Packman Build Service PMBS

Changes of Revision 30

audacious-plugins.spec Changed

@@ -3,7 +3,7 @@
 %define		grp		Productivity/Multimedia/Sound/Players
 
 Name:		audacious-plugins
-Version:	2.5.3
+Version:	3.0
 Release:	1
 
 Summary:	Plugins for Audacious
@@ -15,23 +15,24 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 
-BuildRequires:	audacious-devel = %{version}
-BuildRequires:	bluez-devel bs2b-devel esound-devel flac-devel gtkglext-devel libbinio-devel
-BuildRequires:	libcddb-devel libcdio-devel libcue-devel libcurl-devel libfaad-devel
-BuildRequires:	libffmpeg_oldabi-devel libfluidsynth-devel libmad-devel libmms-devel
-BuildRequires:	libmp3lame-devel libmpcdec-devel libmtp-devel libnotify-devel
-BuildRequires:	libprojectM-devel libshout-devel libusb-devel wavpack-devel
-BuildRequires:	lirc-devel neon-devel SDL-devel libsndfile-devel libtag-devel
-BuildRequires:	update-desktop-files
-
-%if %suse_version >= 1120
-BuildRequires:	libpulse-devel
-%endif
-%if %suse_version >= 1110
-BuildRequires:	sidplay-libs-devel
-%else
-BuildRequires:	libsidplay-devel
-%endif
+#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
+#BuildRequires:  libffmpeg_oldabi-devel libfluidsynth-devel libjack-devel libmad-devel libmms-devel
+#BuildRequires:	libmp3lame-devel libmpcdec-devel libmpg123-devel libmtp-devel libnotify-devel
+#BuildRequires:	libprojectM-devel  libsamplerate-devel libshout-devel libsndfile-devel libtag-devel libusb-devel wavpack-devel
+#BuildRequires:	lirc-devel neon-devel SDL-devel
+#BuildRequires:	update-desktop-files libsmbclient-devel
+
+#%if %suse_version >= 1120
+#BuildRequires:	libpulse-devel
+#%endif
+#%if %suse_version >= 1110
+#BuildRequires:	sidplay-libs-devel
+#%else
+#BuildRequires:	libsidplay-devel
+#%endif
 
 %description
 Core set of plugins for the Audacious audio player.
@@ -106,14 +107,6 @@
 "Paranormal" visualization plugin for Audacious, requires SDL.
 
 
-%package visualization-projectM
-Summary:	ProjectM Visualization Plugin for Audacious
-Group:		%{grp}
-
-%description visualization-projectM
-"ProjectM" visualization plugin for Audacious.
-
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -164,18 +157,18 @@
 %{_libdir}/audacious/Effect/crystalizer.so
 %{_libdir}/audacious/Effect/bs2b.so
 %{_libdir}/audacious/Effect/echo.so
-%{_libdir}/audacious/Effect/ladspa.so
+#%{_libdir}/audacious/Effect/ladspa.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
 %dir %{_libdir}/audacious/General
-%{_libdir}/audacious/General/alarm.so
+#%{_libdir}/audacious/General/alarm.so
 %{_libdir}/audacious/General/albumart.so
 %{_libdir}/audacious/General/aosd.so
 %{_libdir}/audacious/General/cd-menu-items.so
-%{_libdir}/audacious/General/evdev-plug.so
+#%{_libdir}/audacious/General/evdev-plug.so
 %{_libdir}/audacious/General/gnomeshortcuts.so
 %{_libdir}/audacious/General/gtkui.so
 %{_libdir}/audacious/General/hotkey.so
@@ -188,7 +181,7 @@
 %{_libdir}/audacious/General/statusicon.so
 %endif
 %{_libdir}/audacious/General/skins.so
-%{_libdir}/audacious/General/streambrowser.so
+#%{_libdir}/audacious/General/streambrowser.so
 %{_libdir}/audacious/Input/aac.so
 %{_libdir}/audacious/Input/amidi-plug.so
 %dir %{_libdir}/audacious/Input/amidi-plug
@@ -211,21 +204,21 @@
 %{_libdir}/audacious/Output/OSS.so
 %{_libdir}/audacious/Output/alsa.so
 %{_libdir}/audacious/Output/filewriter.so
-%{_libdir}/audacious/Output/jackout.so
+#%{_libdir}/audacious/Output/jackout.so
 %{_libdir}/audacious/Output/null.so
 %{_libdir}/audacious/Output/sdlout.so
 %dir %{_libdir}/audacious/Transport
-%{_libdir}/audacious/Transport/gio.so
+%{_libdir}/audacious/Transport/smb.so
 %{_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/spectrum.so
+#%{_libdir}/audacious/Visualization/spectrum.so
 %dir %{_datadir}/audacious/
-%dir %{_datadir}/audacious/images
-%{_datadir}/audacious/images/*
+#%dir %{_datadir}/audacious/images
+#%{_datadir}/audacious/images/*
 %dir %{_datadir}/audacious/Skins
 %dir %{_datadir}/audacious/Skins/Classic
 %{_datadir}/audacious/Skins/Classic/*
@@ -267,7 +260,7 @@
 %files control-lirc
 %defattr(-,root,root)
 %dir %{_libdir}/audacious/General
-%{_libdir}/audacious/General/lirc.so
+#%{_libdir}/audacious/General/lirc.so
 
 %files transport-mms
 %defattr(-,root,root)
@@ -281,14 +274,10 @@
 %files visualization-paranormal
 %defattr(-,root,root)
 %dir %{_libdir}/audacious/Visualization
-%{_libdir}/audacious/Visualization/paranormal.so
-%dir %{_datadir}/audacious/paranormal
-%dir %{_datadir}/audacious/paranormal/Presets
-%config %{_datadir}/audacious/paranormal/Presets/*
-
-%files visualization-projectM
-%defattr(-,root,root)
-%{_libdir}/audacious/Visualization/projectm-1.0.so
+#%{_libdir}/audacious/Visualization/paranormal.so
+#%dir %{_datadir}/audacious/paranormal
+#%dir %{_datadir}/audacious/paranormal/Presets
+#%config %{_datadir}/audacious/paranormal/Presets/*
 
 
 %changelog

audacious-plugins-2.5.3.tar.gz/m4/jack.m4 Deleted

@@ -1,34 +0,0 @@
-# Configure paths for JACK
-
-dnl AM_PATH_JACK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for JACK, and define JACK_CFLAGS and JACK_LIBS
-dnl
-AC_DEFUN([AM_PATH_JACK],
-[dnl 
-dnl *** Check for JACK libraries
-dnl
-PKG_CHECK_MODULES([JACK], [jack >= 0.100.0], [have_jack=yes], [have_jack=no])
-
-dnl *** Check for libsamplerate necessary for bio2jack
-PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= 0.0.15],
-    [ac_cv_samplerate=1], [ac_cv_samplerate=0])
-
-AC_DEFINE_UNQUOTED([HAVE_SAMPLERATE], ${ac_cv_samplerate},
-    [Set to 1 if you have libsamplerate.])
-
-dnl *** Make sure libsamplerate is found, we can't compile without it
-if test "x${ac_cv_samplerate}" = "x0"; then
-    AC_MSG_WARN([Could not find libsamplerate, necessary for jack output plugin.])
-    have_jack=no
-fi
-
-dnl AC_SUBST(SAMPLERATE_CFLAGS)
-dnl AC_SUBST(SAMPLERATE_LIBS)
-
-if test "x$have_jack" = "xno"; then
-  ifelse([$2], , :, [$2])
-else
-  ifelse([$1], , :, [$1])
-fi
-
-])

audacious-plugins-2.5.3.tar.gz/src/alarm Deleted

audacious-plugins-2.5.3.tar.gz/src/alarm/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/alarm/alarm.c Deleted

@@ -1,1030 +0,0 @@
-/*
- * 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/configdb.h>
-#include <audacious/debug.h>
-#include <audacious/drct.h>
-#include <audacious/plugin.h>
-
-#include "alarm.h"
-#include "interface.h"
-#include "callbacks.h"
-
-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;
-
- widget = (GtkWidget*) gtk_object_get_data(GTK_OBJECT(w),
-					 name);
- g_return_val_if_fail(widget != NULL, NULL);
-
- return widget;
-}
-
-static void dialog_destroyed(GtkWidget *dialog, gpointer data)
-{
- AUDDBG("dialog destroyed\n");
- *(GtkObject**)data = NULL;
-}
-
-static inline gboolean dialog_visible(GtkWidget *dialog)
-{
- return(((dialog != NULL) && GTK_WIDGET_VISIBLE(dialog)));
-}
-
-/*
- * tell the user about that bug
- */
-static void alarm_warning(void)
-{
-
- static GtkWidget *warning_dialog = NULL;
-
- if(dialog_visible(warning_dialog))
- return;
-
- warning_dialog = create_warning_dialog();
-
- gtk_signal_connect(GTK_OBJECT(warning_dialog), "destroy",
-		 GTK_SIGNAL_FUNC(dialog_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
- mcs_handle_t *conf;
-
- AUDDBG("alarm_save\n");
-
- conf = aud_cfg_db_open();
-
- /*
- * 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_cfg_db_set_int(conf, "alarm", "alarm_h", alarm_h);
-
- alarm_m = alarm_conf.default_min =
- gtk_spin_button_get_value_as_int(alarm_conf.alarm_m);
- aud_cfg_db_set_int(conf, "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_cfg_db_set_int(conf, "alarm", day_flags[daynum], alarm_conf.day[daynum].flags);
- aud_cfg_db_set_int(conf, "alarm", day_h[daynum], alarm_conf.day[daynum].hour);
- aud_cfg_db_set_int(conf, "alarm", day_m[daynum], alarm_conf.day[daynum].min);
- }
-
- /* END: days of week */
-
- volume =
- gtk_range_get_adjustment(alarm_conf.volume)->value;
- aud_cfg_db_set_int(conf, "alarm", "volume", volume);
-
- quietvol =
- gtk_range_get_adjustment(alarm_conf.quietvol)->value;
- aud_cfg_db_set_int(conf, "alarm", "quietvol", quietvol);
-
- fading =
- gtk_spin_button_get_value_as_int(alarm_conf.fading);
- //xmms_cfg_write_int(conf, "alarm", "fading", 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_cfg_db_set_int(conf, "alarm", "stop_h", stop_h);
-	 aud_cfg_db_set_int(conf, "alarm", "stop_m", stop_m);
-	 aud_cfg_db_set_int(conf, "alarm", "fading", fading);
-	 aud_cfg_db_set_bool(conf, "alarm", "stop_on", stop_on);
- }
-
-
- g_free(cmdstr);
- cmdstr = gtk_editable_get_chars(GTK_EDITABLE(alarm_conf.cmdstr),
-				 0, -1);
- aud_cfg_db_set_string(conf, "alarm", "cmdstr", cmdstr);
-
- cmd_on =
- gtk_toggle_button_get_active(alarm_conf.cmd_on);
- aud_cfg_db_set_bool(conf, "alarm", "cmd_on", cmd_on);
-
- g_free(playlist);
- playlist = gtk_editable_get_chars(GTK_EDITABLE(alarm_conf.playlist),
-				 0, -1);
- aud_cfg_db_set_string(conf, "alarm", "playlist", playlist);
-
- /* reminder */
- g_free(alarm_conf.reminder_msg);
- alarm_conf.reminder_msg = gtk_editable_get_chars(GTK_EDITABLE(alarm_conf.reminder),
- 0, -1);
- aud_cfg_db_set_string(conf, "alarm", "reminder_msg", alarm_conf.reminder_msg);
-
- alarm_conf.reminder_on =
- gtk_toggle_button_get_active(alarm_conf.reminder_cb);
- aud_cfg_db_set_bool(conf, "alarm", "reminder_on", alarm_conf.reminder_on);
-
- aud_cfg_db_close(conf);
-}
-
-/*
- * read the current configuration from the file
- */
-static void alarm_read_config(void)
-{
- int daynum = 0; // used for day number
- mcs_handle_t *conf;
-
- AUDDBG("alarm_read_config\n");
-
- conf = aud_cfg_db_open();
-
- if(!aud_cfg_db_get_int(conf, "alarm", "alarm_h", &alarm_h))
- alarm_h = DEFAULT_ALARM_HOUR;
- if(!aud_cfg_db_get_int(conf, "alarm", "alarm_m", &alarm_m))
- alarm_m = DEFAULT_ALARM_MIN;
-
- /* save them here too */
- alarm_conf.default_hour = alarm_h;
- alarm_conf.default_min = alarm_m;
-
- if(!aud_cfg_db_get_int( conf, "alarm", "stop_h", &stop_h))
- stop_h = DEFAULT_STOP_HOURS;
- if(!aud_cfg_db_get_int( conf, "alarm", "stop_m", &stop_m))
- stop_m = DEFAULT_STOP_MINS;
- if(!aud_cfg_db_get_bool(conf, "alarm", "stop_on", &stop_on))
- stop_on = TRUE;
-
- if(!aud_cfg_db_get_int(conf, "alarm", "volume", &volume))
- volume = DEFAULT_VOLUME;
- if(!aud_cfg_db_get_int(conf, "alarm", "quietvol", &quietvol))
- quietvol = DEFAULT_QUIET_VOL;
-
- if(!aud_cfg_db_get_int(conf, "alarm", "fading", &fading))
- fading = DEFAULT_FADING;
-
- g_free(cmdstr);
- if(!aud_cfg_db_get_string(conf, "alarm", "cmdstr", &cmdstr))
- cmdstr = g_strdup("");
- if(!aud_cfg_db_get_bool(conf, "alarm", "cmd_on", &cmd_on))
- cmd_on = FALSE;
-
- g_free(playlist);
- if(!aud_cfg_db_get_string(conf, "alarm", "playlist", &playlist))
- playlist = g_strdup("");
-
- g_free(alarm_conf.reminder_msg);
- if(!aud_cfg_db_get_string(conf, "alarm", "reminder_msg", &alarm_conf.reminder_msg))
- alarm_conf.reminder_msg = g_strdup("");
- if(!aud_cfg_db_get_bool(conf, "alarm", "reminder_on", &alarm_conf.reminder_on))
- alarm_conf.reminder_on = FALSE;
-
- /* day flags and times */
- for(; daynum < 7; daynum++)
- {
- /* read the flags */
- if(!aud_cfg_db_get_int(conf, "alarm", day_flags[daynum], &alarm_conf.day[daynum].flags)) {
- // only turn alarm off by default on a sunday
- if(daynum != 0)
- alarm_conf.day[daynum].flags = DEFAULT_FLAGS;
- else
- alarm_conf.day[daynum].flags = DEFAULT_FLAGS | ALARM_OFF;
- }
-
- /* read the times */
- if(!aud_cfg_db_get_int(conf, "alarm", day_h[daynum], &alarm_conf.day[daynum].hour))
- alarm_conf.day[daynum].hour = DEFAULT_ALARM_HOUR;
-
- if(!aud_cfg_db_get_int(conf, "alarm", day_m[daynum], &alarm_conf.day[daynum].min))
- alarm_conf.day[daynum].min = DEFAULT_ALARM_MIN;
- }
-
- aud_cfg_db_close(conf);
- AUDDBG("END alarm_read_config\n");
-}
-
-/*
- * display an about box
- */
-static void alarm_about(void)
-{
- static GtkWidget *about_dialog = NULL;
-
- AUDDBG("alarm_about\n");
-
- if(dialog_visible(about_dialog))
- return;
-
- about_dialog = create_about_dialog();
-
- gtk_signal_connect(GTK_OBJECT(about_dialog), "destroy",
-		 GTK_SIGNAL_FUNC(dialog_destroyed), &about_dialog);
-
- gtk_widget_show_all(about_dialog);
-
- return;
-}
-
-/*
- * create a playlist file selection dialog
- */
-static void alarm_playlist_browse(GtkButton *button, gpointer data)
-{
- GtkWidget *fs;
- gchar *dirname, *path;
-
- dirname = g_dirname(playlist);
- AUDDBG("dirname = %s\n", dirname);
- path = g_strdup_printf("%s/", dirname);
- AUDDBG("path = %s\n", path);
- g_free(dirname);
-
- fs = create_playlist_fileselection();
-
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(fs), path);
- g_free(path);
-
- gtk_widget_show_all(fs);
-}
-
-/*
- * save selected playlist to the corresponding text entry
- */
-void alarm_store_playlistname(GtkButton *button, gpointer data)
-{
- GtkFileSelection *fs = GTK_FILE_SELECTION(data);
- gchar *plist;
-
- AUDDBG("alarm_store_playlistname\n");
-
- plist = g_strdup(gtk_file_selection_get_filename(fs));
-
- gtk_entry_set_text(alarm_conf.playlist, plist);
- g_free(plist);
-}
-
-/*
- * displays the configuration window and opens the config file.
- */
-static void alarm_configure(void)
-{
- int daynum = 0; // used to loop days
- GtkWidget *w;
-
- AUDDBG("alarm_configure\n");
-
- /*
- * dont want to show more than one config window
- */
- if(dialog_visible(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);
-
- w = lookup_widget(config_dialog, "playlist_browse_button");
- gtk_signal_connect(GTK_OBJECT(w), "clicked",
-		 GTK_SIGNAL_FUNC(alarm_playlist_browse), NULL);
-
- gtk_signal_connect(GTK_OBJECT(config_dialog), "destroy",
-		 GTK_SIGNAL_FUNC(dialog_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 (dialog_visible(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);
-
- GDK_THREADS_ENTER();
- reminder_dialog = (GtkWidget*) create_reminder_dialog(alarm_conf.reminder_msg);
- gtk_signal_connect(GTK_OBJECT(reminder_dialog), "destroy",
- GTK_SIGNAL_FUNC(dialog_destroyed), &reminder_dialog);
- gtk_widget_show_all(reminder_dialog);
- GDK_THREADS_LEAVE();
- }
-
- /* 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)
- {
- /* ok, so when we want to open dialogs in threaded programs
- * we use this do we?
- * anyone?
- */
- GDK_THREADS_ENTER();
- {
- AUDDBG("stop_on is true\n");
- alarm_dialog = create_alarm_dialog();
- AUDDBG("created alarm dialog, %p\n", alarm_dialog);
-
- gtk_signal_connect(GTK_OBJECT(alarm_dialog), "destroy",
- GTK_SIGNAL_FUNC(dialog_destroyed), &alarm_dialog);
- AUDDBG("attached destroy signal to alarm dialog, %p\n", alarm_dialog);
- gtk_widget_show_all(alarm_dialog);
- AUDDBG("dialog now showing\n");
-
- AUDDBG("now starting stop thread\n");
- stop = alarm_thread_create(alarm_stop_thread, NULL, 0);
- AUDDBG("Created wakeup dialog and started stop thread\n");
-
-	 }
-	 GDK_THREADS_LEAVE();
-
- /* 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;
-}
-
-static GeneralPlugin alarm_plugin =
-{
- .description = "Alarm "VERSION,
- .init = alarm_init,
- .about = alarm_about,
- .configure = alarm_configure,
- .cleanup = alarm_cleanup,
-};
-
-GeneralPlugin *alarm_gplist[] = { &alarm_plugin, NULL };
-SIMPLE_GENERAL_PLUGIN(alarm, alarm_gplist);

audacious-plugins-2.5.3.tar.gz/src/alarm/alarm.h Deleted

@@ -1,50 +0,0 @@
-/*
- * $Id: alarm.h,v 1.2 2003/11/23 19:29:36 adamf Exp $
- * alarm.h
- *
- * Adam Feakin
- * adamf@snika.uklinux.net
- *
- * we need some struct to hold the info about the days
- */
-#ifndef __ALARM_H
-#define __ALARM_H
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-/* flags */
-#define ALARM_OFF (1 << 0)
-#define ALARM_DEFAULT (1 << 1)
-
-/* defaults */
-#define DEFAULT_ALARM_HOUR 06
-#define DEFAULT_ALARM_MIN 30
-#define DEFAULT_STOP_HOURS 01
-#define DEFAULT_STOP_MINS 00
-#define DEFAULT_VOLUME 80
-#define DEFAULT_FADING 60
-#define DEFAULT_QUIET_VOL 25
-#define DEFAULT_FLAGS ALARM_DEFAULT
-
-typedef struct AlarmDay {
- GtkCheckButton *cb;
- GtkCheckButton *cb_def;
- GtkSpinButton *spin_hr;
- GtkSpinButton *spin_min;
- int flags;
- int hour;
- int min;
-} alarmday;
-
-
-typedef struct Fader {
- guint start, end;
-} fader;
-
-
-#endif /* __ALARM_H */
-/*
- * vi:ai:expandtab:ts=2 sts=2 shiftwidth=2:nowrap:
- */

audacious-plugins-2.5.3.tar.gz/src/alarm/callbacks.h Deleted

@@ -1,49 +0,0 @@
-#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
-alarm_store_playlistname (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-2.5.3.tar.gz/src/alarm/interface.c Deleted

@@ -1,1510 +0,0 @@
-/*
- * 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 "support.h"
-
-#include <audacious/i18n.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");
- gtk_object_set_data (GTK_OBJECT (about_dialog), "about_dialog", about_dialog);
- gtk_window_set_title (GTK_WINDOW (about_dialog), _("About XMMS Alarm"));
-/*
- * GTK2 hack
- * GTK_WINDOW (about_dialog)->type = GTK_WINDOW_DIALOG;
- */
- GTK_WINDOW (about_dialog)->type = GTK_WINDOW_TOPLEVEL;
- gtk_window_set_policy (GTK_WINDOW (about_dialog), FALSE, FALSE, TRUE);
-
- dialog_vbox2 = GTK_DIALOG (about_dialog)->vbox;
- gtk_widget_set_name (dialog_vbox2, "dialog_vbox2");
- gtk_object_set_data (GTK_OBJECT (about_dialog), "dialog_vbox2", dialog_vbox2);
- gtk_widget_show (dialog_vbox2);
-
- frame6 = gtk_frame_new (_("XMMS Alarm"));
- gtk_widget_set_name (frame6, "frame6");
- gtk_widget_ref (frame6);
- gtk_object_set_data_full (GTK_OBJECT (about_dialog), "frame6", frame6,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label18);
- gtk_object_set_data_full (GTK_OBJECT (about_dialog), "label18", label18,
- (GtkDestroyNotify) gtk_widget_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 (about_dialog)->action_area;
- gtk_widget_set_name (dialog_action_area2, "dialog_action_area2");
- gtk_object_set_data (GTK_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");
- gtk_widget_ref (close);
- gtk_object_set_data_full (GTK_OBJECT (about_dialog), "close", close,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (close);
- gtk_box_pack_start (GTK_BOX (dialog_action_area2), close, FALSE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (close, GTK_CAN_DEFAULT);
-
- gtk_signal_connect_object (GTK_OBJECT (close), "clicked",
- GTK_SIGNAL_FUNC (gtk_widget_destroy),
- GTK_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");
- gtk_object_set_data (GTK_OBJECT (alarm_dialog), "alarm_dialog", alarm_dialog);
- gtk_window_set_title (GTK_WINDOW (alarm_dialog), _("Alarm"));
- gtk_window_set_policy (GTK_WINDOW (alarm_dialog), FALSE, FALSE, FALSE);
-
- dialog_vbox3 = GTK_DIALOG (alarm_dialog)->vbox;
- gtk_widget_set_name (dialog_vbox3, "dialog_vbox3");
- gtk_object_set_data (GTK_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");
- gtk_widget_ref (label19);
- gtk_object_set_data_full (GTK_OBJECT (alarm_dialog), "label19", label19,
- (GtkDestroyNotify) gtk_widget_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 (alarm_dialog)->action_area;
- gtk_widget_set_name (dialog_action_area3, "dialog_action_area3");
- gtk_object_set_data (GTK_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");
- gtk_widget_ref (button9);
- gtk_object_set_data_full (GTK_OBJECT (alarm_dialog), "button9", button9,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (button9);
- gtk_box_pack_start (GTK_BOX (dialog_action_area3), button9, FALSE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (button9, GTK_CAN_DEFAULT);
-
- gtk_signal_connect (GTK_OBJECT (button9), "clicked",
- GTK_SIGNAL_FUNC (alarm_stop_cancel),
- NULL);
- gtk_signal_connect_object (GTK_OBJECT (button9), "clicked",
- GTK_SIGNAL_FUNC (gtk_widget_destroy),
- GTK_OBJECT (alarm_dialog));
-
- gtk_widget_grab_focus (button9);
- gtk_widget_grab_default (button9);
- return alarm_dialog;
-}
-
-GtkWidget*
-create_playlist_fileselection (void)
-{
- GtkWidget *playlist_fileselection;
- GtkWidget *ok_button1;
- GtkWidget *cancel_button1;
-
- playlist_fileselection = gtk_file_selection_new (_("Select Playlist"));
- gtk_widget_set_name (playlist_fileselection, "playlist_fileselection");
- gtk_object_set_data (GTK_OBJECT (playlist_fileselection), "playlist_fileselection", playlist_fileselection);
- gtk_container_set_border_width (GTK_CONTAINER (playlist_fileselection), 10);
- gtk_window_set_modal (GTK_WINDOW (playlist_fileselection), TRUE);
-
- ok_button1 = GTK_FILE_SELECTION (playlist_fileselection)->ok_button;
- gtk_widget_set_name (ok_button1, "ok_button1");
- gtk_object_set_data (GTK_OBJECT (playlist_fileselection), "ok_button1", ok_button1);
- gtk_widget_show (ok_button1);
- GTK_WIDGET_SET_FLAGS (ok_button1, GTK_CAN_DEFAULT);
-
- cancel_button1 = GTK_FILE_SELECTION (playlist_fileselection)->cancel_button;
- gtk_widget_set_name (cancel_button1, "cancel_button1");
- gtk_object_set_data (GTK_OBJECT (playlist_fileselection), "cancel_button1", cancel_button1);
- gtk_widget_show (cancel_button1);
- GTK_WIDGET_SET_FLAGS (cancel_button1, GTK_CAN_DEFAULT);
-
- gtk_signal_connect (GTK_OBJECT (ok_button1), "clicked",
- GTK_SIGNAL_FUNC (alarm_store_playlistname),
- playlist_fileselection);
- gtk_signal_connect_object (GTK_OBJECT (ok_button1), "clicked",
- GTK_SIGNAL_FUNC (gtk_widget_destroy),
- GTK_OBJECT (playlist_fileselection));
- gtk_signal_connect_object (GTK_OBJECT (cancel_button1), "clicked",
- GTK_SIGNAL_FUNC (gtk_widget_destroy),
- GTK_OBJECT (playlist_fileselection));
-
- return playlist_fileselection;
-}
-
-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");
- gtk_object_set_data (GTK_OBJECT (warning_dialog), "warning_dialog", warning_dialog);
- gtk_window_set_title (GTK_WINDOW (warning_dialog), _("Sorry"));
- gtk_window_set_policy (GTK_WINDOW (warning_dialog), FALSE, FALSE, FALSE);
-
- dialog_vbox4 = GTK_DIALOG (warning_dialog)->vbox;
- gtk_widget_set_name (dialog_vbox4, "dialog_vbox4");
- gtk_object_set_data (GTK_OBJECT (warning_dialog), "dialog_vbox4", dialog_vbox4);
- gtk_widget_show (dialog_vbox4);
-
- frame9 = gtk_frame_new (_("Warning"));
- gtk_widget_set_name (frame9, "frame9");
- gtk_widget_ref (frame9);
- gtk_object_set_data_full (GTK_OBJECT (warning_dialog), "frame9", frame9,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label70);
- gtk_object_set_data_full (GTK_OBJECT (warning_dialog), "label70", label70,
- (GtkDestroyNotify) gtk_widget_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 (warning_dialog)->action_area;
- gtk_widget_set_name (dialog_action_area4, "dialog_action_area4");
- gtk_object_set_data (GTK_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");
- gtk_widget_ref (button10);
- gtk_object_set_data_full (GTK_OBJECT (warning_dialog), "button10", button10,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (button10);
- gtk_box_pack_start (GTK_BOX (dialog_action_area4), button10, FALSE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (button10, GTK_CAN_DEFAULT);
-
- gtk_signal_connect_object (GTK_OBJECT (button10), "clicked",
- GTK_SIGNAL_FUNC (gtk_widget_destroy),
- GTK_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;
- GtkObject *stop_h_spin_adj;
- GtkWidget *stop_h_spin;
- GtkWidget *label75;
- GtkWidget *hbox22;
- GtkObject *alarm_h_spin_adj;
- GtkWidget *alarm_h_spin;
- GtkWidget *label76;
- GtkWidget *hbox23;
- GtkObject *alarm_m_spin_adj;
- GtkWidget *alarm_m_spin;
- GtkWidget *label77;
- GtkWidget *hbox24;
- GtkObject *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;
- GtkObject *mon_h_adj;
- GtkWidget *mon_h;
- GtkWidget *label89;
- GtkObject *mon_m_adj;
- GtkWidget *mon_m;
- GtkWidget *hbox32;
- GtkWidget *tue_def;
- GtkObject *tue_h_adj;
- GtkWidget *tue_h;
- GtkWidget *label90;
- GtkObject *tue_m_adj;
- GtkWidget *tue_m;
- GtkWidget *hbox33;
- GtkWidget *wed_def;
- GtkObject *wed_h_adj;
- GtkWidget *wed_h;
- GtkWidget *label91;
- GtkObject *wed_m_adj;
- GtkWidget *wed_m;
- GtkWidget *hbox34;
- GtkWidget *thu_def;
- GtkObject *thu_h_adj;
- GtkWidget *thu_h;
- GtkWidget *label92;
- GtkObject *thu_m_adj;
- GtkWidget *thu_m;
- GtkWidget *hbox35;
- GtkWidget *fri_def;
- GtkObject *fri_h_adj;
- GtkWidget *fri_h;
- GtkWidget *label93;
- GtkObject *fri_m_adj;
- GtkWidget *fri_m;
- GtkWidget *hbox36;
- GtkWidget *sat_def;
- GtkObject *sat_h_adj;
- GtkWidget *sat_h;
- GtkWidget *label94;
- GtkObject *sat_m_adj;
- GtkWidget *sat_m;
- GtkWidget *hbox37;
- GtkWidget *sun_def;
- GtkObject *sun_h_adj;
- GtkWidget *sun_h;
- GtkWidget *label95;
- GtkObject *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;
- GtkObject *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;
- GtkTooltips *tooltips;
-
- tooltips = gtk_tooltips_new ();
-
- config_dialog = gtk_dialog_new ();
- gtk_widget_set_name (config_dialog, "config_dialog");
- gtk_object_set_data (GTK_OBJECT (config_dialog), "config_dialog", config_dialog);
- gtk_window_set_title (GTK_WINDOW (config_dialog), _("Alarm Settings"));
- gtk_window_set_policy (GTK_WINDOW (config_dialog), FALSE, FALSE, FALSE);
-
- dialog_vbox5 = GTK_DIALOG (config_dialog)->vbox;
- gtk_widget_set_name (dialog_vbox5, "dialog_vbox5");
- gtk_object_set_data (GTK_OBJECT (config_dialog), "dialog_vbox5", dialog_vbox5);
- gtk_widget_show (dialog_vbox5);
-
- notebook1 = gtk_notebook_new ();
- gtk_widget_set_name (notebook1, "notebook1");
- gtk_widget_ref (notebook1);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "notebook1", notebook1,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (frame10);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "frame10", frame10,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (table3);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "table3", table3,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox21);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox21", hbox21,
- (GtkDestroyNotify) gtk_widget_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 = 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");
- gtk_widget_ref (stop_h_spin);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "stop_h_spin", stop_h_spin,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label75);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label75", label75,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox22);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox22", hbox22,
- (GtkDestroyNotify) gtk_widget_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 = 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");
- gtk_widget_ref (alarm_h_spin);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "alarm_h_spin", alarm_h_spin,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label76);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label76", label76,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox23);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox23", hbox23,
- (GtkDestroyNotify) gtk_widget_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 = 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");
- gtk_widget_ref (alarm_m_spin);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "alarm_m_spin", alarm_m_spin,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label77);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label77", label77,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox24);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox24", hbox24,
- (GtkDestroyNotify) gtk_widget_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 = 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");
- gtk_widget_ref (stop_m_spin);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "stop_m_spin", stop_m_spin,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label78);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label78", label78,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (stop_checkb);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "stop_checkb", stop_checkb,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label79);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label79", label79,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label80);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label80", label80,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label71);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label71", label71,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (frame15);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "frame15", frame15,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (table4);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "table4", table4,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox31);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox31", hbox31,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (mon_def);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "mon_def", mon_def,
- (GtkDestroyNotify) gtk_widget_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 = 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");
- gtk_widget_ref (mon_h);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "mon_h", mon_h,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label89);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label89", label89,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label89);
- gtk_box_pack_start (GTK_BOX (hbox31), label89, FALSE, FALSE, 0);
-
- mon_m_adj = 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");
- gtk_widget_ref (mon_m);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "mon_m", mon_m,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox32);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox32", hbox32,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (tue_def);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "tue_def", tue_def,
- (GtkDestroyNotify) gtk_widget_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 = 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");
- gtk_widget_ref (tue_h);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "tue_h", tue_h,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label90);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label90", label90,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label90);
- gtk_box_pack_start (GTK_BOX (hbox32), label90, FALSE, FALSE, 0);
-
- tue_m_adj = 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");
- gtk_widget_ref (tue_m);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "tue_m", tue_m,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox33);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox33", hbox33,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (wed_def);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "wed_def", wed_def,
- (GtkDestroyNotify) gtk_widget_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 = 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");
- gtk_widget_ref (wed_h);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "wed_h", wed_h,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label91);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label91", label91,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label91);
- gtk_box_pack_start (GTK_BOX (hbox33), label91, FALSE, FALSE, 0);
-
- wed_m_adj = 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");
- gtk_widget_ref (wed_m);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "wed_m", wed_m,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox34);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox34", hbox34,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (thu_def);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "thu_def", thu_def,
- (GtkDestroyNotify) gtk_widget_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 = 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");
- gtk_widget_ref (thu_h);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "thu_h", thu_h,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label92);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label92", label92,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label92);
- gtk_box_pack_start (GTK_BOX (hbox34), label92, FALSE, FALSE, 0);
-
- thu_m_adj = 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");
- gtk_widget_ref (thu_m);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "thu_m", thu_m,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox35);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox35", hbox35,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (fri_def);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "fri_def", fri_def,
- (GtkDestroyNotify) gtk_widget_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 = 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");
- gtk_widget_ref (fri_h);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "fri_h", fri_h,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label93);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label93", label93,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label93);
- gtk_box_pack_start (GTK_BOX (hbox35), label93, FALSE, FALSE, 0);
-
- fri_m_adj = 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");
- gtk_widget_ref (fri_m);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "fri_m", fri_m,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox36);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox36", hbox36,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (sat_def);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "sat_def", sat_def,
- (GtkDestroyNotify) gtk_widget_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 = 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");
- gtk_widget_ref (sat_h);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "sat_h", sat_h,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label94);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label94", label94,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label94);
- gtk_box_pack_start (GTK_BOX (hbox36), label94, FALSE, FALSE, 0);
-
- sat_m_adj = 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");
- gtk_widget_ref (sat_m);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "sat_m", sat_m,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox37);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox37", hbox37,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (sun_def);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "sun_def", sun_def,
- (GtkDestroyNotify) gtk_widget_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 = 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");
- gtk_widget_ref (sun_h);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "sun_h", sun_h,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label95);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label95", label95,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label95);
- gtk_box_pack_start (GTK_BOX (hbox37), label95, FALSE, FALSE, 0);
-
- sun_m_adj = 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");
- gtk_widget_ref (sun_m);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "sun_m", sun_m,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label87);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label87", label87,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label88);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label88", label88,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (tue_cb);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "tue_cb", tue_cb,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (wed_cb);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "wed_cb", wed_cb,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (thu_cb);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "thu_cb", thu_cb,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (fri_cb);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "fri_cb", fri_cb,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (sat_cb);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "sat_cb", sat_cb,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (sun_cb);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "sun_cb", sun_cb,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (mon_cb);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "mon_cb", mon_cb,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label72);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label72", label72,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (vbox8);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "vbox8", vbox8,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (vbox8);
- gtk_container_add (GTK_CONTAINER (notebook1), vbox8);
-
- frame11 = gtk_frame_new (_("Fading"));
- gtk_widget_set_name (frame11, "frame11");
- gtk_widget_ref (frame11);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "frame11", frame11,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (alignment10);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "alignment10", alignment10,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox25);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox25", hbox25,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (hbox25);
- gtk_container_add (GTK_CONTAINER (alignment10), hbox25);
-
- fading_spin_adj = gtk_adjustment_new (120, 0, 3600, 1, 10, 10);
- fading_spin = gtk_spin_button_new (GTK_ADJUSTMENT (fading_spin_adj), 1, 0);
- gtk_widget_set_name (fading_spin, "fading_spin");
- gtk_widget_ref (fading_spin);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "fading_spin", fading_spin,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label81);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label81", label81,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (frame12);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "frame12", frame12,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (vbox9);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "vbox9", vbox9,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (alignment11);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "alignment11", alignment11,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (current_button);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "current_button", current_button,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (current_button);
- gtk_container_add (GTK_CONTAINER (alignment11), current_button);
- gtk_tooltips_set_tip (tooltips, current_button, _("reset to current output volume"), NULL);
-
- label82 = gtk_label_new (_("Start at"));
- gtk_widget_set_name (label82, "label82");
- gtk_widget_ref (label82);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label82", label82,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox26);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox26", hbox26,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (quiet_vol_scale);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "quiet_vol_scale", quiet_vol_scale,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label83);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label83", label83,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hseparator2);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hseparator2", hseparator2,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label84);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label84", label84,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox27);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox27", hbox27,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (vol_scale);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "vol_scale", vol_scale,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label85);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label85", label85,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label73);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label73", label73,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (vbox10);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "vbox10", vbox10,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (vbox10);
- gtk_container_add (GTK_CONTAINER (notebook1), vbox10);
-
- frame13 = gtk_frame_new (_("Additional Command"));
- gtk_widget_set_name (frame13, "frame13");
- gtk_widget_ref (frame13);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "frame13", frame13,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox28);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox28", hbox28,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (cmd_entry);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "cmd_entry", cmd_entry,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (cmd_checkb);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "cmd_checkb", cmd_checkb,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (frame14);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "frame14", frame14,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox29);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox29", hbox29,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (playlist);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "playlist", playlist,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (playlist_browse_button);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "playlist_browse_button", playlist_browse_button,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (frame18);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "frame18", frame18,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (hbox38);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox38", hbox38,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (reminder_cb);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "reminder_cb", reminder_cb,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (reminder_text);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "reminder_text", reminder_text,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label74);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label74", label74,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (frame16);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "frame16", frame16,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (scrolledwindow1);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "scrolledwindow1", scrolledwindow1,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (text1);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "text1", text1,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (label86);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "label86", label86,
- (GtkDestroyNotify) gtk_widget_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 (config_dialog)->action_area;
- gtk_widget_set_name (dialog_action_area5, "dialog_action_area5");
- gtk_object_set_data (GTK_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");
- gtk_widget_ref (hbox20);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "hbox20", hbox20,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (ok_button);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "ok_button", ok_button,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (ok_button);
- gtk_box_pack_start (GTK_BOX (hbox20), ok_button, FALSE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (ok_button, GTK_CAN_DEFAULT);
-
- cancel_button = gtk_button_new_with_label (_("Cancel"));
- gtk_widget_set_name (cancel_button, "cancel_button");
- gtk_widget_ref (cancel_button);
- gtk_object_set_data_full (GTK_OBJECT (config_dialog), "cancel_button", cancel_button,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (cancel_button);
- gtk_box_pack_start (GTK_BOX (hbox20), cancel_button, FALSE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (cancel_button, GTK_CAN_DEFAULT);
-
- gtk_signal_connect (GTK_OBJECT (mon_def), "toggled",
- GTK_SIGNAL_FUNC (on_mon_def_toggled),
- NULL);
- gtk_signal_connect (GTK_OBJECT (tue_def), "toggled",
- GTK_SIGNAL_FUNC (on_tue_def_toggled),
- NULL);
- gtk_signal_connect (GTK_OBJECT (wed_def), "toggled",
- GTK_SIGNAL_FUNC (on_wed_def_toggled),
- NULL);
- gtk_signal_connect (GTK_OBJECT (thu_def), "toggled",
- GTK_SIGNAL_FUNC (on_thu_def_toggled),
- NULL);
- gtk_signal_connect (GTK_OBJECT (fri_def), "toggled",
- GTK_SIGNAL_FUNC (on_fri_def_toggled),
- NULL);
- gtk_signal_connect (GTK_OBJECT (sat_def), "toggled",
- GTK_SIGNAL_FUNC (on_sat_def_toggled),
- NULL);
- gtk_signal_connect (GTK_OBJECT (sun_def), "toggled",
- GTK_SIGNAL_FUNC (on_sun_def_toggled),
- NULL);
- gtk_signal_connect (GTK_OBJECT (current_button), "clicked",
- GTK_SIGNAL_FUNC (alarm_current_volume),
- NULL);
- gtk_signal_connect (GTK_OBJECT (ok_button), "clicked",
- GTK_SIGNAL_FUNC (alarm_save),
- NULL);
- gtk_signal_connect_object (GTK_OBJECT (ok_button), "clicked",
- GTK_SIGNAL_FUNC (gtk_widget_destroy),
- GTK_OBJECT (config_dialog));
- gtk_signal_connect_object (GTK_OBJECT (cancel_button), "clicked",
- GTK_SIGNAL_FUNC (gtk_widget_destroy),
- GTK_OBJECT (config_dialog));
-
- gtk_widget_grab_default (ok_button);
- gtk_object_set_data (GTK_OBJECT (config_dialog), "tooltips", tooltips);
-
- 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");
- gtk_object_set_data (GTK_OBJECT (reminder_dialog), "reminder_dialog", reminder_dialog);
- gtk_window_set_title (GTK_WINDOW (reminder_dialog), _("Reminder"));
- gtk_window_set_policy (GTK_WINDOW (reminder_dialog), TRUE, TRUE, FALSE);
-
- dialog_vbox6 = GTK_DIALOG (reminder_dialog)->vbox;
- gtk_widget_set_name (dialog_vbox6, "dialog_vbox6");
- gtk_object_set_data (GTK_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");
- gtk_widget_ref (frame19);
- gtk_object_set_data_full (GTK_OBJECT (reminder_dialog), "frame19", frame19,
- (GtkDestroyNotify) gtk_widget_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");
- gtk_widget_ref (reminder_entry);
- gtk_object_set_data_full (GTK_OBJECT (reminder_dialog), "reminder_entry", reminder_entry,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (reminder_entry);
- gtk_container_add (GTK_CONTAINER (frame19), reminder_entry);
- gtk_entry_set_editable (GTK_ENTRY (reminder_entry), FALSE);
- gtk_entry_set_text (GTK_ENTRY (reminder_entry), reminder_msg);
-
- dialog_action_area6 = GTK_DIALOG (reminder_dialog)->action_area;
- gtk_widget_set_name (dialog_action_area6, "dialog_action_area6");
- gtk_object_set_data (GTK_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");
- gtk_widget_ref (button11);
- gtk_object_set_data_full (GTK_OBJECT (reminder_dialog), "button11", button11,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (button11);
- gtk_box_pack_start (GTK_BOX (dialog_action_area6), button11, FALSE, FALSE, 0);
-
- gtk_signal_connect_object (GTK_OBJECT (button11), "clicked",
- GTK_SIGNAL_FUNC (gtk_widget_destroy),
- GTK_OBJECT(reminder_dialog));
-
- return reminder_dialog;
-}
-
-/*
- * vi:ai:expandtab:ts=2 sts=2 shiftwidth=2:nowrap:
- */

audacious-plugins-2.5.3.tar.gz/src/alarm/interface.h Deleted

audacious-plugins-2.5.3.tar.gz/src/alarm/support.h Deleted

audacious-plugins-2.5.3.tar.gz/src/bluetooth Deleted

audacious-plugins-2.5.3.tar.gz/src/bluetooth/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/bluetooth/agent.c Deleted

@@ -1,1029 +0,0 @@
-/*
- * Audacious Bluetooth headset suport plugin
- *
- * Copyright (c) 2008 Paula Stanciu <paula.stanciu@gmail.com>
- * Copyright (C) 2005-2008 Marcel Holtmann <marcel@holtmann.org>
- * Copyright (C) 2006-2007 Bastien Nocera <hadess@hadess.net>
- *
- *
- * 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 St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#include <glib/gprintf.h>
-#include "bluetooth.h"
-#include "agent.h"
-#include "gui.h"
-
-#define PASSKEY_AGENT_PATH	"/org/bluez/passkey_agent"
-#define AUTH_AGENT_PATH		"/org/bluez/auth_agent"
-
-static GtkWidget *agent_window = NULL;
-static GtkWidget *window_box = NULL;
-static GtkWidget *top_box = NULL;
-static GtkWidget *middle_box = NULL;
-static GtkWidget *bottom_box = NULL;
-static GtkWidget *pair_label = NULL;
-static GtkWidget *device_label = NULL;
-static GtkWidget *passkey_entry = NULL;
-static GtkWidget *ok_button = NULL;
-static GtkWidget *cancel_button = NULL;
-static const char* passkey;
-static GList *adapter_list = NULL;
-DBusGProxy *pair_obj = NULL;
-
-static DBusGConnection *connection;
-
-struct adapter_data {
-	char *path;
-	int attached;
-	char *old_mode;
-};
-
-void ok_button_call()
-{
- passkey = gtk_entry_get_text(GTK_ENTRY(passkey_entry));
- printf("Key entered : %s\n",passkey);
-}
-
-void cancel_button_call()
-{
- gtk_widget_destroy (agent_window);
- agent_window = NULL;
-}
-
-void gui_agent()
-{
- if (!agent_window)
- {
- agent_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- g_signal_connect (agent_window, "destroy",G_CALLBACK (gtk_widget_destroyed), &agent_window);
- window_box = gtk_vbox_new(FALSE,2);
- top_box = gtk_vbox_new(FALSE,2);
- middle_box = gtk_hbox_new(FALSE,2);
- bottom_box = gtk_hbox_new(FALSE,2);
-
- gtk_container_add(GTK_CONTAINER(agent_window),window_box);
- gtk_container_add(GTK_CONTAINER(window_box),top_box);
- gtk_container_set_border_width (GTK_CONTAINER(middle_box), 20);
- gtk_container_add(GTK_CONTAINER(window_box),middle_box);
- gtk_container_add(GTK_CONTAINER(window_box),bottom_box);
-
- pair_label = gtk_label_new_with_mnemonic("Enter passkey for pairing");
- device_label = gtk_label_new_with_mnemonic(((DeviceData*)(selected_dev->data))->name);
-
- gtk_container_add(GTK_CONTAINER(top_box),pair_label);
- gtk_container_add(GTK_CONTAINER(top_box),device_label);
-
- passkey_entry = gtk_entry_new();
- gtk_container_add(GTK_CONTAINER(middle_box),passkey_entry);
-
- ok_button = gtk_button_new_with_mnemonic("OK");
- cancel_button = gtk_button_new_with_mnemonic("Cancel");
- gtk_container_add(GTK_CONTAINER(bottom_box),ok_button);
- g_signal_connect(ok_button,"clicked",G_CALLBACK(ok_button_call),NULL);
-
- gtk_container_add(GTK_CONTAINER(bottom_box),cancel_button);
- g_signal_connect(cancel_button,"clicked",G_CALLBACK (cancel_button_call),NULL);
-
-
- gtk_window_set_title(GTK_WINDOW(agent_window),"Pairing passkey request");
- if (!GTK_WIDGET_VISIBLE (agent_window))
- gtk_widget_show_all (agent_window);
- else
- { 
- gtk_widget_destroy (agent_window);
- agent_window = NULL;
- }
-
- }
-
-
-}
-static DBusGConnection *connection;
-
-static int volatile registered_passkey	= 0;
-static int volatile registered_auth	= 0;
-
-static gboolean auto_authorize = FALSE;
-
-typedef enum {
- AGENT_ERROR_REJECT
-} AgentError;
-
-#define AGENT_ERROR (agent_error_quark())
-
-#define AGENT_ERROR_TYPE (agent_error_get_type()) 
-
-static GQuark agent_error_quark(void)
-{
- static GQuark quark = 0;
- if (!quark)
- quark = g_quark_from_static_string("agent");
-
- return quark;
-}
-
-#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC }
-
-static GType agent_error_get_type(void)
-{
- static GType etype = 0;
- if (etype == 0) {
- static const GEnumValue values[] = {
- ENUM_ENTRY(AGENT_ERROR_REJECT, "Rejected"),
- { 0, 0, 0 }
- };
-
- etype = g_enum_register_static("agent", values);
- }
-
- return etype;
-}
-
-static GList *input_list = NULL;
-
-struct input_data {
- char *path;
- char *address;
- char *service;
- char *uuid;
- DBusGMethodInvocation *context;
-};
-
-static gint input_compare(gconstpointer a, gconstpointer b)
-{
- struct input_data *a_data = (struct input_data *) a;
- struct input_data *b_data = (struct input_data *) b;
-
- return g_ascii_strcasecmp(a_data->address, b_data->address);
-}
-
-static void input_free(struct input_data *input)
-{
-
- input_list = g_list_remove(input_list, input);
-
- g_free(input->uuid);
- g_free(input->service);
- g_free(input->address);
- g_free(input->path);
- g_free(input);
-
- //	if (g_list_length(input_list) == 0)
- //	disable_blinking();
-}
-
-static void passkey_callback(gint response, gpointer user_data)
-{
- struct input_data *input = user_data;
-
- if (response == GTK_RESPONSE_ACCEPT) {
- const char *passkey;
- /*!!!!!!!!! hardcoded passkey !!!!!!!!!!!!! to modify*/
- passkey ="0000";
- dbus_g_method_return(input->context, passkey);
- } else {
- GError *error;
- error = g_error_new(AGENT_ERROR, AGENT_ERROR_REJECT,
- "Pairing request rejected");
- printf("passkey error\n");
- dbus_g_method_return_error(input->context, error);
- }
-
- input_free(input);
- printf("return\n");
- }
-
-
-static void passkey_dialog(const char *path, const char *address,
- const gchar *device, DBusGMethodInvocation *context)
-{
- struct input_data *input;
-
- input = g_try_malloc0(sizeof(*input));
- if (!input)
- return;
-
- input->path = g_strdup(path);
- input->address = g_strdup(address);
-
- input->context = context;
-
- passkey_callback(GTK_RESPONSE_ACCEPT,input);
-
-
-}
-
-static void confirm_dialog(const char *path, const char *address,
- const char *value, const gchar *device,
- DBusGMethodInvocation *context)
-{
- printf("confirm dialog \n");
- struct input_data *input;
-
- input = g_try_malloc0(sizeof(*input));
- if (!input)
- return;
-
- input->path = g_strdup(path);
- input->address = g_strdup(address);
-
- input->context = context;
- //	g_signal_connect(G_OBJECT(dialog), "response",
- //				G_CALLBACK(confirm_callback), input);
-
- //enable_blinking();
-}
-
-static void auth_dialog(const char *path, const char *address,
- const char *service, const char *uuid, const gchar *device,
- const gchar *profile, DBusGMethodInvocation *context)
-{
- struct input_data *input;
-
- input = g_try_malloc0(sizeof(*input));
- if (!input)
- return;
-
- input->path = g_strdup(path);
- input->address = g_strdup(address);
- input->service = g_strdup(service);
- input->uuid = g_strdup(uuid);
-
- input->context = context;
-
-
- /* translators: Whether to grant access to a particular service
- * to the device mentioned */
-
- /* 	g_signal_connect(G_OBJECT(dialog), "response",
- 				G_CALLBACK(auth_callback), input);
-
- enable_blinking();
- */
-}
-
-typedef struct {
- GObject parent;
-} PasskeyAgent;
-
-typedef struct {
- GObjectClass parent;
-} PasskeyAgentClass;
-
-static GObjectClass *passkey_agent_parent;
-
-G_DEFINE_TYPE(PasskeyAgent, passkey_agent, G_TYPE_OBJECT)
-
-#define PASSKEY_AGENT_OBJECT_TYPE (passkey_agent_get_type())
-
-#define PASSKEY_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- PASSKEY_AGENT_OBJECT_TYPE, PasskeyAgent))
-
-static void passkey_agent_finalize(GObject *obj)
-{
- passkey_agent_parent->finalize(obj);
-}
-
-static void passkey_agent_init(PasskeyAgent *obj)
-{
- g_printf("passkeyagent init\n");
-}
-
-static void passkey_agent_class_init(PasskeyAgentClass *klass)
-{
- GObjectClass *gobject_class;
-
- passkey_agent_parent = g_type_class_peek_parent(klass);
-
- gobject_class = G_OBJECT_CLASS(klass);
- gobject_class->finalize = passkey_agent_finalize;
-}
-
-static PasskeyAgent *passkey_agent_new(const char *path)
-{
- PasskeyAgent *agent;
-
- agent = g_object_new(PASSKEY_AGENT_OBJECT_TYPE, NULL);
-
- dbus_g_connection_register_g_object(connection, path, G_OBJECT(agent));
- g_printf("new passkey agent \n");
- return agent;
-}
-static gboolean passkey_agent_request(PasskeyAgent *agent,
- const char *path, const char *address,
- DBusGMethodInvocation *context)
-{
- printf("passkey_agent request\n");
- DBusGProxy *object;
- const char *adapter = NULL, *name = NULL;
- gchar *device, *line;
-
- object = dbus_g_proxy_new_for_name(connection, "org.bluez",
- path, "org.bluez.Adapter");
-
- dbus_g_proxy_call(object, "GetName", NULL, G_TYPE_INVALID,
- G_TYPE_STRING, &adapter, G_TYPE_INVALID);
-
- dbus_g_proxy_call(object, "GetRemoteName", NULL,
- G_TYPE_STRING, address, G_TYPE_INVALID,
- G_TYPE_STRING, &name, G_TYPE_INVALID);
-
- if (name) {
- if (g_strrstr(name, address))
- device = g_strdup(name);
- else
- device = g_strdup_printf("%s (%s)", name, address);
- } else
- device = g_strdup(address);
-
- passkey_dialog(path, address, device, context);
- /* translators: this is a popup telling you a particular device
- * has asked for pairing */
- line = g_strdup_printf(_("Pairing request for '%s'"), device);
- g_free(device);
-
- /*show_notification(adapter ? adapter : _("Bluetooth device"),
- line, _("Enter passkey"), 0,
- G_CALLBACK(notification_closed));
- */
- g_free(line);
-
- return TRUE;
-}
-
-static gboolean passkey_agent_confirm(PasskeyAgent *agent,
- const char *path, const char *address,
- const char *value, DBusGMethodInvocation *context)
-{
- printf("passkey agent confirm \n");
- DBusGProxy *object;
- const char *adapter = NULL, *name = NULL;
- gchar *device, *line;
-
- object = dbus_g_proxy_new_for_name(connection, "org.bluez",
- path, "org.bluez.Adapter");
-
- dbus_g_proxy_call(object, "GetName", NULL, G_TYPE_INVALID,
- G_TYPE_STRING, &adapter, G_TYPE_INVALID);
-
- dbus_g_proxy_call(object, "GetRemoteName", NULL,
- G_TYPE_STRING, address, G_TYPE_INVALID,
- G_TYPE_STRING, &name, G_TYPE_INVALID);
-
- if (name) {
- if (g_strrstr(name, address))
- device = g_strdup(name);
- else
- device = g_strdup_printf("%s (%s)", name, address);
- } else
- device = g_strdup(address);
-
- confirm_dialog(path, address, value, device, context);
-
- line = g_strdup_printf(_("Pairing request for '%s'"), device);
- g_free(device);
-
- /*show_notification(adapter ? adapter : _("Bluetooth device"),
- line, _("Confirm pairing"), 0,
- G_CALLBACK(notification_closed));
- */
- g_free (line);
-
- return TRUE;
-}
-
-static gboolean passkey_agent_cancel(PasskeyAgent *agent,
- const char *path, const char *address, GError **error)
-{
- printf("passkey agent cancel \n");
- GList *list;
- GError *result;
- struct input_data *input;
-
- input = g_try_malloc0(sizeof(*input));
- if (!input)
- return FALSE;
-
- input->path = g_strdup(path);
- input->address = g_strdup(address);
-
- list = g_list_find_custom(input_list, input, input_compare);
-
- g_free(input->address);
- g_free(input->path);
- g_free(input);
-
- if (!list || !list->data)
- return FALSE;
-
- input = list->data;
-
- //close_notification();
-
- result = g_error_new(AGENT_ERROR, AGENT_ERROR_REJECT,
- "Agent callback canceled");
-
- dbus_g_method_return_error(input->context, result);
-
- input_free(input);
-
- return TRUE;
-}
-
-static gboolean passkey_agent_release(PasskeyAgent *agent, GError **error)
-{
- printf("pass agent release \n");
- registered_passkey = 0;
-
- return TRUE;
-}
-
-#include "passkey-agent-glue.h"
-
-typedef struct {
- GObject parent;
-} AuthAgent;
-
-typedef struct {
- GObjectClass parent;
-} AuthAgentClass;
-
-static GObjectClass *auth_agent_parent;
-
-G_DEFINE_TYPE(AuthAgent, auth_agent, G_TYPE_OBJECT)
-
-#define AUTH_AGENT_OBJECT_TYPE (auth_agent_get_type())
-
-#define AUTH_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- AUTH_AGENT_OBJECT_TYPE, AuthAgent))
-
-static void auth_agent_finalize(GObject *obj)
-{
- auth_agent_parent->finalize(obj);
-}
-
-static void auth_agent_init(AuthAgent *obj)
-{
-}
-
-static void auth_agent_class_init(AuthAgentClass *klass)
-{
- GObjectClass *gobject_class;
-
- auth_agent_parent = g_type_class_peek_parent(klass);
-
- gobject_class = G_OBJECT_CLASS(klass);
- gobject_class->finalize = auth_agent_finalize;
-}
-
-static AuthAgent *auth_agent_new(const char *path)
-{
- AuthAgent *agent;
-
- agent = g_object_new(AUTH_AGENT_OBJECT_TYPE, NULL);
-
- dbus_g_connection_register_g_object(connection, path, G_OBJECT(agent));
-
- return agent;
-}
-
-static gboolean auth_agent_authorize(PasskeyAgent *agent,
- const char *path, const char *address, const char *service,
- const char *uuid, DBusGMethodInvocation *context)
-{
- printf("auth agent authorize \n");
- DBusGProxy *object;
- const char *adapter = NULL, *name = NULL;
- gchar *device, *profile, *line;
-
- if (auto_authorize == TRUE) {
- dbus_g_method_return(context);
- return TRUE;
- }
-
- object = dbus_g_proxy_new_for_name(connection, "org.bluez",
- path, "org.bluez.Adapter");
-
- dbus_g_proxy_call(object, "GetName", NULL, G_TYPE_INVALID,
- G_TYPE_STRING, &adapter, G_TYPE_INVALID);
-
- dbus_g_proxy_call(object, "GetRemoteName", NULL,
- G_TYPE_STRING, address, G_TYPE_INVALID,
- G_TYPE_STRING, &name, G_TYPE_INVALID);
-
- object = dbus_g_proxy_new_for_name(connection, "org.bluez",
- service, "org.bluez.Service");
-
- dbus_g_proxy_call(object, "GetName", NULL, G_TYPE_INVALID,
- G_TYPE_STRING, &profile, G_TYPE_INVALID);
-
- if (name) {
- if (g_strrstr(name, address))
- device = g_strdup(name);
- else
- device = g_strdup_printf("%s (%s)", name, address);
- } else
- device = g_strdup(address);
-
- auth_dialog(path, address, service, uuid, device, profile, context);
-
- line = g_strdup_printf(_("Authorization request for %s"), device);
- g_free(device);
-
- /*show_notification(adapter ? adapter : _("Bluetooth device"),
- line, _("Check authorization"), 0,
- G_CALLBACK(notification_closed));
- */
- g_free(line);
-
- return TRUE;
-}
-
-static gboolean auth_agent_cancel(PasskeyAgent *agent,
- const char *path, const char *address, const char *service,
- const char *uuid, DBusGMethodInvocation *context)
-{
- GList *list;
- GError *result;
- struct input_data *input;
-
- input = g_try_malloc0(sizeof(*input));
- if (!input)
- return FALSE;
-
- input->path = g_strdup(path);
- input->address = g_strdup(address);
- input->service = g_strdup(service);
- input->uuid = g_strdup(uuid);
-
- list = g_list_find_custom(input_list, input, input_compare);
-
- g_free(input->uuid);
- g_free(input->service);
- g_free(input->address);
- g_free(input->path);
- g_free(input);
-
- if (!list || !list->data)
- return FALSE;
-
- input = list->data;
-
- //close_notification();
-
- result = g_error_new(AGENT_ERROR, AGENT_ERROR_REJECT,
- "Agent callback canceled");
-
- dbus_g_method_return_error(input->context, result);
-
- input_free(input);
-
- return TRUE;
-}
-
-static gboolean auth_agent_release(PasskeyAgent *agent, GError **error)
-{
- registered_auth = 0;
-
- return TRUE;
-}
-
-#include "auth-agent-glue.h"
-
-int register_agents(void)
-{
- DBusGProxy *object;
- GError *error = NULL;
-
- if (registered_passkey && registered_auth)
- return 0;
-
- object = dbus_g_proxy_new_for_name(connection, "org.bluez",
- "/org/bluez", "org.bluez.Security");
-
- if (!registered_passkey) {
-
- dbus_g_proxy_call(object, "RegisterDefaultPasskeyAgent",
- &error, G_TYPE_STRING, PASSKEY_AGENT_PATH,
- G_TYPE_INVALID, G_TYPE_INVALID);
-
- if (error != NULL) {
- g_error_free(error);
- return -1;
- }
-
- registered_passkey = 1;
- }
-
- if (!registered_auth) {
- dbus_g_proxy_call(object, "RegisterDefaultAuthorizationAgent",
- &error,	G_TYPE_STRING, AUTH_AGENT_PATH,
- G_TYPE_INVALID, G_TYPE_INVALID);
-
- if (error != NULL) {
- g_error_free(error);
- return -1;
- }
-
- registered_auth = 1;
- }
-
- return 0;
-}
-
-void unregister_agents(void)
-{
- registered_passkey = 0;
- registered_auth = 0;
-}
-
-int setup_agents(DBusGConnection *conn)
-{
- printf("setup agents\n");
- void *agent;
-
- connection = dbus_g_connection_ref(conn);
-
- dbus_g_object_type_install_info(PASSKEY_AGENT_OBJECT_TYPE,
- &dbus_glib_passkey_agent_object_info);
-
- dbus_g_object_type_install_info(AUTH_AGENT_OBJECT_TYPE,
- &dbus_glib_auth_agent_object_info);
-
- dbus_g_error_domain_register(AGENT_ERROR, "org.bluez.Error",
- AGENT_ERROR_TYPE);
-
- agent = passkey_agent_new(PASSKEY_AGENT_PATH);
-
- agent = auth_agent_new(AUTH_AGENT_PATH);
-
- return 0;
-}
-
-void cleanup_agents(void)
-{
- printf("clean up agents \n");
- unregister_agents();
-
- dbus_g_connection_unref(connection);
-}
-
-void show_agents(void)
-{
- printf("show_agents\n");
- //close_notification();
-
- //	g_list_foreach(input_list, show_dialog, NULL);
-
- //	disable_blinking();
-}
-
-void set_auto_authorize(gboolean value)
-{
- auto_authorize = value;
-}
-
-static void bonding_created(DBusGProxy *object,
-				const char *address, gpointer user_data)
-{
-
-
-	const char *adapter = NULL, *name = NULL;
-	gchar *device, *text;
-
-	dbus_g_proxy_call(object, "GetName", NULL, G_TYPE_INVALID,
-				G_TYPE_STRING, &adapter, G_TYPE_INVALID);
-
-	dbus_g_proxy_call(object, "GetRemoteName", NULL,
-				G_TYPE_STRING, address, G_TYPE_INVALID,
-				G_TYPE_STRING, &name, G_TYPE_INVALID);
- mcs_handle_t *cfgfile = aud_cfg_db_open();
- aud_cfg_db_set_string(cfgfile,"BLUETOOTH_PLUGIN","bonded", address);
- aud_cfg_db_close(cfgfile);
-
-	if (name) {
-		if (g_strrstr(name, address))
-			device = g_strdup(name);
-		else
-			device = g_strdup_printf("%s (%s)", name, address);
-	} else
-		device = g_strdup(address);
- bonded_dev = g_strdup_printf(address);
-
-
-	text = g_strdup_printf(_("Created bonding with %s"), device);
- bonding_finish = 1;
-	g_free(device);
-
-	g_printf("%s\n",text);
-	g_free(text);
-}
-
-static void bonding_removed(DBusGProxy *object,
-				const char *address, gpointer user_data)
-{
-	const char *adapter = NULL, *name = NULL;
-	gchar *device, *text;
- 	dbus_g_proxy_call(object, "GetName", NULL, G_TYPE_INVALID,
-				G_TYPE_STRING, &adapter, G_TYPE_INVALID);
-
-	dbus_g_proxy_call(object, "GetRemoteName", NULL,
-				G_TYPE_STRING, address, G_TYPE_INVALID,
-				G_TYPE_STRING, &name, G_TYPE_INVALID);
-
-	if (name) {
-		if (g_strrstr(name, address))
-			device = g_strdup(name);
-		else
-			device = g_strdup_printf("%s (%s)", name, address);
-	} else
-		device = g_strdup(address);
-
-	text = g_strdup_printf(_("Removed bonding with %s"), device);
- mcs_handle_t *cfgfile = aud_cfg_db_open();
- aud_cfg_db_set_string(cfgfile,"BLUETOOTH_PLUGIN","bonded","no");
- aud_cfg_db_close(cfgfile);
-
-	g_free(device);
- printf("bonding removed\n");
-
-//	show_notification(adapter ? adapter : _("Bluetooth device"),
-//						text, NULL, 6000, NULL);
-
-	g_free(text);
- bonding_finish =0;
-}
-
-
-static void trust_added(DBusGProxy *object,
-				const char *address, gpointer user_data)
-{
-}
-
-static void trust_removed(DBusGProxy *object,
-				const char *address, gpointer user_data)
-{
-}
-
-static void set_new_mode(struct adapter_data *adapter, const char *mode)
-{
-	g_free(adapter->old_mode);
-
-	adapter->old_mode = g_strdup(mode);
-}
-
-static void mode_changed(DBusGProxy *object,
-				const char *mode, gpointer user_data)
-{
-	struct adapter_data *adapter = (struct adapter_data *) user_data;
-	const char *adapter_name = NULL;
-	const char *text;
-
-		if (g_str_equal(mode, "off") == TRUE) {
-			set_new_mode(adapter, mode);
-			return;
-		}
-		if (g_str_equal(adapter->old_mode, "off")
-				&& g_str_equal(mode, "connectable")) {
-			set_new_mode(adapter, mode);
-			return;
-		}
-	
-
-	if (g_str_equal(mode, "off") != FALSE) {
-		text = N_("Device has been switched off");
-	} else if (g_str_equal(mode, "connectable") != FALSE
-		 && g_str_equal(adapter->old_mode, "discoverable") != FALSE) {
-		text = N_("Device has been made non-discoverable");
-	} else if (g_str_equal(mode, "connectable") != FALSE) {
-		text = N_("Device has been made connectable");
-	} else if (g_str_equal (mode, "discoverable") != FALSE) {
-		text = N_("Device has been made discoverable");
-	} else if (g_str_equal(mode, "limited") != FALSE) {
-		text = N_("Device has been made limited discoverable");
-	} else if (g_str_equal(mode, "pairing") != FALSE) {
-		text = N_("Device has been switched into pairing mode");
-	} else {
-		set_new_mode(adapter, mode);
-		return;
-	}
-
-	dbus_g_proxy_call(object, "GetName", NULL, G_TYPE_INVALID,
-				G_TYPE_STRING, &adapter_name, G_TYPE_INVALID);
-
-	/*show_notification(adapter_name ? adapter_name : _("Bluetooth device"),
-							_(text), NULL, 3000, NULL);
- */
-
-	set_new_mode(adapter, mode);
-}
-/*
-static void adapter_free(gpointer data, gpointer user_data)
-{
-	struct adapter_data *adapter = data;
-
-	adapter_list = g_list_remove(adapter_list, adapter);
-
-	g_free(adapter->path);
-	g_free(adapter->old_mode);
-	g_free(adapter);
-}
-
-static void adapter_disable(gpointer data, gpointer user_data)
-{
-	struct adapter_data *adapter = data;
-
-	adapter->attached = 0;
-}
-*/
-
-static gint adapter_compare(gconstpointer a, gconstpointer b)
-{
-	const struct adapter_data *adapter = a;
-	const char *path = b;
-
-	return g_ascii_strcasecmp(adapter->path, path);
-}
-/*
-static void adapter_count(gpointer data, gpointer user_data)
-{
-	struct adapter_data *adapter = data;
-	int *count = user_data;
-
-	if (adapter->attached)
-		(*count)++;
-}
-
-*/
-
-
-void add_bonding(){
- DBusGProxy *object;
- 
-	object = dbus_g_proxy_new_for_name(bus, "org.bluez",
-						"/org/bluez/passkey", "org.bluez.Adapter");
-
- dbus_g_proxy_add_signal(object, "BondingCreated",
-					G_TYPE_STRING, G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(object, "BondingCreated",
-				G_CALLBACK(bonding_created), NULL, NULL);
-
-	dbus_g_proxy_add_signal(object, "BondingRemoved",
-					G_TYPE_STRING, G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(object, "BondingRemoved",
-				G_CALLBACK(bonding_removed), NULL, NULL);
-}
-static void add_adapter(const char *path)
-{
-	GList *list;
-	DBusGProxy *object;
-	struct adapter_data *adapter;
-	const char *old_mode;
-
-	list = g_list_find_custom(adapter_list, path, adapter_compare);
-	if (list && list->data) {
-		struct adapter_data *adapter = list->data;
-
-		adapter->attached = 1;
-		return;
-	}
-
-	adapter = g_try_malloc0(sizeof(*adapter));
-	if (!adapter)
-		return;
-
-	adapter->path = g_strdup(path);
-	adapter->attached = 1;
-
-	adapter_list = g_list_append(adapter_list, adapter);
-
-
-	object = dbus_g_proxy_new_for_name(bus, "org.bluez",
-						path, "org.bluez.Adapter");
-
-	dbus_g_proxy_add_signal(object, "ModeChanged",
-					G_TYPE_STRING, G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(object, "ModeChanged",
-				G_CALLBACK(mode_changed), adapter, NULL);
-
-	dbus_g_proxy_add_signal(object, "BondingCreated",
-					G_TYPE_STRING, G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(object, "BondingCreated",
-				G_CALLBACK(bonding_created), NULL, NULL);
-
-	dbus_g_proxy_add_signal(object, "BondingRemoved",
-					G_TYPE_STRING, G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(object, "BondingRemoved",
-				G_CALLBACK(bonding_removed), NULL, NULL);
-
-	dbus_g_proxy_add_signal(object, "TrustAdded",
-					G_TYPE_STRING, G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(object, "TrustAdded",
-				G_CALLBACK(trust_added), NULL, NULL);
-
-	dbus_g_proxy_add_signal(object, "TrustRemoved",
-					G_TYPE_STRING, G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(object, "TrustRemoved",
-				G_CALLBACK(trust_removed), NULL, NULL);
-
-	old_mode = NULL;
-	dbus_g_proxy_call(object, "GetMode", NULL,
-			 G_TYPE_INVALID, G_TYPE_STRING,
-			 &old_mode, G_TYPE_INVALID);
-	if (old_mode != NULL)
-		set_new_mode(adapter, old_mode);
- register_agents();
-}
-
-static void adapter_added(DBusGProxy *object,
-				const char *path, gpointer user_data)
-{
-	printf("adapter added\n");
- register_agents();
-
-	add_adapter(path);
-}
-
-static void adapter_removed(DBusGProxy *object,
-				const char *path, gpointer user_data)
-{
-	GList *list;
-
-	list = g_list_find_custom(adapter_list, path, adapter_compare);
-	if (list && list->data) {
-		struct adapter_data *adapter = list->data;
-
-		adapter->attached = 0;
-	}
-
-}
-
-
-static int setup_manager(void)
-{
-	DBusGProxy *object;
-	GError *error = NULL;
-	const gchar **array = NULL;
-
-	object = dbus_g_proxy_new_for_name(bus, "org.bluez",
-					"/org/bluez", "org.bluez.Manager");
-
-	dbus_g_proxy_add_signal(object, "AdapterAdded",
-					G_TYPE_STRING, G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(object, "AdapterAdded",
-				G_CALLBACK(adapter_added), NULL, NULL);
-
-	dbus_g_proxy_add_signal(object, "AdapterRemoved",
-					G_TYPE_STRING, G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(object, "AdapterRemoved",
-				G_CALLBACK(adapter_removed), NULL, NULL);
-
-	dbus_g_proxy_call(object, "ListAdapters", &error,
-			G_TYPE_INVALID,	G_TYPE_STRV, &array, G_TYPE_INVALID);
-
-	if (error == NULL) {
-		while (*array) {
- printf("add adapter\n");
-			add_adapter(*array);
-			array++;
-		}
-	} else
-		g_error_free(error);
-
-	return 0;
-}
-
-
-void run_agents()
-{
- bonding_finish =0;
- setup_agents(bus);
- //to add the bounding signals 
-// register_agents();
- setup_manager();
-
-}
-

audacious-plugins-2.5.3.tar.gz/src/bluetooth/agent.h Deleted

@@ -1,37 +0,0 @@
-/*
- * Audacious Bluetooth headset suport plugin
- *
- * Copyright (c) 2008 Paula Stanciu <paula.stanciu@gmail.com>
- * Copyright (C) 2005-2008 Marcel Holtmann <marcel@holtmann.org>
- * Copyright (C) 2006-2007 Bastien Nocera <hadess@hadess.net>
- *
- *
- * 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 St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <dbus/dbus-glib.h>
-gint bonding_finish;
-void run_agents(void);
-int setup_agents(DBusGConnection *conn);
-void cleanup_agents(void);
-
-int register_agents(void);
-void unregister_agents(void);
-
-void show_agents(void);
-void set_auto_authorize(gboolean value);

audacious-plugins-2.5.3.tar.gz/src/bluetooth/auth-agent-glue.h Deleted

@@ -1,223 +0,0 @@
-/* Generated by dbus-binding-tool; do not edit! */
-
-
-#ifndef __dbus_glib_marshal_auth_agent_MARSHAL_H__
-#define __dbus_glib_marshal_auth_agent_MARSHAL_H__
-
-#include	<glib-object.h>
-
-G_BEGIN_DECLS
-
-#ifdef G_ENABLE_DEBUG
-#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v) g_value_get_char (v)
-#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
-#define g_marshal_value_peek_int(v) g_value_get_int (v)
-#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
-#define g_marshal_value_peek_long(v) g_value_get_long (v)
-#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
-#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
-#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
-#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
-#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
-#define g_marshal_value_peek_float(v) g_value_get_float (v)
-#define g_marshal_value_peek_double(v) g_value_get_double (v)
-#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
-#define g_marshal_value_peek_param(v) g_value_get_param (v)
-#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
-#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
-#define g_marshal_value_peek_object(v) g_value_get_object (v)
-#else /* !G_ENABLE_DEBUG */
-/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
- * Do not access GValues directly in your code. Instead, use the
- * g_value_get_*() functions
- */
-#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
-#define g_marshal_value_peek_char(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_int(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_long(v) (v)->data[0].v_long
-#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
-#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
-#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_float(v) (v)->data[0].v_float
-#define g_marshal_value_peek_double(v) (v)->data[0].v_double
-#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
-#endif /* !G_ENABLE_DEBUG */
-
-
-/* BOOLEAN:STRING,STRING,STRING,STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.9NIBEU:1) */
-extern void dbus_glib_marshal_auth_agent_BOOLEAN__STRING_STRING_STRING_STRING_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-void
-dbus_glib_marshal_auth_agent_BOOLEAN__STRING_STRING_STRING_STRING_POINTER (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_STRING_STRING_POINTER) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer arg_3,
- gpointer arg_4,
- gpointer arg_5,
- gpointer data2);
- register GMarshalFunc_BOOLEAN__STRING_STRING_STRING_STRING_POINTER callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- gboolean v_return;
-
- g_return_if_fail (return_value != NULL);
- g_return_if_fail (n_param_values == 6);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_BOOLEAN__STRING_STRING_STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_marshal_value_peek_string (param_values + 1),
- g_marshal_value_peek_string (param_values + 2),
- g_marshal_value_peek_string (param_values + 3),
- g_marshal_value_peek_string (param_values + 4),
- g_marshal_value_peek_pointer (param_values + 5),
- data2);
-
- g_value_set_boolean (return_value, v_return);
-}
-
-/* NONE:STRING,STRING,STRING,STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.9NIBEU:2) */
-extern void dbus_glib_marshal_auth_agent_VOID__STRING_STRING_STRING_STRING_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-void
-dbus_glib_marshal_auth_agent_VOID__STRING_STRING_STRING_STRING_POINTER (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING_STRING_POINTER) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer arg_3,
- gpointer arg_4,
- gpointer arg_5,
- gpointer data2);
- register GMarshalFunc_VOID__STRING_STRING_STRING_STRING_POINTER callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
-
- g_return_if_fail (n_param_values == 6);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_VOID__STRING_STRING_STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_marshal_value_peek_string (param_values + 1),
- g_marshal_value_peek_string (param_values + 2),
- g_marshal_value_peek_string (param_values + 3),
- g_marshal_value_peek_string (param_values + 4),
- g_marshal_value_peek_pointer (param_values + 5),
- data2);
-}
-#define dbus_glib_marshal_auth_agent_NONE__STRING_STRING_STRING_STRING_POINTER	dbus_glib_marshal_auth_agent_VOID__STRING_STRING_STRING_STRING_POINTER
-
-/* BOOLEAN:POINTER (/tmp/dbus-binding-tool-c-marshallers.9NIBEU:3) */
-extern void dbus_glib_marshal_auth_agent_BOOLEAN__POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-void
-dbus_glib_marshal_auth_agent_BOOLEAN__POINTER (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER) (gpointer data1,
- gpointer arg_1,
- gpointer data2);
- register GMarshalFunc_BOOLEAN__POINTER callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- gboolean v_return;
-
- g_return_if_fail (return_value != NULL);
- g_return_if_fail (n_param_values == 2);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_BOOLEAN__POINTER) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_marshal_value_peek_pointer (param_values + 1),
- data2);
-
- g_value_set_boolean (return_value, v_return);
-}
-
-G_END_DECLS
-
-#endif /* __dbus_glib_marshal_auth_agent_MARSHAL_H__ */
-
-#include <dbus/dbus-glib.h>
-static const DBusGMethodInfo dbus_glib_auth_agent_methods[] = {
- { (GCallback) auth_agent_authorize, dbus_glib_marshal_auth_agent_NONE__STRING_STRING_STRING_STRING_POINTER, 0 },
- { (GCallback) auth_agent_cancel, dbus_glib_marshal_auth_agent_BOOLEAN__STRING_STRING_STRING_STRING_POINTER, 87 },
- { (GCallback) auth_agent_release, dbus_glib_marshal_auth_agent_BOOLEAN__POINTER, 171 },
-};
-
-const DBusGObjectInfo dbus_glib_auth_agent_object_info = {
- 0,
- dbus_glib_auth_agent_methods,
- 3,
-"org.bluez.AuthorizationAgent\0Authorize\0A\0adapter\0I\0s\0address\0I\0s\0service\0I\0s\0uuid\0I\0s\0\0org.bluez.AuthorizationAgent\0Cancel\0S\0adapter\0I\0s\0address\0I\0s\0service\0I\0s\0uuid\0I\0s\0\0org.bluez.AuthorizationAgent\0Release\0S\0\0\0",
-"\0",
-"\0"
-};
-

audacious-plugins-2.5.3.tar.gz/src/bluetooth/bluetooth.c Deleted

@@ -1,404 +0,0 @@
-/*
- * Audacious Bluetooth headset suport plugin
- *
- * Copyright (c) 2008 Paula Stanciu paula.stanciu@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 <glib/gstdio.h>
-#include <errno.h>
-#include <string.h>
-#include "bluetooth.h"
-#include "marshal.h"
-#include "gui.h"
-#include "scan_gui.h"
-#include "agent.h"
-#include <audacious/plugin.h>
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
-#define DEBUG 1
-GList * current_device = NULL;
-gint config = 0;
-gint devices_no = 0;
-gboolean pcmdev_modified = FALSE;
-GStaticMutex mutex = G_STATIC_MUTEX_INIT;
-static gchar *current_address=NULL;
-static GThread *connect_th;
-void bluetooth_init ( void );
-void bluetooth_cleanup ( void );
-void bt_cfg(void);
-void bt_about(void);
-static void remote_device_found(DBusGProxy *object, char *address, const unsigned int class, const int rssi, gpointer user_data);
-static void discovery_started(DBusGProxy *object, gpointer user_data);
-static void remote_name_updated(DBusGProxy *object, const char *address, char *name, gpointer user_data);
-static void print_results(void);
-static void discovery_completed(DBusGProxy *object, gpointer user_data);
-void discover_devices(void);
-void disconnect_dbus_signals(void);
-/*static void show_restart_dialog(void); */
-static void remove_bonding(gchar* device);
-GeneralPlugin bluetooth_gp =
-{
- .description = "Bluetooth audio support",
- .init = bluetooth_init,
- .about = bt_about,
- .configure = bt_cfg,
- .cleanup = bluetooth_cleanup
-};
-GeneralPlugin *bluetooth_gplist[] = { &bluetooth_gp, NULL };
-DECLARE_PLUGIN(bluetooth_gp, NULL, NULL, NULL, NULL, NULL, bluetooth_gplist, NULL, NULL)
-
-void bluetooth_init ( void )
-{
- bonded_dev = NULL;
- discover_finish = 0;
- pcmdev_modified = FALSE;
- audio_devices = NULL;
- bus = NULL;
- obj = NULL;
- gchar* bonded_addr = NULL;
- discover_devices();
- mcs_handle_t *cfgfile ;
- cfgfile = aud_cfg_db_open();
- if(!aud_cfg_db_get_string(cfgfile, "BLUETOOTH_PLUGIN", "bonded",
- &bonded_addr)) {
- aud_cfg_db_close(cfgfile);
- return;
- }
- if(bonded_addr!=NULL && g_strcmp0(bonded_addr,"no")!=0)
- {
- remove_bonding(bonded_addr);
- }
- free(bonded_addr);
- aud_cfg_db_close(cfgfile);
-
-}
-
-void bluetooth_cleanup ( void )
-{
- if (config ==1 )
- {
- close_window();
- config =0;
- }
- if (bonded_dev) {
- printf("bluetooth: exit\n");
- remove_bonding(bonded_dev);
- }
- if(discover_finish == 2) {
- dbus_g_connection_flush (bus);
- dbus_g_connection_unref(bus);
- disconnect_dbus_signals();
-
- }
- if (pcmdev_modified) {
- /* switching back to default pcm device at cleanup */
- mcs_handle_t *cfgfile = aud_cfg_db_open();
- aud_cfg_db_set_string(cfgfile,"alsa","pcm", "default");
- aud_cfg_db_close(cfgfile);
- }
-}
-
-void bt_about( void )
-{
- 	static GtkWidget *dialog = NULL;
-
-	audgui_simple_message(&dialog, GTK_MESSAGE_INFO, _("Bluetooth headset support plugin"),
-				_("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"
- ));
-}
-
-void bt_cfg(void)
-{ 
- printf("bt_cfg\n");
- config =1;
- if(discover_finish == 2){
- if (devices_no == 0){
- printf("no devs!\n");
- show_scan(0);
- show_no_devices();
- }else 
- results_ui();
- }
- else show_scan(0); 
- printf("end of bt_cfg\n");
-}
-
-void disconnect_dbus_signals()
-{
- dbus_g_proxy_disconnect_signal(obj, "RemoteDeviceFound", G_CALLBACK(remote_device_found), bus);
- dbus_g_proxy_disconnect_signal(obj, "DiscoveryStarted", G_CALLBACK(discovery_started), bus);
- dbus_g_proxy_disconnect_signal(obj, "DiscoveryCompleted", G_CALLBACK(discovery_completed), bus);
- dbus_g_proxy_disconnect_signal(obj, "RemoteNameUpdated", G_CALLBACK(remote_name_updated), NULL);
-
-}
-
-void clean_devices_list()
-{
- g_list_free(audio_devices);
- dbus_g_connection_flush (bus);
- dbus_g_connection_unref(bus);
- audio_devices = NULL;
- //g_list_free(current_device);
-}
-static void remove_bonding(gchar *device)
-{
- printf("remove_bonding call\n");
- dbus_g_object_register_marshaller(marshal_VOID__STRING_UINT_INT, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INT, G_TYPE_INVALID);
- dbus_g_proxy_call(obj,"RemoveBonding",NULL,G_TYPE_STRING,device,G_TYPE_INVALID,G_TYPE_INVALID); 
-
-}
-void refresh_call(void)
-{
- printf("refresh function called\n");
- disconnect_dbus_signals();
- clean_devices_list();
- if(discover_finish == 0 ||discover_finish== 2){
- discover_finish = 0;
-
- discover_devices();
- close_window();
- show_scan(0);
- }
- else 
- printf("Scanning please wait!\n");
-}
-
-gpointer connect_call_th(void)
-{
- //I will have to enable the audio service if necessary 
- run_agents();
- dbus_g_object_register_marshaller(marshal_VOID__STRING_UINT_INT, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INT, G_TYPE_INVALID);
- dbus_g_proxy_call(obj,"CreateBonding",NULL,G_TYPE_STRING,current_address,G_TYPE_INVALID,G_TYPE_INVALID); 
-
-return NULL;
-}
-
-void connect_call(void)
-{ 
- close_call();
- close_window();
- show_scan(1);
- current_address = g_strdup(((DeviceData*)(selected_dev->data))->address);
- connect_th = g_thread_create((GThreadFunc)connect_call_th,NULL,TRUE,NULL) ; 
-}
-
-
-void play_call()
-{
-
- FILE *file;
- FILE *temp_file;
- gint prev=0;
- char line[128];
- const gchar *home;
- gchar *device_line;
- gchar *file_name="";
- gchar *temp_file_name;
- home = g_get_home_dir();
- file_name = g_strconcat(home,"/.asoundrc",NULL);
- temp_file_name = g_strconcat(home,"/temp_bt",NULL);
- file = fopen(file_name,"r");
- temp_file = fopen(temp_file_name,"w");
- device_line = g_strdup_printf("device %s\n",current_address);
- if ( file != NULL )
- {
- while ( fgets ( line, sizeof line, file ) != NULL )
- {
- if(!(strcmp(line,"pcm.audacious_bt{\n"))){
- fputs(line,temp_file);
- fgets ( line, sizeof line, file ); /* type bluetooth */
- fputs(line,temp_file);
- fgets ( line, sizeof line, file ); /* device MAC */
- fputs(device_line,temp_file);
- prev = 1;
- } else 
- fputs(line,temp_file);
- }
-
- fclose (file);
- }
- if(!prev){
- fputs("pcm.audacious_bt{\n",temp_file);
- fputs("type bluetooth\n",temp_file);
- fputs(device_line,temp_file);
- fputs("}\n",temp_file);
- prev = 0;
- }
-
- fclose(temp_file);
- int err = rename(temp_file_name,file_name);
- printf("rename error : %d",err);
- perror("zz");
- g_free(device_line);
- g_free(file_name);
- g_free(temp_file_name);
- pcmdev_modified = TRUE;
- mcs_handle_t *cfgfile = aud_cfg_db_open();
- aud_cfg_db_set_string(cfgfile,"alsa","pcm", "audacious_bt");
- aud_cfg_db_close(cfgfile);
-
- printf("play callback\n");
- close_window();
- aud_output_plugin_cleanup();
-// aud_drct_stop();
- aud_drct_play();
-
-
-}
-/*static void show_restart_dialog()
-{
- static GtkWidget *window = NULL;
- GtkWidget *dialog;
- dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_OK,
- "Please restart the player to apply the bluetooth audio settings!");
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-}
-*/
-static void remote_device_found(DBusGProxy *object, char *address, const unsigned int class, const int rssi, gpointer user_data)
-{
- int found_in_list=FALSE; 
- g_static_mutex_lock(&mutex);
- current_device = audio_devices;
- if((class & 0x200404)==0x200404)
- {
- while(current_device != NULL)
- {
- if(g_str_equal(address,((DeviceData*)(current_device->data))->address)) 
- {
- found_in_list = TRUE;
- break;
- }
- current_device=g_list_next(current_device);
- }
- if(!found_in_list) 
- { 
- DeviceData *dev= g_new0(DeviceData, 1);
- dev->class = class;
- dev->address = g_strdup(address);
- dev->name = NULL;
- audio_devices=g_list_prepend(audio_devices, dev);
- }
- }
- g_static_mutex_unlock(&mutex);
-}
-
-static void discovery_started(DBusGProxy *object, gpointer user_data)
-{
- g_print("Signal: DiscoveryStarted()\n");
- discover_finish = 1;
-}
-
-static void remote_name_updated(DBusGProxy *object, const char *address, char *name, gpointer user_data)
-{
- g_static_mutex_lock(&mutex);
- current_device=audio_devices;
- while(current_device != NULL)
- {
- if(g_str_equal(address,((DeviceData*)(current_device->data))->address)) 
- {
- ((DeviceData*)(current_device->data))->name=g_strdup(name);
- break;
- }
- current_device=g_list_next(current_device);
- }
- g_static_mutex_unlock(&mutex);
-}
-
-static void print_results()
-{
- int i=0;
- g_print("Final Scan results:\n");
- devices_no = g_list_length(audio_devices);
- g_print("Number of audio devices: %d \n",devices_no);
- if(devices_no==0 ) {
- if(config ==1) show_no_devices(); 
- } else {
- current_device=audio_devices;
- while(current_device != NULL)
- {
- g_print("Device %d: Name: %s, Class: 0x%x, Address: %s\n",++i,
- ((DeviceData*)(current_device->data))-> name,
- ((DeviceData*)(current_device->data))-> class,
- ((DeviceData*)(current_device->data))-> address);
- current_device=g_list_next(current_device);
- }
- destroy_scan_window();
- if(config==1) {
- destroy_scan_window();
- results_ui();
- }
- // refresh_tree();
- }
-}
-
-
-
-static void discovery_completed(DBusGProxy *object, gpointer user_data)
-{
- g_print("Signal: DiscoveryCompleted()\n");
- discover_finish =2;
- print_results();
-}
-
-
-
-void discover_devices(void)
-{
- GError *error = NULL;
- // g_type_init();
- /* g_log_set_always_fatal (G_LOG_LEVEL_WARNING); */ /* too invasive */
- bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
- if (error != NULL)
- {
- g_printerr("Connecting to system bus failed: %s\n", error->message);
- g_error_free(error);
- return;
- }
- obj = dbus_g_proxy_new_for_name(bus, "org.bluez", "/org/bluez/hci0", "org.bluez.Adapter");
- printf("bluetooth plugin - start discovery \n");
- dbus_g_object_register_marshaller(marshal_VOID__STRING_UINT_INT, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INT, G_TYPE_INVALID);
-
- dbus_g_proxy_add_signal(obj, "RemoteDeviceFound", G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INT, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal(obj, "RemoteDeviceFound", G_CALLBACK(remote_device_found), bus, NULL);
-
- dbus_g_proxy_add_signal(obj, "DiscoveryStarted", G_TYPE_INVALID);
- dbus_g_proxy_connect_signal(obj, "DiscoveryStarted", G_CALLBACK(discovery_started), bus, NULL);
-
- dbus_g_proxy_add_signal(obj, "DiscoveryCompleted", G_TYPE_INVALID);
- dbus_g_proxy_connect_signal(obj, "DiscoveryCompleted", G_CALLBACK(discovery_completed), bus, NULL);
-
- dbus_g_object_register_marshaller(marshal_VOID__STRING_STRING, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-
- dbus_g_proxy_add_signal(obj, "RemoteNameUpdated", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal(obj, "RemoteNameUpdated", G_CALLBACK(remote_name_updated), NULL, NULL);
-
- dbus_g_proxy_call(obj, "DiscoverDevices", &error, G_TYPE_INVALID, G_TYPE_INVALID);
- if (error != NULL)
- {
- g_printerr("Failed to discover devices: %s\n", error->message);
- g_error_free(error);
- }
-
-}

audacious-plugins-2.5.3.tar.gz/src/bluetooth/bluetooth.h Deleted

@@ -1,52 +0,0 @@
-/*
- * Audacious Bluetooth headset suport plugin
- *
- * Copyright (c) 2008 Paula Stanciu paula.stanciu@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 <config.h>
-#include <glib.h>
-#include <sys/types.h>
-#include <audacious/plugin.h>
-#include <audacious/ui_plugin_menu.h>
-#include <audacious/i18n.h>
-#include <gtk/gtk.h>
-#include <audacious/util.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <glib-object.h>
-#include <stdio.h>
-#include <audacious/configdb.h>
-#include <audacious/i18n.h>
-#include <audacious/util.h>
-#include "gui.h"
-typedef struct {
- guint class;
- gchar* address;
- gchar* name;
-}DeviceData;
-
-
-
-void refresh_call(void);
-void connect_call(void);
-void play_call(void);
-GList * audio_devices;
-gint discover_finish ;
-DBusGConnection * bus;
-DBusGProxy * obj;
-gchar *bonded_dev;
-GMutex *bonded_dev_mutex;
-

audacious-plugins-2.5.3.tar.gz/src/bluetooth/dbus-glue.h Deleted

@@ -1,813 +0,0 @@
-/* Generated by dbus-binding-tool; do not edit! */
-
-#include <glib/gtypes.h>
-#include <glib/gerror.h>
-#include <dbus/dbus-glib.h>
-
-G_BEGIN_DECLS
-
-#ifndef DBUS_GLIB_CLIENT_WRAPPERS_manager
-#define DBUS_GLIB_CLIENT_WRAPPERS_manager
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-manager_default_adapter (DBusGProxy *proxy, char ** OUT_arg0, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "DefaultAdapter", error, G_TYPE_INVALID, G_TYPE_STRING, OUT_arg0, G_TYPE_INVALID);
-}
-
-typedef void (*manager_default_adapter_reply) (DBusGProxy *proxy, char * OUT_arg0, GError *error, gpointer userdata);
-
-static void
-manager_default_adapter_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- char * OUT_arg0;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING, &OUT_arg0, G_TYPE_INVALID);
- (*(manager_default_adapter_reply)data->cb) (proxy, OUT_arg0, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-manager_default_adapter_async (DBusGProxy *proxy, manager_default_adapter_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "DefaultAdapter", manager_default_adapter_async_callback, stuff, g_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-manager_find_adapter (DBusGProxy *proxy, const char * IN_pattern, char ** OUT_arg1, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "FindAdapter", error, G_TYPE_STRING, IN_pattern, G_TYPE_INVALID, G_TYPE_STRING, OUT_arg1, G_TYPE_INVALID);
-}
-
-typedef void (*manager_find_adapter_reply) (DBusGProxy *proxy, char * OUT_arg1, GError *error, gpointer userdata);
-
-static void
-manager_find_adapter_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- char * OUT_arg1;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING, &OUT_arg1, G_TYPE_INVALID);
- (*(manager_find_adapter_reply)data->cb) (proxy, OUT_arg1, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-manager_find_adapter_async (DBusGProxy *proxy, const char * IN_pattern, manager_find_adapter_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "FindAdapter", manager_find_adapter_async_callback, stuff, g_free, G_TYPE_STRING, IN_pattern, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-manager_list_adapters (DBusGProxy *proxy, char *** OUT_arg0, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "ListAdapters", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_arg0, G_TYPE_INVALID);
-}
-
-typedef void (*manager_list_adapters_reply) (DBusGProxy *proxy, char * *OUT_arg0, GError *error, gpointer userdata);
-
-static void
-manager_list_adapters_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- char ** OUT_arg0;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_arg0, G_TYPE_INVALID);
- (*(manager_list_adapters_reply)data->cb) (proxy, OUT_arg0, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-manager_list_adapters_async (DBusGProxy *proxy, manager_list_adapters_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "ListAdapters", manager_list_adapters_async_callback, stuff, g_free, G_TYPE_INVALID);
-}
-#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_manager */
-
-#ifndef DBUS_GLIB_CLIENT_WRAPPERS_security
-#define DBUS_GLIB_CLIENT_WRAPPERS_security
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-security_register_default_passkey_agent (DBusGProxy *proxy, const char * IN_path, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "RegisterDefaultPasskeyAgent", error, G_TYPE_STRING, IN_path, G_TYPE_INVALID, G_TYPE_INVALID);
-}
-
-typedef void (*security_register_default_passkey_agent_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-
-static void
-security_register_default_passkey_agent_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(security_register_default_passkey_agent_reply)data->cb) (proxy, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-security_register_default_passkey_agent_async (DBusGProxy *proxy, const char * IN_path, security_register_default_passkey_agent_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "RegisterDefaultPasskeyAgent", security_register_default_passkey_agent_async_callback, stuff, g_free, G_TYPE_STRING, IN_path, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-security_unregister_default_passkey_agent (DBusGProxy *proxy, const char * IN_path, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "UnregisterDefaultPasskeyAgent", error, G_TYPE_STRING, IN_path, G_TYPE_INVALID, G_TYPE_INVALID);
-}
-
-typedef void (*security_unregister_default_passkey_agent_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-
-static void
-security_unregister_default_passkey_agent_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(security_unregister_default_passkey_agent_reply)data->cb) (proxy, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-security_unregister_default_passkey_agent_async (DBusGProxy *proxy, const char * IN_path, security_unregister_default_passkey_agent_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "UnregisterDefaultPasskeyAgent", security_unregister_default_passkey_agent_async_callback, stuff, g_free, G_TYPE_STRING, IN_path, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-security_register_passkey_agent (DBusGProxy *proxy, const char * IN_path, const char * IN_address, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "RegisterPasskeyAgent", error, G_TYPE_STRING, IN_path, G_TYPE_STRING, IN_address, G_TYPE_INVALID, G_TYPE_INVALID);
-}
-
-typedef void (*security_register_passkey_agent_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-
-static void
-security_register_passkey_agent_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(security_register_passkey_agent_reply)data->cb) (proxy, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-security_register_passkey_agent_async (DBusGProxy *proxy, const char * IN_path, const char * IN_address, security_register_passkey_agent_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "RegisterPasskeyAgent", security_register_passkey_agent_async_callback, stuff, g_free, G_TYPE_STRING, IN_path, G_TYPE_STRING, IN_address, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-security_unregister_passkey_agent (DBusGProxy *proxy, const char * IN_path, const char * IN_address, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "UnregisterPasskeyAgent", error, G_TYPE_STRING, IN_path, G_TYPE_STRING, IN_address, G_TYPE_INVALID, G_TYPE_INVALID);
-}
-
-typedef void (*security_unregister_passkey_agent_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-
-static void
-security_unregister_passkey_agent_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(security_unregister_passkey_agent_reply)data->cb) (proxy, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-security_unregister_passkey_agent_async (DBusGProxy *proxy, const char * IN_path, const char * IN_address, security_unregister_passkey_agent_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "UnregisterPasskeyAgent", security_unregister_passkey_agent_async_callback, stuff, g_free, G_TYPE_STRING, IN_path, G_TYPE_STRING, IN_address, G_TYPE_INVALID);
-}
-#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_security */
-
-#ifndef DBUS_GLIB_CLIENT_WRAPPERS_adapter
-#define DBUS_GLIB_CLIENT_WRAPPERS_adapter
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_get_address (DBusGProxy *proxy, char ** OUT_arg0, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "GetAddress", error, G_TYPE_INVALID, G_TYPE_STRING, OUT_arg0, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_get_address_reply) (DBusGProxy *proxy, char * OUT_arg0, GError *error, gpointer userdata);
-
-static void
-adapter_get_address_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- char * OUT_arg0;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING, &OUT_arg0, G_TYPE_INVALID);
- (*(adapter_get_address_reply)data->cb) (proxy, OUT_arg0, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_get_address_async (DBusGProxy *proxy, adapter_get_address_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "GetAddress", adapter_get_address_async_callback, stuff, g_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_get_mode (DBusGProxy *proxy, char ** OUT_arg0, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "GetMode", error, G_TYPE_INVALID, G_TYPE_STRING, OUT_arg0, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_get_mode_reply) (DBusGProxy *proxy, char * OUT_arg0, GError *error, gpointer userdata);
-
-static void
-adapter_get_mode_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- char * OUT_arg0;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING, &OUT_arg0, G_TYPE_INVALID);
- (*(adapter_get_mode_reply)data->cb) (proxy, OUT_arg0, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_get_mode_async (DBusGProxy *proxy, adapter_get_mode_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "GetMode", adapter_get_mode_async_callback, stuff, g_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_get_name (DBusGProxy *proxy, char ** OUT_arg0, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "GetName", error, G_TYPE_INVALID, G_TYPE_STRING, OUT_arg0, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_get_name_reply) (DBusGProxy *proxy, char * OUT_arg0, GError *error, gpointer userdata);
-
-static void
-adapter_get_name_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- char * OUT_arg0;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING, &OUT_arg0, G_TYPE_INVALID);
- (*(adapter_get_name_reply)data->cb) (proxy, OUT_arg0, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_get_name_async (DBusGProxy *proxy, adapter_get_name_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "GetName", adapter_get_name_async_callback, stuff, g_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_get_major_class (DBusGProxy *proxy, char ** OUT_arg0, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "GetMajorClass", error, G_TYPE_INVALID, G_TYPE_STRING, OUT_arg0, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_get_major_class_reply) (DBusGProxy *proxy, char * OUT_arg0, GError *error, gpointer userdata);
-
-static void
-adapter_get_major_class_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- char * OUT_arg0;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING, &OUT_arg0, G_TYPE_INVALID);
- (*(adapter_get_major_class_reply)data->cb) (proxy, OUT_arg0, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_get_major_class_async (DBusGProxy *proxy, adapter_get_major_class_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "GetMajorClass", adapter_get_major_class_async_callback, stuff, g_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_get_minor_class (DBusGProxy *proxy, char ** OUT_arg0, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "GetMinorClass", error, G_TYPE_INVALID, G_TYPE_STRING, OUT_arg0, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_get_minor_class_reply) (DBusGProxy *proxy, char * OUT_arg0, GError *error, gpointer userdata);
-
-static void
-adapter_get_minor_class_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- char * OUT_arg0;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING, &OUT_arg0, G_TYPE_INVALID);
- (*(adapter_get_minor_class_reply)data->cb) (proxy, OUT_arg0, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_get_minor_class_async (DBusGProxy *proxy, adapter_get_minor_class_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "GetMinorClass", adapter_get_minor_class_async_callback, stuff, g_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_list_remote_devices (DBusGProxy *proxy, char *** OUT_arg0, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "ListRemoteDevices", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_arg0, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_list_remote_devices_reply) (DBusGProxy *proxy, char * *OUT_arg0, GError *error, gpointer userdata);
-
-static void
-adapter_list_remote_devices_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- char ** OUT_arg0;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_arg0, G_TYPE_INVALID);
- (*(adapter_list_remote_devices_reply)data->cb) (proxy, OUT_arg0, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_list_remote_devices_async (DBusGProxy *proxy, adapter_list_remote_devices_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "ListRemoteDevices", adapter_list_remote_devices_async_callback, stuff, g_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_list_connections (DBusGProxy *proxy, char *** OUT_arg0, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "ListConnections", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_arg0, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_list_connections_reply) (DBusGProxy *proxy, char * *OUT_arg0, GError *error, gpointer userdata);
-
-static void
-adapter_list_connections_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- char ** OUT_arg0;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_arg0, G_TYPE_INVALID);
- (*(adapter_list_connections_reply)data->cb) (proxy, OUT_arg0, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_list_connections_async (DBusGProxy *proxy, adapter_list_connections_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "ListConnections", adapter_list_connections_async_callback, stuff, g_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_list_bondings (DBusGProxy *proxy, char *** OUT_arg0, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "ListBondings", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_arg0, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_list_bondings_reply) (DBusGProxy *proxy, char * *OUT_arg0, GError *error, gpointer userdata);
-
-static void
-adapter_list_bondings_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- char ** OUT_arg0;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_arg0, G_TYPE_INVALID);
- (*(adapter_list_bondings_reply)data->cb) (proxy, OUT_arg0, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_list_bondings_async (DBusGProxy *proxy, adapter_list_bondings_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "ListBondings", adapter_list_bondings_async_callback, stuff, g_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_list_trusts (DBusGProxy *proxy, char *** OUT_arg0, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "ListTrusts", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_arg0, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_list_trusts_reply) (DBusGProxy *proxy, char * *OUT_arg0, GError *error, gpointer userdata);
-
-static void
-adapter_list_trusts_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- char ** OUT_arg0;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_arg0, G_TYPE_INVALID);
- (*(adapter_list_trusts_reply)data->cb) (proxy, OUT_arg0, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_list_trusts_async (DBusGProxy *proxy, adapter_list_trusts_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "ListTrusts", adapter_list_trusts_async_callback, stuff, g_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_disconnect_remote_device (DBusGProxy *proxy, const char * IN_address, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "DisconnectRemoteDevice", error, G_TYPE_STRING, IN_address, G_TYPE_INVALID, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_disconnect_remote_device_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-
-static void
-adapter_disconnect_remote_device_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(adapter_disconnect_remote_device_reply)data->cb) (proxy, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_disconnect_remote_device_async (DBusGProxy *proxy, const char * IN_address, adapter_disconnect_remote_device_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "DisconnectRemoteDevice", adapter_disconnect_remote_device_async_callback, stuff, g_free, G_TYPE_STRING, IN_address, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_create_bonding (DBusGProxy *proxy, const char * IN_address, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "CreateBonding", error, G_TYPE_STRING, IN_address, G_TYPE_INVALID, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_create_bonding_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-
-static void
-adapter_create_bonding_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(adapter_create_bonding_reply)data->cb) (proxy, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_create_bonding_async (DBusGProxy *proxy, const char * IN_address, adapter_create_bonding_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "CreateBonding", adapter_create_bonding_async_callback, stuff, g_free, G_TYPE_STRING, IN_address, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_remove_bonding (DBusGProxy *proxy, const char * IN_address, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "RemoveBonding", error, G_TYPE_STRING, IN_address, G_TYPE_INVALID, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_remove_bonding_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-
-static void
-adapter_remove_bonding_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(adapter_remove_bonding_reply)data->cb) (proxy, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_remove_bonding_async (DBusGProxy *proxy, const char * IN_address, adapter_remove_bonding_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "RemoveBonding", adapter_remove_bonding_async_callback, stuff, g_free, G_TYPE_STRING, IN_address, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_set_trusted (DBusGProxy *proxy, const char * IN_address, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "SetTrusted", error, G_TYPE_STRING, IN_address, G_TYPE_INVALID, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_set_trusted_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-
-static void
-adapter_set_trusted_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(adapter_set_trusted_reply)data->cb) (proxy, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_set_trusted_async (DBusGProxy *proxy, const char * IN_address, adapter_set_trusted_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "SetTrusted", adapter_set_trusted_async_callback, stuff, g_free, G_TYPE_STRING, IN_address, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-adapter_remove_trust (DBusGProxy *proxy, const char * IN_address, GError **error)
-
-{
- return dbus_g_proxy_call (proxy, "RemoveTrust", error, G_TYPE_STRING, IN_address, G_TYPE_INVALID, G_TYPE_INVALID);
-}
-
-typedef void (*adapter_remove_trust_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-
-static void
-adapter_remove_trust_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
- DBusGAsyncData *data = (DBusGAsyncData*) user_data;
- GError *error = NULL;
- dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
- (*(adapter_remove_trust_reply)data->cb) (proxy, error, data->userdata);
- return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-adapter_remove_trust_async (DBusGProxy *proxy, const char * IN_address, adapter_remove_trust_reply callback, gpointer userdata)
-
-{
- DBusGAsyncData *stuff;
- stuff = g_new (DBusGAsyncData, 1);
- stuff->cb = G_CALLBACK (callback);
- stuff->userdata = userdata;
- return dbus_g_proxy_begin_call (proxy, "RemoveTrust", adapter_remove_trust_async_callback, stuff, g_free, G_TYPE_STRING, IN_address, G_TYPE_INVALID);
-}
-#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_adapter */
-
-G_END_DECLS

audacious-plugins-2.5.3.tar.gz/src/bluetooth/gui.c Deleted

@@ -1,314 +0,0 @@
-/*
- * Audacious Bluetooth headset suport plugin
- *
- * Copyright (c) 2008 Paula Stanciu paula.stanciu@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 "gui.h"
-#include "bluetooth.h"
-
-static GtkWidget *window = NULL;
-static GtkTreeModel *model;
-static GtkWidget *mainbox;
-static GtkWidget *hbox_top;
-static GtkWidget *hbox_bottom;
-static GtkWidget *box_about;
-static GtkWidget *box_about_left;
-static GtkWidget *box_about_right;
-static GtkWidget *headset_frame;
-static GtkWidget *about_frame;
-static GtkWidget *refresh;
-static GtkWidget *connect_button;
-static GtkWidget *close_button; 
-static GtkWidget *treeview;
-static GtkWidget *label_p;
-static GtkWidget *label_c;
-static GtkWidget *label_a;
-static GtkWidget *label_prod;
-static GtkWidget *label_class;
-static GtkWidget *label_address;
-static GList * dev = NULL;
-gchar *status = NULL;
-enum{
- COLUMN_PRODUCER,
- NUM_COLUMNS
-};
-
-static GtkTreeModel * create_model(void)
-{
- GtkListStore *store;
- GtkTreeIter iter;
- /* create list store */
- store = gtk_list_store_new(NUM_COLUMNS,
- G_TYPE_STRING);
- dev = audio_devices;
- if(dev == NULL) {
- /*if we are scanning for devices now then print the Scanning message,
- * else we print the "no devices found message */
- if(discover_finish == 1) 
- /*we are scanning*/
- status = g_strdup_printf("Scanning"); 
- else 
- status = g_strdup_printf("No devices found!");
- /* add the status to the list */
- gtk_list_store_append(store,&iter);
- gtk_list_store_set(store,&iter, COLUMN_PRODUCER,status,-1);
- return GTK_TREE_MODEL(store); 
- } 
- while(dev != NULL)
- {
- gtk_list_store_append(store,&iter);
- gtk_list_store_set(store,&iter, COLUMN_PRODUCER, 
- ((DeviceData*)(dev->data))-> name,-1);
- dev = g_list_next(dev);
- }
-
- return GTK_TREE_MODEL(store); 
-}
-static GtkTreeModel * rebuild_model(void)
-{
-
- GtkListStore *store;
- GtkTreeIter iter;
- gint dev_no=0;
- GList *dev;
- if(!window) 
- return NULL;
- /* create list store */
- store = gtk_list_store_new(NUM_COLUMNS,
- G_TYPE_STRING);
-
- /*add inf to test_data from audio_devices */
- dev_no = g_list_length(audio_devices);
- dev = audio_devices;
- if(dev == NULL || discover_finish == 0) {
- /*if we are scanning for devices now then print the Scanning message,
- * else we print the "no devices found message */
- printf("discover: %d\n",discover_finish);
- if(discover_finish == 1) {
- /*we are scanning*/
- status = g_strdup_printf("Scanning"); 
- } else 
- status = g_strdup_printf("No devices found!");
- /* add the status to the list */
- gtk_list_store_append(store,&iter);
- gtk_list_store_set(store,&iter, COLUMN_PRODUCER,status,-1);
- gtk_label_set_text(GTK_LABEL(label_prod),status);
- return GTK_TREE_MODEL(store); 
- } 
-
- /* add data to the list store */
- while(dev != NULL)
- {
- gtk_list_store_append(store,&iter);
- gtk_list_store_set(store,&iter, COLUMN_PRODUCER, 
- ((DeviceData*)(dev->data))-> name,-1);
- dev = g_list_next(dev);
- }
- /*set the labels */
- /* temp = g_strdup_printf("0x%x",((DeviceData*)(dev->data))->class); */
- gtk_label_set_text(GTK_LABEL(label_prod),((DeviceData*)(dev->data))->name);
- /* gtk_label_set_text(GTK_LABEL(label_class),temp); */
- gtk_label_set_text(GTK_LABEL(label_address),((DeviceData*)(dev->data))->address);
- /* g_free(temp); */
- return GTK_TREE_MODEL(store); 
-
-}
-
-
-void refresh_tree()
-{
- if(!window) 
- return;
- model = rebuild_model();
- gtk_tree_view_set_model(GTK_TREE_VIEW(treeview),GTK_TREE_MODEL(model));
-}
-
-
-static void add_columns(GtkTreeView *treeview)
-{
- GtkCellRenderer *renderer;
- GtkTreeViewColumn *column;
- // GtkTreeModel *model = gtk_tree_view_get_model (treeview);
-
- /* column for producer */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Producer"),
- renderer,
- "text",
- COLUMN_PRODUCER,
- NULL);
- gtk_tree_view_column_set_sort_column_id (column,COLUMN_PRODUCER);
- gtk_tree_view_append_column (treeview, column);
-
-}
-
-void close_call(void){
- printf("close callback \n");
- gtk_widget_destroy (window);
- window = NULL;
-}
-void select_row(GtkWidget *treeview){
-
- GtkTreeIter iter;
- gint sel;
- gchar *temp;
- gint i;
- printf("select\n");
- GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(treeview)); 
- if(gtk_tree_selection_get_selected (selection, NULL,&iter)){
- GtkTreePath *path;
- path = gtk_tree_model_get_path (model, &iter);
- sel = gtk_tree_path_get_indices (path)[0];
- printf("i=%d\n",sel);
- selected_dev = audio_devices;
- for(i=0;i<sel;i++) 
- selected_dev = g_list_next(dev);
- if(dev != NULL) {
- temp = g_strdup_printf("0x%x",((DeviceData*)(selected_dev->data))->class);
- gtk_label_set_text(GTK_LABEL(label_prod),((DeviceData*)(selected_dev->data))->name);
- gtk_label_set_text(GTK_LABEL(label_class),temp);
- gtk_label_set_text(GTK_LABEL(label_address),((DeviceData*)(selected_dev->data))->address);
- gtk_tree_path_free (path);
- g_free(temp);
- }else 
- gtk_label_set_text(GTK_LABEL(label_prod),status);
- g_free(status);
- gtk_widget_set_sensitive(connect_button,TRUE);
- }
-}
-
-void refresh_resultsui(){
- gtk_widget_destroy (window);
- window = NULL;
-selected_dev = NULL;
- refresh_call();
-}
-
-
-void results_ui()
-{
- gchar *temp;
- if (!window)
- {
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- g_signal_connect (window, "destroy",G_CALLBACK (gtk_widget_destroyed), &window);
-
- mainbox = gtk_vbox_new(FALSE,4);
- gtk_container_set_border_width (GTK_CONTAINER (mainbox), 4); 
- gtk_container_add (GTK_CONTAINER (window), mainbox);
-
- hbox_top = gtk_hbox_new(FALSE,4);
- gtk_container_set_border_width (GTK_CONTAINER(hbox_top), 4); 
- gtk_container_add (GTK_CONTAINER (mainbox), hbox_top);
-
- hbox_bottom = gtk_hbox_new(FALSE,4);
- gtk_container_set_border_width (GTK_CONTAINER (hbox_bottom), 4); 
- gtk_container_add (GTK_CONTAINER (mainbox), hbox_bottom);
-
- headset_frame = gtk_frame_new(_("Available Headsets"));
- gtk_container_add (GTK_CONTAINER (hbox_top), headset_frame);
-
- about_frame = gtk_frame_new(_("Current Headset"));
- gtk_container_add(GTK_CONTAINER(hbox_top),about_frame);
-
- refresh = gtk_button_new_with_mnemonic (_("_Refresh"));
- g_signal_connect (refresh, "clicked",G_CALLBACK (refresh_resultsui), NULL);
- gtk_container_add(GTK_CONTAINER(hbox_bottom),refresh);
-
- connect_button = gtk_button_new_with_mnemonic(_("_Connect"));
- g_signal_connect(connect_button,"clicked",G_CALLBACK (connect_call), NULL);
- gtk_container_add(GTK_CONTAINER(hbox_bottom),connect_button);
- gtk_widget_set_sensitive(connect_button,FALSE);
-
-
- close_button = gtk_button_new_with_mnemonic(_("_Close"));
- g_signal_connect(close_button,"clicked",G_CALLBACK (close_call),NULL);
- gtk_container_add(GTK_CONTAINER(hbox_bottom),close_button);
- /* create tree model */
- model = create_model ();
-
- /* create tree view */
- treeview = gtk_tree_view_new_with_model (model);
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
- gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),GTK_SELECTION_SINGLE);
- g_object_unref (model);
- gtk_container_add (GTK_CONTAINER (headset_frame), treeview);
- /* add columns to the tree view */
- add_columns (GTK_TREE_VIEW (treeview));
-
- g_signal_connect(treeview,"cursor-changed",G_CALLBACK(select_row),treeview);
-
-
- box_about = gtk_hbox_new(FALSE,4);
- gtk_container_set_border_width (GTK_CONTAINER (box_about), 4); 
- gtk_container_add (GTK_CONTAINER (about_frame), box_about);
-
- /*about box left - vbox */
-
- box_about_left = gtk_vbox_new(FALSE,4);
- gtk_container_set_border_width (GTK_CONTAINER (box_about_left), 4); 
- gtk_container_add (GTK_CONTAINER (box_about), box_about_left);
-
- /*about box right - vbox */
- box_about_right = gtk_vbox_new(TRUE,4);
- gtk_container_set_border_width (GTK_CONTAINER (box_about_right), 4); 
- gtk_container_add (GTK_CONTAINER (box_about), box_about_right);
-
- /* Left labels */
- label_p = gtk_label_new(_("Name:"));
- gtk_container_add(GTK_CONTAINER(box_about_left),label_p);
-
- label_c = gtk_label_new(_("Class"));
- gtk_container_add(GTK_CONTAINER(box_about_left),label_c);
-
-
- label_a = gtk_label_new(_("Address:"));
- gtk_container_add(GTK_CONTAINER(box_about_left),label_a);
-
-
- /*right labels */
- label_prod = gtk_label_new(" ");
- gtk_container_add(GTK_CONTAINER(box_about_right),label_prod);
-
- label_class = gtk_label_new(" ");
- gtk_container_add(GTK_CONTAINER(box_about_right),label_class);
-
-
- label_address = gtk_label_new(" ");
- gtk_container_add(GTK_CONTAINER(box_about_right),label_address);
-
- dev = audio_devices;
- if(dev != NULL) {
- temp = g_strdup_printf("0x%x",((DeviceData*)(dev->data))->class);
- gtk_label_set_text(GTK_LABEL(label_prod),((DeviceData*)(dev->data))->name);
- gtk_label_set_text(GTK_LABEL(label_class),temp);
- gtk_label_set_text(GTK_LABEL(label_address),((DeviceData*)(dev->data))->address);
- g_free(temp);
- }
-
- gtk_window_set_default_size (GTK_WINDOW (window), 460, 150);
- if (!GTK_WIDGET_VISIBLE (window))
- gtk_widget_show_all (window);
- else
- {
- gtk_widget_destroy (window);
- window = NULL;
- }
- // return window;
- }
- // return window;
-}
-

audacious-plugins-2.5.3.tar.gz/src/bluetooth/gui.h Deleted

audacious-plugins-2.5.3.tar.gz/src/bluetooth/marshal.list Deleted

audacious-plugins-2.5.3.tar.gz/src/bluetooth/passkey-agent-glue.h Deleted

@@ -1,264 +0,0 @@
-/* Generated by dbus-binding-tool; do not edit! */
-
-
-#ifndef __dbus_glib_marshal_passkey_agent_MARSHAL_H__
-#define __dbus_glib_marshal_passkey_agent_MARSHAL_H__
-
-#include	<glib-object.h>
-
-G_BEGIN_DECLS
-
-#ifdef G_ENABLE_DEBUG
-#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v) g_value_get_char (v)
-#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
-#define g_marshal_value_peek_int(v) g_value_get_int (v)
-#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
-#define g_marshal_value_peek_long(v) g_value_get_long (v)
-#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
-#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
-#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
-#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
-#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
-#define g_marshal_value_peek_float(v) g_value_get_float (v)
-#define g_marshal_value_peek_double(v) g_value_get_double (v)
-#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
-#define g_marshal_value_peek_param(v) g_value_get_param (v)
-#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
-#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
-#define g_marshal_value_peek_object(v) g_value_get_object (v)
-#else /* !G_ENABLE_DEBUG */
-/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
- * Do not access GValues directly in your code. Instead, use the
- * g_value_get_*() functions
- */
-#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
-#define g_marshal_value_peek_char(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_int(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_long(v) (v)->data[0].v_long
-#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
-#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
-#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_float(v) (v)->data[0].v_float
-#define g_marshal_value_peek_double(v) (v)->data[0].v_double
-#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
-#endif /* !G_ENABLE_DEBUG */
-
-
-/* BOOLEAN:STRING,STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.70BCEU:1) */
-extern void dbus_glib_marshal_passkey_agent_BOOLEAN__STRING_STRING_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-void
-dbus_glib_marshal_passkey_agent_BOOLEAN__STRING_STRING_POINTER (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_POINTER) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer arg_3,
- gpointer data2);
- register GMarshalFunc_BOOLEAN__STRING_STRING_POINTER callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- gboolean v_return;
-
- g_return_if_fail (return_value != NULL);
- g_return_if_fail (n_param_values == 4);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_BOOLEAN__STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_marshal_value_peek_string (param_values + 1),
- g_marshal_value_peek_string (param_values + 2),
- g_marshal_value_peek_pointer (param_values + 3),
- data2);
-
- g_value_set_boolean (return_value, v_return);
-}
-
-/* NONE:STRING,STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.70BCEU:2) */
-extern void dbus_glib_marshal_passkey_agent_VOID__STRING_STRING_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-void
-dbus_glib_marshal_passkey_agent_VOID__STRING_STRING_POINTER (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__STRING_STRING_POINTER) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer arg_3,
- gpointer data2);
- register GMarshalFunc_VOID__STRING_STRING_POINTER callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
-
- g_return_if_fail (n_param_values == 4);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_VOID__STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_marshal_value_peek_string (param_values + 1),
- g_marshal_value_peek_string (param_values + 2),
- g_marshal_value_peek_pointer (param_values + 3),
- data2);
-}
-#define dbus_glib_marshal_passkey_agent_NONE__STRING_STRING_POINTER	dbus_glib_marshal_passkey_agent_VOID__STRING_STRING_POINTER
-
-/* NONE:STRING,STRING,STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.70BCEU:3) */
-extern void dbus_glib_marshal_passkey_agent_VOID__STRING_STRING_STRING_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-void
-dbus_glib_marshal_passkey_agent_VOID__STRING_STRING_STRING_POINTER (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING_POINTER) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer arg_3,
- gpointer arg_4,
- gpointer data2);
- register GMarshalFunc_VOID__STRING_STRING_STRING_POINTER callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
-
- g_return_if_fail (n_param_values == 5);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_VOID__STRING_STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_marshal_value_peek_string (param_values + 1),
- g_marshal_value_peek_string (param_values + 2),
- g_marshal_value_peek_string (param_values + 3),
- g_marshal_value_peek_pointer (param_values + 4),
- data2);
-}
-#define dbus_glib_marshal_passkey_agent_NONE__STRING_STRING_STRING_POINTER	dbus_glib_marshal_passkey_agent_VOID__STRING_STRING_STRING_POINTER
-
-/* BOOLEAN:POINTER (/tmp/dbus-binding-tool-c-marshallers.70BCEU:4) */
-extern void dbus_glib_marshal_passkey_agent_BOOLEAN__POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-void
-dbus_glib_marshal_passkey_agent_BOOLEAN__POINTER (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER) (gpointer data1,
- gpointer arg_1,
- gpointer data2);
- register GMarshalFunc_BOOLEAN__POINTER callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- gboolean v_return;
-
- g_return_if_fail (return_value != NULL);
- g_return_if_fail (n_param_values == 2);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_BOOLEAN__POINTER) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_marshal_value_peek_pointer (param_values + 1),
- data2);
-
- g_value_set_boolean (return_value, v_return);
-}
-
-G_END_DECLS
-
-#endif /* __dbus_glib_marshal_passkey_agent_MARSHAL_H__ */
-
-#include <dbus/dbus-glib.h>
-static const DBusGMethodInfo dbus_glib_passkey_agent_methods[] = {
- { (GCallback) passkey_agent_request, dbus_glib_marshal_passkey_agent_NONE__STRING_STRING_POINTER, 0 },
- { (GCallback) passkey_agent_confirm, dbus_glib_marshal_passkey_agent_NONE__STRING_STRING_STRING_POINTER, 68 },
- { (GCallback) passkey_agent_cancel, dbus_glib_marshal_passkey_agent_BOOLEAN__STRING_STRING_POINTER, 133 },
- { (GCallback) passkey_agent_release, dbus_glib_marshal_passkey_agent_BOOLEAN__POINTER, 187 },
-};
-
-const DBusGObjectInfo dbus_glib_passkey_agent_object_info = {
- 0,
- dbus_glib_passkey_agent_methods,
- 4,
-"org.bluez.PasskeyAgent\0Request\0A\0path\0I\0s\0address\0I\0s\0arg2\0O\0F\0N\0s\0\0org.bluez.PasskeyAgent\0Confirm\0A\0path\0I\0s\0address\0I\0s\0value\0I\0s\0\0org.bluez.PasskeyAgent\0Cancel\0S\0path\0I\0s\0address\0I\0s\0\0org.bluez.PasskeyAgent\0Release\0S\0\0\0",
-"\0",
-"\0"
-};
-

audacious-plugins-2.5.3.tar.gz/src/bluetooth/scan_gui.c Deleted

@@ -1,167 +0,0 @@
-/*
- * Audacious Bluetooth headset suport plugin
- *
- * Copyright (c) 2008 Paula Stanciu paula.stanciu@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 "scan_gui.h"
-#include "bluetooth.h"
-#include "agent.h"
-static GtkWidget *window = NULL;
-static GtkWidget *winbox;
-static GtkWidget *scanbox;
-static GtkWidget *buttonsbox;
-static GtkWidget *progressbox;
-static GtkWidget *bluetooth_img;
-static GtkWidget *scan_label;
-static GtkWidget *progress_bar;
-static GtkWidget *rescan_buttton;
-static GtkWidget *close_button;
-static gint usage=0;
-void show_pairing_ok(void);
-gpointer progress()
-{
-
- for(;;){
- if(window){
- gtk_progress_bar_pulse(GTK_PROGRESS_BAR(progress_bar));
- }
- sleep(1);
- if(usage == 0){
- if(discover_finish == 2 ) { 
- if(window){
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar),1);
- gtk_widget_set_sensitive(rescan_buttton,TRUE);
- }
- return 0;
- }
- }else 
- {
- if(bonding_finish == 1 ) { 
- if(window){
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar),1);
- show_pairing_ok();
- gtk_widget_set_sensitive(rescan_buttton,TRUE);
-
- }
- return 0;
- }
- }
- }
- return 0;
-}
-
-void show_pairing_ok()
-{
- if(window ){
- gtk_label_set_text(GTK_LABEL(scan_label),_("Bonding finish!"));
- }
-}
-
-void show_no_devices()
-{
- if(window ){
- gtk_label_set_text(GTK_LABEL(scan_label),_("No devices found!"));
- }
-}
-void destroy_scan_window()
-{
- gtk_widget_hide(window);
-}
-void close_window(void)
-{
- printf("scan_gui close callback \n");
- gtk_widget_destroy (window);
- window = NULL;
-}
-void show_scan(gint use)
-{
- GThread *th1;
- gchar *filename;
- usage = use;
- /*
- * 0 - discovery 
- * 1 - pairing 
- */
- if (!window)
- {
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- g_signal_connect (window, "destroy",G_CALLBACK (gtk_widget_destroyed), &window);
-
- winbox = gtk_vbox_new(FALSE,2);
- gtk_container_set_border_width (GTK_CONTAINER (winbox), 2); 
- gtk_container_add (GTK_CONTAINER (window), winbox);
-
- scanbox = gtk_hbox_new(FALSE,2);
- gtk_container_set_border_width(GTK_CONTAINER(scanbox),2);
- gtk_container_add(GTK_CONTAINER(winbox),scanbox);
-
- progressbox = gtk_vbox_new(FALSE,2);
- gtk_container_set_border_width(GTK_CONTAINER(progressbox),4);
- gtk_container_add(GTK_CONTAINER(winbox),progressbox);
- filename = DATA_DIR G_DIR_SEPARATOR_S "images" G_DIR_SEPARATOR_S "blue.png";
- bluetooth_img = gtk_image_new_from_file(filename);
- gtk_image_set_pixel_size(GTK_IMAGE(bluetooth_img),-1);
- gtk_container_add(GTK_CONTAINER(scanbox),bluetooth_img);
- if(usage == 0){
- scan_label = gtk_label_new_with_mnemonic(_("Scanning..."));
- }else
- {
- scan_label = gtk_label_new_with_mnemonic(_("Pairing..."));
- }
-
- gtk_container_add(GTK_CONTAINER(scanbox),scan_label);
-
- progress_bar = gtk_progress_bar_new();
- gtk_progress_bar_pulse(GTK_PROGRESS_BAR(progress_bar));
- gtk_container_add(GTK_CONTAINER(progressbox),progress_bar);
- th1 = g_thread_create((GThreadFunc)progress, NULL,TRUE,NULL);
- buttonsbox = gtk_hbox_new(FALSE,2);
- gtk_container_set_border_width(GTK_CONTAINER(buttonsbox),2);
- gtk_container_add(GTK_CONTAINER(progressbox),buttonsbox);
- /* I have to modify the rescan button with a play one 
- * and treat the case when the bounding is not ok
- */
- if(usage == 0){
- rescan_buttton = gtk_button_new_with_mnemonic(_("Rescan"));
- g_signal_connect(rescan_buttton,"clicked",G_CALLBACK (refresh_call),NULL);
- gtk_widget_set_sensitive(rescan_buttton,FALSE);
- }else{
- rescan_buttton = gtk_button_new_with_mnemonic(_("Play"));
- g_signal_connect(rescan_buttton,"clicked",G_CALLBACK (play_call),NULL);
- gtk_widget_set_sensitive(rescan_buttton,FALSE);
- }
-
-
-
- close_button = gtk_button_new_with_mnemonic(_("Close"));
- gtk_container_add(GTK_CONTAINER(buttonsbox),rescan_buttton);
- gtk_container_add(GTK_CONTAINER(buttonsbox),close_button);
- g_signal_connect(close_button,"clicked",G_CALLBACK (close_window),NULL);
-
- gtk_window_set_default_size (GTK_WINDOW (window), 60, 40);
- gtk_window_set_resizable(GTK_WINDOW(window),FALSE);
- if (!GTK_WIDGET_VISIBLE (window))
- gtk_widget_show_all (window);
- else
- { 
- gtk_widget_destroy (window);
- g_free(filename);
- window = NULL;
- }
-
- }
-
-}

audacious-plugins-2.5.3.tar.gz/src/bluetooth/scan_gui.h Deleted

@@ -1,30 +0,0 @@
-/*
- * Audacious Bluetooth headset suport plugin
- *
- * Copyright (c) 2008 Paula Stanciu paula.stanciu@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 <gtk/gtk.h>
-#include <glib.h>
-#include <alsa/asoundlib.h>
-#include <alsa/pcm_plugin.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
-
-
-void show_scan(gint use);
-void show_no_devices();
-void destroy_scan_window();
-void close_window();

audacious-plugins-2.5.3.tar.gz/src/daap Deleted

audacious-plugins-2.5.3.tar.gz/src/daap/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/daap/daap.c Deleted

@@ -1,497 +0,0 @@
-/* Audacious DAAP transport plugin
- * Copyright (c) 2007 Cristi Magherusan <majeru@gentoo.ro>
- * 
- * With inspiration and code from David Hammerton's tunesbrowser
- *
- * 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 Softmcware
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <glib.h>
-
-#include <audacious/plugin.h>
-#include <audacious/discovery.h>
-
-#include "xmms2-daap/daap_cmd.h"
-#include "xmms2-daap/daap_util.h"
-#include "xmms2-daap/daap_mdns_browse.h"
-#define DEFAULT_DAAP_PORT 3689
-#define DEBUG 1
-typedef struct {
- gchar *host;
- guint port;
-
- GIOChannel *channel;
-
-} daap_data_t;
-
-typedef struct {
- gboolean logged_in;
- guint session_id;
- guint revision_id;
- guint request_id;
-} daap_login_data_t;
-
-typedef struct{
- daap_data_t *daap_data;
- gchar *url;
- int fd;
- guint pos;
- gulong length; 
-}
-daap_handle_t;
-
-
-
-static GHashTable *login_sessions = NULL;
-
-gboolean daap_initialized=FALSE;
-
-GMutex * mutex_init = NULL; 
-
-GMutex * mutex_discovery = NULL; 
-
-GList * daap_servers = NULL;
-
-guint request_id=0;
-
-
-
- static gboolean
-get_data_from_url (const gchar *url, gchar **host, guint *port, gchar **cmd)
-{
- const gchar *port_ptr, *cmd_ptr, *end_ptr, *stripped;
-
- stripped = url + sizeof (gchar) * strlen ("daap://");
-
- end_ptr = stripped + sizeof (gchar) * strlen (stripped);
-
- if (stripped == end_ptr) {
- g_print("DAAP: Empty URL\n");
- return FALSE;
- }
-
- port_ptr = strstr (stripped, ":");
- if (port && port_ptr && (port_ptr + 1) != end_ptr) {
- *port = strtol (port_ptr + 1, (gchar **) NULL, 10);
- if (*port == 0) {
- *port = DEFAULT_DAAP_PORT;
- }
- } else if (port) {
- *port = DEFAULT_DAAP_PORT;
- }
-
- cmd_ptr = strstr (stripped, "/");
- if (cmd && cmd_ptr && (cmd_ptr + 1) != end_ptr) {
- *cmd = g_strdup (cmd_ptr);
- } else if (cmd) {
- /* cmd wanted but not found */
- g_print("DAAP: No file requested\n");
- } else if (!cmd && cmd_ptr && (cmd_ptr + 1) != end_ptr) {
- /* cmd not wanted but found */
- g_print("DAAP: No such directory\n");
- return FALSE;
- }
-
- if (port_ptr) {
- *host = g_strndup (stripped, port_ptr - stripped);
- } else if (cmd_ptr) {
- *host = g_strndup (stripped, cmd_ptr - stripped);
- } else {
- *host = g_strdup (stripped);
- }
-
- return TRUE;
-}
-
-
-
- static gboolean
-daap_init (daap_handle_t *handle)
-{
- gint dbid;
- GSList *dbid_list = NULL;
- daap_data_t *data;
- daap_login_data_t *login_data;
- guint filesize;
- gchar *command=NULL;
- gchar *hash;
-
- data = g_new0 (daap_data_t, 1);
-
- if (!get_data_from_url (handle->url, &(data->host), &(data->port), &command))
- return FALSE;
-
- hash = g_strdup_printf ("%s:%u", data->host, data->port);
-
- login_data = g_hash_table_lookup (login_sessions, hash);
- if (!login_data) 
- {
-#if DEBUG
- g_print ("creating login data for %s\n", hash);
-#endif
- login_data = g_new0 (daap_login_data_t, 1);
-
- login_data->request_id = 1;
- login_data->logged_in = TRUE;
-
- login_data->session_id = daap_command_login (data->host, data->port,
- login_data->request_id);
- if(login_data->session_id==0)
- return FALSE;
-
- g_hash_table_insert (login_sessions, hash, login_data);
- }
-
- login_data->revision_id = daap_command_update (data->host, data->port,
- login_data->session_id,
- login_data->request_id);
- dbid_list = daap_command_db_list (data->host, data->port,
- login_data->session_id,
- login_data->revision_id,
- login_data->request_id);
- if (!dbid_list) {
- return FALSE;
- }
-
- /* XXX: see XXX in the browse function above */
- dbid = ((cc_item_record_t *) dbid_list->data)->dbid;
- /* want to request a stream, but don't read the data yet */
- data->channel = daap_command_init_stream (data->host, data->port,
- login_data->session_id,
- login_data->revision_id,
- login_data->request_id, dbid,
- command,&filesize);
- if (!data->channel) {
- return FALSE;
- }
-
- login_data->request_id++;
- 
- handle->daap_data=data;
- handle->length=filesize;
- handle->pos=0;
- g_slist_foreach (dbid_list, (GFunc) cc_item_record_free, NULL);
- g_slist_free (dbid_list);
- g_free (command);
-
- return TRUE;
-}
-
-
-
-
-
-
-
- GList*
-daap_get_tracks_from_server (gchar *host, guint port)
-{
- GList * output=NULL;
- GSList *dbid_list = NULL;
- GSList *song_list = NULL, *song_el;
- cc_item_record_t *db_data;
- daap_login_data_t *login_data;
- gchar *hash;
-
- hash = g_strdup_printf ("%s:%u", host, port);
-
- login_data = g_hash_table_lookup (login_sessions, hash);
-
- if (!login_data) {
- login_data = g_new0 (daap_login_data_t, 1);
-
- login_data->session_id = daap_command_login (host, port, 0);
-
- login_data->revision_id = daap_command_update (host, port,
- login_data->session_id,
- 0);
-
- login_data->request_id = 1;
- login_data->logged_in = TRUE;
-
- g_hash_table_insert (login_sessions, hash, login_data);
- } else {
- login_data->revision_id = daap_command_update (host, port,
- login_data->session_id,
- 0);
- }
-
- dbid_list = daap_command_db_list (host, port, login_data->session_id,
- login_data->revision_id, 0);
- if (!dbid_list) {
- return NULL;
- }
-
- /* XXX i've never seen more than one db per server out in the wild,
- * let's hope that never changes *wink*
- * just use the first db in the list */
- db_data = (cc_item_record_t *) dbid_list->data;
- song_list = daap_command_song_list (host, port, login_data->session_id,
- login_data->revision_id,
- 0, db_data->dbid);
-
- g_slist_foreach (dbid_list, (GFunc) cc_item_record_free, NULL);
- g_slist_free (dbid_list);
-
- if (!song_list) {
- return NULL;
- }
-
- for (song_el = song_list; song_el; song_el = g_slist_next (song_el)) 
- output=g_list_prepend(output, g_memdup(song_el->data,sizeof(cc_item_record_t)));
-
-
- g_slist_foreach (song_list, (GFunc) cc_item_record_free, NULL);
- g_slist_free (song_list);
-
- return g_list_reverse(output);
-}
-
-
-GList * daap_discovery_get_devices_impl(void)
-{ 
- discovery_device_t * current_device=NULL;
- GList * returned_devices=NULL;
- GSList * daap_found_devices=NULL,
- * current_server=NULL;
-
- if(mutex_discovery==NULL)
- return NULL;
-
- g_mutex_lock(mutex_discovery);
- g_print ("caut\n");
- daap_found_devices = daap_mdns_get_server_list ();
- current_server=daap_found_devices;
-
- for (; current_server; current_server = g_slist_next (current_server)) 
- {
- current_device = g_new0(discovery_device_t,1);
- daap_mdns_server_t *serv=current_server->data;
- current_device->device_name = 
- g_strdup_printf("%s(%s)",serv->server_name, serv->mdns_hostname);
-
- current_device->device_address = 
- g_strdup_printf(
- "%s:%d",
- serv->address,
- serv->port
- );
- current_device->device_playlist=
- daap_get_tracks_from_server(
- serv->mdns_hostname,
- serv->port
- );
- returned_devices = g_list_prepend(returned_devices,current_device); 
-#if DEBUG
- g_print("DAAP: Found device %s at address %s\n", current_device->device_name ,current_device->device_address );
-#endif
- }
- g_slist_free(daap_found_devices);
- g_mutex_unlock(mutex_discovery);
- return g_list_reverse(returned_devices);
-}
-
-
-
-
-VFSFile * daap_vfs_fopen_impl(const gchar * path, const gchar * mode)
-{
- VFSFile *file=NULL;
- daap_handle_t *handle = g_new0(daap_handle_t, 1);
- handle->url=g_strdup(path);
-
- if (!path || !mode)
- return NULL;
-
- if( !daap_init(handle) )
- {
-#if DEBUG /*this isn't a fatal error, we can try again later*/
- g_print("Error while initializing DAAP !!!\n");
-#endif 
- return NULL;
- }
-#if DEBUG 
- g_print("DAAP was initialized succesfully\n");
-#endif 
- file=g_new0(VFSFile, 1);
- handle->fd=g_io_channel_unix_get_fd(handle->daap_data->channel);
-
- if (handle->fd < 0) 
- {
- g_print("vfs_fopen got a negative FD \n");
- g_free(file);
- file = NULL;
- } 
- else 
- file->handle=(void*)handle;
- return file;
-}
-
-gint daap_vfs_fclose_impl(VFSFile * file)
-{
- gint ret=0;
- daap_handle_t * handle = (daap_handle_t *)file->handle;
- if (file == NULL)
- return -1;
-
- if (file->handle)
- {
- if(g_io_channel_shutdown(handle->daap_data->channel,TRUE,NULL)!=G_IO_STATUS_NORMAL) 
- ret = -1;
- else
- {
- g_io_channel_unref(handle->daap_data->channel);
- ret=0;
- }
- g_free(file->handle);
- file->handle=NULL;
- }
- return ret;
-
-return -1;
-}
-
-size_t daap_vfs_fread_impl(gpointer ptr, size_t size, size_t nmemb, VFSFile * file)
-{
- daap_handle_t *handle= (daap_handle_t *)file->handle;
- size_t ret=0;
-if (file == NULL)
- return 0;
-if( g_io_channel_read_chars (handle->daap_data->channel,ptr,size*nmemb,&ret,NULL)==G_IO_STATUS_NORMAL)
- {
- handle->pos+=(size*nmemb);
- return ret;
- }
-else 
- return 0;
-}
-
-size_t daap_vfs_fwrite_impl(gconstpointer ptr, size_t size, size_t nmemb, VFSFile * file)
-{
- return -1;
-}
-
-gint daap_vfs_getc_impl(VFSFile * file)
-{
-guchar ret=EOF;
-daap_handle_t *handle = (daap_handle_t *)file->handle;
-int status=g_io_channel_read_chars (handle->daap_data->channel,(void*)&ret,1,NULL,NULL);
-if(status==G_IO_STATUS_NORMAL)
- {
- g_print ("fgetc OK\n");
- handle->pos++;
- return ret;
- }
-else 
-{
-g_print ("fgetc failed\n");
- return EOF;
-}
-}
-
-gint daap_vfs_fseek_impl(VFSFile * file, glong offset, gint whence)
-{
- return -1;
-}
-
-gint daap_vfs_ungetc_impl(gint c, VFSFile * stream)
-{
-return c;
-}
-
-void daap_vfs_rewind_impl(VFSFile * stream)
-{
- return;
-}
-
-glong daap_vfs_ftell_impl(VFSFile * stream)
-{
- daap_handle_t *handle=stream->handle;
- return handle->pos;
-}
-
-gboolean daap_vfs_feof_impl(VFSFile * file)
-{
- daap_handle_t *handle=file->handle;
- off_t at = daap_vfs_ftell_impl(file);
- return (gboolean) (at >= handle->length) ? TRUE : FALSE;
-}
-
-gint daap_vfs_truncate_impl(VFSFile * file, glong size)
-{
- return -1;
-}
-off_t daap_vfs_fsize_impl(VFSFile * file)
-{
-return 0;
-}
-
-gchar *daap_vfs_metadata_impl(VFSFile * file, const gchar * field)
-{
-daap_handle_t *handle;
-g_print("Requested metadata: '%s' \n",field);
-
-if(file && file->handle)
- handle = (daap_handle_t *)file->handle;
-else 
- return NULL;
-
-/*if (!g_ascii_strncasecmp(field, "stream-name", 11))
- return handle->url;
-if (!g_ascii_strncasecmp(field, "track-name",10))
- return handle->url;
-*/
-
-if (!g_ascii_strncasecmp(field, "content-type", 12))
- return g_strdup("audio/mpeg");
-return NULL;
-
-}
-
-VFSConstructor daap_const = {
- "daap://",
- daap_vfs_fopen_impl,
- daap_vfs_fclose_impl,
- daap_vfs_fread_impl,
- daap_vfs_fwrite_impl,
- daap_vfs_getc_impl,
- daap_vfs_ungetc_impl,
- daap_vfs_fseek_impl,
- daap_vfs_rewind_impl,
- daap_vfs_ftell_impl,
- daap_vfs_feof_impl,
- daap_vfs_truncate_impl,
- daap_vfs_fsize_impl,
- daap_vfs_metadata_impl
-};
-
-static void init(void)
-{ 
- mutex_init = g_mutex_new(); 
- mutex_discovery = g_mutex_new(); 
- vfs_register_transport(&daap_const);
- daap_mdns_initialize ();
- if (!login_sessions) 
- login_sessions = g_hash_table_new (g_str_hash, g_str_equal);
-
-
-}
-static void cleanup(void)
-{
- g_mutex_free (mutex_init);
- g_mutex_free (mutex_discovery);
- daap_mdns_destroy ();
-}
-DECLARE_PLUGIN(daap, init, cleanup, NULL, NULL, NULL, NULL, NULL, NULL)

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap Deleted

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/cc_handlers.c Deleted

@@ -1,892 +0,0 @@
-/** @file cc_handlers.c
- * Functions for parsing DAAP content code data.
- *
- * Copyright (C) 2006-2007 XMMS2 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; 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.
- */
-
-#define _GNU_SOURCE
-#include <string.h>
-
-#include <stdlib.h>
-
-#include <glib.h>
-#include <glib/gprintf.h>
-
-#include "cc_handlers.h"
-#include "daap_conn.h"
-
-#define DMAP_BYTES_REMAINING ((gint) (data_end - current_data))
-
-static void
-endian_swap_int16 (gint16 *i)
-{
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-	gint16 tmp;
-	tmp = (gint16) (((*i >> 8) & 0x00FF) |
-	 ((*i << 8) & 0xFF00));
-	*i = tmp;
-#endif
-}
-
-static void
-endian_swap_int32 (gint32 *i)
-{
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-	gint32 tmp;
-	tmp = (gint32) (((*i >> 24) & 0x000000FF) |
-	 ((*i >> 8) & 0x0000FF00) |
-	 ((*i << 8) & 0x00FF0000) |
-	 ((*i << 24) & 0xFF000000));
-	*i = tmp;
-#endif
-}
-
-static void
-endian_swap_int64 (gint64 *i)
-{
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-	gint64 tmp;
-	tmp = (gint64) ( ((*i >> 40) & 0x00000000000000FF) |
-	 ((*i >> 32) & 0x000000000000FF00) |
-	 ((*i >> 24) & 0x0000000000FF0000) |
-	 ((*i >> 8) & 0x00000000FF000000) |
-	 G_GINT64_CONSTANT ((*i << 8) & 0x000000FF00000000) |
-	 G_GINT64_CONSTANT ((*i << 24) & 0x0000FF0000000000) |
-	 G_GINT64_CONSTANT ((*i << 32) & 0x00FF000000000000) |
-	 G_GINT64_CONSTANT ((*i << 40) & 0xFF00000000000000));
-	*i = tmp;
-#endif
-}
-
-static gint
-grab_data_string (gchar **container, gchar *data, gint str_len)
-{
-	gint offset = 0;
-
-	if (0 != str_len) {
-		*container = (gchar *) malloc (sizeof (gchar) * (str_len+1));
-
-		memcpy (*container, data + DMAP_CC_SZ + DMAP_INT_SZ, str_len);
-		(*container)[str_len] = '\0';
-
-		offset += str_len;
-	}
-
-	return offset;
-}
-
-static gint
-grab_data_version (gint16 *cont_upper, gint16 *cont_lower, gchar *data)
-{
-	gint offset = DMAP_CC_SZ;
-
-	memcpy (cont_lower, data + offset, DMAP_INT_SZ);
-	endian_swap_int16 (cont_lower);
-	offset += DMAP_INT_SZ;
-
-	memcpy (cont_upper, data + offset, DMAP_INT_SZ);
-	endian_swap_int16 (cont_upper);
-	offset += DMAP_INT_SZ;
-
-	return offset;
-}
-
-static gint
-grab_data (void *container, gchar *data, content_type ct)
-{
-	gint offset;
-	gint data_size;
-
-	offset = DMAP_CC_SZ;
-	memcpy (&data_size, data + offset, DMAP_INT_SZ);
-	endian_swap_int32 ((gint32 *)&data_size);
-	offset += DMAP_INT_SZ;
-
-	switch (ct) {
-		case DMAP_CTYPE_BYTE:
-		case DMAP_CTYPE_UNSIGNEDBYTE:
-			memcpy (container, data + offset, DMAP_BYTE_SZ);
-			offset += DMAP_BYTE_SZ;
-			break;
-		case DMAP_CTYPE_SHORT:
-		case DMAP_CTYPE_UNSIGNEDSHORT:
-			memcpy (container, data + offset, DMAP_SHORT_SZ);
-			endian_swap_int16 (container);
-			offset += DMAP_SHORT_SZ;
-			break;
-		case DMAP_CTYPE_INT:
-		case DMAP_CTYPE_UNSIGNEDINT:
-			memcpy (container, data + offset, DMAP_INT_SZ);
-			endian_swap_int32 (container);
-			offset += DMAP_INT_SZ;
-			break;
-		case DMAP_CTYPE_LONG:
-		case DMAP_CTYPE_UNSIGNEDLONG:
-			memcpy (container, data + offset, DMAP_LONG_SZ);
-			endian_swap_int64 (container);
-			offset += DMAP_LONG_SZ;
-			break;
-		case DMAP_CTYPE_STRING:
-			offset += grab_data_string ((gchar **) container, data, data_size);
-			break;
-		case DMAP_CTYPE_DATE:
-			memcpy (container, data + offset, DMAP_INT_SZ);
-			endian_swap_int32 (container);
-			offset += DMAP_INT_SZ;
-			break;
-		default:
-			g_print ("Warning: Unrecognized content type (%d).\n", ct);
-			break;
-	}
-
-	return offset;
-}
-
-static gint
-cc_handler_mtco (cc_data_t *fields, gchar *current_data)
-{
-	gint offset = grab_data (&(fields->n_rec_matches), current_data, DMAP_CTYPE_INT);
-	return offset;
-}
-
-static gint
-cc_handler_mrco (cc_data_t *fields, gchar *current_data)
-{
-	gint offset = grab_data (&(fields->n_ret_items), current_data, DMAP_CTYPE_INT);
-	return offset;
-}
-
-static gint
-cc_handler_muty (cc_data_t *fields, gchar *current_data)
-{
-	gint offset = grab_data (&(fields->updt_type), current_data, DMAP_CTYPE_BYTE);
-	return offset;
-}
-
-static gint
-cc_handler_mstt (cc_data_t *fields, gchar *current_data)
-{
-	gint offset = grab_data (&(fields->status), current_data, DMAP_CTYPE_INT);
-	return offset;
-}
-
-static gint
-cc_handler_mlit (cc_data_t *fields, gchar *data, gint data_len)
-{
-	gint offset = 0;
-	gboolean do_break = FALSE;
-	gchar *current_data, *data_end;
-	cc_item_record_t *item_fields;
-
-	current_data = data + 8;
-	data_end = data + data_len;
-
-	item_fields = g_malloc0 (sizeof (cc_item_record_t));
-
-	while (current_data < data_end && !do_break) {
-		switch (CC_TO_INT (current_data[0], current_data[1],
-		 current_data[2], current_data[3])) {
-			case CC_TO_INT ('m','i','i','d'):
-				offset += grab_data (&(item_fields->dbid), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('m','p','e','r'):
-				offset += grab_data (&(item_fields->persistent_id), current_data,
-				 DMAP_CTYPE_LONG);
-				break;
-			case CC_TO_INT ('m','i','n','m'):
-				offset += grab_data (&(item_fields->iname), current_data,
-				 DMAP_CTYPE_STRING);
-				break;
-
-			/* song list specific */
-			case CC_TO_INT ('m','i','k','d'):
-				offset += grab_data (&(item_fields->item_kind), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('a','s','d','k'):
-				offset += grab_data (&(item_fields->song_data_kind), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('a','s','u','l'):
-				offset += grab_data (&(item_fields->song_data_url), current_data,
-				 DMAP_CTYPE_STRING);
-				break;
-			case CC_TO_INT ('a','s','a','l'):
-				offset += grab_data (&(item_fields->song_data_album),
-				 current_data,
-				 DMAP_CTYPE_STRING);
-				break;
-			case CC_TO_INT ('a','s','a','r'):
-				offset += grab_data (&(item_fields->song_data_artist),
-				 current_data,
-				 DMAP_CTYPE_STRING);
-				break;
-			case CC_TO_INT ('a','s','b','r'):
-				offset += grab_data (&(item_fields->song_bitrate), current_data,
-				 DMAP_CTYPE_SHORT);
-				break;
-			case CC_TO_INT ('a','s','c','m'):
-				offset += grab_data (&(item_fields->song_comment), current_data,
-				 DMAP_CTYPE_STRING);
-				break;
-			case CC_TO_INT ('a','s','d','a'):
-				offset += grab_data (&(item_fields->song_date), current_data,
-				 DMAP_CTYPE_DATE);
-				break;
-			case CC_TO_INT ('a','s','d','m'):
-				offset += grab_data (&(item_fields->song_date_mod), current_data,
-				 DMAP_CTYPE_DATE);
-				break;
-			case CC_TO_INT ('a','s','g','n'):
-				offset += grab_data (&(item_fields->song_genre), current_data,
-				 DMAP_CTYPE_STRING);
-				break;
-			case CC_TO_INT ('a','s','f','m'):
-				offset += grab_data (&(item_fields->song_format), current_data,
-				 DMAP_CTYPE_STRING);
-				break;
-			case CC_TO_INT ('a','s','d','t'):
-				offset += grab_data (&(item_fields->song_description), current_data,
-				 DMAP_CTYPE_STRING);
-				break;
-			case CC_TO_INT ('a','s','s','r'):
-				offset += grab_data (&(item_fields->sample_rate), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('a','s','s','z'):
-				offset += grab_data (&(item_fields->song_size), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('a','s','s','t'):
-				offset += grab_data (&(item_fields->song_start_time), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('a','s','s','p'):
-				offset += grab_data (&(item_fields->song_stop_time), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('a','s','t','m'):
-				offset += grab_data (&(item_fields->song_total_time), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('a','s','y','r'):
-				offset += grab_data (&(item_fields->song_year), current_data,
-				 DMAP_CTYPE_SHORT);
-				break;
-			case CC_TO_INT ('a','s','t','n'):
-				offset += grab_data (&(item_fields->song_track_no), current_data,
-				 DMAP_CTYPE_SHORT);
-				break;
-			case CC_TO_INT ('a','s','c','p'):
-				offset += grab_data (&(item_fields->song_composer), current_data,
-				 DMAP_CTYPE_STRING);
-				break;
-			case CC_TO_INT ('a','s','t','c'):
-				offset += grab_data (&(item_fields->song_track_count), current_data,
-				 DMAP_CTYPE_SHORT);
-				break;
-			case CC_TO_INT ('a','s','d','c'):
-				offset += grab_data (&(item_fields->song_disc_count), current_data,
-				 DMAP_CTYPE_SHORT);
-				break;
-			case CC_TO_INT ('a','s','d','n'):
-				offset += grab_data (&(item_fields->song_disc_no), current_data,
-				 DMAP_CTYPE_SHORT);
-				break;
-			case CC_TO_INT ('a','s','c','o'):
-				offset += grab_data (&(item_fields->song_compilation), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('a','s','b','t'):
-				offset += grab_data (&(item_fields->song_bpm), current_data,
-				 DMAP_CTYPE_SHORT);
-				break;
-			case CC_TO_INT ('a','g','r','p'):
-				offset += grab_data (&(item_fields->song_grouping), current_data,
-				 DMAP_CTYPE_STRING);
-				break;
-			case CC_TO_INT ('m','c','t','i'):
-				offset += grab_data (&(item_fields->container_id), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('m','u','d','l'):
-				offset += grab_data (&(item_fields->deleted_id), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-
-			/* db list specific */
-			case CC_TO_INT ('m','i','m','c'):
-				offset += grab_data (&(item_fields->db_n_items), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('m','c','t','c'):
-				offset += grab_data (&(item_fields->db_n_playlist), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('a','e','S','P'):
-				offset += grab_data (&(item_fields->is_smart_pl), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('a','b','p','l'):
-				offset += grab_data (&(item_fields->is_base_pl), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-
-			/* exit conditions */
-			case CC_TO_INT ('m','l','i','t'):
-				do_break = TRUE;
-				break;
-			default:
-				g_print ("Warning: Unrecognized content code "
-				 "or end of data: %s\n", current_data);
-				do_break = TRUE;
-				break;
-		}
-
-		current_data += offset;
-		offset = 0;
-	}
-
-	fields->record_list = g_slist_prepend (fields->record_list, item_fields);
-
-	return (gint) (current_data - data);
-}
-
-static gint
-cc_handler_mlcl (cc_data_t *fields, gchar *data, gint data_len)
-{
-	gint offset = 0;
-	gboolean do_break = FALSE;
-	gchar *current_data, *data_end;
-	current_data = data + 8;
-	data_end = data + data_len;
-
-	while (current_data < data_end && !do_break) {
-		if (CC_TO_INT (current_data[0], current_data[1],
-		 current_data[2], current_data[3]) ==
-		 CC_TO_INT ('m','l','i','t')) {
-
-			offset += cc_handler_mlit (fields, current_data,
-			 DMAP_BYTES_REMAINING);
-		} else {
-			break;
-		}
-
-		current_data += offset;
-		offset = 0;
-	}
-
-	return (gint)(current_data - data);
-}
-
-static cc_data_t *
-cc_handler_adbs (gchar *data, gint data_len)
-{
-	gint offset = 0;
-	gboolean do_break = FALSE;
-	gchar *current_data, *data_end;
-	cc_data_t *fields;
-
-	current_data = data + 8;
-	data_end = data + data_len;
-
-	fields = cc_data_new ();
-
-	while ((current_data < data_end) && !do_break) {
-		switch (CC_TO_INT (current_data[0], current_data[1],
-		 current_data[2], current_data[3])) {
-			case CC_TO_INT ('m','s','t','t'):
-				offset += cc_handler_mstt (fields, current_data);
-				break;
-			case CC_TO_INT ('m','u','t','y'):
-				offset += cc_handler_muty (fields, current_data);
-				break;
-			case CC_TO_INT ('m','t','c','o'):
-				offset += cc_handler_mtco (fields, current_data);
-				break;
-			case CC_TO_INT ('m','r','c','o'):
-				offset += cc_handler_mrco (fields, current_data);
-				break;
-			case CC_TO_INT ('m','l','c','l'):
-				offset += cc_handler_mlcl (fields, current_data,
-				 DMAP_BYTES_REMAINING);
-				break;
-			default:
-				do_break = TRUE;
-				break;
-		}
-
-		current_data += offset;
-		offset = 0;
-	}
-
-	return fields;
-}
-
-static cc_data_t *
-cc_handler_msrv (gchar *data, gint data_len)
-{
-	gint offset = 0;
-	gboolean do_break = FALSE;
-	gchar *current_data, *data_end;
-	cc_data_t *fields;
-	current_data = data + 8;
-	data_end = data + data_len;
-
-	fields = cc_data_new ();
-
-	while ((current_data < data_end) && !do_break) {
-		switch (CC_TO_INT (current_data[0], current_data[1],
-		 current_data[2], current_data[3])) {
-			case CC_TO_INT ('m','s','t','t'):
-				offset += cc_handler_mstt (fields, current_data);
-				break;
-			case CC_TO_INT ('a','p','r','o'):
-				offset += grab_data_version (&(fields->daap_proto_major),
-				 &(fields->daap_proto_minor),
-				 current_data);
-				break;
-			case CC_TO_INT ('m','p','r','o'):
-				offset += grab_data_version (&(fields->dmap_proto_major),
-				 &(fields->dmap_proto_minor),
-				 current_data);
-				break;
-			case CC_TO_INT ('m','s','t','m'):
-				offset += grab_data (&(fields->timeout_interval), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('m','s','i','x'):
-				offset += grab_data (&(fields->has_indexing), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('m','s','e','x'):
-				offset += grab_data (&(fields->has_extensions), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('m','s','u','p'):
-				offset += grab_data (&(fields->has_update), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('m','s','a','l'):
-				offset += grab_data (&(fields->has_autologout), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('m','s','l','r'):
-				offset += grab_data (&(fields->login_required), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('m','s','q','y'):
-				offset += grab_data (&(fields->has_queries), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('m','s','r','s'):
-				offset += grab_data (&(fields->has_resolve), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('m','s','b','r'):
-				offset += grab_data (&(fields->has_browsing), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('m','s','p','i'):
-				offset += grab_data (&(fields->has_persistent), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('m','s','a','s'):
-				offset += grab_data (&(fields->auth_type), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('m','s','a','u'):
-				offset += grab_data (&(fields->auth_method), current_data,
-				 DMAP_CTYPE_BYTE);
-				break;
-			case CC_TO_INT ('a','e','S','V'):
-				offset += grab_data (&(fields->sharing_version), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('m','s','d','c'):
-				offset += grab_data (&(fields->db_count), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('m','i','n','m'):
-				offset += grab_data (&(fields->server_name), current_data,
-				 DMAP_CTYPE_STRING);
-				break;
-			default:
-				g_print ("Warning: Unrecognized content code "
-				 "or end of data: %s\n",
-				 current_data);
-				do_break = TRUE;
-				break;
-		}
-
-		current_data += offset;
-		offset = 0;
-	}
-
-	return fields;
-}
-
-static cc_data_t *
-cc_handler_mccr (gchar *data, gint data_len)
-{
-	/* not implemented */
-	return NULL;
-}
-
-static cc_data_t *
-cc_handler_mlog (gchar *data, gint data_len)
-{
-	gint offset = 0;
-	gboolean do_break = FALSE;
-	gchar *current_data, *data_end;
-	cc_data_t *fields;
-
-	current_data = data + 8;
-	data_end = data + data_len;
-
-	fields = cc_data_new ();
-
-	while ((current_data < data_end) && !do_break) {
-		switch (CC_TO_INT (current_data[0], current_data[1],
-		 current_data[2], current_data[3])) {
-			case CC_TO_INT ('m','s','t','t'):
-				offset += cc_handler_mstt (fields, current_data);
-				break;
-			case CC_TO_INT ('m','l','i','d'):
-				offset += grab_data (&(fields->session_id), current_data, DMAP_CTYPE_INT);
-				break;
-			default:
-				g_print ("Unrecognized content code or end of data: %s\n",
-				 current_data);
-				do_break = TRUE;
-				break;
-		}
-
-		current_data += offset;
-		offset = 0;
-	}
-
-	return fields;
-}
-
-static cc_data_t *
-cc_handler_mupd (gchar *data, gint data_len)
-{
-	gint offset = 0;
-	gboolean do_break = FALSE;
-	gchar *current_data, *data_end;
-	cc_data_t *fields;
-
-	current_data = data + 8;
-	data_end = data + data_len;
-
-	fields = cc_data_new ();
-
-	while ((current_data < data_end) && !do_break) {
-		switch (CC_TO_INT (current_data[0], current_data[1],
-		 current_data[2], current_data[3])) {
-			case CC_TO_INT ('m','u','s','r'):
-				offset += grab_data (&(fields->revision_id), current_data,
-				 DMAP_CTYPE_INT);
-				break;
-			case CC_TO_INT ('m','s','t','t'):
-				offset += cc_handler_mstt (fields, current_data);
-				break;
-			default:
-				g_print ("Unrecognized content code or end of data: %s\n",
-				 current_data);
-				do_break = TRUE;
-				break;
-		}
-
-		current_data += offset;
-		offset = 0;
-	}
-
-	return fields;
-}
-
-static cc_data_t *
-cc_handler_avdb (gchar *data, gint data_len)
-{
-	gint offset = 0;
-	gboolean do_break = FALSE;
-	gchar *current_data, *data_end;
-	cc_data_t *fields;
-
-	current_data = data + 8;
-	data_end = data + data_len;
-
-	fields = cc_data_new ();
-
-	while ((current_data < data_end) && !do_break) {
-		switch (CC_TO_INT (current_data[0], current_data[1],
-		 current_data[2], current_data[3])) {
-			case CC_TO_INT ('m','s','t','t'):
-				offset += cc_handler_mstt (fields, current_data);
-				break;
-			case CC_TO_INT ('m','u','t','y'):
-				offset += cc_handler_muty (fields, current_data);
-				break;
-			case CC_TO_INT ('m','t','c','o'):
-				offset += cc_handler_mtco (fields, current_data);
-				break;
-			case CC_TO_INT ('m','r','c','o'):
-				offset += cc_handler_mrco (fields, current_data);
-				break;
-			case CC_TO_INT ('m','l','c','l'):
-				offset += cc_handler_mlcl (fields, current_data,
-				 DMAP_BYTES_REMAINING);
-				break;
-			default:
-				do_break = TRUE;
-				break;
-		}
-
-		current_data += offset;
-		offset = 0;
-	}
-
-	return fields;
-}
-
-static cc_data_t *
-cc_handler_apso (gchar *data, gint data_len)
-{
-	gint offset = 0;
-	gboolean do_break = FALSE;
-	gchar *current_data, *data_end;
-	cc_data_t *fields;
-
-	current_data = data + 8;
-	data_end = data + data_len;
-
-	fields = cc_data_new ();
-
-	while ((current_data < data_end) && !do_break) {
-		switch (CC_TO_INT (current_data[0], current_data[1],
-		 current_data[2], current_data[3])) {
-			case CC_TO_INT ('m','s','t','t'):
-				offset += cc_handler_mstt (fields, current_data);
-				break;
-			case CC_TO_INT ('m','u','t','y'):
-				offset += cc_handler_muty (fields, current_data);
-				break;
-			case CC_TO_INT ('m','t','c','o'):
-				offset += cc_handler_mtco (fields, current_data);
-				break;
-			case CC_TO_INT ('m','r','c','o'):
-				offset += cc_handler_mrco (fields, current_data);
-				break;
-			case CC_TO_INT ('m','l','c','l'):
-				offset += cc_handler_mlcl (fields, current_data,
-				 DMAP_BYTES_REMAINING);
-				break;
-			default:
-				do_break = TRUE;
-				break;
-		}
-
-		current_data += offset;
-		offset = 0;
-	}
-
-	return fields;
-}
-
-static cc_data_t *
-cc_handler_aply (gchar *data, gint data_len)
-{
-	gint offset = 0;
-	gboolean do_break = FALSE;
-	gchar *current_data, *data_end;
-	cc_data_t *fields;
-
-	current_data = data + 8;
-	data_end = data + data_len;
-
-	fields = cc_data_new ();
-
-	while ((current_data < data_end) && !do_break) {
-		switch (CC_TO_INT (current_data[0], current_data[1],
-		 current_data[2], current_data[3])) {
-			case CC_TO_INT ('m','s','t','t'):
-				offset += cc_handler_mstt (fields, current_data);
-				break;
-			case CC_TO_INT ('m','u','t','y'):
-				offset += cc_handler_muty (fields, current_data);
-				break;
-			case CC_TO_INT ('m','t','c','o'):
-				offset += cc_handler_mtco (fields, current_data);
-				break;
-			case CC_TO_INT ('m','r','c','o'):
-				offset += cc_handler_mrco (fields, current_data);
-				break;
-			case CC_TO_INT ('m','l','c','l'):
-				offset += cc_handler_mlcl (fields, current_data,
-				 DMAP_BYTES_REMAINING);
-				break;
-			default:
-				do_break = TRUE;
-				break;
-		}
-
-		current_data += offset;
-		offset = 0;
-	}
-
-	return fields;
-}
-
-cc_data_t *
-cc_data_new ()
-{
-	cc_data_t *retval;
-
-	retval = g_malloc0 (sizeof (cc_data_t));
-	retval->record_list = NULL;
-
-	return retval;
-}
-
-void
-cc_data_free (cc_data_t *fields)
-{
-	if (NULL != fields->server_name) g_free (fields->server_name);
-
-	g_slist_foreach (fields->record_list,
-	 (GFunc) cc_item_record_free,
-	 NULL);
-	g_slist_free (fields->record_list);
-
-	g_free (fields);
-}
-
-void
-cc_item_record_free (cc_item_record_t *item)
-{
-	if (NULL != item->iname) g_free (item->iname);
-	if (NULL != item->song_data_url) g_free (item->song_data_url);
-	if (NULL != item->song_data_album) g_free (item->song_data_album);
-	if (NULL != item->song_data_artist) g_free (item->song_data_artist);
-	if (NULL != item->song_comment) g_free (item->song_comment);
-	if (NULL != item->song_description) g_free (item->song_description);
-	if (NULL != item->song_genre) g_free (item->song_genre);
-	if (NULL != item->song_format) g_free (item->song_format);
-	if (NULL != item->song_composer) g_free (item->song_composer);
-	if (NULL != item->song_grouping) g_free (item->song_grouping);
-
-	g_free (item);
-}
-
-GSList *
-cc_record_list_deep_copy (GSList *record_list) {
-	GSList *retval = NULL;
-	cc_item_record_t *record, *data;
-
-	for (; record_list; record_list = g_slist_next (record_list)) {
-		data = record_list->data;
-		record = g_malloc0 (sizeof (cc_item_record_t));
-		if (!record) {
-			g_print ("memory allocation failed for cc_record_list_deep_copy\n");
-			return NULL;
-		}
-
-		record->item_kind = data->item_kind;
-		record->song_data_kind = data->song_data_kind;
-		record->song_compilation = data->song_compilation;
-		record->is_smart_pl = data->is_smart_pl;
-		record->is_base_pl = data->is_base_pl;
-
-		record->song_bitrate = data->song_bitrate;
-		record->song_year = data->song_year;
-		record->song_track_no = data->song_track_no;
-		record->song_track_count = data->song_track_count;
-		record->song_disc_count = data->song_disc_count;
-		record->song_disc_no = data->song_disc_no;
-		record->song_bpm = data->song_bpm;
-
-		record->dbid = data->dbid;
-		record->sample_rate = data->sample_rate;
-		record->song_size = data->song_size;
-		record->song_start_time = data->song_start_time;
-		record->song_stop_time = data->song_stop_time;
-		record->song_total_time = data->song_total_time;
-		record->song_date = data->song_date;
-		record->song_date_mod = data->song_date_mod;
-		record->container_id = data->container_id;
-
-		record->deleted_id = data->deleted_id;
-
-		record->persistent_id = data->persistent_id;
-
-		record->iname = g_strdup (data->iname);
-		record->song_data_url = g_strdup (data->song_data_url);
-		record->song_data_album = g_strdup (data->song_data_album);
-		record->song_data_artist = g_strdup (data->song_data_artist);
-		record->song_comment = g_strdup (data->song_comment);
-		record->song_description = g_strdup (data->song_description);
-		record->song_genre = g_strdup (data->song_genre);
-		record->song_format = g_strdup (data->song_format);
-		record->song_composer = g_strdup (data->song_composer);
-		record->song_grouping = g_strdup (data->song_grouping);
-
-		/* db list specific */
-		record->db_n_items = data->db_n_items;
-		record->db_n_playlist = data->db_n_playlist;
-
-		retval = g_slist_prepend (retval, record);
-	}
-
-	return retval;
-}
-
-cc_data_t *
-cc_handler (gchar *data, gint data_len)
-{
-	cc_data_t *retval;
-
-	switch (CC_TO_INT (data[0],data[1],data[2],data[3])) {
-		case CC_TO_INT ('a','d','b','s'):
-			retval = cc_handler_adbs (data, data_len);
-			break;
-		case CC_TO_INT ('m','s','r','v'):
-			retval = cc_handler_msrv (data, data_len);
-			break;
-		case CC_TO_INT ('m','c','c','r'):
-			retval = cc_handler_mccr (data, data_len);
-			break;
-		case CC_TO_INT ('m','l','o','g'):
-			retval = cc_handler_mlog (data, data_len);
-			break;
-		case CC_TO_INT ('m','u','p','d'):
-			retval = cc_handler_mupd (data, data_len);
-			break;
-		case CC_TO_INT ('a','v','d','b'):
-			retval = cc_handler_avdb (data, data_len);
-			break;
-		case CC_TO_INT ('a','p','s','o'):
-			retval = cc_handler_apso (data, data_len);
-			break;
-		case CC_TO_INT ('a','p','l','y'):
-			retval = cc_handler_aply (data, data_len);
-			break;
-		default:
-			retval = NULL;
-			break;
-	}
-
-	return retval;
-}
-

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/cc_handlers.h Deleted

@@ -1,174 +0,0 @@
-/** @file cc_handlers.h
- *
- * Copyright (C) 2006-2007 XMMS2 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; 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.
- */
-
-#ifndef CC_HANDLERS_H
-#define CC_HANDLERS_H
-
-#include <glib.h>
-
-#define CC_TO_INT(a,b,c,d) ((gint) ((a << 24) | \
- (b << 16) | \
- (c << 8) | \
- (d ) ))
-
-#define DMAP_CC_SZ (sizeof (gchar) * 4)
-#define DMAP_BYTE_SZ sizeof (gint8)
-#define DMAP_SHORT_SZ sizeof (gint16)
-#define DMAP_INT_SZ sizeof (gint32)
-#define DMAP_LONG_SZ sizeof (gint64)
-#define DMAP_VERSION_SZ sizeof (gint16)
-
-#define DMAP_UNKNOWN_CC -1
-
-typedef enum {
-	DMAP_CTYPE_BYTE = 1,
-	/* unconfirmed */
-	DMAP_CTYPE_UNSIGNEDBYTE = 2,
-
-	DMAP_CTYPE_SHORT = 3,
-	/* unconfirmed */
-	DMAP_CTYPE_UNSIGNEDSHORT = 4,
-
-	DMAP_CTYPE_INT = 5,
-	/* unconfirmed */
-	DMAP_CTYPE_UNSIGNEDINT = 6,
-
-	DMAP_CTYPE_LONG = 7,
-	/* unconfirmed */
-	DMAP_CTYPE_UNSIGNEDLONG = 8,
-	
-	DMAP_CTYPE_STRING = 9,
-	DMAP_CTYPE_DATE = 10,
-	DMAP_CTYPE_VERSION = 11,
-	DMAP_CTYPE_LIST = 12,
-} content_type;
-
-typedef struct {
-	/* items common to more than one type */
-	gint8 updt_type;
-
-	gint32 n_rec_matches;
-	gint32 n_ret_items;
-	gint32 status;
-
-	GSList *record_list;
-
-	/* msrv - server info */
-	gint8 has_indexing;
-	gint8 has_extensions;
-	gint8 has_update;
-	gint8 has_autologout;
-	gint8 has_queries;
-	gint8 has_resolve;
-	gint8 has_browsing;
-	gint8 has_persistent;
-	gint8 auth_type;
-	gint8 auth_method;
-	gint8 login_required;
-
-	gint16 daap_proto_major;
-	gint16 daap_proto_minor;
-	gint16 dmap_proto_major;
-	gint16 dmap_proto_minor;
-
-	gint32 timeout_interval;
-	gint32 sharing_version;
-	gint32 db_count;
-
-	gchar *server_name;
-
-	/* mccr - content codes */
-	/* none */
-
-	/* mlog - login */
-	guint32 session_id;
-
-	/* mupd - update */
-	guint32 revision_id;
-
-	/* avdb - db list */
-	/* none */
-
-	/* apso - items in playlist */
-	/* none */
-
-	/* aply - playlist list */
-	/* none */
-
-} cc_data_t;
-
-/* mlit -- used in a item listing */
-typedef struct {
-	gint8 item_kind;
-	gint8 song_data_kind;
-	gint8 song_compilation;
-	gint8 is_smart_pl;
-	gint8 is_base_pl;
-	
-	gint16 song_bitrate;
-	gint16 song_year;
-	gint16 song_track_no;
-	gint16 song_track_count;
-	gint16 song_disc_count;
-	gint16 song_disc_no;
-	gint16 song_bpm;
-
-	gint32 dbid;
-	gint32 sample_rate;
-	gint32 song_size;
-	gint32 song_start_time;
-	gint32 song_stop_time;
-	gint32 song_total_time;
-	gint32 song_date;
-	gint32 song_date_mod;
-	gint32 container_id;
-
-	gint32 deleted_id;
-
-	guint64 persistent_id;
-	
-	gchar *iname;
-	gchar *song_data_url;
-	gchar *song_data_album;
-	gchar *song_data_artist;
-	gchar *song_comment;
-	gchar *song_description;
-	gchar *song_genre;
-	gchar *song_format;
-	gchar *song_composer;
-	gchar *song_grouping;
-	
-	/* db list specific */
-	gint32 db_n_items;
-	gint32 db_n_playlist;
-
-} cc_item_record_t;
-
-cc_data_t *
-cc_data_new ();
-
-void
-cc_data_free (cc_data_t *fields);
-
-void
-cc_item_record_free (cc_item_record_t *item);
-
-GSList *
-cc_record_list_deep_copy (GSList *record_list);
-
-cc_data_t *
-cc_handler (gchar *data, gint data_len);
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_cmd.c Deleted

@@ -1,291 +0,0 @@
-/** @file daap_cmd.c
- *  Wrapper functions for issuing DAAP commands.
- *
- *  Copyright (C) 2006-2007 XMMS2 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; 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.
- */
-
-#include "daap_cmd.h"
-#include "daap_conn.h"
-
-static cc_data_t *
-daap_request_data (GIOChannel *chan, const gchar *path, gchar *host, guint request_id);
-static gboolean
-daap_request_stream (GIOChannel *chan, gchar *path, gchar *host,
-                     guint request_id, guint *size);
-static gchar *
-daap_url_append_meta (gchar *url, GSList *meta_list);
-
-guint
-daap_command_login (gchar *host, gint port, guint request_id ) {
-	GIOChannel *chan;
-	cc_data_t *cc_data;
-
-	guint session_id = 0;
-
-	chan = daap_open_connection (host, port);
-	if (!chan) {
-        g_print("Connection to server failed! "
-		        "Please make sure the url is of the form:\n"
-		        "daap://ip[:port]/[song]");
-		return 0;
-	}
-
-	cc_data = daap_request_data (chan, "/login", host, request_id);
-	if (cc_data) {
-		session_id = cc_data->session_id;
-		cc_data_free (cc_data);
-	}
-
-	g_io_channel_shutdown (chan, TRUE, NULL);
-	g_io_channel_unref (chan);
-
-	return session_id;
-}
-
-guint
-daap_command_update (gchar *host, gint port, guint session_id, guint request_id)
-{
-	GIOChannel *chan;
-	gchar *request;
-	cc_data_t *cc_data;
-	guint revision_id = 0;
-
-	chan = daap_open_connection (host, port);
-	if (!chan) {
-		return 0;
-	}
-
-	request = g_strdup_printf ("/update?session-id=%d", session_id);
-
-	cc_data = daap_request_data (chan, request, host, request_id);
-	if (cc_data) {
-		revision_id = cc_data->revision_id;
-		cc_data_free (cc_data);
-	}
-
-	g_free (request);
-	g_io_channel_shutdown (chan, TRUE, NULL);
-	g_io_channel_unref (chan);
-
-	return revision_id;
-}
-
-gboolean
-daap_command_logout (gchar *host, gint port, guint session_id, guint request_id)
-{
-	GIOChannel *chan;
-	gchar *request;
-
-	chan = daap_open_connection (host, port);
-	if (!chan) {
-		return FALSE;
-	}
-
-	request = g_strdup_printf ("/logout?session-id=%d", session_id);
-
-	/* there is no cc_data generated, so we don't need to store it anywhere */
-	daap_request_data (chan, request, host, request_id);
-
-	g_free (request);
-	g_io_channel_shutdown (chan, TRUE, NULL);
-	g_io_channel_unref (chan);
-
-	return TRUE;
-}
-
-GSList *
-daap_command_db_list (gchar *host, gint port, guint session_id,
-                      guint revision_id, guint request_id)
-{
-	GIOChannel *chan;
-	gchar *request;
-	cc_data_t *cc_data;
-	GSList *db_id_list = NULL;
-
-	chan = daap_open_connection (host, port);
-	if (!chan) {
-		return NULL;
-	}
-
-	request = g_strdup_printf ("/databases?session-id=%d&revision-id=%d",
-	                           session_id, revision_id);
-
-	cc_data = daap_request_data (chan, request, host, request_id);
-	g_free (request);
-	if (cc_data) {
-		db_id_list = cc_record_list_deep_copy (cc_data->record_list);
-		cc_data_free (cc_data);
-	}
-
-	g_io_channel_shutdown (chan, TRUE, NULL);
-	g_io_channel_unref (chan);
-
-	return db_id_list;
-}
-
-GSList *
-daap_command_song_list (gchar *host, gint port, guint session_id,
-                        guint revision_id, guint request_id, gint db_id)
-{
-	GIOChannel *chan;
-	gchar *request;
-	cc_data_t *cc_data;
-
-	GSList * song_list;
-	GSList * meta_items = NULL;
-
-	chan = daap_open_connection (host, port);
-	if (!chan) {
-		return NULL;
-	}
-
-	meta_items = g_slist_prepend (meta_items, g_strdup ("dmap.itemid"));
-	meta_items = g_slist_prepend (meta_items, g_strdup ("dmap.itemname"));
-	meta_items = g_slist_prepend (meta_items, g_strdup ("daap.songartist"));
-	meta_items = g_slist_prepend (meta_items, g_strdup ("daap.songformat"));
-	meta_items = g_slist_prepend (meta_items, g_strdup ("daap.songtracknumber"));
-	meta_items = g_slist_prepend (meta_items, g_strdup ("daap.songalbum"));
-
-	request = g_strdup_printf ("/databases/%d/items?"
-	                           "session-id=%d&revision-id=%d",
-	                           db_id, session_id, revision_id);
-
-	if (meta_items) {
-		request = daap_url_append_meta (request, meta_items);
-	}
-
-	cc_data = daap_request_data (chan, request, host, request_id);
-	song_list = cc_record_list_deep_copy (cc_data->record_list);
-
-	g_free (request);
-	cc_data_free (cc_data);
-	g_io_channel_shutdown (chan, TRUE, NULL);
-	g_io_channel_unref (chan);
-	g_slist_foreach (meta_items, (GFunc) g_free, NULL);
-	g_slist_free (meta_items);
-
-	return song_list;
-}
-
-GIOChannel *
-daap_command_init_stream (gchar *host, gint port, guint session_id,
-                          guint revision_id, guint request_id,
-                          gint dbid, gchar *song, guint *filesize)
-{
-	GIOChannel *chan;
-	gchar *request;
-	gboolean ok;
-
-	chan = daap_open_connection (host, port);
-	if (!chan) {
-		return NULL;
-	}
-
-	request = g_strdup_printf ("/databases/%d/items%s"
-	                           "?session-id=%d",
-	                           dbid, song, session_id);
-
-	ok = daap_request_stream (chan, request, host, request_id, filesize);
-	g_free (request);
-
-	if (!ok) {
-		return NULL;
-	}
-
-	return chan;
-}
-
-static cc_data_t *
-daap_request_data (GIOChannel *chan, const gchar *path, gchar *host, guint request_id)
-{
-	guint status;
-	gchar *request, *header = NULL;
-	cc_data_t *retval;
-
-	request = daap_generate_request (path, host, request_id);
-	daap_send_request (chan, request);
-	g_free (request);
-
-	daap_receive_header (chan, &header);
-	if (!header) {
-		return NULL;
-	}
-
-	status = get_server_status (header);
-
-	switch (status) {
-		case UNKNOWN_SERVER_STATUS:
-		case HTTP_BAD_REQUEST:
-		case HTTP_FORBIDDEN:
-		case HTTP_NO_CONTENT:
-		case HTTP_NOT_FOUND:
-			retval = NULL;
-			break;
-		case HTTP_OK:
-		default:
-			retval = daap_handle_data (chan, header);
-			break;
-	}
-	g_free (header);
-
-	return retval;
-}
-
-static gboolean
-daap_request_stream (GIOChannel *chan, gchar *path, gchar *host,
-                     guint request_id, guint *size)
-{
-	guint status;
-	gchar *request, *header = NULL;
-
-	request = daap_generate_request (path, host, request_id);
-	daap_send_request (chan, request);
-	g_free (request);
-
-	daap_receive_header (chan, &header);
-	if (!header) {
-		return FALSE;
-	}
-
-	status = get_server_status (header);
-	if (HTTP_OK != status) {
-		g_free (header);
-		return FALSE;
-	}
-
-	*size = get_data_length (header);
-
-	g_free (header);
-
-	return TRUE;
-}
-
-static gchar *
-daap_url_append_meta (gchar *url, GSList *meta_list)
-{
-	gchar * tmpurl;
-
-	tmpurl = url;
-	url = g_strdup_printf ("%s&meta=%s", url, (gchar *) meta_list->data);
-	g_free (tmpurl);
-	meta_list = g_slist_next (meta_list);
-
-	for ( ; meta_list != NULL; meta_list = g_slist_next (meta_list)) {
-		tmpurl = url;
-		url = g_strdup_printf ("%s,%s", url, (gchar *) meta_list->data);
-		g_free (tmpurl);
-	}
-
-	return url;
-}
-

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_cmd.h Deleted

@@ -1,112 +0,0 @@
-/** @file daap_cmd.h
- *
- *  Copyright (C) 2006-2007 XMMS2 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; 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.
- */
-
-#ifndef DAAP_CMD_H
-#define DAAP_CMD_H
-
-#include "cc_handlers.h"
-
-/**
- * Log into a DAAP server.
- * Issue the command necessary for logging in.
- *
- * @param host host IP of server
- * @param port port that the server uses on host
- * @param request_id the request id
- * @return a session id for use in further commands
- */
-guint
-daap_command_login (gchar *host, gint port, guint request_id);
-
-/**
- * Update the DAAP server status.
- * Issue the command necessary for updating the connection to a DAAP server.
- *
- * @param host host IP of server
- * @param port port that the server uses on host
- * @param session_id the id of the current session
- * @param request_id the request id
- * @return a revision id for use in further commands
- */
-guint
-daap_command_update (gchar *host, gint port, guint session_id, guint request_id);
-
-/**
- * Log out of a DAAP server.
- * Issue the command necessary for logging out.
- *
- * @param host host IP of server
- * @param port port that the server uses on host
- * @param session_id the id of the current session
- * @param request_id the request id
- * @return TRUE on success, FALSE otherwise
- */
-gboolean
-daap_command_logout (gchar *host, gint port, guint session_id, guint request_id);
-
-/**
- * Get a list of databases.
- * Issue the command for fetching a list of song databases on the server.
- *
- * @param host host IP of server
- * @param port port that the server uses on host
- * @param session_id the id of the current session
- * @param revision_id the id of the current revision
- * @param request_id the request id
- * @return a list of database ids
- */
-GSList *
-daap_command_db_list (gchar *host, gint port, guint session_id,
-                      guint revision_id, guint request_id);
-
-/**
- * Get a list of songs in a database.
- * Issue the command for fetching a list of songs in a database on the server.
- *
- * @param host host IP of server
- * @param port port that the server uses on host
- * @param session_id the id of the current session
- * @param revision_id the id of the current revision
- * @param request_id the request id
- * @param db_id the database id
- * @return a list of songs in the database
- */
-GSList *
-daap_command_song_list (gchar *host, gint port, guint session_id,
-                        guint revision_id, guint request_id, gint db_id);
-
-/**
- * Begin streaming a song.
- * Issue the command for streaming a song on the server.
- * NOTE: This command only _begins_ the stream; unlike the other command
- * functions, this one does not close the socket/channel, this must be done
- * manually after reading the data.
- *
- * @param host host IP of server
- * @param port port that the server uses on host
- * @param session_id the id of the current session
- * @param revision_id the id of the current revision
- * @param request_id the request id
- * @param dbid the database id
- * @param song a string containing the id and file type of the song to stream
- * @param filesize a pointer to an integer that stores the content length 
- * @return: a GIOChannel corresponding to streaming song data
- */
-GIOChannel *
-daap_command_init_stream (gchar *host, gint port, guint session_id,
-                          guint revision_id, guint request_id,
-                          gint dbid, gchar *song, guint *filesize);
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_conn.c Deleted

@@ -1,331 +0,0 @@
-/** @file daap_conn.c
- * Manages the connection to a DAAP server.
- *
- * Copyright (C) 2006-2007 XMMS2 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; 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.
- */
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <glib.h>
-#include <glib/gprintf.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-
-
-
-
-
-
-#include "cc_handlers.h"
-#include "daap_md5.h"
-#include "daap_conn.h"
-#include "daap_util.h"
-
-
- GIOChannel *
-daap_open_connection (gchar *host, gint port)
-{
- gint ai_status;
- gint sockfd;
- struct sockaddr_in server;
- struct addrinfo *ai_hint, *ai_result;
- GIOChannel *sock_chan;
- GError *err = NULL;
-
- sockfd = socket (AF_INET, SOCK_STREAM, 0);
- if (sockfd == -1) {
- return NULL;
- }
-
- sock_chan = g_io_channel_unix_new (sockfd);
- if (!g_io_channel_get_close_on_unref (sock_chan)) {
- g_io_channel_set_close_on_unref (sock_chan, TRUE);
- }
-
- g_io_channel_set_flags (sock_chan, G_IO_FLAG_NONBLOCK, &err);
- if (NULL != err) {
- g_print ("Error setting nonblock flag: %s\n", err->message);
- g_io_channel_unref (sock_chan);
- return NULL;
- }
-
- /* call getaddrinfo() to convert a hostname to ip */
-
- ai_hint = g_new0 (struct addrinfo, 1);
- /* FIXME sometime in the future, we probably want to append
- * " | {A,P}F_INET6" for IPv6 support */
- ai_hint->ai_family = AF_INET;
- ai_hint->ai_protocol = PF_INET;
-
- while ((ai_status = getaddrinfo (host, NULL, ai_hint, &ai_result))) {
- if (ai_status != EAI_AGAIN) {
- g_print ("Error with getaddrinfo(): %s", gai_strerror (ai_status));
- g_io_channel_unref (sock_chan);
- return NULL;
- }
- }
-
- memset (&server, 0, sizeof (struct sockaddr_in));
-
- server.sin_addr = ((struct sockaddr_in *) ai_result->ai_addr)->sin_addr;
- server.sin_family = AF_INET;
- server.sin_port = htons (port);
-
- g_free (ai_hint);
- freeaddrinfo (ai_result);
-
- while (42) {
- fd_set fds;
- struct timeval tmout;
- gint sret;
- gint err = 0;
- guint errsize = sizeof (err);
-
- tmout.tv_sec = 3;
- tmout.tv_usec = 0;
-
- sret = connect (sockfd,
- (struct sockaddr *) &server,
- sizeof (struct sockaddr_in));
-
- if (sret == 0) {
- break;
- } else if (sret == -1 && errno != EINPROGRESS) {
- g_print ("connect says: %s", strerror (errno));
- g_io_channel_unref (sock_chan);
- return NULL;
- }
-
- FD_ZERO (&fds);
- FD_SET (sockfd, &fds);
-
-		sret = select (sockfd + 1, NULL, &fds, NULL, &tmout);
-		if (sret <= 0 ) {
-			g_io_channel_unref (sock_chan);
-			return NULL;
-		}
-
-		/** Haha, lol lol ololo sockets in POSIX */
-		if (getsockopt (sockfd, SOL_SOCKET, SO_ERROR, &err, &errsize) < 0) {
-			g_io_channel_unref (sock_chan);
-			return NULL;
-		}
-
-		if (err != 0) {
-			g_print ("Connect call failed!");
-			g_io_channel_unref (sock_chan);
-			return NULL;
-		}
-
-		if (FD_ISSET (sockfd, &fds)) {
-			break;
-		}
-	}
-
-	g_io_channel_set_encoding (sock_chan, NULL, &err);
-	if (NULL != err) {
-		g_print ("Error setting encoding: %s\n", err->message);
-		g_io_channel_unref (sock_chan);
-		return NULL;
-	}
-
-	return sock_chan;
-}
-
-gchar *
-daap_generate_request (const gchar *path, gchar *host, gint request_id)
-{
-	gchar *req;
-	gint8 hash[33];
-
-	memset (hash, 0, 33);
-
-	daap_hash_generate (DAAP_VERSION, (guchar *) path, 2, (guchar *) hash,
-	 request_id);
-
-	req = g_strdup_printf ("GET %s %s\r\n"
-	 "Host: %s\r\n"
-	 "Accept: */*\r\n"
-	 "User-Agent: %s\r\n"
-	 "Accept-Language: en-us, en;q=5.0\r\n"
-	 "Client-DAAP-Access-Index: 2\r\n"
-	 "Client-DAAP-Version: 3.0\r\n"
-	 "Client-DAAP-Validation: %s\r\n"
-	 "Client-DAAP-Request-ID: %d\r\n"
-	 "Connection: close\r\n"
-	 "\r\n",
-	 path, HTTP_VER_STRING, host,
-	 USER_AGENT, hash, request_id);
-	return req;
-}
-
-void
-daap_send_request (GIOChannel *sock_chan, gchar *request)
-{
-	gint n_bytes_to_send;
-
-	n_bytes_to_send = strlen (request);
-
-	write_buffer_to_channel (sock_chan, request, n_bytes_to_send);
-}
-
-void
-daap_receive_header (GIOChannel *sock_chan, gchar **header)
-{
-	guint n_total_bytes_recvd = 0;
-	gsize linelen;
-	gchar *response, *recv_line;
-	GIOStatus io_stat;
-	GError *err = NULL;
-
-	if (NULL != header) {
-		*header = NULL;
-	}
-
-	response = (gchar *) g_malloc0 (sizeof (gchar) * MAX_HEADER_LENGTH);
-	if (NULL == response) {
-		g_print ("Error: couldn't allocate memory for response.\n");
-		return;
-	}
-
-	/* read data from the io channel one line at a time, looking for
-	 * the end of the header */
-	do {
-		io_stat = g_io_channel_read_line (sock_chan, &recv_line, &linelen,
-		 NULL, &err);
-		if (io_stat == G_IO_STATUS_ERROR) {
-			g_print ("Error reading from channel: %s\n", err->message);
-			break;
-		}
-
-		if (NULL != recv_line) {
-			memcpy (response+n_total_bytes_recvd, recv_line, linelen);
-			n_total_bytes_recvd += linelen;
-
-			if (strcmp (recv_line, "\r\n") == 0) {
-				g_free (recv_line);
-				if (NULL != header) {
-					*header = (gchar *) g_malloc0 (sizeof (gchar) *
-					 n_total_bytes_recvd);
-					if (NULL == *header) {
-						g_print ("error: couldn't allocate header\n");
-						break;
-					}
-					memcpy (*header, response, n_total_bytes_recvd);
-				}
-				break;
-			}
-
-			g_free (recv_line);
-		}
-
-		if (io_stat == G_IO_STATUS_EOF) {
-			break;
-		}
-
-		if (n_total_bytes_recvd >= MAX_HEADER_LENGTH) {
-			g_print ("Warning: Maximum header size reached without finding "
-			 "end of header; bailing.\n");
-			break;
-		}
-	} while (TRUE);
-
-	g_free (response);
-
-	if (sock_chan) {
-		g_io_channel_flush (sock_chan, &err);
-		if (NULL != err) {
-			g_print ("Error flushing buffer: %s\n", err->message);
-			return;
-		}
-	}
-}
-
-cc_data_t *
-daap_handle_data (GIOChannel *sock_chan, gchar *header)
-{
-	cc_data_t * retval;
-	gint response_length;
-	gchar *response_data;
-
-	response_length = get_data_length (header);
-
-	if (BAD_CONTENT_LENGTH == response_length) {
-		g_print ("warning: Header does not contain a \""CONTENT_LENGTH
-		 "\" parameter.\n");
-		return NULL;
-	} else if (0 == response_length) {
-		g_print ("warning: "CONTENT_LENGTH" is zero, most likely the result of "
-		 "a bad request.\n");
-		return NULL;
-	}
-
-	response_data = (gchar *) g_malloc0 (sizeof (gchar) * response_length);
-	if (NULL == response_data) {
-		g_print ("error: could not allocate response memory\n");
-		return NULL;
-	}
-
-	read_buffer_from_channel (sock_chan, response_data, response_length);
-
-	retval = cc_handler (response_data, response_length);
-	g_free (response_data);
-
-	return retval;
-}
-
-gint
-get_data_length (gchar *header)
-{
-	gint len;
-	gchar *content_length;
-
-	content_length = strstr (header, CONTENT_LENGTH);
-	if (NULL == content_length) {
-		len = BAD_CONTENT_LENGTH;
-	} else {
-		content_length += strlen (CONTENT_LENGTH);
-		len = atoi (content_length);
-	}
-
-	return len;
-}
-
-gint
-get_server_status (gchar *header)
-{
-	gint status;
-	gchar *server_status;
-
-	server_status = strstr (header, HTTP_VER_STRING);
-	if (NULL == server_status) {
-		status = UNKNOWN_SERVER_STATUS;
-	} else {
-		server_status += strlen (HTTP_VER_STRING" ");
-		status = atoi (server_status);
-	}
-
-	return status;
-}
-

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_conn.h Deleted

@@ -1,65 +0,0 @@
-/** @file daap_conn.h
- *
- *  Copyright (C) 2006-2007 XMMS2 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; 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.
- */
-
-#ifndef DAAP_CONN_H
-#define DAAP_CONN_H
-
-#define MAX_REQUEST_LENGTH 1024
-#define MAX_HEADER_LENGTH (1024 * 16)
-
-#define BAD_CONTENT_LENGTH -1
-
-#define DAAP_VERSION 3
-
-#define HTTP_OK               200
-#define HTTP_NO_CONTENT       204
-#define HTTP_BAD_REQUEST      400
-#define HTTP_FORBIDDEN        403
-#define HTTP_NOT_FOUND        404
-#define UNKNOWN_SERVER_STATUS -1
-
-#define DAAP_URL_PREFIX "daap://"
-#define HTTP_VER_STRING "HTTP/1.1"
-#define CONTENT_LENGTH "Content-Length: "
-#define CONTENT_TYPE "Content-Type: "
-/* TODO does this work ok? */
-#define USER_AGENT "Audacious"
-/*#define USER_AGENT "iTunes/4.6 (Windows; N)"*/
-
-GIOChannel *
-daap_open_connection (gchar *host, gint port);
-
-gchar *
-daap_generate_request (const gchar *path, gchar *host, gint request_id);
-
-void
-daap_send_request (GIOChannel *sock_chan, gchar *request);
-
-void
-daap_receive_header (GIOChannel *sock_chan, gchar **header);
-
-cc_data_t *
-daap_handle_data (GIOChannel *sock_chan, gchar *header);
-
-void
-daap_stream_data (GIOChannel *input, GIOChannel *output, gchar *header);
-
-gint
-get_data_length (gchar *header);
-
-gint
-get_server_status (gchar *header);
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_md5.c Deleted

@@ -1,497 +0,0 @@
-/** @file daap_md5.c
- *
- * Implementation of DAAP (iTunes Music Sharing) hashing, parsing, connection
- * Slightly modified for use in XMMS2
- *
- * Copyright (C) 2004,2005 Charles Schmidt <cschmidt2@emich.edu>
- *
- * 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 <stdio.h>
-#include <string.h>
-
-#include "daap_md5.h"
-
-/* hashing - based on/copied from libopendaap
- * Copyright (c) 2004 David Hammerton
- */
-
-typedef struct {
-	guint32 buf[4];
-	guint32 bits[2];
-	unsigned char in[64];
-	int version;
-} MD5_CTX;
-
-/*
-* This code implements the MD5 message-digest algorithm.
-* The algorithm is due to Ron Rivest. This code was
-* written by Colin Plumb in 1993, no copyright is claimed.
-* This code is in the public domain; do with it what you wish.
-*
-* Equivalent code is available from RSA Data Security, Inc.
-* This code has been tested against that, and is equivalent,
-* except that you don't need to include two pages of legalese
-* with every copy.
-*
-* To compute the message digest of a chunk of bytes, declare an MD5Context
-* structure, pass it to OpenDaap_MD5Init, call OpenDaap_MD5Update as needed
-* on buffers full of bytes, and then call OpenDaap_MD5Final, which will fill
-* a supplied 16-byte array with the digest.
-*/
-static void
-MD5Transform (guint32 buf[4],
- guint32 const in[16],
- gint version);
-/* for some reason we still have to reverse bytes on bigendian machines
- * I don't really know why... but otherwise it fails..
- * Any MD5 gurus out there know why???
- */
-#if 0 //ndef WORDS_BIGENDIAN /* was: HIGHFIRST */
-#define byteReverse (buf, len) /* Nothing */
-#else
-static void
-byteReverse (unsigned char *buf,
- unsigned longs);
-
-#ifndef ASM_MD5
-/*
-* Note: this code is harmless on little-endian machines.
-*/
-static void
-byteReverse (unsigned char *buf,
- unsigned longs)
-{
-	guint32 t;
-	do {
-		t = (guint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
-		 ((unsigned) buf[1] << 8 | buf[0]);
-		*(guint32 *) buf = t;
-		buf += 4;
-	} while (--longs);
-}
-#endif /* ! ASM_MD5 */
-#endif /* #if 0 */
-
-static void
-OpenDaap_MD5Init (MD5_CTX *ctx,
- gint version)
-{
-	memset (ctx, 0, sizeof (MD5_CTX));
-	ctx->buf[0] = 0x67452301;
-	ctx->buf[1] = 0xefcdab89;
-	ctx->buf[2] = 0x98badcfe;
-	ctx->buf[3] = 0x10325476;
-
-	ctx->bits[0] = 0;
-	ctx->bits[1] = 0;
-
-	ctx->version = version;
-}
-
-static void
-OpenDaap_MD5Update (MD5_CTX *ctx,
- unsigned char const *buf,
- unsigned int len)
-{
-	guint32 t;
-
-	/* Update bitcount */
-
-	t = ctx->bits[0];
-	if ((ctx->bits[0] = t + ((guint32) len << 3)) < t)
-		ctx->bits[1]++; /* Carry from low to high */
-	ctx->bits[1] += len >> 29;
-
-	t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */
-
-	/* Handle any leading odd-sized chunks */
-
-	if (t) {
-		unsigned char *p = (unsigned char *) ctx->in + t;
-
-		t = 64 - t;
-		if (len < t) {
-			memcpy (p, buf, len);
-			return;
-		}
-		memcpy (p, buf, t);
-		byteReverse (ctx->in, 16);
-		MD5Transform (ctx->buf, (guint32 *) ctx->in, ctx->version);
-		buf += t;
-		len -= t;
-	}
-	/* Process data in 64-byte chunks */
-
-	while (len >= 64) {
-		memcpy (ctx->in, buf, 64);
-		byteReverse (ctx->in, 16);
-		MD5Transform (ctx->buf, (guint32 *) ctx->in, ctx->version);
-		buf += 64;
-		len -= 64;
-	}
-
-	/* Handle any remaining bytes of data. */
-
-	memcpy (ctx->in, buf, len);
-
-}
-
-static void
-OpenDaap_MD5Final (MD5_CTX *ctx,
- unsigned char digest[16])
-{
-	unsigned count;
-	unsigned char *p;
-
-	/* Compute number of bytes mod 64 */
-	count = (ctx->bits[0] >> 3) & 0x3F;
-
-	/* Set the first char of padding to 0x80. This is safe since there is
-	always at least one byte free */
-	p = ctx->in + count;
-	*p++ = 0x80;
-
-	/* Bytes of padding needed to make 64 bytes */
-	count = 64 - 1 - count;
-
-	/* Pad out to 56 mod 64 */
-	if (count < 8) {
-		/* Two lots of padding: Pad the first block to 64 bytes */
-		memset (p, 0, count);
-		byteReverse (ctx->in, 16);
-		MD5Transform (ctx->buf, (guint32 *) ctx->in, ctx->version);
-
-		/* Now fill the next block with 56 bytes */
-		memset (ctx->in, 0, 56);
-	} else {
-		/* Pad block to 56 bytes */
-		memset (p, 0, count - 8);
-	}
-	byteReverse (ctx->in, 14);
-
-	/* Append length in bits and transform */
-	((guint32 *) ctx->in)[14] = ctx->bits[0];
-	((guint32 *) ctx->in)[15] = ctx->bits[1];
-
-	MD5Transform (ctx->buf, (guint32 *) ctx->in, ctx->version);
-	byteReverse ((unsigned char *) ctx->buf, 4);
-	memcpy (digest, ctx->buf, 16);
-	memset (ctx, 0, sizeof (ctx)); /* In case it's sensitive */
-
-	return;
-}
-
-#ifndef ASM_MD5
-
-/* The four core functions - F1 is optimized somewhat */
-
-/* #define F1(x, y, z) (x & y | ~x & z) */
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1 (z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
-
-/* This is the central step in the MD5 algorithm. */
-#define MD5STEP(f, w, x, y, z, data, s) \
-( w += f (x, y, z) + data, w = w<<s | w>>(32-s), w += x )
-
-/*
-* The core of the MD5 algorithm, this alters an existing MD5 hash to reflect
-* the addition of 16 longwords of new data. OpenDaap_MD5Update blocks the
-* data and converts bytes into longwords for this routine.
-*/
-static void
-MD5Transform (guint32 buf[4],
- guint32 const in[16],
- gint version)
-{
-	guint32 a, b, c, d;
-
-	a = buf[0];
-	b = buf[1];
-	c = buf[2];
-	d = buf[3];
-
-	MD5STEP (F1, a, b, c, d, in[0] + 0xd76aa478, 7);
-	MD5STEP (F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
-	MD5STEP (F1, c, d, a, b, in[2] + 0x242070db, 17);
-	MD5STEP (F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
-	MD5STEP (F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
-	MD5STEP (F1, d, a, b, c, in[5] + 0x4787c62a, 12);
-	MD5STEP (F1, c, d, a, b, in[6] + 0xa8304613, 17);
-	MD5STEP (F1, b, c, d, a, in[7] + 0xfd469501, 22);
-	MD5STEP (F1, a, b, c, d, in[8] + 0x698098d8, 7);
-	MD5STEP (F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
-	MD5STEP (F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
-	MD5STEP (F1, b, c, d, a, in[11] + 0x895cd7be, 22);
-	MD5STEP (F1, a, b, c, d, in[12] + 0x6b901122, 7);
-	MD5STEP (F1, d, a, b, c, in[13] + 0xfd987193, 12);
-	MD5STEP (F1, c, d, a, b, in[14] + 0xa679438e, 17);
-	MD5STEP (F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
-	MD5STEP (F2, a, b, c, d, in[1] + 0xf61e2562, 5);
-	MD5STEP (F2, d, a, b, c, in[6] + 0xc040b340, 9);
-	MD5STEP (F2, c, d, a, b, in[11] + 0x265e5a51, 14);
-	MD5STEP (F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
-	MD5STEP (F2, a, b, c, d, in[5] + 0xd62f105d, 5);
-	MD5STEP (F2, d, a, b, c, in[10] + 0x02441453, 9);
-	MD5STEP (F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
-	MD5STEP (F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
-	MD5STEP (F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
-	MD5STEP (F2, d, a, b, c, in[14] + 0xc33707d6, 9);
-	MD5STEP (F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
-
-	if (version == 1) {
-		MD5STEP (F2, b, c, d, a, in[8] + 0x445a14ed, 20);
-	} else {
-		MD5STEP (F2, b, c, d, a, in[8] + 0x455a14ed, 20);
-	}
-	MD5STEP (F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
-	MD5STEP (F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
-	MD5STEP (F2, c, d, a, b, in[7] + 0x676f02d9, 14);
-	MD5STEP (F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
-	MD5STEP (F3, a, b, c, d, in[5] + 0xfffa3942, 4);
-	MD5STEP (F3, d, a, b, c, in[8] + 0x8771f681, 11);
-	MD5STEP (F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
-	MD5STEP (F3, b, c, d, a, in[14] + 0xfde5380c, 23);
-	MD5STEP (F3, a, b, c, d, in[1] + 0xa4beea44, 4);
-	MD5STEP (F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
-	MD5STEP (F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
-	MD5STEP (F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
-	MD5STEP (F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
-	MD5STEP (F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
-	MD5STEP (F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
-	MD5STEP (F3, b, c, d, a, in[6] + 0x04881d05, 23);
-	MD5STEP (F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
-	MD5STEP (F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
-	MD5STEP (F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
-	MD5STEP (F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
-	MD5STEP (F4, a, b, c, d, in[0] + 0xf4292244, 6);
-	MD5STEP (F4, d, a, b, c, in[7] + 0x432aff97, 10);
-	MD5STEP (F4, c, d, a, b, in[14] + 0xab9423a7, 15);
-	MD5STEP (F4, b, c, d, a, in[5] + 0xfc93a039, 21);
-	MD5STEP (F4, a, b, c, d, in[12] + 0x655b59c3, 6);
-	MD5STEP (F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
-	MD5STEP (F4, c, d, a, b, in[10] + 0xffeff47d, 15);
-	MD5STEP (F4, b, c, d, a, in[1] + 0x85845dd1, 21);
-	MD5STEP (F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
-	MD5STEP (F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
-	MD5STEP (F4, c, d, a, b, in[6] + 0xa3014314, 15);
-	MD5STEP (F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
-	MD5STEP (F4, a, b, c, d, in[4] + 0xf7537e82, 6);
-	MD5STEP (F4, d, a, b, c, in[11] + 0xbd3af235, 10);
-	MD5STEP (F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
-	MD5STEP (F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-
-	buf[0] += a;
-	buf[1] += b;
-	buf[2] += c;
-	buf[3] += d;
-}
-
-#endif
-
-
-
-
-
-static int staticHashDone = 0;
-static unsigned char staticHash_42[256*65] = {0};
-static unsigned char staticHash_45[256*65] = {0};
-
-static const char hexchars[] = "0123456789ABCDEF";
-static char ac[] = "Dpqzsjhiu!3114!Bqqmf!Dpnqvufs-!Jod/"; /* +1 */
-static gboolean ac_unfudged = FALSE;
-
-static void
-DigestToString (const unsigned char *digest,
- char *string)
-{
-	int i;
-	for (i = 0; i < 16; i++) {
-		unsigned char tmp = digest[i];
-		string[i*2+1] = hexchars[tmp & 0x0f];
-		string[i*2] = hexchars[(tmp >> 4) & 0x0f];
-	}
-}
-
-static void
-GenerateStatic_42 () {
-	MD5_CTX ctx;
-	unsigned char *p = staticHash_42;
-	int i;
-	unsigned char buf[16];
-
-	for (i = 0; i < 256; i++) {
-		OpenDaap_MD5Init (&ctx, 0);
-
-#define MD5_STRUPDATE(str) OpenDaap_MD5Update(&ctx, (unsigned char const *)str, strlen (str))
-
-		if ((i & 0x80) != 0)
-			MD5_STRUPDATE ("Accept-Language");
-		else
-			MD5_STRUPDATE ("user-agent");
-
-		if ((i & 0x40) != 0)
-			MD5_STRUPDATE ("max-age");
-		else
-			MD5_STRUPDATE ("Authorization");
-
-		if ((i & 0x20) != 0)
-			MD5_STRUPDATE ("Client-DAAP-Version");
-		else
-			MD5_STRUPDATE ("Accept-Encoding");
-
-		if ((i & 0x10) != 0)
-			MD5_STRUPDATE ("daap.protocolversion");
-		else
-			MD5_STRUPDATE ("daap.songartist");
-
-		if ((i & 0x08) != 0)
-			MD5_STRUPDATE ("daap.songcomposer");
-		else
-			MD5_STRUPDATE ("daap.songdatemodified");
-
-		if ((i & 0x04) != 0)
-			MD5_STRUPDATE ("daap.songdiscnumber");
-		else
-			MD5_STRUPDATE ("daap.songdisabled");
-
-		if ((i & 0x02) != 0)
-			MD5_STRUPDATE ("playlist-item-spec");
-		else
-			MD5_STRUPDATE ("revision-number");
-
-		if ((i & 0x01) != 0)
-			MD5_STRUPDATE ("session-id");
-		else
-			MD5_STRUPDATE ("content-codes");
-#undef MD5_STRUPDATE
-
-		OpenDaap_MD5Final (&ctx, buf);
-		DigestToString (buf, (char *)p);
-		p += 65;
-	}
-}
-
-static void GenerateStatic_45 ()
-{
-	MD5_CTX ctx;
-	unsigned char *p = staticHash_45;
-	int i;
-	unsigned char buf[16];
-
-	for (i = 0; i < 256; i++) {
-		OpenDaap_MD5Init (&ctx, 1);
-
-#define MD5_STRUPDATE(str) OpenDaap_MD5Update(&ctx, (unsigned char const *)str, strlen (str))
-
-		if ((i & 0x40) != 0)
-			MD5_STRUPDATE ("eqwsdxcqwesdc");
-		else
-			MD5_STRUPDATE ("op[;lm,piojkmn");
-
-		if ((i & 0x20) != 0)
-			MD5_STRUPDATE ("876trfvb 34rtgbvc");
-		else
-			MD5_STRUPDATE ("=-0ol.,m3ewrdfv");
-
-		if ((i & 0x10) != 0)
-			MD5_STRUPDATE ("87654323e4rgbv ");
-		else
-			MD5_STRUPDATE ("1535753690868867974342659792");
-
-		if ((i & 0x08) != 0)
-			MD5_STRUPDATE ("Song Name");
-		else
-			MD5_STRUPDATE ("DAAP-CLIENT-ID:");
-
-		if ((i & 0x04) != 0)
-			MD5_STRUPDATE ("111222333444555");
-		else
-			MD5_STRUPDATE ("4089961010");
-
-		if ((i & 0x02) != 0)
-			MD5_STRUPDATE ("playlist-item-spec");
-		else
-			MD5_STRUPDATE ("revision-number");
-
-		if ((i & 0x01) != 0)
-			MD5_STRUPDATE ("session-id");
-		else
-			MD5_STRUPDATE ("content-codes");
-
-		if ((i & 0x80) != 0)
-			MD5_STRUPDATE ("IUYHGFDCXWEDFGHN");
-		else
-			MD5_STRUPDATE ("iuytgfdxwerfghjm");
-
-#undef MD5_STRUPDATE
-
-		OpenDaap_MD5Final (&ctx, buf);
-		DigestToString (buf, (char *)p);
-		p += 65;
-	}
-}
-
-void
-daap_hash_generate (short version_major,
- const guchar *url,
- guchar hash_select,
- guchar *out,
- gint request_id)
-{
-	unsigned char buf[16];
-	MD5_CTX ctx;
-	int i;
-
-	unsigned char *hashTable = (version_major == 3) ?
-	 staticHash_45 : staticHash_42;
-
-	if (!staticHashDone) {
-		GenerateStatic_42 ();
-		GenerateStatic_45 ();
-		staticHashDone = 1;
-	}
-
-	OpenDaap_MD5Init (&ctx, (version_major == 3) ? 1 : 0);
-
-	OpenDaap_MD5Update (&ctx, url, strlen ((const gchar*)url));
-	if (ac_unfudged == FALSE) {
-		for (i = 0; i < strlen (ac); i++) {
-			ac[i] = ac[i]-1;
-		}
-		ac_unfudged = TRUE;
-	}
-	OpenDaap_MD5Update (&ctx, (const guchar*)ac, strlen (ac));
-
-	OpenDaap_MD5Update (&ctx, &hashTable[hash_select * 65], 32);
-
-	if (request_id && version_major == 3) {
-		char scribble[20];
-		sprintf (scribble, "%u", request_id);
-		OpenDaap_MD5Update (&ctx, (const guchar*)scribble, strlen (scribble));
-	}
-
-	OpenDaap_MD5Final (&ctx, buf);
-	DigestToString (buf, (char *)out);
-
-	return;
-}

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_md5.h Deleted

@@ -1,37 +0,0 @@
-/** @file daap_md5.h
- *
- * Header for DAAP (iTunes Music Sharing) hashing, connection
- * Slightly modified for use in XMMS2
- *
- * Copyright (C) 2004,2005 Charles Schmidt <cschmidt2@emich.edu>
- *
- * 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.
- *
- */
-
-#ifndef DAAP_MD5_H
-#define DAAP_MD5_H
-
-#include <glib.h>
-
-void
-daap_hash_generate (short version_major,
- const guchar *url,
- guchar hash_select,
- guchar *out,
- gint request_id);
-
-#endif
-

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_mdns_avahi.c Deleted

@@ -1,268 +0,0 @@
-/** @file daap_mdns_browse.c
- * Browser for DAAP servers shared via mDNS.
- *
- * Copyright (C) 2006-2007 XMMS2 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; 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.
- */
-#ifdef DAAP_MDNS_AVAHI
-#include "daap_mdns_browse.h"
-
-#include <string.h>
-#include <glib.h>
-
-#include <avahi-client/client.h>
-#include <avahi-client/lookup.h>
-
-#include <avahi-common/malloc.h>
-#include <avahi-common/error.h>
-#include <avahi-common/timeval.h>
-
-#include <avahi-glib/glib-watch.h>
-#include <avahi-glib/glib-malloc.h>
-
-#define ADDR_LEN (3 * 4 + 3 + 1) /* standard dotted-quad fmt */
-
-typedef struct {
-	AvahiClient *client;
-	GMainLoop *mainloop;
-} browse_callback_userdata_t;
-
-static GSList *g_server_list = NULL;
-static GStaticMutex serv_list_mut = G_STATIC_MUTEX_INIT;
-static AvahiGLibPoll *gl_poll = NULL;
-static AvahiClient *client = NULL;
-static AvahiServiceBrowser *browser = NULL;
-
-static GSList *
-daap_mdns_serv_remove (GSList *serv_list, gchar *addr, guint port)
-{
-	GSList *first = serv_list;
-	daap_mdns_server_t *serv;
-
-	for ( ; serv_list != NULL; serv_list = g_slist_next (serv_list)) {
-		serv = (daap_mdns_server_t *) serv_list->data;
-		if ( (port == serv->port) && (!strcmp (addr, serv->address)) ) {
-			serv_list = g_slist_remove (first, serv);
-
-			g_free (serv->server_name);
-			g_free (serv->mdns_hostname);
-			g_free (serv->address);
-			g_free (serv);
-
-			return serv_list;
-		}
-	}
-	return NULL;
-}
-
-static void
-daap_mdns_resolve_cb (AvahiServiceResolver *resolv,
- AvahiIfIndex iface,
- AvahiProtocol proto,
- AvahiResolverEvent event,
- const gchar *name,
- const gchar *type,
- const gchar *domain,
- const gchar *hostname,
- const AvahiAddress *addr,
- guint16 port,
- AvahiStringList *text,
- AvahiLookupResultFlags flags,
- void *userdata)
-{
-	gboolean *remove = userdata;
-	gchar ad[ADDR_LEN];
-	daap_mdns_server_t *server;
-
-	if (!resolv) {
-		return;
-	}
-
-	switch (event) {
-		case AVAHI_RESOLVER_FOUND:
-			server = (daap_mdns_server_t *)
-			 g_malloc0 (sizeof (daap_mdns_server_t));
-			avahi_address_snprint (ad, sizeof (ad), addr);
-
-			server->server_name = g_strdup (name);
-			server->address = g_strdup (ad);
-			server->mdns_hostname = g_strdup (hostname);
-			server->port = port;
-
-			if (*remove) {
-				g_static_mutex_lock (&serv_list_mut);
-				g_server_list = daap_mdns_serv_remove (g_server_list, ad, port);
-				g_static_mutex_unlock (&serv_list_mut);
-			} else {
-				g_static_mutex_lock (&serv_list_mut);
-				g_server_list = g_slist_prepend (g_server_list, server);
-				g_static_mutex_unlock (&serv_list_mut);
-			}
-			g_free (remove);
-
-			break;
-
-		case AVAHI_RESOLVER_FAILURE:
-			break;
-
-		default:
-			break;
-	}
-
-	avahi_service_resolver_free (resolv);
-}
-
-static void
-daap_mdns_browse_cb (AvahiServiceBrowser *browser,
- AvahiIfIndex iface,
- AvahiProtocol proto,
- AvahiBrowserEvent event,
- const gchar *name,
- const gchar *type,
- const gchar *domain,
- AvahiLookupResultFlags flags,
- void *userdata)
-{
-	gboolean ok = FALSE;
-	gboolean *b = g_malloc (sizeof (gboolean));
-
-	AvahiClient *client = ((browse_callback_userdata_t *) userdata)->client;
-
-	if (!browser) {
-		return;
-	}
-
-	switch (event) {
-		case AVAHI_BROWSER_NEW:
-			*b = FALSE;
-			ok = (gboolean)
-			 avahi_service_resolver_new (client, iface, proto, name, type,
-			 domain, AVAHI_PROTO_UNSPEC, 0,
-			 daap_mdns_resolve_cb, b);
-			break;
-
-		case AVAHI_BROWSER_REMOVE:
-			*b = TRUE;
-			ok = (gboolean)
-			 avahi_service_resolver_new (client, iface, proto, name, type,
-			 domain, AVAHI_PROTO_UNSPEC, 0,
-			 daap_mdns_resolve_cb, b);
-			break;
-
-		case AVAHI_BROWSER_CACHE_EXHAUSTED:
-			break;
-
-		case AVAHI_BROWSER_ALL_FOR_NOW:
-			break;
-
-		default:
-			break;
-	}
-}
-
-static void
-daap_mdns_client_cb (AvahiClient *client,
- AvahiClientState state,
- void * userdata)
-{
-	if (!client) {
-		return;
-	}
-
-	switch (state) {
-		case AVAHI_CLIENT_FAILURE:
-			break;
-		default:
-			break;
-	}
-}
-
-static void
-daap_mdns_timeout (AvahiTimeout *to, void *userdata)
-{
-}
-
-static gboolean
-daap_mdns_timeout_glib (void *userdata)
-{
-	return FALSE;
-}
-
-gboolean
-daap_mdns_initialize ()
-{
-	const AvahiPoll *av_poll;
-
-	GMainLoop *ml = NULL;
-
-	gboolean ok = TRUE;
-	gint errval;
-	struct timeval tv;
-	browse_callback_userdata_t *browse_userdata;
-
-	if (gl_poll) {
-		ok = FALSE;
-		goto fail;
-	}
-
-	browse_userdata = g_malloc0 (sizeof (browse_callback_userdata_t));
-
-	avahi_set_allocator (avahi_glib_allocator ());
-
-	ml = g_main_loop_new (NULL, FALSE);
-
-	gl_poll = avahi_glib_poll_new (NULL, G_PRIORITY_DEFAULT);
-	av_poll = avahi_glib_poll_get (gl_poll);
-
-	avahi_elapse_time (&tv, 2000, 0);
-	av_poll->timeout_new (av_poll, &tv, daap_mdns_timeout, NULL);
-	g_timeout_add (5000, daap_mdns_timeout_glib, ml);
-
-	client = avahi_client_new (av_poll, 0, daap_mdns_client_cb, ml, &errval);
-	if (!client) {
-		ok = FALSE;
-		goto fail;
-	}
-
-	browse_userdata->client = client;
-	browse_userdata->mainloop = ml;
-
-	browser = avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-	 AVAHI_PROTO_UNSPEC, "_daap._tcp", NULL,
-	 0, daap_mdns_browse_cb,
-	 browse_userdata);
-	if (!browser) {
-		ok = FALSE;
-		goto fail;
-	}
-
-fail:
-	return ok;
-}
-
-GSList *
-daap_mdns_get_server_list ()
-{
-	GSList * l;
-	g_static_mutex_lock (&serv_list_mut);
-	l = g_slist_copy (g_server_list);
-	g_static_mutex_unlock (&serv_list_mut);
-	return l;
-}
-
-void
-daap_mdns_destroy ()
-{
-	/* FIXME: deinit avahi */
-}
-#endif
-

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_mdns_browse.h Deleted

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_mdns_dnssd.c Deleted

@@ -1,419 +0,0 @@
-/** XMMS2 transform for accessing DAAP music shares.
- *
- * Copyright (C) 2006-2007 XMMS2 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; 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.
- */
-#ifdef DAAP_MDNS_DNSSD
-
-#include <glib.h>
-#include <dns_sd.h>
-#include <string.h>
-
-#include "daap_mdns_browse.h"
-
-typedef struct GMDNS_t GMDNS;
-typedef struct GMDNSServer_t GMDNSServer;
-typedef struct GMDNSUserData_t GMDNSUserData;
-
-typedef void (*GMDNSFunc)(GMDNS *, gint, GMDNSServer *, gpointer);
-
-struct GMDNS_t {
-	GMutex *mutex;
-	GSList *service_list;
-
-	GMDNSFunc callback;
-	gpointer user_data;
-	GMDNSUserData *browse_ud;
-};
-
-struct GMDNSUserData_t {
-	GMDNS *mdns;
-	GMDNSServer *server;
-	GPollFD *fd;
-	GSource *source;
-
-	DNSServiceRef client;
-};
-
-struct GMDNSServer_t {
-	gchar *mdnsname;
-	gchar *hostname;
-	gchar *address;
-	GHashTable *txtvalues;
-	guint16 port;
-};
-
-enum {
-	G_MDNS_SERVER_ADD,
-	G_MDNS_SERVER_REMOVE
-};
-
-static void g_mdns_user_data_destroy (GMDNSUserData *ud);
-static void g_mdns_server_destroy (GMDNSServer *server);
-static gboolean g_mdns_poll_add (GMDNS *mdns, GMDNSUserData *ud, DNSServiceRef client);
-
-static GMDNS *g_mdns;
-
-static void
-qr_reply (DNSServiceRef sdRef,
- DNSServiceFlags flags,
- uint32_t ifIndex,
- DNSServiceErrorType errorCode,
- const char *fullname,
- uint16_t rrtype,
- uint16_t rrclass,
- uint16_t rdlen,
- const void *rdata,
- uint32_t ttl,
- void *context)
-{
-	GMDNSUserData *ud = context;
-	gchar addr[1000];
-	const guchar *rd = (guchar *)rdata;
-
-	g_return_if_fail (ud);
-	g_return_if_fail (rrtype == kDNSServiceType_A);
-
-	g_snprintf (addr, 1000, "%d.%d.%d.%d", rd[0], rd[1], rd[2], rd[3]);
-
-	ud->server->address = g_strdup (addr);
-
-	g_print ("adding server %s %s", ud->server->mdnsname, ud->server->address);
-	g_mutex_lock (ud->mdns->mutex);
-	ud->mdns->service_list = g_slist_prepend (ud->mdns->service_list, ud->server);
-	g_mutex_unlock (ud->mdns->mutex);
-
-	if (ud->mdns->callback) {
-		ud->mdns->callback (ud->mdns, G_MDNS_SERVER_ADD, ud->server, ud->mdns->user_data);
-	}
-	g_mdns_user_data_destroy (ud);
-}
-
-
-static void
-resolve_reply (DNSServiceRef client,
- DNSServiceFlags flags,
- uint32_t ifIndex,
- DNSServiceErrorType errorCode,
- const char *fullname,
- const char *hosttarget,
- uint16_t opaqueport,
- uint16_t txtLen,
- const char *txtRecord,
- void *context)
-{
-	GMDNSUserData *ud = context;
-	GMDNSUserData *ud2;
-	DNSServiceErrorType err;
-	gint i;
-	union { guint16 s; guchar b[2]; } portu = { opaqueport };
-
-	g_return_if_fail (ud);
-
-	ud->server->port = ((guint16) portu.b[0]) << 8 | portu.b[1];
-	ud->server->hostname = g_strdup (hosttarget);
-	ud->server->txtvalues = g_hash_table_new_full (g_str_hash, g_str_equal,
-	 g_free, g_free);
-
-	for (i = 0; i < TXTRecordGetCount (txtLen, txtRecord); i++) {
-		gchar key[256];
-		const void *txt_value;
-		gchar *value;
-		guint8 vallen;
-
-		err = TXTRecordGetItemAtIndex (txtLen, txtRecord, i, 256, key, &vallen, &txt_value);
-		if (err != kDNSServiceErr_NoError) {
-			g_warning ("error parsing TXT records!");
-		}
-
-		value = g_malloc (vallen + 1);
-		g_strlcpy (value, txt_value, vallen + 1);
-		g_hash_table_insert (ud->server->txtvalues, g_strdup (key), value);
-	}
-
-	ud2 = g_new0 (GMDNSUserData, 1);
-
-	err = DNSServiceQueryRecord (&ud2->client, 0,
-	 kDNSServiceInterfaceIndexAny,
-	 ud->server->hostname,
-	 kDNSServiceType_A,
-	 kDNSServiceClass_IN,
-	 qr_reply, ud2);
-
-	if (err != kDNSServiceErr_NoError) {
-		g_warning ("Error from QueryRecord!");
-	}
-
-	g_mdns_poll_add (ud->mdns, ud2, ud2->client);
-	ud2->server = ud->server;
-
-	g_mdns_user_data_destroy (ud);
-}
-
-
-static void
-browse_reply (DNSServiceRef client,
- DNSServiceFlags flags,
- uint32_t ifIndex,
- DNSServiceErrorType errorCode,
- const char *replyName,
- const char *replyType,
- const char *replyDomain,
- void *context)
-{
-	DNSServiceErrorType err;
-	GMDNSServer *server;
-	GMDNSUserData *ud = context;
-	GMDNSUserData *ud2;
-	gboolean remove = (flags & kDNSServiceFlagsAdd) ? FALSE : TRUE;
-
-	if (!remove) {
-		server = g_new0 (GMDNSServer, 1);
-		server->mdnsname = g_strdup (replyName);
-		ud2 = g_new0 (GMDNSUserData, 1);
-		err = DNSServiceResolve (&ud2->client, 0, kDNSServiceInterfaceIndexAny,
-		 server->mdnsname,
-		 "_daap._tcp", "local",
-		 (DNSServiceResolveReply)resolve_reply, ud2);
-
-		if (err != kDNSServiceErr_NoError) {
-			g_warning ("Couldn't do ServiceResolv");
-			g_free (server->mdnsname);
-			g_free (server);
-			return;
-		}
-
-		ud2->server = server;
-
-		g_mdns_poll_add (ud->mdns, ud2, ud2->client);
-	} else {
-		GSList *n, *nxt;
-		g_mutex_lock (ud->mdns->mutex);
-		for (n = ud->mdns->service_list; n; n = nxt) {
-			nxt = g_slist_next (n);
-			GMDNSServer *server = n->data;
-			if (strcmp (server->mdnsname, replyName) == 0) {
-				n = ud->mdns->service_list = g_slist_remove (ud->mdns->service_list, server);
-				g_mutex_unlock (ud->mdns->mutex);
-				if (ud->mdns->callback)
-					ud->mdns->callback (ud->mdns, G_MDNS_SERVER_REMOVE, server, ud->mdns->user_data);
-				g_mdns_server_destroy (server);
-				g_mutex_lock (ud->mdns->mutex);
-			}
-		}
-		g_mutex_unlock (ud->mdns->mutex);
-	}
-
-}
-
-static void
-g_mdns_server_destroy (GMDNSServer *server)
-{
-	g_return_if_fail (server);
-	if (server->hostname)
-		g_free (server->hostname);
-	if (server->mdnsname)
-		g_free (server->mdnsname);
-	if (server->address)
-		g_free (server->address);
-	if (server->txtvalues)
-		g_hash_table_destroy (server->txtvalues);
-
-	g_free (server);
-}
-
-static gboolean
-g_mdns_source_prepare (GSource *source, gint *timeout_)
-{
-	/* No timeout here */
-	return FALSE;
-}
-
-static gboolean
-g_mdns_source_check (GSource *source)
-{
-	/* Maybe check for errors here? */
-	return TRUE;
-}
-
-static gboolean
-g_mdns_source_dispatch (GSource *source,
- GSourceFunc callback,
- gpointer user_data)
-{
-	GMDNSUserData *ud = user_data;
-	DNSServiceErrorType err;
-
-	if ((ud->fd->revents & G_IO_ERR) || (ud->fd->revents & G_IO_HUP)) {
-		return FALSE;
-	} else if (ud->fd->revents & G_IO_IN) {
-		err = DNSServiceProcessResult (ud->client);
-		if (err != kDNSServiceErr_NoError) {
-			g_warning ("DNSServiceProcessResult returned error");
-			return FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-static GSourceFuncs g_mdns_poll_funcs = {
-	g_mdns_source_prepare,
-	g_mdns_source_check,
-	g_mdns_source_dispatch,
-	NULL
-};
-
-static void
-g_mdns_user_data_destroy (GMDNSUserData *ud)
-{
-	g_return_if_fail (ud);
-
-	g_source_remove_poll (ud->source, ud->fd);
-	g_free (ud->fd);
-	g_source_destroy (ud->source);
-	DNSServiceRefDeallocate (ud->client);
-	g_free (ud);
-}
-
-static gboolean
-g_mdns_poll_add (GMDNS *mdns, GMDNSUserData *ud, DNSServiceRef client)
-{
-	ud->fd = g_new0 (GPollFD, 1);
-	ud->fd->fd = DNSServiceRefSockFD (client);
-	ud->client = client;
-	ud->mdns = mdns;
-
-	if (ud->fd->fd == -1) {
-		g_free (ud->fd);
-		g_free (ud);
-		return FALSE;
-	}
-
-	ud->fd->events = G_IO_IN | G_IO_HUP | G_IO_ERR;
-
-	ud->source = g_source_new (&g_mdns_poll_funcs, sizeof (GSource));
-	g_source_set_callback (ud->source,
-	 (GSourceFunc) g_mdns_source_dispatch,
-	 ud, NULL);
-	g_source_add_poll (ud->source, ud->fd);
-	g_source_attach (ud->source, NULL);
-
-	return TRUE;
-}
-
-/**
- * Browse for a service. The callback will be called
- * when it's fully resloved and queried
- */
-static gboolean
-g_mdns_browse (GMDNS *mdns,
- gchar *service,
- GMDNSFunc callback,
- gpointer user_data)
-{
-	DNSServiceErrorType err;
-	DNSServiceRef client;
-	GMDNSUserData *ud;
-
-	g_return_val_if_fail (!mdns->browse_ud, FALSE);
-
-	ud = g_new0 (GMDNSUserData, 1);
-
-	err = DNSServiceBrowse (&client, 0, kDNSServiceInterfaceIndexAny,
-	 service, 0, browse_reply, ud);
-
-	if (err != kDNSServiceErr_NoError) {
-		g_warning ("Couldn't setup mDNS poller, error = %d",err);
-		return FALSE;
-	}
-
-	g_mdns_poll_add (mdns, ud, client);
-
-	mdns->callback = callback;
-	mdns->user_data = user_data;
-	mdns->browse_ud = ud;
-
-	return TRUE;
-}
-
-/**
- * Remove updates for browsing. Make sure to
- * call this before you initialize a new browsing
- */
-static gboolean
-g_mdns_stop_browsing (GMDNS *mdns)
-{
-	g_return_val_if_fail (mdns, FALSE);
-
-	g_mdns_user_data_destroy (mdns->browse_ud);
-	mdns->callback = NULL;
-	mdns->user_data = NULL;
-
-	return TRUE;
-}
-
-/**
- * Return the full list of services
- * the list is threadsafe but not the entries
- * so it might be removed while you using it.
- */
-GSList *
-daap_mdns_get_server_list ()
-{
-	GSList *ret=NULL, *n;
-	daap_mdns_server_t *server;
-
-	g_mutex_lock (g_mdns->mutex);
-	for (n = g_mdns->service_list; n; n = g_slist_next (n)) {
-		GMDNSServer *s = n->data;
-		server = g_new0 (daap_mdns_server_t, 1);
-		server->mdns_hostname = s->mdnsname;
-		server->server_name = s->hostname;
-		server->port = s->port;
-		server->address = s->address;
-		ret = g_slist_append (ret, server);
-	}
-	g_mutex_unlock (g_mdns->mutex);
-
-	return ret;
-}
-
-/**
- * Free resources held by GMDNS
- */
-void
-daap_mdns_destroy ()
-{
-	GSList *n;
-	g_return_if_fail (g_mdns);
-
-	g_mdns_stop_browsing (g_mdns);
-
-	g_mutex_lock (g_mdns->mutex);
-	for (n = g_mdns->service_list; n; n = g_slist_next (n)) {
-		g_mdns_server_destroy (n->data);
-	}
-	g_mutex_unlock (g_mdns->mutex);
-	g_mutex_free (g_mdns->mutex);
-
-	g_free (g_mdns);
-}
-
-gboolean
-daap_mdns_initialize ()
-{
-	g_mdns = g_new0 (GMDNS, 1);
-	g_mdns->mutex = g_mutex_new ();
-	return g_mdns_browse (g_mdns, "_daap._tcp", NULL, NULL);
-}
-#endif

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_mdns_dummy.c Deleted

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_util.c Deleted

@@ -1,79 +0,0 @@
-/** @file daap_util.c
- * Miscellaneous utility functions.
- *
- * Copyright (C) 2006-2007 XMMS2 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; 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.
- */
-
-#include <glib.h>
-#include <glib/gprintf.h>
-
-#include "daap_util.h"
-
-void
-write_buffer_to_channel (GIOChannel *chan, gchar *buf, gint bufsize)
-{
-	guint total_sent_bytes = 0;
-	gsize sent_bytes;
-	GIOStatus io_stat;
-	GError *err = NULL;
-
-	do {
-		io_stat = g_io_channel_write_chars (chan,
-		 buf + total_sent_bytes,
-		 bufsize - total_sent_bytes,
-		 &sent_bytes,
-		 &err);
-		if (io_stat == G_IO_STATUS_ERROR) {
-			if (NULL != err) {
-				g_print ("Error writing to channel: %s\n", err->message);
-			}
-			break;
-		}
-
-		bufsize -= sent_bytes;
-		total_sent_bytes += sent_bytes;
-	} while (bufsize > 0);
-
-	g_io_channel_flush (chan, &err);
-	if (NULL != err) {
-		g_print ("warning: error flushing channel: %s\n", err->message);
-	}
-}
-
-gint
-read_buffer_from_channel (GIOChannel *chan, gchar *buf, gint bufsize)
-{
-	guint n_total_bytes_read = 0;
-	gsize read_bytes;
-	GIOStatus io_stat;
-	GError *err = NULL;
-
-	do {
-		io_stat = g_io_channel_read_chars (chan,
-		 buf + n_total_bytes_read,
-		 bufsize - n_total_bytes_read,
-		 &read_bytes,
-		 &err);
-		if (io_stat == G_IO_STATUS_ERROR) {
-			g_print ("warning: error reading from channel: %s\n", err->message);
-		}
-		n_total_bytes_read += read_bytes;
-
-		if (io_stat == G_IO_STATUS_EOF) {
-			break;
-		}
-	} while (bufsize > n_total_bytes_read);
-
-	return n_total_bytes_read;
-}
-

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_util.h Deleted

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/daap_xform.c Deleted

@@ -1,449 +0,0 @@
-/** @file daap_xform.c
- * XMMS2 transform for accessing DAAP music shares.
- *
- * Copyright (C) 2006-2007 XMMS2 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; 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.
- */
-
-/* XXX as of the current implementation, there is no method of logging out
- * of the servers.
- */
-
-#include "xmms/xmms_xformplugin.h"
-#include "xmms/xmms_log.h"
-
-#include "daap_cmd.h"
-#include "daap_util.h"
-#include "daap_mdns_browse.h"
-
-#include <stdlib.h>
-#include <glib.h>
-#include <glib/gprintf.h>
-
-#define DEFAULT_DAAP_PORT 3689
-
-/*
- * Type definitions
- */
-
-typedef struct {
-	gchar *host;
-	guint port;
-
-	GIOChannel *channel;
-
-	xmms_error_t status;
-} xmms_daap_data_t;
-
-typedef struct {
-	gboolean logged_in;
-
-	guint session_id;
-	guint revision_id;
-	guint request_id;
-} xmms_daap_login_data_t;
-
-static GHashTable *login_sessions = NULL;
-
-/*
- * Function prototypes
- */
-
-static gboolean
-xmms_daap_plugin_setup (xmms_xform_plugin_t *xform_plugin);
-static gboolean
-xmms_daap_init (xmms_xform_t *xform);
-static void
-xmms_daap_destroy (xmms_xform_t *xform);
-static gint
-xmms_daap_read (xmms_xform_t *xform, void *buffer,
- gint len, xmms_error_t *error);
-static gboolean
-xmms_daap_browse (xmms_xform_t *xform, const gchar *url, xmms_error_t *error);
-
-/*
- * Plugin header
- */
-XMMS_XFORM_PLUGIN ("daap",
- "DAAP access plugin",
- "SoC",
- "Accesses iTunes (DAAP) music shares",
- xmms_daap_plugin_setup);
-
-
-/**
- * Extract hostname, port and command from an url.
- * daap://hostname:port/command
- */
-static gboolean
-get_data_from_url (const gchar *url, gchar **host, guint *port, gchar **cmd, xmms_error_t *err)
-{
-	const gchar *port_ptr, *cmd_ptr, *end_ptr, *stripped;
-
-	stripped = url + sizeof (gchar) * strlen ("daap://");
-
-	end_ptr = stripped + sizeof (gchar) * strlen (stripped);
-
-	if (stripped == end_ptr) {
-		xmms_error_set (err, XMMS_ERROR_INVAL, "Empty URL");
-		return FALSE;
-	}
-
-	port_ptr = strstr (stripped, ":");
-	if (port && port_ptr && (port_ptr + 1) != end_ptr) {
-		*port = strtol (port_ptr + 1, (gchar **) NULL, 10);
-		if (*port == 0) {
-			*port = DEFAULT_DAAP_PORT;
-		}
-	} else if (port) {
-		*port = DEFAULT_DAAP_PORT;
-	}
-
-	cmd_ptr = strstr (stripped, "/");
-	if (cmd && cmd_ptr && (cmd_ptr + 1) != end_ptr) {
-		*cmd = g_strdup (cmd_ptr);
-	} else if (cmd) {
-		/* cmd wanted but not found */
-		xmms_error_set (err, XMMS_ERROR_INVAL, "No file requested");
-	} else if (!cmd && cmd_ptr && (cmd_ptr + 1) != end_ptr) {
-		/* cmd not wanted but found */
-		xmms_error_set (err, XMMS_ERROR_NOENT, "No such directory");
-		return FALSE;
-	}
-
-	if (port_ptr) {
-		*host = g_strndup (stripped, port_ptr - stripped);
-	} else if (cmd_ptr) {
-		*host = g_strndup (stripped, cmd_ptr - stripped);
-	} else {
-		*host = g_strdup (stripped);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-xmms_daap_plugin_setup (xmms_xform_plugin_t *xform_plugin)
-{
-	xmms_xform_methods_t methods;
-
-	XMMS_XFORM_METHODS_INIT (methods);
-	methods.init = xmms_daap_init;
-	methods.destroy = xmms_daap_destroy;
-	methods.read = xmms_daap_read;
-	methods.browse = xmms_daap_browse;
-
-	xmms_xform_plugin_methods_set (xform_plugin, &methods);
-
-	xmms_xform_plugin_indata_add (xform_plugin,
-	 XMMS_STREAM_TYPE_MIMETYPE,
-	 "application/x-url",
-	 XMMS_STREAM_TYPE_URL,
-	 "daap://*",
-	 XMMS_STREAM_TYPE_END);
-
-	daap_mdns_initialize ();
-
-	if (!login_sessions) {
-		login_sessions = g_hash_table_new (g_str_hash, g_str_equal);
-	}
-
-	return TRUE;
-}
-
-
-/**
- * Add a song to the browsing list.
- */
-static void
-daap_add_song_to_list (xmms_xform_t *xform, cc_item_record_t *song)
-{
-	gchar *songurl;
-
-	songurl = g_strdup_printf ("%u.%s", song->dbid, song->song_format);
-	xmms_xform_browse_add_entry (xform, songurl, 0);
-	g_free (songurl);
-
-	if (song->iname) {
-		xmms_xform_browse_add_entry_property_str (xform, "title",
-		 song->iname);
-	}
-
-	if (song->song_data_artist) {
-		xmms_xform_browse_add_entry_property_str (xform, "artist",
-		 song->song_data_artist);
-	}
-
-	if (song->song_data_album) {
-		xmms_xform_browse_add_entry_property_str (xform, "album",
-		 song->song_data_album);
-	}
-
-	xmms_xform_browse_add_entry_property_int (xform, "tracknr",
-	 song->song_track_no);
-}
-
-
-/**
- * Scan a daap server for songs.
- */
-static gboolean
-daap_get_urls_from_server (xmms_xform_t *xform, gchar *host, guint port,
- xmms_error_t *err)
-{
-	GSList *dbid_list = NULL;
-	GSList *song_list = NULL, *song_el;
-	cc_item_record_t *db_data;
-	xmms_daap_login_data_t *login_data;
-	gchar *hash;
-
-	hash = g_strdup_printf ("%s:%u", host, port);
-
-	login_data = g_hash_table_lookup (login_sessions, hash);
-
-	if (!login_data) {
-		login_data = g_new0 (xmms_daap_login_data_t, 1);
-
-		login_data->session_id = daap_command_login (host, port, 0, err);
-		if (xmms_error_iserror (err)) {
-			return FALSE;
-		}
-
-		login_data->revision_id = daap_command_update (host, port,
-		 login_data->session_id,
-		 0);
-
-		login_data->request_id = 1;
-		login_data->logged_in = TRUE;
-
-		g_hash_table_insert (login_sessions, hash, login_data);
-	} else {
-		login_data->revision_id = daap_command_update (host, port,
-		 login_data->session_id,
-		 0);
-	}
-
-	dbid_list = daap_command_db_list (host, port, login_data->session_id,
-	 login_data->revision_id, 0);
-	if (!dbid_list) {
-		return FALSE;
-	}
-
-	/* XXX i've never seen more than one db per server out in the wild,
-	 * let's hope that never changes *wink*
-	 * just use the first db in the list */
-	db_data = (cc_item_record_t *) dbid_list->data;
-	song_list = daap_command_song_list (host, port, login_data->session_id,
-	 login_data->revision_id,
-	 0, db_data->dbid);
-
-	g_slist_foreach (dbid_list, (GFunc) cc_item_record_free, NULL);
-	g_slist_free (dbid_list);
-
-	if (!song_list) {
-		return FALSE;
-	}
-
-	for (song_el = song_list; song_el; song_el = g_slist_next (song_el)) {
-		daap_add_song_to_list (xform, song_el->data);
-	}
-
-	g_slist_foreach (song_list, (GFunc) cc_item_record_free, NULL);
-	g_slist_free (song_list);
-
-	return TRUE;
-}
-
-
-/*
- * Member functions
- */
-
-static gboolean
-xmms_daap_init (xmms_xform_t *xform)
-{
-	gint dbid;
-	GSList *dbid_list = NULL;
-	xmms_daap_data_t *data;
-	xmms_daap_login_data_t *login_data;
-	xmms_error_t err;
-	const gchar *url;
-	const gchar *metakey;
-	gchar *command, *hash;
-	guint filesize;
-
-	g_return_val_if_fail (xform, FALSE);
-
-	url = xmms_xform_indata_get_str (xform, XMMS_STREAM_TYPE_URL);
-
-	g_return_val_if_fail (url, FALSE);
-
-	data = g_new0 (xmms_daap_data_t, 1);
-
-	xmms_error_reset (&err);
-
-	if (!get_data_from_url (url, &(data->host), &(data->port), &command, &err)) {
-		return FALSE;
-	}
-
-	hash = g_strdup_printf ("%s:%u", data->host, data->port);
-
-	login_data = g_hash_table_lookup (login_sessions, hash);
-	if (!login_data) {
-		XMMS_DBG ("creating login data for %s", hash);
-		login_data = g_new0 (xmms_daap_login_data_t, 1);
-
-		login_data->request_id = 1;
-		login_data->logged_in = TRUE;
-
-		login_data->session_id = daap_command_login (data->host, data->port,
-		 login_data->request_id,
-		 &err);
-		if (xmms_error_iserror (&err)) {
-			return FALSE;
-		}
-
-		g_hash_table_insert (login_sessions, hash, login_data);
-	}
-
-	login_data->revision_id = daap_command_update (data->host, data->port,
-	 login_data->session_id,
-	 login_data->request_id);
-	dbid_list = daap_command_db_list (data->host, data->port,
-	 login_data->session_id,
-	 login_data->revision_id,
-	 login_data->request_id);
-	if (!dbid_list) {
-		return FALSE;
-	}
-
-	/* XXX: see XXX in the browse function above */
-	dbid = ((cc_item_record_t *) dbid_list->data)->dbid;
-	/* want to request a stream, but don't read the data yet */
-	data->channel = daap_command_init_stream (data->host, data->port,
-	 login_data->session_id,
-	 login_data->revision_id,
-	 login_data->request_id, dbid,
-	 command, &filesize);
-	if (! data->channel) {
-		return FALSE;
-	}
-	login_data->request_id++;
-
-	metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_SIZE;
-	xmms_xform_metadata_set_int (xform, metakey, filesize);
-
-	xmms_xform_private_data_set (xform, data);
-
-	xmms_xform_outdata_type_add (xform,
-	 XMMS_STREAM_TYPE_MIMETYPE,
-	 "application/octet-stream",
-	 XMMS_STREAM_TYPE_END);
-
-	g_slist_foreach (dbid_list, (GFunc) cc_item_record_free, NULL);
-	g_slist_free (dbid_list);
-	g_free (command);
-
-	return TRUE;
-}
-
-static void
-xmms_daap_destroy (xmms_xform_t *xform)
-{
-	xmms_daap_data_t *data;
-
-	data = xmms_xform_private_data_get (xform);
-
-	g_io_channel_shutdown (data->channel, TRUE, NULL);
-	g_io_channel_unref (data->channel);
-
-	g_free (data->host);
-	g_free (data);
-}
-
-static gint
-xmms_daap_read (xmms_xform_t *xform, void *buffer, gint len, xmms_error_t *error)
-{
-	xmms_daap_data_t *data;
-	gsize read_bytes = 0;
-	GIOStatus status;
-
-	data = xmms_xform_private_data_get (xform);
-
-	/* request is performed, header is stripped. now read the data. */
-	while (read_bytes == 0) {
-		status = g_io_channel_read_chars (data->channel, buffer, len,
-		 &read_bytes, NULL);
-		if (status == G_IO_STATUS_EOF || status == G_IO_STATUS_ERROR) {
-			break;
-		}
-	}
-
-	return read_bytes;
-}
-
-
-static gboolean
-xmms_daap_browse (xmms_xform_t *xform, const gchar *url, xmms_error_t *error)
-{
-	gboolean ret = FALSE;
-
-	if (g_strcasecmp (url, "daap://") == 0) {
-
-		GSList *sl = daap_mdns_get_server_list ();
-
-		for (; sl; sl = g_slist_next (sl)) {
-			daap_mdns_server_t *mdns_serv;
-			gchar *str;
-
-			mdns_serv = sl->data;
-
-			str = g_strdup_printf ("%s:%d", mdns_serv->address,
-			 mdns_serv->port);
-			xmms_xform_browse_add_entry (xform, str, XMMS_XFORM_BROWSE_FLAG_DIR);
-			g_free (str);
-
-			xmms_xform_browse_add_entry_property_str (xform, "servername",
-			 mdns_serv->server_name);
-
-			xmms_xform_browse_add_entry_property_str (xform, "ip",
-			 mdns_serv->address);
-
-			xmms_xform_browse_add_entry_property_str (xform, "name",
-			 mdns_serv->mdns_hostname);
-
-			xmms_xform_browse_add_entry_property_int (xform, "port",
-			 mdns_serv->port);
-
-			/* TODO implement the machinery to allow for this */
-			// val = xmms_object_cmd_value_int_new (mdns_serv->need_auth);
-			// xmms_xform_browse_add_entry_property (xform, "passworded", val);
-			// val = xmms_object_cmd_value_int_new (mdns_serv->version);
-			// xmms_xform_browse_add_entry_property (xform, "version", val);
-		}
-
-		ret = TRUE;
-
-		g_slist_free (sl);
-	} else {
-		gchar *host;
-		guint port;
-
-		if (get_data_from_url (url, &host, &port, NULL, error)) {
-			ret = daap_get_urls_from_server (xform, host, port, error);
-			g_free (host);
-		}
-	}
-
-	return ret;
-}

audacious-plugins-2.5.3.tar.gz/src/daap/xmms2-daap/wscript Deleted

@@ -1,36 +0,0 @@
-from waftools.plugin import plugin
-from Params import g_platform
-
-def plugin_configure(conf):
-    # Set the default fallthrough, if no "intelligent" backend is found.
-    conf.env['XMMS_DAAP_BACKEND'] = 'dummy'
-
-    # First look for Avahi mdns support
-    if (conf.check_pkg("avahi-glib", destvar='avahiglib') and
-        conf.check_pkg("avahi-client", destvar='avahiclient')):
-        # Avahi found
-        conf.env['XMMS_DAAP_BACKEND'] = 'avahi'
-    elif conf.check_header('dns_sd.h'):
-        # We might have dnssd support. If we're not on OSX, check for the
-        # presence of the lib.
-        if g_platform == 'darwin':
-            conf.env['XMMS_DAAP_BACKEND'] = 'dnssd'
-        elif conf.check_library2('dns_sd', uselib='dnssd', mandatory=0):
-            conf.env['XMMS_DAAP_BACKEND'] = 'dnssd'
-    return True
-
-def plugin_build(bld, obj):
-    daap_backend = bld.env_of_name('default')['XMMS_DAAP_BACKEND']
-    obj.source.append("daap_mdns_%s.c" % daap_backend)
-    if daap_backend == 'avahi':
-        obj.uselib += ' avahiglib avahiclient'
-    elif daap_backend == 'dnssd':
-        obj.uselib += ' dnssd'
-    if g_platform == 'win32':
-        obj.uselib += ' socket'
-
-configure, build = plugin('daap', configure=plugin_configure,
-                          extra_libs=['curl'], build=plugin_build,
-                          source="""daap_xform.c daap_cmd.c daap_conn.c
-                                    daap_util.c daap_md5.c cc_handlers.c
-                                 """.split())

audacious-plugins-2.5.3.tar.gz/src/evdev-plug Deleted

audacious-plugins-2.5.3.tar.gz/src/evdev-plug/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/evdev-plug/ed.c Deleted

@@ -1,282 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
-*
-* 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 "ed.h"
-#include "ed_types.h"
-#include "ed_internals.h"
-#include "ed_actions.h"
-#include "ed_ui.h"
-#include "ed_common.h"
-
-#include <audacious/drct.h>
-#include <audacious/i18n.h>
-#include <libaudcore/hook.h>
-
-GeneralPlugin *evdevplug_gplist[] = { &ed_gp, NULL };
-SIMPLE_GENERAL_PLUGIN(evdev-plug, evdevplug_gplist);
-
-GList *ed_device_listening_list = NULL;
-gboolean plugin_is_active = FALSE;
-
-/* action callbacks */
-void ed_action_pb_play ( gpointer );
-void ed_action_pb_stop ( gpointer );
-void ed_action_pb_pause ( gpointer );
-void ed_action_pb_prev ( gpointer );
-void ed_action_pb_next ( gpointer );
-void ed_action_pb_eject ( gpointer );
-void ed_action_vol_up5 ( gpointer );
-void ed_action_vol_down5 ( gpointer );
-void ed_action_vol_up10 ( gpointer );
-void ed_action_vol_down10 ( gpointer );
-void ed_action_vol_mute ( gpointer );
-void ed_action_win_main ( gpointer );
-void ed_action_win_playlist ( gpointer );
-void ed_action_win_equalizer ( gpointer );
-void ed_action_win_jtf ( gpointer );
-void ed_action_pl_repeat ( gpointer );
-void ed_action_pl_shuffle ( gpointer );
-
-/* map action codes to ed_action_t objects */
-ed_action_t player_actions[] =
-{
- [ED_ACTION_PB_PLAY] = { N_("Playback->Play") , ed_action_pb_play },
- [ED_ACTION_PB_STOP] = { N_("Playback->Stop") , ed_action_pb_stop },
- [ED_ACTION_PB_PAUSE] = { N_("Playback->Pause") , ed_action_pb_pause },
- [ED_ACTION_PB_PREV] = { N_("Playback->Prev") , ed_action_pb_prev },
- [ED_ACTION_PB_NEXT] = { N_("Playback->Next") , ed_action_pb_next },
- [ED_ACTION_PB_EJECT] = { N_("Playback->Eject") , ed_action_pb_eject },
-
- [ED_ACTION_PL_REPEAT] = { N_("Playlist->Repeat") , ed_action_pl_repeat },
- [ED_ACTION_PL_SHUFFLE] = { N_("Playlist->Shuffle") , ed_action_pl_shuffle },
-
- [ED_ACTION_VOL_UP5] = { N_("Volume->Up_5") , ed_action_vol_up5 },
- [ED_ACTION_VOL_DOWN5] = { N_("Volume->Down_5") , ed_action_vol_down5 },
- [ED_ACTION_VOL_UP10] = { N_("Volume->Up_10") , ed_action_vol_up10 },
- [ED_ACTION_VOL_DOWN10] = { N_("Volume->Down_10") , ed_action_vol_down10 },
- [ED_ACTION_VOL_MUTE] = { N_("Volume->Mute") , ed_action_vol_mute },
-
- [ED_ACTION_WIN_MAIN] = { N_("Window->Main") , ed_action_win_main },
- [ED_ACTION_WIN_PLAYLIST] = { N_("Window->Playlist") , ed_action_win_playlist },
- [ED_ACTION_WIN_EQUALIZER] = { N_("Window->Equalizer") , ed_action_win_equalizer },
- [ED_ACTION_WIN_JTF] = { N_("Window->JumpToFile") , ed_action_win_jtf }
-};
-
-
-
-/* ***************** */
-/* plug-in functions */
-
-gboolean ed_init (void)
-{
- g_log_set_handler( NULL , G_LOG_LEVEL_WARNING , g_log_default_handler , NULL );
-
- plugin_is_active = TRUE; /* go! */
-
- /* read event devices and bindings from user
- configuration and start listening for active ones */
- ed_device_start_listening_from_config();
-
- return TRUE;
-}
-
-
-void
-ed_cleanup ( void )
-{
- /* shut down all devices being listened */
- ed_device_stop_listening_all( TRUE );
-
- plugin_is_active = FALSE; /* stop! */
-
- return;
-}
-
-
-void
-ed_config ( void )
-{
- ed_ui_config_show();
-}
-
-
-void
-ed_about ( void )
-{
- ed_ui_about_show();
-}
-
-
-
-/* ************** */
-/* player actions */
-
-void
-ed_action_call ( gint code , gpointer param )
-{
- DEBUGMSG( "Calling action; code %i ( %s )\n" , code , player_actions[code].desc );
-
- /* activate callback for requested action */
- player_actions[code].callback( param );
-}
-
-
-void
-ed_action_pb_play ( gpointer param )
-{
- aud_drct_play();
-}
-
-void
-ed_action_pb_stop ( gpointer param )
-{
- aud_drct_stop();
-}
-
-void
-ed_action_pb_pause ( gpointer param )
-{
- if (aud_drct_get_playing() || aud_drct_get_paused())
- aud_drct_pause();
- else
- aud_drct_play();
-}
-
-void
-ed_action_pb_prev ( gpointer param )
-{
- aud_drct_pl_prev();
-}
-
-void
-ed_action_pb_next ( gpointer param )
-{
- aud_drct_pl_next();
-}
-
-void
-ed_action_pb_eject ( gpointer param )
-{
- hook_call ("filebrowser show", GINT_TO_POINTER (TRUE));
-}
-
-void
-ed_action_pl_repeat ( gpointer param )
-{
- aud_drct_pl_repeat_toggle();
-}
-
-void
-ed_action_pl_shuffle ( gpointer param )
-{
- aud_drct_pl_shuffle_toggle();
-}
-
-void
-ed_action_vol_up5 ( gpointer param )
-{
- gint vl, vr;
- aud_drct_get_volume( &vl , &vr );
- aud_drct_set_volume( CLAMP(vl + 5, 0, 100) , CLAMP(vr + 5, 0, 100) );
-}
-
-void
-ed_action_vol_down5 ( gpointer param )
-{
- gint vl, vr;
- aud_drct_get_volume( &vl , &vr );
- aud_drct_set_volume( CLAMP(vl - 5, 0, 100) , CLAMP(vr - 5, 0, 100) );
-}
-
-void
-ed_action_vol_up10 ( gpointer param )
-{
- gint vl, vr;
- aud_drct_get_volume( &vl , &vr );
- aud_drct_set_volume( CLAMP(vl + 10, 0, 100) , CLAMP(vr + 10, 0, 100) );
-}
-
-void
-ed_action_vol_down10 ( gpointer param )
-{
- gint vl, vr;
- aud_drct_get_volume( &vl , &vr );
- aud_drct_set_volume( CLAMP(vl - 10, 0, 100) , CLAMP(vr - 10, 0, 100) );
-}
-
-void
-ed_action_vol_mute ( gpointer param )
-{
- static gint vl = -1;
- static gint vr = -1;
-
- if ( vl == -1 ) /* no previous memory of volume before mute action */
- {
- aud_drct_get_volume( &vl , &vr ); /* memorize volume before mute */
- aud_drct_set_volume( 0 , 0 ); /* mute */
- }
- else /* memorized volume values exist */
- {
- gint vl_now = 0;
- gint vr_now = 0;
-
- aud_drct_get_volume( &vl_now , &vr_now );
- if (( vl_now == 0 ) && ( vr_now == 0 ))
- {
- /* the volume is still muted, restore the old values */
- aud_drct_set_volume( vl , vr );
- vl = -1; vr = -1; /* reset these for next use */
- }
- else
- {
- /* the volume has been raised with other commands, act as if there wasn't a previous memory */
- aud_drct_get_volume( &vl , &vr ); /* memorize volume before mute */
- aud_drct_set_volume( 0 , 0 ); /* mute */
- }
- }
-}
-
-void
-ed_action_win_main ( gpointer param )
-{
- hook_call ("interface toggle visibility", NULL);
-}
-
-void
-ed_action_win_playlist ( gpointer param )
-{
-#if 0
- aud_drct_pl_win_toggle( !aud_drct_pl_win_is_visible () );
-#endif
-}
-
-void
-ed_action_win_equalizer ( gpointer param )
-{
-#if 0
- aud_drct_eq_win_toggle( !aud_drct_eq_win_is_visible () );
-#endif
-}
-
-void
-ed_action_win_jtf ( gpointer param )
-{
- hook_call ("interface show jump to track", NULL);
-}

audacious-plugins-2.5.3.tar.gz/src/evdev-plug/ed.h Deleted

@@ -1,42 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
-*
-* 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
-*
-*/
-
-#ifndef _I_ED_H
-#define _I_ED_H 1
-
-#include "ed_common.h"
-#include <glib.h>
-#include <audacious/plugin.h>
-
-gboolean ed_init (void);
-void ed_cleanup ( void );
-void ed_config ( void );
-void ed_about ( void );
-
-GeneralPlugin ed_gp =
-{
- .description = "EvDev-Plug " ED_VERSION_PLUGIN,
- .init = ed_init,
- .about = ed_about,
- .configure = ed_config,
- .cleanup = ed_cleanup
-};
-
-#endif /* !_I_ED_H */

audacious-plugins-2.5.3.tar.gz/src/evdev-plug/ed_actions.h Deleted

@@ -1,62 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
-*
-* 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
-*
-*/
-
-#ifndef _I_ED_ACTIONS_H
-#define _I_ED_ACTIONS_H 1
-
-#include "ed_common.h"
-#include <glib.h>
-
-/* ed_action_t object structure */
-typedef struct
-{
- const gchar * desc;
- void (*callback)( gpointer );
-}
-ed_action_t;
-
-/* action codes */
-enum
-{
- ED_ACTION_PB_PLAY = 0,
- ED_ACTION_PB_STOP = 1,
- ED_ACTION_PB_PAUSE = 2,
- ED_ACTION_PB_PREV = 3,
- ED_ACTION_PB_NEXT = 4,
- ED_ACTION_PB_EJECT = 5,
-
- ED_ACTION_PL_REPEAT = 10,
- ED_ACTION_PL_SHUFFLE = 11,
-
- ED_ACTION_VOL_UP5 = 20,
- ED_ACTION_VOL_DOWN5 = 21,
- ED_ACTION_VOL_UP10 = 22,
- ED_ACTION_VOL_DOWN10 = 23,
- ED_ACTION_VOL_MUTE = 24,
-
- ED_ACTION_WIN_MAIN = 30,
- ED_ACTION_WIN_PLAYLIST = 31,
- ED_ACTION_WIN_EQUALIZER = 32,
- ED_ACTION_WIN_JTF = 33
-};
-
-void ed_action_call ( gint , gpointer );
-
-#endif /* !_I_ED_ACTIONS_H */

audacious-plugins-2.5.3.tar.gz/src/evdev-plug/ed_bindings_store.c Deleted

@@ -1,137 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
-*
-* 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 "ed_bindings_store.h"
-#include "ed_common.h"
-#include <stdlib.h>
-
-
-/* currently, the bindings store is implemented as a string-based Hash Table;
- however, a change of implementation would only require to re-write the
- public API defined in this source file;
- the rest of the code in EvDev-Plug doesn't care about the
- implementation at all, and access it in a transparent fashion */
-
-
-gpointer
-ed_bindings_store_new ( void )
-{
- GHashTable *hashtable = g_hash_table_new_full( g_str_hash , g_str_equal , g_free , NULL );
- return hashtable;
-}
-
-
-/* associate a triplet ev_type:ev_code:ev_value
- (identifying an input event) to an action code in our bindings store;
- bindings store should keep its own copy of ed_inputevent_t objects! */
-gint
-ed_bindings_store_insert ( gpointer hashtable_gp ,
- ed_inputevent_t * inputev ,
- gint action_code )
-{
- gchar *input_str;
- input_str = g_strdup_printf( "%i:%i:%i" , inputev->type , inputev->code , inputev->value );
- g_hash_table_insert( (GHashTable*)hashtable_gp , input_str , GINT_TO_POINTER(action_code) );
-
- DEBUGMSG( "storing code %i -> event: %i:%i:%i\n" ,
- action_code , inputev->type, inputev->code, inputev->value );
- return 0;
-}
-
-
-typedef struct
-{
- ed_bindings_store_foreach_func callback;
- gpointer data1;
- gpointer data2;
-}
-hashfunc_foreach_container_t;
-
-static void
-hashfunc_foreach( gpointer key , gpointer value , gpointer container_gp )
-{
- hashfunc_foreach_container_t *container = container_gp;
- ed_inputevent_t inputev;
- gchar **toks;
-
- /* convert key (it's a string in the "type:code:value" form) back to ed_inputevent_t object */
- toks = g_strsplit( (gchar*)key , ":" , 3 );
- inputev.type = atoi( toks[0] );
- inputev.code = atoi( toks[1] );
- inputev.value = atoi( toks[2] );
- g_strfreev( toks );
-
- container->callback( &inputev , GPOINTER_TO_INT(value) , container->data1 , container->data2 );
- return;
-}
-
-void
-ed_bindings_store_foreach ( gpointer hashtable_gp ,
- ed_bindings_store_foreach_func callback ,
- gpointer user_data1 ,
- gpointer user_data2 )
-{
- hashfunc_foreach_container_t *container = g_malloc(sizeof(hashfunc_foreach_container_t));
- container->callback = callback;
- container->data1 = user_data1;
- container->data2 = user_data2;
- g_hash_table_foreach( (GHashTable*)hashtable_gp , hashfunc_foreach , container );
- g_free( container );
-}
-
-
-guint
-ed_bindings_store_size ( gpointer hashtable_gp )
-{
- return g_hash_table_size( (GHashTable*)hashtable_gp );
-}
-
-
-gboolean
-ed_bindings_store_lookup( gpointer hashtable_gp ,
- ed_inputevent_t * inputev ,
- gint * action_code )
-{
- gpointer p;
- gchar *input_str;
-
- input_str = g_strdup_printf( "%i:%i:%i" , inputev->type , inputev->code , inputev->value );
-
- if ( g_hash_table_lookup_extended( (GHashTable*)hashtable_gp , input_str , NULL , &p ) == TRUE )
- {
- *action_code = GPOINTER_TO_INT(p);
- g_free( input_str );
- return TRUE;
- }
- else
- {
- g_free( input_str );
- return FALSE;
- }
-}
-
-
-gint
-ed_bindings_store_delete ( gpointer hashtable_gp )
-{
- if ( hashtable_gp != NULL )
- g_hash_table_destroy( hashtable_gp );
- return 0;
-}

audacious-plugins-2.5.3.tar.gz/src/evdev-plug/ed_bindings_store.h Deleted

@@ -1,37 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
-*
-* 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
-*
-*/
-
-#ifndef _I_ED_BINDINGS_STORE_H
-#define _I_ED_BINDINGS_STORE_H 1
-
-#include "ed_types.h"
-#include "ed_common.h"
-#include <glib.h>
-
-typedef void (*ed_bindings_store_foreach_func)( ed_inputevent_t * , gint , gpointer , gpointer );
-
-gpointer ed_bindings_store_new ( void );
-gint ed_bindings_store_insert ( gpointer , ed_inputevent_t * , gint );
-void ed_bindings_store_foreach ( gpointer , ed_bindings_store_foreach_func , gpointer , gpointer );
-guint ed_bindings_store_size ( gpointer );
-gboolean ed_bindings_store_lookup( gpointer , ed_inputevent_t * , gint * );
-gint ed_bindings_store_delete ( gpointer );
-
-#endif /* !_I_ED_BINDINGS_STORE_H */

audacious-plugins-2.5.3.tar.gz/src/evdev-plug/ed_common.h Deleted

@@ -1,38 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
-*
-* 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
-*
-*/
-
-#ifndef _I_ED_COMMON_H
-#define _I_ED_COMMON_H 1
-
-#ifdef DEBUG
-#include <stdio.h>
-#define DEBUGMSG(...) { fprintf(stderr, "evdev-plug(%s:%s:%d): ", __FILE__, __FUNCTION__, (int) __LINE__); fprintf(stderr, __VA_ARGS__); }
-#else
-#define DEBUGMSG(...)
-#endif /* DEBUG */
-
-#include "../../config.h"
-
-#define ED_VERSION_PLUGIN "0.2p1"
-#define ED_VERSION_CONFIG "0"
-
-#define PLAYER_LOCALRC_FILE "evdev-plug.conf"
-
-#endif /* !_I_ED_COMMON_H */

audacious-plugins-2.5.3.tar.gz/src/evdev-plug/ed_internals.c Deleted

@@ -1,1023 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
-*
-* 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 "ed_types.h"
-#include "ed_internals.h"
-#include "ed_actions.h"
-#include "ed_bindings_store.h"
-#include "ed_common.h"
-
-#include <stdint.h>
-#include <stdio.h>
-#include <linux/input.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <regex.h>
-/* for variadic */
-#include <stdarg.h>
-#include <glib.h>
-#include <glib/gstdio.h>
-
-#include <audacious/i18n.h>
-#include <audacious/misc.h>
-
-static gboolean ed_device_giofunc ( GIOChannel * , GIOCondition , gpointer );
-
-static gint ed_util_get_data_from_keyfile( GKeyFile * , gchar * , ... );
-static gpointer ed_util_get_bindings_from_keyfile( GKeyFile * , gchar * );
-
-extern GList *ed_device_listening_list;
-
-
-/* ***************** */
-/* internals */
-
-ed_device_info_t *
-ed_device_info_new ( gchar * device_name , gchar * device_filename ,
- gchar * device_phys , gint device_is_custom )
-{
- ed_device_info_t *info = g_malloc(sizeof(ed_device_info_t));
- info->name = g_strdup(device_name);
- info->filename = g_strdup(device_filename);
- info->phys = g_strdup(device_phys);
- info->is_custom = device_is_custom;
- info->is_active = FALSE;
- info->bindings = NULL;
- info->reg = 0;
- return info;
-}
-
-
-gint
-ed_device_info_delete ( ed_device_info_t * info )
-{
- g_free( info->phys );
- g_free( info->filename );
- g_free( info->name );
- g_free( info );
- return 0;
-}
-
-
-ed_device_t *
-ed_device_new ( gchar * device_name , gchar * device_filename ,
- gchar * device_phys , gint device_is_custom )
-{
- ed_device_t *event_device;
- GIOChannel *iochan;
- gint fd;
-
- fd = g_open( device_filename , O_RDONLY , 0 );
- if ( fd < 0 )
- {
- /* an error occurred */
- g_warning( _("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") , device_filename );
- return NULL;
- }
-
- iochan = g_io_channel_unix_new( fd );
- if ( iochan == NULL )
- {
- /* an error occurred */
- g_warning( _("event-device-plugin: unable to create a io_channel for device file %s ,"
- "skipping this device\n") , device_filename );
- close( fd );
- return NULL;
- }
- g_io_channel_set_encoding( iochan , NULL , NULL ); /* binary data */
-
- event_device = g_malloc(sizeof(ed_device_t));
- event_device->fd = fd;
- event_device->iochan = iochan;
- event_device->is_listening = FALSE;
- event_device->info = ed_device_info_new(
- device_name , device_filename , device_phys , device_is_custom );
-
- return event_device;
-}
-
-
-gint
-ed_device_delete ( ed_device_t * event_device )
-{
- if ( event_device->is_listening )
- ed_device_stop_listening( event_device );
-
- g_io_channel_shutdown( event_device->iochan , TRUE , NULL );
- g_io_channel_unref( event_device->iochan );
- close( event_device->fd );
-
- ed_device_info_delete( event_device->info );
- g_free( event_device );
-
- return 0;
-}
-
-
-gboolean
-ed_inputevent_check_equality( ed_inputevent_t *iev1 , ed_inputevent_t *iev2 )
-{
- if (( iev1 == NULL ) || ( iev2 == NULL ))
- {
- if (( iev1 == NULL ) && ( iev2 == NULL ))
- return TRUE;
- else
- return FALSE;
- }
-
- if ( ( iev1->code == iev2->code ) &&
- ( iev1->type == iev2->type ) &&
- ( iev1->value == iev2->value ) )
- return TRUE;
- else
- return FALSE;
-}
-
-
-gboolean
-ed_device_info_check_equality( ed_device_info_t *info1 , ed_device_info_t *info2 )
-{
- if (( info1 == NULL ) || ( info2 == NULL ))
- {
- if (( info1 == NULL ) && ( info2 == NULL ))
- return TRUE;
- else
- return FALSE;
- }
-
- if ( ( strcmp(info1->name,info2->name) == 0 ) &&
- ( strcmp(info1->filename,info2->filename) == 0 ) &&
- ( strcmp(info1->phys,info2->phys) == 0 ) &&
- ( info1->is_custom == info2->is_custom ) )
- return TRUE;
- else
- return FALSE;
-}
-
-
-gint
-ed_device_start_listening ( ed_device_t * event_device )
-{
- if ( g_list_find( ed_device_listening_list , event_device ) != NULL )
- {
- DEBUGMSG( "called start listening for device \"%s\" ( %s - %s ) but device listening is already active!\n" ,
- event_device->info->name , event_device->info->filename , event_device->info->phys );
- return -1; /* device listening is already active, do nothing */
- }
- else
- {
- DEBUGMSG( "start listening for device \"%s\" ( %s - %s )\n" ,
- event_device->info->name , event_device->info->filename , event_device->info->phys );
- /* add a watch that checks if there's data to read */
- event_device->iochan_sid = g_io_add_watch( event_device->iochan , G_IO_IN ,
- (GIOFunc)ed_device_giofunc , event_device );
-
- /* add event_device to the list */
- ed_device_listening_list = g_list_append( ed_device_listening_list , event_device );
- event_device->is_listening = TRUE;
- return 0;
- }
-}
-
-
-gint
-ed_device_stop_listening ( ed_device_t * event_device )
-{
- if ( ( g_list_find( ed_device_listening_list , event_device ) != NULL ) &&
- ( event_device->is_listening == TRUE ) )
- {
- DEBUGMSG( "stop listening for device \"%s\" ( %s - %s )\n" ,
- event_device->info->name , event_device->info->filename , event_device->info->phys );
- g_source_remove( event_device->iochan_sid );
- ed_device_listening_list = g_list_remove( ed_device_listening_list , event_device );
- event_device->is_listening = FALSE;
- return 0;
- }
- else
- {
- DEBUGMSG( "called stop listening for device \"%s\" ( %s - %s ) but device listening is not active!\n" ,
- event_device->info->name , event_device->info->filename , event_device->info->phys );
- return -1;
- }
-}
-
-
-gint
-ed_device_stop_listening_from_info ( ed_device_info_t * info )
-{
- GList *list_iter = ed_device_listening_list;
- while ( list_iter != NULL )
- {
- ed_device_t *dev = list_iter->data;
- if ( ed_device_info_check_equality( dev->info , info ) == TRUE )
- {
- ed_device_stop_listening( dev );
- return 0;
- }
- list_iter = g_list_next( list_iter );
- }
- return -1;
-}
-
-
-void
-ed_device_stop_listening_all ( gboolean delete_bindings )
-{
- /* convenience function that stops listening for all
- devices and also deletes bindings if requested */
- GList *list_iter = ed_device_listening_list;
- while ( list_iter != NULL )
- {
- ed_device_t *dev = list_iter->data;
-
- if (( delete_bindings == TRUE ) && ( dev->info->bindings != NULL ))
- ed_bindings_store_delete( dev->info->bindings );
-
- ed_device_delete( dev );
-
- list_iter = g_list_next( list_iter );
- }
-}
-
-
-gboolean
-ed_device_check_listening_from_info ( ed_device_info_t * info )
-{
- /* note: this must not alter the reg parameter of info */
- GList *list_iter = ed_device_listening_list;
- while ( list_iter != NULL )
- {
- ed_device_t *dev = list_iter->data;
- if ( ed_device_info_check_equality( dev->info , info ) == TRUE )
- return TRUE;
- list_iter = g_list_next( list_iter );
- }
- return FALSE;
-}
-
-
-static gboolean
-ed_device_giofunc ( GIOChannel * iochan , GIOCondition cond , gpointer event_device )
-{
- switch ( cond )
- {
- case G_IO_IN:
- {
- gsize rb = 0;
- struct input_event inputev;
-
- if ( g_io_channel_read_chars( iochan , (gchar*)&inputev ,
- sizeof(struct input_event) , &rb , NULL ) == G_IO_STATUS_NORMAL )
- {
- if ( rb == sizeof(struct input_event) )
- {
- gint action_code = -1;
- ed_device_t *dev = event_device;
-
- DEBUGMSG( "event (%d,%d,%d) intercepted for device \"%s\" ( %s - %s )\n" ,
- inputev.type , inputev.code , inputev.value ,
- dev->info->name , dev->info->filename , dev->info->phys );
-
- if ( dev->info->bindings != NULL )
- {
- ed_inputevent_t ev;
- ev.type = inputev.type;
- ev.code = inputev.code;
- ev.value = inputev.value;
-
- /* lookup event type/code/value in the binding tree for this device */
- if ( ed_bindings_store_lookup( dev->info->bindings , &ev , &action_code ) == TRUE )
- {
- /* this has been binded to an action, call the corresponding action */
- DEBUGMSG( "found action code %i for event (%d,%d,%d)\n" ,
- action_code , inputev.type , inputev.code , inputev.value );
- ed_action_call( action_code , NULL );
- }
- }
- }
- }
- break;
- }
- default:
- ;
- }
-
- return TRUE;
-}
-
-
-GList *
-ed_device_get_list_from_system ( void )
-{
- GIOChannel *iochan;
- gchar *buffer;
- gsize buffer_len;
- gint fd = -1;
-
- fd = g_open( "/proc/bus/input/devices" , O_RDONLY , 0 );
- if ( fd < 0 )
- {
- /* an error occurred */
- g_warning( _("event-device-plugin: unable to open /proc/bus/input/devices , automatic "
- "detection of event devices won't work.\n") );
- return NULL;
- }
-
- iochan = g_io_channel_unix_new( fd );
- if ( iochan == NULL )
- {
- /* an error occurred */
- g_warning( _("event-device-plugin: unable to open a io_channel for /proc/bus/input/devices , "
- "automatic detection of event devices won't work.\n") );
- close( fd );
- return NULL;
- }
- g_io_channel_set_encoding( iochan , "UTF-8" , NULL ); /* utf-8 text */
-
- if ( g_io_channel_read_to_end( iochan , &buffer , &buffer_len , NULL ) != G_IO_STATUS_NORMAL )
- {
- /* an error occurred */
- g_warning( _("event-device-plugin: an error occurred while reading /proc/bus/input/devices , "
- "automatic detection of event devices won't work.\n") );
- g_io_channel_shutdown( iochan , TRUE , NULL );
- g_io_channel_unref( iochan );
- close( fd );
- return NULL;
- }
- else
- {
- regex_t preg;
- gint search_offset = 0;
- GList *system_devices_list = NULL;
-
- /* we don't need these anymore */
- g_io_channel_shutdown( iochan , TRUE , NULL );
- g_io_channel_unref( iochan );
- close( fd );
-
- /* parse content of /proc/bus/input/devices */
- regcomp( &preg,
- "I:[^\n]*\nN: Name=\"([^\n]*)\"\nP: Phys=([^\n]*)\n([^\n]+\n)*H: Handlers=[^\n]*(event[0-9]+)[^\n]*\n" ,
- REG_ICASE | REG_EXTENDED );
-
- while ( search_offset > -1 )
- {
- size_t nmatch = 5;
- regmatch_t submatch[5];
-
- if ( regexec( &preg , &buffer[search_offset] , nmatch , submatch , 0 ) == 0 )
- {
- GString *device_name = NULL;
- GString *device_phys = NULL;
- GString *device_file = NULL;
-
- if ( submatch[1].rm_so != -1 ) /* check validity of name sub-expression */
- {
- device_name = g_string_new( "" );
- g_string_append_len( device_name ,
- &buffer[(search_offset + submatch[1].rm_so)] ,
- submatch[1].rm_eo - submatch[1].rm_so );
- }
-
- if ( submatch[2].rm_so != -1 ) /* check validity of physicalport sub-expression */
- {
- device_phys = g_string_new( "" );
- g_string_append_len( device_phys ,
- &buffer[(search_offset + submatch[2].rm_so)] ,
- submatch[2].rm_eo - submatch[2].rm_so );
- }
-
- if ( submatch[4].rm_so != -1 ) /* check validity of filename sub-expression */
- {
- device_file = g_string_new( "" );
- GString *device_test = g_string_new( "" );
- g_string_append_len( device_file ,
- &buffer[(search_offset + submatch[4].rm_so)] ,
- submatch[4].rm_eo - submatch[4].rm_so );
-
- /* let's check if the filename actually exists in /dev */
- g_string_printf( device_test , "/dev/input/%s" , (char*)device_file->str );
- if ( !g_file_test( device_test->str , G_FILE_TEST_EXISTS ) )
- {
- /* it doesn't exist, mark as invalid device by nullifying device_file*/
- g_warning( _("event-device-plugin: device %s not found in /dev/input , skipping.\n") , (char*)device_file );
- g_string_free( device_file , TRUE );
- device_file = NULL;
- }
- else
- {
- /* it does exist, mark as valid device by using the full path in device_file*/
- g_string_assign( device_file , device_test->str );
- }
- g_string_free( device_test , TRUE );
- }
-
- if (( device_name != NULL ) && ( device_phys != NULL ) && ( device_file != NULL ))
- {
- /* add item to the list */
- ed_device_info_t *info = ed_device_info_new(
- device_name->str , device_file->str , device_phys->str , 0 );
- info->reg = 0;
- DEBUGMSG( "device found, name:\"%s\" , file \"%s\" , phys \"%s\"\n" ,
- info->name , info->filename , info->phys );
- system_devices_list = g_list_append( system_devices_list , info );
- }
-
- if ( device_name != NULL )
- g_string_free( device_name , TRUE );
- if ( device_phys != NULL )
- g_string_free( device_phys , TRUE );
- if ( device_file != NULL )
- g_string_free( device_file , TRUE );
-
- search_offset += submatch[0].rm_eo; /* update offset for further search */
- }
- else
- {
- /* no more valid devices found */
- search_offset = -1;
- }
- }
- regfree( &preg );
- return system_devices_list;
- }
-}
-
-
-GList *
-ed_device_get_list_from_config ( void )
-{
- GKeyFile *keyfile = NULL;
- GList *config_devices_list = NULL;
- gboolean is_loaded = FALSE;
- gchar **device_names = NULL;
- gsize device_names_num = 0;
- gchar *config_pathfilename = NULL;
- gchar *config_datadir = NULL;
- gint i = 0;
-
- config_datadir = (gchar*)aud_util_get_localdir();
- config_pathfilename = g_build_filename( config_datadir , PLAYER_LOCALRC_FILE , NULL );
- g_free( config_datadir );
- keyfile = g_key_file_new();
- is_loaded = g_key_file_load_from_file( keyfile , config_pathfilename , G_KEY_FILE_NONE , NULL );
- g_free( config_pathfilename );
-
- if ( is_loaded != TRUE )
- {
- g_warning( _("event-device-plugin: unable to load config file %s , default settings will be used.\n") ,
- PLAYER_LOCALRC_FILE );
- g_key_file_free( keyfile );
- return NULL;
- }
-
- /* remove ___plugin___ group that contains plugin settings */
- g_key_file_remove_group( keyfile , "___plugin___" , NULL );
-
- /* the other groups are devices; check them and run active ones */
- device_names = g_key_file_get_groups( keyfile , &device_names_num );
- while ( device_names[i] != NULL )
- {
- gint device_is_custom = 0;
- gchar *device_file = NULL;
- gchar *device_phys = NULL;
- gboolean device_is_active = FALSE;
- gint result = 0;
-
- result = ed_util_get_data_from_keyfile(
- keyfile , device_names[i] ,
- ED_CONFIG_INFO_FILENAME , &device_file ,
- ED_CONFIG_INFO_PHYS , &device_phys ,
- ED_CONFIG_INFO_ISCUSTOM , &device_is_custom ,
- ED_CONFIG_INFO_ISACTIVE , &device_is_active ,
- ED_CONFIG_INFO_END );
-
- if ( result == 0 )
- {
- /* all information succesfully retrieved from config, create a ed_device_info_t */
- ed_device_info_t *info;
-
- info = ed_device_info_new( device_names[i] , device_file ,
- device_phys , device_is_custom );
-
- /* pick bindings for this device */
- info->bindings = ed_util_get_bindings_from_keyfile( keyfile , device_names[i] );
- info->is_active = device_is_active;
-
- /* add this device to the config list */
- config_devices_list = g_list_append( config_devices_list , info );
- /* free information from config file, info has its own copies */
- g_free( device_file ); g_free( device_phys );
- }
- else
- {
- g_warning( _("event-device-plugin: incomplete information in config file for device \"%s\""
- " , skipping.\n") , device_names[i] );
- }
-
- i++; /* on with next */
- }
-
- g_strfreev( device_names );
- g_key_file_free( keyfile );
- return config_devices_list;
-}
-
-
-void
-ed_device_free_list ( GList * system_devices_list )
-{
- GList *list_iter = system_devices_list;
- while ( list_iter != NULL )
- {
- ed_device_info_delete( (ed_device_info_t*)list_iter->data );
- list_iter = g_list_next( list_iter );
- }
- g_list_free( system_devices_list );
- return;
-}
-
-
-void
-ed_device_start_listening_from_config ( void )
-{
- GKeyFile *keyfile = NULL;
- gboolean is_loaded = FALSE;
- gchar **device_names = NULL;
- gsize device_names_num = 0;
- gchar *config_pathfilename = NULL;
- gchar *config_datadir = NULL;
- GList *system_devices_list = NULL;
- gint i = 0;
-
- config_datadir = (gchar*)aud_util_get_localdir();
- config_pathfilename = g_build_filename( config_datadir , PLAYER_LOCALRC_FILE , NULL );
- g_free( config_datadir );
- keyfile = g_key_file_new();
- is_loaded = g_key_file_load_from_file( keyfile , config_pathfilename , G_KEY_FILE_NONE , NULL );
- g_free( config_pathfilename );
-
- if ( is_loaded != TRUE )
- {
- g_warning( _("event-device-plugin: unable to load config file %s , default settings will be used.\n") ,
- PLAYER_LOCALRC_FILE );
- g_key_file_free( keyfile );
- return;
- }
-
- system_devices_list = ed_device_get_list_from_system();
-
- /* remove ___plugin___ group that contains plugin settings */
- g_key_file_remove_group( keyfile , "___plugin___" , NULL );
-
- /* check available devices and run active ones */
- device_names = g_key_file_get_groups( keyfile , &device_names_num );
- while ( device_names[i] != NULL )
- {
- GError *gerr = NULL;
- gboolean is_active;
-
- is_active = g_key_file_get_boolean( keyfile , device_names[i] , "is_active" , &gerr );
- if ( gerr != NULL )
- {
- g_warning( _("event-device-plugin: configuration, unable to get is_active value for device \"%s\""
- ", skipping it.\n") , device_names[i] );
- g_clear_error( &gerr );
- }
-
- if ( is_active == TRUE ) /* only care about active devices at this time, ignore others */
- {
- gint is_custom = 0;
- gchar *device_file = NULL;
- gchar *device_phys = NULL;
- gint result = 0;
-
- result = ed_util_get_data_from_keyfile(
- keyfile , device_names[i] ,
- ED_CONFIG_INFO_FILENAME , &device_file ,
- ED_CONFIG_INFO_PHYS , &device_phys ,
- ED_CONFIG_INFO_ISCUSTOM , &is_custom ,
- ED_CONFIG_INFO_END );
-
- if ( result != 0 )
- {
- /* something wrong, skip this device */
- i++; continue;
- }
-
- /* unless this is a custom device, perform a device check */
- if ( is_custom != 1 )
- {
- /* not a custom device, check it against system_devices_list
- to see if its information should be updated or if it's not plugged at all */
- gint check_result = ed_device_check(
- system_devices_list , device_names[i] , &device_file , &device_phys );
-
- if ( check_result == ED_DEVCHECK_OK )
- {
- /* ok, we have an active not-custom device and it has been successfully
- checked too; create a ed_device_t item for it */
- ed_device_t *dev = ed_device_new ( device_names[i] , device_file , device_phys , 0 );
- g_free( device_file ); g_free( device_phys ); /* not needed anymore */
- if ( dev != NULL )
- {
- dev->info->bindings = ed_util_get_bindings_from_keyfile( keyfile , device_names[i] );
- ed_device_start_listening ( dev );
- }
- }
-
- /* note: if check_result == ED_DEVCHECK_ABSENT, we simply skip this device */
- }
- else
- {
- /* ok, we have an active custom device; create a ed_device_t item for it */
- ed_device_t *dev = ed_device_new ( device_names[i] , device_file , device_phys , 1 );
- g_free( device_file ); g_free( device_phys ); /* not needed anymore */
- if ( dev != NULL )
- {
- dev->info->bindings = ed_util_get_bindings_from_keyfile( keyfile , device_names[i] );
- ed_device_start_listening ( dev );
- }
- }
- }
-
- /* on with next device name */
- i++;
- }
-
- g_strfreev( device_names );
- ed_device_free_list( system_devices_list );
- g_key_file_free( keyfile );
- return;
-}
-
-
-/* this function checks that a given event device (with device_name,
- device_phys and device_file) exists in system_devices_list; device_phys
- and device_file must be dynamically-allocated string, they could
- be freed and reallocated if their information needs to be updated;
- it returns an integer, its value represents the performed operations */
-gint
-ed_device_check ( GList * system_devices_list ,
- gchar * device_name ,
- gchar ** device_file ,
- gchar ** device_phys )
-{
- /* first, search in the list for a device, named device_name,
- that has not been found in a previous ed_device_check
- made with the same system_devices_list (info->reg == 0) */
- GList *list_iter = system_devices_list;
-
- while ( list_iter != NULL )
- {
- ed_device_info_t *info = list_iter->data;
-
- if ( ( info->reg == 0 ) && ( strcmp( device_name , info->name ) == 0 ) )
- {
- /* found a device, check if it has the same physical address */
- if ( strcmp( *device_phys , info->phys ) == 0 )
- {
- /* good, same device name and same physical
- address; update device_file if necessary */
- if ( strcmp( *device_file , info->filename ) != 0 )
- {
- g_free( *device_file );
- *device_file = g_strdup( info->filename );
- }
- /* now mark it as "found" so it won't be searched in next
- ed_device_check made with the same system_devices_list*/
- info->reg = 1;
- /* everything done */
- return ED_DEVCHECK_OK;
- }
- else
- {
- /* device found, but physical address is not the one from *device_phys; try to
- search further in system_devices_list for a device with same name and address */
- GList *list_iter2 = g_list_next(list_iter);
- while ( list_iter2 != NULL )
- {
- ed_device_info_t *info2 = list_iter2->data;
- if ( ( info2->reg == 0 ) &&
- ( strcmp( device_name , info2->name ) == 0 ) &&
- ( strcmp( *device_phys , info2->phys ) == 0 ) )
- {
- /* found a device with the same name and address,
- so let's use it; update device_file if necessary */
- if ( strcmp( *device_file , info2->filename ) != 0 )
- {
- g_free( *device_file );
- *device_file = g_strdup( info2->filename );
- }
- /* now mark it as "found" so it won't be searched in next
- ed_device_check made with the same system_devices_list */
- info2->reg = 1;
- /* everything done */
- return ED_DEVCHECK_OK;
- }
- list_iter2 = g_list_next(list_iter2);
- }
-
- /* if we get to this point, it means that there isn't any device named
- device_name with physical address equal to *device_phys ; there is only
- one (or more) device named device_name but with different physical
- address; we'll use the first of those (alas the current content of info) */
- g_free( *device_phys ); /* free outdated device_phys */
- *device_phys = g_strdup( info->phys ); /* update it with the new one */
-
- /* update device_file if necessary */
- if ( strcmp( *device_file , info->filename ) != 0 )
- {
- g_free( *device_file );
- *device_file = g_strdup( info->filename );
- }
-
- /* now mark it as "found" so it won't be searched in next
- ed_device_check made with the same system_devices_list*/
- info->reg = 1;
- /* everything done */
- return ED_DEVCHECK_OK;
- }
- }
-
- list_iter = g_list_next(list_iter);
- }
-
- /* the entire system_devices_list was searched,
- but no device named device_name was found */
- return ED_DEVCHECK_ABSENT;
-}
-
-
-
-/* config */
-static void
-ed_config_save_from_list_bindings_foreach ( ed_inputevent_t * iev ,
- gint action_code ,
- gpointer keyfile ,
- gpointer info_gp )
-{
- gint int_list[4];
- gchar *keyname;
- ed_device_info_t *info = info_gp;
- keyname = g_strdup_printf( "b%i" , info->reg );
- int_list[0] = action_code;
- int_list[1] = iev->type;
- int_list[2] = iev->code;
- int_list[3] = iev->value;
- g_key_file_set_integer_list( keyfile , info->name , keyname , int_list , 4 );
- g_free( keyname );
- info->reg++;
- return;
-}
-
-gint
-ed_config_save_from_list ( GList * config_devices_list )
-{
- GKeyFile *keyfile;
- GList *iter_list = NULL;
- gchar *keyfile_str = NULL;
- gsize keyfile_str_len = 0;
- GIOChannel *iochan;
- gchar *config_pathfilename = NULL;
- gchar *config_datadir = NULL;
-
- config_datadir = (gchar*)aud_util_get_localdir();
- config_pathfilename = g_build_filename( config_datadir , PLAYER_LOCALRC_FILE , NULL );
-
- keyfile = g_key_file_new();
-
- g_key_file_set_string( keyfile , "___plugin___" , "config_ver" , ED_VERSION_CONFIG );
-
- iter_list = config_devices_list;
- while ( iter_list != NULL )
- {
- ed_device_info_t *info = iter_list->data;
- g_key_file_set_string( keyfile , info->name , "filename" , info->filename );
- g_key_file_set_string( keyfile , info->name , "phys" , info->phys );
- g_key_file_set_boolean( keyfile , info->name , "is_active" , info->is_active );
- g_key_file_set_integer( keyfile , info->name , "is_custom" , info->is_custom );
- /* use the info->reg field as a counter to list actions */
- info->reg = 0; /* init the counter */
- if ( info->bindings != NULL )
- ed_bindings_store_foreach( info->bindings ,
- ed_config_save_from_list_bindings_foreach , keyfile , info );
- iter_list = g_list_next( iter_list );
- }
-
- keyfile_str = g_key_file_to_data( keyfile , &keyfile_str_len , NULL );
- if ( g_file_test( config_datadir , G_FILE_TEST_IS_DIR ) == TRUE )
- {
- iochan = g_io_channel_new_file( config_pathfilename , "w" , NULL );
- g_io_channel_set_encoding( iochan , "UTF-8" , NULL );
- g_io_channel_write_chars( iochan , keyfile_str , keyfile_str_len , NULL , NULL );
- g_io_channel_shutdown( iochan , TRUE , NULL );
- g_io_channel_unref( iochan );
- }
- else
- {
- g_warning( _("event-device-plugin: unable to access local directory %s , settings will not be saved.\n") ,
- config_datadir );
- }
-
- g_free( keyfile_str );
- g_free( config_datadir );
- g_key_file_free( keyfile );
- return 0;
-}
-
-
-/* utils */
-
-
-/* this picks information from a keyfile, using device_name
- as group name; information must be requested by passing
- a ed_config_info_t value and a corresponding container;
- list of requested information must be terminated with
- ED_CONFIG_INFO_END; returns 0 if everything is found,
- returns negative values if some information is missing */
-static gint
-ed_util_get_data_from_keyfile( GKeyFile * keyfile , gchar * device_name , ... )
-{
- GError *gerr = NULL;
- gboolean is_failed = FALSE;
- ed_config_info_t info_code = ED_CONFIG_INFO_END;
- GList *temp_stringstore = NULL;
- va_list ap;
-
- /* when we get a string value from g_key_file_get_string, we temporarily
- store its container in temp_stringstore; if subsequent information
- requests in the iteraton fails, we free the information in previous
- container and nullify its content;
- this way, user will get complete information (return value 0) or
- absent information (all string containers nullified, return value -1) */
-
- va_start( ap, device_name );
-
- while ( ( is_failed == FALSE ) &&
- ( ( info_code = va_arg( ap , ed_config_info_t ) ) != ED_CONFIG_INFO_END ) )
- {
- switch ( info_code )
- {
- case ED_CONFIG_INFO_FILENAME:
- {
- gchar **device_file = va_arg( ap , gchar ** );
- *device_file = g_key_file_get_string( keyfile , device_name , "filename" , &gerr );
- if ( gerr != NULL )
- {
- g_clear_error( &gerr );
- g_warning( _("event-device-plugin: configuration, unable to get filename value for device \"%s\""
- ", skipping it.\n") , device_name );
- is_failed = TRUE;
- }
- else
- temp_stringstore = g_list_append( temp_stringstore , device_file );
- break;
- }
-
- case ED_CONFIG_INFO_PHYS:
- {
- gchar **device_phys = va_arg( ap , gchar ** );
- *device_phys = g_key_file_get_string( keyfile , device_name , "phys" , &gerr );
- if ( gerr != NULL )
- {
- g_clear_error( &gerr );
- g_warning( _("event-device-plugin: configuration, unable to get phys value for device \"%s\""
- ", skipping it.\n") , device_name );
- is_failed = TRUE;
- }
- else
- temp_stringstore = g_list_append( temp_stringstore , device_phys );
- break;
- }
-
- case ED_CONFIG_INFO_ISCUSTOM:
- {
- gint *is_custom = va_arg( ap , gint * );
- *is_custom = g_key_file_get_integer( keyfile , device_name , "is_custom" , &gerr );
- if ( gerr != NULL )
- {
- g_clear_error( &gerr );
- g_warning( _("event-device-plugin: configuration, unable to get is_custom value for device \"%s\""
- ", skipping it.\n") , device_name );
- is_failed = TRUE;
- }
- break;
- }
-
- case ED_CONFIG_INFO_ISACTIVE:
- {
- gboolean *is_active = va_arg( ap , gboolean * );
- *is_active = g_key_file_get_boolean( keyfile , device_name , "is_active" , &gerr );
- if ( gerr != NULL )
- {
- g_clear_error( &gerr );
- g_warning( _("event-device-plugin: configuration, unable to get is_active value for device \"%s\""
- ", skipping it.\n") , device_name );
- is_failed = TRUE;
- }
- break;
- }
-
- default:
- {
- /* unexpected value in info_code, skipping */
- g_warning( _("event-device-plugin: configuration, unexpected value for device \"%s\""
- ", skipping it.\n") , device_name );
- is_failed = TRUE;
- }
- }
- }
-
- va_end( ap );
-
- if ( is_failed == FALSE )
- {
- /* temp_stringstore is not needed anymore,
- do not change pointed containers */
- g_list_free( temp_stringstore );
- return 0;
- }
- else
- {
- /* temp_stringstore is not needed anymore,
- nullify pointed containers and free content */
- GList *list_iter = temp_stringstore;
- while ( list_iter != NULL )
- {
- gchar **container = list_iter->data;
- g_free( *container );
- *container = NULL;
- list_iter = g_list_next( list_iter );
- }
- g_list_free( temp_stringstore );
- return -1;
- }
-}
-
-
-/* this does just what its name says :) */
-static gpointer
-ed_util_get_bindings_from_keyfile( GKeyFile * keyfile , gchar * device_name )
-{
- ed_inputevent_t *iev = g_malloc(sizeof(ed_inputevent_t));
- gpointer bindings = ed_bindings_store_new();
- gchar **keys;
- gint j = 0;
-
- /* now get bindings for this device */
- keys = g_key_file_get_keys( keyfile , device_name , NULL , NULL );
- while ( keys[j] != NULL )
- {
- /* in the config file, only bindings start with the 'b' character */
- if ( keys[j][0] == 'b' )
- {
- gsize ilist_len = 0;
- gint *ilist;
- ilist = g_key_file_get_integer_list( keyfile ,
- device_name , keys[j] , &ilist_len , NULL );
- if ( ilist_len > 3 )
- {
- gint action_code = (gint)ilist[0];
- iev->type = (guint)ilist[1];
- iev->code = (guint)ilist[2];
- iev->value = (gint)ilist[3];
- ed_bindings_store_insert( bindings , iev , action_code );
- }
- g_free( ilist );
- }
- j++;
- }
-
- g_strfreev( keys );
- g_free( iev );
-
- if ( ed_bindings_store_size( bindings ) == 0 )
- {
- ed_bindings_store_delete( bindings );
- bindings = NULL;
- }
-
- return bindings;
-}

audacious-plugins-2.5.3.tar.gz/src/evdev-plug/ed_internals.h Deleted

@@ -1,66 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
-*
-* 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
-*
-*/
-
-#ifndef _I_ED_INTERNALS_H
-#define _I_ED_INTERNALS_H 1
-
-#include "ed_types.h"
-#include "ed_common.h"
-#include <glib.h>
-
-#define ED_DEVCHECK_OK		0
-#define ED_DEVCHECK_ABSENT	1
-
-typedef enum
-{
- ED_CONFIG_INFO_END = -1,
- ED_CONFIG_INFO_FILENAME = 0,
- ED_CONFIG_INFO_PHYS,
- ED_CONFIG_INFO_ISCUSTOM,
- ED_CONFIG_INFO_ISACTIVE
-}
-ed_config_info_t;
-
-ed_device_t * ed_device_new ( gchar * , gchar * , gchar * , gint );
-gint ed_device_delete ( ed_device_t * );
-
-ed_device_info_t * ed_device_info_new ( gchar * , gchar * , gchar * , gint );
-gint ed_device_info_delete ( ed_device_info_t * );
-
-gint ed_device_start_listening ( ed_device_t * );
-void ed_device_start_listening_from_config ( void );
-gint ed_device_stop_listening ( ed_device_t * );
-gint ed_device_stop_listening_from_info ( ed_device_info_t * );
-void ed_device_stop_listening_all ( gboolean );
-gboolean ed_device_check_listening_from_info ( ed_device_info_t * );
-
-gboolean ed_inputevent_check_equality( ed_inputevent_t * , ed_inputevent_t * );
-gboolean ed_device_info_check_equality( ed_device_info_t * , ed_device_info_t * );
-
-/* these function return a GList of ed_device_info_t items */
-GList * ed_device_get_list_from_system ( void );
-GList * ed_device_get_list_from_config ( void );
-void ed_device_free_list ( GList * );
-
-gint ed_device_check ( GList * , gchar * , gchar ** , gchar ** );
-
-gint ed_config_save_from_list ( GList * );
-
-#endif /* !_I_ED_INTERNALS_H */

audacious-plugins-2.5.3.tar.gz/src/evdev-plug/ed_types.h Deleted

@@ -1,62 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
-*
-* 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
-*
-*/
-
-#ifndef _I_ED_TYPES_H
-#define _I_ED_TYPES_H 1
-
-#include "ed_common.h"
-#include <glib.h>
-
-typedef struct
-{
- gchar * name;
- gchar * filename;
- gchar * phys;
-
- gint reg;
-
- gint is_custom;
- gboolean is_active;
-
- gpointer * bindings;
-}
-ed_device_info_t;
-
-typedef struct
-{
- gint fd;
-
- GIOChannel * iochan;
- guint iochan_sid;
- gboolean is_listening;
-
- ed_device_info_t * info;
-}
-ed_device_t;
-
-typedef struct
-{
- guint type;
- guint code;
- gint value;
-}
-ed_inputevent_t;
-
-#endif /* !_I_ED_TYPES_H */

audacious-plugins-2.5.3.tar.gz/src/evdev-plug/ed_ui.c Deleted

@@ -1,1541 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
-*
-* 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 "ed_ui.h"
-#include "ed_types.h"
-#include "ed_internals.h"
-#include "ed_actions.h"
-#include "ed_bindings_store.h"
-#include "ed_common.h"
-#include <stdlib.h>
-#include <string.h>
-#include <linux/input.h>
-
-#include <audacious/i18n.h>
-#include <gtk/gtk.h>
-
-
-static void cfg_ui_bindings_show ( ed_device_t * , GtkTreeRowReference * );
-
-extern ed_action_t player_actions[];
-extern gboolean plugin_is_active;
-
-static GtkWidget *cfg_win = NULL;
-
-enum
-{
- DEVLIST_COL_ISACTIVE = 0,
- DEVLIST_COL_NAME,
- DEVLIST_COL_FILENAME,
- DEVLIST_COL_PHYS,
- DEVLIST_COL_ISAVAILABLE,
- DEVLIST_COL_BINDINGS,
- DEVLIST_NUMCOLS
-};
-
-enum
-{
- DEVLIST_ISAVAILABLE_NOTDET = 0,
- DEVLIST_ISAVAILABLE_DET,
- DEVLIST_ISAVAILABLE_CUSTOM
-};
-
-
-
-static void
-cfg_device_lv_populate( GtkListStore * store )
-{
- /* store is logically divided in three families of devices,
- depending on the ISAVAILABLE value;
- DEVLIST_ISAVAILABLE_NOTDET -> not detected devices: these are not-custom
- devices that are present in configuration file but they do not seem
- to be plugged at the moment, cause they're not in system_devices_list;
- DEVLIST_ISAVAILABLE_DET -> detected devices: these are not-custom devices that
- are currently plugged, no matter whether they are in configuration or not;
- DEVLIST_ISAVAILABLE_CUSTOM -> custom devices: defined by user in configuration
- file, these are not checked against system_devices_list;
- */
-
- GList *system_devices_list = NULL;
- GList *config_devices_list = NULL;
- GList *list_iter = NULL;
-
- system_devices_list = ed_device_get_list_from_system();
- config_devices_list = ed_device_get_list_from_config();
-
- /* first, for each not-custom device in config_devices_list,
- perform a search in system_devices_list */
- list_iter = config_devices_list;
- while ( list_iter != NULL )
- {
- ed_device_info_t *info_from_cfg = list_iter->data;
- if ( info_from_cfg->is_custom == 0 ) /* only try to detect not-custom devices */
- {
- /* note: if device is found, filename and phys in info_from_cfg could be updated by the
- check; the found device will be marked as "found" in system_devices_list too */
- if ( ed_device_check( system_devices_list ,
- info_from_cfg->name , &(info_from_cfg->filename) , &(info_from_cfg->phys) ) == ED_DEVCHECK_OK )
- {
- info_from_cfg->reg = 1; /* mark our device from config as "found" */
- }
- }
- list_iter = g_list_next( list_iter );
- }
-
- /* at this point, we have three logical groups:
- #1 - not-custom devices in config_devices_list, marked as "found" -> DEVLIST_ISAVAILABLE_DET
- #2 - not-custom devices in config_devices_list, not-marked -> DEVLIST_ISAVAILABLE_NOTDET
- #3 - custom devices in config_devices_list -> DEVLIST_ISAVAILABLE_CUSTOM
- #1bis - plus, we pick not-marked devices from system_devices_list, which
- are plugged devices that are not present in config_devices_list -> DEVLIST_ISAVAILABLE_DET
- */
-
- /* let's start to fill the store with items from group #1 (DEVLIST_ISAVAILABLE_DET) */
- list_iter = config_devices_list;
- while ( list_iter != NULL )
- {
- ed_device_info_t *info_from_cfg = list_iter->data;
- if (( info_from_cfg->reg == 1 ) && ( info_from_cfg->is_custom == 0 ))
- {
- GtkTreeIter iter;
- gtk_list_store_append( store , &iter );
- gtk_list_store_set( store , &iter ,
- DEVLIST_COL_ISACTIVE , info_from_cfg->is_active ,
- DEVLIST_COL_NAME , info_from_cfg->name ,
- DEVLIST_COL_FILENAME , info_from_cfg->filename ,
- DEVLIST_COL_PHYS , info_from_cfg->phys ,
- DEVLIST_COL_ISAVAILABLE , DEVLIST_ISAVAILABLE_DET ,
- DEVLIST_COL_BINDINGS , info_from_cfg->bindings ,
- -1 );
- }
- list_iter = g_list_next( list_iter );
- }
-
- /* add items from group #1bis (DEVLIST_ISAVAILABLE_DET) */
- list_iter = system_devices_list;
- while ( list_iter != NULL )
- {
- ed_device_info_t *info_from_sys = list_iter->data;
- if ( info_from_sys->reg == 0 )
- {
- GtkTreeIter iter;
- gtk_list_store_append( store , &iter );
- gtk_list_store_set( store , &iter ,
- DEVLIST_COL_ISACTIVE , info_from_sys->is_active ,
- DEVLIST_COL_NAME , info_from_sys->name ,
- DEVLIST_COL_FILENAME , info_from_sys->filename ,
- DEVLIST_COL_PHYS , info_from_sys->phys ,
- DEVLIST_COL_ISAVAILABLE , DEVLIST_ISAVAILABLE_DET ,
- DEVLIST_COL_BINDINGS , info_from_sys->bindings ,
- -1 );
- }
- list_iter = g_list_next( list_iter );
- }
-
- /* add items from group #2 (DEVLIST_ISAVAILABLE_NOTDET) */
- list_iter = config_devices_list;
- while ( list_iter != NULL )
- {
- ed_device_info_t *info_from_cfg = list_iter->data;
- if (( info_from_cfg->reg == 0 ) && ( info_from_cfg->is_custom == 0 ))
- {
- GtkTreeIter iter;
- gtk_list_store_append( store , &iter );
- gtk_list_store_set( store , &iter ,
- DEVLIST_COL_ISACTIVE , info_from_cfg->is_active ,
- DEVLIST_COL_NAME , info_from_cfg->name ,
- DEVLIST_COL_FILENAME , info_from_cfg->filename ,
- DEVLIST_COL_PHYS , info_from_cfg->phys ,
- DEVLIST_COL_ISAVAILABLE , DEVLIST_ISAVAILABLE_NOTDET ,
- DEVLIST_COL_BINDINGS , info_from_cfg->bindings ,
- -1 );
- }
- list_iter = g_list_next( list_iter );
- }
-
- /* add items from group #3 (DEVLIST_ISAVAILABLE_CUSTOM) */
- list_iter = config_devices_list;
- while ( list_iter != NULL )
- {
- ed_device_info_t *info_from_cfg = list_iter->data;
- if ( info_from_cfg->is_custom == 1 )
- {
- GtkTreeIter iter;
- gtk_list_store_append( store , &iter );
- gtk_list_store_set( store , &iter ,
- DEVLIST_COL_ISACTIVE , info_from_cfg->is_active ,
- DEVLIST_COL_NAME , info_from_cfg->name ,
- DEVLIST_COL_FILENAME , info_from_cfg->filename ,
- DEVLIST_COL_PHYS , info_from_cfg->phys ,
- DEVLIST_COL_ISAVAILABLE , DEVLIST_ISAVAILABLE_CUSTOM ,
- DEVLIST_COL_BINDINGS , info_from_cfg->bindings ,
- -1 );
- }
- list_iter = g_list_next( list_iter );
- }
-
- /* delete lists; bindings objects are not deleted,
- they must be accessible from liststore for customization
- and they'll be deleted when the config win is destroyed */
- ed_device_free_list( config_devices_list );
- ed_device_free_list( system_devices_list );
- return;
-}
-
-
-static void
-cfg_device_lv_celldatafunc_isavailable( GtkTreeViewColumn * col , GtkCellRenderer * renderer ,
- GtkTreeModel * model , GtkTreeIter * iter , gpointer data )
-{
- guint is_available = 0;
- gtk_tree_model_get( model , iter , DEVLIST_COL_ISAVAILABLE , &is_available , -1 );
- switch (is_available)
- {
- case DEVLIST_ISAVAILABLE_DET:
- g_object_set( renderer , "text" , _("Detected") ,
- "foreground" , "Green" , "foreground-set" , TRUE ,
- "background" , "Black" , "background-set" , TRUE , NULL );
- break;
- case DEVLIST_ISAVAILABLE_CUSTOM:
- g_object_set( renderer , "text" , _("Custom") ,
- "foreground" , "Yellow" , "foreground-set" , TRUE ,
- "background" , "Black" , "background-set" , TRUE , NULL );
- break;
- case DEVLIST_ISAVAILABLE_NOTDET:
- default:
- g_object_set( renderer , "text" , _("Not Detected") ,
- "foreground" , "Orange" , "foreground-set" , TRUE ,
- "background" , "Black" , "background-set" , TRUE , NULL );
- break;
- }
- return;
-}
-
-
-static void
-cfg_device_lv_changetoggle ( GtkCellRendererToggle * toggle ,
- gchar * path_str , gpointer cfg_device_lv )
-{
- GtkTreeModel *model = gtk_tree_view_get_model( GTK_TREE_VIEW(cfg_device_lv) );
- GtkTreeIter iter;
- GtkTreePath *path = gtk_tree_path_new_from_string( path_str );
- gboolean toggled;
-
- gtk_tree_model_get_iter( model , &iter , path );
- gtk_tree_model_get( model , &iter , DEVLIST_COL_ISACTIVE , &toggled , -1 );
-
- toggled ^= 1;
- gtk_list_store_set( GTK_LIST_STORE(model), &iter , DEVLIST_COL_ISACTIVE , toggled , -1 );
-
- gtk_tree_path_free( path );
- return;
-}
-
-
-static void
-cfg_config_cb_bindings_show ( gpointer cfg_device_lv )
-{
- GtkTreeSelection *sel;
- GtkTreeModel *model;
- GtkTreeIter iter;
-
- /* check if a row is selected */
- sel = gtk_tree_view_get_selection( GTK_TREE_VIEW(cfg_device_lv) );
- if ( gtk_tree_selection_get_selected( sel , &model , &iter ) == TRUE )
- {
- /* check availability and active status */
- guint is_available = 0;
- gboolean is_active = FALSE;
-
- gtk_tree_model_get( model , &iter ,
- DEVLIST_COL_ISACTIVE , &is_active ,
- DEVLIST_COL_ISAVAILABLE , &is_available ,
- -1 );
-
- if ( is_available == DEVLIST_ISAVAILABLE_NOTDET )
- {
- /* do not open bindings window for a not-detected device */
- ed_ui_message_show( _("Information") ,
- _("Cannot open bindings window for a not-detected device.\n"
- "Ensure that the device has been correctly plugged in.") ,
- cfg_win );
- return;
- }
- else
- {
- /* ok, create a ed_device_t item from selected row information */
- ed_device_t *dev;
- gchar *device_name = NULL, *device_file = NULL, *device_phys = NULL;
- gpointer bindings = NULL;
-
- gtk_tree_model_get( model , &iter ,
- DEVLIST_COL_NAME , &device_name ,
- DEVLIST_COL_FILENAME , &device_file ,
- DEVLIST_COL_PHYS , &device_phys ,
- DEVLIST_COL_BINDINGS , &bindings ,
- -1 );
-
- dev = ed_device_new(
- device_name , device_file , device_phys ,
- ( is_available == DEVLIST_ISAVAILABLE_CUSTOM ? 1 : 0 ) );
- g_free( device_name ); g_free( device_file ); g_free( device_phys );
-
- if ( dev != NULL )
- {
- GtkTreePath *path;
- GtkTreeRowReference *rowref;
-
- dev->info->bindings = bindings;
-
- path = gtk_tree_model_get_path( model , &iter );
- rowref = gtk_tree_row_reference_new( model , path );
- gtk_tree_path_free( path );
- /* show bindings window for device "dev"; also pass to the bindings window
- the GtkTreeRowReference (it keeps track of the model too) for selected row;
- if changes are committed in the bindings window, the row reference will be
- needed to update the treemodel with the new bindings information */
- cfg_ui_bindings_show( dev , rowref );
- }
- else
- {
- /* something went wrong */
- ed_ui_message_show( _("Error") ,
- _("Unable to open selected device.\n"
- "Please check read permissions on device file.") ,
- cfg_win );
- }
- }
- }
-}
-
-
-static void
-cfg_config_cb_addcustom_show ( gpointer cfg_device_lv )
-{
- GtkWidget *addc_dlg;
- GtkWidget *addc_data_frame, *addc_data_vbox;
- GtkWidget *addc_data_label;
- GtkWidget *addc_data_table;
- GtkWidget *addc_data_name_label, *addc_data_name_entry;
- GtkWidget *addc_data_file_label, *addc_data_file_entry;
- gint result;
- gboolean task_done = FALSE;
-
- addc_dlg = gtk_dialog_new_with_buttons( _("EvDev-Plug - Add custom device") ,
- GTK_WINDOW(cfg_win) , GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT ,
- GTK_STOCK_CANCEL , GTK_RESPONSE_REJECT , GTK_STOCK_OK , GTK_RESPONSE_ACCEPT , NULL );
-
- addc_data_frame = gtk_frame_new( NULL );
- gtk_container_add( GTK_CONTAINER(GTK_DIALOG(addc_dlg)->vbox) , addc_data_frame );
- addc_data_vbox = gtk_vbox_new( FALSE , 5 );
- gtk_container_set_border_width( GTK_CONTAINER(addc_data_vbox) , 5 );
- gtk_container_add( GTK_CONTAINER(addc_data_frame) , addc_data_vbox );
-
- addc_data_label = gtk_label_new( "" );
- gtk_label_set_text( GTK_LABEL(addc_data_label) ,
- _("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.") );
- gtk_box_pack_start( GTK_BOX(addc_data_vbox) , addc_data_label , FALSE , FALSE , 0 );
-
- addc_data_name_label = gtk_label_new( _("Device name:") );
- gtk_misc_set_alignment( GTK_MISC(addc_data_name_label) , 0 , 0.5 );
- addc_data_name_entry = gtk_entry_new();
-
- addc_data_file_label = gtk_label_new( _("Device file:") );
- gtk_misc_set_alignment( GTK_MISC(addc_data_file_label) , 0 , 0.5 );
- addc_data_file_entry = gtk_entry_new();
-
- addc_data_table = gtk_table_new( 2 , 2 , FALSE );
- gtk_table_set_col_spacings( GTK_TABLE(addc_data_table) , 2 );
- gtk_table_set_row_spacings( GTK_TABLE(addc_data_table) , 2 );
- gtk_table_attach( GTK_TABLE(addc_data_table) , addc_data_name_label , 0 , 1 , 0 , 1 ,
- GTK_FILL , GTK_EXPAND | GTK_FILL , 0 , 0 );
- gtk_table_attach( GTK_TABLE(addc_data_table) , addc_data_name_entry , 1 , 2 , 0 , 1 ,
- GTK_EXPAND | GTK_FILL , GTK_EXPAND | GTK_FILL , 0 , 0 );
- gtk_table_attach( GTK_TABLE(addc_data_table) , addc_data_file_label , 0 , 1 , 1 , 2 ,
- GTK_FILL , GTK_EXPAND | GTK_FILL , 0 , 0 );
- gtk_table_attach( GTK_TABLE(addc_data_table) , addc_data_file_entry , 1 , 2 , 1 , 2 ,
- GTK_EXPAND | GTK_FILL , GTK_EXPAND | GTK_FILL , 0 , 0 );
- gtk_box_pack_start( GTK_BOX(addc_data_vbox) , addc_data_table , TRUE , TRUE , 0 );
-
- gtk_widget_show_all( addc_dlg );
-
- while ( task_done == FALSE )
- {
- result = gtk_dialog_run( GTK_DIALOG(addc_dlg) );
- if ( result == GTK_RESPONSE_ACCEPT )
- {
- const gchar *name = gtk_entry_get_text( GTK_ENTRY(addc_data_name_entry) );
- const gchar *file = gtk_entry_get_text( GTK_ENTRY(addc_data_file_entry) );
- if ( ( strcmp( name , "" ) != 0 ) &&
- ( strcmp( name , "___plugin___" ) != 0 ) &&
- ( strcmp( file , "" ) != 0 ) &&
- ( file[0] == '/' ) )
- {
- GtkTreeModel *model = gtk_tree_view_get_model( GTK_TREE_VIEW(cfg_device_lv) );
- GtkTreeIter iter;
-
- gtk_list_store_append( GTK_LIST_STORE(model) , &iter );
- gtk_list_store_set( GTK_LIST_STORE(model) , &iter ,
- DEVLIST_COL_ISACTIVE , FALSE ,
- DEVLIST_COL_NAME , name ,
- DEVLIST_COL_FILENAME , file ,
- DEVLIST_COL_PHYS , _("(custom)") ,
- DEVLIST_COL_ISAVAILABLE , DEVLIST_ISAVAILABLE_CUSTOM ,
- DEVLIST_COL_BINDINGS , NULL , -1 );
- task_done = TRUE;
- }
- else
- {
- ed_ui_message_show( _("Information") ,
- _("Please specify both name and filename.\n"
- "Filename must be specified with absolute path.") ,
- addc_dlg );
- }
- }
- else
- task_done = TRUE;
- }
-
- gtk_widget_destroy( addc_dlg );
-}
-
-
-static void
-cfg_config_cb_remove ( gpointer cfg_device_lv )
-{
- GtkTreeSelection *sel;
- GtkTreeModel *model;
- GtkTreeIter iter;
-
- /* check if a row is selected */
- sel = gtk_tree_view_get_selection( GTK_TREE_VIEW(cfg_device_lv) );
- if ( gtk_tree_selection_get_selected( sel , &model , &iter ) == TRUE )
- {
- guint is_available = 0;
- gtk_tree_model_get( model , &iter , DEVLIST_COL_ISAVAILABLE , &is_available , -1 );
- switch ( is_available )
- {
- case DEVLIST_ISAVAILABLE_NOTDET:
- {
- /* if remove is called on a not-detected device,
- it allows to remove existing configuration for it */
- GtkWidget *yesno_dlg = gtk_message_dialog_new( GTK_WINDOW(cfg_win) ,
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT , GTK_MESSAGE_QUESTION ,
- GTK_BUTTONS_YES_NO ,
- _("Do you want to remove the existing configuration for selected device?\n") );
- if ( gtk_dialog_run( GTK_DIALOG(yesno_dlg) ) == GTK_RESPONSE_YES )
- {
- gpointer bindings = NULL;
- gtk_tree_model_get( model , &iter , DEVLIST_COL_BINDINGS , &bindings , -1 );
- if ( bindings != NULL ) ed_bindings_store_delete( bindings );
- gtk_list_store_remove( GTK_LIST_STORE(model) , &iter );
- }
- gtk_widget_destroy( yesno_dlg );
- break;
- }
-
- case DEVLIST_ISAVAILABLE_CUSTOM:
- {
- /* if remove is called on a custom device,
- it allows to remove it along with its configuration */
- GtkWidget *yesno_dlg = gtk_message_dialog_new( GTK_WINDOW(cfg_win) ,
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT , GTK_MESSAGE_QUESTION ,
- GTK_BUTTONS_YES_NO ,
- _("Do you want to remove the selected custom device?\n") );
- if ( gtk_dialog_run( GTK_DIALOG(yesno_dlg) ) == GTK_RESPONSE_YES )
- {
- gpointer bindings = NULL;
- gtk_tree_model_get( model , &iter , DEVLIST_COL_BINDINGS , &bindings , -1 );
- if ( bindings != NULL ) ed_bindings_store_delete( bindings );
- gtk_list_store_remove( GTK_LIST_STORE(model) , &iter );
- }
- gtk_widget_destroy( yesno_dlg );
- break;
- }
-
- case DEVLIST_ISAVAILABLE_DET:
- default:
- {
- /* do nothing for detected devices */
- break;
- }
- }
- }
-}
-
-
-static gboolean
-cfg_config_cb_bindings_commit_foreach ( GtkTreeModel * model ,
- GtkTreePath * path ,
- GtkTreeIter * iter ,
- gpointer config_device_list_p )
-{
- gchar *device_name = NULL;
- gchar *device_file = NULL;
- gchar *device_phys = NULL;
- gboolean is_active = FALSE;
- guint is_available = 0;
- gpointer bindings = NULL;
- ed_device_info_t *info;
- GList **config_device_list = config_device_list_p;
-
- gtk_tree_model_get( model , iter ,
- DEVLIST_COL_ISACTIVE , &is_active ,
- DEVLIST_COL_NAME , &device_name ,
- DEVLIST_COL_FILENAME , &device_file ,
- DEVLIST_COL_PHYS , &device_phys ,
- DEVLIST_COL_ISAVAILABLE , &is_available ,
- DEVLIST_COL_BINDINGS , &bindings , -1 );
-
- info = ed_device_info_new( device_name , device_file , device_phys ,
- ( is_available == DEVLIST_ISAVAILABLE_CUSTOM ? 1 : 0 ) );
- info->bindings = bindings;
- info->is_active = is_active;
-
- *config_device_list = g_list_append( *config_device_list , info );
- return FALSE;
-}
-
-
-static gboolean
-cfg_config_cb_bindings_delbindings_foreach ( GtkTreeModel * model ,
- GtkTreePath * path ,
- GtkTreeIter * iter ,
- gpointer data )
-{
- gpointer bindings = NULL;
- gtk_tree_model_get( model , iter , DEVLIST_COL_BINDINGS , &bindings , -1 );
- if ( bindings != NULL )
- ed_bindings_store_delete( bindings );
- return FALSE;
-}
-
-
-static void
-cfg_config_cb_commit ( gpointer cfg_device_lv )
-{
- GList *config_device_list = NULL;
- GtkTreeModel *model;
-
- model = gtk_tree_view_get_model( GTK_TREE_VIEW(cfg_device_lv) );
- /* fill config_device_list with information from the treeview */
- gtk_tree_model_foreach( model , cfg_config_cb_bindings_commit_foreach , &config_device_list );
- /* ok, now we have a list of ed_device_info_t objects */
-
- /* commit changes in configuration file */
- ed_config_save_from_list( config_device_list );
-
- /* not needed anymore */
- ed_device_free_list( config_device_list );
-
- /* free bindings stored in the liststore */
- gtk_tree_model_foreach( model , cfg_config_cb_bindings_delbindings_foreach , NULL );
-
- if ( plugin_is_active == TRUE )
- {
- /* restart device listening according to the (possibly changed) config file */
- ed_device_start_listening_from_config();
- }
-
- gtk_widget_destroy( cfg_win );
-}
-
-
-static void
-cfg_config_cb_cancel ( gpointer cfg_device_lv )
-{
- GtkTreeModel *model;
- model = gtk_tree_view_get_model( GTK_TREE_VIEW(cfg_device_lv) );
-
- /* free bindings stored in the liststore */
- gtk_tree_model_foreach( model , cfg_config_cb_bindings_delbindings_foreach , NULL );
-
- if ( plugin_is_active == TRUE )
- {
- /* restart device listening according to the (unchanged) config file */
- ed_device_start_listening_from_config();
- }
-
- gtk_widget_destroy( cfg_win );
-}
-
-
-void
-ed_ui_config_show( void )
-{
- GtkWidget *cfg_vbox;
- GtkWidget *cfg_device_lv, *cfg_device_lv_frame, *cfg_device_lv_sw;
- GtkTreeViewColumn *cfg_device_lv_col_name, *cfg_device_lv_col_filename, *cfg_device_lv_col_phys;
- GtkTreeViewColumn *cfg_device_lv_col_isactive, *cfg_device_lv_col_isavailable;
- GtkCellRenderer *cfg_device_lv_rndr_text, *cfg_device_lv_rndr_toggle;
- GtkCellRenderer *cfg_device_lv_rndr_textphys, *cfg_device_lv_rndr_isavailable;
- GtkListStore *device_store;
- GtkWidget *cfg_bbar_hbbox;
- GtkWidget *cfg_bbar_bt_bind, *cfg_bbar_bt_addc, *cfg_bbar_bt_remc;
- GtkWidget *cfg_bbar_bt_cancel, *cfg_bbar_bt_ok;
- GdkGeometry cfg_win_hints;
-
- if ( cfg_win != NULL )
- {
- gtk_window_present( GTK_WINDOW(cfg_win) );
- return;
- }
-
- /* IMPORTANT: stop listening for all devices when config window is opened */
- ed_device_stop_listening_all( TRUE );
-
- cfg_win = gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_window_set_type_hint( GTK_WINDOW(cfg_win), GDK_WINDOW_TYPE_HINT_DIALOG );
- gtk_window_set_position( GTK_WINDOW(cfg_win), GTK_WIN_POS_CENTER );
- gtk_window_set_title( GTK_WINDOW(cfg_win), _("EvDev-Plug - Configuration") );
- gtk_container_set_border_width( GTK_CONTAINER(cfg_win), 10 );
- g_signal_connect( G_OBJECT(cfg_win) , "destroy" ,
- G_CALLBACK(gtk_widget_destroyed) , &cfg_win );
- cfg_win_hints.min_width = -1;
- cfg_win_hints.min_height = 300;
- gtk_window_set_geometry_hints( GTK_WINDOW(cfg_win) , GTK_WIDGET(cfg_win) ,
- &cfg_win_hints , GDK_HINT_MIN_SIZE );
-
- cfg_vbox = gtk_vbox_new( FALSE , 0 );
- gtk_container_add( GTK_CONTAINER(cfg_win) , cfg_vbox );
-
- /* current liststore model
- ----------------------------------------------
- G_TYPE_BOOLEAN -> device listening on/off
- G_TYPE_STRING -> device name
- G_TYPE_STRING -> device filename
- G_TYPE_STRING -> device physical port
- G_TYPE_UINT -> device is available
- G_TYPE_POINTER -> device bindings
- ----------------------------------------------
- */
- device_store = gtk_list_store_new(
- DEVLIST_NUMCOLS , G_TYPE_BOOLEAN , G_TYPE_STRING ,
- G_TYPE_STRING , G_TYPE_STRING , G_TYPE_UINT , G_TYPE_POINTER );
- cfg_device_lv_populate( device_store );
-
- cfg_device_lv_frame = gtk_frame_new( NULL );
- cfg_device_lv = gtk_tree_view_new_with_model( GTK_TREE_MODEL(device_store) );
- g_object_unref( device_store );
-
- cfg_device_lv_rndr_text = gtk_cell_renderer_text_new();
- cfg_device_lv_rndr_toggle = gtk_cell_renderer_toggle_new();
- cfg_device_lv_rndr_isavailable = gtk_cell_renderer_text_new();
- cfg_device_lv_rndr_textphys = gtk_cell_renderer_text_new();
- g_object_set( G_OBJECT(cfg_device_lv_rndr_textphys) ,
- "ellipsize-set" , TRUE , "ellipsize" , PANGO_ELLIPSIZE_END , NULL );
-
- cfg_device_lv_col_isactive = gtk_tree_view_column_new_with_attributes(
- _("Active") , cfg_device_lv_rndr_toggle , "active" , DEVLIST_COL_ISACTIVE , NULL );
- gtk_tree_view_column_set_expand( GTK_TREE_VIEW_COLUMN(cfg_device_lv_col_isactive) , FALSE );
- gtk_tree_view_append_column( GTK_TREE_VIEW(cfg_device_lv), cfg_device_lv_col_isactive );
- cfg_device_lv_col_isavailable = gtk_tree_view_column_new();
- gtk_tree_view_column_set_title( cfg_device_lv_col_isavailable , _("Status") );
- gtk_tree_view_column_pack_start( cfg_device_lv_col_isavailable , cfg_device_lv_rndr_isavailable , TRUE );
- gtk_tree_view_column_set_cell_data_func(
- cfg_device_lv_col_isavailable , cfg_device_lv_rndr_isavailable ,
- (GtkTreeCellDataFunc)cfg_device_lv_celldatafunc_isavailable ,
- NULL , NULL );
- gtk_tree_view_column_set_expand( GTK_TREE_VIEW_COLUMN(cfg_device_lv_col_isavailable) , FALSE );
- gtk_tree_view_append_column( GTK_TREE_VIEW(cfg_device_lv), cfg_device_lv_col_isavailable );
- cfg_device_lv_col_name = gtk_tree_view_column_new_with_attributes(
- _("Device Name") , cfg_device_lv_rndr_text , "text" , DEVLIST_COL_NAME , NULL );
- gtk_tree_view_column_set_expand( GTK_TREE_VIEW_COLUMN(cfg_device_lv_col_name) , FALSE );
- gtk_tree_view_append_column( GTK_TREE_VIEW(cfg_device_lv), cfg_device_lv_col_name );
- cfg_device_lv_col_filename = gtk_tree_view_column_new_with_attributes(
- _("Device File") , cfg_device_lv_rndr_text , "text" , DEVLIST_COL_FILENAME , NULL );
- gtk_tree_view_column_set_expand( GTK_TREE_VIEW_COLUMN(cfg_device_lv_col_filename) , FALSE );
- gtk_tree_view_append_column( GTK_TREE_VIEW(cfg_device_lv), cfg_device_lv_col_filename );
- cfg_device_lv_col_phys = gtk_tree_view_column_new_with_attributes(
- _("Device Address") , cfg_device_lv_rndr_textphys , "text" , DEVLIST_COL_PHYS , NULL );
- gtk_tree_view_column_set_expand( GTK_TREE_VIEW_COLUMN(cfg_device_lv_col_phys) , TRUE );
- gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(cfg_device_lv_col_phys) , TRUE );
- gtk_tree_view_append_column( GTK_TREE_VIEW(cfg_device_lv), cfg_device_lv_col_phys );
- cfg_device_lv_sw = gtk_scrolled_window_new( NULL , NULL );
- gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(cfg_device_lv_sw) ,
- GTK_POLICY_NEVER , GTK_POLICY_ALWAYS );
-
- gtk_container_add( GTK_CONTAINER(cfg_device_lv_sw) , cfg_device_lv );
- gtk_container_add( GTK_CONTAINER(cfg_device_lv_frame) , cfg_device_lv_sw );
- gtk_box_pack_start( GTK_BOX(cfg_vbox) , cfg_device_lv_frame , TRUE , TRUE , 0 );
-
- gtk_box_pack_start( GTK_BOX(cfg_vbox) , gtk_hseparator_new() , FALSE , FALSE , 4 );
-
- /* button bar */
- cfg_bbar_hbbox = gtk_hbutton_box_new();
- gtk_button_box_set_layout( GTK_BUTTON_BOX(cfg_bbar_hbbox) , GTK_BUTTONBOX_START );
- cfg_bbar_bt_bind = gtk_button_new_with_mnemonic( _("_Bindings") );
- gtk_button_set_image( GTK_BUTTON(cfg_bbar_bt_bind) ,
- gtk_image_new_from_stock( GTK_STOCK_PREFERENCES , GTK_ICON_SIZE_BUTTON ) );
- cfg_bbar_bt_addc = gtk_button_new_from_stock( GTK_STOCK_ADD );
- cfg_bbar_bt_remc = gtk_button_new_from_stock( GTK_STOCK_REMOVE );
- /*cfg_bbar_bt_refresh = gtk_button_new_from_stock( GTK_STOCK_REFRESH );*/
- cfg_bbar_bt_cancel = gtk_button_new_from_stock( GTK_STOCK_CANCEL );
- cfg_bbar_bt_ok = gtk_button_new_from_stock( GTK_STOCK_OK );
- gtk_container_add( GTK_CONTAINER(cfg_bbar_hbbox) , cfg_bbar_bt_bind );
- gtk_container_add( GTK_CONTAINER(cfg_bbar_hbbox) , cfg_bbar_bt_addc );
- gtk_container_add( GTK_CONTAINER(cfg_bbar_hbbox) , cfg_bbar_bt_remc );
- /*gtk_container_add( GTK_CONTAINER(cfg_bbar_hbbox) , cfg_bbar_bt_refresh );*/
- gtk_container_add( GTK_CONTAINER(cfg_bbar_hbbox) , cfg_bbar_bt_cancel );
- gtk_container_add( GTK_CONTAINER(cfg_bbar_hbbox) , cfg_bbar_bt_ok );
- gtk_button_box_set_child_secondary( GTK_BUTTON_BOX(cfg_bbar_hbbox) , cfg_bbar_bt_cancel , TRUE );
- gtk_button_box_set_child_secondary( GTK_BUTTON_BOX(cfg_bbar_hbbox) , cfg_bbar_bt_ok , TRUE );
- gtk_box_pack_start( GTK_BOX(cfg_vbox) , cfg_bbar_hbbox , FALSE , FALSE , 0 );
-
- g_signal_connect( cfg_device_lv_rndr_toggle , "toggled" ,
- G_CALLBACK(cfg_device_lv_changetoggle) , cfg_device_lv );
- g_signal_connect_swapped( G_OBJECT(cfg_bbar_bt_bind) , "clicked" ,
- G_CALLBACK(cfg_config_cb_bindings_show) , cfg_device_lv );
- g_signal_connect_swapped( G_OBJECT(cfg_bbar_bt_addc) , "clicked" ,
- G_CALLBACK(cfg_config_cb_addcustom_show) , cfg_device_lv );
- g_signal_connect_swapped( G_OBJECT(cfg_bbar_bt_remc) , "clicked" ,
- G_CALLBACK(cfg_config_cb_remove) , cfg_device_lv );
- g_signal_connect_swapped( G_OBJECT(cfg_bbar_bt_cancel) , "clicked" ,
- G_CALLBACK(cfg_config_cb_cancel) , cfg_device_lv );
- g_signal_connect_swapped( G_OBJECT(cfg_bbar_bt_ok) , "clicked" ,
- G_CALLBACK(cfg_config_cb_commit) , cfg_device_lv );
-
- gtk_widget_show_all( cfg_win );
-}
-
-
-
-/* bindings window */
-
-static void cfg_bindbox_new_empty_row( GtkTable * , GtkWidget * , gboolean );
-
-enum
-{
- BINDLIST_COL_COMBO_ACTION = 0,
- BINDLIST_COL_BT_ASSIGN,
- BINDLIST_COL_LABEL_EVCODE,
- BINDLIST_COL_BT_DELETE,
- BINDLIST_NUMCOLS
-};
-
-
-static gboolean
-cfg_bindbox_assign_binding_timeout_func ( gpointer bindings_win )
-{
- GtkWidget *trigger_dlg = g_object_get_data( G_OBJECT(bindings_win) , "trigger-win" );
- if ( trigger_dlg != NULL )
- gtk_dialog_response( GTK_DIALOG(trigger_dlg) , GTK_RESPONSE_CANCEL );
-
- return FALSE;
-}
-
-
-static gboolean
-cfg_bindbox_assign_binding_input_func ( GIOChannel * iochan ,
- GIOCondition cond ,
- gpointer bindings_win )
-{
- switch ( cond )
- {
- case G_IO_IN:
- {
- gsize rb = 0;
- struct input_event inputev;
- g_io_channel_read_chars( iochan , (gchar*)&inputev ,
- sizeof(struct input_event) , &rb , NULL );
- if ( rb == sizeof(struct input_event) )
- {
- GtkWidget *trigger_dlg = g_object_get_data( G_OBJECT(bindings_win) , "trigger-win" );
- if ( trigger_dlg == NULL )
- {
- /* the trigger-dialog window is not open; ignore input */
- return TRUE;
- }
- else
- {
- /* currently, only care about events of type 'key' and 'absolute'
- TODO: should we handle some other event type as well? */
- switch ( inputev.type )
- {
- case EV_KEY:
- case EV_ABS:
- {
- /* the trigger-dialog window is open; record input and
- store it in a container managed by the trigger-dialog itself */
- ed_inputevent_t *dinputev = g_malloc(sizeof(ed_inputevent_t));
- dinputev->type = inputev.type;
- dinputev->code = inputev.code;
- dinputev->value = inputev.value;
- g_object_set_data( G_OBJECT(trigger_dlg) , "trigger-data" , dinputev );
- gtk_dialog_response( GTK_DIALOG(trigger_dlg) , GTK_RESPONSE_OK );
- break;
- }
- }
- }
- }
- }
-
- default:
- ;
- }
- return TRUE;
-}
-
-
-static gboolean
-cfg_bindbox_assign_binding_checkdups( GtkWidget * table , ed_inputevent_t * inputev )
-{
- /* check if inputev is already assigned in table */
- GList *children = GTK_TABLE(table)->children;
- for ( ; children != NULL ; children = g_list_next(children) )
- {
- GtkTableChild *child = children->data;
-
- if ( child->top_attach + 1 == GTK_TABLE(table)->nrows )
- continue; /* skip last empty row */
-
- if ( child->left_attach == BINDLIST_COL_LABEL_EVCODE )
- {
- /* it's a label, pick its inputevent */
- ed_inputevent_t * iev = g_object_get_data( G_OBJECT(child->widget) , "inputevent" );
- if ( ( iev != NULL ) && ( ed_inputevent_check_equality( inputev , iev ) == TRUE ) )
- return TRUE; /* a duplicate was found */
- }
- }
- return FALSE;
-}
-
-
-static void
-cfg_bindbox_assign_binding ( GtkButton * assign_button , gpointer bindings_win )
-{
- GtkWidget *trigger_dlg;
- GtkWidget *trigger_dlg_frame;
- GtkWidget *trigger_dlg_label;
- guint timeout_sid = 0;
- gint res = 0;
-
- /* create a not-decorated window to inform the user about what's going on */
- trigger_dlg = gtk_dialog_new();
- gtk_widget_set_name( trigger_dlg , "trigger_dlg" );
- trigger_dlg_label = gtk_label_new( _("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.") );
- gtk_widget_hide( GTK_WIDGET(GTK_DIALOG(trigger_dlg)->action_area) );
- gtk_misc_set_padding( GTK_MISC(trigger_dlg_label) , 10 , 10 );
- trigger_dlg_frame = gtk_frame_new( NULL );
- gtk_container_add( GTK_CONTAINER(trigger_dlg_frame) , trigger_dlg_label );
- gtk_container_add( GTK_CONTAINER(GTK_DIALOG(trigger_dlg)->vbox) , trigger_dlg_frame );
- gtk_window_set_position( GTK_WINDOW(trigger_dlg) , GTK_WIN_POS_CENTER );
- gtk_window_set_decorated( GTK_WINDOW(trigger_dlg) , FALSE );
- gtk_window_set_transient_for( GTK_WINDOW(trigger_dlg) ,
- GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(assign_button))) );
- gtk_dialog_set_has_separator( GTK_DIALOG(trigger_dlg) , FALSE );
- gtk_widget_show_all( trigger_dlg );
-
- /* close the trigger-window if no input is received in 5 seconds */
- timeout_sid = g_timeout_add( 5000 , cfg_bindbox_assign_binding_timeout_func , bindings_win );
-
- g_object_set_data( G_OBJECT(bindings_win) , "trigger-win" , trigger_dlg ); /* enable trigger-listening */
- res = gtk_dialog_run( GTK_DIALOG(trigger_dlg) );
- g_object_set_data( G_OBJECT(bindings_win) , "trigger-win" , NULL ); /* stop trigger-listening */
- switch ( res )
- {
- case GTK_RESPONSE_OK:
- {
- ed_inputevent_t *dinputev = g_object_get_data( G_OBJECT(trigger_dlg) , "trigger-data" );
- GtkWidget *label = g_object_get_data( G_OBJECT(assign_button) , "label" );
- GtkWidget *table = g_object_get_data( G_OBJECT(bindings_win) , "table" );
- gchar *input_str;
-
- /* we got a new input event; ensure that this has not been assigned to an action already */
- if ( cfg_bindbox_assign_binding_checkdups( table , dinputev ) == TRUE )
- {
- /* this input event has been already used */
- g_free( dinputev );
- g_source_remove( timeout_sid );
- ed_ui_message_show( _("Information") ,
- _("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).") ,
- bindings_win );
- }
- else
- {
- /* if this is the last row ("Assign" button) , create a new empty row */
- if ( GPOINTER_TO_INT(g_object_get_data(G_OBJECT(assign_button),"last")) == 1 )
- {
- cfg_bindbox_new_empty_row( GTK_TABLE(table) , bindings_win , TRUE );
- /* so, the current row is not the last one anymore;
- remove its "last" mark and enable its delete button */
- g_object_set_data( G_OBJECT(assign_button) , "last" , GINT_TO_POINTER(0) );
- gtk_widget_set_sensitive( GTK_WIDGET(g_object_get_data(G_OBJECT(assign_button),"delbt")) , TRUE );
- }
-
- g_object_set_data_full( G_OBJECT(label) , "inputevent" , dinputev , g_free );
- input_str = g_strdup_printf( "%i:%i:%i" , dinputev->type , dinputev->code , dinputev->value );
- gtk_label_set_text( GTK_LABEL(label) , input_str );
- g_free( input_str );
- g_source_remove( timeout_sid );
- }
-
- break;
- }
-
- default:
- {
- break; /* nothing should be changed */
- }
- }
-
- gtk_widget_destroy( trigger_dlg );
-}
-
-
-static void
-cfg_bindbox_delete_row( GtkButton * delete_button , gpointer bindings_win )
-{
- GtkTable *oldtable, *newtable;
- GtkWidget *table_sw, *table_vp;
- GList *children = NULL;
- gint drow = 0;
-
- /* here comes the drawback of using GtkTable to display
- a list-like set of widgets :) deletion can be a complex task */
-
- /* first, get the row number of the row that should be deleted
- (this can't be the last one cause it has the delete button disabled) */
- oldtable = g_object_get_data( G_OBJECT(bindings_win) , "table" );
- children = oldtable->children;
- while ( children != NULL )
- {
- GtkTableChild *child = children->data;
- if ( child->widget == (GtkWidget*)delete_button )
- drow = child->top_attach;
- children = g_list_next( children );
- }
-
- /* now, a simple trick: create a new GtkTable and move all
- of the widgets there, excepting those positioned in row "drow" */
- newtable = (GtkTable*)gtk_table_new( oldtable->nrows - 1 , oldtable->ncols , FALSE );
-
- children = oldtable->children;
- while ( children != NULL )
- {
- GtkTableChild *child = children->data;
- if ( child->top_attach < drow )
- {
- GtkWidget *widget = child->widget;
- guint widget_row = child->top_attach;
- guint widget_col = child->left_attach;
- g_object_ref( widget );
- gtk_container_remove( GTK_CONTAINER(oldtable) , widget );
- gtk_table_attach( GTK_TABLE(newtable) , widget ,
- widget_col , widget_col + 1 , widget_row , widget_row + 1 ,
- (widget_col == BINDLIST_COL_LABEL_EVCODE ? GTK_EXPAND | GTK_FILL : GTK_FILL ) , GTK_FILL , 0 , 0 );
- /* gtk_container_remove() changed the structure used to iterate; restart */
- children = oldtable->children;
- }
- else if ( child->top_attach > drow )
- {
- GtkWidget *widget = child->widget;
- guint widget_row = child->top_attach;
- guint widget_col = child->left_attach;
- g_object_ref( widget );
- gtk_container_remove( GTK_CONTAINER(oldtable) , widget );
- gtk_table_attach( GTK_TABLE(newtable) , widget ,
- widget_col , widget_col + 1 , widget_row - 1 , widget_row ,
- (widget_col == BINDLIST_COL_LABEL_EVCODE ? GTK_EXPAND | GTK_FILL : GTK_FILL ) , GTK_FILL , 0 , 0 );
- /* gtk_container_remove() changed the structure used to iterate; restart */
- children = oldtable->children;
- }
- else
- children = g_list_next(children);
- }
-
- /* now, replace the old GtkTable with the new one */
- table_sw = g_object_get_data( G_OBJECT(bindings_win) , "tablesw" );
- table_vp = gtk_bin_get_child( GTK_BIN(table_sw) ); /* get the viewport */
- gtk_widget_destroy( GTK_WIDGET(oldtable) ); /* destroy old GtkTable */
- gtk_container_add( GTK_CONTAINER(table_vp) , GTK_WIDGET(newtable) );
- g_object_set_data( G_OBJECT(bindings_win) , "table" , newtable ); /* update table in bindings_win */
- gtk_widget_show_all( GTK_WIDGET(newtable) );
- return;
-}
-
-
-/* the three structure types defined below
- are only used in cfg_bindbox_populate process */
-typedef struct
-{
- GtkWidget *combobox;
- gint action_code;
-}
-combosas_helper_t;
-
-typedef struct
-{
- gint action_code;
- ed_inputevent_t * inputev;
-}
-popul_binding_t;
-
-typedef struct
-{
- gint id;
- popul_binding_t *bindings;
-}
-popul_container_binding_t;
-
-static gboolean
-cfg_bindbox_populate_foreach_combosas ( GtkTreeModel * model ,
- GtkTreePath * path ,
- GtkTreeIter * iter ,
- gpointer combosas_helper_gp )
-{
- gint action_code = 0;
- combosas_helper_t *combosas_helper = combosas_helper_gp;
- gtk_tree_model_get( model , iter , 1 , &action_code , -1 );
- if ( action_code == combosas_helper->action_code )
- {
- gtk_combo_box_set_active_iter( GTK_COMBO_BOX(combosas_helper->combobox) , iter );
- return TRUE;
- }
- return FALSE;
-}
-
-static void
-cfg_bindbox_populate_foreach ( ed_inputevent_t * sinputev ,
- gint action_code ,
- gpointer popul_container_gp ,
- gpointer none )
-{
- ed_inputevent_t *inputev;
- popul_container_binding_t *popul_container = popul_container_gp;
-
- /* make a copy of the ed_inputevent_t object "sinputev" */
- inputev = g_malloc(sizeof(ed_inputevent_t));
- inputev->type = sinputev->type;
- inputev->code = sinputev->code;
- inputev->value = sinputev->value;
-
- popul_container->bindings[popul_container->id].inputev = inputev;
- popul_container->bindings[popul_container->id].action_code = action_code;
-
- popul_container->id++;
- return;
-}
-
-static int
-cfg_bindbox_populate_qsortfunc( const void * p_binding_a , const void * p_binding_b )
-{
- return ((popul_binding_t*)p_binding_a)->action_code - ((popul_binding_t*)p_binding_b)->action_code;
-}
-
-static void
-cfg_bindbox_populate( GtkWidget * bind_table , GtkWidget * bindings_win , gpointer bindings )
-{
- if ( bindings != NULL )
- {
- guint bindings_num = ed_bindings_store_size( bindings );
- popul_binding_t *popul_binding = (popul_binding_t*)calloc( bindings_num , sizeof(popul_binding_t) );
- popul_container_binding_t *popul_container = g_malloc(sizeof(popul_container_binding_t));
- gint i = 0;
-
- popul_container->bindings = popul_binding;
- popul_container->id = 0;
-
- ed_bindings_store_foreach( bindings ,
- (ed_bindings_store_foreach_func)cfg_bindbox_populate_foreach , popul_container , NULL );
-
- /* ok, now we have a popul_binding array, reorder it using action_codes */
- qsort( popul_binding , bindings_num , sizeof(popul_binding_t) , cfg_bindbox_populate_qsortfunc );
-
- /* attach to table each popul_binding */
- for ( i = 0 ; i < bindings_num ; i++ )
- {
- GList *children = GTK_TABLE(bind_table)->children;
- for ( ; children != NULL ; children = g_list_next(children) )
- {
- GtkTableChild *child = children->data;
- if ( ( (child->top_attach + 1) == GTK_TABLE(bind_table)->nrows ) &&
- ( child->left_attach == BINDLIST_COL_BT_ASSIGN ) &&
- ( GPOINTER_TO_INT(g_object_get_data(G_OBJECT(child->widget),"last")) == 1 ) )
- {
- /* ok, this child->widget is the last assign button */
- GtkWidget *combobox = g_object_get_data(G_OBJECT(child->widget),"combobox");
- GtkWidget *label = g_object_get_data(G_OBJECT(child->widget),"label");
- GtkWidget *delbt = g_object_get_data(G_OBJECT(child->widget),"delbt");
- GtkTreeModel *combomodel;
- combosas_helper_t *combosas_helper;
- gchar *input_str;
-
- combomodel = gtk_combo_box_get_model( GTK_COMBO_BOX(combobox) );
- combosas_helper = g_malloc(sizeof(combosas_helper_t));
- combosas_helper->combobox = combobox;
- combosas_helper->action_code = popul_binding[i].action_code;
- gtk_tree_model_foreach( combomodel , cfg_bindbox_populate_foreach_combosas , combosas_helper );
- g_free( combosas_helper );
-
- g_object_set_data_full( G_OBJECT(label) , "inputevent" , popul_binding[i].inputev , g_free );
- input_str = g_strdup_printf( "%i:%i:%i" ,
- popul_binding[i].inputev->type ,
- popul_binding[i].inputev->code ,
- popul_binding[i].inputev->value );
- gtk_label_set_text( GTK_LABEL(label) , input_str );
- g_free( input_str );
-
- /* so, the current row wont' be the last one anymore;
- remove its "last" mark and enable its delete button */
- g_object_set_data( G_OBJECT(child->widget) , "last" , GINT_TO_POINTER(0) );
- gtk_widget_set_sensitive( delbt , TRUE );
- cfg_bindbox_new_empty_row( GTK_TABLE(bind_table) , bindings_win , TRUE );
-
- }
- }
- DEBUGMSG( "populating bindings window: code %i -> event %d:%d:%d\n" ,
- popul_binding[i].action_code , popul_binding[i].inputev->type,
- popul_binding[i].inputev->code, popul_binding[i].inputev->value );
- }
- g_free( popul_binding );
- g_free( popul_container );
- }
- return;
-}
-
-
-static void
-cfg_bindbox_new_empty_row( GtkTable * bind_table , GtkWidget * bindings_win , gboolean resize_table )
-{
- GtkWidget *action_combobox;
- GtkCellRenderer *action_combobox_rndr;
- GtkWidget *assign_button;
- GtkWidget *assign_label;
- GtkWidget *delete_button;
-
- /* add one row to the table */
- if ( resize_table == TRUE )
- gtk_table_resize( bind_table , bind_table->nrows + 1 , bind_table->ncols );
-
- /* action combobox */
- action_combobox = gtk_combo_box_new_with_model(
- GTK_TREE_MODEL(g_object_get_data(G_OBJECT(bindings_win),"action_store")) );
- action_combobox_rndr = gtk_cell_renderer_text_new();
- gtk_cell_layout_pack_start( GTK_CELL_LAYOUT(action_combobox) , action_combobox_rndr , TRUE );
- gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT(action_combobox) ,
- action_combobox_rndr , "text" , 0 , NULL );
- gtk_combo_box_set_active( GTK_COMBO_BOX(action_combobox) , 0 );
-
- gtk_table_attach( bind_table , action_combobox ,
- BINDLIST_COL_COMBO_ACTION , BINDLIST_COL_COMBO_ACTION + 1 ,
- bind_table->nrows - 1 , bind_table->nrows ,
- GTK_FILL , GTK_FILL , 0 , 0 );
-
- /* assign button */
- assign_button = gtk_button_new();
- gtk_button_set_image( GTK_BUTTON(assign_button) ,
- gtk_image_new_from_stock( GTK_STOCK_EXECUTE , GTK_ICON_SIZE_BUTTON ) );
- g_object_set_data( G_OBJECT(assign_button) , "last" , GINT_TO_POINTER(1) );
- g_signal_connect( G_OBJECT(assign_button) , "clicked" ,
- G_CALLBACK(cfg_bindbox_assign_binding) , bindings_win );
-
- gtk_table_attach( bind_table , assign_button ,
- BINDLIST_COL_BT_ASSIGN , BINDLIST_COL_BT_ASSIGN + 1 ,
- bind_table->nrows - 1 , bind_table->nrows ,
- GTK_FILL , GTK_FILL , 0 , 0 );
-
- /* assigned-code label */
- assign_label = gtk_label_new( "" );
- gtk_misc_set_alignment( GTK_MISC(assign_label) , 0 , 0.5 );
- gtk_misc_set_padding( GTK_MISC(assign_label) , 10 , 0 );
- g_object_set_data_full( G_OBJECT(assign_label) , "inputevent" , NULL , g_free );
-
- gtk_table_attach( bind_table , assign_label ,
- BINDLIST_COL_LABEL_EVCODE , BINDLIST_COL_LABEL_EVCODE +1 ,
- bind_table->nrows - 1 , bind_table->nrows ,
- GTK_EXPAND | GTK_FILL , GTK_FILL , 0 , 0 );
-
- /* delete button */
- delete_button = gtk_button_new();
- gtk_button_set_image( GTK_BUTTON(delete_button) ,
- gtk_image_new_from_stock( GTK_STOCK_DELETE , GTK_ICON_SIZE_BUTTON ) );
- g_signal_connect( G_OBJECT(delete_button) , "clicked" ,
- G_CALLBACK(cfg_bindbox_delete_row) , bindings_win );
- gtk_widget_set_sensitive( delete_button , FALSE );
-
- gtk_table_attach( bind_table , delete_button ,
- BINDLIST_COL_BT_DELETE , BINDLIST_COL_BT_DELETE + 1 ,
- bind_table->nrows - 1 , bind_table->nrows ,
- GTK_FILL , GTK_FILL , 0 , 0 );
-
- /* data for assign button */
- g_object_set_data( G_OBJECT(assign_button) , "combobox" , action_combobox );
- g_object_set_data( G_OBJECT(assign_button) , "label" , assign_label );
- g_object_set_data( G_OBJECT(assign_button) , "delbt" , delete_button );
-
- gtk_widget_show_all( GTK_WIDGET(bind_table) );
- return;
-}
-
-
-static void
-cfg_bindings_cb_destroy ( GtkObject * bindings_win , gpointer dev_gp )
-{
- ed_device_t *dev = dev_gp;
- /* bindings window is going to be destroyed;
- deactivate device listening and free the ed_device_t object */
- g_source_remove( dev->iochan_sid );
- ed_device_delete( dev );
-
- /* the rowreference is no longer needed as well */
- gtk_tree_row_reference_free(
- (GtkTreeRowReference*)g_object_get_data(G_OBJECT(bindings_win),"rowref") );
- return;
-}
-
-
-static void
-cfg_bindings_cb_commit ( gpointer bindings_win )
-{
- GtkTreeRowReference *rowref = g_object_get_data(G_OBJECT(bindings_win),"rowref");
- if ( gtk_tree_row_reference_valid( rowref ) == TRUE )
- {
- GtkTreeModel *model = gtk_tree_row_reference_get_model( rowref );
- GtkTreePath *path = gtk_tree_row_reference_get_path( rowref );
- GtkTreeIter iter;
- GtkTable *table;
- gpointer new_bindings = NULL, old_bindings = NULL;
-
- /****************************************************************************/
- table = g_object_get_data( G_OBJECT(bindings_win) , "table" );
- if ( table->nrows > 1 )
- {
- /* bindings defined */
- GList *children = table->children;
- gint *array_actioncode;
- ed_inputevent_t **array_inputevent;
- gint i = 0;
-
- array_actioncode = calloc( table->nrows - 1 , sizeof(gint) );
- array_inputevent = calloc( table->nrows - 1 , sizeof(ed_inputevent_t*) );
-
- for ( ; children != NULL ; children = g_list_next( children ) )
- {
- /* pick information from relevant table cells and put them in arrays */
- GtkTableChild *child = children->data;
-
- if ( ( child->top_attach + 1 ) == table->nrows )
- continue; /* skip last empty row */
-
- if ( child->left_attach == BINDLIST_COL_COMBO_ACTION )
- {
- GtkTreeModel *combomodel = gtk_combo_box_get_model( GTK_COMBO_BOX(child->widget) );
- GtkTreeIter comboiter;
- gint actioncode = 0;
-
- gtk_combo_box_get_active_iter( GTK_COMBO_BOX(child->widget) , &comboiter );
- gtk_tree_model_get( combomodel , &comboiter , 1 , &actioncode , -1 ); /* pick the action code */
- array_actioncode[child->top_attach] = actioncode;
- }
- else if ( child->left_attach == BINDLIST_COL_LABEL_EVCODE )
- {
- ed_inputevent_t *inputevent = g_object_get_data( G_OBJECT(child->widget) , "inputevent" );
- array_inputevent[child->top_attach] = inputevent;
- }
- }
-
- /* ok, now copy data from arrays to the bindings store */
- new_bindings = ed_bindings_store_new(); /* new bindings store object */
-
- for ( i = 0 ; i < ( table->nrows - 1 ) ; i++ )
- ed_bindings_store_insert( new_bindings , array_inputevent[i] , array_actioncode[i] );
-
- g_free( array_actioncode ); g_free( array_inputevent ); /* not needed anymore */
- }
- else
- {
- /* no bindings defined */
- new_bindings = NULL;
- }
- /****************************************************************************/
-
- /* pick old bindings store and delete it */
- gtk_tree_model_get_iter( model , &iter , path );
- gtk_tree_model_get( model , &iter, DEVLIST_COL_BINDINGS , &old_bindings , -1 );
- if ( old_bindings != NULL )
- ed_bindings_store_delete( old_bindings );
- /* replace it with new one */
- gtk_list_store_set( GTK_LIST_STORE(model) , &iter , DEVLIST_COL_BINDINGS , new_bindings , -1 );
- /* everything done! */
- }
- gtk_widget_destroy( GTK_WIDGET(bindings_win) );
-}
-
-
-#define action_store_add(x) { gtk_list_store_append(action_store,&iter); gtk_list_store_set(action_store,&iter,0,_(player_actions[x].desc),1,x,-1); }
-
-static void
-cfg_ui_bindings_show ( ed_device_t * dev , GtkTreeRowReference * rowref )
-{
- GtkWidget *bindings_win;
- GdkGeometry bindings_win_hints;
- GtkWidget *bindings_vbox;
- GtkWidget *bindings_info_table, *bindings_info_frame;
- GtkWidget *bindings_info_label_name_p, *bindings_info_label_name_c;
- GtkWidget *bindings_info_label_file_p, *bindings_info_label_file_c;
- GtkWidget *bindings_info_label_phys_p, *bindings_info_label_phys_c;
- GtkWidget *bindings_bind_frame, *bindings_bind_table, *bindings_bind_table_sw;
- GtkWidget *bindings_bbar_hbbox, *bindings_bbar_bt_cancel, *bindings_bbar_bt_ok;
- GtkListStore *action_store;
- GtkTreeIter iter;
- static gboolean style_added = FALSE;
-
- if ( !style_added )
- {
- /* this is used by trigger dialogs, calling it once is enough */
- gtk_rc_parse_string( "style \"noaaborder\" { GtkDialog::action-area-border = 0 }\n"
- "widget \"trigger_dlg\" style \"noaaborder\"\n" );
- style_added = TRUE;
- }
-
- bindings_win = gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_window_set_type_hint( GTK_WINDOW(bindings_win), GDK_WINDOW_TYPE_HINT_DIALOG );
- gtk_window_set_position( GTK_WINDOW(bindings_win), GTK_WIN_POS_CENTER );
- gtk_window_set_transient_for( GTK_WINDOW(bindings_win), GTK_WINDOW(cfg_win) );
- gtk_window_set_modal( GTK_WINDOW(bindings_win) , TRUE );
- gtk_window_set_title( GTK_WINDOW(bindings_win), _("EvDev-Plug - Bindings Configuration") );
- gtk_container_set_border_width( GTK_CONTAINER(bindings_win), 10 );
- bindings_win_hints.min_width = 400;
- bindings_win_hints.min_height = 400;
- gtk_window_set_geometry_hints( GTK_WINDOW(bindings_win) , GTK_WIDGET(bindings_win) ,
- &bindings_win_hints , GDK_HINT_MIN_SIZE );
-
- g_object_set_data( G_OBJECT(bindings_win) , "rowref" , rowref );
- g_object_set_data( G_OBJECT(bindings_win) , "trigger-win" , NULL );
-
- bindings_vbox = gtk_vbox_new( FALSE , 4 );
- gtk_container_add( GTK_CONTAINER(bindings_win) , bindings_vbox );
-
- /* action combobox model
- column 0 -> action desc
- column 1 -> action code */
- action_store = gtk_list_store_new( 2 , G_TYPE_STRING , G_TYPE_INT );
- action_store_add( ED_ACTION_PB_PLAY );
- action_store_add( ED_ACTION_PB_STOP );
- action_store_add( ED_ACTION_PB_PAUSE );
- action_store_add( ED_ACTION_PB_PREV );
- action_store_add( ED_ACTION_PB_NEXT );
- action_store_add( ED_ACTION_PB_EJECT );
- action_store_add( ED_ACTION_PL_REPEAT );
- action_store_add( ED_ACTION_PL_SHUFFLE );
- action_store_add( ED_ACTION_VOL_UP5 );
- action_store_add( ED_ACTION_VOL_DOWN5 );
- action_store_add( ED_ACTION_VOL_UP10 );
- action_store_add( ED_ACTION_VOL_DOWN10 );
- action_store_add( ED_ACTION_VOL_MUTE );
- action_store_add( ED_ACTION_WIN_MAIN );
- action_store_add( ED_ACTION_WIN_PLAYLIST );
- action_store_add( ED_ACTION_WIN_EQUALIZER );
- action_store_add( ED_ACTION_WIN_JTF );
- g_object_set_data_full( G_OBJECT(bindings_win) , "action_store" , action_store , g_object_unref );
-
- /* info table */
- bindings_info_table = gtk_table_new( 3 , 2 , FALSE );
- gtk_container_set_border_width( GTK_CONTAINER(bindings_info_table), 4 );
- bindings_info_label_name_p = gtk_label_new( "" );
- gtk_label_set_markup( GTK_LABEL(bindings_info_label_name_p) , _("Name: ") );
- gtk_misc_set_alignment( GTK_MISC(bindings_info_label_name_p) , 0 , 0.5 );
- bindings_info_label_name_c = gtk_label_new( dev->info->name );
- gtk_misc_set_alignment( GTK_MISC(bindings_info_label_name_c) , 0 , 0.5 );
- gtk_table_attach( GTK_TABLE(bindings_info_table) , bindings_info_label_name_p , 0 , 1 , 0 , 1 ,
- GTK_FILL , GTK_FILL | GTK_EXPAND , 0 , 0 );
- gtk_table_attach( GTK_TABLE(bindings_info_table) , bindings_info_label_name_c , 1 , 2 , 0 , 1 ,
- GTK_FILL , GTK_FILL | GTK_EXPAND , 0 , 0 );
- bindings_info_label_file_p = gtk_label_new( "" );
- gtk_label_set_markup( GTK_LABEL(bindings_info_label_file_p) , _("Filename: ") );
- gtk_misc_set_alignment( GTK_MISC(bindings_info_label_file_p) , 0 , 0.5 );
- bindings_info_label_file_c = gtk_label_new( dev->info->filename );
- gtk_misc_set_alignment( GTK_MISC(bindings_info_label_file_c) , 0 , 0.5 );
- gtk_table_attach( GTK_TABLE(bindings_info_table) , bindings_info_label_file_p , 0 , 1 , 1 , 2 ,
- GTK_FILL , GTK_FILL | GTK_EXPAND , 0 , 0 );
- gtk_table_attach( GTK_TABLE(bindings_info_table) , bindings_info_label_file_c , 1 , 2 , 1 , 2 ,
- GTK_FILL , GTK_FILL | GTK_EXPAND , 0 , 0 );
- bindings_info_label_phys_p = gtk_label_new( "" );
- gtk_label_set_markup( GTK_LABEL(bindings_info_label_phys_p) , _("Phys.Address: ") );
- gtk_misc_set_alignment( GTK_MISC(bindings_info_label_phys_p) , 0 , 0.5 );
- bindings_info_label_phys_c = gtk_label_new( dev->info->phys );
- gtk_misc_set_alignment( GTK_MISC(bindings_info_label_phys_c) , 0 , 0.5 );
- gtk_table_attach( GTK_TABLE(bindings_info_table) , bindings_info_label_phys_p , 0 , 1 , 2 , 3 ,
- GTK_FILL , GTK_FILL | GTK_EXPAND , 0 , 0 );
- gtk_table_attach( GTK_TABLE(bindings_info_table) , bindings_info_label_phys_c , 1 , 2 , 2 , 3 ,
- GTK_FILL , GTK_FILL | GTK_EXPAND , 0 , 0 );
- bindings_info_frame = gtk_frame_new( NULL );
- gtk_container_add( GTK_CONTAINER(bindings_info_frame) , bindings_info_table );
- gtk_box_pack_start( GTK_BOX(bindings_vbox) , bindings_info_frame , FALSE , FALSE , 0 );
-
- /* bindings boxlist */
- bindings_bind_table = gtk_table_new( 1 , BINDLIST_NUMCOLS , FALSE );
- cfg_bindbox_new_empty_row( GTK_TABLE(bindings_bind_table) , bindings_win , FALSE );
- cfg_bindbox_populate( bindings_bind_table , bindings_win , dev->info->bindings );
- bindings_bind_table_sw = gtk_scrolled_window_new( NULL , NULL );
- gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(bindings_bind_table_sw) ,
- GTK_POLICY_NEVER , GTK_POLICY_ALWAYS );
- bindings_bind_frame = gtk_frame_new( NULL );
- gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(bindings_bind_table_sw) ,
- bindings_bind_table );
- gtk_container_add( GTK_CONTAINER(bindings_bind_frame) , bindings_bind_table_sw );
- gtk_box_pack_start( GTK_BOX(bindings_vbox) , bindings_bind_frame , TRUE , TRUE , 0 );
- g_object_set_data( G_OBJECT(bindings_win) , "table" , bindings_bind_table );
- g_object_set_data( G_OBJECT(bindings_win) , "tablesw" , bindings_bind_table_sw );
-
- gtk_box_pack_start( GTK_BOX(bindings_vbox) , gtk_hseparator_new() , FALSE , FALSE , 0 );
-
- /* button bar */
- bindings_bbar_hbbox = gtk_hbutton_box_new();
- gtk_button_box_set_layout( GTK_BUTTON_BOX(bindings_bbar_hbbox) , GTK_BUTTONBOX_START );
- bindings_bbar_bt_cancel = gtk_button_new_from_stock( GTK_STOCK_CANCEL );
- bindings_bbar_bt_ok = gtk_button_new_from_stock( GTK_STOCK_OK );
- gtk_container_add( GTK_CONTAINER(bindings_bbar_hbbox) , bindings_bbar_bt_cancel );
- gtk_container_add( GTK_CONTAINER(bindings_bbar_hbbox) , bindings_bbar_bt_ok );
- gtk_button_box_set_child_secondary( GTK_BUTTON_BOX(bindings_bbar_hbbox) , bindings_bbar_bt_cancel , TRUE );
- gtk_button_box_set_child_secondary( GTK_BUTTON_BOX(bindings_bbar_hbbox) , bindings_bbar_bt_ok , TRUE );
- gtk_box_pack_start( GTK_BOX(bindings_vbox) , bindings_bbar_hbbox , FALSE , FALSE , 0 );
-
- /* activate device listening */
- dev->iochan_sid = g_io_add_watch( dev->iochan , G_IO_IN ,
- (GIOFunc)cfg_bindbox_assign_binding_input_func , bindings_win );
-
- /* signals */
- g_signal_connect( G_OBJECT(bindings_win) , "destroy" ,
- G_CALLBACK(cfg_bindings_cb_destroy) , dev );
- g_signal_connect_swapped( G_OBJECT(bindings_bbar_bt_cancel) , "clicked" ,
- G_CALLBACK(gtk_widget_destroy) , bindings_win );
- g_signal_connect_swapped( G_OBJECT(bindings_bbar_bt_ok) , "clicked" ,
- G_CALLBACK(cfg_bindings_cb_commit) , bindings_win );
-
- gtk_widget_show_all( bindings_win );
-}
-
-
-
-/* about box */
-void
-ed_ui_about_show( void )
-{
- static GtkWidget *about_win = NULL;
- GtkWidget *about_vbox;
- GtkWidget *logoandinfo_vbox;
- GtkWidget *info_tv, *info_tv_sw, *info_tv_frame;
- GtkWidget *bbar_bbox, *bbar_bt_ok;
- GtkTextBuffer *info_tb;
- GdkGeometry abount_win_hints;
- gchar *info_tb_content = NULL;
-
- if ( about_win != NULL )
- {
- gtk_window_present( GTK_WINDOW(about_win) );
- return;
- }
-
- about_win = gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_window_set_type_hint( GTK_WINDOW(about_win), GDK_WINDOW_TYPE_HINT_DIALOG );
- gtk_window_set_position( GTK_WINDOW(about_win), GTK_WIN_POS_CENTER );
- gtk_window_set_title( GTK_WINDOW(about_win), _("EvDev-Plug - about") );
- abount_win_hints.min_width = 420;
- abount_win_hints.min_height = 200;
- gtk_window_set_geometry_hints( GTK_WINDOW(about_win) , GTK_WIDGET(about_win) ,
- &abount_win_hints , GDK_HINT_MIN_SIZE );
- /* gtk_window_set_resizable( GTK_WINDOW(about_win) , FALSE ); */
- gtk_container_set_border_width( GTK_CONTAINER(about_win) , 10 );
- g_signal_connect( G_OBJECT(about_win) , "destroy" , G_CALLBACK(gtk_widget_destroyed) , &about_win );
-
- about_vbox = gtk_vbox_new( FALSE , 0 );
- gtk_container_add( GTK_CONTAINER(about_win) , about_vbox );
-
- logoandinfo_vbox = gtk_vbox_new( TRUE , 2 );
-
- /* TODO make a logo or make someone do it! :)
- logo_pixbuf = gdk_pixbuf_new_from_xpm_data( (const gchar **)evdev_plug_logo_xpm );
- logo_image = gtk_image_new_from_pixbuf( logo_pixbuf );
- g_object_unref( logo_pixbuf );
-
- logo_frame = gtk_frame_new( NULL );
- gtk_container_add( GTK_CONTAINER(logo_frame) , logo_image );
- gtk_box_pack_start( GTK_BOX(logoandinfo_vbox) , logo_frame , TRUE , TRUE , 0 ); */
-
- info_tv = gtk_text_view_new();
- info_tb = gtk_text_view_get_buffer( GTK_TEXT_VIEW(info_tv) );
- gtk_text_view_set_editable( GTK_TEXT_VIEW(info_tv) , FALSE );
- gtk_text_view_set_cursor_visible( GTK_TEXT_VIEW(info_tv) , FALSE );
- gtk_text_view_set_justification( GTK_TEXT_VIEW(info_tv) , GTK_JUSTIFY_LEFT );
- gtk_text_view_set_left_margin( GTK_TEXT_VIEW(info_tv) , 10 );
-
- info_tb_content = g_strjoin( NULL , "\nEvDev-Plug " , ED_VERSION_PLUGIN ,
- _("\nplayer remote control via event devices\n"
- "http://www.develia.org/projects.php?p=audacious#evdevplug\n\n"
- "written by Giacomo Lozito\n") ,
- "< james@develia.org >\n\n" , NULL );
- gtk_text_buffer_set_text( info_tb , info_tb_content , -1 );
- g_free( info_tb_content );
-
- info_tv_sw = gtk_scrolled_window_new( NULL , NULL );
- gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(info_tv_sw) ,
- GTK_POLICY_NEVER , GTK_POLICY_ALWAYS );
- gtk_container_add( GTK_CONTAINER(info_tv_sw) , info_tv );
- info_tv_frame = gtk_frame_new( NULL );
- gtk_container_add( GTK_CONTAINER(info_tv_frame) , info_tv_sw );
- gtk_box_pack_start( GTK_BOX(logoandinfo_vbox) , info_tv_frame , TRUE , TRUE , 0 );
-
- gtk_box_pack_start( GTK_BOX(about_vbox) , logoandinfo_vbox , TRUE , TRUE , 0 );
-
- /* horizontal separator and buttons */
- gtk_box_pack_start( GTK_BOX(about_vbox) , gtk_hseparator_new() , FALSE , FALSE , 4 );
- bbar_bbox = gtk_hbutton_box_new();
- gtk_button_box_set_layout( GTK_BUTTON_BOX(bbar_bbox) , GTK_BUTTONBOX_END );
- bbar_bt_ok = gtk_button_new_from_stock( GTK_STOCK_OK );
- g_signal_connect_swapped( G_OBJECT(bbar_bt_ok) , "clicked" ,
- G_CALLBACK(gtk_widget_destroy) , about_win );
- gtk_container_add( GTK_CONTAINER(bbar_bbox) , bbar_bt_ok );
- gtk_box_pack_start( GTK_BOX(about_vbox) , bbar_bbox , FALSE , FALSE , 0 );
-
- gtk_widget_show_all( about_win );
-}
-
-
-
-/* message box */
-void
-ed_ui_message_show ( gchar * title , gchar * message , gpointer parent_win_gp )
-{
- GtkWidget *message_win;
- GtkWindow *parent_win = NULL;
-
- if (( parent_win_gp != NULL ) && ( GTK_WIDGET_TOPLEVEL(GTK_WIDGET(parent_win_gp)) ))
- parent_win = GTK_WINDOW(parent_win_gp);
-
- message_win = gtk_message_dialog_new(
- parent_win ,
- ( parent_win != NULL ? GTK_DIALOG_DESTROY_WITH_PARENT : 0 ) ,
- GTK_MESSAGE_INFO , GTK_BUTTONS_CLOSE , "%s", message );
- gtk_window_set_title( GTK_WINDOW(message_win) , title );
-
- gtk_dialog_run( GTK_DIALOG(message_win) );
- gtk_widget_destroy( message_win );
-}

audacious-plugins-2.5.3.tar.gz/src/evdev-plug/ed_ui.h Deleted

@@ -1,31 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
-*
-* 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
-*
-*/
-
-#ifndef _I_ED_UI_H
-#define _I_ED_UI_H 1
-
-#include "ed_common.h"
-#include <glib.h>
-
-void ed_ui_config_show( void );
-void ed_ui_about_show( void );
-void ed_ui_message_show ( gchar * , gchar * , gpointer );
-
-#endif /* !_I_ED_UI_H */

audacious-plugins-2.5.3.tar.gz/src/ffaudio/ffaudio-audvfs.c Deleted

@@ -1,93 +0,0 @@
-/*
- * Audacious FFaudio Plugin
- * Copyright © 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 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 "ffaudio-stdinc.h"
-
-#include <libavutil/avstring.h>
-
-static int audvfs_read(URLContext *h, unsigned char *buf, int size)
-{
- VFSFile *file;
- file = h->priv_data;
- return vfs_fread(buf, 1, size, file);
-}
-
-#if CHECK_LIBAVFORMAT_VERSION (52, 68, 0)
-static int audvfs_write (URLContext * h, const unsigned char * buf, int size)
-#else
-static int audvfs_write (URLContext * h, unsigned char * buf, int size)
-#endif
-{
- VFSFile *file;
- file = h->priv_data;
- return vfs_fwrite(buf, 1, size, file);
-}
-
-/* XXX: use llseek */
-static int64_t audvfs_seek(URLContext *h, int64_t pos, int whence)
-{
- int64_t res, siz;
- VFSFile *file;
- file = h->priv_data;
- siz = vfs_fsize(file);
-
- if (whence == AVSEEK_SIZE)
- return siz;
-
- if (whence == SEEK_SET && pos > siz)
- return AVERROR(EPIPE);
-
- if (vfs_fseek(file, pos, whence) == 0)
- {
- if (whence == SEEK_SET)
- res = pos;
- else
- res = vfs_ftell(file);
- } else
- res = AVERROR(EPIPE);
-
- return res;
-}
-
-static int audvfs_close(URLContext *h)
-{
- return 0;
-}
-
-static int audvfsptr_open(URLContext *h, const char *filename, int flags)
-{
- VFSFile *p;
-
- av_strstart(filename, "audvfsptr:", &filename);
-
- p = (VFSFile *) strtoul(filename, NULL, 16);
- h->priv_data = p;
-
- return 0;
-}
-
-URLProtocol audvfsptr_protocol = {
- .name = "audvfsptr",
- .url_open = audvfsptr_open,
- .url_read = audvfs_read,
- .url_write = audvfs_write,
- .url_seek = audvfs_seek,
- .url_close = audvfs_close,
-};
-

audacious-plugins-2.5.3.tar.gz/src/gtkui/actions-mainwin.h Deleted

@@ -1,76 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2007 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 AUDACIOUS_ACTIONS_MAINWIN_H
-#define AUDACIOUS_ACTIONS_MAINWIN_H
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-/* actions below are handled in mainwin.c */
-
-
-/* toggle actions */
-void action_anamode_peaks(GtkToggleAction *);
-void action_autoscroll_songname(GtkToggleAction *);
-void action_playback_noplaylistadvance(GtkToggleAction *);
-void action_playback_repeat(GtkToggleAction *);
-void action_playback_shuffle(GtkToggleAction *);
-void action_stop_after_current_song(GtkToggleAction *);
-void action_view_always_on_top(GtkToggleAction *);
-void action_view_scaled(GtkToggleAction *);
-void action_view_easymove(GtkToggleAction *);
-void action_view_on_all_workspaces(GtkToggleAction *);
-void action_roll_up_equalizer(GtkToggleAction *);
-void action_roll_up_player(GtkToggleAction *);
-void action_roll_up_playlist_editor(GtkToggleAction *);
-void action_show_equalizer(GtkToggleAction *);
-void action_show_player(GtkToggleAction *);
-void action_show_playlist_editor(GtkToggleAction *);
-void action_view_infoarea(GtkToggleAction *);
-void action_view_menu(GtkToggleAction *);
-void action_view_statusbar(GtkToggleAction *);
-
-/* radio actions (one for each radio action group) */
-void action_anafoff(GtkAction *, GtkRadioAction *);
-void action_anamode(GtkAction *, GtkRadioAction *);
-void action_anatype(GtkAction *, GtkRadioAction *);
-void action_peafoff(GtkAction *, GtkRadioAction *);
-void action_scomode(GtkAction *, GtkRadioAction *);
-void action_vismode(GtkAction *, GtkRadioAction *);
-void action_vprmode(GtkAction *, GtkRadioAction *);
-void action_wshmode(GtkAction *, GtkRadioAction *);
-void action_viewtime(GtkAction *, GtkRadioAction *);
-
-/* normal actions */
-void action_about_audacious(void);
-void action_jump_to_file(void);
-void action_jump_to_playlist_start(void);
-void action_jump_to_time(void);
-void action_play_file(void);
-void action_play_location(void);
-void action_playback_next(void);
-void action_playback_pause(void);
-void action_playback_play(void);
-void action_playback_previous(void);
-void action_playback_stop(void);
-void action_preferences(void);
-void action_quit(void);
-void action_current_track_info(void);
-#endif /* AUDACIOUS_ACTIONS_MAINWIN_H */

audacious-plugins-2.5.3.tar.gz/src/gtkui/actions-playlist.h Deleted

@@ -1,72 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2007 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 AUDACIOUS_ACTIONS_PLAYLIST_H
-#define AUDACIOUS_ACTIONS_PLAYLIST_H
-
-void action_playlist_load_list(void);
-void action_playlist_save_list(void);
-void action_playlist_save_default_list(void);
-void action_playlist_save_all_playlists(void);
-void action_playlist_refresh_list(void);
-void action_playlist_refresh_selected(void);
-void action_open_list_manager(void);
-
-void action_playlist_prev(void);
-void action_playlist_new(void);
-void action_playlist_next(void);
-void action_playlist_delete(void);
-
-void action_playlist_search_and_select(void);
-void action_playlist_invert_selection(void);
-void action_playlist_select_all(void);
-void action_playlist_select_none(void);
-
-void action_playlist_clear_queue(void);
-void action_playlist_remove_unavailable(void);
-void action_playlist_remove_dupes_by_title(void);
-void action_playlist_remove_dupes_by_filename(void);
-void action_playlist_remove_dupes_by_full_path(void);
-void action_playlist_remove_all(void);
-void action_playlist_remove_selected(void);
-void action_playlist_remove_unselected(void);
-
-void action_playlist_copy(void);
-void action_playlist_cut(void);
-void action_playlist_paste(void);
-
-void action_playlist_add_url(void);
-void action_playlist_add_files(void);
-
-void action_playlist_track_info(void);
-void action_queue_toggle(void);
-
-void playlist_sort_track (void);
-void playlist_sort_title (void);
-void playlist_sort_artist (void);
-void playlist_sort_album (void);
-void playlist_sort_date (void);
-void playlist_sort_path (void);
-void playlist_sort_formatted_title (void);
-void playlist_reverse (void);
-void playlist_randomize (void);
-
-void playlist_toggle_autoscroll (GtkToggleAction * act);
-
-#endif /* AUDACIOUS_ACTIONS_PLAYLIST_H */

audacious-plugins-2.5.3.tar.gz/src/gtkui/actions.c Deleted

@@ -1,750 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2010 Audacious development team.
- *
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS 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.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <glib/gprintf.h>
-#include <gtk/gtk.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-/* GDK including */
-#include <gtk/gtk.h>
-
-#if defined(USE_REGEX_ONIGURUMA)
-#include <onigposix.h>
-#elif defined(USE_REGEX_PCRE)
-#include <pcreposix.h>
-#else
-#include <regex.h>
-#endif
-
-#include <audacious/audconfig.h>
-#include <audacious/drct.h>
-#include <audacious/gtk-compat.h>
-#include <audacious/misc.h>
-#include <audacious/playlist.h>
-#include <libaudcore/audstrings.h>
-#include <libaudcore/hook.h>
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-#include "ui_gtk.h"
-#include "util.h"
-#include "playlist_util.h"
-#include "gtkui_cfg.h"
-#include "ui_infoarea.h"
-#include "ui_statusbar.h"
-
-static GtkWidget *mainwin_jtt = NULL;
-
-/* toggleactionentries actions */
-
-void action_playback_noplaylistadvance(GtkToggleAction * action)
-{
- aud_cfg->no_playlist_advance = gtk_toggle_action_get_active(action);
-}
-
-void action_playback_repeat(GtkToggleAction * action)
-{
- if (aud_cfg->repeat != gtk_toggle_action_get_active (action))
- {
- aud_cfg->repeat = gtk_toggle_action_get_active (action);
- hook_call ("toggle repeat", NULL);
- }
-}
-
-void action_playback_shuffle(GtkToggleAction * action)
-{
- if (aud_cfg->shuffle != gtk_toggle_action_get_active (action))
- {
- aud_cfg->shuffle = gtk_toggle_action_get_active (action);
- hook_call ("toggle shuffle", NULL);
- }
-}
-
-void action_stop_after_current_song (GtkToggleAction * action)
-{
- gboolean active = gtk_toggle_action_get_active (action);
-
- if (active != aud_cfg->stopaftersong)
- {
- aud_cfg->stopaftersong = active;
- hook_call ("toggle stop after song", NULL);
- }
-}
-
-void action_view_infoarea(GtkToggleAction *action)
-{
- config.infoarea_visible = gtk_toggle_action_get_active (action);
-
- if (config.infoarea_visible && ! infoarea)
- {
- infoarea = ui_infoarea_new ();
- gtk_box_pack_end ((GtkBox *) vbox, infoarea, FALSE, FALSE, 0);
- gtk_box_reorder_child(GTK_BOX(vbox), infoarea, -1);
-
- gtk_widget_show (infoarea);
- }
-
- if (! config.infoarea_visible && infoarea)
- {
- gtk_widget_destroy (infoarea);
- infoarea = NULL;
- }
-}
-
-void action_view_menu(GtkToggleAction *action)
-{
- config.menu_visible = gtk_toggle_action_get_active (action);
-
- if (config.menu_visible)
- gtk_widget_show (menu);
- else
- gtk_widget_hide (menu);
-}
-
-void action_view_statusbar(GtkToggleAction *action)
-{
- config.statusbar_visible = gtk_toggle_action_get_active(action);
-
- if (config.statusbar_visible && !statusbar)
- {
- statusbar = ui_statusbar_new();
- gtk_box_pack_end(GTK_BOX(vbox), statusbar, FALSE, FALSE, 3);
-
- if (infoarea != NULL)
- gtk_box_reorder_child(GTK_BOX(vbox), infoarea, -1);
-
- gtk_widget_show_all(statusbar);
- }
-
- if (!config.statusbar_visible && statusbar)
- {
- gtk_widget_destroy(statusbar);
- statusbar = NULL;
- }
-}
-
-/* actionentries actions */
-
-void action_about_audacious(void)
-{
- audgui_show_about_window();
-}
-
-void action_play_file(void)
-{
- audgui_run_filebrowser(TRUE);
-}
-
-void action_play_location(void)
-{
- audgui_show_add_url_window (TRUE);
-}
-
-void action_current_track_info(void)
-{
- audgui_infowin_show_current();
-}
-
-void action_jump_to_file(void)
-{
- audgui_jump_to_track();
-}
-
-void action_jump_to_playlist_start(void)
-{
- aud_drct_pl_set_pos(0);
-}
-
-static void mainwin_jump_to_time_cb(GtkWidget * widget, GtkWidget * entry)
-{
- guint min = 0, sec = 0, params;
- gint time;
-
- params = sscanf(gtk_entry_get_text(GTK_ENTRY(entry)), "%u:%u", &min, &sec);
-
- if (params == 2)
- time = (min * 60) + sec;
- else if (params == 1)
- time = min;
- else
- return;
-
- aud_drct_seek (1000 * time);
- gtk_widget_destroy(mainwin_jtt);
-}
-
-
-void mainwin_jump_to_time(void)
-{
- GtkWidget *vbox, *hbox_new, *hbox_total;
- GtkWidget *time_entry, *label, *bbox, *jump, *cancel;
- GtkWidget *dialog;
- guint tindex;
- gchar time_str[10];
-
- if (!aud_drct_get_playing())
- {
- dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Can't jump to time when no track is being played.\n"));
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
- return;
- }
-
- if (mainwin_jtt)
- {
- gtk_window_present(GTK_WINDOW(mainwin_jtt));
- return;
- }
-
- mainwin_jtt = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_type_hint(GTK_WINDOW(mainwin_jtt), GDK_WINDOW_TYPE_HINT_DIALOG);
-
- gtk_window_set_title(GTK_WINDOW(mainwin_jtt), _("Jump to Time"));
- gtk_window_set_position(GTK_WINDOW(mainwin_jtt), GTK_WIN_POS_CENTER);
-
- g_signal_connect(mainwin_jtt, "destroy", G_CALLBACK(gtk_widget_destroyed), &mainwin_jtt);
- gtk_container_set_border_width(GTK_CONTAINER(mainwin_jtt), 10);
-
- vbox = gtk_vbox_new(FALSE, 5);
- gtk_container_add(GTK_CONTAINER(mainwin_jtt), vbox);
-
- hbox_new = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), hbox_new, TRUE, TRUE, 5);
-
- time_entry = gtk_entry_new();
- gtk_box_pack_start(GTK_BOX(hbox_new), time_entry, FALSE, FALSE, 5);
- g_signal_connect(time_entry, "activate", G_CALLBACK(mainwin_jump_to_time_cb), time_entry);
-
- gtk_widget_set_size_request(time_entry, 70, -1);
- label = gtk_label_new(_("minutes:seconds"));
- gtk_box_pack_start(GTK_BOX(hbox_new), label, FALSE, FALSE, 5);
-
- hbox_total = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), hbox_total, TRUE, TRUE, 5);
- gtk_widget_show(hbox_total);
-
- /* FIXME: Disable display of current track length. It's not
- updated when track changes */
-#if 0
- label = gtk_label_new(_("Track length:"));
- gtk_box_pack_start(GTK_BOX(hbox_total), label, FALSE, FALSE, 5);
-
- len = aud_playlist_get_current_length() / 1000;
- g_snprintf(time_str, sizeof(time_str), "%u:%2.2u", len / 60, len % 60);
- label = gtk_label_new(time_str);
-
- gtk_box_pack_start(GTK_BOX(hbox_total), label, FALSE, FALSE, 10);
-#endif
-
- bbox = gtk_hbutton_box_new();
- gtk_box_pack_start(GTK_BOX(vbox), bbox, TRUE, TRUE, 0);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_set_spacing(GTK_BOX(bbox), 5);
-
- cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_widget_set_can_default (cancel, TRUE);
- gtk_container_add(GTK_CONTAINER(bbox), cancel);
- g_signal_connect_swapped(cancel, "clicked", G_CALLBACK(gtk_widget_destroy), mainwin_jtt);
-
- jump = gtk_button_new_from_stock(GTK_STOCK_JUMP_TO);
- gtk_widget_set_can_default (jump, TRUE);
- gtk_container_add(GTK_CONTAINER(bbox), jump);
- g_signal_connect(jump, "clicked", G_CALLBACK(mainwin_jump_to_time_cb), time_entry);
-
- tindex = aud_drct_get_time() / 1000;
- g_snprintf(time_str, sizeof(time_str), "%u:%2.2u", tindex / 60, tindex % 60);
- gtk_entry_set_text(GTK_ENTRY(time_entry), time_str);
-
- gtk_editable_select_region(GTK_EDITABLE(time_entry), 0, strlen(time_str));
-
- gtk_widget_show_all(mainwin_jtt);
-
- gtk_widget_grab_focus(time_entry);
- gtk_widget_grab_default(jump);
-}
-
-void action_jump_to_time(void)
-{
- mainwin_jump_to_time();
-}
-
-void action_playback_next(void)
-{
- aud_drct_pl_next();
-}
-
-void action_playback_previous(void)
-{
- aud_drct_pl_prev();
-}
-
-void action_playback_play(void)
-{
- if (aud_drct_get_playing () && aud_drct_get_paused ())
- aud_drct_pause();
- else
- {
- aud_playlist_set_playing (aud_playlist_get_active ());
- aud_drct_play();
- }
-}
-
-void action_playback_pause(void)
-{
- aud_drct_pause();
-}
-
-void action_playback_stop(void)
-{
- aud_drct_stop();
-}
-
-void action_preferences(void)
-{
- show_preferences_window(TRUE);
-}
-
-void action_quit(void)
-{
- aud_drct_quit();
-}
-
-void action_playlist_track_info (void)
-{
- gint list = aud_playlist_get_active ();
- gint row = playlist_get_focus (list);
-
- if (row < 0)
- audgui_infowin_show_current ();
- else
- audgui_infowin_show (list, row);
-}
-
-void action_queue_toggle(void)
-{
- gint playlist = aud_playlist_get_active ();
- gint focus = playlist_get_focus (playlist);
- gint at;
-
- if (focus < 0)
- return;
-
- if ((at = aud_playlist_queue_find_entry (playlist, focus)) < 0)
- aud_playlist_queue_insert (playlist, -1, focus);
- else
- aud_playlist_queue_delete (playlist, at, 1);
-}
-
-void action_playlist_clear_queue(void)
-{
- gint playlist = aud_playlist_get_active();
- aud_playlist_queue_delete(playlist, 0, aud_playlist_queue_count(playlist));
-}
-
-void action_playlist_remove_unavailable(void)
-{
- aud_playlist_remove_failed(aud_playlist_get_active());
-}
-
-void action_playlist_remove_dupes_by_title(void)
-{
- aud_playlist_remove_duplicates_by_scheme(aud_playlist_get_active(), PLAYLIST_SORT_TITLE);
-}
-
-void action_playlist_remove_dupes_by_filename(void)
-{
- aud_playlist_remove_duplicates_by_scheme(aud_playlist_get_active(), PLAYLIST_SORT_FILENAME);
-}
-
-void action_playlist_remove_dupes_by_full_path(void)
-{
- aud_playlist_remove_duplicates_by_scheme(aud_playlist_get_active(), PLAYLIST_SORT_PATH);
-}
-
-void action_playlist_remove_all(void)
-{
- gint playlist = aud_playlist_get_active();
-
- aud_playlist_entry_delete(playlist, 0, aud_playlist_entry_count(playlist));
-}
-
-void action_playlist_remove_selected (GtkAction * act)
-{
- gint list = aud_playlist_get_active ();
- gint focus = playlist_get_focus (list);
- focus -= playlist_count_selected_in_range (list, 0, focus);
-
- aud_drct_pl_delete_selected ();
-
- if (aud_playlist_selected_count (list)) /* song changed? */
- return;
-
- if (focus == aud_playlist_entry_count (list))
- focus --;
- if (focus >= 0)
- playlist_follow (list, focus);
-}
-
-void action_playlist_remove_unselected(void)
-{
- gint playlist = aud_playlist_get_active();
- gint entries = aud_playlist_entry_count(playlist);
- gint count;
-
- for (count = 0; count < entries; count++)
- aud_playlist_entry_set_selected(playlist, count, !aud_playlist_entry_get_selected(playlist, count));
-
- aud_playlist_delete_selected(playlist);
- aud_playlist_select_all(playlist, TRUE);
-}
-
-void action_playlist_add_files(void)
-{
- audgui_run_filebrowser(FALSE);
-}
-
-void action_playlist_add_url(void)
-{
- audgui_show_add_url_window (FALSE);
-}
-
-void action_playlist_new(void)
-{
- gint playlist = aud_playlist_count();
-
- aud_playlist_insert(playlist);
- aud_playlist_set_active(playlist);
-}
-
-void action_playlist_prev (void)
-{
- if (aud_playlist_get_active ())
- aud_playlist_set_active (aud_playlist_get_active () - 1);
- else
- aud_playlist_set_active (aud_playlist_count () - 1);
-}
-
-void action_playlist_next (void)
-{
- aud_playlist_set_active ((aud_playlist_get_active () + 1) %
- aud_playlist_count ());
-}
-
-void action_playlist_delete(void)
-{
- audgui_confirm_playlist_delete (aud_playlist_get_active ());
-}
-
-static gchar *playlist_file_selection_save(const gchar * title, const gchar * default_filename)
-{
- GtkWidget *dialog;
- gchar *filename;
-
- g_return_val_if_fail(title != NULL, NULL);
-
- dialog = make_filebrowser(title, TRUE);
-
- if (aud_cfg->playlist_path)
- gtk_file_chooser_set_current_folder_uri ((GtkFileChooser *) dialog,
- aud_cfg->playlist_path);
-
- if (default_filename)
- gtk_file_chooser_set_uri ((GtkFileChooser *) dialog, default_filename);
-
- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
- filename = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
- else
- filename = NULL;
-
- gtk_widget_destroy(dialog);
- return filename;
-}
-
-static void show_playlist_save_error(GtkWindow * parent, const gchar * filename)
-{
- GtkWidget *dialog;
-
- g_return_if_fail(GTK_IS_WINDOW(parent));
- g_return_if_fail(filename);
-
- dialog = gtk_message_dialog_new(GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error writing playlist \"%s\": %s"), filename, strerror(errno));
-
- gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); /* centering */
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
-}
-
-static gboolean show_playlist_overwrite_prompt(GtkWindow * parent, const gchar * filename)
-{
- GtkWidget *dialog;
- gint result;
-
- g_return_val_if_fail(filename != NULL, FALSE);
-
- dialog = gtk_message_dialog_new (parent, GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("Overwrite %s?"), filename);
-
- gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); /* centering */
- result = gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
-
- return (result == GTK_RESPONSE_YES);
-}
-
-static void playlistwin_save_playlist(const gchar * filename)
-{
- str_replace_in(&aud_cfg->playlist_path, g_path_get_dirname(filename));
-
- if (vfs_file_test (filename, G_FILE_TEST_EXISTS))
- if (!show_playlist_overwrite_prompt(NULL, filename))
- return;
-
- if (!aud_playlist_save(aud_playlist_get_active(), filename))
- show_playlist_save_error(NULL, filename);
-}
-
-void action_playlist_save_list(void)
-{
- const gchar *default_filename = aud_playlist_get_filename(aud_playlist_get_active());
-
- gchar *dot = NULL, *basename = NULL;
- gchar * filename = playlist_file_selection_save (_("Export Playlist"),
- default_filename);
-
- if (filename)
- {
- /* Default extension */
- basename = g_path_get_basename(filename);
- dot = strrchr(basename, '.');
- if (dot == NULL || dot == basename)
- {
- gchar *oldname = filename;
- filename = g_strconcat(oldname, ".xspf", NULL);
-
- g_free(oldname);
- }
- g_free(basename);
-
- playlistwin_save_playlist(filename);
- g_free(filename);
- }
-}
-
-void action_playlist_save_default_list(void)
-{
-#if 0
- Playlist *playlist = aud_playlist_get_active();
-
- playlist_save(playlist, aud_paths[BMP_PATH_PLAYLIST_FILE]);
-#endif
-}
-
-static void playlistwin_load_playlist(const gchar * filename)
-{
- gint playlist = aud_playlist_get_active();
-
- g_return_if_fail(filename != NULL);
-
- str_replace_in(&aud_cfg->playlist_path, g_path_get_dirname(filename));
-
- aud_playlist_entry_delete(playlist, 0, aud_playlist_entry_count(playlist));
- aud_playlist_insert_playlist(playlist, 0, filename);
- aud_playlist_set_filename(playlist, filename);
-
- if (aud_playlist_get_title(playlist) == NULL)
- aud_playlist_set_title(playlist, filename);
-}
-
-static gchar *playlist_file_selection_load(const gchar * title, const gchar * default_filename)
-{
- GtkWidget *dialog;
- gchar *filename;
-
- g_return_val_if_fail(title != NULL, NULL);
-
- dialog = make_filebrowser(title, FALSE);
-
- if (aud_cfg->playlist_path)
- gtk_file_chooser_set_current_folder ((GtkFileChooser *) dialog,
- aud_cfg->playlist_path);
-
- if (default_filename)
- gtk_file_chooser_set_uri(GTK_FILE_CHOOSER(dialog), default_filename);
- gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); /* centering */
-
- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
- filename = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
- else
- filename = NULL;
-
- gtk_widget_destroy(dialog);
- return filename;
-}
-
-void action_playlist_load_list(void)
-{
- const gchar *default_filename = aud_playlist_get_filename(aud_playlist_get_active());
- gchar * filename = playlist_file_selection_load (_("Import Playlist"),
- default_filename);
-
- if (filename)
- {
- playlistwin_load_playlist(filename);
- g_free(filename);
- }
-}
-
-void action_playlist_refresh_list(void)
-{
- aud_playlist_rescan(aud_playlist_get_active());
-}
-
-void action_playlist_refresh_selected(void)
-{
- aud_playlist_rescan_selected(aud_playlist_get_active());
-}
-
-void action_open_list_manager(void)
-{
- audgui_playlist_manager_ui_show(window);
-}
-
-void action_playlist_search_and_select(void)
-{
- //playlistwin_select_search();
-}
-
-void action_playlist_invert_selection(void)
-{
- g_message("implement me");
-}
-
-void action_playlist_select_none(void)
-{
- aud_playlist_select_all (aud_playlist_get_active (), FALSE);
-}
-
-void action_playlist_select_all(void)
-{
- aud_playlist_select_all (aud_playlist_get_active (), TRUE);
-}
-
-void action_playlist_save_all_playlists(void)
-{
- aud_save_playlists();
-}
-
-void action_playlist_copy(void)
-{
- GtkClipboard *clip = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
- gchar *list = audgui_urilist_create_from_selected (aud_playlist_get_active());
-
- if (list == NULL)
- return;
-
- gtk_clipboard_set_text(clip, list, -1);
- g_free(list);
-}
-
-void action_playlist_cut(void)
-{
- action_playlist_copy();
- action_playlist_remove_selected(NULL);
-}
-
-void action_playlist_paste(void)
-{
- GtkClipboard *clip = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
- gchar *list = gtk_clipboard_wait_for_text(clip);
-
- gint playlist = aud_playlist_get_active ();
- audgui_urilist_insert (playlist, playlist_get_focus (playlist), list);
-
- g_free (list);
-}
-
-static void playlist_sort_scheme (gint scheme)
-{
- aud_playlist_sort_by_scheme (aud_playlist_get_active (), scheme);
-}
-
-void playlist_sort_track (void)
-{
- playlist_sort_scheme (PLAYLIST_SORT_TRACK);
-}
-
-void playlist_sort_title (void)
-{
- playlist_sort_scheme (PLAYLIST_SORT_TITLE);
-}
-
-void playlist_sort_artist (void)
-{
- playlist_sort_scheme (PLAYLIST_SORT_ARTIST);
-}
-
-void playlist_sort_album (void)
-{
- playlist_sort_scheme (PLAYLIST_SORT_ALBUM);
-}
-
-void playlist_sort_date (void)
-{
- playlist_sort_scheme (PLAYLIST_SORT_DATE);
-}
-
-void playlist_sort_path (void)
-{
- playlist_sort_scheme (PLAYLIST_SORT_PATH);
-}
-
-void playlist_sort_formatted_title (void)
-{
- playlist_sort_scheme (PLAYLIST_SORT_FORMATTED_TITLE);
-}
-
-void playlist_reverse (void)
-{
- aud_playlist_reverse (aud_playlist_get_active ());
-}
-
-void playlist_randomize (void)
-{
- aud_playlist_randomize (aud_playlist_get_active ());
-}
-
-void playlist_toggle_autoscroll (GtkToggleAction * act)
-{
- config.autoscroll = gtk_toggle_action_get_active (act);
-}

audacious-plugins-2.5.3.tar.gz/src/gtkui/ui Deleted

audacious-plugins-2.5.3.tar.gz/src/gtkui/ui/player.ui Deleted

@@ -1,114 +0,0 @@
-<?xml version="1.0" standalone="yes" encoding="utf-8" ?>
-
-<ui>
-	<menubar name="mainwin-menus">
-		<menu action="file">
-			<menuitem action="play file" />
-			<menuitem action="play location" />
-			<menuitem action="playlist add files" />
-			<menuitem action="playlist add url" />
-			<separator />
-			<menuitem action="preferences" />
-			<menuitem action="quit" />
-		</menu>
-
-		<menu action="playback">
-			<menuitem action="playback repeat" />
-			<menuitem action="playback shuffle" />
-			<menuitem action="playback no playlist advance" />
-			<menuitem action="stop after current song" />
-			<separator />
-			<menuitem action="playback play" />
-			<menuitem action="playback pause" />
-			<menuitem action="playback stop" />
-			<menuitem action="playback previous" />
-			<menuitem action="playback next" />
-			<separator />
-			<menuitem action="jump to playlist start" />
-			<separator />
-			<menuitem action="jump to file" />
-			<menuitem action="jump to time" />
-			<separator />
-			<menuitem action="current track info" />
-		</menu>
-		<menu action="playlist">
-			<separator />
-			<menu action="playlist sort">
-				<menuitem action="playlist sort track" />
-				<menuitem action="playlist sort title" />
-				<menuitem action="playlist sort artist" />
-				<menuitem action="playlist sort album" />
-				<menuitem action="playlist sort date" />
-				<menuitem action="playlist sort path" />
-				<menuitem action="playlist sort formatted title" />
-				<separator />
-				<menuitem action="playlist reverse" />
-			</menu>
-			<menuitem action="playlist randomize" />
-			<separator />
-			<menuitem action="playlist refresh" />
-			<menuitem action="playlist refresh selected" />
-			<separator />
-			<menuitem action="playlist new" />
-			<menuitem action="playlist delete" />
-			<separator />
-			<menuitem action="playlist load" />
-			<menuitem action="playlist save" />
-			<menuitem action="playlist save all" />
-			<separator />
-			<menuitem action="playlist manager" />
-		</menu>
-		<menu action="plugins-menu" />
-
-		<menu action="output">
-			<menuitem action="effects menu" />
-			<separator />
-			<menuitem action="equalizer show" />
-		</menu>
-
-		<menu action="view">
-			<menuitem action="iface menu" />
-			<separator />
-			<menuitem action="view menu" />
-			<menuitem action="view infoarea" />
-			<menuitem action="view statusbar" />
-			<separator />
-			<menuitem action="playlist show headers" />
-			<menuitem action="playlist choose columns" />
-			<menuitem action="playlist autoscroll" />
-		</menu>
-
-		<menu action="help">
-			<menuitem action="about audacious" />
-		</menu>
-	</menubar>
-
-	<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 select none" />
-			<menuitem action="playlist select all" />
-			<separator/>
-			<menuitem action="playlist remove selected" />
-			<menuitem action="playlist remove unselected" />
-			<menuitem action="playlist remove all" />
-			<separator />
-			<menuitem action="playlist refresh selected" />
-			<separator />
-			<menuitem action="queue toggle" />
-			<separator />
-			<menuitem action="plugins-menu" />
-		</menu>
-		<menu action="dummy" name="playlist-tab-menu">
-			<menuitem action="playlist title edit" />
-			<separator />
-			<menuitem action="playlist delete" />
-			<menuitem action="playlist save" />
-		</menu>
-	</menubar>
-</ui>

audacious-plugins-2.5.3.tar.gz/src/gtkui/ui_gtk.h Deleted

@@ -1,33 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2008 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_NEW_H
-#define UI_NEW_H
-
-extern GtkWidget *window;
-extern GtkWidget *vbox;
-extern GtkWidget *menu;
-extern GtkWidget *playlist_box;
-extern GtkWidget *infoarea;
-extern GtkWidget *statusbar;
-
-void setup_panes (void);
-void show_preferences_window(gboolean show);
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/gtkui/ui_manager.c Deleted

@@ -1,400 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2007 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 "config.h"
-
-#include "ui_manager.h"
-#include "actions-mainwin.h"
-#include "actions-playlist.h"
-#include "ui_playlist_notebook.h"
-#include "ui_playlist_widget.h"
-
-#include <audacious/misc.h>
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-static GtkUIManager *ui_manager = NULL;
-
-/* toggle action entries */
-
-static GtkToggleActionEntry toggleaction_entries_others[] = {
- {"stop after current song", NULL, N_("Stop after Current Song"), "<Ctrl>M",
- N_("Stop after Current Song"), G_CALLBACK(action_stop_after_current_song), FALSE},
-
- {"playback repeat", NULL, N_("Repeat"), "R",
- N_("Repeat"), G_CALLBACK(action_playback_repeat), FALSE},
-
- {"playback shuffle", NULL, N_("Shuffle"), "S",
- N_("Shuffle"), G_CALLBACK(action_playback_shuffle), FALSE},
-
- {"playback no playlist advance", NULL, N_("No Playlist Advance"), "<Ctrl>N",
- N_("No Playlist Advance"), G_CALLBACK(action_playback_noplaylistadvance), FALSE},
-
- {"view infoarea", NULL, N_("Show infoarea"), "<Shift><Ctrl>I",
- N_("Show/hide infoarea"), G_CALLBACK(action_view_infoarea), FALSE},
-
- {"view menu", NULL, N_("Show main menu"), "<Shift><Ctrl>M",
- N_("Show/hide main menu"), G_CALLBACK(action_view_menu), FALSE},
-
- {"view statusbar", NULL, N_("Show statusbar"), "<Shift><Ctrl>S",
- N_("Show/hide statusbar"), G_CALLBACK(action_view_statusbar), FALSE},
-
- {"playlist show headers", NULL, N_("Show Column Headers"), NULL, NULL,
- (GCallback) playlist_show_headers, FALSE},
- {"playlist autoscroll", NULL, N_("Scroll on Song Change"), NULL, NULL,
- (GCallback) playlist_toggle_autoscroll, FALSE}};
-
-/* normal actions */
-
-static GtkActionEntry action_entries_playback[] = {
-
- {"playback", NULL, N_("Playback")},
-
- {"playback play", GTK_STOCK_MEDIA_PLAY, N_("Play"), "X",
- N_("Play"), G_CALLBACK(action_playback_play)},
-
- {"playback pause", GTK_STOCK_MEDIA_PAUSE, N_("Pause"), "C",
- N_("Pause"), G_CALLBACK(action_playback_pause)},
-
- {"playback stop", GTK_STOCK_MEDIA_STOP, N_("Stop"), "V",
- N_("Stop"), G_CALLBACK(action_playback_stop)},
-
- {"playback previous", GTK_STOCK_MEDIA_PREVIOUS, N_("Previous"), "Z",
- N_("Previous"), G_CALLBACK(action_playback_previous)},
-
- {"playback next", GTK_STOCK_MEDIA_NEXT, N_("Next"), "B",
- N_("Next"), G_CALLBACK(action_playback_next)}
-};
-
-static GtkActionEntry action_entries_playlist[] = {
-
- {"playlist", NULL, N_("Playlist")},
-
- {"playlist new", GTK_STOCK_NEW, N_("New Playlist"), "<Ctrl>T",
- N_("New Playlist"), G_CALLBACK(action_playlist_new)},
-
- {"playlist delete", GTK_STOCK_DELETE, N_("Delete Playlist"), "<Ctrl>W",
- N_("Delete Playlist"), G_CALLBACK(action_playlist_delete)},
-
- {"playlist load", GTK_STOCK_OPEN, N_("Import Playlist ..."), "O",
- N_("Loads a playlist file into the selected playlist."), G_CALLBACK(action_playlist_load_list)},
-
- {"playlist save", GTK_STOCK_SAVE, N_("Export Playlist ..."), "<Shift>S",
- N_("Saves the selected playlist."), G_CALLBACK(action_playlist_save_list)},
-
- {"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."),
- G_CALLBACK(action_playlist_save_all_playlists)},
-
- {"playlist refresh", GTK_STOCK_REFRESH, N_("Refresh"), "F5",
- N_("Refreshes metadata associated with a playlist entry."),
- G_CALLBACK(action_playlist_refresh_list)},
-
- {"playlist refresh selected", GTK_STOCK_REFRESH, N_("Refresh Selected"),
- "F6", N_("Refreshes metadata associated with selected entries."),
- G_CALLBACK(action_playlist_refresh_selected)},
-
-
- {"playlist manager", AUD_STOCK_PLAYLIST, N_("Playlist Manager"), "P",
- N_("Opens the playlist manager."),
- G_CALLBACK(action_open_list_manager)},
-
- {"playlist add url", GTK_STOCK_NETWORK, N_("Add URL ..."), "<Ctrl>H",
- N_("Adds a remote track to the playlist."),
- G_CALLBACK(action_playlist_add_url)},
-
- {"playlist add files", GTK_STOCK_ADD, N_("Add Files ..."), "F",
- N_("Adds files to the playlist."),
- G_CALLBACK(action_playlist_add_files)},
-
- {"playlist remove all", GTK_STOCK_CLEAR, N_("Remove All"), NULL,
- N_("Removes all entries from the playlist."),
- G_CALLBACK(action_playlist_remove_all)},
-
- {"playlist remove unselected", GTK_STOCK_REMOVE, N_("Remove Unselected"), NULL,
- N_("Remove unselected entries from the playlist."),
- G_CALLBACK(action_playlist_remove_unselected)},
-
- {"playlist remove selected", GTK_STOCK_REMOVE, N_("Remove Selected"), "Delete",
- N_("Remove selected entries from the playlist."),
- G_CALLBACK(action_playlist_remove_selected)},
-
- {"playlist title edit", GTK_STOCK_EDIT, N_("Edit title"), "F2",
- N_("Edit the playlist title."),
- G_CALLBACK(ui_playlist_notebook_edit_tab_title)},
-
- {"playlist choose columns", NULL, N_("Choose Columns ..."), NULL, NULL,
- (GCallback) pw_col_choose},
-
- {"playlist sort", GTK_STOCK_SORT_ASCENDING, N_("Sort"), NULL, NULL, NULL},
- {"playlist sort track", NULL, N_("By Track Number"), NULL, NULL, (GCallback)
- playlist_sort_track},
- {"playlist sort title", NULL, N_("By Title"), NULL, NULL, (GCallback)
- playlist_sort_title},
- {"playlist sort artist", NULL, N_("By Artist"), NULL, NULL, (GCallback)
- playlist_sort_artist},
- {"playlist sort album", NULL, N_("By Album"), NULL, NULL, (GCallback)
- playlist_sort_album},
- {"playlist sort date", NULL, N_("By Release Date"), NULL, NULL, (GCallback)
- playlist_sort_date},
- {"playlist sort path", NULL, N_("By File Path"), NULL, NULL, (GCallback)
- playlist_sort_path},
- {"playlist sort formatted title", NULL, N_("By Formatted Title"), NULL, NULL,
- (GCallback) playlist_sort_formatted_title},
- {"playlist reverse", GTK_STOCK_SORT_DESCENDING, N_("Reverse Order"), NULL,
- NULL, (GCallback) playlist_reverse},
- {"playlist randomize", NULL, N_("Random Order"), NULL, NULL, (GCallback)
- playlist_randomize}};
-
-static GtkActionEntry action_entries_output[] =
-{
- {"output", NULL, N_("Output")},
-
- {"effects menu", NULL, N_("Effects")},
-
- {"equalizer show", NULL, N_("Equalizer"), "<Ctrl>E", NULL, (GCallback)
- audgui_show_equalizer_window},
-};
-
-static GtkActionEntry action_entries_view[] = {
- {"view", NULL, N_("View")},
- {"iface menu", NULL, N_("Interface")}};
-
-static GtkActionEntry action_entries_others[] = {
-
- {"dummy", NULL, "dummy"},
-
- /* XXX Carbon support */
- {"file", NULL, N_("File")},
- {"help", NULL, N_("Help")},
-
- {"plugins-menu", NULL, N_("Components")},
-
- {"current track info", GTK_STOCK_INFO, N_("View Track Details"), "I",
- N_("View track details"), G_CALLBACK(action_current_track_info)},
-
- {"playlist track info", GTK_STOCK_INFO, N_("View Track Details"), "<Alt>I",
- N_("View track details"), G_CALLBACK(action_playlist_track_info)},
-
- {"about audacious", GTK_STOCK_DIALOG_INFO, N_("About Audacious"), NULL,
- N_("About Audacious"), G_CALLBACK(action_about_audacious)},
-
- {"play file", GTK_STOCK_OPEN, N_("Open Files ..."), "L",
- N_("Load and play a file"), G_CALLBACK(action_play_file)},
-
- {"play location", GTK_STOCK_NETWORK, N_("Open URL ..."), "<Ctrl>L",
- N_("Play media from the selected location"), G_CALLBACK(action_play_location)},
-
- {"plugins", NULL, N_("Plugin services")},
-
- {"preferences", GTK_STOCK_PREFERENCES, N_("Preferences"), "<Ctrl>P",
- N_("Open preferences window"), G_CALLBACK(action_preferences)},
-
- {"quit", GTK_STOCK_QUIT, N_("_Quit"), NULL,
- N_("Quit Audacious"), G_CALLBACK(action_quit)},
-
- {"jump to playlist start", GTK_STOCK_GOTO_TOP, N_("Jump to Playlist Start"), "<Ctrl>Z",
- N_("Jump to Playlist Start"), G_CALLBACK(action_jump_to_playlist_start)},
-
- {"jump to file", GTK_STOCK_JUMP_TO, N_("Jump to File"), "J",
- N_("Jump to File"), G_CALLBACK(action_jump_to_file)},
-
- {"jump to time", GTK_STOCK_JUMP_TO, N_("Jump to Time"), "<Ctrl>J",
- N_("Jump to Time"), G_CALLBACK(action_jump_to_time)},
-
- {"queue toggle", AUD_STOCK_QUEUETOGGLE, N_("Queue Toggle"), "Q",
- N_("Enables/disables the entry in the playlist's queue."),
- G_CALLBACK(action_queue_toggle)},
-
- {"playlist copy", GTK_STOCK_COPY, N_("Copy"), "<Ctrl>C",
- NULL, G_CALLBACK(action_playlist_copy)},
-
- {"playlist cut", GTK_STOCK_CUT, N_("Cut"), "<Ctrl>X",
- NULL, G_CALLBACK(action_playlist_cut)},
-
- {"playlist paste", GTK_STOCK_PASTE, N_("Paste"), "<Ctrl>V",
- NULL, G_CALLBACK(action_playlist_paste)},
-
- {"playlist select all", NULL, N_("Select All"), "<Ctrl>A",
- N_("Selects all of the playlist entries."),
- G_CALLBACK(action_playlist_select_all)},
-
- {"playlist select none", NULL, N_("Select None"), "<Shift><Ctrl>A",
- N_("Deselects all of the playlist entries."),
- G_CALLBACK(action_playlist_select_none)},
-};
-
-static GtkActionGroup * action_group_playback;
-static GtkActionGroup * action_group_output;
-static GtkActionGroup * action_group_view;
-static GtkActionGroup * action_group_others;
-static GtkActionGroup * action_group_playlist;
-
-/* ***************************** */
-
-GtkWidget *ui_manager_get_menus(void)
-{
- GtkWidget *menu;
-
- menu = gtk_ui_manager_get_widget(ui_manager, "/mainwin-menus");
-
- return menu;
-}
-
-static GtkActionGroup *ui_manager_new_action_group(const gchar * group_name)
-{
- GtkActionGroup *group = gtk_action_group_new(group_name);
- gtk_action_group_set_translation_domain(group, PACKAGE_NAME);
- return group;
-}
-
-void ui_manager_init(void)
-{
- /* toggle actions */
- toggleaction_group_others = ui_manager_new_action_group("toggleaction_others");
- gtk_action_group_add_toggle_actions(toggleaction_group_others, toggleaction_entries_others, G_N_ELEMENTS(toggleaction_entries_others), NULL);
-
- /* normal actions */
- action_group_playback = ui_manager_new_action_group("action_playback");
- gtk_action_group_add_actions(action_group_playback, action_entries_playback, G_N_ELEMENTS(action_entries_playback), NULL);
-
- action_group_playlist = ui_manager_new_action_group("action_playlist");
- gtk_action_group_add_actions(action_group_playlist, action_entries_playlist, G_N_ELEMENTS(action_entries_playlist), NULL);
-
- action_group_output = ui_manager_new_action_group ("action_output");
- gtk_action_group_add_actions (action_group_output, action_entries_output,
- G_N_ELEMENTS (action_entries_output), NULL);
-
- action_group_view = ui_manager_new_action_group("action_view");
- gtk_action_group_add_actions(action_group_view, action_entries_view, G_N_ELEMENTS(action_entries_view), NULL);
-
- action_group_others = ui_manager_new_action_group("action_others");
- gtk_action_group_add_actions(action_group_others, action_entries_others, G_N_ELEMENTS(action_entries_others), NULL);
-
- /* ui */
- ui_manager = gtk_ui_manager_new();
- gtk_ui_manager_insert_action_group(ui_manager, toggleaction_group_others, 0);
- gtk_ui_manager_insert_action_group(ui_manager, action_group_playback, 0);
- gtk_ui_manager_insert_action_group(ui_manager, action_group_playlist, 0);
- gtk_ui_manager_insert_action_group(ui_manager, action_group_output, 0);
- gtk_ui_manager_insert_action_group(ui_manager, action_group_view, 0);
- gtk_ui_manager_insert_action_group(ui_manager, action_group_others, 0);
-}
-
-#ifdef GDK_WINDOWING_QUARTZ
-static GtkWidget *carbon_menubar;
-#endif
-
-
-void ui_manager_create_menus(void)
-{
- GError *gerr = NULL;
-
- /* attach xml menu definitions */
- gchar * path = g_strdup_printf ("%s/ui/player.ui",
- aud_get_path (AUD_PATH_DATA_DIR));
- gtk_ui_manager_add_ui_from_file (ui_manager, path, & gerr);
- g_free (path);
-
- if (gerr != NULL)
- {
- g_critical("Error loading player.ui: %s", gerr->message);
- g_error_free(gerr);
- return;
- }
-
- gtk_menu_item_set_submenu ((GtkMenuItem *) gtk_ui_manager_get_widget
- (ui_manager, "/mainwin-menus/plugins-menu"), aud_get_plugin_menu
- (AUDACIOUS_MENU_MAIN));
- gtk_menu_item_set_submenu ((GtkMenuItem *) gtk_ui_manager_get_widget
- (ui_manager, "/mainwin-menus/output/effects menu"),
- audgui_create_effects_menu ());
- gtk_menu_item_set_submenu ((GtkMenuItem *) gtk_ui_manager_get_widget
- (ui_manager, "/mainwin-menus/view/iface menu"),
- audgui_create_iface_menu ());
-
- playlistwin_popup_menu = ui_manager_get_popup_menu(ui_manager, "/playlist-menus/playlist-rightclick-menu");
-
- gtk_menu_item_set_submenu ((GtkMenuItem *) gtk_ui_manager_get_widget
- (ui_manager, "/playlist-menus/playlist-rightclick-menu/plugins-menu"),
- aud_get_plugin_menu (AUDACIOUS_MENU_PLAYLIST_RCLICK));
-
- playlist_tab_menu = ui_manager_get_popup_menu(ui_manager, "/playlist-menus/playlist-tab-menu");
-}
-
-
-GtkAccelGroup *ui_manager_get_accel_group(void)
-{
- return gtk_ui_manager_get_accel_group(ui_manager);
-}
-
-
-GtkWidget *ui_manager_get_popup_menu(GtkUIManager * self, const gchar * path)
-{
- GtkWidget *menu_item = gtk_ui_manager_get_widget(self, path);
-
- if (GTK_IS_MENU_ITEM(menu_item))
- return gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu_item));
- else
- return NULL;
-}
-
-
-static void menu_popup_pos_func(GtkMenu * menu, gint * x, gint * y, gboolean * push_in, gint * point)
-{
- GtkRequisition requisition;
- gint screen_width;
- gint screen_height;
-
- gtk_widget_size_request(GTK_WIDGET(menu), &requisition);
-
- screen_width = gdk_screen_width();
- screen_height = gdk_screen_height();
-
- *x = CLAMP(point[0] - 2, 0, MAX(0, screen_width - requisition.width));
- *y = CLAMP(point[1] - 2, 0, MAX(0, screen_height - requisition.height));
-
- *push_in = FALSE;
-}
-
-
-void ui_manager_popup_menu_show(GtkMenu * menu, gint x, gint y, guint button, guint time)
-{
- gint pos[2];
- pos[0] = x;
- pos[1] = y;
-
- gtk_menu_popup(menu, NULL, NULL, (GtkMenuPositionFunc) menu_popup_pos_func, pos, button, time);
-}
-
-void ui_manager_destroy(void)
-{
- gtk_menu_detach ((GtkMenu *) aud_get_plugin_menu (AUDACIOUS_MENU_MAIN));
- gtk_menu_detach ((GtkMenu *) aud_get_plugin_menu
- (AUDACIOUS_MENU_PLAYLIST_RCLICK));
-
- g_object_unref((GObject *) toggleaction_group_others);
- g_object_unref((GObject *) action_group_playback);
- g_object_unref((GObject *) action_group_playlist);
- g_object_unref((GObject *) action_group_output);
- g_object_unref((GObject *) action_group_view);
- g_object_unref((GObject *) action_group_others);
- g_object_unref((GObject *) ui_manager);
-}

audacious-plugins-2.5.3.tar.gz/src/gtkui/ui_manager.h Deleted

@@ -1,44 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2007 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 AUDACIOUS_UI_MANAGER_H
-#define AUDACIOUS_UI_MANAGER_H
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-GtkWidget *playlistwin_popup_menu;
-GtkWidget *playlist_tab_menu;
-
-GtkActionGroup *toggleaction_group_others;
-
-void ui_manager_init(void);
-void ui_manager_create_menus(void);
-GtkAccelGroup *ui_manager_get_accel_group(void);
-GtkWidget *ui_manager_get_popup_menu(GtkUIManager *, const gchar *);
-void ui_manager_popup_menu_show(GtkMenu *, gint, gint, guint, guint);
-void ui_manager_destroy(void);
-
-GtkWidget *ui_manager_get_menus(void);
-
-G_END_DECLS
-#endif /* AUDACIOUS_UI_MANAGER_H */

audacious-plugins-2.5.3.tar.gz/src/gtkui/util.c Deleted

@@ -1,64 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2008 Audacious development team
- *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS 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 <gtk/gtk.h>
-
-#include <audacious/gtk-compat.h>
-#include <libaudcore/hook.h>
-
-#include "util.h"
-
-GtkWidget *make_filebrowser(const gchar * title, gboolean save)
-{
- GtkWidget *dialog;
- GtkWidget *button;
-
- g_return_val_if_fail(title != NULL, NULL);
-
- dialog = gtk_file_chooser_dialog_new(title, NULL, save ? GTK_FILE_CHOOSER_ACTION_SAVE : GTK_FILE_CHOOSER_ACTION_OPEN, NULL, NULL);
-
- button = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
-
- gtk_button_set_use_stock(GTK_BUTTON(button), TRUE);
- gtk_widget_set_can_default (button, TRUE);
-
- button = gtk_dialog_add_button(GTK_DIALOG(dialog), save ? GTK_STOCK_SAVE : GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT);
-
- gtk_button_set_use_stock(GTK_BUTTON(button), TRUE);
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
- gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); /* centering */
-
- return dialog;
-}
-
-void check_set(GtkActionGroup * action_group, const gchar * action_name, gboolean is_on)
-{
- GtkAction * action = gtk_action_group_get_action (action_group, action_name);
-
- g_return_if_fail (action != NULL);
-
- gtk_toggle_action_set_active ((GtkToggleAction *) action, is_on);
- hook_call (action_name, GINT_TO_POINTER (is_on));
-}

audacious-plugins-2.5.3.tar.gz/src/gtkui/util.h Deleted

@@ -1,34 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2008 Audacious development team
- *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP development team
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS 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 AUDACIOUS_UTIL_H
-#define AUDACIOUS_UTIL_H
-
-#include <gtk/gtk.h>
-
-GtkWidget * make_filebrowser (const gchar * title, gboolean save);
-void check_set(GtkActionGroup * action_group, const gchar * action_name, gboolean is_on);
-
-#endif /* AUDACIOUS_UTIL_H */

audacious-plugins-2.5.3.tar.gz/src/kanashi Deleted

audacious-plugins-2.5.3.tar.gz/src/kanashi/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/kanashi/beatdetect.c Deleted

@@ -1,49 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization framework
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "kanashi.h"
-
-/*
- * This algorithm is by Janusz Gregorcyzk, the implementation is
- * mine, however.
- *
- * -- nenolod
- */
-int
-kanashi_is_new_beat(void)
-{
- gint i;
- gint total = 0;
- gboolean ret = FALSE;
- static gint previous;
-
- for (i = 1; i < 512; i++)
- {
- total += abs (kanashi_sound_data->pcm_data[0][i] -
-		 kanashi_sound_data->pcm_data[0][i - 1]);
- }
-
- total /= 512;
-
- ret = (total > (2 * previous));
-
- previous = total;
-
- return ret;
-}

audacious-plugins-2.5.3.tar.gz/src/kanashi/cfg.c Deleted

@@ -1,135 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization framework
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/* FIXME: prevent the user from dragging something above the root
- actuator */
-
-#include <config.h>
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <audacious/plugin.h>
-
-#include <math.h>
-
-#include "kanashi.h"
-
-/* DON'T CALL kanashi_fatal_error () IN HERE!!! */
-
-/* Actuator page stuffs */
-static GtkWidget *cfg_dialog;
-
-/* If selector != NULL, then it's 'OK', otherwise it's 'Cancel' */
-static void
-load_sel_cb (GtkButton *button, GtkFileSelection *selector)
-{
- if (selector)
- {
- static const char *fname;
- mcs_handle_t *db;
-
- db = aud_cfg_db_open();
- fname = (char *) gtk_file_selection_get_filename (selector);
- kanashi_load_preset (fname);
- aud_cfg_db_set_string(db, "kanashi", "last_path", (char*)fname);
- aud_cfg_db_close(db);
- }
-
- gtk_widget_set_sensitive (cfg_dialog, TRUE);
-}
-
-static void
-load_button_cb (GtkButton *button, gpointer data)
-{
- GtkWidget *selector;
- mcs_handle_t *db;
- gchar *last_path;
-
- db = aud_cfg_db_open();
- selector = gtk_file_selection_new ("Load Preset");
- if(aud_cfg_db_get_string(db, "kanashi", "last_path", &last_path)) {
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(selector), last_path);
- }
- aud_cfg_db_close(db);
-
- gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button),
-		 "clicked", GTK_SIGNAL_FUNC (load_sel_cb), selector);
- gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (selector)->cancel_button),
-		 "clicked", GTK_SIGNAL_FUNC (load_sel_cb), NULL);
-
- gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button),
-			 "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy),
-			 (gpointer) selector);
- gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (selector)->cancel_button),
-			 "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy),
-			 (gpointer) selector);
-
- gtk_widget_set_sensitive (cfg_dialog, FALSE);
- gtk_widget_show (selector);
-}
-
-static void
-ok_button_cb (GtkButton *button, gpointer data)
-{
- gtk_widget_hide (cfg_dialog);
-}
-
-void
-kanashi_configure (void)
-{
- GtkWidget *bbox, *button;
-
- if (! cfg_dialog)
- {
- /* The dialog */
- cfg_dialog = gtk_dialog_new ();
- gtk_window_set_title (GTK_WINDOW (cfg_dialog), "Kanashi");
- gtk_widget_set_usize (cfg_dialog, 530, 370);
- gtk_container_border_width (GTK_CONTAINER (cfg_dialog), 8);
- gtk_signal_connect_object (GTK_OBJECT (cfg_dialog), "delete-event",
-				 GTK_SIGNAL_FUNC (gtk_widget_hide),
-				 GTK_OBJECT (cfg_dialog));
-
- /* OK / Apply / Cancel */
- bbox = gtk_hbutton_box_new ();
- gtk_widget_show (bbox);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
- gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 8);
- gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), 64, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (cfg_dialog)->action_area),
-			 bbox, FALSE, FALSE, 0);
-
- button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
- gtk_widget_show (button);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			 GTK_SIGNAL_FUNC (load_button_cb), NULL);
- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NORMAL);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
-
- button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- gtk_widget_show (button);
- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NORMAL);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			 GTK_SIGNAL_FUNC (ok_button_cb), NULL);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
- }
-
- gtk_widget_show (cfg_dialog);
- gtk_widget_grab_focus (cfg_dialog);
-}

audacious-plugins-2.5.3.tar.gz/src/kanashi/cmaps.c Deleted

@@ -1,70 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization framework
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <glib.h>
-
-#include "kanashi.h"
-
-static struct kanashi_color black = {0, 0, 0};
-static struct kanashi_color white = {255, 255, 255};
-
-/* **************** cmap generation funcs **************** */
-static void
-cmap_gen_gradient (int step, const struct kanashi_color *a,
-		 const struct kanashi_color *b,
-		 struct kanashi_color *c)
-{
- c->r = a->r + step * ((((float)b->r) - ((float)a->r)) / 256.0);
- c->g = a->g + step * ((((float)b->g) - ((float)a->g)) / 256.0);
- c->b = a->b + step * ((((float)b->b) - ((float)a->b)) / 256.0);
-}
-
-/* **************** cmap_gradient **************** */
-#if 0
-static void
-cmap_gradient_exec (const struct kanashi_actuator_option *opts,
-		 gpointer data)
-{
- int i;
-
- for (i=opts[0].val.ival; i<=opts[1].val.ival; i++)
- cmap_gen_gradient (((i-opts[0].val.ival)<<8)/(opts[1].val.ival
-						 - opts[0].val.ival),
-		 &opts[2].val.cval, &opts[3].val.cval,
-		 &kanashi_image_data->cmap[i]);
-}
-#endif
-
-/* **************** cmap_bwgradient **************** */
-void
-kanashi_set_colormap_gradient(gint low_index, gint high_index, struct kanashi_color *color)
-{
- int i;
-
- for (i=low_index; i < 128 && i <= high_index; i++)
- cmap_gen_gradient (i<<1, &black, color,
-		 &kanashi_image_data->cmap[i]);
-
- for (i=128; i < 256 && i <= high_index; i++)
- cmap_gen_gradient ((i-128)<<1, color, &white,
-		 &kanashi_image_data->cmap[i]);
-}
-

audacious-plugins-2.5.3.tar.gz/src/kanashi/drawing.c Deleted

@@ -1,60 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization engine
- * 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; under version 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <math.h>
-
-#include "kanashi.h"
-#include "kanashi_utils.h"
-
-void
-kanashi_draw_dot (guint x, guint y, guchar value)
-{
- if (x > kanashi_image_data->width || x < 0 || y > kanashi_image_data->height || y < 0)
- return;
-
- kanashi_image_data->surface[0][PN_IMG_INDEX(x, y)] = value;
-}
-
-void
-kanashi_draw_line (guint _x0, guint _y0, guint _x1, guint _y1, guchar value)
-{
- gint x0 = _x0;
- gint y0 = _y0;
- gint x1 = _x1;
- gint y1 = _y1;
-
- gint dx = x1 - x0;
- gint dy = y1 - y0;
-
- kanashi_draw_dot(x0, y0, value);
-
- if (dx != 0)
- {
- gfloat m = (gfloat) dy / (gfloat) dx;
- gfloat b = y0 - m * x0;
-
- dx = (x1 > x0) ? 1 : - 1;
- while (x0 != x1)
- {
- x0 += dx;
- y0 = m * x0 + b;
-
- kanashi_draw_dot(x0, y0, value);
- }
- }
-}

audacious-plugins-2.5.3.tar.gz/src/kanashi/drawing.h Deleted

@@ -1,28 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization framework
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <glib.h>
-
-#ifndef PN_DRAWING_H
-#define PN_DRAWING_H
-
-void kanashi_draw_dot (guint x, guint y, guchar value);
-void kanashi_draw_line (guint _x0, guint _y0, guint _x1, guint _y1, guchar value);
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/kanashi/examples Deleted

audacious-plugins-2.5.3.tar.gz/src/kanashi/examples/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/kanashi/examples/nenolod_-_kanashi_default.js Deleted

audacious-plugins-2.5.3.tar.gz/src/kanashi/freq.c Deleted

@@ -1,60 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization framework
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <glib.h>
-
-#include "kanashi.h"
-#include "kanashi_utils.h"
-
-/* **************** freq_dots **************** */
-/* FIXME: take this piece of crap out */
-static void
-kanashi_freq_dots(void)
-{
- int i, basex;
-
- basex = (kanashi_image_data->width>>1)-128;
- for (i=basex < 0 ? -basex : 0 ; i < 256; i++)
- {
- kanashi_image_data->surface[0][PN_IMG_INDEX (basex+i, (kanashi_image_data->height>>1)
-					 - CAP (kanashi_sound_data->freq_data[0][i], 120))]
-	= 0xff;
- kanashi_image_data->surface[0][PN_IMG_INDEX (basex+256-i, (kanashi_image_data->height>>1)
-					 + CAP (kanashi_sound_data->freq_data[1][i], 120))]
-	= 0xff;
- }
-}
-
-/* **************** freq_drops **************** */
-static void
-kanashi_freq_drops (void)
-{
- int i,j;
- 
- for (i=0; i<256; i++)
- for (j=0; j<kanashi_sound_data->freq_data[0][i]>>3; i++)
- kanashi_image_data->surface[0][PN_IMG_INDEX (rand() % kanashi_image_data->width,
-					 rand() % kanashi_image_data->height)]
-	= 0xff;
-}

audacious-plugins-2.5.3.tar.gz/src/kanashi/general.c Deleted

@@ -1,220 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization framework
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/* FIXME: what to name this file? */
-
-#include <config.h>
-
-#include "kanashi.h"
-#include "kanashi_utils.h"
-
-/* **************** general_fade **************** */
-void
-kanashi_fade(gint amt)
-{
- register gint i, j;
-
- for (j=0; j<kanashi_image_data->height; j++)
- for (i=0; i<kanashi_image_data->width; i++)
- kanashi_image_data->surface[0][PN_IMG_INDEX (i, j)] =
- 	 CAPLO (kanashi_image_data->surface[0][PN_IMG_INDEX (i, j)] - amt, 0);
-}
-
-/* **************** general_blur **************** */
-void
-kanashi_blur(void)
-{
- int i,j;
- register guchar *srcptr = kanashi_image_data->surface[0];
- register guchar *destptr = kanashi_image_data->surface[1];
- register int sum;
-
- for (j=0; j<kanashi_image_data->height; j++)
- for (i=0; i<kanashi_image_data->width; i++)
- {
-	sum = *(srcptr)<<2;
-
-	/* top */
-	if (j > 0)
-	 {
-	 sum += *(srcptr-kanashi_image_data->width)<<1;
-	 if (i > 0)
-	 sum += *(srcptr-kanashi_image_data->width-1);
-	 if (i < kanashi_image_data->width-1)
-	 sum += *(srcptr-kanashi_image_data->width+1);
-	 }
-	/* bottom */
-	if (j < kanashi_image_data->height-1)
-	 {
-	 sum += *(srcptr+kanashi_image_data->width)<<1;
-	 if (i > 0)
-	 sum += *(srcptr+kanashi_image_data->width-1);
-	 if (i < kanashi_image_data->width-1)
-	 sum += *(srcptr+kanashi_image_data->width+1);
-	 }
-	/* left */
-	if (i > 0)
-	 sum += *(srcptr-1)<<1;
-	/* right */
-	if (i < kanashi_image_data->width-1)
-	 sum += *(srcptr+1)<<1;
-
-	*destptr++ = (guchar)(sum >> 4);
-	srcptr++;
- }
-
- kanashi_swap_surfaces ();
-}
-
-/* **************** general_mosaic **************** */
-void
-kanashi_mosaic(gint radius)
-{
- int i,j;
- register guchar *srcptr = kanashi_image_data->surface[0];
- register guchar *destptr = kanashi_image_data->surface[1];
-
- for (j=0; j<kanashi_image_data->height; j += radius)
- for (i=0; i<kanashi_image_data->width; i += radius)
- {
- int ii = 0, jj = 0;
- guchar bval = 0;
-
- /* find the brightest colour */
- for (jj = 0; jj < radius && (j + jj < kanashi_image_data->height); jj++)
- for (ii = 0; ii < radius && (i + ii < kanashi_image_data->width); ii++)
- {
- guchar val = srcptr[PN_IMG_INDEX(i + ii, j + jj)];
-
- if (val > bval)
- bval = val;
- }
-
- for (jj = 0; jj < radius && (j + jj < kanashi_image_data->height); jj++)
- for (ii = 0; ii < radius && (i + ii < kanashi_image_data->width); ii++)
- {
- destptr[PN_IMG_INDEX(i + ii, j + jj)] = bval;
- }
- }
-
- kanashi_swap_surfaces ();
-}
-
-/* **************** general_clear **************** */
-void
-kanashi_clear(void)
-{
- memset(kanashi_image_data->surface[0], '\0',
-	 (kanashi_image_data->height * kanashi_image_data->width));
-}
-
-/* **************** general_invert **************** */
-void
-kanashi_invert(void)
-{
- int i, j;
-
- for (j=0; j < kanashi_image_data->height; j++)
- for (i=0; i < kanashi_image_data->width; i++)
- kanashi_image_data->surface[0][PN_IMG_INDEX (i, j)] =
-	255 - kanashi_image_data->surface[0][PN_IMG_INDEX (i, j)];
-}
-
-/* **************** general_replace **************** */
-#if 0
-static struct kanashi_actuator_option_desc general_replace_opts[] =
-{
- { "start", "The beginning colour value that should be replaced by the value of out.",
- OPT_TYPE_INT, { ival: 250 } },
- { "end", "The ending colour value that should be replaced by the value of out.",
- OPT_TYPE_INT, { ival: 255 } },
- { "out", "The colour value that in is replaced with.",
- OPT_TYPE_INT, { ival: 0 } },
- { NULL }
-};
-
-static void
-general_replace_exec (const struct kanashi_actuator_option *opts,
-	 gpointer data)
-{
- register int i, j;
- register guchar val;
- guchar begin = opts[0].val.ival > 255 || opts[0].val.ival < 0 ? 250 : opts[0].val.ival;
- guchar end = opts[1].val.ival > 255 || opts[1].val.ival < 0 ? 255 : opts[1].val.ival;
- guchar out = opts[2].val.ival > 255 || opts[2].val.ival < 0 ? 0 : opts[2].val.ival;
-
- for (j=0; j < kanashi_image_data->height; j++)
- for (i=0; i < kanashi_image_data->width; i++)
- {
- val = kanashi_image_data->surface[0][PN_IMG_INDEX (i, j)];
- if (val >= begin && val <= end)
- kanashi_image_data->surface[0][PN_IMG_INDEX (i, j)] = out;
- }
-}
-
-struct kanashi_actuator_desc builtin_general_replace =
-{
- "general_replace", "Value Replace", "Performs a value replace on a range of values.",
- 0, general_replace_opts,
- NULL, NULL, general_replace_exec
-};
-#endif
-
-/* **************** general_swap **************** */
-void
-kanashi_swap(void)
-{
- kanashi_swap_surfaces ();
-}
-
-/* **************** general_copy **************** */
-void
-kanashi_copy(void)
-{
- memcpy(kanashi_image_data->surface[1], kanashi_image_data->surface[0], 
- (kanashi_image_data->width * kanashi_image_data->height));
-}
-
-/* **************** general_flip **************** */
-void
-kanashi_flip(gint direction)
-{
- gint x, y;
-
- if (direction < 0)
- {
- for (y = 0; y < kanashi_image_data->height; y++)
- for (x = 0; x < kanashi_image_data->width; x++)
- {
- kanashi_image_data->surface[1][PN_IMG_INDEX(kanashi_image_data->width - x, y)] = 
- kanashi_image_data->surface[0][PN_IMG_INDEX(x, y)];
- }
- }
- else
- {
- for (y = 0; y < kanashi_image_data->height; y++)
- for (x = 0; x < kanashi_image_data->width; x++)
- {
- kanashi_image_data->surface[1][PN_IMG_INDEX(x, kanashi_image_data->height - y)] = 
- kanashi_image_data->surface[0][PN_IMG_INDEX(x, y)];
- }
- }
-
- kanashi_swap_surfaces ();
-}

audacious-plugins-2.5.3.tar.gz/src/kanashi/jsglue.c Deleted

@@ -1,238 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization engine
- * 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; under version 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "kanashi.h"
-#include "kanashi_utils.h"
-#include "drawing.h"
-
-JSBool
-kanashi_js_fade(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- gint amt;
-
- if (!JS_ConvertArguments(cx_, argc, argv, "i", &amt))
- return JS_FALSE;
-
- if (amt < 1)
- amt = 1;
-
- kanashi_fade(amt);
-
- *rval = JSVAL_VOID;
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_mosaic(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- gint amt;
-
- if (!JS_ConvertArguments(cx_, argc, argv, "i", &amt))
- return JS_FALSE;
-
- if (amt < 1)
- amt = 1;
-
- kanashi_mosaic(amt);
-
- *rval = JSVAL_VOID;
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_blur(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- gint amt, i;
-
- if (!JS_ConvertArguments(cx_, argc, argv, "i", &amt))
- return JS_FALSE;
-
- if (amt < 1)
- amt = 1;
-
- for (i = 0; i < amt; i++)
- kanashi_blur();
-
- *rval = JSVAL_VOID;
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_invert(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- kanashi_invert();
-
- *rval = JSVAL_VOID;
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_set_colormap_gradient(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- gint low_index, high_index;
- struct kanashi_color color;
-
- if (!JS_ConvertArguments(cx_, argc, argv, "iiiii", &low_index, &high_index, &color.r, &color.g, &color.b))
- return JS_FALSE;
-
- kanashi_set_colormap_gradient(low_index, high_index, &color);
-
- *rval = JSVAL_VOID;
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_render_horizontal_waveform(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- gint channels, value;
-
- if (!JS_ConvertArguments(cx_, argc, argv, "ii", &channels, &value))
- return JS_FALSE;
-
- kanashi_render_horizontal_waveform(channels, value);
-
- *rval = JSVAL_VOID;
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_render_vertical_waveform(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- gint channels, value;
-
- if (!JS_ConvertArguments(cx_, argc, argv, "ii", &channels, &value))
- return JS_FALSE;
-
- kanashi_render_vertical_waveform(channels, value);
-
- *rval = JSVAL_VOID;
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_is_beat(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- if (kanashi_new_beat)
- *rval = JSVAL_TRUE;
- else
- *rval = JSVAL_FALSE;
-
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_render_line(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- gint x1, y1, x2, y2, value;
-
- if (!JS_ConvertArguments(cx_, argc, argv, "iiiii", &x1, &y1, &x2, &y2, &value))
- return JS_FALSE;
-
- kanashi_draw_line(x1, y1, x2, y2, value);
-
- *rval = JSVAL_VOID;
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_render_dot(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- gint x1, y1, value;
-
- if (!JS_ConvertArguments(cx_, argc, argv, "iii", &x1, &y1, &value))
- return JS_FALSE;
-
- kanashi_draw_dot(x1, y1, value);
-
- *rval = JSVAL_VOID;
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_get_canvas_width(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- *rval = INT_TO_JSVAL(kanashi_image_data->width);
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_get_canvas_height(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- *rval = INT_TO_JSVAL(kanashi_image_data->height);
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_get_pcm_data(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- JSObject *ar = JS_NewArrayObject(cx_, 0, NULL);
- gint i;
-
- JS_AddRoot(cx_, ar);
-
- for (i = 0; i < 256; i++)
- {
- JSObject *tuple = JS_NewArrayObject(cx_, 0, NULL);
- jsval l, r, tu;
-
- JS_AddRoot(cx_, tuple);
-
- l = INT_TO_JSVAL(kanashi_sound_data->pcm_data[0][i * 2]);
- r = INT_TO_JSVAL(kanashi_sound_data->pcm_data[1][i * 2]);
- JS_SetElement(cx_, tuple, 0, &l);
- JS_SetElement(cx_, tuple, 1, &r);
-
- tu = OBJECT_TO_JSVAL(tuple);
- JS_SetElement(cx_, ar, i, &tu);
-
- JS_RemoveRoot(cx_, tuple);
- }
-
- JS_RemoveRoot(cx_, ar);
-
- *rval = OBJECT_TO_JSVAL(ar);
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_translate_polar_x(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- gint x;
-
- if (!JS_ConvertArguments(cx_, argc, argv, "i", &x))
- return JS_FALSE;
-
- x *= kanashi_image_data->width;
-
- *rval = INT_TO_JSVAL(x);
- return JS_TRUE;
-}
-
-JSBool
-kanashi_js_translate_polar_y(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
- gint y;
-
- if (!JS_ConvertArguments(cx_, argc, argv, "i", &y))
- return JS_FALSE;
-
- y *= kanashi_image_data->height;
-
- *rval = INT_TO_JSVAL(y);
- return JS_TRUE;
-}

audacious-plugins-2.5.3.tar.gz/src/kanashi/jsglue.h Deleted

@@ -1,42 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization engine
- * 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; under version 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "kanashi.h"
-
-extern JSBool kanashi_js_fade(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-extern JSBool kanashi_js_blur(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-extern JSBool kanashi_js_mosaic(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-extern JSBool kanashi_js_invert(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-extern JSBool kanashi_js_set_colormap_gradient(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-extern JSBool kanashi_js_render_horizontal_waveform(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-extern JSBool kanashi_js_render_vertical_waveform(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-extern JSBool kanashi_js_render_line(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-extern JSBool kanashi_js_render_dot(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-extern JSBool kanashi_js_is_beat(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-extern JSBool kanashi_js_get_canvas_width(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-extern JSBool kanashi_js_get_canvas_height(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-extern JSBool kanashi_js_get_pcm_data(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-extern JSBool kanashi_js_translate_polar_x(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-extern JSBool kanashi_js_translate_polar_y(JSContext *cx_, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-

audacious-plugins-2.5.3.tar.gz/src/kanashi/kanashi.c Deleted

@@ -1,301 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization framework
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <math.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-
-#include "kanashi.h"
-#include "jsglue.h"
-
-GtkWidget *kanashi_win = NULL;
-GdkRgbCmap *cmap = NULL;
-
-/* Globals */
-struct kanashi_rc *kanashi_rc;
-struct kanashi_image_data *kanashi_image_data;
-struct kanashi_sound_data *kanashi_sound_data;
-
-/* Trig Pre-Computes */
-float sin_val[360];
-float cos_val[360];
-
-gboolean kanashi_new_beat;
-
-JSRuntime *rt = NULL;
-JSContext *cx = NULL;
-JSObject *global = NULL;
-
-GStaticMutex kanashi_mutex = G_STATIC_MUTEX_INIT;
-gint render_timeout = 0;
-extern GCond *render_cond;
-
-/* **************** drawing doodads **************** */
-static void
-set_colormap (void)
-{
- guint32 colors[256];
- gint i;
-
- if (cmap != NULL)
- gdk_rgb_cmap_free(cmap);
-
- for (i = 0; i < 256; i++) {
- colors[i] =
- (kanashi_image_data->cmap[i].r << 16) |
- (kanashi_image_data->cmap[i].g << 8) |
- (kanashi_image_data->cmap[i].b);
- }
-
- cmap = gdk_rgb_cmap_new(colors, 256);
-}
-
-static gboolean
-blit_to_screen (gpointer unused)
-{
- kanashi_render ();
- set_colormap();
-
- gdk_draw_indexed_image(kanashi_win->window, kanashi_win->style->white_gc, 0, 0,
- kanashi_image_data->width, kanashi_image_data->height, GDK_RGB_DITHER_NONE, 
- kanashi_image_data->surface[0], kanashi_image_data->width, cmap);
-
- return TRUE;
-}
-
-static void
-resize_video (guint w, guint h)
-{
- g_static_mutex_lock(&kanashi_mutex);
-
- kanashi_image_data->width = w;
- kanashi_image_data->height = h;
-
- if (kanashi_image_data->surface[0])
- g_free (kanashi_image_data->surface[0]);
- if (kanashi_image_data->surface[1])
- g_free (kanashi_image_data->surface[1]);
-
- kanashi_image_data->surface[0] = g_malloc0 (w * h);
- kanashi_image_data->surface[1] = g_malloc0 (w * h);
-
- g_static_mutex_unlock(&kanashi_mutex);
-}
-
-/* **************** basic renderer management **************** */
-void
-kanashi_cleanup (void)
-{
- if (kanashi_image_data)
- {
- if (kanashi_image_data->surface[0])
-	g_free (kanashi_image_data->surface[0]);
- if (kanashi_image_data->surface[1])
-	g_free (kanashi_image_data->surface[1]);
- g_free (kanashi_image_data);
- }
- if (kanashi_sound_data)
- g_free (kanashi_sound_data);
-
- if (render_timeout)
- g_source_remove(render_timeout);
-}
-
-/* Renders one frame and handles the SDL window */
-void
-kanashi_render (void)
-{
- jsval rval;
-
- kanashi_new_beat = kanashi_is_new_beat();
-
- if (!JS_CallFunctionName(cx, global, "render_scene", 0, NULL, &rval))
- printf("something broke\n");
-}
-
-/* this MUST be called if a builtin's output is to surface[1]
- (by the builtin, after it is done) */
-void
-kanashi_swap_surfaces (void)
-{
- guchar *tmp = kanashi_image_data->surface[0];
- kanashi_image_data->surface[0] = kanashi_image_data->surface[1];
- kanashi_image_data->surface[1] = tmp;
-}
-
-/******* presets *******/
-static JSClass global_class = {
- "global", JSCLASS_GLOBAL_FLAGS,
- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
- JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
- JSCLASS_NO_OPTIONAL_MEMBERS
-};
-
-void
-kanashi_report_js_error(JSContext *cx, const char *message, JSErrorReport *report)
-{
- printf("%s:%u:%s\n",
- report->filename ? report->filename : "<no filename>",
- (unsigned int) report->lineno,
- message);
-}
-
-
-JSBool
-kanashi_branch_callback_hook(JSContext *cx_, JSScript *script)
-{
- static int counter = 0;
-
- if (++counter == 2000) {
- JS_MaybeGC(cx_);
- counter = 0;
- }
-
- return JS_TRUE;
-}
-
-gboolean
-kanashi_load_preset(const char *filename)
-{
- gchar *data;
- gsize len;
- GError *err = NULL;
- JSScript *script;
- jsval rval;
-
- if (g_file_get_contents(filename, &data, &len, &err)) 
- {
- script = JS_CompileScript(cx, global, data, len, filename, 1);
- if (script != NULL) 
- {
- JS_ExecuteScript(cx, global, script, &rval);
- }
- else 
- {
- printf("compilation failed\n");
- return FALSE;
- }
- }
- else 
- {
- printf("loading failed\n");
- return FALSE;
- }
-
- g_free(data);
-
- return TRUE;
-}
-
-static JSFunctionSpec js_global_functions[] = {
- {"value_reduce", kanashi_js_fade, 1, 0, 0},
- {"value_invert", kanashi_js_invert, 0, 0, 0},
- {"blur", kanashi_js_blur, 1, 0, 0},
- {"mosaic", kanashi_js_mosaic, 1, 0, 0},
- {"set_colormap_gradient", kanashi_js_set_colormap_gradient, 5, 0, 0},
- {"render_horizontal_waveform", kanashi_js_render_horizontal_waveform, 2, 0, 0},
- {"render_vertical_waveform", kanashi_js_render_vertical_waveform, 2, 0, 0},
- {"render_line", kanashi_js_render_line, 5, 0, 0},
- {"render_dot", kanashi_js_render_dot, 3, 0, 0},
- {"is_beat", kanashi_js_is_beat, 0, 0, 0},
- {"get_canvas_width", kanashi_js_get_canvas_width, 0, 0, 0},
- {"get_canvas_height", kanashi_js_get_canvas_height, 0, 0, 0},
- {"get_pcm_data", kanashi_js_get_pcm_data, 0, 0, 0},
- {"translate_polar_x", kanashi_js_translate_polar_x, 1, 0, 0},
- {"translate_polar_y", kanashi_js_translate_polar_y, 1, 0, 0},
- {},
-};
-
-gboolean
-kanashi_reconfigure(GtkWidget *widget, GdkEventConfigure *event, gpointer unused)
-{
- resize_video (event->width, event->height);
-
- return FALSE;
-}
-
-gboolean
-kanashi_init(void)
-{
- int i;
-
- kanashi_sound_data = g_new0 (struct kanashi_sound_data, 1);
- kanashi_image_data = g_new0 (struct kanashi_image_data, 1);
-
- kanashi_win = gtk_drawing_area_new();
- gtk_widget_realize(kanashi_win);
- gtk_widget_set_size_request(kanashi_win, 640, 360);
- gtk_widget_show(kanashi_win);
- g_signal_connect(G_OBJECT(kanashi_win), "configure-event", G_CALLBACK(kanashi_reconfigure), NULL);
-
- resize_video (640, 360);
-
- for (i=0; i<360; i++)
- {
- sin_val[i] = sin(i*(M_PI/180.0));
- cos_val[i] = cos(i*(M_PI/180.0));
- }
-
- rt = JS_NewRuntime(8L * 1024L * 1024L);
- if (rt == NULL)
- {
- return FALSE;
- }
-
- /* Create a context. */
- cx = JS_NewContext(rt, 8192);
- if (cx == NULL)
- {
- return FALSE;
- }
-
- JS_SetOptions(cx, JSOPTION_VAROBJFIX);
- JS_SetVersion(cx, JSVERSION_1_7);
- JS_SetErrorReporter(cx, kanashi_report_js_error);
- JS_SetBranchCallback(cx, kanashi_branch_callback_hook);
-
- global = JS_NewObject(cx, &global_class, NULL, NULL);
- if (global == NULL)
- {
- return FALSE;
- }
-
- if (!JS_InitStandardClasses(cx, global))
- {
- return FALSE;
- }
-
- if (!JS_DefineFunctions(cx, global, js_global_functions))
- {
- return FALSE;
- }
-
- kanashi_load_preset(PRESET_PATH "/nenolod_-_kanashi_default.js");
-
- g_signal_connect(kanashi_win, "expose-event", G_CALLBACK(blit_to_screen), NULL);
- render_timeout = g_timeout_add(16, (GSourceFunc) gtk_widget_queue_draw, kanashi_win);
-
- return TRUE;
-}

audacious-plugins-2.5.3.tar.gz/src/kanashi/kanashi.h Deleted

@@ -1,85 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization plugin
- * 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; under version 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef _KANASHI_H
-#define _KANASHI_H
-
-#define XP_UNIX	/* XXX */
-
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <mozjs/jsapi.h>
-
-struct kanashi_color
-{
- guchar r, g, b, a;
-};
-
-struct kanashi_sound_data
-{
- gint16 pcm_data[2][512];
- gint16 freq_data[2][256];
-};
-
-struct kanashi_image_data
-{
- int width, height;
- struct kanashi_color cmap[256];
- guchar *surface[2];
-};
-
-/* The executable (ie xmms.c or standalone.c)
- is responsible for allocating this and filling
- it with default/saved values */
-struct kanashi_rc
-{
- struct kanashi_actuator *actuator;
-};
-
-/* core funcs */
-gboolean kanashi_init (void);
-void kanashi_cleanup (void);
-void kanashi_render (void);
-void kanashi_swap_surfaces (void);
-gboolean kanashi_load_preset (const char *filename);
-
-/* Implemented elsewhere (ie xmms.c or standalone.c) */
-void kanashi_set_rc ();
-void kanashi_fatal_error (const char *fmt, ...);
-void kanashi_error (const char *fmt, ...);
-void kanashi_quit (void);
-
-/* Implimented in cfg.c */
-void kanashi_configure (void);
-
-/* globals used for rendering */
-extern struct kanashi_rc *kanashi_rc;
-extern struct kanashi_sound_data *kanashi_sound_data;
-extern struct kanashi_image_data *kanashi_image_data;
-
-extern gboolean kanashi_new_beat;
-
-/* global trig pre-computes */
-extern float sin_val[360];
-extern float cos_val[360];
-
-/* beat detection */
-int kanashi_is_new_beat(void);
-
-#endif /* _KANASHI_H */

audacious-plugins-2.5.3.tar.gz/src/kanashi/kanashi_utils.h Deleted

@@ -1,46 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization engine
- * Copyright (c) 2009 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef _PN_UTILS_H
-#define _PN_UTILS_H
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-#define CAP(i,c) (i > c ? c : i < -(c) ? -(c) : i)
-#define CAPHILO(i,h,l) (i > h ? h : i < l ? l : i)
-#define CAPHI(i,h) (i > h ? h : i)
-#define CAPLO(i,l) (i < l ? l : i)
-
-#define PN_IMG_INDEX(x,y) ((x) + (kanashi_image_data->width * (y)))
-
-struct kanashi_color;
-
-extern void kanashi_mosaic(gint amt);
-extern void kanashi_fade(gint amt);
-extern void kanashi_blur(void);
-extern void kanashi_invert(void);
-
-extern void kanashi_set_colormap_gradient(gint low_index, gint high_index, struct kanashi_color *color);
-
-extern void kanashi_render_horizontal_waveform(gint channels, guchar value);
-extern void kanashi_render_vertical_waveform(gint channels, guchar value);
-
-#endif /* _PN_UTILS_H */

audacious-plugins-2.5.3.tar.gz/src/kanashi/misc.c Deleted

@@ -1,129 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization framework
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <glib.h>
-
-#include "kanashi.h"
-#include "kanashi_utils.h"
-
-/* ******************** misc_floater ******************** */
-#if 0
-typedef enum
-{
- float_up = 0x1,
- float_down = 0x2,
- float_left = 0x4,
- float_right = 0x8,
-} FloaterDirection;
-
-struct floater_state_data
-{
- FloaterDirection dir;
- gint x;
- gint y;
-};
-
-static void
-misc_floater_init(gpointer *data)
-{
- struct floater_state_data *opaque_data = g_new0(struct floater_state_data, 1);
- *data = opaque_data;
- opaque_data->x = rand() % kanashi_image_data->width;
- opaque_data->y = rand() % kanashi_image_data->height;
- opaque_data->dir = (FloaterDirection) rand() % 15; /* sum of all dir values */
-}
-
-static void
-misc_floater_cleanup(gpointer data)
-{
- g_free(data);
-}
-
-/*
- * This implementation isn't very great.
- * Anyone want to improve it? :(
- */
-static void
-misc_floater_exec(const struct kanashi_actuator_option *opts, gpointer data)
-{
- struct floater_state_data *opaque_data = (struct floater_state_data *) data;
- guchar value = (opts[0].val.ival < 0 || opts[0].val.ival > 255) ? 255 : opts[0].val.ival;
-
- /* determine the root coordinate first */
- if (opaque_data->dir & float_up)
- opaque_data->y -= 1;
- if (opaque_data->dir & float_down)
- opaque_data->y += 1;
-
- if (opaque_data->dir & float_left)
- opaque_data->x -= 1;
- if (opaque_data->dir & float_right)
- opaque_data->x += 1;
-
- /* make sure we're within surface boundaries. segfaults suck, afterall. */
- if (opaque_data->x + 1 <= kanashi_image_data->width &&
- opaque_data->x - 1 >= 0 &&
- opaque_data->y + 1 <= kanashi_image_data->height &&
- opaque_data->y - 1 >= 0)
- {
- /* draw it. i could use a loop here, but i don't see much reason in it,
- * so i don't think i will at this time. -nenolod
- */
- kanashi_image_data->surface[0][PN_IMG_INDEX(opaque_data->x, opaque_data->y)] = value;
- kanashi_image_data->surface[0][PN_IMG_INDEX(opaque_data->x + 1, opaque_data->y)] = value;
- kanashi_image_data->surface[0][PN_IMG_INDEX(opaque_data->x - 1, opaque_data->y)] = value;
- kanashi_image_data->surface[0][PN_IMG_INDEX(opaque_data->x, opaque_data->y + 1)] = value;
- kanashi_image_data->surface[0][PN_IMG_INDEX(opaque_data->x, opaque_data->y - 1)] = value;
- }
-
- /* check if we need to change direction yet, and if so, do so. */
- if (kanashi_new_beat == TRUE)
- opaque_data->dir = (FloaterDirection) rand() % 15; /* sum of all dir values */
-
- /* now adjust the direction so we stay in boundary */
- if (opaque_data->x - 1 <= 0 && opaque_data->dir & float_left)
- {
- opaque_data->dir &= ~float_left;
- opaque_data->dir |= float_right;
- }
-
- if (opaque_data->x + 1 >= kanashi_image_data->width && opaque_data->dir & float_right)
- {
- opaque_data->dir &= ~float_right;
- opaque_data->dir |= float_left;
- }
-
- if (opaque_data->y - 1 <= 0 && opaque_data->dir & float_up)
- {
- opaque_data->dir &= ~float_up;
- opaque_data->dir |= float_down;
- }
-
- if (opaque_data->y + 1 >= kanashi_image_data->height && opaque_data->dir & float_down)
- {
- opaque_data->dir &= ~float_down;
- opaque_data->dir |= float_up;
- }
-}
-#endif

audacious-plugins-2.5.3.tar.gz/src/kanashi/plugin.c Deleted

@@ -1,309 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization framework
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/* FIXME: issues with not uniniting variables between
- enables? I wasn't too careful about that, but it
- seems to work fine. If there are problems perhaps
- look for a bug there?
-*/
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <memory.h>
-#include <math.h>
-#include <setjmp.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <audacious/i18n.h>
-
-#include <gtk/gtk.h>
-#include <audacious/plugin.h>
-
-#include "kanashi.h"
-
-/* Error reporting dlg */
-static GtkWidget *err_dialog;
-extern GtkWidget *kanashi_win;
-
-/* Draw thread stuff */
-/* FIXME: Do I need mutex for kanashi_done? */
-static GMutex *sound_data_mutex;
-static GMutex *config_mutex;
-GCond *render_cond;
-extern GStaticMutex kanashi_mutex;
-
-static gboolean kanashi_done = FALSE;
-static jmp_buf quit_jmp;
-static gboolean timeout_set = FALSE;
-static guint quit_timeout;
-
-/* Sound stuffs */
-static gboolean new_pcm_data = FALSE;
-static gboolean new_freq_data = FALSE;
-static gint16 tmp_pcm_data[2][512];
-static gint16 tmp_freq_data[2][256];
-
-/* XMMS interface */
-static void kanashi_xmms_init (void);
-static void kanashi_xmms_cleanup (void);
-static void kanashi_xmms_about (void);
-static void kanashi_xmms_configure (void);
-static void kanashi_xmms_render_pcm (gint16 data[2][512]);
-static void kanashi_xmms_render_freq (gint16 data[2][256]);
-
-static GtkWidget *
-kanashi_get_widget(void)
-{
- g_print("get widget\n");
-
- return kanashi_win;
-}
-
-static VisPlugin kanashi_vp = 
-{
- .description = "Kanashi",
- .num_pcm_chs_wanted = 2,
- .num_freq_chs_wanted = 2,
- .init = kanashi_xmms_init,
- .cleanup = kanashi_xmms_cleanup,
- .about = kanashi_xmms_about,
- .configure = kanashi_xmms_configure,
- .render_pcm = kanashi_xmms_render_pcm,
- .render_freq = kanashi_xmms_render_freq,
- .get_widget = kanashi_get_widget,
-};
-
-VisPlugin *kanashi_vplist[] = { &kanashi_vp, NULL };
-
-DECLARE_PLUGIN(kanashi, NULL, NULL, NULL, NULL, NULL, NULL, kanashi_vplist,NULL);
-
-static gpointer
-draw_thread_fn (gpointer data)
-{
- while (kanashi_done == FALSE)
- {
- kanashi_render ();
- }
-
- g_print("exit\n");
-
- kanashi_cleanup ();
-
- return NULL;
-}
-
-static void
-kanashi_xmms_init (void)
-{
- kanashi_init ();
-
- sound_data_mutex = g_mutex_new();
- config_mutex = g_mutex_new();
- render_cond = g_cond_new();
-}
-
-static void
-kanashi_xmms_cleanup (void)
-{
- if (timeout_set)
- {
- gtk_timeout_remove (quit_timeout);
- timeout_set = FALSE;
- }
-
- if (sound_data_mutex)
- {
- g_mutex_free (sound_data_mutex);
- sound_data_mutex = NULL;
- }
-
- if (config_mutex)
- {
- g_mutex_free (config_mutex);
- config_mutex = NULL;
- }
-
- if (render_cond)
- {
- g_cond_free (render_cond);
- render_cond = NULL;
- }
-}
-
-#define KANASHI_VERSION		"0.1alpha3"
-static void
-kanashi_xmms_about (void)
-{
- static GtkWidget *window = NULL;
-
- audgui_simple_message(&window, GTK_MESSAGE_INFO, "About Kanashi", 
-
-"Kanashi " KANASHI_VERSION "\n\n\
-Copyright (C) 2009, William Pitcock <nenolod -at- dereferenced.org>\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");
-}
-
-static void
-kanashi_xmms_configure (void)
-{
- if (config_mutex)
- g_mutex_lock (config_mutex);
-
- kanashi_configure ();
-
- if (config_mutex)
- g_mutex_unlock (config_mutex);
-}
-
-static void
-kanashi_xmms_render_pcm (gint16 data[2][512])
-{
- memcpy (kanashi_sound_data->pcm_data, data, sizeof (gint16) * 2 * 512);
-}
-
-static void
-kanashi_xmms_render_freq (gint16 data[2][256])
-{
- memcpy (kanashi_sound_data->freq_data, data, sizeof (gint16) * 2 * 256);
-}
-
-/* **************** kanashi.h stuff **************** */
-
-void
-kanashi_set_rc (struct kanashi_rc *new_rc)
-{
-}
-
-void
-kanashi_fatal_error (const char *fmt, ...)
-{
- char *errstr;
- va_list ap;
- GtkWidget *dialog;
- GtkWidget *close, *label;
-
- /* now report the error... */
- va_start (ap, fmt);
- errstr = g_strdup_vprintf (fmt, ap);
- va_end (ap);
-
- dialog=gtk_dialog_new();
- gtk_window_set_title(GTK_WINDOW(dialog), "Kanashi: Fatal Error");
- gtk_container_border_width (GTK_CONTAINER (dialog), 8);
-
- label=gtk_label_new(errstr);
- fprintf (stderr, "%s\n", errstr);
- g_free (errstr);
-
- close = gtk_button_new_with_label ("Close");
- gtk_signal_connect_object (GTK_OBJECT (close), "clicked",
-			 GTK_SIGNAL_FUNC (gtk_widget_destroy),
-			 GTK_OBJECT (dialog));
-
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE,
-		 FALSE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), close,
-		 FALSE, FALSE, 0);
- gtk_widget_show (label);
- gtk_widget_show (close);
-
- gtk_widget_show (dialog);
- gtk_widget_grab_focus (dialog);
-
- kanashi_quit ();
-}
-
-
-void
-kanashi_error (const char *fmt, ...)
-{
- char *errstr;
- va_list ap;
- static GtkWidget *text;
- static GtkTextBuffer *textbuf;
-
- /* now report the error... */
- va_start (ap, fmt);
- errstr = g_strdup_vprintf (fmt, ap);
- va_end (ap);
- fprintf (stderr, "Kanashi-CRITICAL **: %s\n", errstr);
-
- if (! err_dialog)
- {
- GtkWidget *close;
-
- err_dialog=gtk_dialog_new();
- gtk_window_set_title (GTK_WINDOW (err_dialog), "Kanashi: Error");
- gtk_window_set_policy (GTK_WINDOW (err_dialog), FALSE, FALSE, FALSE);
- gtk_widget_set_usize (err_dialog, 400, 200);
- gtk_container_border_width (GTK_CONTAINER (err_dialog), 8);
-
- textbuf = gtk_text_buffer_new(NULL);
- text = gtk_text_view_new_with_buffer (textbuf);
-
- close = gtk_button_new_with_label ("Close");
- gtk_signal_connect_object (GTK_OBJECT (close), "clicked",
-				 GTK_SIGNAL_FUNC (gtk_widget_hide),
-				 GTK_OBJECT (err_dialog));
- gtk_signal_connect_object (GTK_OBJECT (err_dialog), "delete-event",
-				 GTK_SIGNAL_FUNC (gtk_widget_hide),
-				 GTK_OBJECT (err_dialog));
-
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (err_dialog)->vbox), text, FALSE,
-			 FALSE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (err_dialog)->action_area), close,
-			 FALSE, FALSE, 0);
- gtk_widget_show (text);
- gtk_widget_show (close);
- }
-
- gtk_text_buffer_set_text(GTK_TEXT_BUFFER(textbuf), errstr, -1);
- g_free (errstr);
-
- gtk_widget_show (err_dialog);
- gtk_widget_grab_focus (err_dialog);
-}
-
-
-/* This is confusing...
- Don't call this from anywhere but the draw thread or
- the initialization xmms thread (ie NOT the xmms sound
- data functions) */
-void
-kanashi_quit (void)
-{
-}

audacious-plugins-2.5.3.tar.gz/src/kanashi/wave.c Deleted

@@ -1,291 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization framework
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <math.h>
-
-#include "kanashi.h"
-#include "kanashi_utils.h"
-
-#include "drawing.h"
-
-/* **************** wave_horizontal **************** */
-void
-kanashi_render_horizontal_waveform(gint channels, guchar value)
-{
- int channel = ( channels < 0 ) ? 0 : 1;
- int *x_pos, *y_pos;	/* dynamic tables which store the positions for the line */
- int *x2_pos, *y2_pos;	/* dynamic tables which store the positions for the line */
- int i;
- float step;
-
- g_print("waveform render\n");
-
- x_pos = g_new0(int, 257);
- y_pos = g_new0(int, 257);
- x2_pos = g_new0(int, 257);
- y2_pos = g_new0(int, 257);
-
- step = kanashi_image_data->width / 256.;
-
- /* calculate the line. */
- for (i = 0; i < 256; i++)
- {
- if (channels != 0)
- {
- x_pos[i] = i * step;
- y_pos[i] = (kanashi_image_data->height>>1) - 
-			CAP (kanashi_sound_data->pcm_data[channel][i * 2]>>8, 
-			(kanashi_image_data->height>>1)-1);
- }
- else
- {
- x_pos[i] = i * step;
- y_pos[i] = (kanashi_image_data->height>>2) - 
-			CAP (kanashi_sound_data->pcm_data[0][i * 2]>>9,
-			(kanashi_image_data->height>>2)-1);
-
- x2_pos[i] = i * step;
- y2_pos[i] = 3*(kanashi_image_data->height>>2) - 
-			CAP (kanashi_sound_data->pcm_data[1][i * 2]>>9,
-			(kanashi_image_data->height>>2)-1);
-
- }
- }
-
- /* draw the line. */
- for (i = 1; i < 256; i++)
- {
- kanashi_draw_line(x_pos[i - 1], y_pos[i - 1], x_pos[i], y_pos[i], value);
-
- if ( channels == 0 )
- kanashi_draw_line(x2_pos[i - 1], y2_pos[i - 1], x2_pos[i], y2_pos[i], value);
- }
-
- g_free(x_pos);
- g_free(y_pos);
- g_free(x2_pos);
- g_free(y2_pos);
-}
-
-void
-kanashi_render_vertical_waveform(gint channels, guchar value)
-{
- int channel = ( channels < 0 ) ? 0 : 1;
- int *x_pos, *y_pos;	/* dynamic tables which store the positions for the line */
- int *x2_pos, *y2_pos;	/* dynamic tables which store the positions for the line */
- int i;
- float step;
-
- x_pos = g_new0(int, 129);
- y_pos = g_new0(int, 129);
- x2_pos = g_new0(int, 129);
- y2_pos = g_new0(int, 129);
-
- step = kanashi_image_data->height / 128.;
-
- /* calculate the line. */
- for (i = 0; i < 128; i++)
- {
- if (channels != 0)
- {
- x_pos[i] = (kanashi_image_data->width>>1) - 
-			CAP (kanashi_sound_data->pcm_data[channel]
-			[i*4]>>8,
-			(kanashi_image_data->width>>1)-1);
-	 y_pos[i] = i * step;
- }
- else
- {
- x_pos[i] = (kanashi_image_data->width>>2) 
-		 - CAP (kanashi_sound_data->pcm_data[0]
-		 [i*4]>>9,
-		 (kanashi_image_data->width>>2)-1);
- y_pos[i] = i * step;
-
- x2_pos[i] = 3*(kanashi_image_data->width>>2) 
-		 - CAP (kanashi_sound_data->pcm_data[1]
-		 [i*4]>>9,
-		 (kanashi_image_data->width>>2)-1);
- y2_pos[i] = i * step;
- }
- }
-
- /* draw the line. */
- for (i = 1; i < 128; i++)
- {
- kanashi_draw_line(x_pos[i - 1], y_pos[i - 1], x_pos[i], y_pos[i], value);
-
- if ( channels == 0 )
- kanashi_draw_line(x2_pos[i - 1], y2_pos[i - 1], x2_pos[i], y2_pos[i], value);
- }
-
- g_free(x_pos);
- g_free(y_pos);
- g_free(x2_pos);
- g_free(y2_pos);
-}
-
-#if 0
-/* FIXME: allow for only 1 channel for wave_normalize & wave_smooth */
-/* **************** wave_normalize **************** */
-static struct kanashi_actuator_option_desc wave_normalize_opts[] =
-{
- { "height", "If positive, the height, in pixels, to which the waveform will be "
- "normalized; if negative, hfrac is used", OPT_TYPE_INT, { ival: -1 } },
- { "hfrac", "If positive, the fraction of the horizontal image size to which the "
- "waveform will be normalized; if negative, vfrac is used",
- OPT_TYPE_FLOAT, { fval: -1 } },
- { "vfrac", "If positive, the fraction of the vertical image size to which the "
- "waveform will be normalized",
- OPT_TYPE_FLOAT, { fval: .125 } },
- { "channels", "Which sound channel(s) to normalize: negative = channel 1,\n"
- "\tpositive = channel 2, 0 = both channels.",
- OPT_TYPE_INT, { ival: 0 } },
- { NULL }
-};
-
-static void
-wave_normalize_exec (const struct kanashi_actuator_option *opts,
-		 gpointer data)
-{
- int i, j, max=0;
- float denom;
-
- for (j=0; j<2; j++)
- {
- if ( !(opts[3].val.ival) || (opts[3].val.ival < 0 && j == 0) ||
-	 (opts[3].val.ival > 0 && j == 1) ) {
-	
-	for (i=0; i<512; i++)
-	 if (abs(kanashi_sound_data->pcm_data[j][i]) > max)
-	 max = abs(kanashi_sound_data->pcm_data[j][i]);
-	
-	if (opts[0].val.ival > 0)
-	 denom = max/(opts[0].val.ival<<8);
-	else if (opts[1].val.fval > 0)
-	 denom = max/(opts[1].val.fval * (kanashi_image_data->width<<8));
-	else
-	 denom = max/(opts[2].val.fval * (kanashi_image_data->height<<8));
-	
-	if (denom > 0)
-	 for (i=0; i<512; i++)
-	 kanashi_sound_data->pcm_data[j][i]
-	 /= denom;
- }
- }
-}
-
-struct kanashi_actuator_desc builtin_wave_normalize =
-{
- "wave_normalize", "Normalize Waveform Data",
- "Normalizes the waveform data used by the wave_* actuators",
- 0, wave_normalize_opts,
- NULL, NULL, wave_normalize_exec
-};
-
-/* **************** wave_smooth **************** */
-struct kanashi_actuator_option_desc wave_smooth_opts[] = 
-{
- { "channels", "Which sound channel(s) to smooth: negative = channel 1, \n"
- "\tpositive = channel 2, 0 = both channels.",
- OPT_TYPE_INT, { ival: 0 } },
- {0}
-};
-
-static void
-wave_smooth_exec (const struct kanashi_actuator_option *opts,
-		 gpointer data)
-{
- int i, j, k;
- gint16 tmp[512];
-
- for (j=0; j<2; j++)
- {
- if ( !(opts[0].val.ival) || (opts[0].val.ival < 0 && j == 0) ||
-	 (opts[0].val.ival > 0 && j == 1) ) { 
-	
-	for (i=4; i<508; i++)
-	 {
-	 k = (kanashi_sound_data->pcm_data[j][i]<<3)
-	 + (kanashi_sound_data->pcm_data[j][i+1]<<2)
-	 + (kanashi_sound_data->pcm_data[j][i-1]<<2)
-	 + (kanashi_sound_data->pcm_data[j][i+2]<<2)
-	 + (kanashi_sound_data->pcm_data[j][i-2]<<2)
-	 + (kanashi_sound_data->pcm_data[j][i+3]<<1)
-	 + (kanashi_sound_data->pcm_data[j][i-3]<<1)
-	 + (kanashi_sound_data->pcm_data[j][i+4]<<1)
-	 + (kanashi_sound_data->pcm_data[j][i-4]<<1);
-	 tmp[i] = k >> 5;
-	 }
-	memcpy (kanashi_sound_data->pcm_data[j]+4, tmp, sizeof (gint16) * 504);
- } 
- }
-}
-
-struct kanashi_actuator_desc builtin_wave_smooth =
-{
- "wave_smooth", "Smooth Waveform Data",
- "Smooth out the waveform data used by the wave_* actuators",
- 0, wave_smooth_opts,
- NULL, NULL, wave_smooth_exec
-};
-
-/* **************** wave_radial **************** */
-static struct kanashi_actuator_option_desc wave_radial_opts[] =
-{
- { "base_radius", " ", 
- OPT_TYPE_FLOAT, { fval: 0 } },
- {"value", "The colour value to use.", OPT_TYPE_INT, {ival: 255} },
-/* {"lines", "Use lines instead of dots.", OPT_TYPE_BOOLEAN, {bval: TRUE} }, */
- { NULL }
-};
-
-static void
-wave_radial_exec (const struct kanashi_actuator_option *opts,
-		 gpointer data)
-{
- int i, x, y;
- guchar value = (opts[1].val.ival < 0 || opts[1].val.ival > 255) ? 255 : opts[1].val.ival;
- 
- for(i=0; i<360; i++)
- {
- x = (kanashi_image_data->width>>1)
-	+ (opts[0].val.fval + (kanashi_sound_data->pcm_data[0][(int)(i*(512.0/360.0))]>>8))
-	* cos_val[i];
- y = (kanashi_image_data->height>>1) 
-	+ (opts[0].val.fval + (kanashi_sound_data->pcm_data[0][(int)(i*(512.0/360.0))]>>8))
-	* sin_val[i];
-
- kanashi_image_data->surface[0][PN_IMG_INDEX (CAPHILO(x,kanashi_image_data->width,0),
-					 CAPHILO(y,kanashi_image_data->height,0))]
-	= value;
- }
-};	 
-
-struct kanashi_actuator_desc builtin_wave_radial =
-{
- "wave_radial", "Radial Waveform",
- "Draws a single waveform varying"
- " radially from the center of the image",
- 0, wave_radial_opts,
- NULL, NULL, wave_radial_exec
-};
-#endif

audacious-plugins-2.5.3.tar.gz/src/kanashi/xform.c Deleted

@@ -1,773 +0,0 @@
-/*
- * kanashi: iterated javascript-driven visualization framework
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/* FIXME: allow for only using an xform on part of the img? */
-/* FIXME: perhaps combine these into a single vector field
- so that only 1 apply_xform needs to be done for as many
- of these as someone wants to use */
-
-#include <config.h>
-
-#include <math.h>
-
-#include <glib.h>
-
-#include "kanashi.h"
-#include "kanashi_utils.h"
-
-struct xform_vector
-{
- gint32 offset; /* the offset of the top left pixel */
- guint16 w; /* 4:4:4:4 NE, NW, SE, SW pixel weights
-		 The total should be 16 */
-
- /* if offset < 0 then w is the color index to
- which the pixel will be set */
-};
-
-static void
-xfvec (float x, float y, struct xform_vector *v)
-{
- float xd, yd;
- int weight[4];
-
- if (x >= kanashi_image_data->width-1 || y >= kanashi_image_data->height-1
- || x < 0 || y < 0)
- {
- v->offset = -1;
- v->w = 0;
- return;
- }
-
- v->offset = PN_IMG_INDEX (floor(x), floor(y));
-
- xd = x - floor (x);
- yd = y - floor (y);
-
- weight[3] = xd * yd * 16;
- weight[2] = (1-xd) * yd * 16;
- weight[1] = xd * (1-yd) * 16;
- weight[0] = 16 - weight[3] - weight[2] - weight[1]; /* just in case */
-
- v->w = (weight[0]<<12) | (weight[1]<<8) | (weight[2]<<4) | weight[3];
-}
-
-static void
-apply_xform (struct xform_vector *vfield)
-{
- int i;
- struct xform_vector *v;
- register guchar *srcptr;
- register guchar *destptr;
- register int color;
-
- if (vfield == NULL)
- return;
-
- for (i=0, v=vfield, destptr=kanashi_image_data->surface[1];
- i<kanashi_image_data->width*kanashi_image_data->height;
- i++, v++, destptr++)
- {
- /* off the screen */
- if (v->offset < 0)
-	{
-	 *destptr = (guchar)v->w;
-	 continue;
-	}
-
- srcptr = kanashi_image_data->surface[0] + v->offset;
-
- /* exactly on the pixel */
- if (v->w == 0)
-	 *destptr = *srcptr;
- 
- /* gotta blend the points */
- else
-	{
-	 color = *srcptr * (v->w>>12);
-	 color += *++srcptr * ((v->w>>8) & 0x0f);
-	 color += *(srcptr+=kanashi_image_data->width) * (v->w & 0x0f);
-	 color += *(--srcptr) * ((v->w>>4) & 0x0f);
-	 color >>= 4;
-	 *destptr = (guchar)color;
-	}
- }
-}
-
-#if 0
-/* **************** xform_spin **************** */
-/* FIXME: Describe these better, how they are backwards */
-/* FIXME: better name? */
-struct kanashi_actuator_option_desc xform_spin_opts[] =
-{
- { "angle", "The angle of rotation", OPT_TYPE_FLOAT, { fval: -8.0 } },
- { "r_add", "The number of pixels by which the r coordinate will be "
- "increased (before scaling)", OPT_TYPE_FLOAT, { fval: 0.0 } },
- { "r_scale", "The amount by which the r coordinate of each pixel will "
- "be scaled", OPT_TYPE_FLOAT, { fval: 1.0 } },
- { NULL }
-};
-
-struct xform_spin_data
-{
- int width, height;
- struct xform_vector *vfield;
-};
-
-static void
-xform_spin_init (gpointer *data)
-{
- *data = g_new0 (struct xform_spin_data, 1);
-}
-
-static void
-xform_spin_cleanup (gpointer data)
-{
- struct xform_spin_data *d = (struct xform_spin_data *) data;
-
- 
- if (d)
- {
- if (d->vfield)
-	g_free (d->vfield);
- g_free (d);
- }
-}
-
-static void
-xform_spin_exec (const struct kanashi_actuator_option *opts,
-		 gpointer data)
-{
- struct xform_spin_data *d = (struct xform_spin_data*)data;
- float i, j;
-
- if (d->width != kanashi_image_data->width
- || d->height != kanashi_image_data->height)
- {
- d->width = kanashi_image_data->width;
- d->height = kanashi_image_data->height;
-
- if (d->vfield)
-	g_free (d->vfield);
-
- d->vfield = g_malloc0 (sizeof(struct xform_vector)
-			 * d->width * d->height);
-
- for (j=-(kanashi_image_data->height>>1)+1; j<=kanashi_image_data->height>>1; j++)
-	for (i=-(kanashi_image_data->width>>1); i<kanashi_image_data->width>>1; i++)
-	 {
-	 float r, t = 0;
-	 float x, y;
-
-	 r = sqrt (i*i + j*j);
-	 if (r)
-	 t = asin (j/r);
-	 if (i < 0)
-	 t = M_PI - t;
-
-	 t += opts[0].val.fval * M_PI/180.0; 
-	 r += opts[1].val.fval;
-	 r *= opts[2].val.fval;
-
-	 x = (r * cos (t)) + (kanashi_image_data->width>>1);
-	 y = (kanashi_image_data->height>>1) - (r * sin (t));
-
-	 xfvec (x, y, &d->vfield
-		 [PN_IMG_INDEX ((kanashi_image_data->width>>1)+(int)rint(i),
-				 ((kanashi_image_data->height>>1)-(int)rint(j)))]);
-	 }
- }
-
- apply_xform (d->vfield);
- kanashi_swap_surfaces ();
-}
-
-struct kanashi_actuator_desc builtin_xform_spin =
-{
- "xform_spin", "Spin Transform", 
- "Rotates and radially scales the image",
- 0, xform_spin_opts,
- xform_spin_init, xform_spin_cleanup, xform_spin_exec
-};
-
-/* **************** xform_ripple **************** */
-struct kanashi_actuator_option_desc xform_ripple_opts[] =
-{
- { "angle", "The angle of rotation", OPT_TYPE_FLOAT, { fval: 0 } },
- { "ripples", "The number of ripples that fit on the screen "
- "(horizontally)", OPT_TYPE_FLOAT, { fval: 8 } },
- { "base_speed", "The minimum number of pixels to move each pixel",
- OPT_TYPE_FLOAT, { fval: 1 } },
- { "mod_speed", "The maximum number of pixels by which base_speed"
- " will be modified", OPT_TYPE_FLOAT, { fval: 1 } },
- { NULL }
-};
-
-struct xform_ripple_data
-{
- int width, height;
- struct xform_vector *vfield;
-};
-
-static void
-xform_ripple_init (gpointer *data)
-{
- *data = g_new0 (struct xform_ripple_data, 1);
-}
-
-static void
-xform_ripple_cleanup (gpointer data)
-{
- struct xform_ripple_data *d = (struct xform_ripple_data*) data;
-
- if (d)
- {
- if (d->vfield)
-	g_free (d->vfield);
- g_free (d);
- }
-}
-
-static void
-xform_ripple_exec (const struct kanashi_actuator_option *opts,
-		 gpointer data)
-{
- struct xform_ripple_data *d = (struct xform_ripple_data*)data;
- float i, j;
-
- if (d->width != kanashi_image_data->width
- || d->height != kanashi_image_data->height)
- {
- d->width = kanashi_image_data->width;
- d->height = kanashi_image_data->height;
-
- if (d->vfield)
-	g_free (d->vfield);
-
- d->vfield = g_malloc (sizeof(struct xform_vector)
-			 * d->width * d->height);
-
- for (j=-(kanashi_image_data->height>>1)+1; j<=kanashi_image_data->height>>1; j++)
-	for (i=-(kanashi_image_data->width>>1); i<kanashi_image_data->width>>1; i++)
-	 {
-	 float r, t = 0;
-	 float x, y;
-
-	 r = sqrt (i*i + j*j);
-	 if (r)
-	 t = asin (j/r);
-	 if (i < 0)
-	 t = M_PI - t;
-
-	 t += opts[0].val.fval * M_PI/180.0; 
-
-	 if (r > 4)//(kanashi_image_data->width/(2*opts[1].val.fval)))
-	 r -= opts[2].val.fval + (opts[3].val.fval/2) *
-		(1 + sin ((r/(kanashi_image_data->width/(2*opts[1].val.fval)))*M_PI));
-/* 	 else if (r > 4) */
-/* 	 r *= r/(kanashi_image_data->width/opts[1].val.fval); */
-	 else /* don't let it explode */
-	 r = 1000000;
-
-
-	 x = (r * cos (t)) + (kanashi_image_data->width>>1);
-	 y = (kanashi_image_data->height>>1) - (r * sin (t));
-
-	 xfvec (x, y, &d->vfield
-		 [PN_IMG_INDEX ((kanashi_image_data->width>>1)+(int)rint(i),
-				 ((kanashi_image_data->height>>1)-(int)rint(j)))]);
-	 }
- }
-
- apply_xform (d->vfield);
- kanashi_swap_surfaces ();
-}
-
-struct kanashi_actuator_desc builtin_xform_ripple =
-{
- "xform_ripple", "Ripple Transform", "Creates an ripple effect",
- 0, xform_ripple_opts,
- xform_ripple_init, xform_ripple_cleanup, xform_ripple_exec
-};
-
-/* **************** xform_bump_spin **************** */
-struct kanashi_actuator_option_desc xform_bump_spin_opts[] =
-{
- { "angle", "The angle of rotation", OPT_TYPE_FLOAT, { fval: 0 } },
- { "bumps", "The number of bumps that on the image",
- OPT_TYPE_FLOAT, { fval: 8 } },
- { "base_scale", "The base radial scale",
- OPT_TYPE_FLOAT, { fval: 0.95 } },
- { "mod_scale", "The maximum amount that should be "
- "added to the base_scale to create the 'bump' effect",
- OPT_TYPE_FLOAT, { fval: .1 } },
- { NULL }
-};
-
-struct xform_bump_spin_data
-{
- int width, height;
- struct xform_vector *vfield;
-};
-
-static void
-xform_bump_spin_init (gpointer *data)
-{
- *data = g_new0 (struct xform_bump_spin_data, 1);
-}
-
-static void
-xform_bump_spin_cleanup (gpointer data)
-{
- struct xform_bump_spin_data *d = (struct xform_bump_spin_data*) data;
-
- if (d)
- {
- if (d->vfield)
-	g_free (d->vfield);
- g_free (d);
- }
-}
-
-static void
-xform_bump_spin_exec (const struct kanashi_actuator_option *opts,
-		 gpointer data)
-{
- struct xform_bump_spin_data *d = (struct xform_bump_spin_data*)data;
- float i, j;
-
- if (d->width != kanashi_image_data->width
- || d->height != kanashi_image_data->height)
- {
- d->width = kanashi_image_data->width;
- d->height = kanashi_image_data->height;
-
- if (d->vfield)
-	g_free (d->vfield);
-
- d->vfield = g_malloc (sizeof(struct xform_vector)
-			 * d->width * d->height);
-
- for (j=-(kanashi_image_data->height>>1)+1; j<=kanashi_image_data->height>>1; j++)
-	for (i=-(kanashi_image_data->width>>1); i<kanashi_image_data->width>>1; i++)
-	 {
-	 float r, t = 0;
-	 float x, y;
-
-	 r = sqrt (i*i + j*j);
-	 if (r)
-	 t = asin (j/r);
-	 if (i < 0)
-	 t = M_PI - t;
-
-	 t += opts[0].val.fval * M_PI/180.0;
-
-	 r *= opts[2].val.fval + opts[3].val.fval
-	 * (1 + sin (t*opts[1].val.fval));
-
-	 x = (r * cos (t)) + (kanashi_image_data->width>>1);
-	 y = (kanashi_image_data->height>>1) - (r * sin (t));
-
-	 xfvec (x, y, &d->vfield
-		 [PN_IMG_INDEX ((kanashi_image_data->width>>1)+(int)rint(i),
-				 ((kanashi_image_data->height>>1)-(int)rint(j)))]);
-	 }
- }
-
- apply_xform (d->vfield);
- kanashi_swap_surfaces ();
-}
-
-struct kanashi_actuator_desc builtin_xform_bump_spin =
-{
- "xform_bump_spin", "Bump Transform", 
- "Rotate the image at a varying speed to create "
- "the illusion of bumps",
- 0, xform_bump_spin_opts,
- xform_bump_spin_init, xform_bump_spin_cleanup, xform_bump_spin_exec
-};
-
-/* **************** xform_halfrender **************** */
-struct kanashi_actuator_option_desc xform_halfrender_opts[] =
-{
- { "direction", "Negative is horizontal, positive is vertical.", 
- OPT_TYPE_INT, { ival: 1 } },
- { "render_twice", "Render the second image.",
- OPT_TYPE_BOOLEAN, { bval: TRUE } },
- { NULL }
-};
-
-static void
-xform_halfrender_exec (const struct kanashi_actuator_option *opts,
-		 gpointer data)
-{
- gint x, y;
-
- if (opts[0].val.ival < 0)
- {
- for (y = 0; y < kanashi_image_data->height; y += 2)
- {
- for (x = 0; x < kanashi_image_data->width; x++)
- {
- kanashi_image_data->surface[1][PN_IMG_INDEX(x, y / 2)] =
- kanashi_image_data->surface[0][PN_IMG_INDEX(x, y)];
-	 if (opts[1].val.bval)
- {
- kanashi_image_data->surface[1][PN_IMG_INDEX(x, (y / 2) + (kanashi_image_data->height / 2))] =
- kanashi_image_data->surface[0][PN_IMG_INDEX(x, y)];
- }
- }
- }
- }
- else
- {
- for (y = 0; y < kanashi_image_data->height; y++)
- {
- for (x = 0; x < kanashi_image_data->width; x += 2)
- {
- kanashi_image_data->surface[1][PN_IMG_INDEX(x / 2, y)] =
- kanashi_image_data->surface[0][PN_IMG_INDEX(x, y)];
- if (opts[1].val.bval)
- {
- kanashi_image_data->surface[1][PN_IMG_INDEX((x / 2) + (kanashi_image_data->width / 2), y)] =
- kanashi_image_data->surface[0][PN_IMG_INDEX(x, y)];
- }
- }
- }
- }
-
- kanashi_swap_surfaces ();
-}
-
-struct kanashi_actuator_desc builtin_xform_halfrender =
-{
- "xform_halfrender", "Halfrender Transform",
- "Divides the surface in half and renders it twice.",
- 0, xform_halfrender_opts,
- NULL, NULL, xform_halfrender_exec
-};
-
-/* **************** xform_movement **************** */
-struct kanashi_actuator_option_desc xform_movement_opts[] =
-{
- { "formula", "The formula to evaluate.",
- OPT_TYPE_STRING, { sval: "r = r * cos(r); d = sin(d);" } },
- { "polar", "Whether the coordinates are polar or not.",
- OPT_TYPE_BOOLEAN, { bval: TRUE } },
- { NULL }
-};
-
-typedef struct {
- int width, height; /* Previous width and height. */
- struct xform_vector *vfield;
-} PnMovementData;
-
-static void
-xform_movement_init (gpointer *data)
-{
- *data = g_new0(PnMovementData, 1);
-}
-
-static void
-xform_movement_cleanup (gpointer data)
-{
- PnMovementData *d = (PnMovementData *) data;
-
- if (d)
- {
- if (d->vfield)
- 	 g_free (d->vfield);
- g_free (d);
- }
-}
-
-inline void
-xform_trans_polar (struct xform_vector *vfield, gint x, gint y,
-	expression_t *expr, symbol_dict_t *dict)
-{
- gdouble *rf, *df;
- gdouble xf, yf;
- gint xn, yn;
-
- rf = dict_variable(dict, "r");
- df = dict_variable(dict, "d");
-
- /* Points (xf, yf) must be in a (-1..1) square. */
- xf = 2.0 * x / (kanashi_image_data->width - 1) - 1.0;
- yf = 2.0 * y / (kanashi_image_data->height - 1) - 1.0;
-
- /* Now, convert to polar coordinates r and d. */
- *rf = hypot(xf, yf);
- *df = atan2(yf, xf);
-
- /* Run the script. */
- expr_execute(expr, dict);
-
- /* Back to (-1..1) square. */
- xf = (*rf) * cos ((*df));
- yf = (*rf) * sin ((*df));
-
- /* Convert back to physical coordinates. */
- xn = (int)(((xf + 1.0) * (kanashi_image_data->width - 1) / 2) + 0.5);
- yn = (int)(((yf + 1.0) * (kanashi_image_data->height - 1) / 2) + 0.5);
-
- if (xn < 0 || xn >= kanashi_image_data->width || yn < 0 || yn >= kanashi_image_data->height)
- {
- xn = x; yn = y;
- }
-
- xfvec (xn, yn, &vfield[PN_IMG_INDEX (x, y)]);
-}
-
-inline void
-xform_trans_literal (struct xform_vector *vfield, gint x, gint y,
-	expression_t *expr, symbol_dict_t *dict)
-{
- gint xn, yn;
- gdouble *xf = dict_variable(dict, "x");
- gdouble *yf = dict_variable(dict, "y");
-
- /* Points (xf, yf) must be in a (-1..1) square. */
- *xf = 2.0 * x / (kanashi_image_data->width - 1) - 1.0;
- *yf = 2.0 * y / (kanashi_image_data->height - 1) - 1.0;
-
- /* Run the script. */
- expr_execute(expr, dict);
-
- /* Convert back to physical coordinates. */
- xn = (int)(((*xf + 1.0) * (kanashi_image_data->width - 1) / 2) + 0.5);
- yn = (int)(((*yf + 1.0) * (kanashi_image_data->height - 1) / 2) + 0.5);
-
- if (xn < 0 || xn >= kanashi_image_data->width || yn < 0 || yn >= kanashi_image_data->height)
- {
- xn = x; yn = y;
- }
-
- xfvec (xn, yn, &vfield[PN_IMG_INDEX (x, y)]);
-}
-
-static void
-xform_movement_exec (const struct kanashi_actuator_option *opts,
-		 gpointer odata)
-{
- PnMovementData *d = (PnMovementData *) odata;
- void (*transform_func)(struct xform_vector *, gint, gint, expression_t *, symbol_dict_t *) = 
- opts[1].val.bval == TRUE ? xform_trans_polar : xform_trans_literal;
-
- if (d->width != kanashi_image_data->width
- || d->height != kanashi_image_data->height)
- {
- gint i, j;
- gdouble *rf, *df;
- expression_t *expr;
- symbol_dict_t *dict;
-
- d->width = kanashi_image_data->width;
- d->height = kanashi_image_data->height;
-
- if (d->vfield)
- {
- 	 g_free (d->vfield);
- d->vfield = NULL;
- }
-
- if (opts[0].val.sval == NULL)
- return;
-
- dict = dict_new();
- expr = expr_compile_string(opts[0].val.sval, dict);
- if (!expr)
- {
- dict_free(dict);
- return;
- }
-
- rf = dict_variable(dict, "r");
- df = dict_variable(dict, "d");
-
- d->vfield = g_malloc (sizeof(struct xform_vector)
-			 * d->width * d->height);
-
- for (j = 0; j < kanashi_image_data->height; j++)
-	for (i = 0; i < kanashi_image_data->width; i++)
-	 {
- transform_func(d->vfield, i, j, expr, dict);
-	 }
- }
-
- apply_xform (d->vfield);
- kanashi_swap_surfaces ();
-}
-
-struct kanashi_actuator_desc builtin_xform_movement =
-{
- "xform_movement", "Movement Transform",
- "A customizable blitter.",
- 0, xform_movement_opts,
- xform_movement_init, xform_movement_cleanup, xform_movement_exec
-};
-
-/* **************** xform_dynmovement **************** */
-/* FIXME: really slow */
-struct kanashi_actuator_option_desc xform_dynmovement_opts[] =
-{
- { "init_script", "The formula to evaluate on init.",
- OPT_TYPE_STRING, { sval: "" } },
- { "beat_script", "The formula to evaluate on each beat.",
- OPT_TYPE_STRING, { sval: "" } },
- { "frame_script", "The formula to evaluate on each frame.",
- OPT_TYPE_STRING, { sval: "" } },
- { "point_script", "The formula to evaluate.",
- OPT_TYPE_STRING, { sval: "d = 0.15;" } },
- { "polar", "Whether or not the coordinates to use are polar.",
- OPT_TYPE_BOOLEAN, { bval: TRUE } },
- { NULL }
-};
-
-typedef struct {
- int width, height; /* Previous width and height. */
- expression_t *expr_init;
- expression_t *expr_frame;
- expression_t *expr_beat;
- expression_t *expr_point;
- symbol_dict_t *dict;
- struct xform_vector *vfield;
-} PnDynMovementData;
-
-static void
-xform_dynmovement_init (gpointer *data)
-{
- *data = g_new0(PnDynMovementData, 1);
-}
-
-static void
-xform_dynmovement_cleanup (gpointer data)
-{
- PnDynMovementData *d = (PnDynMovementData *) data;
-
- if (d)
- {
- if (d->expr_init)
- expr_free (d->expr_init);
- if (d->expr_beat)
- expr_free (d->expr_beat);
- if (d->expr_frame)
- expr_free (d->expr_frame);
- if (d->expr_point)
- expr_free (d->expr_point);
- if (d->dict)
- dict_free (d->dict);
- if (d->vfield)
- 	 g_free (d->vfield);
- g_free (d);
- }
-}
-
-static void
-xform_dynmovement_exec (const struct kanashi_actuator_option *opts,
-		 gpointer odata)
-{
- PnDynMovementData *d = (PnDynMovementData *) odata;
- gint i, j;
- gdouble *rf, *df;
- void (*transform_func)(struct xform_vector *, gint, gint, expression_t *, symbol_dict_t *) = 
- opts[4].val.bval == TRUE ? xform_trans_polar : xform_trans_literal;
- gboolean make_table = FALSE;
-
- if (d->width != kanashi_image_data->width
- || d->height != kanashi_image_data->height)
- {
- d->width = kanashi_image_data->width;
- d->height = kanashi_image_data->height;
-
- if (d->vfield)
- {
- 	 g_free (d->vfield);
- d->vfield = NULL;
- }
-
- if (opts[3].val.sval == NULL)
- return;
-
- if (!d->dict)
- d->dict = dict_new();
- else
- {
- dict_free(d->dict);
- d->dict = dict_new();
- }
-
- if (d->expr_init)
- {
- expr_free(d->expr_init);
- d->expr_init = NULL;
- }
-
- /* initialize */
- d->expr_init = expr_compile_string(opts[0].val.sval, d->dict);
-
- if (d->expr_init != NULL)
- {
- expr_execute(d->expr_init, d->dict);
- }
-
- d->expr_beat = expr_compile_string(opts[1].val.sval, d->dict);
- d->expr_frame = expr_compile_string(opts[2].val.sval, d->dict);
- d->expr_point = expr_compile_string(opts[3].val.sval, d->dict);
-
- d->vfield = g_malloc (sizeof(struct xform_vector)
-			 * d->width * d->height);
-
- make_table = TRUE;
- }
-
- rf = dict_variable(d->dict, "r");
- df = dict_variable(d->dict, "d");
-
- if (*opts[2].val.sval != '\0' || kanashi_new_beat)
- make_table = TRUE;
-
- /* run the on-frame script. */
- if (make_table == TRUE)
- {
- if (d->expr_beat != NULL)
- expr_execute(d->expr_beat, d->dict);
-
- if (d->expr_frame != NULL)
- expr_execute(d->expr_frame, d->dict);
-
- for (j = 0; j < kanashi_image_data->height; j++)
- for (i = 0; i < kanashi_image_data->width; i++)
- {
- transform_func(d->vfield, i, j, d->expr_point, d->dict);
- }
- }
-
- apply_xform (d->vfield);
- kanashi_swap_surfaces ();
-}
-
-struct kanashi_actuator_desc builtin_xform_dynmovement =
-{
- "xform_dynmovement", "Dynamic Movement Transform",
- "A customizable blitter.",
- 0, xform_dynmovement_opts,
- xform_dynmovement_init, xform_dynmovement_cleanup, xform_dynmovement_exec
-};
-#endif

audacious-plugins-2.5.3.tar.gz/src/ladspa Deleted

audacious-plugins-2.5.3.tar.gz/src/ladspa/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/ladspa/ladspa.c Deleted

@@ -1,1135 +0,0 @@
-/* xmms_ladspa - use LADSPA plugins from XMMS
- Copyright (C) 2002,2003 Nick Lamb <njl195@zepler.org.uk>
-
- 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
-*/
-
-/* BMP-ladspa port by Giacomo Lozito <city_hunter@users.sf.net> */
-/* Audacious 2.4 port by John Lindgren <john.lindgren@tds.net>, 2010 */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <float.h>
-#include <dirent.h>
-#include <sys/types.h>
-#include <gtk/gtk.h>
-#include <gmodule.h>
-
-#include <audacious/configdb.h>
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
-
-#include "ladspa.h"
-
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-
-#define PLUGIN_NAME "LADSPA host"
-
-#define MAX_SAMPLES 8192
-#define MAX_KNOBS 64
-
-typedef struct
-{
- char *name;
- char *filename;
- long int id;
- long int unique_id;
- gboolean stereo;
-} ladspa_plugin;
-
-typedef struct
-{
- void *library;
- char *filename;
- gboolean stereo;
- gboolean restored;
- const LADSPA_Descriptor *descriptor;
- LADSPA_Handle *handle;	/* left or mono */
- LADSPA_Handle *handle2;	/* right stereo */
- GtkWidget *window;
- guint timeout;
- GtkAdjustment *adjustments[MAX_KNOBS];
- LADSPA_Data knobs[MAX_KNOBS];
-} plugin_instance;
-
-static gboolean start (void);
-static void stop(void);
-static void configure(void);
-
-static void restore(void);
-static plugin_instance *add_plugin(ladspa_plugin * plugin);
-static void find_all_plugins(void);
-static void find_plugins(char *path_entry);
-static ladspa_plugin *get_plugin_by_id(const gchar * basename, long id);
-static plugin_instance *load(char *filename, long int num);
-static void reboot_plugins(void);
-static void boot_plugin(plugin_instance * instance);
-static void port_assign(plugin_instance * instance);
-static void ladspa_shutdown(plugin_instance * instance);
-static void unload(plugin_instance * instance);
-
-static GtkWidget *make_plugin_clist(void);
-static void make_run_clist(void);
-static void sort_column(GtkCList * clist, gint column, gpointer user_data);
-static void select_plugin(GtkCList * clist, gint row, gint column, GdkEventButton * event, gpointer user_data);
-static void unselect_plugin(GtkCList * clist, gint row, gint column, GdkEventButton * event, gpointer user_data);
-static void add_plugin_clicked(GtkButton * button, gpointer user_data);
-static void remove_plugin_clicked(GtkButton * button, gpointer user_data);
-static void configure_plugin_clicked(GtkButton * button, gpointer user_data);
-
-static void draw_plugin(plugin_instance * instance);
-
-static LADSPA_Data left[MAX_SAMPLES], right[MAX_SAMPLES], trash[MAX_SAMPLES];
-
-G_LOCK_DEFINE_STATIC(running_plugins);
-
-static GSList *plugin_list, *running_plugins;
-
-static ladspa_plugin *selected_plugin;
-static plugin_instance *selected_instance;
-
-static struct
-{
- gint srate;
- gint nch;
- gboolean ignore;
- gboolean running;
- gboolean initialised;
-} state = {0, 0, FALSE, FALSE, FALSE};
-
-static GtkWidget *config_window = NULL, *run_clist = NULL;
-
-/* GCC does not like casting func * * to void * *. */
-static void * get_symbol (GModule * mod, const gchar * name)
-{
- void * sym = NULL;
- g_module_symbol (mod, name, & sym);
- return sym;
-}
-
-static gboolean start (void)
-{
- if (state.initialised == FALSE)
- {
-	restore();
- }
- else if (state.srate > 0)
- {
-	reboot_plugins();
- }
- state.running = TRUE;
- return TRUE;
-}
-
-static void restore(void)
-{
- mcs_handle_t *db;
- gint k, plugins = 0;
-
- db = aud_cfg_db_open();
- if (! db)
-	goto DONE;
-
- aud_cfg_db_get_int(db, "ladspa", "plugins", &plugins);
- for (k = 0; k < plugins; ++k)
- {
-	gint id;
-	int port, ports = 0;
-	plugin_instance *instance;
-	gchar *bn, *section, *file;
-
-	section = g_strdup_printf("ladspa_plugin%d", k);
-
-	aud_cfg_db_get_int(db, section, "id", &id);
-	aud_cfg_db_get_int(db, section, "ports", &ports);
-	if (!aud_cfg_db_get_string(db, section, "file", &file)) {
- g_free(section);
- continue;
- }
-	bn = g_path_get_basename(file);
- g_free(file);
-	instance = add_plugin(get_plugin_by_id(bn,id));
- g_free(bn);
-	if (!instance)
-	 continue;		/* couldn't load this plugin */
-
-	for (port = 0; port < ports && port < MAX_KNOBS; ++port)
-	{
-	 gchar *key = g_strdup_printf("port%d", port);
-	 aud_cfg_db_get_float(db, section, key, &(instance->knobs[port]));
-	}
-	instance->restored = TRUE;
-	g_free(section);
- }
-
- aud_cfg_db_close(db);
-
-DONE:
- state.initialised = TRUE;
-}
-
-static ladspa_plugin *get_plugin_by_id(const gchar * basename, long id)
-{
- GSList *list;
- ladspa_plugin *plugin;
-
- if (plugin_list == NULL)
- {
-	find_all_plugins();
- }
-
- for (list = plugin_list; list != NULL; list = g_slist_next(list))
- {
-	gchar *bn;
-	plugin = (ladspa_plugin *) list->data;
-
-	bn = g_path_get_basename(plugin->filename);
-	if (plugin->unique_id == id && !g_ascii_strcasecmp(basename, bn))
-	{
-	 g_free(bn);
-	 return plugin;
-	}
-
-	g_free(bn);
- }
-
- return NULL;
-}
-
-static void find_all_plugins(void)
-{
- char *ladspa_path, *directory;
-
- plugin_list = NULL;		/* empty list */
- ladspa_path = getenv("LADSPA_PATH");
- if (ladspa_path == NULL)
- {
-	/* Fallback, look in obvious places */
-	find_plugins("/usr/lib/ladspa");
-	find_plugins("/usr/local/lib/ladspa");
- }
- else
- {
-	ladspa_path = g_strdup(ladspa_path);
-
-	directory = strtok(ladspa_path, ":");
-	while (directory != NULL)
-	{
-	 find_plugins(directory);
-	 directory = strtok(NULL, ":");
-	}
-	g_free(ladspa_path);
- }
-}
-
-static plugin_instance *load(char *filename, long int num)
-{
- LADSPA_Descriptor_Function descriptor_fn;
- plugin_instance *instance;
-
- instance = g_new0(plugin_instance, 1);
-
- instance->filename = filename;
- instance->library = g_module_open(filename, G_MODULE_BIND_LOCAL);
-
- if (instance->library == NULL)
- {
- g_free(instance);
- return NULL;
- }
-
- if (! (descriptor_fn = get_symbol (instance->library, "ladspa_descriptor")))
- {
- g_free(instance);
- return NULL;
- }
-
- instance->descriptor = descriptor_fn(num);
-
- return instance;
-}
-
-static void unload(plugin_instance * instance)
-{
- if (instance->window)
- {
-	gtk_widget_destroy(instance->window);
-	instance->window = NULL;
- }
-
- if (instance->timeout)
- {
-	gtk_timeout_remove(instance->timeout);
- }
-
- ladspa_shutdown(instance);
-
- if (instance->library)
- {
-	g_module_close(instance->library);
- }
-}
-
-static void stop(void)
-{
- GSList *list;
- mcs_handle_t *db;
- gint plugins = 0;
-
- if (state.running == FALSE)
- {
-	return;
- }
- state.running = FALSE;
- db = aud_cfg_db_open();
- G_LOCK(running_plugins);
- for (list = running_plugins; list != NULL; list = g_slist_next(list))
- {
-	plugin_instance *instance = (plugin_instance *) list->data;
-
-	if (! db)
-	 goto SHUTDOWN;
-
-	gchar *bn;
-	gchar *section;
-	int port, ports = 0;
-
-	bn = g_path_get_basename(instance->filename);
-	section = g_strdup_printf("ladspa_plugin%d", plugins);
-	g_free(bn);
-
-	aud_cfg_db_set_int(db, section, "id", instance->descriptor->UniqueID);
-	aud_cfg_db_set_string(db, section, "file", instance->filename);
-	aud_cfg_db_set_string(db, section, "label", (gchar *) instance->descriptor->Label);
-
-	ports = instance->descriptor->PortCount;
-	if (ports > MAX_KNOBS)
-	 ports = MAX_KNOBS;
-	for (port = 0; port < ports; ++port)
-	{
-	 gchar *key = g_strdup_printf("port%d", port);
-	 aud_cfg_db_set_float(db, section, key, instance->knobs[port]);
-	 g_free(key);
-	}
-	aud_cfg_db_set_int(db, section, "ports", ports);
-	g_free(section);
-
-SHUTDOWN:
-	ladspa_shutdown(instance);
-	plugins++;
- }
- G_UNLOCK(running_plugins);
-
- aud_cfg_db_set_int(db, "ladspa", "plugins", plugins);
- aud_cfg_db_close(db);
-}
-
-static void ladspa_shutdown(plugin_instance * instance)
-{
- const LADSPA_Descriptor *descriptor = instance->descriptor;
-
- if (instance->handle)
- {
-	if (descriptor->deactivate)
-	{
-	 descriptor->deactivate(instance->handle);
-	}
-	descriptor->cleanup(instance->handle);
-	instance->handle = NULL;
- }
- if (instance->handle2)
- {
-	if (descriptor->deactivate)
-	{
-	 descriptor->deactivate(instance->handle2);
-	}
-	descriptor->cleanup(instance->handle2);
-	instance->handle2 = NULL;
- }
-}
-
-static void boot_plugin(plugin_instance * instance)
-{
- const LADSPA_Descriptor *descriptor = instance->descriptor;
-
- ladspa_shutdown(instance);
- instance->handle = descriptor->instantiate(descriptor, state.srate);
- if (state.nch > 1 && !instance->stereo)
- {
-	/* Create an additional instance */
-	instance->handle2 = descriptor->instantiate(descriptor, state.srate);
- }
-
- port_assign(instance);
-
- if (descriptor->activate)
- {
-	descriptor->activate(instance->handle);
-	if (instance->handle2)
-	{
-	 descriptor->activate(instance->handle2);
-	}
- }
-}
-
-static void reboot_plugins(void)
-{
- GSList *list;
-
- G_LOCK(running_plugins);
- for (list = running_plugins; list != NULL; list = g_slist_next(list))
- {
-	boot_plugin((plugin_instance *) list->data);
- }
- G_UNLOCK(running_plugins);
-}
-
-static void ladspa_process (gfloat * * datap, gint * samplesp)
-{
- gfloat * const data = * datap;
- const gint samples = * samplesp;
- GSList *list;
- plugin_instance *instance;
- int k;
-
- if (running_plugins == NULL || state.running == FALSE || state.ignore ||
- samples > MAX_SAMPLES)
-	return;
-
- if (state.nch == 1)
- {
-	for (k = 0; k < samples; k ++)
-	 left[k] = data[k];
-
-	G_LOCK(running_plugins);
-	for (list = running_plugins; list != NULL; list = g_slist_next(list))
-	{
-	 instance = (plugin_instance *) list->data;
-	 if (instance->handle)
-		instance->descriptor->run(instance->handle, samples);
-	}
-	G_UNLOCK(running_plugins);
-
-	for (k = 0; k < samples; k ++)
-	 data[k] = left[k];
- }
- else
- {
-	for (k = 0; k < samples; k += 2)
-	 left[k >> 1] = data[k];
-	for (k = 1; k < samples; k += 2)
-	 right[k >> 1] = data[k];
-
-	G_LOCK(running_plugins);
-	for (list = running_plugins; list != NULL; list = g_slist_next(list))
-	{
-	 instance = (plugin_instance *) list->data;
-	 if (instance->handle)
-		instance->descriptor->run(instance->handle, samples / 2);
-	 if (instance->handle2)
-		instance->descriptor->run(instance->handle2, samples / 2);
-	}
-	G_UNLOCK(running_plugins);
-
-	for (k = 0; k < samples; k += 2)
-	 data[k] = left[k >> 1];
-	for (k = 1; k < samples; k += 2)
-	 data[k] = right[k >> 1];
- }
-}
-
-static void port_assign(plugin_instance * instance)
-{
- unsigned long port;
- unsigned long inputs = 0, outputs = 0;
- const LADSPA_Descriptor *plugin = instance->descriptor;
-
- for (port = 0; port < plugin->PortCount; ++port)
- {
-
-	if (LADSPA_IS_PORT_CONTROL(plugin->PortDescriptors[port]))
-	{
-	 if (port < MAX_KNOBS)
-	 {
-		plugin->connect_port(instance->handle, port, &(instance->knobs[port]));
-		if (instance->handle2)
-		 plugin->connect_port(instance->handle2, port, &(instance->knobs[port]));
-	 }
-	 else
-	 {
-		plugin->connect_port(instance->handle, port, trash);
-		if (instance->handle2)
-		 plugin->connect_port(instance->handle2, port, trash);
-	 }
-
-	}
-	else if (LADSPA_IS_PORT_AUDIO(plugin->PortDescriptors[port]))
-	{
-
-	 if (LADSPA_IS_PORT_INPUT(plugin->PortDescriptors[port]))
-	 {
-		if (inputs == 0)
-		{
-		 plugin->connect_port(instance->handle, port, left);
-		 if (instance->handle2)
-			plugin->connect_port(instance->handle2, port, right);
-		}
-		else if (inputs == 1 && instance->stereo)
-		{
-		 plugin->connect_port(instance->handle, port, right);
-		}
-		else
-		{
-		 plugin->connect_port(instance->handle, port, trash);
-		 if (instance->handle2)
-			plugin->connect_port(instance->handle2, port, trash);
-		}
-		inputs++;
-
-	 }
-	 else if (LADSPA_IS_PORT_OUTPUT(plugin->PortDescriptors[port]))
-	 {
-		if (outputs == 0)
-		{
-		 plugin->connect_port(instance->handle, port, left);
-		 if (instance->handle2)
-			plugin->connect_port(instance->handle2, port, right);
-		}
-		else if (outputs == 1 && instance->stereo)
-		{
-		 plugin->connect_port(instance->handle, port, right);
-		}
-		else
-		{
-		 plugin->connect_port(instance->handle, port, trash);
-		 if (instance->handle2)
-			plugin->connect_port(instance->handle2, port, trash);
-		}
-		outputs++;
-
-	 }
-	}
- }
-
-}
-
-static void find_plugins(char *path_entry)
-{
- ladspa_plugin *plugin;
- void *library = NULL;
- char lib_name[PATH_MAX];
- LADSPA_Descriptor_Function descriptor_fn;
- const LADSPA_Descriptor *descriptor;
- DIR *dir;
- struct dirent *dirent;
- long int k;
- unsigned long int port, input, output;
-
- dir = opendir(path_entry);
- if (dir == NULL)
-	return;
-
- while ((dirent = readdir(dir)))
- {
-	snprintf(lib_name, PATH_MAX, "%s/%s", path_entry, dirent->d_name);
-	library = g_module_open(lib_name, G_MODULE_BIND_LAZY);
-	if (library == NULL)
-	{
-	 continue;
-	}
-
- if (! (descriptor_fn = get_symbol (library, "ladspa_descriptor")))
-	{
-	 g_module_close(library);
-	 continue;
-	}
-
-	for (k = 0;; ++k)
-	{
-	 descriptor = descriptor_fn(k);
-	 if (descriptor == NULL)
-	 {
-		break;
-	 }
-	 plugin = g_new(ladspa_plugin, 1);
-	 plugin->name = g_strdup(descriptor->Name);
-	 plugin->filename = g_strdup(lib_name);
-	 plugin->id = k;
-	 plugin->unique_id = descriptor->UniqueID;
-	 for (input = output = port = 0; port < descriptor->PortCount; ++port)
-	 {
-		if (LADSPA_IS_PORT_AUDIO(descriptor->PortDescriptors[port]))
-		{
-		 if (LADSPA_IS_PORT_INPUT(descriptor->PortDescriptors[port]))
-			input++;
-		 if (LADSPA_IS_PORT_OUTPUT(descriptor->PortDescriptors[port]))
-			output++;
-		}
-		else if (LADSPA_IS_PORT_CONTROL(descriptor->PortDescriptors[port]))
-		{
-		}
-	 }
-	 if (input >= 2 && output >= 2)
-	 {
-		plugin->stereo = TRUE;
-	 }
-	 else
-	 {
-		plugin->stereo = FALSE;
-	 }
-	 plugin_list = g_slist_prepend(plugin_list, plugin);
-	}
-	g_module_close(library);
- }
-
- closedir(dir);
- return;
-}
-
-static void value_changed(GtkAdjustment * adjustment, gpointer * user_data)
-{
- LADSPA_Data *data = (LADSPA_Data *) user_data;
-
- G_LOCK(running_plugins);
- *data = (LADSPA_Data) adjustment->value;
- G_UNLOCK(running_plugins);
-}
-
-static void toggled(GtkToggleButton * togglebutton, gpointer * user_data)
-{
- LADSPA_Data *data = (LADSPA_Data *) user_data;
-
- if (gtk_toggle_button_get_active(togglebutton))
- {
-	G_LOCK(running_plugins);
-	*data = (LADSPA_Data) 1.0f;
-	G_UNLOCK(running_plugins);
- }
- else
- {
-	G_LOCK(running_plugins);
-	*data = (LADSPA_Data) - 1.0f;
-	G_UNLOCK(running_plugins);
- }
-}
-
-static int update_instance(gpointer data)
-{
- plugin_instance *instance = (plugin_instance *) data;
- unsigned long k;
-
- G_LOCK(running_plugins);
- for (k = 0; k < MAX_KNOBS && k < instance->descriptor->PortCount; ++k)
- {
-	if (LADSPA_IS_PORT_OUTPUT(instance->descriptor->PortDescriptors[k]) && LADSPA_IS_PORT_CONTROL(instance->descriptor->PortDescriptors[k]))
-	{
-	 instance->adjustments[k]->value = instance->knobs[k];
-	 gtk_adjustment_value_changed(instance->adjustments[k]);
-	}
- }
- G_UNLOCK(running_plugins);
- return TRUE;
-}
-
-static void draw_plugin(plugin_instance * instance)
-{
- const LADSPA_Descriptor *plugin = instance->descriptor;
- const LADSPA_PortRangeHint *hints = plugin->PortRangeHints;
- LADSPA_Data fact, min, max, step, start;
- int dp;
- unsigned long k;
- gboolean no_ui = TRUE;
- GtkWidget *widget, *vbox, *hbox;
- GtkObject *adjustment;
-
- if (instance->window != NULL)
- {
-	/* Just show window */
-	gtk_widget_show(instance->window);
-	return;
- }
-
- instance->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_type_hint(GTK_WINDOW(instance->window), GDK_WINDOW_TYPE_HINT_DIALOG);
- gtk_window_set_title(GTK_WINDOW(instance->window), plugin->Name);
-
- vbox = gtk_vbox_new(FALSE, 3);
-
- for (k = 0; k < MAX_KNOBS && k < plugin->PortCount; ++k)
- {
-	if (!LADSPA_IS_PORT_CONTROL(plugin->PortDescriptors[k]))
-	 continue;
-	no_ui = FALSE;
-	hbox = gtk_hbox_new(FALSE, 3);
-	widget = gtk_label_new(plugin->PortNames[k]);
-	gtk_container_add(GTK_CONTAINER(hbox), widget);
-
-	if (LADSPA_IS_HINT_TOGGLED(hints[k].HintDescriptor))
-	{
-	 widget = gtk_toggle_button_new_with_label("Press");
-	 g_signal_connect(G_OBJECT(widget), "toggled", G_CALLBACK(toggled), &(instance->knobs[k]));
-	 gtk_container_add(GTK_CONTAINER(hbox), widget);
-	 gtk_container_add(GTK_CONTAINER(vbox), hbox);
-	 continue;
-	}
-
-	if (LADSPA_IS_HINT_SAMPLE_RATE(hints[k].HintDescriptor))
-	{
-	 fact = state.srate ? state.srate : 44100.0f;
-	}
-	else
-	{
-	 fact = 1.0f;
-	}
-
-	if (LADSPA_IS_HINT_BOUNDED_BELOW(hints[k].HintDescriptor))
-	{
-	 min = hints[k].LowerBound * fact;
-	}
-	else
-	{
-	 min = -10000.0f;
-	}
-
-	if (LADSPA_IS_HINT_BOUNDED_ABOVE(hints[k].HintDescriptor))
-	{
-	 max = hints[k].UpperBound * fact;
-	}
-	else
-	{
-	 max = 10000.0f;
-	}
-
-	/* infinity */
-	if (10000.0f <= max - min)
-	{
-	 dp = 1;
-	 step = 5.0f;
-
-	 /* 100.0 ... lots */
-	}
-	else if (100.0f < max - min)
-	{
-	 dp = 0;
-	 step = 5.0f;
-
-	 /* 10.0 ... 100.0 */
-	}
-	else if (10.0f < max - min)
-	{
-	 dp = 1;
-	 step = 0.5f;
-
-	 /* 1.0 ... 10.0 */
-	}
-	else if (1.0f < max - min)
-	{
-	 dp = 2;
-	 step = 0.05f;
-
-	 /* 0.0 ... 1.0 */
-	}
-	else
-	{
-	 dp = 3;
-	 step = 0.005f;
-	}
-
-	if (LADSPA_IS_HINT_INTEGER(hints[k].HintDescriptor))
-	{
-	 dp = 0;
-	 if (step < 1.0f)
-		step = 1.0f;
-	}
-
-	if (LADSPA_IS_HINT_DEFAULT_MINIMUM(hints[k].HintDescriptor))
-	{
-	 start = min;
-	}
-	else if (LADSPA_IS_HINT_DEFAULT_LOW(hints[k].HintDescriptor))
-	{
-	 start = min * 0.75f + max * 0.25f;
-	}
-	else if (LADSPA_IS_HINT_DEFAULT_MIDDLE(hints[k].HintDescriptor))
-	{
-	 start = min * 0.5f + max * 0.5f;
-	}
-	else if (LADSPA_IS_HINT_DEFAULT_HIGH(hints[k].HintDescriptor))
-	{
-	 start = min * 0.25f + max * 0.75f;
-	}
-	else if (LADSPA_IS_HINT_DEFAULT_MAXIMUM(hints[k].HintDescriptor))
-	{
-	 start = max;
-	}
-	else if (LADSPA_IS_HINT_DEFAULT_0(hints[k].HintDescriptor))
-	{
-	 start = 0.0f;
-	}
-	else if (LADSPA_IS_HINT_DEFAULT_1(hints[k].HintDescriptor))
-	{
-	 start = 1.0f;
-	}
-	else if (LADSPA_IS_HINT_DEFAULT_100(hints[k].HintDescriptor))
-	{
-	 start = 100.0f;
-	}
-	else if (LADSPA_IS_HINT_DEFAULT_440(hints[k].HintDescriptor))
-	{
-	 start = 440.0f;
-	}
-	else if (LADSPA_IS_HINT_INTEGER(hints[k].HintDescriptor))
-	{
-	 start = min;
-	}
-	else if (max >= 0.0f && min <= 0.0f)
-	{
-	 start = 0.0f;
-	}
-	else
-	{
-	 start = min * 0.5f + max * 0.5f;
-	}
-
-	if (instance->restored)
-	{
-	 start = instance->knobs[k];
-	}
-	else
-	{
-	 instance->knobs[k] = start;
-	}
-	adjustment = gtk_adjustment_new(start, min, max, step, step * 10.0, 0.0);
-	instance->adjustments[k] = GTK_ADJUSTMENT(adjustment);
-	widget = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), step, dp);
-	if (LADSPA_IS_PORT_OUTPUT(plugin->PortDescriptors[k]))
-	{
-	 gtk_widget_set_sensitive(widget, FALSE);
-	}
-	else
-	{
-	 g_signal_connect(adjustment, "value-changed", G_CALLBACK(value_changed), &(instance->knobs[k]));
-	}
-	gtk_container_add(GTK_CONTAINER(hbox), widget);
-	widget = gtk_hscale_new(GTK_ADJUSTMENT(adjustment));
-	gtk_scale_set_digits(GTK_SCALE(widget), dp);
-	if (LADSPA_IS_PORT_OUTPUT(plugin->PortDescriptors[k]))
-	{
-	 gtk_widget_set_sensitive(widget, FALSE);
-	}
-	gtk_container_add(GTK_CONTAINER(hbox), widget);
-
-	gtk_container_add(GTK_CONTAINER(vbox), hbox);
- }
-
- if (no_ui)
- {
-	widget = gtk_label_new(_("This LADSPA plugin has no user controls"));
-	gtk_container_add(GTK_CONTAINER(vbox), widget);
- }
-
- instance->timeout = gtk_timeout_add(100, update_instance, instance);
-
- gtk_container_add(GTK_CONTAINER(instance->window), vbox);
-
- g_signal_connect(G_OBJECT(instance->window), "delete_event", G_CALLBACK(gtk_widget_hide_on_delete), NULL);
- gtk_widget_show_all(instance->window);
-}
-
-static void sort_column(GtkCList * clist, gint column, gpointer user_data)
-{
- gtk_clist_set_sort_column(clist, column);
- gtk_clist_sort(clist);
-}
-
-static void unselect_instance(GtkCList * clist, gint row, gint column, GdkEventButton * event, gpointer user_data)
-{
- selected_instance = NULL;
-}
-
-static void select_instance(GtkCList * clist, gint row, gint column, GdkEventButton * event, gpointer user_data)
-{
- selected_instance = (plugin_instance *) gtk_clist_get_row_data(clist, row);
-}
-
-static void reorder_instance(GtkCList * clist, gint from, gint to, gpointer user_data)
-{
- void *data;
-
- G_LOCK(running_plugins);
- data = g_slist_nth_data(running_plugins, from);
- running_plugins = g_slist_remove(running_plugins, data);
- running_plugins = g_slist_insert(running_plugins, data, to);
- G_UNLOCK(running_plugins);
-}
-
-static void make_run_clist(void)
-{
- char *titles[1] = { _("Name") };
- GSList *list;
-
- run_clist = gtk_clist_new_with_titles(1, titles);
- gtk_clist_column_titles_passive(GTK_CLIST(run_clist));
- gtk_clist_set_reorderable(GTK_CLIST(run_clist), TRUE);
- g_signal_connect(G_OBJECT(run_clist), "select-row", G_CALLBACK(select_instance), NULL);
- g_signal_connect(G_OBJECT(run_clist), "unselect-row", G_CALLBACK(unselect_instance), NULL);
- g_signal_connect(G_OBJECT(run_clist), "row-move", G_CALLBACK(reorder_instance), NULL);
-
- G_LOCK(running_plugins);
- for (list = running_plugins; list != NULL; list = g_slist_next(list))
- {
-	gint row;
-	gchar *line[1];
-	plugin_instance *instance = (plugin_instance *) list->data;
-
-	line[0] = (char *)instance->descriptor->Name;
-	row = gtk_clist_append(GTK_CLIST(run_clist), line);
-	gtk_clist_set_row_data(GTK_CLIST(run_clist), row, (gpointer) instance);
-	gtk_clist_select_row(GTK_CLIST(run_clist), row, 0);
- }
- G_UNLOCK(running_plugins);
-}
-
-static plugin_instance *add_plugin(ladspa_plugin * plugin)
-{
- plugin_instance *instance;
- char *line[1];
- gint row;
-
- if (plugin == NULL)
- {
-	return NULL;
- }
-
- instance = load(plugin->filename, plugin->id);
- if (instance == NULL)
- {
-	return NULL;
- }
-
- instance->stereo = plugin->stereo;
- if (state.srate && state.running)
- {
-	/* Jump right in */
-	boot_plugin(instance);
- }
-
- if (run_clist)
- {
-	line[0] = (char *)instance->descriptor->Name;
-	row = gtk_clist_append(GTK_CLIST(run_clist), line);
-	gtk_clist_set_row_data(GTK_CLIST(run_clist), row, (gpointer) instance);
-	gtk_clist_select_row(GTK_CLIST(run_clist), row, 0);
-	draw_plugin(instance);
- }
- G_LOCK(running_plugins);
- running_plugins = g_slist_append(running_plugins, instance);
- G_UNLOCK(running_plugins);
-
- return instance;
-}
-
-
-static void unselect_plugin(GtkCList * clist, gint row, gint column, GdkEventButton * event, gpointer user_data)
-{
- selected_plugin = NULL;
-}
-
-static void select_plugin(GtkCList * clist, gint row, gint column, GdkEventButton * event, gpointer user_data)
-{
- selected_plugin = (ladspa_plugin *) gtk_clist_get_row_data(clist, row);
- gtk_clist_unselect_all(GTK_CLIST(run_clist));
- if (event->type == GDK_2BUTTON_PRESS)
- {
-	/* Double click */
-	add_plugin(selected_plugin);
- }
-}
-
-static GtkWidget *make_plugin_clist(void)
-{
- ladspa_plugin *plugin;
- GSList *list;
- GtkWidget *clist;
- char number[14];
- char *titles[2] = { _("UID"), _("Name") };
- char *line[2];
- gint row;
-
- find_all_plugins();
-
- clist = gtk_clist_new_with_titles(2, titles);
- gtk_clist_column_titles_active(GTK_CLIST(clist));
- gtk_clist_set_column_auto_resize(GTK_CLIST(clist), 0, TRUE);
- gtk_clist_set_sort_column(GTK_CLIST(clist), 1);
-
- for (list = plugin_list; list != NULL; list = g_slist_next(list))
- {
-	plugin = (ladspa_plugin *) list->data;
-	snprintf(number, sizeof(number), "%ld", plugin->unique_id);
-	line[0] = number;
-	line[1] = plugin->name;
-	row = gtk_clist_append(GTK_CLIST(clist), line);
-	gtk_clist_set_row_data(GTK_CLIST(clist), row, (gpointer) plugin);
- }
- gtk_clist_sort(GTK_CLIST(clist));
-
- g_signal_connect(G_OBJECT(clist), "click-column", G_CALLBACK(sort_column), NULL);
- g_signal_connect(G_OBJECT(clist), "select-row", G_CALLBACK(select_plugin), NULL);
- g_signal_connect(G_OBJECT(clist), "unselect-row", G_CALLBACK(unselect_plugin), NULL);
-
- return clist;
-}
-
-static void add_plugin_clicked(GtkButton * button, gpointer user_data)
-{
- add_plugin(selected_plugin);
-}
-
-static void remove_plugin_clicked(GtkButton * button, gpointer user_data)
-{
- plugin_instance *instance = selected_instance;
- gint row;
-
- if (instance == NULL)
- {
-	return;
- }
- row = gtk_clist_find_row_from_data(GTK_CLIST(run_clist), (gpointer) instance);
- gtk_clist_remove(GTK_CLIST(run_clist), row);
-
- G_LOCK(running_plugins);
- running_plugins = g_slist_remove(running_plugins, instance);
- unload(instance);
- G_UNLOCK(running_plugins);
- selected_instance = NULL;
-}
-
-static void configure_plugin_clicked(GtkButton * button, gpointer user_data)
-{
- if (selected_instance)
- {
-	draw_plugin(selected_instance);
- }
-}
-
-static void configure(void)
-{
- GtkWidget *widget, *vbox, *hbox, *bbox, *frame;
-
- if (config_window)
- {
-	/* just show the window */
-	gtk_widget_show(config_window);
-	return;
- }
-
- config_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_type_hint(GTK_WINDOW(config_window), GDK_WINDOW_TYPE_HINT_DIALOG);
- vbox = gtk_vbox_new(FALSE, 0);
- hbox = gtk_hbox_new(TRUE, 0);
-
- frame = gtk_frame_new(_("Installed plugins"));
- widget = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
- gtk_container_add(GTK_CONTAINER(widget), make_plugin_clist());
- gtk_container_add(GTK_CONTAINER(frame), widget);
- gtk_container_add(GTK_CONTAINER(hbox), frame);
-
-
- frame = gtk_frame_new(_("Running plugins"));
- widget = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
- if (run_clist == NULL)
- {
-	make_run_clist();
- }
- gtk_container_add(GTK_CONTAINER(widget), run_clist);
- gtk_container_add(GTK_CONTAINER(frame), widget);
- gtk_container_add(GTK_CONTAINER(hbox), frame);
- gtk_container_add(GTK_CONTAINER(vbox), hbox);
-
- /* Buttons */
- bbox = gtk_hbutton_box_new();
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_SPREAD);
- widget = gtk_button_new_with_label(_("Add"));
- g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(add_plugin_clicked), NULL);
- gtk_box_pack_end_defaults(GTK_BOX(bbox), widget);
- widget = gtk_button_new_with_label(_("Remove"));
- g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(remove_plugin_clicked), NULL);
- gtk_box_pack_end_defaults(GTK_BOX(bbox), widget);
- widget = gtk_button_new_with_label(_("Configure"));
- g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(configure_plugin_clicked), NULL);
- gtk_box_pack_end_defaults(GTK_BOX(bbox), widget);
-
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
-
- gtk_container_add(GTK_CONTAINER(config_window), vbox);
-
- gtk_window_set_title(GTK_WINDOW(config_window), _("LADSPA Plugin Catalog"));
- gtk_widget_set_usize(config_window, 380, 400);
- g_signal_connect(G_OBJECT(config_window), "delete_event", G_CALLBACK(gtk_widget_hide_on_delete), NULL);
-
- gtk_widget_show_all(config_window);
-}
-
-void ladspa_start (gint * channels, gint * rate)
-{
- state.nch = * channels;
- state.srate = * rate;
- state.ignore = (* channels < 1 || * channels > 2);
- reboot_plugins ();
-}
-
-void ladspa_flush (void)
-{
-}
-
-void ladspa_finish (gfloat * * data, gint * samples)
-{
- ladspa_process (data, samples);
-}
-
-gint ladspa_decoder_to_output_time (gint time)
-{
- return time;
-}
-
-gint ladspa_output_to_decoder_time (gint time)
-{
- return time;
-}
-
-static EffectPlugin header = {
- .description = PLUGIN_NAME,
- .init = start,
- .cleanup = stop,
- .configure = configure,
- .start = ladspa_start,
- .process = ladspa_process,
- .flush = ladspa_flush,
- .finish = ladspa_finish,
- .decoder_to_output_time = ladspa_decoder_to_output_time,
- .output_to_decoder_time = ladspa_output_to_decoder_time,
- .preserves_format = TRUE,
-};
-
-EffectPlugin * header_list[] = {& header, NULL};
-SIMPLE_EFFECT_PLUGIN (ladspa, header_list)

audacious-plugins-2.5.3.tar.gz/src/ladspa/ladspa.h Deleted

@@ -1,603 +0,0 @@
-/* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   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-2.5.3.tar.gz/src/lirc Deleted

audacious-plugins-2.5.3.tar.gz/src/lirc/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/lirc/about.c Deleted

@@ -1,143 +0,0 @@
-/* LIRC Plugin
-
- Copyright (C) 2005 Audacious development team
-
- Copyright (c) 1998-1999 Carl van Schaik (carl@leg.uct.ac.za)
- code from gtuner lirc plugin
- cRadio, kTuner, gtuner (c) 1998-1999 Carl van Schaik
- 
- Copyright (C) 2000 Christoph Bartelmus (xmms@bartelmus.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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "config.h"
-
-#include <glib.h>
-#include <audacious/i18n.h>
-#include <gtk/gtk.h>
-
-#include "lirc.h"
-#include "lirc_image.h"
-#include "lirc_mini.xpm"
-
-#include <gdk/gdkx.h>
-
-static void win_set_icon (GtkWidget *win, char** image);
-
-static GtkWidget *dialog = NULL;
-static GdkPixmap *icon;
-static GdkBitmap *icon_mask;
-
-void about_close_cb(GtkWidget *w,gpointer data)
-{
-	gtk_widget_destroy(dialog);
-	gdk_pixmap_unref(icon);
-	gdk_bitmap_unref(icon_mask);
-}
-
-void about(void)
-{
- GdkPixmap *pixmap;
-	GtkWidget *bbox,*about_credits_logo_box,*about_credits_logo_frame;
-	GtkWidget *about_credits_logo;
-	GtkWidget *button,*label;
-	GString *logo_text;
-	
-	if(dialog) return;
-	
-	dialog=gtk_dialog_new();
-	gtk_window_set_title(GTK_WINDOW(dialog),
-			 _("About LIRC Audacious Plugin"));
-	g_signal_connect(G_OBJECT(dialog),"destroy",
-			 G_CALLBACK(gtk_widget_destroyed),
-			 &dialog);
-	gtk_widget_realize(dialog);
-	
-	pixmap=gdk_pixmap_create_from_xpm_d(dialog->window,
-					 NULL, NULL, lirc_image);
-	
-	about_credits_logo_box = gtk_hbox_new(TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
-			 about_credits_logo_box, FALSE, FALSE, 0);
-	about_credits_logo_frame = gtk_frame_new(NULL);
-	gtk_frame_set_shadow_type(GTK_FRAME(about_credits_logo_frame),
-				 GTK_SHADOW_OUT);
-	gtk_box_pack_start(GTK_BOX(about_credits_logo_box),
-			 about_credits_logo_frame, FALSE, FALSE, 0);
-	
-	about_credits_logo = gtk_pixmap_new(pixmap, NULL);
-	gdk_pixmap_unref(pixmap);
-	
-	gtk_container_add(GTK_CONTAINER(about_credits_logo_frame),
-			 about_credits_logo);
-	
-	gtk_container_border_width(GTK_CONTAINER(dialog),5);
-
- logo_text = g_string_new( "" );
- g_string_append( logo_text , _("LIRC Plugin "));
- g_string_append( logo_text , VERSION );
- g_string_append( logo_text , _("\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"));
-
-	label=gtk_label_new( logo_text->str );
- g_string_free( logo_text, TRUE );
-
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),label,
- TRUE,TRUE,10);
-	
-	bbox = gtk_hbutton_box_new();
-	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-	gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
-			 bbox, FALSE, FALSE, 0);
-	
-	button = gtk_button_new_with_label(_("Close"));
-	g_signal_connect_object(G_OBJECT(button), "clicked",
-				 G_CALLBACK(about_close_cb), NULL,G_CONNECT_SWAPPED) ;
-	
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-	gtk_box_pack_start(GTK_BOX(bbox), button, TRUE, TRUE, 0);
-	gtk_widget_grab_default(button);
-	gtk_widget_grab_focus(button);
-	
- win_set_icon(dialog, lirc_mini_xpm);
-	
-	gtk_widget_show_all(dialog);
-}
-
-static void win_set_icon (GtkWidget *win, char** image)
-{
-	GdkAtom icon_atom;
-	glong data[2];
-	
-	icon=gdk_pixmap_create_from_xpm_d(win->window, &icon_mask,
-					 &win->style->bg[GTK_STATE_NORMAL],
-					 image);
-	data[0] = GDK_WINDOW_XWINDOW(icon);
-	data[1] = GDK_WINDOW_XWINDOW(icon_mask);
-	
-	icon_atom = gdk_atom_intern ("KWM_WIN_ICON", FALSE);
-	gdk_property_change (win->window, icon_atom, icon_atom, 32,
-			 GDK_PROP_MODE_REPLACE, (guchar *)data, 2);
-}

audacious-plugins-2.5.3.tar.gz/src/lirc/callbacks.c Deleted

@@ -1,33 +0,0 @@
-#include <config.h>
-
-#include <gtk/gtk.h>
-
-#include "common.h"
-
-void
-on_reconnectcheck_toggled (GtkToggleButton *togglebutton,
- GtkWidget *reconnectspin)
-{
- gtk_widget_set_sensitive(reconnectspin, gtk_toggle_button_get_active(togglebutton));
-}
-
-
-void
-on_cancelbutton1_clicked (GtkButton *button,
- gpointer user_data)
-{
- gtk_widget_destroy(lirc_cfg);
- lirc_cfg=NULL;
-}
-
-
-void
-on_okbutton1_clicked (GtkButton *button,
- gpointer user_data)
-{
- b_enable_reconnect=(gint)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(lirc_cfg), "reconnectcheck")));
- reconnect_timeout=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(g_object_get_data(G_OBJECT(lirc_cfg), "reconnectspin")));
- save_cfg();
- gtk_widget_destroy(lirc_cfg);
- lirc_cfg=NULL;
-}

audacious-plugins-2.5.3.tar.gz/src/lirc/common.h Deleted

audacious-plugins-2.5.3.tar.gz/src/lirc/interface.c Deleted

@@ -1,109 +0,0 @@
-#include <config.h>
-
-#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 <audacious/i18n.h>
-
-#include "common.h"
-
-GtkWidget*
-create_lirc_cfg (void)
-{
- GtkWidget *dialog_vbox1;
- GtkWidget *notebook1;
- GtkWidget *vbox2;
- GtkWidget *frame1;
- GtkWidget *alignment1;
- GtkWidget *vbox3;
- GtkWidget *hbox1;
- GtkWidget *label3;
- GtkWidget *reconnectcheck;
- GtkWidget *reconnectspin;
- GtkObject *reconnectspin_adj;
- GtkWidget *label2;
- GtkWidget *label1;
- GtkWidget *dialog_action_area1;
- GtkWidget *cancelbutton1;
- GtkWidget *okbutton1;
-
- lirc_cfg = gtk_dialog_new ();
- gtk_window_set_title (GTK_WINDOW (lirc_cfg), _("LIRC plugin settings"));
- gtk_window_set_position (GTK_WINDOW (lirc_cfg), GTK_WIN_POS_CENTER_ON_PARENT);
- gtk_window_set_resizable (GTK_WINDOW (lirc_cfg), FALSE);
- gtk_window_set_type_hint (GTK_WINDOW (lirc_cfg), GDK_WINDOW_TYPE_HINT_DIALOG);
- g_signal_connect(G_OBJECT(lirc_cfg),"destroy", G_CALLBACK(gtk_widget_destroyed), &lirc_cfg);
-
- dialog_vbox1 = GTK_DIALOG (lirc_cfg)->vbox;
-
- notebook1 = gtk_notebook_new ();
- gtk_box_pack_start (GTK_BOX (dialog_vbox1), notebook1, TRUE, TRUE, 0);
-
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (notebook1), vbox2);
-
- frame1 = gtk_frame_new (NULL);
- gtk_box_pack_start (GTK_BOX (vbox2), frame1, TRUE, TRUE, 0);
-
- alignment1 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_container_add (GTK_CONTAINER (frame1), alignment1);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment1), 0, 0, 12, 0);
-
- vbox3 = gtk_vbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (alignment1), vbox3);
-
- reconnectcheck = gtk_check_button_new_with_mnemonic (_("Reconnect to LIRC server"));
- gtk_box_pack_start (GTK_BOX (vbox3), reconnectcheck, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (reconnectcheck), (gboolean)b_enable_reconnect);
-
- hbox1 = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox3), hbox1, TRUE, TRUE, 0);
-
- label3 = gtk_label_new (_("Timeout before reconnecting (seconds): "));
- gtk_box_pack_start (GTK_BOX (hbox1), label3, FALSE, FALSE, 17);
-
- reconnectspin_adj = gtk_adjustment_new (reconnect_timeout, 1, 100, 1, 10, 10);
- reconnectspin = gtk_spin_button_new (GTK_ADJUSTMENT (reconnectspin_adj), 1, 0);
- gtk_box_pack_start (GTK_BOX (hbox1), reconnectspin, TRUE, TRUE, 15);
-
- label2 = gtk_label_new (_("Reconnect"));
- gtk_frame_set_label_widget (GTK_FRAME (frame1), label2);
- gtk_label_set_use_markup (GTK_LABEL (label2), TRUE);
-
- label1 = gtk_label_new (_("Connection"));
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 0), label1);
-
- dialog_action_area1 = GTK_DIALOG (lirc_cfg)->action_area;
- gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-
- cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel");
- gtk_dialog_add_action_widget (GTK_DIALOG (lirc_cfg), cancelbutton1, GTK_RESPONSE_CANCEL);
- GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_DEFAULT);
-
- okbutton1 = gtk_button_new_from_stock ("gtk-ok");
- gtk_dialog_add_action_widget (GTK_DIALOG (lirc_cfg), okbutton1, GTK_RESPONSE_OK);
- GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT);
-
- g_signal_connect (G_OBJECT (reconnectcheck), "toggled",
- G_CALLBACK (on_reconnectcheck_toggled),
- G_OBJECT (reconnectspin));
- g_signal_connect (G_OBJECT (cancelbutton1), "clicked",
- G_CALLBACK (on_cancelbutton1_clicked),
- NULL);
- g_signal_connect (G_OBJECT (okbutton1), "clicked",
- G_CALLBACK (on_okbutton1_clicked),
- NULL);
- gtk_widget_set_sensitive(reconnectspin, (gboolean)b_enable_reconnect);
-
- g_object_set_data(G_OBJECT(lirc_cfg), "reconnectcheck", G_OBJECT(reconnectcheck));
- g_object_set_data(G_OBJECT(lirc_cfg), "reconnectspin", G_OBJECT(reconnectspin));
-
- return lirc_cfg;
-}
-

audacious-plugins-2.5.3.tar.gz/src/lirc/lirc.c Deleted

@@ -1,368 +0,0 @@
-/* Lirc plugin
-
- Copyright (C) 2005 Audacious development team
-
- Copyright (c) 1998-1999 Carl van Schaik (carl@leg.uct.ac.za)
-
- Copyright (C) 2000 Christoph Bartelmus (xmms@bartelmus.de)
-
- some code was stolen from:
- IRman plugin for xmms by Charles Sielski (stray@teklabs.net)
-
- 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "config.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <lirc/lirc_client.h>
-
-#include <audacious/drct.h>
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
-#include <libaudcore/hook.h>
-
-#include "lirc.h"
-
-#include "common.h"
-
-const char *plugin_name="LIRC Plugin";
-
-GeneralPlugin lirc_plugin = {
- .description = "LIRC Plugin",
- .init = init,
- .about = about,
- .configure = configure,
- .cleanup = cleanup
-};
-
-GeneralPlugin *lirc_gplist[] = { &lirc_plugin, NULL };
-DECLARE_PLUGIN(lirc, NULL, NULL, NULL, NULL, NULL, lirc_gplist, NULL, NULL);
-
-int lirc_fd=-1;
-struct lirc_config *config=NULL;
-gint tracknr=0;
-gint mute=0; /* mute flag */
-gint mute_vol=0; /* holds volume before mute */
-
-gint input_tag;
-
-char track_no[64];
-int track_no_pos;
-
-gint tid;
-
-void init_lirc(void)
-{
-	int flags;
-
-	if((lirc_fd=lirc_init("audacious",1))==-1)
-	{
-		fprintf(stderr,_("%s: could not init LIRC support\n"),
-			plugin_name);
-		return;
-	}
-	if(lirc_readconfig(NULL,&config,NULL)==-1)
-	{
-		lirc_deinit();
-		fprintf(stderr,
-			_("%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"),
-			plugin_name,plugin_name,plugin_name);
-		return;
-	}
-	input_tag=gdk_input_add(lirc_fd,GDK_INPUT_READ,
-				lirc_input_callback,NULL);
-	fcntl(lirc_fd,F_SETOWN,getpid());
-	flags=fcntl(lirc_fd,F_GETFL,0);
-	if(flags!=-1)
-	{
-		fcntl(lirc_fd,F_SETFL,flags|O_NONBLOCK);
-	}
-	fflush(stdout);
-}
-
-gboolean init (void)
-{
-	load_cfg();
-	init_lirc();
-	track_no_pos=0;
-	tid=0;
-	return TRUE;
-}
-
-gboolean reconnect_lirc(gpointer data)
-{
-	fprintf(stderr,_("%s: trying to reconnect...\n"),plugin_name);
-	init();
-	return (lirc_fd==-1);
-}
-
-gboolean jump_to(gpointer data)
-{
-	aud_drct_pl_set_pos(atoi(track_no)-1);
-	track_no_pos=0;
-	tid=0;
-	return FALSE;
-}
-
-void lirc_input_callback(gpointer data,gint source,
-			 GdkInputCondition condition)
-{
-	char *code;
-	char *c;
-	gint playlist_time,playlist_pos,output_time,v;
-	int ret;
-	char *ptr;
-	gint balance;
-#if 0
-	gboolean show_pl;
-#endif
-	int n;
-	gchar *utf8_title_markup;
-
-	while((ret=lirc_nextcode(&code))==0 && code!=NULL)
-	{
-		while((ret=lirc_code2char(config,code,&c))==0 && c!=NULL)
-		{
-			if(strcasecmp("PLAY",c)==0)
-			{
-				aud_drct_play();
-			}
-			else if(strcasecmp("STOP",c)==0)
-			{
-				aud_drct_stop();
-			}
-			else if(strcasecmp("PAUSE",c)==0)
-			{
-				aud_drct_pause();
-			}
-			else if(strcasecmp("PLAYPAUSE",c) == 0)
-			{
-				if(aud_drct_get_playing())
-					aud_drct_pause();
-				else
-					aud_drct_play();
-			}
-			else if(strncasecmp("NEXT",c,4)==0)
-			{
- ptr=c+4;
- while(isspace(*ptr)) ptr++;
-				n=atoi(ptr);
-
-				if(n<=0) n=1;
-				for(;n>0;n--)
-				{
-					aud_drct_pl_next();
-				}
-			}
-			else if(strncasecmp("PREV",c,4)==0)
-			{
- ptr=c+4;
- while(isspace(*ptr)) ptr++;
-				n=atoi(ptr);
-
-				if(n<=0) n=1;
-				for(;n>0;n--)
-				{
-					aud_drct_pl_prev();
-				}
-			}
-			else if(strcasecmp("SHUFFLE",c)==0)
-			{
-				aud_drct_pl_shuffle_toggle();
-			}
-			else if(strcasecmp("REPEAT",c)==0)
-			{
-				aud_drct_pl_repeat_toggle();
-			}
-			else if(strncasecmp("FWD",c,3)==0)
-			{
- ptr=c+3;
- while(isspace(*ptr)) ptr++;
-				n=atoi(ptr)*1000;
-
-				if(n<=0) n=5000;
-				output_time=aud_drct_get_time();
-				playlist_pos=aud_drct_pl_get_pos();
-				playlist_time=aud_drct_pl_get_time(playlist_pos);
-				if(playlist_time-output_time<n)
-					output_time=playlist_time-n;
-				aud_drct_seek(output_time+n);
-			}
-			else if(strncasecmp("BWD",c,3)==0)
-			{
- ptr=c+3;
- while(isspace(*ptr)) ptr++;
-				n=atoi(ptr)*1000;
-
-				if(n<=0) n=5000;
-				output_time=aud_drct_get_time();
-				if(output_time<n)
-					output_time=n;
-				aud_drct_seek(output_time-n);
-			}
-			else if(strncasecmp("VOL_UP",c,6)==0)
-			{
- ptr=c+6;
- while(isspace(*ptr)) ptr++;
-				n=atoi(ptr);
- if(n<=0) n=5;
-
-				aud_drct_get_volume_main(&v);
-				if(v > (100-n)) v=100-n;
-				aud_drct_set_volume_main(v+n);
-			}
-			else if(strncasecmp("VOL_DOWN",c,8)==0)
-			{
- ptr=c+8;
- while (isspace(*ptr)) ptr++;
-				n=atoi(ptr);
- if(n<=0) n=5;
-
-				aud_drct_get_volume_main(&v);
-				if(v<n) v=n;
-				aud_drct_set_volume_main(v-n);
-			}
-			else if(strcasecmp("QUIT",c)==0)
-			{
-				aud_drct_quit();
-			}
-			else if(strcasecmp("MUTE",c)==0)
- 			{
-				if(mute==0)
- 				{
- 					mute=1;
- 					/* store the master volume so
- we can restore it on unmute. */
-					aud_drct_get_volume_main(&mute_vol);
- 					aud_drct_set_volume_main(0);
- 				}
- 				else
- 				{
- 					mute=0;
- 					aud_drct_set_volume_main(mute_vol);
- 				}
-			}
-			else if(strncasecmp("BAL_LEFT",c,8)==0)
-			{
- ptr=c+8;
- while(isspace(*ptr)) ptr++;
-				n=atoi(ptr);
-				if(n<=0) n=5;
-
-				aud_drct_get_volume_balance(&balance);
-				balance-=n;
-				if(balance<-100) balance=-100;
-				aud_drct_set_volume_balance(balance);
-			}
-			else if(strncasecmp("BAL_RIGHT",c,9)==0)
-			{
- ptr=c+9;
- while(isspace(*ptr)) ptr++;
-				n=atoi(ptr);
-				if(n<=0) n=5;
-
-				aud_drct_get_volume_balance(&balance);
-				balance+=n;
-				if(balance>100) balance=100;
-				aud_drct_set_volume_balance(balance);
-			}
-			else if(strcasecmp("BAL_CENTER",c)==0)
-			{
-				balance=0;
-				aud_drct_set_volume_balance(balance);
-			}
-			else if(strcasecmp("LIST",c)==0)
-			{
-#if 0
-				show_pl=aud_drct_pl_win_is_visible();
-				show_pl=(show_pl) ? 0:1;
-				aud_drct_pl_win_toggle(show_pl);
-#endif
- 			}
-			else if(strcasecmp("PLAYLIST_CLEAR",c)==0)
-			{
-				aud_drct_stop();
-				aud_drct_pl_clear();
-			}
-			else if(strncasecmp("PLAYLIST_ADD ",c,13)==0)
-			{
-				GList list;
-				list.prev=list.next=NULL;
-				list.data=c+13;
-				aud_drct_pl_add_list (& list, -1);
-			}
-			else if((strlen(c)==1) && ((*c>='0') || (*c<='9')))
-			{
-				if (track_no_pos<63)
-				{
-					if (tid) g_source_remove(tid);
-					track_no[track_no_pos++]=*c;
-					track_no[track_no_pos]=0;
-					tid=g_timeout_add(1500, jump_to, NULL);
-					utf8_title_markup = g_markup_printf_escaped(
-					 "%s", aosd_font, track_no);
-					hook_call("aosd toggle", utf8_title_markup);
-				}
-			}
-			else
-			{
-				fprintf(stderr,_("%s: unknown command \"%s\"\n"),
-					plugin_name,c);
-			}
-		}
-		free(code);
-		if(ret==-1) break;
-	}
-	if(ret==-1)
-	{
-		/* something went badly wrong */
-		fprintf(stderr,_("%s: disconnected from LIRC\n"),plugin_name);
-		cleanup();
-		if(b_enable_reconnect)
-		{
-			fprintf(stderr,_("%s: will try reconnect every %d seconds...\n"),plugin_name,reconnect_timeout);
-			g_timeout_add(1000*reconnect_timeout, reconnect_lirc, NULL);
-		}
-	}
-}
-
-void cleanup()
-{
-	if(config)
-	{
-		if(input_tag)
-			gtk_input_remove(input_tag);
-
-		config=NULL;
-	}
-	if(lirc_fd!=-1)
-	{
-		lirc_deinit();
-		lirc_fd=-1;
-	}
-	g_free(aosd_font);
-}

audacious-plugins-2.5.3.tar.gz/src/lirc/lirc.h Deleted

@@ -1,34 +0,0 @@
-/* Lirc Plugin
-
- Copyright (C) 2005 Audacious development team
-
- Copyright (c) 1998-1999 Carl van Schaik (carl@leg.uct.ac.za)
-
- Copyright (C) 2000 Christoph Bartelmus (xmms@bartelmus.de)
-
- some code was stolen from:
- IRman plugin for xmms by Charles Sielski (stray@teklabs.net)
-
- 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <gtk/gtk.h>
-
-gboolean init (void);
-void cleanup(void);
-void about(void);
-
-void lirc_input_callback(gpointer data,gint source,
-			 GdkInputCondition condition);

audacious-plugins-2.5.3.tar.gz/src/lirc/lirc_cfg.c Deleted

@@ -1,51 +0,0 @@
-#include <config.h>
-
-#include <gtk/gtk.h>
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
-#include <audacious/configdb.h>
-
-#include "common.h"
-
-GtkWidget *lirc_cfg = NULL;
-
-gint b_enable_reconnect;
-gint reconnect_timeout;
-gchar *aosd_font = NULL;
-
-void load_cfg(void)
-{
- mcs_handle_t *db;
- db = aud_cfg_db_open();
- aud_cfg_db_get_int(db, "lirc", "enable_reconnect", &b_enable_reconnect);
- aud_cfg_db_get_int(db, "lirc", "reconnect_timeout", &reconnect_timeout);
- if (!aud_cfg_db_get_string(db, "aosd", "text_fonts_name_0", &aosd_font))
- aosd_font = g_strdup("Sans 26");
- if (!reconnect_timeout)
- {
- reconnect_timeout = 5;
- b_enable_reconnect = 1;
- }
- aud_cfg_db_close(db);
-}
-
-void save_cfg(void)
-{
- mcs_handle_t *db;
- db = aud_cfg_db_open();
- aud_cfg_db_set_int(db, "lirc", "enable_reconnect", b_enable_reconnect);
- aud_cfg_db_set_int(db, "lirc", "reconnect_timeout", reconnect_timeout);
- aud_cfg_db_close(db);
-}
-
-void configure(void)
-{
- if (lirc_cfg)
- {
- gtk_window_present(GTK_WINDOW(lirc_cfg));
- return;
- }
- load_cfg();
- lirc_cfg = create_lirc_cfg();
- gtk_widget_show_all(lirc_cfg);
-}

audacious-plugins-2.5.3.tar.gz/src/lirc/lirc_image.h Deleted

@@ -1,96 +0,0 @@
-/* XPM */
-static char *lirc_image[] = {
-/* width height num_colors chars_per_pixel */
-"   288    63       26            1",
-/* colors */
-". c #000080",
-"# c #080880",
-"a c #101088",
-"b c #181888",
-"c c #202090",
-"d c #282890",
-"e c #282c98",
-"f c #303098",
-"g c #383898",
-"h c #383ca0",
-"i c #4848a0",
-"j c #5050a8",
-"k c #6060b0",
-"l c #686cb8",
-"m c #7070b8",
-"n c #7878b8",
-"o c #9898c8",
-"p c #a0a4d0",
-"q c #b0b4d8",
-"r c #c8cce0",
-"s c #d0d4e8",
-"t c #d8d8e8",
-"u c #e0e0f0",
-"v c #e8ecf0",
-"w c #f0f4f8",
-"x c #f8fcf8",
-/* pixels */
-"................................................................................................................................................................................................................................................................................................",
-"................................................................................................................................................................................................................................................................................................",
-"................................................................................................................................................................................................................................................................................................",
-"................................................................................................................................................................................................................................................................................................",
-"................................................................................................................................................................................................................................................................................................",
-"..............................................ff....................................afb.........................................................................................................................................................................................................",
-"..............................................xxh...................................lxo.........................................................................................................................................................................................................",
-"..............................................xxxs#.................................lxo.........................................................................................................................................................................................................",
-"..............................................xxxxxh................................lxo.............................................................................................................................................................................bmnrrrpng...................",
-"..............................................xxxxxxu#..............................lxo...................................................................xxxxxxxxx....................xxxxxxxxxxxxxxxxxxxxx.......xxxxxxxxxxxxxxxxxxxrnb........................nxxxxxxxxxxxxxxm...............",
-"..............................................xxxxxxxxl.............................lxo...................................................................xxxxxxxxx....................xxxxxxxxxxxxxxxxxxxxx.......xxxxxxxxxxxxxxxxxxxxxxxp....................txxxxxxxxxxxxxxxxxxvb............",
-"..............................................xxxxxxxxxua...........................lxo...................................................................xxxxxxxxx....................xxxxxxxxxxxxxxxxxxxxx.......xxxxxxxxxxxxxxxxxxxxxxxxxi................pxxxxxxxxxxxxxxxxxxxxxxx...........",
-"..............................................xxxxxxxxxxxl..........................lxo...................................................................xxxxxxxxx....................xxxxxxxxxxxxxxxxxxxxx.......xxxxxxxxxxxxxxxxxxxxxxxxxxp..............vxxxxxxxxxxxxxxxxxxxxxxxx...........",
-"..............................................xxxxxxxxxxxxvb........................lxo...................................................................xxxxxxxxx....................xxxxxxxxxxxxxxxxxxxxx.......xxxxxxxxxxxxxxxxxxxxxxxxxxxg............xxxxxxxxxxxxxxxxxxxxxxxxxx...........",
-"..............................................xxxxxxxxxxxxxxo.......................lxo...................................................................xxxxxxxxx....................xxxxxxxxxxxxxxxxxxxxx.......xxxxxxxxxxxxxxxxxxxxxxxxxxxx...........vxxxxxxxxxxxxxxxxxxxxxxxxxx...........",
-"..............................................xxxxxxxxxxxxxxxvc.....................lxo...................................................................xxxxxxxxx....................nnnnnnxxxxxxxxxnnnnnn.......xxxxxxxxxnnnnnnrxxxxxxxxxxxxi.........kxxxxxxxxxxxxpg....mxxxxxxxx...........",
-"..............................................xxxxxxxxxxxxxxxxxo....................lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx.........xxxxxxxxxxr.........xxxxxxxxxxxn.........bvxxxxx...........",
-"..............................................xxxxxxxxxxxxxxxxxxwd..................lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx..........xxxxxxxxxx........rxxxxxxxxxxb............exxxx...........",
-"..............................................xxxxxxxxxxxxxxxxxwxxq.................lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx..........rxxxxxxxxx........xxxxxxxxxxb...............vxx...........",
-"..............................................xxxxxxxxxxxxxxxxxxxxxwh...............lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx..........nxxxxxxxxx.......ixxxxxxxxxp.................px...........",
-"..............................................xxxxxxxxxxxxxxxxxxxxwxxq..............lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx..........nxxxxxxxxx.......vxxxxxxxxx...............................",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxh............lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx..........txxxxxxxxr.......xxxxxxxxxr...............................",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxq...........lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx..........xxxxxxxxxe.......xxxxxxxxxe...............................",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxh.........lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx.........xxxxxxxxxx.......bxxxxxxxxx................................",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxxs#.......lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx......grxxxxxxxxxxk.......gxxxxxxxxx................................",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxl......lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxxxxxxxxxxxxxxxxxxxt........nxxxxxxxxx................................",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxu#....lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxxxxxxxxxxxxxxxxxxv.........nxxxxxxxxx................................",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxl...lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxxxxxxxxxxxxxxxxxp..........nxxxxxxxxx................................",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxua.lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxxxxxxxxxxxxxxxxb...........kxxxxxxxxx................................",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxllxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxxxxxxxxxxxxxxxe............gxxxxxxxxx................................",
-"...looooooooooooooooooooooooooooooooooooooooooxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxwxsoooooooooooooooooooooooooooooooooooooooooooooooooooooooob..........xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxxxxxxxxxxxxxxxx.............xxxxxxxxxb...............................",
-"...sxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxf..........xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx....vxxxxxxxxxx............xxxxxxxxxp...............................",
-"...looooooooooooooooooooooooooooooooooooooooooxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsxsoooooooooooooooooooooooooooooooooooooooooooooooooooooooob..........xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx.....xxxxxxxxxxr...........xxxxxxxxxx...............................",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxs#lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx.....bxxxxxxxxxxj..........nxxxxxxxxxn.................er...........",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxh..lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx......nxxxxxxxxxxb..........xxxxxxxxxx................pxx...........",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxq#...lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx.......vxxxxxxxxxx..........vxxxxxxxxxx..............vxxx...........",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxh.....lxo...................................................................xxxxxxxxx..........................xxxxxxxxx.............xxxxxxxxx........xxxxxxxxxxv.........bxxxxxxxxxxxg..........nxxxxx...........",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxq.......lxo...................................................................xxxxxxxxxxxxxxxxxxxxxxxxxg...ggggggxxxxxxxxxgggggg.......xxxxxxxxx........bxxxxxxxxxxp.........txxxxxxxxxxxxn.....erxxxxxxx...........",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxxxh........lxo...................................................................xxxxxxxxxxxxxxxxxxxxxxxxxg...xxxxxxxxxxxxxxxxxxxxx.......xxxxxxxxx.........pxxxxxxxxxxe.........xxxxxxxxxxxxxxxxxxxxxxxxxxx...........",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxxq..........lxo...................................................................xxxxxxxxxxxxxxxxxxxxxxxxxg...xxxxxxxxxxxxxxxxxxxxx.......xxxxxxxxx..........vxxxxxxxxxx.........bxxxxxxxxxxxxxxxxxxxxxxxxxx...........",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxxxh...........lxo...................................................................xxxxxxxxxxxxxxxxxxxxxxxxxg...xxxxxxxxxxxxxxxxxxxxx.......xxxxxxxxx...........xxxxxxxxxxx.........bxxxxxxxxxxxxxxxxxxxxxxxxx...........",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxxq.............lxo...................................................................xxxxxxxxxxxxxxxxxxxxxxxxxg...xxxxxxxxxxxxxxxxxxxxx.......xxxxxxxxx...........exxxxxxxxxxr..........vxxxxxxxxxxxxxxxxxxxxxxx...........",
-"..............................................xxxxxxxxxxxxxxxxxxxxxxxh..............lxo...................................................................xxxxxxxxxxxxxxxxxxxxxxxxxg...xxxxxxxxxxxxxxxxxxxxx.......xxxxxxxxx............pxxxxxxxxxxj..........ixxxxxxxxxxxxxxxxxxxvb............",
-"..............................................xxxxxxxxxxxxxxxxxxxxxq................lxo...................................................................xxxxxxxxxxxxxxxxxxxxxxxxxg...xxxxxxxxxxxxxxxxxxxxx.......xxxxxxxxx.............xxxxxxxxxxxb...........evxxxxxxxxxxxxxxn...............",
-"..............................................xxxxxxxxxxxxxxxxxxxxh.................lxo.............................................................................................................................................................................kprxxxvrnb..................",
-"..............................................xxxxxxxxxxxxxxxxxxq...................lxo.........................................................................................................................................................................................................",
-"..............................................xxxxxxxxxxxxxxxxxh....................lxo.........................................................................................................................................................................................................",
-"..............................................xxxxxxxxxxxxwxxq......................lxo.........................................................................................................................................................................................................",
-"..............................................xxxxxxxxxxxxxwd.......................lxo.........................................................................................................................................................................................................",
-"..............................................xxxxxxxxxwxxq.........................lxo.........................................................................................................................................................................................................",
-"..............................................xxxxxxxxxxwd..........................lxo.........................................................................................................................................................................................................",
-"..............................................xxxxxxwxxq............................lxo.........................................................................................................................................................................................................",
-"..............................................xxxxxxxwd.............................lxo............................................................nx...nx....................gxxx.......txx......................xn...gxxxx.....................xr..........gxxxp............xg...........xg...",
-"..............................................xxxwxxo...............................lxo............................................................nx...gn.nknr..nb.ngkn.bn#...gx..nknr.gxrkknbkeprm..n.n.brp...ppxn...gx..xn.brp..ngpn.pm..grn.bxtn.brp.....xp..p.grn..ngpp.kxpngnbn.krn..xg...",
-"..............................................xxxxwc................................lxo............................................................nx...nx.xxnxt.xg.xn.xpxp....gx..xxnxtgxrkrxrpkiixm.xtr.xipx.xvgxn...gx.gxb.xipx.xvnxtpx.gxivxbxtn.xipx...gx....gxivx.xvnxpkxpnnxrrnxgxv.xg...",
-"..............................................wxxo..................................lvo............................................................nx...nx.xr.rx.xg.xn.bxv.....gx..xr.rx.xn.rx..exxxn.x..nxxxx.xg.xn...gxxxk.nxxxx.xn.xg.x.rx.gx.xr.nxxxx...gx....rx.gx.xn.xr.xg.nx..xx.nx.xg...",
-"...............................................vc..................................................................................................nx...nx.xr.rx.xn.xn.rxxe....gx..xr.rx.xn.rx..xn.xn.x..ix..b.xp.xn...gx.rxbix..b.xn.xg.x.nx.nx.xr.ix..b....xr.brnx.nx.xn.xr.xg.nx..rx.rx.xg...",
-"...................................................................................................................................................nxxxxnx.xr.rx.rxvxnjx.nx...gxxx.xr.rx.xn.rx..pxxxn.x...rxxx.pxxxn...gx..xx.rxxx.xn.xg.x..vxxi.nxx.rxxx....bxxxn.vxxi.xn.xr.vxxnx...xxxe.xg...",
-"................................................................................................................................................................................................................................................................................................",
-"................................................................................................................................................................................................................................................................................................",
-"................................................................................................................................................................................................................................................................................................",
-"................................................................................................................................................................................................................................................................................................",
-"................................................................................................................................................................................................................................................................................................"
-};

audacious-plugins-2.5.3.tar.gz/src/lirc/lirc_mini.xpm Deleted

@@ -1,69 +0,0 @@
-/* XPM */
-static char * lirc_mini_xpm[] = {
-"16 16 50 1",
-" 	c None",
-".	c #000080",
-"+	c #4748A2",
-"@	c #7072B7",
-"#	c #060683",
-"$	c #4648A3",
-"%	c #303096",
-"&	c #5E5FAD",
-"*	c #F8FCF8",
-"=	c #C1C4DE",
-"-	c #34359A",
-";	c #5D5FAF",
-">	c #F0F4F4",
-",	c #8588C1",
-"'	c #0C0C86",
-")	c #D5D8E7",
-"!	c #020281",
-"~	c #F5F9F7",
-"{	c #9DA0CD",
-"]	c #19198C",
-"^	c #E0E4ED",
-"/	c #5B5DAD",
-"(	c #010180",
-"_	c #F7FBF8",
-":	c #B7BAD9",
-"<	c #252592",
-"[	c #9293C6",
-"}	c #ECF0F3",
-"|	c #B7BADA",
-"1	c #DCE0EB",
-"2	c #A9ACD3",
-"3	c #F4F8F6",
-"4	c #9598C9",
-"5	c #141489",
-"6	c #D1D4E6",
-"7	c #4143A0",
-"8	c #F1F5F5",
-"9	c #8689C2",
-"0	c #0F0F87",
-"a	c #CACDE2",
-"b	c #35379A",
-"c	c #EDF0F3",
-"d	c #7678BA",
-"e	c #030381",
-"f	c #B7B9D9",
-"g	c #2A2B94",
-"h	c #292A94",
-"i	c #6365B0",
-"j	c #050582",
-"k	c #242592",
-".+@#.........$%.",
-".&*=-........;*.",
-".&**>,'......;*.",
-".&****)+!....;*.",
-".&*****~{]...;*.",
-".&*******^/(.;*.",
-".&********_:<;*.",
-"[[**********}|*[",
-"[[**********12*[",
-".&********345;*.",
-".&*******67..;*.",
-".&*****890...;*.",
-".&***_ab(....;*.",
-".&**cde......;*.",
-".&_fg........;*.",
-".hij.........k]."};

audacious-plugins-2.5.3.tar.gz/src/modplug/gui Deleted

audacious-plugins-2.5.3.tar.gz/src/modplug/gui/callbacks.cxx Deleted

@@ -1,162 +0,0 @@
-#include <config.h>
-
-#include <gtk/gtk.h>
-#include <iostream>
-
-#include "callbacks.h"
-#include "interface.h"
-#include "support.h"
-
-#include "../modplugbmp.h"
-
-
-gboolean
-hide_window (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data)
-{
-	gtk_widget_hide(widget);
-	return TRUE;
-}
-
-
-void
-on_config_apply_clicked (GtkButton *button,
- gpointer user_data)
-{
-	ModplugXMMS::Settings lProps;
-	
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "bit8")))
-		lProps.mBits = 8;
-	else
-		lProps.mBits = 16;
-	
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "samp22")))
-		lProps.mFrequency = 22050;
-	else if (gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "samp44")))
-		lProps.mFrequency = 44100;
-	else if (gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "samp96")))
-		lProps.mFrequency = 96000;
-	else
-		lProps.mFrequency = 48000;
-	
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "resampNearest")))
-		lProps.mResamplingMode = 0;
-	else if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "resampLinear")))
-		lProps.mResamplingMode = 1;
-	else if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "resampSpline")))
-		lProps.mResamplingMode = 2;
-	else
-		lProps.mResamplingMode = 3;
-	
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "mono")))
-		lProps.mChannels = 1;
-	else
-		lProps.mChannels = 2;
-	
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "fxNR")))
-		lProps.mNoiseReduction = true;
-	else
-		lProps.mNoiseReduction = false;
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "fxAmigaMOD")))
-		lProps.mGrabAmigaMOD = true;
-	else
-		lProps.mGrabAmigaMOD = false;
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "fxFastInfo")))
-		lProps.mFastinfo = true;
-	else
-		lProps.mFastinfo = false;
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "fxUseFilename")))
-		lProps.mUseFilename = true;
-	else
-		lProps.mUseFilename = false;
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "fxReverb")))
-		lProps.mReverb = true;
-	else
-		lProps.mReverb = false;
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "fxBassBoost")))
-		lProps.mMegabass = true;
-	else
-		lProps.mMegabass = false;
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "fxSurround")))
-		lProps.mSurround = true;
-	else
-		lProps.mSurround = false;
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "fxPreamp")))
-		lProps.mPreamp = true;
-	else
-		lProps.mPreamp = false;
-	
-	if(gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "fxLoopForever")))
-		lProps.mLoopCount = -1;
-	else if (gtk_toggle_button_get_active((GtkToggleButton*)lookup_widget((GtkWidget*)button, "fxLoopFinite")))
-	{
-		lProps.mLoopCount =
-			(uint32)gtk_spin_button_get_adjustment(
-			(GtkSpinButton*)lookup_widget((GtkWidget*)button, "fxLoopCount"))->value;
-	}
-	else
-		lProps.mLoopCount = 0;
-	
-	//hmm... GTK objects have un-protected data members? That's not good...
-	lProps.mReverbDepth =
-		(uint32)gtk_range_get_adjustment((GtkRange*)lookup_widget((GtkWidget*)button, "fxReverbDepth"))->value;
-	lProps.mReverbDelay =
-		(uint32)gtk_range_get_adjustment((GtkRange*)lookup_widget((GtkWidget*)button, "fxReverbDelay"))->value;
-	lProps.mBassAmount =
-		(uint32)gtk_range_get_adjustment((GtkRange*)lookup_widget((GtkWidget*)button, "fxBassAmount"))->value;
-	lProps.mBassRange =
-		(uint32)gtk_range_get_adjustment((GtkRange*)lookup_widget((GtkWidget*)button, "fxBassRange"))->value;
-	lProps.mSurroundDepth =
-		(uint32)gtk_range_get_adjustment((GtkRange*)lookup_widget((GtkWidget*)button, "fxSurroundDepth"))->value;
-	lProps.mSurroundDelay =
-		(uint32)gtk_range_get_adjustment((GtkRange*)lookup_widget((GtkWidget*)button, "fxSurroundDelay"))->value;
-	lProps.mPreampLevel =
-		(float)gtk_range_get_adjustment((GtkRange*)lookup_widget((GtkWidget*)button, "fxPreampLevel"))->value;
-	
-	gModplugXMMS.SetModProps(lProps);
-}
-
-
-void
-on_config_ok_clicked (GtkButton *button,
- gpointer user_data)
-{
-	GtkWidget* lConfigWindow;
-	
-	on_config_apply_clicked(button, user_data);
-	
-	lConfigWindow = lookup_widget((GtkWidget*)button, "Config");
-	if(!lConfigWindow)
-		cerr << "ModPlug: on_config_ok_clicked: Could not find config window!" << endl;
-	else
-		gtk_widget_hide(lConfigWindow);
-}
-
-
-void
-on_config_cancel_clicked (GtkButton *button,
- gpointer user_data)
-{
-	GtkWidget* lConfigWindow;
-	
-	lConfigWindow = lookup_widget((GtkWidget*)button, "Config");
-	if(!lConfigWindow)
-		cerr << "ModPlug: on_config_ok_clicked: Could not find config window!" << endl;
-	else
-		gtk_widget_hide(lConfigWindow);
-}
-
-
-void
-on_info_close_clicked (GtkButton *button,
- gpointer user_data)
-{
-	GtkWidget* lInfoWindow;
-	
-	lInfoWindow = lookup_widget((GtkWidget*)button, "Info");
-	if(!lInfoWindow)
-		cerr << "ModPlug: on_info_close_clicked: Could not find info window!" << endl;
-	else
-		gtk_widget_hide(lInfoWindow);
-}

audacious-plugins-2.5.3.tar.gz/src/modplug/gui/callbacks.h Deleted

audacious-plugins-2.5.3.tar.gz/src/modplug/gui/interface.cxx Deleted

@@ -1,1009 +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 "callbacks.h"
-#include "interface.h"
-#include "support.h"
-
-#define GLADE_HOOKUP_OBJECT(component,widget,name) \
- g_object_set_data_full (G_OBJECT (component), name, \
- g_object_ref (widget), (GDestroyNotify) g_object_unref)
-
-#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
- g_object_set_data (G_OBJECT (component), name, widget)
-
-GtkWidget*
-create_Config (void)
-{
- GtkWidget *Config;
- GtkWidget *vbox2;
- GtkWidget *notebook1;
- GtkWidget *vbox3;
- GtkWidget *hbox2;
- GtkWidget *frame1;
- GtkWidget *vbox4;
- GtkWidget *bit16;
- GSList *bit16_group = NULL;
- GtkWidget *bit8;
- GtkWidget *xlabel2;
- GtkWidget *frame2;
- GtkWidget *vbox5;
- GtkWidget *stereo;
- GSList *stereo_group = NULL;
- GtkWidget *mono;
- GtkWidget *label3;
- GtkWidget *hbox14;
- GtkWidget *frame9;
- GtkWidget *vbox15;
- GtkWidget *resampNearest;
- GSList *resampNearest_group = NULL;
- GtkWidget *resampLinear;
- GtkWidget *resampSpline;
- GtkWidget *resampPolyphase;
- GtkWidget *label4;
- GtkWidget *frame3;
- GtkWidget *vbox6;
- GtkWidget *samp96;
- GSList *samp96_group = NULL;
- GtkWidget *samp48;
- GtkWidget *samp44;
- GtkWidget *samp22;
- GtkWidget *label5;
- GtkWidget *label2;
- GtkWidget *vbox7;
- GtkWidget *hbox15;
- GtkWidget *frame5;
- GtkWidget *vbox20;
- GtkWidget *fxReverb;
- GtkWidget *table1;
- GtkWidget *fxReverbDepth;
- GtkWidget *fxReverbDelay;
- GtkWidget *xlabel3;
- GtkWidget *xlabel4;
- GtkWidget *label6;
- GtkWidget *frame6;
- GtkWidget *vbox21;
- GtkWidget *fxBassBoost;
- GtkWidget *table2;
- GtkWidget *fxBassAmount;
- GtkWidget *fxBassRange;
- GtkWidget *xlabel5;
- GtkWidget *xlabel6;
- GtkWidget *label7;
- GtkWidget *hbox16;
- GtkWidget *frame7;
- GtkWidget *vbox22;
- GtkWidget *fxSurround;
- GtkWidget *table3;
- GtkWidget *fxSurroundDepth;
- GtkWidget *fxSurroundDelay;
- GtkWidget *xlabel7;
- GtkWidget *label8;
- GtkWidget *xlabel8;
- GtkWidget *frame10;
- GtkWidget *vbox16;
- GtkWidget *fxPreamp;
- GtkWidget *hbox11;
- GtkWidget *label19;
- GtkWidget *fxPreampLevel;
- GtkWidget *label20;
- GtkWidget *label9;
- GtkWidget *label10;
- GtkWidget *vbox19;
- GtkWidget *frame4;
- GtkWidget *hbox3;
- GtkWidget *vbox8;
- GtkWidget *fxUseFilename;
- GtkWidget *fxFastInfo;
- GtkWidget *vbox9;
- GtkWidget *fxNR;
- GtkWidget *fxAmigaMOD;
- GtkWidget *label21;
- GtkWidget *frame11;
- GtkWidget *vbox17;
- GtkWidget *fxNoLoop;
- GSList *fxNoLoop_group = NULL;
- GtkWidget *hbox13;
- GtkWidget *fxLoopFinite;
- GtkObject *fxLoopCount_adj;
- GtkWidget *fxLoopCount;
- GtkWidget *xlabel21;
- GtkWidget *fxLoopForever;
- GtkWidget *label22;
- GtkWidget *xlabel22;
- GtkWidget *hbuttonbox2;
- GtkWidget *config_ok;
- GtkWidget *config_apply;
- GtkWidget *config_cancel;
-
- Config = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_type_hint(GTK_WINDOW(Config), GDK_WINDOW_TYPE_HINT_DIALOG);
- gtk_widget_set_name (Config, "Config");
- gtk_widget_set_size_request (Config, 500, -1);
- gtk_window_set_title (GTK_WINDOW (Config), _("ModPlug Configuration"));
- gtk_window_set_resizable (GTK_WINDOW (Config), FALSE);
-
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox2, "vbox2");
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (Config), vbox2);
-
- notebook1 = gtk_notebook_new ();
- gtk_widget_set_name (notebook1, "notebook1");
- gtk_widget_show (notebook1);
- gtk_box_pack_start (GTK_BOX (vbox2), notebook1, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (notebook1), 4);
-
- vbox3 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox3, "vbox3");
- gtk_widget_show (vbox3);
- gtk_container_add (GTK_CONTAINER (notebook1), vbox3);
- gtk_container_set_border_width (GTK_CONTAINER (vbox3), 2);
-
- hbox2 = gtk_hbox_new (FALSE, 2);
- gtk_widget_set_name (hbox2, "hbox2");
- gtk_widget_show (hbox2);
- gtk_box_pack_start (GTK_BOX (vbox3), hbox2, FALSE, TRUE, 0);
-
- frame1 = gtk_frame_new (NULL);
- gtk_widget_set_name (frame1, "frame1");
- gtk_widget_show (frame1);
- gtk_box_pack_start (GTK_BOX (hbox2), frame1, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame1), 2);
-
- vbox4 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox4, "vbox4");
- gtk_widget_show (vbox4);
- gtk_container_add (GTK_CONTAINER (frame1), vbox4);
- gtk_container_set_border_width (GTK_CONTAINER (vbox4), 2);
-
- bit16 = gtk_radio_button_new_with_mnemonic (NULL, _("16 bit"));
- gtk_widget_set_name (bit16, "bit16");
- gtk_widget_show (bit16);
- gtk_box_pack_start (GTK_BOX (vbox4), bit16, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (bit16), bit16_group);
- bit16_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (bit16));
-
- bit8 = gtk_radio_button_new_with_mnemonic (NULL, _("8 bit"));
- gtk_widget_set_name (bit8, "bit8");
- gtk_widget_show (bit8);
- gtk_box_pack_start (GTK_BOX (vbox4), bit8, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (bit8), bit16_group);
- bit16_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (bit8));
-
- xlabel2 = gtk_label_new (_("Resolution"));
- gtk_widget_set_name (xlabel2, "xlabel2");
- gtk_widget_show (xlabel2);
- gtk_frame_set_label_widget (GTK_FRAME (frame1), xlabel2);
-
- frame2 = gtk_frame_new (NULL);
- gtk_widget_set_name (frame2, "frame2");
- gtk_widget_show (frame2);
- gtk_box_pack_start (GTK_BOX (hbox2), frame2, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame2), 2);
-
- vbox5 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox5, "vbox5");
- gtk_widget_show (vbox5);
- gtk_container_add (GTK_CONTAINER (frame2), vbox5);
- gtk_container_set_border_width (GTK_CONTAINER (vbox5), 2);
-
- stereo = gtk_radio_button_new_with_mnemonic (NULL, _("Stereo"));
- gtk_widget_set_name (stereo, "stereo");
- gtk_widget_show (stereo);
- gtk_box_pack_start (GTK_BOX (vbox5), stereo, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (stereo), stereo_group);
- stereo_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (stereo));
-
- mono = gtk_radio_button_new_with_mnemonic (NULL, _("Mono (downmix)"));
- gtk_widget_set_name (mono, "mono");
- gtk_widget_show (mono);
- gtk_box_pack_start (GTK_BOX (vbox5), mono, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (mono), stereo_group);
- stereo_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (mono));
-
- label3 = gtk_label_new (_("Channels"));
- gtk_widget_set_name (label3, "label3");
- gtk_widget_show (label3);
- gtk_frame_set_label_widget (GTK_FRAME (frame2), label3);
-
- hbox14 = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (hbox14, "hbox14");
- gtk_widget_show (hbox14);
- gtk_box_pack_start (GTK_BOX (vbox3), hbox14, FALSE, TRUE, 0);
-
- frame9 = gtk_frame_new (NULL);
- gtk_widget_set_name (frame9, "frame9");
- gtk_widget_show (frame9);
- gtk_box_pack_start (GTK_BOX (hbox14), frame9, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame9), 2);
-
- vbox15 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox15, "vbox15");
- gtk_widget_show (vbox15);
- gtk_container_add (GTK_CONTAINER (frame9), vbox15);
- gtk_container_set_border_width (GTK_CONTAINER (vbox15), 2);
-
- resampNearest = gtk_radio_button_new_with_mnemonic (NULL, _("Nearest (fastest)"));
- gtk_widget_set_name (resampNearest, "resampNearest");
- gtk_widget_show (resampNearest);
- gtk_box_pack_start (GTK_BOX (vbox15), resampNearest, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (resampNearest), resampNearest_group);
- resampNearest_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resampNearest));
-
- resampLinear = gtk_radio_button_new_with_mnemonic (NULL, _("Linear (fast)"));
- gtk_widget_set_name (resampLinear, "resampLinear");
- gtk_widget_show (resampLinear);
- gtk_box_pack_start (GTK_BOX (vbox15), resampLinear, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (resampLinear), resampNearest_group);
- resampNearest_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resampLinear));
-
- resampSpline = gtk_radio_button_new_with_mnemonic (NULL, _("Spline (good quality)"));
- gtk_widget_set_name (resampSpline, "resampSpline");
- gtk_widget_show (resampSpline);
- gtk_box_pack_start (GTK_BOX (vbox15), resampSpline, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (resampSpline), resampNearest_group);
- resampNearest_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resampSpline));
-
- resampPolyphase = gtk_radio_button_new_with_mnemonic (NULL, _("8-tap Fir (extremely high quality)"));
- gtk_widget_set_name (resampPolyphase, "resampPolyphase");
- gtk_widget_show (resampPolyphase);
- gtk_box_pack_start (GTK_BOX (vbox15), resampPolyphase, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (resampPolyphase), resampNearest_group);
- resampNearest_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resampPolyphase));
-
- label4 = gtk_label_new (_("Resampling"));
- gtk_widget_set_name (label4, "label4");
- gtk_widget_show (label4);
- gtk_frame_set_label_widget (GTK_FRAME (frame9), label4);
-
- frame3 = gtk_frame_new (NULL);
- gtk_widget_set_name (frame3, "frame3");
- gtk_widget_show (frame3);
- gtk_box_pack_start (GTK_BOX (hbox14), frame3, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame3), 2);
-
- vbox6 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox6, "vbox6");
- gtk_widget_show (vbox6);
- gtk_container_add (GTK_CONTAINER (frame3), vbox6);
- gtk_container_set_border_width (GTK_CONTAINER (vbox6), 2);
-
- samp96 = gtk_radio_button_new_with_mnemonic (NULL, _("96 kHz"));
- gtk_widget_set_name (samp96, "samp96");
- gtk_widget_show (samp96);
- gtk_box_pack_start (GTK_BOX (vbox6), samp96, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp96), samp96_group);
- samp96_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp96));
-
- samp48 = gtk_radio_button_new_with_mnemonic (NULL, _("48 kHz"));
- gtk_widget_set_name (samp48, "samp48");
- gtk_widget_show (samp48);
- gtk_box_pack_start (GTK_BOX (vbox6), samp48, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp48), samp96_group);
- samp96_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp48));
-
- samp44 = gtk_radio_button_new_with_mnemonic (NULL, _("44 kHz"));
- gtk_widget_set_name (samp44, "samp44");
- gtk_widget_show (samp44);
- gtk_box_pack_start (GTK_BOX (vbox6), samp44, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp44), samp96_group);
- samp96_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp44));
-
- samp22 = gtk_radio_button_new_with_mnemonic (NULL, _("22 kHz"));
- gtk_widget_set_name (samp22, "samp22");
- gtk_widget_show (samp22);
- gtk_box_pack_start (GTK_BOX (vbox6), samp22, FALSE, FALSE, 0);
- gtk_button_set_focus_on_click (GTK_BUTTON (samp22), FALSE);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp22), samp96_group);
- samp96_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp22));
-
- label5 = gtk_label_new (_("Sampling Rate"));
- gtk_widget_set_name (label5, "label5");
- gtk_widget_show (label5);
- gtk_frame_set_label_widget (GTK_FRAME (frame3), label5);
-
- label2 = gtk_label_new (_("Quality"));
- gtk_widget_set_name (label2, "label2");
- gtk_widget_show (label2);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 0), label2);
- gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_CENTER);
-
- vbox7 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox7, "vbox7");
- gtk_widget_show (vbox7);
- gtk_container_add (GTK_CONTAINER (notebook1), vbox7);
- gtk_container_set_border_width (GTK_CONTAINER (vbox7), 2);
-
- hbox15 = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (hbox15, "hbox15");
- gtk_widget_show (hbox15);
- gtk_box_pack_start (GTK_BOX (vbox7), hbox15, FALSE, TRUE, 0);
-
- frame5 = gtk_frame_new (NULL);
- gtk_widget_set_name (frame5, "frame5");
- gtk_widget_show (frame5);
- gtk_box_pack_start (GTK_BOX (hbox15), frame5, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame5), 2);
-
- vbox20 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox20, "vbox20");
- gtk_widget_show (vbox20);
- gtk_container_add (GTK_CONTAINER (frame5), vbox20);
- gtk_container_set_border_width (GTK_CONTAINER (vbox20), 2);
-
- fxReverb = gtk_check_button_new_with_mnemonic (_("Enable"));
- gtk_widget_set_name (fxReverb, "fxReverb");
- gtk_widget_show (fxReverb);
- gtk_box_pack_start (GTK_BOX (vbox20), fxReverb, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (fxReverb), 2);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxReverb), TRUE);
-
- table1 = gtk_table_new (2, 2, FALSE);
- gtk_widget_set_name (table1, "table1");
- gtk_widget_show (table1);
- gtk_box_pack_start (GTK_BOX (vbox20), table1, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (table1), 2);
- gtk_table_set_row_spacings (GTK_TABLE (table1), 4);
- gtk_table_set_col_spacings (GTK_TABLE (table1), 4);
-
- fxReverbDepth = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (30, 0, 100, 0, 0, 0)));
- gtk_widget_set_name (fxReverbDepth, "fxReverbDepth");
- gtk_widget_show (fxReverbDepth);
- gtk_table_attach (GTK_TABLE (table1), fxReverbDepth, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
-
- fxReverbDelay = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (90, 40, 200, 0, 0, 0)));
- gtk_widget_set_name (fxReverbDelay, "fxReverbDelay");
- gtk_widget_show (fxReverbDelay);
- gtk_table_attach (GTK_TABLE (table1), fxReverbDelay, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
-
- xlabel3 = gtk_label_new (_("Depth"));
- gtk_widget_set_name (xlabel3, "xlabel3");
- gtk_widget_show (xlabel3);
- gtk_table_attach (GTK_TABLE (table1), xlabel3, 0, 1, 0, 1,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (xlabel3), GTK_JUSTIFY_CENTER);
-
- xlabel4 = gtk_label_new (_("Delay"));
- gtk_widget_set_name (xlabel4, "xlabel4");
- gtk_widget_show (xlabel4);
- gtk_table_attach (GTK_TABLE (table1), xlabel4, 0, 1, 1, 2,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (xlabel4), GTK_JUSTIFY_CENTER);
-
- label6 = gtk_label_new (_("Reverb"));
- gtk_widget_set_name (label6, "label6");
- gtk_widget_show (label6);
- gtk_frame_set_label_widget (GTK_FRAME (frame5), label6);
-
- frame6 = gtk_frame_new (NULL);
- gtk_widget_set_name (frame6, "frame6");
- gtk_widget_show (frame6);
- gtk_box_pack_start (GTK_BOX (hbox15), frame6, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame6), 2);
-
- vbox21 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox21, "vbox21");
- gtk_widget_show (vbox21);
- gtk_container_add (GTK_CONTAINER (frame6), vbox21);
- gtk_container_set_border_width (GTK_CONTAINER (vbox21), 2);
-
- fxBassBoost = gtk_check_button_new_with_mnemonic (_("Enable"));
- gtk_widget_set_name (fxBassBoost, "fxBassBoost");
- gtk_widget_show (fxBassBoost);
- gtk_box_pack_start (GTK_BOX (vbox21), fxBassBoost, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (fxBassBoost), 2);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxBassBoost), TRUE);
-
- table2 = gtk_table_new (2, 2, FALSE);
- gtk_widget_set_name (table2, "table2");
- gtk_widget_show (table2);
- gtk_box_pack_start (GTK_BOX (vbox21), table2, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (table2), 2);
- gtk_table_set_row_spacings (GTK_TABLE (table2), 4);
- gtk_table_set_col_spacings (GTK_TABLE (table2), 4);
-
- fxBassAmount = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (30, 0, 100, 0, 0, 0)));
- gtk_widget_set_name (fxBassAmount, "fxBassAmount");
- gtk_widget_show (fxBassAmount);
- gtk_table_attach (GTK_TABLE (table2), fxBassAmount, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
-
- fxBassRange = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (30, 10, 100, 0, 0, 0)));
- gtk_widget_set_name (fxBassRange, "fxBassRange");
- gtk_widget_show (fxBassRange);
- gtk_table_attach (GTK_TABLE (table2), fxBassRange, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
-
- xlabel5 = gtk_label_new (_("Amount"));
- gtk_widget_set_name (xlabel5, "xlabel5");
- gtk_widget_show (xlabel5);
- gtk_table_attach (GTK_TABLE (table2), xlabel5, 0, 1, 0, 1,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (xlabel5), GTK_JUSTIFY_CENTER);
-
- xlabel6 = gtk_label_new (_("Range"));
- gtk_widget_set_name (xlabel6, "xlabel6");
- gtk_widget_show (xlabel6);
- gtk_table_attach (GTK_TABLE (table2), xlabel6, 0, 1, 1, 2,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (xlabel6), GTK_JUSTIFY_CENTER);
-
- label7 = gtk_label_new (_("Bass Boost"));
- gtk_widget_set_name (label7, "label7");
- gtk_widget_show (label7);
- gtk_frame_set_label_widget (GTK_FRAME (frame6), label7);
-
- hbox16 = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (hbox16, "hbox16");
- gtk_widget_show (hbox16);
- gtk_box_pack_start (GTK_BOX (vbox7), hbox16, FALSE, TRUE, 0);
-
- frame7 = gtk_frame_new (NULL);
- gtk_widget_set_name (frame7, "frame7");
- gtk_widget_show (frame7);
- gtk_box_pack_start (GTK_BOX (hbox16), frame7, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame7), 2);
-
- vbox22 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox22, "vbox22");
- gtk_widget_show (vbox22);
- gtk_container_add (GTK_CONTAINER (frame7), vbox22);
-
- fxSurround = gtk_check_button_new_with_mnemonic (_("Enable"));
- gtk_widget_set_name (fxSurround, "fxSurround");
- gtk_widget_show (fxSurround);
- gtk_box_pack_start (GTK_BOX (vbox22), fxSurround, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (fxSurround), 2);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxSurround), TRUE);
-
- table3 = gtk_table_new (2, 2, FALSE);
- gtk_widget_set_name (table3, "table3");
- gtk_widget_show (table3);
- gtk_box_pack_start (GTK_BOX (vbox22), table3, TRUE, 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);
-
- fxSurroundDepth = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (20, 0, 100, 0, 0, 0)));
- gtk_widget_set_name (fxSurroundDepth, "fxSurroundDepth");
- gtk_widget_show (fxSurroundDepth);
- gtk_table_attach (GTK_TABLE (table3), fxSurroundDepth, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
-
- fxSurroundDelay = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (20, 5, 40, 0, 0, 0)));
- gtk_widget_set_name (fxSurroundDelay, "fxSurroundDelay");
- gtk_widget_show (fxSurroundDelay);
- gtk_table_attach (GTK_TABLE (table3), fxSurroundDelay, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
-
- xlabel7 = gtk_label_new (_("Depth"));
- gtk_widget_set_name (xlabel7, "xlabel7");
- gtk_widget_show (xlabel7);
- gtk_table_attach (GTK_TABLE (table3), xlabel7, 0, 1, 0, 1,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (xlabel7), GTK_JUSTIFY_CENTER);
-
- label8 = gtk_label_new (_("Delay"));
- gtk_widget_set_name (label8, "label8");
- gtk_widget_show (label8);
- gtk_table_attach (GTK_TABLE (table3), label8, 0, 1, 1, 2,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label8), GTK_JUSTIFY_CENTER);
-
- xlabel8 = gtk_label_new (_("Surround"));
- gtk_widget_set_name (xlabel8, "xlabel8");
- gtk_widget_show (xlabel8);
- gtk_frame_set_label_widget (GTK_FRAME (frame7), xlabel8);
-
- frame10 = gtk_frame_new (NULL);
- gtk_widget_set_name (frame10, "frame10");
- gtk_widget_show (frame10);
- gtk_box_pack_start (GTK_BOX (hbox16), frame10, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame10), 2);
-
- vbox16 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (vbox16, "vbox16");
- gtk_widget_show (vbox16);
- gtk_container_add (GTK_CONTAINER (frame10), vbox16);
- gtk_container_set_border_width (GTK_CONTAINER (vbox16), 4);
-
- fxPreamp = gtk_check_button_new_with_mnemonic (_("Enable"));
- gtk_widget_set_name (fxPreamp, "fxPreamp");
- gtk_widget_show (fxPreamp);
- gtk_box_pack_start (GTK_BOX (vbox16), fxPreamp, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (fxPreamp), 2);
-
- hbox11 = gtk_hbox_new (FALSE, 4);
- gtk_widget_set_name (hbox11, "hbox11");
- gtk_widget_show (hbox11);
- gtk_box_pack_start (GTK_BOX (vbox16), hbox11, TRUE, TRUE, 0);
-
- label19 = gtk_label_new (_("Volume"));
- gtk_widget_set_name (label19, "label19");
- gtk_widget_show (label19);
- gtk_box_pack_start (GTK_BOX (hbox11), label19, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label19), GTK_JUSTIFY_CENTER);
-
- fxPreampLevel = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, -3, 3, 1, 0, 0)));
- gtk_widget_set_name (fxPreampLevel, "fxPreampLevel");
- gtk_widget_show (fxPreampLevel);
- gtk_box_pack_start (GTK_BOX (hbox11), fxPreampLevel, TRUE, TRUE, 0);
-
- label20 = gtk_label_new (_("Note: Setting the preamp\ntoo high may cause clipping\n(annoying clicks and pops)!"));
- gtk_widget_set_name (label20, "label20");
- gtk_widget_show (label20);
- gtk_box_pack_start (GTK_BOX (vbox16), label20, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label20), GTK_JUSTIFY_CENTER);
-
- label9 = gtk_label_new (_("Preamp"));
- gtk_widget_set_name (label9, "label9");
- gtk_widget_show (label9);
- gtk_frame_set_label_widget (GTK_FRAME (frame10), label9);
-
- label10 = gtk_label_new (_("Effects"));
- gtk_widget_set_name (label10, "label10");
- gtk_widget_show (label10);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 1), label10);
- gtk_label_set_justify (GTK_LABEL (label10), GTK_JUSTIFY_CENTER);
-
- vbox19 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox19, "vbox19");
- gtk_widget_show (vbox19);
- gtk_container_add (GTK_CONTAINER (notebook1), vbox19);
- gtk_container_set_border_width (GTK_CONTAINER (vbox19), 2);
-
- frame4 = gtk_frame_new (NULL);
- gtk_widget_set_name (frame4, "frame4");
- gtk_widget_show (frame4);
- gtk_box_pack_start (GTK_BOX (vbox19), frame4, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame4), 2);
-
- hbox3 = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (hbox3, "hbox3");
- gtk_widget_show (hbox3);
- gtk_container_add (GTK_CONTAINER (frame4), hbox3);
- gtk_container_set_border_width (GTK_CONTAINER (hbox3), 2);
-
- vbox8 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox8, "vbox8");
- gtk_widget_show (vbox8);
- gtk_box_pack_start (GTK_BOX (hbox3), vbox8, TRUE, TRUE, 0);
-
- fxUseFilename = gtk_check_button_new_with_mnemonic (_("Use Filename as Song Title"));
- gtk_widget_set_name (fxUseFilename, "fxUseFilename");
- gtk_widget_show (fxUseFilename);
- gtk_box_pack_start (GTK_BOX (vbox8), fxUseFilename, FALSE, FALSE, 0);
-
- fxFastInfo = gtk_check_button_new_with_mnemonic (_("Fast Playlist Info"));
- gtk_widget_set_name (fxFastInfo, "fxFastInfo");
- gtk_widget_show (fxFastInfo);
- gtk_box_pack_start (GTK_BOX (vbox8), fxFastInfo, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxFastInfo), TRUE);
-
- vbox9 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox9, "vbox9");
- gtk_widget_show (vbox9);
- gtk_box_pack_start (GTK_BOX (hbox3), vbox9, TRUE, TRUE, 0);
-
- fxNR = gtk_check_button_new_with_mnemonic (_("Noise Reduction"));
- gtk_widget_set_name (fxNR, "fxNR");
- gtk_widget_show (fxNR);
- gtk_box_pack_start (GTK_BOX (vbox9), fxNR, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxNR), TRUE);
-
- fxAmigaMOD = gtk_check_button_new_with_mnemonic (_("Play Amiga MOD"));
- gtk_widget_set_name (fxAmigaMOD, "fxAmigaMOD");
- gtk_widget_show (fxAmigaMOD);
- gtk_box_pack_start (GTK_BOX (vbox9), fxAmigaMOD, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fxAmigaMOD), TRUE);
-
- label21 = gtk_label_new (_("General"));
- gtk_widget_set_name (label21, "label21");
- gtk_widget_show (label21);
- gtk_frame_set_label_widget (GTK_FRAME (frame4), label21);
-
- frame11 = gtk_frame_new (NULL);
- gtk_widget_set_name (frame11, "frame11");
- gtk_widget_show (frame11);
- gtk_box_pack_start (GTK_BOX (vbox19), frame11, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame11), 2);
-
- vbox17 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox17, "vbox17");
- gtk_widget_show (vbox17);
- gtk_container_add (GTK_CONTAINER (frame11), vbox17);
- gtk_container_set_border_width (GTK_CONTAINER (vbox17), 2);
-
- fxNoLoop = gtk_radio_button_new_with_mnemonic (NULL, _("Don't loop"));
- gtk_widget_set_name (fxNoLoop, "fxNoLoop");
- gtk_widget_show (fxNoLoop);
- gtk_box_pack_start (GTK_BOX (vbox17), fxNoLoop, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (fxNoLoop), fxNoLoop_group);
- fxNoLoop_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (fxNoLoop));
-
- hbox13 = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (hbox13, "hbox13");
- gtk_widget_show (hbox13);
- gtk_box_pack_start (GTK_BOX (vbox17), hbox13, FALSE, FALSE, 0);
-
- fxLoopFinite = gtk_radio_button_new_with_mnemonic (NULL, _("Loop"));
- gtk_widget_set_name (fxLoopFinite, "fxLoopFinite");
- gtk_widget_show (fxLoopFinite);
- gtk_box_pack_start (GTK_BOX (hbox13), fxLoopFinite, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (fxLoopFinite), fxNoLoop_group);
- fxNoLoop_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (fxLoopFinite));
-
- fxLoopCount_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
- fxLoopCount = gtk_spin_button_new (GTK_ADJUSTMENT (fxLoopCount_adj), 1, 0);
- gtk_widget_set_name (fxLoopCount, "fxLoopCount");
- gtk_widget_show (fxLoopCount);
- gtk_box_pack_start (GTK_BOX (hbox13), fxLoopCount, FALSE, TRUE, 0);
-
- xlabel21 = gtk_label_new (_("time(s)"));
- gtk_widget_set_name (xlabel21, "xlabel21");
- gtk_widget_show (xlabel21);
- gtk_box_pack_start (GTK_BOX (hbox13), xlabel21, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (xlabel21), GTK_JUSTIFY_CENTER);
-
- fxLoopForever = gtk_radio_button_new_with_mnemonic (NULL, _("Loop forever"));
- gtk_widget_set_name (fxLoopForever, "fxLoopForever");
- gtk_widget_show (fxLoopForever);
- gtk_box_pack_start (GTK_BOX (vbox17), fxLoopForever, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (fxLoopForever), fxNoLoop_group);
- fxNoLoop_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (fxLoopForever));
-
- label22 = gtk_label_new (_("Looping"));
- gtk_widget_set_name (label22, "label22");
- gtk_widget_show (label22);
- gtk_frame_set_label_widget (GTK_FRAME (frame11), label22);
-
- xlabel22 = gtk_label_new (_("Misc"));
- gtk_widget_set_name (xlabel22, "xlabel22");
- gtk_widget_show (xlabel22);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), xlabel22);
- gtk_label_set_justify (GTK_LABEL (xlabel22), GTK_JUSTIFY_CENTER);
-
- hbuttonbox2 = gtk_hbutton_box_new ();
- gtk_widget_set_name (hbuttonbox2, "hbuttonbox2");
- gtk_widget_show (hbuttonbox2);
- gtk_box_pack_start (GTK_BOX (vbox2), hbuttonbox2, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox2), 4);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox2), GTK_BUTTONBOX_END);
- gtk_box_set_spacing (GTK_BOX (hbuttonbox2), 8);
-
- config_ok = gtk_button_new_with_mnemonic (_("OK"));
- gtk_widget_set_name (config_ok, "config_ok");
- gtk_widget_show (config_ok);
- gtk_container_add (GTK_CONTAINER (hbuttonbox2), config_ok);
- GTK_WIDGET_SET_FLAGS (config_ok, GTK_CAN_DEFAULT);
-
- config_apply = gtk_button_new_with_mnemonic (_("Apply"));
- gtk_widget_set_name (config_apply, "config_apply");
- gtk_widget_show (config_apply);
- gtk_container_add (GTK_CONTAINER (hbuttonbox2), config_apply);
- GTK_WIDGET_SET_FLAGS (config_apply, GTK_CAN_DEFAULT);
-
- config_cancel = gtk_button_new_with_mnemonic (_("Cancel"));
- gtk_widget_set_name (config_cancel, "config_cancel");
- gtk_widget_show (config_cancel);
- gtk_container_add (GTK_CONTAINER (hbuttonbox2), config_cancel);
- GTK_WIDGET_SET_FLAGS (config_cancel, GTK_CAN_DEFAULT);
-
- g_signal_connect ((gpointer) Config, "delete_event",
- G_CALLBACK (hide_window),
- NULL);
- g_signal_connect ((gpointer) config_ok, "clicked",
- G_CALLBACK (on_config_ok_clicked),
- NULL);
- g_signal_connect ((gpointer) config_apply, "clicked",
- G_CALLBACK (on_config_apply_clicked),
- NULL);
- g_signal_connect ((gpointer) config_cancel, "clicked",
- G_CALLBACK (on_config_cancel_clicked),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (Config, Config, "Config");
- GLADE_HOOKUP_OBJECT (Config, vbox2, "vbox2");
- GLADE_HOOKUP_OBJECT (Config, notebook1, "notebook1");
- GLADE_HOOKUP_OBJECT (Config, vbox3, "vbox3");
- GLADE_HOOKUP_OBJECT (Config, hbox2, "hbox2");
- GLADE_HOOKUP_OBJECT (Config, frame1, "frame1");
- GLADE_HOOKUP_OBJECT (Config, vbox4, "vbox4");
- GLADE_HOOKUP_OBJECT (Config, bit16, "bit16");
- GLADE_HOOKUP_OBJECT (Config, bit8, "bit8");
- GLADE_HOOKUP_OBJECT (Config, xlabel2, "xlabel2");
- GLADE_HOOKUP_OBJECT (Config, frame2, "frame2");
- GLADE_HOOKUP_OBJECT (Config, vbox5, "vbox5");
- GLADE_HOOKUP_OBJECT (Config, stereo, "stereo");
- GLADE_HOOKUP_OBJECT (Config, mono, "mono");
- GLADE_HOOKUP_OBJECT (Config, label3, "label3");
- GLADE_HOOKUP_OBJECT (Config, hbox14, "hbox14");
- GLADE_HOOKUP_OBJECT (Config, frame9, "frame9");
- GLADE_HOOKUP_OBJECT (Config, vbox15, "vbox15");
- GLADE_HOOKUP_OBJECT (Config, resampNearest, "resampNearest");
- GLADE_HOOKUP_OBJECT (Config, resampLinear, "resampLinear");
- GLADE_HOOKUP_OBJECT (Config, resampSpline, "resampSpline");
- GLADE_HOOKUP_OBJECT (Config, resampPolyphase, "resampPolyphase");
- GLADE_HOOKUP_OBJECT (Config, label4, "label4");
- GLADE_HOOKUP_OBJECT (Config, frame3, "frame3");
- GLADE_HOOKUP_OBJECT (Config, vbox6, "vbox6");
- GLADE_HOOKUP_OBJECT (Config, samp96, "samp96");
- GLADE_HOOKUP_OBJECT (Config, samp48, "samp48");
- GLADE_HOOKUP_OBJECT (Config, samp44, "samp44");
- GLADE_HOOKUP_OBJECT (Config, samp22, "samp22");
- GLADE_HOOKUP_OBJECT (Config, label5, "label5");
- GLADE_HOOKUP_OBJECT (Config, label2, "label2");
- GLADE_HOOKUP_OBJECT (Config, vbox7, "vbox7");
- GLADE_HOOKUP_OBJECT (Config, hbox15, "hbox15");
- GLADE_HOOKUP_OBJECT (Config, frame5, "frame5");
- GLADE_HOOKUP_OBJECT (Config, vbox20, "vbox20");
- GLADE_HOOKUP_OBJECT (Config, fxReverb, "fxReverb");
- GLADE_HOOKUP_OBJECT (Config, table1, "table1");
- GLADE_HOOKUP_OBJECT (Config, fxReverbDepth, "fxReverbDepth");
- GLADE_HOOKUP_OBJECT (Config, fxReverbDelay, "fxReverbDelay");
- GLADE_HOOKUP_OBJECT (Config, xlabel3, "xlabel3");
- GLADE_HOOKUP_OBJECT (Config, xlabel4, "xlabel4");
- GLADE_HOOKUP_OBJECT (Config, label6, "label6");
- GLADE_HOOKUP_OBJECT (Config, frame6, "frame6");
- GLADE_HOOKUP_OBJECT (Config, vbox21, "vbox21");
- GLADE_HOOKUP_OBJECT (Config, fxBassBoost, "fxBassBoost");
- GLADE_HOOKUP_OBJECT (Config, table2, "table2");
- GLADE_HOOKUP_OBJECT (Config, fxBassAmount, "fxBassAmount");
- GLADE_HOOKUP_OBJECT (Config, fxBassRange, "fxBassRange");
- GLADE_HOOKUP_OBJECT (Config, xlabel5, "xlabel5");
- GLADE_HOOKUP_OBJECT (Config, xlabel6, "xlabel6");
- GLADE_HOOKUP_OBJECT (Config, label7, "label7");
- GLADE_HOOKUP_OBJECT (Config, hbox16, "hbox16");
- GLADE_HOOKUP_OBJECT (Config, frame7, "frame7");
- GLADE_HOOKUP_OBJECT (Config, vbox22, "vbox22");
- GLADE_HOOKUP_OBJECT (Config, fxSurround, "fxSurround");
- GLADE_HOOKUP_OBJECT (Config, table3, "table3");
- GLADE_HOOKUP_OBJECT (Config, fxSurroundDepth, "fxSurroundDepth");
- GLADE_HOOKUP_OBJECT (Config, fxSurroundDelay, "fxSurroundDelay");
- GLADE_HOOKUP_OBJECT (Config, xlabel7, "xlabel7");
- GLADE_HOOKUP_OBJECT (Config, label8, "label8");
- GLADE_HOOKUP_OBJECT (Config, xlabel8, "xlabel8");
- GLADE_HOOKUP_OBJECT (Config, frame10, "frame10");
- GLADE_HOOKUP_OBJECT (Config, vbox16, "vbox16");
- GLADE_HOOKUP_OBJECT (Config, fxPreamp, "fxPreamp");
- GLADE_HOOKUP_OBJECT (Config, hbox11, "hbox11");
- GLADE_HOOKUP_OBJECT (Config, label19, "label19");
- GLADE_HOOKUP_OBJECT (Config, fxPreampLevel, "fxPreampLevel");
- GLADE_HOOKUP_OBJECT (Config, label20, "label20");
- GLADE_HOOKUP_OBJECT (Config, label9, "label9");
- GLADE_HOOKUP_OBJECT (Config, label10, "label10");
- GLADE_HOOKUP_OBJECT (Config, vbox19, "vbox19");
- GLADE_HOOKUP_OBJECT (Config, frame4, "frame4");
- GLADE_HOOKUP_OBJECT (Config, hbox3, "hbox3");
- GLADE_HOOKUP_OBJECT (Config, vbox8, "vbox8");
- GLADE_HOOKUP_OBJECT (Config, fxUseFilename, "fxUseFilename");
- GLADE_HOOKUP_OBJECT (Config, fxFastInfo, "fxFastInfo");
- GLADE_HOOKUP_OBJECT (Config, vbox9, "vbox9");
- GLADE_HOOKUP_OBJECT (Config, fxNR, "fxNR");
- GLADE_HOOKUP_OBJECT (Config, fxAmigaMOD, "fxAmigaMOD");
- GLADE_HOOKUP_OBJECT (Config, label21, "label21");
- GLADE_HOOKUP_OBJECT (Config, frame11, "frame11");
- GLADE_HOOKUP_OBJECT (Config, vbox17, "vbox17");
- GLADE_HOOKUP_OBJECT (Config, fxNoLoop, "fxNoLoop");
- GLADE_HOOKUP_OBJECT (Config, hbox13, "hbox13");
- GLADE_HOOKUP_OBJECT (Config, fxLoopFinite, "fxLoopFinite");
- GLADE_HOOKUP_OBJECT (Config, fxLoopCount, "fxLoopCount");
- GLADE_HOOKUP_OBJECT (Config, xlabel21, "xlabel21");
- GLADE_HOOKUP_OBJECT (Config, fxLoopForever, "fxLoopForever");
- GLADE_HOOKUP_OBJECT (Config, label22, "label22");
- GLADE_HOOKUP_OBJECT (Config, xlabel22, "xlabel22");
- GLADE_HOOKUP_OBJECT (Config, hbuttonbox2, "hbuttonbox2");
- GLADE_HOOKUP_OBJECT (Config, config_ok, "config_ok");
- GLADE_HOOKUP_OBJECT (Config, config_apply, "config_apply");
- GLADE_HOOKUP_OBJECT (Config, config_cancel, "config_cancel");
-
- return Config;
-}
-
-GtkWidget*
-create_Info (void)
-{
- GtkWidget *Info;
- GtkWidget *vbox14;
- GtkWidget *notebook2;
- GtkWidget *hbox9;
- GtkWidget *label11;
- GtkWidget *info_general;
- GtkWidget *label13;
- GtkWidget *scrolledwindow1;
- GtkWidget *viewport1;
- GtkWidget *info_samples;
- GtkWidget *label15;
- GtkWidget *scrolledwindow2;
- GtkWidget *viewport2;
- GtkWidget *info_instruments;
- GtkWidget *label17;
- GtkWidget *scrolledwindow3;
- GtkWidget *info_message;
- GtkWidget *label18;
- GtkWidget *hbuttonbox3;
- GtkWidget *info_close;
-
- Info = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_widget_set_name (Info, "Info");
- gtk_window_set_title (GTK_WINDOW (Info), _("MOD Info"));
-
- vbox14 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox14, "vbox14");
- gtk_widget_show (vbox14);
- gtk_container_add (GTK_CONTAINER (Info), vbox14);
-
- notebook2 = gtk_notebook_new ();
- gtk_widget_set_name (notebook2, "notebook2");
- gtk_widget_show (notebook2);
- gtk_box_pack_start (GTK_BOX (vbox14), notebook2, TRUE, TRUE, 8);
- gtk_container_set_border_width (GTK_CONTAINER (notebook2), 4);
-
- hbox9 = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (hbox9, "hbox9");
- gtk_widget_show (hbox9);
- gtk_container_add (GTK_CONTAINER (notebook2), hbox9);
- gtk_container_set_border_width (GTK_CONTAINER (hbox9), 2);
-
- label11 = gtk_label_new (_("Filename:\nTitle:\nType:\nLength:\nSpeed:\nTempo:\nSamples:\nInstruments:\nPatterns:\nChannels:"));
- gtk_widget_set_name (label11, "label11");
- gtk_widget_show (label11);
- gtk_box_pack_start (GTK_BOX (hbox9), label11, FALSE, FALSE, 4);
-
- info_general = gtk_label_new (_("---\n---\n---\n---\n---\n---\n---\n---\n---\n---"));
- gtk_widget_set_name (info_general, "info_general");
- gtk_widget_show (info_general);
- gtk_box_pack_start (GTK_BOX (hbox9), info_general, FALSE, FALSE, 4);
-
- label13 = gtk_label_new (_("General"));
- gtk_widget_set_name (label13, "label13");
- gtk_widget_show (label13);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 0), label13);
- gtk_label_set_justify (GTK_LABEL (label13), GTK_JUSTIFY_CENTER);
-
- scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_set_name (scrolledwindow1, "scrolledwindow1");
- gtk_widget_show (scrolledwindow1);
- gtk_container_add (GTK_CONTAINER (notebook2), scrolledwindow1);
- gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow1), 6);
- GTK_WIDGET_UNSET_FLAGS (scrolledwindow1, GTK_CAN_FOCUS);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-
- viewport1 = gtk_viewport_new (NULL, NULL);
- gtk_widget_set_name (viewport1, "viewport1");
- gtk_widget_show (viewport1);
- gtk_container_add (GTK_CONTAINER (scrolledwindow1), viewport1);
-
- info_samples = gtk_label_new ("");
- gtk_widget_set_name (info_samples, "info_samples");
- gtk_widget_show (info_samples);
- gtk_container_add (GTK_CONTAINER (viewport1), info_samples);
- gtk_misc_set_alignment (GTK_MISC (info_samples), 7.45058e-09, 7.45058e-09);
-
- label15 = gtk_label_new (_("Samples"));
- gtk_widget_set_name (label15, "label15");
- gtk_widget_show (label15);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 1), label15);
- gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_CENTER);
-
- scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_set_name (scrolledwindow2, "scrolledwindow2");
- gtk_widget_show (scrolledwindow2);
- gtk_container_add (GTK_CONTAINER (notebook2), scrolledwindow2);
- gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow2), 6);
- GTK_WIDGET_UNSET_FLAGS (scrolledwindow2, GTK_CAN_FOCUS);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow2), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-
- viewport2 = gtk_viewport_new (NULL, NULL);
- gtk_widget_set_name (viewport2, "viewport2");
- gtk_widget_show (viewport2);
- gtk_container_add (GTK_CONTAINER (scrolledwindow2), viewport2);
-
- info_instruments = gtk_label_new ("");
- gtk_widget_set_name (info_instruments, "info_instruments");
- gtk_widget_show (info_instruments);
- gtk_container_add (GTK_CONTAINER (viewport2), info_instruments);
- gtk_misc_set_alignment (GTK_MISC (info_instruments), 1.49012e-08, 7.45058e-09);
-
- label17 = gtk_label_new (_("Instruments"));
- gtk_widget_set_name (label17, "label17");
- gtk_widget_show (label17);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 2), label17);
- gtk_label_set_justify (GTK_LABEL (label17), GTK_JUSTIFY_CENTER);
-
- scrolledwindow3 = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_set_name (scrolledwindow3, "scrolledwindow3");
- gtk_widget_show (scrolledwindow3);
- gtk_container_add (GTK_CONTAINER (notebook2), scrolledwindow3);
- GTK_WIDGET_UNSET_FLAGS (scrolledwindow3, GTK_CAN_FOCUS);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow3), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow3), GTK_SHADOW_IN);
-
- info_message = gtk_text_view_new ();
- gtk_widget_set_name (info_message, "info_message");
- gtk_widget_show (info_message);
- gtk_container_add (GTK_CONTAINER (scrolledwindow3), info_message);
- gtk_text_view_set_editable (GTK_TEXT_VIEW (info_message), FALSE);
- gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (info_message), GTK_WRAP_WORD);
-
- label18 = gtk_label_new (_("Message"));
- gtk_widget_set_name (label18, "label18");
- gtk_widget_show (label18);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 3), label18);
- gtk_label_set_justify (GTK_LABEL (label18), GTK_JUSTIFY_CENTER);
-
- hbuttonbox3 = gtk_hbutton_box_new ();
- gtk_widget_set_name (hbuttonbox3, "hbuttonbox3");
- gtk_widget_show (hbuttonbox3);
- gtk_box_pack_start (GTK_BOX (vbox14), hbuttonbox3, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox3), 2);
- gtk_box_set_spacing (GTK_BOX (hbuttonbox3), 30);
-
- info_close = gtk_button_new_with_mnemonic (_("Close"));
- gtk_widget_set_name (info_close, "info_close");
- gtk_widget_show (info_close);
- gtk_container_add (GTK_CONTAINER (hbuttonbox3), info_close);
- GTK_WIDGET_SET_FLAGS (info_close, GTK_CAN_DEFAULT);
-
- g_signal_connect ((gpointer) Info, "delete_event",
- G_CALLBACK (hide_window),
- NULL);
- g_signal_connect ((gpointer) info_close, "clicked",
- G_CALLBACK (on_info_close_clicked),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (Info, Info, "Info");
- GLADE_HOOKUP_OBJECT (Info, vbox14, "vbox14");
- GLADE_HOOKUP_OBJECT (Info, notebook2, "notebook2");
- GLADE_HOOKUP_OBJECT (Info, hbox9, "hbox9");
- GLADE_HOOKUP_OBJECT (Info, label11, "label11");
- GLADE_HOOKUP_OBJECT (Info, info_general, "info_general");
- GLADE_HOOKUP_OBJECT (Info, label13, "label13");
- GLADE_HOOKUP_OBJECT (Info, scrolledwindow1, "scrolledwindow1");
- GLADE_HOOKUP_OBJECT (Info, viewport1, "viewport1");
- GLADE_HOOKUP_OBJECT (Info, info_samples, "info_samples");
- GLADE_HOOKUP_OBJECT (Info, label15, "label15");
- GLADE_HOOKUP_OBJECT (Info, scrolledwindow2, "scrolledwindow2");
- GLADE_HOOKUP_OBJECT (Info, viewport2, "viewport2");
- GLADE_HOOKUP_OBJECT (Info, info_instruments, "info_instruments");
- GLADE_HOOKUP_OBJECT (Info, label17, "label17");
- GLADE_HOOKUP_OBJECT (Info, scrolledwindow3, "scrolledwindow3");
- GLADE_HOOKUP_OBJECT (Info, info_message, "info_message");
- GLADE_HOOKUP_OBJECT (Info, label18, "label18");
- GLADE_HOOKUP_OBJECT (Info, hbuttonbox3, "hbuttonbox3");
- GLADE_HOOKUP_OBJECT (Info, info_close, "info_close");
-
- return Info;
-}
-

audacious-plugins-2.5.3.tar.gz/src/modplug/gui/interface.h Deleted

audacious-plugins-2.5.3.tar.gz/src/modplug/gui/main.cxx Deleted

@@ -1,326 +0,0 @@
-/*
- * Initial main.c file generated by Glade. Edit as required.
- * Glade will not overwrite this file.
- */
-
-#include <config.h>
-
-#include "../stddefs.h"
-#include "../stdafx.h"
-#include "../sndfile.h"
-#include "../archive/open.h"
-
-// Order of #include is important - UINT is redefined to unsigned long instead of unsigned int
-// somewhere in the following headers, which leads to unresolved symbol -
-// linking is okay, error pops up when starting Audacious.
-
-#include <gtk/gtk.h>
-#include <libintl.h>
-
-#include "interface.h"
-#include "support.h"
-#include "main.h"
-
-#include <sstream>
-//open()
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-//mmap()
-#include <unistd.h>
-#include <sys/mman.h>
-#include <fstream>
-
-extern "C"
-{
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
-}
-
-#define MAX_MESSAGE_LENGTH 4000
-
-GtkWidget *AboutWin = NULL;
-GtkWidget *ConfigWin = NULL;
-GtkWidget *InfoWin = NULL;
-
-void ShowAboutWindow()
-{
-	if(!AboutWin)
-	{
-		gchar * about_text = g_strjoin("",
-			_("Modplug Input Plugin for Audacious ver"), VERSION,
-			_("\nModplug sound engine written by Olivier Lapicque.\nXMMS interface for Modplug by Kenton Varda.\n(c)2000 Olivier Lapicque and Kenton Varda.\nUpdates and maintenance by Konstanty Bialkowski.\nPorted to BMP by Theofilos Intzoglou."),
-			NULL);
-
-		audgui_simple_message (& AboutWin, GTK_MESSAGE_INFO, _("About Modplug"),
-		 about_text);
-
-		g_free(about_text);
-	}
-}
-
-void ShowConfigureWindow(const ModplugXMMS::Settings& aProps)
-{
-	if(!ConfigWin)
-		ConfigWin = create_Config();
-
-	if(aProps.mBits == 8)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "bit8"), TRUE);
-	else
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "bit16"), TRUE);
-
-	if(aProps.mFrequency == 22050)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "samp22"), TRUE);
-	else if (aProps.mFrequency == 44100)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "samp44"), TRUE);
-	else if (aProps.mFrequency == 96000)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "samp96"), TRUE);
-	else
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "samp48"), TRUE);
-
-	if(aProps.mChannels == 1)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "mono"), TRUE);
-	else
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "stereo"), TRUE);
-
-	if(aProps.mResamplingMode == 0)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "resampNearest"), TRUE);
-	else if(aProps.mResamplingMode == 1)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "resampLinear"), TRUE);
-	else if(aProps.mResamplingMode == 2)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "resampSpline"), TRUE);
-	else
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "resampPolyphase"), TRUE);
-
-	if(aProps.mNoiseReduction)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxNR"), TRUE);
-	else
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxNR"), FALSE);
-
-	if(aProps.mGrabAmigaMOD)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxAmigaMOD"), TRUE);
-	else
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxAmigaMOD"), FALSE);
-
-	if(aProps.mFastinfo)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxFastInfo"), TRUE);
-	else
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxFastInfo"), FALSE);
-
-	if(aProps.mUseFilename)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxUseFilename"), TRUE);
-	else
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxUseFilename"), FALSE);
-
-	if(aProps.mReverb)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxReverb"), TRUE);
-	else
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxReverb"), FALSE);
-
-	if(aProps.mMegabass)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxBassBoost"), TRUE);
-	else
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxBassBoost"), FALSE);
-
-	if(aProps.mSurround)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxSurround"), TRUE);
-	else
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxSurround"), FALSE);
-
-	if(aProps.mPreamp)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxPreamp"), TRUE);
-	else
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxPreamp"), FALSE);
-
-	gtk_adjustment_set_value(gtk_range_get_adjustment((GtkRange*)lookup_widget(ConfigWin, "fxReverbDepth")), aProps.mReverbDepth);
-	gtk_adjustment_set_value(gtk_range_get_adjustment((GtkRange*)lookup_widget(ConfigWin, "fxReverbDelay")), aProps.mReverbDelay);
-	gtk_adjustment_set_value(gtk_range_get_adjustment((GtkRange*)lookup_widget(ConfigWin, "fxBassAmount")), aProps.mBassAmount);
-	gtk_adjustment_set_value(gtk_range_get_adjustment((GtkRange*)lookup_widget(ConfigWin, "fxBassRange")), aProps.mBassRange);
-	gtk_adjustment_set_value(gtk_range_get_adjustment((GtkRange*)lookup_widget(ConfigWin, "fxSurroundDepth")), aProps.mSurroundDepth);
-	gtk_adjustment_set_value(gtk_range_get_adjustment((GtkRange*)lookup_widget(ConfigWin, "fxSurroundDelay")), aProps.mSurroundDelay);
-	gtk_adjustment_set_value(gtk_range_get_adjustment((GtkRange*)lookup_widget(ConfigWin, "fxPreampLevel")), aProps.mPreampLevel);
-
-	if(aProps.mLoopCount < 0)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxLoopForever"), TRUE);
-	else if(aProps.mLoopCount == 0)
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxNoLoop"), TRUE);
-	else
-	{
-		gtk_toggle_button_set_active((GtkToggleButton*)lookup_widget(ConfigWin, "fxLoopFinite"), TRUE);
-		gtk_adjustment_set_value(gtk_spin_button_get_adjustment(
-			(GtkSpinButton*)lookup_widget(ConfigWin, "fxLoopCount")), aProps.mLoopCount);
-	}
-
-	gtk_widget_show(ConfigWin);
-}
-
-void ShowInfoWindow(const string& aFilename)
-{
-	if(!InfoWin)
-		InfoWin = create_Info();
-
-	uint32 lSongTime, lNumSamples, lNumInstruments, i;
-	string lInfo;
-	gchar lBuffer[33];
-	stringstream lStrStream(ios::out); //C++ replacement for sprintf()
-
-	CSoundFile* lSoundFile;
-
-	Archive* lArchive;
-	string lShortFN;
-	uint32 lPos;
-	gchar *tmps;
-
-	lPos = aFilename.find_last_of('/') + 1;
-	lShortFN = aFilename.substr(lPos);
-
-	//open and mmap the file
-	lArchive = OpenArchive(aFilename);
-	if(lArchive->Size() == 0)
-	{
-		delete lArchive;
-		return;
-	}
-
-	lSoundFile = new CSoundFile;
-	lSoundFile->Create((uchar*)lArchive->Map(), lArchive->Size());
-
-	lInfo = lShortFN;
-	lInfo += '\n';
-	tmps = MODPLUG_CONVERT(lSoundFile->GetTitle());
-	lInfo += tmps;
-	g_free(tmps);
-	lInfo += '\n';
-
-	switch(lSoundFile->GetType())
-	{
-	case MOD_TYPE_MOD:
-		lInfo+= "ProTracker";
-		break;
-	case MOD_TYPE_S3M:
-		lInfo+= "Scream Tracker 3";
-		break;
-	case MOD_TYPE_XM:
-		lInfo+= "Fast Tracker 2";
-		break;
-	case MOD_TYPE_IT:
-		lInfo+= "Impulse Tracker";
-		break;
-	case MOD_TYPE_MED:
-		lInfo+= "OctaMed";
-		break;
-	case MOD_TYPE_MTM:
-		lInfo+= "MTM";
-		break;
-	case MOD_TYPE_669:
-		lInfo+= "669 Composer / UNIS 669";
-		break;
-	case MOD_TYPE_ULT:
-		lInfo+= "ULT";
-		break;
-	case MOD_TYPE_STM:
-		lInfo+= "Scream Tracker";
-		break;
-	case MOD_TYPE_FAR:
-		lInfo+= "Farandole";
-		break;
-	case MOD_TYPE_AMF:
-		lInfo+= "ASYLUM Music Format";
-		break;
-	case MOD_TYPE_AMS:
-		lInfo+= "AMS module";
-		break;
-	case MOD_TYPE_DSM:
-		lInfo+= "DSIK Internal Format";
-		break;
-	case MOD_TYPE_MDL:
-		lInfo+= "DigiTracker";
-		break;
-	case MOD_TYPE_OKT:
-		lInfo+= "Oktalyzer";
-		break;
-	case MOD_TYPE_DMF:
-		lInfo+= "Delusion Digital Music Fileformat (X-Tracker)";
-		break;
-	case MOD_TYPE_PTM:
-		lInfo+= "PolyTracker";
-		break;
-	case MOD_TYPE_DBM:
-		lInfo+= "DigiBooster Pro";
-		break;
-	case MOD_TYPE_MT2:
-		lInfo+= "MT2";
-		break;
-	case MOD_TYPE_AMF0:
-		lInfo+= "AMF0";
-		break;
-	case MOD_TYPE_PSM:
-		lInfo+= "PSM";
-		break;
-	default:
-		lInfo+= "Unknown";
-		break;
-	}
-	lInfo += '\n';
-
-	lSongTime = lSoundFile->GetSongTime();
-	lStrStream.clear();
-	lStrStream << (int)(lSongTime / 60) << ":";
-	if(lSongTime % 60 < 10) //single digit for seconds?
-		lStrStream << '0'; //yes, so add a 0.
-	lStrStream << (int)(lSongTime % 60);
-
-	lStrStream << '\n';
-
-	lStrStream << (int)lSoundFile->GetMusicSpeed() << '\n';
-	lStrStream << (int)lSoundFile->GetMusicTempo() << '\n';
-	lStrStream << (int)(lNumSamples = lSoundFile->GetNumSamples()) << '\n';
-	lStrStream << (int)(lNumInstruments = lSoundFile->GetNumInstruments());
-	lStrStream << '\n';
-	lStrStream << (int)(lSoundFile->GetNumPatterns()) << '\n';
-	lStrStream << (int)lSoundFile->GetNumChannels();
-	lInfo += lStrStream.str();
-
-	gtk_label_set_text((GtkLabel*)lookup_widget(InfoWin, "info_general"), lInfo.c_str());
-
-	lInfo = "";
-	for(i = 0; i < lNumSamples; i++)
-	{
-		lSoundFile->GetSampleName(i, lBuffer);
-		tmps = MODPLUG_CONVERT(lBuffer);
-		lInfo += tmps;
-		g_free(tmps);
-		lInfo += '\n';
-	}
-	gtk_label_set_text((GtkLabel*)lookup_widget(InfoWin, "info_samples"), lInfo.c_str());
-
-	lInfo = "";
-	for(i = 0; i < lNumInstruments; i++)
-	{
-		lSoundFile->GetInstrumentName(i, lBuffer);
-		tmps = MODPLUG_CONVERT(lBuffer);
-		lInfo += tmps;
-		g_free(tmps);
-		lInfo += '\n';
-	}
-	gtk_label_set_text((GtkLabel*)lookup_widget(InfoWin, "info_instruments"), lInfo.c_str());
-
-	char message[MAX_MESSAGE_LENGTH];
-	static int length = 0;
-
-	//textbox = (GtkLabel*)lookup_widget(InfoWin, "info_message");
-	//gtk_text_backward_delete(textbox, length);
-	length = lSoundFile->GetSongComments(message, MAX_MESSAGE_LENGTH, 80);
-	if (length != 0) {
-		tmps = MODPLUG_CONVERT(message);
-		gtk_label_set_text((GtkLabel*)lookup_widget(InfoWin, "info_message"), tmps);
-		g_free(tmps);
-	}
-
-	//unload the file
-	lSoundFile->Destroy();
-	delete lSoundFile;
-	delete lArchive;
-
-	gtk_widget_show(InfoWin);
-}

audacious-plugins-2.5.3.tar.gz/src/modplug/gui/main.h Deleted

audacious-plugins-2.5.3.tar.gz/src/modplug/gui/modplug.glade Deleted

@@ -1,2048 +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="Config">
- <property name="width_request">500</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">ModPlug 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">False</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="hide_window"/>
-
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
-	<widget class="GtkNotebook" id="notebook1">
-	 <property name="border_width">4</property>
-	 <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="GtkVBox" id="vbox3">
-	 <property name="border_width">2</property>
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">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="GtkFrame" id="frame1">
-		 <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="GtkVBox" id="vbox4">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="bit16">
-			 <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>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="bit8">
-			 <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>
-			 <property name="group">bit16</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="xlabel2">
-			 <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="frame2">
-		 <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="GtkVBox" id="vbox5">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="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>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="mono">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Mono (downmix)</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">stereo</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="label3">
-			 <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="GtkHBox" id="hbox14">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
-
-		 <child>
-		 <widget class="GtkFrame" id="frame9">
-		 <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="GtkVBox" id="vbox15">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="resampNearest">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Nearest (fastest)</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="resampLinear">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Linear (fast)</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">resampNearest</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="resampSpline">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Spline (good quality)</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">resampNearest</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="resampPolyphase">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">8-tap Fir (extremely high quality)</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">resampNearest</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="label4">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Resampling</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="frame3">
-		 <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="GtkVBox" id="vbox6">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="samp96">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">96 kHz</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="samp48">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">48 kHz</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">samp96</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="samp44">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">44 kHz</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">samp96</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="samp22">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">22 kHz</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">False</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">samp96</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">Sampling Rate</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>
-	 </widget>
-	 <packing>
-	 <property name="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="label2">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Quality</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="vbox7">
-	 <property name="border_width">2</property>
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">0</property>
-
-	 <child>
-		<widget class="GtkHBox" id="hbox15">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
-
-		 <child>
-		 <widget class="GtkFrame" id="frame5">
-		 <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="GtkVBox" id="vbox20">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkCheckButton" id="fxReverb">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Enable</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">True</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="GtkTable" id="table1">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="n_rows">2</property>
-			 <property name="n_columns">2</property>
-			 <property name="homogeneous">False</property>
-			 <property name="row_spacing">4</property>
-			 <property name="column_spacing">4</property>
-
-			 <child>
-				<widget class="GtkHScale" id="fxReverbDepth">
-				 <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">1</property>
-				 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-				 <property name="inverted">False</property>
-				 <property name="adjustment">30 0 100 0 0 0</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>
-				</packing>
-			 </child>
-
-			 <child>
-				<widget class="GtkHScale" id="fxReverbDelay">
-				 <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">1</property>
-				 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-				 <property name="inverted">False</property>
-				 <property name="adjustment">90 40 200 0 0 0</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="x_options">fill</property>
-				</packing>
-			 </child>
-
-			 <child>
-				<widget class="GtkLabel" id="xlabel3">
-				 <property name="visible">True</property>
-				 <property name="label" translatable="yes">Depth</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="xlabel4">
-				 <property name="visible">True</property>
-				 <property name="label" translatable="yes">Delay</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>
-			 </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="label6">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Reverb</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="frame6">
-		 <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="GtkVBox" id="vbox21">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkCheckButton" id="fxBassBoost">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Enable</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">True</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="GtkTable" id="table2">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="n_rows">2</property>
-			 <property name="n_columns">2</property>
-			 <property name="homogeneous">False</property>
-			 <property name="row_spacing">4</property>
-			 <property name="column_spacing">4</property>
-
-			 <child>
-				<widget class="GtkHScale" id="fxBassAmount">
-				 <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">1</property>
-				 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-				 <property name="inverted">False</property>
-				 <property name="adjustment">30 0 100 0 0 0</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>
-				</packing>
-			 </child>
-
-			 <child>
-				<widget class="GtkHScale" id="fxBassRange">
-				 <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">1</property>
-				 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-				 <property name="inverted">False</property>
-				 <property name="adjustment">30 10 100 0 0 0</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="x_options">fill</property>
-				</packing>
-			 </child>
-
-			 <child>
-				<widget class="GtkLabel" id="xlabel5">
-				 <property name="visible">True</property>
-				 <property name="label" translatable="yes">Amount</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="xlabel6">
-				 <property name="visible">True</property>
-				 <property name="label" translatable="yes">Range</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>
-			 </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="label7">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Bass Boost</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="GtkHBox" id="hbox16">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
-
-		 <child>
-		 <widget class="GtkFrame" id="frame7">
-		 <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="GtkVBox" id="vbox22">
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkCheckButton" id="fxSurround">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Enable</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">True</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="GtkTable" id="table3">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="n_rows">2</property>
-			 <property name="n_columns">2</property>
-			 <property name="homogeneous">False</property>
-			 <property name="row_spacing">4</property>
-			 <property name="column_spacing">4</property>
-
-			 <child>
-				<widget class="GtkHScale" id="fxSurroundDepth">
-				 <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">1</property>
-				 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-				 <property name="inverted">False</property>
-				 <property name="adjustment">20 0 100 0 0 0</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>
-				</packing>
-			 </child>
-
-			 <child>
-				<widget class="GtkHScale" id="fxSurroundDelay">
-				 <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">1</property>
-				 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-				 <property name="inverted">False</property>
-				 <property name="adjustment">20 5 40 0 0 0</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="x_options">fill</property>
-				</packing>
-			 </child>
-
-			 <child>
-				<widget class="GtkLabel" id="xlabel7">
-				 <property name="visible">True</property>
-				 <property name="label" translatable="yes">Depth</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="label8">
-				 <property name="visible">True</property>
-				 <property name="label" translatable="yes">Delay</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>
-			 </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="xlabel8">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Surround</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="frame10">
-		 <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="GtkVBox" id="vbox16">
-			 <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="fxPreamp">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Enable</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="hbox11">
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">4</property>
-
-			 <child>
-				<widget class="GtkLabel" id="label19">
-				 <property name="visible">True</property>
-				 <property name="label" translatable="yes">Volume</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="GtkHScale" id="fxPreampLevel">
-				 <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">1</property>
-				 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-				 <property name="inverted">False</property>
-				 <property name="adjustment">0 -3 3 1 0 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>
-
-			 <child>
-			 <widget class="GtkLabel" id="label20">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Note: Setting the preamp
-too high may cause clipping
-(annoying clicks and pops)!</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>
-		 </child>
-
-		 <child>
-			<widget class="GtkLabel" id="label9">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Preamp</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>
-	 </widget>
-	 <packing>
-	 <property name="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="label10">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Effects</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="vbox19">
-	 <property name="border_width">2</property>
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">0</property>
-
-	 <child>
-		<widget class="GtkFrame" id="frame4">
-		 <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="GtkHBox" id="hbox3">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
-
-		 <child>
-			<widget class="GtkVBox" id="vbox8">
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkCheckButton" id="fxUseFilename">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Use Filename as Song Title</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="GtkCheckButton" id="fxFastInfo">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Fast Playlist Info</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">True</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>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkVBox" id="vbox9">
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkCheckButton" id="fxNR">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Noise Reduction</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">True</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="GtkCheckButton" id="fxAmigaMOD">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Play Amiga MOD</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">True</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>
-			</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">General</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="frame11">
-		 <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="GtkVBox" id="vbox17">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
-
-		 <child>
-			<widget class="GtkRadioButton" id="fxNoLoop">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Don't loop</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="hbox13">
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="fxLoopFinite">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Loop</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">fxNoLoop</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="fxLoopCount">
-			 <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">1 0 100 1 10 10</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="xlabel21">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">time(s)</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">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkRadioButton" id="fxLoopForever">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Loop forever</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">fxNoLoop</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="label22">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Looping</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="xlabel22">
-	 <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="hbuttonbox2">
-	 <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="config_ok">
-	 <property name="visible">True</property>
-	 <property name="can_default">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="label" translatable="yes">OK</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="on_config_ok_clicked"/>
-	 </widget>
-	 </child>
-
-	 <child>
-	 <widget class="GtkButton" id="config_apply">
-	 <property name="visible">True</property>
-	 <property name="can_default">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="label" translatable="yes">Apply</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="on_config_apply_clicked"/>
-	 </widget>
-	 </child>
-
-	 <child>
-	 <widget class="GtkButton" id="config_cancel">
-	 <property name="visible">True</property>
-	 <property name="can_default">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="label" translatable="yes">Cancel</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="on_config_cancel_clicked"/>
-	 </widget>
-	 </child>
-	</widget>
-	<packing>
-	 <property name="padding">0</property>
-	 <property name="expand">True</property>
-	 <property name="fill">True</property>
-	</packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkWindow" id="Info">
- <property name="visible">True</property>
- <property name="title" translatable="yes">MOD Info</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="hide_window"/>
-
- <child>
- <widget class="GtkVBox" id="vbox14">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
-	<widget class="GtkNotebook" id="notebook2">
-	 <property name="border_width">4</property>
-	 <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="hbox9">
-	 <property name="border_width">2</property>
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">0</property>
-
-	 <child>
-		<widget class="GtkLabel" id="label11">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Filename:
-Title:
-Type:
-Length:
-Speed:
-Tempo:
-Samples:
-Instruments:
-Patterns:
-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="padding">4</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkLabel" id="info_general">
-		 <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.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">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="label13">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">General</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="GtkScrolledWindow" id="scrolledwindow1">
-	 <property name="border_width">6</property>
-	 <property name="visible">True</property>
-	 <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-	 <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	 <property name="shadow_type">GTK_SHADOW_NONE</property>
-	 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	 <child>
-		<widget class="GtkViewport" id="viewport1">
-		 <property name="visible">True</property>
-		 <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		 <child>
-		 <widget class="GtkLabel" id="info_samples">
-		 <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">7.45058015283e-09</property>
-		 <property name="yalign">7.45058015283e-09</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>
-	 <packing>
-	 <property name="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="label15">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Samples</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="GtkScrolledWindow" id="scrolledwindow2">
-	 <property name="border_width">6</property>
-	 <property name="visible">True</property>
-	 <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-	 <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	 <property name="shadow_type">GTK_SHADOW_NONE</property>
-	 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	 <child>
-		<widget class="GtkViewport" id="viewport2">
-		 <property name="visible">True</property>
-		 <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		 <child>
-		 <widget class="GtkLabel" id="info_instruments">
-		 <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">1.49012002737e-08</property>
-		 <property name="yalign">7.45058015283e-09</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>
-	 <packing>
-	 <property name="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="label17">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Instruments</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="GtkScrolledWindow" id="scrolledwindow3">
-	 <property name="visible">True</property>
-	 <property name="hscrollbar_policy">GTK_POLICY_NEVER</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="info_message">
-		 <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="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="label18">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Message</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">8</property>
-	 <property name="expand">True</property>
-	 <property name="fill">True</property>
-	</packing>
- </child>
-
- <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox3">
-	 <property name="border_width">2</property>
-	 <property name="visible">True</property>
-	 <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-	 <property name="spacing">30</property>
-
-	 <child>
-	 <widget class="GtkButton" id="info_close">
-	 <property name="visible">True</property>
-	 <property name="can_default">True</property>
-	 <property name="can_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="on_info_close_clicked"/>
-	 </widget>
-	 </child>
-	</widget>
-	<packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">False</property>
-	</packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>

audacious-plugins-2.5.3.tar.gz/src/modplug/gui/modplug.gladep Deleted

audacious-plugins-2.5.3.tar.gz/src/modplug/gui/support.cxx 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 "support.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-2.5.3.tar.gz/src/modplug/gui/support.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-2.5.3.tar.gz/src/mpg123/id3skip.c Deleted

@@ -1,57 +0,0 @@
-/*
- * id3skip.c
- * Copyright 2010 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 <string.h>
-
-#include <glib.h>
-
-#pragma pack(push) /* must be byte-aligned */
-#pragma pack(1)
-struct id3_header
-{
- gchar magic[3];
- guchar version;
- guchar revision;
- guchar flags;
- guint32 size;
-};
-#pragma pack(pop)
-
-static guint32 unsyncsafe (guint32 x)
-{
- return (x & 0x7f) | ((x & 0x7f00) >> 1) | ((x & 0x7f0000) >> 2) | ((x &
- 0x7f000000) >> 3);
-}
-
-gint id3_header_size (const guchar * data, gint size)
-{
- struct id3_header header;
-
- if (size < sizeof (struct id3_header))
- return 0;
-
- memcpy (& header, data, sizeof (struct id3_header));
-
- if (memcmp (header.magic, "ID3", 3))
- return 0;
-
- return sizeof (struct id3_header) + unsyncsafe (GUINT32_FROM_BE (header.size));
-}

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123 Deleted

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/AUTHORS Deleted

@@ -1,145 +0,0 @@
-This is an attempt to give credit to the people who contributed in some way to the mpg123 project.
-There are names and email addresses listed. Please use these addresses only to contact contributors with some question about their mpg123 contribution.
-You are explicitly not allowed to send them unwanted business offers or to question the quality of their sex life.
---------------------
-
-Current maintainers with various sorts of contributions:
-	Thomas Orgis <thomas@orgis.org>
-	Nicholas J Humfrey <njh@ecs.soton.ac.uk>
-
-Generic address pointing to the current maintainer (hopefully still works in future in case maintainership will change again): <maintainer@mpg123.org>
-
-The creator: Michael Hipp (email: hippm@informatik.uni-tuebingen.de - please bother maintainers first)
-
-Contributions/ideas Thomas Orgis era (includes backports from mhipp trunk):
-
-Jonathan Yong (jon_y) <10walls@gmail.com>: win32 hacking
-Malcolm Boczek <MBoczek@terraindustries.com>: Common language runtime wrapper
-Elbert Pol (TeLLie) <elbert.pol@gmail.com>: OS/2 port fixup
-Jeroen Valkonet <jvalkon@xs4all.nl>: motivate pitch control, suggestive patch for pitch command in generic control interface
-Andy Hefner <ahefner@gmail.com>: patch for that second UTF16 issue
-Taihei Monma <tmkk@mac.com>: A whole lot of new/improved assembler code, including Altivec!
-Christian Weisgerber <naddy@openbsd.org>: sndio output
-Patrick Dehne (P4tr3ck) <patrick@steidle.net>: more MSVC++ porting, patch to handle missing bit reservoirs
-Thorsten Glaser <tg@mirbsd.de>: icy2utf8, suggest utf8 locale stuff
-Dan Smith <dan@algenta.com>: ABI fixes for ensuring stack alignment (esp. for MinGW-built DLL with MSVC)
-Michael Ryzhykh <mclroy@gmail.com>: mpg123.spec.in
-Stefan Lenselink <Stefan@lenselink.org>: initial aRts output
-Sergej Kvachonok <ravenexp@gmail.com>: win32 audio rewrite
-Winston: SunOS-4.1.4/gcc-2.7.0 testing and suggestions for fixes (legacy Makefile, integer type headers)
-Mika Tiainen: pointing out the fix for the UTF to ASCII filtering of tags to actually work
-Nick Kurshev <nickols_k@mail.ru>: extended 3dnow (from mplayer)
-Zuxy Meng <zuxy.meng@gmail.com>: SSE (from mplayer)
-Honza <cundrak@quick.cz>: idea and prototype patch for ICY meta data support
-Petr Baudis <pasky@ucw.cz>: patches: term sigcont, id3 display unicode fallback and condensed output
-Petr Salinger <Petr.Salinger@seznam.cz>: i486 enhancement
-mpdavig@users.sourceforge.net: linux-ppc-nas Makefile.legacy entry
-Adrian Bacon <adrian.bacon@xs4all.nl>: patched decode_i586_dither (noise shaped float/int rounding)
-Cool Feet Audio project <nutcase@dtfm.org>: realtime equalizer control
-Steve Grundell <www@grundell.u-net.com>: clean stdout in control mode with stdout decoding
-Romain Dolbeau <romain@dolbeau.org>: Altivec support (taken from mplayer)
-higway <higway@mednet.md>: MMX Patch
-Clemens Ladisch <clemens@ladisch.de>: ALSA 0.9/1.0 support
-
-Debian Daniel Kobras <kobras@debian.org> era:
-
-Steve Kemp <skx@debian.org>
-Dan Olson <theoddone33@icculus.org>
-Syuuhei Kashiyama <squash@mb.kcom.ne.jp>
-Rupert Levene <rupert.debian@hotpop.com>
-Andreas Dilger <adilger@turbolinux.com>
-Erik B. Andersen <andersee@debian.org>
-Chris Butler <chrisb@debian.org>
-Martin Sjogren <md9ms@mdstud.chalmers.se>
-Chet Hosey <chosey@budapress.com>
-Roland Rosenfeld <roland@spinnaker.de>
-
-
-Debian Colin Watson <cjwatson@debian.org> era:
-
-Helge Deller <deller@gmx.de>
-Chet Hosey <chosey@budapress.com>
-Christopher C. Chimelis <chris@debian.org>
-Roland Rosenfeld <roland@spinnaker.de>
-Marcelo E. Magallon <mmagallo@debian.org>
-
-
-Initial Debianers:
-
-Tommi Virtanen <tv@debian.org>
-Paul Haggart <phaggart@debian.org>
-
-
-Contributions/ideas Michael Hipp era:
-
-Mikko Tommila: DCT9
-Oliver Fromme <oliver.fromme@heim3.tu-clausthal.de>
-MPEG Software Simulation Group: reference decoder package
-Tobias Bading: idea for DCT64 in subband synthesis from maplay package
-Jeff Tsay and Mikko Tommila: MDCT36 from maplay package
-Philipp Knirsch <phil@mpik-tueb.mpg.de>: DCT36/manual unroll idea
-Thomas Woerner: SGI Audio
-Damien Clermonte: HP-UX audio fixes
-Niclas Lindstrom <nil@wineasy.se>: OS2 port
-Stefan Bieschewski <stb@acm.org>: Pentium optimizations, decode_i586.s
-Martin Denn <mdenn@unix-ag.uni-kl.de>: NAS port
-Niklas Beisert <nbeisert@physik.tu-muenchen.de>: MPEG 2.5 tables
-<mycroft@NetBSD.ORG> and <augustss@cs.chalmers.se>: NetBSD Patch(es)
-Kevin Brintnall <kbrint@visi.com>: BSD patch
-Tony Million: win32 port
-Steven Tiger Lang: advanced shuffle
-Eric B. Mitchell: esd port
-Ryan R. Prosser <prosser@geocities.com>: esd port for Solaris
-Andreas Neuhaus: initial generic control interface
-
-(additionally fetched from changelog:)
-
-Ralf Hildebrandt <R.Hildebrandt@TU-BS.DE>: audio_alib changes
-<sms@moe.2bsd.com>: BSDOS 4.0 with gcc added to Makefile
-Bertrand Petit <elrond@phoe.netdev.net>: frontend changes
-Erik Mouw <J.A.K.Mouw@its.tudelft.nl>: SGI audio fix for non RAD machines
-Daniel O'Connor <darius@guppy.dons.net.au>: freebsd-esd make-entry
-D. Skarda <0rfelyus@atrey.karlin.mff.cuni.cz>: enhanced head_check
-Wilson, Jeff D <jeff.wilson@wilcom.com>: xterm-title
-Robert Bihlmeyer <robbe@orcus.priv.at>: esd changes
-Hannu Napari's <Hannu.Napari@hut.fi>: SGI audio patches
-<Juergen.Schoew@unix-ag.uni-siegen.de>: native AIX support
-<psst@euskalnet.net>: playlist patch
-Gilles Zunino <Gilles.Zunino@hei.fupl.asso.fr>: SGI audio patches
-Matthew Parslow <roy@alpha.alphalink.com.au>: esdserver patch
-<dlux@dlux.sch.bme.hu>: equalizer patch (equalfile setting)
-Ducroquet Erwan <ducroque@ufr-info-p7.ibp.fr>: HPUX/ALib support
-Shane Wegner <shane@CM.NU>: genrepatch
-Samuel Audet <guardia@step.polymtl.ca>: wav-File patch
-"J. Dean Brederson" <jdb@cs.utah.edu>: SGI-RAD support
-Chou Ye-chi <is84002@cis.nctu.edu.tw>: sajberplay/FreeBSD patch
-Fabrice Bellard <bellard@email.enst.fr>: 486 optimizations
-A. Hermansen <ahermans@vf.telia.no> and J. Kysela <perex@jcu.cz>: ALSA output
-KIMURA Takuhiro <kim@hannah.ipc.miyakyo-u.ac.jp>: K6-3DNow
-Petr Stehlik <stehlik@cas3.zlin.vutbr.cz>: MINT
-Andy <andy@snoogie.demon.co.uk>: float2int speed up proposal
-Brian Foutz <foutz@anise.ee.cornell.edu>: TK3Play
-Thomas Niederreiter <tn@tarantel.rz.fh-muenchen.de>: RIFF header fix
-Stefan Gybas <cab@studbox.uni-stuttgart.de>: m68k patch 
-Grant Erickson <eric0139@tc.umn.edu>: Linux PPC patch
-Peter Berger <peterb@hoopoe.psc.edu>: BSDi patch 
-Henrik P Johnson <king@one.se>: HTTP auth
-Steven Tiger Lang <tiger@tyger.org>: advanced shuffle
-"Brian J. Swetland" <swetland@uiuc.edu>: front-end (remote) patch
-<leo@zycad.com>
-Tillmann Steinbrecher <tst@gmx.de>: shuffle patch
-M.Stekelenburg <m.stekelenburg@student.utwente.nl>: i386-getbits
-Antti Andreimann <anttix@cyberix.edu.ee>: outburst patch
-Hur TaeSung <saturn@arari.snu.ac.kr>: 'http accept' patch 
-
-(from post-0.59 changes that yet have to go into new trunk:)
-
-Hans Schwengeler <schweng@astro.unibas.ch>: audio_dec additions
-Wojciech Barañski's Mp3Play (check the tools folder): Mp3Play frontend
-Daniel Koukola: audio_oss.c patch
-Munechika SUMIKAWA <sumikawa@ebina.hitachi.co.jp>: IPv6
-TEMNOTA <temnota@kmv.ru>: HTTP,FTP patch/playlist fix
-Peter Surda <shurdeek@panorama.sth.ac.at>: VBR patch
-Ben <ben@blaukopf.com>: ARM startup time improvements 
-Dave MacKenzie <djm@pix.net>: init_output() patch
-pasky's <pasky@ju.cz>: close-on-stop patch

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/COPYING Deleted

@@ -1,773 +0,0 @@
-This is the file that contains the terms of use, copying, etc. for the mpg123 distribution package.
-
-Main message:
-
-	Code is copyrighted by Michael Hipp, who made it free software under the terms of the LGPL 2.1.
-
-But that is not all of it.
-mpg123 is licensed under the GNU General Lesser Public License, version 2.1, and in parts under the GNU General Public License, version 2.
-That means that _all_ of mpg123 is licensed under GPL and the major part also under the LGPL.
-
-Actually, the "major part" currently is the whole distributed package of mpg123. There are some files (old alsa output, libao output) that you get from our svn repository and that do not fall under LGPL.
-
-When the copyright marker in a source file says "the mpg123 project" that means that the file contains code copyrighted by contributors to mpg123, the "initially written by" naming the person(s) that created the file and thus may have the largest part of copyrights on it.
-I am explaining this here to emphasize that the copyright always actually lies by the individual member (i.e. contributor to) of the mpg123 project who wrote a specific section of code.
-Usage of a source code management system like Subversion should provide keeping track of individual copyright traces...
-
-Please consider that any code that is contributed to the mpg123 project shall be licensed under LGPL 2.1 .
-If you want to contribute, but don't agree to that (i.e. you want to have your code GPL only) please say so - then, we either you convince is to include your code under GPL, we convince you to make it LGPL instead or, as a last resort, you'll have to do you own GPLed fork.
-But we should try to avoid the last option...
-
-All files in the distribution that don't carry a license note on their own are licensed under the terms of the LGPL 2.1; all files that do carry either a LGPL or GPL note are licensed respectively under the LGPL or GPL as follows:
-
-
-=======================
-1. The LGPL version 2.1
-=======================
-
-
-  GNU LESSER GENERAL PUBLIC LICENSE
-       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-     END OF TERMS AND CONDITIONS
-
-
-====================
-2. The GPL version 2
-====================
-
-
-   GNU GENERAL PUBLIC LICENSE
-       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-     END OF TERMS AND CONDITIONS

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/README Deleted

@@ -1,237 +0,0 @@
-This is a modified copy of libmpg123 for use in Audacious. The newer 1.12 has
-been released at the time of this writing, but is unusable because of a tendency
-to crash (Debian bug #580095) and because of API changes related to the use of
--D_FILE_OFFSET_BITS=64 (briefly, 32-bit 1.10 as packaged by Debian requires the
-flag, while 64-bit 1.12 as packaged by Gentoo is broken by it).
-
- John Lindgren
- June 9, 2010
-
-Change log:
-
-John Lindgren, June 9, 2010:
- * Imported libmpg123 1.10.0.
- * Removed some configuration stuff from mpg123.h.in and renamed it mpg123.h.
- * Added local config.h.
-
-John Lindgren, June 21, 2010:
- * Updated to libmpg123 1.12.2.
-
-John Lindgren, July 16, 2010:
- * Updated to libmpg123 1.12.3.
- * Imported upstream revision 2760 (fixes an unused variable warning).
-
-John Lindgren, February 6, 2011:
- * Updated to libmpg123 1.13.1.
-
-John Lindgren, February 16, 2011:
- * Imported upstream revision 2843 (fixes an unused variable warning).
- 
-John Lindgren, March 27, 2011:
- * Updated to libmpg123 1.13.2.
-
- ======
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* mpg123 - MPEG 1.0/2.0/2.5 audio player *
-* README for version 1.x.y, dated at 14.06.2009 *
-* *
-* ...still the fastest MPEG audio player for UNIX ;) *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * *
-(This file has very long lines - die-hard terminal nostalgists can be satisfied by `fmt -s -w 75 < README | less`. I think it's better to let the reader's preference rule than to preformat the stuff to some arbitrary width.)
-
-
-0. Stuff
-
-For building/installation info see INSTALL.
-
-The mpg123 project was started by Michel Hipp and is now being maintained by Thomas Orgis and Nicholas J. Humfrey, who initiated the Sourceforge project.
-The source code contains contributions from quite a few people - see AUTHORS for more info.
-It is Open Source software licensed mostly under the LGPL with some parts restricted to GPL. See COPYING for details.
-As for every mp3 player, some of mpg123's functionality may be covered by patents in a country where these are valid. See PATENTS for details.
-
-Project's official website URL is
-
-	http://mpg123.org
-(or http://mpg123.orgis.org as fallback address if there is a problem with the DNS forwarding)
-
-for the traditional home page and
-
-	http://sourceforge.net/projects/mpg123
-
-for sourceforge.net based services like download mirrors, mailing lists and bug/feature trackers.
-Please use the sourceforge download mirrors when possible to minimize load on the mpg123.org server.
-
-
-1. Introduction
-
-This is a console based decoder/player for mono/stereo mpeg audio files, probably more familiar as MP3 or MP2 files.
-It's focus is speed. We still need some low-end benchmarks for the current version, but playback should be possible even on i486 CPUs. There is hand-optimized assembly code for i586, MMX, 3DNow, SEE and 3DNowExt instructions, while generic code runs on a variety of different platforms and CPUs.
-It can play MPEG1.0/2.0/2.5 layer I, II, II (1, 2, 3;-) files (VBR files are fine, too) and produce output on a number of different ways: raw data to stdout and different sound systems depending on your platform (see INSTALL).
-Most tested are Linux on x86 and Alpha/AXP and MacOSX on ppc as the environments the current developers work in.
-We are always thankful for user reports on success (and failure) on any platform!
-
-
-2. Contact
-
-short:
-
-	mpg123-devel@lists.sourceforge.net
-	mpg123-users@lists.sourceforge.net
-or 
-	maintainer@mpg123.org
-
-long: see doc/CONTACT
-
-
-3. Interface/Usage
-
-Please consult the manpage mpg123(1). Some starter info follows.
-
-3.1 Simple Console Usage
-
-Mpg123 is a console program - normally it just plays a list of files you specify on command line and that's it. See the included manpage or
-
-	mpg123 --help
-
-or, for the full story,
-
-	mpg123 --longhelp
-
-on command line syntax/options. I encourage you to check out the --gapless and --rva-album/--rva-mix options:-)
-
-In the simple "mpg123 file1.mp3 file2.mp3" mode, the only thing you can do to interact is to press Ctrl+C to skip to next track or end the whole playback if pressing it twice.
-
-Note that this Ctrl+C behaviour is special to this mode; when any of the following is activated, Ctrl+C will just kill the program like you would expect normally (this changed from earlier versions).
-
-3.2 Advanced Console Usage
-
-You can specify the option -C to enable a terminal control interface enabling to influence playback on current title/playlist by pressing some key:
-
- -= terminal control keys =-
-[s] or [ ]	interrupt/restart playback (i.e. 'pause')
-[f]	next track
-[d]	previous track
-[b]	back to beginning of track
-[p]	pause while looping current sound chunk
-[.]	forward
-[,]	rewind
-[:]	fast forward
-[;]	fast rewind
-[>]	fine forward
-[<]	fine rewind
-[+]	volume up
-[-]	volume down
-[r]	RVA switch
-[v]	verbose switch
-[l]	list current playlist, indicating current track there
-[t]	display tag info (again)
-[m]	print MPEG header info (again)
-[h]	this help
-[q]	quit
-
-You can change these bindings to key to your liking by modifying term.h .
-
-Note: This interface needs not to be available on _every_ platform/build.
-
-Another note: The volume up and down is performed by changing the scale factor (like the -f parameter) ... so the audio is scaled digitally in the given range of the output format (usually 16bits). That means the lowering the volume will decrease the dynamic range and possibly lessen the quality while increasing volume can in fact increase the dynamic range and thus make it better, if you deal with a silent source and no clipping is necessary.
-It is a good idea to use RVA values stored in the file for adjusting low volume files, though - mpg123 handles that in addition to your volume setting.
-
-3.3 Control Interface for Frontends
-
-There used to be several interfaces for frontends left over from that past, but only one of them remains for the present and future:
-
-	The Generic Control Interface
-
-It contains of communication of textual messages via standard input to mpg123 and responses to standard output unless the -s switch for output of audio data on stdout is used - then the responses come via stderr.
-
-See doc/README.remote for usage.
-
-
-4. Speed
-
-mpg123 is fast. Any faster software player is probably based on some hacked mpg123;-)
-MPlayer included mpg123 source code in it's mp3lib and we have to be thankful for the MPlayer folks adding SSE, 3DNowExt and AltiVec optimizations over the years, which we were able to backport.
-
-mpg123 includes the AltiVec optimization since version 0.61 and the SSE and 3DNowExt optimizations since 0.66 .
-Also, version 0.66 adds the merged x86 optimization build, which includes every applicable optimization for x86 cpus except the one for i486, wich is a bit special.
-
-Now mpg123 catched up with MPlayer's mp3lib concerning decoding speed on my Pentium M (which supports SSE):
-Decoding a certain album (Queensryche's Rage for Order) to /dev/null took 22.4s user time with mpg123-0.66 compared to 24.7s with MPlayer-1.0rc1 .
-
-Also, beginning with mpg123 1.8.0, there are fresh x86-64 SSE optimizations (provided by Taihei Monma) which make mpg123 the fastest MPEG audio decoder in my knowledge also on current 64bit x86 systems.
-
-5. Accuracy
-
-The mpg123 engine is able to decode in full compliance to ISO/IEC 11172-3, for all three layers, using floating point or integer math (the latter since 1.8.1).
-Accuracy of 16bit output depends on specific optimization in use and compile-time choice about the rounding mode (which is performance relevant).
-
-The ISO test suite is incorporated in the mpg123 subversion repository under svn://orgis.org/mpg123/test, nightly tests of a build (with high-quality 16bit rounding) are published on the mpg123 website.
-
-Dithered 16bit output is available as an option (the --cpu choices ending with _dither). See
-
-	http://dither123.dyndns.org
-
-on the whereabouts.
-
-6. History
-
-A looooong time ago (mid-90s), Michael Hipp wrote some initial mpg123 and made it _the_ Unix console mp3 player in the following years.
-The exact date of birth is fuzzy in human memory, but according to the master himself (Michael) mpg123 started in 1994 as an MP2 player which a year later, 1995, gained MP3 ability.
-The core decoder files have mostly 1995 as their birth year listed, so one can say that mpg123 as the layer1,2,3 player was born in 1995.
-In any case, that is a looooong time ago for a media player - especially for one that is still alive!
-
-This is the historic description:
-
-	This isn't a new player. It's a fully rewritten version originally based 
-	on the mpegaudio (FHG-version) package. The DCT algorithm in the
-	synthesis filter is a rewritten version of the DCT first seen in the maplay
-	package, which was written by Tobias Bading (bading@cs.tu-berlin.de). The 
-	rewrite was necessary, because the GPL may not allow this copyright mix.
-	The mpegaudio package was written by various people from the MPEG/audio
-	software simulation group. The maplay is under GPL .. You can find the
-	original source code and the mpegaudio package on: ftp.tnt.uni-hannover.de.
-
-	Especially layer3.c common.c and mpg123.h is based on the dist10 package.
-	The code is fully rewritten but I'm using sometimes the
-	same variable names or similar function names as in the
-	original package.
-
-	In the current layer3.c I'm using a DCT36 first seen in Jeff Tsay's 
-	(ctsay@pasteur.eecs.berkeley.edu) maplay 1.2+ package. His code is
-	under GPL .. I also tried the enhancement from Mikko Tommila. His
-	code is also in layer3.c (but it's disabled at the moment, because
-	it was slightly slower than the unrolled 9 point DCT (at least on 
-	_my_ system)). Theoretically it should be faster. You may try it on
-	your system.
-
-Well, that's how it started...
-Official development ceased due to the typical lack-of-time syndrome around 2002 and the free-floating patches began to seize the day.
-
-But before that, Michael wrote or rewrote the essential code; others contributed their bits.
-The main message is:
-
-Code is copyrighted by Michael Hipp, who made it free software under the terms of the LGPL 2.1.
-
-Please see doc/ROAD_TO_LGPL, COPYING and AUTHORS for details on that. Note that the only notable legacy non-LGPL file was the old alsa output that didn't work with alsa 0.9/1.0 anymore.
-Also, there has been a libao output in the betas 0.60 for a short period. Libao being generally problematic for us because of its GPL license, this output is not distributed anymore in the release packages. There is now a new, LGPLed alsa output that made both the old alsa and libao obsolete for our purposes.
-So, the distributed mpg123 releases actually only contain LGPL code, but you get the other files from our subversion repository if you checkout the trunk / version tags.
-
-There has been quite some confusion about the licensing and "freeness" of mpg123 in the past.
-The initial "free for private use, ask me when you want to do something commercial" license caused some people to avoid mpg123 and even to write a replacement mimicking the interface but using a different decoding engine - what was not actively developed for too long but entered the "free" software sections.
-
-The Debian (non-free section) and Gentoo distributions cared about the last stable and the last development release of mpg123 over the years with mainly applying security fixes. Thanks go to the distribution maintainers for not letting it alone to bitrot over the years.
-
-Thomas Orgis started to hack on mpg123 in 2004 while working on his personal audio experience with mixplayd and later DerMixD, utilizing the generic control interface. In Feb 2005, he crammed control interface improvements together with Debian's r19 fixes and released the personal fork/patch named mpg123-thor.
-Little later that year, Nicholas J. Humphrey independently created the sourceforge project and released an autotooled 0.59r under official GPL flag with Debian and MacOSX fixes.
-In the beginning of 2006, Thomas finally decided that he could work "officially" on mpg123 and contacted Michael Hipp for taking over maintainership.
-Michael was all-positive about letting mpg123 really live again (and perhaps see version 1.0 some time;-) and also pointed at the sourceforge project that didn't see much activity since the initial release. 
-A lot of emails and some weeks later there was the two-developer team of Nicholas and Thomas working on merging their mpg123 variants as well as adding some features and fixes to let it shine again.
-
-And there we are now...
-
-7. End
-
-Have fun!
-____________
-Thomas Orgis

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/compat.c Deleted

@@ -1,152 +0,0 @@
-/*
-	compat: Some compatibility functions.
-
-	The mpg123 code is determined to keep it's legacy. A legacy of old, old UNIX.
-	So anything possibly somewhat advanced should be considered to be put here, with proper #ifdef;-)
-
-	copyright 2007-8 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis, Windows Unicode stuff by JonY.
-*/
-
-#include "config.h"
-#include "compat.h"
-
-#ifdef _MSC_VER
-#include <io.h>
-#else
-#include <fcntl.h>
-#endif
-#include <sys/stat.h>
-
-#ifdef WANT_WIN32_UNICODE
-#include <wchar.h>
-#include <windows.h>
-#include <winnls.h>
-#endif
-
-#include "debug.h"
-
-/* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */
-void *safe_realloc(void *ptr, size_t size)
-{
-	if(ptr == NULL) return malloc(size);
-	else return realloc(ptr, size);
-}
-
-#ifndef HAVE_STRERROR
-const char *strerror(int errnum)
-{
-	extern int sys_nerr;
-	extern char *sys_errlist[];
-
-	return (errnum < sys_nerr) ? sys_errlist[errnum] : "";
-}
-#endif
-
-#ifndef HAVE_STRDUP
-char *strdup(const char *src)
-{
-	char *dest;
-
-	if (!(dest = (char *) malloc(strlen(src)+1)))
-	return NULL;
-	else
-	return strcpy(dest, src);
-}
-#endif
-
-int compat_open(const char *filename, int flags)
-{
-	int ret;
-#if defined (WANT_WIN32_UNICODE)
-	const wchar_t *frag = NULL;
-
-	ret = win32_utf8_wide(filename, &frag, NULL);
-	if ((frag == NULL) || (ret == 0)) goto fallback; /* Fallback to plain open when ucs-2 conversion fails */
-
-	ret = _wopen(frag, flags); /*Try _wopen */
-	if (ret != -1 ) goto open_ok; /* msdn says -1 means failure */
-
-fallback:
-#endif
-
-#if (defined(WIN32) && !defined (__CYGWIN__)) /* MSDN says POSIX function is deprecated beginning in Visual C++ 2005 */
-	ret = _open(filename, flags); /* Try plain old _open(), if it fails, do nothing */
-#else
-	/* On UNIX, we always add a default permission mask in case flags|O_CREAT. */
-	ret = open(filename, flags, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
-#endif
-
-#if defined (WANT_WIN32_UNICODE)
-open_ok:
-	free ((void *)frag); /* Freeing a NULL should be OK */
-#endif
-
-	return ret;
-}
-
-int compat_close(int infd)
-{
-#if (defined(WIN32) && !defined (__CYGWIN__)) /* MSDN says POSIX function is deprecated beginning in Visual C++ 2005 */
-	return _close(infd);
-#else
-	return close(infd);
-#endif
-}
-
-/* Windows Unicode stuff */
-
-#ifdef WANT_WIN32_UNICODE
-int win32_wide_utf8(const wchar_t * const wptr, const char **const mbptr, size_t * const buflen)
-{
-	size_t len;
-	char *buf;
-	int ret;
-
-	len = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, NULL, 0, NULL, NULL); /* Get utf-8 string length */
-	buf = calloc(len, sizeof (char)); /* Can we assume sizeof char always = 1? */
-	debug2("win32_wide_utf8 allocated %u bytes at %p", len, buf);
-
-	if(buf != NULL)
-	{
-		ret = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, buf, len, NULL, NULL); /*Do actual conversion*/
-		*mbptr = buf; /* Set string pointer to allocated buffer */
-		if(buflen != NULL) *buflen = len * sizeof (char); /* Give length of allocated memory if needed. */
-
-		return ret;
-	}
-	else
-	{
-		if(buflen != NULL) *buflen = 0;
-
-		return 0;
-	}
-}
-
-int win32_utf8_wide(const char *const mbptr, const wchar_t ** const wptr, size_t * const buflen)
-{
-	size_t len;
-	wchar_t *buf;
-	int ret;
-
-	len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, NULL, 0); /* Get converted size */
-	buf = calloc(len, sizeof (wchar_t)); /* Allocate memory accordingly */
-	debug2("win32_utf8_wide allocated %u bytes at %p", len, buf);
-
-	if(buf != NULL)
-	{
-		ret = MultiByteToWideChar (CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, buf, len); /* Do conversion */
-		*wptr = buf; /* Set string pointer to allocated buffer */
-		if (buflen != NULL) *buflen = len * sizeof (wchar_t); /* Give length of allocated memory if needed. */
-
-		return ret;
-	}
-	else
-	{
-		if (buflen != NULL) *buflen = 0;
-
-		return 0;
-	}
-}
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/compat.h Deleted

@@ -1,178 +0,0 @@
-/*
-	compat: Some compatibility functions and header inclusions.
-	Basic standard C stuff, that may barely be above/around C89.
-
-	The mpg123 code is determined to keep it's legacy. A legacy of old, old UNIX.
-	It is envisioned to include this compat header instead of any of the "standard" headers, to catch compatibility issues.
-	So, don't include stdlib.h or string.h ... include compat.h.
-
-	copyright 2007-8 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis
-*/
-
-#ifndef MPG123_COMPAT_H
-#define MPG123_COMPAT_H
-
-#include "config.h"
-#include "intsym.h"
-
-#ifdef HAVE_STDLIB_H
-/* realloc, size_t */
-#include <stdlib.h>
-#endif
-
-#include <stdio.h>
-#include <math.h>
-
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#else
-#ifdef HAVE_SYS_SIGNAL_H
-#include <sys/signal.h>
-#endif
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-/* Types, types, types. */
-/* Do we actually need these two in addition to sys/types.h? As replacement? */
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-/* We want SIZE_MAX, etc. */
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
- 
-#ifndef SIZE_MAX
-#define SIZE_MAX ((size_t)-1)
-#endif
-#ifndef ULONG_MAX
-#define ULONG_MAX ((unsigned long)-1)
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef OS2
-#include <float.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-/* For select(), I need select.h according to POSIX 2001, else: sys/time.h sys/types.h unistd.h */
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-/* To parse big numbers... */
-#ifdef HAVE_ATOLL
-#define atobigint atoll
-#else
-#define atobigint atol
-#endif
-
-typedef unsigned char byte;
-
-/* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */
-void *safe_realloc(void *ptr, size_t size);
-#ifndef HAVE_STRERROR
-const char *strerror(int errnum);
-#endif
-
-#ifndef HAVE_STRDUP
-char *strdup(const char *s);
-#endif
-
-/* If we have the size checks enabled, try to derive some sane printfs.
- Simple start: Use max integer type and format if long is not big enough.
- I am hesitating to use %ll without making sure that it's there... */
-#if !(defined PLAIN_C89) && (defined SIZEOF_OFF_T) && (SIZEOF_OFF_T > SIZEOF_LONG) && (defined PRIiMAX)
-# define OFF_P PRIiMAX
-typedef intmax_t off_p;
-#else
-# define OFF_P "li"
-typedef long off_p;
-#endif
-
-#if !(defined PLAIN_C89) && (defined SIZEOF_SIZE_T) && (SIZEOF_SIZE_T > SIZEOF_LONG) && (defined PRIuMAX)
-# define SIZE_P PRIuMAX
-typedef uintmax_t size_p;
-#else
-# define SIZE_P "lu"
-typedef unsigned long size_p;
-#endif
-
-#if !(defined PLAIN_C89) && (defined SIZEOF_SSIZE_T) && (SIZEOF_SSIZE_T > SIZEOF_LONG) && (defined PRIiMAX)
-# define SSIZE_P PRIuMAX
-typedef intmax_t ssize_p;
-#else
-# define SSIZE_P "li"
-typedef long ssize_p;
-#endif
-
-/**
- * Opening a file handle can be different.
- * This function here is defined to take a path in native encoding (ISO8859 / UTF-8 / ...), or, when MS Windows Unicode support is enabled, an UTF-8 string that will be converted back to native UCS-2 (wide character) before calling the system's open function.
- * @param[in] wptr Pointer to wide string.
- * @param[in] mbptr Pointer to multibyte string.
- * @return file descriptor (>=0) or error code.
- */
-int compat_open(const char *filename, int flags);
-
-/**
- * Closing a file handle can be platform specific.
- * This function takes a file descriptor that is to be closed.
- * @param[in] infd File descriptor to be closed.
- * @return 0 if the file was successfully closed. A return value of -1 indicates an error.
- */
-int compat_close(int infd);
-
-/* Those do make sense in a separate file, but I chose to include them in compat.c because that's the one source whose object is shared between mpg123 and libmpg123 -- and both need the functionality internally. */
-
-#ifdef WANT_WIN32_UNICODE
-/**
- * win32_uni2mbc
- * Converts a null terminated UCS-2 string to a multibyte (UTF-8) equivalent.
- * Caller is supposed to free allocated buffer.
- * @param[in] wptr Pointer to wide string.
- * @param[out] mbptr Pointer to multibyte string.
- * @param[out] buflen Optional parameter for length of allocated buffer.
- * @return status of WideCharToMultiByte conversion.
- *
- * WideCharToMultiByte - http://msdn.microsoft.com/en-us/library/dd374130(VS.85).aspx
- */
-int win32_wide_utf8 (const wchar_t * const wptr, const char **const mbptr, size_t * const buflen);
-
-/**
- * win32_mbc2uni
- * Converts a null terminated UTF-8 string to a UCS-2 equivalent.
- * Caller is supposed to free allocated buffer.
- * @param[out] mbptr Pointer to multibyte string.
- * @param[in] wptr Pointer to wide string.
- * @param[out] buflen Optional parameter for length of allocated buffer.
- * @return status of WideCharToMultiByte conversion.
- *
- * MultiByteToWideChar - http://msdn.microsoft.com/en-us/library/dd319072(VS.85).aspx
- */
-
-int win32_utf8_wide (const char *const mbptr, const wchar_t ** const wptr, size_t * const buflen);
-#endif
-
-/* That one comes from Tellie on OS/2, needed in resolver. */
-#ifdef __KLIBC__
-typedef int socklen_t;
-#endif
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/config.h Deleted

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/dct64.c Deleted

@@ -1,174 +0,0 @@
-/*
-	dct64.c: DCT64, the plain C version
-
-	copyright ?-2006 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp
-*/
-
-/*
- * Discrete Cosine Tansform (DCT) for subband synthesis
- *
- * -funroll-loops (for gcc) will remove the loops for better performance
- * using loops in the source-code enhances readabillity
- *
- *
- * TODO: write an optimized version for the down-sampling modes
- *       (in these modes the bands 16-31 (2:1) or 8-31 (4:1) are zero 
- */
-
-#include "mpg123lib_intern.h"
-
-void dct64(real *out0,real *out1,real *samples)
-{
-  real bufs[64];
-
- {
-  register int i,j;
-  register real *b1,*b2,*bs,*costab;
-
-  b1 = samples;
-  bs = bufs;
-  costab = pnts[0]+16;
-  b2 = b1 + 32;
-
-  for(i=15;i>=0;i--)
-    *bs++ = (*b1++ + *--b2); 
-  for(i=15;i>=0;i--)
-    *bs++ = REAL_MUL((*--b2 - *b1++), *--costab);
-
-  b1 = bufs;
-  costab = pnts[1]+8;
-  b2 = b1 + 16;
-
-  {
-    for(i=7;i>=0;i--)
-      *bs++ = (*b1++ + *--b2); 
-    for(i=7;i>=0;i--)
-      *bs++ = REAL_MUL((*--b2 - *b1++), *--costab);
-    b2 += 32;
-    costab += 8;
-    for(i=7;i>=0;i--)
-      *bs++ = (*b1++ + *--b2); 
-    for(i=7;i>=0;i--)
-      *bs++ = REAL_MUL((*b1++ - *--b2), *--costab);
-    b2 += 32;
-  }
-
-  bs = bufs;
-  costab = pnts[2];
-  b2 = b1 + 8;
-
-  for(j=2;j;j--)
-  {
-    for(i=3;i>=0;i--)
-      *bs++ = (*b1++ + *--b2); 
-    for(i=3;i>=0;i--)
-      *bs++ = REAL_MUL((*--b2 - *b1++), costab[i]);
-    b2 += 16;
-    for(i=3;i>=0;i--)
-      *bs++ = (*b1++ + *--b2); 
-    for(i=3;i>=0;i--)
-      *bs++ = REAL_MUL((*b1++ - *--b2), costab[i]);
-    b2 += 16;
-  }
-
-  b1 = bufs;
-  costab = pnts[3];
-  b2 = b1 + 4;
-
-  for(j=4;j;j--)
-  {
-    *bs++ = (*b1++ + *--b2); 
-    *bs++ = (*b1++ + *--b2);
-    *bs++ = REAL_MUL((*--b2 - *b1++), costab[1]);
-    *bs++ = REAL_MUL((*--b2 - *b1++), costab[0]);
-    b2 += 8;
-    *bs++ = (*b1++ + *--b2); 
-    *bs++ = (*b1++ + *--b2);
-    *bs++ = REAL_MUL((*b1++ - *--b2), costab[1]);
-    *bs++ = REAL_MUL((*b1++ - *--b2), costab[0]);
-    b2 += 8;
-  }
-  bs = bufs;
-  costab = pnts[4];
-
-  for(j=8;j;j--)
-  {
-    real v0,v1;
-    v0=*b1++; v1 = *b1++;
-    *bs++ = (v0 + v1);
-    *bs++ = REAL_MUL((v0 - v1), (*costab));
-    v0=*b1++; v1 = *b1++;
-    *bs++ = (v0 + v1);
-    *bs++ = REAL_MUL((v1 - v0), (*costab));
-  }
-
- }
-
-
- {
-  register real *b1;
-  register int i;
-
-  for(b1=bufs,i=8;i;i--,b1+=4)
-    b1[2] += b1[3];
-
-  for(b1=bufs,i=4;i;i--,b1+=8)
-  {
-    b1[4] += b1[6];
-    b1[6] += b1[5];
-    b1[5] += b1[7];
-  }
-
-  for(b1=bufs,i=2;i;i--,b1+=16)
-  {
-    b1[8]  += b1[12];
-    b1[12] += b1[10];
-    b1[10] += b1[14];
-    b1[14] += b1[9];
-    b1[9]  += b1[13];
-    b1[13] += b1[11];
-    b1[11] += b1[15];
-  }
- }
-
-
-  out0[0x10*16] = REAL_SCALE_DCT64(bufs[0]);
-  out0[0x10*15] = REAL_SCALE_DCT64(bufs[16+0]  + bufs[16+8]);
-  out0[0x10*14] = REAL_SCALE_DCT64(bufs[8]);
-  out0[0x10*13] = REAL_SCALE_DCT64(bufs[16+8]  + bufs[16+4]);
-  out0[0x10*12] = REAL_SCALE_DCT64(bufs[4]);
-  out0[0x10*11] = REAL_SCALE_DCT64(bufs[16+4]  + bufs[16+12]);
-  out0[0x10*10] = REAL_SCALE_DCT64(bufs[12]);
-  out0[0x10* 9] = REAL_SCALE_DCT64(bufs[16+12] + bufs[16+2]);
-  out0[0x10* 8] = REAL_SCALE_DCT64(bufs[2]);
-  out0[0x10* 7] = REAL_SCALE_DCT64(bufs[16+2]  + bufs[16+10]);
-  out0[0x10* 6] = REAL_SCALE_DCT64(bufs[10]);
-  out0[0x10* 5] = REAL_SCALE_DCT64(bufs[16+10] + bufs[16+6]);
-  out0[0x10* 4] = REAL_SCALE_DCT64(bufs[6]);
-  out0[0x10* 3] = REAL_SCALE_DCT64(bufs[16+6]  + bufs[16+14]);
-  out0[0x10* 2] = REAL_SCALE_DCT64(bufs[14]);
-  out0[0x10* 1] = REAL_SCALE_DCT64(bufs[16+14] + bufs[16+1]);
-  out0[0x10* 0] = REAL_SCALE_DCT64(bufs[1]);
-
-  out1[0x10* 0] = REAL_SCALE_DCT64(bufs[1]);
-  out1[0x10* 1] = REAL_SCALE_DCT64(bufs[16+1]  + bufs[16+9]);
-  out1[0x10* 2] = REAL_SCALE_DCT64(bufs[9]);
-  out1[0x10* 3] = REAL_SCALE_DCT64(bufs[16+9]  + bufs[16+5]);
-  out1[0x10* 4] = REAL_SCALE_DCT64(bufs[5]);
-  out1[0x10* 5] = REAL_SCALE_DCT64(bufs[16+5]  + bufs[16+13]);
-  out1[0x10* 6] = REAL_SCALE_DCT64(bufs[13]);
-  out1[0x10* 7] = REAL_SCALE_DCT64(bufs[16+13] + bufs[16+3]);
-  out1[0x10* 8] = REAL_SCALE_DCT64(bufs[3]);
-  out1[0x10* 9] = REAL_SCALE_DCT64(bufs[16+3]  + bufs[16+11]);
-  out1[0x10*10] = REAL_SCALE_DCT64(bufs[11]);
-  out1[0x10*11] = REAL_SCALE_DCT64(bufs[16+11] + bufs[16+7]);
-  out1[0x10*12] = REAL_SCALE_DCT64(bufs[7]);
-  out1[0x10*13] = REAL_SCALE_DCT64(bufs[16+7]  + bufs[16+15]);
-  out1[0x10*14] = REAL_SCALE_DCT64(bufs[15]);
-  out1[0x10*15] = REAL_SCALE_DCT64(bufs[16+15]);
-
-}
-
-

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/debug.h Deleted

@@ -1,171 +0,0 @@
-/*
-	debug.h: 
-		if DEBUG defined: debugging macro fprintf wrappers
-		else: macros defined to do nothing
-	That saves typing #ifdef DEBUG all the time and still preserves
-	lean code without debugging.
-	
-	public domain (or LGPL / GPL, if you like that more;-)
-	generated by debugdef.pl, what was
-	trivially written by Thomas Orgis <thomas@orgis.org>
-*/
-
-#include "config.h"
-
-/*
-	I could do that with variadic macros available:
-	#define sdebug(me, s) fprintf(stderr, "[location] " s "\n")
-	#define debug(me, s, ...) fprintf(stderr, "[location] " s "}n", __VA_ARGS__)
-
-	Variadic macros are a C99 feature...
-	Now just predefining stuff non-variadic for up to 15 arguments.
-	It's cumbersome to have them all with different names, though...
-*/
-
-#ifdef DEBUG
-#include <stdio.h>
-#define debug(s) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__)
-#define debug1(s, a) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a)
-#define debug2(s, a, b) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b)
-#define debug3(s, a, b, c) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c)
-#define debug4(s, a, b, c, d) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d)
-#define debug5(s, a, b, c, d, e) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e)
-#define debug6(s, a, b, c, d, e, f) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f)
-#define debug7(s, a, b, c, d, e, f, g) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f, g)
-#define debug8(s, a, b, c, d, e, f, g, h) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f, g, h)
-#define debug9(s, a, b, c, d, e, f, g, h, i) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i)
-#define debug10(s, a, b, c, d, e, f, g, h, i, j) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j)
-#define debug11(s, a, b, c, d, e, f, g, h, i, j, k) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k)
-#define debug12(s, a, b, c, d, e, f, g, h, i, j, k, l) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l)
-#define debug13(s, a, b, c, d, e, f, g, h, i, j, k, l, m) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m)
-#define debug14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n)
-#define debug15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) fprintf(stderr, "[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o)
-#else
-#define debug(s) 
-#define debug1(s, a) 
-#define debug2(s, a, b) 
-#define debug3(s, a, b, c) 
-#define debug4(s, a, b, c, d) 
-#define debug5(s, a, b, c, d, e) 
-#define debug6(s, a, b, c, d, e, f) 
-#define debug7(s, a, b, c, d, e, f, g) 
-#define debug8(s, a, b, c, d, e, f, g, h) 
-#define debug9(s, a, b, c, d, e, f, g, h, i) 
-#define debug10(s, a, b, c, d, e, f, g, h, i, j) 
-#define debug11(s, a, b, c, d, e, f, g, h, i, j, k) 
-#define debug12(s, a, b, c, d, e, f, g, h, i, j, k, l) 
-#define debug13(s, a, b, c, d, e, f, g, h, i, j, k, l, m) 
-#define debug14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) 
-#define debug15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) 
-#endif
-
-/* warning macros also here... */
-#ifndef NO_WARNING
-#define warning(s) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__)
-#define warning1(s, a) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a)
-#define warning2(s, a, b) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b)
-#define warning3(s, a, b, c) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c)
-#define warning4(s, a, b, c, d) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d)
-#define warning5(s, a, b, c, d, e) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e)
-#define warning6(s, a, b, c, d, e, f) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f)
-#define warning7(s, a, b, c, d, e, f, g) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g)
-#define warning8(s, a, b, c, d, e, f, g, h) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g, h)
-#define warning9(s, a, b, c, d, e, f, g, h, i) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i)
-#define warning10(s, a, b, c, d, e, f, g, h, i, j) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j)
-#define warning11(s, a, b, c, d, e, f, g, h, i, j, k) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k)
-#define warning12(s, a, b, c, d, e, f, g, h, i, j, k, l) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l)
-#define warning13(s, a, b, c, d, e, f, g, h, i, j, k, l, m) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m)
-#define warning14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n)
-#define warning15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) fprintf(stderr, "[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o)
-#else
-#define warning(s) 
-#define warning1(s, a) 
-#define warning2(s, a, b) 
-#define warning3(s, a, b, c) 
-#define warning4(s, a, b, c, d) 
-#define warning5(s, a, b, c, d, e) 
-#define warning6(s, a, b, c, d, e, f) 
-#define warning7(s, a, b, c, d, e, f, g) 
-#define warning8(s, a, b, c, d, e, f, g, h) 
-#define warning9(s, a, b, c, d, e, f, g, h, i) 
-#define warning10(s, a, b, c, d, e, f, g, h, i, j) 
-#define warning11(s, a, b, c, d, e, f, g, h, i, j, k) 
-#define warning12(s, a, b, c, d, e, f, g, h, i, j, k, l) 
-#define warning13(s, a, b, c, d, e, f, g, h, i, j, k, l, m) 
-#define warning14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) 
-#define warning15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) 
-#endif
-
-/* error macros also here... */
-#ifndef NO_ERROR
-#define error(s) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__)
-#define error1(s, a) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a)
-#define error2(s, a, b) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b)
-#define error3(s, a, b, c) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c)
-#define error4(s, a, b, c, d) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d)
-#define error5(s, a, b, c, d, e) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e)
-#define error6(s, a, b, c, d, e, f) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f)
-#define error7(s, a, b, c, d, e, f, g) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g)
-#define error8(s, a, b, c, d, e, f, g, h) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g, h)
-#define error9(s, a, b, c, d, e, f, g, h, i) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i)
-#define error10(s, a, b, c, d, e, f, g, h, i, j) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j)
-#define error11(s, a, b, c, d, e, f, g, h, i, j, k) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k)
-#define error12(s, a, b, c, d, e, f, g, h, i, j, k, l) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l)
-#define error13(s, a, b, c, d, e, f, g, h, i, j, k, l, m) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m)
-#define error14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n)
-#define error15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o)
-#else
-#define error(s) 
-#define error1(s, a) 
-#define error2(s, a, b) 
-#define error3(s, a, b, c) 
-#define error4(s, a, b, c, d) 
-#define error5(s, a, b, c, d, e) 
-#define error6(s, a, b, c, d, e, f) 
-#define error7(s, a, b, c, d, e, f, g) 
-#define error8(s, a, b, c, d, e, f, g, h) 
-#define error9(s, a, b, c, d, e, f, g, h, i) 
-#define error10(s, a, b, c, d, e, f, g, h, i, j) 
-#define error11(s, a, b, c, d, e, f, g, h, i, j, k) 
-#define error12(s, a, b, c, d, e, f, g, h, i, j, k, l) 
-#define error13(s, a, b, c, d, e, f, g, h, i, j, k, l, m) 
-#define error14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) 
-#define error15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) 
-#endif
-
-/* ereturn macros also here... */
-#ifndef NO_ERETURN
-#define ereturn(rv, s) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__); return rv; }while(0)
-#define ereturn1(rv, s, a) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a); return rv; }while(0)
-#define ereturn2(rv, s, a, b) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b); return rv; }while(0)
-#define ereturn3(rv, s, a, b, c) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c); return rv; }while(0)
-#define ereturn4(rv, s, a, b, c, d) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d); return rv; }while(0)
-#define ereturn5(rv, s, a, b, c, d, e) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e); return rv; }while(0)
-#define ereturn6(rv, s, a, b, c, d, e, f) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e, f); return rv; }while(0)
-#define ereturn7(rv, s, a, b, c, d, e, f, g) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e, f, g); return rv; }while(0)
-#define ereturn8(rv, s, a, b, c, d, e, f, g, h) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e, f, g, h); return rv; }while(0)
-#define ereturn9(rv, s, a, b, c, d, e, f, g, h, i) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i); return rv; }while(0)
-#define ereturn10(rv, s, a, b, c, d, e, f, g, h, i, j) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j); return rv; }while(0)
-#define ereturn11(rv, s, a, b, c, d, e, f, g, h, i, j, k) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k); return rv; }while(0)
-#define ereturn12(rv, s, a, b, c, d, e, f, g, h, i, j, k, l) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l); return rv; }while(0)
-#define ereturn13(rv, s, a, b, c, d, e, f, g, h, i, j, k, l, m) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m); return rv; }while(0)
-#define ereturn14(rv, s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n); return rv; }while(0)
-#define ereturn15(rv, s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) do{ fprintf(stderr, "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o); return rv; }while(0)
-#else
-#define ereturn(rv, s) return rv
-#define ereturn1(rv, s, a) return rv
-#define ereturn2(rv, s, a, b) return rv
-#define ereturn3(rv, s, a, b, c) return rv
-#define ereturn4(rv, s, a, b, c, d) return rv
-#define ereturn5(rv, s, a, b, c, d, e) return rv
-#define ereturn6(rv, s, a, b, c, d, e, f) return rv
-#define ereturn7(rv, s, a, b, c, d, e, f, g) return rv
-#define ereturn8(rv, s, a, b, c, d, e, f, g, h) return rv
-#define ereturn9(rv, s, a, b, c, d, e, f, g, h, i) return rv
-#define ereturn10(rv, s, a, b, c, d, e, f, g, h, i, j) return rv
-#define ereturn11(rv, s, a, b, c, d, e, f, g, h, i, j, k) return rv
-#define ereturn12(rv, s, a, b, c, d, e, f, g, h, i, j, k, l) return rv
-#define ereturn13(rv, s, a, b, c, d, e, f, g, h, i, j, k, l, m) return rv
-#define ereturn14(rv, s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) return rv
-#define ereturn15(rv, s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) return rv
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/decode.h Deleted

@@ -1,268 +0,0 @@
-/*
-	decode.h: common definitions for decode functions
-
-	This file is strongly tied with optimize.h concerning the synth functions.
-	Perhaps one should restructure that a bit.
-
-	copyright 2007-8 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis, taking WRITE_SAMPLE from decode.c
-*/
-#ifndef MPG123_DECODE_H
-#define MPG123_DECODE_H
-
-/* Selection of class of output routines for basic format. */
-#ifndef REAL_IS_FIXED
-#define OUT_FORMATS 4 /* Basic output formats: 16bit, 8bit, real and s32 */
-#else
-#define OUT_FORMATS 2 /* Only up to 16bit */
-#endif
-
-#define OUT_16 0
-#define OUT_8  1
-/* Those are defined but not supported for fixed point decoding! */
-#define OUT_REAL 2 /* Write a floating point sample (that is, one matching the internal real type). */
-#define OUT_S32 3
-
-#ifdef NO_NTOM
-#define NTOM_MAX 1
-#else
-#define NTOM_MAX 8          /* maximum allowed factor for upsampling */
-#define NTOM_MAX_FREQ 96000 /* maximum frequency to upsample to / downsample from */
-#define NTOM_MUL (32768)
-void ntom_set_ntom(mpg123_handle *fr, off_t num);
-#endif
-
-/* Let's collect all possible synth functions here, for an overview.
-   If they are actually defined and used depends on preprocessor machinery.
-   See synth.c and optimize.h for that, also some special C and assembler files. */
-
-#ifndef NO_16BIT
-/* The signed-16bit-producing variants. */
-int synth_1to1            (real*, int, mpg123_handle*, int);
-int synth_1to1_dither     (real*, int, mpg123_handle*, int);
-int synth_1to1_i386       (real*, int, mpg123_handle*, int);
-int synth_1to1_i586       (real*, int, mpg123_handle*, int);
-int synth_1to1_i586_dither(real*, int, mpg123_handle*, int);
-int synth_1to1_mmx        (real*, int, mpg123_handle*, int);
-int synth_1to1_3dnow      (real*, int, mpg123_handle*, int);
-int synth_1to1_sse        (real*, int, mpg123_handle*, int);
-int synth_1to1_stereo_sse (real*, real*, mpg123_handle*);
-int synth_1to1_3dnowext   (real*, int, mpg123_handle*, int);
-int synth_1to1_altivec    (real*, int, mpg123_handle*, int);
-int synth_1to1_stereo_altivec(real*, real*, mpg123_handle*);
-int synth_1to1_x86_64     (real*, int, mpg123_handle*, int);
-int synth_1to1_stereo_x86_64(real*, real*, mpg123_handle*);
-int synth_1to1_arm        (real*, int, mpg123_handle*, int);
-int synth_1to1_neon       (real*, int, mpg123_handle*, int);
-int synth_1to1_stereo_neon(real*, real*, mpg123_handle*);
-/* This is different, special usage in layer3.c only.
-   Hence, the name... and now forget about it.
-   Never use it outside that special portion of code inside layer3.c! */
-int absynth_1to1_i486(real*, int, mpg123_handle*, int);
-/* These mono/stereo converters use one of the above for the grunt work. */
-int synth_1to1_mono       (real*, mpg123_handle*);
-int synth_1to1_m2s(real*, mpg123_handle*);
-
-/* Sample rate decimation comes in less flavours. */
-#ifndef NO_DOWNSAMPLE
-int synth_2to1            (real*, int, mpg123_handle*, int);
-int synth_2to1_dither     (real*, int, mpg123_handle*, int);
-int synth_2to1_i386       (real*, int, mpg123_handle*, int);
-int synth_2to1_mono       (real*, mpg123_handle*);
-int synth_2to1_m2s(real*, mpg123_handle*);
-int synth_4to1            (real *,int, mpg123_handle*, int);
-int synth_4to1_dither     (real *,int, mpg123_handle*, int);
-int synth_4to1_i386       (real*, int, mpg123_handle*, int);
-int synth_4to1_mono       (real*, mpg123_handle*);
-int synth_4to1_m2s(real*, mpg123_handle*);
-#endif
-#ifndef NO_NTOM
-/* NtoM is really just one implementation. */
-int synth_ntom (real *,int, mpg123_handle*, int);
-int synth_ntom_mono (real *, mpg123_handle *);
-int synth_ntom_m2s (real *, mpg123_handle *);
-#endif
-#endif
-
-#ifndef NO_8BIT
-/* The 8bit-producing variants. */
-/* There are direct 8-bit synths and wrappers over a possibly optimized 16bit one. */
-int synth_1to1_8bit            (real*, int, mpg123_handle*, int);
-int synth_1to1_8bit_i386       (real*, int, mpg123_handle*, int);
-#ifndef NO_16BIT
-int synth_1to1_8bit_wrap       (real*, int, mpg123_handle*, int);
-int synth_1to1_8bit_mono       (real*, mpg123_handle*);
-#endif
-int synth_1to1_8bit_m2s(real*, mpg123_handle*);
-#ifndef NO_16BIT
-int synth_1to1_8bit_wrap_mono       (real*, mpg123_handle*);
-int synth_1to1_8bit_wrap_m2s(real*, mpg123_handle*);
-#endif
-#ifndef NO_DOWNSAMPLE
-int synth_2to1_8bit            (real*, int, mpg123_handle*, int);
-int synth_2to1_8bit_i386       (real*, int, mpg123_handle*, int);
-int synth_2to1_8bit_mono       (real*, mpg123_handle*);
-int synth_2to1_8bit_m2s(real*, mpg123_handle*);
-int synth_4to1_8bit            (real*, int, mpg123_handle*, int);
-int synth_4to1_8bit_i386       (real*, int, mpg123_handle*, int);
-int synth_4to1_8bit_mono       (real*, mpg123_handle*);
-int synth_4to1_8bit_m2s(real*, mpg123_handle*);
-#endif
-#ifndef NO_NTOM
-int synth_ntom_8bit            (real*, int, mpg123_handle*, int);
-int synth_ntom_8bit_mono       (real*, mpg123_handle*);
-int synth_ntom_8bit_m2s(real*, mpg123_handle*);
-#endif
-#endif
-
-#ifndef REAL_IS_FIXED
-
-#ifndef NO_REAL
-/* The real-producing variants. */
-int synth_1to1_real            (real*, int, mpg123_handle*, int);
-int synth_1to1_real_i386       (real*, int, mpg123_handle*, int);
-int synth_1to1_real_sse        (real*, int, mpg123_handle*, int);
-int synth_1to1_real_stereo_sse (real*, real*, mpg123_handle*);
-int synth_1to1_real_x86_64     (real*, int, mpg123_handle*, int);
-int synth_1to1_real_stereo_x86_64(real*, real*, mpg123_handle*);
-int synth_1to1_real_altivec    (real*, int, mpg123_handle*, int);
-int synth_1to1_real_stereo_altivec(real*, real*, mpg123_handle*);
-int synth_1to1_real_neon       (real*, int, mpg123_handle*, int);
-int synth_1to1_real_stereo_neon(real*, real*, mpg123_handle*);
-int synth_1to1_real_mono       (real*, mpg123_handle*);
-int synth_1to1_real_m2s(real*, mpg123_handle*);
-#ifndef NO_DOWNSAMPLE
-int synth_2to1_real            (real*, int, mpg123_handle*, int);
-int synth_2to1_real_i386       (real*, int, mpg123_handle*, int);
-int synth_2to1_real_mono       (real*, mpg123_handle*);
-int synth_2to1_real_m2s(real*, mpg123_handle*);
-int synth_4to1_real            (real*, int, mpg123_handle*, int);
-int synth_4to1_real_i386       (real*, int, mpg123_handle*, int);
-int synth_4to1_real_mono       (real*, mpg123_handle*);
-int synth_4to1_real_m2s(real*, mpg123_handle*);
-#endif
-#ifndef NO_NTOM
-int synth_ntom_real            (real*, int, mpg123_handle*, int);
-int synth_ntom_real_mono       (real*, mpg123_handle*);
-int synth_ntom_real_m2s(real*, mpg123_handle*);
-#endif
-#endif
-
-#ifndef NO_32BIT
-/* 32bit integer */
-int synth_1to1_s32            (real*, int, mpg123_handle*, int);
-int synth_1to1_s32_i386       (real*, int, mpg123_handle*, int);
-int synth_1to1_s32_sse        (real*, int, mpg123_handle*, int);
-int synth_1to1_s32_stereo_sse (real*, real*, mpg123_handle*);
-int synth_1to1_s32_x86_64     (real*, int, mpg123_handle*, int);
-int synth_1to1_s32_stereo_x86_64(real*, real*, mpg123_handle*);
-int synth_1to1_s32_altivec    (real*, int, mpg123_handle*, int);
-int synth_1to1_s32_stereo_altivec(real*, real*, mpg123_handle*);
-int synth_1to1_s32_neon       (real*, int, mpg123_handle*, int);
-int synth_1to1_s32_stereo_neon(real*, real*, mpg123_handle*);
-int synth_1to1_s32_mono       (real*, mpg123_handle*);
-int synth_1to1_s32_m2s(real*, mpg123_handle*);
-#ifndef NO_DOWNSAMPLE
-int synth_2to1_s32            (real*, int, mpg123_handle*, int);
-int synth_2to1_s32_i386       (real*, int, mpg123_handle*, int);
-int synth_2to1_s32_mono       (real*, mpg123_handle*);
-int synth_2to1_s32_m2s(real*, mpg123_handle*);
-int synth_4to1_s32            (real*, int, mpg123_handle*, int);
-int synth_4to1_s32_i386       (real*, int, mpg123_handle*, int);
-int synth_4to1_s32_mono       (real*, mpg123_handle*);
-int synth_4to1_s32_m2s(real*, mpg123_handle*);
-#endif
-#ifndef NO_NTOM
-int synth_ntom_s32            (real*, int, mpg123_handle*, int);
-int synth_ntom_s32_mono       (real*, mpg123_handle*);
-int synth_ntom_s32_m2s(real*, mpg123_handle*);
-#endif
-#endif
-
-#endif /* FIXED */
-
-
-/* Inside these synth functions, some dct64 variants may be used.
-   The special optimized ones that only appear in assembler code are not mentioned here.
-   And, generally, these functions are only employed in a matching synth function. */
-void dct64        (real *,real *,real *);
-void dct64_i386   (real *,real *,real *);
-void dct64_altivec(real *,real *,real *);
-void dct64_i486(int*, int* , real*); /* Yeah, of no use outside of synth_i486.c .*/
-
-/* This is used by the layer 3 decoder, one generic function and 3DNow variants. */
-void dct36         (real *,real *,real *,real *,real *);
-void dct36_3dnow   (real *,real *,real *,real *,real *);
-void dct36_3dnowext(real *,real *,real *,real *,real *);
-
-/* Tools for NtoM resampling synth, defined in ntom.c . */
-int synth_ntom_set_step(mpg123_handle *fr); /* prepare ntom decoding */
-unsigned long ntom_val(mpg123_handle *fr, off_t frame); /* compute ntom_val for frame offset */
-/* Frame and sample offsets. */
-#ifndef NO_NTOM
-/*
-	Outsamples of _this_ frame.
-	To be exact: The samples to be expected from the next frame decode (using the current ntom_val). When you already decoded _this_ frame, this is the number of samples to be expected from the next one.
-*/
-off_t ntom_frame_outsamples(mpg123_handle *fr);
-/* Total out/insample offset. */
-off_t ntom_frmouts(mpg123_handle *fr, off_t frame);
-off_t ntom_ins2outs(mpg123_handle *fr, off_t ins);
-off_t ntom_frameoff(mpg123_handle *fr, off_t soff);
-#endif
-
-/* Initialization of any static data that majy be needed at runtime.
-   Make sure you call these once before it is too late. */
-#ifndef NO_LAYER3
-void init_layer3(void);
-real init_layer3_gainpow2(mpg123_handle *fr, int i);
-void init_layer3_stuff(mpg123_handle *fr, real (*gainpow2)(mpg123_handle *fr, int i));
-#endif
-#ifndef NO_LAYER12
-void  init_layer12(void);
-real* init_layer12_table(mpg123_handle *fr, real *table, int m);
-void  init_layer12_stuff(mpg123_handle *fr, real* (*init_table)(mpg123_handle *fr, real *table, int m));
-#endif
-
-void prepare_decode_tables(void);
-
-extern real *pnts[5]; /* tabinit provides, dct64 needs */
-
-/* Runtime (re)init functions; needed more often. */
-void make_decode_tables(mpg123_handle *fr); /* For every volume change. */
-/* Stuff needed after updating synth setup (see set_synth_functions()). */
-
-#ifdef OPT_MMXORSSE
-/* Special treatment for mmx-like decoders, these functions go into the slots below. */
-void make_decode_tables_mmx(mpg123_handle *fr);
-#ifndef NO_LAYER3
-real init_layer3_gainpow2_mmx(mpg123_handle *fr, int i);
-#endif
-#ifndef NO_LAYER12
-real* init_layer12_table_mmx(mpg123_handle *fr, real *table, int m);
-#endif
-#endif
-
-#ifndef NO_8BIT
-/* Needed when switching to 8bit output. */
-int make_conv16to8_table(mpg123_handle *fr);
-#endif
-
-/* These are the actual workers.
-   They operate on the parsed frame data and handle decompression to audio samples.
-   The synth functions defined above are called from inside the layer handlers. */
-
-#ifndef NO_LAYER3
-int do_layer3(mpg123_handle *fr);
-#endif
-#ifndef NO_LAYER2
-int do_layer2(mpg123_handle *fr);
-#endif
-#ifndef NO_LAYER1
-int do_layer1(mpg123_handle *fr);
-#endif
-/* There's an 3DNow counterpart in asm. */
-void do_equalizer(real *bandPtr,int channel, real equalizer[2][32]);
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/equalizer.c Deleted

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/feature.c Deleted

@@ -1,106 +0,0 @@
-#include "mpg123lib_intern.h"
-
-int mpg123_feature(const enum mpg123_feature_set key)
-{
-	switch(key)
-	{
-		case MPG123_FEATURE_ABI_UTF8OPEN:
-#ifdef WANT_WIN32_UNICODE
-		return 1;
-#else
-		return 0;
-#endif /* WANT_WIN32_UNICODE */
-
-		case MPG123_FEATURE_OUTPUT_8BIT:
-#ifdef NO_8BIT
-		return 0;
-#else
-		return 1;
-#endif /* mpg123_output_8bit */
-
-		case MPG123_FEATURE_OUTPUT_16BIT:
-#ifdef NO_16BIT
-		return 0;
-#else
-		return 1;
-#endif /* mpg123_output_16bit */
-
-		case MPG123_FEATURE_OUTPUT_32BIT:
-#ifdef NO_32BIT
-		return 0;
-#else
-		return 1;
-#endif /* mpg123_output_32bit */
-
-		case MPG123_FEATURE_PARSE_ID3V2:
-#ifdef NO_ID3V2
-		return 0;
-#else
-		return 1;
-#endif /* NO_ID3V2 */
-
-		case MPG123_FEATURE_DECODE_LAYER1:
-#ifdef NO_LAYER1
-		return 0;
-#else
-		return 1;
-#endif /* NO_LAYER1 */
-
-		case MPG123_FEATURE_DECODE_LAYER2:
-#ifdef NO_LAYER2
-		return 0;
-#else
-		return 1;
-#endif /* NO_LAYER2 */
-
-		case MPG123_FEATURE_DECODE_LAYER3:
-#ifdef NO_LAYER3
-		return 0;
-#else
-		return 1;
-#endif /* NO_LAYER3 */
-
-		case MPG123_FEATURE_DECODE_ACCURATE:
-#ifdef ACCURATE_ROUNDING
-		return 1;
-#else
-		return 0;
-#endif /* ACCURATE_ROUNDING */
-
-		case MPG123_FEATURE_DECODE_DOWNSAMPLE:
-#ifdef NO_DOWNSAMPLE
-		return 0;
-#else
-		return 1;
-#endif /* NO_DOWNSAMPLE */
-
-		case MPG123_FEATURE_DECODE_NTOM:
-#ifdef NO_NTOM
-		return 0;
-#else
-		return 1;
-#endif /* NO_NTOM */
-
-		case MPG123_FEATURE_PARSE_ICY:
-#ifdef NO_ICY
-		return 0;
-#else
-		return 1;
-#endif /* NO_ICY */
-
-		case MPG123_FEATURE_INDEX:
-#ifdef FRAME_INDEX
-		return 1;
-#else
-		return 0;
-#endif /* FRAME_INDEX */
-		case MPG123_FEATURE_TIMEOUT_READ:
-#ifdef TIMEOUT_READ
-		return 1;
-#else
-		return 0;
-#endif
-
-		default: return 0;
-	}
-}

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/format.c Deleted

@@ -1,517 +0,0 @@
-/*
-	format:routines to deal with audio (output) format
-
-	copyright 2008-9 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis, starting with parts of the old audio.c, with only faintly manage to show now
-*/
-
-#include "mpg123lib_intern.h"
-#include "debug.h"
-
-/* static int chans[NUM_CHANNELS] = { 1 , 2 }; */
-static const long my_rates[MPG123_RATES] = /* only the standard rates */
-{
-	 8000, 11025, 12000, 
-	16000, 22050, 24000,
-	32000, 44100, 48000,
-};
-
-static const int my_encodings[MPG123_ENCODINGS] =
-{
-	MPG123_ENC_SIGNED_16,
-	MPG123_ENC_UNSIGNED_16,
-	MPG123_ENC_SIGNED_32,
-	MPG123_ENC_UNSIGNED_32,
-	MPG123_ENC_SIGNED_24,
-	MPG123_ENC_UNSIGNED_24,
-	/* Floating point range, see below. */
-	MPG123_ENC_FLOAT_32,
-	MPG123_ENC_FLOAT_64,
-	/* 8 bit range, see below. */
-	MPG123_ENC_SIGNED_8,
-	MPG123_ENC_UNSIGNED_8,
-	MPG123_ENC_ULAW_8,
-	MPG123_ENC_ALAW_8
-};
-
-/* Make that match the above table.
- And yes, I still don't like this kludgy stuff. */
-/* range[0] <= i < range[1] for forced floating point */
-static const int enc_float_range[2] = { 6, 8 };
-/* same for 8 bit encodings */
-static const int enc_8bit_range[2] = { 8, 12 };
-
-/* Only one type of float is supported. */
-# ifdef REAL_IS_FLOAT
-# define MPG123_FLOAT_ENC MPG123_ENC_FLOAT_32
-# else
-# define MPG123_FLOAT_ENC MPG123_ENC_FLOAT_64
-# endif
-
-/* The list of actually possible encodings. */
-static const int good_encodings[] =
-{
-#ifndef NO_16BIT
-	MPG123_ENC_SIGNED_16,
-	MPG123_ENC_UNSIGNED_16,
-#endif
-#ifndef NO_32BIT
-	MPG123_ENC_SIGNED_32,
-	MPG123_ENC_UNSIGNED_32,
-	MPG123_ENC_SIGNED_24,
-	MPG123_ENC_UNSIGNED_24,
-#endif
-#ifndef NO_REAL
-	MPG123_FLOAT_ENC,
-#endif
-#ifndef NO_8BIT
-	MPG123_ENC_SIGNED_8,
-	MPG123_ENC_UNSIGNED_8,
-	MPG123_ENC_ULAW_8,
-	MPG123_ENC_ALAW_8
-#endif
-};
-
-/* Check if encoding is a valid one in this build.
- ...lazy programming: linear search. */
-static int good_enc(const int enc)
-{
-	size_t i;
-	for(i=0; i<sizeof(good_encodings)/sizeof(int); ++i)
-	if(enc == good_encodings[i]) return TRUE;
-
-	return FALSE;
-}
-
-void attribute_align_arg mpg123_rates(const long **list, size_t *number)
-{
-	if(list != NULL) *list = my_rates;
-	if(number != NULL) *number = sizeof(my_rates)/sizeof(long);
-}
-
-/* Now that's a bit tricky... One build of the library knows only a subset of the encodings. */
-void attribute_align_arg mpg123_encodings(const int **list, size_t *number)
-{
-	if(list != NULL) *list = good_encodings;
-	if(number != NULL) *number = sizeof(good_encodings)/sizeof(int);
-}
-
-int attribute_align_arg mpg123_encsize(int encoding)
-{
-	if(encoding & MPG123_ENC_8)
-	return 1;
-	else if(encoding & MPG123_ENC_16)
-	return 2;
-	else if(encoding & MPG123_ENC_24)
-	return 3;
-	else if(encoding & MPG123_ENC_32 || encoding == MPG123_ENC_FLOAT_32)
-	return 4;
-	else if(encoding == MPG123_ENC_FLOAT_64)
-	return 8;
-	else
-	return 0;
-}
-
-/*	char audio_caps[NUM_CHANNELS][MPG123_RATES+1][MPG123_ENCODINGS]; */
-
-static int rate2num(mpg123_pars *mp, long r)
-{
-	int i;
-	for(i=0;i<MPG123_RATES;i++) if(my_rates[i] == r) return i;
-#ifndef NO_NTOM
-	if(mp && mp->force_rate != 0 && mp->force_rate == r) return MPG123_RATES;
-#endif
-
-	return -1;
-}
-
-static int enc2num(int encoding)
-{
-	int i;
-	for(i=0;i<MPG123_ENCODINGS;++i)
-	if(my_encodings[i] == encoding) return i;
-
-	return -1;
-}
-
-static int cap_fit(mpg123_handle *fr, struct audioformat *nf, int f0, int f2)
-{
-	int i;
-	int c = nf->channels-1;
-	int rn = rate2num(&fr->p, nf->rate);
-	if(rn >= 0)	for(i=f0;i<f2;i++)
-	{
-		if(fr->p.audio_caps[c][rn][i])
-		{
-			nf->encoding = my_encodings[i];
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static int freq_fit(mpg123_handle *fr, struct audioformat *nf, int f0, int f2)
-{
-	nf->rate = frame_freq(fr)>>fr->p.down_sample;
-	if(cap_fit(fr,nf,f0,f2)) return 1;
-	nf->rate>>=1;
-	if(cap_fit(fr,nf,f0,f2)) return 1;
-	nf->rate>>=1;
-	if(cap_fit(fr,nf,f0,f2)) return 1;
-#ifndef NO_NTOM
-	/* If nothing worked, try the other rates, only without constrains from user.
-	 In case you didn't guess: We enable flexible resampling if we find a working rate. */
-	if(!fr->p.force_rate && fr->p.down_sample == 0)
-	{
-		int i;
-		int c = nf->channels-1;
-		int rn = rate2num(&fr->p, frame_freq(fr));
-		int rrn;
-		if(rn < 0) return 0;
-		/* Try higher rates first. */
-		for(i=f0;i<f2;i++) for(rrn=rn+1; rrn<MPG123_RATES; ++rrn)
-		if(fr->p.audio_caps[c][rrn][i])
-		{
-			nf->rate = my_rates[rrn];
-			nf->encoding = my_encodings[i];
-			return 1;
-		}
-		/* Then lower rates. */
-		for(i=f0;i<f2;i++) for(rrn=rn-1; rrn>=0; --rrn)
-		if(fr->p.audio_caps[c][rrn][i])
-		{
-			nf->rate = my_rates[rrn];
-			nf->encoding = my_encodings[i];
-			return 1;
-		}
-	}
-#endif
-
-	return 0;
-}
-
-/* match constraints against supported audio formats, store possible setup in frame
- return: -1: error; 0: no format change; 1: format change */
-int frame_output_format(mpg123_handle *fr)
-{
-	struct audioformat nf;
-	int f0=0;
-	int f2=MPG123_ENCODINGS; /* Omit the 32bit and float encodings. */
-	mpg123_pars *p = &fr->p;
-	/* initialize new format, encoding comes later */
-	nf.channels = fr->stereo;
-
-	/* All this forcing should be removed in favour of the capabilities table... */
-	if(p->flags & MPG123_FORCE_8BIT)
-	{
-		f0 = enc_8bit_range[0];
-		f2 = enc_8bit_range[1];
-	}
-	if(p->flags & MPG123_FORCE_FLOAT)
-	{
-		f0 = enc_float_range[0];
-		f2 = enc_float_range[1];
-	}
-
-	/* force stereo is stronger */
-	if(p->flags & MPG123_FORCE_MONO) nf.channels = 1;
-	if(p->flags & MPG123_FORCE_STEREO) nf.channels = 2;
-
-#ifndef NO_NTOM
-	if(p->force_rate)
-	{
-		nf.rate = p->force_rate;
-		if(cap_fit(fr,&nf,f0,2)) goto end; /* 16bit encodings */
-		if(cap_fit(fr,&nf,f0<=2 ? 2 : f0,f2)) goto end; /* 8bit encodings */
-
-		/* try again with different stereoness */
-		if(nf.channels == 2 && !(p->flags & MPG123_FORCE_STEREO)) nf.channels = 1;
-		else if(nf.channels == 1 && !(p->flags & MPG123_FORCE_MONO)) nf.channels = 2;
-
-		if(cap_fit(fr,&nf,f0,2)) goto end; /* 16bit encodings */
-		if(cap_fit(fr,&nf,f0<=2 ? 2 : f0,f2)) goto end; /* 8bit encodings */
-
-		if(NOQUIET)
-		error3( "Unable to set up output format! Constraints: %s%s%liHz.",
-		 ( p->flags & MPG123_FORCE_STEREO ? "stereo, " :
-		 (p->flags & MPG123_FORCE_MONO ? "mono, " : "") ),
-		 (p->flags & MPG123_FORCE_8BIT ? "8bit, " : ""),
-		 p->force_rate );
-/*		if(NOQUIET && p->verbose <= 1) print_capabilities(fr); */
-
-		fr->err = MPG123_BAD_OUTFORMAT;
-		return -1;
-	}
-#endif
-
-	if(freq_fit(fr, &nf, f0, 2)) goto end; /* try rates with 16bit */
-	if(freq_fit(fr, &nf, f0<=2 ? 2 : f0, f2)) goto end; /* ... 8bit */
-
-	/* try again with different stereoness */
-	if(nf.channels == 2 && !(p->flags & MPG123_FORCE_STEREO)) nf.channels = 1;
-	else if(nf.channels == 1 && !(p->flags & MPG123_FORCE_MONO)) nf.channels = 2;
-
-	if(freq_fit(fr, &nf, f0, 2)) goto end; /* try rates with 16bit */
-	if(freq_fit(fr, &nf, f0<=2 ? 2 : f0, f2)) goto end; /* ... 8bit */
-
-	/* Here is the _bad_ end. */
-	if(NOQUIET)
-	{
-		error5( "Unable to set up output format! Constraints: %s%s%li, %li or %liHz.",
-		 ( p->flags & MPG123_FORCE_STEREO ? "stereo, " :
-		 (p->flags & MPG123_FORCE_MONO ? "mono, " : "") ),
-		 (p->flags & MPG123_FORCE_8BIT ? "8bit, " : ""),
-		 frame_freq(fr), frame_freq(fr)>>1, frame_freq(fr)>>2 );
-	}
-/*	if(NOQUIET && p->verbose <= 1) print_capabilities(fr); */
-
-	fr->err = MPG123_BAD_OUTFORMAT;
-	return -1;
-
-end: /* Here is the _good_ end. */
-	/* we had a successful match, now see if there's a change */
-	if(nf.rate == fr->af.rate && nf.channels == fr->af.channels && nf.encoding == fr->af.encoding)
-	{
-		debug2("Old format with %i channels, and FORCE_MONO=%li", nf.channels, p->flags & MPG123_FORCE_MONO);
-		return 0; /* the same format as before */
-	}
-	else /* a new format */
-	{
-		debug1("New format with %i channels!", nf.channels);
-		fr->af.rate = nf.rate;
-		fr->af.channels = nf.channels;
-		fr->af.encoding = nf.encoding;
-		/* Cache the size of one sample in bytes, for ease of use. */
-		fr->af.encsize = mpg123_encsize(fr->af.encoding);
-		if(fr->af.encsize < 1)
-		{
-			if(NOQUIET) error1("Some unknown encoding??? (%i)", fr->af.encoding);
-
-			fr->err = MPG123_BAD_OUTFORMAT;
-			return -1;
-		}
-		return 1;
-	}
-}
-
-int attribute_align_arg mpg123_format_none(mpg123_handle *mh)
-{
-	int r;
-	if(mh == NULL) return MPG123_ERR;
-
-	r = mpg123_fmt_none(&mh->p);
-	if(r != MPG123_OK){ mh->err = r; r = MPG123_ERR; }
-
-	return r;
-}
-
-int attribute_align_arg mpg123_fmt_none(mpg123_pars *mp)
-{
-	if(mp == NULL) return MPG123_BAD_PARS;
-
-	if(PVERB(mp,3)) fprintf(stderr, "Note: Disabling all formats.\n");
-
-	memset(mp->audio_caps,0,sizeof(mp->audio_caps));
-	return MPG123_OK;
-}
-
-int attribute_align_arg mpg123_format_all(mpg123_handle *mh)
-{
-	int r;
-	if(mh == NULL) return MPG123_ERR;
-
-	r = mpg123_fmt_all(&mh->p);
-	if(r != MPG123_OK){ mh->err = r; r = MPG123_ERR; }
-
-	return r;
-}
-
-int attribute_align_arg mpg123_fmt_all(mpg123_pars *mp)
-{
-	size_t rate, ch, enc;
-	if(mp == NULL) return MPG123_BAD_PARS;
-
-	if(PVERB(mp,3)) fprintf(stderr, "Note: Enabling all formats.\n");
-
-	for(ch=0; ch < NUM_CHANNELS; ++ch)
-	for(rate=0; rate < MPG123_RATES+1; ++rate)
-	for(enc=0; enc < MPG123_ENCODINGS; ++enc)
-	mp->audio_caps[ch][rate][enc] = good_enc(my_encodings[enc]) ? 1 : 0;
-
-	return MPG123_OK;
-}
-
-int attribute_align_arg mpg123_format(mpg123_handle *mh, long rate, int channels, int encodings)
-{
-	int r;
-	if(mh == NULL) return MPG123_ERR;
-	r = mpg123_fmt(&mh->p, rate, channels, encodings);
-	if(r != MPG123_OK){ mh->err = r; r = MPG123_ERR; }
-
-	return r;
-}
-
-int attribute_align_arg mpg123_fmt(mpg123_pars *mp, long rate, int channels, int encodings)
-{
-	int ie, ic, ratei;
-	int ch[2] = {0, 1};
-	if(mp == NULL) return MPG123_BAD_PARS;
-	if(!(channels & (MPG123_MONO|MPG123_STEREO))) return MPG123_BAD_CHANNEL;
-
-	if(PVERB(mp,3)) fprintf(stderr, "Note: Want to enable format %li/%i for encodings 0x%x.\n", rate, channels, encodings);
-
-	if(!(channels & MPG123_STEREO)) ch[1] = 0; /* {0,0} */
-	else if(!(channels & MPG123_MONO)) ch[0] = 1; /* {1,1} */
-	ratei = rate2num(mp, rate);
-	if(ratei < 0) return MPG123_BAD_RATE;
-
-	/* now match the encodings */
-	for(ic = 0; ic < 2; ++ic)
-	{
-		for(ie = 0; ie < MPG123_ENCODINGS; ++ie)
-		if(good_enc(my_encodings[ie]) && ((my_encodings[ie] & encodings) == my_encodings[ie]))
-		mp->audio_caps[ch[ic]][ratei][ie] = 1;
-
-		if(ch[0] == ch[1]) break; /* no need to do it again */
-	}
-
-	return MPG123_OK;
-}
-
-int attribute_align_arg mpg123_format_support(mpg123_handle *mh, long rate, int encoding)
-{
-	if(mh == NULL) return 0;
-	else return mpg123_fmt_support(&mh->p, rate, encoding);
-}
-
-int attribute_align_arg mpg123_fmt_support(mpg123_pars *mp, long rate, int encoding)
-{
-	int ch = 0;
-	int ratei, enci;
-	ratei = rate2num(mp, rate);
-	enci = enc2num(encoding);
-	if(mp == NULL || ratei < 0 || enci < 0) return 0;
-	if(mp->audio_caps[0][ratei][enci]) ch |= MPG123_MONO;
-	if(mp->audio_caps[1][ratei][enci]) ch |= MPG123_STEREO;
-	return ch;
-}
-
-/* Call this one to ensure that any valid format will be something different than this. */
-void invalidate_format(struct audioformat *af)
-{
-	af->encoding = 0;
-	af->rate = 0;
-	af->channels = 0;
-}
-
-/* Consider 24bit output needing 32bit output as temporary storage. */
-off_t samples_to_storage(mpg123_handle *fr, off_t s)
-{
-	if(fr->af.encoding & MPG123_ENC_24)
-	return s*4*fr->af.channels; /* 4 bytes per sample */
-	else
-	return samples_to_bytes(fr, s);
-}
-
-/* take into account: channels, bytes per sample -- NOT resampling!*/
-off_t samples_to_bytes(mpg123_handle *fr , off_t s)
-{
-	return s * fr->af.encsize * fr->af.channels;
-}
-
-off_t bytes_to_samples(mpg123_handle *fr , off_t b)
-{
-	return b / fr->af.encsize / fr->af.channels;
-}
-
-
-#ifndef NO_32BIT
-/* Remove every fourth byte, facilitating conversion from 32 bit to 24 bit integers.
- This has to be aware of endianess, of course. */
-static void chop_fourth_byte(struct outbuffer *buf)
-{
-	unsigned char *wpos = buf->data;
-	unsigned char *rpos = buf->data;
-#ifdef WORDS_BIGENDIAN
-	while((size_t) (rpos - buf->data + 4) <= buf->fill)
-	{
-		/* Really stupid: Copy, increment. Byte per byte. */
-		*wpos = *rpos;
-		wpos++; rpos++;
-		*wpos = *rpos;
-		wpos++; rpos++;
-		*wpos = *rpos;
-		wpos++; rpos++;
-		rpos++; /* Skip the lowest byte (last). */
-	}
-#else
-	while((size_t) (rpos - buf->data + 4) <= buf->fill)
-	{
-		/* Really stupid: Copy, increment. Byte per byte. */
-		rpos++; /* Skip the lowest byte (first). */
-		*wpos = *rpos;
-		wpos++; rpos++;
-		*wpos = *rpos;
-		wpos++; rpos++;
-		*wpos = *rpos;
-		wpos++; rpos++;
-	}
-#endif
-	buf->fill = wpos-buf->data;
-}
-#endif
-
-void postprocess_buffer(mpg123_handle *fr)
-{
-	/* Handle unsigned output formats via reshifting after decode here.
-	 Also handle conversion to 24 bit. */
-#ifndef NO_32BIT
-	if(fr->af.encoding == MPG123_ENC_UNSIGNED_32 || fr->af.encoding == MPG123_ENC_UNSIGNED_24)
-	{ /* 32bit signed -> unsigned */
-		size_t i;
-		int32_t *ssamples;
-		uint32_t *usamples;
-		ssamples = (int32_t*)fr->buffer.data;
-		usamples = (uint32_t*)fr->buffer.data;
-		debug("converting output to unsigned 32 bit integer");
-		for(i=0; i<fr->buffer.fill/sizeof(int32_t); ++i)
-		{
-			/* Different strategy since we don't have a larger type at hand.
-				 Also watch out for silly +-1 fun because integer constants are signed in C90! */
-			if(ssamples[i] >= 0)
-			usamples[i] = (uint32_t)ssamples[i] + 2147483647+1;
-			/* The smalles value goes zero. */
-			else if(ssamples[i] == ((int32_t)-2147483647-1))
-			usamples[i] = 0;
-			/* Now -value is in the positive range of signed int ... so it's a possible value at all. */
-			else
-			usamples[i] = (uint32_t)2147483647+1 - (uint32_t)(-ssamples[i]);
-		}
-		/* Dumb brute force: A second pass for hacking off the last byte. */
-		if(fr->af.encoding == MPG123_ENC_UNSIGNED_24)
-		chop_fourth_byte(&fr->buffer);
-	}
-	else if(fr->af.encoding == MPG123_ENC_SIGNED_24)
-	{
-		/* We got 32 bit signed ... chop off for 24 bit signed. */
-		chop_fourth_byte(&fr->buffer);
-	}
-#endif
-#ifndef NO_16BIT
-	if(fr->af.encoding == MPG123_ENC_UNSIGNED_16)
-	{
-		size_t i;
-		short *ssamples;
-		unsigned short *usamples;
-		ssamples = (short*)fr->buffer.data;
-		usamples = (unsigned short*)fr->buffer.data;
-		debug("converting output to unsigned 16 bit integer");
-		for(i=0; i<fr->buffer.fill/sizeof(short); ++i)
-		{
-			long tmp = (long)ssamples[i]+32768;
-			usamples[i] = (unsigned short)tmp;
-		}
-	}
-#endif
-}

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/frame.c Deleted

@@ -1,989 +0,0 @@
-/*
-	frame: Heap of routines dealing with the core mpg123 data structure.
-
-	copyright 2008-2010 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis
-*/
-
-#include "mpg123lib_intern.h"
-#include "getcpuflags.h"
-#include "debug.h"
-
-static void frame_fixed_reset(mpg123_handle *fr);
-
-/* that's doubled in decode_ntom.c */
-#define NTOM_MUL (32768)
-
-#define aligned_pointer(p, type, alignment) align_the_pointer(p, alignment)
-static void *align_the_pointer(void *base, unsigned int alignment)
-{
-	/*
-		Work in unsigned integer realm, explicitly.
-		Tricking the compiler into integer operations like % by invoking base-NULL is dangerous: It results into ptrdiff_t, which gets negative on big addresses. Big screw up, that.
-		I try to do it "properly" here: Casting only to uintptr_t and no artihmethic with void*.
-	*/
-	uintptr_t baseval = (uintptr_t)(char*)base;
-	uintptr_t aoff = baseval % alignment;
-
-	debug3("align_the_pointer: pointer %p is off by %u from %u",
-	 base, (unsigned int)aoff, alignment);
-
-	if(aoff) return (char*)base+alignment-aoff;
-	else return base;
-}
-
-static void frame_default_pars(mpg123_pars *mp)
-{
-	mp->outscale = 1.0;
-#ifdef GAPLESS
-	mp->flags = MPG123_GAPLESS;
-#else
-	mp->flags = 0;
-#endif
-#ifndef NO_NTOM
-	mp->force_rate = 0;
-#endif
-	mp->down_sample = 0;
-	mp->rva = 0;
-	mp->halfspeed = 0;
-	mp->doublespeed = 0;
-	mp->verbose = 0;
-#ifndef NO_ICY
-	mp->icy_interval = 0;
-#endif
-	mp->timeout = 0;
-	mp->resync_limit = 1024;
-#ifdef FRAME_INDEX
-	mp->index_size = INDEX_SIZE;
-#endif
-	mp->preframes = 4; /* That's good for layer 3 ISO compliance bitstream. */
-	mpg123_fmt_all(mp);
-}
-
-void frame_init(mpg123_handle *fr)
-{
-	frame_init_par(fr, NULL);
-}
-
-void frame_init_par(mpg123_handle *fr, mpg123_pars *mp)
-{
-	fr->own_buffer = FALSE;
-	fr->buffer.data = NULL;
-	fr->rawbuffs = NULL;
-	fr->rawbuffss = 0;
-	fr->rawdecwin = NULL;
-	fr->rawdecwins = 0;
-#ifndef NO_8BIT
-	fr->conv16to8_buf = NULL;
-#endif
-#ifdef OPT_DITHER
-	fr->dithernoise = NULL;
-#endif
-	fr->layerscratch = NULL;
-	fr->xing_toc = NULL;
-	fr->cpu_opts.type = defdec();
-	fr->cpu_opts.class = decclass(fr->cpu_opts.type);
-#ifndef NO_NTOM
-	/* these two look unnecessary, check guarantee for synth_ntom_set_step (in control_generic, even)! */
-	fr->ntom_val[0] = NTOM_MUL>>1;
-	fr->ntom_val[1] = NTOM_MUL>>1;
-	fr->ntom_step = NTOM_MUL;
-#endif
-	/* unnecessary: fr->buffer.size = fr->buffer.fill = 0; */
-	mpg123_reset_eq(fr);
-	init_icy(&fr->icy);
-	init_id3(fr);
-	/* frame_outbuffer is missing... */
-	/* frame_buffers is missing... that one needs cpu opt setting! */
-	/* after these... frame_reset is needed before starting full decode */
-	invalidate_format(&fr->af);
-	fr->rdat.r_read = NULL;
-	fr->rdat.r_lseek = NULL;
-	fr->rdat.iohandle = NULL;
-	fr->rdat.r_read_handle = NULL;
-	fr->rdat.r_lseek_handle = NULL;
-	fr->rdat.cleanup_handle = NULL;
-	fr->wrapperdata = NULL;
-	fr->wrapperclean = NULL;
-	fr->decoder_change = 1;
-	fr->err = MPG123_OK;
-	if(mp == NULL) frame_default_pars(&fr->p);
-	else memcpy(&fr->p, mp, sizeof(struct mpg123_pars_struct));
-
-	fr->down_sample = 0; /* Initialize to silence harmless errors when debugging. */
-	frame_fixed_reset(fr); /* Reset only the fixed data, dynamic buffers are not there yet! */
-	fr->synth = NULL;
-	fr->synth_mono = NULL;
-	fr->make_decode_tables = NULL;
-#ifdef FRAME_INDEX
-	fi_init(&fr->index);
-	frame_index_setup(fr); /* Apply the size setting. */
-#endif
-}
-
-#ifdef OPT_DITHER
-/* Also, only allocate the memory for the table on demand.
- In future, one could create special noise for different sampling frequencies(?). */
-int frame_dither_init(mpg123_handle *fr)
-{
-	/* run-time dither noise table generation */
-	if(fr->dithernoise == NULL)
-	{
-		fr->dithernoise = malloc(sizeof(float)*DITHERSIZE);
-		if(fr->dithernoise == NULL) return 0;
-
-		dither_table_init(fr->dithernoise);
-	}
-	return 1;
-}
-#endif
-
-mpg123_pars attribute_align_arg *mpg123_new_pars(int *error)
-{
-	mpg123_pars *mp = malloc(sizeof(struct mpg123_pars_struct));
-	if(mp != NULL){ frame_default_pars(mp); if(error != NULL) *error = MPG123_OK; }
-	else if(error != NULL) *error = MPG123_OUT_OF_MEM;
-	return mp;
-}
-
-void attribute_align_arg mpg123_delete_pars(mpg123_pars* mp)
-{
-	if(mp != NULL) free(mp);
-}
-
-int attribute_align_arg mpg123_reset_eq(mpg123_handle *mh)
-{
-	int i;
-	mh->have_eq_settings = 0;
-	for(i=0; i < 32; ++i) mh->equalizer[0][i] = mh->equalizer[1][i] = DOUBLE_TO_REAL(1.0);
-
-	return MPG123_OK;
-}
-
-int frame_outbuffer(mpg123_handle *fr)
-{
-	size_t size = mpg123_safe_buffer()*AUDIOBUFSIZE;
-	if(!fr->own_buffer) fr->buffer.data = NULL;
-	if(fr->buffer.data != NULL && fr->buffer.size != size)
-	{
-		free(fr->buffer.data);
-		fr->buffer.data = NULL;
-	}
-	fr->buffer.size = size;
-	if(fr->buffer.data == NULL) fr->buffer.data = (unsigned char*) malloc(fr->buffer.size);
-	if(fr->buffer.data == NULL)
-	{
-		fr->err = MPG123_OUT_OF_MEM;
-		return -1;
-	}
-	fr->own_buffer = TRUE;
-	fr->buffer.fill = 0;
-	return 0;
-}
-
-int attribute_align_arg mpg123_replace_buffer(mpg123_handle *mh, unsigned char *data, size_t size)
-{
-	if(data == NULL || size < mpg123_safe_buffer())
-	{
-		mh->err = MPG123_BAD_BUFFER;
-		return MPG123_ERR;
-	}
-	if(mh->own_buffer && mh->buffer.data != NULL) free(mh->buffer.data);
-	mh->own_buffer = FALSE;
-	mh->buffer.data = data;
-	mh->buffer.size = size;
-	mh->buffer.fill = 0;
-	return MPG123_OK;
-}
-
-#ifdef FRAME_INDEX
-int frame_index_setup(mpg123_handle *fr)
-{
-	int ret = MPG123_ERR;
-	if(fr->p.index_size >= 0)
-	{ /* Simple fixed index. */
-		fr->index.grow_size = 0;
-		debug1("resizing index to %li", fr->p.index_size);
-		ret = fi_resize(&fr->index, (size_t)fr->p.index_size);
-		debug2("index resized... %lu at %p", (unsigned long)fr->index.size, (void*)fr->index.data);
-	}
-	else
-	{ /* A growing index. We give it a start, though. */
-		fr->index.grow_size = (size_t)(- fr->p.index_size);
-		if(fr->index.size < fr->index.grow_size)
-		ret = fi_resize(&fr->index, fr->index.grow_size);
-		else
-		ret = MPG123_OK; /* We have minimal size already... and since growing is OK... */
-	}
-	debug2("set up frame index of size %lu (ret=%i)", (unsigned long)fr->index.size, ret);
-
-	return ret;
-}
-#endif
-
-static void frame_decode_buffers_reset(mpg123_handle *fr)
-{
-	memset(fr->rawbuffs, 0, fr->rawbuffss);
-}
-
-int frame_buffers(mpg123_handle *fr)
-{
-	int buffssize = 0;
-	debug1("frame %p buffer", (void*)fr);
-/*
-	the used-to-be-static buffer of the synth functions, has some subtly different types/sizes
-
-	2to1, 4to1, ntom, generic, i386: real[2][2][0x110]
-	mmx, sse: short[2][2][0x110]
-	i586(_dither): 4352 bytes; int/long[2][2][0x110]
-	i486: int[2][2][17*FIR_BUFFER_SIZE]
-	altivec: static real __attribute__ ((aligned (16))) buffs[4][4][0x110]
-
-	Huh, altivec looks like fun. Well, let it be large... then, the 16 byte alignment seems to be implicit on MacOSX malloc anyway.
-	Let's make a reasonable attempt to allocate enough memory...
-	Keep in mind: biggest ones are i486 and altivec (mutually exclusive!), then follows i586 and normal real.
-	mmx/sse use short but also real for resampling.
-	Thus, minimum is 2*2*0x110*sizeof(real).
-*/
-	if(fr->cpu_opts.type == altivec) buffssize = 4*4*0x110*sizeof(real);
-#ifdef OPT_I486
-	else if(fr->cpu_opts.type == ivier) buffssize = 2*2*17*FIR_BUFFER_SIZE*sizeof(int);
-#endif
-	else if(fr->cpu_opts.type == ifuenf || fr->cpu_opts.type == ifuenf_dither || fr->cpu_opts.type == dreidnow)
-	buffssize = 2*2*0x110*4; /* don't rely on type real, we need 4352 bytes */
-
-	if(2*2*0x110*sizeof(real) > buffssize)
-	buffssize = 2*2*0x110*sizeof(real);
-	buffssize += 15; /* For 16-byte alignment (SSE likes that). */
-
-	if(fr->rawbuffs != NULL && fr->rawbuffss != buffssize)
-	{
-		free(fr->rawbuffs);
-		fr->rawbuffs = NULL;
-	}
-
-	if(fr->rawbuffs == NULL) fr->rawbuffs = (unsigned char*) malloc(buffssize);
-	if(fr->rawbuffs == NULL) return -1;
-	fr->rawbuffss = buffssize;
-	fr->short_buffs[0][0] = aligned_pointer(fr->rawbuffs,short,16);
-	fr->short_buffs[0][1] = fr->short_buffs[0][0] + 0x110;
-	fr->short_buffs[1][0] = fr->short_buffs[0][1] + 0x110;
-	fr->short_buffs[1][1] = fr->short_buffs[1][0] + 0x110;
-	fr->real_buffs[0][0] = aligned_pointer(fr->rawbuffs,real,16);
-	fr->real_buffs[0][1] = fr->real_buffs[0][0] + 0x110;
-	fr->real_buffs[1][0] = fr->real_buffs[0][1] + 0x110;
-	fr->real_buffs[1][1] = fr->real_buffs[1][0] + 0x110;
-#ifdef OPT_I486
-	if(fr->cpu_opts.type == ivier)
-	{
-		fr->int_buffs[0][0] = (int*) fr->rawbuffs;
-		fr->int_buffs[0][1] = fr->int_buffs[0][0] + 17*FIR_BUFFER_SIZE;
-		fr->int_buffs[1][0] = fr->int_buffs[0][1] + 17*FIR_BUFFER_SIZE;
-		fr->int_buffs[1][1] = fr->int_buffs[1][0] + 17*FIR_BUFFER_SIZE;
-	}
-#endif
-#ifdef OPT_ALTIVEC
-	if(fr->cpu_opts.type == altivec)
-	{
-		int i,j;
-		fr->areal_buffs[0][0] = (real*) fr->rawbuffs;
-		for(i=0; i<4; ++i) for(j=0; j<4; ++j)
-		fr->areal_buffs[i][j] = fr->areal_buffs[0][0] + (i*4+j)*0x110;
-	}
-#endif
-	/* now the different decwins... all of the same size, actually */
-	/* The MMX ones want 32byte alignment, which I'll try to ensure manually */
-	{
-		int decwin_size = (512+32)*sizeof(real);
-#ifdef OPT_MMXORSSE
-#ifdef OPT_MULTI
-		if(fr->cpu_opts.class == mmxsse)
-		{
-#endif
-			/* decwin_mmx will share, decwins will be appended ... sizeof(float)==4 */
-			if(decwin_size < (512+32)*4) decwin_size = (512+32)*4;
-
-			/* the second window + alignment zone -- we align for 32 bytes for SSE as
-			 requirement, 64 byte for matching cache line size (that matters!) */
-			decwin_size += (512+32)*4 + 63;
-			/* (512+32)*4/32 == 2176/32 == 68, so one decwin block retains alignment for 32 or 64 bytes */
-#ifdef OPT_MULTI
-		}
-#endif
-#endif
-#if defined(OPT_ALTIVEC) || defined(OPT_ARM) 
-		/* sizeof(real) >= 4 ... yes, it could be 8, for example.
-		 We got it intialized to at least (512+32)*sizeof(real).*/
-		decwin_size += 512*sizeof(real);
-#endif
-		/* Hm, that's basically realloc() ... */
-		if(fr->rawdecwin != NULL && fr->rawdecwins != decwin_size)
-		{
-			free(fr->rawdecwin);
-			fr->rawdecwin = NULL;
-		}
-
-		if(fr->rawdecwin == NULL)
-		fr->rawdecwin = (unsigned char*) malloc(decwin_size);
-
-		if(fr->rawdecwin == NULL) return -1;
-
-		fr->rawdecwins = decwin_size;
-		fr->decwin = (real*) fr->rawdecwin;
-#ifdef OPT_MMXORSSE
-#ifdef OPT_MULTI
-		if(fr->cpu_opts.class == mmxsse)
-		{
-#endif
-			/* align decwin, assign that to decwin_mmx, append decwins */
-			/* I need to add to decwin what is missing to the next full 64 byte -- also I want to make gcc -pedantic happy... */
-			fr->decwin = aligned_pointer(fr->rawdecwin,real,64);
-			debug1("aligned decwin: %p", (void*)fr->decwin);
-			fr->decwin_mmx = (float*)fr->decwin;
-			fr->decwins = fr->decwin_mmx+512+32;
-#ifdef OPT_MULTI
-		}
-		else debug("no decwins/decwin_mmx for that class");
-#endif
-#endif
-	}
-
-	/* Layer scratch buffers are of compile-time fixed size, so allocate only once. */
-	if(fr->layerscratch == NULL)
-	{
-		/* Allocate specific layer1/2/3 buffers, so that we know they'll work for SSE. */
-		size_t scratchsize = 0;
-		real *scratcher;
-#ifndef NO_LAYER1
-		scratchsize += sizeof(real) * 2 * SBLIMIT;
-#endif
-#ifndef NO_LAYER2
-		scratchsize += sizeof(real) * 2 * 4 * SBLIMIT;
-#endif
-#ifndef NO_LAYER3
-		scratchsize += sizeof(real) * 2 * SBLIMIT * SSLIMIT; /* hybrid_in */
-		scratchsize += sizeof(real) * 2 * SSLIMIT * SBLIMIT; /* hybrid_out */
-#endif
-		/*
-			Now figure out correct alignment:
-			We need 16 byte minimum, smallest unit of the blocks is 2*SBLIMIT*sizeof(real), which is 64*4=256. Let's do 64bytes as heuristic for cache line (as proven useful in buffs above).
-		*/
-		fr->layerscratch = malloc(scratchsize+63);
-		if(fr->layerscratch == NULL) return -1;
-
-		/* Get aligned part of the memory, then divide it up. */
-		scratcher = aligned_pointer(fr->layerscratch,real,64);
-		/* Those funky pointer casts silence compilers...
-		 One might change the code at hand to really just use 1D arrays, but in practice, that would not make a (positive) difference. */
-#ifndef NO_LAYER1
-		fr->layer1.fraction = (real(*)[SBLIMIT])scratcher;
-		scratcher += 2 * SBLIMIT;
-#endif
-#ifndef NO_LAYER2
-		fr->layer2.fraction = (real(*)[4][SBLIMIT])scratcher;
-		scratcher += 2 * 4 * SBLIMIT;
-#endif
-#ifndef NO_LAYER3
-		fr->layer3.hybrid_in = (real(*)[SBLIMIT][SSLIMIT])scratcher;
-		scratcher += 2 * SBLIMIT * SSLIMIT;
-		fr->layer3.hybrid_out = (real(*)[SSLIMIT][SBLIMIT])scratcher;
-		scratcher += 2 * SSLIMIT * SBLIMIT;
-#endif
-		/* Note: These buffers don't need resetting here. */
-	}
-
-	/* Only reset the buffers we created just now. */
-	frame_decode_buffers_reset(fr);
-
-	debug1("frame %p buffer done", (void*)fr);
-	return 0;
-}
-
-int frame_buffers_reset(mpg123_handle *fr)
-{
-	fr->buffer.fill = 0; /* hm, reset buffer fill... did we do a flush? */
-	fr->bsnum = 0;
-	/* Wondering: could it be actually _wanted_ to retain buffer contents over different files? (special gapless / cut stuff) */
-	fr->bsbuf = fr->bsspace[1];
-	fr->bsbufold = fr->bsbuf;
-	fr->bitreservoir = 0; /* Not entirely sure if this is the right place for that counter. */
-	frame_decode_buffers_reset(fr);
-	memset(fr->bsspace, 0, 2*(MAXFRAMESIZE+512));
-	memset(fr->ssave, 0, 34);
-	fr->hybrid_blc[0] = fr->hybrid_blc[1] = 0;
-	memset(fr->hybrid_block, 0, sizeof(real)*2*2*SBLIMIT*SSLIMIT);
-	return 0;
-}
-
-static void frame_icy_reset(mpg123_handle* fr)
-{
-#ifndef NO_ICY
-	if(fr->icy.data != NULL) free(fr->icy.data);
-	fr->icy.data = NULL;
-	fr->icy.interval = 0;
-	fr->icy.next = 0;
-#endif
-}
-
-static void frame_free_toc(mpg123_handle *fr)
-{
-	if(fr->xing_toc != NULL){ free(fr->xing_toc); fr->xing_toc = NULL; }
-}
-
-/* Just copy the Xing TOC over... */
-int frame_fill_toc(mpg123_handle *fr, unsigned char* in)
-{
-	if(fr->xing_toc == NULL) fr->xing_toc = malloc(100);
-	if(fr->xing_toc != NULL)
-	{
-		memcpy(fr->xing_toc, in, 100);
-#ifdef DEBUG
-		debug("Got a TOC! Showing the values...");
-		{
-			int i;
-			for(i=0; i<100; ++i)
-			debug2("entry %i = %i", i, fr->xing_toc[i]);
-		}
-#endif
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/* Prepare the handle for a new track.
- Reset variables, buffers... */
-int frame_reset(mpg123_handle* fr)
-{
-	frame_buffers_reset(fr);
-	frame_fixed_reset(fr);
-	frame_free_toc(fr);
-#ifdef FRAME_INDEX
-	fi_reset(&fr->index);
-#endif
-
-	return 0;
-}
-
-/* Reset everythign except dynamic memory. */
-static void frame_fixed_reset(mpg123_handle *fr)
-{
-	frame_icy_reset(fr);
-	open_bad(fr);
-	fr->to_decode = FALSE;
-	fr->to_ignore = FALSE;
-	fr->metaflags = 0;
-	fr->outblock = mpg123_safe_buffer();
-	fr->num = -1;
-	fr->playnum = -1;
-	fr->accurate = TRUE;
-	fr->silent_resync = 0;
-	fr->audio_start = 0;
-	fr->clip = 0;
-	fr->oldhead = 0;
-	fr->firsthead = 0;
-	fr->vbr = MPG123_CBR;
-	fr->abr_rate = 0;
-	fr->track_frames = 0;
-	fr->track_samples = -1;
-	fr->framesize=0; 
-	fr->mean_frames = 0;
-	fr->mean_framesize = 0;
-	fr->freesize = 0;
-	fr->lastscale = -1;
-	fr->rva.level[0] = -1;
-	fr->rva.level[1] = -1;
-	fr->rva.gain[0] = 0;
-	fr->rva.gain[1] = 0;
-	fr->rva.peak[0] = 0;
-	fr->rva.peak[1] = 0;
-	fr->fsizeold = 0;
-	fr->firstframe = 0;
-	fr->ignoreframe = fr->firstframe-fr->p.preframes;
-	fr->lastframe = -1;
-	fr->fresh = 1;
-	fr->new_format = 0;
-#ifdef GAPLESS
-	frame_gapless_init(fr,0,0);
-	fr->lastoff = 0;
-	fr->firstoff = 0;
-#endif
-#ifdef OPT_I486
-	fr->i486bo[0] = fr->i486bo[1] = FIR_SIZE-1;
-#endif
-	fr->bo = 1; /* the usual bo */
-#ifdef OPT_DITHER
-	fr->ditherindex = 0;
-#endif
-	reset_id3(fr);
-	reset_icy(&fr->icy);
-	/* ICY stuff should go into icy.c, eh? */
-#ifndef NO_ICY
-	fr->icy.interval = 0;
-	fr->icy.next = 0;
-#endif
-	fr->halfphase = 0; /* here or indeed only on first-time init? */
-	fr->error_protection = 0;
-	fr->freeformat_framesize = -1;
-}
-
-static void frame_free_buffers(mpg123_handle *fr)
-{
-	if(fr->rawbuffs != NULL) free(fr->rawbuffs);
-	fr->rawbuffs = NULL;
-	fr->rawbuffss = 0;
-	if(fr->rawdecwin != NULL) free(fr->rawdecwin);
-	fr->rawdecwin = NULL;
-	fr->rawdecwins = 0;
-#ifndef NO_8BIT
-	if(fr->conv16to8_buf != NULL) free(fr->conv16to8_buf);
-	fr->conv16to8_buf = NULL;
-#endif
-	if(fr->layerscratch != NULL) free(fr->layerscratch);
-}
-
-void frame_exit(mpg123_handle *fr)
-{
-	if(fr->own_buffer && fr->buffer.data != NULL)
-	{
-		debug1("freeing buffer at %p", (void*)fr->buffer.data);
-		free(fr->buffer.data);
-	}
-	fr->buffer.data = NULL;
-	frame_free_buffers(fr);
-	frame_free_toc(fr);
-#ifdef FRAME_INDEX
-	fi_exit(&fr->index);
-#endif
-#ifdef OPT_DITHER
-	if(fr->dithernoise != NULL)
-	{
-		free(fr->dithernoise);
-		fr->dithernoise = NULL;
-	}
-#endif
-	exit_id3(fr);
-	clear_icy(&fr->icy);
-	/* Clean up possible mess from LFS wrapper. */
-	if(fr->wrapperclean != NULL)
-	{
-		fr->wrapperclean(fr->wrapperdata);
-		fr->wrapperdata = NULL;
-	}
-}
-
-int attribute_align_arg mpg123_info(mpg123_handle *mh, struct mpg123_frameinfo *mi)
-{
-	if(mh == NULL) return MPG123_ERR;
-	if(mi == NULL)
-	{
-		mh->err = MPG123_ERR_NULL;
-		return MPG123_ERR;
-	}
-	mi->version = mh->mpeg25 ? MPG123_2_5 : (mh->lsf ? MPG123_2_0 : MPG123_1_0);
-	mi->layer = mh->lay;
-	mi->rate = frame_freq(mh);
-	switch(mh->mode)
-	{
-		case 0: mi->mode = MPG123_M_STEREO; break;
-		case 1: mi->mode = MPG123_M_JOINT; break;
-		case 2: mi->mode = MPG123_M_DUAL; break;
-		case 3: mi->mode = MPG123_M_MONO; break;
-		default: error("That mode cannot be!");
-	}
-	mi->mode_ext = mh->mode_ext;
-	mi->framesize = mh->framesize+4; /* Include header. */
-	mi->flags = 0;
-	if(mh->error_protection) mi->flags |= MPG123_CRC;
-	if(mh->copyright) mi->flags |= MPG123_COPYRIGHT;
-	if(mh->extension) mi->flags |= MPG123_PRIVATE;
-	if(mh->original) mi->flags |= MPG123_ORIGINAL;
-	mi->emphasis = mh->emphasis;
-	mi->bitrate = frame_bitrate(mh);
-	mi->abr_rate = mh->abr_rate;
-	mi->vbr = mh->vbr;
-	return MPG123_OK;
-}
-
-
-/*
-	Fuzzy frame offset searching (guessing).
-	When we don't have an accurate position, we may use an inaccurate one.
-	Possibilities:
-		- use approximate positions from Xing TOC (not yet parsed)
-		- guess wildly from mean framesize and offset of first frame / beginning of file.
-*/
-
-static off_t frame_fuzzy_find(mpg123_handle *fr, off_t want_frame, off_t* get_frame)
-{
-	/* Default is to go to the beginning. */
-	off_t ret = fr->audio_start;
-	*get_frame = 0;
-
-	/* But we try to find something better. */
-	/* Xing VBR TOC works with relative positions, both in terms of audio frames and stream bytes.
-	 Thus, it only works when whe know the length of things.
-	 Oh... I assume the offsets are relative to the _total_ file length. */
-	if(fr->xing_toc != NULL && fr->track_frames > 0 && fr->rdat.filelen > 0)
-	{
-		/* One could round... */
-		int toc_entry = (int) ((double)want_frame*100./fr->track_frames);
-		/* It is an index in the 100-entry table. */
-		if(toc_entry < 0) toc_entry = 0;
-		if(toc_entry > 99) toc_entry = 99;
-
-		/* Now estimate back what frame we get. */
-		*get_frame = (off_t) ((double)toc_entry/100. * fr->track_frames);
-		fr->accurate = FALSE;
-		fr->silent_resync = 1;
-		/* Question: Is the TOC for whole file size (with/without ID3) or the "real" audio data only?
-		 ID3v1 info could also matter. */
-		ret = (off_t) ((double)fr->xing_toc[toc_entry]/256.* fr->rdat.filelen);
-	}
-	else if(fr->mean_framesize > 0)
-	{	/* Just guess with mean framesize (may be exact with CBR files). */
-		/* Query filelen here or not? */
-		fr->accurate = FALSE; /* Fuzzy! */
-		fr->silent_resync = 1;
-		*get_frame = want_frame;
-		ret = (off_t) (fr->audio_start+fr->mean_framesize*want_frame);
-	}
-	debug5("fuzzy: want %li of %li, get %li at %li B of %li B",
-		(long)want_frame, (long)fr->track_frames, (long)*get_frame, (long)ret, (long)(fr->rdat.filelen-fr->audio_start));
-	return ret;
-}
-
-/*
-	find the best frame in index just before the wanted one, seek to there
-	then step to just before wanted one with read_frame
-	do not care tabout the stuff that was in buffer but not played back
-	everything that left the decoder is counted as played
-	
-	Decide if you want low latency reaction and accurate timing info or stable long-time playback with buffer!
-*/
-
-off_t frame_index_find(mpg123_handle *fr, off_t want_frame, off_t* get_frame)
-{
-	/* default is file start if no index position */
-	off_t gopos = 0;
-	*get_frame = 0;
-#ifdef FRAME_INDEX
-	/* Possibly use VBRI index, too? I'd need an example for this... */
-	if(fr->index.fill)
-	{
-		/* find in index */
-		size_t fi;
-		/* at index fi there is frame step*fi... */
-		fi = want_frame/fr->index.step;
-		if(fi >= fr->index.fill) /* If we are beyond the end of frame index...*/
-		{
-			/* When fuzzy seek is allowed, we have some limited tolerance for the frames we want to read rather then jump over. */
-			if(fr->p.flags & MPG123_FUZZY && want_frame - (fr->index.fill-1)*fr->index.step > 10)
-			{
-				gopos = frame_fuzzy_find(fr, want_frame, get_frame);
-				if(gopos > fr->audio_start) return gopos; /* Only in that case, we have a useful guess. */
-				/* Else... just continue, fuzzyness didn't help. */
-			}
-			/* Use the last available position, slowly advancing from that one. */
-			fi = fr->index.fill - 1;
-		}
-		/* We have index position, that yields frame and byte offsets. */
-		*get_frame = fi*fr->index.step;
-		gopos = fr->index.data[fi];
-		fr->accurate = TRUE; /* When using the frame index, we are accurate. */
-	}
-	else
-	{
-#endif
-		if(fr->p.flags & MPG123_FUZZY)
-		return frame_fuzzy_find(fr, want_frame, get_frame);
-		/* A bit hackish here... but we need to be fresh when looking for the first header again. */
-		fr->firsthead = 0;
-		fr->oldhead = 0;
-#ifdef FRAME_INDEX
-	}
-#endif
-	debug2("index: 0x%lx for frame %li", (unsigned long)gopos, (long) *get_frame);
-	return gopos;
-}
-
-off_t frame_ins2outs(mpg123_handle *fr, off_t ins)
-{	
-	off_t outs = 0;
-	switch(fr->down_sample)
-	{
-		case 0:
-#		ifndef NO_DOWNSAMPLE
-		case 1:
-		case 2:
-#		endif
-			outs = ins>>fr->down_sample;
-		break;
-#		ifndef NO_NTOM
-		case 3: outs = ntom_ins2outs(fr, ins); break;
-#		endif
-		default: error1("Bad down_sample (%i) ... should not be possible!!", fr->down_sample);
-	}
-	return outs;
-}
-
-off_t frame_outs(mpg123_handle *fr, off_t num)
-{
-	off_t outs = 0;
-	switch(fr->down_sample)
-	{
-		case 0:
-#		ifndef NO_DOWNSAMPLE
-		case 1:
-		case 2:
-#		endif
-			outs = (spf(fr)>>fr->down_sample)*num;
-		break;
-#ifndef NO_NTOM
-		case 3: outs = ntom_frmouts(fr, num); break;
-#endif
-		default: error1("Bad down_sample (%i) ... should not be possible!!", fr->down_sample);
-	}
-	return outs;
-}
-
-/* Compute the number of output samples we expect from this frame.
- This is either simple spf() or a tad more elaborate for ntom. */
-off_t frame_expect_outsamples(mpg123_handle *fr)
-{
-	off_t outs = 0;
-	switch(fr->down_sample)
-	{
-		case 0:
-#		ifndef NO_DOWNSAMPLE
-		case 1:
-		case 2:
-#		endif
-			outs = spf(fr)>>fr->down_sample;
-		break;
-#ifndef NO_NTOM
-		case 3: outs = ntom_frame_outsamples(fr); break;
-#endif
-		default: error1("Bad down_sample (%i) ... should not be possible!!", fr->down_sample);
-	}
-	return outs;
-}
-
-off_t frame_offset(mpg123_handle *fr, off_t outs)
-{
-	off_t num = 0;
-	switch(fr->down_sample)
-	{
-		case 0:
-#		ifndef NO_DOWNSAMPLE
-		case 1:
-		case 2:
-#		endif
-			num = outs/(spf(fr)>>fr->down_sample);
-		break;
-#ifndef NO_NTOM
-		case 3: num = ntom_frameoff(fr, outs); break;
-#endif
-		default: error("Bad down_sample ... should not be possible!!");
-	}
-	return num;
-}
-
-#ifdef GAPLESS
-/* input in _input_ samples */
-void frame_gapless_init(mpg123_handle *fr, off_t b, off_t e)
-{
-	fr->begin_s = b;
-	fr->end_s = e;
-	/* These will get proper values later, from above plus resampling info. */
-	fr->begin_os = 0;
-	fr->end_os = 0;
-	debug2("frame_gapless_init: from %lu to %lu samples", (long unsigned)fr->begin_s, (long unsigned)fr->end_s);
-}
-
-void frame_gapless_realinit(mpg123_handle *fr)
-{
-	fr->begin_os = frame_ins2outs(fr, fr->begin_s);
-	fr->end_os = frame_ins2outs(fr, fr->end_s);
-	debug2("frame_gapless_realinit: from %lu to %lu samples", (long unsigned)fr->begin_os, (long unsigned)fr->end_os);
-}
-
-/* When we got a new sample count, update the gaplessness. */
-void frame_gapless_update(mpg123_handle *fr, off_t total_samples)
-{
-	if(fr->end_s < 1)
-	{
-		fr->end_s = total_samples;
-		frame_gapless_realinit(fr);
-	}
-	else if(fr->end_s > total_samples)
-	{
-		if(NOQUIET) error2("end sample count smaller than gapless end! (%"OFF_P" < %"OFF_P").", (off_p)total_samples, (off_p)fr->end_s);
-		/* Humbly disabling gapless stuff on track end. */
-		fr->end_s = 0;
-		frame_gapless_realinit(fr);
-		fr->lastframe = -1;
-		fr->lastoff = 0;
-	}
-}
-
-#endif
-
-/* Compute the needed frame to ignore from, for getting accurate/consistent output for intended firstframe. */
-static off_t ignoreframe(mpg123_handle *fr)
-{
-	off_t preshift = fr->p.preframes;
-	/* Layer 3 _really_ needs at least one frame before. */
-	if(fr->lay==3 && preshift < 1) preshift = 1;
-	/* Layer 1 & 2 reall do not need more than 2. */
-	if(fr->lay!=3 && preshift > 2) preshift = 2;
-
-	return fr->firstframe - preshift;
-}
-
-/* The frame seek... This is not simply the seek to fe*spf(fr) samples in output because we think of _input_ frames here.
- Seek to frame offset 1 may be just seek to 200 samples offset in output since the beginning of first frame is delay/padding.
- Hm, is that right? OK for the padding stuff, but actually, should the decoder delay be better totally hidden or not?
- With gapless, even the whole frame position could be advanced further than requested (since Homey don't play dat). */
-void frame_set_frameseek(mpg123_handle *fr, off_t fe)
-{
-	fr->firstframe = fe;
-#ifdef GAPLESS
-	if(fr->p.flags & MPG123_GAPLESS)
-	{
-		/* Take care of the beginning... */
-		off_t beg_f = frame_offset(fr, fr->begin_os);
-		if(fe <= beg_f)
-		{
-			fr->firstframe = beg_f;
-			fr->firstoff = fr->begin_os - frame_outs(fr, beg_f);
-		}
-		else fr->firstoff = 0;
-		/* The end is set once for a track at least, on the frame_set_frameseek called in get_next_frame() */
-		if(fr->end_os > 0)
-		{
-			fr->lastframe = frame_offset(fr,fr->end_os);
-			fr->lastoff = fr->end_os - frame_outs(fr, fr->lastframe);
-		} else fr->lastoff = 0;
-	} else { fr->firstoff = fr->lastoff = 0; fr->lastframe = -1; }
-#endif
-	fr->ignoreframe = ignoreframe(fr);
-#ifdef GAPLESS
-	debug5("frame_set_frameseek: begin at %li frames and %li samples, end at %li and %li; ignore from %li",
-	 (long) fr->firstframe, (long) fr->firstoff,
-	 (long) fr->lastframe, (long) fr->lastoff, (long) fr->ignoreframe);
-#else
-	debug3("frame_set_frameseek: begin at %li frames, end at %li; ignore from %li",
-	 (long) fr->firstframe, (long) fr->lastframe, (long) fr->ignoreframe);
-#endif
-}
-
-void frame_skip(mpg123_handle *fr)
-{
-#ifndef NO_LAYER3
-	if(fr->lay == 3) set_pointer(fr, 512);
-#endif
-}
-
-/* Sample accurate seek prepare for decoder. */
-/* This gets unadjusted output samples and takes resampling into account */
-void frame_set_seek(mpg123_handle *fr, off_t sp)
-{
-	fr->firstframe = frame_offset(fr, sp);
-#ifndef NO_NTOM
-	if(fr->down_sample == 3) ntom_set_ntom(fr, fr->firstframe);
-#endif
-	fr->ignoreframe = ignoreframe(fr);
-#ifdef GAPLESS /* The sample offset is used for non-gapless mode, too! */
-	fr->firstoff = sp - frame_outs(fr, fr->firstframe);
-	debug5("frame_set_seek: begin at %li frames and %li samples, end at %li and %li; ignore from %li",
-	 (long) fr->firstframe, (long) fr->firstoff,
-	 (long) fr->lastframe, (long) fr->lastoff, (long) fr->ignoreframe);
-#else
-	debug3("frame_set_seek: begin at %li frames, end at %li; ignore from %li",
-	 (long) fr->firstframe, (long) fr->lastframe, (long) fr->ignoreframe);
-#endif
-	/* Old bit reservoir should be invalid, eh? */
-	fr->bitreservoir = 0;
-}
-
-int attribute_align_arg mpg123_volume_change(mpg123_handle *mh, double change)
-{
-	if(mh == NULL) return MPG123_ERR;
-	return mpg123_volume(mh, change + (double) mh->p.outscale);
-}
-
-int attribute_align_arg mpg123_volume(mpg123_handle *mh, double vol)
-{
-	if(mh == NULL) return MPG123_ERR;
-
-	if(vol >= 0) mh->p.outscale = vol;
-	else mh->p.outscale = 0.;
-
-	do_rva(mh);
-	return MPG123_OK;
-}
-
-static int get_rva(mpg123_handle *fr, double *peak, double *gain)
-{
-	double p = -1;
-	double g = 0;
-	int ret = 0;
-	if(fr->p.rva)
-	{
-		int rt = 0;
-		/* Should one assume a zero RVA as no RVA? */
-		if(fr->p.rva == 2 && fr->rva.level[1] != -1) rt = 1;
-		if(fr->rva.level[rt] != -1)
-		{
-			p = fr->rva.peak[rt];
-			g = fr->rva.gain[rt];
-			ret = 1; /* Success. */
-		}
-	}
-	if(peak != NULL) *peak = p;
-	if(gain != NULL) *gain = g;
-	return ret;
-}
-
-/* adjust the volume, taking both fr->outscale and rva values into account */
-void do_rva(mpg123_handle *fr)
-{
-	double peak = 0;
-	double gain = 0;
-	double newscale;
-	double rvafact = 1;
-	if(get_rva(fr, &peak, &gain))
-	{
-		if(NOQUIET && fr->p.verbose > 1) fprintf(stderr, "Note: doing RVA with gain %f\n", gain);
-		rvafact = pow(10,gain/20);
-	}
-
-	newscale = fr->p.outscale*rvafact;
-
-	/* if peak is unknown (== 0) this check won't hurt */
-	if((peak*newscale) > 1.0)
-	{
-		newscale = 1.0/peak;
-		warning2("limiting scale value to %f to prevent clipping with indicated peak factor of %f", newscale, peak);
-	}
-	/* first rva setting is forced with fr->lastscale < 0 */
-	if(newscale != fr->lastscale || fr->decoder_change)
-	{
-		debug3("changing scale value from %f to %f (peak estimated to %f)", fr->lastscale != -1 ? fr->lastscale : fr->p.outscale, newscale, (double) (newscale*peak));
-		fr->lastscale = newscale;
-		/* It may be too early, actually. */
-		if(fr->make_decode_tables != NULL) fr->make_decode_tables(fr); /* the actual work */
-	}
-}
-
-
-int attribute_align_arg mpg123_getvolume(mpg123_handle *mh, double *base, double *really, double *rva_db)
-{
-	if(mh == NULL) return MPG123_ERR;
-	if(base) *base = mh->p.outscale;
-	if(really) *really = mh->lastscale;
-	get_rva(mh, NULL, rva_db);
-	return MPG123_OK;
-}
-

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/frame.h Deleted

@@ -1,397 +0,0 @@
-/*
-	frame: Central data structures and opmitization hooks.
-
-	copyright 2007 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis
-*/
-
-#ifndef MPG123_FRAME_H
-#define MPG123_FRAME_H
-
-#include <stdio.h>
-#include "config.h"
-#include "mpg123.h"
-#include "optimize.h"
-#include "id3.h"
-#include "icy.h"
-#include "reader.h"
-#ifdef FRAME_INDEX
-#include "index.h"
-#endif
-#include "synths.h"
-
-#ifdef OPT_DITHER
-#include "dither.h"
-int frame_dither_init(mpg123_handle *fr);
-#endif
-
-/* max = 1728 */
-#define MAXFRAMESIZE 3456
-
-struct al_table
-{
- short bits;
- short d;
-};
-
-/* the output buffer, used to be pcm_sample, pcm_point and audiobufsize */
-struct outbuffer
-{
-	unsigned char *data;
-	unsigned char *p; /* read pointer */
-	size_t fill; /* fill from read pointer */
-	size_t size; /* that's actually more like a safe size, after we have more than that, flush it */
-};
-
-struct audioformat
-{
-	int encoding;
-	int encsize; /* Size of one sample in bytes, plain int should be fine here... */
-	int channels;
-	long rate;
-};
-
-void invalidate_format(struct audioformat *af);
-
-struct mpg123_pars_struct
-{
-	int verbose; /* verbose level */
-	long flags; /* combination of above */
-#ifndef NO_NTOM
-	long force_rate;
-#endif
-	int down_sample;
-	int rva; /* (which) rva to do: 0: nothing, 1: radio/mix/track 2: album/audiophile */
-	long halfspeed;
-	long doublespeed;
-	long timeout;
-#define NUM_CHANNELS 2
-	char audio_caps[NUM_CHANNELS][MPG123_RATES+1][MPG123_ENCODINGS];
-/*	long start_frame; */ /* frame offset to begin with */
-/*	long frame_number;*/ /* number of frames to decode */
-#ifndef NO_ICY
-	long icy_interval;
-#endif
-	double outscale;
-	long resync_limit;
-	long index_size; /* Long, because: negative values have a meaning. */
-	long preframes;
-};
-
-
-
-/* There is a lot to condense here... many ints can be merged as flags; though the main space is still consumed by buffers. */
-struct mpg123_handle_struct
-{
-	int fresh; /* to be moved into flags */
-	int new_format;
-	real hybrid_block[2][2][SBLIMIT*SSLIMIT];
-	int hybrid_blc[2];
-	/* the scratch vars for the decoders, sometimes real, sometimes short... sometimes int/long */ 
-	short *short_buffs[2][2];
-	real *real_buffs[2][2];
-	unsigned char *rawbuffs;
-	int rawbuffss;
-#ifdef OPT_I486
-	int i486bo[2];
-#endif
-	int bo; /* Just have it always here. */
-#ifdef OPT_DITHER
-	int ditherindex;
-	float *dithernoise;
-#endif
-	unsigned char* rawdecwin; /* the block with all decwins */
-	int rawdecwins; /* size of rawdecwin memory */
-	real *decwin; /* _the_ decode table */
-#ifdef OPT_MMXORSSE
-	/* I am not really sure that I need both of them... used in assembler */
-	float *decwin_mmx;
-	float *decwins;
-#endif
-	int have_eq_settings;
-	real equalizer[2][32];
-
-	/* for halfspeed mode */
-	unsigned char ssave[34];
-	int halfphase;
-#ifndef NO_8BIT
-	/* a raw buffer and a pointer into the middle for signed short conversion, only allocated on demand */
-	unsigned char *conv16to8_buf;
-	unsigned char *conv16to8;
-#endif
-	/* There's some possible memory saving for stuff that is not _really_ dynamic. */
-
-	/* layer3 */
-	int longLimit[9][23];
-	int shortLimit[9][14];
-	real gainpow2[256+118+4]; /* not really dynamic, just different for mmx */
-
-	/* layer2 */
-	real muls[27][64];	/* also used by layer 1 */
-
-#ifndef NO_NTOM
-	/* decode_ntom */
-	unsigned long ntom_val[2];
-	unsigned long ntom_step;
-#endif
-	/* special i486 fun */
-#ifdef OPT_I486
-	int *int_buffs[2][2];
-#endif
-	/* special altivec... */
-#ifdef OPT_ALTIVEC
-	real *areal_buffs[4][4];
-#endif
-	struct synth_s synths;
-	struct
-	{
-#ifdef OPT_MULTI
-
-#ifndef NO_LAYER3
-#if (defined OPT_3DNOW || defined OPT_3DNOWEXT)
-		void (*the_dct36)(real *,real *,real *,real *,real *);
-#endif
-#endif
-
-#endif
-		enum optdec type;
-		enum optcla class;
-	} cpu_opts;
-
-	int verbose; /* 0: nothing, 1: just print chosen decoder, 2: be verbose */
-
-	const struct al_table *alloc;
-	/* The runtime-chosen decoding, based on input and output format. */
-	func_synth synth;
-	func_synth_stereo synth_stereo;
-	func_synth_mono synth_mono;
-	/* Yes, this function is runtime-switched, too. */
-	void (*make_decode_tables)(mpg123_handle *fr); /* That is the volume control. */
-
-	int stereo; /* I _think_ 1 for mono and 2 for stereo */
-	int jsbound;
-#define SINGLE_STEREO -1
-#define SINGLE_LEFT 0
-#define SINGLE_RIGHT 1
-#define SINGLE_MIX 3
-	int single;
-	int II_sblimit;
-	int down_sample_sblimit;
-	int lsf; /* 0: MPEG 1.0; 1: MPEG 2.0/2.5 -- both used as bool and array index! */
-	/* Many flags in disguise as integers... wasting bytes. */
-	int mpeg25;
-	int down_sample;
-	int header_change;
-	int lay;
-	int (*do_layer)(mpg123_handle *);
-	int error_protection;
-	int bitrate_index;
-	int sampling_frequency;
-	int padding;
-	int extension;
-	int mode;
-	int mode_ext;
-	int copyright;
-	int original;
-	int emphasis;
-	int framesize; /* computed framesize */
-	int freesize; /* free format frame size */
-	enum mpg123_vbr vbr; /* 1 if variable bitrate was detected */
-	off_t num; /* frame offset ... */
-	off_t playnum; /* playback offset... includes repetitions, reset at seeks */
-	off_t audio_start; /* The byte offset in the file where audio data begins. */
-	char accurate; /* Flag to see if we trust the frame number. */
-	char silent_resync; /* Do not complain for the next n resyncs. */
-	unsigned char* xing_toc; /* The seek TOC from Xing header. */
-	int freeformat;
-	long freeformat_framesize;
-
-	/* bitstream info; bsi */
-	int bitindex;
-	unsigned char *wordpointer;
-	/* temporary storage for getbits stuff */
-	unsigned long ultmp;
-	unsigned char uctmp;
-
-	/* rva data, used in common.c, set in id3.c */
-
-	double maxoutburst; /* The maximum amplitude in current sample represenation. */
-	double lastscale;
-	struct
-	{
-		int level[2];
-		float gain[2];
-		float peak[2];
-	} rva;
-
-	/* input data */
-	off_t track_frames;
-	off_t track_samples;
-	double mean_framesize;
-	off_t mean_frames;
-	int fsizeold;
-	int ssize;
-	unsigned int bitreservoir;
-	unsigned char bsspace[2][MAXFRAMESIZE+512]; /* MAXFRAMESIZE */
-	unsigned char *bsbuf;
-	unsigned char *bsbufold;
-	int bsnum;
-	unsigned long oldhead;
-	unsigned long firsthead;
-	int abr_rate;
-#ifdef FRAME_INDEX
-	struct frame_index index;
-#endif
-
-	/* output data */
-	struct outbuffer buffer;
-	struct audioformat af;
-	int own_buffer;
-	size_t outblock; /* number of bytes that this frame produces (upper bound) */
-	int to_decode; /* this frame holds data to be decoded */
-	int to_ignore; /* the same, somehow */
-	off_t firstframe; /* start decoding from here */
-	off_t lastframe; /* last frame to decode (for gapless or num_frames limit) */
-	off_t ignoreframe; /* frames to decode but discard before firstframe */
-#ifdef GAPLESS
-	off_t firstoff; /* number of samples to ignore from firstframe */
-	off_t lastoff; /* number of samples to use from lastframe */
-	off_t begin_s; /* overall begin offset in samples */
-	off_t begin_os;
-	off_t end_s; /* overall end offset in samples */
-	off_t end_os;
-#endif
-	unsigned int crc; /* Well, I need a safe 16bit type, actually. But wider doesn't hurt. */
-	struct reader *rd; /* pointer to the reading functions */
-	struct reader_data rdat; /* reader data and state info */
-	struct mpg123_pars_struct p;
-	int err;
-	int decoder_change;
-	int delayed_change;
-	long clip;
-	/* the meta crap */
-	int metaflags;
-	unsigned char id3buf[128];
-#ifndef NO_ID3V2
-	mpg123_id3v2 id3v2;
-#endif
-#ifndef NO_ICY
-	struct icy_meta icy;
-#endif
-	/*
-		More variables needed for decoders, layerX.c.
-		This time it is not about static variables but about the need for alignment which cannot be guaranteed on the stack by certain compilers (Sun Studio).
-		We do not require the compiler to align stuff for our hand-written assembly. We only hope that it's able to align stuff for SSE and similar ops it generates itself.
-	*/
-	/*
-		Those layer-specific structs could actually share memory, as they are not in use simultaneously. One might allocate on decoder switch, too.
-		They all reside in one lump of memory (after each other), allocated to layerscratch.
-	*/
-	real *layerscratch;
-#ifndef NO_LAYER1
-	struct
-	{
-		real (*fraction)[SBLIMIT]; /* ALIGNED(16) real fraction[2][SBLIMIT]; */
-	} layer1;
-#endif
-#ifndef NO_LAYER2
-	struct
-	{
-		real (*fraction)[4][SBLIMIT]; /* ALIGNED(16) real fraction[2][4][SBLIMIT] */
-	} layer2;
-#endif
-#ifndef NO_LAYER3
-	/* These are significant chunks of memory already... */
-	struct
-	{
-		real (*hybrid_in)[SBLIMIT][SSLIMIT]; /* ALIGNED(16) real hybridIn[2][SBLIMIT][SSLIMIT]; */
-		real (*hybrid_out)[SSLIMIT][SBLIMIT]; /* ALIGNED(16) real hybridOut[2][SSLIMIT][SBLIMIT]; */
-	} layer3;
-#endif
-	/* A place for storing additional data for the large file wrapper.
-	 This is cruft! */
-	void *wrapperdata;
-	/* A callback used to properly destruct the wrapper data. */
-	void (*wrapperclean)(void*);
-};
-
-/* generic init, does not include dynamic buffers */
-void frame_init(mpg123_handle *fr);
-void frame_init_par(mpg123_handle *fr, mpg123_pars *mp);
-/* output buffer and format */
-int frame_outbuffer(mpg123_handle *fr);
-int frame_output_format(mpg123_handle *fr);
-
-int frame_buffers(mpg123_handle *fr); /* various decoder buffers, needed once */
-int frame_reset(mpg123_handle* fr); /* reset for next track */
-int frame_buffers_reset(mpg123_handle *fr);
-void frame_exit(mpg123_handle *fr); /* end, free all buffers */
-
-/* Index functions... */
-/* Well... print it... */
-int mpg123_print_index(mpg123_handle *fr, FILE* out);
-/* Find a seek position in index. */
-off_t frame_index_find(mpg123_handle *fr, off_t want_frame, off_t* get_frame);
-/* Apply index_size setting. */
-int frame_index_setup(mpg123_handle *fr);
-
-void do_volume(mpg123_handle *fr, double factor);
-void do_rva(mpg123_handle *fr);
-
-/* samples per frame ...
-Layer I
-Layer II
-Layer III
-MPEG-1
-384
-1152
-1152
-MPEG-2 LSF
-384
-1152
-576
-MPEG 2.5
-384
-1152
-576
-*/
-#define spf(fr) ((fr)->lay == 1 ? 384 : ((fr)->lay==2 ? 1152 : ((fr)->lsf || (fr)->mpeg25 ? 576 : 1152)))
-
-#ifdef GAPLESS
-/* well, I take that one for granted... at least layer3 */
-#define GAPLESS_DELAY 529
-/* still fine-tuning the "real music" window... see read_frame */
-void frame_gapless_init(mpg123_handle *fr, off_t b, off_t e);
-void frame_gapless_realinit(mpg123_handle *fr);
-void frame_gapless_update(mpg123_handle *mh, off_t total_samples);
-/*void frame_gapless_position(mpg123_handle* fr);
-void frame_gapless_bytify(mpg123_handle *fr);
-void frame_gapless_ignore(mpg123_handle *fr, off_t frames);*/
-/* void frame_gapless_buffercheck(mpg123_handle *fr); */
-#endif
-
-/* Number of samples the decoding of the current frame should yield. */
-off_t frame_expect_outsamples(mpg123_handle *fr);
-
-/* Skip this frame... do some fake action to get away without actually decoding it. */
-void frame_skip(mpg123_handle *fr);
-
-/*
-	Seeking core functions:
-	- convert input sample offset to output sample offset
-	- convert frame offset to output sample offset
-	- get leading frame offset for output sample offset
-	The offsets are "unadjusted"/internal; resampling is being taken care of.
-*/
-off_t frame_ins2outs(mpg123_handle *fr, off_t ins);
-off_t frame_outs(mpg123_handle *fr, off_t num);
-/* This one just computes the expected sample count for _this_ frame. */
-off_t frame_expect_outsampels(mpg123_handle *fr);
-off_t frame_offset(mpg123_handle *fr, off_t outs);
-void frame_set_frameseek(mpg123_handle *fr, off_t fe);
-void frame_set_seek(mpg123_handle *fr, off_t sp);
-off_t frame_tell_seek(mpg123_handle *fr);
-/* Take a copy of the Xing VBR TOC for fuzzy seeking. */
-int frame_fill_toc(mpg123_handle *fr, unsigned char* in);
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/getbits.h Deleted

@@ -1,100 +0,0 @@
-/*
-	getbits
-
-	copyright ?-2009 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp
-
-	All code is in the header to suggest/force inlining of these small often-used functions.
-	This indeed has some impact on performance.
-*/
-
-#ifndef _MPG123_GETBITS_H_
-#define _MPG123_GETBITS_H_
-
-#include "mpg123lib_intern.h"
-
-#define backbits(fr,nob) ((void)( \
- fr->bitindex -= nob, \
- fr->wordpointer += (fr->bitindex>>3), \
- fr->bitindex &= 0x7 ))
-
-#define getbitoffset(fr) ((-fr->bitindex)&0x7)
-#define getbyte(fr) (*fr->wordpointer++)
-
-/* There is something wrong with that macro... the function below works also for the layer1 test case. */
-#define macro_getbits(fr, nob) ( \
- fr->ultmp = fr->wordpointer[0],\
- fr->ultmp <<= 8, \
- fr->ultmp |= fr->wordpointer[1], \
- fr->ultmp <<= 8, \
- fr->ultmp |= fr->wordpointer[2], \
- fr->ultmp <<= fr->bitindex, \
- fr->ultmp &= 0xffffff, \
- fr->bitindex += nob, \
- fr->ultmp >>= (24-nob), \
- fr->wordpointer += (fr->bitindex>>3), \
- fr->bitindex &= 7, \
- fr->ultmp)
-
-static unsigned int getbits(mpg123_handle *fr, int number_of_bits)
-{
- unsigned long rval;
-
-#ifdef DEBUG_GETBITS
-fprintf(stderr,"g%d",number_of_bits);
-#endif
-
-/* This is actually slow: if(!number_of_bits)
- return 0; */
-
-#if 0
- check_buffer_range(number_of_bits+fr->bitindex);
-#endif
-
- {
- rval = fr->wordpointer[0];
- rval <<= 8;
- rval |= fr->wordpointer[1];
- rval <<= 8;
- rval |= fr->wordpointer[2];
-
- rval <<= fr->bitindex;
- rval &= 0xffffff;
-
- fr->bitindex += number_of_bits;
-
- rval >>= (24-number_of_bits);
-
- fr->wordpointer += (fr->bitindex>>3);
- fr->bitindex &= 7;
- }
-
-#ifdef DEBUG_GETBITS
-fprintf(stderr,":%lx\n",rval);
-#endif
-
- return rval;
-}
-
-
-#define skipbits(fr, nob) fr->ultmp = ( \
- fr->ultmp = fr->wordpointer[0], fr->ultmp <<= 8, fr->ultmp |= fr->wordpointer[1], \
- fr->ultmp <<= 8, fr->ultmp |= fr->wordpointer[2], fr->ultmp <<= fr->bitindex, \
- fr->ultmp &= 0xffffff, fr->bitindex += nob, \
- fr->ultmp >>= (24-nob), fr->wordpointer += (fr->bitindex>>3), \
- fr->bitindex &= 7 )
-
-#define getbits_fast(fr, nob) ( \
- fr->ultmp = (unsigned char) (fr->wordpointer[0] << fr->bitindex), \
- fr->ultmp |= ((unsigned long) fr->wordpointer[1]<<fr->bitindex)>>8, \
- fr->ultmp <<= nob, fr->ultmp >>= 8, \
- fr->bitindex += nob, fr->wordpointer += (fr->bitindex>>3), \
- fr->bitindex &= 7, fr->ultmp )
-
-#define get1bit(fr) ( \
- fr->uctmp = *fr->wordpointer << fr->bitindex, fr->bitindex++, \
- fr->wordpointer += (fr->bitindex>>3), fr->bitindex &= 7, fr->uctmp>>7 )
-
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/getcpuflags.h Deleted

@@ -1,47 +0,0 @@
-/*
-	getcpucpuflags: get cpuflags for ia32
-
-	copyright ?-2007 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http:#mpg123.org
-	initially written by KIMURA Takuhiro (for 3DNow!)
-	extended for general use by Thomas Orgis
-*/
-
-#ifndef MPG123_H_GETCPUFLAGS
-#define MPG123_H_GETCPUFLAGS
-
-/* standard level flags part 1 (ECX)*/
-#define FLAG_SSE3      0x00000001
-
-/* standard level flags part 2 (EDX) */
-#define FLAG2_MMX       0x00800000
-#define FLAG2_SSE       0x02000000
-#define FLAG2_SSE2      0x04000000
-#define FLAG2_FPU       0x00000001
-/* cpuid extended level 1 (AMD) */
-#define XFLAG_MMX      0x00800000
-#define XFLAG_3DNOW    0x80000000
-#define XFLAG_3DNOWEXT 0x40000000
-
-struct cpuflags
-{
-	unsigned int id;
-	unsigned int std;
-	unsigned int std2;
-	unsigned int ext;
-};
-
-unsigned int getcpuflags(struct cpuflags* cf);
-
-/* checks the family */
-#define cpu_i586(s) ( ((s.id & 0xf00)>>8) == 0 || ((s.id & 0xf00)>>8) > 4 )
-/* checking some flags... */
-#define cpu_fpu(s) (FLAG2_FPU & s.std2)
-#define cpu_mmx(s) (FLAG2_MMX & s.std2 || XFLAG_MMX & s.ext)
-#define cpu_3dnow(s) (XFLAG_3DNOW & s.ext)
-#define cpu_3dnowext(s) (XFLAG_3DNOWEXT & s.ext)
-#define cpu_sse(s) (FLAG2_SSE & s.std2)
-#define cpu_sse2(s) (FLAG2_SSE2 & s.std2)
-#define cpu_sse3(s) (FLAG_SSE3 & s.std)
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/huffman.h Deleted

@@ -1,340 +0,0 @@
-/*
-	huffman.h: huffman tables ... recalcualted to work with optimzed decoder scheme (MH)
-
-	copyright ?-2006 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp
-
-	probably we could save a few bytes of memory, because the 
-	smaller tables are often the part of a bigger table
-*/
-
-
-#ifndef _MPG123_HUFFMAN_H_
-#define _MPG123_HUFFMAN_H_
-
-struct newhuff 
-{
-  unsigned int linbits;
-  short *table;
-};
-
-static short tab0[] = 
-{ 
-   0
-};
-
-static short tab1[] =
-{
-  -5,  -3,  -1,  17,   1,  16,   0
-};
-
-static short tab2[] =
-{
- -15, -11,  -9,  -5,  -3,  -1,  34,   2,  18,  -1,  33,  32,  17,  -1,   1,
-  16,   0
-};
-
-static short tab3[] =
-{
- -13, -11,  -9,  -5,  -3,  -1,  34,   2,  18,  -1,  33,  32,  16,  17,  -1,
-   1,   0
-};
-
-static short tab5[] =
-{
- -29, -25, -23, -15,  -7,  -5,  -3,  -1,  51,  35,  50,  49,  -3,  -1,  19,
-   3,  -1,  48,  34,  -3,  -1,  18,  33,  -1,   2,  32,  17,  -1,   1,  16,
-   0
-};
-
-static short tab6[] =
-{
- -25, -19, -13,  -9,  -5,  -3,  -1,  51,   3,  35,  -1,  50,  48,  -1,  19,
-  49,  -3,  -1,  34,   2,  18,  -3,  -1,  33,  32,   1,  -1,  17,  -1,  16,
-   0
-};
-
-static short tab7[] =
-{
- -69, -65, -57, -39, -29, -17, -11,  -7,  -3,  -1,  85,  69,  -1,  84,  83,
-  -1,  53,  68,  -3,  -1,  37,  82,  21,  -5,  -1,  81,  -1,   5,  52,  -1,
-  80,  -1,  67,  51,  -5,  -3,  -1,  36,  66,  20,  -1,  65,  64, -11,  -7,
-  -3,  -1,   4,  35,  -1,  50,   3,  -1,  19,  49,  -3,  -1,  48,  34,  18,
-  -5,  -1,  33,  -1,   2,  32,  17,  -1,   1,  16,   0
-};
-
-static short tab8[] =
-{
- -65, -63, -59, -45, -31, -19, -13,  -7,  -5,  -3,  -1,  85,  84,  69,  83,
-  -3,  -1,  53,  68,  37,  -3,  -1,  82,   5,  21,  -5,  -1,  81,  -1,  52,
-  67,  -3,  -1,  80,  51,  36,  -5,  -3,  -1,  66,  20,  65,  -3,  -1,   4,
-  64,  -1,  35,  50,  -9,  -7,  -3,  -1,  19,  49,  -1,   3,  48,  34,  -1,
-   2,  32,  -1,  18,  33,  17,  -3,  -1,   1,  16,   0
-};
-
-static short tab9[] =
-{
- -63, -53, -41, -29, -19, -11,  -5,  -3,  -1,  85,  69,  53,  -1,  83,  -1,
-  84,   5,  -3,  -1,  68,  37,  -1,  82,  21,  -3,  -1,  81,  52,  -1,  67,
-  -1,  80,   4,  -7,  -3,  -1,  36,  66,  -1,  51,  64,  -1,  20,  65,  -5,
-  -3,  -1,  35,  50,  19,  -1,  49,  -1,   3,  48,  -5,  -3,  -1,  34,   2,
-  18,  -1,  33,  32,  -3,  -1,  17,   1,  -1,  16,   0
-};
-
-static short tab10[] =
-{
--125,-121,-111, -83, -55, -35, -21, -13,  -7,  -3,  -1, 119, 103,  -1, 118,
-  87,  -3,  -1, 117, 102,  71,  -3,  -1, 116,  86,  -1, 101,  55,  -9,  -3,
-  -1, 115,  70,  -3,  -1,  85,  84,  99,  -1,  39, 114, -11,  -5,  -3,  -1,
- 100,   7, 112,  -1,  98,  -1,  69,  53,  -5,  -1,   6,  -1,  83,  68,  23,
- -17,  -5,  -1, 113,  -1,  54,  38,  -5,  -3,  -1,  37,  82,  21,  -1,  81,
-  -1,  52,  67,  -3,  -1,  22,  97,  -1,  96,  -1,   5,  80, -19, -11,  -7,
-  -3,  -1,  36,  66,  -1,  51,   4,  -1,  20,  65,  -3,  -1,  64,  35,  -1,
-  50,   3,  -3,  -1,  19,  49,  -1,  48,  34,  -7,  -3,  -1,  18,  33,  -1,
-   2,  32,  17,  -1,   1,  16,   0
-};
-
-static short tab11[] =
-{
--121,-113, -89, -59, -43, -27, -17,  -7,  -3,  -1, 119, 103,  -1, 118, 117,
-  -3,  -1, 102,  71,  -1, 116,  -1,  87,  85,  -5,  -3,  -1,  86, 101,  55,
-  -1, 115,  70,  -9,  -7,  -3,  -1,  69,  84,  -1,  53,  83,  39,  -1, 114,
-  -1, 100,   7,  -5,  -1, 113,  -1,  23, 112,  -3,  -1,  54,  99,  -1,  96,
-  -1,  68,  37, -13,  -7,  -5,  -3,  -1,  82,   5,  21,  98,  -3,  -1,  38,
-   6,  22,  -5,  -1,  97,  -1,  81,  52,  -5,  -1,  80,  -1,  67,  51,  -1,
-  36,  66, -15, -11,  -7,  -3,  -1,  20,  65,  -1,   4,  64,  -1,  35,  50,
-  -1,  19,  49,  -5,  -3,  -1,   3,  48,  34,  33,  -5,  -1,  18,  -1,   2,
-  32,  17,  -3,  -1,   1,  16,   0
-};
-
-static short tab12[] =
-{
--115, -99, -73, -45, -27, -17,  -9,  -5,  -3,  -1, 119, 103, 118,  -1,  87,
- 117,  -3,  -1, 102,  71,  -1, 116, 101,  -3,  -1,  86,  55,  -3,  -1, 115,
-  85,  39,  -7,  -3,  -1, 114,  70,  -1, 100,  23,  -5,  -1, 113,  -1,   7,
- 112,  -1,  54,  99, -13,  -9,  -3,  -1,  69,  84,  -1,  68,  -1,   6,   5,
-  -1,  38,  98,  -5,  -1,  97,  -1,  22,  96,  -3,  -1,  53,  83,  -1,  37,
-  82, -17,  -7,  -3,  -1,  21,  81,  -1,  52,  67,  -5,  -3,  -1,  80,   4,
-  36,  -1,  66,  20,  -3,  -1,  51,  65,  -1,  35,  50, -11,  -7,  -5,  -3,
-  -1,  64,   3,  48,  19,  -1,  49,  34,  -1,  18,  33,  -7,  -5,  -3,  -1,
-   2,  32,   0,  17,  -1,   1,  16
-};
-
-static short tab13[] =
-{
--509,-503,-475,-405,-333,-265,-205,-153,-115, -83, -53, -35, -21, -13,  -9,
-  -7,  -5,  -3,  -1, 254, 252, 253, 237, 255,  -1, 239, 223,  -3,  -1, 238,
- 207,  -1, 222, 191,  -9,  -3,  -1, 251, 206,  -1, 220,  -1, 175, 233,  -1,
- 236, 221,  -9,  -5,  -3,  -1, 250, 205, 190,  -1, 235, 159,  -3,  -1, 249,
- 234,  -1, 189, 219, -17,  -9,  -3,  -1, 143, 248,  -1, 204,  -1, 174, 158,
-  -5,  -1, 142,  -1, 127, 126, 247,  -5,  -1, 218,  -1, 173, 188,  -3,  -1,
- 203, 246, 111, -15,  -7,  -3,  -1, 232,  95,  -1, 157, 217,  -3,  -1, 245,
- 231,  -1, 172, 187,  -9,  -3,  -1,  79, 244,  -3,  -1, 202, 230, 243,  -1,
-  63,  -1, 141, 216, -21,  -9,  -3,  -1,  47, 242,  -3,  -1, 110, 156,  15,
-  -5,  -3,  -1, 201,  94, 171,  -3,  -1, 125, 215,  78, -11,  -5,  -3,  -1,
- 200, 214,  62,  -1, 185,  -1, 155, 170,  -1,  31, 241, -23, -13,  -5,  -1,
- 240,  -1, 186, 229,  -3,  -1, 228, 140,  -1, 109, 227,  -5,  -1, 226,  -1,
-  46,  14,  -1,  30, 225, -15,  -7,  -3,  -1, 224,  93,  -1, 213, 124,  -3,
-  -1, 199,  77,  -1, 139, 184,  -7,  -3,  -1, 212, 154,  -1, 169, 108,  -1,
- 198,  61, -37, -21,  -9,  -5,  -3,  -1, 211, 123,  45,  -1, 210,  29,  -5,
-  -1, 183,  -1,  92, 197,  -3,  -1, 153, 122, 195,  -7,  -5,  -3,  -1, 167,
- 151,  75, 209,  -3,  -1,  13, 208,  -1, 138, 168, -11,  -7,  -3,  -1,  76,
- 196,  -1, 107, 182,  -1,  60,  44,  -3,  -1, 194,  91,  -3,  -1, 181, 137,
-  28, -43, -23, -11,  -5,  -1, 193,  -1, 152,  12,  -1, 192,  -1, 180, 106,
-  -5,  -3,  -1, 166, 121,  59,  -1, 179,  -1, 136,  90, -11,  -5,  -1,  43,
-  -1, 165, 105,  -1, 164,  -1, 120, 135,  -5,  -1, 148,  -1, 119, 118, 178,
- -11,  -3,  -1,  27, 177,  -3,  -1,  11, 176,  -1, 150,  74,  -7,  -3,  -1,
-  58, 163,  -1,  89, 149,  -1,  42, 162, -47, -23,  -9,  -3,  -1,  26, 161,
-  -3,  -1,  10, 104, 160,  -5,  -3,  -1, 134,  73, 147,  -3,  -1,  57,  88,
-  -1, 133, 103,  -9,  -3,  -1,  41, 146,  -3,  -1,  87, 117,  56,  -5,  -1,
- 131,  -1, 102,  71,  -3,  -1, 116,  86,  -1, 101, 115, -11,  -3,  -1,  25,
- 145,  -3,  -1,   9, 144,  -1,  72, 132,  -7,  -5,  -1, 114,  -1,  70, 100,
-  40,  -1, 130,  24, -41, -27, -11,  -5,  -3,  -1,  55,  39,  23,  -1, 113,
-  -1,  85,   7,  -7,  -3,  -1, 112,  54,  -1,  99,  69,  -3,  -1,  84,  38,
-  -1,  98,  53,  -5,  -1, 129,  -1,   8, 128,  -3,  -1,  22,  97,  -1,   6,
-  96, -13,  -9,  -5,  -3,  -1,  83,  68,  37,  -1,  82,   5,  -1,  21,  81,
-  -7,  -3,  -1,  52,  67,  -1,  80,  36,  -3,  -1,  66,  51,  20, -19, -11,
-  -5,  -1,  65,  -1,   4,  64,  -3,  -1,  35,  50,  19,  -3,  -1,  49,   3,
-  -1,  48,  34,  -3,  -1,  18,  33,  -1,   2,  32,  -3,  -1,  17,   1,  16,
-   0
-};
-
-static short tab15[] =
-{
--495,-445,-355,-263,-183,-115, -77, -43, -27, -13,  -7,  -3,  -1, 255, 239,
-  -1, 254, 223,  -1, 238,  -1, 253, 207,  -7,  -3,  -1, 252, 222,  -1, 237,
- 191,  -1, 251,  -1, 206, 236,  -7,  -3,  -1, 221, 175,  -1, 250, 190,  -3,
-  -1, 235, 205,  -1, 220, 159, -15,  -7,  -3,  -1, 249, 234,  -1, 189, 219,
-  -3,  -1, 143, 248,  -1, 204, 158,  -7,  -3,  -1, 233, 127,  -1, 247, 173,
-  -3,  -1, 218, 188,  -1, 111,  -1, 174,  15, -19, -11,  -3,  -1, 203, 246,
-  -3,  -1, 142, 232,  -1,  95, 157,  -3,  -1, 245, 126,  -1, 231, 172,  -9,
-  -3,  -1, 202, 187,  -3,  -1, 217, 141,  79,  -3,  -1, 244,  63,  -1, 243,
- 216, -33, -17,  -9,  -3,  -1, 230,  47,  -1, 242,  -1, 110, 240,  -3,  -1,
-  31, 241,  -1, 156, 201,  -7,  -3,  -1,  94, 171,  -1, 186, 229,  -3,  -1,
- 125, 215,  -1,  78, 228, -15,  -7,  -3,  -1, 140, 200,  -1,  62, 109,  -3,
-  -1, 214, 227,  -1, 155, 185,  -7,  -3,  -1,  46, 170,  -1, 226,  30,  -5,
-  -1, 225,  -1,  14, 224,  -1,  93, 213, -45, -25, -13,  -7,  -3,  -1, 124,
- 199,  -1,  77, 139,  -1, 212,  -1, 184, 154,  -7,  -3,  -1, 169, 108,  -1,
- 198,  61,  -1, 211, 210,  -9,  -5,  -3,  -1,  45,  13,  29,  -1, 123, 183,
-  -5,  -1, 209,  -1,  92, 208,  -1, 197, 138, -17,  -7,  -3,  -1, 168,  76,
-  -1, 196, 107,  -5,  -1, 182,  -1, 153,  12,  -1,  60, 195,  -9,  -3,  -1,
- 122, 167,  -1, 166,  -1, 192,  11,  -1, 194,  -1,  44,  91, -55, -29, -15,
-  -7,  -3,  -1, 181,  28,  -1, 137, 152,  -3,  -1, 193,  75,  -1, 180, 106,
-  -5,  -3,  -1,  59, 121, 179,  -3,  -1, 151, 136,  -1,  43,  90, -11,  -5,
-  -1, 178,  -1, 165,  27,  -1, 177,  -1, 176, 105,  -7,  -3,  -1, 150,  74,
-  -1, 164, 120,  -3,  -1, 135,  58, 163, -17,  -7,  -3,  -1,  89, 149,  -1,
-  42, 162,  -3,  -1,  26, 161,  -3,  -1,  10, 160, 104,  -7,  -3,  -1, 134,
-  73,  -1, 148,  57,  -5,  -1, 147,  -1, 119,   9,  -1,  88, 133, -53, -29,
- -13,  -7,  -3,  -1,  41, 103,  -1, 118, 146,  -1, 145,  -1,  25, 144,  -7,
-  -3,  -1,  72, 132,  -1,  87, 117,  -3,  -1,  56, 131,  -1, 102,  71,  -7,
-  -3,  -1,  40, 130,  -1,  24, 129,  -7,  -3,  -1, 116,   8,  -1, 128,  86,
-  -3,  -1, 101,  55,  -1, 115,  70, -17,  -7,  -3,  -1,  39, 114,  -1, 100,
-  23,  -3,  -1,  85, 113,  -3,  -1,   7, 112,  54,  -7,  -3,  -1,  99,  69,
-  -1,  84,  38,  -3,  -1,  98,  22,  -3,  -1,   6,  96,  53, -33, -19,  -9,
-  -5,  -1,  97,  -1,  83,  68,  -1,  37,  82,  -3,  -1,  21,  81,  -3,  -1,
-   5,  80,  52,  -7,  -3,  -1,  67,  36,  -1,  66,  51,  -1,  65,  -1,  20,
-   4,  -9,  -3,  -1,  35,  50,  -3,  -1,  64,   3,  19,  -3,  -1,  49,  48,
-  34,  -9,  -7,  -3,  -1,  18,  33,  -1,   2,  32,  17,  -3,  -1,   1,  16,
-   0
-};
-
-static short tab16[] =
-{
--509,-503,-461,-323,-103, -37, -27, -15,  -7,  -3,  -1, 239, 254,  -1, 223,
- 253,  -3,  -1, 207, 252,  -1, 191, 251,  -5,  -1, 175,  -1, 250, 159,  -3,
-  -1, 249, 248, 143,  -7,  -3,  -1, 127, 247,  -1, 111, 246, 255,  -9,  -5,
-  -3,  -1,  95, 245,  79,  -1, 244, 243, -53,  -1, 240,  -1,  63, -29, -19,
- -13,  -7,  -5,  -1, 206,  -1, 236, 221, 222,  -1, 233,  -1, 234, 217,  -1,
- 238,  -1, 237, 235,  -3,  -1, 190, 205,  -3,  -1, 220, 219, 174, -11,  -5,
-  -1, 204,  -1, 173, 218,  -3,  -1, 126, 172, 202,  -5,  -3,  -1, 201, 125,
-  94, 189, 242, -93,  -5,  -3,  -1,  47,  15,  31,  -1, 241, -49, -25, -13,
-  -5,  -1, 158,  -1, 188, 203,  -3,  -1, 142, 232,  -1, 157, 231,  -7,  -3,
-  -1, 187, 141,  -1, 216, 110,  -1, 230, 156, -13,  -7,  -3,  -1, 171, 186,
-  -1, 229, 215,  -1,  78,  -1, 228, 140,  -3,  -1, 200,  62,  -1, 109,  -1,
- 214, 155, -19, -11,  -5,  -3,  -1, 185, 170, 225,  -1, 212,  -1, 184, 169,
-  -5,  -1, 123,  -1, 183, 208, 227,  -7,  -3,  -1,  14, 224,  -1,  93, 213,
-  -3,  -1, 124, 199,  -1,  77, 139, -75, -45, -27, -13,  -7,  -3,  -1, 154,
- 108,  -1, 198,  61,  -3,  -1,  92, 197,  13,  -7,  -3,  -1, 138, 168,  -1,
- 153,  76,  -3,  -1, 182, 122,  60, -11,  -5,  -3,  -1,  91, 137,  28,  -1,
- 192,  -1, 152, 121,  -1, 226,  -1,  46,  30, -15,  -7,  -3,  -1, 211,  45,
-  -1, 210, 209,  -5,  -1,  59,  -1, 151, 136,  29,  -7,  -3,  -1, 196, 107,
-  -1, 195, 167,  -1,  44,  -1, 194, 181, -23, -13,  -7,  -3,  -1, 193,  12,
-  -1,  75, 180,  -3,  -1, 106, 166, 179,  -5,  -3,  -1,  90, 165,  43,  -1,
- 178,  27, -13,  -5,  -1, 177,  -1,  11, 176,  -3,  -1, 105, 150,  -1,  74,
- 164,  -5,  -3,  -1, 120, 135, 163,  -3,  -1,  58,  89,  42, -97, -57, -33,
- -19, -11,  -5,  -3,  -1, 149, 104, 161,  -3,  -1, 134, 119, 148,  -5,  -3,
-  -1,  73,  87, 103, 162,  -5,  -1,  26,  -1,  10, 160,  -3,  -1,  57, 147,
-  -1,  88, 133,  -9,  -3,  -1,  41, 146,  -3,  -1, 118,   9,  25,  -5,  -1,
- 145,  -1, 144,  72,  -3,  -1, 132, 117,  -1,  56, 131, -21, -11,  -5,  -3,
-  -1, 102,  40, 130,  -3,  -1,  71, 116,  24,  -3,  -1, 129, 128,  -3,  -1,
-   8,  86,  55,  -9,  -5,  -1, 115,  -1, 101,  70,  -1,  39, 114,  -5,  -3,
-  -1, 100,  85,   7,  23, -23, -13,  -5,  -1, 113,  -1, 112,  54,  -3,  -1,
-  99,  69,  -1,  84,  38,  -3,  -1,  98,  22,  -1,  97,  -1,   6,  96,  -9,
-  -5,  -1,  83,  -1,  53,  68,  -1,  37,  82,  -1,  81,  -1,  21,   5, -33,
- -23, -13,  -7,  -3,  -1,  52,  67,  -1,  80,  36,  -3,  -1,  66,  51,  20,
-  -5,  -1,  65,  -1,   4,  64,  -1,  35,  50,  -3,  -1,  19,  49,  -3,  -1,
-   3,  48,  34,  -3,  -1,  18,  33,  -1,   2,  32,  -3,  -1,  17,   1,  16,
-   0
-};
-
-static short tab24[] =
-{
--451,-117, -43, -25, -15,  -7,  -3,  -1, 239, 254,  -1, 223, 253,  -3,  -1,
- 207, 252,  -1, 191, 251,  -5,  -1, 250,  -1, 175, 159,  -1, 249, 248,  -9,
-  -5,  -3,  -1, 143, 127, 247,  -1, 111, 246,  -3,  -1,  95, 245,  -1,  79,
- 244, -71,  -7,  -3,  -1,  63, 243,  -1,  47, 242,  -5,  -1, 241,  -1,  31,
- 240, -25,  -9,  -1,  15,  -3,  -1, 238, 222,  -1, 237, 206,  -7,  -3,  -1,
- 236, 221,  -1, 190, 235,  -3,  -1, 205, 220,  -1, 174, 234, -15,  -7,  -3,
-  -1, 189, 219,  -1, 204, 158,  -3,  -1, 233, 173,  -1, 218, 188,  -7,  -3,
-  -1, 203, 142,  -1, 232, 157,  -3,  -1, 217, 126,  -1, 231, 172, 255,-235,
--143, -77, -45, -25, -15,  -7,  -3,  -1, 202, 187,  -1, 141, 216,  -5,  -3,
-  -1,  14, 224,  13, 230,  -5,  -3,  -1, 110, 156, 201,  -1,  94, 186,  -9,
-  -5,  -1, 229,  -1, 171, 125,  -1, 215, 228,  -3,  -1, 140, 200,  -3,  -1,
-  78,  46,  62, -15,  -7,  -3,  -1, 109, 214,  -1, 227, 155,  -3,  -1, 185,
- 170,  -1, 226,  30,  -7,  -3,  -1, 225,  93,  -1, 213, 124,  -3,  -1, 199,
-  77,  -1, 139, 184, -31, -15,  -7,  -3,  -1, 212, 154,  -1, 169, 108,  -3,
-  -1, 198,  61,  -1, 211,  45,  -7,  -3,  -1, 210,  29,  -1, 123, 183,  -3,
-  -1, 209,  92,  -1, 197, 138, -17,  -7,  -3,  -1, 168, 153,  -1,  76, 196,
-  -3,  -1, 107, 182,  -3,  -1, 208,  12,  60,  -7,  -3,  -1, 195, 122,  -1,
- 167,  44,  -3,  -1, 194,  91,  -1, 181,  28, -57, -35, -19,  -7,  -3,  -1,
- 137, 152,  -1, 193,  75,  -5,  -3,  -1, 192,  11,  59,  -3,  -1, 176,  10,
-  26,  -5,  -1, 180,  -1, 106, 166,  -3,  -1, 121, 151,  -3,  -1, 160,   9,
- 144,  -9,  -3,  -1, 179, 136,  -3,  -1,  43,  90, 178,  -7,  -3,  -1, 165,
-  27,  -1, 177, 105,  -1, 150, 164, -17,  -9,  -5,  -3,  -1,  74, 120, 135,
-  -1,  58, 163,  -3,  -1,  89, 149,  -1,  42, 162,  -7,  -3,  -1, 161, 104,
-  -1, 134, 119,  -3,  -1,  73, 148,  -1,  57, 147, -63, -31, -15,  -7,  -3,
-  -1,  88, 133,  -1,  41, 103,  -3,  -1, 118, 146,  -1,  25, 145,  -7,  -3,
-  -1,  72, 132,  -1,  87, 117,  -3,  -1,  56, 131,  -1, 102,  40, -17,  -7,
-  -3,  -1, 130,  24,  -1,  71, 116,  -5,  -1, 129,  -1,   8, 128,  -1,  86,
- 101,  -7,  -5,  -1,  23,  -1,   7, 112, 115,  -3,  -1,  55,  39, 114, -15,
-  -7,  -3,  -1,  70, 100,  -1,  85, 113,  -3,  -1,  54,  99,  -1,  69,  84,
-  -7,  -3,  -1,  38,  98,  -1,  22,  97,  -5,  -3,  -1,   6,  96,  53,  -1,
-  83,  68, -51, -37, -23, -15,  -9,  -3,  -1,  37,  82,  -1,  21,  -1,   5,
-  80,  -1,  81,  -1,  52,  67,  -3,  -1,  36,  66,  -1,  51,  20,  -9,  -5,
-  -1,  65,  -1,   4,  64,  -1,  35,  50,  -1,  19,  49,  -7,  -5,  -3,  -1,
-   3,  48,  34,  18,  -1,  33,  -1,   2,  32,  -3,  -1,  17,   1,  -1,  16,
-   0
-};
-
-static short tab_c0[] =
-{
- -29, -21, -13,  -7,  -3,  -1,  11,  15,  -1,  13,  14,  -3,  -1,   7,   5,
-   9,  -3,  -1,   6,   3,  -1,  10,  12,  -3,  -1,   2,   1,  -1,   4,   8,
-   0
-};
-
-static short tab_c1[] =
-{
- -15,  -7,  -3,  -1,  15,  14,  -1,  13,  12,  -3,  -1,  11,  10,  -1,   9,
-   8,  -7,  -3,  -1,   7,   6,  -1,   5,   4,  -3,  -1,   3,   2,  -1,   1,
-   0
-};
-
-
-
-static struct newhuff ht[] = 
-{
- { /* 0 */ 0 , tab0  } ,
- { /* 2 */ 0 , tab1  } ,
- { /* 3 */ 0 , tab2  } ,
- { /* 3 */ 0 , tab3  } ,
- { /* 0 */ 0 , tab0  } ,
- { /* 4 */ 0 , tab5  } ,
- { /* 4 */ 0 , tab6  } ,
- { /* 6 */ 0 , tab7  } ,
- { /* 6 */ 0 , tab8  } ,
- { /* 6 */ 0 , tab9  } ,
- { /* 8 */ 0 , tab10 } ,
- { /* 8 */ 0 , tab11 } ,
- { /* 8 */ 0 , tab12 } ,
- { /* 16 */ 0 , tab13 } ,
- { /* 0  */ 0 , tab0  } ,
- { /* 16 */ 0 , tab15 } ,
-
- { /* 16 */ 1 , tab16 } ,
- { /* 16 */ 2 , tab16 } ,
- { /* 16 */ 3 , tab16 } ,
- { /* 16 */ 4 , tab16 } ,
- { /* 16 */ 6 , tab16 } ,
- { /* 16 */ 8 , tab16 } ,
- { /* 16 */ 10, tab16 } ,
- { /* 16 */ 13, tab16 } ,
- { /* 16 */ 4 , tab24 } ,
- { /* 16 */ 5 , tab24 } ,
- { /* 16 */ 6 , tab24 } ,
- { /* 16 */ 7 , tab24 } ,
- { /* 16 */ 8 , tab24 } ,
- { /* 16 */ 9 , tab24 } ,
- { /* 16 */ 11, tab24 } ,
- { /* 16 */ 13, tab24 }
-};
-
-static struct newhuff htc[] = 
-{
- { /* 1 , 1 , */ 0 , tab_c0 } ,
- { /* 1 , 1 , */ 0 , tab_c1 }
-};
-
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/icy.c Deleted

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/icy.h Deleted

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/icy2utf8.c Deleted

@@ -1,438 +0,0 @@
-/* mpg123 note: This is BSD-licensed code that is no problem for mpg123 usage under LGPL.
- It's Free, understood? ;-) */
-
-/* Another note: This code is basically written by Thorsten Glaser,
- Thomas Orgis did just some rearrangements and comments. */
-
-/*-
- * Copyright (c) 2008
- *	Thorsten Glaser <tg@mirbsd.org>
- *
- * Provided that these terms and disclaimer and all copyright notices
- * are retained or reproduced in an accompanying document, permission
- * is granted to deal in this work without restriction, including un-
- * limited rights to use, publicly perform, distribute, sell, modify,
- * merge, give away, or sublicence.
- *
- * This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to
- * the utmost extent permitted by applicable law, neither express nor
- * implied; without malicious intent or gross negligence. In no event
- * may a licensor, author or contributor be held liable for indirect,
- * direct, other damage, loss, or other issues arising in any way out
- * of dealing in the work, even if advised of the possibility of such
- * damage or existence of a defect, except proven that it results out
- * of said person's immediate fault when using the work as intended.
- *-
- * Convert from ICY encoding (windows-1252 codepage) to UTF-8
- */
-
-/* Includes string and stdlib headers... */
-#include "compat.h"
-
-/* ThOr: too lazy for this type check; also we use char/short all around anyway.
- Of cource, it would be the proper way to use _these_ kind of types all around. */
-#define uint8_t unsigned char
-#define uint16_t unsigned short
-
-static const uint8_t cp1252_utf8[] = {
-	/* 0x00 @ 0 */	0x00,
-	/* 0x01 @ 1 */	0x01,
-	/* 0x02 @ 2 */	0x02,
-	/* 0x03 @ 3 */	0x03,
-	/* 0x04 @ 4 */	0x04,
-	/* 0x05 @ 5 */	0x05,
-	/* 0x06 @ 6 */	0x06,
-	/* 0x07 @ 7 */	0x07,
-	/* 0x08 @ 8 */	0x08,
-	/* 0x09 @ 9 */	0x09,
-	/* 0x0A @ 10 */	0x0A,
-	/* 0x0B @ 11 */	0x0B,
-	/* 0x0C @ 12 */	0x0C,
-	/* 0x0D @ 13 */	0x0D,
-	/* 0x0E @ 14 */	0x0E,
-	/* 0x0F @ 15 */	0x0F,
-	/* 0x10 @ 16 */	0x10,
-	/* 0x11 @ 17 */	0x11,
-	/* 0x12 @ 18 */	0x12,
-	/* 0x13 @ 19 */	0x13,
-	/* 0x14 @ 20 */	0x14,
-	/* 0x15 @ 21 */	0x15,
-	/* 0x16 @ 22 */	0x16,
-	/* 0x17 @ 23 */	0x17,
-	/* 0x18 @ 24 */	0x18,
-	/* 0x19 @ 25 */	0x19,
-	/* 0x1A @ 26 */	0x1A,
-	/* 0x1B @ 27 */	0x1B,
-	/* 0x1C @ 28 */	0x1C,
-	/* 0x1D @ 29 */	0x1D,
-	/* 0x1E @ 30 */	0x1E,
-	/* 0x1F @ 31 */	0x1F,
-	/* 0x20 @ 32 */	0x20,
-	/* 0x21 @ 33 */	0x21,
-	/* 0x22 @ 34 */	0x22,
-	/* 0x23 @ 35 */	0x23,
-	/* 0x24 @ 36 */	0x24,
-	/* 0x25 @ 37 */	0x25,
-	/* 0x26 @ 38 */	0x26,
-	/* 0x27 @ 39 */	0x27,
-	/* 0x28 @ 40 */	0x28,
-	/* 0x29 @ 41 */	0x29,
-	/* 0x2A @ 42 */	0x2A,
-	/* 0x2B @ 43 */	0x2B,
-	/* 0x2C @ 44 */	0x2C,
-	/* 0x2D @ 45 */	0x2D,
-	/* 0x2E @ 46 */	0x2E,
-	/* 0x2F @ 47 */	0x2F,
-	/* 0x30 @ 48 */	0x30,
-	/* 0x31 @ 49 */	0x31,
-	/* 0x32 @ 50 */	0x32,
-	/* 0x33 @ 51 */	0x33,
-	/* 0x34 @ 52 */	0x34,
-	/* 0x35 @ 53 */	0x35,
-	/* 0x36 @ 54 */	0x36,
-	/* 0x37 @ 55 */	0x37,
-	/* 0x38 @ 56 */	0x38,
-	/* 0x39 @ 57 */	0x39,
-	/* 0x3A @ 58 */	0x3A,
-	/* 0x3B @ 59 */	0x3B,
-	/* 0x3C @ 60 */	0x3C,
-	/* 0x3D @ 61 */	0x3D,
-	/* 0x3E @ 62 */	0x3E,
-	/* 0x3F @ 63 */	0x3F,
-	/* 0x40 @ 64 */	0x40,
-	/* 0x41 @ 65 */	0x41,
-	/* 0x42 @ 66 */	0x42,
-	/* 0x43 @ 67 */	0x43,
-	/* 0x44 @ 68 */	0x44,
-	/* 0x45 @ 69 */	0x45,
-	/* 0x46 @ 70 */	0x46,
-	/* 0x47 @ 71 */	0x47,
-	/* 0x48 @ 72 */	0x48,
-	/* 0x49 @ 73 */	0x49,
-	/* 0x4A @ 74 */	0x4A,
-	/* 0x4B @ 75 */	0x4B,
-	/* 0x4C @ 76 */	0x4C,
-	/* 0x4D @ 77 */	0x4D,
-	/* 0x4E @ 78 */	0x4E,
-	/* 0x4F @ 79 */	0x4F,
-	/* 0x50 @ 80 */	0x50,
-	/* 0x51 @ 81 */	0x51,
-	/* 0x52 @ 82 */	0x52,
-	/* 0x53 @ 83 */	0x53,
-	/* 0x54 @ 84 */	0x54,
-	/* 0x55 @ 85 */	0x55,
-	/* 0x56 @ 86 */	0x56,
-	/* 0x57 @ 87 */	0x57,
-	/* 0x58 @ 88 */	0x58,
-	/* 0x59 @ 89 */	0x59,
-	/* 0x5A @ 90 */	0x5A,
-	/* 0x5B @ 91 */	0x5B,
-	/* 0x5C @ 92 */	0x5C,
-	/* 0x5D @ 93 */	0x5D,
-	/* 0x5E @ 94 */	0x5E,
-	/* 0x5F @ 95 */	0x5F,
-	/* 0x60 @ 96 */	0x60,
-	/* 0x61 @ 97 */	0x61,
-	/* 0x62 @ 98 */	0x62,
-	/* 0x63 @ 99 */	0x63,
-	/* 0x64 @ 100 */	0x64,
-	/* 0x65 @ 101 */	0x65,
-	/* 0x66 @ 102 */	0x66,
-	/* 0x67 @ 103 */	0x67,
-	/* 0x68 @ 104 */	0x68,
-	/* 0x69 @ 105 */	0x69,
-	/* 0x6A @ 106 */	0x6A,
-	/* 0x6B @ 107 */	0x6B,
-	/* 0x6C @ 108 */	0x6C,
-	/* 0x6D @ 109 */	0x6D,
-	/* 0x6E @ 110 */	0x6E,
-	/* 0x6F @ 111 */	0x6F,
-	/* 0x70 @ 112 */	0x70,
-	/* 0x71 @ 113 */	0x71,
-	/* 0x72 @ 114 */	0x72,
-	/* 0x73 @ 115 */	0x73,
-	/* 0x74 @ 116 */	0x74,
-	/* 0x75 @ 117 */	0x75,
-	/* 0x76 @ 118 */	0x76,
-	/* 0x77 @ 119 */	0x77,
-	/* 0x78 @ 120 */	0x78,
-	/* 0x79 @ 121 */	0x79,
-	/* 0x7A @ 122 */	0x7A,
-	/* 0x7B @ 123 */	0x7B,
-	/* 0x7C @ 124 */	0x7C,
-	/* 0x7D @ 125 */	0x7D,
-	/* 0x7E @ 126 */	0x7E,
-	/* 0x7F @ 127 */	0x7F,
-	/* 0x80 @ 128 */	0xE2, 0x82, 0xAC,
-	/* 0x81 @ 131 */	0xEF, 0xBF, 0xBD,
-	/* 0x82 @ 134 */	0xE2, 0x80, 0x9A,
-	/* 0x83 @ 137 */	0xC6, 0x92,
-	/* 0x84 @ 139 */	0xE2, 0x80, 0x9E,
-	/* 0x85 @ 142 */	0xE2, 0x80, 0xA6,
-	/* 0x86 @ 145 */	0xE2, 0x80, 0xA0,
-	/* 0x87 @ 148 */	0xE2, 0x80, 0xA1,
-	/* 0x88 @ 151 */	0xCB, 0x86,
-	/* 0x89 @ 153 */	0xE2, 0x80, 0xB0,
-	/* 0x8A @ 156 */	0xC5, 0xA0,
-	/* 0x8B @ 158 */	0xE2, 0x80, 0xB9,
-	/* 0x8C @ 161 */	0xC5, 0x92,
-	/* 0x8D @ 163 */	0xEF, 0xBF, 0xBD,
-	/* 0x8E @ 166 */	0xC5, 0xBD,
-	/* 0x8F @ 168 */	0xEF, 0xBF, 0xBD,
-	/* 0x90 @ 171 */	0xEF, 0xBF, 0xBD,
-	/* 0x91 @ 174 */	0xE2, 0x80, 0x98,
-	/* 0x92 @ 177 */	0xE2, 0x80, 0x99,
-	/* 0x93 @ 180 */	0xE2, 0x80, 0x9C,
-	/* 0x94 @ 183 */	0xE2, 0x80, 0x9D,
-	/* 0x95 @ 186 */	0xE2, 0x80, 0xA2,
-	/* 0x96 @ 189 */	0xE2, 0x80, 0x93,
-	/* 0x97 @ 192 */	0xE2, 0x80, 0x94,
-	/* 0x98 @ 195 */	0xCB, 0x9C,
-	/* 0x99 @ 197 */	0xE2, 0x84, 0xA2,
-	/* 0x9A @ 200 */	0xC5, 0xA1,
-	/* 0x9B @ 202 */	0xE2, 0x80, 0xBA,
-	/* 0x9C @ 205 */	0xC5, 0x93,
-	/* 0x9D @ 207 */	0xEF, 0xBF, 0xBD,
-	/* 0x9E @ 210 */	0xC5, 0xBE,
-	/* 0x9F @ 212 */	0xC5, 0xB8,
-	/* 0xA0 @ 214 */	0xC2, 0xA0,
-	/* 0xA1 @ 216 */	0xC2, 0xA1,
-	/* 0xA2 @ 218 */	0xC2, 0xA2,
-	/* 0xA3 @ 220 */	0xC2, 0xA3,
-	/* 0xA4 @ 222 */	0xC2, 0xA4,
-	/* 0xA5 @ 224 */	0xC2, 0xA5,
-	/* 0xA6 @ 226 */	0xC2, 0xA6,
-	/* 0xA7 @ 228 */	0xC2, 0xA7,
-	/* 0xA8 @ 230 */	0xC2, 0xA8,
-	/* 0xA9 @ 232 */	0xC2, 0xA9,
-	/* 0xAA @ 234 */	0xC2, 0xAA,
-	/* 0xAB @ 236 */	0xC2, 0xAB,
-	/* 0xAC @ 238 */	0xC2, 0xAC,
-	/* 0xAD @ 240 */	0xC2, 0xAD,
-	/* 0xAE @ 242 */	0xC2, 0xAE,
-	/* 0xAF @ 244 */	0xC2, 0xAF,
-	/* 0xB0 @ 246 */	0xC2, 0xB0,
-	/* 0xB1 @ 248 */	0xC2, 0xB1,
-	/* 0xB2 @ 250 */	0xC2, 0xB2,
-	/* 0xB3 @ 252 */	0xC2, 0xB3,
-	/* 0xB4 @ 254 */	0xC2, 0xB4,
-	/* 0xB5 @ 256 */	0xC2, 0xB5,
-	/* 0xB6 @ 258 */	0xC2, 0xB6,
-	/* 0xB7 @ 260 */	0xC2, 0xB7,
-	/* 0xB8 @ 262 */	0xC2, 0xB8,
-	/* 0xB9 @ 264 */	0xC2, 0xB9,
-	/* 0xBA @ 266 */	0xC2, 0xBA,
-	/* 0xBB @ 268 */	0xC2, 0xBB,
-	/* 0xBC @ 270 */	0xC2, 0xBC,
-	/* 0xBD @ 272 */	0xC2, 0xBD,
-	/* 0xBE @ 274 */	0xC2, 0xBE,
-	/* 0xBF @ 276 */	0xC2, 0xBF,
-	/* 0xC0 @ 278 */	0xC3, 0x80,
-	/* 0xC1 @ 280 */	0xC3, 0x81,
-	/* 0xC2 @ 282 */	0xC3, 0x82,
-	/* 0xC3 @ 284 */	0xC3, 0x83,
-	/* 0xC4 @ 286 */	0xC3, 0x84,
-	/* 0xC5 @ 288 */	0xC3, 0x85,
-	/* 0xC6 @ 290 */	0xC3, 0x86,
-	/* 0xC7 @ 292 */	0xC3, 0x87,
-	/* 0xC8 @ 294 */	0xC3, 0x88,
-	/* 0xC9 @ 296 */	0xC3, 0x89,
-	/* 0xCA @ 298 */	0xC3, 0x8A,
-	/* 0xCB @ 300 */	0xC3, 0x8B,
-	/* 0xCC @ 302 */	0xC3, 0x8C,
-	/* 0xCD @ 304 */	0xC3, 0x8D,
-	/* 0xCE @ 306 */	0xC3, 0x8E,
-	/* 0xCF @ 308 */	0xC3, 0x8F,
-	/* 0xD0 @ 310 */	0xC3, 0x90,
-	/* 0xD1 @ 312 */	0xC3, 0x91,
-	/* 0xD2 @ 314 */	0xC3, 0x92,
-	/* 0xD3 @ 316 */	0xC3, 0x93,
-	/* 0xD4 @ 318 */	0xC3, 0x94,
-	/* 0xD5 @ 320 */	0xC3, 0x95,
-	/* 0xD6 @ 322 */	0xC3, 0x96,
-	/* 0xD7 @ 324 */	0xC3, 0x97,
-	/* 0xD8 @ 326 */	0xC3, 0x98,
-	/* 0xD9 @ 328 */	0xC3, 0x99,
-	/* 0xDA @ 330 */	0xC3, 0x9A,
-	/* 0xDB @ 332 */	0xC3, 0x9B,
-	/* 0xDC @ 334 */	0xC3, 0x9C,
-	/* 0xDD @ 336 */	0xC3, 0x9D,
-	/* 0xDE @ 338 */	0xC3, 0x9E,
-	/* 0xDF @ 340 */	0xC3, 0x9F,
-	/* 0xE0 @ 342 */	0xC3, 0xA0,
-	/* 0xE1 @ 344 */	0xC3, 0xA1,
-	/* 0xE2 @ 346 */	0xC3, 0xA2,
-	/* 0xE3 @ 348 */	0xC3, 0xA3,
-	/* 0xE4 @ 350 */	0xC3, 0xA4,
-	/* 0xE5 @ 352 */	0xC3, 0xA5,
-	/* 0xE6 @ 354 */	0xC3, 0xA6,
-	/* 0xE7 @ 356 */	0xC3, 0xA7,
-	/* 0xE8 @ 358 */	0xC3, 0xA8,
-	/* 0xE9 @ 360 */	0xC3, 0xA9,
-	/* 0xEA @ 362 */	0xC3, 0xAA,
-	/* 0xEB @ 364 */	0xC3, 0xAB,
-	/* 0xEC @ 366 */	0xC3, 0xAC,
-	/* 0xED @ 368 */	0xC3, 0xAD,
-	/* 0xEE @ 370 */	0xC3, 0xAE,
-	/* 0xEF @ 372 */	0xC3, 0xAF,
-	/* 0xF0 @ 374 */	0xC3, 0xB0,
-	/* 0xF1 @ 376 */	0xC3, 0xB1,
-	/* 0xF2 @ 378 */	0xC3, 0xB2,
-	/* 0xF3 @ 380 */	0xC3, 0xB3,
-	/* 0xF4 @ 382 */	0xC3, 0xB4,
-	/* 0xF5 @ 384 */	0xC3, 0xB5,
-	/* 0xF6 @ 386 */	0xC3, 0xB6,
-	/* 0xF7 @ 388 */	0xC3, 0xB7,
-	/* 0xF8 @ 390 */	0xC3, 0xB8,
-	/* 0xF9 @ 392 */	0xC3, 0xB9,
-	/* 0xFA @ 394 */	0xC3, 0xBA,
-	/* 0xFB @ 396 */	0xC3, 0xBB,
-	/* 0xFC @ 398 */	0xC3, 0xBC,
-	/* 0xFD @ 400 */	0xC3, 0xBD,
-	/* 0xFE @ 402 */	0xC3, 0xBE,
-	/* 0xFF @ 404 */	0xC3, 0xBF,
-};
-
-static const uint16_t tblofs[257] = {
-	/* 0x00 */ 0, 1, 2, 3, 4, 5, 6, 7,
-	/* 0x08 */ 8, 9, 10, 11, 12, 13, 14, 15,
-	/* 0x10 */ 16, 17, 18, 19, 20, 21, 22, 23,
-	/* 0x18 */ 24, 25, 26, 27, 28, 29, 30, 31,
-	/* 0x20 */ 32, 33, 34, 35, 36, 37, 38, 39,
-	/* 0x28 */ 40, 41, 42, 43, 44, 45, 46, 47,
-	/* 0x30 */ 48, 49, 50, 51, 52, 53, 54, 55,
-	/* 0x38 */ 56, 57, 58, 59, 60, 61, 62, 63,
-	/* 0x40 */ 64, 65, 66, 67, 68, 69, 70, 71,
-	/* 0x48 */ 72, 73, 74, 75, 76, 77, 78, 79,
-	/* 0x50 */ 80, 81, 82, 83, 84, 85, 86, 87,
-	/* 0x58 */ 88, 89, 90, 91, 92, 93, 94, 95,
-	/* 0x60 */ 96, 97, 98, 99, 100, 101, 102, 103,
-	/* 0x68 */ 104, 105, 106, 107, 108, 109, 110, 111,
-	/* 0x70 */ 112, 113, 114, 115, 116, 117, 118, 119,
-	/* 0x78 */ 120, 121, 122, 123, 124, 125, 126, 127,
-	/* 0x80 */ 128, 131, 134, 137, 139, 142, 145, 148,
-	/* 0x88 */ 151, 153, 156, 158, 161, 163, 166, 168,
-	/* 0x90 */ 171, 174, 177, 180, 183, 186, 189, 192,
-	/* 0x98 */ 195, 197, 200, 202, 205, 207, 210, 212,
-	/* 0xA0 */ 214, 216, 218, 220, 222, 224, 226, 228,
-	/* 0xA8 */ 230, 232, 234, 236, 238, 240, 242, 244,
-	/* 0xB0 */ 246, 248, 250, 252, 254, 256, 258, 260,
-	/* 0xB8 */ 262, 264, 266, 268, 270, 272, 274, 276,
-	/* 0xC0 */ 278, 280, 282, 284, 286, 288, 290, 292,
-	/* 0xC8 */ 294, 296, 298, 300, 302, 304, 306, 308,
-	/* 0xD0 */ 310, 312, 314, 316, 318, 320, 322, 324,
-	/* 0xD8 */ 326, 328, 330, 332, 334, 336, 338, 340,
-	/* 0xE0 */ 342, 344, 346, 348, 350, 352, 354, 356,
-	/* 0xE8 */ 358, 360, 362, 364, 366, 368, 370, 372,
-	/* 0xF0 */ 374, 376, 378, 380, 382, 384, 386, 388,
-	/* 0xF8 */ 390, 392, 394, 396, 398, 400, 402, 404,
-	/* sizeof (cp1252_utf8) */ 406
-};
-
-/* Check if a string qualifies as UTF-8. */
-static int
-is_utf8(const char* src)
-{
-	uint8_t ch;
-	size_t i;
-	const uint8_t* s = (const uint8_t*) src;
-
-	/* We make a loop over every character, until we find a null one.
-	 Remember: The string is supposed to end with a NUL, so ahead checks are safe. */
-	while ((ch = *s++))	{
-		/* Ye olde 7bit ASCII chars 'rr fine for anything */
-		if(ch < 0x80) continue;
-
-		/* Now, we watch out for non-UTF conform sequences. */
-		else if ((ch < 0xC2) || (ch > 0xFD))
-			return 0;
-		/* check for some misformed sequences */
-		if (((ch == 0xC2) && (s[0] < 0xA0)) ||
-		 ((ch == 0xEF) && (s[0] == 0xBF) && (s[1] > 0xBD)))
-			/* XXX add more for outside the BMP */
-			return 0;
-
-		/* Check the continuation bytes. */
-		if (ch < 0xE0) i = 1;
-		else if (ch < 0xF0) i = 2;
-		else if (ch < 0xF8)	i = 3;
-		else if (ch < 0xFC)	i = 4;
-		else
-			i = 5;
-
-		while (i--)
-			if ((*s++ & 0xC0) != 0x80)
-				return 0;
-	}
-
-	/* If no check failed, the string indeed looks like valid UTF-8. */
-	return 1;
-}
-
-/* The main conversion routine.
- ICY in CP-1252 (or UTF-8 alreay) to UTF-8 encoded string.
- If force is applied, it will always encode to UTF-8, without checking. */
-char *
-icy2utf8(const char *src, int force)
-{
-	const uint8_t *s = (const uint8_t *)src;
-	size_t srclen, dstlen, i, k;
-	uint8_t ch, *d;
-	char *dst;
-
-	/* Some funny streams from Apple/iTunes give ICY info in UTF-8 already.
-	 So, be prepared and don't try to re-encode such. Unless forced. */
-	if(!force && is_utf8(src)) return (strdup(src));
-
-	srclen = strlen(src) + 1;
-	/* allocate conservatively */
-	if ((d = malloc(srclen * 3)) == NULL)
-		return (NULL);
-
-	i = 0;
-	dstlen = 0;
-	while (i < srclen) {
-		ch = s[i++];
-		k = tblofs[ch];
-		while (k < tblofs[ch + 1])
-			d[dstlen++] = cp1252_utf8[k++];
-	}
-
-	/* dstlen includes trailing NUL since srclen also does */
-	if ((dst = realloc(d, dstlen)) == NULL) {
-		free(d);
-		return (NULL);
-	}
-	return (dst);
-}
-
-/* This stuff is for testing only. */
-#ifdef TEST
-static const char intext[] = "\225 Gr\374\337e kosten 0,55 \200\205";
-
-#include <stdio.h>
-
-int
-main(void)
-{
-	char *t, *t2;
-
-	if ((t = icy2utf8(intext, 0)) == NULL) {
-		fprintf(stderr, "out of memory\n");
-		return (1);
-	}
-
-	/* make sure it won't be converted twice */
-	if ((t2 = icy2utf8(t), 0) == NULL) {
-		fprintf(stderr, "out of memory\n");
-		return (1);
-	}
-
-	printf("Result is:\t\343\200\214%s\343\200\215\n"
-		"\t\t\343\200\214%s\343\200\215\n", t, t2);
-
-	free(t);
-	free(t2);
-	return (0);
-}
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/icy2utf8.h Deleted

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/id3.c Deleted

@@ -1,998 +0,0 @@
-/*
-	id3: ID3v2.3 and ID3v2.4 parsing (a relevant subset)
-
-	copyright 2006-2008 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis
-*/
-
-#include "mpg123lib_intern.h"
-#include "id3.h"
-#include "debug.h"
-
-#ifndef NO_ID3V2 /* Only the main parsing routine will always be there. */
-
-/* We know the usual text frames plus some specifics. */
-#define KNOWN_FRAMES 4
-static const char frame_type[KNOWN_FRAMES][5] = { "COMM", "TXXX", "RVA2", "USLT" };
-enum frame_types { unknown = -2, text = -1, comment, extra, rva2, uslt };
-
-/* UTF support definitions */
-
-typedef void (*text_converter)(mpg123_string *sb, const unsigned char* source, size_t len, const int noquiet);
-
-static void convert_latin1 (mpg123_string *sb, const unsigned char* source, size_t len, const int noquiet);
-static void convert_utf16bom(mpg123_string *sb, const unsigned char* source, size_t len, const int noquiet);
-static void convert_utf8 (mpg123_string *sb, const unsigned char* source, size_t len, const int noquiet);
-
-static const text_converter text_converters[4] = 
-{
-	convert_latin1,
-	/* We always check for (multiple) BOM in 16bit unicode. Without BOM, UTF16 BE is the default.
-	 Errors in encoding are detected anyway. */
-	convert_utf16bom,
-	convert_utf16bom,
-	convert_utf8
-};
-
-static const unsigned int encoding_widths[4] = { 1, 2, 2, 1 };
-
-/* the code starts here... */
-
-static void null_id3_links(mpg123_handle *fr)
-{
-	fr->id3v2.title = NULL;
-	fr->id3v2.artist = NULL;
-	fr->id3v2.album = NULL;
-	fr->id3v2.year = NULL;
-	fr->id3v2.genre = NULL;
-	fr->id3v2.comment = NULL;
-}
-
-void init_id3(mpg123_handle *fr)
-{
-	fr->id3v2.version = 0; /* nothing there */
-	null_id3_links(fr);
-	fr->id3v2.comments = 0;
-	fr->id3v2.comment_list = NULL;
-	fr->id3v2.texts = 0;
-	fr->id3v2.text = NULL;
-	fr->id3v2.extras = 0;
-	fr->id3v2.extra = NULL;
-}
-
-/* Managing of the text, comment and extra lists. */
-
-/* Initialize one element. */
-static void init_mpg123_text(mpg123_text *txt)
-{
-	mpg123_init_string(&txt->text);
-	mpg123_init_string(&txt->description);
-	txt->id[0] = 0;
-	txt->id[1] = 0;
-	txt->id[2] = 0;
-	txt->id[3] = 0;
-	txt->lang[0] = 0;
-	txt->lang[1] = 0;
-	txt->lang[2] = 0;
-}
-
-/* Free memory of one element. */
-static void free_mpg123_text(mpg123_text *txt)
-{
-	mpg123_free_string(&txt->text);
-	mpg123_free_string(&txt->description);
-}
-
-/* Free memory of whole list. */
-#define free_comment(mh) free_id3_text(&((mh)->id3v2.comment_list), &((mh)->id3v2.comments))
-#define free_text(mh) free_id3_text(&((mh)->id3v2.text), &((mh)->id3v2.texts))
-#define free_extra(mh) free_id3_text(&((mh)->id3v2.extra), &((mh)->id3v2.extras))
-static void free_id3_text(mpg123_text **list, size_t *size)
-{
-	size_t i;
-	for(i=0; i<*size; ++i) free_mpg123_text(&((*list)[i]));
-
-	free(*list);
-	*list = NULL;
-	*size = 0;
-}
-
-/* Add items to the list. */
-#define add_comment(mh) add_id3_text(&((mh)->id3v2.comment_list), &((mh)->id3v2.comments))
-#define add_text(mh) add_id3_text(&((mh)->id3v2.text), &((mh)->id3v2.texts))
-#define add_extra(mh) add_id3_text(&((mh)->id3v2.extra), &((mh)->id3v2.extras))
-static mpg123_text *add_id3_text(mpg123_text **list, size_t *size)
-{
-	mpg123_text *x = safe_realloc(*list, sizeof(mpg123_text)*(*size+1));
-	if(x == NULL) return NULL; /* bad */
-
-	*list = x;
-	*size += 1;
-	init_mpg123_text(&((*list)[*size-1]));
-
-	return &((*list)[*size-1]); /* Return pointer to the added text. */
-}
-
-/* Remove the last item. */
-#define pop_comment(mh) pop_id3_text(&((mh)->id3v2.comment_list), &((mh)->id3v2.comments))
-#define pop_text(mh) pop_id3_text(&((mh)->id3v2.text), &((mh)->id3v2.texts))
-#define pop_extra(mh) pop_id3_text(&((mh)->id3v2.extra), &((mh)->id3v2.extras))
-static void pop_id3_text(mpg123_text **list, size_t *size)
-{
-	mpg123_text *x;
-	if(*size < 1) return;
-
-	free_mpg123_text(&((*list)[*size-1]));
-	if(*size > 1)
-	{
-		x = safe_realloc(*list, sizeof(mpg123_text)*(*size-1));
-		if(x != NULL){ *list = x; *size -= 1; }
-	}
-	else
-	{
-		free(*list);
-		*list = NULL;
-		*size = 0;
-	}
-}
-
-/* OK, back t the higher level functions. */
-
-void exit_id3(mpg123_handle *fr)
-{
-	free_comment(fr);
-	free_extra(fr);
-	free_text(fr);
-}
-
-void reset_id3(mpg123_handle *fr)
-{
-	exit_id3(fr);
-	init_id3(fr);
-}
-
-/* Set the id3v2.artist id3v2.title ... links to elements of the array. */
-void id3_link(mpg123_handle *fr)
-{
-	size_t i;
-	mpg123_id3v2 *v2 = &fr->id3v2;
-	debug("linking ID3v2");
-	null_id3_links(fr);
-	for(i=0; i<v2->texts; ++i)
-	{
-		mpg123_text *entry = &v2->text[i];
-		if (!strncmp("TIT2", entry->id, 4)) v2->title = &entry->text;
-		else if(!strncmp("TALB", entry->id, 4)) v2->album = &entry->text;
-		else if(!strncmp("TPE1", entry->id, 4)) v2->artist = &entry->text;
-		else if(!strncmp("TYER", entry->id, 4)) v2->year = &entry->text;
-		else if(!strncmp("TCON", entry->id, 4)) v2->genre = &entry->text;
-	}
-	for(i=0; i<v2->comments; ++i)
-	{
-		mpg123_text *entry = &v2->comment_list[i];
-		if(entry->description.fill == 0 || entry->description.p[0] == 0)
-		v2->comment = &entry->text;
-	}
-	/* When no generic comment found, use the last non-generic one. */
-	if(v2->comment == NULL && v2->comments > 0)
-	v2->comment = &v2->comment_list[v2->comments-1].text;
-}
-
-/*
-	Store ID3 text data in an mpg123_string; either verbatim copy or everything translated to UTF-8 encoding.
-	Preserve the zero string separator (I don't need strlen for the total size).
-
-	ID3v2 standard says that there should be one text frame of specific type per tag, and subsequent tags overwrite old values.
-	So, I always replace the text that may be stored already (perhaps with a list of zero-separated strings, though).
-*/
-static void store_id3_text(mpg123_string *sb, char *source, size_t source_size, const int noquiet, const int notranslate)
-{
-	if(!source_size)
-	{
-		debug("Empty id3 data!");
-		return;
-	}
-
-	/* We shall just copy the data. Client wants to decode itself. */
-	if(notranslate)
-	{
-		/* Future: Add a path for ID3 errors. */
-		if(!mpg123_resize_string(sb, source_size))
-		{
-			if(noquiet) error("Cannot resize target string, out of memory?");
-			return;
-		}
-		memcpy(sb->p, source, source_size);
-		sb->fill = source_size;
-		debug1("stored undecoded ID3 text of size %"SIZE_P, (size_p)source_size);
-		return;
-	}
-
-	id3_to_utf8(sb, ((unsigned char *)source)[0], (unsigned char*)source+1, source_size-1, noquiet);
-
-	if(sb->fill) debug1("UTF-8 string (the first one): %s", sb->p);
-	else if(noquiet) error("unable to convert string to UTF-8 (out of memory, junk input?)!");
-}
-
-/* On error, sb->size is 0. */
-void id3_to_utf8(mpg123_string *sb, unsigned char encoding, const unsigned char *source, size_t source_size, int noquiet)
-{
-	unsigned int bwidth;
-	debug1("encoding: %u", encoding);
-	/* A note: ID3v2.3 uses UCS-2 non-variable 16bit encoding, v2.4 uses UTF16.
-	 UTF-16 uses a reserved/private range in UCS-2 to add the magic, so we just always treat it as UTF. */
-	if(encoding > mpg123_id3_enc_max)
-	{
-		if(noquiet) error1("Unknown text encoding %u, I take no chances, sorry!", encoding);
-
-		mpg123_free_string(sb);
-		return;
-	}
-	bwidth = encoding_widths[encoding];
-	/* Hack! I've seen a stray zero byte before BOM. Is that supposed to happen? */
-	if(encoding != mpg123_id3_utf16be) /* UTF16be _can_ beging with a null byte! */
-	while(source_size > bwidth && source[0] == 0)
-	{
-		--source_size;
-		++source;
-		debug("skipped leading zero");
-	}
-	if(source_size % bwidth)
-	{
-		/* When we need two bytes for a character, it's strange to have an uneven bytestream length. */
-		if(noquiet) warning2("Weird tag size %d for encoding %u - I will probably trim too early or something but I think the MP3 is broken.", (int)source_size, encoding);
-		source_size -= source_size % bwidth;
-	}
-	text_converters[encoding](sb, source, source_size, noquiet);
-}
-
-static char *next_text(char* prev, int encoding, size_t limit)
-{
-	char *text = prev;
-	size_t width = encoding_widths[encoding];
-
-	/* So I go lengths to find zero or double zero...
-	 Remember bug 2834636: Only check for aligned NULLs! */
-	while(text-prev < (ssize_t)limit)
-	{
-		if(text[0] == 0)
-		{
-			if(width <= limit-(text-prev))
-			{
-				size_t i = 1;
-				for(; i<width; ++i) if(text[i] != 0) break;
-
-				if(i == width) /* found a null wide enough! */
-				{
-					text += width;
-					break;
-				}
-			}
-			else return NULL; /* No full character left? This text is broken */
-		}
-
-		text += width;
-	}
-	if((size_t)(text-prev) >= limit) text = NULL;
-
-	return text;
-}
-
-static const char *enc_name(int enc)
-{
-	switch(enc)
-	{
-		case 0: return "Latin 1";
-		case 1: return "UTF-16 BOM";
-		case 2: return "UTF-16 BE";
-		case 3: return "UTF-8";
-		default: return "unknown!";
-	}
-}
-
-static void process_text(mpg123_handle *fr, char *realdata, size_t realsize, char *id)
-{
-	/* Text encoding $xx */
-	/* The text (encoded) ... */
-	mpg123_text *t = add_text(fr);
-	if(VERBOSE4) fprintf(stderr, "Note: Storing text from %s encoding\n", enc_name(realdata[0]));
-	if(t == NULL)
-	{
-		if(NOQUIET) error("Unable to attach new text!");
-		return;
-	}
-	memcpy(t->id, id, 4);
-	store_id3_text(&t->text, realdata, realsize, NOQUIET, fr->p.flags & MPG123_PLAIN_ID3TEXT);
-	if(VERBOSE4) fprintf(stderr, "Note: ID3v2 %c%c%c%c text frame: %s\n", id[0], id[1], id[2], id[3], t->text.p);
-}
-
-/* Store a new comment that perhaps is a RVA / RVA_ALBUM/AUDIOPHILE / RVA_MIX/RADIO one
- Special gimmik: It also stores USLT to the texts. Stucture is the same as for comments. */
-static void process_comment(mpg123_handle *fr, enum frame_types tt, char *realdata, size_t realsize, int rva_level, char *id)
-{
-	/* Text encoding $xx */
-	/* Language $xx xx xx */
-	/* Short description (encoded!) <text> $00 (00) */
-	/* Then the comment text (encoded) ... */
-	char encoding = realdata[0];
-	char *lang = realdata+1; /* I'll only use the 3 bytes! */
-	char *descr = realdata+4;
-	char *text = NULL;
-	mpg123_text *xcom = NULL;
-	mpg123_text localcom; /* UTF-8 variant for local processing. */
-
-	if((int)realsize < descr-realdata)
-	{
-		if(NOQUIET) error1("Invalid frame size of %lu (too small for anything).", (unsigned long)realsize);
-		return;
-	}
-	xcom = (tt == uslt ? add_text(fr) : add_comment(fr));
-	if(VERBOSE4) fprintf(stderr, "Note: Storing comment from %s encoding\n", enc_name(realdata[0]));
-	if(xcom == NULL)
-	{
-		if(NOQUIET) error("Unable to attach new comment!");
-		return;
-	}
-	memcpy(xcom->lang, lang, 3);
-	memcpy(xcom->id, id, 4);
-	/* Now I can abuse a byte from lang for the encoding. */
-	descr[-1] = encoding;
-	/* Be careful with finding the end of description, I have to honor encoding here. */
-	text = next_text(descr, encoding, realsize-(descr-realdata));
-	if(text == NULL)
-	{
-		if(NOQUIET) error("No comment text / valid description?");
-		pop_comment(fr);
-		return;
-	}
-
-	init_mpg123_text(&localcom);
-	/* Store the text, without translation to UTF-8, but for comments always a local copy in UTF-8.
-	 Reminder: No bailing out from here on without freeing the local comment data! */
-	store_id3_text(&xcom->description, descr-1, text-descr+1, NOQUIET, fr->p.flags & MPG123_PLAIN_ID3TEXT);
-	if(tt == comment)
-	store_id3_text(&localcom.description, descr-1, text-descr+1, NOQUIET, 0);
-
-	text[-1] = encoding; /* Byte abusal for encoding... */
-	store_id3_text(&xcom->text, text-1, realsize+1-(text-realdata), NOQUIET, fr->p.flags & MPG123_PLAIN_ID3TEXT);
-	/* Remember: I will probably decode the above (again) for rva comment checking. So no messing around, please. */
-
-	if(VERBOSE4) /* Do _not_ print the verbatim text: The encoding might be funny! */
-	{
-		fprintf(stderr, "Note: ID3 comm/uslt desc of length %"SIZE_P".\n", (size_p)xcom->description.fill);
-		fprintf(stderr, "Note: ID3 comm/uslt text of length %"SIZE_P".\n", (size_p)xcom->text.fill);
-	}
-	/* Look out for RVA info only when we really deal with a straight comment. */
-	if(tt == comment && localcom.description.fill > 0)
-	{
-		int rva_mode = -1; /* mix / album */
-		if( !strcasecmp(localcom.description.p, "rva")
-			 || !strcasecmp(localcom.description.p, "rva_mix")
-			 || !strcasecmp(localcom.description.p, "rva_track")
-			 || !strcasecmp(localcom.description.p, "rva_radio") )
-		rva_mode = 0;
-		else if( !strcasecmp(localcom.description.p, "rva_album")
-		 || !strcasecmp(localcom.description.p, "rva_audiophile")
-		 || !strcasecmp(localcom.description.p, "rva_user") )
-		rva_mode = 1;
-		if((rva_mode > -1) && (fr->rva.level[rva_mode] <= rva_level))
-		{
-			/* Only translate the contents in here where we really need them. */
-			store_id3_text(&localcom.text, text-1, realsize+1-(text-realdata), NOQUIET, 0);
-			if(localcom.text.fill > 0)
-			{
-				fr->rva.gain[rva_mode] = (float) atof(localcom.text.p);
-				if(VERBOSE3) fprintf(stderr, "Note: RVA value %fdB\n", fr->rva.gain[rva_mode]);
-				fr->rva.peak[rva_mode] = 0;
-				fr->rva.level[rva_mode] = rva_level;
-			}
-		}
-	}
-	/* Make sure to free the local memory... */
-	free_mpg123_text(&localcom);
-}
-
-static void process_extra(mpg123_handle *fr, char* realdata, size_t realsize, int rva_level, char *id)
-{
-	/* Text encoding $xx */
-	/* Description ... $00 (00) */
-	/* Text ... */
-	char encoding = realdata[0];
-	char *descr = realdata+1; /* remember, the encoding is descr[-1] */
-	char *text;
-	mpg123_text *xex;
-	mpg123_text localex;
-
-	if((int)realsize < descr-realdata)
-	{
-		if(NOQUIET) error1("Invalid frame size of %lu (too small for anything).", (unsigned long)realsize);
-		return;
-	}
-	text = next_text(descr, encoding, realsize-(descr-realdata));
-	if(VERBOSE4) fprintf(stderr, "Note: Storing extra from %s encoding\n", enc_name(realdata[0]));
-	if(text == NULL)
-	{
-		if(NOQUIET) error("No extra frame text / valid description?");
-		return;
-	}
-	xex = add_extra(fr);
-	if(xex == NULL)
-	{
-		if(NOQUIET) error("Unable to attach new extra text!");
-		return;
-	}
-	memcpy(xex->id, id, 4);
-	init_mpg123_text(&localex); /* For our local copy. */
-
-	/* The outside storage gets reencoded to UTF-8 only if not requested otherwise.
-	 Remember that we really need the -1 here to hand in the encoding byte!*/
-	store_id3_text(&xex->description, descr-1, text-descr+1, NOQUIET, fr->p.flags & MPG123_PLAIN_ID3TEXT);
-	/* Our local copy is always stored in UTF-8! */
-	store_id3_text(&localex.description, descr-1, text-descr+1, NOQUIET, 0);
-	/* At first, only store the outside copy of the payload. We may not need the local copy. */
-	text[-1] = encoding;
-	store_id3_text(&xex->text, text-1, realsize-(text-realdata)+1, NOQUIET, fr->p.flags & MPG123_PLAIN_ID3TEXT);
-
-	/* Now check if we would like to interpret this extra info for RVA. */
-	if(localex.description.fill > 0)
-	{
-		int is_peak = 0;
-		int rva_mode = -1; /* mix / album */
-
-		if(!strncasecmp(localex.description.p, "replaygain_track_",17))
-		{
-			if(VERBOSE3) fprintf(stderr, "Note: RVA ReplayGain track gain/peak\n");
-
-			rva_mode = 0;
-			if(!strcasecmp(localex.description.p, "replaygain_track_peak")) is_peak = 1;
-			else if(strcasecmp(localex.description.p, "replaygain_track_gain")) rva_mode = -1;
-		}
-		else
-		if(!strncasecmp(localex.description.p, "replaygain_album_",17))
-		{
-			if(VERBOSE3) fprintf(stderr, "Note: RVA ReplayGain album gain/peak\n");
-
-			rva_mode = 1;
-			if(!strcasecmp(localex.description.p, "replaygain_album_peak")) is_peak = 1;
-			else if(strcasecmp(localex.description.p, "replaygain_album_gain")) rva_mode = -1;
-		}
-		if((rva_mode > -1) && (fr->rva.level[rva_mode] <= rva_level))
-		{
-			/* Now we need the translated copy of the data. */
-			store_id3_text(&localex.text, text-1, realsize-(text-realdata)+1, NOQUIET, 0);
-			if(localex.text.fill > 0)
-			{
-				if(is_peak)
-				{
-					fr->rva.peak[rva_mode] = (float) atof(localex.text.p);
-					if(VERBOSE3) fprintf(stderr, "Note: RVA peak %f\n", fr->rva.peak[rva_mode]);
-				}
-				else
-				{
-					fr->rva.gain[rva_mode] = (float) atof(localex.text.p);
-					if(VERBOSE3) fprintf(stderr, "Note: RVA gain %fdB\n", fr->rva.gain[rva_mode]);
-				}
-				fr->rva.level[rva_mode] = rva_level;
-			}
-		}
-	}
-
-	free_mpg123_text(&localex);
-}
-
-/* Make a ID3v2.3+ 4-byte ID from a ID3v2.2 3-byte ID
- Note that not all frames survived to 2.4; the mapping goes to 2.3 .
- A notable miss is the old RVA frame, which is very unspecific anyway.
- This function returns -1 when a not known 3 char ID was encountered, 0 otherwise. */
-static int promote_framename(mpg123_handle *fr, char *id) /* fr because of VERBOSE macros */
-{
-	size_t i;
-	char *old[] =
-	{
-		"COM", "TAL", "TBP", "TCM", "TCO", "TCR", "TDA", "TDY", "TEN", "TFT",
-		"TIM", "TKE", "TLA", "TLE", "TMT", "TOA", "TOF", "TOL", "TOR", "TOT",
-		"TP1", "TP2", "TP3", "TP4", "TPA", "TPB", "TRC", "TDA", "TRK", "TSI",
-		"TSS", "TT1", "TT2", "TT3", "TXT", "TXX", "TYE"
-	};
-	char *new[] =
-	{
-		"COMM", "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDAT", "TDLY", "TENC", "TFLT",
-		"TIME", "TKEY", "TLAN", "TLEN", "TMED", "TOPE", "TOFN", "TOLY", "TORY", "TOAL",
-		"TPE1", "TPE2", "TPE3", "TPE4", "TPOS", "TPUB", "TSRC", "TRDA", "TRCK", "TSIZ",
-		"TSSE", "TIT1", "TIT2", "TIT3", "TEXT", "TXXX", "TYER"
-	};
-	for(i=0; i<sizeof(old)/sizeof(char*); ++i)
-	{
-		if(!strncmp(id, old[i], 3))
-		{
-			memcpy(id, new[i], 4);
-			if(VERBOSE3) fprintf(stderr, "Translated ID3v2.2 frame %s to %s\n", old[i], new[i]);
-			return 0;
-		}
-	}
-	if(VERBOSE3) fprintf(stderr, "Ignoring untranslated ID3v2.2 frame %c%c%c\n", id[0], id[1], id[2]);
-	return -1;
-}
-
-#endif /* NO_ID3V2 */
-
-/*
-	trying to parse ID3v2.3 and ID3v2.4 tags...
-
-	returns: 0: bad or just unparseable tag
-	 1: good, (possibly) new tag info
-	 <0: reader error (may need more data feed, try again)
-*/
-int parse_new_id3(mpg123_handle *fr, unsigned long first4bytes)
-{
-	#define UNSYNC_FLAG 128
-	#define EXTHEAD_FLAG 64
-	#define EXP_FLAG 32
-	#define FOOTER_FLAG 16
-	#define UNKNOWN_FLAGS 15 /* 00001111*/
-	unsigned char buf[6];
-	unsigned long length=0;
-	unsigned char flags = 0;
-	int ret = 1;
-	int ret2;
-	unsigned char major = first4bytes & 0xff;
-	debug1("ID3v2: major tag version: %i", major);
-	if(major == 0xff) return 0; /* Invalid... */
-	if((ret2 = fr->rd->read_frame_body(fr, buf, 6)) < 0) /* read more header information */
-	return ret2;
-
-	if(buf[0] == 0xff) return 0; /* Revision, will never be 0xff. */
-
-	/* second new byte are some nice flags, if these are invalid skip the whole thing */
-	flags = buf[1];
-	debug1("ID3v2: flags 0x%08x", flags);
-	/* use 4 bytes from buf to construct 28bit uint value and return 1; return 0 if bytes are not synchsafe */
-	#define synchsafe_to_long(buf,res) \
-	( \
-		(((buf)[0]|(buf)[1]|(buf)[2]|(buf)[3]) & 0x80) ? 0 : \
-		(res = (((unsigned long) (buf)[0]) << 21) \
-		 | (((unsigned long) (buf)[1]) << 14) \
-		 | (((unsigned long) (buf)[2]) << 7) \
-		 | ((unsigned long) (buf)[3]) \
-		,1) \
-	)
-	/* id3v2.3 does not store synchsafe frame sizes, but synchsafe tag size - doh! */
-	#define bytes_to_long(buf,res) \
-	( \
-		major == 3 ? \
-		(res = (((unsigned long) (buf)[0]) << 24) \
-		 | (((unsigned long) (buf)[1]) << 16) \
-		 | (((unsigned long) (buf)[2]) << 8) \
-		 | ((unsigned long) (buf)[3]) \
-		,1) : synchsafe_to_long(buf,res) \
-	)
-	/* for id3v2.2 only */
-	#define threebytes_to_long(buf,res) \
-	( \
-		res = (((unsigned long) (buf)[0]) << 16) \
-		 | (((unsigned long) (buf)[1]) << 8) \
-		 | ((unsigned long) (buf)[2]) \
-		,1 \
-	)
-
-	/* length-10 or length-20 (footer present); 4 synchsafe integers == 28 bit number */
-	/* we have already read 10 bytes, so left are length or length+10 bytes belonging to tag */
-	if(!synchsafe_to_long(buf+2,length))
-	{
-		if(NOQUIET) error4("Bad tag length (not synchsafe): 0x%02x%02x%02x%02x; You got a bad ID3 tag here.", buf[2],buf[3],buf[4],buf[5]);
-		return 0;
-	}
-	debug1("ID3v2: tag data length %lu", length);
-#ifndef NO_ID3V2
-	if(VERBOSE2) fprintf(stderr,"Note: ID3v2.%i rev %i tag of %lu bytes\n", major, buf[0], length);
-	/* skip if unknown version/scary flags, parse otherwise */
-	if(fr->p.flags & MPG123_SKIP_ID3V2 || ((flags & UNKNOWN_FLAGS) || (major > 4) || (major < 2)))
-	{
-		if(NOQUIET)
-		{
-			if(fr->p.flags & MPG123_SKIP_ID3V2)
-			{
-				if(VERBOSE3) fprintf(stderr, "Note: Skipping ID3v2 tag per user request.\n");
-			}
-			else /* Must be because of scary Tag properties. */
-			warning2("ID3v2: Won't parse the ID3v2 tag with major version %u and flags 0x%xu - some extra code may be needed", major, flags);
-		}
-#endif
-		if((ret2 = fr->rd->skip_bytes(fr,length)) < 0) /* will not store data in backbuff! */
-		ret = ret2;
-#ifndef NO_ID3V2
-	}
-	else
-	{
-		unsigned char* tagdata = NULL;
-		fr->id3v2.version = major;
-		/* try to interpret that beast */
-		if((tagdata = (unsigned char*) malloc(length+1)) != NULL)
-		{
-			debug("ID3v2: analysing frames...");
-			if((ret2 = fr->rd->read_frame_body(fr,tagdata,length)) > 0)
-			{
-				unsigned long tagpos = 0;
-				debug1("ID3v2: have read at all %lu bytes for the tag now", (unsigned long)length+6);
-				/* going to apply strlen for strings inside frames, make sure that it doesn't overflow! */
-				tagdata[length] = 0;
-				if(flags & EXTHEAD_FLAG)
-				{
-					debug("ID3v2: skipping extended header");
-					if(!bytes_to_long(tagdata, tagpos))
-					{
-						ret = 0;
-						if(NOQUIET) error4("Bad (non-synchsafe) tag offset: 0x%02x%02x%02x%02x", tagdata[0], tagdata[1], tagdata[2], tagdata[3]);
-					}
-				}
-				if(ret > 0)
-				{
-					char id[5];
-					unsigned long framesize;
-					unsigned long fflags; /* need 16 bits, actually */
-					id[4] = 0;
-					/* pos now advanced after ext head, now a frame has to follow */
-					while(tagpos < length-10) /* I want to read at least a full header */
-					{
-						int i = 0;
-						unsigned long pos = tagpos;
-						int head_part = fr->id3v2.version == 2 ? 3 : 4; /* bytes of frame title and of framesize value */
-						/* level 1,2,3 - 0 is info from lame/info tag! */
-						/* rva tags with ascending significance, then general frames */
-						enum frame_types tt = unknown;
-						/* we may have entered the padding zone or any other strangeness: check if we have valid frame id characters */
-						for(i=0; i< head_part; ++i)
-						if( !( ((tagdata[tagpos+i] > 47) && (tagdata[tagpos+i] < 58))
-						 || ((tagdata[tagpos+i] > 64) && (tagdata[tagpos+i] < 91)) ) )
-						{
-							debug5("ID3v2: real tag data apparently ended after %lu bytes with 0x%02x%02x%02x%02x", tagpos, tagdata[tagpos], tagdata[tagpos+1], tagdata[tagpos+2], tagdata[tagpos+3]);
-							/* This is no hard error... let's just hope that we got something meaningful already (ret==1 in that case). */
-							goto tagparse_cleanup; /* Need to escape two loops here. */
-						}
-						if(ret > 0)
-						{
-							/* 4 or 3 bytes id */
-							strncpy(id, (char*) tagdata+pos, head_part);
-							pos += head_part;
-							tagpos += head_part;
-							/* size as 32 bits or 28 bits */
-							if(fr->id3v2.version == 2) threebytes_to_long(tagdata+pos, framesize);
-							else
-							if(!bytes_to_long(tagdata+pos, framesize))
-							{
-								/* Just assume that up to now there was some good data. */
-								if(NOQUIET) error1("ID3v2: non-syncsafe size of %s frame, skipping the remainder of tag", id);
-								break;
-							}
-							if(VERBOSE3) fprintf(stderr, "Note: ID3v2 %s frame of size %lu\n", id, framesize);
-							tagpos += head_part + framesize; /* the important advancement in whole tag */
-							if(tagpos > length)
-							{
-								if(NOQUIET) error("Whoa! ID3v2 frame claims to be larger than the whole rest of the tag.");
-								break;
-							}
-							pos += head_part;
-							if(fr->id3v2.version > 2)
-							{
-								fflags = (((unsigned long) tagdata[pos]) << 8) | ((unsigned long) tagdata[pos+1]);
-								pos += 2;
-								tagpos += 2;
-							}
-							else fflags = 0;
-							/* for sanity, after full parsing tagpos should be == pos */
-							/* debug4("ID3v2: found %s frame, size %lu (as bytes: 0x%08lx), flags 0x%016lx", id, framesize, framesize, fflags); */
-							/* %0abc0000 %0h00kmnp */
-							#define BAD_FFLAGS (unsigned long) 36784
-							#define PRES_TAG_FFLAG 16384
-							#define PRES_FILE_FFLAG 8192
-							#define READ_ONLY_FFLAG 4096
-							#define GROUP_FFLAG 64
-							#define COMPR_FFLAG 8
-							#define ENCR_FFLAG 4
-							#define UNSYNC_FFLAG 2
-							#define DATLEN_FFLAG 1
-							if(head_part < 4 && promote_framename(fr, id) != 0) continue;
-
-							/* shall not or want not handle these */
-							if(fflags & (BAD_FFLAGS | COMPR_FFLAG | ENCR_FFLAG))
-							{
-								if(NOQUIET) warning("ID3v2: skipping invalid/unsupported frame");
-								continue;
-							}
-							
-							for(i = 0; i < KNOWN_FRAMES; ++i)
-							if(!strncmp(frame_type[i], id, 4)){ tt = i; break; }
-
-							if(id[0] == 'T' && tt != extra) tt = text;
-
-							if(tt != unknown)
-							{
-								int rva_mode = -1; /* mix / album */
-								unsigned long realsize = framesize;
-								unsigned char* realdata = tagdata+pos;
-								if((flags & UNSYNC_FLAG) || (fflags & UNSYNC_FFLAG))
-								{
-									unsigned long ipos = 0;
-									unsigned long opos = 0;
-									debug("Id3v2: going to de-unsync the frame data");
-									/* de-unsync: FF00 -> FF; real FF00 is simply represented as FF0000 ... */
-									/* damn, that means I have to delete bytes from withing the data block... thus need temporal storage */
-									/* standard mandates that de-unsync should always be safe if flag is set */
-									realdata = (unsigned char*) malloc(framesize); /* will need <= bytes */
-									if(realdata == NULL)
-									{
-										if(NOQUIET) error("ID3v2: unable to allocate working buffer for de-unsync");
-										continue;
-									}
-									/* now going byte per byte through the data... */
-									realdata[0] = tagdata[pos];
-									opos = 1;
-									for(ipos = pos+1; ipos < pos+framesize; ++ipos)
-									{
-										if(!((tagdata[ipos] == 0) && (tagdata[ipos-1] == 0xff)))
-										{
-											realdata[opos++] = tagdata[ipos];
-										}
-									}
-									realsize = opos;
-									debug2("ID3v2: de-unsync made %lu out of %lu bytes", realsize, framesize);
-								}
-								pos = 0; /* now at the beginning again... */
-								switch(tt)
-								{
-									case comment:
-									case uslt:
-										process_comment(fr, tt, (char*)realdata, realsize, comment+1, id);
-									break;
-									case extra: /* perhaps foobar2000's work */
-										process_extra(fr, (char*)realdata, realsize, extra+1, id);
-									break;
-									case rva2: /* "the" RVA tag */
-									{
-										/* starts with null-terminated identification */
-										if(VERBOSE3) fprintf(stderr, "Note: RVA2 identification \"%s\"\n", realdata);
-										/* default: some individual value, mix mode */
-										rva_mode = 0;
-										if( !strncasecmp((char*)realdata, "album", 5)
-										 || !strncasecmp((char*)realdata, "audiophile", 10)
-										 || !strncasecmp((char*)realdata, "user", 4))
-										rva_mode = 1;
-										if(fr->rva.level[rva_mode] <= rva2+1)
-										{
-											pos += strlen((char*) realdata) + 1;
-											if(realdata[pos] == 1)
-											{
-												++pos;
-												/* only handle master channel */
-												debug("ID3v2: it is for the master channel");
-												/* two bytes adjustment, one byte for bits representing peak - n bytes, eh bits, for peak */
-												/* 16 bit signed integer = dB * 512 ... the double cast is needed to preserve the sign of negative values! */
-												fr->rva.gain[rva_mode] = (float) ( (((short)((signed char)realdata[pos])) << 8) | realdata[pos+1] ) / 512;
-												pos += 2;
-												if(VERBOSE3) fprintf(stderr, "Note: RVA value %fdB\n", fr->rva.gain[rva_mode]);
-												/* heh, the peak value is represented by a number of bits - but in what manner? Skipping that part */
-												fr->rva.peak[rva_mode] = 0;
-												fr->rva.level[rva_mode] = rva2+1;
-											}
-										}
-									}
-									break;
-									/* non-rva metainfo, simply store... */
-									case text:
-										process_text(fr, (char*)realdata, realsize, id);
-									break;
-									default: if(NOQUIET) error1("ID3v2: unknown frame type %i", tt);
-								}
-								if((flags & UNSYNC_FLAG) || (fflags & UNSYNC_FFLAG)) free(realdata);
-							}
-							#undef BAD_FFLAGS
-							#undef PRES_TAG_FFLAG
-							#undef PRES_FILE_FFLAG
-							#undef READ_ONLY_FFLAG
-							#undef GROUP_FFLAG
-							#undef COMPR_FFLAG
-							#undef ENCR_FFLAG
-							#undef UNSYNC_FFLAG
-							#undef DATLEN_FFLAG
-						}
-						else break;
-						#undef KNOWN_FRAMES
-					}
-				}
-			}
-			else
-			{
-				/* There are tags with zero length. Strictly not an error, then. */
-				if(length > 0 && NOQUIET && ret2 != MPG123_NEED_MORE) error("ID3v2: Duh, not able to read ID3v2 tag data.");
-				ret = ret2;
-			}
-tagparse_cleanup:
-			free(tagdata);
-		}
-		else
-		{
-			if(NOQUIET) error1("ID3v2: Arrg! Unable to allocate %lu bytes for interpreting ID3v2 data - trying to skip instead.", length);
-			if((ret2 = fr->rd->skip_bytes(fr,length)) < 0) ret = ret2; /* will not store data in backbuff! */
-			else ret = 0;
-		}
-	}
-#endif /* NO_ID3V2 */
-	/* skip footer if present */
-	if((ret > 0) && (flags & FOOTER_FLAG) && ((ret2 = fr->rd->skip_bytes(fr,length)) < 0)) ret = ret2;
-
-	return ret;
-	#undef UNSYNC_FLAG
-	#undef EXTHEAD_FLAG
-	#undef EXP_FLAG
-	#undef FOOTER_FLAG
-	#undef UNKOWN_FLAGS
-}
-
-#ifndef NO_ID3V2 /* Disabling all the rest... */
-
-static void convert_latin1(mpg123_string *sb, const unsigned char* s, size_t l, const int noquiet)
-{
-	size_t length = l;
-	size_t i;
-	unsigned char *p;
-	/* determine real length, a latin1 character can at most take 2 in UTF8 */
-	for(i=0; i<l; ++i)
-	if(s[i] >= 0x80) ++length;
-
-	debug1("UTF-8 length: %lu", (unsigned long)length);
-	/* one extra zero byte for paranoia */
-	if(!mpg123_resize_string(sb, length+1)){ mpg123_free_string(sb); return ; }
-
-	p = (unsigned char*) sb->p; /* Signedness doesn't matter but it shows I thought about the non-issue */
-	for(i=0; i<l; ++i)
-	if(s[i] < 0x80){ *p = s[i]; ++p; }
-	else /* two-byte encoding */
-	{
-		*p = 0xc0 | (s[i]>>6);
-		*(p+1) = 0x80 | (s[i] & 0x3f);
-		p+=2;
-	}
-
-	sb->p[length] = 0;
-	sb->fill = length+1;
-}
-
-/*
-	Check if we have a byte oder mark(s) there, return:
-	-1: little endian
-	 0: no BOM
-	 1: big endian
-
-	This modifies source and len to indicate the data _after_ the BOM(s).
-	Note on nasty data: The last encountered BOM determines the endianess.
-	I have seen data with multiple BOMS, namely from "the" id3v2 program.
-	Not nice, but what should I do?
-*/
-static int check_bom(const unsigned char** source, size_t *len)
-{
-	int this_bom = 0;
-	int further_bom = 0;
-
-	if(*len < 2) return 0;
-
-	if((*source)[0] == 0xff && (*source)[1] == 0xfe)
-	this_bom = -1;
-
-	if((*source)[0] == 0xfe && (*source)[1] == 0xff)
-	this_bom = 1;
-
-	/* Skip the detected BOM. */
-	if(this_bom != 0)
-	{
-		*source += 2;
-		*len -= 2;
-		/* Check for following BOMs. The last one wins! */
-		further_bom = check_bom(source, len);
-		if(further_bom == 0) return this_bom; /* End of the recursion. */
-		else return further_bom;
-	}
-	else return 0;
-}
-
-#define FULLPOINT(f,s) ( (((f)&0x3ff)<<10) + ((s)&0x3ff) + 0x10000 )
-/* Remember: There's a limit at 0x1ffff. */
-#define UTF8LEN(x) ( (x)<0x80 ? 1 : ((x)<0x800 ? 2 : ((x)<0x10000 ? 3 : 4)))
-static void convert_utf16bom(mpg123_string *sb, const unsigned char* s, size_t l, const int noquiet)
-{
-	size_t i;
-	size_t n; /* number bytes that make up full pairs */
-	unsigned char *p;
-	size_t length = 0; /* the resulting UTF-8 length */
-	/* Determine real length... extreme case can be more than utf-16 length. */
-	size_t high = 0;
-	size_t low = 1;
-	int bom_endian;
-
-	debug1("convert_utf16 with length %lu", (unsigned long)l);
-
-	bom_endian = check_bom(&s, &l);
-	debug1("UTF16 endianess check: %i", bom_endian);
-
-	if(bom_endian == -1) /* little-endian */
-	{
-		high = 1; /* The second byte is the high byte. */
-		low = 0; /* The first byte is the low byte. */
-	}
-
-	n = (l/2)*2; /* number bytes that make up full pairs */
-
-	/* first: get length, check for errors -- stop at first one */
-	for(i=0; i < n; i+=2)
-	{
-		unsigned long point = ((unsigned long) s[i+high]<<8) + s[i+low];
-		if((point & 0xd800) == 0xd800) /* lead surrogate */
-		{
-			unsigned short second = (i+3 < l) ? (s[i+2+high]<<8) + s[i+2+low] : 0;
-			if((second & 0xdc00) == 0xdc00) /* good... */
-			{
-				point = FULLPOINT(point,second);
-				length += UTF8LEN(point); /* possibly 4 bytes */
-				i+=2; /* We overstepped one word. */
-			}
-			else /* if no valid pair, break here */
-			{
-				if(noquiet) error2("Invalid UTF16 surrogate pair at %li (0x%04lx).", (unsigned long)i, point);
-				n = i; /* Forget the half pair, END! */
-				break;
-			}
-		}
-		else length += UTF8LEN(point); /* 1,2 or 3 bytes */
-	}
-
-	if(!mpg123_resize_string(sb, length+1)){ mpg123_free_string(sb); return ; }
-
-	/* Now really convert, skip checks as these have been done just before. */
-	p = (unsigned char*) sb->p; /* Signedness doesn't matter but it shows I thought about the non-issue */
-	for(i=0; i < n; i+=2)
-	{
-		unsigned long codepoint = ((unsigned long) s[i+high]<<8) + s[i+low];
-		if((codepoint & 0xd800) == 0xd800) /* lead surrogate */
-		{
-			unsigned short second = (s[i+2+high]<<8) + s[i+2+low];
-			codepoint = FULLPOINT(codepoint,second);
-			i+=2; /* We overstepped one word. */
-		}
-		if(codepoint < 0x80) *p++ = (unsigned char) codepoint;
-		else if(codepoint < 0x800)
-		{
-			*p++ = (unsigned char) (0xc0 | (codepoint>>6));
-			*p++ = (unsigned char) (0x80 | (codepoint & 0x3f));
-		}
-		else if(codepoint < 0x10000)
-		{
-			*p++ = (unsigned char) (0xe0 | (codepoint>>12));
-			*p++ = 0x80 | ((codepoint>>6) & 0x3f);
-			*p++ = 0x80 | (codepoint & 0x3f);
-		}
-		else if (codepoint < 0x200000) 
-		{
-			*p++ = (unsigned char) (0xf0 | codepoint>>18);
-			*p++ = (unsigned char) (0x80 | ((codepoint>>12) & 0x3f));
-			*p++ = (unsigned char) (0x80 | ((codepoint>>6) & 0x3f));
-			*p++ = (unsigned char) (0x80 | (codepoint & 0x3f));
-		} /* ignore bigger ones (that are not possible here anyway) */
-	}
-	sb->p[sb->size-1] = 0; /* paranoia... */
-	sb->fill = sb->size;
-}
-#undef UTF8LEN
-#undef FULLPOINT
-
-static void convert_utf8(mpg123_string *sb, const unsigned char* source, size_t len, const int noquiet)
-{
-	if(mpg123_resize_string(sb, len+1))
-	{
-		memcpy(sb->p, source, len);
-		sb->p[len] = 0;
-		sb->fill = len+1;
-	}
-	else mpg123_free_string(sb);
-}
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/id3.h Deleted

@@ -1,43 +0,0 @@
-/*
-	id3: ID3v2.3 and ID3v2.4 parsing (a relevant subset)
-
-	copyright 2006-2007 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis
-*/
-
-#ifndef MPG123_ID3_H
-#define MPG123_ID3_H
-
-/* really need it _here_! */
-#include "frame.h"
-
-#ifdef NO_ID3V2
-# ifdef init_id3
-#  undef init_id3
-# endif
-# define init_id3(fr)
-# ifdef exit_id3
-#  undef exit_id3
-# endif
-# define exit_id3(fr)
-# ifdef reset_id3
-#  undef reset_id3
-# endif
-# define reset_id3(fr)
-# ifdef id3_link
-#  undef id3_link
-# endif
-# define id3_link(fr)
-#else
-void init_id3(mpg123_handle *fr);
-void exit_id3(mpg123_handle *fr);
-void reset_id3(mpg123_handle *fr);
-void id3_link(mpg123_handle *fr);
-#endif
-int  parse_new_id3(mpg123_handle *fr, unsigned long first4bytes);
-/* Convert text from some ID3 encoding to UTf-8.
-   On error, sb->fill is 0. The noquiet flag enables warning/error messages. */
-void id3_to_utf8(mpg123_string *sb, unsigned char encoding, const unsigned char *source, size_t source_size, int noquiet);
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/index.c Deleted

@@ -1,134 +0,0 @@
-/*
-	index: frame index data structure and functions
-
-	copyright 2007-8 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis
-*/
-
-#include "index.h"
-#include "debug.h"
-
-/* The next expected frame offset, one step ahead. */
-static off_t fi_next(struct frame_index *fi)
-{
-	return (off_t)fi->fill*fi->step;
-}
-
-/* Shrink down the used index to the half.
- Be careful with size = 1 ... there's no shrinking possible there. */
-static void fi_shrink(struct frame_index *fi)
-{
-	if(fi->fill < 2) return; /* Won't shrink below 1. */
-	else
-	{ /* Double the step, half the fill. Should work as well for fill%2 = 1 */
-		size_t c;
-		debug2("shrink index with fill %lu and step %lu", (unsigned long)fi->fill, (unsigned long)fi->step);
-		fi->step *= 2;
-		fi->fill /= 2;
-		/* Move the data down. */
-		for(c = 0; c < fi->fill; ++c)
-		fi->data[c] = fi->data[2*c];
-	}
-
-	fi->next = fi_next(fi);
-}
-
-void fi_init(struct frame_index *fi)
-{
-	fi->data = NULL;
-	fi->step = 1;
-	fi->fill = 0;
-	fi->size = 0;
-	fi->grow_size = 0;
-	fi->next = fi_next(fi);
-}
-
-void fi_exit(struct frame_index *fi)
-{
-	debug2("fi_exit: %p and %lu", (void*)fi->data, (unsigned long)fi->size);
-	if(fi->size && fi->data != NULL) free(fi->data);
-
-	fi_init(fi); /* Be prepared for further fun, still. */
-}
-
-int fi_resize(struct frame_index *fi, size_t newsize)
-{
-	off_t *newdata = NULL;
-	if(newsize == fi->size) return 0;
-
-	if(newsize > 0 && newsize < fi->size)
-	{ /* When we reduce buffer size a bit, shrink stuff. */
-		while(fi->fill > newsize){ fi_shrink(fi); }
-	}
-
-	newdata = safe_realloc(fi->data, newsize*sizeof(off_t));
-	if(newsize == 0 || newdata != NULL)
-	{
-		fi->data = newdata;
-		fi->size = newsize;
-		if(fi->fill > fi->size) fi->fill = fi->size;
-
-		fi->next = fi_next(fi);
-		debug2("new index of size %lu at %p", (unsigned long)fi->size, (void*)fi->data);
-		return 0;
-	}
-	else
-	{
-		error("failed to resize index!");
-		return -1;
-	}
-}
-
-void fi_add(struct frame_index *fi, off_t pos)
-{
-	debug3("wanting to add to fill %lu, step %lu, size %lu", (unsigned long)fi->fill, (unsigned long)fi->step, (unsigned long)fi->size);
-	if(fi->fill == fi->size)
-	{ /* Index is full, we need to shrink... or grow. */
-		/* Store the current frame number to check later if we still want it. */
-		off_t framenum = fi->fill*fi->step;
-		/* If we want not / cannot grow, we shrink. */	
-		if( !(fi->grow_size && fi_resize(fi, fi->size+fi->grow_size)==0) )
-		fi_shrink(fi);
-
-		/* Now check if we still want to add this frame (could be that not, because of changed step). */
-		if(fi->next != framenum) return;
-	}
-	/* When we are here, we want that frame. */
-	if(fi->fill < fi->size) /* safeguard for size=1, or just generally */
-	{
-		debug1("adding to index at %p", (void*)(fi->data+fi->fill));
-		fi->data[fi->fill] = pos;
-		++fi->fill;
-		fi->next = fi_next(fi);
-		debug3("added pos %li to index with fill %lu and step %lu", (long) pos, (unsigned long)fi->fill, (unsigned long)fi->step);
-	}
-}
-
-int fi_set(struct frame_index *fi, off_t *offsets, off_t step, size_t fill)
-{
-	if(fi_resize(fi, fill) == -1) return -1;
-	fi->step = step;
-	if(offsets != NULL)
-	{
-		memcpy(fi->data, offsets, fill*sizeof(off_t));
-		fi->fill = fill;
-	}
-	else
-	{
-		/* allocation only, no entries in index yet */
-		fi->fill = 0;
-	}
-	fi->next = fi_next(fi);
-	debug3("set new index of fill %lu, size %lu at %p",
-	(unsigned long)fi->fill, (unsigned long)fi->size, (void*)fi->data);
-	return 0;
-}
-
-void fi_reset(struct frame_index *fi)
-{
-	debug1("reset with size %"SIZE_P, (size_p)fi->size);
-	fi->fill = 0;
-	fi->step = 1;
-	fi->next = fi_next(fi);
-}

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/index.h Deleted

@@ -1,59 +0,0 @@
-#ifndef MPG123_H_INDEX
-#define MPG123_H_INDEX
-
-/*
-	index: frame index data structure and functions
-
-	This is for keeping track of frame positions for accurate seeking.
-	Now in it's own file, with initial code from frame.c and parse.c .
-
-	The idea of the index with a certain amount of entries is to cover
-	all yet-encountered frame positions with minimal coarseness.
-	Meaning: At first every frame position is recorded, then, when
-	the index is full, every second position is trown away to make
-	space. Next time it is full, the same happens. And so on.
-	In this manner we maintain a good resolution with the given
-	maximum index size while covering the whole stream.
-
-	copyright 2007-8 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis
-*/
-
-#include "config.h"
-#include "compat.h"
-
-struct frame_index
-{
-	off_t *data; /* actual data, the frame positions */
-	off_t  step; /* advancement in frame number per index point */
-	off_t  next; /* frame offset supposed to come next into the index */
-	size_t size; /* total number of possible entries */
-	size_t fill; /* number of used entries */
-	size_t grow_size; /* if > 0: index allowed to grow on need with these steps, instead of lowering resolution */
-};
-
-/* The condition for a framenum to be appended to the index. 
-  if(FI_NEXT(fr->index, fr->num)) fi_add(offset); */
-#define FI_NEXT(fi, framenum) ((fi).size && framenum == (fi).next)
-
-/* Initialize stuff, set things to zero and NULL... */
-void fi_init(struct frame_index *fi);
-/* Deallocate/zero things. */
-void fi_exit(struct frame_index *fi);
-
-/* Prepare a given size, preserving current fill, if possible.
-   If the new size is smaller than fill, the entry density is reduced.
-   Return 0 on success. */
-int fi_resize(struct frame_index *fi, size_t newsize);
-
-/* Append a frame position, reducing index density if needed. */
-void fi_add(struct frame_index *fi, off_t pos);
-
-/* Replace the frame index */
-int fi_set(struct frame_index *fi, off_t *offsets, off_t step, size_t fill);
-
-/* Empty the index (setting fill=0 and step=1), but keep current size. */
-void fi_reset(struct frame_index *fi);
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/intsym.h Deleted

@@ -1,256 +0,0 @@
-#ifndef MPG123_INTMAP_H
-#define MPG123_INTMAP_H
-/* Mapping of internal mpg123 symbols to something that is less likely to conflict in case of static linking. */
-#define COS9 INT123_COS9
-#define tfcos36 INT123_tfcos36
-#define pnts INT123_pnts
-#define safe_realloc INT123_safe_realloc
-#define compat_open INT123_compat_open
-#define compat_close INT123_compat_close
-#define win32_wide_utf8 INT123_win32_wide_utf8
-#define win32_utf8_wide INT123_win32_utf8_wide
-#define ntom_set_ntom INT123_ntom_set_ntom
-#define synth_1to1 INT123_synth_1to1
-#define synth_1to1_dither INT123_synth_1to1_dither
-#define synth_1to1_i386 INT123_synth_1to1_i386
-#define synth_1to1_i586 INT123_synth_1to1_i586
-#define synth_1to1_i586_dither INT123_synth_1to1_i586_dither
-#define synth_1to1_mmx INT123_synth_1to1_mmx
-#define synth_1to1_3dnow INT123_synth_1to1_3dnow
-#define synth_1to1_sse INT123_synth_1to1_sse
-#define synth_1to1_stereo_sse INT123_synth_1to1_stereo_sse
-#define synth_1to1_3dnowext INT123_synth_1to1_3dnowext
-#define synth_1to1_altivec INT123_synth_1to1_altivec
-#define synth_1to1_stereo_altivec INT123_synth_1to1_stereo_altivec
-#define synth_1to1_x86_64 INT123_synth_1to1_x86_64
-#define synth_1to1_stereo_x86_64 INT123_synth_1to1_stereo_x86_64
-#define synth_1to1_arm INT123_synth_1to1_arm
-#define synth_1to1_neon INT123_synth_1to1_neon
-#define synth_1to1_stereo_neon INT123_synth_1to1_stereo_neon
-#define absynth_1to1_i486 INT123_absynth_1to1_i486
-#define synth_1to1_mono INT123_synth_1to1_mono
-#define synth_1to1_m2s INT123_synth_1to1_m2s
-#define synth_2to1 INT123_synth_2to1
-#define synth_2to1_dither INT123_synth_2to1_dither
-#define synth_2to1_i386 INT123_synth_2to1_i386
-#define synth_2to1_mono INT123_synth_2to1_mono
-#define synth_2to1_m2s INT123_synth_2to1_m2s
-#define synth_4to1 INT123_synth_4to1
-#define synth_4to1_dither INT123_synth_4to1_dither
-#define synth_4to1_i386 INT123_synth_4to1_i386
-#define synth_4to1_mono INT123_synth_4to1_mono
-#define synth_4to1_m2s INT123_synth_4to1_m2s
-#define synth_ntom INT123_synth_ntom
-#define synth_ntom_mono INT123_synth_ntom_mono
-#define synth_ntom_m2s INT123_synth_ntom_m2s
-#define synth_1to1_8bit INT123_synth_1to1_8bit
-#define synth_1to1_8bit_i386 INT123_synth_1to1_8bit_i386
-#define synth_1to1_8bit_wrap INT123_synth_1to1_8bit_wrap
-#define synth_1to1_8bit_mono INT123_synth_1to1_8bit_mono
-#define synth_1to1_8bit_m2s INT123_synth_1to1_8bit_m2s
-#define synth_1to1_8bit_wrap_mono INT123_synth_1to1_8bit_wrap_mono
-#define synth_1to1_8bit_wrap_m2s INT123_synth_1to1_8bit_wrap_m2s
-#define synth_2to1_8bit INT123_synth_2to1_8bit
-#define synth_2to1_8bit_i386 INT123_synth_2to1_8bit_i386
-#define synth_2to1_8bit_mono INT123_synth_2to1_8bit_mono
-#define synth_2to1_8bit_m2s INT123_synth_2to1_8bit_m2s
-#define synth_4to1_8bit INT123_synth_4to1_8bit
-#define synth_4to1_8bit_i386 INT123_synth_4to1_8bit_i386
-#define synth_4to1_8bit_mono INT123_synth_4to1_8bit_mono
-#define synth_4to1_8bit_m2s INT123_synth_4to1_8bit_m2s
-#define synth_ntom_8bit INT123_synth_ntom_8bit
-#define synth_ntom_8bit_mono INT123_synth_ntom_8bit_mono
-#define synth_ntom_8bit_m2s INT123_synth_ntom_8bit_m2s
-#define synth_1to1_real INT123_synth_1to1_real
-#define synth_1to1_real_i386 INT123_synth_1to1_real_i386
-#define synth_1to1_real_sse INT123_synth_1to1_real_sse
-#define synth_1to1_real_stereo_sse INT123_synth_1to1_real_stereo_sse
-#define synth_1to1_real_x86_64 INT123_synth_1to1_real_x86_64
-#define synth_1to1_real_stereo_x86_64 INT123_synth_1to1_real_stereo_x86_64
-#define synth_1to1_real_altivec INT123_synth_1to1_real_altivec
-#define synth_1to1_real_stereo_altivec INT123_synth_1to1_real_stereo_altivec
-#define synth_1to1_real_neon INT123_synth_1to1_real_neon
-#define synth_1to1_real_stereo_neon INT123_synth_1to1_real_stereo_neon
-#define synth_1to1_real_mono INT123_synth_1to1_real_mono
-#define synth_1to1_real_m2s INT123_synth_1to1_real_m2s
-#define synth_2to1_real INT123_synth_2to1_real
-#define synth_2to1_real_i386 INT123_synth_2to1_real_i386
-#define synth_2to1_real_mono INT123_synth_2to1_real_mono
-#define synth_2to1_real_m2s INT123_synth_2to1_real_m2s
-#define synth_4to1_real INT123_synth_4to1_real
-#define synth_4to1_real_i386 INT123_synth_4to1_real_i386
-#define synth_4to1_real_mono INT123_synth_4to1_real_mono
-#define synth_4to1_real_m2s INT123_synth_4to1_real_m2s
-#define synth_ntom_real INT123_synth_ntom_real
-#define synth_ntom_real_mono INT123_synth_ntom_real_mono
-#define synth_ntom_real_m2s INT123_synth_ntom_real_m2s
-#define synth_1to1_s32 INT123_synth_1to1_s32
-#define synth_1to1_s32_i386 INT123_synth_1to1_s32_i386
-#define synth_1to1_s32_sse INT123_synth_1to1_s32_sse
-#define synth_1to1_s32_stereo_sse INT123_synth_1to1_s32_stereo_sse
-#define synth_1to1_s32_x86_64 INT123_synth_1to1_s32_x86_64
-#define synth_1to1_s32_stereo_x86_64 INT123_synth_1to1_s32_stereo_x86_64
-#define synth_1to1_s32_altivec INT123_synth_1to1_s32_altivec
-#define synth_1to1_s32_stereo_altivec INT123_synth_1to1_s32_stereo_altivec
-#define synth_1to1_s32_neon INT123_synth_1to1_s32_neon
-#define synth_1to1_s32_stereo_neon INT123_synth_1to1_s32_stereo_neon
-#define synth_1to1_s32_mono INT123_synth_1to1_s32_mono
-#define synth_1to1_s32_m2s INT123_synth_1to1_s32_m2s
-#define synth_2to1_s32 INT123_synth_2to1_s32
-#define synth_2to1_s32_i386 INT123_synth_2to1_s32_i386
-#define synth_2to1_s32_mono INT123_synth_2to1_s32_mono
-#define synth_2to1_s32_m2s INT123_synth_2to1_s32_m2s
-#define synth_4to1_s32 INT123_synth_4to1_s32
-#define synth_4to1_s32_i386 INT123_synth_4to1_s32_i386
-#define synth_4to1_s32_mono INT123_synth_4to1_s32_mono
-#define synth_4to1_s32_m2s INT123_synth_4to1_s32_m2s
-#define synth_ntom_s32 INT123_synth_ntom_s32
-#define synth_ntom_s32_mono INT123_synth_ntom_s32_mono
-#define synth_ntom_s32_m2s INT123_synth_ntom_s32_m2s
-#define dct64 INT123_dct64
-#define dct64_i386 INT123_dct64_i386
-#define dct64_altivec INT123_dct64_altivec
-#define dct64_i486 INT123_dct64_i486
-#define dct36 INT123_dct36
-#define dct36_3dnow INT123_dct36_3dnow
-#define dct36_3dnowext INT123_dct36_3dnowext
-#define synth_ntom_set_step INT123_synth_ntom_set_step
-#define ntom_val INT123_ntom_val
-#define ntom_frame_outsamples INT123_ntom_frame_outsamples
-#define ntom_frmouts INT123_ntom_frmouts
-#define ntom_ins2outs INT123_ntom_ins2outs
-#define ntom_frameoff INT123_ntom_frameoff
-#define init_layer3 INT123_init_layer3
-#define init_layer3_gainpow2 INT123_init_layer3_gainpow2
-#define init_layer3_stuff INT123_init_layer3_stuff
-#define init_layer12 INT123_init_layer12
-#define init_layer12_table INT123_init_layer12_table
-#define init_layer12_stuff INT123_init_layer12_stuff
-#define prepare_decode_tables INT123_prepare_decode_tables
-#define make_decode_tables INT123_make_decode_tables
-#define make_decode_tables_mmx INT123_make_decode_tables_mmx
-#define init_layer3_gainpow2_mmx INT123_init_layer3_gainpow2_mmx
-#define init_layer12_table_mmx INT123_init_layer12_table_mmx
-#define make_conv16to8_table INT123_make_conv16to8_table
-#define do_layer3 INT123_do_layer3
-#define do_layer2 INT123_do_layer2
-#define do_layer1 INT123_do_layer1
-#define do_equalizer INT123_do_equalizer
-#define dither_table_init INT123_dither_table_init
-#define frame_dither_init INT123_frame_dither_init
-#define invalidate_format INT123_invalidate_format
-#define frame_init INT123_frame_init
-#define frame_init_par INT123_frame_init_par
-#define frame_outbuffer INT123_frame_outbuffer
-#define frame_output_format INT123_frame_output_format
-#define frame_buffers INT123_frame_buffers
-#define frame_reset INT123_frame_reset
-#define frame_buffers_reset INT123_frame_buffers_reset
-#define frame_exit INT123_frame_exit
-#define frame_index_find INT123_frame_index_find
-#define frame_index_setup INT123_frame_index_setup
-#define do_volume INT123_do_volume
-#define do_rva INT123_do_rva
-#define frame_gapless_init INT123_frame_gapless_init
-#define frame_gapless_realinit INT123_frame_gapless_realinit
-#define frame_gapless_update INT123_frame_gapless_update
-#define frame_gapless_bytify INT123_frame_gapless_bytify
-#define frame_gapless_ignore INT123_frame_gapless_ignore
-#define frame_expect_outsamples INT123_frame_expect_outsamples
-#define frame_skip INT123_frame_skip
-#define frame_ins2outs INT123_frame_ins2outs
-#define frame_outs INT123_frame_outs
-#define frame_expect_outsampels INT123_frame_expect_outsampels
-#define frame_offset INT123_frame_offset
-#define frame_set_frameseek INT123_frame_set_frameseek
-#define frame_set_seek INT123_frame_set_seek
-#define frame_tell_seek INT123_frame_tell_seek
-#define frame_fill_toc INT123_frame_fill_toc
-#define getbits INT123_getbits
-#define getcpuflags INT123_getcpuflags
-#define icy2utf8 INT123_icy2utf8
-#define init_icy INT123_init_icy
-#define clear_icy INT123_clear_icy
-#define reset_icy INT123_reset_icy
-#define init_id3 INT123_init_id3
-#define exit_id3 INT123_exit_id3
-#define reset_id3 INT123_reset_id3
-#define id3_link INT123_id3_link
-#define parse_new_id3 INT123_parse_new_id3
-#define id3_to_utf8 INT123_id3_to_utf8
-#define fi_init INT123_fi_init
-#define fi_exit INT123_fi_exit
-#define fi_resize INT123_fi_resize
-#define fi_add INT123_fi_add
-#define fi_set INT123_fi_set
-#define fi_reset INT123_fi_reset
-#define double_to_long_rounded INT123_double_to_long_rounded
-#define scale_rounded INT123_scale_rounded
-#define decode_update INT123_decode_update
-#define samples_to_bytes INT123_samples_to_bytes
-#define bytes_to_samples INT123_bytes_to_samples
-#define frame_cpu_opt INT123_frame_cpu_opt
-#define set_synth_functions INT123_set_synth_functions
-#define dectype INT123_dectype
-#define defdec INT123_defdec
-#define decclass INT123_decclass
-#define check_decoders INT123_check_decoders
-#define read_frame_init INT123_read_frame_init
-#define frame_bitrate INT123_frame_bitrate
-#define frame_freq INT123_frame_freq
-#define read_frame_recover INT123_read_frame_recover
-#define read_frame INT123_read_frame
-#define set_pointer INT123_set_pointer
-#define position_info INT123_position_info
-#define compute_bpf INT123_compute_bpf
-#define time_to_frame INT123_time_to_frame
-#define get_songlen INT123_get_songlen
-#define open_stream INT123_open_stream
-#define open_stream_handle INT123_open_stream_handle
-#define open_feed INT123_open_feed
-#define feed_more INT123_feed_more
-#define feed_forget INT123_feed_forget
-#define feed_set_pos INT123_feed_set_pos
-#define open_bad INT123_open_bad
-#define dct64_3dnow INT123_dct64_3dnow
-#define dct64_3dnowext INT123_dct64_3dnowext
-#define dct64_mmx INT123_dct64_mmx
-#define dct64_MMX INT123_dct64_MMX
-#define dct64_sse INT123_dct64_sse
-#define dct64_real_sse INT123_dct64_real_sse
-#define dct64_x86_64 INT123_dct64_x86_64
-#define dct64_real_x86_64 INT123_dct64_real_x86_64
-#define dct64_neon INT123_dct64_neon
-#define dct64_real_neon INT123_dct64_real_neon
-#define do_equalizer_3dnow INT123_do_equalizer_3dnow
-#define synth_1to1_3dnow_asm INT123_synth_1to1_3dnow_asm
-#define synth_1to1_arm_asm INT123_synth_1to1_arm_asm
-#define synth_1to1_arm_accurate_asm INT123_synth_1to1_arm_accurate_asm
-#define synth_1to1_i586_asm INT123_synth_1to1_i586_asm
-#define synth_1to1_i586_asm_dither INT123_synth_1to1_i586_asm_dither
-#define synth_1to1_MMX INT123_synth_1to1_MMX
-#define synth_1to1_sse_accurate_asm INT123_synth_1to1_sse_accurate_asm
-#define synth_1to1_real_sse_asm INT123_synth_1to1_real_sse_asm
-#define synth_1to1_s32_sse_asm INT123_synth_1to1_s32_sse_asm
-#define synth_1to1_s_sse_accurate_asm INT123_synth_1to1_s_sse_accurate_asm
-#define synth_1to1_real_s_sse_asm INT123_synth_1to1_real_s_sse_asm
-#define synth_1to1_s32_s_sse_asm INT123_synth_1to1_s32_s_sse_asm
-#define synth_1to1_s_x86_64_asm INT123_synth_1to1_s_x86_64_asm
-#define synth_1to1_s_x86_64_accurate_asm INT123_synth_1to1_s_x86_64_accurate_asm
-#define synth_1to1_real_s_x86_64_asm INT123_synth_1to1_real_s_x86_64_asm
-#define synth_1to1_s32_s_x86_64_asm INT123_synth_1to1_s32_s_x86_64_asm
-#define synth_1to1_x86_64_asm INT123_synth_1to1_x86_64_asm
-#define synth_1to1_x86_64_accurate_asm INT123_synth_1to1_x86_64_accurate_asm
-#define synth_1to1_real_x86_64_asm INT123_synth_1to1_real_x86_64_asm
-#define synth_1to1_s32_x86_64_asm INT123_synth_1to1_s32_x86_64_asm
-#define synth_1to1_neon_asm INT123_synth_1to1_neon_asm
-#define synth_1to1_neon_accurate_asm INT123_synth_1to1_neon_accurate_asm
-#define synth_1to1_real_neon_asm INT123_synth_1to1_real_neon_asm
-#define synth_1to1_s32_neon_asm INT123_synth_1to1_s32_neon_asm
-#define synth_1to1_s_neon_asm INT123_synth_1to1_s_neon_asm
-#define synth_1to1_s_neon_accurate_asm INT123_synth_1to1_s_neon_accurate_asm
-#define synth_1to1_real_s_neon_asm INT123_synth_1to1_real_s_neon_asm
-#define synth_1to1_s32_s_neon_asm INT123_synth_1to1_s32_s_neon_asm
-#define costab_mmxsse INT123_costab_mmxsse
-#define make_decode_tables_mmx_asm INT123_make_decode_tables_mmx_asm
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/l12_integer_tables.h Deleted

@@ -1,278 +0,0 @@
-/*
-	l12_integer_tables.h: Layer1/2 Constant tables for integer decoders
-
-	copyright 1995-2009 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Taihei Monma
-*/
-
-#ifndef MPG123_L12_INTEGER_TABLES_H
-#define MPG123_L12_INTEGER_TABLES_H
-
-static const real layer12_table[27][64] =
-{
-	{
-	},
-	{
-		-1431655765,-1136305934,-901886617,-715827883,-568152967,-450943309,-357913941,-284076483,
-		-225471654,-178956971,-142038242,-112735827,-89478485,-71019121,-56367914,-44739243,
-		-35509560,-28183957,-22369621,-17754780,-14091978,-11184811,-8877390,-7045989,
-		-5592405,-4438695,-3522995,-2796203,-2219348,-1761497,-1398101,-1109674,
-		-880749,-699051,-554837,-440374,-349525,-277418,-220187,-174763,
-		-138709,-110094,-87381,-69355,-55047,-43691,-34677,-27523,
-		-21845,-17339,-13762,-10923,-8669,-6881,-5461,-4335,
-		-3440,-2731,-2167,-1720,-1365,-1084,-860,0
-	},
-	{
-		1431655765,1136305934,901886617,715827883,568152967,450943309,357913941,284076483,
-		225471654,178956971,142038242,112735827,89478485,71019121,56367914,44739243,
-		35509560,28183957,22369621,17754780,14091978,11184811,8877390,7045989,
-		5592405,4438695,3522995,2796203,2219348,1761497,1398101,1109674,
-		880749,699051,554837,440374,349525,277418,220187,174763,
-		138709,110094,87381,69355,55047,43691,34677,27523,
-		21845,17339,13762,10923,8669,6881,5461,4335,
-		3440,2731,2167,1720,1365,1084,860,0
-	},
-	{
-		613566757,486988257,386522836,306783378,243494129,193261418,153391689,121747064,
-		96630709,76695845,60873532,48315355,38347922,30436766,24157677,19173961,
-		15218383,12078839,9586981,7609192,6039419,4793490,3804596,3019710,
-		2396745,1902298,1509855,1198373,951149,754927,599186,475574,
-		377464,299593,237787,188732,149797,118894,94366,74898,
-		59447,47183,37449,29723,23591,18725,14862,11796,
-		9362,7431,5898,4681,3715,2949,2341,1858,
-		1474,1170,929,737,585,464,369,0
-	},
-	{
-		286331153,227261187,180377323,143165577,113630593,90188662,71582788,56815297,
-		45094331,35791394,28407648,22547165,17895697,14203824,11273583,8947849,
-		7101912,5636791,4473924,3550956,2818396,2236962,1775478,1409198,
-		1118481,887739,704599,559241,443870,352299,279620,221935,
-		176150,139810,110967,88075,69905,55484,44037,34953,
-		27742,22019,17476,13871,11009,8738,6935,5505,
-		4369,3468,2752,2185,1734,1376,1092,867,
-		688,546,433,344,273,217,172,0
-	},
-	{
-		138547332,109965090,87279350,69273666,54982545,43639675,34636833,27491273,
-		21819838,17318417,13745636,10909919,8659208,6872818,5454959,4329604,
-		3436409,2727480,2164802,1718205,1363740,1082401,859102,681870,
-		541201,429551,340935,270600,214776,170467,135300,107388,
-		85234,67650,53694,42617,33825,26847,21308,16913,
-		13423,10654,8456,6712,5327,4228,3356,2664,
-		2114,1678,1332,1057,839,666,529,419,
-		333,264,210,166,132,105,83,0
-	},
-	{
-		68174084,54109806,42946982,34087042,27054903,21473491,17043521,13527452,
-		10736745,8521761,6763726,5368373,4260880,3381863,2684186,2130440,
-		1690931,1342093,1065220,845466,671047,532610,422733,335523,
-		266305,211366,167762,133153,105683,83881,66576,52842,
-		41940,33288,26421,20970,16644,13210,10485,8322,
-		6605,5243,4161,3303,2621,2081,1651,1311,
-		1040,826,655,520,413,328,260,206,
-		164,130,103,82,65,52,41,0
-	},
-	{
-		33818640,26841872,21304408,16909320,13420936,10652204,8454660,6710468,
-		5326102,4227330,3355234,2663051,2113665,1677617,1331526,1056833,
-		838809,665763,528416,419404,332881,264208,209702,166441,
-		132104,104851,83220,66052,52426,41610,33026,26213,
-		20805,16513,13106,10403,8257,6553,5201,4128,
-		3277,2601,2064,1638,1300,1032,819,650,
-		516,410,325,258,205,163,129,102,
-		81,65,51,41,32,26,20,0
-	},
-	{
-		16843009,13368305,10610431,8421505,6684153,5305215,4210752,3342076,
-		2652608,2105376,1671038,1326304,1052688,835519,663152,526344,
-		417760,331576,263172,208880,165788,131586,104440,82894,
-		65793,52220,41447,32897,26110,20723,16448,13055,
-		10362,8224,6527,5181,4112,3264,2590,2056,
-		1632,1295,1028,816,648,514,408,324,
-		257,204,162,129,102,81,64,51,
-		40,32,25,20,16,13,10,0
-	},
-	{
-		8405024,6671072,5294833,4202512,3335536,2647417,2101256,1667768,
-		1323708,1050628,833884,661854,525314,416942,330927,262657,
-		208471,165464,131329,104236,82732,65664,52118,41366,
-		32832,26059,20683,16416,13029,10341,8208,6515,
-		5171,4104,3257,2585,2052,1629,1293,1026,
-		814,646,513,407,323,257,204,162,
-		128,102,81,64,51,40,32,25,
-		20,16,13,10,8,6,5,0
-	},
-	{
-		4198404,3332275,2644829,2099202,1666138,1322414,1049601,833069,
-		661207,524801,416534,330604,262400,208267,165302,131200,
-		104134,82651,65600,52067,41325,32800,26033,20663,
-		16400,13017,10331,8200,6508,5166,4100,3254,
-		2583,2050,1627,1291,1025,814,646,513,
-		407,323,256,203,161,128,102,81,
-		64,51,40,32,25,20,16,13,
-		10,8,6,5,4,3,3,0
-	},
-	{
-		2098177,1665324,1321768,1049088,832662,660884,524544,416331,
-		330442,262272,208165,165221,131136,104083,82611,65568,
-		52041,41305,32784,26021,20653,16392,13010,10326,
-		8196,6505,5163,4098,3253,2582,2049,1626,
-		1291,1025,813,645,512,407,323,256,
-		203,161,128,102,81,64,51,40,
-		32,25,20,16,13,10,8,6,
-		5,4,3,3,2,2,1,0
-	},
-	{
-		1048832,832459,660723,524416,416229,330361,262208,208115,
-		165181,131104,104057,82590,65552,52029,41295,32776,
-		26014,20648,16388,13007,10324,8194,6504,5162,
-		4097,3252,2581,2049,1626,1290,1024,813,
-		645,512,406,323,256,203,161,128,
-		102,81,64,51,40,32,25,20,
-		16,13,10,8,6,5,4,3,
-		3,2,2,1,1,1,1,0
-	},
-	{
-		524352,416178,330321,262176,208089,165161,131088,104045,
-		82580,65544,52022,41290,32772,26011,20645,16386,
-		13006,10323,8193,6503,5161,4097,3251,2581,
-		2048,1626,1290,1024,813,645,512,406,
-		323,256,203,161,128,102,81,64,
-		51,40,32,25,20,16,13,10,
-		8,6,5,4,3,3,2,2,
-		1,1,1,1,1,0,0,0
-	},
-	{
-		262160,208077,165150,131080,104038,82575,65540,52019,
-		41288,32770,26010,20644,16385,13005,10322,8193,
-		6502,5161,4096,3251,2580,2048,1626,1290,
-		1024,813,645,512,406,323,256,203,
-		161,128,102,81,64,51,40,32,
-		25,20,16,13,10,8,6,5,
-		4,3,3,2,2,1,1,1,
-		1,1,0,0,0,0,0,0
-	},
-	{
-		131076,104035,82573,65538,52018,41286,32769,26009,
-		20643,16385,13004,10322,8192,6502,5161,4096,
-		3251,2580,2048,1626,1290,1024,813,645,
-		512,406,323,256,203,161,128,102,
-		81,64,51,40,32,25,20,16,
-		13,10,8,6,5,4,3,3,
-		2,2,1,1,1,1,1,0,
-		0,0,0,0,0,0,0,0
-	},
-	{
-		65537,52017,41286,32769,26008,20643,16384,13004,
-		10321,8192,6502,5161,4096,3251,2580,2048,
-		1626,1290,1024,813,645,512,406,323,
-		256,203,161,128,102,81,64,51,
-		40,32,25,20,16,13,10,8,
-		6,5,4,3,3,2,2,1,
-		1,1,1,1,0,0,0,0,
-		0,0,0,0,0,0,0,0
-	},
-	{
-		-1717986918,-1363567121,-1082263941,-858993459,-681783560,-541131970,-429496730,-340891780,
-		-270565985,-214748365,-170445890,-135282993,-107374182,-85222945,-67641496,-53687091,
-		-42611473,-33820748,-26843546,-21305736,-16910374,-13421773,-10652868,-8455187,
-		-6710886,-5326434,-4227594,-3355443,-2663217,-2113797,-1677722,-1331609,
-		-1056898,-838861,-665804,-528449,-419430,-332902,-264225,-209715,
-		-166451,-132112,-104858,-83226,-66056,-52429,-41613,-33028,
-		-26214,-20806,-16514,-13107,-10403,-8257,-6554,-5202,
-		-4129,-3277,-2601,-2064,-1638,-1300,-1032,0
-	},
-	{
-		-858993459,-681783560,-541131970,-429496730,-340891780,-270565985,-214748365,-170445890,
-		-135282993,-107374182,-85222945,-67641496,-53687091,-42611473,-33820748,-26843546,
-		-21305736,-16910374,-13421773,-10652868,-8455187,-6710886,-5326434,-4227594,
-		-3355443,-2663217,-2113797,-1677722,-1331609,-1056898,-838861,-665804,
-		-528449,-419430,-332902,-264225,-209715,-166451,-132112,-104858,
-		-83226,-66056,-52429,-41613,-33028,-26214,-20806,-16514,
-		-13107,-10403,-8257,-6554,-5202,-4129,-3277,-2601,
-		-2064,-1638,-1300,-1032,-819,-650,-516,0
-	},
-	{
-		858993459,681783560,541131970,429496730,340891780,270565985,214748365,170445890,
-		135282993,107374182,85222945,67641496,53687091,42611473,33820748,26843546,
-		21305736,16910374,13421773,10652868,8455187,6710886,5326434,4227594,
-		3355443,2663217,2113797,1677722,1331609,1056898,838861,665804,
-		528449,419430,332902,264225,209715,166451,132112,104858,
-		83226,66056,52429,41613,33028,26214,20806,16514,
-		13107,10403,8257,6554,5202,4129,3277,2601,
-		2064,1638,1300,1032,819,650,516,0
-	},
-	{
-		1717986918,1363567121,1082263941,858993459,681783560,541131970,429496730,340891780,
-		270565985,214748365,170445890,135282993,107374182,85222945,67641496,53687091,
-		42611473,33820748,26843546,21305736,16910374,13421773,10652868,8455187,
-		6710886,5326434,4227594,3355443,2663217,2113797,1677722,1331609,
-		1056898,838861,665804,528449,419430,332902,264225,209715,
-		166451,132112,104858,83226,66056,52429,41613,33028,
-		26214,20806,16514,13107,10403,8257,6554,5202,
-		4129,3277,2601,2064,1638,1300,1032,0
-	},
-	{
-		-1908874354,-1515074579,-1202515490,-954437177,-757537289,-601257745,-477218588,-378768645,
-		-300628872,-238609294,-189384322,-150314436,-119304647,-94692161,-75157218,-59652324,
-		-47346081,-37578609,-29826162,-23673040,-18789305,-14913081,-11836520,-9394652,
-		-7456540,-5918260,-4697326,-3728270,-2959130,-2348663,-1864135,-1479565,
-		-1174332,-932068,-739783,-587166,-466034,-369891,-293583,-233017,
-		-184946,-146791,-116508,-92473,-73396,-58254,-46236,-36698,
-		-29127,-23118,-18349,-14564,-11559,-9174,-7282,-5780,
-		-4587,-3641,-2890,-2294,-1820,-1445,-1147,0
-	},
-	{
-		-954437177,-757537289,-601257745,-477218588,-378768645,-300628872,-238609294,-189384322,
-		-150314436,-119304647,-94692161,-75157218,-59652324,-47346081,-37578609,-29826162,
-		-23673040,-18789305,-14913081,-11836520,-9394652,-7456540,-5918260,-4697326,
-		-3728270,-2959130,-2348663,-1864135,-1479565,-1174332,-932068,-739783,
-		-587166,-466034,-369891,-293583,-233017,-184946,-146791,-116508,
-		-92473,-73396,-58254,-46236,-36698,-29127,-23118,-18349,
-		-14564,-11559,-9174,-7282,-5780,-4587,-3641,-2890,
-		-2294,-1820,-1445,-1147,-910,-722,-573,0
-	},
-	{
-		-477218588,-378768645,-300628872,-238609294,-189384322,-150314436,-119304647,-94692161,
-		-75157218,-59652324,-47346081,-37578609,-29826162,-23673040,-18789305,-14913081,
-		-11836520,-9394652,-7456540,-5918260,-4697326,-3728270,-2959130,-2348663,
-		-1864135,-1479565,-1174332,-932068,-739783,-587166,-466034,-369891,
-		-293583,-233017,-184946,-146791,-116508,-92473,-73396,-58254,
-		-46236,-36698,-29127,-23118,-18349,-14564,-11559,-9174,
-		-7282,-5780,-4587,-3641,-2890,-2294,-1820,-1445,
-		-1147,-910,-722,-573,-455,-361,-287,0
-	},
-	{
-		477218588,378768645,300628872,238609294,189384322,150314436,119304647,94692161,
-		75157218,59652324,47346081,37578609,29826162,23673040,18789305,14913081,
-		11836520,9394652,7456540,5918260,4697326,3728270,2959130,2348663,
-		1864135,1479565,1174332,932068,739783,587166,466034,369891,
-		293583,233017,184946,146791,116508,92473,73396,58254,
-		46236,36698,29127,23118,18349,14564,11559,9174,
-		7282,5780,4587,3641,2890,2294,1820,1445,
-		1147,910,722,573,455,361,287,0
-	},
-	{
-		954437177,757537289,601257745,477218588,378768645,300628872,238609294,189384322,
-		150314436,119304647,94692161,75157218,59652324,47346081,37578609,29826162,
-		23673040,18789305,14913081,11836520,9394652,7456540,5918260,4697326,
-		3728270,2959130,2348663,1864135,1479565,1174332,932068,739783,
-		587166,466034,369891,293583,233017,184946,146791,116508,
-		92473,73396,58254,46236,36698,29127,23118,18349,
-		14564,11559,9174,7282,5780,4587,3641,2890,
-		2294,1820,1445,1147,910,722,573,0
-	},
-	{
-		1908874354,1515074579,1202515490,954437177,757537289,601257745,477218588,378768645,
-		300628872,238609294,189384322,150314436,119304647,94692161,75157218,59652324,
-		47346081,37578609,29826162,23673040,18789305,14913081,11836520,9394652,
-		7456540,5918260,4697326,3728270,2959130,2348663,1864135,1479565,
-		1174332,932068,739783,587166,466034,369891,293583,233017,
-		184946,146791,116508,92473,73396,58254,46236,36698,
-		29127,23118,18349,14564,11559,9174,7282,5780,
-		4587,3641,2890,2294,1820,1445,1147,0
-	},
-};
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/l2tables.h Deleted

@@ -1,164 +0,0 @@
-/*
-	l2tables.h: Layer 2 Alloc tables
-
-	copyright ?-2006 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp
-
-	most other tables are calculated on program start (which is (of course)	not ISO-conform)
-	Layer-3 huffman table is in huffman.h
-*/
-
-
-#ifndef _MPG123_L2TABLES_H_
-#define _MPG123_L2TABLES_H_
-
-static const struct al_table alloc_0[] = {
-	{4,0},{5,3},{3,-3},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},{9,-255},{10,-511},
-	{11,-1023},{12,-2047},{13,-4095},{14,-8191},{15,-16383},{16,-32767},
-	{4,0},{5,3},{3,-3},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},{9,-255},{10,-511},
-	{11,-1023},{12,-2047},{13,-4095},{14,-8191},{15,-16383},{16,-32767},
-	{4,0},{5,3},{3,-3},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},{9,-255},{10,-511},
-	{11,-1023},{12,-2047},{13,-4095},{14,-8191},{15,-16383},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{2,0},{5,3},{7,5},{16,-32767},
-	{2,0},{5,3},{7,5},{16,-32767},
-	{2,0},{5,3},{7,5},{16,-32767},
-	{2,0},{5,3},{7,5},{16,-32767} };
-
-static const struct al_table alloc_1[] = {
-	{4,0},{5,3},{3,-3},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},{9,-255},{10,-511},
-	{11,-1023},{12,-2047},{13,-4095},{14,-8191},{15,-16383},{16,-32767},
-	{4,0},{5,3},{3,-3},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},{9,-255},{10,-511},
-	{11,-1023},{12,-2047},{13,-4095},{14,-8191},{15,-16383},{16,-32767},
-	{4,0},{5,3},{3,-3},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},{9,-255},{10,-511},
-	{11,-1023},{12,-2047},{13,-4095},{14,-8191},{15,-16383},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-	{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{3,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{16,-32767},
-	{2,0},{5,3},{7,5},{16,-32767},
-	{2,0},{5,3},{7,5},{16,-32767},
-	{2,0},{5,3},{7,5},{16,-32767},
-	{2,0},{5,3},{7,5},{16,-32767},
-	{2,0},{5,3},{7,5},{16,-32767},
-	{2,0},{5,3},{7,5},{16,-32767},
-	{2,0},{5,3},{7,5},{16,-32767} };
-
-static const struct al_table alloc_2[] = {
-	{4,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},{9,-255},
-	{10,-511},{11,-1023},{12,-2047},{13,-4095},{14,-8191},{15,-16383},
-	{4,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},{9,-255},
-	{10,-511},{11,-1023},{12,-2047},{13,-4095},{14,-8191},{15,-16383},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63} };
-
-static const struct al_table alloc_3[] = {
-	{4,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},{9,-255},
-	{10,-511},{11,-1023},{12,-2047},{13,-4095},{14,-8191},{15,-16383},
-	{4,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},{9,-255},
-	{10,-511},{11,-1023},{12,-2047},{13,-4095},{14,-8191},{15,-16383},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63} };
-
-static const struct al_table alloc_4[] = {
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-		{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{14,-8191},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-		{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{14,-8191},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-		{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{14,-8191},
-	{4,0},{5,3},{7,5},{3,-3},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},{8,-127},
-		{9,-255},{10,-511},{11,-1023},{12,-2047},{13,-4095},{14,-8191},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{3,0},{5,3},{7,5},{10,9},{4,-7},{5,-15},{6,-31},{7,-63},
-	{2,0},{5,3},{7,5},{10,9},
-	{2,0},{5,3},{7,5},{10,9},
-	{2,0},{5,3},{7,5},{10,9},
-	{2,0},{5,3},{7,5},{10,9},
-	{2,0},{5,3},{7,5},{10,9},
-	{2,0},{5,3},{7,5},{10,9},
-	{2,0},{5,3},{7,5},{10,9},
-	{2,0},{5,3},{7,5},{10,9},
-	{2,0},{5,3},{7,5},{10,9},
-	{2,0},{5,3},{7,5},{10,9},
-	{2,0},{5,3},{7,5},{10,9},
-    {2,0},{5,3},{7,5},{10,9},
-    {2,0},{5,3},{7,5},{10,9},
-    {2,0},{5,3},{7,5},{10,9},
-    {2,0},{5,3},{7,5},{10,9},
-    {2,0},{5,3},{7,5},{10,9},
-    {2,0},{5,3},{7,5},{10,9},
-    {2,0},{5,3},{7,5},{10,9},
-    {2,0},{5,3},{7,5},{10,9}  };
-
-#endif
-

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/l3_integer_tables.h Deleted

@@ -1,1002 +0,0 @@
-/*
-	l3_integer_tables.h: Layer3 Constant tables for integer decoders
-
-	copyright 1995-2009 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Taihei Monma
-*/
-
-#ifndef MPG123_L3_INTEGER_TABLES_H
-#define MPG123_L3_INTEGER_TABLES_H
-
-#ifdef PRECALC_TABLES
-static const real ispow[8207] =
-{
-	0,8192,20643,35445,52016,70041,89315,109695,131072,153360,
-	176491,200407,225060,250408,276414,303048,330281,358087,386444,415331,
-	444730,474623,504995,535830,567116,598839,630988,663552,696521,729884,
-	763633,797760,832255,867112,902323,937880,973778,1010010,1046569,1083451,
-	1120650,1158160,1195976,1234093,1272507,1311213,1350207,1389485,1429042,1468875,
-	1508979,1549352,1589990,1630889,1672046,1713458,1755122,1797035,1839193,1881594,
-	1924236,1967115,2010229,2053576,2097152,2140956,2184985,2229238,2273710,2318402,
-	2363310,2408432,2453767,2499312,2545065,2591025,2637190,2683558,2730126,2776895,
-	2823861,2871023,2918379,2965929,3013670,3061600,3109719,3158025,3206517,3255192,
-	3304050,3353089,3402309,3451707,3501282,3551033,3600960,3651060,3701332,3751776,
-	3802390,3853172,3904123,3955241,4006524,4057972,4109583,4161357,4213293,4265389,
-	4317644,4370058,4422630,4475359,4528243,4581282,4634476,4687822,4741320,4794970,
-	4848770,4902720,4956819,5011066,5065460,5120000,5174686,5229517,5284492,5339610,
-	5394871,5450274,5505818,5561502,5617327,5673290,5729391,5785631,5842007,5898519,
-	5955168,6011951,6068869,6125920,6183105,6240422,6297871,6355451,6413162,6471004,
-	6528974,6587074,6645302,6703658,6762141,6820751,6879487,6938349,6997336,7056447,
-	7115683,7175042,7234524,7294129,7353855,7413703,7473672,7533762,7593972,7654301,
-	7714750,7775317,7836002,7896805,7957725,8018762,8079916,8141185,8202570,8264070,
-	8325685,8387413,8449256,8511212,8573281,8635462,8697756,8760161,8822678,8885305,
-	8948043,9010892,9073850,9136917,9200094,9263379,9326772,9390274,9453882,9517598,
-	9581421,9645351,9709386,9773527,9837774,9902125,9966582,10031143,10095807,10160576,
-	10225448,10290423,10355500,10420681,10485963,10551347,10616832,10682419,10748106,10813894,
-	10879782,10945770,11011857,11078044,11144330,11210715,11277198,11343779,11410458,11477234,
-	11544108,11611079,11678147,11745311,11812571,11879927,11947378,12014925,12082567,12150304,
-	12218135,12286061,12354081,12422194,12490401,12558701,12627094,12695580,12764158,12832829,
-	12901592,12970446,13039392,13108429,13177557,13246776,13316085,13385485,13454975,13524554,
-	13594224,13663982,13733830,13803767,13873792,13943906,14014108,14084398,14154776,14225242,
-	14295794,14366435,14437162,14507975,14578876,14649862,14720935,14792093,14863337,14934667,
-	15006082,15077582,15149167,15220837,15292591,15364429,15436351,15508358,15580448,15652621,
-	15724878,15797217,15869640,15942146,16014734,16087404,16160156,16232991,16305907,16378905,
-	16451984,16525145,16598386,16671709,16745112,16818596,16892160,16965804,17039528,17113332,
-	17187216,17261179,17335222,17409343,17483544,17557824,17632182,17706618,17781133,17855726,
-	17930397,18005146,18079973,18154877,18229858,18304917,18380052,18455265,18530554,18605920,
-	18681362,18756880,18832475,18908145,18983891,19059713,19135610,19211583,19287630,19363753,
-	19439951,19516223,19592571,19668992,19745488,19822058,19898702,19975420,20052211,20129076,
-	20206015,20283027,20360112,20437270,20514501,20591805,20669181,20746630,20824151,20901745,
-	20979410,21057148,21134957,21212838,21290791,21368815,21446910,21525076,21603314,21681622,
-	21760001,21838451,21916971,21995561,22074222,22152953,22231754,22310625,22389566,22468576,
-	22547656,22626806,22706024,22785312,22864669,22944094,23023589,23103152,23182783,23262484,
-	23342252,23422089,23501993,23581966,23662007,23742115,23822291,23902534,23982845,24063223,
-	24143669,24224181,24304761,24385407,24466120,24546899,24627745,24708658,24789637,24870682,
-	24951793,25032970,25114213,25195521,25276895,25358335,25439841,25521411,25603047,25684748,
-	25766514,25848345,25930241,26012201,26094226,26176316,26258469,26340688,26422970,26505317,
-	26587727,26670202,26752740,26835342,26918008,27000737,27083530,27166386,27249305,27332287,
-	27415332,27498440,27581611,27664845,27748142,27831501,27914922,27998406,28081952,28165561,
-	28249231,28332963,28416758,28500614,28584532,28668511,28752552,28836655,28920819,29005044,
-	29089330,29173677,29258086,29342555,29427085,29511676,29596328,29681040,29765813,29850646,
-	29935539,30020493,30105507,30190581,30275714,30360908,30446162,30531475,30616848,30702280,
-	30787772,30873323,30958934,31044604,31130332,31216120,31301967,31387873,31473838,31559862,
-	31645944,31732084,31818284,31904541,31990857,32077231,32163664,32250154,32336703,32423309,
-	32509974,32596696,32683476,32770313,32857208,32944161,33031171,33118238,33205363,33292544,
-	33379783,33467079,33554432,33641842,33729308,33816832,33904412,33992048,34079741,34167491,
-	34255297,34343159,34431078,34519052,34607083,34695170,34783312,34871511,34959765,35048075,
-	35136441,35224862,35313339,35401872,35490459,35579102,35667801,35756554,35845363,35934226,
-	36023145,36112118,36201147,36290230,36379367,36468560,36557807,36647108,36736464,36825875,
-	36915339,37004858,37094431,37184058,37273739,37363474,37453263,37543106,37633003,37722953,
-	37812957,37903015,37993126,38083291,38173509,38263780,38354105,38444483,38534914,38625398,
-	38715935,38806525,38897168,38987864,39078612,39169414,39260268,39351174,39442133,39533145,
-	39624209,39715325,39806494,39897714,39988987,40080312,40171690,40263119,40354600,40446133,
-	40537718,40629354,40721042,40812782,40904574,40996417,41088311,41180257,41272254,41364303,
-	41456402,41548553,41640755,41733008,41825313,41917668,42010074,42102530,42195038,42287596,
-	42380205,42472865,42565575,42658336,42751147,42844009,42936921,43029883,43122895,43215958,
-	43309070,43402233,43495446,43588709,43682022,43775384,43868797,43962259,44055771,44149332,
-	44242943,44336604,44430314,44524073,44617882,44711741,44805648,44899605,44993611,45087666,
-	45181770,45275923,45370126,45464377,45558677,45653025,45747423,45841869,45936364,46030908,
-	46125500,46220141,46314830,46409567,46504353,46599187,46694070,46789001,46883980,46979007,
-	47074082,47169205,47264376,47359595,47454862,47550177,47645540,47740950,47836408,47931914,
-	48027467,48123068,48218716,48314412,48410155,48505945,48601783,48697668,48793601,48889580,
-	48985607,49081681,49177802,49273969,49370184,49466446,49562754,49659109,49755511,49851960,
-	49948456,50044998,50141586,50238222,50334903,50431631,50528406,50625227,50722094,50819007,
-	50915967,51012973,51110025,51207123,51304267,51401457,51498694,51595976,51693304,51790677,
-	51888097,51985562,52083073,52180630,52278232,52375880,52473573,52571312,52669097,52766926,
-	52864801,52962722,53060688,53158699,53256755,53354856,53453002,53551194,53649430,53747712,
-	53846038,53944410,54042826,54141287,54239793,54338344,54436939,54535579,54634263,54732993,
-	54831766,54930585,55029447,55128354,55227306,55326302,55425342,55524426,55623555,55722728,
-	55821945,55921206,56020511,56119860,56219253,56318690,56418171,56517696,56617265,56716877,
-	56816534,56916234,57015977,57115764,57215595,57315470,57415388,57515349,57615354,57715403,
-	57815494,57915629,58015808,58116029,58216294,58316602,58416954,58517348,58617785,58718266,
-	58818789,58919356,59019965,59120617,59221312,59322050,59422831,59523654,59624521,59725429,
-	59826381,59927375,60028412,60129491,60230613,60331777,60432983,60534232,60635524,60736857,
-	60838233,60939651,61041112,61142614,61244159,61345746,61447375,61549046,61650759,61752513,
-	61854310,61956149,62058030,62159952,62261916,62363922,62465970,62568059,62670191,62772363,
-	62874578,62976833,63079131,63181470,63283850,63386272,63488735,63591239,63693785,63796372,
-	63899001,64001670,64104381,64207133,64309926,64412760,64515636,64618552,64721509,64824507,
-	64927546,65030627,65133747,65236909,65340112,65443355,65546639,65649964,65753329,65856735,
-	65960182,66063669,66167197,66270765,66374374,66478023,66581713,66685443,66789213,66893024,
-	66996875,67100766,67204698,67308669,67412681,67516733,67620825,67724957,67829130,67933342,
-	68037594,68141886,68246218,68350590,68455002,68559454,68663945,68768476,68873047,68977658,
-	69082308,69186998,69291728,69396497,69501306,69606154,69711042,69815969,69920936,70025942,
-	70130987,70236072,70341196,70446360,70551562,70656804,70762085,70867406,70972765,71078164,
-	71183601,71289078,71394594,71500149,71605742,71711375,71817046,71922757,72028506,72134294,
-	72240121,72345987,72451891,72557835,72663817,72769837,72875896,72981994,73088130,73194305,
-	73300519,73406770,73513061,73619389,73725757,73832162,73938606,74045088,74151609,74258168,
-	74364765,74471400,74578073,74684785,74791535,74898323,75005149,75112012,75218914,75325854,
-	75432832,75539848,75646902,75753994,75861123,75968291,76075496,76182739,76290020,76397338,
-	76504694,76612088,76719520,76826989,76934495,77042040,77149622,77257241,77364898,77472592,
-	77580324,77688093,77795899,77903743,78011625,78119543,78227499,78335492,78443522,78551590,
-	78659695,78767836,78876015,78984232,79092485,79200775,79309102,79417467,79525868,79634306,
-	79742781,79851293,79959842,80068428,80177050,80285710,80394406,80503139,80611908,80720715,
-	80829558,80938438,81047354,81156307,81265296,81374322,81483385,81592484,81701620,81810792,
-	81920000,82029245,82138526,82247844,82357198,82466588,82576014,82685477,82794976,82904512,
-	83014083,83123691,83233334,83343014,83452730,83562482,83672271,83782095,83891955,84001851,
-	84111783,84221751,84331755,84441795,84551870,84661982,84772129,84882312,84992531,85102786,
-	85213076,85323402,85433764,85544161,85654594,85765063,85875567,85986107,86096682,86207293,
-	86317939,86428621,86539338,86650091,86760879,86871702,86982561,87093455,87204384,87315349,
-	87426349,87537384,87648455,87759560,87870701,87981877,88093088,88204334,88315616,88426932,
-	88538283,88649670,88761091,88872548,88984039,89095565,89207126,89318723,89430353,89542019,
-	89653720,89765455,89877226,89989030,90100870,90212745,90324654,90436598,90548576,90660589,
-	90772637,90884719,90996836,91108987,91221173,91333394,91445648,91557938,91670262,91782620,
-	91895012,92007439,92119901,92232396,92344926,92457491,92570089,92682722,92795389,92908090,
-	93020826,93133595,93246399,93359237,93472109,93585015,93697955,93810929,93923937,94036980,
-	94150056,94263166,94376310,94489488,94602700,94715946,94829225,94942539,95055886,95169267,
-	95282682,95396131,95509613,95623129,95736679,95850263,95963880,96077530,96191215,96304933,
-	96418684,96532470,96646288,96760140,96874026,96987945,97101898,97215884,97329904,97443956,
-	97558043,97672162,97786315,97900502,98014721,98128974,98243260,98357580,98471933,98586318,
-	98700737,98815190,98929675,99044194,99158745,99273330,99387948,99502598,99617282,99731999,
-	99846749,99961532,100076348,100191197,100306078,100420993,100535940,100650921,100765934,100880980,
-	100996059,101111170,101226315,101341492,101456702,101571944,101687220,101802528,101917868,102033241,
-	102148647,102264086,102379557,102495061,102610597,102726166,102841767,102957401,103073067,103188765,
-	103304497,103420260,103536056,103651884,103767745,103883638,103999563,104115521,104231511,104347533,
-	104463588,104579675,104695794,104811945,104928128,105044344,105160592,105276871,105393183,105509527,
-	105625904,105742312,105858752,105975224,106091729,106208265,106324833,106441433,106558066,106674730,
-	106791426,106908154,107024913,107141705,107258528,107375384,107492271,107609190,107726140,107843123,
-	107960137,108077182,108194260,108311369,108428510,108545683,108662887,108780122,108897390,109014689,
-	109132019,109249381,109366775,109484200,109601656,109719144,109836664,109954215,110071797,110189411,
-	110307056,110424733,110542441,110660180,110777950,110895752,111013585,111131450,111249346,111367273,
-	111485231,111603220,111721241,111839292,111957375,112075489,112193635,112311811,112430018,112548257,
-	112666526,112784827,112903159,113021521,113139915,113258339,113376795,113495282,113613799,113732347,
-	113850927,113969537,114088178,114206850,114325552,114444286,114563050,114681845,114800671,114919528,
-	115038415,115157333,115276282,115395262,115514272,115633313,115752384,115871486,115990619,116109783,
-	116228976,116348201,116467456,116586742,116706058,116825404,116944781,117064189,117183627,117303095,
-	117422594,117542124,117661683,117781273,117900894,118020545,118140226,118259937,118379679,118499451,
-	118619253,118739086,118858948,118978842,119098765,119218718,119338702,119458716,119578759,119698834,
-	119818938,119939072,120059236,120179431,120299655,120419910,120540194,120660509,120780854,120901228,
-	121021633,121142067,121262532,121383026,121503550,121624105,121744689,121865303,121985946,122106620,
-	122227323,122348057,122468820,122589613,122710435,122831287,122952170,123073081,123194023,123314994,
-	123435995,123557025,123678085,123799175,123920295,124041444,124162622,124283830,124405068,124526335,
-	124647632,124768959,124890314,125011700,125133114,125254559,125376032,125497536,125619068,125740630,
-	125862221,125983842,126105492,126227171,126348880,126470618,126592386,126714182,126836008,126957863,
-	127079748,127201661,127323604,127445576,127567578,127689608,127811668,127933756,128055874,128178021,
-	128300197,128422403,128544637,128666900,128789193,128911514,129033865,129156244,129278652,129401090,
-	129523556,129646052,129768576,129891129,130013711,130136323,130258963,130381631,130504329,130627056,
-	130749811,130872595,130995408,131118250,131241120,131364020,131486948,131609905,131732890,131855904,
-	131978947,132102019,132225119,132348248,132471406,132594592,132717807,132841050,132964323,133087623,
-	133210952,133334310,133457696,133581111,133704554,133828026,133951527,134075055,134198613,134322198,
-	134445812,134569455,134693126,134816825,134940553,135064309,135188094,135311906,135435747,135559617,
-	135683515,135807441,135931395,136055378,136179388,136303427,136427495,136551590,136675714,136799866,
-	136924046,137048254,137172490,137296755,137421048,137545368,137669717,137794094,137918499,138042932,
-	138167393,138291882,138416400,138540945,138665518,138790119,138914748,139039405,139164090,139288803,
-	139413544,139538313,139663110,139787934,139912787,140037667,140162575,140287511,140412475,140537467,
-	140662486,140787533,140912608,141037711,141162842,141288000,141413186,141538399,141663641,141788910,
-	141914207,142039531,142164883,142290263,142415670,142541105,142666567,142792057,142917575,143043120,
-	143168693,143294294,143419921,143545577,143671260,143796970,143922708,144048473,144174266,144300086,
-	144425934,144551809,144677712,144803641,144929599,145055583,145181595,145307635,145433701,145559795,
-	145685917,145812065,145938241,146064445,146190675,146316933,146443218,146569530,146695869,146822236,
-	146948630,147075051,147201499,147327974,147454477,147581007,147707563,147834147,147960758,148087396,
-	148214061,148340754,148467473,148594219,148720993,148847793,148974620,149101475,149228356,149355264,
-	149482200,149609162,149736151,149863167,149990210,150117280,150244377,150371501,150498652,150625829,
-	150753033,150880265,151007523,151134807,151262119,151389457,151516823,151644215,151771633,151899079,
-	152026551,152154050,152281576,152409128,152536707,152664313,152791945,152919604,153047290,153175002,
-	153302741,153430507,153558299,153686118,153813963,153941835,154069734,154197659,154325610,154453588,
-	154581593,154709624,154837682,154965766,155093876,155222013,155350177,155478367,155606583,155734826,
-	155863095,155991391,156119713,156248061,156376436,156504837,156633264,156761718,156890198,157018704,
-	157147237,157275796,157404381,157532993,157661630,157790294,157918985,158047701,158176444,158305212,
-	158434008,158562829,158691676,158820550,158949449,159078375,159207327,159336305,159465310,159594340,
-	159723396,159852479,159981587,160110722,160239882,160369069,160498282,160627520,160756785,160886076,
-	161015392,161144735,161274103,161403498,161532918,161662365,161791837,161921335,162050859,162180409,
-	162309985,162439587,162569215,162698868,162828547,162958252,163087983,163217740,163347523,163477331,
-	163607165,163737025,163866910,163996822,164126759,164256722,164386710,164516724,164646764,164776830,
-	164906921,165037038,165167181,165297349,165427543,165557762,165688007,165818278,165948574,166078896,
-	166209243,166339616,166470015,166600439,166730888,166861363,166991864,167122390,167252942,167383519,
-	167514122,167644750,167775403,167906082,168036786,168167516,168298271,168429052,168559858,168690689,
-	168821546,168952428,169083335,169214268,169345226,169476210,169607219,169738253,169869312,170000397,
-	170131507,170262642,170393802,170524988,170656199,170787435,170918696,171049983,171181295,171312632,
-	171443994,171575381,171706793,171838231,171969694,172101182,172232695,172364233,172495796,172627384,
-	172758997,172890636,173022299,173153988,173285702,173417440,173549204,173680993,173812806,173944645,
-	174076509,174208397,174340311,174472249,174604213,174736201,174868215,175000253,175132316,175264404,
-	175396517,175528655,175660818,175793005,175925218,176057455,176189717,176322004,176454316,176586653,
-	176719014,176851400,176983811,177116247,177248708,177381193,177513703,177646237,177778797,177911381,
-	178043990,178176624,178309282,178441965,178574672,178707405,178840162,178972943,179105749,179238580,
-	179371435,179504316,179637220,179770149,179903103,180036082,180169084,180302112,180435164,180568240,
-	180701342,180834467,180967617,181100792,181233991,181367214,181500462,181633735,181767032,181900353,
-	182033699,182167069,182300464,182433883,182567326,182700794,182834286,182967803,183101344,183234909,
-	183368499,183502113,183635751,183769414,183903101,184036812,184170548,184304307,184438092,184571900,
-	184705732,184839589,184973470,185107376,185241305,185375259,185509237,185643239,185777266,185911316,
-	186045391,186179490,186313613,186447760,186581931,186716126,186850346,186984590,187118857,187253149,
-	187387465,187521805,187656169,187790557,187924969,188059405,188193866,188328350,188462858,188597390,
-	188731946,188866527,189001131,189135759,189270411,189405087,189539787,189674511,189809259,189944031,
-	190078827,190213646,190348490,190483357,190618249,190753164,190888103,191023066,191158052,191293063,
-	191428097,191563155,191698237,191833343,191968473,192103626,192238803,192374004,192509229,192644477,
-	192779749,192915045,193050365,193185708,193321075,193456466,193591881,193727319,193862781,193998266,
-	194133775,194269308,194404864,194540444,194676048,194811675,194947326,195083001,195218699,195354421,
-	195490166,195625935,195761727,195897543,196033383,196169246,196305132,196441042,196576976,196712933,
-	196848914,196984918,197120945,197256996,197393071,197529169,197665290,197801435,197937603,198073795,
-	198210010,198346249,198482510,198618796,198755104,198891437,199027792,199164171,199300573,199436998,
-	199573447,199709919,199846415,199982934,200119476,200256041,200392630,200529242,200665877,200802535,
-	200939217,201075922,201212650,201349402,201486176,201622974,201759795,201896639,202033507,202170398,
-	202307311,202444248,202581209,202718192,202855198,202992228,203129281,203266357,203403456,203540578,
-	203677723,203814891,203952082,204089297,204226534,204363795,204501078,204638385,204775715,204913067,
-	205050443,205187842,205325264,205462708,205600176,205737667,205875180,206012717,206150277,206287859,
-	206425465,206563093,206700745,206838419,206976116,207113836,207251579,207389345,207527134,207664946,
-	207802780,207940638,208078518,208216421,208354347,208492295,208630267,208768261,208906279,209044319,
-	209182381,209320467,209458575,209596706,209734860,209873037,210011236,210149458,210287703,210425971,
-	210564261,210702574,210840910,210979268,211117649,211256053,211394480,211532929,211671400,211809895,
-	211948412,212086952,212225514,212364099,212502706,212641337,212779989,212918665,213057363,213196083,
-	213334826,213473592,213612380,213751191,213890024,214028880,214167758,214306659,214445582,214584528,
-	214723497,214862488,215001501,215140537,215279595,215418676,215557779,215696904,215836053,215975223,
-	216114416,216253631,216392869,216532129,216671412,216810717,216950044,217089394,217228766,217368160,
-	217507577,217647016,217786477,217925961,218065467,218204996,218344546,218484119,218623715,218763332,
-	218902972,219042634,219182319,219322026,219461754,219601506,219741279,219881075,220020893,220160733,
-	220300595,220440479,220580386,220720315,220860266,221000239,221140235,221280252,221420292,221560354,
-	221700438,221840544,221980672,222120823,222260995,222401190,222541406,222681645,222821906,222962189,
-	223102494,223242821,223383170,223523541,223663934,223804350,223944787,224085246,224225728,224366231,
-	224506756,224647303,224787873,224928464,225069077,225209712,225350370,225491049,225631750,225772473,
-	225913218,226053985,226194773,226335584,226476417,226617271,226758148,226899046,227039966,227180908,
-	227321872,227462858,227603865,227744895,227885946,228027019,228168114,228309231,228450369,228591529,
-	228732712,228873916,229015141,229156389,229297658,229438949,229580262,229721596,229862953,230004331,
-	230145730,230287152,230428595,230570060,230711546,230853055,230994585,231136136,231277709,231419304,
-	231560921,231702559,231844219,231985901,232127604,232269329,232411076,232552844,232694633,232836445,
-	232978278,233120132,233262008,233403906,233545825,233687766,233829728,233971712,234113717,234255744,
-	234397793,234539863,234681954,234824068,234966202,235108358,235250536,235392735,235534955,235677197,
-	235819461,235961746,236104052,236246380,236388729,236531100,236673492,236815905,236958340,237100797,
-	237243274,237385774,237528294,237670836,237813399,237955984,238098590,238241217,238383866,238526536,
-	238669228,238811940,238954674,239097430,239240207,239383005,239525824,239668664,239811526,239954409,
-	240097314,240240240,240383187,240526155,240669144,240812155,240955187,241098240,241241314,241384410,
-	241527527,241670665,241813824,241957005,242100206,242243429,242386673,242529938,242673224,242816532,
-	242959860,243103210,243246581,243389973,243533386,243676820,243820276,243963752,244107249,244250768,
-	244394308,244537869,244681450,244825053,244968677,245112322,245255989,245399676,245543384,245687113,
-	245830863,245974635,246118427,246262240,246406074,246549930,246693806,246837703,246981621,247125560,
-	247269521,247413502,247557504,247701527,247845571,247989635,248133721,248277828,248421956,248566104,
-	248710273,248854464,248998675,249142907,249287160,249431434,249575729,249720044,249864381,250008738,
-	250153116,250297515,250441935,250586375,250730837,250875319,251019822,251164346,251308890,251453456,
-	251598042,251742649,251887277,252031925,252176594,252321284,252465995,252610727,252755479,252900252,
-	253045045,253189860,253334695,253479551,253624427,253769324,253914242,254059181,254204140,254349120,
-	254494121,254639142,254784184,254929246,255074329,255219433,255364558,255509703,255654868,255800054,
-	255945261,256090489,256235737,256381006,256526295,256671605,256816935,256962286,257107657,257253049,
-	257398462,257543895,257689349,257834823,257980318,258125833,258271369,258416925,258562502,258708099,
-	258853717,258999355,259145014,259290693,259436392,259582112,259727853,259873614,260019395,260165197,
-	260311019,260456862,260602725,260748609,260894513,261040437,261186382,261332347,261478333,261624339,
-	261770365,261916411,262062478,262208566,262354674,262500802,262646950,262793119,262939308,263085517,
-	263231747,263377997,263524267,263670558,263816869,263963200,264109551,264255923,264402315,264548728,
-	264695160,264841613,264988086,265134579,265281093,265427627,265574181,265720755,265867349,266013964,
-	266160599,266307254,266453929,266600625,266747340,266894076,267040832,267187608,267334404,267481221,
-	267628057,267774914,267921791,268068688,268215605,268362542,268509500,268656477,268803475,268950493,
-	269097530,269244588,269391666,269538764,269685882,269833021,269980179,270127357,270274555,270421774,
-	270569012,270716271,270863549,271010848,271158166,271305505,271452863,271600242,271747640,271895059,
-	272042497,272189956,272337434,272484933,272632451,272779990,272927548,273075126,273222724,273370342,
-	273517981,273665639,273813316,273961014,274108732,274256470,274404227,274552005,274699802,274847619,
-	274995456,275143313,275291190,275439087,275587003,275734940,275882896,276030872,276178868,276326884,
-	276474919,276622975,276771050,276919145,277067260,277215394,277363549,277511723,277659917,277808130,
-	277956364,278104617,278252890,278401183,278549496,278697828,278846180,278994552,279142943,279291354,
-	279439785,279588236,279736706,279885196,280033706,280182236,280330785,280479353,280627942,280776550,
-	280925178,281073825,281222493,281371179,281519886,281668612,281817358,281966123,282114908,282263713,
-	282412537,282561381,282710244,282859127,283008030,283156952,283305894,283454855,283603836,283752836,
-	283901856,284050896,284199955,284349034,284498132,284647250,284796387,284945544,285094721,285243917,
-	285393132,285542367,285691621,285840895,285990189,286139502,286288834,286438186,286587557,286736948,
-	286886358,287035788,287185237,287334706,287484194,287633701,287783228,287932774,288082340,288231925,
-	288381530,288531154,288680797,288830460,288980142,289129844,289279565,289429305,289579065,289728844,
-	289878642,290028460,290178297,290328153,290478029,290627924,290777839,290927773,291077726,291227698,
-	291377690,291527701,291677731,291827781,291977850,292127938,292278045,292428172,292578318,292728484,
-	292878668,293028872,293179095,293329337,293479599,293629880,293780180,293930499,294080837,294231195,
-	294381572,294531968,294682383,294832818,294983272,295133744,295284237,295434748,295585278,295735828,
-	295886396,296036984,296187591,296338218,296488863,296639527,296790211,296940914,297091636,297242377,
-	297393137,297543916,297694714,297845532,297996368,298147224,298298098,298448992,298599905,298750837,
-	298901788,299052758,299203747,299354755,299505782,299656829,299807894,299958978,300110081,300261204,
-	300412345,300563505,300714685,300865883,301017101,301168337,301319592,301470867,301622160,301773472,
-	301924804,302076154,302227523,302378911,302530318,302681744,302833189,302984653,303136136,303287638,
-	303439159,303590698,303742257,303893834,304045431,304197046,304348680,304500333,304652005,304803696,
-	304955405,305107134,305258881,305410648,305562433,305714237,305866060,306017901,306169762,306321641,
-	306473539,306625456,306777392,306929347,307081320,307233312,307385323,307537353,307689402,307841469,
-	307993555,308145660,308297784,308449927,308602088,308754268,308906467,309058684,309210921,309363176,
-	309515449,309667742,309820053,309972383,310124732,310277099,310429485,310581890,310734313,310886755,
-	311039216,311191696,311344194,311496711,311649247,311801801,311954374,312106965,312259575,312412204,
-	312564852,312717518,312870203,313022906,313175628,313328369,313481128,313633906,313786703,313939518,
-	314092351,314245204,314398074,314550964,314703872,314856799,315009744,315162708,315315690,315468691,
-	315621710,315774748,315927805,316080880,316233973,316387086,316540216,316693365,316846533,316999719,
-	317152924,317306147,317459389,317612649,317765928,317919225,318072541,318225875,318379228,318532599,
-	318685988,318839396,318992823,319146268,319299731,319453213,319606713,319760232,319913769,320067324,
-	320220898,320374491,320528101,320681731,320835378,320989044,321142729,321296431,321450153,321603892,
-	321757650,321911426,322065221,322219034,322372865,322526715,322680583,322834470,322988374,323142297,
-	323296239,323450199,323604177,323758173,323912188,324066221,324220272,324374342,324528430,324682536,
-	324836660,324990803,325144964,325299144,325453341,325607557,325761791,325916044,326070314,326224603,
-	326378910,326533236,326687579,326841941,326996321,327150720,327305136,327459571,327614024,327768495,
-	327922984,328077492,328232018,328386562,328541124,328695704,328850302,329004919,329159554,329314207,
-	329468878,329623567,329778275,329933000,330087744,330242506,330397286,330552084,330706900,330861735,
-	331016587,331171458,331326347,331481254,331636178,331791121,331946083,332101062,332256059,332411074,
-	332566108,332721159,332876229,333031317,333186422,333341546,333496688,333651848,333807026,333962221,
-	334117435,334272667,334427917,334583185,334738471,334893776,335049098,335204438,335359796,335515172,
-	335670566,335825978,335981408,336136856,336292322,336447806,336603308,336758828,336914365,337069921,
-	337225495,337381087,337536696,337692324,337847969,338003633,338159314,338315013,338470730,338626465,
-	338782218,338937989,339093778,339249585,339405409,339561252,339717112,339872990,340028886,340184800,
-	340340732,340496682,340652650,340808635,340964638,341120659,341276698,341432755,341588830,341744922,
-	341901032,342057161,342213306,342369470,342525652,342681851,342838068,342994303,343150556,343306826,
-	343463115,343619421,343775745,343932086,344088446,344244823,344401218,344557631,344714061,344870509,
-	345026975,345183459,345339960,345496480,345653016,345809571,345966143,346122733,346279341,346435967,
-	346592610,346749271,346905949,347062646,347219359,347376091,347532840,347689607,347846392,348003194,
-	348160014,348316852,348473707,348630580,348787471,348944379,349101305,349258249,349415210,349572189,
-	349729185,349886199,350043231,350200280,350357347,350514432,350671534,350828653,350985791,351142946,
-	351300118,351457308,351614516,351771741,351928984,352086244,352243522,352400817,352558130,352715461,
-	352872809,353030175,353187558,353344959,353502377,353659813,353817266,353974737,354132225,354289731,
-	354447254,354604795,354762354,354919929,355077523,355235134,355392762,355550408,355708071,355865752,
-	356023450,356181166,356338899,356496649,356654418,356812203,356970006,357127826,357285664,357443520,
-	357601392,357759282,357917190,358075115,358233057,358391017,358548994,358706989,358865001,359023030,
-	359181077,359339141,359497223,359655322,359813438,359971572,360129723,360287891,360446077,360604280,
-	360762501,360920738,361078994,361237266,361395556,361553863,361712188,361870530,362028889,362187265,
-	362345659,362504070,362662499,362820944,362979407,363137888,363296385,363454900,363613432,363771982,
-	363930549,364089133,364247734,364406353,364564988,364723642,364882312,365041000,365199704,365358426,
-	365517166,365675922,365834696,365993487,366152296,366311121,366469964,366628824,366787701,366946595,
-	367105507,367264435,367423381,367582344,367741325,367900322,368059337,368218369,368377418,368536484,
-	368695567,368854668,369013785,369172920,369332072,369491241,369650428,369809631,369968852,370128089,
-	370287344,370446616,370605905,370765211,370924535,371083875,371243232,371402607,371561999,371721408,
-	371880833,372040276,372199737,372359214,372518708,372678219,372837748,372997293,373156856,373316435,
-	373476032,373635645,373795276,373954924,374114589,374274270,374433969,374593685,374753418,374913168,
-	375072935,375232719,375392520,375552338,375712173,375872025,376031894,376191780,376351683,376511603,
-	376671540,376831494,376991465,377151453,377311458,377471479,377631518,377791574,377951647,378111736,
-	378271843,378431966,378592107,378752264,378912439,379072630,379232838,379393063,379553305,379713564,
-	379873840,380034133,380194443,380354769,380515113,380675473,380835850,380996244,381156655,381317083,
-	381477528,381637990,381798468,381958964,382119476,382280005,382440551,382601114,382761694,382922290,
-	383082903,383243534,383404181,383564844,383725525,383886223,384046937,384207668,384368416,384529181,
-	384689962,384850761,385011576,385172408,385333256,385494122,385655004,385815903,385976819,386137752,
-	386298701,386459667,386620650,386781650,386942667,387103700,387264750,387425816,387586900,387748000,
-	387909117,388070251,388231401,388392568,388553752,388714952,388876170,389037404,389198654,389359922,
-	389521206,389682507,389843824,390005158,390166509,390327877,390489261,390650662,390812079,390973513,
-	391134964,391296432,391457916,391619417,391780934,391942469,392104019,392265587,392427171,392588772,
-	392750389,392912023,393073674,393235341,393397025,393558725,393720442,393882176,394043926,394205693,
-	394367477,394529277,394691093,394852927,395014776,395176643,395338526,395500425,395662342,395824274,
-	395986224,396148189,396310172,396472171,396634186,396796218,396958267,397120332,397282414,397444512,
-	397606627,397768758,397930906,398093070,398255251,398417448,398579662,398741892,398904139,399066402,
-	399228682,399390979,399553291,399715621,399877966,400040329,400202707,400365103,400527514,400689943,
-	400852387,401014848,401177326,401339820,401502330,401664857,401827400,401989960,402152536,402315129,
-	402477738,402640363,402803005,402965664,403128338,403291030,403453737,403616461,403779201,403941958,
-	404104731,404267521,404430327,404593149,404755988,404918843,405081715,405244602,405407507,405570427,
-	405733364,405896317,406059287,406222273,406385275,406548294,406711329,406874381,407037448,407200532,
-	407363633,407526750,407689883,407853032,408016198,408179380,408342578,408505793,408669024,408832271,
-	408995534,409158814,409322110,409485423,409648751,409812096,409975457,410138835,410302229,410465639,
-	410629065,410792508,410955967,411119442,411282933,411446441,411609964,411773505,411937061,412100633,
-	412264222,412427827,412591449,412755086,412918740,413082410,413246096,413409798,413573517,413737251,
-	413901002,414064769,414228553,414392352,414556168,414720000,414883848,415047712,415211593,415375489,
-	415539402,415703331,415867276,416031238,416195215,416359209,416523218,416687244,416851286,417015344,
-	417179419,417343509,417507616,417671738,417835877,418000032,418164203,418328390,418492594,418656813,
-	418821048,418985300,419149568,419313852,419478151,419642467,419806800,419971148,420135512,420299892,
-	420464289,420628701,420793130,420957574,421122035,421286511,421451004,421615513,421780038,421944579,
-	422109136,422273709,422438298,422602903,422767524,422932161,423096814,423261483,423426168,423590870,
-	423755587,423920320,424085069,424249834,424414616,424579413,424744226,424909055,425073900,425238762,
-	425403639,425568532,425733441,425898366,426063307,426228264,426393237,426558226,426723231,426888252,
-	427053288,427218341,427383410,427548494,427713595,427878711,428043844,428208992,428374156,428539337,
-	428704533,428869745,429034973,429200217,429365476,429530752,429696043,429861351,430026674,430192013,
-	430357369,430522740,430688126,430853529,431018948,431184382,431349833,431515299,431680781,431846279,
-	432011793,432177323,432342868,432508430,432674007,432839600,433005209,433170834,433336474,433502131,
-	433667803,433833491,433999195,434164914,434330650,434496401,434662168,434827951,434993750,435159565,
-	435325395,435491241,435657103,435822981,435988874,436154784,436320709,436486650,436652606,436818579,
-	436984567,437150571,437316590,437482626,437648677,437814744,437980827,438146925,438313039,438479169,
-	438645315,438811476,438977653,439143846,439310055,439476279,439642519,439808775,439975046,440141333,
-	440307636,440473955,440640289,440806639,440973005,441139386,441305783,441472196,441638624,441805068,
-	441971528,442138004,442304495,442471002,442637524,442804062,442970616,443137185,443303770,443470371,
-	443636988,443803620,443970267,444136931,444303610,444470304,444637014,444803740,444970482,445137239,
-	445304012,445470800,445637604,445804423,445971259,446138109,446304976,446471858,446638755,446805668,
-	446972597,447139542,447306501,447473477,447640468,447807475,447974497,448141535,448308588,448475657,
-	448642742,448809842,448976957,449144088,449311235,449478397,449645575,449812768,449979977,450147202,
-	450314442,450481697,450648968,450816255,450983557,451150874,451318207,451485556,451652920,451820300,
-	451987695,452155105,452322531,452489973,452657430,452824903,452992391,453159894,453327413,453494948,
-	453662498,453830063,453997644,454165240,454332852,454500480,454668122,454835781,455003454,455171143,
-	455338848,455506568,455674303,455842054,456009821,456177602,456345399,456513212,456681040,456848884,
-	457016742,457184617,457352506,457520411,457688332,457856268,458024219,458192186,458360168,458528165,
-	458696178,458864207,459032250,459200309,459368384,459536474,459704579,459872699,460040835,460208986,
-	460377153,460545335,460713532,460881745,461049973,461218216,461386475,461554749,461723039,461891343,
-	462059663,462227999,462396350,462564716,462733097,462901494,463069906,463238333,463406776,463575234,
-	463743707,463912196,464080699,464249219,464417753,464586303,464754868,464923448,465092044,465260655,
-	465429281,465597922,465766579,465935251,466103938,466272641,466441358,466610091,466778840,466947603,
-	467116382,467285176,467453985,467622810,467791650,467960505,468129375,468298260,468467161,468636077,
-	468805008,468973954,469142916,469311893,469480885,469649892,469818914,469987952,470157005,470326073,
-	470495156,470664254,470833368,471002497,471171641,471340800,471509974,471679164,471848368,472017588,
-	472186823,472356073,472525339,472694619,472863915,473033226,473202552,473371893,473541249,473710620,
-	473880007,474049409,474218825,474388257,474557704,474727167,474896644,475066136,475235644,475405167,
-	475574704,475744257,475913825,476083408,476253007,476422620,476592248,476761892,476931550,477101224,
-	477270913,477440617,477610336,477780070,477949819,478119583,478289362,478459157,478628966,478798790,
-	478968630,479138484,479308354,479478239,479648138,479818053,479987983,480157928,480327888,480497863,
-	480667853,480837858,481007878,481177913,481347963,481518028,481688108,481858203,482028313,482198438,
-	482368578,482538734,482708904,482879089,483049289,483219504,483389734,483559979,483730240,483900515,
-	484070805,484241110,484411430,484581765,484752115,484922480,485092860,485263254,485433664,485604089,
-	485774529,485944983,486115453,486285938,486456437,486626952,486797481,486968025,487138585,487309159,
-	487479748,487650352,487820971,487991605,488162254,488332917,488503596,488674290,488844998,489015721,
-	489186460,489357213,489527981,489698764,489869562,490040374,490211202,490382044,490552902,490723774,
-	490894661,491065563,491236480,491407412,491578358,491749320,491920296,492091287,492262294,492433314,
-	492604350,492775401,492946466,493117547,493288642,493459752,493630876,493802016,493973171,494144340,
-	494315524,494486723,494657937,494829165,495000409,495171667,495342940,495514228,495685530,495856848,
-	496028180,496199527,496370889,496542265,496713657,496885063,497056484,497227919,497399370,497570835,
-	497742315,497913810,498085320,498256844,498428383,498599937,498771506,498943089,499114687,499286300,
-	499457928,499629570,499801227,499972899,500144586,500316287,500488003,500659734,500831480,501003240,
-	501175015,501346805,501518609,501690428,501862262,502034111,502205974,502377852,502549745,502721652,
-	502893574,503065511,503237462,503409429,503581409,503753405,503925415,504097440,504269480,504441534,
-	504613603,504785686,504957785,505129897,505302025,505474167,505646324,505818496,505990682,506162883,
-	506335098,506507328,506679573,506851833,507024107,507196395,507368699,507541017,507713349,507885697,
-	508058058,508230435,508402826,508575232,508747652,508920087,509092536,509265000,509437479,509609972,
-	509782480,509955003,510127540,510300092,510472658,510645239,510817834,510990444,511163069,511335708,
-	511508362,511681030,511853713,512026411,512199123,512371849,512544590,512717346,512890116,513062901,
-	513235701,513408514,513581343,513754186,513927043,514099916,514272802,514445703,514618619,514791549,
-	514964494,515137453,515310427,515483415,515656418,515829435,516002467,516175513,516348574,516521649,
-	516694739,516867844,517040962,517214096,517387243,517560406,517733582,517906774,518079979,518253200,
-	518426434,518599683,518772947,518946225,519119518,519292825,519466146,519639482,519812833,519986197,
-	520159577,520332970,520506379,520679801,520853238,521026690,521200156,521373636,521547131,521720640,
-	521894164,522067702,522241255,522414822,522588403,522761999,522935609,523109234,523282873,523456526,
-	523630194,523803876,523977573,524151284,524325009,524498749,524672503,524846272,525020055,525193852,
-	525367664,525541490,525715330,525889185,526063054,526236938,526410836,526584748,526758675,526932616,
-	527106571,527280541,527454525,527628524,527802536,527976563,528150605,528324661,528498731,528672815,
-	528846914,529021027,529195155,529369297,529543453,529717623,529891808,530066007,530240220,530414448,
-	530588690,530762946,530937217,531111502,531285801,531460115,531634442,531808785,531983141,532157512,
-	532331897,532506296,532680709,532855137,533029579,533204036,533378506,533552991,533727490,533902004,
-	534076531,534251073,534425630,534600200,534774785,534949384,535123997,535298624,535473266,535647922,
-	535822592,535997276,536171975,536346688,536521415,536696156,536870912,537045682,537220466,537395264,
-	537570076,537744903,537919744,538094599,538269468,538444352,538619249,538794161,538969087,539144028,
-	539318982,539493951,539668934,539843931,540018942,540193967,540369007,540544060,540719128,540894210,
-	541069307,541244417,541419542,541594680,541769833,541945000,542120182,542295377,542470587,542645810,
-	542821048,542996300,543171566,543346846,543522141,543697449,543872772,544048109,544223460,544398825,
-	544574204,544749597,544925004,545100426,545275862,545451311,545626775,545802253,545977745,546153251,
-	546328772,546504306,546679854,546855417,547030994,547206584,547382189,547557808,547733441,547909088,
-	548084749,548260425,548436114,548611817,548787535,548963266,549139012,549314771,549490545,549666333,
-	549842135,550017950,550193780,550369624,550545482,550721354,550897241,551073141,551249055,551424983,
-	551600925,551776882,551952852,552128836,552304835,552480847,552656873,552832914,553008968,553185037,
-	553361119,553537215,553713326,553889450,554065589,554241741,554417908,554594088,554770283,554946491,
-	555122714,555298950,555475201,555651465,555827743,556004036,556180342,556356662,556532997,556709345,
-	556885707,557062083,557238473,557414877,557591295,557767727,557944173,558120633,558297107,558473595,
-	558650097,558826612,559003142,559179686,559356243,559532814,559709400,559885999,560062612,560239240,
-	560415881,560592536,560769205,560945887,561122584,561299295,561476019,561652758,561829510,562006276,
-	562183057,562359851,562536659,562713480,562890316,563067166,563244029,563420907,563597798,563774703,
-	563951622,564128555,564305502,564482463,564659437,564836426,565013428,565190444,565367474,565544518,
-	565721576,565898647,566075733,566252832,566429945,566607072,566784213,566961368,567138536,567315719,
-	567492915,567670125,567847349,568024586,568201838,568379103,568556382,568733675,568910982,569088303,
-	569265637,569442985,569620347,569797723,569975113,570152516,570329933,570507365,570684809,570862268,
-	571039740,571217227,571394727,571572240,571749768,571927309,572104865,572282433,572460016,572637613,
-	572815223,572992847,573170485,573348136,573525802,573703481,573881173,574058880,574236600,574414334,
-	574592082,574769844,574947619,575125408,575303211,575481028,575658858,575836702,576014560,576192431,
-	576370316,576548215,576726128,576904054,577081994,577259948,577437916,577615897,577793892,577971901,
-	578149923,578327959,578506009,578684072,578862149,579040240,579218345,579396463,579574595,579752741,
-	579930900,580109073,580287260,580465460,580643674,580821902,581000143,581178399,581356667,581534950,
-	581713246,581891555,582069879,582248216,582426567,582604931,582783309,582961701,583140106,583318525,
-	583496958,583675404,583853864,584032337,584210825,584389325,584567840,584746368,584924910,585103465,
-	585282034,585460616,585639213,585817822,585996446,586175083,586353733,586532398,586711076,586889767,
-	587068472,587247191,587425923,587604669,587783428,587962201,588140988,588319788,588498602,588677429,
-	588856270,589035125,589213993,589392875,589571770,589750679,589929601,590108537,590287487,590466450,
-	590645427,590824417,591003421,591182438,591361469,591540513,591719571,591898643,592077728,592256827,
-	592435939,592615065,592794204,592973357,593152523,593331703,593510896,593690103,593869324,594048558,
-	594227805,594407066,594586341,594765629,594944930,595124245,595303574,595482916,595662271,595841640,
-	596021023,596200419,596379829,596559252,596738688,596918138,597097602,597277079,597456569,597636073,
-	597815591,597995122,598174666,598354224,598533795,598713380,598892979,599072590,599252216,599431854,
-	599611506,599791172,599970851,600150544,600330250,600509969,600689702,600869448,601049208,601228981,
-	601408768,601588568,601768381,601948208,602128049,602307902,602487770,602667650,602847544,603027452,
-	603207373,603387307,603567255,603747216,603927191,604107179,604287180,604467195,604647223,604827265,
-	605007320,605187388,605367470,605547565,605727674,605907796,606087931,606268080,606448242,606628417,
-	606808606,606988808,607169024,607349253,607529496,607709751,607890020,608070303,608250599,608430908,
-	608611231,608791566,608971916,609152278,609332654,609513044,609693446,609873862,610054292,610234735,
-	610415191,610595660,610776143,610956639,611137148,611317671,611498207,611678756,611859319,612039895,
-	612220484,612401087,612581703,612762332,612942975,613123631,613304300,613484983,613665679,613846388,
-	614027110,614207846,614388595,614569357,614750133,614930922,615111724,615292540,615473368,615654210,
-	615835066,616015934,616196816,616377712,616558620,616739542,616920477,617101425,617282386,617463361,
-	617644349,617825351,618006365,618187393,618368434,618549488,618730556,618911637,619092731,619273838,
-	619454959,619636093,619817240,619998400,620179573,620360760,620541960,620723173,620904400,621085639,
-	621266892,621448158,621629438,621810730,621992036,622173355,622354687,622536032,622717391,622898763,
-	623080148,623261546,623442957,623624382,623805820,623987271,624168735,624350212,624531703,624713207,
-	624894724,625076254,625257797,625439354,625620923,625802506,625984102,626165711,626347334,626528969,
-	626710618,626892280,627073955,627255643,627437344,627619058,627800786,627982527,628164281,628346048,
-	628527828,628709621,628891428,629073248,629255080,629436926,629618785,629800658,629982543,630164441,
-	630346353,630528278,630710215,630892166,631074130,631256108,631438098,631620101,631802118,631984147,
-	632166190,632348246,632530315,632712397,632894492,633076600,633258722,633440856,633623004,633805164,
-	633987338,634169525,634351725,634533938,634716164,634898403,635080655,635262921,635445199,635627490,
-	635809795,635992113,636174443,636356787,636539144,636721514,636903896,637086292,637268701,637451123,
-	637633559,637816007,637998468,638180942,638363430,638545930,638728443,638910970,639093509,639276062,
-	639458627,639641206,639823797,640006402,640189020,640371650,640554294,640736951,640919621,641102303,
-	641284999,641467708,641650430,641833165,642015912,642198673,642381447,642564234,642747034,642929846,
-	643112672,643295511,643478363,643661228,643844105,644026996,644209900,644392817,644575746,644758689,
-	644941645,645124613,645307595,645490590,645673597,645856618,646039651,646222698,646405757,646588830,
-	646771915,646955013,647138125,647321249,647504386,647687536,647870699,648053875,648237064,648420266,
-	648603481,648786709,648969949,649153203,649336470,649519749,649703042,649886347,650069665,650252997,
-	650436341,650619698,650803068,650986451,651169847,651353255,651536677,651720112,651903559,652087020,
-	652270493,652453979,652637478,652820990,653004515,653188053,653371604,653555167,653738744,653922333,
-	654105935,654289550,654473178,654656819,654840473,655024140,655207819,655391512,655575217,655758935,
-	655942666,656126410,656310167,656493936,656677719,656861514,657045322,657229143,657412977,657596824,
-	657780683,657964556,658148441,658332339,658516250,658700174,658884111,659068060,659252023,659435998,
-	659619986,659803987,659988000,660172027,660356066,660540118,660724183,660908261,661092351,661276455,
-	661460571,661644700,661828842,662012997,662197164,662381344,662565538,662749743,662933962,663118194,
-	663302438,663486695,663670965,663855247,664039543,664223851,664408172,664592506,664776853,664961212,
-	665145584,665329969,665514367,665698777,665883200,666067636,666252085,666436547,666621021,666805508,
-	666990008,667174521,667359046,667543584,667728135,667912699,668097275,668281864,668466466,668651081,
-	668835708,669020348,669205001,669389667,669574345,669759036,669943740,670128456,670313185,670497927,
-	670682682,670867450,671052230,671237023,671421828,671606647,671791478,671976321,672161178,672346047,
-	672530929,672715823,672900731,673085651,673270583,673455529,673640487,673825458,674010441,674195437,
-	674380446,674565468,674750502,674935549,675120609,675305681,675490766,675675863,675860974,676046097,
-	676231232,676416381,676601542,676786716,676971902,677157101,677342313,677527537,677712774,677898024,
-	678083286,678268561,678453849,678639149,678824462,679009787,679195126,679380477,679565840,679751216,
-	679936605,680122006,680307421,680492847,680678287,680863739,681049203,681234680,681420170,681605673,
-	681791188,681976716,682162256,682347809,682533374,682718953,682904543,683090147,683275763,683461391,
-	683647033,683832687,684018353,684204032,684389724,684575428,684761145,684946874,685132616,685318371,
-	685504138,685689918,685875710,686061515,686247332,686433163,686619005,686804861,686990728,687176609,
-	687362502,687548407,687734325,687920256,688106199,688292155,688478123,688664104,688850098,689036104,
-	689222122,689408154,689594197,689780254,689966322,690152404,690338498,690524604,690710723,690896854,
-	691082998,691269155,691455324,691641506,691827700,692013907,692200126,692386358,692572602,692758859,
-	692945128,693131410,693317704,693504011,693690330,693876662,694063007,694249364,694435733,694622115,
-	694808509,694994916,695181336,695367768,695554212,695740669,695927138,696113620,696300115,696486621,
-	696673141,696859673,697046217,697232774,697419343,697605925,697792519,697979126,698165745,698352377,
-	698539021,698725677,698912347,699099028,699285722,699472429,699659147,699845879,700032623,700219379,
-	700406148,700592929,700779723,700966529,701153347,701340178,701527022,701713878,701900746,702087627,
-	702274520,702461425,702648343,702835274,703022217,703209172,703396140,703583120,703770113,703957118,
-	704144135,704331165,704518208,704705262,704892329,705079409,705266501,705453605,705640722,705827851,
-	706014993,706202147,706389313,706576492,706763683,706950887,707138103,707325331,707512572,707699825,
-	707887090,708074368,708261659,708448961,708636276,708823604,709010944,709198296,709385660,709573037,
-	709760427,709947828,710135242,710322669,710510107,710697559,710885022,711072498,711259986,711447487,
-	711635000,711822525,712010063,712197613,712385175,712572750,712760337,712947936,713135548,713323172,
-	713510808,713698457,713886118,714073791,714261477,714449175,714636885,714824608,715012343,715200090,
-	715387850,715575622,715763406,715951203,716139012,716326833,716514667,716702513,716890371,717078242,
-	717266124,717454019,717641927,717829847,718017779,718205723,718393680,718581648,718769630,718957623,
-	719145629,719333647,719521677,719709720,719897775,720085842,720273922,720462013,720650117,720838234,
-	721026362,721214503,721402656,721590822,721778999,721967189,722155392,722343606,722531833,722720072,
-	722908323,723096587,723284862,723473150,723661451,723849763,724038088,724226425,724414774,724603136,
-	724791509,724979895,725168294,725356704,725545127,725733562,725922009,726110468,726298940,726487424,
-	726675920,726864428,727052949,727241481,727430026,727618583,727807153,727995734,728184328,728372934,
-	728561553,728750183,728938826,729127480,729316148,729504827,729693518,729882222,730070938,730259666,
-	730448406,730637159,730825923,731014700,731203489,731392290,731581104,731769929,731958767,732147617,
-	732336479,732525353,732714240,732903139,733092049,733280972,733469908,733658855,733847814,734036786,
-	734225770,734414766,734603774,734792794,734981827,735170871,735359928,735548997,735738078,735927171,
-	736116277,736305394,736494524,736683666,736872820,737061986,737251164,737440354,737629557,737818771,
-	738007998,738197237,738386488,738575751,738765026,738954314,739143613,739332925,739522249,739711585,
-	739900933,740090293,740279665,740469049,740658446,740847854,741037275,741226708,741416152,741605609,
-	741795078,741984560,742174053,742363558,742553076,742742605,742932147,743121701,743311266,743500844,
-	743690434,743880036,744069651,744259277,744448915,744638566,744828228,745017903,745207589,745397288,
-	745586999,745776721,745966456,746156203,746345962,746535733,746725517,746915312,747105119,747294938,
-	747484770,747674613,747864469,748054336,748244216,748434107,748624011,748813927,749003855,749193794,
-	749383746,749573710,749763686,749953674,750143674,750333686,750523710,750713746,750903794,751093854,
-	751283926,751474011,751664107,751854215,752044335,752234467,752424612,752614768,752804936,752995117,
-	753185309,753375513,753565729,753755958,753946198,754136450,754326715,754516991,754707279,754897580,
-	755087892,755278216,755468553,755658901,755849261,756039633,756230018,756420414,756610822,756801242,
-	756991675,757182119,757372575,757563043,757753523,757944015,758134519,758325035,758515563,758706103,
-	758896655,759087219,759277794,759468382,759658982,759849593,760040217,760230853,760421500,760612160,
-	760802831,760993514,761184210,761374917,761565636,761756367,761947110,762137866,762328632,762519411,
-	762710202,762901005,763091820,763282646,763473485,763664335,763855198,764046072,764236958,764427856,
-	764618767,764809689,765000622,765191568,765382526,765573496,765764477,765955471,766146476,766337493,
-	766528523,766719564,766910617,767101682,767292758,767483847,767674948,767866060,768057185,768248321,
-	768439469,768630629,768821801,769012985,769204180,769395388,769586607,769777839,769969082,770160337,
-	770351604,770542883,770734174,770925476,771116791,771308117,771499455,771690805,771882167,772073541,
-	772264926,772456324,772647733,772839155,773030588,773222032,773413489,773604958,773796438,773987931,
-	774179435,774370951,774562479,774754018,774945570,775137133,775328708,775520295,775711894,775903505,
-	776095127,776286762,776478408,776670066,776861736,777053417,777245111,777436816,777628533,777820262,
-	778012003,778203755,778395520,778587296,778779084,778970884,779162695,779354519,779546354,779738201,
-	779930060,780121930,780313813,780505707,780697613,780889531,781081460,781273402,781465355,781657320,
-	781849297,782041285,782233285,782425297,782617321,782809357,783001404,783193464,783385535,783577617,
-	783769712,783961818,784153936,784346066,784538208,784730361,784922526,785114703,785306892,785499092,
-	785691304,785883528,786075764,786268012,786460271,786652542,786844824,787037119,787229425,787421743,
-	787614073,787806414,787998767,788191132,788383509,788575897,788768297,788960709,789153133,789345568,
-	789538015,789730474,789922944,790115426,790307920,790500426,790692943,790885472,791078013,791270566,
-	791463130,791655706,791848294,792040893,792233504,792426127,792618762,792811408,793004066,793196735,
-	793389417,793582110,793774814,793967531,794160259,794352999,794545750,794738513,794931288,795124075,
-	795316873,795509683,795702505,795895338,796088183,796281039,796473908,796666788,796859680,797052583,
-	797245498,797438425,797631363,797824313,798017275,798210248,798403233,798596230,798789238,798982258,
-	799175290,799368333,799561388,799754455,799947533,800140623,800333725,800526838,800719963,800913099,
-	801106248,801299407,801492579,801685762,801878957,802072163,802265381,802458611,802651852,802845105,
-	803038370,803231646,803424934,803618233,803811544,804004867,804198201,804391547,804584905,804778274,
-	804971654,805165047,805358451,805551866,805745294,805938733,806132183,806325645,806519119,806712604,
-	806906101,807099609,807293129,807486661,807680204,807873759,808067326,808260904,808454493,808648094,
-	808841707,809035332,809228968,809422615,809616274,809809945,810003627,810197321,810391027,810584744,
-	810778472,810972213,811165964,811359728,811553503,811747289,811941087,812134897,812328718,812522551,
-	812716395,812910251,813104118,813297997,813491888,813685790,813879703,814073628,814267565,814461513,
-	814655473,814849445,815043427,815237422,815431428,815625445,815819475,816013515,816207567,816401631,
-	816595706,816789793,816983891,817178001,817372122,817566255,817760400,817954555,818148723,818342902,
-	818537092,818731294,818925508,819119733,819313969,819508217,819702477,819896748,820091031,820285325,
-	820479630,820673947,820868276,821062616,821256968,821451331,821645705,821840091,822034489,822228898,
-	822423319,822617751,822812194,823006649,823201116,823395594,823590083,823784584,823979097,824173621,
-	824368156,824562703,824757261,824951831,825146413,825341005,825535610,825730225,825924853,826119491,
-	826314141,826508803,826703476,826898160,827092856,827287564,827482283,827677013,827871755,828066508,
-	828261273,828456049,828650837,828845636,829040446,829235268,829430102,829624946,829819803,830014670,
-	830209550,830404440,830599342,830794256,830989181,831184117,831379065,831574024,831768994,831963976,
-	832158970,832353975,832548991,832744019,832939058,833134109,833329170,833524244,833719329,833914425,
-	834109533,834304652,834499782,834694924,834890077,835085242,835280418,835475605,835670804,835866015,
-	836061236,836256469,836451714,836646970,836842237,837037516,837232806,837428107,837623420,837818744,
-	838014080,838209427,838404785,838600155,838795536,838990928,839186332,839381747,839577174,839772612,
-	839968061,840163522,840358994,840554478,840749972,840945479,841140996,841336525,841532065,841727617,
-	841923180,842118754,842314340,842509937,842705546,842901165,843096797,843292439,843488093,843683758,
-	843879435,844075122,844270822,844466532,844662254,844857987,845053732,845249488,845445255,845641034,
-	845836823,846032625,846228437,846424261,846620096,846815943,847011801,847207670,847403550,847599442,
-	847795345,847991260,848187186,848383123,848579071,848775031,848971002,849166984,849362978,849558983,
-	849754999,849951027,850147065,850343116,850539177,850735250,850931334,851127429,851323536,851519654,
-	851715783,851911924,852108076,852304239,852500413,852696599,852892796,853089004,853285224,853481454,
-	853677697,853873950,854070215,854266491,854462778,854659076,854855386,855051707,855248039,855444383,
-	855640738,855837104,856033481,856229870,856426270,856622681,856819103,857015537,857211982,857408438,
-	857604905,857801384,857997874,858194375,858390888,858587411,858783946,858980492,859177050,859373619,
-	859570198,859766790,859963392,860160006,860356630,860553267,860749914,860946572,861143242,861339923,
-	861536615,861733319,861930034,862126760,862323497,862520245,862717005,862913775,863110557,863307351,
-	863504155,863700971,863897798,864094636,864291485,864488346,864685217,864882100,865078994,865275900,
-	865472816,865669744,865866683,866063633,866260595,866457567,866654551,866851546,867048552,867245569,
-	867442598,867639637,867836688,868033750,868230823,868427908,868625004,868822110,869019228,869216357,
-	869413498,869610649,869807812,870004986,870202171,870399367,870596574,870793793,870991023,871188264,
-	871385516,871582779,871780053,871977339,872174635,872371943,872569262,872766592,872963934,873161286,
-	873358650,873556024,873753410,873950807,874148216,874345635,874543065,874740507,874937960,875135424,
-	875332899,875530385,875727882,875925391,876122910,876320441,876517983,876715536,876913100,877110675,
-	877308262,877505859,877703468,877901088,878098719,878296361,878494014,878691678,878889353,879087040,
-	879284737,879482446,879680166,879877897,880075639,880273392,880471156,880668932,880866718,881064516,
-	881262324,881460144,881657975,881855817,882053670,882251534,882449409,882647296,882845193,883043102,
-	883241021,883438952,883636894,883834847,884032811,884230786,884428772,884626769,884824777,885022797,
-	885220827,885418869,885616921,885814985,886013060,886211145,886409242,886607350,886805469,887003599,
-	887201741,887399893,887598056,887796230,887994416,888192612,888390820,888589038,888787268,888985509,
-	889183760,889382023,889580297,889778582,889976878,890175185,890373503,890571832,890770172,890968523,
-	891166885,891365258,891563643,891762038,891960444,892158862,892357290,892555729,892754180,892952641,
-	893151114,893349597,893548092,893746597,893945114,894143642,894342180,894540730,894739291,894937862,
-	895136445,895335039,895533644,895732259,895930886,896129524,896328173,896526833,896725503,896924185,
-	897122878,897321582,897520297,897719022,897917759,898116507,898315266,898514036,898712816,898911608,
-	899110411,899309225,899508050,899706885,899905732,900104590,900303458,900502338,900701229,900900130,
-	901099043,901297967,901496901,901695847,901894803,902093771,902292749,902491739,902690739,902889750,
-	903088773,903287806,903486850,903685906,903884972,904084049,904283137,904482236,904681346,904880467,
-	905079599,905278742,905477896,905677061,905876237,906075423,906274621,906473829,906673049,906872279,
-	907071521,907270773,907470037,907669311,907868596,908067892,908267199,908466517,908665846,908865186,
-	909064537,909263899,909463271,909662655,909862049,910061455,910260871,910460298,910659737,910859186,
-	911058646,911258117,911457599,911657091,911856595,912056110,912255635,912455172,912654719,912854277,
-	913053846,913253426,913453017,913652619,913852232,914051856,914251490,914451136,914650792,914850459,
-	915050138,915249827,915449527,915649237,915848959,916048692,916248435,916448190,916647955,916847731,
-	917047518,917247316,917447125,917646945,917846775,918046617,918246469,918446332,918646206,918846091,
-	919045987,919245894,919445811,919645740,919845679,920045629,920245590,920445562,920645545,920845538,
-	921045543,921245558,921445584,921645621,921845669,922045728,922245797,922445878,922645969,922846071,
-	923046184,923246308,923446443,923646588,923846745,924046912,924247090,924447279,924647479,924847689,
-	925047911,925248143,925448386,925648640,925848904,926049180,926249466,926449764,926650072,926850391,
-	927050720,927251061,927451412,927651774,927852147,928052531,928252926,928453331,928653747,928854174,
-	929054612,929255061,929455521,929655991,929856472,930056964,930257467,930457980,930658504,930859040,
-	931059586,931260142,931460710,931661288,931861877,932062477,932263088,932463709,932664342,932864985,
-	933065639,933266303,933466979,933667665,933868362,934069070,934269789,934470518,934671258,934872009,
-	935072771,935273543,935474326,935675120,935875925,936076741,936277567,936478404,936679252,936880111,
-	937080980,937281861,937482751,937683653,937884566,938085489,938286423,938487368,938688323,938889289,
-	939090266,939291254,939492253,939693262,939894282,940095313,940296354,940497407,940698470,940899543,
-	941100628,941301723,941502829,941703946,941905073,942106212,942307361,942508520,942709691,942910872,
-	943112064,943313266,943514480,943715704,943916938,944118184,944319440,944520707,944721985,944923273,
-	945124572,945325882,945527203,945728534,945929876,946131229,946332592,946533966,946735351,946936747,
-	947138153,947339570,947540998,947742436,947943885,948145345,948346815,948548297,948749789,948951291,
-	949152804,949354328,949555863,949757409,949958965,950160531,950362109,950563697,950765296,950966905,
-	951168526,951370156,951571798,951773450,951975113,952176787,952378471,952580166,952781872,952983588,
-	953185315,953387053,953588801,953790560,953992330,954194110,954395901,954597703,954799515,955001338,
-	955203172,955405016,955606871,955808737,956010613,956212500,956414398,956616306,956818225,957020155,
-	957222095,957424046,957626008,957827980,958029963,958231956,958433960,958635975,958838001,959040037,
-	959242083,959444141,959646209,959848287,960050377,960252477,960454587,960656708,960858840,961060983,
-	961263136,961465299,961667474,961869659,962071854,962274060,962476277,962678505,962880743,963082991,
-	963285251,963487521,963689801,963892092,964094394,964296707,964499030,964701363,964903707,965106062,
-	965308428,965510804,965713190,965915588,966117995,966320414,966522843,966725283,966927733,967130194,
-	967332665,967535147,967737640,967940143,968142657,968345181,968547716,968750262,968952818,969155385,
-	969357962,969560550,969763149,969965758,970168378,970371008,970573649,970776300,970978962,971181635,
-	971384318,971587011,971789716,971992431,972195156,972397892,972600639,972803396,973006163,973208942,
-	973411731,973614530,973817340,974020160,974222991,974425833,974628685,974831548,975034421,975237305,
-	975440200,975643105,975846020,976048946,976251883,976454830,976657788,976860756,977063735,977266724,
-	977469724,977672734,977875755,978078787,978281829,978484881,978687944,978891018,979094102,979297197,
-	979500302,979703418,979906544,980109681,980312828,980515986,980719154,980922333,981125523,981328723,
-	981531933,981735154,981938386,982141628,982344880,982548143,982751417,982954701,983157995,983361300,
-	983564616,983767942,983971279,984174626,984377983,984581352,984784730,984988119,985191519,985394929,
-	985598350,985801781,986005222,986208675,986412137,986615610,986819094,987022588,987226092,987429608,
-	987633133,987836669,988040216,988243773,988447340,988650918,988854506,989058105,989261715,989465335,
-	989668965,989872606,990076257,990279919,990483591,990687274,990890967,991094671,991298385,991502109,
-	991705844,991909590,992113346,992317112,992520889,992724677,992928475,993132283,993336102,993539931,
-	993743770,993947620,994151481,994355352,994559234,994763125,994967028,995170941,995374864,995578798,
-	995782742,995986696,996190661,996394637,996598623,996802619,997006626,997210643,997414671,997618709,
-	997822757,998026816,998230886,998434965,998639056,998843156,999047267,999251389,999455521,999659663,
-	999863816,1000067979,1000272153,1000476337,1000680531,1000884736,1001088952,1001293177,1001497413,1001701660,
-	1001905917,1002110184,1002314462,1002518750,1002723049,1002927358,1003131677,1003336007,1003540347,1003744698,
-	1003949059,1004153430,1004357812,1004562204,1004766607,1004971020,1005175443,1005379877,1005584321,1005788776,
-	1005993241,1006197716,1006402202,1006606698,1006811205,1007015722,1007220249,1007424787,1007629335,1007833893,
-	1008038462,1008243041,1008447631,1008652231,1008856841,1009061462,1009266093,1009470734,1009675386,1009880048,
-	1010084721,1010289404,1010494097,1010698801,1010903515,1011108239,1011312974,1011517719,1011722475,1011927241,
-	1012132017,1012336803,1012541600,1012746407,1012951225,1013156053,1013360891,1013565740,1013770599,1013975469,
-	1014180348,1014385238,1014590139,1014795050,1014999971,1015204902,1015409844,1015614796,1015819759,1016024732,
-	1016229715,1016434708,1016639712,1016844726,1017049751,1017254786,1017459831,1017664886,1017869952,1018075028,
-	1018280115,1018485212,1018690319,1018895436,1019100564,1019305702,1019510851,1019716009,1019921179,1020126358,
-	1020331548,1020536748,1020741958,1020947179,1021152410,1021357651,1021562903,1021768165,1021973437,1022178719,
-	1022384012,1022589315,1022794629,1022999953,1023205287,1023410631,1023615986,1023821351,1024026726,1024232111,
-	1024437507,1024642913,1024848330,1025053757,1025259194,1025464641,1025670099,1025875566,1026081045,1026286533,
-	1026492032,1026697541,1026903060,1027108590,1027314130,1027519680,1027725240,1027930811,1028136392,1028341984,
-	1028547585,1028753197,1028958819,1029164451,1029370094,1029575747,1029781410,1029987084,1030192768,1030398462,
-	1030604166,1030809880,1031015605,1031221340,1031427086,1031632841,1031838607,1032044383,1032250170,1032455966,
-	1032661773,1032867590,1033073418,1033279255,1033485103,1033690961,1033896830,1034102708,1034308597,1034514496,
-	1034720406,1034926325,1035132255,1035338195,1035544146,1035750106,1035956077,1036162058,1036368050,1036574051,
-	1036780063,1036986085,1037192117,1037398160,1037604212,1037810275,1038016348,1038222432,1038428526,1038634629,
-	1038840743,1039046868,1039253002,1039459147,1039665302,1039871467,1040077643,1040283828,1040490024,1040696230,
-	1040902446,1041108673,1041314910,1041521157,1041727414,1041933681,1042139959,1042346246,1042552544,1042758852,
-	1042965171,1043171499,1043377838,1043584187,1043790546,1043996916,1044203295,1044409685,1044616085,1044822495,
-	1045028916,1045235346,1045441787,1045648238,1045854699,1046061170,1046267652,1046474144,1046680645,1046887158,
-	1047093680,1047300212,1047506755,1047713308,1047919871,1048126444,1048333027,1048539621,1048746224,1048952838,
-	1049159462,1049366097,1049572741,1049779396,1049986060,1050192735,1050399420,1050606116,1050812821,1051019537,
-	1051226262,1051432998,1051639744,1051846500,1052053267,1052260043,1052466830,1052673627,1052880434,1053087251,
-	1053294079,1053500916,1053707764,1053914622,1054121489,1054328368,1054535256,1054742154,1054949063,1055155981,
-	1055362910,1055569849,1055776798,1055983758,1056190727,1056397707,1056604696,1056811696,1057018706,1057225726,
-	1057432756,1057639797,1057846847,1058053908,1058260979,1058468059,1058675150,1058882252,1059089363,1059296484,
-	1059503616,1059710757,1059917909,1060125071,1060332243,1060539425,1060746617,1060953820,1061161032,1061368255,
-	1061575488,1061782730,1061989983,1062197246,1062404520,1062611803,1062819096,1063026400,1063233713,1063441037,
-	1063648371,1063855715,1064063069,1064270433,1064477807,1064685192,1064892586,1065099990,1065307405,1065514830,
-	1065722265,1065929709,1066137164,1066344630,1066552105,1066759590,1066967085,1067174591,1067382106,1067589632,
-	1067797168,1068004714,1068212269,1068419835,1068627411,1068834998,1069042594,1069250200,1069457816,1069665443,
-	1069873079,1070080726,1070288383,1070496049,1070703726,1070911413,1071119110,1071326817,1071534534,1071742261,
-	1071949998,1072157746,1072365503,1072573270,1072781048,1072988835,1073196633,1073404441,1073612258,1073820086,
-	1074027924,1074235772,1074443630,1074651498,1074859376,1075067264,1075275162,1075483070,1075690988,1075898917,
-	1076106855,1076314803,1076522762,1076730730,1076938709,1077146697,1077354696,1077562705,1077770723,1077978752,
-	1078186791,1078394839,1078602898,1078810967,1079019046,1079227135,1079435234,1079643343,1079851462,1080059591,
-	1080267730,1080475879,1080684038,1080892207,1081100386,1081308576,1081516775,1081724984,1081933203,1082141432,
-	1082349672,1082557921,1082766180,1082974450,1083182729,1083391018,1083599318,1083807627,1084015947,1084224276,
-	1084432615,1084640965,1084849324,1085057694,1085266073,1085474462,1085682862,1085891271,1086099691,1086308120,
-	1086516560,1086725009,1086933468,1087141938,1087350417,1087558907,1087767406,1087975915,1088184435,1088392964,
-	1088601503,1088810053,1089018612,1089227181,1089435761,1089644350,1089852949,1090061559,1090270178,1090478807,
-	1090687446,1090896095,1091104754,1091313424,1091522103,1091730792,1091939491,1092148200,1092356919,1092565648,
-	1092774387,1092983136,1093191894,1093400663,1093609442,1093818231,1094027030,1094235838,1094444657,1094653486,
-	1094862324,1095071173,1095280031,1095488900,1095697778,1095906666,1096115565,1096324473,1096533391,1096742319,
-	1096951257,1097160206,1097369164,1097578132,1097787109,1097996097,1098205095,1098414103,1098623121,1098832148,
-	1099041186,1099250233,1099459291,1099668358,1099877435,1100086523,1100295620,1100504727,1100713844,1100922971,
-	1101132108,1101341255,1101550412,1101759578,1101968755,1102177942,1102387138,1102596345,1102805561,1103014787,
-	1103224023,1103433270,1103642526,1103851792,1104061067,1104270353,1104479649,1104688955,1104898270,1105107596,
-	1105316931,1105526276,1105735631,1105944997,1106154372,1106363756,1106573151,1106782556,1106991971,1107201395,
-	1107410830,1107620274,1107829728,1108039192,1108248667,1108458150,1108667644,1108877148,1109086662,1109296185,
-	1109505719,1109715262,1109924815,1110134378,1110343951,1110553534,1110763127,1110972730,1111182342,1111391965,
-	1111601597,1111811239,1112020891,1112230553,1112440225,1112649907,1112859598,1113069300,1113279011,1113488733,
-	1113698464,1113908205,1114117956,1114327716,1114537487,1114747267,1114957058,1115166858,1115376668,1115586488,
-	1115796318,1116006157,1116216007,1116425866,1116635736,1116845615,1117055504,1117265403,1117475311,1117685230,
-	1117895158,1118105097,1118315045,1118525003,1118734971,1118944948,1119154936,1119364933,1119574941,1119784958,
-	1119994985,1120205022,1120415068,1120625125,1120835191,1121045267,1121255353,1121465449,1121675555,1121885670,
-	1122095796,1122305931,1122516076,1122726231,1122936396,1123146570,1123356755,1123566949,1123777153,1123987367,
-	1124197590,1124407824,1124618067,1124828321,1125038584,1125248856,1125459139,1125669432,1125879734,1126090046,
-	1126300368,1126510700,1126721041,1126931393,1127141754,1127352125,1127562506,1127772897,1127983297,1128193707,
-	1128404127,1128614557,1128824997,1129035447,1129245906,1129456375,1129666854,1129877343,1130087841,1130298350,
-	1130508868,1130719396,1130929934,1131140481,1131351039,1131561606,1131772183,1131982769,1132193366,1132403972,
-	1132614588,1132825214,1133035850,1133246496,1133457151,1133667816,1133878491,1134089176,1134299870,1134510574,
-	1134721288,1134932012,1135142746,1135353489,1135564242,1135775005,1135985778,1136196560,1136407352,1136618154,
-	1136828966,1137039788,1137250619,1137461460,1137672311,1137883172,1138094042,1138304922,1138515812,1138726712,
-	1138937622,1139148541,1139359470,1139570409,1139781357,1139992315,1140203284,1140414261,1140625249,1140836246,
-	1141047253,1141258270,1141469297,1141680333,1141891379,1142102435,1142313501,1142524576,1142735661,1142946756,
-	1143157861,1143368975,1143580099,1143791233,1144002377,1144213530,1144424693,1144635866,1144847048,1145058241,
-	1145269443,1145480655,1145691876,1145903107,1146114348,1146325599,1146536859,1146748130,1146959410,1147170699,
-	1147381999,1147593308,1147804626,1148015955,1148227293,1148438641,1148649999,1148861367,1149072744,1149284131,
-	1149495527,1149706934,1149918350,1150129775,1150341211,1150552656,1150764111,1150975576,1151187050,1151398534,
-	1151610028,1151821531,1152033044,1152244567,1152456100,1152667642,1152879194,1153090756,1153302327,1153513909,
-	1153725499,1153937100,1154148710,1154360330,1154571960,1154783599,1154995248,1155206907,1155418575,1155630253,
-	1155841941,1156053639,1156265346,1156477063,1156688789,1156900526,1157112272,1157324027,1157535793,1157747568,
-	1157959352,1158171147,1158382951,1158594765,1158806588,1159018421,1159230264,1159442116,1159653979,1159865850,
-	1160077732,1160289623,1160501524,1160713435,1160925355,1161137285,1161349224,1161561173,1161773132,1161985101,
-	1162197079,1162409067,1162621064,1162833072,1163045089,1163257115,1163469151,1163681197,1163893253,1164105318,
-	1164317393,1164529477,1164741571,1164953675,1165165789,1165377912,1165590045,1165802187,1166014339,1166226501,
-	1166438672,1166650853,1166863044,1167075244,1167287454,1167499674,1167711903,1167924142,1168136390,1168348649,
-	1168560916,1168773194,1168985481,1169197778,1169410084,1169622400,1169834726,1170047061,1170259406,1170471761,
-	1170684125,1170896499,1171108882,1171321275,1171533678,1171746090,1171958512,1172170944,1172383385,1172595836,
-	1172808296,1173020766,1173233246,1173445735,1173658234,1173870743,1174083261,1174295789,1174508326,1174720873,
-	1174933430,1175145996,1175358572,1175571158,1175783753,1175996357,1176208972,1176421596,1176634229,1176846872,
-	1177059525,1177272187,1177484859,1177697541,1177910232,1178122933,1178335643,1178548363,1178761093,1178973832,
-	1179186581,1179399339,1179612107,1179824884,1180037672,1180250468,1180463275,1180676090,1180888916,1181101751,
-	1181314596,1181527450,1181740314,1181953187,1182166070,1182378963,1182591865,1182804777,1183017698,1183230629,
-	1183443570,1183656520,1183869480,1184082449,1184295428,1184508416,1184721414,1184934422,1185147439,1185360465,
-	1185573502,1185786548,1185999603,1186212668,1186425743,1186638827,1186851920,1187065024,1187278136,1187491259,
-	1187704391,1187917532,1188130683,1188343844,1188557014,1188770194,1188983383,1189196582,1189409790,1189623008,
-	1189836236,1190049473,1190262720,1190475976,1190689242,1190902517,1191115802,1191329096,1191542400,1191755713,
-	1191969036,1192182369,1192395711,1192609063,1192822424,1193035795,1193249175,1193462565,1193675964,1193889373,
-	1194102791,1194316219,1194529657,1194743104,1194956561,1195170027,1195383502,1195596987,1195810482,1196023986,
-	1196237500,1196451023,1196664556,1196878099,1197091650,1197305212,1197518783,1197732363,1197945953,1198159553,
-	1198373162,1198586780,1198800408,1199014046,1199227693,1199441349,1199655015,1199868691,1200082376,1200296071,
-	1200509775,1200723489,1200937212,1201150944,1201364687,1201578438,1201792200,1202005970,1202219750,1202433540,
-	1202647339,1202861148,1203074966,1203288794,1203502631,1203716478,1203930334,1204144200,1204358075,1204571960,
-	1204785854,1204999758,1205213671,1205427594,1205641526,1205855467,1206069419,1206283379,1206497349,1206711329,
-	1206925318,1207139317,1207353325,1207567342,1207781369,1207995406,1208209452,1208423507,1208637572,1208851647,
-	1209065731,1209279824,1209493927,1209708039,1209922161,1210136293,1210350433,1210564584,1210778743,1210992912,
-	1211207091,1211421279,1211635477,1211849684,1212063900,1212278126,1212492362,1212706607,1212920861,1213135125,
-	1213349398,1213563681,1213777973,1213992275,1214206586,1214420907,1214635237,1214849576,1215063925,1215278284,
-	1215492652,1215707029,1215921416,1216135812,1216350218,1216564633,1216779057,1216993491,1217207935,1217422388,
-	1217636850,1217851322,1218065803,1218280294,1218494794,1218709304,1218923823,1219138351,1219352889,1219567436,
-	1219781993,1219996559,1220211135,1220425720,1220640314,1220854918,1221069532,1221284154,1221498787,1221713428,
-	1221928079,1222142740,1222357410,1222572089,1222786778,1223001476,1223216184,1223430901,1223645627,1223860363,
-	1224075109,1224289863,1224504627,1224719401,1224934184,1225148976,1225363778,1225578589,1225793410,1226008240,
-	1226223080,1226437928,1226652787,1226867654,1227082531,1227297418,1227512314,1227727219,1227942134,1228157058,
-	1228371992,1228586934,1228801887,1229016849,1229231820,1229446800,1229661790,1229876789,1230091798,1230306816,
-	1230521844,1230736881,1230951927,1231166983,1231382048,1231597122,1231812206,1232027299,1232242402,1232457514,
-	1232672636,1232887766,1233102907,1233318056,1233533215,1233748383,1233963561,1234178748,1234393945,1234609151,
-	1234824366,1235039590,1235254824,1235470068,1235685321,1235900583,1236115854,1236331135,1236546425,1236761725,
-	1236977034,1237192352,1237407680,1237623017,1237838364,1238053719,1238269085,1238484459,1238699843,1238915236,
-	1239130639,1239346051,1239561472,1239776903,1239992343,1240207793,1240423251,1240638720,1240854197,1241069684,
-	1241285180,1241500686,1241716201,1241931725,1242147259,1242362802,1242578354,1242793916,1243009487,1243225067,
-	1243440657,1243656256,1243871864,1244087482,1244303109,1244518745,1244734391,1244950046,1245165711,1245381385,
-	1245597068,1245812760,1246028462,1246244173,1246459894,1246675623,1246891363,1247107111,1247322869,1247538636,
-	1247754413,1247970198,1248185993,1248401798,1248617612,1248833435,1249049267,1249265109,1249480960,1249696820,
-	1249912690,1250128569,1250344458,1250560355,1250776262,1250992179,1251208104,1251424039,1251639983,1251855937,
-	1252071900,1252287872,1252503854,1252719845,1252935845,1253151854,1253367873,1253583901,1253799938,1254015985,
-	1254232041,1254448106,1254664181,1254880265,1255096358,1255312461,1255528572,1255744693,1255960824,1256176964,
-	1256393113,1256609271,1256825438,1257041615,1257257802,1257473997,1257690202,1257906416,1258122639,1258338872,
-	1258555114,1258771365,1258987626,1259203895,1259420174,1259636463,1259852760,1260069067,1260285384,1260501709,
-	1260718044,1260934388,1261150741,1261367104,1261583476,1261799857,1262016248,1262232647,1262449056,1262665475,
-	1262881902,1263098339,1263314785,1263531241,1263747705,1263964179,1264180662,1264397155,1264613657,1264830168,
-	1265046688,1265263217,1265479756,1265696304,1265912861,1266129428,1266346004,1266562589,1266779183,1266995787,
-	1267212400,1267429022,1267645653,1267862294,1268078944,1268295603,1268512271,1268728949,1268945636,1269162332,
-	1269379038,1269595752,1269812476,1270029209,1270245952,1270462703,1270679464,1270896234,1271113014,1271329802,
-	1271546600,1271763407,1271980224,1272197049,1272413884,1272630728,1272847582,1273064444,1273281316,1273498197,
-	1273715087,1273931987,1274148895,1274365813,1274582740,1274799677,1275016622,1275233577,1275450541,1275667515,
-	1275884497,1276101489,1276318490,1276535500,1276752520,1276969548,1277186586,1277403633,1277620690,1277837755,
-	1278054830,1278271914,1278489007,1278706110,1278923221,1279140342,1279357472,1279574611,1279791760,1280008918,
-	1280226085,1280443261,1280660446,1280877641,1281094844,1281312057,1281529279,1281746511,1281963751,1282181001,
-	1282398260,1282615528,1282832806,1283050092,1283267388,1283484693,1283702007,1283919331,1284136663,1284354005,
-	1284571356,1284788716,1285006085,1285223464,1285440852,1285658249,1285875655,1286093070,1286310494,1286527928,
-	1286745371,1286962823,1287180284,1287397755,1287615234,1287832723,1288050221,1288267728,1288485245,1288702770,
-	1288920305,1289137849,1289355402,1289572964,1289790535,1290008116,1290225706,1290443305,1290660913,1290878530,
-	1291096157,1291313792,1291531437,1291749091,1291966754,1292184426,1292402108,1292619799,1292837498,1293055207,
-	1293272925,1293490653,1293708389,1293926135,1294143890,1294361654,1294579427,1294797209,1295015000,1295232801,
-	1295450611,1295668430,1295886258,1296104095,1296321941,1296539797,1296757661,1296975535,1297193418,1297411310,
-	1297629211,1297847122,1298065041,1298282970,1298500908,1298718855,1298936811,1299154776,1299372751,1299590734,
-	1299808727,1300026729,1300244740,1300462760,1300680789,1300898828,1301116875,1301334932,1301552998,1301771072,
-	1301989157,1302207250,1302425352,1302643464,1302861584,1303079714,1303297853,1303516001,1303734158,1303952324,
-	1304170499,1304388684,1304606878,1304825080,1305043292,1305261513,1305479743,1305697982,1305916231,1306134488,
-	1306352755,1306571030,1306789315,1307007609,1307225912,1307444224,1307662546,1307880876,1308099216,1308317564,
-	1308535922,1308754289,1308972665,1309191050,1309409444,1309627847,1309846259,1310064681,1310283112,1310501551,
-	1310720000,1310938458,1311156925,1311375401,1311593886,1311812380,1312030884,1312249396,1312467918,1312686449,
-	1312904988,1313123537,1313342095,1313560662,1313779238,1313997824,1314216418,1314435021,1314653634,1314872255,
-	1315090886,1315309526,1315528175,1315746833,1315965500,1316184176,1316402861,1316621555,1316840259,1317058971,
-	1317277693,1317496423,1317715163,1317933912,1318152669,1318371436,1318590212,1318808997,1319027792,1319246595,
-	1319465407,1319684228,1319903059,1320121898,1320340747,1320559605,1320778471,1320997347,1321216232,1321435126,
-	1321654029,1321872941,1322091862,1322310792,1322529731,1322748679,1322967637,1323186603,1323405579,1323624563,
-	1323843557,1324062559,1324281571,1324500592,1324719622,1324938661,1325157708,1325376765,1325595831,1325814906,
-	1326033991,1326253084,1326472186,1326691297,1326910418,1327129547,1327348685,1327567833,1327786989,1328006155,
-	1328225329,1328444513,1328663706,1328882907,1329102118,1329321338,1329540567,1329759804,1329979051,1330198307,
-	1330417572,1330636846,1330856129,1331075421,1331294722,1331514033,1331733352,1331952680,1332172017,1332391363,
-	1332610719,1332830083,1333049456,1333268839,1333488230,1333707630,1333927040,1334146458,1334365886,1334585322,
-	1334804768,1335024222,1335243686,1335463158,1335682640,1335902131,1336121630,1336341139,1336560657,1336780183,
-	1336999719,1337219264,1337438817,1337658380,1337877952,1338097532,1338317122,1338536721,1338756329,1338975945,
-	1339195571,1339415206,1339634850,1339854503,1340074164,1340293835,1340513515,1340733204,1340952901,1341172608,
-	1341392324,1341612049,1341831783,1342051525,1342271277,1342491038,1342710808,1342930586,1343150374,1343370171,
-	1343589977,1343809791,1344029615,1344249448,1344469289,1344689140,1344909000,1345128868,1345348746,1345568633,
-	1345788528,1346008433,1346228346,1346448269,1346668200,1346888141,1347108090,1347328049,1347548016,1347767993,
-	1347987978,1348207972,1348427976,1348647988,1348868009,1349088040,1349308079,1349528127,1349748184,1349968250,
-	1350188326,1350408410,1350628503,1350848605,1351068716,1351288836,1351508965,1351729102,1351949249,1352169405,
-	1352389570,1352609744,1352829926,1353050118,1353270318,1353490528,1353710747,1353930974,1354151210,1354371456,
-	1354591710,1354811973,1355032246,1355252527,1355472817,1355693116,1355913424,
-};
-
-static real aa_cs[8] =
-{
-	14386344,14793176,15932125,16497281,16702017,16763133,16775525,16777101
-};
-
-static real aa_ca[8] =
-{
-	-8631806,-7914349,-5257601,-3051997,-1586692,-687288,-238212,-62075
-};
-
-static real win[4][36] =
-{
-	{
-		541609,1798624,3379171,5462936,8388608,12881122,20824265,39123649,129925287,-141788570,-50986933,-32687548,
-		-24744405,-20251891,-17326219,-15242454,-13661907,-12404893,-11366990,-10483150,-9710514,-9019459,-8388608,-7801881,
-		-7246655,-6712557,-6190623,-5672661,-5150726,-4616628,-4061402,-3474675,-2843824,-2152769,-1380133,-496293
-	},
-	{
-		541609,1798624,3379171,5462936,8388608,12881122,20824265,39123649,129925287,-141788570,-50986933,-32687548,
-		-24744405,-20251891,-17326219,-15242454,-13661907,-12404893,-11377819,-10573609,-9946281,-9457165,-9079764,-8795700,
-		-8518771,-7816938,-6661470,-5111526,-3237882,-1121518,
-	},
-	{
-		1798624,8388608,39123649,-50986933,-20251891,-13661907,-10483150,-8388608,-6712557,-5150726,-3474675,-1380133,
-	},
-	{
-		0,0,0,0,0,0,5058839,24594154,117073194,-152572757,-59375541,-38425694,
-		-27896396,-21920489,-18167045,-15612533,-13779795,-12416710,-11366990,-10483150,-9710514,-9019459,-8388608,-7801881,
-		-7246655,-6712557,-6190623,-5672661,-5150726,-4616628,-4061402,-3474675,-2843824,-2152769,-1380133,-496293
-	}
-};
-
-const real COS9[9] =
-{
-	16777216,16522332,15765426,14529495,12852093,10784187,8388608,5738146,2913333
-};
-
-static const real COS6_1 = 14529495;
-
-static const real COS6_2 = 8388608;
-
-const real tfcos36[9] =
-{
-	8420651,8684526,9255805,10240599,11863283,14625092,19849138,32411092,96248483
-};
-
-static const real tfcos12[3] =
-{
-	8684526,11863283,32411092
-};
-
-#ifdef NEW_DCT9
-static const real cos9[3] =
-{
-	15765426,-2913333,-12852093
-};
-
-static const real cos18[3] =
-{
-	16522332,-5738146,-10784187
-};
-#endif
-
-static const real tan1_1[16] =
-{
-	0,6925,11994,16384,20774,25843,32768,44762,77530,2147483647,-44762,-11994,0,6925,11994,16384
-};
-
-static const real tan2_1[16] =
-{
-	32768,25843,20774,16384,11994,6925,0,-11994,-44762,2147483647,77530,44762,32768,25843,20774,16384
-};
-
-static const real tan1_2[16] =
-{
-	0,9793,16962,23170,29379,36548,46341,63303,109644,2147483647,-63303,-16962,0,9793,16962,23170
-};
-
-static real tan2_2[16] =
-{
-	46341,36548,29379,23170,16962,9793,0,-16962,-63303,2147483647,109644,63303,46341,36548,29379,23170
-};
-
-static const real pow1_1[2][16] =
-{
-	{32768,27554,32768,23170,32768,19484,32768,16384,32768,13777,32768,11585,32768,9742,32768,8192},
-	{32768,23170,32768,16384,32768,11585,32768,8192,32768,5793,32768,4096,32768,2896,32768,2048}
-};
-
-static const real pow2_1[2][16] =
-{
-	{32768,32768,27554,32768,23170,32768,19484,32768,16384,32768,13777,32768,11585,32768,9742,32768},
-	{32768,32768,23170,32768,16384,32768,11585,32768,8192,32768,5793,32768,4096,32768,2896,32768}
-};
-
-static const real pow1_2[2][16] =
-{
-	{46341,38968,46341,32768,46341,27554,46341,23170,46341,19484,46341,16384,46341,13777,46341,11585},
-	{46341,32768,46341,23170,46341,16384,46341,11585,46341,8192,46341,5793,46341,4096,46341,2896}
-};
-
-static const real pow2_2[2][16] =
-{
-	{46341,46341,38968,46341,32768,46341,27554,46341,23170,46341,19484,46341,16384,46341,13777,46341},
-	{46341,46341,32768,46341,23170,46341,16384,46341,11585,46341,8192,46341,5793,46341,4096,46341}
-};
-
-static const real gainpow2[256+118+4] =
-{
-	1518500250,1276901417,1073741824,1805811301,1518500250,1276901417,1073741824,1805811301,1518500250,1276901417,
-	1073741824,1805811301,1518500250,1276901417,1073741824,1805811301,1518500250,1276901417,1073741824,1805811301,
-	1518500250,1276901417,1073741824,1805811301,1518500250,1276901417,1073741824,1805811301,1518500250,1276901417,
-	1073741824,1805811301,1518500250,1276901417,1073741824,1805811301,1518500250,1276901417,1073741824,1805811301,
-	1518500250,1276901417,1073741824,1805811301,1518500250,1276901417,1073741824,1805811301,1518500250,1276901417,
-	1073741824,1805811301,1518500250,1276901417,1073741824,1805811301,1518500250,1276901417,1073741824,1805811301,
-	1518500250,1276901417,1073741824,902905651,759250125,638450708,536870912,451452825,379625062,319225354,
-	268435456,225726413,189812531,159612677,134217728,112863206,94906266,79806339,67108864,56431603,
-	47453133,39903169,33554432,28215802,23726566,19951585,16777216,14107901,11863283,9975792,
-	8388608,7053950,5931642,4987896,4194304,3526975,2965821,2493948,2097152,1763488,
-	1482910,1246974,1048576,881744,741455,623487,524288,440872,370728,311744,
-	262144,220436,185364,155872,131072,110218,92682,77936,65536,55109,
-	46341,38968,32768,27554,23170,19484,16384,13777,11585,9742,
-	8192,6889,5793,4871,4096,3444,2896,2435,2048,1722,
-	1448,1218,1024,861,724,609,512,431,362,304,
-	256,215,181,152,128,108,91,76,64,54,
-	45,38,32,27,23,19,16,13,11,10,
-	8,7,6,5,4,3,3,2,2,2,
-	1,1,1,1,1,1,1,
-};
-
-#else
-static real ispow[8207];
-static real aa_ca[8],aa_cs[8];
-static real win[4][36];
-static real win1[4][36];
-real COS9[9]; /* dct36_3dnow wants to use that */
-static real COS6_1,COS6_2;
-real tfcos36[9]; /* dct36_3dnow wants to use that */
-static real tfcos12[3];
-#ifdef NEW_DCT9
-static real cos9[3],cos18[3];
-static real tan1_1[16],tan2_1[16],tan1_2[16],tan2_2[16];
-static real pow1_1[2][16],pow2_1[2][16],pow1_2[2][16],pow2_2[2][16];
-#endif
-#endif
-
-static real win1[4][36];
-
-static const char gainpow2_scale[256+118+4+1] = 
-{
-	19,19,19,20,20,20,20,21,21,21,21,22,22,22,22,23,23,23,23,24,24,24,24,25,25,25,25,26,26,26,26,27,
-	27,27,27,28,28,28,28,29,29,29,29,30,30,30,30,31,31,31,31,32,32,32,32,33,33,33,33,34,34,34,34,34,
-	34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,
-	34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,
-	34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,
-	34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,
-	34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,
-	34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,
-	34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,
-	34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,
-	34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,
-	34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,0
-};
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/layer1.c Deleted

@@ -1,155 +0,0 @@
-/*
-	layer1.c: the layer 1 decoder
-
-	copyright 1995-2009 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp
-
-	may have a few bugs after last optimization ... 
-*/
-
-#include "mpg123lib_intern.h"
-#include "getbits.h"
-
-static void I_step_one(unsigned int balloc[], unsigned int scale_index[2][SBLIMIT],mpg123_handle *fr)
-{
-	unsigned int *ba=balloc;
-	unsigned int *sca = (unsigned int *) scale_index;
-
-	if(fr->stereo == 2)
-	{
-		int i;
-		int jsbound = fr->jsbound;
-		for(i=0;i<jsbound;i++)
-		{ 
-			*ba++ = getbits(fr, 4);
-			*ba++ = getbits(fr, 4);
-		}
-		for(i=jsbound;i<SBLIMIT;i++) *ba++ = getbits(fr, 4);
-
-		ba = balloc;
-
-		for(i=0;i<jsbound;i++)
-		{
-			if ((*ba++))
-				*sca++ = getbits(fr, 6);
-			if ((*ba++))
-				*sca++ = getbits(fr, 6);
-		}
-		for (i=jsbound;i<SBLIMIT;i++)
-		if((*ba++))
-		{
-			*sca++ = getbits(fr, 6);
-			*sca++ = getbits(fr, 6);
-		}
-	}
-	else
-	{
-		int i;
-		for(i=0;i<SBLIMIT;i++) *ba++ = getbits(fr, 4);
-
-		ba = balloc;
-		for (i=0;i<SBLIMIT;i++)
-		if ((*ba++))
-		*sca++ = getbits(fr, 6);
-	}
-}
-
-static void I_step_two(real fraction[2][SBLIMIT],unsigned int balloc[2*SBLIMIT], unsigned int scale_index[2][SBLIMIT],mpg123_handle *fr)
-{
-	int i,n;
-	int smpb[2*SBLIMIT]; /* values: 0-65535 */
-	int *sample;
-	register unsigned int *ba;
-	register unsigned int *sca = (unsigned int *) scale_index;
-
-	if(fr->stereo == 2)
-	{
-		int jsbound = fr->jsbound;
-		register real *f0 = fraction[0];
-		register real *f1 = fraction[1];
-		ba = balloc;
-		for(sample=smpb,i=0;i<jsbound;i++)
-		{
-			if((n = *ba++)) *sample++ = getbits(fr, n+1);
-
-			if((n = *ba++)) *sample++ = getbits(fr, n+1);
-		}
-		for(i=jsbound;i<SBLIMIT;i++) 
-		if((n = *ba++))
-		*sample++ = getbits(fr, n+1);
-
-		ba = balloc;
-		for(sample=smpb,i=0;i<jsbound;i++)
-		{
-			if((n=*ba++))
-			*f0++ = REAL_MUL_SCALE_LAYER12(DOUBLE_TO_REAL_15( ((-1)<<n) + (*sample++) + 1), fr->muls[n+1][*sca++]);
-			else *f0++ = DOUBLE_TO_REAL(0.0);
-
-			if((n=*ba++))
-			*f1++ = REAL_MUL_SCALE_LAYER12(DOUBLE_TO_REAL_15( ((-1)<<n) + (*sample++) + 1), fr->muls[n+1][*sca++]);
-			else *f1++ = DOUBLE_TO_REAL(0.0);
-		}
-		for(i=jsbound;i<SBLIMIT;i++)
-		{
-			if((n=*ba++))
-			{
-				real samp = DOUBLE_TO_REAL_15( ((-1)<<n) + (*sample++) + 1);
-				*f0++ = REAL_MUL_SCALE_LAYER12(samp, fr->muls[n+1][*sca++]);
-				*f1++ = REAL_MUL_SCALE_LAYER12(samp, fr->muls[n+1][*sca++]);
-			}
-			else *f0++ = *f1++ = DOUBLE_TO_REAL(0.0);
-		}
-		for(i=fr->down_sample_sblimit;i<32;i++)
-		fraction[0][i] = fraction[1][i] = 0.0;
-	}
-	else
-	{
-		register real *f0 = fraction[0];
-		ba = balloc;
-		for(sample=smpb,i=0;i<SBLIMIT;i++)
-		if ((n = *ba++))
-		*sample++ = getbits(fr, n+1);
-
-		ba = balloc;
-		for(sample=smpb,i=0;i<SBLIMIT;i++)
-		{
-			if((n=*ba++))
-			*f0++ = REAL_MUL_SCALE_LAYER12(DOUBLE_TO_REAL_15( ((-1)<<n) + (*sample++) + 1), fr->muls[n+1][*sca++]);
-			else *f0++ = DOUBLE_TO_REAL(0.0);
-		}
-		for(i=fr->down_sample_sblimit;i<32;i++)
-		fraction[0][i] = DOUBLE_TO_REAL(0.0);
-	}
-}
-
-int do_layer1(mpg123_handle *fr)
-{
-	int clip=0;
-	int i,stereo = fr->stereo;
-	unsigned int balloc[2*SBLIMIT];
-	unsigned int scale_index[2][SBLIMIT];
-	real (*fraction)[SBLIMIT] = fr->layer1.fraction; /* fraction[2][SBLIMIT] */
-	int single = fr->single;
-
-	fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ? (fr->mode_ext<<2)+4 : 32;
-
-	if(stereo == 1 || single == SINGLE_MIX) /* I don't see mixing handled here */
-	single = SINGLE_LEFT;
-
-	I_step_one(balloc,scale_index,fr);
-
-	for(i=0;i<SCALE_BLOCK;i++)
-	{
-		I_step_two(fraction,balloc,scale_index,fr);
-
-		if(single != SINGLE_STEREO)
-		clip += (fr->synth_mono)(fraction[single], fr);
-		else
-		clip += (fr->synth_stereo)(fraction[0], fraction[1], fr);
-	}
-
-	return clip;
-}
-
-

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/layer2.c Deleted

@@ -1,371 +0,0 @@
-/*
-	layer2.c: the layer 2 decoder, root of mpg123
-
-	copyright 1994-2009 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp
-
-	mpg123 started as mp2 decoder a long time ago...
-	part of this file is required for layer 1, too.
-*/
-
-
-#include "mpg123lib_intern.h"
-#ifndef NO_LAYER2
-#include "l2tables.h"
-#endif
-#include "getbits.h"
-
-#ifndef NO_LAYER12 /* Stuff needed for layer I and II. */
-
-static int grp_3tab[32 * 3] = { 0, }; /* used: 27 */
-static int grp_5tab[128 * 3] = { 0, }; /* used: 125 */
-static int grp_9tab[1024 * 3] = { 0, }; /* used: 729 */
-
-#if defined(REAL_IS_FIXED) && defined(PRECALC_TABLES)
-#include "l12_integer_tables.h"
-#else
-static const double mulmul[27] =
-{
-	0.0 , -2.0/3.0 , 2.0/3.0 ,
-	2.0/7.0 , 2.0/15.0 , 2.0/31.0, 2.0/63.0 , 2.0/127.0 , 2.0/255.0 ,
-	2.0/511.0 , 2.0/1023.0 , 2.0/2047.0 , 2.0/4095.0 , 2.0/8191.0 ,
-	2.0/16383.0 , 2.0/32767.0 , 2.0/65535.0 ,
-	-4.0/5.0 , -2.0/5.0 , 2.0/5.0, 4.0/5.0 ,
-	-8.0/9.0 , -4.0/9.0 , -2.0/9.0 , 2.0/9.0 , 4.0/9.0 , 8.0/9.0
-};
-#endif
-
-void init_layer12(void)
-{
-	const int base[3][9] =
-	{
-		{ 1 , 0, 2 , } ,
-		{ 17, 18, 0 , 19, 20 , } ,
-		{ 21, 1, 22, 23, 0, 24, 25, 2, 26 }
-	};
-	int i,j,k,l,len;
-	const int tablen[3] = { 3 , 5 , 9 };
-	int *itable;
-	int *tables[3] = { grp_3tab , grp_5tab , grp_9tab };
-
-	for(i=0;i<3;i++)
-	{
-		itable = tables[i];
-		len = tablen[i];
-		for(j=0;j<len;j++)
-		for(k=0;k<len;k++)
-		for(l=0;l<len;l++)
-		{
-			*itable++ = base[i][l];
-			*itable++ = base[i][k];
-			*itable++ = base[i][j];
-		}
-	}
-}
-
-void init_layer12_stuff(mpg123_handle *fr, real* (*init_table)(mpg123_handle *fr, real *table, int m))
-{
-	int k;
-	real *table;
-	for(k=0;k<27;k++)
-	{
-		table = init_table(fr, fr->muls[k], k);
-		*table++ = 0.0;
-	}
-}
-
-real* init_layer12_table(mpg123_handle *fr, real *table, int m)
-{
-#if defined(REAL_IS_FIXED) && defined(PRECALC_TABLES)
-	int i;
-	for(i=0;i<63;i++)
-	*table++ = layer12_table[m][i];
-#else
-	int i,j;
-	for(j=3,i=0;i<63;i++,j--)
-	*table++ = DOUBLE_TO_REAL_SCALE_LAYER12(mulmul[m] * pow(2.0,(double) j / 3.0));
-#endif
-
-	return table;
-}
-
-#ifdef OPT_MMXORSSE
-real* init_layer12_table_mmx(mpg123_handle *fr, real *table, int m)
-{
-	int i,j;
-	if(!fr->p.down_sample) 
-	{
-		for(j=3,i=0;i<63;i++,j--)
-			*table++ = DOUBLE_TO_REAL(16384 * mulmul[m] * pow(2.0,(double) j / 3.0));
-	}
-	else
-	{
-		for(j=3,i=0;i<63;i++,j--)
-		*table++ = DOUBLE_TO_REAL(mulmul[m] * pow(2.0,(double) j / 3.0));
-	}
-	return table;
-}
-#endif
-
-#endif /* NO_LAYER12 */
-
-/* The rest is the actual decoding of layer II data. */
-
-#ifndef NO_LAYER2
-
-static void II_step_one(unsigned int *bit_alloc,int *scale,mpg123_handle *fr)
-{
-	int stereo = fr->stereo-1;
-	int sblimit = fr->II_sblimit;
-	int jsbound = fr->jsbound;
-	int sblimit2 = fr->II_sblimit<<stereo;
-	const struct al_table *alloc1 = fr->alloc;
-	int i;
-	unsigned int scfsi_buf[64];
-	unsigned int *scfsi,*bita;
-	int sc,step;
-
-	bita = bit_alloc;
-	if(stereo)
-	{
-		for(i=jsbound;i;i--,alloc1+=(1<<step))
-		{
-			step=alloc1->bits;
-			*bita++ = (char) getbits(fr, step);
-			*bita++ = (char) getbits(fr, step);
-		}
-		for(i=sblimit-jsbound;i;i--,alloc1+=(1<<step))
-		{
-			step=alloc1->bits;
-			bita[0] = (char) getbits(fr, step);
-			bita[1] = bita[0];
-			bita+=2;
-		}
-		bita = bit_alloc;
-		scfsi=scfsi_buf;
-
-		for(i=sblimit2;i;i--)
-		if(*bita++) *scfsi++ = (char) getbits_fast(fr, 2);
-	}
-	else /* mono */
-	{
-		for(i=sblimit;i;i--,alloc1+=(1<<step))
-		{
-			step=alloc1->bits;
-			*bita++ = (char) getbits(fr, step);
-		}
-		bita = bit_alloc;
-		scfsi=scfsi_buf;
-		for(i=sblimit;i;i--)
-		if(*bita++) *scfsi++ = (char) getbits_fast(fr, 2);
-	}
-
-	bita = bit_alloc;
-	scfsi=scfsi_buf;
-	for(i=sblimit2;i;i--)
-	if(*bita++)
-	switch(*scfsi++)
-	{
-		case 0: 
-			*scale++ = getbits_fast(fr, 6);
-			*scale++ = getbits_fast(fr, 6);
-			*scale++ = getbits_fast(fr, 6);
-		break;
-		case 1 : 
-			*scale++ = sc = getbits_fast(fr, 6);
-			*scale++ = sc;
-			*scale++ = getbits_fast(fr, 6);
-		break;
-		case 2: 
-			*scale++ = sc = getbits_fast(fr, 6);
-			*scale++ = sc;
-			*scale++ = sc;
-		break;
-		default: /* case 3 */
-			*scale++ = getbits_fast(fr, 6);
-			*scale++ = sc = getbits_fast(fr, 6);
-			*scale++ = sc;
-		break;
-	}
-}
-
-
-static void II_step_two(unsigned int *bit_alloc,real fraction[2][4][SBLIMIT],int *scale,mpg123_handle *fr,int x1)
-{
-	int i,j,k,ba;
-	int stereo = fr->stereo;
-	int sblimit = fr->II_sblimit;
-	int jsbound = fr->jsbound;
-	const struct al_table *alloc2,*alloc1 = fr->alloc;
-	unsigned int *bita=bit_alloc;
-	int d1,step;
-
-	for(i=0;i<jsbound;i++,alloc1+=(1<<step))
-	{
-		step = alloc1->bits;
-		for(j=0;j<stereo;j++)
-		{
-			if( (ba=*bita++) ) 
-			{
-				k=(alloc2 = alloc1+ba)->bits;
-				if( (d1=alloc2->d) < 0) 
-				{
-					real cm=fr->muls[k][scale[x1]];
-					fraction[j][0][i] = REAL_MUL_SCALE_LAYER12(DOUBLE_TO_REAL_15((int)getbits(fr, k) + d1), cm);
-					fraction[j][1][i] = REAL_MUL_SCALE_LAYER12(DOUBLE_TO_REAL_15((int)getbits(fr, k) + d1), cm);
-					fraction[j][2][i] = REAL_MUL_SCALE_LAYER12(DOUBLE_TO_REAL_15((int)getbits(fr, k) + d1), cm);
-				} 
-				else 
-				{
-					const int *table[] = { 0,0,0,grp_3tab,0,grp_5tab,0,0,0,grp_9tab };
-					unsigned int idx,*tab,m=scale[x1];
-					idx = (unsigned int) getbits(fr, k);
-					tab = (unsigned int *) (table[d1] + idx + idx + idx);
-					fraction[j][0][i] = REAL_SCALE_LAYER12(fr->muls[*tab++][m]);
-					fraction[j][1][i] = REAL_SCALE_LAYER12(fr->muls[*tab++][m]);
-					fraction[j][2][i] = REAL_SCALE_LAYER12(fr->muls[*tab][m]); 
-				}
-				scale+=3;
-			}
-			else
-			fraction[j][0][i] = fraction[j][1][i] = fraction[j][2][i] = DOUBLE_TO_REAL(0.0);
-		}
-	}
-
-	for(i=jsbound;i<sblimit;i++,alloc1+=(1<<step))
-	{
-		step = alloc1->bits;
-		bita++;	/* channel 1 and channel 2 bitalloc are the same */
-		if( (ba=*bita++) )
-		{
-			k=(alloc2 = alloc1+ba)->bits;
-			if( (d1=alloc2->d) < 0)
-			{
-				real cm;
-				cm=fr->muls[k][scale[x1+3]];
-				fraction[0][0][i] = DOUBLE_TO_REAL_15((int)getbits(fr, k) + d1);
-				fraction[0][1][i] = DOUBLE_TO_REAL_15((int)getbits(fr, k) + d1);
-				fraction[0][2][i] = DOUBLE_TO_REAL_15((int)getbits(fr, k) + d1);
-				fraction[1][0][i] = REAL_MUL_SCALE_LAYER12(fraction[0][0][i], cm);
-				fraction[1][1][i] = REAL_MUL_SCALE_LAYER12(fraction[0][1][i], cm);
-				fraction[1][2][i] = REAL_MUL_SCALE_LAYER12(fraction[0][2][i], cm);
-				cm=fr->muls[k][scale[x1]];
-				fraction[0][0][i] = REAL_MUL_SCALE_LAYER12(fraction[0][0][i], cm);
-				fraction[0][1][i] = REAL_MUL_SCALE_LAYER12(fraction[0][1][i], cm);
-				fraction[0][2][i] = REAL_MUL_SCALE_LAYER12(fraction[0][2][i], cm);
-			}
-			else
-			{
-				const int *table[] = { 0,0,0,grp_3tab,0,grp_5tab,0,0,0,grp_9tab };
-				unsigned int idx,*tab,m1,m2;
-				m1 = scale[x1]; m2 = scale[x1+3];
-				idx = (unsigned int) getbits(fr, k);
-				tab = (unsigned int *) (table[d1] + idx + idx + idx);
-				fraction[0][0][i] = REAL_SCALE_LAYER12(fr->muls[*tab][m1]); fraction[1][0][i] = REAL_SCALE_LAYER12(fr->muls[*tab++][m2]);
-				fraction[0][1][i] = REAL_SCALE_LAYER12(fr->muls[*tab][m1]); fraction[1][1][i] = REAL_SCALE_LAYER12(fr->muls[*tab++][m2]);
-				fraction[0][2][i] = REAL_SCALE_LAYER12(fr->muls[*tab][m1]); fraction[1][2][i] = REAL_SCALE_LAYER12(fr->muls[*tab][m2]);
-			}
-			scale+=6;
-		}
-		else
-		{
-			fraction[0][0][i] = fraction[0][1][i] = fraction[0][2][i] =
-			fraction[1][0][i] = fraction[1][1][i] = fraction[1][2][i] = DOUBLE_TO_REAL(0.0);
-		}
-/*
-	Historic comment...
-	should we use individual scalefac for channel 2 or
-	is the current way the right one , where we just copy channel 1 to
-	channel 2 ?? 
-	The current 'strange' thing is, that we throw away the scalefac
-	values for the second channel ...!!
-	-> changed .. now we use the scalefac values of channel one !! 
-*/
-	}
-
-	if(sblimit > (fr->down_sample_sblimit) )
-	sblimit = fr->down_sample_sblimit;
-
-	for(i=sblimit;i<SBLIMIT;i++)
-	for (j=0;j<stereo;j++)
-	fraction[j][0][i] = fraction[j][1][i] = fraction[j][2][i] = DOUBLE_TO_REAL(0.0);
-}
-
-
-static void II_select_table(mpg123_handle *fr)
-{
-	const int translate[3][2][16] =
-	{
-		{
-			{ 0,2,2,2,2,2,2,0,0,0,1,1,1,1,1,0 },
-			{ 0,2,2,0,0,0,1,1,1,1,1,1,1,1,1,0 }
-		},
-		{
-			{ 0,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0 },
-			{ 0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0 }
-		},
-		{
-			{ 0,3,3,3,3,3,3,0,0,0,1,1,1,1,1,0 },
-			{ 0,3,3,0,0,0,1,1,1,1,1,1,1,1,1,0 }
-		}
-	};
-
-	int table,sblim;
-	const struct al_table *tables[5] = { alloc_0, alloc_1, alloc_2, alloc_3 , alloc_4 };
-	const int sblims[5] = { 27 , 30 , 8, 12 , 30 };
-
-	if(fr->sampling_frequency >= 3)	/* Or equivalent: (fr->lsf == 1) */
-	table = 4;
-	else
-	table = translate[fr->sampling_frequency][2-fr->stereo][fr->bitrate_index];
-
-	sblim = sblims[table];
-	fr->alloc = tables[table];
-	fr->II_sblimit = sblim;
-}
-
-
-int do_layer2(mpg123_handle *fr)
-{
-	int clip=0;
-	int i,j;
-	int stereo = fr->stereo;
-	/* pick_table clears unused subbands */
-	/* replacement for real fraction[2][4][SBLIMIT], needs alignment. */
-	real (*fraction)[4][SBLIMIT] = fr->layer2.fraction;
-	unsigned int bit_alloc[64];
-	int scale[192];
-	int single = fr->single;
-
-	II_select_table(fr);
-	fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ? (fr->mode_ext<<2)+4 : fr->II_sblimit;
-
-	if(fr->jsbound > fr->II_sblimit)
-	{
-		fprintf(stderr, "Truncating stereo boundary to sideband limit.\n");
-		fr->jsbound=fr->II_sblimit;
-	}
-
-	/* TODO: What happens with mono mixing, actually? */
-	if(stereo == 1 || single == SINGLE_MIX) /* also, mix not really handled */
-	single = SINGLE_LEFT;
-
-	II_step_one(bit_alloc, scale, fr);
-
-	for(i=0;i<SCALE_BLOCK;i++)
-	{
-		II_step_two(bit_alloc,fraction,scale,fr,i>>2);
-		for(j=0;j<3;j++) 
-		{
-			if(single != SINGLE_STEREO)
-			clip += (fr->synth_mono)(fraction[single][j], fr);
-			else
-			clip += (fr->synth_stereo)(fraction[0][j], fraction[1][j], fr);
-		}
-	}
-
-	return clip;
-}
-
-#endif /* NO_LAYER2 */

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/layer3.c Deleted

@@ -1,2058 +0,0 @@
-/*
-	layer3.c: the layer 3 decoder
-
-	copyright 1995-2009 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp
-
-	Dear visitor:
-	If you feel you don't understand fully the works of this file, your feeling might be correct.
-
-	Optimize-TODO: put short bands into the band-field without the stride of 3 reals
-	Length-optimze: unify long and short band code where it is possible
-
-	The int-vs-pointer situation has to be cleaned up.
-*/
-
-#include "mpg123lib_intern.h"
-#include "huffman.h"
-#include "getbits.h"
-#include "debug.h"
-
-/* define CUT_SFB21 if you want to cut-off the frequency above 16kHz */
-#if 0
-#define CUT_SFB21
-#endif
-
-#ifdef REAL_IS_FIXED
-#define NEW_DCT9
-#include "l3_integer_tables.h"
-#else
-/* static one-time calculated tables... or so */
-static real ispow[8207];
-static real aa_ca[8],aa_cs[8];
-static real win[4][36];
-static real win1[4][36];
-real COS9[9]; /* dct36_3dnow wants to use that */
-static real COS6_1,COS6_2;
-real tfcos36[9]; /* dct36_3dnow wants to use that */
-static real tfcos12[3];
-#define NEW_DCT9
-#ifdef NEW_DCT9
-static real cos9[3],cos18[3];
-static real tan1_1[16],tan2_1[16],tan1_2[16],tan2_2[16];
-static real pow1_1[2][16],pow2_1[2][16],pow1_2[2][16],pow2_2[2][16];
-#endif
-#endif
-
-/* Decoder state data, living on the stack of do_layer3. */
-
-struct gr_info_s
-{
-	int scfsi;
-	unsigned part2_3_length;
-	unsigned big_values;
-	unsigned scalefac_compress;
-	unsigned block_type;
-	unsigned mixed_block_flag;
-	unsigned table_select[3];
-	/* Making those two signed int as workaround for open64/pathscale/sun compilers, and also for consistency, since they're worked on together with other signed variables. */
-	int maxband[3];
-	int maxbandl;
-	unsigned maxb;
-	unsigned region1start;
-	unsigned region2start;
-	unsigned preflag;
-	unsigned scalefac_scale;
-	unsigned count1table_select;
-	real *full_gain[3];
-	real *pow2gain;
-};
-
-struct III_sideinfo
-{
-	unsigned main_data_begin;
-	unsigned private_bits;
-	/* Hm, funny... struct inside struct... */
-	struct { struct gr_info_s gr[2]; } ch[2];
-};
-
-struct bandInfoStruct
-{
-	int longIdx[23];
-	int longDiff[22];
-	int shortIdx[14];
-	int shortDiff[13];
-};
-
-/* Techy details about our friendly MPEG data. Fairly constant over the years;-) */
-static const struct bandInfoStruct bandInfo[9] =
-{
-	{ /* MPEG 1.0 */
-		{0,4,8,12,16,20,24,30,36,44,52,62,74, 90,110,134,162,196,238,288,342,418,576},
-		{4,4,4,4,4,4,6,6,8, 8,10,12,16,20,24,28,34,42,50,54, 76,158},
-		{0,4*3,8*3,12*3,16*3,22*3,30*3,40*3,52*3,66*3, 84*3,106*3,136*3,192*3},
-		{4,4,4,4,6,8,10,12,14,18,22,30,56}
-	},
-	{
-		{0,4,8,12,16,20,24,30,36,42,50,60,72, 88,106,128,156,190,230,276,330,384,576},
-		{4,4,4,4,4,4,6,6,6, 8,10,12,16,18,22,28,34,40,46,54, 54,192},
-		{0,4*3,8*3,12*3,16*3,22*3,28*3,38*3,50*3,64*3, 80*3,100*3,126*3,192*3},
-		{4,4,4,4,6,6,10,12,14,16,20,26,66}
-	},
-	{
-		{0,4,8,12,16,20,24,30,36,44,54,66,82,102,126,156,194,240,296,364,448,550,576},
-		{4,4,4,4,4,4,6,6,8,10,12,16,20,24,30,38,46,56,68,84,102, 26},
-		{0,4*3,8*3,12*3,16*3,22*3,30*3,42*3,58*3,78*3,104*3,138*3,180*3,192*3},
-		{4,4,4,4,6,8,12,16,20,26,34,42,12}
-	},
-	{ /* MPEG 2.0 */
-		{0,6,12,18,24,30,36,44,54,66,80,96,116,140,168,200,238,284,336,396,464,522,576},
-		{6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54 } ,
-		{0,4*3,8*3,12*3,18*3,24*3,32*3,42*3,56*3,74*3,100*3,132*3,174*3,192*3} ,
-		{4,4,4,6,6,8,10,14,18,26,32,42,18 }
-	},
-	{ /* Twiddling 3 values here (not just 330->332!) fixed bug 1895025. */
-		{0,6,12,18,24,30,36,44,54,66,80,96,114,136,162,194,232,278,332,394,464,540,576},
-		{6,6,6,6,6,6,8,10,12,14,16,18,22,26,32,38,46,54,62,70,76,36 },
-		{0,4*3,8*3,12*3,18*3,26*3,36*3,48*3,62*3,80*3,104*3,136*3,180*3,192*3},
-		{4,4,4,6,8,10,12,14,18,24,32,44,12 }
-	},
-	{
-		{0,6,12,18,24,30,36,44,54,66,80,96,116,140,168,200,238,284,336,396,464,522,576},
-		{6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54 },
-		{0,4*3,8*3,12*3,18*3,26*3,36*3,48*3,62*3,80*3,104*3,134*3,174*3,192*3},
-		{4,4,4,6,8,10,12,14,18,24,30,40,18 }
-	},
-	{ /* MPEG 2.5 */
-		{0,6,12,18,24,30,36,44,54,66,80,96,116,140,168,200,238,284,336,396,464,522,576},
-		{6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54},
-		{0,12,24,36,54,78,108,144,186,240,312,402,522,576},
-		{4,4,4,6,8,10,12,14,18,24,30,40,18}
-	},
-	{
-		{0,6,12,18,24,30,36,44,54,66,80,96,116,140,168,200,238,284,336,396,464,522,576},
-		{6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54},
-		{0,12,24,36,54,78,108,144,186,240,312,402,522,576},
-		{4,4,4,6,8,10,12,14,18,24,30,40,18}
-	},
-	{
-		{0,12,24,36,48,60,72,88,108,132,160,192,232,280,336,400,476,566,568,570,572,574,576},
-		{12,12,12,12,12,12,16,20,24,28,32,40,48,56,64,76,90,2,2,2,2,2},
-		{0, 24, 48, 72,108,156,216,288,372,480,486,492,498,576},
-		{8,8,8,12,16,20,24,28,36,2,2,2,26}
-	}
-};
-
-static int mapbuf0[9][152];
-static int mapbuf1[9][156];
-static int mapbuf2[9][44];
-static int *map[9][3];
-static int *mapend[9][3];
-
-static unsigned int n_slen2[512]; /* MPEG 2.0 slen for 'normal' mode */
-static unsigned int i_slen2[256]; /* MPEG 2.0 slen for intensity stereo */
-
-/* Some helpers used in init_layer3 */
-
-#ifdef OPT_MMXORSSE
-real init_layer3_gainpow2_mmx(mpg123_handle *fr, int i)
-{
-	if(!fr->p.down_sample) return DOUBLE_TO_REAL(16384.0 * pow((double)2.0,-0.25 * (double) (i+210) ));
-	else return DOUBLE_TO_REAL(pow((double)2.0,-0.25 * (double) (i+210)));
-}
-#endif
-
-real init_layer3_gainpow2(mpg123_handle *fr, int i)
-{
-#if defined(REAL_IS_FIXED) && defined(PRECALC_TABLES)
-	return gainpow2[i+256];
-#else
-	return DOUBLE_TO_REAL_SCALE_LAYER3(pow((double)2.0,-0.25 * (double) (i+210)),i+256);
-#endif
-}
-
-
-/* init tables for layer-3 ... specific with the downsampling... */
-void init_layer3(void)
-{
-	int i,j,k,l;
-
-#if !defined(REAL_IS_FIXED) || !defined(PRECALC_TABLES)
-	for(i=0;i<8207;i++)
-	ispow[i] = DOUBLE_TO_REAL_POW43(pow((double)i,(double)4.0/3.0));
-
-	for(i=0;i<8;i++)
-	{
-		const double Ci[8] = {-0.6,-0.535,-0.33,-0.185,-0.095,-0.041,-0.0142,-0.0037};
-		double sq = sqrt(1.0+Ci[i]*Ci[i]);
-		aa_cs[i] = DOUBLE_TO_REAL(1.0/sq);
-		aa_ca[i] = DOUBLE_TO_REAL(Ci[i]/sq);
-	}
-
-	for(i=0;i<18;i++)
-	{
-		win[0][i] = win[1][i] =
-			DOUBLE_TO_REAL( 0.5*sin(M_PI/72.0 * (double)(2*(i+0) +1)) / cos(M_PI * (double)(2*(i+0) +19) / 72.0) );
-		win[0][i+18] = win[3][i+18] =
-			DOUBLE_TO_REAL( 0.5*sin(M_PI/72.0 * (double)(2*(i+18)+1)) / cos(M_PI * (double)(2*(i+18)+19) / 72.0) );
-	}
-	for(i=0;i<6;i++)
-	{
-		win[1][i+18] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 ));
-		win[3][i+12] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (2*(i+12)+19) / 72.0 ));
-		win[1][i+24] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 24.0 * (double) (2*i+13) ) / cos ( M_PI * (double) (2*(i+24)+19) / 72.0 ));
-		win[1][i+30] = win[3][i] = DOUBLE_TO_REAL(0.0);
-		win[3][i+6 ] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 24.0 * (double) (2*i+1 ) ) / cos ( M_PI * (double) (2*(i+6 )+19) / 72.0 ));
-	}
-
-	for(i=0;i<9;i++)
-	COS9[i] = DOUBLE_TO_REAL(cos( M_PI / 18.0 * (double) i));
-
-	for(i=0;i<9;i++)
-	tfcos36[i] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (i*2+1) / 36.0 ));
-
-	for(i=0;i<3;i++)
-	tfcos12[i] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (i*2+1) / 12.0 ));
-
-	COS6_1 = DOUBLE_TO_REAL(cos( M_PI / 6.0 * (double) 1));
-	COS6_2 = DOUBLE_TO_REAL(cos( M_PI / 6.0 * (double) 2));
-
-#ifdef NEW_DCT9
-	cos9[0] = DOUBLE_TO_REAL(cos(1.0*M_PI/9.0));
-	cos9[1] = DOUBLE_TO_REAL(cos(5.0*M_PI/9.0));
-	cos9[2] = DOUBLE_TO_REAL(cos(7.0*M_PI/9.0));
-	cos18[0] = DOUBLE_TO_REAL(cos(1.0*M_PI/18.0));
-	cos18[1] = DOUBLE_TO_REAL(cos(11.0*M_PI/18.0));
-	cos18[2] = DOUBLE_TO_REAL(cos(13.0*M_PI/18.0));
-#endif
-
-	for(i=0;i<12;i++)
-	{
-		win[2][i] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*i+7) / 24.0 ));
-	}
-
-	for(i=0;i<16;i++)
-	{
-		double t = tan( (double) i * M_PI / 12.0 );
-		tan1_1[i] = DOUBLE_TO_REAL_15(t / (1.0+t));
-		tan2_1[i] = DOUBLE_TO_REAL_15(1.0 / (1.0 + t));
-		tan1_2[i] = DOUBLE_TO_REAL_15(M_SQRT2 * t / (1.0+t));
-		tan2_2[i] = DOUBLE_TO_REAL_15(M_SQRT2 / (1.0 + t));
-
-		for(j=0;j<2;j++)
-		{
-			double base = pow(2.0,-0.25*(j+1.0));
-			double p1=1.0,p2=1.0;
-			if(i > 0)
-			{
-				if( i & 1 ) p1 = pow(base,(i+1.0)*0.5);
-				else p2 = pow(base,i*0.5);
-			}
-			pow1_1[j][i] = DOUBLE_TO_REAL_15(p1);
-			pow2_1[j][i] = DOUBLE_TO_REAL_15(p2);
-			pow1_2[j][i] = DOUBLE_TO_REAL_15(M_SQRT2 * p1);
-			pow2_2[j][i] = DOUBLE_TO_REAL_15(M_SQRT2 * p2);
-		}
-	}
-#endif
-
-	for(j=0;j<4;j++)
-	{
-		const int len[4] = { 36,36,12,36 };
-		for(i=0;i<len[j];i+=2) win1[j][i] = + win[j][i];
-
-		for(i=1;i<len[j];i+=2) win1[j][i] = - win[j][i];
-	}
-
-	for(j=0;j<9;j++)
-	{
-		const struct bandInfoStruct *bi = &bandInfo[j];
-		int *mp;
-		int cb,lwin;
-		const int *bdf;
-
-		mp = map[j][0] = mapbuf0[j];
-		bdf = bi->longDiff;
-		for(i=0,cb = 0; cb < 8 ; cb++,i+=*bdf++)
-		{
-			*mp++ = (*bdf) >> 1;
-			*mp++ = i;
-			*mp++ = 3;
-			*mp++ = cb;
-		}
-		bdf = bi->shortDiff+3;
-		for(cb=3;cb<13;cb++)
-		{
-			int l = (*bdf++) >> 1;
-			for(lwin=0;lwin<3;lwin++)
-			{
-				*mp++ = l;
-				*mp++ = i + lwin;
-				*mp++ = lwin;
-				*mp++ = cb;
-			}
-			i += 6*l;
-		}
-		mapend[j][0] = mp;
-
-		mp = map[j][1] = mapbuf1[j];
-		bdf = bi->shortDiff+0;
-		for(i=0,cb=0;cb<13;cb++)
-		{
-			int l = (*bdf++) >> 1;
-			for(lwin=0;lwin<3;lwin++)
-			{
-				*mp++ = l;
-				*mp++ = i + lwin;
-				*mp++ = lwin;
-				*mp++ = cb;
-			}
-			i += 6*l;
-		}
-		mapend[j][1] = mp;
-
-		mp = map[j][2] = mapbuf2[j];
-		bdf = bi->longDiff;
-		for(cb = 0; cb < 22 ; cb++)
-		{
-			*mp++ = (*bdf++) >> 1;
-			*mp++ = cb;
-		}
-		mapend[j][2] = mp;
-	}
-
-	/* Now for some serious loopings! */
-	for(i=0;i<5;i++)
-	for(j=0;j<6;j++)
-	for(k=0;k<6;k++)
-	{
-		int n = k + j * 6 + i * 36;
-		i_slen2[n] = i|(j<<3)|(k<<6)|(3<<12);
-	}
-	for(i=0;i<4;i++)
-	for(j=0;j<4;j++)
-	for(k=0;k<4;k++)
-	{
-		int n = k + j * 4 + i * 16;
-		i_slen2[n+180] = i|(j<<3)|(k<<6)|(4<<12);
-	}
-	for(i=0;i<4;i++)
-	for(j=0;j<3;j++)
-	{
-		int n = j + i * 3;
-		i_slen2[n+244] = i|(j<<3) | (5<<12);
-		n_slen2[n+500] = i|(j<<3) | (2<<12) | (1<<15);
-	}
-	for(i=0;i<5;i++)
-	for(j=0;j<5;j++)
-	for(k=0;k<4;k++)
-	for(l=0;l<4;l++)
-	{
-		int n = l + k * 4 + j * 16 + i * 80;
-		n_slen2[n] = i|(j<<3)|(k<<6)|(l<<9)|(0<<12);
-	}
-	for(i=0;i<5;i++)
-	for(j=0;j<5;j++)
-	for(k=0;k<4;k++)
-	{
-		int n = k + j * 4 + i * 20;
-		n_slen2[n+400] = i|(j<<3)|(k<<6)|(1<<12);
-	}
-}
-
-
-void init_layer3_stuff(mpg123_handle *fr, real (*gainpow2)(mpg123_handle *fr, int i))
-{
-	int i,j;
-
-	for(i=-256;i<118+4;i++)	fr->gainpow2[i+256] = gainpow2(fr,i);
-
-	for(j=0;j<9;j++)
-	{
-		for(i=0;i<23;i++)
-		{
-			fr->longLimit[j][i] = (bandInfo[j].longIdx[i] - 1 + 8) / 18 + 1;
-			if(fr->longLimit[j][i] > (fr->down_sample_sblimit) )
-			fr->longLimit[j][i] = fr->down_sample_sblimit;
-		}
-		for(i=0;i<14;i++)
-		{
-			fr->shortLimit[j][i] = (bandInfo[j].shortIdx[i] - 1) / 18 + 1;
-			if(fr->shortLimit[j][i] > (fr->down_sample_sblimit) )
-			fr->shortLimit[j][i] = fr->down_sample_sblimit;
-		}
-	}
-}
-
-/*
-	Observe!
-	Now come the actualy decoding routines.
-*/
-
-/* read additional side information (for MPEG 1 and MPEG 2) */
-static int III_get_side_info(mpg123_handle *fr, struct III_sideinfo *si,int stereo, int ms_stereo,long sfreq,int single)
-{
-	int ch, gr;
-	int powdiff = (single == SINGLE_MIX) ? 4 : 0;
-
-	const int tabs[2][5] = { { 2,9,5,3,4 } , { 1,8,1,2,9 } };
-	const int *tab = tabs[fr->lsf];
-
-	si->main_data_begin = getbits(fr, tab[1]);
-
-	if(si->main_data_begin > fr->bitreservoir)
-	{
-		if(VERBOSE2) fprintf(stderr, "Note: missing %d bytes in bit reservoir for frame %li\n", (int)(si->main_data_begin - fr->bitreservoir), (long)fr->num);
-
-		/* overwrite main_data_begin for the really available bit reservoir */
-		backbits(fr, tab[1]);
-		if(fr->lsf == 0)
-		{
-			fr->wordpointer[0] = (unsigned char) (fr->bitreservoir >> 1);
-			fr->wordpointer[1] = (unsigned char) ((fr->bitreservoir & 1) << 7);
-		}
-		else fr->wordpointer[0] = (unsigned char) fr->bitreservoir;
-
-		/* zero "side-info" data for a silence-frame
-		without touching audio data used as bit reservoir for following frame */
-		memset(fr->wordpointer+2, 0, fr->ssize-2);
-
-		/* reread the new bit reservoir offset */
-		si->main_data_begin = getbits(fr, tab[1]);
-	}
-
-	/* Keep track of the available data bytes for the bit reservoir.
-	Think: Substract the 2 crc bytes in parser already? */
-	fr->bitreservoir = fr->bitreservoir + fr->framesize - fr->ssize - (fr->error_protection ? 2 : 0);
-	/* Limit the reservoir to the max for MPEG 1.0 or 2.x . */
-	if(fr->bitreservoir > (unsigned int) (fr->lsf == 0 ? 511 : 255))
-	fr->bitreservoir = (fr->lsf == 0 ? 511 : 255);
-
-	/* Now back into less commented territory. It's code. It works. */
-
-	if (stereo == 1)
-	si->private_bits = getbits_fast(fr, tab[2]);
-	else 
-	si->private_bits = getbits_fast(fr, tab[3]);
-
-	if(!fr->lsf) for(ch=0; ch<stereo; ch++)
-	{
-		si->ch[ch].gr[0].scfsi = -1;
-		si->ch[ch].gr[1].scfsi = getbits_fast(fr, 4);
-	}
-
-	for (gr=0; gr<tab[0]; gr++)
-	for (ch=0; ch<stereo; ch++)
-	{
-		register struct gr_info_s *gr_info = &(si->ch[ch].gr[gr]);
-
-		gr_info->part2_3_length = getbits(fr, 12);
-		gr_info->big_values = getbits(fr, 9);
-		if(gr_info->big_values > 288)
-		{
-			if(NOQUIET) error("big_values too large!");
-			gr_info->big_values = 288;
-		}
-		gr_info->pow2gain = fr->gainpow2+256 - getbits_fast(fr, 8) + powdiff;
-		if(ms_stereo) gr_info->pow2gain += 2;
-
-		gr_info->scalefac_compress = getbits(fr, tab[4]);
-
-		if(get1bit(fr))
-		{ /* window switch flag */
-			int i;
-			gr_info->block_type = getbits_fast(fr, 2);
-			gr_info->mixed_block_flag = get1bit(fr);
-			gr_info->table_select[0] = getbits_fast(fr, 5);
-			gr_info->table_select[1] = getbits_fast(fr, 5);
-			/*
-				table_select[2] not needed, because there is no region2,
-				but to satisfy some verification tools we set it either.
-			*/
-			gr_info->table_select[2] = 0;
-			for(i=0;i<3;i++)
-			gr_info->full_gain[i] = gr_info->pow2gain + (getbits_fast(fr, 3)<<3);
-
-			if(gr_info->block_type == 0)
-			{
-				if(NOQUIET) error("Blocktype == 0 and window-switching == 1 not allowed.");
-				return 1;
-			}
-
-			/* region_count/start parameters are implicit in this case. */ 
-			if( (!fr->lsf || (gr_info->block_type == 2)) && !fr->mpeg25)
-			{
-				gr_info->region1start = 36>>1;
-				gr_info->region2start = 576>>1;
-			}
-			else
-			{
-				if(fr->mpeg25)
-				{ 
-					int r0c,r1c;
-					if((gr_info->block_type == 2) && (!gr_info->mixed_block_flag) ) r0c = 5;
-					else r0c = 7;
-
-					r1c = 20 - r0c;
-					gr_info->region1start = bandInfo[sfreq].longIdx[r0c+1] >> 1 ;
-					gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1; 
-				}
-				else
-				{
-					gr_info->region1start = 54>>1;
-					gr_info->region2start = 576>>1; 
-				} 
-			}
-		}
-		else
-		{
-			int i,r0c,r1c;
-			for (i=0; i<3; i++)
-			gr_info->table_select[i] = getbits_fast(fr, 5);
-
-			r0c = getbits_fast(fr, 4);
-			r1c = getbits_fast(fr, 3);
-			gr_info->region1start = bandInfo[sfreq].longIdx[r0c+1] >> 1 ;
-			gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1;
-
-			if(r0c + r1c + 2 > 22) gr_info->region2start = 576>>1;
-			else gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1;
-
-			gr_info->block_type = 0;
-			gr_info->mixed_block_flag = 0;
-		}
-		if(!fr->lsf) gr_info->preflag = get1bit(fr);
-
-		gr_info->scalefac_scale = get1bit(fr);
-		gr_info->count1table_select = get1bit(fr);
-	}
-	return 0;
-}
-
-
-/* read scalefactors */
-static int III_get_scale_factors_1(mpg123_handle *fr, int *scf,struct gr_info_s *gr_info,int ch,int gr)
-{
-	const unsigned char slen[2][16] =
-	{
-		{0, 0, 0, 0, 3, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4},
-		{0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3}
-	};
-	int numbits;
-	int num0 = slen[0][gr_info->scalefac_compress];
-	int num1 = slen[1][gr_info->scalefac_compress];
-
-	if(gr_info->block_type == 2)
-	{
-		int i=18;
-		numbits = (num0 + num1) * 18;
-
-		if(gr_info->mixed_block_flag)
-		{
-			for (i=8;i;i--)
-			*scf++ = getbits_fast(fr, num0);
-
-			i = 9;
-			numbits -= num0; /* num0 * 17 + num1 * 18 */
-		}
-
-		for(;i;i--) *scf++ = getbits_fast(fr, num0);
-
-		for(i = 18; i; i--) *scf++ = getbits_fast(fr, num1);
-
-		*scf++ = 0; *scf++ = 0; *scf++ = 0; /* short[13][0..2] = 0 */
-	}
-	else
-	{
-		int i;
-		int scfsi = gr_info->scfsi;
-
-		if(scfsi < 0)
-		{ /* scfsi < 0 => granule == 0 */
-			for(i=11;i;i--) *scf++ = getbits_fast(fr, num0);
-
-			for(i=10;i;i--) *scf++ = getbits_fast(fr, num1);
-
-			numbits = (num0 + num1) * 10 + num0;
-			*scf++ = 0;
-		}
-		else
-		{
-			numbits = 0;
-			if(!(scfsi & 0x8))
-			{
-				for (i=0;i<6;i++) *scf++ = getbits_fast(fr, num0);
-
-				numbits += num0 * 6;
-			}
-			else scf += 6; 
-
-			if(!(scfsi & 0x4))
-			{
-				for (i=0;i<5;i++) *scf++ = getbits_fast(fr, num0);
-
-				numbits += num0 * 5;
-			}
-			else scf += 5;
-
-			if(!(scfsi & 0x2))
-			{
-				for(i=0;i<5;i++) *scf++ = getbits_fast(fr, num1);
-
-				numbits += num1 * 5;
-			}
-			else scf += 5;
-
-			if(!(scfsi & 0x1))
-			{
-				for (i=0;i<5;i++) *scf++ = getbits_fast(fr, num1);
-
-				numbits += num1 * 5;
-			}
-			else scf += 5;
-
-			*scf++ = 0; /* no l[21] in original sources */
-		}
-	}
-	return numbits;
-}
-
-
-static int III_get_scale_factors_2(mpg123_handle *fr, int *scf,struct gr_info_s *gr_info,int i_stereo)
-{
-	const unsigned char *pnt;
-	int i,j,n=0,numbits=0;
-	unsigned int slen;
-
-	const unsigned char stab[3][6][4] =
-	{
-		{
-			{ 6, 5, 5,5 } , { 6, 5, 7,3 } , { 11,10,0,0},
-			{ 7, 7, 7,0 } , { 6, 6, 6,3 } , { 8, 8,5,0}
-		},
-		{
-			{ 9, 9, 9,9 } , { 9, 9,12,6 } , { 18,18,0,0},
-			{12,12,12,0 } , {12, 9, 9,6 } , { 15,12,9,0}
-		},
-		{
-			{ 6, 9, 9,9 } , { 6, 9,12,6 } , { 15,18,0,0},
-			{ 6,15,12,0 } , { 6,12, 9,6 } , { 6,18,9,0}
-		}
-	}; 
-
-	if(i_stereo) /* i_stereo AND second channel -> do_layer3() checks this */
-	slen = i_slen2[gr_info->scalefac_compress>>1];
-	else
-	slen = n_slen2[gr_info->scalefac_compress];
-
-	gr_info->preflag = (slen>>15) & 0x1;
-
-	n = 0; 
-	if( gr_info->block_type == 2 )
-	{
-		n++;
-		if(gr_info->mixed_block_flag) n++;
-	}
-
-	pnt = stab[n][(slen>>12)&0x7];
-
-	for(i=0;i<4;i++)
-	{
-		int num = slen & 0x7;
-		slen >>= 3;
-		if(num)
-		{
-			for(j=0;j<(int)(pnt[i]);j++) *scf++ = getbits_fast(fr, num);
-
-			numbits += pnt[i] * num;
-		}
-		else
-		for(j=0;j<(int)(pnt[i]);j++) *scf++ = 0;
-	}
- 
-	n = (n << 1) + 1;
-	for(i=0;i<n;i++) *scf++ = 0;
-
-	return numbits;
-}
-
-static const int pretab1[22] = {0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,3,3,3,2,0};
-static const int pretab2[22] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-
-/*
-	Dequantize samples
-	...includes Huffman decoding
-*/
-
-/* 24 is enough because tab13 has max. a 19 bit huffvector */
-#define BITSHIFT ((sizeof(long)-1)*8)
-#define REFRESH_MASK \
-	while(num < BITSHIFT) { \
-		mask |= ((unsigned long)getbyte(fr))<<(BITSHIFT-num); \
-		num += 8; \
-		part2remain -= 8; }
-
-static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],int *scf, struct gr_info_s *gr_info,int sfreq,int part2bits)
-{
-	int shift = 1 + gr_info->scalefac_scale;
-	real *xrpnt = (real *) xr;
-	int l[3],l3;
-	int part2remain = gr_info->part2_3_length - part2bits;
-	int *me;
-#ifdef REAL_IS_FIXED
-	int gainpow2_scale_idx = 378;
-#endif
-
-	/* mhipp tree has this split up a bit... */
-	int num=getbitoffset(fr);
-	long mask;
-	/* We must split this, because for num==0 the shift is undefined if you do it in one step. */
-	mask = ((unsigned long) getbits(fr, num))<<BITSHIFT;
-	mask <<= 8-num;
-	part2remain -= num;
-
-	{
-		int bv = gr_info->big_values;
-		int region1 = gr_info->region1start;
-		int region2 = gr_info->region2start;
-		if(region1 > region2)
-		{
-			/*
-				That's not optimal: it fixes a segfault with fuzzed data, but also apparently triggers where it shouldn't, see bug 1641196.
-				The benefit of not crashing / having this security risk is bigger than these few frames of a lame-3.70 file that aren't audible anyway.
-				But still, I want to know if indeed this check or the old lame is at fault.
-			*/
-			if(NOQUIET) error("You got some really nasty file there... region1>region2!");
-			return 1;
-		}
-		l3 = ((576>>1)-bv)>>1; 
-
-		/* we may lose the 'odd' bit here !! check this later again */
-		if(bv <= region1)
-		{
-			l[0] = bv;
-			l[1] = 0;
-			l[2] = 0;
-		}
-		else
-		{
-			l[0] = region1;
-			if(bv <= region2)
-			{
-				l[1] = bv - l[0];
-				l[2] = 0;
-			}
-			else
-			{
-				l[1] = region2 - l[0];
-				l[2] = bv - region2;
-			}
-		}
-	}
- 
-	if(gr_info->block_type == 2)
-	{
-		/* decoding with short or mixed mode BandIndex table */
-		int i,max[4];
-		int step=0,lwin=3,cb=0;
-		register real v = 0.0;
-		register int *m,mc;
-
-		if(gr_info->mixed_block_flag)
-		{
-			max[3] = -1;
-			max[0] = max[1] = max[2] = 2;
-			m = map[sfreq][0];
-			me = mapend[sfreq][0];
-		}
-		else
-		{
-			max[0] = max[1] = max[2] = max[3] = -1;
-			/* max[3] not really needed in this case */
-			m = map[sfreq][1];
-			me = mapend[sfreq][1];
-		}
-
-		mc = 0;
-		for(i=0;i<2;i++)
-		{
-			int lp = l[i];
-			struct newhuff *h = ht+gr_info->table_select[i];
-			for(;lp;lp--,mc--)
-			{
-				register int x,y;
-				if( (!mc) )
-				{
-					mc = *m++;
-					xrpnt = ((real *) xr) + (*m++);
-					lwin = *m++;
-					cb = *m++;
-					if(lwin == 3)
-					{
-#ifdef REAL_IS_FIXED
-						gainpow2_scale_idx = (int)(gr_info->pow2gain + (*scf << shift) - fr->gainpow2);
-#endif
-						v = gr_info->pow2gain[(*scf++) << shift];
-						step = 1;
-					}
-					else
-					{
-#ifdef REAL_IS_FIXED
-						gainpow2_scale_idx = (int)(gr_info->full_gain[lwin] + (*scf << shift) - fr->gainpow2);
-#endif
-						v = gr_info->full_gain[lwin][(*scf++) << shift];
-						step = 3;
-					}
-				}
-				{
-					register short *val = h->table;
-					REFRESH_MASK;
-					while((y=*val++)<0)
-					{
-						if (mask < 0) val -= y;
-
-						num--;
-						mask <<= 1;
-					}
-					x = y >> 4;
-					y &= 0xf;
-				}
-				if(x == 15 && h->linbits)
-				{
-					max[lwin] = cb;
-					REFRESH_MASK;
-					x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
-					num -= h->linbits+1;
-					mask <<= h->linbits;
-					if(mask < 0) *xrpnt = REAL_MUL_SCALE_LAYER3(-ispow[x], v, gainpow2_scale_idx);
-					else *xrpnt = REAL_MUL_SCALE_LAYER3( ispow[x], v, gainpow2_scale_idx);
-
-					mask <<= 1;
-				}
-				else if(x)
-				{
-					max[lwin] = cb;
-					if(mask < 0) *xrpnt = REAL_MUL_SCALE_LAYER3(-ispow[x], v, gainpow2_scale_idx);
-					else *xrpnt = REAL_MUL_SCALE_LAYER3( ispow[x], v, gainpow2_scale_idx);
-
-					num--;
-					mask <<= 1;
-				}
-				else *xrpnt = DOUBLE_TO_REAL(0.0);
-
-				xrpnt += step;
-				if(y == 15 && h->linbits)
-				{
-					max[lwin] = cb;
-					REFRESH_MASK;
-					y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
-					num -= h->linbits+1;
-					mask <<= h->linbits;
-					if(mask < 0) *xrpnt = REAL_MUL_SCALE_LAYER3(-ispow[y], v, gainpow2_scale_idx);
-					else *xrpnt = REAL_MUL_SCALE_LAYER3( ispow[y], v, gainpow2_scale_idx);
-
-					mask <<= 1;
-				}
-				else if(y)
-				{
-					max[lwin] = cb;
-					if(mask < 0) *xrpnt = REAL_MUL_SCALE_LAYER3(-ispow[y], v, gainpow2_scale_idx);
-					else *xrpnt = REAL_MUL_SCALE_LAYER3( ispow[y], v, gainpow2_scale_idx);
-
-					num--;
-					mask <<= 1;
-				}
-				else *xrpnt = DOUBLE_TO_REAL(0.0);
-
-				xrpnt += step;
-			}
-		}
-
-		for(;l3 && (part2remain+num > 0);l3--)
-		{
-			struct newhuff* h;
-			register short* val;
-			register short a;
-			/*
-				This is only a humble hack to prevent a special segfault.
-				More insight into the real workings is still needed.
-				Especially why there are (valid?) files that make xrpnt exceed the array with 4 bytes without segfaulting, more seems to be really bad, though.
-			*/
-			#ifdef DEBUG
-			if(!(xrpnt < &xr[SBLIMIT][0]))
-			{
-				if(VERBOSE) debug2("attempted soft xrpnt overflow (%p !< %p) ?", (void*) xrpnt, (void*) &xr[SBLIMIT][0]);
-			}
-			#endif
-			if(!(xrpnt < &xr[SBLIMIT][0]+5))
-			{
-				if(NOQUIET) error2("attempted xrpnt overflow (%p !< %p)", (void*) xrpnt, (void*) &xr[SBLIMIT][0]);
-				return 2;
-			}
-			h = htc+gr_info->count1table_select;
-			val = h->table;
-
-			REFRESH_MASK;
-			while((a=*val++)<0)
-			{
-				if(mask < 0) val -= a;
-
-				num--;
-				mask <<= 1;
-			}
-			if(part2remain+num <= 0)
-			{
-				num -= part2remain+num;
-				break;
-			}
-
-			for(i=0;i<4;i++)
-			{
-				if(!(i & 1))
-				{
-					if(!mc)
-					{
-						mc = *m++;
-						xrpnt = ((real *) xr) + (*m++);
-						lwin = *m++;
-						cb = *m++;
-						if(lwin == 3)
-						{
-#ifdef REAL_IS_FIXED
-							gainpow2_scale_idx = (int)(gr_info->pow2gain + (*scf << shift) - fr->gainpow2);
-#endif
-							v = gr_info->pow2gain[(*scf++) << shift];
-							step = 1;
-						}
-						else
-						{
-#ifdef REAL_IS_FIXED
-							gainpow2_scale_idx = (int)(gr_info->full_gain[lwin] + (*scf << shift) - fr->gainpow2);
-#endif
-							v = gr_info->full_gain[lwin][(*scf++) << shift];
-							step = 3;
-						}
-					}
-					mc--;
-				}
-				if( (a & (0x8>>i)) )
-				{
-					max[lwin] = cb;
-					if(part2remain+num <= 0)
-					break;
-
-					if(mask < 0) *xrpnt = -REAL_SCALE_LAYER3(v, gainpow2_scale_idx);
-					else *xrpnt = REAL_SCALE_LAYER3(v, gainpow2_scale_idx);
-
-					num--;
-					mask <<= 1;
-				}
-				else *xrpnt = DOUBLE_TO_REAL(0.0);
-
-				xrpnt += step;
-			}
-		}
-
-		if(lwin < 3)
-		{ /* short band? */
-			while(1)
-			{
-				for(;mc > 0;mc--)
-				{
-					*xrpnt = DOUBLE_TO_REAL(0.0); xrpnt += 3; /* short band -> step=3 */
-					*xrpnt = DOUBLE_TO_REAL(0.0); xrpnt += 3;
-				}
-				if(m >= me)
-				break;
-
-				mc = *m++;
-				xrpnt = ((real *) xr) + *m++;
-				if(*m++ == 0)
-				break; /* optimize: field will be set to zero at the end of the function */
-
-				m++; /* cb */
-			}
-		}
-
-		gr_info->maxband[0] = max[0]+1;
-		gr_info->maxband[1] = max[1]+1;
-		gr_info->maxband[2] = max[2]+1;
-		gr_info->maxbandl = max[3]+1;
-
-		{
-			int rmax = max[0] > max[1] ? max[0] : max[1];
-			rmax = (rmax > max[2] ? rmax : max[2]) + 1;
-			gr_info->maxb = rmax ? fr->shortLimit[sfreq][rmax] : fr->longLimit[sfreq][max[3]+1];
-		}
-
-	}
-	else
-	{
-		/* decoding with 'long' BandIndex table (block_type != 2) */
-		const int *pretab = gr_info->preflag ? pretab1 : pretab2;
-		int i,max = -1;
-		int cb = 0;
-		int *m = map[sfreq][2];
-		register real v = 0.0;
-		int mc = 0;
-
-		/* long hash table values */
-		for(i=0;i<3;i++)
-		{
-			int lp = l[i];
-			struct newhuff *h = ht+gr_info->table_select[i];
-
-			for(;lp;lp--,mc--)
-			{
-				int x,y;
-				if(!mc)
-				{
-					mc = *m++;
-					cb = *m++;
-#ifdef CUT_SFB21
-					if(cb == 21)
-						v = 0.0;
-					else
-#endif
-					{
-#ifdef REAL_IS_FIXED
-						gainpow2_scale_idx = (int)(gr_info->pow2gain + (*scf << shift) - fr->gainpow2);
-#endif
-						v = gr_info->pow2gain[(*(scf++) + (*pretab++)) << shift];
-					}
-				}
-				{
-					register short *val = h->table;
-					REFRESH_MASK;
-					while((y=*val++)<0)
-					{
-						if (mask < 0) val -= y;
-
-						num--;
-						mask <<= 1;
-					}
-					x = y >> 4;
-					y &= 0xf;
-				}
-
-				if(x == 15 && h->linbits)
-				{
-					max = cb;
-					REFRESH_MASK;
-					x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
-					num -= h->linbits+1;
-					mask <<= h->linbits;
-					if(mask < 0) *xrpnt++ = REAL_MUL_SCALE_LAYER3(-ispow[x], v, gainpow2_scale_idx);
-					else *xrpnt++ = REAL_MUL_SCALE_LAYER3( ispow[x], v, gainpow2_scale_idx);
-
-					mask <<= 1;
-				}
-				else if(x)
-				{
-					max = cb;
-					if(mask < 0) *xrpnt++ = REAL_MUL_SCALE_LAYER3(-ispow[x], v, gainpow2_scale_idx);
-					else *xrpnt++ = REAL_MUL_SCALE_LAYER3( ispow[x], v, gainpow2_scale_idx);
-					num--;
-
-					mask <<= 1;
-				}
-				else *xrpnt++ = DOUBLE_TO_REAL(0.0);
-
-				if(y == 15 && h->linbits)
-				{
-					max = cb;
-					REFRESH_MASK;
-					y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
-					num -= h->linbits+1;
-					mask <<= h->linbits;
-					if(mask < 0) *xrpnt++ = REAL_MUL_SCALE_LAYER3(-ispow[y], v, gainpow2_scale_idx);
-					else *xrpnt++ = REAL_MUL_SCALE_LAYER3( ispow[y], v, gainpow2_scale_idx);
-
-					mask <<= 1;
-				}
-				else if(y)
-				{
-					max = cb;
-					if(mask < 0) *xrpnt++ = REAL_MUL_SCALE_LAYER3(-ispow[y], v, gainpow2_scale_idx);
-					else *xrpnt++ = REAL_MUL_SCALE_LAYER3( ispow[y], v, gainpow2_scale_idx);
-
-					num--;
-					mask <<= 1;
-				}
-				else *xrpnt++ = DOUBLE_TO_REAL(0.0);
-			}
-		}
-
-		/* short (count1table) values */
-		for(;l3 && (part2remain+num > 0);l3--)
-		{
-			struct newhuff *h = htc+gr_info->count1table_select;
-			register short *val = h->table,a;
-
-			REFRESH_MASK;
-			while((a=*val++)<0)
-			{
-				if (mask < 0) val -= a;
-
-				num--;
-				mask <<= 1;
-			}
-			if(part2remain+num <= 0)
-			{
-				num -= part2remain+num;
-				break;
-			}
-
-			for(i=0;i<4;i++)
-			{
-				if(!(i & 1))
-				{
-					if(!mc)
-					{
-						mc = *m++;
-						cb = *m++;
-#ifdef CUT_SFB21
-						if(cb == 21)
-							v = 0.0;
-						else
-#endif
-						{
-#ifdef REAL_IS_FIXED
-							gainpow2_scale_idx = (int)(gr_info->pow2gain + (*scf << shift) - fr->gainpow2);
-#endif
-							v = gr_info->pow2gain[((*scf++) + (*pretab++)) << shift];
-						}
-					}
-					mc--;
-				}
-				if( (a & (0x8>>i)) )
-				{
-					max = cb;
-					if(part2remain+num <= 0)
-					break;
-
-					if(mask < 0) *xrpnt++ = -REAL_SCALE_LAYER3(v, gainpow2_scale_idx);
-					else *xrpnt++ = REAL_SCALE_LAYER3(v, gainpow2_scale_idx);
-
-					num--;
-					mask <<= 1;
-				}
-				else *xrpnt++ = DOUBLE_TO_REAL(0.0);
-			}
-		}
-
-		gr_info->maxbandl = max+1;
-		gr_info->maxb = fr->longLimit[sfreq][gr_info->maxbandl];
-	}
-
-	part2remain += num;
-	backbits(fr, num);
-	num = 0;
-
-	while(xrpnt < &xr[SBLIMIT][0]) 
-	*xrpnt++ = DOUBLE_TO_REAL(0.0);
-
-	while( part2remain > 16 )
-	{
-		skipbits(fr, 16); /* Dismiss stuffing Bits */
-		part2remain -= 16;
-	}
-	if(part2remain > 0) skipbits(fr, part2remain);
-	else if(part2remain < 0)
-	{
-		debug1("Can't rewind stream by %d bits!",-part2remain);
-		return 1; /* -> error */
-	}
-	return 0;
-}
-
-
-/* calculate real channel values for Joint-I-Stereo-mode */
-static void III_i_stereo(real xr_buf[2][SBLIMIT][SSLIMIT],int *scalefac, struct gr_info_s *gr_info,int sfreq,int ms_stereo,int lsf)
-{
-	real (*xr)[SBLIMIT*SSLIMIT] = (real (*)[SBLIMIT*SSLIMIT] ) xr_buf;
-	const struct bandInfoStruct *bi = &bandInfo[sfreq];
-
-	const real *tab1,*tab2;
-
-#if 1
-	int tab;
-/* TODO: optimize as static */
-	const real *tabs[3][2][2] =
-	{ 
-		{ { tan1_1,tan2_1 } , { tan1_2,tan2_2 } },
-		{ { pow1_1[0],pow2_1[0] } , { pow1_2[0],pow2_2[0] } },
-		{ { pow1_1[1],pow2_1[1] } , { pow1_2[1],pow2_2[1] } }
-	};
-
-	tab = lsf + (gr_info->scalefac_compress & lsf);
-	tab1 = tabs[tab][ms_stereo][0];
-	tab2 = tabs[tab][ms_stereo][1];
-#else
-	if(lsf)
-	{
-		int p = gr_info->scalefac_compress & 0x1;
-		if(ms_stereo)
-		{
-			tab1 = pow1_2[p];
-			tab2 = pow2_2[p];
-		}
-		else
-		{
-			tab1 = pow1_1[p];
-			tab2 = pow2_1[p];
-		}
-	}
-	else
-	{
-		if(ms_stereo)
-		{
-			tab1 = tan1_2;
-			tab2 = tan2_2;
-		}
-		else
-		{
-			tab1 = tan1_1;
-			tab2 = tan2_1;
-		}
-	}
-#endif
-
-	if(gr_info->block_type == 2)
-	{
-		int lwin,do_l = 0;
-		if( gr_info->mixed_block_flag ) do_l = 1;
-
-		for(lwin=0;lwin<3;lwin++)
-		{ /* process each window */
-			/* get first band with zero values */
-			int is_p,sb,idx,sfb = gr_info->maxband[lwin]; /* sfb is minimal 3 for mixed mode */
-			if(sfb > 3) do_l = 0;
-
-			for(;sfb<12;sfb++)
-			{
-				is_p = scalefac[sfb*3+lwin-gr_info->mixed_block_flag]; /* scale: 0-15 */ 
-				if(is_p != 7)
-				{
-					real t1,t2;
-					sb = bi->shortDiff[sfb];
-					idx = bi->shortIdx[sfb] + lwin;
-					t1 = tab1[is_p]; t2 = tab2[is_p];
-					for (; sb > 0; sb--,idx+=3)
-					{
-						real v = xr[0][idx];
-						xr[0][idx] = REAL_MUL_15(v, t1);
-						xr[1][idx] = REAL_MUL_15(v, t2);
-					}
-				}
-			}
-
-#if 1
-/* in the original: copy 10 to 11 , here: copy 11 to 12 
-maybe still wrong??? (copy 12 to 13?) */
-			is_p = scalefac[11*3+lwin-gr_info->mixed_block_flag]; /* scale: 0-15 */
-			sb = bi->shortDiff[12];
-			idx = bi->shortIdx[12] + lwin;
-#else
-			is_p = scalefac[10*3+lwin-gr_info->mixed_block_flag]; /* scale: 0-15 */
-			sb = bi->shortDiff[11];
-			idx = bi->shortIdx[11] + lwin;
-#endif
-			if(is_p != 7)
-			{
-				real t1,t2;
-				t1 = tab1[is_p]; t2 = tab2[is_p];
-				for( ; sb > 0; sb--,idx+=3 )
-				{ 
-					real v = xr[0][idx];
-					xr[0][idx] = REAL_MUL_15(v, t1);
-					xr[1][idx] = REAL_MUL_15(v, t2);
-				}
-			}
-		} /* end for(lwin; .. ; . ) */
-
-		/* also check l-part, if ALL bands in the three windows are 'empty' and mode = mixed_mode */
-		if(do_l)
-		{
-			int sfb = gr_info->maxbandl;
-			int idx;
-			if(sfb > 21) return; /* similarity fix related to CVE-2006-1655 */
-
-			idx = bi->longIdx[sfb];
-			for( ; sfb<8; sfb++ )
-			{
-				int sb = bi->longDiff[sfb];
-				int is_p = scalefac[sfb]; /* scale: 0-15 */
-				if(is_p != 7)
-				{
-					real t1,t2;
-					t1 = tab1[is_p]; t2 = tab2[is_p];
-					for( ; sb > 0; sb--,idx++)
-					{
-						real v = xr[0][idx];
-						xr[0][idx] = REAL_MUL_15(v, t1);
-						xr[1][idx] = REAL_MUL_15(v, t2);
-					}
-				}
-				else idx += sb;
-			}
-		} 
-	} 
-	else
-	{ /* ((gr_info->block_type != 2)) */
-		int sfb = gr_info->maxbandl;
-		int is_p,idx;
-		if(sfb > 21) return; /* tightened fix for CVE-2006-1655 */
-
-		idx = bi->longIdx[sfb];
-		for ( ; sfb<21; sfb++)
-		{
-			int sb = bi->longDiff[sfb];
-			is_p = scalefac[sfb]; /* scale: 0-15 */
-			if(is_p != 7)
-			{
-				real t1,t2;
-				t1 = tab1[is_p]; t2 = tab2[is_p];
-				for( ; sb > 0; sb--,idx++)
-				{
-					 real v = xr[0][idx];
-					 xr[0][idx] = REAL_MUL_15(v, t1);
-					 xr[1][idx] = REAL_MUL_15(v, t2);
-				}
-			}
-			else idx += sb;
-		}
-
-		is_p = scalefac[20];
-		if(is_p != 7)
-		{ /* copy l-band 20 to l-band 21 */
-			int sb;
-			real t1 = tab1[is_p],t2 = tab2[is_p]; 
-
-			for( sb = bi->longDiff[21]; sb > 0; sb--,idx++ )
-			{
-				real v = xr[0][idx];
-				xr[0][idx] = REAL_MUL_15(v, t1);
-				xr[1][idx] = REAL_MUL_15(v, t2);
-			}
-		}
-	}
-}
-
-
-static void III_antialias(real xr[SBLIMIT][SSLIMIT],struct gr_info_s *gr_info)
-{
-	int sblim;
-
-	if(gr_info->block_type == 2)
-	{
-			if(!gr_info->mixed_block_flag) return;
-
-			sblim = 1; 
-	}
-	else sblim = gr_info->maxb-1;
-
-	/* 31 alias-reduction operations between each pair of sub-bands */
-	/* with 8 butterflies between each pair */
-
-	{
-		int sb;
-		real *xr1=(real *) xr[1];
-
-		for(sb=sblim; sb; sb--,xr1+=10)
-		{
-			int ss;
-			real *cs=aa_cs,*ca=aa_ca;
-			real *xr2 = xr1;
-
-			for(ss=7;ss>=0;ss--)
-			{ /* upper and lower butterfly inputs */
-				register real bu = *--xr2,bd = *xr1;
-				*xr2 = REAL_MUL(bu, *cs) - REAL_MUL(bd, *ca);
-				*xr1++ = REAL_MUL(bd, *cs++) + REAL_MUL(bu, *ca++);
-			}
-		}
-	}
-}
-
-/* 
-	This is an optimized DCT from Jeff Tsay's maplay 1.2+ package.
-	Saved one multiplication by doing the 'twiddle factor' stuff
-	together with the window mul. (MH)
-
-	This uses Byeong Gi Lee's Fast Cosine Transform algorithm, but the
-	9 point IDCT needs to be reduced further. Unfortunately, I don't
-	know how to do that, because 9 is not an even number. - Jeff.
-
-	Original Message:
-
-	9 Point Inverse Discrete Cosine Transform
-
-	This piece of code is Copyright 1997 Mikko Tommila and is freely usable
-	by anybody. The algorithm itself is of course in the public domain.
-
-	Again derived heuristically from the 9-point WFTA.
-
-	The algorithm is optimized (?) for speed, not for small rounding errors or
-	good readability.
-
-	36 additions, 11 multiplications
-
-	Again this is very likely sub-optimal.
-
-	The code is optimized to use a minimum number of temporary variables,
-	so it should compile quite well even on 8-register Intel x86 processors.
-	This makes the code quite obfuscated and very difficult to understand.
-
-	References:
-	[1] S. Winograd: "On Computing the Discrete Fourier Transform",
-	 Mathematics of Computation, Volume 32, Number 141, January 1978,
-	 Pages 175-199
-*/
-
-/* Calculation of the inverse MDCT
- used to be static without 3dnow - does that really matter? */
-void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf)
-{
-#ifdef NEW_DCT9
-	real tmp[18];
-#endif
-
-	{
-		register real *in = inbuf;
-
-		in[17]+=in[16]; in[16]+=in[15]; in[15]+=in[14];
-		in[14]+=in[13]; in[13]+=in[12]; in[12]+=in[11];
-		in[11]+=in[10]; in[10]+=in[9]; in[9] +=in[8];
-		in[8] +=in[7]; in[7] +=in[6]; in[6] +=in[5];
-		in[5] +=in[4]; in[4] +=in[3]; in[3] +=in[2];
-		in[2] +=in[1]; in[1] +=in[0];
-
-		in[17]+=in[15]; in[15]+=in[13]; in[13]+=in[11]; in[11]+=in[9];
-		in[9] +=in[7]; in[7] +=in[5]; in[5] +=in[3]; in[3] +=in[1];
-
-
-#ifdef NEW_DCT9
-#if 1
-		{
-			real t3;
-			{
-				real t0, t1, t2;
-
-				t0 = REAL_MUL(COS6_2, (in[8] + in[16] - in[4]));
-				t1 = REAL_MUL(COS6_2, in[12]);
-
-				t3 = in[0];
-				t2 = t3 - t1 - t1;
-				tmp[1] = tmp[7] = t2 - t0;
-				tmp[4] = t2 + t0 + t0;
-				t3 += t1;
-
-				t2 = REAL_MUL(COS6_1, (in[10] + in[14] - in[2]));
-				tmp[1] -= t2;
-				tmp[7] += t2;
-			}
-			{
-				real t0, t1, t2;
-
-				t0 = REAL_MUL(cos9[0], (in[4] + in[8] ));
-				t1 = REAL_MUL(cos9[1], (in[8] - in[16]));
-				t2 = REAL_MUL(cos9[2], (in[4] + in[16]));
-
-				tmp[2] = tmp[6] = t3 - t0 - t2;
-				tmp[0] = tmp[8] = t3 + t0 + t1;
-				tmp[3] = tmp[5] = t3 - t1 + t2;
-			}
-		}
-		{
-			real t1, t2, t3;
-
-			t1 = REAL_MUL(cos18[0], (in[2] + in[10]));
-			t2 = REAL_MUL(cos18[1], (in[10] - in[14]));
-			t3 = REAL_MUL(COS6_1, in[6]);
-
-			{
-				real t0 = t1 + t2 + t3;
-				tmp[0] += t0;
-				tmp[8] -= t0;
-			}
-
-			t2 -= t3;
-			t1 -= t3;
-
-			t3 = REAL_MUL(cos18[2], (in[2] + in[14]));
-
-			t1 += t3;
-			tmp[3] += t1;
-			tmp[5] -= t1;
-
-			t2 -= t3;
-			tmp[2] += t2;
-			tmp[6] -= t2;
-		}
-
-#else
-		{
-			real t0, t1, t2, t3, t4, t5, t6, t7;
-
-			t1 = REAL_MUL(COS6_2, in[12]);
-			t2 = REAL_MUL(COS6_2, (in[8] + in[16] - in[4]));
-
-			t3 = in[0] + t1;
-			t4 = in[0] - t1 - t1;
-			t5 = t4 - t2;
-			tmp[4] = t4 + t2 + t2;
-
-			t0 = REAL_MUL(cos9[0], (in[4] + in[8]));
-			t1 = REAL_MUL(cos9[1], (in[8] - in[16]));
-
-			t2 = REAL_MUL(cos9[2], (in[4] + in[16]));
-
-			t6 = t3 - t0 - t2;
-			t0 += t3 + t1;
-			t3 += t2 - t1;
-
-			t2 = REAL_MUL(cos18[0], (in[2] + in[10]));
-			t4 = REAL_MUL(cos18[1], (in[10] - in[14]));
-			t7 = REAL_MUL(COS6_1, in[6]);
-
-			t1 = t2 + t4 + t7;
-			tmp[0] = t0 + t1;
-			tmp[8] = t0 - t1;
-			t1 = REAL_MUL(cos18[2], (in[2] + in[14]));
-			t2 += t1 - t7;
-
-			tmp[3] = t3 + t2;
-			t0 = REAL_MUL(COS6_1, (in[10] + in[14] - in[2]));
-			tmp[5] = t3 - t2;
-
-			t4 -= t1 + t7;
-
-			tmp[1] = t5 - t0;
-			tmp[7] = t5 + t0;
-			tmp[2] = t6 + t4;
-			tmp[6] = t6 - t4;
-		}
-#endif
-
-		{
-			real t0, t1, t2, t3, t4, t5, t6, t7;
-
-			t1 = REAL_MUL(COS6_2, in[13]);
-			t2 = REAL_MUL(COS6_2, (in[9] + in[17] - in[5]));
-
-			t3 = in[1] + t1;
-			t4 = in[1] - t1 - t1;
-			t5 = t4 - t2;
-
-			t0 = REAL_MUL(cos9[0], (in[5] + in[9]));
-			t1 = REAL_MUL(cos9[1], (in[9] - in[17]));
-
-			tmp[13] = REAL_MUL((t4 + t2 + t2), tfcos36[17-13]);
-			t2 = REAL_MUL(cos9[2], (in[5] + in[17]));
-
-			t6 = t3 - t0 - t2;
-			t0 += t3 + t1;
-			t3 += t2 - t1;
-
-			t2 = REAL_MUL(cos18[0], (in[3] + in[11]));
-			t4 = REAL_MUL(cos18[1], (in[11] - in[15]));
-			t7 = REAL_MUL(COS6_1, in[7]);
-
-			t1 = t2 + t4 + t7;
-			tmp[17] = REAL_MUL((t0 + t1), tfcos36[17-17]);
-			tmp[9] = REAL_MUL((t0 - t1), tfcos36[17-9]);
-			t1 = REAL_MUL(cos18[2], (in[3] + in[15]));
-			t2 += t1 - t7;
-
-			tmp[14] = REAL_MUL((t3 + t2), tfcos36[17-14]);
-			t0 = REAL_MUL(COS6_1, (in[11] + in[15] - in[3]));
-			tmp[12] = REAL_MUL((t3 - t2), tfcos36[17-12]);
-
-			t4 -= t1 + t7;
-
-			tmp[16] = REAL_MUL((t5 - t0), tfcos36[17-16]);
-			tmp[10] = REAL_MUL((t5 + t0), tfcos36[17-10]);
-			tmp[15] = REAL_MUL((t6 + t4), tfcos36[17-15]);
-			tmp[11] = REAL_MUL((t6 - t4), tfcos36[17-11]);
-		}
-
-#define MACRO(v) { \
-		real tmpval; \
-		tmpval = tmp[(v)] + tmp[17-(v)]; \
-		out2[9+(v)] = REAL_MUL(tmpval, w[27+(v)]); \
-		out2[8-(v)] = REAL_MUL(tmpval, w[26-(v)]); \
-		tmpval = tmp[(v)] - tmp[17-(v)]; \
-		ts[SBLIMIT*(8-(v))] = out1[8-(v)] + REAL_MUL(tmpval, w[8-(v)]); \
-		ts[SBLIMIT*(9+(v))] = out1[9+(v)] + REAL_MUL(tmpval, w[9+(v)]); }
-
-		{
-			register real *out2 = o2;
-			register real *w = wintab;
-			register real *out1 = o1;
-			register real *ts = tsbuf;
-
-			MACRO(0);
-			MACRO(1);
-			MACRO(2);
-			MACRO(3);
-			MACRO(4);
-			MACRO(5);
-			MACRO(6);
-			MACRO(7);
-			MACRO(8);
-		}
-
-#else
-
-		{
-
-#define MACRO0(v) { \
-	real tmp; \
-	out2[9+(v)] = REAL_MUL((tmp = sum0 + sum1), w[27+(v)]); \
-	out2[8-(v)] = REAL_MUL(tmp, w[26-(v)]); } \
-	sum0 -= sum1; \
-	ts[SBLIMIT*(8-(v))] = out1[8-(v)] + REAL_MUL(sum0, w[8-(v)]); \
-	ts[SBLIMIT*(9+(v))] = out1[9+(v)] + REAL_MUL(sum0, w[9+(v)]);
-#define MACRO1(v) { \
-	real sum0,sum1; \
-	sum0 = tmp1a + tmp2a; \
-	sum1 = REAL_MUL((tmp1b + tmp2b), tfcos36[(v)]); \
-	MACRO0(v); }
-#define MACRO2(v) { \
-	real sum0,sum1; \
-	sum0 = tmp2a - tmp1a; \
-	sum1 = REAL_MUL((tmp2b - tmp1b), tfcos36[(v)]); \
-	MACRO0(v); }
-
-			register const real *c = COS9;
-			register real *out2 = o2;
-			register real *w = wintab;
-			register real *out1 = o1;
-			register real *ts = tsbuf;
-
-			real ta33,ta66,tb33,tb66;
-
-			ta33 = REAL_MUL(in[2*3+0], c[3]);
-			ta66 = REAL_MUL(in[2*6+0], c[6]);
-			tb33 = REAL_MUL(in[2*3+1], c[3]);
-			tb66 = REAL_MUL(in[2*6+1], c[6]);
-
-			{ 
-				real tmp1a,tmp2a,tmp1b,tmp2b;
-				tmp1a = REAL_MUL(in[2*1+0], c[1]) + ta33 + REAL_MUL(in[2*5+0], c[5]) + REAL_MUL(in[2*7+0], c[7]);
-				tmp1b = REAL_MUL(in[2*1+1], c[1]) + tb33 + REAL_MUL(in[2*5+1], c[5]) + REAL_MUL(in[2*7+1], c[7]);
-				tmp2a = REAL_MUL(in[2*2+0], c[2]) + REAL_MUL(in[2*4+0], c[4]) + ta66 + REAL_MUL(in[2*8+0], c[8]);
-				tmp2b = REAL_MUL(in[2*2+1], c[2]) + REAL_MUL(in[2*4+1], c[4]) + tb66 + REAL_MUL(in[2*8+1], c[8]);
-
-				MACRO1(0);
-				MACRO2(8);
-			}
-
-			{
-				real tmp1a,tmp2a,tmp1b,tmp2b;
-				tmp1a = REAL_MUL(( in[2*1+0] - in[2*5+0] - in[2*7+0] ), c[3]);
-				tmp1b = REAL_MUL(( in[2*1+1] - in[2*5+1] - in[2*7+1] ), c[3]);
-				tmp2a = REAL_MUL(( in[2*2+0] - in[2*4+0] - in[2*8+0] ), c[6]) - in[2*6+0] + in[2*0+0];
-				tmp2b = REAL_MUL(( in[2*2+1] - in[2*4+1] - in[2*8+1] ), c[6]) - in[2*6+1] + in[2*0+1];
-
-				MACRO1(1);
-				MACRO2(7);
-			}
-
-			{
-				real tmp1a,tmp2a,tmp1b,tmp2b;
-				tmp1a = REAL_MUL(in[2*1+0], c[5]) - ta33 - REAL_MUL(in[2*5+0], c[7]) + REAL_MUL(in[2*7+0], c[1]);
-				tmp1b = REAL_MUL(in[2*1+1], c[5]) - tb33 - REAL_MUL(in[2*5+1], c[7]) + REAL_MUL(in[2*7+1], c[1]);
-				tmp2a = - REAL_MUL(in[2*2+0], c[8]) - REAL_MUL(in[2*4+0], c[2]) + ta66 + REAL_MUL(in[2*8+0], c[4]);
-				tmp2b = - REAL_MUL(in[2*2+1], c[8]) - REAL_MUL(in[2*4+1], c[2]) + tb66 + REAL_MUL(in[2*8+1], c[4]);
-
-				MACRO1(2);
-				MACRO2(6);
-			}
-
-			{
-				real tmp1a,tmp2a,tmp1b,tmp2b;
-				tmp1a = REAL_MUL(in[2*1+0], c[7]) - ta33 + REAL_MUL(in[2*5+0], c[1]) - REAL_MUL(in[2*7+0], c[5]);
-				tmp1b = REAL_MUL(in[2*1+1], c[7]) - tb33 + REAL_MUL(in[2*5+1], c[1]) - REAL_MUL(in[2*7+1], c[5]);
-				tmp2a = - REAL_MUL(in[2*2+0], c[4]) + REAL_MUL(in[2*4+0], c[8]) + ta66 - REAL_MUL(in[2*8+0], c[2]);
-				tmp2b = - REAL_MUL(in[2*2+1], c[4]) + REAL_MUL(in[2*4+1], c[8]) + tb66 - REAL_MUL(in[2*8+1], c[2]);
-
-				MACRO1(3);
-				MACRO2(5);
-			}
-
-			{
-				real sum0,sum1;
-				sum0 = in[2*0+0] - in[2*2+0] + in[2*4+0] - in[2*6+0] + in[2*8+0];
-				sum1 = REAL_MUL((in[2*0+1] - in[2*2+1] + in[2*4+1] - in[2*6+1] + in[2*8+1] ), tfcos36[4]);
-				MACRO0(4);
-			}
-		}
-#endif
-
-	}
-}
-
-
-/* new DCT12 */
-static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,register real *ts)
-{
-#define DCT12_PART1 \
-	in5 = in[5*3]; \
-	in5 += (in4 = in[4*3]); \
-	in4 += (in3 = in[3*3]); \
-	in3 += (in2 = in[2*3]); \
-	in2 += (in1 = in[1*3]); \
-	in1 += (in0 = in[0*3]); \
-	\
-	in5 += in3; in3 += in1; \
-	\
-	in2 = REAL_MUL(in2, COS6_1); \
-	in3 = REAL_MUL(in3, COS6_1);
-
-#define DCT12_PART2 \
-	in0 += REAL_MUL(in4, COS6_2); \
-	\
-	in4 = in0 + in2; \
-	in0 -= in2; \
-	\
-	in1 += REAL_MUL(in5, COS6_2); \
-	\
-	in5 = REAL_MUL((in1 + in3), tfcos12[0]); \
-	in1 = REAL_MUL((in1 - in3), tfcos12[2]); \
-	\
-	in3 = in4 + in5; \
-	in4 -= in5; \
-	\
-	in2 = in0 + in1; \
-	in0 -= in1;
-
-	{
-		real in0,in1,in2,in3,in4,in5;
-		register real *out1 = rawout1;
-		ts[SBLIMIT*0] = out1[0]; ts[SBLIMIT*1] = out1[1]; ts[SBLIMIT*2] = out1[2];
-		ts[SBLIMIT*3] = out1[3]; ts[SBLIMIT*4] = out1[4]; ts[SBLIMIT*5] = out1[5];
- 
-		DCT12_PART1
-
-		{
-			real tmp0,tmp1 = (in0 - in4);
-			{
-				real tmp2 = REAL_MUL((in1 - in5), tfcos12[1]);
-				tmp0 = tmp1 + tmp2;
-				tmp1 -= tmp2;
-			}
-			ts[(17-1)*SBLIMIT] = out1[17-1] + REAL_MUL(tmp0, wi[11-1]);
-			ts[(12+1)*SBLIMIT] = out1[12+1] + REAL_MUL(tmp0, wi[6+1]);
-			ts[(6 +1)*SBLIMIT] = out1[6 +1] + REAL_MUL(tmp1, wi[1]);
-			ts[(11-1)*SBLIMIT] = out1[11-1] + REAL_MUL(tmp1, wi[5-1]);
-		}
-
-		DCT12_PART2
-
-		ts[(17-0)*SBLIMIT] = out1[17-0] + REAL_MUL(in2, wi[11-0]);
-		ts[(12+0)*SBLIMIT] = out1[12+0] + REAL_MUL(in2, wi[6+0]);
-		ts[(12+2)*SBLIMIT] = out1[12+2] + REAL_MUL(in3, wi[6+2]);
-		ts[(17-2)*SBLIMIT] = out1[17-2] + REAL_MUL(in3, wi[11-2]);
-
-		ts[(6 +0)*SBLIMIT] = out1[6+0] + REAL_MUL(in0, wi[0]);
-		ts[(11-0)*SBLIMIT] = out1[11-0] + REAL_MUL(in0, wi[5-0]);
-		ts[(6 +2)*SBLIMIT] = out1[6+2] + REAL_MUL(in4, wi[2]);
-		ts[(11-2)*SBLIMIT] = out1[11-2] + REAL_MUL(in4, wi[5-2]);
-	}
-
-	in++;
-
-	{
-		real in0,in1,in2,in3,in4,in5;
-		register real *out2 = rawout2;
- 
-		DCT12_PART1
-
-		{
-			real tmp0,tmp1 = (in0 - in4);
-			{
-				real tmp2 = REAL_MUL((in1 - in5), tfcos12[1]);
-				tmp0 = tmp1 + tmp2;
-				tmp1 -= tmp2;
-			}
-			out2[5-1] = REAL_MUL(tmp0, wi[11-1]);
-			out2[0+1] = REAL_MUL(tmp0, wi[6+1]);
-			ts[(12+1)*SBLIMIT] += REAL_MUL(tmp1, wi[1]);
-			ts[(17-1)*SBLIMIT] += REAL_MUL(tmp1, wi[5-1]);
-		}
-
-		DCT12_PART2
-
-		out2[5-0] = REAL_MUL(in2, wi[11-0]);
-		out2[0+0] = REAL_MUL(in2, wi[6+0]);
-		out2[0+2] = REAL_MUL(in3, wi[6+2]);
-		out2[5-2] = REAL_MUL(in3, wi[11-2]);
-
-		ts[(12+0)*SBLIMIT] += REAL_MUL(in0, wi[0]);
-		ts[(17-0)*SBLIMIT] += REAL_MUL(in0, wi[5-0]);
-		ts[(12+2)*SBLIMIT] += REAL_MUL(in4, wi[2]);
-		ts[(17-2)*SBLIMIT] += REAL_MUL(in4, wi[5-2]);
-	}
-
-	in++; 
-
-	{
-		real in0,in1,in2,in3,in4,in5;
-		register real *out2 = rawout2;
-		out2[12]=out2[13]=out2[14]=out2[15]=out2[16]=out2[17]=0.0;
-
-		DCT12_PART1
-
-		{
-			real tmp0,tmp1 = (in0 - in4);
-			{
-				real tmp2 = REAL_MUL((in1 - in5), tfcos12[1]);
-				tmp0 = tmp1 + tmp2;
-				tmp1 -= tmp2;
-			}
-			out2[11-1] = REAL_MUL(tmp0, wi[11-1]);
-			out2[6 +1] = REAL_MUL(tmp0, wi[6+1]);
-			out2[0+1] += REAL_MUL(tmp1, wi[1]);
-			out2[5-1] += REAL_MUL(tmp1, wi[5-1]);
-		}
-
-		DCT12_PART2
-
-		out2[11-0] = REAL_MUL(in2, wi[11-0]);
-		out2[6 +0] = REAL_MUL(in2, wi[6+0]);
-		out2[6 +2] = REAL_MUL(in3, wi[6+2]);
-		out2[11-2] = REAL_MUL(in3, wi[11-2]);
-
-		out2[0+0] += REAL_MUL(in0, wi[0]);
-		out2[5-0] += REAL_MUL(in0, wi[5-0]);
-		out2[0+2] += REAL_MUL(in4, wi[2]);
-		out2[5-2] += REAL_MUL(in4, wi[5-2]);
-	}
-}
-
-
-static void III_hybrid(real fsIn[SBLIMIT][SSLIMIT], real tsOut[SSLIMIT][SBLIMIT], int ch,struct gr_info_s *gr_info, mpg123_handle *fr)
-{
-	real (*block)[2][SBLIMIT*SSLIMIT] = fr->hybrid_block;
-	int *blc = fr->hybrid_blc;
-
-	real *tspnt = (real *) tsOut;
-	real *rawout1,*rawout2;
-	int bt = 0;
-	size_t sb = 0;
-
-	{
-		int b = blc[ch];
-		rawout1=block[b][ch];
-		b=-b+1;
-		rawout2=block[b][ch];
-		blc[ch] = b;
-	}
- 
-	if(gr_info->mixed_block_flag)
-	{
-		sb = 2;
-		opt_dct36(fr)(fsIn[0],rawout1,rawout2,win[0],tspnt);
-		opt_dct36(fr)(fsIn[1],rawout1+18,rawout2+18,win1[0],tspnt+1);
-		rawout1 += 36; rawout2 += 36; tspnt += 2;
-	}
- 
-	bt = gr_info->block_type;
-	if(bt == 2)
-	{
-		for(; sb<gr_info->maxb; sb+=2,tspnt+=2,rawout1+=36,rawout2+=36)
-		{
-			dct12(fsIn[sb] ,rawout1 ,rawout2 ,win[2] ,tspnt);
-			dct12(fsIn[sb+1],rawout1+18,rawout2+18,win1[2],tspnt+1);
-		}
-	}
-	else
-	{
-		for(; sb<gr_info->maxb; sb+=2,tspnt+=2,rawout1+=36,rawout2+=36)
-		{
-			opt_dct36(fr)(fsIn[sb],rawout1,rawout2,win[bt],tspnt);
-			opt_dct36(fr)(fsIn[sb+1],rawout1+18,rawout2+18,win1[bt],tspnt+1);
-		}
-	}
-
-	for(;sb<SBLIMIT;sb++,tspnt++)
-	{
-		int i;
-		for(i=0;i<SSLIMIT;i++)
-		{
-			tspnt[i*SBLIMIT] = *rawout1++;
-			*rawout2++ = DOUBLE_TO_REAL(0.0);
-		}
-	}
-}
-
-
-/* And at the end... the main layer3 handler */
-int do_layer3(mpg123_handle *fr)
-{
-	int gr, ch, ss,clip=0;
-	int scalefacs[2][39]; /* max 39 for short[13][3] mode, mixed: 38, long: 22 */
-	struct III_sideinfo sideinfo;
-	int stereo = fr->stereo;
-	int single = fr->single;
-	int ms_stereo,i_stereo;
-	int sfreq = fr->sampling_frequency;
-	int stereo1,granules;
-
-	if(stereo == 1)
-	{ /* stream is mono */
-		stereo1 = 1;
-		single = SINGLE_LEFT;
-	}
-	else if(single != SINGLE_STEREO) /* stream is stereo, but force to mono */
-	stereo1 = 1;
-	else
-	stereo1 = 2;
-
-	if(fr->mode == MPG_MD_JOINT_STEREO)
-	{
-		ms_stereo = (fr->mode_ext & 0x2)>>1;
-		i_stereo = fr->mode_ext & 0x1;
-	}
-	else ms_stereo = i_stereo = 0;
-
-	granules = fr->lsf ? 1 : 2;
-
-	/* quick hack to keep the music playing */
-	/* after having seen this nasty test file... */
-	if(III_get_side_info(fr, &sideinfo,stereo,ms_stereo,sfreq,single))
-	{
-		if(NOQUIET) error("bad frame - unable to get valid sideinfo");
-		return clip;
-	}
-
-	set_pointer(fr,sideinfo.main_data_begin);
-
-	for(gr=0;gr<granules;gr++)
-	{
-		/* hybridIn[2][SBLIMIT][SSLIMIT] */
-		real (*hybridIn)[SBLIMIT][SSLIMIT] = fr->layer3.hybrid_in;
-		/* hybridOut[2][SSLIMIT][SBLIMIT] */
-		real (*hybridOut)[SSLIMIT][SBLIMIT] = fr->layer3.hybrid_out;
-
-		{
-			struct gr_info_s *gr_info = &(sideinfo.ch[0].gr[gr]);
-			long part2bits;
-			if(fr->lsf)
-			part2bits = III_get_scale_factors_2(fr, scalefacs[0],gr_info,0);
-			else
-			part2bits = III_get_scale_factors_1(fr, scalefacs[0],gr_info,0,gr);
-
-			if(III_dequantize_sample(fr, hybridIn[0], scalefacs[0],gr_info,sfreq,part2bits))
-			{
-				if(VERBOSE2) error("dequantization failed!");
-				return clip;
-			}
-		}
-
-		if(stereo == 2)
-		{
-			struct gr_info_s *gr_info = &(sideinfo.ch[1].gr[gr]);
-			long part2bits;
-			if(fr->lsf) 
-			part2bits = III_get_scale_factors_2(fr, scalefacs[1],gr_info,i_stereo);
-			else
-			part2bits = III_get_scale_factors_1(fr, scalefacs[1],gr_info,1,gr);
-
-			if(III_dequantize_sample(fr, hybridIn[1],scalefacs[1],gr_info,sfreq,part2bits))
-			{
-				if(VERBOSE2) error("dequantization failed!");
-				return clip;
-			}
-
-			if(ms_stereo)
-			{
-				int i;
-				unsigned int maxb = sideinfo.ch[0].gr[gr].maxb;
-				if(sideinfo.ch[1].gr[gr].maxb > maxb) maxb = sideinfo.ch[1].gr[gr].maxb;
-
-				for(i=0;i<SSLIMIT*(int)maxb;i++)
-				{
-					real tmp0 = ((real *)hybridIn[0])[i];
-					real tmp1 = ((real *)hybridIn[1])[i];
-					((real *)hybridIn[0])[i] = tmp0 + tmp1;
-					((real *)hybridIn[1])[i] = tmp0 - tmp1;
-				}
-			}
-
-			if(i_stereo) III_i_stereo(hybridIn,scalefacs[1],gr_info,sfreq,ms_stereo,fr->lsf);
-
-			if(ms_stereo || i_stereo || (single == SINGLE_MIX) )
-			{
-				if(gr_info->maxb > sideinfo.ch[0].gr[gr].maxb) 
-				sideinfo.ch[0].gr[gr].maxb = gr_info->maxb;
-				else
-				gr_info->maxb = sideinfo.ch[0].gr[gr].maxb;
-			}
-
-			switch(single)
-			{
-				case SINGLE_MIX:
-				{
-					register int i;
-					register real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1];
-					for(i=0;i<SSLIMIT*(int)gr_info->maxb;i++,in0++)
-					*in0 = (*in0 + *in1++); /* *0.5 done by pow-scale */ 
-				}
-				break;
-				case SINGLE_RIGHT:
-				{
-					register int i;
-					register real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1];
-					for(i=0;i<SSLIMIT*(int)gr_info->maxb;i++)
-					*in0++ = *in1++;
-				}
-				break;
-			}
-		}
-
-		for(ch=0;ch<stereo1;ch++)
-		{
-			struct gr_info_s *gr_info = &(sideinfo.ch[ch].gr[gr]);
-			III_antialias(hybridIn[ch],gr_info);
-			III_hybrid(hybridIn[ch], hybridOut[ch], ch,gr_info, fr);
-		}
-
-#ifdef OPT_I486
-		if(single != SINGLE_STEREO || fr->af.encoding != MPG123_ENC_SIGNED_16 || fr->down_sample != 0)
-		{
-#endif
-		for(ss=0;ss<SSLIMIT;ss++)
-		{
-			if(single != SINGLE_STEREO)
-			clip += (fr->synth_mono)(hybridOut[0][ss], fr);
-			else
-			clip += (fr->synth_stereo)(hybridOut[0][ss], hybridOut[1][ss], fr);
-
-		}
-#ifdef OPT_I486
-		} else
-		{
-			/* Only stereo, 16 bits benefit from the 486 optimization. */
-			ss=0;
-			while(ss < SSLIMIT)
-			{
-				int n;
-				n=(fr->buffer.size - fr->buffer.fill) / (2*2*32);
-				if(n > (SSLIMIT-ss)) n=SSLIMIT-ss;
-
-				/* Clip counting makes no sense with this function. */
-				absynth_1to1_i486(hybridOut[0][ss], 0, fr, n);
-				absynth_1to1_i486(hybridOut[1][ss], 1, fr, n);
-				ss+=n;
-				fr->buffer.fill+=(2*2*32)*n;
-			}
-		}
-#endif
-	}
- 
-	return clip;
-}

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/libmpg123.c Deleted

@@ -1,1608 +0,0 @@
-/*
-	libmpg123: MPEG Audio Decoder library
-
-	copyright 1995-2010 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-
-*/
-
-#include "mpg123lib_intern.h"
-#include "icy2utf8.h"
-#include "debug.h"
-
-#ifdef GAPLESS
-#define SAMPLE_ADJUST(x) ((x) - ((mh->p.flags & MPG123_GAPLESS) ? mh->begin_os : 0))
-#define SAMPLE_UNADJUST(x) ((x) + ((mh->p.flags & MPG123_GAPLESS) ? mh->begin_os : 0))
-#else
-#define SAMPLE_ADJUST(x) (x)
-#define SAMPLE_UNADJUST(x) (x)
-#endif
-
-#define SEEKFRAME(mh) ((mh)->ignoreframe < 0 ? 0 : (mh)->ignoreframe)
-
-static int initialized = 0;
-
-#ifdef GAPLESS
-/*
-	Take the buffer after a frame decode (strictly: it is the data from frame fr->num!) and cut samples out.
-	fr->buffer.fill may then be smaller than before...
-*/
-static void frame_buffercheck(mpg123_handle *fr)
-{
-	/* When we have no accurate position, gapless code does not make sense. */
-	if(!fr->accurate) return;
-
-	/* Important: We first cut samples from the end, then cut from beginning (including left-shift of the buffer).
-	 This order works also for the case where firstframe == lastframe. */
-
-	/* The last interesting (planned) frame: Only use some leading samples.
-	 Note a difference from the below: The last frame and offset are unchanges by seeks.
-	 The lastoff keeps being valid. */
-	if(fr->lastframe > -1 && fr->num >= fr->lastframe)
-	{
-		/* There can be more than one frame of padding at the end, so we ignore the whole frame if we are beyond lastframe. */
-		off_t byteoff = (fr->num == fr->lastframe) ? samples_to_bytes(fr, fr->lastoff) : 0;
-		if((off_t)fr->buffer.fill > byteoff)
-		{
-			fr->buffer.fill = byteoff;
-		}
-		debug1("Cut frame buffer on end of stream, fill now %"SIZE_P" bytes.", (size_p)fr->buffer.fill);
-	}
-
-	/* The first interesting frame: Skip some leading samples. */
-	if(fr->firstoff && fr->num == fr->firstframe)
-	{
-		off_t byteoff = samples_to_bytes(fr, fr->firstoff);
-		if((off_t)fr->buffer.fill > byteoff)
-		{
-			fr->buffer.fill -= byteoff;
-			/* buffer.p != buffer.data only for own buffer */
-			debug6("cutting %li samples/%li bytes on begin, own_buffer=%i at %p=%p, buf[1]=%i",
-			 (long)fr->firstoff, (long)byteoff, fr->own_buffer, (void*)fr->buffer.p, (void*)fr->buffer.data, ((short*)fr->buffer.p)[2]);
-			if(fr->own_buffer) fr->buffer.p = fr->buffer.data + byteoff;
-			else memmove(fr->buffer.data, fr->buffer.data + byteoff, fr->buffer.fill);
-			debug3("done cutting, buffer at %p =? %p, buf[1]=%i",
-			 (void*)fr->buffer.p, (void*)fr->buffer.data, ((short*)fr->buffer.p)[2]);
-		}
-		else fr->buffer.fill = 0;
-		/* We can only reach this frame again by seeking. And on seeking, firstoff will be recomputed.
-		 So it is safe to null it here (and it makes the if() decision abort earlier). */
-		fr->firstoff = 0;
-	}
-}
-#endif
-
-int attribute_align_arg mpg123_init(void)
-{
-	if((sizeof(short) != 2) || (sizeof(long) < 4)) return MPG123_BAD_TYPES;
-
-	if(initialized) return MPG123_OK; /* no need to initialize twice */
-
-#ifndef NO_LAYER12
-	init_layer12(); /* inits also shared tables with layer1 */
-#endif
-#ifndef NO_LAYER3
-	init_layer3();
-#endif
-	prepare_decode_tables();
-	check_decoders();
-	initialized = 1;
-	return MPG123_OK;
-}
-
-void attribute_align_arg mpg123_exit(void)
-{
-	/* nothing yet, but something later perhaps */
-}
-
-/* create a new handle with specified decoder, decoder can be "", "auto" or NULL for auto-detection */
-mpg123_handle attribute_align_arg *mpg123_new(const char* decoder, int *error)
-{
-	return mpg123_parnew(NULL, decoder, error);
-}
-
-/* ...the full routine with optional initial parameters to override defaults. */
-mpg123_handle attribute_align_arg *mpg123_parnew(mpg123_pars *mp, const char* decoder, int *error)
-{
-	mpg123_handle *fr = NULL;
-	int err = MPG123_OK;
-
-	if(initialized) fr = (mpg123_handle*) malloc(sizeof(mpg123_handle));
-	else err = MPG123_NOT_INITIALIZED;
-	if(fr != NULL)
-	{
-		frame_init_par(fr, mp);
-		debug("cpu opt setting");
-		if(frame_cpu_opt(fr, decoder) != 1)
-		{
-			err = MPG123_BAD_DECODER;
-			frame_exit(fr);
-			free(fr);
-			fr = NULL;
-		}
-	}
-	if(fr != NULL)
-	{
-		/* Cleanup that mess! ... use mpg123_decoder / decode_update! */
-		if(frame_outbuffer(fr) != 0)
-		{
-			err = MPG123_NO_BUFFERS;
-			frame_exit(fr);
-			free(fr);
-			fr = NULL;
-		}
-		else
-		{
-			fr->decoder_change = 1;
-		}
-	}
-	else if(err == MPG123_OK) err = MPG123_OUT_OF_MEM;
-
-	if(error != NULL) *error = err;
-	return fr;
-}
-
-int attribute_align_arg mpg123_decoder(mpg123_handle *mh, const char* decoder)
-{
-	enum optdec dt = dectype(decoder);
-
-	if(mh == NULL) return MPG123_ERR;
-
-	if(dt == nodec)
-	{
-		mh->err = MPG123_BAD_DECODER;
-		return MPG123_ERR;
-	}
-	if(dt == mh->cpu_opts.type) return MPG123_OK;
-
-	/* Now really change. */
-	/* frame_exit(mh);
-	frame_init(mh); */
-	debug("cpu opt setting");
-	if(frame_cpu_opt(mh, decoder) != 1)
-	{
-		mh->err = MPG123_BAD_DECODER;
-		frame_exit(mh);
-		return MPG123_ERR;
-	}
-	/* New buffers for decoder are created in frame_buffers() */
-	if((frame_outbuffer(mh) != 0))
-	{
-		mh->err = MPG123_NO_BUFFERS;
-		frame_exit(mh);
-		return MPG123_ERR;
-	}
-	/* Do _not_ call decode_update here! That is only allowed after a first MPEG frame has been met. */
-	mh->decoder_change = 1;
-	return MPG123_OK;
-}
-
-int attribute_align_arg mpg123_param(mpg123_handle *mh, enum mpg123_parms key, long val, double fval)
-{
-	int r;
-
-	if(mh == NULL) return MPG123_ERR;
-	r = mpg123_par(&mh->p, key, val, fval);
-	if(r != MPG123_OK){ mh->err = r; r = MPG123_ERR; }
-	else
-	{ /* Special treatment for some settings. */
-#ifdef FRAME_INDEX
-		if(key == MPG123_INDEX_SIZE)
-		{ /* Apply frame index size and grow property on the fly. */
-			r = frame_index_setup(mh);
-			if(r != MPG123_OK) mh->err = MPG123_INDEX_FAIL;
-		}
-#endif
-	}
-	return r;
-}
-
-int attribute_align_arg mpg123_par(mpg123_pars *mp, enum mpg123_parms key, long val, double fval)
-{
-	int ret = MPG123_OK;
-
-	if(mp == NULL) return MPG123_BAD_PARS;
-	switch(key)
-	{
-		case MPG123_VERBOSE:
-			mp->verbose = val;
-		break;
-		case MPG123_FLAGS:
-#ifndef GAPLESS
-			if(val & MPG123_GAPLESS) ret = MPG123_NO_GAPLESS;
-#endif
-			if(ret == MPG123_OK) mp->flags = val;
-			debug1("set flags to 0x%lx", (unsigned long) mp->flags);
-		break;
-		case MPG123_ADD_FLAGS:
-#ifndef GAPLESS
-			/* Enabling of gapless mode doesn't work when it's not there, but disabling (below) is no problem. */
-			if(val & MPG123_GAPLESS) ret = MPG123_NO_GAPLESS;
-			else
-#endif
-			mp->flags |= val;
-			debug1("set flags to 0x%lx", (unsigned long) mp->flags);
-		break;
-		case MPG123_REMOVE_FLAGS:
-			mp->flags &= ~val;
-			debug1("set flags to 0x%lx", (unsigned long) mp->flags);
-		break;
-		case MPG123_FORCE_RATE: /* should this trigger something? */
-#ifdef NO_NTOM
-			if(val > 0)
-			ret = MPG123_BAD_RATE;
-#else
-			if(val > 96000) ret = MPG123_BAD_RATE;
-			else mp->force_rate = val < 0 ? 0 : val; /* >0 means enable, 0 disable */
-#endif
-		break;
-		case MPG123_DOWN_SAMPLE:
-#ifdef NO_DOWNSAMPLE
-			if(val != 0) ret = MPG123_BAD_RATE;
-#else
-			if(val < 0 || val > 2) ret = MPG123_BAD_RATE;
-			else mp->down_sample = (int)val;
-#endif
-		break;
-		case MPG123_RVA:
-			if(val < 0 || val > MPG123_RVA_MAX) ret = MPG123_BAD_RVA;
-			else mp->rva = (int)val;
-		break;
-		case MPG123_DOWNSPEED:
-			mp->halfspeed = val < 0 ? 0 : val;
-		break;
-		case MPG123_UPSPEED:
-			mp->doublespeed = val < 0 ? 0 : val;
-		break;
-		case MPG123_ICY_INTERVAL:
-#ifndef NO_ICY
-			mp->icy_interval = val > 0 ? val : 0;
-#else
-			if(val > 0) ret = MPG123_BAD_PARAM;
-#endif
-		break;
-		case MPG123_OUTSCALE:
-			/* Choose the value that is non-zero, if any.
-			 Downscaling integers to 1.0 . */
-			mp->outscale = val == 0 ? fval : (double)val/SHORT_SCALE;
-		break;
-		case MPG123_TIMEOUT:
-#ifdef TIMEOUT_READ
-			mp->timeout = val >= 0 ? val : 0;
-#else
-			if(val > 0) ret = MPG123_NO_TIMEOUT;
-#endif
-		break;
-		case MPG123_RESYNC_LIMIT:
-			mp->resync_limit = val;
-		break;
-		case MPG123_INDEX_SIZE:
-#ifdef FRAME_INDEX
-			mp->index_size = val;
-#else
-			ret = MPG123_NO_INDEX;
-#endif
-		break;
-		case MPG123_PREFRAMES:
-			if(val >= 0) mp->preframes = val;
-			else ret = MPG123_BAD_VALUE;
-		break;
-		default:
-			ret = MPG123_BAD_PARAM;
-	}
-	return ret;
-}
-
-int attribute_align_arg mpg123_getparam(mpg123_handle *mh, enum mpg123_parms key, long *val, double *fval)
-{
-	int r;
-
-	if(mh == NULL) return MPG123_ERR;
-	r = mpg123_getpar(&mh->p, key, val, fval);
-	if(r != MPG123_OK){ mh->err = r; r = MPG123_ERR; }
-	return r;
-}
-
-int attribute_align_arg mpg123_getpar(mpg123_pars *mp, enum mpg123_parms key, long *val, double *fval)
-{
-	int ret = 0;
-
-	if(mp == NULL) return MPG123_BAD_PARS;
-	switch(key)
-	{
-		case MPG123_VERBOSE:
-			if(val) *val = mp->verbose;
-		break;
-		case MPG123_FLAGS:
-		case MPG123_ADD_FLAGS:
-			if(val) *val = mp->flags;
-		break;
-		case MPG123_FORCE_RATE:
-			if(val) 
-#ifdef NO_NTOM
-			*val = 0;
-#else
-			*val = mp->force_rate;
-#endif
-		break;
-		case MPG123_DOWN_SAMPLE:
-			if(val) *val = mp->down_sample;
-		break;
-		case MPG123_RVA:
-			if(val) *val = mp->rva;
-		break;
-		case MPG123_DOWNSPEED:
-			if(val) *val = mp->halfspeed;
-		break;
-		case MPG123_UPSPEED:
-			if(val) *val = mp->doublespeed;
-		break;
-		case MPG123_ICY_INTERVAL:
-#ifndef NO_ICY
-			if(val) *val = (long)mp->icy_interval;
-#else
-			if(val) *val = 0;
-#endif
-		break;
-		case MPG123_OUTSCALE:
-			if(fval) *fval = mp->outscale;
-			if(val) *val = (long)(mp->outscale*SHORT_SCALE);
-		break;
-		case MPG123_RESYNC_LIMIT:
-			if(val) *val = mp->resync_limit;
-		break;
-		case MPG123_INDEX_SIZE:
-			if(val)
-#ifdef FRAME_INDEX
-			*val = mp->index_size;
-#else
-			*val = 0; /* graceful fallback: no index is index of zero size */
-#endif
-		break;
-		case MPG123_PREFRAMES:
-			*val = mp->preframes;
-		break;
-		default:
-			ret = MPG123_BAD_PARAM;
-	}
-	return ret;
-}
-
-int attribute_align_arg mpg123_getstate(mpg123_handle *mh, enum mpg123_state key, long *val, double *fval)
-{
-	int ret = MPG123_OK;
-	long theval = 0;
-	double thefval = 0.;
-
-	if(mh == NULL) return MPG123_ERR;
-
-	switch(key)
-	{
-		case MPG123_ACCURATE:
-			theval = mh->accurate;
-		break;
-		default:
-			mh->err = MPG123_BAD_KEY;
-			ret = MPG123_ERR;
-	}
-
-	if(val != NULL) *val = theval;
-	if(fval != NULL) *fval = thefval;
-
-	return ret;
-}
-
-int attribute_align_arg mpg123_eq(mpg123_handle *mh, enum mpg123_channels channel, int band, double val)
-{
-	if(mh == NULL) return MPG123_ERR;
-	if(band < 0 || band > 31){ mh->err = MPG123_BAD_BAND; return MPG123_ERR; }
-	switch(channel)
-	{
-		case MPG123_LEFT|MPG123_RIGHT:
-			mh->equalizer[0][band] = mh->equalizer[1][band] = DOUBLE_TO_REAL(val);
-		break;
-		case MPG123_LEFT: mh->equalizer[0][band] = DOUBLE_TO_REAL(val); break;
-		case MPG123_RIGHT: mh->equalizer[1][band] = DOUBLE_TO_REAL(val); break;
-		default:
-			mh->err=MPG123_BAD_CHANNEL;
-			return MPG123_ERR;
-	}
-	mh->have_eq_settings = TRUE;
-	return MPG123_OK;
-}
-
-double attribute_align_arg mpg123_geteq(mpg123_handle *mh, enum mpg123_channels channel, int band)
-{
-	double ret = 0.;
-
-	if(mh == NULL) return MPG123_ERR;
-
-	/* Handle this gracefully. When there is no band, it has no volume. */
-	if(band > -1 && band < 32)
-	switch(channel)
-	{
-		case MPG123_LEFT|MPG123_RIGHT:
-			ret = 0.5*(REAL_TO_DOUBLE(mh->equalizer[0][band])+REAL_TO_DOUBLE(mh->equalizer[1][band]));
-		break;
-		case MPG123_LEFT: ret = REAL_TO_DOUBLE(mh->equalizer[0][band]); break;
-		case MPG123_RIGHT: ret = REAL_TO_DOUBLE(mh->equalizer[1][band]); break;
-		/* Default case is already handled: ret = 0 */
-	}
-
-	return ret;
-}
-
-
-/* plain file access, no http! */
-int attribute_align_arg mpg123_open(mpg123_handle *mh, const char *path)
-{
-	if(mh == NULL) return MPG123_ERR;
-
-	mpg123_close(mh);
-	return open_stream(mh, path, -1);
-}
-
-int attribute_align_arg mpg123_open_fd(mpg123_handle *mh, int fd)
-{
-	if(mh == NULL) return MPG123_ERR;
-
-	mpg123_close(mh);
-	return open_stream(mh, NULL, fd);
-}
-
-int attribute_align_arg mpg123_open_handle(mpg123_handle *mh, void *iohandle)
-{
-	if(mh == NULL) return MPG123_ERR;
-
-	mpg123_close(mh);
-	if(mh->rdat.r_read_handle == NULL)
-	{
-		mh->err = MPG123_BAD_CUSTOM_IO;
-		return MPG123_ERR;
-	}
-	return open_stream_handle(mh, iohandle);
-}
-
-int attribute_align_arg mpg123_open_feed(mpg123_handle *mh)
-{
-	if(mh == NULL) return MPG123_ERR;
-
-	mpg123_close(mh);
-	return open_feed(mh);
-}
-
-int attribute_align_arg mpg123_replace_reader( mpg123_handle *mh,
- ssize_t (*r_read) (int, void *, size_t),
- off_t (*r_lseek)(int, off_t, int) )
-{
-	if(mh == NULL) return MPG123_ERR;
-
-	mpg123_close(mh);
-	mh->rdat.r_read = r_read;
-	mh->rdat.r_lseek = r_lseek;
-	return MPG123_OK;
-}
-
-int attribute_align_arg mpg123_replace_reader_handle( mpg123_handle *mh,
- ssize_t (*r_read) (void*, void *, size_t),
- off_t (*r_lseek)(void*, off_t, int),
- void (*cleanup)(void*) )
-{
-	if(mh == NULL) return MPG123_ERR;
-
-	mpg123_close(mh);
-	mh->rdat.r_read_handle = r_read;
-	mh->rdat.r_lseek_handle = r_lseek;
-	mh->rdat.cleanup_handle = cleanup;
-	return MPG123_OK;
-}
-
-/* Update decoding engine for
- a) a new choice of decoder
- b) a changed native format of the MPEG stream
- ... calls are only valid after parsing some MPEG frame! */
-int decode_update(mpg123_handle *mh)
-{
-	long native_rate;
-	int b;
-
-	if(mh->num < 0)
-	{
-		if(!(mh->p.flags & MPG123_QUIET)) error("decode_update() has been called before reading the first MPEG frame! Internal programming error.");
-
-		mh->err = MPG123_BAD_DECODER_SETUP;
-		return MPG123_ERR;
-	}
-
-	native_rate = frame_freq(mh);
-
-	b = frame_output_format(mh); /* Select the new output format based on given constraints. */
-	if(b < 0) return MPG123_ERR;
-
-	if(b == 1) mh->new_format = 1; /* Store for later... */
-
-	debug3("updating decoder structure with native rate %li and af.rate %li (new format: %i)", native_rate, mh->af.rate, mh->new_format);
-	if(mh->af.rate == native_rate) mh->down_sample = 0;
-	else if(mh->af.rate == native_rate>>1) mh->down_sample = 1;
-	else if(mh->af.rate == native_rate>>2) mh->down_sample = 2;
-	else mh->down_sample = 3; /* flexible (fixed) rate */
-	switch(mh->down_sample)
-	{
-		case 0:
-		case 1:
-		case 2:
-			mh->down_sample_sblimit = SBLIMIT>>(mh->down_sample);
-			/* With downsampling I get less samples per frame */
-			mh->outblock = samples_to_storage(mh, (spf(mh)>>mh->down_sample));
-		break;
-#ifndef NO_NTOM
-		case 3:
-		{
-			if(synth_ntom_set_step(mh) != 0) return -1;
-			if(frame_freq(mh) > mh->af.rate)
-			{
-				mh->down_sample_sblimit = SBLIMIT * mh->af.rate;
-				mh->down_sample_sblimit /= frame_freq(mh);
-			}
-			else mh->down_sample_sblimit = SBLIMIT;
-			mh->outblock = samples_to_storage(mh,
-			 ( ( NTOM_MUL-1+spf(mh)
-			 * (((size_t)NTOM_MUL*mh->af.rate)/frame_freq(mh))
-			 )/NTOM_MUL ));
-		}
-		break;
-#endif
-	}
-
-	if(!(mh->p.flags & MPG123_FORCE_MONO))
-	{
-		if(mh->af.channels == 1) mh->single = SINGLE_MIX;
-		else mh->single = SINGLE_STEREO;
-	}
-	else mh->single = (mh->p.flags & MPG123_FORCE_MONO)-1;
-	if(set_synth_functions(mh) != 0) return -1;;
-
-	do_rva(mh);
-	debug3("done updating decoder structure with native rate %li and af.rate %li and down_sample %i", frame_freq(mh), mh->af.rate, mh->down_sample);
-
-	return 0;
-}
-
-size_t attribute_align_arg mpg123_safe_buffer(void)
-{
-	/* real is the largest possible output (it's 32bit float, 32bit int or 64bit double). */
-	return sizeof(real)*2*1152*NTOM_MAX;
-}
-
-size_t attribute_align_arg mpg123_outblock(mpg123_handle *mh)
-{
-	if(mh != NULL) return mh->outblock;
-	else return mpg123_safe_buffer();
-}
-
-/* Read in the next frame we actually want for decoding.
- This includes skipping/ignoring frames, in additon to skipping junk in the parser. */
-static int get_next_frame(mpg123_handle *mh)
-{
-	/* We have some decoder ready, if the desired decoder has changed,
-	 it is OK to use the old one for ignoring frames and activating
-	 the new one for real (decode_update()) after getting the frame. */
-	int change = mh->decoder_change;
-	do
-	{
-		int b;
-		/* Decode & discard some frame(s) before beginning. */
-		if(mh->to_ignore && mh->num < mh->firstframe && mh->num >= mh->ignoreframe)
-		{
-			debug1("ignoring frame %li", (long)mh->num);
-			/* Decoder structure must be current! decode_update has been called before... */
-			(mh->do_layer)(mh); mh->buffer.fill = 0;
-#ifndef NO_NTOM
-			/* The ignored decoding may have failed. Make sure ntom stays consistent. */
-			if(mh->down_sample == 3) ntom_set_ntom(mh, mh->num+1);
-#endif
-			mh->to_ignore = mh->to_decode = FALSE;
-		}
-		/* Read new frame data; possibly breaking out here for MPG123_NEED_MORE. */
-		debug("read frame");
-		mh->to_decode = FALSE;
-		b = read_frame(mh); /* That sets to_decode only if a full frame was read. */
-		debug4("read of frame %li returned %i (to_decode=%i) at sample %li", (long)mh->num, b, mh->to_decode, (long)mpg123_tell(mh));
-		if(b == MPG123_NEED_MORE) return MPG123_NEED_MORE; /* need another call with data */
-		else if(b <= 0)
-		{
-			/* More sophisticated error control? */
-			if(b==0 || mh->rdat.filepos == mh->rdat.filelen)
-			{ /* We simply reached the end. */
-				mh->track_frames = mh->num + 1;
-				debug("What about updating/checking gapless sample count here?");
-				return MPG123_DONE;
-			}
-			else return MPG123_ERR; /* Some real error. */
-		}
-		/* Now, there should be new data to decode ... and also possibly new stream properties */
-		if(mh->header_change > 1)
-		{
-			debug("big header change");
-			change = 1;
-		}
-		/* Now some accounting: Look at the numbers and decide if we want this frame. */
-		++mh->playnum;
-		/* Plain skipping without decoding, only when frame is not ignored on next cycle. */
-		if(mh->num < mh->firstframe || (mh->p.doublespeed && (mh->playnum % mh->p.doublespeed)))
-		{
-			if(!(mh->to_ignore && mh->num < mh->firstframe && mh->num >= mh->ignoreframe))
-			{
-				frame_skip(mh);
-				/* Should one fix NtoM here or not?
-				 It is not work the trouble for doublespeed, but what with leading frames? */
-			}
-		}
-		/* Or, we are finally done and have a new frame. */
-		else break;
-	} while(1);
-
-	/* If we reach this point, we got a new frame ready to be decoded.
-	 All other situations resulted in returns from the loop. */
-	if(change)
-	{
-		if(decode_update(mh) < 0) /* dito... */
-		return MPG123_ERR;
-
-debug1("new format: %i", mh->new_format);
-
-		mh->decoder_change = 0;
-		if(mh->fresh)
-		{
-#ifdef GAPLESS
-			int b=0;
-			/* Prepare offsets for gapless decoding. */
-			debug1("preparing gapless stuff with native rate %li", frame_freq(mh));
-			frame_gapless_realinit(mh);
-			frame_set_frameseek(mh, mh->num);
-#endif
-			mh->fresh = 0;
-#ifdef GAPLESS
-			/* Could this possibly happen? With a real big gapless offset... */
-			if(mh->num < mh->firstframe) b = get_next_frame(mh);
-			if(b < 0) return b; /* Could be error, need for more, new format... */
-#endif
-		}
-	}
-	return MPG123_OK;
-}
-
-/* Assumption: A buffer full of zero samples can be constructed by repetition of this byte.
- Oh, and it handles some format conversion.
- Only to be used by decode_the_frame() ... */
-static int zero_byte(mpg123_handle *fr)
-{
-#ifndef NO_8BIT
-	return fr->af.encoding & MPG123_ENC_8 ? fr->conv16to8[0] : 0;
-#else
-	return 0; /* All normal signed formats have the zero here (even in byte form -- that may be an assumption for your funny machine...). */
-#endif
-}
-
-/*
-	Not part of the api. This just decodes the frame and fills missing bits with zeroes.
-	There can be frames that are broken and thus make do_layer() fail.
-*/
-static void decode_the_frame(mpg123_handle *fr)
-{
-	size_t needed_bytes = samples_to_storage(fr, frame_expect_outsamples(fr));
-	fr->clip += (fr->do_layer)(fr);
-	/*fprintf(stderr, "frame %"OFF_P": got %"SIZE_P" / %"SIZE_P"\n", fr->num,(size_p)fr->buffer.fill, (size_p)needed_bytes);*/
-	/* There could be less data than promised.
-	 Also, then debugging, we look out for coding errors that could result in _more_ data than expected. */
-#ifdef DEBUG
-	if(fr->buffer.fill != needed_bytes)
-	{
-#endif
-		if(fr->buffer.fill < needed_bytes)
-		{
-			if(VERBOSE2)
-			fprintf(stderr, "Note: broken frame %li, filling up with %"SIZE_P" zeroes, from %"SIZE_P"\n", (long)fr->num, (size_p)(needed_bytes-fr->buffer.fill), (size_p)fr->buffer.fill);
-
-			/*
-				One could do a loop with individual samples instead... but zero is zero
-				Actually, that is wrong: zero is mostly a series of null bytes,
-				but we have funny 8bit formats that have a different opinion on zero...
-				Unsigned 16 or 32 bit formats are handled later.
-			*/
-			memset( fr->buffer.data + fr->buffer.fill, zero_byte(fr), needed_bytes - fr->buffer.fill );
-
-			fr->buffer.fill = needed_bytes;
-#ifndef NO_NTOM
-			/* ntom_val will be wrong when the decoding wasn't carried out completely */
-			ntom_set_ntom(fr, fr->num+1);
-#endif
-		}
-#ifdef DEBUG
-		else
-		{
-			if(NOQUIET)
-			error2("I got _more_ bytes than expected (%"SIZE_P" / %"SIZE_P"), that should not be possible!", (size_p)fr->buffer.fill, (size_p)needed_bytes);
-		}
-	}
-#endif
-	postprocess_buffer(fr);
-}
-
-/*
-	Decode the current frame into the frame structure's buffer, accessible at the location stored in <audio>, with <bytes> bytes available.
-	<num> will contain the last decoded frame number. This function should be called after mpg123_framebyframe_next positioned the stream at a
-	valid mp3 frame. The buffer contents will get lost on the next call to mpg123_framebyframe_next or mpg123_framebyframe_decode.
-	returns
-	MPG123_OK -- successfully decoded or ignored the frame, you get your output data or in case of ignored frames 0 bytes
-	MPG123_DONE -- decoding finished, should not happen
-	MPG123_ERR -- some error occured.
-	MPG123_ERR_NULL -- audio or bytes are not pointing to valid storage addresses
-	MPG123_BAD_HANDLE -- mh has not been initialized
-	MPG123_NO_SPACE -- not enough space in buffer for safe decoding, should not happen
-*/
-int attribute_align_arg mpg123_framebyframe_decode(mpg123_handle *mh, off_t *num, unsigned char **audio, size_t *bytes)
-{
-	if(bytes == NULL) return MPG123_ERR_NULL;
-	if(audio == NULL) return MPG123_ERR_NULL;
-	if(mh == NULL) return MPG123_BAD_HANDLE;
-	if(mh->buffer.size < mh->outblock) return MPG123_NO_SPACE;
-
-	*bytes = 0;
-	mh->buffer.fill = 0; /* always start fresh */
-	if(!mh->to_decode) return MPG123_OK;
-
-	if(num != NULL) *num = mh->num;
-	debug("decoding");
-	decode_the_frame(mh);
-	mh->to_decode = mh->to_ignore = FALSE;
-	mh->buffer.p = mh->buffer.data;
-#ifdef GAPLESS
-	/* This checks for individual samples to skip, for gapless mode or sample-accurate seek. */
-	frame_buffercheck(mh);
-#endif
-	*audio = mh->buffer.p;
-	*bytes = mh->buffer.fill;
-	return MPG123_OK;
-}
-
-/*
-	Find, read and parse the next mp3 frame while skipping junk and parsing id3 tags, lame headers, etc.
-	Prepares everything for decoding using mpg123_framebyframe_decode.
-	returns
-	MPG123_OK -- new frame was read and parsed, call mpg123_framebyframe_decode to actually decode
-	MPG123_NEW_FORMAT -- new frame was read, it results in changed output format, call mpg123_framebyframe_decode to actually decode
-	MPG123_BAD_HANDLE -- mh has not been initialized
-	MPG123_NEED_MORE -- more input data is needed to advance to the next frame. supply more input data using mpg123_feed
-*/
-int attribute_align_arg mpg123_framebyframe_next(mpg123_handle *mh)
-{
-	int b;
-	if(mh == NULL) return MPG123_BAD_HANDLE;
-
-	mh->to_decode = mh->to_ignore = FALSE;
-	mh->buffer.fill = 0;
-
-	b = get_next_frame(mh);
-	if(b < 0) return b;
-	debug1("got next frame, %i", mh->to_decode);
-
-	/* mpg123_framebyframe_decode will return MPG123_OK with 0 bytes decoded if mh->to_decode is 0 */
-	if(!mh->to_decode)
-		return MPG123_OK;
-
-	if(mh->new_format)
-	{
-		debug("notifiying new format");
-		mh->new_format = 0;
-		return MPG123_NEW_FORMAT;
-	}
-
-	return MPG123_OK;
-}
-
-/*
-	Put _one_ decoded frame into the frame structure's buffer, accessible at the location stored in <audio>, with <bytes> bytes available.
-	The buffer contents will be lost on next call to mpg123_decode_frame.
-	MPG123_OK -- successfully decoded the frame, you get your output data
-	MPg123_DONE -- This is it. End.
-	MPG123_ERR -- some error occured...
-	MPG123_NEW_FORMAT -- new frame was read, it results in changed output format -> will be decoded on next call
-	MPG123_NEED_MORE -- that should not happen as this function is intended for in-library stream reader but if you force it...
-	MPG123_NO_SPACE -- not enough space in buffer for safe decoding, also should not happen
-
-	num will be updated to the last decoded frame number (may possibly _not_ increase, p.ex. when format changed).
-*/
-int attribute_align_arg mpg123_decode_frame(mpg123_handle *mh, off_t *num, unsigned char **audio, size_t *bytes)
-{
-	if(bytes != NULL) *bytes = 0;
-	if(mh == NULL) return MPG123_ERR;
-	if(mh->buffer.size < mh->outblock) return MPG123_NO_SPACE;
-	mh->buffer.fill = 0; /* always start fresh */
-	while(TRUE)
-	{
-		/* decode if possible */
-		if(mh->to_decode)
-		{
-			if(mh->new_format)
-			{
-				debug("notifiying new format");
-				mh->new_format = 0;
-				return MPG123_NEW_FORMAT;
-			}
-			if(num != NULL) *num = mh->num;
-			debug("decoding");
-
-			decode_the_frame(mh);
-
-			mh->to_decode = mh->to_ignore = FALSE;
-			mh->buffer.p = mh->buffer.data;
-#ifdef GAPLESS
-			/* This checks for individual samples to skip, for gapless mode or sample-accurate seek. */
-			frame_buffercheck(mh);
-#endif
-			if(audio != NULL) *audio = mh->buffer.p;
-			if(bytes != NULL) *bytes = mh->buffer.fill;
-
-			return MPG123_OK;
-		}
-		else
-		{
-			int b = get_next_frame(mh);
-			if(b < 0) return b;
-			debug1("got next frame, %i", mh->to_decode);
-		}
-	}
-}
-
-int attribute_align_arg mpg123_read(mpg123_handle *mh, unsigned char *out, size_t size, size_t *done)
-{
-	return mpg123_decode(mh, NULL, 0, out, size, done);
-}
-
-int attribute_align_arg mpg123_feed(mpg123_handle *mh, const unsigned char *in, size_t size)
-{
-	if(mh == NULL) return MPG123_ERR;
-	if(size > 0)
-	{
-		if(in != NULL)
-		{
-			if(feed_more(mh, in, size) != 0) return MPG123_ERR;
-			else
-			{
-				/* The need for more data might have triggered an error.
-				 This one is outdated now with the new data. */
-				if(mh->err == MPG123_ERR_READER) mh->err = MPG123_OK;
-
-				return MPG123_OK;
-			}
-		}
-		else
-		{
-			mh->err = MPG123_NULL_BUFFER;
-			return MPG123_ERR;
-		}
-	}
-	return MPG123_OK;
-}
-
-/*
-	The old picture:
-	while(1) {
-		len = read(0,buf,16384);
-		if(len <= 0)
-			break;
-		ret = decodeMP3(&mp,buf,len,out,8192,&size);
-		while(ret == MP3_OK) {
-			write(1,out,size);
-			ret = decodeMP3(&mp,NULL,0,out,8192,&size);
-		}
-	}
-*/
-
-int attribute_align_arg mpg123_decode(mpg123_handle *mh, const unsigned char *inmemory, size_t inmemsize, unsigned char *outmemory, size_t outmemsize, size_t *done)
-{
-	int ret = MPG123_OK;
-	size_t mdone = 0;
-
-	if(done != NULL) *done = 0;
-	if(mh == NULL) return MPG123_ERR;
-	if(inmemsize > 0 && mpg123_feed(mh, inmemory, inmemsize) != MPG123_OK)
-	{
-		ret = MPG123_ERR;
-		goto decodeend;
-	}
-	if(outmemory == NULL) outmemsize = 0; /* Not just give error, give chance to get a status message. */
-
-	while(ret == MPG123_OK)
-	{
-		debug4("decode loop, fill %i (%li vs. %li); to_decode: %i", (int)mh->buffer.fill, (long)mh->num, (long)mh->firstframe, mh->to_decode);
-		/* Decode a frame that has been read before.
-		 This only happens when buffer is empty! */
-		if(mh->to_decode)
-		{
-			if(mh->new_format)
-			{
-				debug("notifiying new format");
-				mh->new_format = 0;
-				ret = MPG123_NEW_FORMAT;
-				goto decodeend;
-			}
-			if(mh->buffer.size - mh->buffer.fill < mh->outblock)
-			{
-				ret = MPG123_NO_SPACE;
-				goto decodeend;
-			}
-			decode_the_frame(mh);
-			mh->to_decode = mh->to_ignore = FALSE;
-			mh->buffer.p = mh->buffer.data;
-			debug2("decoded frame %li, got %li samples in buffer", (long)mh->num, (long)(mh->buffer.fill / (samples_to_bytes(mh, 1))));
-#ifdef GAPLESS
-			frame_buffercheck(mh); /* Seek & gapless. */
-#endif
-		}
-		if(mh->buffer.fill) /* Copy (part of) the decoded data to the caller's buffer. */
-		{
-			/* get what is needed - or just what is there */
-			int a = mh->buffer.fill > (outmemsize - mdone) ? outmemsize - mdone : mh->buffer.fill;
-			debug4("buffer fill: %i; copying %i (%i - %li)", (int)mh->buffer.fill, a, (int)outmemsize, (long)mdone);
-			memcpy(outmemory, mh->buffer.p, a);
-			/* less data in frame buffer, less needed, output pointer increase, more data given... */
-			mh->buffer.fill -= a;
-			outmemory += a;
-			mdone += a;
-			mh->buffer.p += a;
-			if(!(outmemsize > mdone)) goto decodeend;
-		}
-		else /* If we didn't have data, get a new frame. */
-		{
-			int b = get_next_frame(mh);
-			if(b < 0){ ret = b; goto decodeend; }
-		}
-	}
-decodeend:
-	if(done != NULL) *done = mdone;
-	return ret;
-}
-
-long attribute_align_arg mpg123_clip(mpg123_handle *mh)
-{
-	long ret = 0;
-
-	if(mh != NULL)
-	{
-		ret = mh->clip;
-		mh->clip = 0;
-	}
-	return ret;
-}
-
-#define track_need_init(mh) (!(mh)->to_decode && (mh)->fresh)
-
-static int init_track(mpg123_handle *mh)
-{
-	if(track_need_init(mh))
-	{
-		/* Fresh track, need first frame for basic info. */
-		int b = get_next_frame(mh);
-		if(b < 0) return b;
-	}
-	return 0;
-}
-
-int attribute_align_arg mpg123_getformat(mpg123_handle *mh, long *rate, int *channels, int *encoding)
-{
-	int b;
-
-	if(mh == NULL) return MPG123_ERR;
-	b = init_track(mh);
-	if(b < 0) return b;
-
-	if(rate != NULL) *rate = mh->af.rate;
-	if(channels != NULL) *channels = mh->af.channels;
-	if(encoding != NULL) *encoding = mh->af.encoding;
-	mh->new_format = 0;
-	return MPG123_OK;
-}
-
-off_t attribute_align_arg mpg123_timeframe(mpg123_handle *mh, double seconds)
-{
-	off_t b;
-
-	if(mh == NULL) return MPG123_ERR;
-	b = init_track(mh);
-	if(b<0) return b;
-	return (off_t)(seconds/mpg123_tpf(mh));
-}
-
-/*
-	Now, where are we? We need to know the last decoded frame... and what's left of it in buffer.
-	The current frame number can mean the last decoded frame or the to-be-decoded frame.
-	If mh->to_decode, then mh->num frames have been decoded, the frame mh->num now coming next.
-	If not, we have the possibility of mh->num+1 frames being decoded or nothing at all.
-	Then, there is firstframe...when we didn't reach it yet, then the next data will come from there.
-	mh->num starts with -1
-*/
-off_t attribute_align_arg mpg123_tell(mpg123_handle *mh)
-{
-	if(mh == NULL) return MPG123_ERR;
-	if(track_need_init(mh)) return 0;
-	/* Now we have all the info at hand. */
-	debug5("tell: %li/%i first %li buffer %lu; frame_outs=%li", (long)mh->num, mh->to_decode, (long)mh->firstframe, (unsigned long)mh->buffer.fill, (long)frame_outs(mh, mh->num));
-
-	{ /* Funny block to keep C89 happy. */
-		off_t pos = 0;
-		if((mh->num < mh->firstframe) || (mh->num == mh->firstframe && mh->to_decode))
-		{ /* We are at the beginning, expect output from firstframe on. */
-			pos = frame_outs(mh, mh->firstframe);
-#ifdef GAPLESS
-			pos += mh->firstoff;
-#endif
-		}
-		else if(mh->to_decode)
-		{ /* We start fresh with this frame. Buffer should be empty, but we make sure to count it in. */
-			pos = frame_outs(mh, mh->num) - bytes_to_samples(mh, mh->buffer.fill);
-		}
-		else
-		{ /* We serve what we have in buffer and then the beginning of next frame... */
-			pos = frame_outs(mh, mh->num+1) - bytes_to_samples(mh, mh->buffer.fill);
-		}
-		/* Substract padding and delay from the beginning. */
-		pos = SAMPLE_ADJUST(pos);
-		/* Negative sample offsets are not right, less than nothing is still nothing. */
-		return pos>0 ? pos : 0;
-	}
-}
-
-off_t attribute_align_arg mpg123_tellframe(mpg123_handle *mh)
-{
-	if(mh == NULL) return MPG123_ERR;
-	if(mh->num < mh->firstframe) return mh->firstframe;
-	if(mh->to_decode) return mh->num;
-	/* Consider firstoff? */
-	return mh->buffer.fill ? mh->num : mh->num + 1;
-}
-
-off_t attribute_align_arg mpg123_tell_stream(mpg123_handle *mh)
-{
-	if(mh == NULL) return MPG123_ERR;
-	/* mh->rd is at least a bad_reader, so no worry. */
-	return mh->rd->tell(mh);
-}
-
-static int do_the_seek(mpg123_handle *mh)
-{
-	int b;
-	off_t fnum = SEEKFRAME(mh);
-	mh->buffer.fill = 0;
-
-	/* If we are inside the ignoreframe - firstframe window, we may get away without actual seeking. */
-	if(mh->num < mh->firstframe)
-	{
-		mh->to_decode = FALSE; /* In any case, don't decode the current frame, perhaps ignore instead. */
-		if(mh->num > fnum) return MPG123_OK;
-	}
-
-	/* If we are already there, we are fine either for decoding or for ignoring. */
-	if(mh->num == fnum && (mh->to_decode || fnum < mh->firstframe)) return MPG123_OK;
-	/* We have the frame before... just go ahead as normal. */
-	if(mh->num == fnum-1)
-	{
-		mh->to_decode = FALSE;
-		return MPG123_OK;
-	}
-
-	/* OK, real seeking follows... clear buffers and go for it. */
-	frame_buffers_reset(mh);
-#ifndef NO_NTOM
-	if(mh->down_sample == 3)
-	{
-		ntom_set_ntom(mh, fnum);
-		debug3("fixed ntom for frame %"OFF_P" to %lu, num=%"OFF_P, (off_p)fnum, mh->ntom_val[0], (off_p)mh->num);
-	}
-#endif
-	b = mh->rd->seek_frame(mh, fnum);
-	debug1("seek_frame returned: %i", b);
-	if(b<0) return b;
-	/* Only mh->to_ignore is TRUE. */
-	if(mh->num < mh->firstframe) mh->to_decode = FALSE;
-
-	mh->playnum = mh->num;
-	return 0;
-}
-
-off_t attribute_align_arg mpg123_seek(mpg123_handle *mh, off_t sampleoff, int whence)
-{
-	int b;
-	off_t pos;
-
-	pos = mpg123_tell(mh); /* adjusted samples */
-	/* pos < 0 also can mean that simply a former seek failed at the lower levels.
-	 In that case, we only allow absolute seeks. */
-	if(pos < 0 && whence != SEEK_SET)
-	{ /* Unless we got the obvious error of NULL handle, this is a special seek failure. */
-		if(mh != NULL) mh->err = MPG123_NO_RELSEEK;
-		return MPG123_ERR;
-	}
-	if((b=init_track(mh)) < 0) return b;
-	switch(whence)
-	{
-		case SEEK_CUR: pos += sampleoff; break;
-		case SEEK_SET: pos = sampleoff; break;
-		case SEEK_END:
-			/* When we do not know the end already, we can try to find it. */
-			if(mh->track_frames < 1 && (mh->rdat.flags & READER_SEEKABLE))
-			mpg123_scan(mh);
-#ifdef GAPLESS
-			if(mh->end_os > 0) pos = SAMPLE_ADJUST(mh->end_os) - sampleoff;
-#else
-			if(mh->track_frames > 0) pos = SAMPLE_ADJUST(frame_outs(mh, mh->track_frames)) - sampleoff;
-#endif
-			else
-			{
-				mh->err = MPG123_NO_SEEK_FROM_END;
-				return MPG123_ERR;
-			}
-		break;
-		default: mh->err = MPG123_BAD_WHENCE; return MPG123_ERR;
-	}
-	if(pos < 0) pos = 0;
-	/* pos now holds the wanted sample offset in adjusted samples */
-	frame_set_seek(mh, SAMPLE_UNADJUST(pos));
-	pos = do_the_seek(mh);
-	if(pos < 0) return pos;
-
-	return mpg123_tell(mh);
-}
-
-/*
-	A bit more tricky... libmpg123 does not do the seeking itself.
-	All it can do is to ignore frames until the wanted one is there.
-	The caller doesn't know where a specific frame starts and mpg123 also only knows the general region after it scanned the file.
-	Well, it is tricky...
-*/
-off_t attribute_align_arg mpg123_feedseek(mpg123_handle *mh, off_t sampleoff, int whence, off_t *input_offset)
-{
-	int b;
-	off_t pos;
-
-	pos = mpg123_tell(mh); /* adjusted samples */
-	debug3("seek from %li to %li (whence=%i)", (long)pos, (long)sampleoff, whence);
-	/* The special seek error handling does not apply here... there is no lowlevel I/O. */
-	if(pos < 0) return pos; /* mh == NULL is covered in mpg123_tell() */
-	if(input_offset == NULL)
-	{
-		mh->err = MPG123_NULL_POINTER;
-		return MPG123_ERR;
-	}
-
-	if((b=init_track(mh)) < 0) return b; /* May need more to do anything at all. */
-
-	switch(whence)
-	{
-		case SEEK_CUR: pos += sampleoff; break;
-		case SEEK_SET: pos = sampleoff; break;
-		case SEEK_END:
-#ifdef GAPLESS
-			if(mh->end_os >= 0) pos = SAMPLE_ADJUST(mh->end_os) - sampleoff;
-#else
-			if(mh->track_frames > 0) pos = SAMPLE_ADJUST(frame_outs(mh, mh->track_frames)) - sampleoff;
-#endif
-			else
-			{
-				mh->err = MPG123_NO_SEEK_FROM_END;
-				return MPG123_ERR;
-			}
-		break;
-		default: mh->err = MPG123_BAD_WHENCE; return MPG123_ERR;
-	}
-	if(pos < 0) pos = 0;
-	frame_set_seek(mh, SAMPLE_UNADJUST(pos));
-	pos = SEEKFRAME(mh);
-	mh->buffer.fill = 0;
-
-	/* Shortcuts without modifying input stream. */
-	*input_offset = mh->rdat.buffer.fileoff + mh->rdat.buffer.size;
-	if(mh->num < mh->firstframe) mh->to_decode = FALSE;
-	if(mh->num == pos && mh->to_decode) goto feedseekend;
-	if(mh->num == pos-1) goto feedseekend;
-	/* Whole way. */
-	*input_offset = feed_set_pos(mh, frame_index_find(mh, SEEKFRAME(mh), &pos));
-	mh->num = pos-1; /* The next read frame will have num = pos. */
-	if(*input_offset < 0) return MPG123_ERR;
-
-feedseekend:
-	return mpg123_tell(mh);
-}
-
-off_t attribute_align_arg mpg123_seek_frame(mpg123_handle *mh, off_t offset, int whence)
-{
-	int b;
-	off_t pos = 0;
-
-	if(mh == NULL) return MPG123_ERR;
-	if((b=init_track(mh)) < 0) return b;
-
-	/* Could play games here with to_decode... */
-	pos = mh->num;
-	switch(whence)
-	{
-		case SEEK_CUR: pos += offset; break;
-		case SEEK_SET: pos = offset; break;
-		case SEEK_END:
-			if(mh->track_frames > 0) pos = mh->track_frames - offset;
-			else
-			{
-				mh->err = MPG123_NO_SEEK_FROM_END;
-				return MPG123_ERR;
-			}
-		break;
-		default:
-			mh->err = MPG123_BAD_WHENCE;
-			return MPG123_ERR;
-	}
-	if(pos < 0) pos = 0;
-	/* Hm, do we need to seek right past the end? */
-	else if(mh->track_frames > 0 && pos >= mh->track_frames) pos = mh->track_frames;
-
-	frame_set_frameseek(mh, pos);
-	pos = do_the_seek(mh);
-	if(pos < 0) return pos;
-
-	return mpg123_tellframe(mh);
-}
-
-int attribute_align_arg mpg123_set_filesize(mpg123_handle *mh, off_t size)
-{
-	if(mh == NULL) return MPG123_ERR;
-
-	mh->rdat.filelen = size;
-	return MPG123_OK;
-}
-
-off_t attribute_align_arg mpg123_length(mpg123_handle *mh)
-{
-	int b;
-	off_t length;
-
-	if(mh == NULL) return MPG123_ERR;
-	b = init_track(mh);
-	if(b<0) return b;
-	if(mh->track_samples > -1) length = mh->track_samples;
-	else if(mh->track_frames > 0) length = mh->track_frames*spf(mh);
-	else if(mh->rdat.filelen > 0) /* Let the case of 0 length just fall through. */
-	{
-		/* A bad estimate. Ignoring tags 'n stuff. */
-		double bpf = mh->mean_framesize ? mh->mean_framesize : compute_bpf(mh);
-		length = (off_t)((double)(mh->rdat.filelen)/bpf*spf(mh));
-	}
-	else if(mh->rdat.filelen == 0) return mpg123_tell(mh); /* we could be in feeder mode */
-	else return MPG123_ERR; /* No length info there! */
-
-	debug1("mpg123_length: internal sample length: %"OFF_P, (off_p)length);
-
-	length = frame_ins2outs(mh, length);
-	debug1("mpg123_length: external sample length: %"OFF_P, (off_p)length);
-#ifdef GAPLESS
-	if(mh->p.flags & MPG123_GAPLESS)
-	{
-		debug2("mpg123_length: begin_os = %"OFF_P", end_os = %"OFF_P, (off_p)mh->begin_os, (off_p)mh->end_os);
-		if(mh->end_os > 0 && length > mh->end_os) length = mh->end_os;
-		length -= mh->begin_os;
-		debug1("mpg123_length: after gapless correction: %"OFF_P, (off_p)length);
-	}
-#endif
-	return length;
-}
-
-int attribute_align_arg mpg123_scan(mpg123_handle *mh)
-{
-	int b;
-	off_t backframe;
-	int to_decode, to_ignore;
-
-	if(mh == NULL) return MPG123_ERR;
-	if(!(mh->rdat.flags & READER_SEEKABLE)){ mh->err = MPG123_NO_SEEK; return MPG123_ERR; }
-	/* Scan through the _whole_ file, since the current position is no count but computed assuming constant samples per frame. */
-	/* Also, we can just keep the current buffer and seek settings. Just operate on input frames here. */
-	debug("issuing scan");
-	b = init_track(mh); /* mh->num >= 0 !! */
-	if(b<0)
-	{
-		if(b == MPG123_DONE) return MPG123_OK;
-		else return MPG123_ERR; /* Must be error here, NEED_MORE is not for seekable streams. */
-	}
-	backframe = mh->num;
-	to_decode = mh->to_decode;
-	to_ignore = mh->to_ignore;
-	b = mh->rd->seek_frame(mh, 0);
-	if(b<0 || mh->num != 0) return MPG123_ERR;
-	/* One frame must be there now. */
-	mh->track_frames = 1;
-	mh->track_samples = spf(mh); /* Internal samples. */
-	debug("TODO: We should disable gapless code when encountering inconsistent spf(mh)!");
-	while(read_frame(mh) == 1)
-	{
-		++mh->track_frames;
-		mh->track_samples += spf(mh);
-	}
-	debug2("Scanning yielded %"OFF_P" track samples, %"OFF_P" frames.", (off_p)mh->track_samples, (off_p)mh->track_frames);
-#ifdef GAPLESS
-	/* Also, think about usefulness of that extra value track_samples ... it could be used for consistency checking. */
-	frame_gapless_update(mh, mh->track_samples);
-#endif	
-	b = mh->rd->seek_frame(mh, backframe);
-	if(b<0 || mh->num != backframe) return MPG123_ERR;
-	mh->to_decode = to_decode;
-	mh->to_ignore = to_ignore;
-	return MPG123_OK;
-}
-
-int attribute_align_arg mpg123_meta_check(mpg123_handle *mh)
-{
-	if(mh != NULL) return mh->metaflags;
-	else return 0;
-}
-
-int attribute_align_arg mpg123_id3(mpg123_handle *mh, mpg123_id3v1 **v1, mpg123_id3v2 **v2)
-{
-	if(v1 != NULL) *v1 = NULL;
-	if(v2 != NULL) *v2 = NULL;
-	if(mh == NULL) return MPG123_ERR;
-
-	if(mh->metaflags & MPG123_ID3)
-	{
-		id3_link(mh);
-		if(v1 != NULL && mh->rdat.flags & READER_ID3TAG) *v1 = (mpg123_id3v1*) mh->id3buf;
-		if(v2 != NULL)
-#ifdef NO_ID3V2
-		*v2 = NULL;
-#else
-		*v2 = &mh->id3v2;
-#endif
-
-		mh->metaflags |= MPG123_ID3;
-		mh->metaflags &= ~MPG123_NEW_ID3;
-	}
-	return MPG123_OK;
-}
-
-int attribute_align_arg mpg123_icy(mpg123_handle *mh, char **icy_meta)
-{
-	if(mh == NULL) return MPG123_ERR;
-#ifndef NO_ICY
-	if(icy_meta == NULL)
-	{
-		mh->err = MPG123_NULL_POINTER;
-		return MPG123_ERR;
-	}
-	*icy_meta = NULL;
-
-	if(mh->metaflags & MPG123_ICY)
-	{
-		*icy_meta = mh->icy.data;
-		mh->metaflags |= MPG123_ICY;
-		mh->metaflags &= ~MPG123_NEW_ICY;
-	}
-	return MPG123_OK;
-#else
-	mh->err = MPG123_MISSING_FEATURE;
-	return MPG123_ERR;
-#endif
-}
-
-char* attribute_align_arg mpg123_icy2utf8(const char* icy_text)
-{
-#ifndef NO_ICY
-	return icy2utf8(icy_text, 0);
-#else
-	return NULL;
-#endif
-}
-
-/* That one is always defined... it's not worth it to remove it for NO_ID3V2. */
-enum mpg123_text_encoding attribute_align_arg mpg123_enc_from_id3(unsigned char id3_enc_byte)
-{
-	switch(id3_enc_byte)
-	{
-		case mpg123_id3_latin1: return mpg123_text_latin1;
-		case mpg123_id3_utf16bom: return mpg123_text_utf16bom; /* ID3v2.3 has UCS-2 with BOM here. */
-		case mpg123_id3_utf16be: return mpg123_text_utf16be;
-		case mpg123_id3_utf8: return mpg123_text_utf8;
-		default: return mpg123_text_unknown;
-	}
-}
-
-#ifndef NO_STRING
-int mpg123_store_utf8(mpg123_string *sb, enum mpg123_text_encoding enc, const unsigned char *source, size_t source_size)
-{
-	switch(enc)
-	{
-#ifndef NO_ID3V2
-		/* The encodings we get from ID3v2 tags. */
-		case mpg123_text_utf8:
-			id3_to_utf8(sb, mpg123_id3_utf8, source, source_size, 0);
-		break;
-		case mpg123_text_latin1:
-			id3_to_utf8(sb, mpg123_id3_latin1, source, source_size, 0);
-		break;
-		case mpg123_text_utf16bom:
-		case mpg123_text_utf16:
-			id3_to_utf8(sb, mpg123_id3_utf16bom, source, source_size, 0);
-		break;
-		/* Special because one cannot skip zero bytes here. */
-		case mpg123_text_utf16be:
-			id3_to_utf8(sb, mpg123_id3_utf16be, source, source_size, 0);
-		break;
-#endif
-#ifndef NO_ICY
-		/* ICY encoding... */
-		case mpg123_text_icy:
-		case mpg123_text_cp1252:
-		{
-			mpg123_free_string(sb);
-			/* Paranoia: Make sure that the string ends inside the buffer... */
-			if(source[source_size-1] == 0)
-			{
-				/* Convert from ICY encoding... with force applied or not. */
-				char *tmpstring = icy2utf8((const char*)source, enc == mpg123_text_cp1252 ? 1 : 0);
-				if(tmpstring != NULL)
-				{
-					mpg123_set_string(sb, tmpstring);
-					free(tmpstring);
-				}
-			}
-		}
-		break;
-#endif
-		default:
-			mpg123_free_string(sb);
-	}
-	/* At least a trailing null of some form should be there... */
-	return (sb->fill > 0) ? 1 : 0;
-}
-#endif
-
-int attribute_align_arg mpg123_index(mpg123_handle *mh, off_t **offsets, off_t *step, size_t *fill)
-{
-	if(mh == NULL) return MPG123_ERR;
-	if(offsets == NULL || step == NULL || fill == NULL)
-	{
-		mh->err = MPG123_BAD_INDEX_PAR;
-		return MPG123_ERR;
-	}
-#ifdef FRAME_INDEX
-	*offsets = mh->index.data;
-	*step = mh->index.step;
-	*fill = mh->index.fill;
-#else
-	*offsets = NULL;
-	*step = 0;
-	*fill = 0;
-#endif
-	return MPG123_OK;
-}
-
-int attribute_align_arg mpg123_set_index(mpg123_handle *mh, off_t *offsets, off_t step, size_t fill)
-{
-	if(mh == NULL) return MPG123_ERR;
-#ifdef FRAME_INDEX
-	if(step == 0)
-	{
-		mh->err = MPG123_BAD_INDEX_PAR;
-		return MPG123_ERR;
-	}
-	if(fi_set(&mh->index, offsets, step, fill) == -1)
-	{
-		mh->err = MPG123_OUT_OF_MEM;
-		return MPG123_ERR;
-	}
-	return MPG123_OK;
-#else
-	mh->err = MPG123_MISSING_FEATURE;
-	return MPG123_ERR;
-#endif
-}
-
-int attribute_align_arg mpg123_close(mpg123_handle *mh)
-{
-	if(mh == NULL) return MPG123_ERR;
-	if(mh->rd != NULL && mh->rd->close != NULL) mh->rd->close(mh);
-	mh->rd = NULL;
-	if(mh->new_format)
-	{
-		debug("Hey, we are closing a track before the new format has been queried...");
-		invalidate_format(&mh->af);
-		mh->new_format = 0;
-	}
-	/* Always reset the frame buffers on close, so we cannot forget it in funky opening routines (wrappers, even). */
-	frame_reset(mh);
-	return MPG123_OK;
-}
-
-void attribute_align_arg mpg123_delete(mpg123_handle *mh)
-{
-	if(mh != NULL)
-	{
-		mpg123_close(mh);
-		frame_exit(mh); /* free buffers in frame */
-		free(mh); /* free struct; cast? */
-	}
-}
-
-static const char *mpg123_error[] =
-{
-	"No error... (code 0)",
-	"Unable to set up output format! (code 1)",
-	"Invalid channel number specified. (code 2)",
-	"Invalid sample rate specified. (code 3)",
-	"Unable to allocate memory for 16 to 8 converter table! (code 4)",
-	"Bad parameter id! (code 5)",
-	"Bad buffer given -- invalid pointer or too small size. (code 6)",
-	"Out of memory -- some malloc() failed. (code 7)",
-	"You didn't initialize the library! (code 8)",
-	"Invalid decoder choice. (code 9)",
-	"Invalid mpg123 handle. (code 10)",
-	"Unable to initialize frame buffers (out of memory?)! (code 11)",
-	"Invalid RVA mode. (code 12)",
-	"This build doesn't support gapless decoding. (code 13)",
-	"Not enough buffer space. (code 14)",
-	"Incompatible numeric data types. (code 15)",
-	"Bad equalizer band. (code 16)",
-	"Null pointer given where valid storage address needed. (code 17)",
-	"Error reading the stream. (code 18)",
-	"Cannot seek from end (end is not known). (code 19)",
-	"Invalid 'whence' for seek function. (code 20)",
-	"Build does not support stream timeouts. (code 21)",
-	"File access error. (code 22)",
-	"Seek not supported by stream. (code 23)",
-	"No stream opened. (code 24)",
-	"Bad parameter handle. (code 25)",
-	"Invalid parameter addresses for index retrieval. (code 26)",
-	"Lost track in the bytestream and did not attempt resync. (code 27)",
-	"Failed to find valid MPEG data within limit on resync. (code 28)",
-	"No 8bit encoding possible. (code 29)",
-	"Stack alignment is not good. (code 30)",
-	"You gave me a NULL buffer? (code 31)",
-	"File position is screwed up, please do an absolute seek (code 32)",
-	"Inappropriate NULL-pointer provided.",
-	"Bad key value given.",
-	"There is no frame index (disabled in this build).",
-	"Frame index operation failed.",
-	"Decoder setup failed (invalid combination of settings?)",
-	"Feature not in this build."
-	,"Some bad value has been provided."
-	,"Low-level seeking has failed (call to lseek(), usually)."
-	,"Custom I/O obviously not prepared."
-	,"Overflow in LFS (large file support) conversion."
-};
-
-const char* attribute_align_arg mpg123_plain_strerror(int errcode)
-{
-	if(errcode >= 0 && errcode < sizeof(mpg123_error)/sizeof(char*))
-	return mpg123_error[errcode];
-	else switch(errcode)
-	{
-		case MPG123_ERR:
-			return "A generic mpg123 error.";
-		case MPG123_DONE:
-			return "Message: I am done with this track.";
-		case MPG123_NEED_MORE:
-			return "Message: Feed me more input data!";
-		case MPG123_NEW_FORMAT:
-			return "Message: Prepare for a changed audio format (query the new one)!";
-		default:
-			return "I have no idea - an unknown error code!";
-	}
-}
-
-int attribute_align_arg mpg123_errcode(mpg123_handle *mh)
-{
-	if(mh != NULL) return mh->err;
-	return MPG123_BAD_HANDLE;
-}
-
-const char* attribute_align_arg mpg123_strerror(mpg123_handle *mh)
-{
-	return mpg123_plain_strerror(mpg123_errcode(mh));
-}

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/mpg123.h Deleted

@@ -1,964 +0,0 @@
-/*
-	libmpg123: MPEG Audio Decoder library (version 1.13.3)
-
-	copyright 1995-2010 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-*/
-
-#ifndef MPG123_LIB_H
-#define MPG123_LIB_H
-
-/** \file mpg123.h The header file for the libmpg123 MPEG Audio decoder */
-
-/* A macro to check at compile time which set of API functions to expect.
- This should be incremented at least each time a new symbol is added to the header. */
-#define MPG123_API_VERSION 29
-
-/* Nothing on normal/UNIX builds */
-#define EXPORT
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** \defgroup mpg123_init mpg123 library and handle setup
- *
- * Functions to initialise and shutdown the mpg123 library and handles.
- * The parameters of handles have workable defaults, you only have to tune them when you want to tune something;-)
- * Tip: Use a RVA setting...
- *
- * @{
- */
-
-/** Opaque structure for the libmpg123 decoder handle. */
-struct mpg123_handle_struct;
-
-/** Opaque structure for the libmpg123 decoder handle.
- * Most functions take a pointer to a mpg123_handle as first argument and operate on its data in an object-oriented manner.
- */
-typedef struct mpg123_handle_struct mpg123_handle;
-
-/** Function to initialise the mpg123 library. 
- *	This function is not thread-safe. Call it exactly once per process, before any other (possibly threaded) work with the library.
- *
- *	\return MPG123_OK if successful, otherwise an error number.
- */
-EXPORT int mpg123_init(void);
-
-/** Function to close down the mpg123 library. 
- *	This function is not thread-safe. Call it exactly once per process, before any other (possibly threaded) work with the library. */
-EXPORT void mpg123_exit(void);
-
-/** Create a handle with optional choice of decoder (named by a string, see mpg123_decoders() or mpg123_supported_decoders()).
- * and optional retrieval of an error code to feed to mpg123_plain_strerror().
- * Optional means: Any of or both the parameters may be NULL.
- *
- * \return Non-NULL pointer when successful.
- */
-EXPORT mpg123_handle *mpg123_new(const char* decoder, int *error);
-
-/** Delete handle, mh is either a valid mpg123 handle or NULL. */
-EXPORT void mpg123_delete(mpg123_handle *mh);
-
-/** Enumeration of the parameters types that it is possible to set/get. */
-enum mpg123_parms
-{
-	MPG123_VERBOSE, /**< set verbosity value for enabling messages to stderr, >= 0 makes sense (integer) */
-	MPG123_FLAGS, /**< set all flags, p.ex val = MPG123_GAPLESS|MPG123_MONO_MIX (integer) */
-	MPG123_ADD_FLAGS, /**< add some flags (integer) */
-	MPG123_FORCE_RATE, /**< when value > 0, force output rate to that value (integer) */
-	MPG123_DOWN_SAMPLE, /**< 0=native rate, 1=half rate, 2=quarter rate (integer) */
-	MPG123_RVA, /**< one of the RVA choices above (integer) */
-	MPG123_DOWNSPEED, /**< play a frame N times (integer) */
-	MPG123_UPSPEED, /**< play every Nth frame (integer) */
-	MPG123_START_FRAME, /**< start with this frame (skip frames before that, integer) */ 
-	MPG123_DECODE_FRAMES, /**< decode only this number of frames (integer) */
-	MPG123_ICY_INTERVAL, /**< stream contains ICY metadata with this interval (integer) */
-	MPG123_OUTSCALE, /**< the scale for output samples (amplitude - integer or float according to mpg123 output format, normally integer) */
-	MPG123_TIMEOUT, /**< timeout for reading from a stream (not supported on win32, integer) */
-	MPG123_REMOVE_FLAGS, /**< remove some flags (inverse of MPG123_ADD_FLAGS, integer) */
-	MPG123_RESYNC_LIMIT, /**< Try resync on frame parsing for that many bytes or until end of stream (<0 ... integer). */
-	MPG123_INDEX_SIZE /**< Set the frame index size (if supported). Values <0 mean that the index is allowed to grow dynamically in these steps (in positive direction, of course) -- Use this when you really want a full index with every individual frame. */
-	,MPG123_PREFRAMES /**< Decode/ignore that many frames in advance for layer 3. This is needed to fill bit reservoir after seeking, for example (but also at least one frame in advance is needed to have all "normal" data for layer 3). Give a positive integer value, please.*/
-};
-
-/** Flag bits for MPG123_FLAGS, use the usual binary or to combine. */
-enum mpg123_param_flags
-{
-	 MPG123_FORCE_MONO = 0x7 /**< 0111 Force some mono mode: This is a test bitmask for seeing if any mono forcing is active. */
-	,MPG123_MONO_LEFT = 0x1 /**< 0001 Force playback of left channel only. */
-	,MPG123_MONO_RIGHT = 0x2 /**< 0010 Force playback of right channel only. */
-	,MPG123_MONO_MIX = 0x4 /**< 0100 Force playback of mixed mono. */
-	,MPG123_FORCE_STEREO = 0x8 /**< 1000 Force stereo output. */
-	,MPG123_FORCE_8BIT = 0x10 /**< 00010000 Force 8bit formats. */
-	,MPG123_QUIET = 0x20 /**< 00100000 Suppress any printouts (overrules verbose). */
-	,MPG123_GAPLESS = 0x40 /**< 01000000 Enable gapless decoding (default on if libmpg123 has support). */
-	,MPG123_NO_RESYNC = 0x80 /**< 10000000 Disable resync stream after error. */
-	,MPG123_SEEKBUFFER = 0x100 /**< 000100000000 Enable small buffer on non-seekable streams to allow some peek-ahead (for better MPEG sync). */
-	,MPG123_FUZZY = 0x200 /**< 001000000000 Enable fuzzy seeks (guessing byte offsets or using approximate seek points from Xing TOC) */
-	,MPG123_FORCE_FLOAT = 0x400 /**< 010000000000 Force floating point output (32 or 64 bits depends on mpg123 internal precision). */
-	,MPG123_PLAIN_ID3TEXT = 0x800 /**< 100000000000 Do not translate ID3 text data to UTF-8. ID3 strings will contain the raw text data, with the first byte containing the ID3 encoding code. */
-	,MPG123_IGNORE_STREAMLENGTH = 0x1000 /**< 1000000000000 Ignore any stream length information contained in the stream, which can be contained in a 'TLEN' frame of an ID3v2 tag or a Xing tag */
-	,MPG123_SKIP_ID3V2 = 0x2000 /**< 10 0000 0000 0000 Do not parse ID3v2 tags, just skip them. */
-};
-
-/** choices for MPG123_RVA */
-enum mpg123_param_rva
-{
-	 MPG123_RVA_OFF = 0 /**< RVA disabled (default). */
-	,MPG123_RVA_MIX = 1 /**< Use mix/track/radio gain. */
-	,MPG123_RVA_ALBUM = 2 /**< Use album/audiophile gain */
-	,MPG123_RVA_MAX = MPG123_RVA_ALBUM /**< The maximum RVA code, may increase in future. */
-};
-
-/* TODO: Assess the possibilities and troubles of changing parameters during playback. */
-
-/** Set a specific parameter, for a specific mpg123_handle, using a parameter 
- * type key chosen from the mpg123_parms enumeration, to the specified value. */
-EXPORT int mpg123_param(mpg123_handle *mh, enum mpg123_parms type, long value, double fvalue);
-
-/** Get a specific parameter, for a specific mpg123_handle. 
- * See the mpg123_parms enumeration for a list of available parameters. */
-EXPORT int mpg123_getparam(mpg123_handle *mh, enum mpg123_parms type, long *val, double *fval);
-
-/** Feature set available for query with mpg123_feature. */
-enum mpg123_feature_set
-{
-	 MPG123_FEATURE_ABI_UTF8OPEN = 0 /**< mpg123 expects path names to be given in UTF-8 encoding instead of plain native. */
-	,MPG123_FEATURE_OUTPUT_8BIT /**< 8bit output */
-	,MPG123_FEATURE_OUTPUT_16BIT /**< 16bit output */
-	,MPG123_FEATURE_OUTPUT_32BIT /**< 32bit output */
-	,MPG123_FEATURE_INDEX /**< support for building a frame index for accurate seeking */
-	,MPG123_FEATURE_PARSE_ID3V2 /**< id3v2 parsing */
-	,MPG123_FEATURE_DECODE_LAYER1 /**< mpeg layer-1 decoder enabled */
-	,MPG123_FEATURE_DECODE_LAYER2 /**< mpeg layer-2 decoder enabled */
-	,MPG123_FEATURE_DECODE_LAYER3 /**< mpeg layer-3 decoder enabled */
-	,MPG123_FEATURE_DECODE_ACCURATE /**< accurate decoder rounding */
-	,MPG123_FEATURE_DECODE_DOWNSAMPLE /**< downsample (sample omit) */
-	,MPG123_FEATURE_DECODE_NTOM /**< flexible rate decoding */
-	,MPG123_FEATURE_PARSE_ICY /**< ICY support */
-	,MPG123_FEATURE_TIMEOUT_READ /**< Reader with timeout (network). */
-};
-
-/** Query libmpg123 feature, 1 for success, 0 for unimplemented functions. */
-EXPORT int mpg123_feature(const enum mpg123_feature_set key);
-
-/* @} */
-
-
-/** \defgroup mpg123_error mpg123 error handling
- *
- * Functions to get text version of the error numbers and an enumeration
- * of the error codes returned by libmpg123.
- *
- * Most functions operating on a mpg123_handle simply return MPG123_OK on success and MPG123_ERR on failure (setting the internal error variable of the handle to the specific error code).
- * Decoding/seek functions may also return message codes MPG123_DONE, MPG123_NEW_FORMAT and MPG123_NEED_MORE (please read up on these on how to react!).
- * The positive range of return values is used for "useful" values when appropriate.
- *
- * @{
- */
-
-/** Enumeration of the message and error codes and returned by libmpg123 functions. */
-enum mpg123_errors
-{
-	MPG123_DONE=-12,	/**< Message: Track ended. Stop decoding. */
-	MPG123_NEW_FORMAT=-11,	/**< Message: Output format will be different on next call. Note that some libmpg123 versions between 1.4.3 and 1.8.0 insist on you calling mpg123_getformat() after getting this message code. Newer verisons behave like advertised: You have the chance to call mpg123_getformat(), but you can also just continue decoding and get your data. */
-	MPG123_NEED_MORE=-10,	/**< Message: For feed reader: "Feed me more!" (call mpg123_feed() or mpg123_decode() with some new input data). */
-	MPG123_ERR=-1,			/**< Generic Error */
-	MPG123_OK=0, 			/**< Success */
-	MPG123_BAD_OUTFORMAT, 	/**< Unable to set up output format! */
-	MPG123_BAD_CHANNEL,		/**< Invalid channel number specified. */
-	MPG123_BAD_RATE,		/**< Invalid sample rate specified. */
-	MPG123_ERR_16TO8TABLE,	/**< Unable to allocate memory for 16 to 8 converter table! */
-	MPG123_BAD_PARAM,		/**< Bad parameter id! */
-	MPG123_BAD_BUFFER,		/**< Bad buffer given -- invalid pointer or too small size. */
-	MPG123_OUT_OF_MEM,		/**< Out of memory -- some malloc() failed. */
-	MPG123_NOT_INITIALIZED,	/**< You didn't initialize the library! */
-	MPG123_BAD_DECODER,		/**< Invalid decoder choice. */
-	MPG123_BAD_HANDLE,		/**< Invalid mpg123 handle. */
-	MPG123_NO_BUFFERS,		/**< Unable to initialize frame buffers (out of memory?). */
-	MPG123_BAD_RVA,			/**< Invalid RVA mode. */
-	MPG123_NO_GAPLESS,		/**< This build doesn't support gapless decoding. */
-	MPG123_NO_SPACE,		/**< Not enough buffer space. */
-	MPG123_BAD_TYPES,		/**< Incompatible numeric data types. */
-	MPG123_BAD_BAND,		/**< Bad equalizer band. */
-	MPG123_ERR_NULL,		/**< Null pointer given where valid storage address needed. */
-	MPG123_ERR_READER,		/**< Error reading the stream. */
-	MPG123_NO_SEEK_FROM_END,/**< Cannot seek from end (end is not known). */
-	MPG123_BAD_WHENCE,		/**< Invalid 'whence' for seek function.*/
-	MPG123_NO_TIMEOUT,		/**< Build does not support stream timeouts. */
-	MPG123_BAD_FILE,		/**< File access error. */
-	MPG123_NO_SEEK,			/**< Seek not supported by stream. */
-	MPG123_NO_READER,		/**< No stream opened. */
-	MPG123_BAD_PARS,		/**< Bad parameter handle. */
-	MPG123_BAD_INDEX_PAR,	/**< Bad parameters to mpg123_index() and mpg123_set_index() */
-	MPG123_OUT_OF_SYNC,	/**< Lost track in bytestream and did not try to resync. */
-	MPG123_RESYNC_FAIL,	/**< Resync failed to find valid MPEG data. */
-	MPG123_NO_8BIT,	/**< No 8bit encoding possible. */
-	MPG123_BAD_ALIGN,	/**< Stack aligmnent error */
-	MPG123_NULL_BUFFER,	/**< NULL input buffer with non-zero size... */
-	MPG123_NO_RELSEEK,	/**< Relative seek not possible (screwed up file offset) */
-	MPG123_NULL_POINTER, /**< You gave a null pointer somewhere where you shouldn't have. */
-	MPG123_BAD_KEY,	/**< Bad key value given. */
-	MPG123_NO_INDEX,	/**< No frame index in this build. */
-	MPG123_INDEX_FAIL,	/**< Something with frame index went wrong. */
-	MPG123_BAD_DECODER_SETUP,	/**< Something prevents a proper decoder setup */
-	MPG123_MISSING_FEATURE /**< This feature has not been built into libmpg123. */
-	,MPG123_BAD_VALUE /**< A bad value has been given, somewhere. */
-	,MPG123_LSEEK_FAILED /**< Low-level seek failed. */
-	,MPG123_BAD_CUSTOM_IO /**< Custom I/O not prepared. */
-	,MPG123_LFS_OVERFLOW /**< Offset value overflow during translation of large file API calls -- your client program cannot handle that large file. */
-};
-
-/** Return a string describing that error errcode means. */
-EXPORT const char* mpg123_plain_strerror(int errcode);
-
-/** Give string describing what error has occured in the context of handle mh.
- * When a function operating on an mpg123 handle returns MPG123_ERR, you should check for the actual reason via
- * char *errmsg = mpg123_strerror(mh)
- * This function will catch mh == NULL and return the message for MPG123_BAD_HANDLE. */
-EXPORT const char* mpg123_strerror(mpg123_handle *mh);
-
-/** Return the plain errcode intead of a string. */
-EXPORT int mpg123_errcode(mpg123_handle *mh);
-
-/*@}*/
-
-
-/** \defgroup mpg123_decoder mpg123 decoder selection
- *
- * Functions to list and select the available decoders.
- * Perhaps the most prominent feature of mpg123: You have several (optimized) decoders to choose from (on x86 and PPC (MacOS) systems, that is).
- *
- * @{
- */
-
-/** Return a NULL-terminated array of generally available decoder names (plain 8bit ASCII). */
-EXPORT const char **mpg123_decoders(void);
-
-/** Return a NULL-terminated array of the decoders supported by the CPU (plain 8bit ASCII). */
-EXPORT const char **mpg123_supported_decoders(void);
-
-/** Set the chosen decoder to 'decoder_name' */
-EXPORT int mpg123_decoder(mpg123_handle *mh, const char* decoder_name);
-
-/** Get the currently active decoder engine name.
- The active decoder engine can vary depening on output constraints,
- mostly non-resampling, integer output is accelerated via 3DNow & Co. but for other modes a fallback engine kicks in.
- Note that this can return a decoder that is ony active in the hidden and not available as decoder choice from the outside.
- \return The decoder name or NULL on error. */
-EXPORT const char* mpg123_current_decoder(mpg123_handle *mh);
-
-/*@}*/
-
-
-/** \defgroup mpg123_output mpg123 output audio format 
- *
- * Functions to get and select the format of the decoded audio.
- *
- * @{
- */
-
-/** An enum over all sample types possibly known to mpg123.
- * The values are designed as bit flags to allow bitmasking for encoding families.
- *
- * Note that (your build of) libmpg123 does not necessarily support all these.
- * Usually, you can expect the 8bit encodings and signed 16 bit.
- * Also 32bit float will be usual beginning with mpg123-1.7.0 .
- * What you should bear in mind is that (SSE, etc) optimized routines may be absent
- * for some formats. We do have SSE for 16, 32 bit and float, though.
- * 24 bit integer is done via postprocessing of 32 bit output -- just cutting
- * the last byte, no rounding, even. If you want better, do it yourself.
- *
- * All formats are in native byte order. If you need different endinaness, you
- * can simply postprocess the output buffers (libmpg123 wouldn't do anything else).
- * mpg123_encsize() can be helpful there.
- */
-enum mpg123_enc_enum
-{
-	 MPG123_ENC_8 = 0x00f /**< 0000 0000 1111 Some 8 bit integer encoding. */
-	,MPG123_ENC_16 = 0x040 /**< 0000 0100 0000 Some 16 bit integer encoding. */
-	,MPG123_ENC_24 = 0x4000 /**< 0100 0000 0000 0000 Some 24 bit integer encoding. */
-	,MPG123_ENC_32 = 0x100 /**< 0001 0000 0000 Some 32 bit integer encoding. */
-	,MPG123_ENC_SIGNED = 0x080 /**< 0000 1000 0000 Some signed integer encoding. */
-	,MPG123_ENC_FLOAT = 0xe00 /**< 1110 0000 0000 Some float encoding. */
-	,MPG123_ENC_SIGNED_16 = (MPG123_ENC_16|MPG123_ENC_SIGNED|0x10) /**< 1101 0000 signed 16 bit */
-	,MPG123_ENC_UNSIGNED_16 = (MPG123_ENC_16|0x20) /**< 0110 0000 unsigned 16 bit */
-	,MPG123_ENC_UNSIGNED_8 = 0x01 /**< 0000 0001 unsigned 8 bit */
-	,MPG123_ENC_SIGNED_8 = (MPG123_ENC_SIGNED|0x02) /**< 1000 0010 signed 8 bit */
-	,MPG123_ENC_ULAW_8 = 0x04 /**< 0000 0100 ulaw 8 bit */
-	,MPG123_ENC_ALAW_8 = 0x08 /**< 0000 1000 alaw 8 bit */
-	,MPG123_ENC_SIGNED_32 = MPG123_ENC_32|MPG123_ENC_SIGNED|0x1000 /**< 0001 0001 1000 0000 signed 32 bit */
-	,MPG123_ENC_UNSIGNED_32 = MPG123_ENC_32|0x2000 /**< 0010 0001 0000 0000 unsigned 32 bit */
-	,MPG123_ENC_SIGNED_24 = MPG123_ENC_24|MPG123_ENC_SIGNED|0x1000 /**< 0101 0000 1000 0000 signed 24 bit */
-	,MPG123_ENC_UNSIGNED_24 = MPG123_ENC_24|0x2000 /**< 0110 0000 0000 0000 unsigned 24 bit */
-	,MPG123_ENC_FLOAT_32 = 0x200 /**< 0010 0000 0000 32bit float */
-	,MPG123_ENC_FLOAT_64 = 0x400 /**< 0100 0000 0000 64bit float */
-	,MPG123_ENC_ANY = ( MPG123_ENC_SIGNED_16 | MPG123_ENC_UNSIGNED_16 | MPG123_ENC_UNSIGNED_8 
-	 | MPG123_ENC_SIGNED_8 | MPG123_ENC_ULAW_8 | MPG123_ENC_ALAW_8
-	 | MPG123_ENC_SIGNED_32 | MPG123_ENC_UNSIGNED_32
-	 | MPG123_ENC_SIGNED_24 | MPG123_ENC_UNSIGNED_24
-	 | MPG123_ENC_FLOAT_32 | MPG123_ENC_FLOAT_64 ) /**< Any encoding on the list. */
-};
-
-/** They can be combined into one number (3) to indicate mono and stereo... */
-enum mpg123_channelcount
-{
-	 MPG123_MONO = 1
-	,MPG123_STEREO = 2
-};
-
-/** An array of supported standard sample rates
- * These are possible native sample rates of MPEG audio files.
- * You can still force mpg123 to resample to a different one, but by default you will only get audio in one of these samplings.
- * \param list Store a pointer to the sample rates array there.
- * \param number Store the number of sample rates there. */
-EXPORT void mpg123_rates(const long **list, size_t *number);
-
-/** An array of supported audio encodings.
- * An audio encoding is one of the fully qualified members of mpg123_enc_enum (MPG123_ENC_SIGNED_16, not MPG123_SIGNED).
- * \param list Store a pointer to the encodings array there.
- * \param number Store the number of encodings there. */
-EXPORT void mpg123_encodings(const int **list, size_t *number);
-
-/** Return the size (in bytes) of one mono sample of the named encoding.
- * \param encoding The encoding value to analyze.
- * \return positive size of encoding in bytes, 0 on invalid encoding. */
-EXPORT int mpg123_encsize(int encoding);
-
-/** Configure a mpg123 handle to accept no output format at all, 
- * use before specifying supported formats with mpg123_format */
-EXPORT int mpg123_format_none(mpg123_handle *mh);
-
-/** Configure mpg123 handle to accept all formats 
- * (also any custom rate you may set) -- this is default. */
-EXPORT int mpg123_format_all(mpg123_handle *mh);
-
-/** Set the audio format support of a mpg123_handle in detail:
- * \param mh audio decoder handle
- * \param rate The sample rate value (in Hertz).
- * \param channels A combination of MPG123_STEREO and MPG123_MONO.
- * \param encodings A combination of accepted encodings for rate and channels, p.ex MPG123_ENC_SIGNED16 | MPG123_ENC_ULAW_8 (or 0 for no support). Please note that some encodings may not be supported in the library build and thus will be ignored here.
- * \return MPG123_OK on success, MPG123_ERR if there was an error. */
-EXPORT int mpg123_format(mpg123_handle *mh, long rate, int channels, int encodings);
-
-/** Check to see if a specific format at a specific rate is supported 
- * by mpg123_handle.
- * \return 0 for no support (that includes invalid parameters), MPG123_STEREO, 
- * MPG123_MONO or MPG123_STEREO|MPG123_MONO. */
-EXPORT int mpg123_format_support(mpg123_handle *mh, long rate, int encoding);
-
-/** Get the current output format written to the addresses givenr. */
-EXPORT int mpg123_getformat(mpg123_handle *mh, long *rate, int *channels, int *encoding);
-
-/*@}*/
-
-
-/** \defgroup mpg123_input mpg123 file input and decoding
- *
- * Functions for input bitstream and decoding operations.
- * Decoding/seek functions may also return message codes MPG123_DONE, MPG123_NEW_FORMAT and MPG123_NEED_MORE (please read up on these on how to react!).
- * @{
- */
-
-/* reading samples / triggering decoding, possible return values: */
-/** Enumeration of the error codes returned by libmpg123 functions. */
-
-/** Open and prepare to decode the specified file by filesystem path.
- * This does not open HTTP urls; libmpg123 contains no networking code.
- * If you want to decode internet streams, use mpg123_open_fd() or mpg123_open_feed().
- */
-EXPORT int mpg123_open(mpg123_handle *mh, const char *path);
-
-/** Use an already opened file descriptor as the bitstream input
- * mpg123_close() will _not_ close the file descriptor.
- */
-EXPORT int mpg123_open_fd(mpg123_handle *mh, int fd);
-
-/** Use an opaque handle as bitstream input. This works only with the
- * replaced I/O from mpg123_replace_reader_handle()!
- * mpg123_close() will call the cleanup callback for your handle (if you gave one).
- */
-EXPORT int mpg123_open_handle(mpg123_handle *mh, void *iohandle);
-
-/** Open a new bitstream and prepare for direct feeding
- * This works together with mpg123_decode(); you are responsible for reading and feeding the input bitstream.
- */
-EXPORT int mpg123_open_feed(mpg123_handle *mh);
-
-/** Closes the source, if libmpg123 opened it. */
-EXPORT int mpg123_close(mpg123_handle *mh);
-
-/** Read from stream and decode up to outmemsize bytes.
- * \param outmemory address of output buffer to write to
- * \param outmemsize maximum number of bytes to write
- * \param done address to store the number of actually decoded bytes to
- * \return error/message code (watch out for MPG123_DONE and friends!) */
-EXPORT int mpg123_read(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done);
-
-/** Feed data for a stream that has been opened with mpg123_open_feed().
- * It's give and take: You provide the bytestream, mpg123 gives you the decoded samples.
- * \param in input buffer
- * \param size number of input bytes
- * \return error/message code. */
-EXPORT int mpg123_feed(mpg123_handle *mh, const unsigned char *in, size_t size);
-
-/** Decode MPEG Audio from inmemory to outmemory. 
- * This is very close to a drop-in replacement for old mpglib.
- * When you give zero-sized output buffer the input will be parsed until 
- * decoded data is available. This enables you to get MPG123_NEW_FORMAT (and query it) 
- * without taking decoded data.
- * Think of this function being the union of mpg123_read() and mpg123_feed() (which it actually is, sort of;-).
- * You can actually always decide if you want those specialized functions in separate steps or one call this one here.
- * \param inmemory input buffer
- * \param inmemsize number of input bytes
- * \param outmemory output buffer
- * \param outmemsize maximum number of output bytes
- * \param done address to store the number of actually decoded bytes to
- * \return error/message code (watch out especially for MPG123_NEED_MORE)
- */
-EXPORT int mpg123_decode(mpg123_handle *mh, const unsigned char *inmemory, size_t inmemsize, unsigned char *outmemory, size_t outmemsize, size_t *done);
-
-/** Decode next MPEG frame to internal buffer
- * or read a frame and return after setting a new format.
- * \param num current frame offset gets stored there
- * \param audio This pointer is set to the internal buffer to read the decoded audio from.
- * \param bytes number of output bytes ready in the buffer
- */
-EXPORT int mpg123_decode_frame(mpg123_handle *mh, off_t *num, unsigned char **audio, size_t *bytes);
-
-/** Decode current MPEG frame to internal buffer.
- * Warning: This is experimental API that might change in future releases!
- * Please watch mpg123 development closely when using it.
- * \param num last frame offset gets stored there
- * \param audio this pointer is set to the internal buffer to read the decoded audio from.
- * \param bytes number of output bytes ready in the buffer
- */
-EXPORT int mpg123_framebyframe_decode(mpg123_handle *mh, off_t *num, unsigned char **audio, size_t *bytes);
-
-/** Find, read and parse the next mp3 frame
- * Warning: This is experimental API that might change in future releases!
- * Please watch mpg123 development closely when using it.
- */
-EXPORT int mpg123_framebyframe_next(mpg123_handle *mh);
-
-/*@}*/
-
-
-/** \defgroup mpg123_seek mpg123 position and seeking
- *
- * Functions querying and manipulating position in the decoded audio bitstream.
- * The position is measured in decoded audio samples, or MPEG frame offset for the specific functions.
- * If gapless code is in effect, the positions are adjusted to compensate the skipped padding/delay - meaning, you should not care about that at all and just use the position defined for the samples you get out of the decoder;-)
- * The general usage is modelled after stdlib's ftell() and fseek().
- * Especially, the whence parameter for the seek functions has the same meaning as the one for fseek() and needs the same constants from stdlib.h: 
- * - SEEK_SET: set position to (or near to) specified offset
- * - SEEK_CUR: change position by offset from now
- * - SEEK_END: set position to offset from end
- *
- * Note that sample-accurate seek only works when gapless support has been enabled at compile time; seek is frame-accurate otherwise.
- * Also, really sample-accurate seeking (meaning that you get the identical sample value after seeking compared to plain decoding up to the position) is only guaranteed when you do not mess with the position code by using MPG123_UPSPEED, MPG123_DOWNSPEED or MPG123_START_FRAME. The first two mainly should cause trouble with NtoM resampling, but in any case with these options in effect, you have to keep in mind that the sample offset is not the same as counting the samples you get from decoding since mpg123 counts the skipped samples, too (or the samples played twice only once)!
- * Short: When you care about the sample position, don't mess with those parameters;-)
- * Also, seeking is not guaranteed to work for all streams (underlying stream may not support it).
- *
- * @{
- */
-
-/** Returns the current position in samples.
- * On the next read, you'd get that sample. */
-EXPORT off_t mpg123_tell(mpg123_handle *mh);
-
-/** Returns the frame number that the next read will give you data from. */
-EXPORT off_t mpg123_tellframe(mpg123_handle *mh);
-
-/** Returns the current byte offset in the input stream. */
-EXPORT off_t mpg123_tell_stream(mpg123_handle *mh);
-
-/** Seek to a desired sample offset. 
- * Set whence to SEEK_SET, SEEK_CUR or SEEK_END.
- * \return The resulting offset >= 0 or error/message code */
-EXPORT off_t mpg123_seek(mpg123_handle *mh, off_t sampleoff, int whence);
-
-/** Seek to a desired sample offset in data feeding mode. 
- * This just prepares things to be right only if you ensure that the next chunk of input data will be from input_offset byte position.
- * \param input_offset The position it expects to be at the 
- * next time data is fed to mpg123_decode().
- * \return The resulting offset >= 0 or error/message code */
-EXPORT off_t mpg123_feedseek(mpg123_handle *mh, off_t sampleoff, int whence, off_t *input_offset);
-
-/** Seek to a desired MPEG frame index.
- * Set whence to SEEK_SET, SEEK_CUR or SEEK_END.
- * \return The resulting offset >= 0 or error/message code */
-EXPORT off_t mpg123_seek_frame(mpg123_handle *mh, off_t frameoff, int whence);
-
-/** Return a MPEG frame offset corresponding to an offset in seconds.
- * This assumes that the samples per frame do not change in the file/stream, which is a good assumption for any sane file/stream only.
- * \return frame offset >= 0 or error/message code */
-EXPORT off_t mpg123_timeframe(mpg123_handle *mh, double sec);
-
-/** Give access to the frame index table that is managed for seeking.
- * You are asked not to modify the values... Use mpg123_set_index to set the
- * seek index
- * \param offsets pointer to the index array
- * \param step one index byte offset advances this many MPEG frames
- * \param fill number of recorded index offsets; size of the array */
-EXPORT int mpg123_index(mpg123_handle *mh, off_t **offsets, off_t *step, size_t *fill);
-
-/** Set the frame index table
- * Setting offsets to NULL and fill > 0 will allocate fill entries. Setting offsets
- * to NULL and fill to 0 will clear the index and free the allocated memory used by the index.
- * \param offsets pointer to the index array
- * \param step one index byte offset advances this many MPEG frames
- * \param fill number of recorded index offsets; size of the array */ 
-EXPORT int mpg123_set_index(mpg123_handle *mh, off_t *offsets, off_t step, size_t fill);
-
-/** Get information about current and remaining frames/seconds.
- * WARNING: This function is there because of special usage by standalone mpg123 and may be removed in the final version of libmpg123!
- * You provide an offset (in frames) from now and a number of output bytes 
- * served by libmpg123 but not yet played. You get the projected current frame 
- * and seconds, as well as the remaining frames/seconds. This does _not_ care 
- * about skipped samples due to gapless playback. */
-EXPORT int mpg123_position( mpg123_handle *mh, off_t frame_offset, off_t buffered_bytes, off_t *current_frame, off_t *frames_left, double *current_seconds, double *seconds_left);
-
-/*@}*/
-
-
-/** \defgroup mpg123_voleq mpg123 volume and equalizer
- *
- * @{
- */
-
-enum mpg123_channels
-{
-	 MPG123_LEFT=0x1	/**< The Left Channel. */
-	,MPG123_RIGHT=0x2	/**< The Right Channel. */
-	,MPG123_LR=0x3	/**< Both left and right channel; same as MPG123_LEFT|MPG123_RIGHT */
-};
-
-/** Set the 32 Band Audio Equalizer settings.
- * \param channel Can be MPG123_LEFT, MPG123_RIGHT or MPG123_LEFT|MPG123_RIGHT for both.
- * \param band The equaliser band to change (from 0 to 31)
- * \param val The (linear) adjustment factor. */
-EXPORT int mpg123_eq(mpg123_handle *mh, enum mpg123_channels channel, int band, double val);
-
-/** Get the 32 Band Audio Equalizer settings.
- * \param channel Can be MPG123_LEFT, MPG123_RIGHT or MPG123_LEFT|MPG123_RIGHT for (arithmetic mean of) both.
- * \param band The equaliser band to change (from 0 to 31)
- * \return The (linear) adjustment factor. */
-EXPORT double mpg123_geteq(mpg123_handle *mh, enum mpg123_channels channel, int band);
-
-/** Reset the 32 Band Audio Equalizer settings to flat */
-EXPORT int mpg123_reset_eq(mpg123_handle *mh);
-
-/** Set the absolute output volume including the RVA setting, 
- * vol<0 just applies (a possibly changed) RVA setting. */
-EXPORT int mpg123_volume(mpg123_handle *mh, double vol);
-
-/** Adjust output volume including the RVA setting by chosen amount */
-EXPORT int mpg123_volume_change(mpg123_handle *mh, double change);
-
-/** Return current volume setting, the actual value due to RVA, and the RVA 
- * adjustment itself. It's all as double float value to abstract the sample 
- * format. The volume values are linear factors / amplitudes (not percent) 
- * and the RVA value is in decibels. */
-EXPORT int mpg123_getvolume(mpg123_handle *mh, double *base, double *really, double *rva_db);
-
-/* TODO: Set some preamp in addition / to replace internal RVA handling? */
-
-/*@}*/
-
-
-/** \defgroup mpg123_status mpg123 status and information
- *
- * @{
- */
-
-/** Enumeration of the mode types of Variable Bitrate */
-enum mpg123_vbr {
-	MPG123_CBR=0,	/**< Constant Bitrate Mode (default) */
-	MPG123_VBR,		/**< Variable Bitrate Mode */
-	MPG123_ABR		/**< Average Bitrate Mode */
-};
-
-/** Enumeration of the MPEG Versions */
-enum mpg123_version {
-	MPG123_1_0=0,	/**< MPEG Version 1.0 */
-	MPG123_2_0,		/**< MPEG Version 2.0 */
-	MPG123_2_5		/**< MPEG Version 2.5 */
-};
-
-
-/** Enumeration of the MPEG Audio mode.
- * Only the mono mode has 1 channel, the others have 2 channels. */
-enum mpg123_mode {
-	MPG123_M_STEREO=0,	/**< Standard Stereo. */
-	MPG123_M_JOINT,		/**< Joint Stereo. */
-	MPG123_M_DUAL,		/**< Dual Channel. */
-	MPG123_M_MONO		/**< Single Channel. */
-};
-
-
-/** Enumeration of the MPEG Audio flag bits */
-enum mpg123_flags {
-	MPG123_CRC=0x1,			/**< The bitstream is error protected using 16-bit CRC. */
-	MPG123_COPYRIGHT=0x2,	/**< The bitstream is copyrighted. */
-	MPG123_PRIVATE=0x4,		/**< The private bit has been set. */
-	MPG123_ORIGINAL=0x8	/**< The bitstream is an original, not a copy. */
-};
-
-/** Data structure for storing information about a frame of MPEG Audio */
-struct mpg123_frameinfo
-{
-	enum mpg123_version version;	/**< The MPEG version (1.0/2.0/2.5). */
-	int layer;						/**< The MPEG Audio Layer (MP1/MP2/MP3). */
-	long rate; 						/**< The sampling rate in Hz. */
-	enum mpg123_mode mode;			/**< The audio mode (Mono, Stereo, Joint-stero, Dual Channel). */
-	int mode_ext;					/**< The mode extension bit flag. */
-	int framesize;					/**< The size of the frame (in bytes). */
-	enum mpg123_flags flags;		/**< MPEG Audio flag bits. Just now I realize that it should be declared as int, not enum. It's a bitwise combination of the enum values. */
-	int emphasis;					/**< The emphasis type. */
-	int bitrate;					/**< Bitrate of the frame (kbps). */
-	int abr_rate;					/**< The target average bitrate. */
-	enum mpg123_vbr vbr;			/**< The VBR mode. */
-};
-
-/** Get frame information about the MPEG audio bitstream and store it in a mpg123_frameinfo structure. */
-EXPORT int mpg123_info(mpg123_handle *mh, struct mpg123_frameinfo *mi);
-
-/** Get the safe output buffer size for all cases (when you want to replace the internal buffer) */
-EXPORT size_t mpg123_safe_buffer(void); 
-
-/** Make a full parsing scan of each frame in the file. ID3 tags are found. An accurate length 
- * value is stored. Seek index will be filled. A seek back to current position 
- * is performed. At all, this function refuses work when stream is 
- * not seekable. 
- * \return MPG123_OK or MPG123_ERR.
- */
-EXPORT int mpg123_scan(mpg123_handle *mh);
-
-/** Return, if possible, the full (expected) length of current track in samples.
- * \return length >= 0 or MPG123_ERR if there is no length guess possible. */
-EXPORT off_t mpg123_length(mpg123_handle *mh);
-
-/** Override the value for file size in bytes.
- * Useful for getting sensible track length values in feed mode or for HTTP streams.
- * \return MPG123_OK or MPG123_ERR */
-EXPORT int mpg123_set_filesize(mpg123_handle *mh, off_t size);
-
-/** Returns the time (seconds) per frame; <0 is error. */
-EXPORT double mpg123_tpf(mpg123_handle *mh);
-
-/** Get and reset the clip count. */
-EXPORT long mpg123_clip(mpg123_handle *mh);
-
-
-/** The key values for state information from mpg123_getstate(). */
-enum mpg123_state
-{
-	 MPG123_ACCURATE = 1 /**< Query if positons are currently accurate (integer value, 0 if false, 1 if true) */
-};
-
-/** Get various current decoder/stream state information.
- * \param key the key to identify the information to give.
- * \param val the address to return (long) integer values to
- * \param fval the address to return floating point values to
- * \return MPG123_OK or MPG123_ERR for success
- */
-EXPORT int mpg123_getstate(mpg123_handle *mh, enum mpg123_state key, long *val, double *fval);
-
-/*@}*/
-
-
-/** \defgroup mpg123_metadata mpg123 metadata handling
- *
- * Functions to retrieve the metadata from MPEG Audio files and streams.
- * Also includes string handling functions.
- *
- * @{
- */
-
-/** Data structure for storing strings in a safer way than a standard C-String.
- * Can also hold a number of null-terminated strings. */
-typedef struct 
-{
-	char* p; /**< pointer to the string data */
-	size_t size; /**< raw number of bytes allocated */
-	size_t fill; /**< number of used bytes (including closing zero byte) */
-} mpg123_string;
-
-/** Create and allocate memory for a new mpg123_string */
-EXPORT void mpg123_init_string(mpg123_string* sb);
-
-/** Free-up mempory for an existing mpg123_string */
-EXPORT void mpg123_free_string(mpg123_string* sb);
-
-/** Change the size of a mpg123_string
- * \return 0 on error, 1 on success */
-EXPORT int mpg123_resize_string(mpg123_string* sb, size_t news);
-
-/** Increase size of a mpg123_string if necessary (it may stay larger).
- * Note that the functions for adding and setting in current libmpg123 use this instead of mpg123_resize_string().
- * That way, you can preallocate memory and safely work afterwards with pieces.
- * \return 0 on error, 1 on success */
-EXPORT int mpg123_grow_string(mpg123_string* sb, size_t news);
-
-/** Copy the contents of one mpg123_string string to another.
- * \return 0 on error, 1 on success */
-EXPORT int mpg123_copy_string(mpg123_string* from, mpg123_string* to);
-
-/** Append a C-String to an mpg123_string
- * \return 0 on error, 1 on success */
-EXPORT int mpg123_add_string(mpg123_string* sb, const char* stuff);
-
-/** Append a C-substring to an mpg123 string
- * \return 0 on error, 1 on success
- * \param from offset to copy from
- * \param count number of characters to copy (a null-byte is always appended) */
-EXPORT int mpg123_add_substring(mpg123_string *sb, const char *stuff, size_t from, size_t count);
-
-/** Set the conents of a mpg123_string to a C-string
- * \return 0 on error, 1 on success */
-EXPORT int mpg123_set_string(mpg123_string* sb, const char* stuff);
-
-/** Set the contents of a mpg123_string to a C-substring
- * \return 0 on error, 1 on success
- * \param from offset to copy from
- * \param count number of characters to copy (a null-byte is always appended) */
-EXPORT int mpg123_set_substring(mpg123_string *sb, const char *stuff, size_t from, size_t count);
-
-/** Count characters in a mpg123 string (non-null bytes or UTF-8 characters).
- * \return character count
- * \param sb the string
- * \param utf8 a flag to tell if the string is in utf8 encoding
- * Even with the fill property, the character count is not obvious as there could be multiple trailing null bytes.
-*/
-EXPORT size_t mpg123_strlen(mpg123_string *sb, int utf8);
-
-/** The mpg123 text encodings. This contains encodings we encounter in ID3 tags or ICY meta info. */
-enum mpg123_text_encoding
-{
-	 mpg123_text_unknown = 0 /**< Unkown encoding... mpg123_id3_encoding can return that on invalid codes. */
-	,mpg123_text_utf8 = 1 /**< UTF-8 */
-	,mpg123_text_latin1 = 2 /**< ISO-8859-1. Note that sometimes latin1 in ID3 is abused for totally different encodings. */
-	,mpg123_text_icy = 3 /**< ICY metadata encoding, usually CP-1252 but we take it as UTF-8 if it qualifies as such. */
-	,mpg123_text_cp1252 = 4 /**< Really CP-1252 without any guessing. */
-	,mpg123_text_utf16 = 5 /**< Some UTF-16 encoding. The last of a set of leading BOMs (byte order mark) rules.
-	 * When there is no BOM, big endian ordering is used. Note that UCS-2 qualifies as UTF-8 when
-	 * you don't mess with the reserved code points. If you want to decode little endian data
-	 * without BOM you need to prepend 0xff 0xfe yourself. */
-	,mpg123_text_utf16bom = 6 /**< Just an alias for UTF-16, ID3v2 has this as distinct code. */
-	,mpg123_text_utf16be = 7 /**< Another alias for UTF16 from ID3v2. Note, that, because of the mess that is reality,
-	 * BOMs are used if encountered. There really is not much distinction between the UTF16 types for mpg123
-	 * One exception: Since this is seen in ID3v2 tags, leading null bytes are skipped for all other UTF16
-	 * types (we expect a BOM before real data there), not so for utf16be!*/
-	,mpg123_text_max = 7 /**< Placeholder for the maximum encoding value. */
-};
-
-/** The encoding byte values from ID3v2. */
-enum mpg123_id3_enc
-{
-	 mpg123_id3_latin1 = 0 /**< Note: This sometimes can mean anything in practice... */
-	,mpg123_id3_utf16bom = 1 /**< UTF16, UCS-2 ... it's all the same for practical purposes. */
-	,mpg123_id3_utf16be = 2 /**< Big-endian UTF-16, BOM see note for mpg123_text_utf16be. */
-	,mpg123_id3_utf8 = 3 /**< Our lovely overly ASCII-compatible 8 byte encoding for the world. */
-	,mpg123_id3_enc_max = 3 /**< Placeholder to check valid range of encoding byte. */
-};
-
-/** Convert ID3 encoding byte to mpg123 encoding index. */
-EXPORT enum mpg123_text_encoding mpg123_enc_from_id3(unsigned char id3_enc_byte);
-
-/** Store text data in string, after converting to UTF-8 from indicated encoding
- * \return 0 on error, 1 on success (on error, mpg123_free_string is called on sb)
- * \param sb target string
- * \param enc mpg123 text encoding value
- * \param source source buffer with plain unsigned bytes (you might need to cast from char *)
- * \param source_size number of bytes in the source buffer
- *
- * A prominent error can be that you provided an unknown encoding value, or this build of libmpg123 lacks support for certain encodings (ID3 or ICY stuff missing).
- * Also, you might want to take a bit of care with preparing the data; for example, strip leading zeroes (I have seen that).
- */
-EXPORT int mpg123_store_utf8(mpg123_string *sb, enum mpg123_text_encoding enc, const unsigned char *source, size_t source_size);
-
-/** Sub data structure for ID3v2, for storing various text fields (including comments).
- * This is for ID3v2 COMM, TXXX and all the other text fields.
- * Only COMM and TXXX have a description, only COMM and USLT have a language.
- * You should consult the ID3v2 specification for the use of the various text fields ("frames" in ID3v2 documentation, I use "fields" here to separate from MPEG frames). */
-typedef struct
-{
-	char lang[3]; /**< Three-letter language code (not terminated). */
-	char id[4]; /**< The ID3v2 text field id, like TALB, TPE2, ... (4 characters, no string termination). */
-	mpg123_string description; /**< Empty for the generic comment... */
-	mpg123_string text; /**< ... */
-} mpg123_text;
-
-/** Data structure for storing IDV3v2 tags.
- * This structure is not a direct binary mapping with the file contents.
- * The ID3v2 text frames are allowed to contain multiple strings.
- * So check for null bytes until you reach the mpg123_string fill.
- * All text is encoded in UTF-8. */
-typedef struct
-{
-	unsigned char version; /**< 3 or 4 for ID3v2.3 or ID3v2.4. */
-	mpg123_string *title; /**< Title string (pointer into text_list). */
-	mpg123_string *artist; /**< Artist string (pointer into text_list). */
-	mpg123_string *album; /**< Album string (pointer into text_list). */
-	mpg123_string *year; /**< The year as a string (pointer into text_list). */
-	mpg123_string *genre; /**< Genre String (pointer into text_list). The genre string(s) may very well need postprocessing, esp. for ID3v2.3. */
-	mpg123_string *comment; /**< Pointer to last encountered comment text with empty description. */
-	/* Encountered ID3v2 fields are appended to these lists.
-	 There can be multiple occurences, the pointers above always point to the last encountered data. */
-	mpg123_text *comment_list; /**< Array of comments. */
-	size_t comments; /**< Number of comments. */
-	mpg123_text *text; /**< Array of ID3v2 text fields (including USLT) */
-	size_t texts; /**< Numer of text fields. */
-	mpg123_text *extra; /**< The array of extra (TXXX) fields. */
-	size_t extras; /**< Number of extra text (TXXX) fields. */
-} mpg123_id3v2;
-
-/** Data structure for ID3v1 tags (the last 128 bytes of a file).
- * Don't take anything for granted (like string termination)!
- * Also note the change ID3v1.1 did: comment[28] = 0; comment[19] = track_number
- * It is your task to support ID3v1 only or ID3v1.1 ...*/
-typedef struct
-{
-	char tag[3]; /**< Always the string "TAG", the classic intro. */
-	char title[30]; /**< Title string. */
-	char artist[30]; /**< Artist string. */
-	char album[30]; /**< Album string. */
-	char year[4]; /**< Year string. */
-	char comment[30]; /**< Comment string. */
-	unsigned char genre; /**< Genre index. */
-} mpg123_id3v1;
-
-#define MPG123_ID3 0x3 /**< 0011 There is some ID3 info. Also matches 0010 or NEW_ID3. */
-#define MPG123_NEW_ID3 0x1 /**< 0001 There is ID3 info that changed since last call to mpg123_id3. */
-#define MPG123_ICY 0xc /**< 1100 There is some ICY info. Also matches 0100 or NEW_ICY.*/
-#define MPG123_NEW_ICY 0x4 /**< 0100 There is ICY info that changed since last call to mpg123_icy. */
-
-/** Query if there is (new) meta info, be it ID3 or ICY (or something new in future).
- The check function returns a combination of flags. */
-EXPORT int mpg123_meta_check(mpg123_handle *mh); /* On error (no valid handle) just 0 is returned. */
-
-/** Point v1 and v2 to existing data structures wich may change on any next read/decode function call.
- * v1 and/or v2 can be set to NULL when there is no corresponding data.
- * \return Return value is MPG123_OK or MPG123_ERR, */
-EXPORT int mpg123_id3(mpg123_handle *mh, mpg123_id3v1 **v1, mpg123_id3v2 **v2);
-
-/** Point icy_meta to existing data structure wich may change on any next read/decode function call.
- * \return Return value is MPG123_OK or MPG123_ERR, */
-EXPORT int mpg123_icy(mpg123_handle *mh, char **icy_meta); /* same for ICY meta string */
-
-/** Decode from windows-1252 (the encoding ICY metainfo used) to UTF-8.
- * Note that this is very similar to mpg123_store_utf8(&sb, mpg123_text_icy, icy_text, strlen(icy_text+1)) .
- * \param icy_text The input data in ICY encoding
- * \return pointer to newly allocated buffer with UTF-8 data (You free() it!) */
-EXPORT char* mpg123_icy2utf8(const char* icy_text);
-
-
-/* @} */
-
-
-/** \defgroup mpg123_advpar mpg123 advanced parameter API
- *
- * Direct access to a parameter set without full handle around it.
- *	Possible uses:
- * - Influence behaviour of library _during_ initialization of handle (MPG123_VERBOSE).
- * - Use one set of parameters for multiple handles.
- *
- *	The functions for handling mpg123_pars (mpg123_par() and mpg123_fmt() 
- * family) directly return a fully qualified mpg123 error code, the ones 
- * operating on full handles normally MPG123_OK or MPG123_ERR, storing the 
- * specific error code itseld inside the handle. 
- *
- * @{
- */
-
-/** Opaque structure for the libmpg123 decoder parameters. */
-struct mpg123_pars_struct;
-
-/** Opaque structure for the libmpg123 decoder parameters. */
-typedef struct mpg123_pars_struct mpg123_pars;
-
-/** Create a handle with preset parameters. */
-EXPORT mpg123_handle *mpg123_parnew(mpg123_pars *mp, const char* decoder, int *error);
-
-/** Allocate memory for and return a pointer to a new mpg123_pars */
-EXPORT mpg123_pars *mpg123_new_pars(int *error);
-
-/** Delete and free up memory used by a mpg123_pars data structure */
-EXPORT void mpg123_delete_pars(mpg123_pars* mp);
-
-/** Configure mpg123 parameters to accept no output format at all, 
- * use before specifying supported formats with mpg123_format */
-EXPORT int mpg123_fmt_none(mpg123_pars *mp);
-
-/** Configure mpg123 parameters to accept all formats 
- * (also any custom rate you may set) -- this is default. */
-EXPORT int mpg123_fmt_all(mpg123_pars *mp);
-
-/** Set the audio format support of a mpg123_pars in detail:
-	\param rate The sample rate value (in Hertz).
-	\param channels A combination of MPG123_STEREO and MPG123_MONO.
-	\param encodings A combination of accepted encodings for rate and channels, p.ex MPG123_ENC_SIGNED16|MPG123_ENC_ULAW_8 (or 0 for no support).
-	\return 0 on success, -1 if there was an error. /
-*/
-EXPORT int mpg123_fmt(mpg123_pars *mh, long rate, int channels, int encodings); /* 0 is good, -1 is error */
-
-/** Check to see if a specific format at a specific rate is supported 
- * by mpg123_pars.
- * \return 0 for no support (that includes invalid parameters), MPG123_STEREO, 
- * MPG123_MONO or MPG123_STEREO|MPG123_MONO. */
-EXPORT int mpg123_fmt_support(mpg123_pars *mh, long rate, int encoding);
-
-/** Set a specific parameter, for a specific mpg123_pars, using a parameter 
- * type key chosen from the mpg123_parms enumeration, to the specified value. */
-EXPORT int mpg123_par(mpg123_pars *mp, enum mpg123_parms type, long value, double fvalue);
-
-/** Get a specific parameter, for a specific mpg123_pars. 
- * See the mpg123_parms enumeration for a list of available parameters. */
-EXPORT int mpg123_getpar(mpg123_pars *mp, enum mpg123_parms type, long *val, double *fval);
-
-/* @} */
-
-
-/** \defgroup mpg123_lowio mpg123 low level I/O
- * You may want to do tricky stuff with I/O that does not work with mpg123's default file access or you want to make it decode into your own pocket...
- *
- * @{ */
-
-/** Replace default internal buffer with user-supplied buffer.
- * Instead of working on it's own private buffer, mpg123 will directly use the one you provide for storing decoded audio. */
-EXPORT int mpg123_replace_buffer(mpg123_handle *mh, unsigned char *data, size_t size);
-
-/** The max size of one frame's decoded output with current settings.
- * Use that to determine an appropriate minimum buffer size for decoding one frame. */
-EXPORT size_t mpg123_outblock(mpg123_handle *mh);
-
-/** Replace low-level stream access functions; read and lseek as known in POSIX.
- * You can use this to make any fancy file opening/closing yourself, 
- * using mpg123_open_fd() to set the file descriptor for your read/lseek (doesn't need to be a "real" file descriptor...).
- * Setting a function to NULL means that the default internal read is 
- * used (active from next mpg123_open call on).
- * Note: As it would be troublesome to mess with this while having a file open,
- * this implies mpg123_close(). */
-EXPORT int mpg123_replace_reader(mpg123_handle *mh, ssize_t (*r_read) (int, void *, size_t), off_t (*r_lseek)(int, off_t, int));
-
-/** Replace I/O functions with your own ones operating on some kind of handle instead of integer descriptors.
- * The handle is a void pointer, so you can pass any data you want...
- * mpg123_open_handle() is the call you make to use the I/O defined here.
- * There is no fallback to internal read/seek here.
- * Note: As it would be troublesome to mess with this while having a file open,
- * this mpg123_close() is implied here.
- * \param r_read The callback for reading (behaviour like posix read).
- * \param r_lseek The callback for seeking (like posix lseek).
- * \param cleanup A callback to clean up an I/O handle on mpg123_close, can be NULL for none (you take care of cleaning your handles). */
-EXPORT int mpg123_replace_reader_handle(mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*));
-
-/* @} */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/mpg123lib_intern.h Deleted

@@ -1,337 +0,0 @@
-/*
-	mpg123lib_intern: Common non-public stuff for libmpg123
-
-	copyright 1995-2008 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-
-	derived from the old mpg123.h
-*/
-
-#ifndef MPG123_H_INTERN
-#define MPG123_H_INTERN
-
-#define MPG123_RATES 9
-#define MPG123_ENCODINGS 12
-
-#include "config.h" /* Load this before _anything_ */
-#include "intsym.h" /* Prefixing of internal symbols that still are public in a static lib. */
-
-/* ABI conformance for other compilers.
-   mpg123 needs 16byte-aligned stack for SSE and friends.
-   gcc provides that, but others don't necessarily. */
-#ifdef ABI_ALIGN_FUN
-#ifndef attribute_align_arg
-#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__>1)
-#    define attribute_align_arg __attribute__((force_align_arg_pointer))
-/* The gcc that can align the stack does not need the check... nor does it work with gcc 4.3+, anyway. */
-#else
-
-#    define attribute_align_arg
-/* Other compilers get code to catch misaligned stack.
-   Well, except Sun Studio, which accepts the aligned attribute but does not honor it. */
-#if !defined(__SUNPRO_C)
-#    define NEED_ALIGNCHECK
-#endif
-
-#endif
-#endif
-#else
-#define attribute_align_arg
-/* We won't try the align check... */
-#endif
-
-/* export DLL symbols */
-#if defined(WIN32) && defined(DYNAMIC_BUILD)
-#define BUILD_MPG123_DLL
-#endif
-#include "compat.h"
-#include "mpg123.h"
-
-#define SKIP_JUNK 1
-
-#ifndef M_PI
-# define M_PI       3.14159265358979323846
-#endif
-#ifndef M_SQRT2
-# define M_SQRT2	1.41421356237309504880
-#endif
-
-#ifdef SUNOS
-#define memmove(dst,src,size) bcopy(src,dst,size)
-#endif
-
-/* some stuff has to go back to mpg123.h */
-#ifdef REAL_IS_FLOAT
-#  define real float
-#  define REAL_SCANF "%f"
-#  define REAL_PRINTF "%f"
-#elif defined(REAL_IS_LONG_DOUBLE)
-#  define real long double
-#  define REAL_SCANF "%Lf"
-#  define REAL_PRINTF "%Lf"
-#elif defined(REAL_IS_FIXED)
-/* Disable some output formats for fixed point decoder... */
-
-# define real long
-
-/*
-  for fixed-point decoders, use pre-calculated tables to avoid expensive floating-point maths
-  undef this macro for run-time calculation
-*/
-#define PRECALC_TABLES
-
-# define REAL_RADIX				24
-# define REAL_FACTOR			16777216.0
-
-static inline long double_to_long_rounded(double x, double scalefac)
-{
-	x *= scalefac;
-	x += (x > 0) ? 0.5 : -0.5;
-	return (long)x;
-}
-
-static inline long scale_rounded(long x, int shift)
-{
-	x += (x >> 31);
-	x >>= (shift - 1);
-	x += (x & 1);
-	return (x >> 1);
-}
-
-# ifdef __GNUC__
-#  if defined(OPT_I386)
-/* for i386_nofpu decoder */
-#   define REAL_MUL_ASM(x, y, radix) \
-({ \
-	long _x=(x), _y=(y); \
-	__asm__ ( \
-		"imull %1 \n\t" \
-		"shrdl %2, %%edx, %0 \n\t" \
-		: "+&a" (_x) \
-		: "mr" (_y), "I" (radix) \
-		: "%edx", "cc" \
-	); \
-	_x; \
-})
-
-#   define REAL_MUL_SCALE_LAYER3_ASM(x, y, radix) \
-({ \
-	long _x=(x), _y=(y), _radix=(radix); \
-	__asm__ ( \
-		"imull %1 \n\t" \
-		"shrdl %%cl, %%edx, %0 \n\t" \
-		: "+&a" (_x) \
-		: "mr" (_y), "c" (_radix) \
-		: "%edx", "cc" \
-	); \
-	_x; \
-})
-#  elif defined(OPT_PPC)
-/* for powerpc */
-#   define REAL_MUL_ASM(x, y, radix) \
-({ \
-	long _x=(x), _y=(y), _mull, _mulh; \
-	__asm__ ( \
-		"mullw %0, %2, %3 \n\t" \
-		"mulhw %1, %2, %3 \n\t" \
-		"srwi %0, %0, %4 \n\t" \
-		"rlwimi %0, %1, %5, 0, %6 \n\t" \
-		: "=&r" (_mull), "=&r" (_mulh) \
-		: "%r" (_x), "r" (_y), "i" (radix), "i" (32-(radix)), "i" ((radix)-1) \
-	); \
-	_mull; \
-})
-
-#   define REAL_MUL_SCALE_LAYER3_ASM(x, y, radix) \
-({ \
-	long _x=(x), _y=(y), _radix=(radix), _mull, _mulh, _radix2; \
-	__asm__ ( \
-		"mullw %0, %3, %4 \n\t" \
-		"mulhw %1, %3, %4 \n\t" \
-		"subfic %2, %5, 32 \n\t" \
-		"srw %0, %0, %5 \n\t" \
-		"slw %1, %1, %2 \n\t" \
-		"or %0, %0, %1 \n\t" \
-		: "=&r" (_mull), "=&r" (_mulh), "=&r" (_radix2) \
-		: "%r" (_x), "r" (_y), "r" (_radix) \
-		: "cc" \
-	); \
-	_mull; \
-})
-#  elif defined(OPT_ARM)
-/* for arm */
-#   define REAL_MUL_ASM(x, y, radix) \
-({ \
-	long _x=(x), _y=(y), _mull, _mulh; \
-	__asm__ ( \
-		"smull %0, %1, %2, %3 \n\t" \
-		"mov %0, %0, lsr %4 \n\t" \
-		"orr %0, %0, %1, lsl %5 \n\t" \
-		: "=&r" (_mull), "=&r" (_mulh) \
-		: "%r" (_x), "r" (_y), "M" (radix), "M" (32-(radix)) \
-	); \
-	_mull; \
-})
-
-#   define REAL_MUL_SCALE_LAYER3_ASM(x, y, radix) \
-({ \
-	long _x=(x), _y=(y), _radix=(radix), _mull, _mulh, _radix2; \
-	__asm__ ( \
-		"smull %0, %1, %3, %4 \n\t" \
-		"mov %0, %0, lsr %5 \n\t" \
-		"rsb %2, %5, #32 \n\t" \
-		"orr %0, %0, %1, lsl %2 \n\t" \
-		: "=&r" (_mull), "=&r" (_mulh), "=&r" (_radix2) \
-		: "%r" (_x), "r" (_y), "r" (_radix) \
-	); \
-	_mull; \
-})
-#  endif
-# endif
-
-/* I just changed the (int) to (long) there... seemed right. */
-# define DOUBLE_TO_REAL(x)					(double_to_long_rounded(x, REAL_FACTOR))
-# define DOUBLE_TO_REAL_15(x)				(double_to_long_rounded(x, 32768.0))
-# define DOUBLE_TO_REAL_POW43(x)			(double_to_long_rounded(x, 8192.0))
-# define DOUBLE_TO_REAL_SCALE_LAYER12(x)	(double_to_long_rounded(x, 1073741824.0))
-# define DOUBLE_TO_REAL_SCALE_LAYER3(x, y)	(double_to_long_rounded(x, pow(2.0,gainpow2_scale[y])))
-# define REAL_TO_DOUBLE(x)					((double)(x) / REAL_FACTOR)
-# ifdef REAL_MUL_ASM
-#  define REAL_MUL(x, y)					REAL_MUL_ASM(x, y, REAL_RADIX)
-#  define REAL_MUL_15(x, y)					REAL_MUL_ASM(x, y, 15)
-#  define REAL_MUL_SCALE_LAYER12(x, y)		REAL_MUL_ASM(x, y, 15 + 30 - REAL_RADIX)
-# else
-#  define REAL_MUL(x, y)					(((long long)(x) * (long long)(y)) >> REAL_RADIX)
-#  define REAL_MUL_15(x, y)					(((long long)(x) * (long long)(y)) >> 15)
-#  define REAL_MUL_SCALE_LAYER12(x, y)		(((long long)(x) * (long long)(y)) >> (15 + 30 - REAL_RADIX))
-# endif
-# ifdef REAL_MUL_SCALE_LAYER3_ASM
-#  define REAL_MUL_SCALE_LAYER3(x, y, z)	REAL_MUL_SCALE_LAYER3_ASM(x, y, 13 + gainpow2_scale[z] - REAL_RADIX)
-# else
-#  define REAL_MUL_SCALE_LAYER3(x, y, z)	(((long long)(x) * (long long)(y)) >> (13 + gainpow2_scale[z] - REAL_RADIX))
-# endif
-# define REAL_SCALE_LAYER12(x)				((long)((x) >> (30 - REAL_RADIX)))
-# define REAL_SCALE_LAYER3(x, y)			((long)((x) >> (gainpow2_scale[y] - REAL_RADIX)))
-# ifdef ACCURATE_ROUNDING
-#  define REAL_MUL_SYNTH(x, y)				REAL_MUL(x, y)
-#  define REAL_SCALE_DCT64(x)				(x)
-#  define REAL_SCALE_WINDOW(x)				(x)
-# else
-#  define REAL_MUL_SYNTH(x, y)				((x) * (y))
-#  define REAL_SCALE_DCT64(x)				((x) >> 8)
-#  define REAL_SCALE_WINDOW(x)				scale_rounded(x, 16)
-# endif
-#  define REAL_SCANF "%ld"
-#  define REAL_PRINTF "%ld"
-
-#else
-#  define real double
-#  define REAL_SCANF "%lf"
-#  define REAL_PRINTF "%f"
-#endif
-
-#ifndef REAL_IS_FIXED
-# if (defined SIZEOF_INT32_T) && (SIZEOF_INT32_T != 4)
-#  error "Bad 32bit types!!!"
-# endif
-#endif
-
-#ifndef DOUBLE_TO_REAL
-# define DOUBLE_TO_REAL(x)					(real)(x)
-#endif
-#ifndef DOUBLE_TO_REAL_15
-# define DOUBLE_TO_REAL_15(x)				(real)(x)
-#endif
-#ifndef DOUBLE_TO_REAL_POW43
-# define DOUBLE_TO_REAL_POW43(x)			(real)(x)
-#endif
-#ifndef DOUBLE_TO_REAL_SCALE_LAYER12
-# define DOUBLE_TO_REAL_SCALE_LAYER12(x)	(real)(x)
-#endif
-#ifndef DOUBLE_TO_REAL_SCALE_LAYER3
-# define DOUBLE_TO_REAL_SCALE_LAYER3(x, y)	(real)(x)
-#endif
-#ifndef REAL_TO_DOUBLE
-# define REAL_TO_DOUBLE(x)					(x)
-#endif
-
-#ifndef REAL_MUL
-# define REAL_MUL(x, y)						((x) * (y))
-#endif
-#ifndef REAL_MUL_SYNTH
-# define REAL_MUL_SYNTH(x, y)				((x) * (y))
-#endif
-#ifndef REAL_MUL_15
-# define REAL_MUL_15(x, y)					((x) * (y))
-#endif
-#ifndef REAL_MUL_SCALE_LAYER12
-# define REAL_MUL_SCALE_LAYER12(x, y)		((x) * (y))
-#endif
-#ifndef REAL_MUL_SCALE_LAYER3
-# define REAL_MUL_SCALE_LAYER3(x, y, z)		((x) * (y))
-#endif
-#ifndef REAL_SCALE_LAYER12
-# define REAL_SCALE_LAYER12(x)				(x)
-#endif
-#ifndef REAL_SCALE_LAYER3
-# define REAL_SCALE_LAYER3(x, y)			(x)
-#endif
-#ifndef REAL_SCALE_DCT64
-# define REAL_SCALE_DCT64(x)				(x)
-#endif
-
-/* used to be: AUDIOBUFSIZE = n*64 with n=1,2,3 ...
-   now: factor on minimum frame buffer size (which takes upsampling into account) */
-#define		AUDIOBUFSIZE		2
-
-#include "true.h"
-
-#define         MAX_NAME_SIZE           81
-#define         SBLIMIT                 32
-#define         SCALE_BLOCK             12
-#define         SSLIMIT                 18
-
-/* Same as MPG_M_* */
-#define         MPG_MD_STEREO           0
-#define         MPG_MD_JOINT_STEREO     1
-#define         MPG_MD_DUAL_CHANNEL     2
-#define         MPG_MD_MONO             3
-
-/* We support short or float output samples...
-   Short integer amplitude is scaled by this. */
-#define SHORT_SCALE 32768
-/* That scales a short-scaled value to a 32bit integer scaled one
-   value = 2**31/2**15 */
-#define S32_RESCALE 65536
-
-/* Pre Shift fo 16 to 8 bit converter table */
-#define AUSHIFT (3)
-
-#include "optimize.h"
-#include "decode.h"
-#include "parse.h"
-#include "frame.h"
-
-/* fr is a mpg123_handle* by convention here... */
-#define NOQUIET  (!(fr->p.flags & MPG123_QUIET))
-#define VERBOSE  (NOQUIET && fr->p.verbose)
-#define VERBOSE2 (NOQUIET && fr->p.verbose > 1)
-#define VERBOSE3 (NOQUIET && fr->p.verbose > 2)
-#define VERBOSE4 (NOQUIET && fr->p.verbose > 3)
-#define PVERB(mp, level) (!((mp)->flags & MPG123_QUIET) && (mp)->verbose >= (level))
-
-int decode_update(mpg123_handle *mh);
-/* residing in format.c  */
-off_t samples_to_storage(mpg123_handle *fr , off_t s);
-off_t samples_to_bytes(mpg123_handle *fr , off_t s);
-off_t bytes_to_samples(mpg123_handle *fr , off_t b);
-/* Postprocessing format conversion of freshly decoded buffer. */
-void postprocess_buffer(mpg123_handle *fr);
-
-/* If networking is enabled and we really mean internal networking, the timeout_read function is available. */
-#if defined (NETWORK) && !defined (WANT_WIN32_SOCKETS)
-/* Does not work with win32 */
-#define TIMEOUT_READ
-#endif
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/optimize.c Deleted

@@ -1,962 +0,0 @@
-/*
-	optimize: get a grip on the different optimizations
-
-	copyright 2006-9 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis, inspired by 3DNow stuff in mpg123.[hc]
-
-	Currently, this file contains the struct and function to choose an optimization variant and works only when OPT_MULTI is in effect.
-*/
-
-#include "mpg123lib_intern.h" /* includes optimize.h */
-#include "debug.h"
-
-/* Must match the enum dectype! */
-
-/*
-	It SUCKS having to define these names that way, but compile-time intialization of string arrays is a bitch.
-	GCC doesn't see constant stuff when it's wiggling in front of it!
-	Anyhow: Have a script for that:
-names="generic generic_dither i386 i486 i586 i586_dither MMX 3DNow 3DNowExt AltiVec SSE x86-64"
-for i in $names; do echo "##define dn_${i/-/_} \"$i\""; done
-echo -n "static const char* decname[] =
-{
-	\"auto\"
-	"
-for i in $names; do echo -n ", dn_${i/-/_}"; done
-echo "
-	, \"nodec\"
-};"
-*/
-#define dn_generic "generic"
-#define dn_generic_dither "generic_dither"
-#define dn_i386 "i386"
-#define dn_i486 "i486"
-#define dn_i586 "i586"
-#define dn_i586_dither "i586_dither"
-#define dn_MMX "MMX"
-#define dn_3DNow "3DNow"
-#define dn_3DNowExt "3DNowExt"
-#define dn_AltiVec "AltiVec"
-#define dn_SSE "SSE"
-#define dn_x86_64 "x86-64"
-#define dn_ARM "ARM"
-#define dn_NEON "NEON"
-static const char* decname[] =
-{
-	"auto"
-	, dn_generic, dn_generic_dither, dn_i386, dn_i486, dn_i586, dn_i586_dither, dn_MMX, dn_3DNow, dn_3DNowExt, dn_AltiVec, dn_SSE, dn_x86_64, dn_ARM, dn_NEON
-	, "nodec"
-};
-
-#if (defined OPT_X86) && (defined OPT_MULTI)
-#include "getcpuflags.h"
-static struct cpuflags cpu_flags;
-#else
-/* Faking stuff for non-multi builds. The same code for synth function choice is used.
- Just no runtime dependency of result... */
-#define cpu_flags nothing
-#define cpu_i586(s) 1
-#define cpu_fpu(s) 1
-#define cpu_mmx(s) 1
-#define cpu_3dnow(s) 1
-#define cpu_3dnowext(s) 1
-#define cpu_sse(s) 1
-#define cpu_sse2(s) 1
-#define cpu_sse3(s) 1
-#endif
-
-/* Ugly macros to build conditional synth function array values. */
-
-#ifndef NO_8BIT
-#define IF8(synth) synth,
-#else
-#define IF8(synth)
-#endif
-
-#ifndef NO_REAL
-#define IFREAL(synth) synth,
-#else
-#define IFREAL(synth)
-#endif
-
-#ifndef NO_32BIT
-#define IF32(synth) synth
-#else
-#define IF32(synth)
-#endif
-
-#ifndef NO_16BIT
-#	define OUT_SYNTHS(synth_16, synth_8, synth_real, synth_32) { synth_16, IF8(synth_8) IFREAL(synth_real) IF32(synth_32) }
-#else
-#	define OUT_SYNTHS(synth_16, synth_8, synth_real, synth_32) { IF8(synth_8) IFREAL(synth_real) IF32(synth_32) }
-#endif
-
-/* The call of left and right plain synth, wrapped.
- This may be replaced by a direct stereo optimized synth. */
-static int synth_stereo_wrap(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr)
-{
-	int clip;
-	clip = (fr->synth)(bandPtr_l, 0, fr, 0);
-	clip += (fr->synth)(bandPtr_r, 1, fr, 1);
-	return clip;
-}
-
-static const struct synth_s synth_base =
-{
-	{ /* plain */
-		 OUT_SYNTHS(synth_1to1, synth_1to1_8bit, synth_1to1_real, synth_1to1_s32)
-#		ifndef NO_DOWNSAMPLE
-		,OUT_SYNTHS(synth_2to1, synth_2to1_8bit, synth_2to1_real, synth_2to1_s32)
-		,OUT_SYNTHS(synth_4to1, synth_4to1_8bit, synth_4to1_real, synth_4to1_s32)
-#		endif
-#		ifndef NO_NTOM
-		,OUT_SYNTHS(synth_ntom, synth_ntom_8bit, synth_ntom_real, synth_ntom_s32)
-#		endif
-	},
-	{ /* stereo, by default only wrappers over plain synth */
-		 OUT_SYNTHS(synth_stereo_wrap, synth_stereo_wrap, synth_stereo_wrap, synth_stereo_wrap)
-#		ifndef NO_DOWNSAMPLE
-		,OUT_SYNTHS(synth_stereo_wrap, synth_stereo_wrap, synth_stereo_wrap, synth_stereo_wrap)
-		,OUT_SYNTHS(synth_stereo_wrap, synth_stereo_wrap, synth_stereo_wrap, synth_stereo_wrap)
-#		endif
-#		ifndef NO_NTOM
-		,OUT_SYNTHS(synth_stereo_wrap, synth_stereo_wrap, synth_stereo_wrap, synth_stereo_wrap)
-#		endif
-	},
-	{ /* mono2stereo */
-		 OUT_SYNTHS(synth_1to1_m2s, synth_1to1_8bit_m2s, synth_1to1_real_m2s, synth_1to1_s32_m2s)
-#		ifndef NO_DOWNSAMPLE
-		,OUT_SYNTHS(synth_2to1_m2s, synth_2to1_8bit_m2s, synth_2to1_real_m2s, synth_2to1_s32_m2s)
-		,OUT_SYNTHS(synth_4to1_m2s, synth_4to1_8bit_m2s, synth_4to1_real_m2s, synth_4to1_s32_m2s)
-#		endif
-#		ifndef NO_NTOM
-		,OUT_SYNTHS(synth_ntom_m2s, synth_ntom_8bit_m2s, synth_ntom_real_m2s, synth_ntom_s32_m2s)
-#		endif
-	},
-	{ /* mono*/
-		 OUT_SYNTHS(synth_1to1_mono, synth_1to1_8bit_mono, synth_1to1_real_mono, synth_1to1_s32_mono)
-#		ifndef NO_DOWNSAMPLE
-		,OUT_SYNTHS(synth_2to1_mono, synth_2to1_8bit_mono, synth_2to1_real_mono, synth_2to1_s32_mono)
-		,OUT_SYNTHS(synth_4to1_mono, synth_4to1_8bit_mono, synth_4to1_real_mono, synth_4to1_s32_mono)
-#		endif
-#		ifndef NO_NTOM
-		,OUT_SYNTHS(synth_ntom_mono, synth_ntom_8bit_mono, synth_ntom_real_mono, synth_ntom_s32_mono)
-#endif
-	}
-};
-
-#ifdef OPT_X86
-/* More plain synths for i386 */
-const func_synth plain_i386[r_limit][f_limit] =
-{ /* plain */
-	 OUT_SYNTHS(synth_1to1_i386, synth_1to1_8bit_i386, synth_1to1_real_i386, synth_1to1_s32_i386)
-#	ifndef NO_DOWNSAMPLE
-	,OUT_SYNTHS(synth_2to1_i386, synth_2to1_8bit_i386, synth_2to1_real_i386, synth_2to1_s32_i386)
-	,OUT_SYNTHS(synth_4to1_i386, synth_4to1_8bit_i386, synth_4to1_real_i386, synth_4to1_s32_i386)
-#	endif
-#	ifndef NO_NTOM
-	,OUT_SYNTHS(synth_ntom, synth_ntom_8bit, synth_ntom_real, synth_ntom_s32)
-#	endif
-};
-#endif
-
-
-enum optdec defdec(void){ return defopt; }
-
-enum optcla decclass(const enum optdec type)
-{
-	return (type == mmx || type == sse || type == dreidnowext || type == x86_64 || type == neon) ? mmxsse : normal;
-}
-
-
-static int find_synth(func_synth synth, const func_synth synths[r_limit][f_limit])
-{
-	enum synth_resample ri;
-	enum synth_format fi;
-	for(ri=0; ri<r_limit; ++ri)
-	for(fi=0; fi<f_limit; ++fi)
-	if(synth == synths[ri][fi])
-	return TRUE;
-
-	return FALSE;
-}
-
-/* Determine what kind of decoder is actually active
- This depends on runtime choices which may cause fallback to i386 or generic code. */
-static int find_dectype(mpg123_handle *fr)
-{
-	enum optdec type = nodec;
-	/* Direct and indirect usage, 1to1 stereo decoding.
-	 Concentrating on the plain stereo synth should be fine, mono stuff is derived. */
-	func_synth basic_synth = fr->synth;
-#ifndef NO_8BIT
-#ifndef NO_16BIT
-	if(basic_synth == synth_1to1_8bit_wrap)
-	basic_synth = fr->synths.plain[r_1to1][f_16]; /* That is what's really below the surface. */
-#endif
-#endif
-
-	if(FALSE) ; /* Just to initialize the else if ladder. */
-#ifndef NO_16BIT
-#ifdef OPT_3DNOWEXT
-	else if(basic_synth == synth_1to1_3dnowext) type = dreidnowext;
-#endif
-#ifdef OPT_SSE
-	else if(basic_synth == synth_1to1_sse) type = sse;
-#endif
-#ifdef OPT_3DNOW
-	else if(basic_synth == synth_1to1_3dnow) type = dreidnow;
-#endif
-#ifdef OPT_MMX
-	else if(basic_synth == synth_1to1_mmx) type = mmx;
-#endif
-#ifdef OPT_I586_DITHER
-	else if(basic_synth == synth_1to1_i586_dither) type = ifuenf_dither;
-#endif
-#ifdef OPT_I586
-	else if(basic_synth == synth_1to1_i586) type = ifuenf;
-#endif
-#ifdef OPT_ALTIVEC
-	else if(basic_synth == synth_1to1_altivec) type = altivec;
-#endif
-#ifdef OPT_X86_64
-	else if(basic_synth == synth_1to1_x86_64) type = x86_64;
-#endif
-#ifdef OPT_ARM
-	else if(basic_synth == synth_1to1_arm) type = arm;
-#endif
-#ifdef OPT_NEON
-	else if(basic_synth == synth_1to1_neon) type = neon;
-#endif
-#ifdef OPT_GENERIC_DITHER
-	else if(basic_synth == synth_1to1_dither) type = generic_dither;
-#endif
-#ifdef OPT_DITHER /* either i586 or generic! */
-#ifndef NO_DOWNSAMPLE
-	else if
-	(
-		 basic_synth == synth_2to1_dither
-		|| basic_synth == synth_4to1_dither
-	) type = generic_dither;
-#endif
-#endif
-#endif /* 16bit */
-
-#ifndef NO_REAL
-#ifdef OPT_SSE
-	else if(basic_synth == synth_1to1_real_sse) type = sse;
-#endif
-#ifdef OPT_X86_64
-	else if(basic_synth == synth_1to1_real_x86_64) type = x86_64;
-#endif
-#ifdef OPT_ALTIVEC
-	else if(basic_synth == synth_1to1_real_altivec) type = altivec;
-#endif
-#ifdef OPT_NEON
-	else if(basic_synth == synth_1to1_real_neon) type = neon;
-#endif
-
-#endif /* real */
-
-#ifndef NO_32BIT
-#ifdef OPT_SSE
-	else if(basic_synth == synth_1to1_s32_sse) type = sse;
-#endif
-#ifdef OPT_X86_64
-	else if(basic_synth == synth_1to1_s32_x86_64) type = x86_64;
-#endif
-#ifdef OPT_ALTIVEC
-	else if(basic_synth == synth_1to1_s32_altivec) type = altivec;
-#endif
-#ifdef OPT_NEON
-	else if(basic_synth == synth_1to1_s32_neon) type = neon;
-#endif
-#endif /* 32bit */
-
-#ifdef OPT_X86
-	else if(find_synth(basic_synth, plain_i386))
-	type = idrei;
-#endif
-
-	else if(find_synth(basic_synth, synth_base.plain))
-	type = generic;
-
-
-
-#ifdef OPT_I486
-	/* i486 is special ... the specific code is in use for 16bit 1to1 stereo
-	 otherwise we have i386 active... but still, the distinction doesn't matter*/
-	type = ivier;
-#endif
-
-	if(type != nodec)
-	{
-		fr->cpu_opts.type = type;
-		fr->cpu_opts.class = decclass(type);
-
-		debug3("determined active decoder type %i (%s) of class %i", type, decname[type], fr->cpu_opts.class);
-		return MPG123_OK;
-	}
-	else
-	{
-		if(NOQUIET) error("Unable to determine active decoder type -- this is SERIOUS b0rkage!");
-
-		fr->err = MPG123_BAD_DECODER_SETUP;
-		return MPG123_ERR;
-	}
-}
-
-/* set synth functions for current frame, optimizations handled by opt_* macros */
-int set_synth_functions(mpg123_handle *fr)
-{
-	enum synth_resample resample = r_none;
-	enum synth_format basic_format = f_none; /* Default is always 16bit, or whatever. */
-
-	/* Select the basic output format, different from 16bit: 8bit, real. */
-	if(FALSE){}
-#ifndef NO_16BIT
-	else if(fr->af.encoding & MPG123_ENC_16)
-	basic_format = f_16;
-#endif
-#ifndef NO_8BIT
-	else if(fr->af.encoding & MPG123_ENC_8)
-	basic_format = f_8;
-#endif
-#ifndef NO_REAL
-	else if(fr->af.encoding & MPG123_ENC_FLOAT)
-	basic_format = f_real;
-#endif
-#ifndef NO_32BIT
-	/* 24 bit integer means decoding to 32 bit first. */
-	else if(fr->af.encoding & MPG123_ENC_32 || fr->af.encoding & MPG123_ENC_24)
-	basic_format = f_32;
-#endif
-
-	/* Make sure the chosen format is compiled into this lib. */
-	if(basic_format == f_none)
-	{
-		if(NOQUIET) error("set_synth_functions: This output format is disabled in this build!");
-
-		return -1;
-	}
-
-	/* Be explicit about downsampling variant. */
-	switch(fr->down_sample)
-	{
-		case 0: resample = r_1to1; break;
-#ifndef NO_DOWNSAMPLE
-		case 1: resample = r_2to1; break;
-		case 2: resample = r_4to1; break;
-#endif
-#ifndef NO_NTOM
-		case 3: resample = r_ntom; break;
-#endif
-	}
-
-	if(resample == r_none)
-	{
-		if(NOQUIET) error("set_synth_functions: This resampling mode is not supported in this build!");
-
-		return -1;
-	}
-
-	debug2("selecting synth: resample=%i format=%i", resample, basic_format);
-	/* Finally selecting the synth functions for stereo / mono. */
-	fr->synth = fr->synths.plain[resample][basic_format];
-	fr->synth_stereo = fr->synths.stereo[resample][basic_format];
-	fr->synth_mono = fr->af.channels==2
-		? fr->synths.mono2stereo[resample][basic_format] /* Mono MPEG file decoded to stereo. */
-		: fr->synths.mono[resample][basic_format]; /* Mono MPEG file decoded to mono. */
-
-	if(find_dectype(fr) != MPG123_OK) /* Actually determine the currently active decoder breed. */
-	{
-		fr->err = MPG123_BAD_DECODER_SETUP;
-		return MPG123_ERR;
-	}
-
-	if(frame_buffers(fr) != 0)
-	{
-		fr->err = MPG123_NO_BUFFERS;
-		if(NOQUIET) error("Failed to set up decoder buffers!");
-
-		return MPG123_ERR;
-	}
-
-#ifndef NO_8BIT
-	if(basic_format == f_8)
-	{
-		if(make_conv16to8_table(fr) != 0)
-		{
-			if(NOQUIET) error("Failed to set up conv16to8 table!");
-			/* it's a bit more work to get proper error propagation up */
-			return -1;
-		}
-	}
-#endif
-
-#ifdef OPT_MMXORSSE
-	/* Special treatment for MMX, SSE and 3DNowExt stuff.
-	 The real-decoding SSE for x86-64 uses normal tables! */
-	if(fr->cpu_opts.class == mmxsse
-#	ifndef NO_REAL
-	 && basic_format != f_real
-#	endif
-#	ifndef NO_32BIT
-	 && basic_format != f_32
-#	endif
-#	ifdef ACCURATE_ROUNDING
-	 && fr->cpu_opts.type != sse
-	 && fr->cpu_opts.type != x86_64
-	 && fr->cpu_opts.type != neon
-#	endif
-	 )
-	{
-#ifndef NO_LAYER3
-		init_layer3_stuff(fr, init_layer3_gainpow2_mmx);
-#endif
-#ifndef NO_LAYER12
-		init_layer12_stuff(fr, init_layer12_table_mmx);
-#endif
-		fr->make_decode_tables = make_decode_tables_mmx;
-	}
-	else
-#endif
-	{
-#ifndef NO_LAYER3
-		init_layer3_stuff(fr, init_layer3_gainpow2);
-#endif
-#ifndef NO_LAYER12
-		init_layer12_stuff(fr, init_layer12_table);
-#endif
-		fr->make_decode_tables = make_decode_tables;
-	}
-
-	/* We allocated the table buffers just now, so (re)create the tables. */
-	fr->make_decode_tables(fr);
-
-	return 0;
-}
-
-int frame_cpu_opt(mpg123_handle *fr, const char* cpu)
-{
-	const char* chosen = ""; /* the chosen decoder opt as string */
-	enum optdec want_dec = nodec;
-	int done = 0;
-	int auto_choose = 0;
-#ifdef OPT_DITHER
-	int dithered = FALSE; /* If some dithered decoder is chosen. */
-#endif
-
-	want_dec = dectype(cpu);
-	auto_choose = want_dec == autodec;
-	/* Fill whole array of synth functions with generic code first. */
-	fr->synths = synth_base;
-
-#ifndef OPT_MULTI
-	{
-		if(!auto_choose && want_dec != defopt)
-		{
-			if(NOQUIET) error2("you wanted decoder type %i, I only have %i", want_dec, defopt);
-		}
-		auto_choose = TRUE; /* There will be only one choice anyway. */
-	}
-#endif
-
-	fr->cpu_opts.type = nodec;
-	/* covers any i386+ cpu; they actually differ only in the synth_1to1 function, mostly... */
-#ifdef OPT_X86
-
-#ifdef OPT_MULTI
-#ifndef NO_LAYER3
-#if (defined OPT_3DNOW || defined OPT_3DNOWEXT)
-	fr->cpu_opts.the_dct36 = dct36;
-#endif
-#endif
-#endif
-
-	if(cpu_i586(cpu_flags))
-	{
-#		ifdef OPT_MULTI
-		debug2("standard flags: 0x%08x\textended flags: 0x%08x", cpu_flags.std, cpu_flags.ext);
-#		endif
-		#ifdef OPT_SSE
-		if( !done && (auto_choose || want_dec == sse)
-		 && cpu_sse(cpu_flags) && cpu_mmx(cpu_flags) )
-		{
-			chosen = "SSE";
-			fr->cpu_opts.type = sse;
-#			ifndef NO_16BIT
-			fr->synths.plain[r_1to1][f_16] = synth_1to1_sse;
-#			ifdef ACCURATE_ROUNDING
-			fr->synths.stereo[r_1to1][f_16] = synth_1to1_stereo_sse;
-#			endif
-#			endif
-#			ifndef NO_REAL
-			fr->synths.plain[r_1to1][f_real] = synth_1to1_real_sse;
-			fr->synths.stereo[r_1to1][f_real] = synth_1to1_real_stereo_sse;
-#			endif
-#			ifndef NO_32BIT
-			fr->synths.plain[r_1to1][f_32] = synth_1to1_s32_sse;
-			fr->synths.stereo[r_1to1][f_32] = synth_1to1_s32_stereo_sse;
-#			endif
-			done = 1;
-		}
-		#endif
-#		ifdef OPT_3DNOWEXT
-		if( !done && (auto_choose || want_dec == dreidnowext )
-		 && cpu_3dnow(cpu_flags)
-		 && cpu_3dnowext(cpu_flags)
-		 && cpu_mmx(cpu_flags) )
-		{
-			chosen = "3DNowExt";
-			fr->cpu_opts.type = dreidnowext;
-#ifdef OPT_MULTI
-#			ifndef NO_LAYER3
-			fr->cpu_opts.the_dct36 = dct36_3dnowext;
-#			endif
-#endif
-#			ifndef NO_16BIT
-			fr->synths.plain[r_1to1][f_16] = synth_1to1_3dnowext;
-#			endif
-			done = 1;
-		}
-		#endif
-		#ifdef OPT_3DNOW
-		if( !done && (auto_choose || want_dec == dreidnow)
-		 && cpu_3dnow(cpu_flags) && cpu_mmx(cpu_flags) )
-		{
-			chosen = "3DNow";
-			fr->cpu_opts.type = dreidnow;
-#ifdef OPT_MULTI
-#			ifndef NO_LAYER3
-			fr->cpu_opts.the_dct36 = dct36_3dnow;
-#			endif
-#endif
-#			ifndef NO_16BIT
-			fr->synths.plain[r_1to1][f_16] = synth_1to1_3dnow;
-#			endif
-			done = 1;
-		}
-		#endif
-		#ifdef OPT_MMX
-		if( !done && (auto_choose || want_dec == mmx)
-		 && cpu_mmx(cpu_flags) )
-		{
-			chosen = "MMX";
-			fr->cpu_opts.type = mmx;
-#			ifndef NO_16BIT
-			fr->synths.plain[r_1to1][f_16] = synth_1to1_mmx;
-#			endif
-			done = 1;
-		}
-		#endif
-		#ifdef OPT_I586
-		if(!done && (auto_choose || want_dec == ifuenf))
-		{
-			chosen = "i586/pentium";
-			fr->cpu_opts.type = ifuenf;
-#			ifndef NO_16BIT
-			fr->synths.plain[r_1to1][f_16] = synth_1to1_i586;
-#			endif
-			done = 1;
-		}
-		#endif
-		#ifdef OPT_I586_DITHER
-		if(!done && (auto_choose || want_dec == ifuenf_dither))
-		{
-			chosen = "dithered i586/pentium";
-			fr->cpu_opts.type = ifuenf_dither;
-			dithered = TRUE;
-#			ifndef NO_16BIT
-			fr->synths.plain[r_1to1][f_16] = synth_1to1_i586_dither;
-#			ifndef NO_DOWNSAMPLE
-			fr->synths.plain[r_2to1][f_16] = synth_2to1_dither;
-			fr->synths.plain[r_4to1][f_16] = synth_4to1_dither;
-#			endif
-#			endif
-			done = 1;
-		}
-		#endif
-	}
-	#ifdef OPT_I486
-	/* That won't cooperate in multi opt mode - forcing i486 in layer3.c
-	 But still... here it is... maybe for real use in future. */
-	if(!done && (auto_choose || want_dec == ivier))
-	{
-		chosen = "i486";
-		fr->cpu_opts.type = ivier;
-		done = 1;
-	}
-	#endif
-	#ifdef OPT_I386
-	if(!done && (auto_choose || want_dec == idrei))
-	{
-		chosen = "i386";
-		fr->cpu_opts.type = idrei;
-		done = 1;
-	}
-	#endif
-
-	if(done)
-	{
-		/*
-			We have chosen some x86 decoder... fillup some i386 stuff.
-			There is an open question about using dithered synth_1to1 for 8bit wrappers.
-			For quality it won't make sense, but wrapped i586_dither wrapped may still be faster...
-		*/
-		enum synth_resample ri;
-		enum synth_format fi;
-#		ifndef NO_8BIT
-#		ifndef NO_16BIT /* possibility to use a 16->8 wrapper... */
-		if(fr->synths.plain[r_1to1][f_16] != synth_base.plain[r_1to1][f_16])
-		{
-			fr->synths.plain[r_1to1][f_8] = synth_1to1_8bit_wrap;
-			fr->synths.mono[r_1to1][f_8] = synth_1to1_8bit_wrap_mono;
-			fr->synths.mono2stereo[r_1to1][f_8] = synth_1to1_8bit_wrap_m2s;
-		}
-#		endif
-#		endif
-		for(ri=0; ri<r_limit; ++ri)
-		for(fi=0; fi<f_limit; ++fi)
-		{
-			if(fr->synths.plain[ri][fi] == synth_base.plain[ri][fi])
-			fr->synths.plain[ri][fi] = plain_i386[ri][fi];
-		}
-	}
-
-#endif /* OPT_X86 */
-
-#ifdef OPT_X86_64
-	if(!done && (auto_choose || want_dec == x86_64))
-	{
-		chosen = "x86-64 (SSE)";
-		fr->cpu_opts.type = x86_64;
-#		ifndef NO_16BIT
-		fr->synths.plain[r_1to1][f_16] = synth_1to1_x86_64;
-		fr->synths.stereo[r_1to1][f_16] = synth_1to1_stereo_x86_64;
-#		endif
-#		ifndef NO_REAL
-		fr->synths.plain[r_1to1][f_real] = synth_1to1_real_x86_64;
-		fr->synths.stereo[r_1to1][f_real] = synth_1to1_real_stereo_x86_64;
-#		endif
-#		ifndef NO_32BIT
-		fr->synths.plain[r_1to1][f_32] = synth_1to1_s32_x86_64;
-		fr->synths.stereo[r_1to1][f_32] = synth_1to1_s32_stereo_x86_64;
-#		endif
-		done = 1;
-	}
-#endif
-
-#ifdef OPT_GENERIC_DITHER
-	if(!done && (auto_choose || want_dec == generic_dither))
-	{
-		chosen = "dithered generic";
-		fr->cpu_opts.type = generic_dither;
-		dithered = TRUE;
-#		ifndef NO_16BIT
-		fr->synths.plain[r_1to1][f_16] = synth_1to1_dither;
-#		ifndef NO_DOWNSAMPLE
-		fr->synths.plain[r_2to1][f_16] = synth_2to1_dither;
-		fr->synths.plain[r_4to1][f_16] = synth_4to1_dither;
-#		endif
-#		endif
-		done = 1;
-	}
-#endif
-
-#	ifdef OPT_ALTIVEC
-	if(!done && (auto_choose || want_dec == altivec))
-	{
-		chosen = "AltiVec";
-		fr->cpu_opts.type = altivec;
-#		ifndef NO_16BIT
-		fr->synths.plain[r_1to1][f_16] = synth_1to1_altivec;
-		fr->synths.stereo[r_1to1][f_16] = synth_1to1_stereo_altivec;
-#		endif
-#		ifndef NO_REAL
-		fr->synths.plain[r_1to1][f_real] = synth_1to1_real_altivec;
-		fr->synths.stereo[r_1to1][f_real] = synth_1to1_real_stereo_altivec;
-#		endif
-#		ifndef NO_32BIT
-		fr->synths.plain[r_1to1][f_32] = synth_1to1_s32_altivec;
-		fr->synths.stereo[r_1to1][f_32] = synth_1to1_s32_stereo_altivec;
-#		endif
-		done = 1;
-	}
-#	endif
-
-#	ifdef OPT_NEON
-	if(!done && (auto_choose || want_dec == neon))
-	{
-		chosen = "NEON";
-		fr->cpu_opts.type = neon;
-#		ifndef NO_16BIT
-		fr->synths.plain[r_1to1][f_16] = synth_1to1_neon;
-		fr->synths.stereo[r_1to1][f_16] = synth_1to1_stereo_neon;
-#		endif
-#		ifndef NO_REAL
-		fr->synths.plain[r_1to1][f_real] = synth_1to1_real_neon;
-		fr->synths.stereo[r_1to1][f_real] = synth_1to1_real_stereo_neon;
-#		endif
-#		ifndef NO_32BIT
-		fr->synths.plain[r_1to1][f_32] = synth_1to1_s32_neon;
-		fr->synths.stereo[r_1to1][f_32] = synth_1to1_s32_stereo_neon;
-#		endif
-		done = 1;
-	}
-#	endif
-
-#	ifdef OPT_ARM
-	if(!done && (auto_choose || want_dec == arm))
-	{
-		chosen = "ARM";
-		fr->cpu_opts.type = arm;
-#		ifndef NO_16BIT
-		fr->synths.plain[r_1to1][f_16] = synth_1to1_arm;
-#		endif
-		done = 1;
-	}
-#	endif
-
-#	ifdef OPT_GENERIC
-	if(!done && (auto_choose || want_dec == generic))
-	{
-		chosen = "generic";
-		fr->cpu_opts.type = generic;
-		done = 1;
-	}
-#	endif
-
-	fr->cpu_opts.class = decclass(fr->cpu_opts.type);
-
-#	ifndef NO_8BIT
-#	ifndef NO_16BIT /* possibility to use a 16->8 wrapper... */
-	/* Last chance to use some optimized routine via generic wrappers (for 8bit). */
-	if( fr->cpu_opts.type != ifuenf_dither
-	 && fr->cpu_opts.type != generic_dither
-	 && fr->synths.plain[r_1to1][f_16] != synth_base.plain[r_1to1][f_16] )
-	{
-		fr->synths.plain[r_1to1][f_8] = synth_1to1_8bit_wrap;
-		fr->synths.mono[r_1to1][f_8] = synth_1to1_8bit_wrap_mono;
-		fr->synths.mono2stereo[r_1to1][f_8] = synth_1to1_8bit_wrap_m2s;
-	}
-#	endif
-#	endif
-
-#ifdef OPT_DITHER
-	if(done && dithered)
-	{
-		/* run-time dither noise table generation */
-		if(!frame_dither_init(fr))
-		{
-			if(NOQUIET) error("Dither noise setup failed!");
-			return 0;
-		}
-	}
-#endif
-
-	if(done)
-	{
-		if(VERBOSE) fprintf(stderr, "Decoder: %s\n", chosen);
-		return 1;
-	}
-	else
-	{
-		if(NOQUIET) error("Could not set optimization!");
-		return 0;
-	}
-}
-
-enum optdec dectype(const char* decoder)
-{
-	enum optdec dt;
-	if( (decoder == NULL)
-	 || (decoder[0] == 0) )
-	return autodec;
-
-	for(dt=autodec; dt<nodec; ++dt)
-	if(!strcasecmp(decoder, decname[dt])) return dt;
-
-	return nodec; /* If we found nothing... */
-}
-
-#ifdef OPT_MULTI
-
-/* same number of entries as full list, but empty at beginning */
-static const char *mpg123_supported_decoder_list[] =
-{
-	#ifdef OPT_SSE
-	NULL,
-	#endif
-	#ifdef OPT_3DNOWEXT
-	NULL,
-	#endif
-	#ifdef OPT_3DNOW
-	NULL,
-	#endif
-	#ifdef OPT_MMX
-	NULL,
-	#endif
-	#ifdef OPT_I586
-	NULL,
-	#endif
-	#ifdef OPT_I586_DITHER
-	NULL,
-	#endif
-	#ifdef OPT_I486
-	NULL,
-	#endif
-	#ifdef OPT_I386
-	NULL,
-	#endif
-	#ifdef OPT_ALTIVEC
-	NULL,
-	#endif
-	#ifdef OPT_X86_64
-	NULL,
-	#endif
-	#ifdef OPT_ARM
-	NULL,
-	#endif
-	#ifdef OPT_NEON
-	NULL,
-	#endif
-	#ifdef OPT_GENERIC_FLOAT
-	NULL,
-	#endif
-#	ifdef OPT_GENERIC
-	NULL,
-#	endif
-#	ifdef OPT_GENERIC_DITHER
-	NULL,
-#	endif
-	NULL
-};
-#endif
-
-static const char *mpg123_decoder_list[] =
-{
-	#ifdef OPT_SSE
-	dn_SSE,
-	#endif
-	#ifdef OPT_3DNOWEXT
-	dn_3DNowExt,
-	#endif
-	#ifdef OPT_3DNOW
-	dn_3DNow,
-	#endif
-	#ifdef OPT_MMX
-	dn_MMX,
-	#endif
-	#ifdef OPT_I586
-	dn_i586,
-	#endif
-	#ifdef OPT_I586_DITHER
-	dn_i586_dither,
-	#endif
-	#ifdef OPT_I486
-	dn_i486,
-	#endif
-	#ifdef OPT_I386
-	dn_i386,
-	#endif
-	#ifdef OPT_ALTIVEC
-	dn_AltiVec,
-	#endif
-	#ifdef OPT_X86_64
-	dn_x86_64,
-	#endif
-	#ifdef OPT_ARM
-	dn_ARM,
-	#endif
-	#ifdef OPT_NEON
-	dn_NEON,
-	#endif
-	#ifdef OPT_GENERIC
-	dn_generic,
-	#endif
-	#ifdef OPT_GENERIC_DITHER
-	dn_generic_dither,
-	#endif
-	NULL
-};
-
-void check_decoders(void )
-{
-#ifndef OPT_MULTI
-	/* In non-multi mode, only the full list (one entry) is used. */
-	return;
-#else
-	const char **d = mpg123_supported_decoder_list;
-#ifdef OPT_X86
-	getcpuflags(&cpu_flags);
-	if(cpu_i586(cpu_flags))
-	{
-		/* not yet: if(cpu_sse2(cpu_flags)) printf(" SSE2");
-		if(cpu_sse3(cpu_flags)) printf(" SSE3"); */
-#ifdef OPT_SSE
-		if(cpu_sse(cpu_flags)) *(d++) = decname[sse];
-#endif
-#ifdef OPT_3DNOWEXT
-		if(cpu_3dnowext(cpu_flags)) *(d++) = decname[dreidnowext];
-#endif
-#ifdef OPT_3DNOW
-		if(cpu_3dnow(cpu_flags)) *(d++) = decname[dreidnow];
-#endif
-#ifdef OPT_MMX
-		if(cpu_mmx(cpu_flags)) *(d++) = decname[mmx];
-#endif
-#ifdef OPT_I586
-		*(d++) = decname[ifuenf];
-#endif
-#ifdef OPT_I586_DITHER
-		*(d++) = decname[ifuenf_dither];
-#endif
-	}
-#endif
-/* just assume that the i486 built is run on a i486 cpu... */
-#ifdef OPT_I486
-	*(d++) = decname[ivier];
-#endif
-#ifdef OPT_ALTIVEC
-	*(d++) = decname[altivec];
-#endif
-/* every supported x86 can do i386, any cpu can do generic */
-#ifdef OPT_I386
-	*(d++) = decname[idrei];
-#endif
-#ifdef OPT_X86_64
-	*(d++) = decname[x86_64];
-#endif
-#ifdef OPT_ARM
-	*(d++) = decname[arm];
-#endif
-#ifdef OPT_NEON
-	*(d++) = decname[neon];
-#endif
-#ifdef OPT_GENERIC
-	*(d++) = decname[generic];
-#endif
-#ifdef OPT_GENERIC_DITHER
-	*(d++) = decname[generic_dither];
-#endif
-#endif /* ndef OPT_MULTI */
-}
-
-const char* attribute_align_arg mpg123_current_decoder(mpg123_handle *mh)
-{
-	if(mh == NULL) return NULL;
-
-	return decname[mh->cpu_opts.type];
-}
-
-const char attribute_align_arg **mpg123_decoders(void){ return mpg123_decoder_list; }
-const char attribute_align_arg **mpg123_supported_decoders(void)
-{
-#ifdef OPT_MULTI
-	return mpg123_supported_decoder_list;
-#else
-	return mpg123_decoder_list;
-#endif
-}

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/optimize.h Deleted

@@ -1,219 +0,0 @@
-#ifndef MPG123_H_OPTIMIZE
-#define MPG123_H_OPTIMIZE
-/*
-	optimize: get a grip on the different optimizations
-
-	copyright 2007 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis, taking from mpg123.[hc]
-
-	for building mpg123 with one optimization only, you have to choose exclusively between
-	OPT_GENERIC (generic C code for everyone)
-	OPT_GENERIC_DITHER (same with dithering for 1to1)
-	OPT_I386 (Intel i386)
-	OPT_I486 (Somewhat special code for i486; does not work together with others.)
-	OPT_I586 (Intel Pentium)
-	OPT_I586_DITHER (Intel Pentium with dithering/noise shaping for enhanced quality)
-	OPT_MMX (Intel Pentium and compatibles with MMX, fast, but not the best accuracy)
-	OPT_3DNOW (AMD 3DNow!, K6-2/3, Athlon, compatibles...)
-	OPT_3DNOWEXT (AMD 3DNow! extended, generally Athlon, compatibles...)
-	OPT_ALTIVEC (Motorola/IBM PPC with AltiVec under MacOSX)
-	OPT_X86_64 (x86-64 / AMD64 / Intel 64)
-
-	or you define OPT_MULTI and give a combination which makes sense (do not include i486, do not mix altivec and x86).
-
-	I still have to examine the dynamics of this here together with REAL_IS_FIXED.
-	Basic point is: Don't use REAL_IS_FIXED with something else than generic or i386.
-
-	Also, one should minimize code size by really ensuring that only functions that are really needed are included.
-	Currently, all generic functions will be always there (to be safe for fallbacks for advanced decoders).
-	Strictly, at least the synth_1to1 should not be necessary for single-decoder mode.
-*/
-
-
-/* Runtime optimization interface now here: */
-
-enum optdec
-{ /* autodec needs to be =0 and the first, nodec needs to be the last -- for loops! */
-	autodec=0, generic, generic_dither, idrei,
-	ivier, ifuenf, ifuenf_dither, mmx,
-	dreidnow, dreidnowext, altivec, sse, x86_64, arm, neon,
-	nodec
-};
-enum optcla { nocla=0, normal, mmxsse };
-
-/*  - Set up the table of synth functions for current decoder choice. */
-int frame_cpu_opt(mpg123_handle *fr, const char* cpu);
-/*  - Choose, from the synth table, the synth functions to use for current output format/rate. */
-int set_synth_functions(mpg123_handle *fr);
-/*  - Parse decoder name and return numerical code. */
-enum optdec dectype(const char* decoder);
-/*  - Return the default decoder type. */
-enum optdec defdec(void);
-/*  - Return the class of a decoder type (mmxsse or normal). */
-enum optcla decclass(const enum optdec);
-
-/* Now comes a whole lot of definitions, for multi decoder mode and single decoder mode.
-   Because of the latter, it may look redundant at times. */
-
-/* this is included in mpg123.h, which includes config.h */
-#ifdef CCALIGN
-#define ALIGNED(a) __attribute__((aligned(a)))
-#else
-#define ALIGNED(a)
-#endif
-
-/* Safety catch for invalid decoder choice. */
-#ifdef REAL_IS_FIXED
-#if (defined OPT_I486)  || (defined OPT_I586) || (defined OPT_I586_DITHER) \
- || (defined OPT_MMX)   || (defined OPT_SSE)  || (defined_OPT_ALTIVEC) \
- || (defined OPT_3DNOW) || (defined OPT_3DNOWEXT) || (defined OPT_X86_64) \
- || (defined OPT_NEON) || (defined OPT_GENERIC_DITHER)
-#error "Bad decoder choice together with fixed point math!"
-#endif
-#endif
-
-#if (defined NO_LAYER1 && defined NO_LAYER2)
-#define NO_LAYER12
-#endif
-
-#ifdef OPT_GENERIC
-#ifndef OPT_MULTI
-#	define defopt generic
-#endif
-#endif
-
-#ifdef OPT_GENERIC_DITHER
-#define OPT_DITHER
-#ifndef OPT_MULTI
-#	define defopt generic_dither
-#endif
-#endif
-
-/* i486 is special... always alone! */
-#ifdef OPT_I486
-#define OPT_X86
-#define defopt ivier
-#ifdef OPT_MULTI
-#error "i486 can only work alone!"
-#endif
-#define FIR_BUFFER_SIZE  128
-#define FIR_SIZE 16
-#endif
-
-#ifdef OPT_I386
-#define OPT_X86
-#ifndef OPT_MULTI
-#	define defopt idrei
-#endif
-#endif
-
-#ifdef OPT_I586
-#define OPT_X86
-#ifndef OPT_MULTI
-#	define defopt ifuenf
-#endif
-#endif
-
-#ifdef OPT_I586_DITHER
-#define OPT_X86
-#define OPT_DITHER
-#ifndef OPT_MULTI
-#	define defopt ifuenf_dither
-#endif
-#endif
-
-/* We still have some special code around MMX tables. */
-
-#ifdef OPT_MMX
-#define OPT_MMXORSSE
-#define OPT_X86
-#ifndef OPT_MULTI
-#	define defopt mmx
-#endif
-#endif
-
-#ifdef OPT_SSE
-#define OPT_MMXORSSE
-#define OPT_MPLAYER
-#define OPT_X86
-#ifndef OPT_MULTI
-#	define defopt sse
-#endif
-#endif
-
-#ifdef OPT_3DNOWEXT
-#define OPT_MMXORSSE
-#define OPT_MPLAYER
-#define OPT_X86
-#ifndef OPT_MULTI
-#	define defopt dreidnowext
-#	define opt_dct36(fr) dct36_3dnowext
-#endif
-#endif
-
-#ifdef OPT_MPLAYER
-extern const int costab_mmxsse[];
-#endif
-
-/* 3dnow used to use synth_1to1_i586 for mono / 8bit conversion - was that intentional? */
-/* I'm trying to skip the pentium code here ... until I see that that is indeed a bad idea */
-#ifdef OPT_3DNOW
-#define OPT_X86
-#ifndef OPT_MULTI
-#	define defopt dreidnow
-#	define opt_dct36(fr) dct36_3dnow
-#endif
-#endif
-
-#ifdef OPT_ALTIVEC
-#ifndef OPT_MULTI
-#	define defopt altivec
-#endif
-#endif
-
-#ifdef OPT_X86_64
-#define OPT_MMXORSSE
-#ifndef OPT_MULTI
-#	define defopt x86_64
-#endif
-#endif
-
-#ifdef OPT_ARM
-#ifndef OPT_MULTI
-#	define defopt arm
-#endif
-#endif
-
-#ifdef OPT_NEON
-#define OPT_MMXORSSE
-#ifndef OPT_MULTI
-#	define defopt neon
-#endif
-#endif
-
-/* used for multi opt mode and the single 3dnow mode to have the old 3dnow test flag still working */
-void check_decoders(void);
-
-/*
-	Now come two blocks of standard definitions for multi-decoder mode and single-decoder mode.
-	Most stuff is so automatic that it's indeed generated by some inline shell script.
-	Remember to use these scripts when possible, instead of direct repetitive hacking.
-*/
-
-#ifdef OPT_MULTI
-
-#	define defopt nodec
-
-#	if (defined OPT_3DNOW || defined OPT_3DNOWEXT)
-#		define opt_dct36(fr) ((fr)->cpu_opts.the_dct36)
-#	endif
-
-#endif /* OPT_MULTI else */
-
-#	ifndef opt_dct36
-#		define opt_dct36(fr) dct36
-#	endif
-
-#endif /* MPG123_H_OPTIMIZE */
-

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/parse.c Deleted

@@ -1,1154 +0,0 @@
-/*
-	parse: spawned from common; clustering around stream/frame parsing
-
-	copyright ?-2009 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp & Thomas Orgis
-*/
-
-#include "mpg123lib_intern.h"
-
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "getbits.h"
-
-#if defined (WANT_WIN32_SOCKETS)
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-
-/* a limit for number of frames in a track; beyond that unsigned long may not be enough to hold byte addresses */
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#ifndef ULONG_MAX
-/* hm, is this portable across preprocessors? */
-#define ULONG_MAX ((unsigned long)-1)
-#endif
-#define TRACK_MAX_FRAMES ULONG_MAX/4/1152
-
-#include "debug.h"
-
-#define bsbufid(fr) (fr)->bsbuf==(fr)->bsspace[0] ? 0 : ((fr)->bsbuf==fr->bsspace[1] ? 1 : ( (fr)->bsbuf==(fr)->bsspace[0]+512 ? 2 : ((fr)->bsbuf==fr->bsspace[1]+512 ? 3 : -1) ) )
-
-/*
-	AAAAAAAA AAABBCCD EEEEFFGH IIJJKLMM
-	A: sync
-	B: mpeg version
-	C: layer
-	D: CRC
-	E: bitrate
-	F: sampling rate
-	G: padding
-	H: private
-	I: channel mode
-	J: mode ext
-	K: copyright
-	L: original
-	M: emphasis
-
-	old compare mask 0xfffffd00:
-	11111111 11111111 11111101 00000000
-
-	means: everything must match excluding padding and channel mode, ext mode, ...
-	But a vbr stream's headers will differ in bitrate!
-	We are already strict in allowing only frames of same type in stream, we should at least watch out for VBR while being strict.
-
-	So a better mask is:
-	11111111 11111111 00001101 00000000
-
-	Even more, I'll allow varying crc bit.
-	11111111 11111110 00001101 00000000
-
-	Still unsure about this private bit... well, as Marcel pointed out:
-	The decoder should not care about this.
-	11111111 11111110 00001100 00000000
-*/
-#define HDRCMPMASK 0xfffe0c00
-/*
-	This needs cleanup ... The parser is not as strict as documented above.
-	Here comes a mask that checks for anything that can change sampling rate.
-	This includes change of MPEG version and frequency bits.
-	00011000 00001100 00000000, BB and FF bits */
-#define HDRSAMPMASK 0x180c00
-
-/* bitrates for [mpeg1/2][layer] */
-static const int tabsel_123[2][3][16] =
-{
-	{
-		{0,32,64,96,128,160,192,224,256,288,320,352,384,416,448,},
-		{0,32,48,56, 64, 80, 96,112,128,160,192,224,256,320,384,},
-		{0,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,}
-	},
-	{
-		{0,32,48,56,64,80,96,112,128,144,160,176,192,224,256,},
-		{0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,},
-		{0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,}
-	}
-};
-
-static const long freqs[9] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 , 12000 , 8000 };
-
-static int decode_header(mpg123_handle *fr,unsigned long newhead);
-
-/* These two are to be replaced by one function that gives all the frame parameters (for outsiders).*/
-/* Those functions are unsafe regarding bad arguments (inside the mpg123_handle), but just returning anything would also be unsafe, the caller code has to be trusted. */
-
-int frame_bitrate(mpg123_handle *fr)
-{
-	return tabsel_123[fr->lsf][fr->lay-1][fr->bitrate_index];
-}
-
-long frame_freq(mpg123_handle *fr)
-{
-	return freqs[fr->sampling_frequency];
-}
-
-#define free_format_header(head) ( ((head & 0xffe00000) == 0xffe00000) && ((head>>17)&3) && (((head>>12)&0xf) == 0x0) && (((head>>10)&0x3) != 0x3 ))
-
-/* compiler is smart enought to inline this one or should I really do it as macro...? */
-static int head_check(unsigned long head)
-{
-	if
-	(
-		/* first 11 bits are set to 1 for frame sync */
-		((head & 0xffe00000) != 0xffe00000)
-		||
-		/* layer: 01,10,11 is 1,2,3; 00 is reserved */
-		(!((head>>17)&3))
-		||
-		/* 1111 means bad bitrate */
-		(((head>>12)&0xf) == 0xf)
-		||
-		/* sampling freq: 11 is reserved */
-		(((head>>10)&0x3) == 0x3 )
-		/* here used to be a mpeg 2.5 check... re-enabled 2.5 decoding due to lack of evidence that it is really not good */
-	)
-	{
-		return FALSE;
-	}
-	/* if no check failed, the header is valid (hopefully)*/
-	else
-	{
-		return TRUE;
-	}
-}
-
-static int check_lame_tag(mpg123_handle *fr)
-{
-	/*
-		going to look for Xing or Info at some position after the header
-		 MPEG 1 MPEG 2/2.5 (LSF)
-		Stereo, Joint Stereo, Dual Channel 32 17
-		Mono 17 9
-
-		Also, how to avoid false positives? I guess I should interpret more of the header to rule that out(?).
-		I hope that ensuring all zeros until tag start is enough.
-	*/
-	int lame_offset = (fr->stereo == 2) ? (fr->lsf ? 17 : 32 ) : (fr->lsf ? 9 : 17);
-	/* At least skip the decoder delay. */
-#ifdef GAPLESS
-	if(fr->p.flags & MPG123_GAPLESS)
-	{
-		if(fr->begin_s == 0) frame_gapless_init(fr, GAPLESS_DELAY, 0);
-	}
-#endif
-
-	if(fr->framesize >= 120+lame_offset) /* traditional Xing header is 120 bytes */
-	{
-		int i;
-		int lame_type = 0;
-		debug("do we have lame tag?");
-		/* only search for tag when all zero before it (apart from checksum) */
-		for(i=2; i < lame_offset; ++i) if(fr->bsbuf[i] != 0) break;
-		if(i == lame_offset)
-		{
-			debug("possibly...");
-			if
-			(
-					 (fr->bsbuf[lame_offset] == 'I')
-				&& (fr->bsbuf[lame_offset+1] == 'n')
-				&& (fr->bsbuf[lame_offset+2] == 'f')
-				&& (fr->bsbuf[lame_offset+3] == 'o')
-			)
-			{
-				lame_type = 1; /* We still have to see what there is */
-			}
-			else if
-			(
-					 (fr->bsbuf[lame_offset] == 'X')
-				&& (fr->bsbuf[lame_offset+1] == 'i')
-				&& (fr->bsbuf[lame_offset+2] == 'n')
-				&& (fr->bsbuf[lame_offset+3] == 'g')
-			)
-			{
-				lame_type = 2;
-				fr->vbr = MPG123_VBR; /* Xing header means always VBR */
-			}
-			if(lame_type)
-			{
-				unsigned long xing_flags;
-
-				/* we have one of these headers... */
-				if(VERBOSE2) fprintf(stderr, "Note: Xing/Lame/Info header detected\n");
-				/* now interpret the Xing part, I have 120 bytes total for sure */
-				/* there are 4 bytes for flags, but only the last byte contains known ones */
-				lame_offset += 4; /* now first byte after Xing/Name */
-				/* 4 bytes dword for flags */
-				#define make_long(a, o) ((((unsigned long) a[o]) << 24) | (((unsigned long) a[o+1]) << 16) | (((unsigned long) a[o+2]) << 8) | ((unsigned long) a[o+3]))
-				/* 16 bit */
-				#define make_short(a,o) ((((unsigned short) a[o]) << 8) | ((unsigned short) a[o+1]))
-				xing_flags = make_long(fr->bsbuf, lame_offset);
-				lame_offset += 4;
-				debug1("Xing: flags 0x%08lx", xing_flags);
-				if(xing_flags & 1) /* frames */
-				{
-					if(fr->p.flags & MPG123_IGNORE_STREAMLENGTH)
-					{
-						if(VERBOSE3)
-						fprintf(stderr, "Note: Ignoring Xing frames because of MPG123_IGNORE_STREAMLENGTH\n");
-					}
-					else
-					{
-						/*
-							In theory, one should use that value for skipping...
-							When I know the exact number of samples I could simply count in flush_output,
-							but that's problematic with seeking and such.
-							I still miss the real solution for detecting the end.
-						*/
-						fr->track_frames = (off_t) make_long(fr->bsbuf, lame_offset);
-						if(fr->track_frames > TRACK_MAX_FRAMES) fr->track_frames = 0; /* endless stream? */
-						#ifdef GAPLESS
-						/* if no further info there, remove/add at least the decoder delay */
-						if(fr->p.flags & MPG123_GAPLESS)
-						{
-							off_t length = fr->track_frames * spf(fr);
-							if(length > 1)
-							frame_gapless_init(fr, GAPLESS_DELAY, length+GAPLESS_DELAY);
-						}
-						#endif
-						if(VERBOSE3) fprintf(stderr, "Note: Xing: %lu frames\n", (long unsigned)fr->track_frames);
-					}
-
-					lame_offset += 4;
-				}
-				if(xing_flags & 0x2) /* bytes */
-				{
-					if(fr->p.flags & MPG123_IGNORE_STREAMLENGTH)
-					{
-						if(VERBOSE3)
-						fprintf(stderr, "Note: Ignoring Xing bytes because of MPG123_IGNORE_STREAMLENGTH\n");
-					}
-					else
-					{
-						unsigned long xing_bytes = make_long(fr->bsbuf, lame_offset);					/* We assume that this is the _total_ size of the file, including Xing frame ... and ID3 frames...
-						 It's not that clearly documented... */
-						if(fr->rdat.filelen < 1)
-						fr->rdat.filelen = (off_t) xing_bytes; /* One could start caring for overflow here. */
-						else
-						{
-							if((off_t) xing_bytes != fr->rdat.filelen && NOQUIET)
-							{
-								double diff = 1.0/fr->rdat.filelen * (fr->rdat.filelen - (off_t)xing_bytes);
-								if(diff < 0.) diff = -diff;
-
-								if(VERBOSE3)
-								fprintf(stderr, "Note: Xing stream size %lu differs by %f%% from determined/given file size!\n", xing_bytes, diff);
-
-								if(diff > 1.)
-								fprintf(stderr, "Warning: Xing stream size off by more than 1%%, fuzzy seeking may be even more fuzzy than by design!\n");
-							}
-						}
-
-						if(VERBOSE3)
-						fprintf(stderr, "Note: Xing: %lu bytes\n", (long unsigned)xing_bytes);
-					}
-
-					lame_offset += 4;
-				}
-				if(xing_flags & 0x4) /* TOC */
-				{
-					frame_fill_toc(fr, fr->bsbuf+lame_offset);
-					lame_offset += 100; /* just skip */
-				}
-				if(xing_flags & 0x8) /* VBR quality */
-				{
-					if(VERBOSE3)
-					{
-						unsigned long xing_quality = make_long(fr->bsbuf, lame_offset);
-						fprintf(stderr, "Note: Xing: quality = %lu\n", (long unsigned)xing_quality);
-					}
-					lame_offset += 4;
-				}
-				/* I guess that either 0 or LAME extra data follows */
-				/* there may this crc16 be floating around... (?) */
-				if(fr->bsbuf[lame_offset] != 0)
-				{
-					unsigned char lame_vbr;
-					float replay_gain[2] = {0,0};
-					float peak = 0;
-					/* float gain_offset = 0; */ /* going to be +6 for old lame that used 83dB */
-					char nb[10];
-					memcpy(nb, fr->bsbuf+lame_offset, 9);
-					nb[9] = 0;
-					if(VERBOSE3) fprintf(stderr, "Note: Info: Encoder: %s\n", nb);
-					if(!strncmp("LAME", nb, 4))
-					{
-						/* gain_offset = 6; */
-						debug("TODO: finish lame detetcion...");
-					}
-					lame_offset += 9;
-					/* the 4 big bits are tag revision, the small bits vbr method */
-					lame_vbr = fr->bsbuf[lame_offset] & 15;
-					if(VERBOSE3)
-					{
-						fprintf(stderr, "Note: Info: rev %u\n", fr->bsbuf[lame_offset] >> 4);
-						fprintf(stderr, "Note: Info: vbr mode %u\n", lame_vbr);
-					}
-					lame_offset += 1;
-					switch(lame_vbr)
-					{
-						/* from rev1 proposal... not sure if all good in practice */
-						case 1:
-						case 8: fr->vbr = MPG123_CBR; break;
-						case 2:
-						case 9: fr->vbr = MPG123_ABR; break;
-						default: fr->vbr = MPG123_VBR; /* 00==unknown is taken as VBR */
-					}
-					/* skipping: lowpass filter value */
-					lame_offset += 1;
-					/* replaygain */
-					/* 32bit float: peak amplitude -- why did I parse it as int before??*/
-					/* Ah, yes, lame seems to store it as int since some day in 2003; I've only seen zeros anyway until now, bah! */
-					if
-					(
-							 (fr->bsbuf[lame_offset] != 0)
-						|| (fr->bsbuf[lame_offset+1] != 0)
-						|| (fr->bsbuf[lame_offset+2] != 0)
-						|| (fr->bsbuf[lame_offset+3] != 0)
-					)
-					{
-						debug("Wow! Is there _really_ a non-zero peak value? Now is it stored as float or int - how should I know?");
-						/* byte*peak_bytes = (byte*) &peak;
-						... endianess ... just copy bytes to avoid floating point operation on unaligned memory?
-						peak_bytes[0] = ...
-						peak = *(float*) (fr->bsbuf+lame_offset); */
-					}
-					if(VERBOSE3) fprintf(stderr, "Note: Info: peak = %f (I won't use this)\n", peak);
-					peak = 0; /* until better times arrived */
-					lame_offset += 4;
-					/*
-						ReplayGain values - lame only writes radio mode gain...
-						16bit gain, 3 bits name, 3 bits originator, sign (1=-, 0=+), dB value*10 in 9 bits (fixed point)
-						ignore the setting if name or originator == 000!
-						radio 0 0 1 0 1 1 1 0 0 1 1 1 1 1 0 1
-						audiophile 0 1 0 0 1 0 0 0 0 0 0 1 0 1 0 0
-					*/
-
-					for(i =0; i < 2; ++i)
-					{
-						unsigned char origin = (fr->bsbuf[lame_offset] >> 2) & 0x7; /* the 3 bits after that... */
-						if(origin != 0)
-						{
-							unsigned char gt = fr->bsbuf[lame_offset] >> 5; /* only first 3 bits */
-							if(gt == 1) gt = 0; /* radio */
-							else if(gt == 2) gt = 1; /* audiophile */
-							else continue;
-							/* get the 9 bits into a number, divide by 10, multiply sign... happy bit banging */
-							replay_gain[0] = (float) ((fr->bsbuf[lame_offset] & 0x2) ? -0.1 : 0.1) * (make_short(fr->bsbuf, lame_offset) & 0x1f);
-						}
-						lame_offset += 2;
-					}
-					if(VERBOSE3) 
-					{
-						fprintf(stderr, "Note: Info: Radio Gain = %03.1fdB\n", replay_gain[0]);
-						fprintf(stderr, "Note: Info: Audiophile Gain = %03.1fdB\n", replay_gain[1]);
-					}
-					for(i=0; i < 2; ++i)
-					{
-						if(fr->rva.level[i] <= 0)
-						{
-							fr->rva.peak[i] = 0; /* at some time the parsed peak should be used */
-							fr->rva.gain[i] = replay_gain[i];
-							fr->rva.level[i] = 0;
-						}
-					}
-					lame_offset += 1; /* skipping encoding flags byte */
-					if(fr->vbr == MPG123_ABR)
-					{
-						fr->abr_rate = fr->bsbuf[lame_offset];
-						if(VERBOSE3) fprintf(stderr, "Note: Info: ABR rate = %u\n", fr->abr_rate);
-					}
-					lame_offset += 1;
-					/* encoder delay and padding, two 12 bit values... lame does write them from int ...*/
-					if(VERBOSE3)
-					fprintf(stderr, "Note: Encoder delay = %i; padding = %i\n",
-					 ((((int) fr->bsbuf[lame_offset]) << 4) | (((int) fr->bsbuf[lame_offset+1]) >> 4)),
-					 (((((int) fr->bsbuf[lame_offset+1]) << 8) | (((int) fr->bsbuf[lame_offset+2]))) & 0xfff) );
-					#ifdef GAPLESS
-					if(fr->p.flags & MPG123_GAPLESS)
-					{
-						off_t length = fr->track_frames * spf(fr);
-						off_t skipbegin = GAPLESS_DELAY + ((((int) fr->bsbuf[lame_offset]) << 4) | (((int) fr->bsbuf[lame_offset+1]) >> 4));
-						off_t skipend = -GAPLESS_DELAY + (((((int) fr->bsbuf[lame_offset+1]) << 8) | (((int) fr->bsbuf[lame_offset+2]))) & 0xfff);
-						debug3("preparing gapless mode for layer3: length %lu, skipbegin %lu, skipend %lu", 
-								(long unsigned)length, (long unsigned)skipbegin, (long unsigned)skipend);
-						if(length > 1)
-						frame_gapless_init(fr, skipbegin, (skipend < length) ? length-skipend : length);
-					}
-					#endif
-				}
-				/* switch buffer back ... */
-				fr->bsbuf = fr->bsspace[fr->bsnum]+512;
-				fr->bsnum = (fr->bsnum + 1) & 1;
-				return 1; /* got it! */
-			}
-		}
-	}
-	return 0; /* no lame tag */
-}
-
-/* Just tell if the header is some mono. */
-static int header_mono(unsigned long newhead)
-{
-	return ((newhead>>6)&0x3) == MPG_MD_MONO ? TRUE : FALSE;
-}
-
-/*
-	That's a big one: read the next frame. 1 is success, <= 0 is some error
-	Special error READER_MORE means: Please feed more data and try again.
-*/
-int read_frame(mpg123_handle *fr)
-{
-	/* TODO: rework this thing */
-	unsigned long newhead;
-	off_t framepos;
-	int ret;
-	/* stuff that needs resetting if complete frame reading fails */
-	int oldsize = fr->framesize;
-	int oldphase = fr->halfphase;
-
-	/* The counter for the search-first-header loop.
-	 It is persistent outside the loop to prevent seemingly endless loops
-	 when repeatedly headers are found that do not have valid followup headers. */
-	int headcount = 0;
-
-	fr->fsizeold=fr->framesize; /* for Layer3 */
-
-	/* Speed-down hack: Play it again, Sam (the frame, I mean). */
-	if (fr->p.halfspeed) 
-	{
-		if(fr->halfphase) /* repeat last frame */
-		{
-			debug("repeat!");
-			fr->to_decode = fr->to_ignore = TRUE;
-			--fr->halfphase;
-			fr->bitindex = 0;
-			fr->wordpointer = (unsigned char *) fr->bsbuf;
-			if(fr->lay == 3) memcpy (fr->bsbuf, fr->ssave, fr->ssize);
-			if(fr->error_protection) fr->crc = getbits(fr, 16); /* skip crc */
-			return 1;
-		}
-		else
-		{
-			fr->halfphase = fr->p.halfspeed - 1;
-		}
-	}
-
-read_again:
-	/* In case we are looping to find a valid frame, discard any buffered data before the current position.
-	 This is essential to prevent endless looping, always going back to the beginning when feeder buffer is exhausted. */
-	if(fr->rd->forget != NULL) fr->rd->forget(fr);
-
-	debug2("trying to get frame %"OFF_P" at %"OFF_P, (off_p)fr->num+1, (off_p)fr->rd->tell(fr));
-	if((ret = fr->rd->head_read(fr,&newhead)) <= 0){ debug("need more?"); goto read_frame_bad;}
-
-init_resync:
-
-	fr->header_change = 2; /* output format change is possible... */
-	if(fr->oldhead) /* check a following header for change */
-	{
-		if(fr->oldhead == newhead) fr->header_change = 0;
-		else
-		/* If they have the same sample rate. Note that only is _not_ the case for the first header, as we enforce sample rate match for following frames.
-			 So, during one stream, only change of stereoness is possible and indicated by header_change == 2. */
-		if((fr->oldhead & HDRSAMPMASK) == (newhead & HDRSAMPMASK))
-		{
-			/* Now if both channel modes are mono or both stereo, it's no big deal. */
-			if( header_mono(fr->oldhead) == header_mono(newhead))
-			fr->header_change = 1;
-		}
-	}
-
-#ifdef SKIP_JUNK
-	/* watch out for junk/tags on beginning of stream by invalid header */
-	if(!fr->firsthead && !head_check(newhead)) {
-
-		/* check for id3v2; first three bytes (of 4) are "ID3" */
-		if((newhead & (unsigned long) 0xffffff00) == (unsigned long) 0x49443300)
-		{
-			int id3ret = 0;
-			id3ret = parse_new_id3(fr, newhead);
-			if (id3ret < 0){ debug("need more?"); ret = id3ret; goto read_frame_bad; }
-#ifndef NO_ID3V2
-			else if(id3ret > 0){ debug("got ID3v2"); fr->metaflags |= MPG123_NEW_ID3|MPG123_ID3; }
-			else debug("no useful ID3v2");
-#endif
-
-			fr->oldhead = 0;
-			goto read_again; /* Also in case of invalid ID3 tag (ret==0), try to get on track again. */
-		}
-		else if(VERBOSE2 && fr->silent_resync == 0) fprintf(stderr,"Note: Junk at the beginning (0x%08lx)\n",newhead);
-
-		/* I even saw RIFF headers at the beginning of MPEG streams ;( */
-		if(newhead == ('R'<<24)+('I'<<16)+('F'<<8)+'F') {
-			if(VERBOSE2 && fr->silent_resync == 0) fprintf(stderr, "Note: Looks like a RIFF header.\n");
-
-			if((ret=fr->rd->head_read(fr,&newhead))<=0){ debug("need more?"); goto read_frame_bad; }
-
-			while(newhead != ('d'<<24)+('a'<<16)+('t'<<8)+'a')
-			{
-				if((ret=fr->rd->head_shift(fr,&newhead))<=0){ debug("need more?"); goto read_frame_bad; }
-			}
-			if((ret=fr->rd->head_read(fr,&newhead))<=0){ debug("need more?"); goto read_frame_bad; }
-
-			if(VERBOSE2 && fr->silent_resync == 0) fprintf(stderr,"Note: Skipped RIFF header!\n");
-
-			fr->oldhead = 0;
-			goto read_again;
-		}
-		/* unhandled junk... just continue search for a header */
-		/* step in byte steps through next 64K */
-		debug("searching for header...");
-
-		ret = 0; /* We will check the value after the loop. */
-		for(; headcount<65536; headcount++)
-		{
-			if((ret=fr->rd->head_shift(fr,&newhead))<=0){ debug("need more?"); goto read_frame_bad; }
-			/* if(head_check(newhead)) */
-			if(head_check(newhead) && (ret=decode_header(fr, newhead)))
-				break;
-		}
-		if(ret<0){ debug("need more?"); goto read_frame_bad; }
-
-		if(headcount == 65536)
-		{
-			if(NOQUIET) error("Giving up searching valid MPEG header after (over) 64K of junk.");
-			return 0;
-		}
-		else debug1("hopefully found one at %"OFF_P, (off_p)fr->rd->tell(fr));
-		/* 
-		 * should we additionaly check, whether a new frame starts at
-		 * the next expected position? (some kind of read ahead)
-		 * We could implement this easily, at least for files.
-		 */
-	}
-#endif
-
-	/* first attempt of read ahead check to find the real first header; cannot believe what junk is out there! */
-	if(!fr->firsthead && fr->rdat.flags & (READER_SEEKABLE|READER_BUFFERED) && head_check(newhead) && (ret=decode_header(fr, newhead)))
-	{
-		unsigned long nexthead = 0;
-		int hd = 0;
-		off_t start = fr->rd->tell(fr);
-		if(ret<0){ debug("need more?"); goto read_frame_bad; }
-
-		debug2("doing ahead check with BPF %d at %"OFF_P, fr->framesize+4, (off_p)start);
-		/* step framesize bytes forward and read next possible header*/
-		if((ret=fr->rd->skip_bytes(fr, fr->framesize))<0)
-		{
-			if(ret==READER_ERROR && NOQUIET) error("cannot seek!");
-			goto read_frame_bad;
-		}
-		hd = fr->rd->head_read(fr,&nexthead);
-		if(hd==MPG123_NEED_MORE){ debug("need more?"); ret = hd; goto read_frame_bad; }
-		if((ret=fr->rd->back_bytes(fr, fr->rd->tell(fr)-start))<0)
-		{
-			if(ret==READER_ERROR && NOQUIET) error("cannot seek!");
-			else debug("need more?"); 
-			goto read_frame_bad;
-		}
-		debug1("After fetching next header, at %"OFF_P, (off_p)fr->rd->tell(fr));
-		if(!hd)
-		{
-			if(NOQUIET) warning("cannot read next header, a one-frame stream? Duh...");
-		}
-		else
-		{
-			debug2("does next header 0x%08lx match first 0x%08lx?", nexthead, newhead);
-			/* not allowing free format yet */
-			if(!head_check(nexthead) || (nexthead & HDRCMPMASK) != (newhead & HDRCMPMASK))
-			{
-				debug("No, the header was not valid, start from beginning...");
-				fr->oldhead = 0; /* start over */
-				/* try next byte for valid header */
-				if((ret=fr->rd->back_bytes(fr, 3))<0)
-				{
-					if(NOQUIET) error("cannot seek!");
-					else debug("need more?"); 
-					goto read_frame_bad;
-				}
-				goto read_again;
-			}
-		}
-	}
-
-	/*
-		Why has this head check been avoided here before? And apart from that:
-		Tricky business: Bug 3267863 triggers endless loop because an invalid free format header does not trigger head_check(), hence does not trigger resync.
-		This whole logic is going to be reworked, code untangled, but 1.13.3 needs some minimal patching.
-		So we try to fully decode the header (which includes free format size checking), not just check.
-	*/
-	/* Check in advance to avoid premature error message in decode_header() */
-	ret = head_check(newhead);
-	if(ret)
-	{
-		ret = decode_header(fr, newhead);
-		if(ret < 0) goto read_frame_bad;
-	}
-
-	if(!ret)
-	{
-		/* and those ugly ID3 tags */
-		if((newhead & 0xffffff00) == ('T'<<24)+('A'<<16)+('G'<<8))
-		{
-			fr->id3buf[0] = (unsigned char) ((newhead >> 24) & 0xff);
-			fr->id3buf[1] = (unsigned char) ((newhead >> 16) & 0xff);
-			fr->id3buf[2] = (unsigned char) ((newhead >> 8) & 0xff);
-			fr->id3buf[3] = (unsigned char) ( newhead & 0xff);
-			if((ret=fr->rd->fullread(fr,fr->id3buf+4,124)) < 0){ debug("need more?"); goto read_frame_bad; }
-			fr->metaflags |= MPG123_NEW_ID3|MPG123_ID3;
-			fr->rdat.flags |= READER_ID3TAG; /* that marks id3v1 */
-			if (VERBOSE3) fprintf(stderr,"Note: Skipped ID3v1 tag.\n");
-			goto read_again;
-		}
-		/* duplicated code from above! */
-		/* check for id3v2; first three bytes (of 4) are "ID3" */
-		if((newhead & (unsigned long) 0xffffff00) == (unsigned long) 0x49443300)
-		{
-			int id3length = 0;
-			id3length = parse_new_id3(fr, newhead);
-			if(id3length < 0){ debug("need more?"); ret = id3length; goto read_frame_bad; }
-
-			fr->metaflags |= MPG123_NEW_ID3|MPG123_ID3;
-			goto read_again;
-		}
-		else if(NOQUIET && fr->silent_resync == 0)
-		{
-			fprintf(stderr,"Note: Illegal Audio-MPEG-Header 0x%08lx at offset %"OFF_P".\n",
-				newhead, (off_p)fr->rd->tell(fr)-4);
-		}
-
-		/* We reach this point only for invalid headers.
-		 And: All paths lead to a jump out of this block! So there is no "after". */
-
-		if(NOQUIET && (newhead & 0xffffff00) == ('b'<<24)+('m'<<16)+('p'<<8)) fprintf(stderr,"Note: Could be a BMP album art.\n");
-		/* Do resync if not forbidden by flag.
-		I used to have a check for not-icy-meta here, but concluded that the desync issues came from a reader bug, not the stream. */
-		if( !(fr->p.flags & MPG123_NO_RESYNC) )
-		{
-			long try = 0;
-			long limit = fr->p.resync_limit;
-			
-			/* If a resync is needed the bitreservoir of previous frames is no longer valid */
-			fr->bitreservoir = 0;
-
-			/* TODO: make this more robust, I'd like to cat two mp3 fragments together (in a dirty way) and still have mpg123 beign able to decode all it somehow. */
-			if(NOQUIET && fr->silent_resync == 0) fprintf(stderr, "Note: Trying to resync...\n");
-			/* Read more bytes until we find something that looks
-			 reasonably like a valid header. This is not a
-			 perfect strategy, but it should get us back on the
-			 track within a short time (and hopefully without
-			 too much distortion in the audio output). */
-			do
-			{
-				++try;
-				if(limit >= 0 && try >= limit) break;				
-
-				if((ret=fr->rd->head_shift(fr,&newhead)) <= 0)
-				{
-					debug("need more?");
-					if(NOQUIET) fprintf (stderr, "Note: Hit end of (available) data during resync.\n");
-
-					goto read_frame_bad;
-				}
-				if(VERBOSE3) debug3("resync try %li at %"OFF_P", got newhead 0x%08lx", try, (off_p)fr->rd->tell(fr), newhead);
-
-				if(!fr->oldhead)
-				{
-					debug("going to init_resync...");
-					goto init_resync; /* "considered harmful", eh? */
-				}
-				/* we should perhaps collect a list of valid headers that occured in file... there can be more */
-				/* Michael's new resync routine seems to work better with the one frame readahead (and some input buffering?) */
-			} while
-			(
-				!head_check(newhead) /* Simply check for any valid header... we have the readahead to get it straight now(?) */
-				/* (newhead & HDRCMPMASK) != (fr->oldhead & HDRCMPMASK)
-				&& (newhead & HDRCMPMASK) != (fr->firsthead & HDRCMPMASK)*/
-			);
-			/* too many false positives 
-			}while (!(head_check(newhead) && decode_header(fr, newhead))); */
-			if(NOQUIET && fr->silent_resync == 0) fprintf (stderr, "Note: Skipped %li bytes in input.\n", try);
-
-			if(limit >= 0 && try >= limit)
-			{
-				if(NOQUIET)
-				error1("Giving up resync after %li bytes - your stream is not nice... (maybe increasing resync limit could help).", try);
-
-				fr->err = MPG123_RESYNC_FAIL;
-				return READER_ERROR;
-			}
-			else
-			{
-				debug1("Found valid header 0x%lx... unsetting firsthead to reinit stream.", newhead);
-				fr->firsthead = 0;
-				goto init_resync;
-			}
-		}
-		else
-		{
-			if(NOQUIET) error("not attempting to resync...");
-
-			fr->err = MPG123_OUT_OF_SYNC;
-			return READER_ERROR;
-		}
-	}
-	/* There used to be code here ... and turned out to be totally redundant. */
-
-	/* Past this point we know the header is good and we can start reading in the actual frame. */
-
-	/* if filepos is invalid, so is framepos */
-	framepos = fr->rd->tell(fr) - 4;
-	/* flip/init buffer for Layer 3 */
-	{
-		unsigned char *newbuf = fr->bsspace[fr->bsnum]+512;
-		/* read main data into memory */
-		if((ret=fr->rd->read_frame_body(fr,newbuf,fr->framesize))<0)
-		{
-			/* if failed: flip back */
-			debug("need more?");
-			goto read_frame_bad;
-		}
-		fr->bsbufold = fr->bsbuf;
-		fr->bsbuf = newbuf;
-	}
-	fr->bsnum = (fr->bsnum + 1) & 1;
-
-	if(!fr->firsthead)
-	{
-		fr->firsthead = newhead; /* _now_ it's time to store it... the first real header */
-		/* This is the first header of our current stream segment.
-		 It is only the actual first header of the whole stream when fr->num is still below zero!
-		 Think of resyncs where firsthead has been reset for format flexibility. */
-		if(fr->num < 0)
-		{
-			fr->audio_start = framepos;
-			/* Only check for LAME tag at beginning of whole stream
-			 ... when there indeed is one in between, it's the user's problem. */
-			if(fr->lay == 3 && check_lame_tag(fr) == 1)
-			{ /* ...in practice, Xing/LAME tags are layer 3 only. */
-				if(fr->rd->forget != NULL) fr->rd->forget(fr);
-
-				fr->oldhead = 0;
-				goto read_again;
-			}
-			/* now adjust volume */
-			do_rva(fr);
-		}
-
-		debug2("fr->firsthead: %08lx, audio_start: %li", fr->firsthead, (long int)fr->audio_start);
-	}
-
- fr->bitindex = 0;
- fr->wordpointer = (unsigned char *) fr->bsbuf;
-	/* Question: How bad does the floating point value get with repeated recomputation?
-	 Also, considering that we can play the file or parts of many times. */
-	if(++fr->mean_frames != 0)
-	{
-		fr->mean_framesize = ((fr->mean_frames-1)*fr->mean_framesize+compute_bpf(fr)) / fr->mean_frames ;
-	}
-	++fr->num; /* 0 for first frame! */
-	debug4("Frame %"OFF_P" %08lx %i, next filepos=%"OFF_P, 
-	(off_p)fr->num, newhead, fr->framesize, (off_p)fr->rd->tell(fr));
-
-	/* save for repetition */
-	if(fr->p.halfspeed && fr->lay == 3)
-	{
-		debug("halfspeed - reusing old bsbuf ");
-		memcpy (fr->ssave, fr->bsbuf, fr->ssize);
-	}
-
-	/* index the position */
-#ifdef FRAME_INDEX
-	/* Keep track of true frame positions in our frame index.
-	 but only do so when we are sure that the frame number is accurate... */
-	if(fr->accurate && FI_NEXT(fr->index, fr->num))
-	fi_add(&fr->index, framepos);
-#endif
-
-	if(fr->silent_resync > 0) --fr->silent_resync;
-
-	if(fr->rd->forget != NULL) fr->rd->forget(fr);
-
-	fr->to_decode = fr->to_ignore = TRUE;
-	if(fr->error_protection) fr->crc = getbits(fr, 16); /* skip crc */
-
-	return 1;
-read_frame_bad:
-	/* Also if we searched for valid data in vain, we can forget skipped data.
-	 Otherwise, the feeder would hold every dead old byte in memory until the first valid frame! */
-	if(fr->rd->forget != NULL) fr->rd->forget(fr);
-
-	fr->silent_resync = 0;
-	if(fr->err == MPG123_OK) fr->err = MPG123_ERR_READER;
-	fr->framesize = oldsize;
-	fr->halfphase = oldphase;
-	/* That return code might be inherited from some feeder action, or reader error. */
-	return ret;
-}
-
-
-/*
- * read ahead and find the next MPEG header, to guess framesize
- * return value: success code
- * 1: found a valid frame size (stored in the handle).
- * <0: error codes, possibly from feeder buffer (NEED_MORE)
- * 0: cannot get the framesize for some reason and shall silentry try the next possible header (if this is no free format stream after all...)
- */
-static int guess_freeformat_framesize(mpg123_handle *fr)
-{
-	long i;
-	int ret;
-	unsigned long head;
-	if(!(fr->rdat.flags & (READER_SEEKABLE|READER_BUFFERED)))
-	{
-		if(NOQUIET) error("Cannot look for freeformat frame size with non-seekable and non-buffered stream!");
-
-		return 0;
-	}
-	if((ret=fr->rd->head_read(fr,&head))<=0)
-	return ret;
-
-	/* We are already 4 bytes into it */
-/* fix that limit to be absolute for the first header search! */
-	for(i=4;i<65536;i++) {
-		if((ret=fr->rd->head_shift(fr,&head))<=0)
-		{
-			return ret;
-		}
-		if(head_check(head))
-		{
-			int sampling_frequency,mpeg25,lsf;
-			
-			if(head & (1<<20))
-			{
-				lsf = (head & (1<<19)) ? 0x0 : 0x1;
-				mpeg25 = 0;
-			}
-			else
-			{
-				lsf = 1;
-				mpeg25 = 1;
-			}
-			
-			if(mpeg25)
-				sampling_frequency = 6 + ((head>>10)&0x3);
-			else
-				sampling_frequency = ((head>>10)&0x3) + (lsf*3);
-			
-			if((lsf==fr->lsf) && (mpeg25==fr->mpeg25) && (sampling_frequency == fr->sampling_frequency))
-			{
-				fr->rd->back_bytes(fr,i+1);
-				fr->framesize = i-3;
-				return 1; /* Success! */
-			}
-		}
-	}
-	fr->rd->back_bytes(fr,i);
-	return 0;
-}
-
-
-/*
- * decode a header and write the information
- * into the frame structure
- * Return values are compatible with those of read_frame, namely:
- * 1: success
- * 0: no valid header
- * <0: some error
- */
-static int decode_header(mpg123_handle *fr,unsigned long newhead)
-{
-	if(!head_check(newhead))
-	{
-		if(NOQUIET) error("tried to decode obviously invalid header");
-
-		return 0;
-	}
-	if( newhead & (1<<20) )
-	{
-		fr->lsf = (newhead & (1<<19)) ? 0x0 : 0x1;
-		fr->mpeg25 = 0;
-	}
-	else
-	{
-		fr->lsf = 1;
-		fr->mpeg25 = 1;
-	}
-
-	if( (fr->p.flags & MPG123_NO_RESYNC) || !fr->oldhead
-	 || (((fr->oldhead>>19)&0x3) ^ ((newhead>>19)&0x3)) )
-	{
-		/* If "tryresync" is false, assume that certain
-		parameters do not change within the stream!
-		Force an update if lsf or mpeg25 settings
-		have changed. */
-		fr->lay = 4-((newhead>>17)&3);
-		if( ((newhead>>10)&0x3) == 0x3)
-		{
-			if(NOQUIET) error("Stream error");
-
-			return 0; /* exit() here really is too much, isn't it? */
-		}
-		if(fr->mpeg25)
-		fr->sampling_frequency = 6 + ((newhead>>10)&0x3);
-		else
-		fr->sampling_frequency = ((newhead>>10)&0x3) + (fr->lsf*3);
-	}
-
-	#ifdef DEBUG
-	if((((newhead>>16)&0x1)^0x1) != fr->error_protection) debug("changed crc bit!");
-	#endif
-	fr->error_protection = ((newhead>>16)&0x1)^0x1; /* seen a file where this varies (old lame tag without crc, track with crc) */
-	fr->bitrate_index = ((newhead>>12)&0xf);
-	fr->padding = ((newhead>>9)&0x1);
-	fr->extension = ((newhead>>8)&0x1);
-	fr->mode = ((newhead>>6)&0x3);
-	fr->mode_ext = ((newhead>>4)&0x3);
-	fr->copyright = ((newhead>>3)&0x1);
-	fr->original = ((newhead>>2)&0x1);
-	fr->emphasis = newhead & 0x3;
-	fr->freeformat = free_format_header(newhead);
-
-	fr->stereo = (fr->mode == MPG_MD_MONO) ? 1 : 2;
-
-	fr->oldhead = newhead;
-	
-	/* we can't use tabsel_123 for freeformat, so trying to guess framesize... */
-	if(fr->freeformat)
-	{
-		/* when we first encounter the frame with freeformat, guess framesize */
-		if(fr->freeformat_framesize < 0)
-		{
-			int ret;
-			ret = guess_freeformat_framesize(fr);
-			if(ret>0)
-			{
-				fr->freeformat_framesize = fr->framesize - fr->padding;
-				if(VERBOSE2)
-				fprintf(stderr, "Note: free format frame size %li\n", fr->freeformat_framesize);
-			}
-			else
-			{
-				if(ret == MPG123_NEED_MORE)
-				debug("Need more data to guess free format frame size.");
-				else
-				error("Encountered free format header, but failed to guess frame size.");
-				return ret;
-			}
-		}
-		/* freeformat should be CBR, so the same framesize can be used at the 2nd reading or later */
-		else
-		{
-			fr->framesize = fr->freeformat_framesize + fr->padding;
-		}
-	}
-
-	switch(fr->lay)
-	{
-#ifndef NO_LAYER1
-		case 1:
-			fr->do_layer = do_layer1;
-			if(!fr->freeformat)
-			{
-				fr->framesize = (long) tabsel_123[fr->lsf][0][fr->bitrate_index] * 12000;
-				fr->framesize /= freqs[fr->sampling_frequency];
-				fr->framesize = ((fr->framesize+fr->padding)<<2)-4;
-			}
-		break;
-#endif
-#ifndef NO_LAYER2
-		case 2:
-			fr->do_layer = do_layer2;
-			if(!fr->freeformat)
-			{
-				debug2("bitrate index: %i (%i)", fr->bitrate_index, tabsel_123[fr->lsf][1][fr->bitrate_index] );
-				fr->framesize = (long) tabsel_123[fr->lsf][1][fr->bitrate_index] * 144000;
-				fr->framesize /= freqs[fr->sampling_frequency];
-				fr->framesize += fr->padding - 4;
-			}
-		break;
-#endif
-#ifndef NO_LAYER3
-		case 3:
-			fr->do_layer = do_layer3;
-			if(fr->lsf)
-			fr->ssize = (fr->stereo == 1) ? 9 : 17;
-			else
-			fr->ssize = (fr->stereo == 1) ? 17 : 32;
-
-			if(fr->error_protection)
-			fr->ssize += 2;
-
-			if(!fr->freeformat)
-			{
-				fr->framesize = (long) tabsel_123[fr->lsf][2][fr->bitrate_index] * 144000;
-				fr->framesize /= freqs[fr->sampling_frequency]<<(fr->lsf);
-				fr->framesize = fr->framesize + fr->padding - 4;
-			}
-		break;
-#endif 
-		default:
-			if(NOQUIET) error1("Layer type %i not supported in this build!", fr->lay); 
-
-			return 0;
-	}
-	if (fr->framesize > MAXFRAMESIZE)
-	{
-		if(NOQUIET) error1("Frame size too big: %d", fr->framesize+4-fr->padding);
-
-		return (0);
-	}
-	return 1;
-}
-
-void set_pointer(mpg123_handle *fr, long backstep)
-{
-	fr->wordpointer = fr->bsbuf + fr->ssize - backstep;
-	if (backstep)
-	memcpy(fr->wordpointer,fr->bsbufold+fr->fsizeold-backstep,backstep);
-
-	fr->bitindex = 0; 
-}
-
-/********************************/
-
-double compute_bpf(mpg123_handle *fr)
-{
-	double bpf;
-
-	switch(fr->lay) 
-	{
-		case 1:
-			bpf = tabsel_123[fr->lsf][0][fr->bitrate_index];
-			bpf *= 12000.0 * 4.0;
-			bpf /= freqs[fr->sampling_frequency] <<(fr->lsf);
-		break;
-		case 2:
-		case 3:
-			bpf = tabsel_123[fr->lsf][fr->lay-1][fr->bitrate_index];
-			bpf *= 144000;
-			bpf /= freqs[fr->sampling_frequency] << (fr->lsf);
-		break;
-		default:
-			bpf = 1.0;
-	}
-
-	return bpf;
-}
-
-double attribute_align_arg mpg123_tpf(mpg123_handle *fr)
-{
-	static int bs[4] = { 0,384,1152,1152 };
-	double tpf;
-	if(fr == NULL) return -1;
-
-	tpf = (double) bs[fr->lay];
-	tpf /= freqs[fr->sampling_frequency] << (fr->lsf);
-	return tpf;
-}
-
-int attribute_align_arg mpg123_position(mpg123_handle *fr, off_t no, off_t buffsize,
-	off_t *current_frame, off_t *frames_left,
-	double *current_seconds, double *seconds_left)
-{
-	double tpf;
-	double dt = 0.0;
-	off_t cur, left;
-	double curs, lefts;
-
-	if(!fr || !fr->rd) /* Isn't this too paranoid? */
-	{
-		debug("reader troubles!");
-		return MPG123_ERR;
-	}
-
-	no += fr->num; /* no starts out as offset */
-	cur = no;
-	tpf = mpg123_tpf(fr);
-	if(buffsize > 0 && fr->af.rate > 0 && fr->af.channels > 0)
-	{
-		dt = (double) buffsize / fr->af.rate / fr->af.channels;
-		if(fr->af.encoding & MPG123_ENC_16) dt *= 0.5;
-	}
-
-	left = 0;
-
-	if((fr->track_frames != 0) && (fr->track_frames >= fr->num)) left = no < fr->track_frames ? fr->track_frames - no : 0;
-	else
-	if(fr->rdat.filelen >= 0)
-	{
-		double bpf;
-		off_t t = fr->rd->tell(fr);
-		bpf = fr->mean_framesize ? fr->mean_framesize : compute_bpf(fr);
-		left = (off_t)((double)(fr->rdat.filelen-t)/bpf);
-		/* no can be different for prophetic purposes, file pointer is always associated with fr->num! */
-		if(fr->num != no)
-		{
-			if(fr->num > no) left += fr->num - no;
-			else
-			{
-				if(left >= (no - fr->num)) left -= no - fr->num;
-				else left = 0; /* uh, oh! */
-			}
-		}
-		/* I totally don't understand why we should re-estimate the given correct(?) value */
-		/* fr->num = (unsigned long)((double)t/bpf); */
-	}
-
-	/* beginning with 0 or 1?*/
-	curs = (double) no*tpf-dt;
-	lefts = (double)left*tpf+dt;
-#if 0
-	curs = curs < 0 ? 0.0 : curs;
-#endif
-	if(left < 0 || lefts < 0)
-	{ /* That is the case for non-seekable streams. */
-		left = 0;
-		lefts = 0.0;
-	}
-	if(current_frame != NULL) *current_frame = cur;
-	if(frames_left != NULL) *frames_left = left;
-	if(current_seconds != NULL) *current_seconds = curs;
-	if(seconds_left != NULL) *seconds_left = lefts;
-	return MPG123_OK;
-}
-
-int get_songlen(mpg123_handle *fr,int no)
-{
-	double tpf;
-	
-	if(!fr)
-		return 0;
-	
-	if(no < 0) {
-		if(!fr->rd || fr->rdat.filelen < 0)
-			return 0;
-		no = (int) ((double) fr->rdat.filelen / compute_bpf(fr));
-	}
-
-	tpf = mpg123_tpf(fr);
-	return (int) (no*tpf);
-}

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/parse.h Deleted

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/reader.h Deleted

@@ -1,117 +0,0 @@
-/*
-	reader: reading input data
-
-	copyright ?-2007 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis (after code from Michael Hipp)
-*/
-
-#ifndef MPG123_READER_H
-#define MPG123_READER_H
-
-#include "config.h"
-#include "mpg123.h"
-
-struct buffy
-{
-	unsigned char *data;
-	ssize_t size;
-	ssize_t realsize;
-	struct buffy *next;
-};
-
-struct bufferchain
-{
-	struct buffy* first; /* The beginning of the chain. */
-	struct buffy* last; /* The end... of the chain. */
-	ssize_t size; /* Aggregated size of all buffies. */
-	/* These positions are relative to buffer chain beginning. */
-	ssize_t pos; /* Position in whole chain. */
-	ssize_t firstpos; /* The point of return on non-forget() */
-	/* The "real" filepos is fileoff + pos. */
-	off_t fileoff; /* Beginning of chain is at this file offset. */
-};
-
-struct reader_data
-{
-	off_t filelen; /* total file length or total buffer size */
-	off_t filepos; /* position in file or position in buffer chain */
-	int filept;
-	/* Custom opaque I/O handle from the client. */
-	void *iohandle;
-	int flags;
-	long timeout_sec;
-	ssize_t (*fdread) (mpg123_handle *, void *, size_t);
-	/* User can replace the read and lseek functions. The r_* are the stored replacement functions or NULL. */
-	ssize_t (*r_read) (int fd, void *buf, size_t count);
-	off_t (*r_lseek)(int fd, off_t offset, int whence);
-	/* These are custom I/O routines for opaque user handles.
-	 They get picked if there's some iohandle set. */
-	ssize_t (*r_read_handle) (void *handle, void *buf, size_t count);
-	off_t (*r_lseek_handle)(void *handle, off_t offset, int whence);
-	/* An optional cleaner for the handle on closing the stream. */
-	void (*cleanup_handle)(void *handle);
-	/* These two pointers are the actual workers (default map to POSIX read/lseek). */
-	ssize_t (*read) (int fd, void *buf, size_t count);
-	off_t (*lseek)(int fd, off_t offset, int whence);
-	/* Buffered readers want that abstracted, set internally. */
-	ssize_t (*fullread)(mpg123_handle *, unsigned char *, ssize_t);
-	struct bufferchain buffer; /* Not dynamically allocated, these few struct bytes aren't worth the trouble. */
-};
-
-/* start to use off_t to properly do LFS in future ... used to be long */
-struct reader
-{
-	int (*init) (mpg123_handle *);
-	void (*close) (mpg123_handle *);
-	ssize_t (*fullread) (mpg123_handle *, unsigned char *, ssize_t);
-	int (*head_read) (mpg123_handle *, unsigned long *newhead); /* succ: TRUE, else <= 0 (FALSE or READER_MORE) */
-	int (*head_shift) (mpg123_handle *, unsigned long *head); /* succ: TRUE, else <= 0 (FALSE or READER_MORE) */
-	off_t (*skip_bytes) (mpg123_handle *, off_t len); /* succ: >=0, else error or READER_MORE */
-	int (*read_frame_body)(mpg123_handle *, unsigned char *, int size);
-	int (*back_bytes) (mpg123_handle *, off_t bytes);
-	int (*seek_frame) (mpg123_handle *, off_t num);
-	off_t (*tell) (mpg123_handle *);
-	void (*rewind) (mpg123_handle *);
-	void (*forget) (mpg123_handle *);
-};
-
-/* Open a file by path or use an opened file descriptor. */
-int open_stream(mpg123_handle *, const char *path, int fd);
-/* Open an external handle. */
-int open_stream_handle(mpg123_handle *, void *iohandle);
-
-/* feed based operation has some specials */
-int open_feed(mpg123_handle *);
-/* externally called function, returns 0 on success, -1 on error */
-int feed_more(mpg123_handle *fr, const unsigned char *in, long count);
-void feed_forget(mpg123_handle *fr); /* forget the data that has been read (free some buffers) */
-off_t feed_set_pos(mpg123_handle *fr, off_t pos); /* Set position (inside available data if possible), return wanted byte offset of next feed. */
-
-void open_bad(mpg123_handle *);
-
-#define READER_FD_OPENED 0x1
-#define READER_ID3TAG 0x2
-#define READER_SEEKABLE 0x4
-#define READER_BUFFERED 0x8
-#define READER_NONBLOCK 0x20
-#define READER_HANDLEIO 0x40
-
-#define READER_STREAM 0
-#define READER_ICY_STREAM 1
-#define READER_FEED 2
-/* These two add a little buffering to enable small seeks for peek ahead. */
-#define READER_BUF_STREAM 3
-#define READER_BUF_ICY_STREAM 4
-
-#ifdef READ_SYSTEM
-#define READER_SYSTEM 5
-#define READERS 6
-#else
-#define READERS 5
-#endif
-
-#define READER_ERROR MPG123_ERR
-#define READER_MORE MPG123_NEED_MORE
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/readers.c Deleted

@@ -1,1122 +0,0 @@
-/* TODO: Check all read calls (in loops, especially!) for return value 0 (EOF)! */
-
-/*
-	readers.c: reading input data
-
-	copyright ?-2008 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp
-*/
-
-#include "mpg123lib_intern.h"
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-/* For select(), I need select.h according to POSIX 2001, else: sys/time.h sys/types.h unistd.h (the latter two included in compat.h already). */
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef _MSC_VER
-#include <io.h>
-#endif
-
-#include "compat.h"
-#include "debug.h"
-
-static int default_init(mpg123_handle *fr);
-static off_t get_fileinfo(mpg123_handle *);
-static ssize_t posix_read(int fd, void *buf, size_t count){ return read(fd, buf, count); }
-static off_t posix_lseek(int fd, off_t offset, int whence){ return lseek(fd, offset, whence); }
-static off_t nix_lseek(int fd, off_t offset, int whence){ return -1; }
-
-static ssize_t plain_fullread(mpg123_handle *fr,unsigned char *buf, ssize_t count);
-
-/* Wrapper to decide between descriptor-based and external handle-based I/O. */
-static off_t io_seek(struct reader_data *rdat, off_t offset, int whence);
-static ssize_t io_read(struct reader_data *rdat, void *buf, size_t count);
-
-#ifndef NO_FEEDER
-/* Bufferchain methods. */
-static void bc_init(struct bufferchain *bc);
-static void bc_reset(struct bufferchain *bc);
-static int bc_append(struct bufferchain *bc, ssize_t size);
-#if 0
-static void bc_drop(struct bufferchain *bc);
-#endif
-static int bc_add(struct bufferchain *bc, const unsigned char *data, ssize_t size);
-static ssize_t bc_give(struct bufferchain *bc, unsigned char *out, ssize_t size);
-static ssize_t bc_skip(struct bufferchain *bc, ssize_t count);
-static ssize_t bc_seekback(struct bufferchain *bc, ssize_t count);
-static void bc_forget(struct bufferchain *bc);
-#else
-#define bc_init(a)
-#define bc_reset(a)
-#endif
-
-/* A normal read and a read with timeout. */
-static ssize_t plain_read(mpg123_handle *fr, void *buf, size_t count)
-{
-	ssize_t ret = io_read(&fr->rdat, buf, count);
-	if(VERBOSE3) debug2("read %li bytes of %li", (long)ret, (long)count);
-	return ret;
-}
-
-#ifdef TIMEOUT_READ
-
-/* Wait for data becoming available, allowing soft-broken network connection to die
- This is needed for Shoutcast servers that have forgotten about us while connection was temporarily down. */
-static ssize_t timeout_read(mpg123_handle *fr, void *buf, size_t count)
-{
-	struct timeval tv;
-	ssize_t ret = 0;
-	fd_set fds;
-	tv.tv_sec = fr->rdat.timeout_sec;
-	tv.tv_usec = 0;
-	FD_ZERO(&fds);
-	FD_SET(fr->rdat.filept, &fds);
-	ret = select(fr->rdat.filept+1, &fds, NULL, NULL, &tv);
-	/* This works only with "my" read function. Not user-replaced. */
-	if(ret > 0) ret = read(fr->rdat.filept, buf, count);
-	else
-	{
-		ret=-1; /* no activity is the error */
-		if(NOQUIET) error("stream timed out");
-	}
-	return ret;
-}
-#endif
-
-#ifndef NO_ICY
-/* stream based operation with icy meta data*/
-static ssize_t icy_fullread(mpg123_handle *fr, unsigned char *buf, ssize_t count)
-{
-	ssize_t ret,cnt;
-	cnt = 0;
-	if(fr->rdat.flags & READER_SEEKABLE)
-	{
-		if(NOQUIET) error("mpg123 programmer error: I don't do ICY on seekable streams.");
-		return -1;
-	}
-	/*
-		There used to be a check for expected file end here (length value or ID3 flag).
-		This is not needed:
-		1. EOF is indicated by fdread returning zero bytes anyway.
-		2. We get false positives of EOF for either files that grew or
-		3. ... files that have ID3v1 tags in between (stream with intro).
-	*/
-
-	while(cnt < count)
-	{
-		/* all icy code is inside this if block, everything else is the plain fullread we know */
-		/* debug1("read: %li left", (long) count-cnt); */
-		if(fr->icy.next < count-cnt)
-		{
-			unsigned char temp_buff;
-			size_t meta_size;
-			ssize_t cut_pos;
-
-			/* we are near icy-metaint boundary, read up to the boundary */
-			if(fr->icy.next > 0)
-			{
-				cut_pos = fr->icy.next;
-				ret = fr->rdat.fdread(fr,buf+cnt,cut_pos);
-				if(ret < 1)
-				{
-					if(ret == 0) break; /* Just EOF. */
-					if(NOQUIET) error("icy boundary read");
-
-					return READER_ERROR;
-				}
-
-				if(!(fr->rdat.flags & READER_BUFFERED)) fr->rdat.filepos += ret;
-				cnt += ret;
-				fr->icy.next -= ret;
-				if(fr->icy.next > 0)
-				{
-					debug1("another try... still %li left", (long)fr->icy.next);
-					continue;
-				}
-			}
-			/* now off to read icy data */
-
-			/* one byte icy-meta size (must be multiplied by 16 to get icy-meta length) */
-			
-			ret = fr->rdat.fdread(fr,&temp_buff,1); /* Getting one single byte hast to suceed. */
-			if(ret < 0){ if(NOQUIET) error("reading icy size"); return READER_ERROR; }
-			if(ret == 0) break;
-
-			debug2("got meta-size byte: %u, at filepos %li", temp_buff, (long)fr->rdat.filepos );
-			if(!(fr->rdat.flags & READER_BUFFERED)) fr->rdat.filepos += ret; /* 1... */
-
-			if((meta_size = ((size_t) temp_buff) * 16))
-			{
-				/* we have got some metadata */
-				char *meta_buff;
-				meta_buff = malloc(meta_size+1);
-				if(meta_buff != NULL)
-				{
-					ssize_t left = meta_size;
-					while(left > 0)
-					{
-						ret = fr->rdat.fdread(fr,meta_buff+meta_size-left,left);
-						/* 0 is error here, too... there _must_ be the ICY data, the server promised! */
-						if(ret < 1){ if(NOQUIET) error("reading icy-meta"); return READER_ERROR; }
-						left -= ret;
-					}
-					meta_buff[meta_size] = 0; /* string paranoia */
-					if(!(fr->rdat.flags & READER_BUFFERED)) fr->rdat.filepos += ret;
-
-					if(fr->icy.data) free(fr->icy.data);
-					fr->icy.data = meta_buff;
-					fr->metaflags |= MPG123_NEW_ICY;
-					debug2("icy-meta: %s size: %d bytes", fr->icy.data, (int)meta_size);
-				}
-				else
-				{
-					if(NOQUIET) error1("cannot allocate memory for meta_buff (%lu bytes) ... trying to skip the metadata!", (unsigned long)meta_size);
-					fr->rd->skip_bytes(fr, meta_size);
-				}
-			}
-			fr->icy.next = fr->icy.interval;
-		}
-		else
-		{
-			ret = plain_fullread(fr, buf+cnt, count-cnt);
-			if(ret < 0){ if(NOQUIET) error1("reading the rest of %li", (long)(count-cnt)); return READER_ERROR; }
-			if(ret == 0) break;
-
-			cnt += ret;
-			fr->icy.next -= ret;
-		}
-	}
-	/* debug1("done reading, got %li", (long)cnt); */
-	return cnt;
-}
-#else
-#define icy_fullread NULL
-#endif /* NO_ICY */
-
-/* stream based operation */
-static ssize_t plain_fullread(mpg123_handle *fr,unsigned char *buf, ssize_t count)
-{
-	ssize_t ret,cnt=0;
-
-	/*
-		There used to be a check for expected file end here (length value or ID3 flag).
-		This is not needed:
-		1. EOF is indicated by fdread returning zero bytes anyway.
-		2. We get false positives of EOF for either files that grew or
-		3. ... files that have ID3v1 tags in between (stream with intro).
-	*/
-	while(cnt < count)
-	{
-		ret = fr->rdat.fdread(fr,buf+cnt,count-cnt);
-		if(ret < 0) return READER_ERROR;
-		if(ret == 0) break;
-		if(!(fr->rdat.flags & READER_BUFFERED)) fr->rdat.filepos += ret;
-		cnt += ret;
-	}
-	return cnt;
-}
-
-static off_t stream_lseek(mpg123_handle *fr, off_t pos, int whence)
-{
-	off_t ret;
-	ret = io_seek(&fr->rdat, pos, whence);
-	if (ret >= 0)	fr->rdat.filepos = ret;
-	else
-	{
-		fr->err = MPG123_LSEEK_FAILED;
-		ret = READER_ERROR; /* not the original value */
-	}
-	return ret;
-}
-
-static void stream_close(mpg123_handle *fr)
-{
-	if(fr->rdat.flags & READER_FD_OPENED) compat_close(fr->rdat.filept);
-
-	fr->rdat.filept = 0;
-
-	if(fr->rdat.flags & READER_BUFFERED) bc_reset(&fr->rdat.buffer);
-	if(fr->rdat.flags & READER_HANDLEIO)
-	{
-		if(fr->rdat.cleanup_handle != NULL) fr->rdat.cleanup_handle(fr->rdat.iohandle);
-
-		fr->rdat.iohandle = NULL;
-	}
-}
-
-static int stream_seek_frame(mpg123_handle *fr, off_t newframe)
-{
-	debug2("seek_frame to %"OFF_P" (from %"OFF_P")", (off_p)newframe, (off_p)fr->num);
-	/* Seekable streams can go backwards and jump forwards.
-	 Non-seekable streams still can go forward, just not jump. */
-	if((fr->rdat.flags & READER_SEEKABLE) || (newframe >= fr->num))
-	{
-		off_t preframe; /* a leading frame we jump to */
-		off_t seek_to; /* the byte offset we want to reach */
-		off_t to_skip; /* bytes to skip to get there (can be negative) */
-		/*
-			now seek to nearest leading index position and read from there until newframe is reached.
-			We use skip_bytes, which handles seekable and non-seekable streams
-			(the latter only for positive offset, which we ensured before entering here).
-		*/
-		seek_to = frame_index_find(fr, newframe, &preframe);
-		/* No need to seek to index position if we are closer already.
-		 But I am picky about fr->num == newframe, play safe by reading the frame again.
-		 If you think that's stupid, don't call a seek to the current frame. */
-		if(fr->num >= newframe || fr->num < preframe)
-		{
-			to_skip = seek_to - fr->rd->tell(fr);
-			if(fr->rd->skip_bytes(fr, to_skip) != seek_to)
-			return READER_ERROR;
-
-			debug2("going to %lu; just got %lu", (long unsigned)newframe, (long unsigned)preframe);
-			fr->num = preframe-1; /* Watch out! I am going to read preframe... fr->num should indicate the frame before! */
-		}
-		while(fr->num < newframe)
-		{
-			/* try to be non-fatal now... frameNum only gets advanced on success anyway */
-			if(!read_frame(fr)) break;
-		}
-		/* Now the wanted frame should be ready for decoding. */
-		debug1("arrived at %lu", (long unsigned)fr->num);
-
-		return MPG123_OK;
-	}
-	else
-	{
-		fr->err = MPG123_NO_SEEK;
-		return READER_ERROR; /* invalid, no seek happened */
-	}
-}
-
-/* return FALSE on error, TRUE on success, READER_MORE on occasion */
-static int generic_head_read(mpg123_handle *fr,unsigned long *newhead)
-{
-	unsigned char hbuf[4];
-	int ret = fr->rd->fullread(fr,hbuf,4);
-	if(ret == READER_MORE) return ret;
-	if(ret != 4) return FALSE;
-
-	*newhead = ((unsigned long) hbuf[0] << 24) |
-	 ((unsigned long) hbuf[1] << 16) |
-	 ((unsigned long) hbuf[2] << 8) |
-	 (unsigned long) hbuf[3];
-
-	return TRUE;
-}
-
-/* return FALSE on error, TRUE on success, READER_MORE on occasion */
-static int generic_head_shift(mpg123_handle *fr,unsigned long *head)
-{
-	unsigned char hbuf;
-	int ret = fr->rd->fullread(fr,&hbuf,1);
-	if(ret == READER_MORE) return ret;
-	if(ret != 1) return FALSE;
-
-	*head <<= 8;
-	*head |= hbuf;
-	*head &= 0xffffffff;
-	return TRUE;
-}
-
-/* returns reached position... negative ones are bad... */
-static off_t stream_skip_bytes(mpg123_handle *fr,off_t len)
-{
-	if(fr->rdat.flags & READER_SEEKABLE)
-	{
-		off_t ret = stream_lseek(fr, len, SEEK_CUR);
-		return (ret < 0) ? READER_ERROR : ret;
-	}
-	else if(len >= 0)
-	{
-		unsigned char buf[1024]; /* ThOr: Compaq cxx complained and it makes sense to me... or should one do a cast? What for? */
-		ssize_t ret;
-		while (len > 0)
-		{
-			ssize_t num = len < (off_t)sizeof(buf) ? (ssize_t)len : (ssize_t)sizeof(buf);
-			ret = fr->rd->fullread(fr, buf, num);
-			if (ret < 0) return ret;
-			else if(ret == 0) break; /* EOF... an error? interface defined to tell the actual position... */
-			len -= ret;
-		}
-		return fr->rd->tell(fr);
-	}
-	else if(fr->rdat.flags & READER_BUFFERED)
-	{ /* Perhaps we _can_ go a bit back. */
-		if(fr->rdat.buffer.pos >= -len)
-		{
-			fr->rdat.buffer.pos += len;
-			return fr->rd->tell(fr);
-		}
-		else
-		{
-			fr->err = MPG123_NO_SEEK;
-			return READER_ERROR;
-		}
-	}
-	else
-	{
-		fr->err = MPG123_NO_SEEK;
-		return READER_ERROR;
-	}
-}
-
-/* Return 0 on success... */
-static int stream_back_bytes(mpg123_handle *fr, off_t bytes)
-{
-	off_t want = fr->rd->tell(fr)-bytes;
-	if(want < 0) return READER_ERROR;
-	if(stream_skip_bytes(fr,-bytes) != want) return READER_ERROR;
-
-	return 0;
-}
-
-
-/* returns size on success... */
-static int generic_read_frame_body(mpg123_handle *fr,unsigned char *buf, int size)
-{
-	long l;
-
-	if((l=fr->rd->fullread(fr,buf,size)) != size)
-	{
-		long ll = l;
-		if(ll <= 0) ll = 0;
-		return READER_MORE;
-	}
-	return l;
-}
-
-static off_t generic_tell(mpg123_handle *fr)
-{
-	if(fr->rdat.flags & READER_BUFFERED)
-	fr->rdat.filepos = fr->rdat.buffer.fileoff+fr->rdat.buffer.pos;
-
-	return fr->rdat.filepos;
-}
-
-/* This does not (fully) work for non-seekable streams... You have to check for that flag, pal! */
-static void stream_rewind(mpg123_handle *fr)
-{
-	if(fr->rdat.flags & READER_SEEKABLE)
-	fr->rdat.buffer.fileoff = fr->rdat.filepos = stream_lseek(fr,0,SEEK_SET);
-	if(fr->rdat.flags & READER_BUFFERED)
-	{
-		fr->rdat.buffer.pos = 0;
-		fr->rdat.buffer.firstpos = 0;
-		fr->rdat.filepos = fr->rdat.buffer.fileoff;
-	}
-}
-
-/*
- * returns length of a file (if filept points to a file)
- * reads the last 128 bytes information into buffer
- * ... that is not totally safe...
- */
-static off_t get_fileinfo(mpg123_handle *fr)
-{
-	off_t len;
-
-	if((len=io_seek(&fr->rdat,0,SEEK_END)) < 0)	return -1;
-
-	if(io_seek(&fr->rdat,-128,SEEK_END) < 0) return -1;
-
-	if(fr->rd->fullread(fr,(unsigned char *)fr->id3buf,128) != 128)	return -1;
-
-	if(!strncmp((char*)fr->id3buf,"TAG",3))	len -= 128;
-
-	if(io_seek(&fr->rdat,0,SEEK_SET) < 0)	return -1;
-
-	if(len <= 0)	return -1;
-
-	return len;
-}
-
-/* Let's work in nice 4K blocks, that may be nicely reusable (by malloc(), even). */
-#define BUFFBLOCK 4096
-
-#ifndef NO_FEEDER
-/* Methods for the buffer chain, mainly used for feed reader, but not just that. */
-
-static void bc_init(struct bufferchain *bc)
-{
-	bc->first = NULL;
-	bc->last = bc->first;
-	bc->size = 0;
-	bc->pos = 0;
-	bc->firstpos = 0;
-	bc->fileoff = 0;
-}
-
-static void bc_reset(struct bufferchain *bc)
-{
-	/* free the buffer chain */
-	struct buffy *b = bc->first;
-	while(b != NULL)
-	{
-		struct buffy *n = b->next;
-		free(b->data);
-		free(b);
-		b = n;
-	}
-	bc_init(bc);
-}
-
-/* Create a new buffy at the end to be filled. */
-static int bc_append(struct bufferchain *bc, ssize_t size)
-{
-	struct buffy *newbuf;
-	if(size < 1) return -1;
-
-	newbuf = malloc(sizeof(struct buffy));
-	if(newbuf == NULL) return -2;
-
-	newbuf->realsize = size > BUFFBLOCK ? size : BUFFBLOCK;
-	newbuf->data = malloc(newbuf->realsize);
-	if(newbuf->data == NULL)
-	{
-		free(newbuf);
-		return -3;
-	}
-	newbuf->size = size;
-	newbuf->next = NULL;
-	if(bc->last != NULL) bc->last->next = newbuf;
-	else if(bc->first == NULL) bc->first = newbuf;
-
-	bc->last = newbuf;
-	bc->size += size;
-	return 0;
-}
-
-#if 0
-/* Drop the last one (again).
- This is not optimal but should happen on error situations only, anyway. */
-static void bc_drop(struct bufferchain *bc)
-{
-	struct buffy *cur = bc->first;
-	if(bc->first == NULL || bc->last == NULL) return;
-	/* Special case: only one buffer there. */
-	if(cur->next == NULL)
-	{
-		free(cur->data);
-		free(cur);
-		bc->first = bc->last = NULL;
-		bc->size = 0;
-		return;
-	}
-	/* Find the pre-last buffy. If chain is consistent, this _will_ succeed. */
-	while(cur->next != bc->last){ cur = cur->next; }
-
-	bc->size -= bc->last->size;
-	free(bc->last->data);
-	free(bc->last);
-	cur->next = NULL;
-	bc->last = cur;
-}
-#endif
-
-/* Append a new buffer and copy content to it. */
-static int bc_add(struct bufferchain *bc, const unsigned char *data, ssize_t size)
-{
-	int ret = 0;
-	ssize_t part = 0;
-	debug2("bc_add: adding %"SSIZE_P" bytes at %"OFF_P, (ssize_p)size, (off_p)(bc->fileoff+bc->size));
-	if(size >=4) debug4("first bytes: %02x %02x %02x %02x", data[0], data[1], data[2], data[3]);
-
-	/* Try to fill up the last buffer block. */
-	if(bc->last != NULL && bc->last->size < bc->last->realsize)
-	{
-		part = bc->last->realsize - bc->last->size;
-		if(part > size) part = size;
-
-		memcpy(bc->last->data+bc->last->size, data, part);
-		bc->last->size += part;
-		size -= part;
-		bc->size += part;
-	}
-
-
-	/* If there is still data left, put it into a new buffer block. */
-	if(size > 0 && (ret = bc_append(bc, size)) == 0)
-	memcpy(bc->last->data, data+part, size);
-
-	return ret;
-}
-
-/* Common handler for "You want more than I can give." situation. */
-static ssize_t bc_need_more(struct bufferchain *bc)
-{
-	debug3("hit end, back to beginning (%li - %li < %li)", (long)bc->size, (long)bc->pos, (long)bc->size);
-	/* go back to firstpos, undo the previous reads */
-	bc->pos = bc->firstpos;
-	return READER_MORE;
-}
-
-/* Give some data, advancing position but not forgetting yet. */
-static ssize_t bc_give(struct bufferchain *bc, unsigned char *out, ssize_t size)
-{
-	struct buffy *b = bc->first;
-	ssize_t gotcount = 0;
-	ssize_t offset = 0;
-	if(bc->size - bc->pos < size) return bc_need_more(bc);
-
-	/* find the current buffer */
-	while(b != NULL && (offset + b->size) <= bc->pos)
-	{
-		offset += b->size;
-		b = b->next;
-	}
-	/* now start copying from there */
-	while(gotcount < size && (b != NULL))
-	{
-		ssize_t loff = bc->pos - offset;
-		ssize_t chunk = size - gotcount; /* amount of bytes to get from here... */
-		if(chunk > b->size - loff) chunk = b->size - loff;
-
-#ifdef EXTRA_DEBUG
-		debug3("copying %liB from %p+%li",(long)chunk, b->data, (long)loff);
-#endif
-
-		memcpy(out+gotcount, b->data+loff, chunk);
-		gotcount += chunk;
-		bc->pos += chunk;
-		offset += b->size;
-		b = b->next;
-	}
-#ifdef EXTRA_DEBUG
-	debug2("got %li bytes, pos advanced to %li", (long)gotcount, (long)bc->pos);
-#endif
-
-	return gotcount;
-}
-
-/* Skip some bytes and return the new position.
- The buffers are still there, just the read pointer is moved! */
-static ssize_t bc_skip(struct bufferchain *bc, ssize_t count)
-{
-	if(count >= 0)
-	{
-		if(bc->size - bc->pos < count) return bc_need_more(bc);
-		else return bc->pos += count;
-	}
-	else return READER_ERROR;
-}
-
-static ssize_t bc_seekback(struct bufferchain *bc, ssize_t count)
-{
-	if(count >= 0 && count <= bc->pos) return bc->pos -= count;
-	else return READER_ERROR;
-}
-
-/* Throw away buffies that we passed. */
-static void bc_forget(struct bufferchain *bc)
-{
-	struct buffy *b = bc->first;
-	/* free all buffers that are def'n'tly outdated */
-	/* we have buffers until filepos... delete all buffers fully below it */
-	if(b) debug2("bc_forget: block %lu pos %lu", (unsigned long)b->size, (unsigned long)bc->pos);
-	else debug("forget with nothing there!");
-
-	while(b != NULL && bc->pos >= b->size)
-	{
-		struct buffy *n = b->next; /* != NULL or this is indeed the end and the last cycle anyway */
-		if(n == NULL) bc->last = NULL; /* Going to delete the last buffy... */
-		bc->fileoff += b->size;
-		bc->pos -= b->size;
-		bc->size -= b->size;
-
-		debug5("bc_forget: forgot %p with %lu, pos=%li, size=%li, fileoff=%li", (void*)b->data, (long)b->size, (long)bc->pos, (long)bc->size, (long)bc->fileoff);
-
-		free(b->data);
-		free(b);
-		b = n;
-	}
-	bc->first = b;
-	bc->firstpos = bc->pos;
-}
-
-/* reader for input via manually provided buffers */
-
-static int feed_init(mpg123_handle *fr)
-{
-	bc_init(&fr->rdat.buffer);
-	fr->rdat.filelen = 0;
-	fr->rdat.filepos = 0;
-	fr->rdat.flags |= READER_BUFFERED;
-	return 0;
-}
-
-/* externally called function, returns 0 on success, -1 on error */
-int feed_more(mpg123_handle *fr, const unsigned char *in, long count)
-{
-	int ret = 0;
-	if(VERBOSE3) debug("feed_more");
-	if((ret = bc_add(&fr->rdat.buffer, in, count)) != 0)
-	{
-		ret = READER_ERROR;
-		if(NOQUIET) error1("Failed to add buffer, return: %i", ret);
-	}
-	else /* Not talking about filelen... that stays at 0. */
-
-	if(VERBOSE3) debug3("feed_more: %p %luB bufsize=%lu", fr->rdat.buffer.last->data,
-		(unsigned long)fr->rdat.buffer.last->size, (unsigned long)fr->rdat.buffer.size);
-	return ret;
-}
-
-static ssize_t feed_read(mpg123_handle *fr, unsigned char *out, ssize_t count)
-{
-	ssize_t gotcount = bc_give(&fr->rdat.buffer, out, count);
-	if(gotcount >= 0 && gotcount != count) return READER_ERROR;
-	else return gotcount;
-}
-
-/* returns reached position... negative ones are bad... */
-static off_t feed_skip_bytes(mpg123_handle *fr,off_t len)
-{
-	/* This is either the new buffer offset or some negative error value. */
-	off_t res = bc_skip(&fr->rdat.buffer, (ssize_t)len);
-	if(res < 0) return res;
-
-	return fr->rdat.buffer.fileoff+res;
-}
-
-static int feed_back_bytes(mpg123_handle *fr, off_t bytes)
-{
-	if(bytes >=0)
-	return bc_seekback(&fr->rdat.buffer, (ssize_t)bytes) >= 0 ? 0 : READER_ERROR;
-	else
-	return feed_skip_bytes(fr, -bytes) >= 0 ? 0 : READER_ERROR;
-}
-
-static int feed_seek_frame(mpg123_handle *fr, off_t num){ return READER_ERROR; }
-
-/* Not just for feed reader, also for self-feeding buffered reader. */
-static void buffered_forget(mpg123_handle *fr)
-{
-	bc_forget(&fr->rdat.buffer);
-	fr->rdat.filepos = fr->rdat.buffer.fileoff + fr->rdat.buffer.pos;
-}
-
-off_t feed_set_pos(mpg123_handle *fr, off_t pos)
-{
-	struct bufferchain *bc = &fr->rdat.buffer;
-	if(pos >= bc->fileoff && pos-bc->fileoff < bc->size)
-	{ /* We have the position! */
-		bc->pos = (ssize_t)(pos - bc->fileoff);
-		debug1("feed_set_pos inside, next feed from %"OFF_P, (off_p)(bc->fileoff+bc->size));
-		return bc->fileoff+bc->size; /* Next input after end of buffer... */
-	}
-	else
-	{ /* I expect to get the specific position on next feed. Forget what I have now. */
-		bc_reset(bc);
-		bc->fileoff = pos;
-		debug1("feed_set_pos outside, buffer reset, next feed from %"OFF_P, (off_p)pos);
-		return pos; /* Next input from exactly that position. */
-	}
-}
-
-/* The specific stuff for buffered stream reader. */
-
-static ssize_t buffered_fullread(mpg123_handle *fr, unsigned char *out, ssize_t count)
-{
-	struct bufferchain *bc = &fr->rdat.buffer;
-	ssize_t gotcount;
-	if(bc->size - bc->pos < count)
-	{ /* Add more stuff to buffer. If hitting end of file, adjust count. */
-		unsigned char readbuf[BUFFBLOCK];
-		ssize_t need = count - (bc->size-bc->pos);
-		while(need>0)
-		{
-			int ret;
-			ssize_t got = fr->rdat.fullread(fr, readbuf, BUFFBLOCK);
-			if(got < 0)
-			{
-				if(NOQUIET) error("buffer reading");
-				return READER_ERROR;
-			}
-
-			if(VERBOSE3) debug1("buffered_fullread: buffering %li bytes from stream (if > 0)", (long)got);
-			if(got > 0 && (ret=bc_add(bc, readbuf, got)) != 0)
-			{
-				if(NOQUIET) error1("unable to add to chain, return: %i", ret);
-				return READER_ERROR;
-			}
-
-			need -= got; /* May underflow here... */
-			if(got < BUFFBLOCK) /* That naturally catches got == 0, too. */
-			{
-				if(VERBOSE3) fprintf(stderr, "Note: Input data end.\n");
-				break; /* End. */
-			}
-		}
-		if(bc->size - bc->pos < count)
-		count = bc->size - bc->pos; /* We want only what we got. */
-	}
-	gotcount = bc_give(bc, out, count);
-
-	if(VERBOSE3) debug2("wanted %li, got %li", (long)count, (long)gotcount);
-
-	if(gotcount != count){ if(NOQUIET) error("gotcount != count"); return READER_ERROR; }
-	else return gotcount;
-}
-#else
-int feed_more(mpg123_handle *fr, const unsigned char *in, long count)
-{
-	fr->err = MPG123_MISSING_FEATURE;
-	return -1;
-}
-off_t feed_set_pos(mpg123_handle *fr, off_t pos)
-{
-	fr->err = MPG123_MISSING_FEATURE;
-	return -1;
-}
-#endif /* NO_FEEDER */
-
-/*****************************************************************
- * read frame helper
- */
-
-#define bugger_off { mh->err = MPG123_NO_READER; return MPG123_ERR; }
-static int bad_init(mpg123_handle *mh) bugger_off
-static void bad_close(mpg123_handle *mh){}
-static ssize_t bad_fullread(mpg123_handle *mh, unsigned char *data, ssize_t count) bugger_off
-static int bad_head_read(mpg123_handle *mh, unsigned long *newhead) bugger_off
-static int bad_head_shift(mpg123_handle *mh, unsigned long *head) bugger_off
-static off_t bad_skip_bytes(mpg123_handle *mh, off_t len) bugger_off
-static int bad_read_frame_body(mpg123_handle *mh, unsigned char *data, int size) bugger_off
-static int bad_back_bytes(mpg123_handle *mh, off_t bytes) bugger_off
-static int bad_seek_frame(mpg123_handle *mh, off_t num) bugger_off
-static off_t bad_tell(mpg123_handle *mh) bugger_off
-static void bad_rewind(mpg123_handle *mh){}
-#undef bugger_off
-
-#define READER_STREAM 0
-#define READER_ICY_STREAM 1
-#define READER_FEED 2
-#define READER_BUF_STREAM 3
-#define READER_BUF_ICY_STREAM 4
-static struct reader readers[] =
-{
-	{ /* READER_STREAM */
-		default_init,
-		stream_close,
-		plain_fullread,
-		generic_head_read,
-		generic_head_shift,
-		stream_skip_bytes,
-		generic_read_frame_body,
-		stream_back_bytes,
-		stream_seek_frame,
-		generic_tell,
-		stream_rewind,
-		NULL
-	} ,
-	{ /* READER_ICY_STREAM */
-		default_init,
-		stream_close,
-		icy_fullread,
-		generic_head_read,
-		generic_head_shift,
-		stream_skip_bytes,
-		generic_read_frame_body,
-		stream_back_bytes,
-		stream_seek_frame,
-		generic_tell,
-		stream_rewind,
-		NULL
-	},
-#ifdef NO_FEEDER
-#define feed_init NULL
-#define feed_read NULL
-#define buffered_fullread NULL
-#define feed_seek_frame NULL
-#define feed_back_bytes NULL
-#define feed_skip_bytes NULL
-#define buffered_forget NULL
-#endif
-	{ /* READER_FEED */
-		feed_init,
-		stream_close,
-		feed_read,
-		generic_head_read,
-		generic_head_shift,
-		feed_skip_bytes,
-		generic_read_frame_body,
-		feed_back_bytes,
-		feed_seek_frame,
-		generic_tell,
-		stream_rewind,
-		buffered_forget
-	},
-	{ /* READER_BUF_STREAM */
-		default_init,
-		stream_close,
-		buffered_fullread,
-		generic_head_read,
-		generic_head_shift,
-		stream_skip_bytes,
-		generic_read_frame_body,
-		stream_back_bytes,
-		stream_seek_frame,
-		generic_tell,
-		stream_rewind,
-		buffered_forget
-	} ,
-	{ /* READER_BUF_ICY_STREAM */
-		default_init,
-		stream_close,
-		buffered_fullread,
-		generic_head_read,
-		generic_head_shift,
-		stream_skip_bytes,
-		generic_read_frame_body,
-		stream_back_bytes,
-		stream_seek_frame,
-		generic_tell,
-		stream_rewind,
-		buffered_forget
-	},
-#ifdef READ_SYSTEM
-	,{
-		system_init,
-		NULL,	/* filled in by system_init() */
-		fullread,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-	}
-#endif
-};
-
-static struct reader bad_reader =
-{
-	bad_init,
-	bad_close,
-	bad_fullread,
-	bad_head_read,
-	bad_head_shift,
-	bad_skip_bytes,
-	bad_read_frame_body,
-	bad_back_bytes,
-	bad_seek_frame,
-	bad_tell,
-	bad_rewind,
-	NULL
-};
-
-static int default_init(mpg123_handle *fr)
-{
-#ifdef TIMEOUT_READ
-	if(fr->p.timeout > 0)
-	{
-		int flags;
-		if(fr->rdat.r_read != NULL)
-		{
-			error("Timeout reading does not work with user-provided read function. Implement it yourself!");
-			return -1;
-		}
-		flags = fcntl(fr->rdat.filept, F_GETFL);
-		flags |= O_NONBLOCK;
-		fcntl(fr->rdat.filept, F_SETFL, flags);
-		fr->rdat.fdread = timeout_read;
-		fr->rdat.timeout_sec = fr->p.timeout;
-		fr->rdat.flags |= READER_NONBLOCK;
-	}
-	else
-#endif
-	fr->rdat.fdread = plain_read;
-
-	fr->rdat.read = fr->rdat.r_read != NULL ? fr->rdat.r_read : posix_read;
-	fr->rdat.lseek = fr->rdat.r_lseek != NULL ? fr->rdat.r_lseek : posix_lseek;
-	/* ICY streams of any sort shall not be seekable. */
-	if(fr->p.icy_interval > 0) fr->rdat.lseek = nix_lseek;
-
-	fr->rdat.filelen = get_fileinfo(fr);
-	fr->rdat.filepos = 0;
-	/*
-		Don't enable seeking on ICY streams, just plain normal files.
-		This check is necessary since the client can enforce ICY parsing on files that would otherwise be seekable.
-		It is a task for the future to make the ICY parsing safe with seeks ... or not.
-	*/
-	if(fr->rdat.filelen >= 0)
-	{
-		fr->rdat.flags |= READER_SEEKABLE;
-		if(!strncmp((char*)fr->id3buf,"TAG",3))
-		{
-			fr->rdat.flags |= READER_ID3TAG;
-			fr->metaflags |= MPG123_NEW_ID3;
-		}
-	}
-	/* Switch reader to a buffered one, if allowed. */
-	else if(fr->p.flags & MPG123_SEEKBUFFER)
-	{
-#ifdef NO_FEEDER
-		error("Buffered readers not supported in this build.");
-		fr->err = MPG123_MISSING_FEATURE;
-		return -1;
-#else
-		if (fr->rd == &readers[READER_STREAM])
-		{
-			fr->rd = &readers[READER_BUF_STREAM];
-			fr->rdat.fullread = plain_fullread;
-		}
-#ifndef NO_ICY
-		else if(fr->rd == &readers[READER_ICY_STREAM])
-		{
-			fr->rd = &readers[READER_BUF_ICY_STREAM];
-			fr->rdat.fullread = icy_fullread;
-		}
-#endif
-		else
-		{
-			if(NOQUIET) error("mpg123 Programmer's fault: invalid reader");
-			return -1;
-		}
-		bc_init(&fr->rdat.buffer);
-		fr->rdat.filelen = 0; /* We carry the offset, but never know how big the stream is. */
-		fr->rdat.flags |= READER_BUFFERED;
-#endif /* NO_FEEDER */
-	}
-	return 0;
-}
-
-
-void open_bad(mpg123_handle *mh)
-{
-#ifndef NO_ICY
-	clear_icy(&mh->icy);
-#endif
-	mh->rd = &bad_reader;
-	mh->rdat.flags = 0;
-	bc_init(&mh->rdat.buffer);
-}
-
-int open_feed(mpg123_handle *fr)
-{
-	debug("feed reader");
-#ifdef NO_FEEDER
-	error("Buffered readers not supported in this build.");
-	fr->err = MPG123_MISSING_FEATURE;
-	return -1;
-#else
-#ifndef NO_ICY
-	if(fr->p.icy_interval > 0)
-	{
-		if(NOQUIET) error("Feed reader cannot do ICY parsing!");
-
-		return -1;
-	}
-	clear_icy(&fr->icy);
-#endif
-	fr->rd = &readers[READER_FEED];
-	fr->rdat.flags = 0;
-	if(fr->rd->init(fr) < 0) return -1;
-	return 0;
-#endif /* NO_FEEDER */
-}
-
-/* Final code common to open_stream and open_stream_handle. */
-static int open_finish(mpg123_handle *fr)
-{
-#ifndef NO_ICY
-	if(fr->p.icy_interval > 0)
-	{
-		debug("ICY reader");
-		fr->icy.interval = fr->p.icy_interval;
-		fr->icy.next = fr->icy.interval;
-		fr->rd = &readers[READER_ICY_STREAM];
-	}
-	else
-#endif
-	{
-		fr->rd = &readers[READER_STREAM];
-		debug("stream reader");
-	}
-
-	if(fr->rd->init(fr) < 0) return -1;
-
-	return MPG123_OK;
-}
-
-int open_stream(mpg123_handle *fr, const char *bs_filenam, int fd)
-{
-	int filept_opened = 1;
-	int filept; /* descriptor of opened file/stream */
-
-	clear_icy(&fr->icy); /* can be done inside frame_clear ...? */
-
-	if(!bs_filenam) /* no file to open, got a descriptor (stdin) */
-	{
-		filept = fd;
-		filept_opened = 0; /* and don't try to close it... */
-	}
-	#ifndef O_BINARY
-	#define O_BINARY (0)
-	#endif
-	else if((filept = compat_open(bs_filenam, O_RDONLY|O_BINARY)) < 0) /* a plain old file to open... */
-	{
-		if(NOQUIET) error2("Cannot open file %s: %s", bs_filenam, strerror(errno));
-		fr->err = MPG123_BAD_FILE;
-		return MPG123_ERR; /* error... */
-	}
-
-	/* now we have something behind filept and can init the reader */
-	fr->rdat.filelen = -1;
-	fr->rdat.filept = filept;
-	fr->rdat.flags = 0;
-	if(filept_opened)	fr->rdat.flags |= READER_FD_OPENED;
-
-	return open_finish(fr);
-}
-
-int open_stream_handle(mpg123_handle *fr, void *iohandle)
-{
-	clear_icy(&fr->icy); /* can be done inside frame_clear ...? */
-	fr->rdat.filelen = -1;
-	fr->rdat.filept = -1;
-	fr->rdat.iohandle = iohandle;
-	fr->rdat.flags = 0;
-	fr->rdat.flags |= READER_HANDLEIO;
-
-	return open_finish(fr);
-}
-
-/* Wrappers for actual reading/seeking... I'm full of wrappers here. */
-static off_t io_seek(struct reader_data *rdat, off_t offset, int whence)
-{
-	if(rdat->flags & READER_HANDLEIO)
-	{
-		if(rdat->r_lseek_handle != NULL)
-		{
-			return rdat->r_lseek_handle(rdat->iohandle, offset, whence);
-		}
-		else return -1;
-	}
-	else
-	return rdat->lseek(rdat->filept, offset, whence);
-}
-
-static ssize_t io_read(struct reader_data *rdat, void *buf, size_t count)
-{
-	if(rdat->flags & READER_HANDLEIO)
-	{
-		if(rdat->r_read_handle != NULL)
-		{
-			return rdat->r_read_handle(rdat->iohandle, buf, count);
-		}
-		else return -1;
-	}
-	else
-	return rdat->read(rdat->filept, buf, count);
-}

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/sample.h Deleted

@@ -1,132 +0,0 @@
-/*
-	sample.h: The conversion from internal data to output samples of differing formats.
-
-	copyright 2007-9 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis, taking WRITE_SAMPLE from decode.c
-	Later added the end-conversion specific macros here, too.
-*/
-
-#ifndef SAMPLE_H
-#define SAMPLE_H
-
-/* mpg123lib_intern.h is included already, right? */
-
-/* Special case is fixed point math... which does work, but not that nice yet. */
-#ifdef REAL_IS_FIXED
-static inline short idiv_signed_rounded(long x, int shift)
-{
-	x >>= (shift - 1);
-	x += (x & 1);
-	return (short)(x >> 1);
-}
-# define REAL_PLUS_32767 ( 32767 << 15 )
-# define REAL_MINUS_32768 ( -32768 << 15 )
-# define REAL_TO_SHORT(x) (idiv_signed_rounded(x, 15))
-/* No better code (yet). */
-# define REAL_TO_SHORT_ACCURATE(x) REAL_TO_SHORT(x)
-/* This is just here for completeness, it is not used! */
-# define REAL_TO_S32(x) (x)
-#endif
-
-/* From now on for single precision float... double precision is a possible option once we added some bits. But, it would be rather insane. */
-#ifndef REAL_TO_SHORT
-
-/* Define the accurate rounding function. */
-# if (defined REAL_IS_FLOAT) && (defined IEEE_FLOAT)
-/* This function is only available for IEEE754 single-precision values
- This is nearly identical to proper rounding, just -+0.5 is rounded to 0 */
-static inline short ftoi16(float x)
-{
-	union
-	{
-		float f;
-		int32_t i;
-	} u_fi;
-	u_fi.f = x + 12582912.0f; /* Magic Number: 2^23 + 2^22 */
-	return (short)u_fi.i;
-}
-# define REAL_TO_SHORT_ACCURATE(x) ftoi16(x)
-# else
-/* The "proper" rounding, plain C, a bit slow. */
-# define REAL_TO_SHORT_ACCURATE(x) (short)((x)>0.0?(x)+0.5:(x)-0.5)
-# endif
-
-/* Now define the normal rounding. */
-# ifdef ACCURATE_ROUNDING
-# define REAL_TO_SHORT(x) REAL_TO_SHORT_ACCURATE(x)
-# else
-/* Non-accurate rounding... simple truncation. Fastest, most LSB errors. */
-# define REAL_TO_SHORT(x) (short)(x)
-# endif
-
-#endif /* REAL_TO_SHORT */
-
-/* We should add dithering for S32, too? */
-#ifndef REAL_TO_S32
-# ifdef ACCURATE_ROUNDING
-# define REAL_TO_S32(x) (int32_t)((x)>0.0?(x)+0.5:(x)-0.5)
-# else
-# define REAL_TO_S32(x) (int32_t)(x)
-# endif
-#endif
-
-#ifndef REAL_PLUS_32767
-# define REAL_PLUS_32767 32767.0
-#endif
-#ifndef REAL_MINUS_32768
-# define REAL_MINUS_32768 -32768.0
-#endif
-#ifndef REAL_PLUS_S32
-# define REAL_PLUS_S32 2147483647.0
-#endif
-#ifndef REAL_MINUS_S32
-# define REAL_MINUS_S32 -2147483648.0
-#endif
-
-
-/* The actual storage of a decoded sample is separated in the following macros.
- We can handle different types, we could also handle dithering here. */
-
-/* Macro to produce a short (signed 16bit) output sample from internal representation,
- which may be float, double or indeed some integer for fixed point handling. */
-#define WRITE_SHORT_SAMPLE(samples,sum,clip) \
- if( (sum) > REAL_PLUS_32767) { *(samples) = 0x7fff; (clip)++; } \
- else if( (sum) < REAL_MINUS_32768) { *(samples) = -0x8000; (clip)++; } \
- else { *(samples) = REAL_TO_SHORT(sum); }
-
-/* Same as above, but always using accurate rounding. Would we want softer clipping here, too? */
-#define WRITE_SHORT_SAMPLE_ACCURATE(samples,sum,clip) \
- if( (sum) > REAL_PLUS_32767) { *(samples) = 0x7fff; (clip)++; } \
- else if( (sum) < REAL_MINUS_32768) { *(samples) = -0x8000; (clip)++; } \
- else { *(samples) = REAL_TO_SHORT_ACCURATE(sum); }
-
-/*
-	32bit signed 
-	We do clipping with the same old borders... but different conversion.
-	We see here that we need extra work for non-16bit output... we optimized for 16bit.
-	-0x7fffffff-1 is the minimum 32 bit signed integer value expressed so that MSVC 
-	does not give a compile time warning.
-*/
-#define WRITE_S32_SAMPLE(samples,sum,clip) \
-	{ \
-		real tmpsum = REAL_MUL((sum),S32_RESCALE); \
-		if( tmpsum > REAL_PLUS_S32 ){ *(samples) = 0x7fffffff; (clip)++; } \
-		else if( tmpsum < REAL_MINUS_S32 ) { *(samples) = -0x7fffffff-1; (clip)++; } \
-		else { *(samples) = REAL_TO_S32(tmpsum); } \
-	}
-
-/* Produce an 8bit sample, via 16bit intermediate. */
-#define WRITE_8BIT_SAMPLE(samples,sum,clip) \
-{ \
-	short write_8bit_tmp; \
-	if( (sum) > REAL_PLUS_32767) { write_8bit_tmp = 0x7fff; (clip)++; } \
-	else if( (sum) < REAL_MINUS_32768) { write_8bit_tmp = -0x8000; (clip)++; } \
-	else { write_8bit_tmp = REAL_TO_SHORT(sum); } \
-	*(samples) = fr->conv16to8[write_8bit_tmp>>AUSHIFT]; \
-}
-#ifndef REAL_IS_FIXED
-#define WRITE_REAL_SAMPLE(samples,sum,clip) *(samples) = ((real)1./SHORT_SCALE)*(sum)
-#endif
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/stringbuf.c Deleted

@@ -1,163 +0,0 @@
-/*
-	stringbuf: mimicking a bit of C++ to more safely handle strings
-
-	copyright 2006-10 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Thomas Orgis
-*/
-
-#include "mpg123lib_intern.h"
-#include "config.h"
-#include "mpg123.h"
-#include "compat.h"
-#include <string.h>
-#include "debug.h"
-
-void attribute_align_arg mpg123_init_string(mpg123_string* sb)
-{
-	sb->p = NULL;
-	sb->size = 0;
-	sb->fill = 0;
-}
-
-void attribute_align_arg mpg123_free_string(mpg123_string* sb)
-{
-	if(sb->p != NULL) free(sb->p);
-	mpg123_init_string(sb);
-}
-
-int attribute_align_arg mpg123_grow_string(mpg123_string* sb, size_t new)
-{
-	if(sb->size < new) return mpg123_resize_string(sb, new);
-	else return 1;
-}
-
-int attribute_align_arg mpg123_resize_string(mpg123_string* sb, size_t new)
-{
-	debug3("resizing string pointer %p from %lu to %lu", (void*) sb->p, (unsigned long)sb->size, (unsigned long)new);
-	if(new == 0)
-	{
-		if(sb->size && sb->p != NULL) free(sb->p);
-		mpg123_init_string(sb);
-		return 1;
-	}
-	if(sb->size != new)
-	{
-		char* t;
-		debug("really!");
-		t = (char*) safe_realloc(sb->p, new*sizeof(char));
-		debug1("safe_realloc returned %p", (void*) t); 
-		if(t != NULL)
-		{
-			sb->p = t;
-			sb->size = new;
-			return 1;
-		}
-		else return 0;
-	}
-	else return 1; /* success */
-}
-
-int attribute_align_arg mpg123_copy_string(mpg123_string* from, mpg123_string* to)
-{
-	size_t fill;
-	char *text;
-	if(to == NULL) return -1;
-
-	debug2("called copy_string with %p -> %p", (void*)from, (void*)to);
-	if(from == NULL)
-	{
-		fill = 0;
-		text = NULL;
-	}
-	else
-	{
-		fill = from->fill;
-		text = from->p;
-	}
-
-	if(mpg123_resize_string(to, fill))
-	{
-		memcpy(to->p, text, fill);
-		to->fill = fill;
-		return 1;
-	}
-	else return 0;
-}
-
-int attribute_align_arg mpg123_add_string(mpg123_string* sb, const char* stuff)
-{
-	debug1("adding %s", stuff);
-	return mpg123_add_substring(sb, stuff, 0, strlen(stuff));
-}
-
-int attribute_align_arg mpg123_add_substring(mpg123_string *sb, const char *stuff, size_t from, size_t count)
-{
-	debug("adding a substring");
-	if(sb->fill) /* includes zero byte... */
-	{
-		if( (SIZE_MAX - sb->fill >= count) /* Avoid overflow. */
-		 && (sb->size >= sb->fill+count || mpg123_grow_string(sb, sb->fill+count)) )
-		{
-			memcpy(sb->p+sb->fill-1, stuff+from, count);
-			sb->fill += count;
-			sb->p[sb->fill-1] = 0; /* Terminate! */
-		}
-		else return 0;
-	}
-	else
-	{
-		if( count < SIZE_MAX && mpg123_grow_string(sb, count+1) )
-		{
-			memcpy(sb->p, stuff+from, count);
-			sb->fill = count+1;
-			sb->p[sb->fill-1] = 0; /* Terminate! */
-		}
-		else return 0;
-	}
-	return 1;
-}
-
-int attribute_align_arg mpg123_set_substring(mpg123_string* sb, const char* stuff, size_t from, size_t count)
-{
-	sb->fill = 0;
-	return mpg123_add_substring(sb, stuff, from, count);
-}
-
-int attribute_align_arg mpg123_set_string(mpg123_string* sb, const char* stuff)
-{
-	sb->fill = 0;
-	return mpg123_add_string(sb, stuff);
-}
-
-size_t attribute_align_arg mpg123_strlen(mpg123_string *sb, int utf8)
-{
-	size_t i;
-	size_t bytelen;
-
-	/* Notions of empty string. If there's only a single character, it has to be the trailing zero, and if the first is the trailing zero anyway, we got empty. */
-	if(sb->fill < 2 || sb->p[0] == 0) return 0;
-
-	/* Find the first non-null character from the back.
-	 We already established that the first character is non-null
-	 That at fill-2 has to be null, though. */
-	for(i=sb->fill-2; i>0; --i)
-	if(sb->p[i] != 0) break;
-
-	/* For simple byte strings, we are done now. */
-	bytelen = i+1;
-
-	if(!utf8) return bytelen;
-	else
-	{
-		/* Work out the actual count of UTF8 bytes.
-		 This employs no particular encoding error checking. */
-		size_t len = 0;
-		for(i=0; i<bytelen; ++i)
-		{
-			/* Every byte that is not a continuation byte ( 0xc0 == 10xx xxxx ) stands for a character. */
-			if((sb->p[i] & 0xc0) != 0x80) len++;
-		}
-		return len;
-	}
-}

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/synth.c Deleted

@@ -1,816 +0,0 @@
-/*
-	synth.c: The functions for synthesizing samples, at the end of decoding.
-
-	copyright 1995-2008 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp, heavily dissected and rearranged by Thomas Orgis
-*/
-
-#include "mpg123lib_intern.h"
-#include "sample.h"
-#include "debug.h"
-
-/*
-	Part 1: All synth functions that produce signed short.
-	That is:
-		- synth_1to1 with cpu-specific variants (synth_1to1_i386, synth_1to1_i586 ...)
-		- synth_1to1_mono and synth_1to1_m2s; which use fr->synths.plain[r_1to1][f_16].
-	Nearly every decoder variant has it's own synth_1to1, while the mono conversion is shared.
-*/
-
-#define SAMPLE_T short
-#define WRITE_SAMPLE(samples,sum,clip) WRITE_SHORT_SAMPLE(samples,sum,clip)
-
-/* Part 1a: All straight 1to1 decoding functions */
-#define BLOCK 0x40 /* One decoding block is 64 samples. */
-
-#define SYNTH_NAME synth_1to1
-#include "synth.h"
-#undef SYNTH_NAME
-
-/* Mono-related synths; they wrap over _some_ synth_1to1. */
-#define SYNTH_NAME       fr->synths.plain[r_1to1][f_16]
-#define MONO_NAME        synth_1to1_mono
-#define MONO2STEREO_NAME synth_1to1_m2s
-#include "synth_mono.h"
-#undef SYNTH_NAME
-#undef MONO_NAME
-#undef MONO2STEREO_NAME
-
-/* Now we have possibly some special synth_1to1 ...
-   ... they produce signed short; the mono functions defined above work on the special synths, too. */
-
-#ifdef OPT_GENERIC_DITHER
-#define SYNTH_NAME synth_1to1_dither
-/* We need the accurate sample writing... */
-#undef WRITE_SAMPLE
-#define WRITE_SAMPLE(samples,sum,clip) WRITE_SHORT_SAMPLE_ACCURATE(samples,sum,clip)
-
-#define USE_DITHER
-#include "synth.h"
-#undef USE_DITHER
-#undef SYNTH_NAME
-
-#undef WRITE_SAMPLE
-#define WRITE_SAMPLE(samples,sum,clip) WRITE_SHORT_SAMPLE(samples,sum,clip)
-
-#endif
-
-#ifdef OPT_X86
-/* The i386-specific C code, here as short variant, later 8bit and float. */
-#define NO_AUTOINCREMENT
-#define SYNTH_NAME synth_1to1_i386
-#include "synth.h"
-#undef SYNTH_NAME
-/* i386 uses the normal mono functions. */
-#undef NO_AUTOINCREMENT
-#endif
-
-#undef BLOCK /* Following functions are so special that they don't need this. */
-
-#ifdef OPT_I586
-/* This is defined in assembler. */
-int synth_1to1_i586_asm(real *bandPtr, int channel, unsigned char *out, unsigned char *buffs, int *bo, real *decwin);
-/* This is just a hull to use the mpg123 handle. */
-int synth_1to1_i586(real *bandPtr, int channel, mpg123_handle *fr, int final)
-{
-	int ret;
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	ret = synth_1to1_i586_asm(bandPtr, channel, fr->buffer.data+fr->buffer.fill, fr->rawbuffs, &fr->bo, fr->decwin);
-	if(final) fr->buffer.fill += 128;
-	return ret;
-}
-#endif
-
-#ifdef OPT_I586_DITHER
-/* This is defined in assembler. */
-int synth_1to1_i586_asm_dither(real *bandPtr, int channel, unsigned char *out, unsigned char *buffs, int *bo, real *decwin, float *dithernoise);
-/* This is just a hull to use the mpg123 handle. */
-int synth_1to1_i586_dither(real *bandPtr, int channel, mpg123_handle *fr, int final)
-{
-	int ret;
-	int bo_dither[2]; /* Temporary workaround? Could expand the asm code. */
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	/* Applying this hack, to change the asm only bit by bit (adding dithernoise pointer). */
-	bo_dither[0] = fr->bo;
-	bo_dither[1] = fr->ditherindex;
-	ret = synth_1to1_i586_asm_dither(bandPtr, channel, fr->buffer.data+fr->buffer.fill, fr->rawbuffs, bo_dither, fr->decwin, fr->dithernoise);
-	fr->bo          = bo_dither[0];
-	fr->ditherindex = bo_dither[1];
-
-	if(final) fr->buffer.fill += 128;
-	return ret;
-}
-#endif
-
-#ifdef OPT_3DNOW
-/* Those are defined in assembler. */
-void do_equalizer_3dnow(real *bandPtr,int channel, real equalizer[2][32]);
-int synth_1to1_3dnow_asm(real *bandPtr, int channel, unsigned char *out, unsigned char *buffs, int *bo, real *decwin);
-/* This is just a hull to use the mpg123 handle. */
-int synth_1to1_3dnow(real *bandPtr, int channel, mpg123_handle *fr, int final)
-{
-	int ret;
-
-	if(fr->have_eq_settings) do_equalizer_3dnow(bandPtr,channel,fr->equalizer);
-
-	/* this is in asm, can be dither or not */
-	/* uh, is this return from pointer correct? */ 
-	ret = (int) synth_1to1_3dnow_asm(bandPtr, channel, fr->buffer.data+fr->buffer.fill, fr->rawbuffs, &fr->bo, fr->decwin);
-	if(final) fr->buffer.fill += 128;
-	return ret;
-}
-#endif
-
-#ifdef OPT_MMX
-/* This is defined in assembler. */
-int synth_1to1_MMX(real *bandPtr, int channel, short *out, short *buffs, int *bo, float *decwins);
-/* This is just a hull to use the mpg123 handle. */
-int synth_1to1_mmx(real *bandPtr, int channel, mpg123_handle *fr, int final)
-{
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	/* in asm */
-	synth_1to1_MMX(bandPtr, channel, (short*) (fr->buffer.data+fr->buffer.fill), (short *) fr->rawbuffs, &fr->bo, fr->decwins);
-	if(final) fr->buffer.fill += 128;
-	return 0;
-}
-#endif
-
-#ifdef OPT_SSE
-#ifdef ACCURATE_ROUNDING
-/* This is defined in assembler. */
-int synth_1to1_sse_accurate_asm(real *window, real *b0, short *samples, int bo1);
-int synth_1to1_s_sse_accurate_asm(real *window, real *b0l, real *b0r, short *samples, int bo1);
-void dct64_real_sse(real *out0, real *out1, real *samples);
-/* This is just a hull to use the mpg123 handle. */
-int synth_1to1_sse(real *bandPtr,int channel, mpg123_handle *fr, int final)
-{
-	short *samples = (short *) (fr->buffer.data+fr->buffer.fill);	
-	real *b0, **buf;
-	int clip; 
-	int bo1;
-
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	if(!channel)
-	{
-		fr->bo--;
-		fr->bo &= 0xf;
-		buf = fr->real_buffs[0];
-	}
-	else
-	{
-		samples++;
-		buf = fr->real_buffs[1];
-	}
-
-	if(fr->bo & 0x1) 
-	{
-		b0 = buf[0];
-		bo1 = fr->bo;
-		dct64_real_sse(buf[1]+((fr->bo+1)&0xf),buf[0]+fr->bo,bandPtr);
-	}
-	else
-	{
-		b0 = buf[1];
-		bo1 = fr->bo+1;
-		dct64_real_sse(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr);
-	}
-
-	clip = synth_1to1_sse_accurate_asm(fr->decwin, b0, samples, bo1);
-
-	if(final) fr->buffer.fill += 128;
-
-	return clip;
-}
-
-int synth_1to1_stereo_sse(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr)
-{
-	short *samples = (short *) (fr->buffer.data+fr->buffer.fill);
-
-	real *b0l, *b0r, **bufl, **bufr;
-	int bo1;
-	int clip;
-
-	if(fr->have_eq_settings)
-	{
-		do_equalizer(bandPtr_l,0,fr->equalizer);
-		do_equalizer(bandPtr_r,1,fr->equalizer);
-	}
-
-	fr->bo--;
-	fr->bo &= 0xf;
-	bufl = fr->real_buffs[0];
-	bufr = fr->real_buffs[1];
-
-	if(fr->bo & 0x1)
-	{
-		b0l = bufl[0];
-		b0r = bufr[0];
-		bo1 = fr->bo;
-		dct64_real_sse(bufl[1]+((fr->bo+1)&0xf),bufl[0]+fr->bo,bandPtr_l);
-		dct64_real_sse(bufr[1]+((fr->bo+1)&0xf),bufr[0]+fr->bo,bandPtr_r);
-	}
-	else
-	{
-		b0l = bufl[1];
-		b0r = bufr[1];
-		bo1 = fr->bo+1;
-		dct64_real_sse(bufl[0]+fr->bo,bufl[1]+fr->bo+1,bandPtr_l);
-		dct64_real_sse(bufr[0]+fr->bo,bufr[1]+fr->bo+1,bandPtr_r);
-	}
-
-	clip = synth_1to1_s_sse_accurate_asm(fr->decwin, b0l, b0r, samples, bo1);
-
-	fr->buffer.fill += 128;
-
-	return clip;
-}
-#else
-/* This is defined in assembler. */
-void synth_1to1_sse_asm(real *bandPtr, int channel, short *samples, short *buffs, int *bo, real *decwin);
-/* This is just a hull to use the mpg123 handle. */
-int synth_1to1_sse(real *bandPtr, int channel, mpg123_handle *fr, int final)
-{
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	synth_1to1_sse_asm(bandPtr, channel, (short*) (fr->buffer.data+fr->buffer.fill), (short *) fr->rawbuffs, &fr->bo, fr->decwins);
-	if(final) fr->buffer.fill += 128;
-	return 0;
-}
-#endif
-#endif
-
-#ifdef OPT_3DNOWEXT
-/* This is defined in assembler. */
-void synth_1to1_3dnowext_asm(real *bandPtr, int channel, short *samples, short *buffs, int *bo, real *decwin);
-/* This is just a hull to use the mpg123 handle. */
-int synth_1to1_3dnowext(real *bandPtr, int channel, mpg123_handle *fr, int final)
-{
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	synth_1to1_3dnowext_asm(bandPtr, channel, (short*) (fr->buffer.data+fr->buffer.fill), (short *) fr->rawbuffs, &fr->bo, fr->decwins);
-	if(final) fr->buffer.fill += 128;
-	return 0;
-}
-#endif
-
-#ifdef OPT_X86_64
-#ifdef ACCURATE_ROUNDING
-/* Assembler routines. */
-int synth_1to1_x86_64_accurate_asm(real *window, real *b0, short *samples, int bo1);
-int synth_1to1_s_x86_64_accurate_asm(real *window, real *b0l, real *b0r, short *samples, int bo1);
-void dct64_real_x86_64(real *out0, real *out1, real *samples);
-/* Hull for C mpg123 API */
-int synth_1to1_x86_64(real *bandPtr,int channel, mpg123_handle *fr, int final)
-{
-	short *samples = (short *) (fr->buffer.data+fr->buffer.fill);
-
-	real *b0, **buf;
-	int bo1;
-	int clip;
-
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	if(!channel)
-	{
-		fr->bo--;
-		fr->bo &= 0xf;
-		buf = fr->real_buffs[0];
-	}
-	else
-	{
-		samples++;
-		buf = fr->real_buffs[1];
-	}
-
-	if(fr->bo & 0x1)
-	{
-		b0 = buf[0];
-		bo1 = fr->bo;
-		dct64_real_x86_64(buf[1]+((fr->bo+1)&0xf),buf[0]+fr->bo,bandPtr);
-	}
-	else
-	{
-		b0 = buf[1];
-		bo1 = fr->bo+1;
-		dct64_real_x86_64(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr);
-	}
-
-	clip = synth_1to1_x86_64_accurate_asm(fr->decwin, b0, samples, bo1);
-
-	if(final) fr->buffer.fill += 128;
-
-	return clip;
-}
-
-int synth_1to1_stereo_x86_64(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr)
-{
-	short *samples = (short *) (fr->buffer.data+fr->buffer.fill);
-
-	real *b0l, *b0r, **bufl, **bufr;
-	int bo1;
-	int clip;
-
-	if(fr->have_eq_settings)
-	{
-		do_equalizer(bandPtr_l,0,fr->equalizer);
-		do_equalizer(bandPtr_r,1,fr->equalizer);
-	}
-
-	fr->bo--;
-	fr->bo &= 0xf;
-	bufl = fr->real_buffs[0];
-	bufr = fr->real_buffs[1];
-
-	if(fr->bo & 0x1)
-	{
-		b0l = bufl[0];
-		b0r = bufr[0];
-		bo1 = fr->bo;
-		dct64_real_x86_64(bufl[1]+((fr->bo+1)&0xf),bufl[0]+fr->bo,bandPtr_l);
-		dct64_real_x86_64(bufr[1]+((fr->bo+1)&0xf),bufr[0]+fr->bo,bandPtr_r);
-	}
-	else
-	{
-		b0l = bufl[1];
-		b0r = bufr[1];
-		bo1 = fr->bo+1;
-		dct64_real_x86_64(bufl[0]+fr->bo,bufl[1]+fr->bo+1,bandPtr_l);
-		dct64_real_x86_64(bufr[0]+fr->bo,bufr[1]+fr->bo+1,bandPtr_r);
-	}
-
-	clip = synth_1to1_s_x86_64_accurate_asm(fr->decwin, b0l, b0r, samples, bo1);
-
-	fr->buffer.fill += 128;
-
-	return clip;
-}
-#else
-/* This is defined in assembler. */
-int synth_1to1_x86_64_asm(short *window, short *b0, short *samples, int bo1);
-int synth_1to1_s_x86_64_asm(short *window, short *b0l, short *b0r, short *samples, int bo1);
-void dct64_x86_64(short *out0, short *out1, real *samples);
-/* This is just a hull to use the mpg123 handle. */
-int synth_1to1_x86_64(real *bandPtr,int channel, mpg123_handle *fr, int final)
-{
-	short *samples = (short *) (fr->buffer.data+fr->buffer.fill);	
-	short *b0, **buf;
-	int clip; 
-	int bo1;
-
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	if(!channel)
-	{
-		fr->bo--;
-		fr->bo &= 0xf;
-		buf = fr->short_buffs[0];
-	}
-	else
-	{
-		samples++;
-		buf = fr->short_buffs[1];
-	}
-
-	if(fr->bo & 0x1) 
-	{
-		b0 = buf[0];
-		bo1 = fr->bo;
-		dct64_x86_64(buf[1]+((fr->bo+1)&0xf),buf[0]+fr->bo,bandPtr);
-	}
-	else
-	{
-		b0 = buf[1];
-		bo1 = fr->bo+1;
-		dct64_x86_64(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr);
-	}
-
-	clip = synth_1to1_x86_64_asm((short *)fr->decwins, b0, samples, bo1);
-
-	if(final) fr->buffer.fill += 128;
-
-	return clip;
-}
-
-int synth_1to1_stereo_x86_64(real *bandPtr_l,real *bandPtr_r, mpg123_handle *fr)
-{
-	short *samples = (short *) (fr->buffer.data+fr->buffer.fill);
-	short *b0l, *b0r, **bufl, **bufr;
-	int clip; 
-	int bo1;
-
-	if(fr->have_eq_settings)
-	{
-		do_equalizer(bandPtr_l,0,fr->equalizer);
-		do_equalizer(bandPtr_r,1,fr->equalizer);
-	}
-
-	fr->bo--;
-	fr->bo &= 0xf;
-	bufl = fr->short_buffs[0];
-	bufr = fr->short_buffs[1];
-
-	if(fr->bo & 0x1) 
-	{
-		b0l = bufl[0];
-		b0r = bufr[0];
-		bo1 = fr->bo;
-		dct64_x86_64(bufl[1]+((fr->bo+1)&0xf),bufl[0]+fr->bo,bandPtr_l);
-		dct64_x86_64(bufr[1]+((fr->bo+1)&0xf),bufr[0]+fr->bo,bandPtr_r);
-	}
-	else
-	{
-		b0l = bufl[1];
-		b0r = bufr[1];
-		bo1 = fr->bo+1;
-		dct64_x86_64(bufl[0]+fr->bo,bufl[1]+fr->bo+1,bandPtr_l);
-		dct64_x86_64(bufr[0]+fr->bo,bufr[1]+fr->bo+1,bandPtr_r);
-	}
-
-	clip = synth_1to1_s_x86_64_asm((short *)fr->decwins, b0l, b0r, samples, bo1);
-
-	fr->buffer.fill += 128;
-
-	return clip;
-}
-#endif
-#endif
-
-#ifdef OPT_ARM
-#ifdef ACCURATE_ROUNDING
-/* Assembler routines. */
-int synth_1to1_arm_accurate_asm(real *window, real *b0, short *samples, int bo1);
-/* Hull for C mpg123 API */
-int synth_1to1_arm(real *bandPtr,int channel, mpg123_handle *fr, int final)
-{
-	short *samples = (short *) (fr->buffer.data+fr->buffer.fill);
-
-	real *b0, **buf;
-	int bo1;
-	int clip;
-
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	if(!channel)
-	{
-		fr->bo--;
-		fr->bo &= 0xf;
-		buf = fr->real_buffs[0];
-	}
-	else
-	{
-		samples++;
-		buf = fr->real_buffs[1];
-	}
-
-	if(fr->bo & 0x1)
-	{
-		b0 = buf[0];
-		bo1 = fr->bo;
-		dct64(buf[1]+((fr->bo+1)&0xf),buf[0]+fr->bo,bandPtr);
-	}
-	else
-	{
-		b0 = buf[1];
-		bo1 = fr->bo+1;
-		dct64(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr);
-	}
-
-	clip = synth_1to1_arm_accurate_asm(fr->decwin, b0, samples, bo1);
-
-	if(final) fr->buffer.fill += 128;
-
-	return clip;
-}
-#else
-/* Assembler routines. */
-int synth_1to1_arm_asm(real *window, real *b0, short *samples, int bo1);
-/* Hull for C mpg123 API */
-int synth_1to1_arm(real *bandPtr,int channel, mpg123_handle *fr, int final)
-{
-	short *samples = (short *) (fr->buffer.data+fr->buffer.fill);
-
-	real *b0, **buf;
-	int bo1;
-	int clip;
-
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	if(!channel)
-	{
-		fr->bo--;
-		fr->bo &= 0xf;
-		buf = fr->real_buffs[0];
-	}
-	else
-	{
-		samples++;
-		buf = fr->real_buffs[1];
-	}
-
-	if(fr->bo & 0x1)
-	{
-		b0 = buf[0];
-		bo1 = fr->bo;
-		dct64(buf[1]+((fr->bo+1)&0xf),buf[0]+fr->bo,bandPtr);
-	}
-	else
-	{
-		b0 = buf[1];
-		bo1 = fr->bo+1;
-		dct64(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr);
-	}
-
-	clip = synth_1to1_arm_asm(fr->decwin, b0, samples, bo1);
-
-	if(final) fr->buffer.fill += 128;
-
-	return clip;
-}
-#endif
-#endif
-
-#ifdef OPT_NEON
-#ifdef ACCURATE_ROUNDING
-/* This is defined in assembler. */
-int synth_1to1_neon_accurate_asm(real *window, real *b0, short *samples, int bo1);
-int synth_1to1_s_neon_accurate_asm(real *window, real *b0l, real *b0r, short *samples, int bo1);
-void dct64_real_neon(real *out0, real *out1, real *samples);
-/* Hull for C mpg123 API */
-int synth_1to1_neon(real *bandPtr,int channel, mpg123_handle *fr, int final)
-{
-	short *samples = (short *) (fr->buffer.data+fr->buffer.fill);
-
-	real *b0, **buf;
-	int bo1;
-	int clip;
-
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	if(!channel)
-	{
-		fr->bo--;
-		fr->bo &= 0xf;
-		buf = fr->real_buffs[0];
-	}
-	else
-	{
-		samples++;
-		buf = fr->real_buffs[1];
-	}
-
-	if(fr->bo & 0x1)
-	{
-		b0 = buf[0];
-		bo1 = fr->bo;
-		dct64_real_neon(buf[1]+((fr->bo+1)&0xf),buf[0]+fr->bo,bandPtr);
-	}
-	else
-	{
-		b0 = buf[1];
-		bo1 = fr->bo+1;
-		dct64_real_neon(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr);
-	}
-
-	clip = synth_1to1_neon_accurate_asm(fr->decwin, b0, samples, bo1);
-
-	if(final) fr->buffer.fill += 128;
-
-	return clip;
-}
-
-int synth_1to1_stereo_neon(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr)
-{
-	short *samples = (short *) (fr->buffer.data+fr->buffer.fill);
-
-	real *b0l, *b0r, **bufl, **bufr;
-	int bo1;
-	int clip;
-
-	if(fr->have_eq_settings)
-	{
-		do_equalizer(bandPtr_l,0,fr->equalizer);
-		do_equalizer(bandPtr_r,1,fr->equalizer);
-	}
-
-	fr->bo--;
-	fr->bo &= 0xf;
-	bufl = fr->real_buffs[0];
-	bufr = fr->real_buffs[1];
-
-	if(fr->bo & 0x1)
-	{
-		b0l = bufl[0];
-		b0r = bufr[0];
-		bo1 = fr->bo;
-		dct64_real_neon(bufl[1]+((fr->bo+1)&0xf),bufl[0]+fr->bo,bandPtr_l);
-		dct64_real_neon(bufr[1]+((fr->bo+1)&0xf),bufr[0]+fr->bo,bandPtr_r);
-	}
-	else
-	{
-		b0l = bufl[1];
-		b0r = bufr[1];
-		bo1 = fr->bo+1;
-		dct64_real_neon(bufl[0]+fr->bo,bufl[1]+fr->bo+1,bandPtr_l);
-		dct64_real_neon(bufr[0]+fr->bo,bufr[1]+fr->bo+1,bandPtr_r);
-	}
-
-	clip = synth_1to1_s_neon_accurate_asm(fr->decwin, b0l, b0r, samples, bo1);
-
-	fr->buffer.fill += 128;
-
-	return clip;
-}
-#else
-/* This is defined in assembler. */
-int synth_1to1_neon_asm(short *window, short *b0, short *samples, int bo1);
-int synth_1to1_s_neon_asm(short *window, short *b0l, short *b0r, short *samples, int bo1);
-void dct64_neon(short *out0, short *out1, real *samples);
-/* Hull for C mpg123 API */
-int synth_1to1_neon(real *bandPtr,int channel, mpg123_handle *fr, int final)
-{
-	short *samples = (short *) (fr->buffer.data+fr->buffer.fill);	
-	short *b0, **buf;
-	int clip; 
-	int bo1;
-
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	if(!channel)
-	{
-		fr->bo--;
-		fr->bo &= 0xf;
-		buf = fr->short_buffs[0];
-	}
-	else
-	{
-		samples++;
-		buf = fr->short_buffs[1];
-	}
-
-	if(fr->bo & 0x1) 
-	{
-		b0 = buf[0];
-		bo1 = fr->bo;
-		dct64_neon(buf[1]+((fr->bo+1)&0xf),buf[0]+fr->bo,bandPtr);
-	}
-	else
-	{
-		b0 = buf[1];
-		bo1 = fr->bo+1;
-		dct64_neon(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr);
-	}
-
-	clip = synth_1to1_neon_asm((short *)fr->decwins, b0, samples, bo1);
-
-	if(final) fr->buffer.fill += 128;
-
-	return clip;
-}
-
-int synth_1to1_stereo_neon(real *bandPtr_l,real *bandPtr_r, mpg123_handle *fr)
-{
-	short *samples = (short *) (fr->buffer.data+fr->buffer.fill);
-	short *b0l, *b0r, **bufl, **bufr;
-	int clip; 
-	int bo1;
-
-	if(fr->have_eq_settings)
-	{
-		do_equalizer(bandPtr_l,0,fr->equalizer);
-		do_equalizer(bandPtr_r,1,fr->equalizer);
-	}
-
-	fr->bo--;
-	fr->bo &= 0xf;
-	bufl = fr->short_buffs[0];
-	bufr = fr->short_buffs[1];
-
-	if(fr->bo & 0x1) 
-	{
-		b0l = bufl[0];
-		b0r = bufr[0];
-		bo1 = fr->bo;
-		dct64_neon(bufl[1]+((fr->bo+1)&0xf),bufl[0]+fr->bo,bandPtr_l);
-		dct64_neon(bufr[1]+((fr->bo+1)&0xf),bufr[0]+fr->bo,bandPtr_r);
-	}
-	else
-	{
-		b0l = bufl[1];
-		b0r = bufr[1];
-		bo1 = fr->bo+1;
-		dct64_neon(bufl[0]+fr->bo,bufl[1]+fr->bo+1,bandPtr_l);
-		dct64_neon(bufr[0]+fr->bo,bufr[1]+fr->bo+1,bandPtr_r);
-	}
-
-	clip = synth_1to1_s_neon_asm((short *)fr->decwins, b0l, b0r, samples, bo1);
-
-	fr->buffer.fill += 128;
-
-	return clip;
-}
-#endif
-#endif
-
-#ifndef NO_DOWNSAMPLE
-
-/*
-	Part 1b: 2to1 synth.
-	Only generic and i386 functions this time.
-*/
-#define BLOCK 0x20 /* One decoding block is 32 samples. */
-
-#define SYNTH_NAME synth_2to1
-#include "synth.h"
-#undef SYNTH_NAME
-
-#ifdef OPT_DITHER /* Used for generic_dither and as fallback for i586_dither. */
-#define SYNTH_NAME synth_2to1_dither
-#define USE_DITHER
-#include "synth.h"
-#undef USE_DITHER
-#undef SYNTH_NAME
-#endif
-
-#define SYNTH_NAME       fr->synths.plain[r_2to1][f_16]
-#define MONO_NAME        synth_2to1_mono
-#define MONO2STEREO_NAME synth_2to1_m2s
-#include "synth_mono.h"
-#undef SYNTH_NAME
-#undef MONO_NAME
-#undef MONO2STEREO_NAME
-
-#ifdef OPT_X86
-#define NO_AUTOINCREMENT
-#define SYNTH_NAME synth_2to1_i386
-#include "synth.h"
-#undef SYNTH_NAME
-/* i386 uses the normal mono functions. */
-#undef NO_AUTOINCREMENT
-#endif
-
-#undef BLOCK
-
-/*
-	Part 1c: 4to1 synth.
-	Same procedure as above...
-*/
-#define BLOCK 0x10 /* One decoding block is 16 samples. */
-
-#define SYNTH_NAME synth_4to1
-#include "synth.h"
-#undef SYNTH_NAME
-
-#ifdef OPT_DITHER
-#define SYNTH_NAME synth_4to1_dither
-#define USE_DITHER
-#include "synth.h"
-#undef USE_DITHER
-#undef SYNTH_NAME
-#endif
-
-#define SYNTH_NAME       fr->synths.plain[r_4to1][f_16] /* This is just for the _i386 one... gotta check if it is really useful... */
-#define MONO_NAME        synth_4to1_mono
-#define MONO2STEREO_NAME synth_4to1_m2s
-#include "synth_mono.h"
-#undef SYNTH_NAME
-#undef MONO_NAME
-#undef MONO2STEREO_NAME
-
-#ifdef OPT_X86
-#define NO_AUTOINCREMENT
-#define SYNTH_NAME synth_4to1_i386
-#include "synth.h"
-#undef SYNTH_NAME
-/* i386 uses the normal mono functions. */
-#undef NO_AUTOINCREMENT
-#endif
-
-#undef BLOCK
-
-#endif /* NO_DOWNSAMPLE */
-
-#ifndef NO_NTOM
-/*
-	Part 1d: ntom synth.
-	Same procedure as above... Just no extra play anymore, straight synth that uses the plain dct64.
-*/
-
-/* These are all in one header, there's no flexibility to gain. */
-#define SYNTH_NAME       synth_ntom
-#define MONO_NAME        synth_ntom_mono
-#define MONO2STEREO_NAME synth_ntom_m2s
-#include "synth_ntom.h"
-#undef SYNTH_NAME
-#undef MONO_NAME
-#undef MONO2STEREO_NAME
-
-#endif
-
-/* Done with short output. */
-#undef SAMPLE_T
-#undef WRITE_SAMPLE

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/synth.h Deleted

@@ -1,196 +0,0 @@
-/*
-	synth.h: generic synth functions 
-
-	copyright 1995-2008 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp, generalized by Thomas Orgis
-
-	This header is used multiple times to create different variants of these functions.
-	See decode.c and friends.
-	Hint: BLOCK, MONO_NAME, MONO2STEREO_NAME, SYNTH_NAME and SAMPLE_T as well as WRITE_SAMPLE do vary.
-
-	Thomas looked closely at the decode_1to1, decode_2to1 and decode_4to1 contents, seeing that they are too similar to be separate files.
-	This is what resulted...
-
-	Basically, you need one set of these functions for each output sample type.
-	That currently means signed short, 8bit or float/double; though unsigned short may come, too.
-
-	Define NO_AUTOINCREMENT i386 code that shall not rely on autoincrement.
-	Actual benefit of this has to be examined; may apply to specific (old) compilers, only.
-*/
-
-
-/* Main synth function, uses the plain dct64 or dct64_i386. */
-int SYNTH_NAME(real *bandPtr, int channel, mpg123_handle *fr, int final)
-{
-#ifndef NO_AUTOINCREMENT
-#define BACKPEDAL 0x10 /* We use autoincrement and thus need this re-adjustment for window/b0. */
-#define MY_DCT64 dct64
-#else
-#define BACKPEDAL 0x00 /* i386 code does not need that. */
-#define MY_DCT64 dct64_i386
-#endif
-	static const int step = 2;
-	SAMPLE_T *samples = (SAMPLE_T *) (fr->buffer.data + fr->buffer.fill);
-
-	real *b0, **buf; /* (*buf)[0x110]; */
-	int clip = 0; 
-	int bo1;
-
-	if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer);
-
-	if(!channel)
-	{
-		fr->bo--;
-		fr->bo &= 0xf;
-		buf = fr->real_buffs[0];
-	}
-	else
-	{
-#ifdef USE_DITHER
-		/* We always go forward 32 dither points (and back again for the second channel),
-		 (re)sampling the noise the same way as the original signal. */
-		fr->ditherindex -= 32;
-#endif
-		samples++;
-		buf = fr->real_buffs[1];
-	}
-#ifdef USE_DITHER
-	/* We check only once for the overflow of dither index here ...
-	 this wraps differently than the original i586 dither code, in theory (but when DITHERSIZE % BLOCK/2 == 0 it's the same). */
-	if(DITHERSIZE-fr->ditherindex < 32) fr->ditherindex = 0;
-	/* And we define a macro for the dither action... */
-	#define ADD_DITHER(fr,sum) sum+=fr->dithernoise[fr->ditherindex]; fr->ditherindex += 64/BLOCK;
-#else
-	#define ADD_DITHER(fr,sum)
-#endif
-
-	if(fr->bo & 0x1)
-	{
-		b0 = buf[0];
-		bo1 = fr->bo;
-		MY_DCT64(buf[1]+((fr->bo+1)&0xf),buf[0]+fr->bo,bandPtr);
-	}
-	else
-	{
-		b0 = buf[1];
-		bo1 = fr->bo+1;
-		MY_DCT64(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr);
-	}
-
-	{
-		register int j;
-		real *window = fr->decwin + 16 - bo1;
-
-		for(j=(BLOCK/4); j; j--, b0+=0x400/BLOCK-BACKPEDAL, window+=0x800/BLOCK-BACKPEDAL, samples+=step)
-		{
-			real sum;
-#ifndef NO_AUTOINCREMENT
-			sum = REAL_MUL_SYNTH(*window++, *b0++);
-			sum -= REAL_MUL_SYNTH(*window++, *b0++);
-			sum += REAL_MUL_SYNTH(*window++, *b0++);
-			sum -= REAL_MUL_SYNTH(*window++, *b0++);
-			sum += REAL_MUL_SYNTH(*window++, *b0++);
-			sum -= REAL_MUL_SYNTH(*window++, *b0++);
-			sum += REAL_MUL_SYNTH(*window++, *b0++);
-			sum -= REAL_MUL_SYNTH(*window++, *b0++);
-			sum += REAL_MUL_SYNTH(*window++, *b0++);
-			sum -= REAL_MUL_SYNTH(*window++, *b0++);
-			sum += REAL_MUL_SYNTH(*window++, *b0++);
-			sum -= REAL_MUL_SYNTH(*window++, *b0++);
-			sum += REAL_MUL_SYNTH(*window++, *b0++);
-			sum -= REAL_MUL_SYNTH(*window++, *b0++);
-			sum += REAL_MUL_SYNTH(*window++, *b0++);
-			sum -= REAL_MUL_SYNTH(*window++, *b0++);
-#else
-			sum = REAL_MUL_SYNTH(window[0x0], b0[0x0]);
-			sum -= REAL_MUL_SYNTH(window[0x1], b0[0x1]);
-			sum += REAL_MUL_SYNTH(window[0x2], b0[0x2]);
-			sum -= REAL_MUL_SYNTH(window[0x3], b0[0x3]);
-			sum += REAL_MUL_SYNTH(window[0x4], b0[0x4]);
-			sum -= REAL_MUL_SYNTH(window[0x5], b0[0x5]);
-			sum += REAL_MUL_SYNTH(window[0x6], b0[0x6]);
-			sum -= REAL_MUL_SYNTH(window[0x7], b0[0x7]);
-			sum += REAL_MUL_SYNTH(window[0x8], b0[0x8]);
-			sum -= REAL_MUL_SYNTH(window[0x9], b0[0x9]);
-			sum += REAL_MUL_SYNTH(window[0xA], b0[0xA]);
-			sum -= REAL_MUL_SYNTH(window[0xB], b0[0xB]);
-			sum += REAL_MUL_SYNTH(window[0xC], b0[0xC]);
-			sum -= REAL_MUL_SYNTH(window[0xD], b0[0xD]);
-			sum += REAL_MUL_SYNTH(window[0xE], b0[0xE]);
-			sum -= REAL_MUL_SYNTH(window[0xF], b0[0xF]);
-#endif
-
-			ADD_DITHER(fr,sum)
-			WRITE_SAMPLE(samples,sum,clip);
-		}
-
-		{
-			real sum;
-			sum = REAL_MUL_SYNTH(window[0x0], b0[0x0]);
-			sum += REAL_MUL_SYNTH(window[0x2], b0[0x2]);
-			sum += REAL_MUL_SYNTH(window[0x4], b0[0x4]);
-			sum += REAL_MUL_SYNTH(window[0x6], b0[0x6]);
-			sum += REAL_MUL_SYNTH(window[0x8], b0[0x8]);
-			sum += REAL_MUL_SYNTH(window[0xA], b0[0xA]);
-			sum += REAL_MUL_SYNTH(window[0xC], b0[0xC]);
-			sum += REAL_MUL_SYNTH(window[0xE], b0[0xE]);
-
-			ADD_DITHER(fr,sum)
-			WRITE_SAMPLE(samples,sum,clip);
-			samples += step;
-			b0-=0x400/BLOCK;
-			window-=0x800/BLOCK;
-		}
-		window += bo1<<1;
-
-		for(j=(BLOCK/4)-1; j; j--, b0-=0x400/BLOCK+BACKPEDAL, window-=0x800/BLOCK-BACKPEDAL, samples+=step)
-		{
-			real sum;
-#ifndef NO_AUTOINCREMENT
-			sum = -REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-			sum -= REAL_MUL_SYNTH(*(--window), *b0++);
-#else
-			sum = -REAL_MUL_SYNTH(window[-0x1], b0[0x0]);
-			sum -= REAL_MUL_SYNTH(window[-0x2], b0[0x1]);
-			sum -= REAL_MUL_SYNTH(window[-0x3], b0[0x2]);
-			sum -= REAL_MUL_SYNTH(window[-0x4], b0[0x3]);
-			sum -= REAL_MUL_SYNTH(window[-0x5], b0[0x4]);
-			sum -= REAL_MUL_SYNTH(window[-0x6], b0[0x5]);
-			sum -= REAL_MUL_SYNTH(window[-0x7], b0[0x6]);
-			sum -= REAL_MUL_SYNTH(window[-0x8], b0[0x7]);
-			sum -= REAL_MUL_SYNTH(window[-0x9], b0[0x8]);
-			sum -= REAL_MUL_SYNTH(window[-0xA], b0[0x9]);
-			sum -= REAL_MUL_SYNTH(window[-0xB], b0[0xA]);
-			sum -= REAL_MUL_SYNTH(window[-0xC], b0[0xB]);
-			sum -= REAL_MUL_SYNTH(window[-0xD], b0[0xC]);
-			sum -= REAL_MUL_SYNTH(window[-0xE], b0[0xD]);
-			sum -= REAL_MUL_SYNTH(window[-0xF], b0[0xE]);
-			sum -= REAL_MUL_SYNTH(window[-0x0], b0[0xF]); /* Is that right? 0x0? Just wondering... */
-#endif
-			ADD_DITHER(fr,sum)
-			WRITE_SAMPLE(samples,sum,clip);
-		}
-	}
-
-	if(final) fr->buffer.fill += BLOCK*sizeof(SAMPLE_T);
-
-	return clip;
-#undef ADD_DITHER
-#undef BACKPEDAL
-#undef MY_DCT64
-}

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/synth_mono.h Deleted

@@ -1,64 +0,0 @@
-/*
-	monosynth.h: generic mono related synth functions 
-
-	copyright 1995-2008 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp, generalized by Thomas Orgis
-
-	This header is used multiple times to create different variants of these functions.
-	See decode.c and synth.h .
-	Hint: BLOCK, MONO_NAME, MONO2STEREO_NAME, SYNTH_NAME and SAMPLE_T do vary.
-
-	Thomas looked closely at the decode_1to1, decode_2to1 and decode_4to1 contents, seeing that they are too similar to be separate files.
-	This is what resulted...
-
-	Reason to separate this from synth.h:
-	There are decoders that have a special synth_1to1 but still can use these generic derivations for the mono stuff.
-	It generally makes a good deal of sense to set SYNTH_NAME to opt_synth_1to1(fr) (or opt_synth_2to1(fr), etc.).
-*/
-
-/* Mono synth, wrapping over SYNTH_NAME */
-int MONO_NAME(real *bandPtr, mpg123_handle *fr)
-{
-	SAMPLE_T samples_tmp[BLOCK];
-	SAMPLE_T *tmp1 = samples_tmp;
-	int i,ret;
-
-	/* save buffer stuff, trick samples_tmp into there, decode, restore */
-	unsigned char *samples = fr->buffer.data;
-	int pnt = fr->buffer.fill;
-	fr->buffer.data = (unsigned char*) samples_tmp;
-	fr->buffer.fill = 0;
-	ret = SYNTH_NAME(bandPtr, 0, fr, 0); /* decode into samples_tmp */
-	fr->buffer.data = samples; /* restore original value */
-
-	/* now append samples from samples_tmp */
-	samples += pnt; /* just the next mem in frame buffer */
-	for(i=0;i<(BLOCK/2);i++)
-	{
-		*( (SAMPLE_T *)samples) = *tmp1;
-		samples += sizeof(SAMPLE_T);
-		tmp1 += 2;
-	}
-	fr->buffer.fill = pnt + (BLOCK/2)*sizeof(SAMPLE_T);
-
-	return ret;
-}
-
-/* Mono to stereo synth, wrapping over SYNTH_NAME */
-int MONO2STEREO_NAME(real *bandPtr, mpg123_handle *fr)
-{
-	int i,ret;
-	unsigned char *samples = fr->buffer.data;
-
-	ret = SYNTH_NAME(bandPtr,0,fr,1);
-	samples += fr->buffer.fill - BLOCK*sizeof(SAMPLE_T);
-
-	for(i=0;i<(BLOCK/2);i++)
-	{
-		((SAMPLE_T *)samples)[1] = ((SAMPLE_T *)samples)[0];
-		samples+=2*sizeof(SAMPLE_T);
-	}
-
-	return ret;
-}

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/synths.h Deleted

@@ -1,52 +0,0 @@
-#ifndef MPG123_SYNTH_H
-#define MPG123_SYNTH_H
-
-/* This is included inside frame.h, which is included in mpg123lib_intern.h,
-   at the appropriate place.
-   Explicit header inclusions here would cause circular dependencies. */
-
-/* The handle needs these types for selecting the decoding routine at runtime.
-   Not just for optimization, mainly for XtoY, mono/stereo. */
-typedef int (*func_synth)(real *,int, mpg123_handle *,int );
-typedef int (*func_synth_mono)(real *, mpg123_handle *);
-typedef int (*func_synth_stereo)(real *, real *, mpg123_handle *);
-enum synth_channel  { c_plain=0, c_stereo, c_m2s, c_mono, c_limit };
-enum synth_resample
-{
-	 r_none=-1
-	,r_1to1=0
-#	ifndef NO_DOWNSAMPLE
-	,r_2to1
-	,r_4to1
-#	endif
-#	ifndef NO_NTOM
-	,r_ntom
-#	endif
-	,r_limit
-};
-enum synth_format
-{
-	 f_none=-1
-#	ifndef NO_16BIT
-	,f_16
-#	endif
-#	ifndef NO_8BIT
-	,f_8
-#	endif
-#	ifndef NO_REAL
-	,f_real
-#	endif
-#	ifndef NO_32BIT
-	,f_32
-#	endif
-	,f_limit
-};
-struct synth_s
-{
-	func_synth              plain[r_limit][f_limit];
-	func_synth_stereo      stereo[r_limit][f_limit];
-	func_synth_mono   mono2stereo[r_limit][f_limit];
-	func_synth_mono          mono[r_limit][f_limit];
-};
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/tabinit.c Deleted

@@ -1,294 +0,0 @@
-/*
-	tabinit.c: initialize tables...
-
-	copyright ?-2008 by the mpg123 project - free software under the terms of the LGPL 2.1
-	see COPYING and AUTHORS files in distribution or http://mpg123.org
-	initially written by Michael Hipp
-*/
-
-#include "mpg123lib_intern.h"
-#include "debug.h"
-
-/* That altivec alignment part here should not hurt generic code, I hope */
-#ifdef OPT_ALTIVEC
-static ALIGNED(16) real cos64[16];
-static ALIGNED(16) real cos32[8];
-static ALIGNED(16) real cos16[4];
-static ALIGNED(16) real cos8[2];
-static ALIGNED(16) real cos4[1];
-#elif defined(REAL_IS_FIXED) && defined(PRECALC_TABLES)
-static real cos64[16] = 
-{
-	8398725,8480395,8647771,8909416,9279544,9780026,10443886,11321405,
-	12491246,14081950,16316987,19619946,24900150,34523836,57170182,170959967
-};
-static real cos32[8] =
-{
-	8429197,8766072,9511743,10851869,13223040,17795219,28897867,85583072
-};
-static real cos16[4] =
-{
-	8552951,10088893,15099095,42998586
-};
-static real cos8[2] =
-{
-	9079764,21920489
-};
-static real cos4[1] =
-{
-	11863283
-};
-#else
-static real cos64[16],cos32[8],cos16[4],cos8[2],cos4[1];
-#endif
-
-real *pnts[] = { cos64,cos32,cos16,cos8,cos4 };
-
-
-static long intwinbase[] = {
- 0, -1, -1, -1, -1, -1, -1, -2, -2, -2,
- -2, -3, -3, -4, -4, -5, -5, -6, -7, -7,
- -8, -9, -10, -11, -13, -14, -16, -17, -19, -21,
- -24, -26, -29, -31, -35, -38, -41, -45, -49, -53,
- -58, -63, -68, -73, -79, -85, -91, -97, -104, -111,
- -117, -125, -132, -139, -147, -154, -161, -169, -176, -183,
- -190, -196, -202, -208, -213, -218, -222, -225, -227, -228,
- -228, -227, -224, -221, -215, -208, -200, -189, -177, -163,
- -146, -127, -106, -83, -57, -29, 2, 36, 72, 111,
- 153, 197, 244, 294, 347, 401, 459, 519, 581, 645,
- 711, 779, 848, 919, 991, 1064, 1137, 1210, 1283, 1356,
- 1428, 1498, 1567, 1634, 1698, 1759, 1817, 1870, 1919, 1962,
- 2001, 2032, 2057, 2075, 2085, 2087, 2080, 2063, 2037, 2000,
- 1952, 1893, 1822, 1739, 1644, 1535, 1414, 1280, 1131, 970,
- 794, 605, 402, 185, -45, -288, -545, -814, -1095, -1388,
- -1692, -2006, -2330, -2663, -3004, -3351, -3705, -4063, -4425, -4788,
- -5153, -5517, -5879, -6237, -6589, -6935, -7271, -7597, -7910, -8209,
- -8491, -8755, -8998, -9219, -9416, -9585, -9727, -9838, -9916, -9959,
- -9966, -9935, -9863, -9750, -9592, -9389, -9139, -8840, -8492, -8092,
- -7640, -7134, -6574, -5959, -5288, -4561, -3776, -2935, -2037, -1082,
- -70, 998, 2122, 3300, 4533, 5818, 7154, 8540, 9975, 11455,
- 12980, 14548, 16155, 17799, 19478, 21189, 22929, 24694, 26482, 28289,
- 30112, 31947, 33791, 35640, 37489, 39336, 41176, 43006, 44821, 46617,
- 48390, 50137, 51853, 53534, 55178, 56778, 58333, 59838, 61289, 62684,
- 64019, 65290, 66494, 67629, 68692, 69679, 70590, 71420, 72169, 72835,
- 73415, 73908, 74313, 74630, 74856, 74992, 75038 };
-
-void prepare_decode_tables()
-{
-#if !defined(REAL_IS_FIXED) || !defined(PRECALC_TABLES)
- int i,k,kr,divv;
- real *costab;
-
- for(i=0;i<5;i++)
- {
- kr=0x10>>i; divv=0x40>>i;
- costab = pnts[i];
- for(k=0;k<kr;k++)
- costab[k] = DOUBLE_TO_REAL(1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv)));
- }
-#endif
-}
-
-#ifdef OPT_MMXORSSE
-#if !defined(OPT_X86_64) && !defined(OPT_NEON)
-void make_decode_tables_mmx_asm(long scaleval, float* decwin_mmx, float *decwins);
-void make_decode_tables_mmx(mpg123_handle *fr)
-{
-	debug("MMX decode tables");
-	/* Take care: The scale should be like before, when we didn't have float output all around. */
-	make_decode_tables_mmx_asm((long)((fr->lastscale < 0 ? fr->p.outscale : fr->lastscale)*SHORT_SCALE), fr->decwin_mmx, fr->decwins);
-	debug("MMX decode tables done");
-}
-#else
-
-/* This mimics round() as defined in C99. We stay C89. */
-static int rounded(double f)
-{
-	return (int)(f>0 ? floor(f+0.5) : ceil(f-0.5));
-}
-
-/* x86-64 doesn't use asm version */
-void make_decode_tables_mmx(mpg123_handle *fr)
-{
-	int i,j,val;
-	int idx = 0;
-	short *ptr = (short *)fr->decwins;
-	/* Scale is always based on 1.0 . */
-	double scaleval = -0.5*(fr->lastscale < 0 ? fr->p.outscale : fr->lastscale);
-	debug1("MMX decode tables with scaleval %g", scaleval);
-	for(i=0,j=0;i<256;i++,j++,idx+=32)
-	{
-		if(idx < 512+16)
-		fr->decwin_mmx[idx+16] = fr->decwin_mmx[idx] = DOUBLE_TO_REAL((double) intwinbase[j] * scaleval);
-		
-		if(i % 32 == 31)
-		idx -= 1023;
-		if(i % 64 == 63)
-		scaleval = - scaleval;
-	}
-	
-	for( /* i=256 */ ;i<512;i++,j--,idx+=32)
-	{
-		if(idx < 512+16)
-		fr->decwin_mmx[idx+16] = fr->decwin_mmx[idx] = DOUBLE_TO_REAL((double) intwinbase[j] * scaleval);
-		
-		if(i % 32 == 31)
-		idx -= 1023;
-		if(i % 64 == 63)
-		scaleval = - scaleval;
-	}
-	
-	for(i=0; i<512; i++) {
-		if(i&1) val = rounded(fr->decwin_mmx[i]*0.5);
-		else val = rounded(fr->decwin_mmx[i]*-0.5);
-		if(val > 32767) val = 32767;
-		else if(val < -32768) val = -32768;
-		ptr[i] = val;
-	}
-	for(i=512; i<512+32; i++) {
-		if(i&1) val = rounded(fr->decwin_mmx[i]*0.5);
-		else val = 0;
-		if(val > 32767) val = 32767;
-		else if(val < -32768) val = -32768;
-		ptr[i] = val;
-	}
-	for(i=0; i<512; i++) {
-		val = rounded(fr->decwin_mmx[511-i]*-0.5);
-		if(val > 32767) val = 32767;
-		else if(val < -32768) val = -32768;
-		ptr[512+32+i] = val;
-	}
-	debug("decode tables done");
-}
-#endif
-#endif
-
-void make_decode_tables(mpg123_handle *fr)
-{
-	int i,j;
-	int idx = 0;
-	/* Scale is always based on 1.0 . */
-	double scaleval = -0.5*(fr->lastscale < 0 ? fr->p.outscale : fr->lastscale);
-	debug1("decode tables with scaleval %g", scaleval);
-#ifdef REAL_IS_FIXED
-	long scaleval_long = DOUBLE_TO_REAL_15(scaleval);
-#endif
-	for(i=0,j=0;i<256;i++,j++,idx+=32)
-	{
-		if(idx < 512+16)
-#ifdef REAL_IS_FIXED
-		fr->decwin[idx+16] = fr->decwin[idx] = REAL_SCALE_WINDOW(intwinbase[j] * scaleval_long);
-#else
-		fr->decwin[idx+16] = fr->decwin[idx] = DOUBLE_TO_REAL((double) intwinbase[j] * scaleval);
-#endif
-
-		if(i % 32 == 31)
-		idx -= 1023;
-		if(i % 64 == 63)
-#ifdef REAL_IS_FIXED
-		scaleval_long = - scaleval_long;
-#else
-		scaleval = - scaleval;
-#endif
-	}
-
-	for( /* i=256 */ ;i<512;i++,j--,idx+=32)
-	{
-		if(idx < 512+16)
-#ifdef REAL_IS_FIXED
-		fr->decwin[idx+16] = fr->decwin[idx] = REAL_SCALE_WINDOW(intwinbase[j] * scaleval_long);
-#else
-		fr->decwin[idx+16] = fr->decwin[idx] = DOUBLE_TO_REAL((double) intwinbase[j] * scaleval);
-#endif
-
-		if(i % 32 == 31)
-		idx -= 1023;
-		if(i % 64 == 63)
-#ifdef REAL_IS_FIXED
-		scaleval_long = - scaleval_long;
-#else
-		scaleval = - scaleval;
-#endif
-	}
-#if defined(OPT_X86_64) || defined(OPT_ALTIVEC) || defined(OPT_SSE) || defined(OPT_ARM) || defined(OPT_NEON)
-	if(fr->cpu_opts.type == x86_64 || fr->cpu_opts.type == altivec || fr->cpu_opts.type == sse || fr->cpu_opts.type == arm || fr->cpu_opts.type == neon)
-	{ /* for float SSE / AltiVec / ARM decoder */
-		for(i=512; i<512+32; i++)
-		{
-			fr->decwin[i] = (i&1) ? fr->decwin[i] : 0;
-		}
-		for(i=0; i<512; i++)
-		{
-			fr->decwin[512+32+i] = -fr->decwin[511-i];
-		}
-#ifdef OPT_NEON
-		if(fr->cpu_opts.type == neon)
-		{
-			for(i=0; i<512; i+=2)
-			{
-				fr->decwin[i] = -fr->decwin[i];
-			}
-		}
-#endif
-	}
-#endif
-	debug("decode tables done");
-}
-
-#ifndef NO_8BIT
-int make_conv16to8_table(mpg123_handle *fr)
-{
- int i;
-	int mode = fr->af.encoding;
-
- /*
- * ????: 8.0 is right but on SB cards '2.0' is a better value ???
- */
- const double mul = 8.0;
-
- if(!fr->conv16to8_buf){
- fr->conv16to8_buf = (unsigned char *) malloc(8192);
- if(!fr->conv16to8_buf) {
- fr->err = MPG123_ERR_16TO8TABLE;
- if(NOQUIET) error("Can't allocate 16 to 8 converter table!");
- return -1;
- }
- fr->conv16to8 = fr->conv16to8_buf + 4096;
- }
-
- if(fr->af.encoding == MPG123_ENC_ULAW_8){
- double m=127.0 / log(256.0);
- int c1;
-
- for(i=-4096;i<4096;i++) {
-/* dunno whether this is a valid transformation rule ?!?!? */
- if(i < 0)
- c1 = 127 - (int) (log( 1.0 - 255.0 * (double) i*mul / 32768.0 ) * m);
- else
- c1 = 255 - (int) (log( 1.0 + 255.0 * (double) i*mul / 32768.0 ) * m);
- if((c1 < 0 || c1 > 255) && NOQUIET) error2("Converror %d %d",i,c1);
-
- if(c1 == 0)
- c1 = 2;
- fr->conv16to8[i] = (unsigned char) c1;
- }
- }
- else if(mode == MPG123_ENC_SIGNED_8) {
- for(i=-4096;i<4096;i++) {
- fr->conv16to8[i] = i>>5;
- }
- }
- else if(mode == MPG123_ENC_UNSIGNED_8) {
- for(i=-4096;i<4096;i++) {
- fr->conv16to8[i] = (i>>5)+128;
- }
- }
- else {
- for(i=-4096;i<4096;i++) {
- fr->conv16to8[i] = 0;
- }
- }
-	return 0;
-}
-#endif
-

audacious-plugins-2.5.3.tar.gz/src/mpg123/libmpg123/true.h Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/TODO Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/actuators.c Deleted

@@ -1,196 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <glib.h>
-
-#include "actuators.h"
-//#include "containers.h"
-
-/* FIXME: container options override containees - fix this? */
-/* FIXME: add actuator groups (by a group name string) */
-
-/* FIXME: add support for copying containers' children (optionally) */
-struct pn_actuator *
-copy_actuator (const struct pn_actuator *a)
-{
- struct pn_actuator *actuator;
- int i; 
-
- actuator = g_new (struct pn_actuator, 1);
-
- actuator->desc = a->desc;
-
- /* Make an options table */
- if (actuator->desc->option_descs)
- {
- /* count the options */
- for (i=0; actuator->desc->option_descs[i].name; i++);
-
- actuator->options = g_new (struct pn_actuator_option, i + 1);
- for (i=0; actuator->desc->option_descs[i].name; i++)
-	{
-	 actuator->options[i].desc = &actuator->desc->option_descs[i];
-
-	 /* copy the default options */
-	 switch (actuator->desc->option_descs[i].type)
-	 {
-	 case OPT_TYPE_INT:
-	 case OPT_TYPE_COLOR_INDEX:
-	 case OPT_TYPE_FLOAT:
-	 case OPT_TYPE_COLOR:
-	 case OPT_TYPE_BOOLEAN:
-	 memcpy (&actuator->options[i].val,
-		 &a->options[i].val,
-		 sizeof (union actuator_option_val));
-	 break;
-	 case OPT_TYPE_STRING:
- actuator->options[i].val.sval = g_strdup(a->options[i].val.sval);
- break;
-	 default:
-	 break;
-	 }
-	}
-
- /* the NULL option */
- actuator->options[i].desc = NULL;
- }
- else
- actuator->options = NULL;
-
- if (actuator->desc->init)
- actuator->desc->init (&actuator->data);
-
- return actuator;
-}
-
-struct pn_actuator_desc *
-get_actuator_desc (const char *name)
-{
- int i;
-
- for (i=0; builtin_table[i]; i++)
- if (! g_strcasecmp (name, builtin_table[i]->name) || ! g_strcasecmp(name, builtin_table[i]->dispname))
- break;
-
- /* actuator not found */
- if (! builtin_table[i])
- return NULL;
-
- return builtin_table[i];
-}
-
-struct pn_actuator *
-create_actuator (const char *name)
-{
- int i;
- struct pn_actuator_desc *desc;
- struct pn_actuator *actuator;
-
- /* find the actuatoreration */
- desc = get_actuator_desc (name);
-
- if (! desc)
- return NULL;
-
- actuator = g_new (struct pn_actuator, 1);
- actuator->desc = desc;
-
- /* Make an options table */
- if (actuator->desc->option_descs)
- {
- /* count the options */
- for (i=0; actuator->desc->option_descs[i].name != NULL; i++);
-
- actuator->options = g_new0 (struct pn_actuator_option, i + 1);
- for (i=0; actuator->desc->option_descs[i].name != NULL; i++)
-	{
-	 actuator->options[i].desc = &actuator->desc->option_descs[i];
-
-	 /* copy the default options */
-	 switch (actuator->desc->option_descs[i].type)
-	 {
-	 case OPT_TYPE_INT:
-	 case OPT_TYPE_COLOR_INDEX:
-	 case OPT_TYPE_FLOAT:
-	 case OPT_TYPE_COLOR:
-	 case OPT_TYPE_BOOLEAN:
-	 memcpy (&actuator->options[i].val,
-		 &actuator->desc->option_descs[i].default_val,
-		 sizeof (union actuator_option_val));
-	 break;
-	 case OPT_TYPE_STRING:
-	 /* NOTE: It's not realloc'ed so don't free it */
-	 actuator->options[i].val.sval =
-		actuator->desc->option_descs[i].default_val.sval;
-	 break;
-	 }
-	}
-
- /* the NULL option */
- actuator->options[i].desc = NULL;
- }
- else
- actuator->options = NULL;
-
- if (actuator->desc->init)
- actuator->desc->init (&actuator->data);
-
- return actuator;
-}
-
-void
-destroy_actuator (struct pn_actuator *actuator)
-{
- int i;
-
- if (actuator->desc->cleanup)
- actuator->desc->cleanup (actuator->data);
-
- /* find any option val's that need to be freed */
- if (actuator->options)
- for (i=0; actuator->options[i].desc; i++)
- switch (actuator->options[i].desc->type)
-	{
-	case OPT_TYPE_INT:
-	case OPT_TYPE_FLOAT:
-	case OPT_TYPE_COLOR:
-	case OPT_TYPE_COLOR_INDEX:
-	case OPT_TYPE_BOOLEAN:
-	 break;
-	case OPT_TYPE_STRING:
-	 if (actuator->options[i].val.sval
-	 != actuator->options[i].desc->default_val.sval)
-	 g_free ((char *)actuator->options[i].val.sval);
-	}
-
- g_free (actuator->options);
- g_free (actuator);
-}
-
-void
-exec_actuator (struct pn_actuator *actuator)
-{
- g_assert (actuator);
- g_assert (actuator->desc);
- g_assert (actuator->desc->exec);
- actuator->desc->exec (actuator->options, actuator->data);
-}
-

audacious-plugins-2.5.3.tar.gz/src/paranormal/actuators.h Deleted

@@ -1,118 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/* FIXME: rename actuators to pn_actuators */
-/* FIXME: add a color type to the OPT_TYPE's */
-
-#ifndef _ACTUATORS_H
-#define _ACTUATORS_H
-
-#include <glib.h>
-#include <SDL.h>
-
-/* Helper macros for actuator functions */
-#define PN_ACTUATOR_INIT_FUNC(f) ((void (*) (gpointer *data))f)
-#define PN_ACTUATOR_CLEANUP_FUNC(f) ((void (*) (gpointer data))f)
-#define PN_ACTUATOR_EXEC_FUNC(f) \
-((void (*) (const struct pn_actuator_option *opts, gpointer data))f)
-
-struct pn_color
-{
- guchar r, g, b;
- guchar spluzz; /* gotta look like an SDL_Color */
-};
-
-
-union actuator_option_val
-{
- int ival;
- float fval;
- const char *sval;
- struct pn_color cval;
- gboolean bval;
-};
-
-/* A actuator's option description */
-struct pn_actuator_option_desc
-{
- const char *name;
- const char *doc; /* option documentation */
- enum
- {
- OPT_TYPE_INT = 0,
- OPT_TYPE_FLOAT = 1,
- OPT_TYPE_STRING = 2,
- OPT_TYPE_COLOR = 3,
- OPT_TYPE_COLOR_INDEX = 4, /* uses ival */
- OPT_TYPE_BOOLEAN = 5
- } type;
- union actuator_option_val default_val;
-};
-
-/* The actual option instance */
-struct pn_actuator_option
-{
- const struct pn_actuator_option_desc *desc;
- union actuator_option_val val;
-};
-
-/* An operation's description */
-struct pn_actuator_desc
-{
- const char *name;	/* e.g. "container_simple" */
- const char *dispname;	/* e.g. "Simple Container" */
- const char *doc; /* documentation txt */
- const enum
- {
- ACTUATOR_FLAG_CONTAINER = 1<<0
- } flags;
-
- /* A null terminating (ie a actuator_option_desc == {0,...,0})
- array - OPTIONAL (optional fields can be NULL) */
- const struct pn_actuator_option_desc *option_descs;
-
- /* Init function - data points to the actuator.data - OPTIONAL */
- void (*init) (gpointer *data);
-
- /* Cleanup actuatortion - OPTIONAL */
- void (*cleanup) (gpointer data);
-
- /* Execute actuatortion - REQUIRED (duh!) */
- void (*exec) (const struct pn_actuator_option *opts, gpointer data);
-};
-
-/* An actual operation instance */
-struct pn_actuator
-{
- const struct pn_actuator_desc *desc;
- struct pn_actuator_option *options;
- gpointer data;
-};
-
-/* The array containing all operations (see builtins.c) */
-extern struct pn_actuator_desc *builtin_table[];
-
-/* functions for actuators */
-struct pn_actuator_desc *get_actuator_desc (const char *name);
-struct pn_actuator *copy_actuator (const struct pn_actuator *a);
-struct pn_actuator *create_actuator (const char *name);
-void destroy_actuator (struct pn_actuator *actuator);
-void exec_actuator (struct pn_actuator *actuator);
-
-#endif /* _ACTUATORS_H */

audacious-plugins-2.5.3.tar.gz/src/paranormal/beatdetect.c Deleted

@@ -1,49 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "paranormal.h"
-
-/*
- * This algorithm is by Janusz Gregorcyzk, the implementation is
- * mine, however.
- *
- * -- nenolod
- */
-int
-pn_is_new_beat(void)
-{
- gint i;
- gint total = 0;
- gboolean ret = FALSE;
- static gint previous;
-
- for (i = 1; i < 512; i++)
- {
- total += abs (pn_sound_data->pcm_data[0][i] -
-		 pn_sound_data->pcm_data[0][i - 1]);
- }
-
- total /= 512;
-
- ret = (total > (2 * previous));
-
- previous = total;
-
- return ret;
-}

audacious-plugins-2.5.3.tar.gz/src/paranormal/builtins.c Deleted

@@ -1,121 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include "actuators.h"
-
-#define DECLARE_ACTUATOR(a) extern struct pn_actuator_desc builtin_##a;
-
-/* **************** containers **************** */
-
-DECLARE_ACTUATOR (container_simple);
-DECLARE_ACTUATOR (container_once);
-DECLARE_ACTUATOR (container_cycle);
-DECLARE_ACTUATOR (container_onbeat);
-
-/* **************** cmaps **************** */
-
-DECLARE_ACTUATOR (cmap_bwgradient);
-DECLARE_ACTUATOR (cmap_gradient);
-DECLARE_ACTUATOR (cmap_dynamic);
-
-/* **************** freq **************** */
-DECLARE_ACTUATOR (freq_dots);
-DECLARE_ACTUATOR (freq_drops);
-
-/* **************** general **************** */
-DECLARE_ACTUATOR (general_fade);
-DECLARE_ACTUATOR (general_blur);
-DECLARE_ACTUATOR (general_mosaic);
-DECLARE_ACTUATOR (general_clear);
-DECLARE_ACTUATOR (general_noop);
-DECLARE_ACTUATOR (general_invert);
-DECLARE_ACTUATOR (general_replace);
-DECLARE_ACTUATOR (general_swap);
-DECLARE_ACTUATOR (general_copy);
-DECLARE_ACTUATOR (general_flip);
-DECLARE_ACTUATOR (general_evaluate);
-
-/* **************** misc **************** */
-DECLARE_ACTUATOR (misc_floater);
-
-/* **************** wave **************** */
-DECLARE_ACTUATOR (wave_horizontal);
-DECLARE_ACTUATOR (wave_vertical);
-DECLARE_ACTUATOR (wave_normalize);
-DECLARE_ACTUATOR (wave_smooth);
-DECLARE_ACTUATOR (wave_radial);
-DECLARE_ACTUATOR (wave_scope);
-
-/* **************** xform **************** */
-DECLARE_ACTUATOR (xform_spin);
-DECLARE_ACTUATOR (xform_ripple);
-DECLARE_ACTUATOR (xform_bump_spin);
-DECLARE_ACTUATOR (xform_halfrender);
-DECLARE_ACTUATOR (xform_movement);
-DECLARE_ACTUATOR (xform_dynmovement);
-
-/* **************** builtin_table **************** */
-struct pn_actuator_desc *builtin_table[] =
-{
- /* **************** containers **************** */
- &builtin_container_simple,
- &builtin_container_once,
- &builtin_container_cycle,
- &builtin_container_onbeat,
-
- /* **************** cmaps **************** */
- &builtin_cmap_bwgradient,
- &builtin_cmap_gradient,
- &builtin_cmap_dynamic,
- /* **************** freq **************** */
- &builtin_freq_dots,
- &builtin_freq_drops,
- /* **************** general **************** */
- &builtin_general_fade,
- &builtin_general_blur,
- &builtin_general_mosaic,
- &builtin_general_clear,
- &builtin_general_noop,
- &builtin_general_invert,
- &builtin_general_replace,
- &builtin_general_swap,
- &builtin_general_copy,
- &builtin_general_flip,
- &builtin_general_evaluate,
- /* **************** misc **************** */
- &builtin_misc_floater,
- /* **************** wave **************** */
- &builtin_wave_horizontal,
- &builtin_wave_vertical,
- &builtin_wave_normalize,
- &builtin_wave_smooth,
- &builtin_wave_radial,
- &builtin_wave_scope,
- /* **************** xform **************** */
- &builtin_xform_spin,
- &builtin_xform_ripple,
- &builtin_xform_bump_spin,
- &builtin_xform_halfrender,
- &builtin_xform_movement,
- &builtin_xform_dynmovement,
- /* **************** the end! **************** */
- NULL
-};

audacious-plugins-2.5.3.tar.gz/src/paranormal/cfg.c Deleted

@@ -1,653 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/* FIXME: prevent the user from dragging something above the root
- actuator */
-
-#include <config.h>
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <math.h>
-
-#include <audacious/configdb.h>
-#include <audacious/plugin.h>
-
-#include "paranormal.h"
-#include "actuators.h"
-#include "containers.h"
-#include "presets.h"
-
-/* DON'T CALL pn_fatal_error () IN HERE!!! */
-
-/* Actuator page stuffs */
-static GtkWidget *cfg_dialog, *actuator_tree, *option_frame, *actuator_option_table;
-static GtkWidget *actuator_add_opmenu, *actuator_add_button, *actuator_remove_button;
-static GtkCTreeNode *selected_actuator_node;
-static GtkTooltips *actuator_tooltips;
-
-/* This is used so that actuator_row_data_destroyed_cb won't free
- the actuator associated w/ the node since we're going to be using it */
-gboolean destroy_row_data = TRUE;
-
-static void
-actuator_row_data_destroyed_cb (struct pn_actuator *a)
-{
- if (a && destroy_row_data)
- destroy_actuator (a);
-}
-
-static void
-add_actuator (struct pn_actuator *a, GtkCTreeNode *parent, gboolean copy)
-{
- GtkCTreeNode *node;
- GSList *l;
-
- g_assert (cfg_dialog);
- g_assert (actuator_tree);
- g_assert (actuator_option_table);
-
- node = gtk_ctree_insert_node (GTK_CTREE (actuator_tree), parent,
-				NULL, (gchar**)&a->desc->dispname, 0,
-				NULL, NULL, NULL, NULL,
-				a->desc->flags & ACTUATOR_FLAG_CONTAINER
-				? FALSE : TRUE,
-				TRUE);
-
- if (a->desc->flags & ACTUATOR_FLAG_CONTAINER)
- for (l=*(GSList **)a->data; l; l = l->next)
- {
-	add_actuator (l->data, node, copy);
- }
-
- if (copy)
- a = copy_actuator (a);
- else if (a->desc->flags & ACTUATOR_FLAG_CONTAINER)
- container_unlink_actuators (a);
-
- gtk_ctree_node_set_row_data_full (GTK_CTREE (actuator_tree), node, a,
-				 ((GtkDestroyNotify) actuator_row_data_destroyed_cb));
-}
-
-static guchar
-gdk_colour_to_paranormal_colour(gint16 colour)
-{
- return (guchar) (colour / 255);
-}
-
-static gint16
-paranormal_colour_to_gdk_colour(guchar colour)
-{
- return (gint16) (colour * 255);
-}
-
-static void
-int_changed_cb (GtkSpinButton *sb, int *i)
-{
- *i = gtk_spin_button_get_value_as_int (sb);
-}
-
-static void
-float_changed_cb (GtkSpinButton *sb, float *f)
-{
- *f = gtk_spin_button_get_value_as_float (sb);
-}
-
-static void
-string_changed_cb (GtkEditable *t, char **s)
-{
- if (*s != gtk_object_get_data (GTK_OBJECT (t), "DEFAULT_OP_STRING"))
- g_free (*s);
-
- *s = gtk_editable_get_chars (t, 0, -1);
-}
-
-static void
-color_changed_cb (GtkColorButton *cb, struct pn_color *c)
-{
- GdkColor colour;
-
- gtk_color_button_get_color(cb, &colour);
-
- c->r = gdk_colour_to_paranormal_colour(colour.red);
- c->g = gdk_colour_to_paranormal_colour(colour.green);
- c->b = gdk_colour_to_paranormal_colour(colour.blue);
-}
-
-static void
-boolean_changed_cb (GtkToggleButton *tb, gboolean *b)
-{
- *b = gtk_toggle_button_get_active (tb);
-}
-
-static void
-row_select_cb (GtkCTree *ctree, GtkCTreeNode *node,
-	 gint column, gpointer data)
-{
- struct pn_actuator *a;
- int opt_count = 0, i, j;
- GtkWidget *w;
- GtkObject *adj;
-
- a = (struct pn_actuator *)gtk_ctree_node_get_row_data (ctree, node);
-
- /* count the actuator's options (plus one) */
- if (a->desc->option_descs)
- while (a->desc->option_descs[opt_count++].name);
- else
- opt_count = 1;
-
- gtk_table_resize (GTK_TABLE (actuator_option_table), opt_count, 2);
-
- /* Actuator name */
- gtk_frame_set_label (GTK_FRAME (option_frame), a->desc->dispname);
-
- /* Actuator description */
- w = gtk_label_new (a->desc->doc);
- gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
- gtk_label_set_justify (GTK_LABEL (w), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (w), 0, .5);
- gtk_widget_show (w);
- gtk_table_attach (GTK_TABLE (actuator_option_table), w, 0, 2, 0, 1,
-		 GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0,
-		 3, 3);
-
- /* now add the options */
- for (i=1, j=0; i<opt_count; j++, i++)
- {
- w = gtk_label_new (a->desc->option_descs[j].name);
- gtk_widget_show (w);
- gtk_table_attach (GTK_TABLE (actuator_option_table), w,
-			0, 1, i, i+1,
-			GTK_SHRINK | GTK_FILL, 0,
-			3, 3);
- switch (a->desc->option_descs[j].type)
-	{
-	case OPT_TYPE_INT:
-	 adj = gtk_adjustment_new (a->options[j].val.ival,
-				 G_MININT, G_MAXINT,
-				 1, 2, 0);
-	 w = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1.0, 0);
-	 gtk_signal_connect (GTK_OBJECT (w), "changed",
-			 GTK_SIGNAL_FUNC (int_changed_cb),
-			 &a->options[j].val.ival);
-	 break;
-	case OPT_TYPE_FLOAT:
-	 adj = gtk_adjustment_new (a->options[j].val.fval,
-				 -G_MAXFLOAT, G_MAXFLOAT,
-				 1, 2, 0);
-	 w = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1.0, 5);
-	 gtk_signal_connect (GTK_OBJECT (w), "changed",
-			 GTK_SIGNAL_FUNC (float_changed_cb),
-			 &a->options[j].val.fval);
-	 break;
-	case OPT_TYPE_STRING:
-	 w = gtk_entry_new ();
-	 gtk_widget_show (w);
-	 gtk_entry_set_text (GTK_ENTRY (w), a->options[j].val.sval);
-	 gtk_object_set_data (GTK_OBJECT (w), "DEFAULT_OP_STRING",
-			 (gpointer)a->desc->option_descs[j].default_val.sval);
-	 gtk_signal_connect (GTK_OBJECT (w), "changed",
-			 GTK_SIGNAL_FUNC (string_changed_cb),
-			 &a->options[j].val.sval);
-	 break;
-	case OPT_TYPE_COLOR:
-	 {
-	 /* FIXME: add some color preview */
- GdkColor *colour = g_new0(GdkColor, 1);
-
- colour->red = paranormal_colour_to_gdk_colour(a->options[j].val.cval.r);
- colour->green = paranormal_colour_to_gdk_colour(a->options[j].val.cval.g);
- colour->blue = paranormal_colour_to_gdk_colour(a->options[j].val.cval.b);
-
- w = gtk_color_button_new_with_color(colour);
-	 g_signal_connect(G_OBJECT (w), "color-set",
-			 G_CALLBACK (color_changed_cb),
-			 &a->options[j].val.cval);
-	 gtk_tooltips_set_tip (actuator_tooltips, GTK_WIDGET(w),
-				 a->desc->option_descs[j].doc, NULL);
-	 }
-	 break;
-	case OPT_TYPE_COLOR_INDEX:
-	 adj = gtk_adjustment_new (a->options[j].val.ival,
-				 0, 255,
-				 1, 2, 0);
-	 w = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1.0, 0);
-	 gtk_signal_connect (GTK_OBJECT (w), "changed",
-			 GTK_SIGNAL_FUNC (int_changed_cb),
-			 &a->options[j].val.ival);
-	 break;
-	case OPT_TYPE_BOOLEAN:
-	 w = gtk_check_button_new ();
-	 gtk_widget_show (w);
-	 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w),
-					a->options[j].val.bval);
-	 gtk_signal_connect (GTK_OBJECT (w), "clicked",
-			 GTK_SIGNAL_FUNC (boolean_changed_cb),
-			 &a->options[j].val.bval);
-	 break;
-	}
- gtk_widget_show (w);
- gtk_tooltips_set_tip (actuator_tooltips, w,
-			 a->desc->option_descs[j].doc, NULL);
- gtk_table_attach (GTK_TABLE (actuator_option_table), w,
-			1, 2, i, i+1,
-			GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-			0,
-			3, 3);
- }
-
- gtk_widget_set_sensitive (actuator_remove_button, TRUE);
- gtk_widget_set_sensitive (actuator_add_button, a->desc->flags & ACTUATOR_FLAG_CONTAINER
-			? TRUE : FALSE);
-
- selected_actuator_node = node;
-}
-
-static void
-table_remove_all_cb (GtkWidget *widget, gpointer data)
-{
- gtk_container_remove (GTK_CONTAINER (actuator_option_table),
-			widget);
-}
-
-static void
-row_unselect_cb (GtkCTree *ctree, GList *node, gint column,
-		 gpointer user_data)
-{
- gtk_frame_set_label (GTK_FRAME (option_frame), NULL);
-
- gtk_container_foreach (GTK_CONTAINER (actuator_option_table),
-			 table_remove_all_cb, NULL);
-
- /* Can't remove something if nothing's selected */
- gtk_widget_set_sensitive (actuator_remove_button, FALSE);
-
- selected_actuator_node = NULL;
-}
-
-static void
-add_actuator_cb (GtkButton *button, gpointer data)
-{
- char *actuator_name;
- struct pn_actuator *a;
-
- gtk_label_get (GTK_LABEL (GTK_BIN (actuator_add_opmenu)->child),
- &actuator_name);
-
- a = create_actuator (actuator_name);
- g_assert (a);
-
- add_actuator (a, selected_actuator_node, FALSE);
-}
-
-static void
-remove_actuator_cb (GtkButton *button, gpointer data)
-{
- if (selected_actuator_node)
- gtk_ctree_remove_node (GTK_CTREE (actuator_tree),
-			 selected_actuator_node);
-}
-
-/* Connect a node to its parent and replace the row data with
- a copy of the node */
-static void
-connect_actuators_cb (GtkCTree *ctree, GtkCTreeNode *node,
-		 struct pn_actuator **root_ptr)
-{
- struct pn_actuator *actuator, *parent, *copy;
-
- actuator = (struct pn_actuator *) gtk_ctree_node_get_row_data (ctree, node);
- if (GTK_CTREE_ROW (node)->parent)
- {
- /* Connect it to the parent */
- parent = (struct pn_actuator *)
-	gtk_ctree_node_get_row_data (ctree, GTK_CTREE_ROW (node)->parent);
- container_add_actuator (parent, actuator);
- }
- else
- /* This is the root node; still gotta copy it, but we need to
- save the original to *root_ptr */
- *root_ptr = actuator;
-
- /* we don't want our copy getting destroyed */
- destroy_row_data = FALSE;
-
- copy = copy_actuator (actuator);
- gtk_ctree_node_set_row_data_full (ctree, node, copy,
-				 ((GtkDestroyNotify)actuator_row_data_destroyed_cb));
-
- /* Ok, now you can destroy it */
- destroy_row_data = TRUE;
-}
-
-/* Extract (and connect) the actuators in the tree */
-static struct pn_actuator *
-extract_actuator (void)
-{
- GtkCTreeNode *root, *selected;
- struct pn_actuator *root_actuator = NULL;
-
- root = gtk_ctree_node_nth (GTK_CTREE (actuator_tree), 0);
- if (root)
- gtk_ctree_post_recursive (GTK_CTREE (actuator_tree), root,
-			 GTK_CTREE_FUNC (connect_actuators_cb),
-			 &root_actuator);
-
- if (selected_actuator_node)
- {
- selected = selected_actuator_node;
- gtk_ctree_unselect (GTK_CTREE (actuator_tree), GTK_CTREE_NODE (selected));
- gtk_ctree_select (GTK_CTREE (actuator_tree), GTK_CTREE_NODE (selected));
- }
-
- return root_actuator;
-}
-
-/* If selector != NULL, then it's 'OK', otherwise it's 'Cancel' */
-static void
-load_sel_cb (GtkButton *button, GtkFileSelection *selector)
-{
- if (selector)
- {
- static const char *fname;
- struct pn_actuator *a;
- GtkCTreeNode *root;
- mcs_handle_t *db;
-
- db = aud_cfg_db_open();
- fname = (char *) gtk_file_selection_get_filename (selector);
- a = load_preset (fname);
- aud_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname);
- aud_cfg_db_close(db);
- if (! a)
-	pn_error ("Unable to load file: \"%s\"", fname);
- else
-	{
-	 if ((root = gtk_ctree_node_nth (GTK_CTREE (actuator_tree), 0)))
-	 gtk_ctree_remove_node (GTK_CTREE (actuator_tree), root);
-	 add_actuator (a, NULL, FALSE);
-	}
- }
-
- gtk_widget_set_sensitive (cfg_dialog, TRUE);
-}
-
-static void
-load_button_cb (GtkButton *button, gpointer data)
-{
- GtkWidget *selector;
- mcs_handle_t *db;
- gchar *last_path;
-
- db = aud_cfg_db_open();
- selector = gtk_file_selection_new ("Load Preset");
- if(aud_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) {
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(selector), last_path);
- }
- aud_cfg_db_close(db);
-
- gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button),
-		 "clicked", GTK_SIGNAL_FUNC (load_sel_cb), selector);
- gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (selector)->cancel_button),
-		 "clicked", GTK_SIGNAL_FUNC (load_sel_cb), NULL);
-
- gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button),
-			 "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy),
-			 (gpointer) selector);
- gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (selector)->cancel_button),
-			 "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy),
-			 (gpointer) selector);
-
- gtk_widget_set_sensitive (cfg_dialog, FALSE);
- gtk_widget_show (selector);
-}
-
-static void
-save_sel_cb (GtkButton *button, GtkFileSelection *selector)
-{
- if (selector)
- {
- const char *fname;
- struct pn_actuator *a;
-
- fname = (char *) gtk_file_selection_get_filename (selector);
- a = extract_actuator ();
-
- if (! save_preset (fname, a))
-	pn_error ("unable to save preset to file: %s", fname);
- }
-
- gtk_widget_set_sensitive (cfg_dialog, TRUE);
-}
-
-static void
-save_button_cb (GtkButton *button, gpointer data)
-{
- GtkWidget *selector;
-
- selector = gtk_file_selection_new ("Save Preset");
-
- gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button),
-		 "clicked", GTK_SIGNAL_FUNC (save_sel_cb), selector);
- gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (selector)->cancel_button),
-		 "clicked", GTK_SIGNAL_FUNC (save_sel_cb), NULL);
-
- gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button),
-			 "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy),
-			 (gpointer) selector);
- gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (selector)->cancel_button),
-			 "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy),
-			 (gpointer) selector);
-
- gtk_widget_set_sensitive (cfg_dialog, FALSE);
- gtk_widget_show (selector);
-}
-
-static void
-apply_settings (void)
-{
- struct pn_rc rc;
-
- rc.actuator = extract_actuator ();
-
- pn_set_rc (&rc);
-}
-
-static void
-apply_button_cb (GtkButton *button, gpointer data)
-{
- apply_settings ();
-}
-
-static void
-ok_button_cb (GtkButton *button, gpointer data)
-{
- apply_settings ();
- gtk_widget_hide (cfg_dialog);
-}
-
-static void
-cancel_button_cb (GtkButton *button, gpointer data)
-{
- gtk_widget_destroy (cfg_dialog);
- cfg_dialog = NULL;
-}
-
-void
-pn_configure (void)
-{
- GtkWidget *notebook, *label, *scrollwindow, *menu, *menuitem;
- GtkWidget *paned, *vbox, *table, *bbox, *button;
- int i;
-
-
- if (! cfg_dialog)
- {
- /* The dialog */
- cfg_dialog = gtk_dialog_new ();
- gtk_window_set_title (GTK_WINDOW (cfg_dialog), "Paranormal Visualization Studio - Editor");
- gtk_widget_set_usize (cfg_dialog, 530, 370);
- gtk_container_border_width (GTK_CONTAINER (cfg_dialog), 8);
- gtk_signal_connect_object (GTK_OBJECT (cfg_dialog), "delete-event",
-				 GTK_SIGNAL_FUNC (gtk_widget_hide),
-				 GTK_OBJECT (cfg_dialog));
-
- /* The notebook */
- notebook = gtk_notebook_new ();
- gtk_widget_show (notebook);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (cfg_dialog)->vbox), notebook,
-			 TRUE, TRUE, 0);
-
- /* Actuator page */
- paned = gtk_hpaned_new ();
- gtk_widget_show (paned);
- label = gtk_label_new ("Actuators");
- gtk_widget_show (label);
- gtk_notebook_append_page (GTK_NOTEBOOK (notebook), paned, label);
- vbox = gtk_vbox_new (FALSE, 3);
- gtk_widget_show (vbox);
- gtk_paned_pack1 (GTK_PANED (paned), vbox, TRUE, FALSE);
- scrollwindow = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_show (scrollwindow);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwindow),
-				 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (vbox), scrollwindow, TRUE, TRUE, 3);
- actuator_tree = gtk_ctree_new (1, 0);
- gtk_widget_show (actuator_tree);
- gtk_ctree_set_reorderable (GTK_CTREE (actuator_tree), TRUE);
- gtk_signal_connect (GTK_OBJECT (actuator_tree), "tree-select-row",
-			 GTK_SIGNAL_FUNC (row_select_cb), NULL);
- gtk_signal_connect (GTK_OBJECT (actuator_tree), "tree-unselect-row",
-			 GTK_SIGNAL_FUNC (row_unselect_cb), NULL);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwindow),
-					 actuator_tree);
- table = gtk_table_new (3, 2, TRUE);
- gtk_widget_show (table);
- gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 3);
- actuator_add_opmenu = gtk_option_menu_new ();
- gtk_widget_show (actuator_add_opmenu);
- menu = gtk_menu_new ();
- gtk_widget_show (menu);
- for (i=0; builtin_table[i]; i++)
-	{
-	 /* FIXME: Add actuator group support */
-	 menuitem = gtk_menu_item_new_with_label (builtin_table[i]->dispname);
-	 gtk_widget_show (menuitem);
-	 gtk_menu_append (GTK_MENU (menu), menuitem);
-	}
- gtk_option_menu_set_menu (GTK_OPTION_MENU (actuator_add_opmenu), menu);
- gtk_table_attach (GTK_TABLE (table), actuator_add_opmenu,
-			0, 2, 0, 1,
-			GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0,
-			3, 3);
- actuator_add_button = gtk_button_new_from_stock(GTK_STOCK_ADD);
- gtk_widget_show (actuator_add_button);
- gtk_signal_connect (GTK_OBJECT (actuator_add_button), "clicked",
-			 GTK_SIGNAL_FUNC (add_actuator_cb), NULL);
- gtk_table_attach (GTK_TABLE (table), actuator_add_button,
-			0, 1, 1, 2,
-			GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0,
-			3, 3);
- actuator_remove_button = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
- gtk_widget_set_sensitive (actuator_remove_button, FALSE);
- gtk_widget_show (actuator_remove_button);
- gtk_signal_connect (GTK_OBJECT (actuator_remove_button), "clicked",
-			 GTK_SIGNAL_FUNC (remove_actuator_cb), NULL);
- gtk_table_attach (GTK_TABLE (table), actuator_remove_button,
-			1, 2, 1, 2,
-			GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0,
-			3, 3);
- button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
- gtk_widget_show (button);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			 GTK_SIGNAL_FUNC (load_button_cb), NULL);
- gtk_table_attach (GTK_TABLE (table), button,
-			0, 1, 2, 3,
-			GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0,
-			3, 3);
- button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
- gtk_widget_show (button);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			 GTK_SIGNAL_FUNC (save_button_cb), NULL);
- gtk_table_attach (GTK_TABLE (table), button,
-			1, 2, 2, 3,
-			GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0,
-			3, 3);
-
- /* Option table */
- option_frame = gtk_frame_new (NULL);
- gtk_widget_show (option_frame);
- gtk_container_set_border_width (GTK_CONTAINER (option_frame), 3);
- gtk_paned_pack2 (GTK_PANED (paned), option_frame, TRUE, TRUE);
- scrollwindow = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_show (scrollwindow);
- gtk_container_set_border_width (GTK_CONTAINER (scrollwindow), 3);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwindow),
-				 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_container_add (GTK_CONTAINER (option_frame), scrollwindow);
- actuator_option_table = gtk_table_new (0, 2, FALSE);
- gtk_widget_show (actuator_option_table);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwindow),
-					 actuator_option_table);
- gtk_paned_set_position (GTK_PANED (paned), 0);
- actuator_tooltips = gtk_tooltips_new ();
- gtk_tooltips_enable (actuator_tooltips);
-
- /* Build the initial actuator actuator_tree */
- if (pn_rc->actuator)
-	{
-	 add_actuator (pn_rc->actuator, NULL, TRUE);
-	 gtk_widget_set_sensitive (actuator_add_button, FALSE);
-	}
-
- /* OK / Apply / Cancel */
- bbox = gtk_hbutton_box_new ();
- gtk_widget_show (bbox);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
- gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 8);
- gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), 64, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (cfg_dialog)->action_area),
-			 bbox, FALSE, FALSE, 0);
-
- button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- gtk_widget_show (button);
- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NORMAL);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			 GTK_SIGNAL_FUNC (cancel_button_cb), NULL);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
-
- button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
- gtk_widget_show (button);
- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NORMAL);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			 GTK_SIGNAL_FUNC (apply_button_cb), NULL);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
-
- button = gtk_button_new_from_stock (GTK_STOCK_OK);
- gtk_widget_show (button);
- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NORMAL);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			 GTK_SIGNAL_FUNC (ok_button_cb), NULL);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
- }
-
- gtk_widget_show (cfg_dialog);
- gtk_widget_grab_focus (cfg_dialog);
-}

audacious-plugins-2.5.3.tar.gz/src/paranormal/cmaps.c Deleted

@@ -1,202 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <glib.h>
-
-#include "paranormal.h"
-#include "actuators.h"
-
-#include "libcalc/calc.h"
-
-#define STD_CMAP_OPTS { "low_index", "The lowest index of the \
-color map that should be altered", OPT_TYPE_COLOR_INDEX, { ival: 0 } },\
-{ "high_index", "The highest index of the color map that should be \
-altered", OPT_TYPE_COLOR_INDEX, { ival: 255 } }
-
-static struct pn_color black = {0, 0, 0};
-static struct pn_color white = {255, 255, 255};
-
-/* **************** cmap generation funcs **************** */
-static void
-cmap_gen_gradient (int step, const struct pn_color *a,
-		 const struct pn_color *b,
-		 struct pn_color *c)
-{
- c->r = a->r + step * ((((float)b->r) - ((float)a->r)) / 256.0);
- c->g = a->g + step * ((((float)b->g) - ((float)a->g)) / 256.0);
- c->b = a->b + step * ((((float)b->b) - ((float)a->b)) / 256.0);
-}
-
-/* **************** cmap_gradient **************** */
-static struct pn_actuator_option_desc cmap_gradient_opts[] =
-{
- STD_CMAP_OPTS,
- { "lcolor", "The low color used in the gradient generation",
- OPT_TYPE_COLOR, { cval: {0, 0, 0} } },
- { "hcolor", "The high color used in the gradient generation",
- OPT_TYPE_COLOR, { cval: {0, 0, 0} } },
- { NULL }
-};
-
-static void
-cmap_gradient_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- int i;
-
- for (i=opts[0].val.ival; i<=opts[1].val.ival; i++)
- cmap_gen_gradient (((i-opts[0].val.ival)<<8)/(opts[1].val.ival
-						 - opts[0].val.ival),
-		 &opts[2].val.cval, &opts[3].val.cval,
-		 &pn_image_data->cmap[i]);
-}
-
-struct pn_actuator_desc builtin_cmap_gradient =
-{
- "cmap_gradient",
- "Normal colourmap",
- "Sets the colormap to a gradient going from <lcolor> to "
- "<hcolor>",
- 0, cmap_gradient_opts,
- NULL, NULL, cmap_gradient_exec
-};
-
-/* **************** cmap_bwgradient **************** */
-static struct pn_actuator_option_desc cmap_bwgradient_opts[] =
-{
- STD_CMAP_OPTS,
- { "color", "The intermediate color to use in the gradient",
- OPT_TYPE_COLOR, { cval: {191, 191, 191} } },
- { NULL }
-};
-
-static void
-cmap_bwgradient_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- int i;
-
- for (i=opts[0].val.ival; i<128 && i<=opts[1].val.ival; i++)
- cmap_gen_gradient (i<<1, &black, &opts[2].val.cval,
-		 &pn_image_data->cmap[i]);
-
- for (i=128; i<256 && i<=opts[1].val.ival; i++)
- cmap_gen_gradient ((i-128)<<1, &opts[2].val.cval, &white,
-		 &pn_image_data->cmap[i]);
-}
- 
-struct pn_actuator_desc builtin_cmap_bwgradient =
-{
- "cmap_bwgradient",
- "Value-based colourmap",
- "Sets the colormap to a gradient going from black to "
- "white, via an intermediate color",
- 0, cmap_bwgradient_opts,
- NULL, NULL, cmap_bwgradient_exec
-};
-
-/* **************** cmap_dynamic **************** */
-static struct pn_actuator_option_desc cmap_dynamic_opts[] =
-{
- STD_CMAP_OPTS,
- { "script", "The script to run on each step.",
- OPT_TYPE_STRING, { sval: "red = red + 0.01; blue = blue + 0.01; green = green + 0.01;" } },
- { NULL }
-};
-
-typedef struct {
- expression_t *expr;
- symbol_dict_t *dict;
-} PnDynamicColourmapData;
-
-static void
-cmap_dynamic_init(gpointer *data)
-{
- *data = g_new0(PnDynamicColourmapData, 1);
-}
-
-static void
-cmap_dynamic_cleanup(gpointer data)
-{
- PnDynamicColourmapData *d = (PnDynamicColourmapData *) data;
-
- if (d->expr)
- expr_free(d->expr);
- if (d->dict)
- dict_free(d->dict);
-
- g_free(d);
-}
-
-static void
-cmap_dynamic_exec(const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- PnDynamicColourmapData *d = (PnDynamicColourmapData *) data;
- gint i;
- gdouble *rf, *bf, *gf, *inf;
- gint rn, bn, gn;
-
- if (!d->dict && !d->expr)
- {
- d->dict = dict_new();
- if (!d->dict)
- return;
-
- d->expr = expr_compile_string(opts[2].val.sval, d->dict);
- if (!d->expr)
- {
- dict_free(d->dict);
- d->dict = NULL;
- return;
- }
- }
-
- rf = dict_variable(d->dict, "red");
- gf = dict_variable(d->dict, "green");
- bf = dict_variable(d->dict, "blue");
- inf = dict_variable(d->dict, "index");
-
- for (i = opts[0].val.ival; i < 255 && i <= opts[1].val.ival; i++)
- {
- *inf = ((gdouble)i / 255.0);
-
- expr_execute(d->expr, d->dict);
-
- /* Convert rf/bf/gf to realworld values. */
- rn = (gdouble)(*rf * 255);
- gn = (gdouble)(*gf * 255);
- bn = (gdouble)(*bf * 255);
-
- pn_image_data->cmap[i].r = rn;
- pn_image_data->cmap[i].g = gn;
- pn_image_data->cmap[i].b = bn;
- }
-}
-
-struct pn_actuator_desc builtin_cmap_dynamic =
-{
- "cmap_dynamic",
- "Dynamic Colourmap",
- "Scriptable colourmap modifier.",
- 0, cmap_dynamic_opts,
- cmap_dynamic_init, cmap_dynamic_cleanup, cmap_dynamic_exec
-};

audacious-plugins-2.5.3.tar.gz/src/paranormal/containers.c Deleted

@@ -1,267 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-
-#include <glib.h>
-
-#include "actuators.h"
-#include "paranormal.h"
-
-/* **************** all containers **************** */
-
-/* Add a actuator to a container (end of list) */
-void
-container_add_actuator (struct pn_actuator *container, struct pn_actuator *a)
-{
- g_assert (container->desc->flags & ACTUATOR_FLAG_CONTAINER);
- g_assert (a);
-
- *((GSList **)container->data) =
- g_slist_append (*(GSList **)container->data, a);
-} 
-
-void
-container_remove_actuator (struct pn_actuator *container, struct pn_actuator *a)
-{
- g_assert (container->desc->flags & ACTUATOR_FLAG_CONTAINER);
- g_assert (a);
-
- *((GSList **)container->data) =
- g_slist_remove (*(GSList **)container->data, a);
-} 
-
-/* clear the containee list */
-void
-container_unlink_actuators (struct pn_actuator *container)
-{
- g_assert (container->desc->flags & ACTUATOR_FLAG_CONTAINER);
-
- g_slist_free (*(GSList **)container->data);
- *(GSList **)container->data = NULL;
-}
-
-/* this does NOT free data */
-static void
-container_cleanup (GSList** data)
-{
- GSList *child;
-
- for (child = *data; child; child = child->next)
- destroy_actuator ((struct pn_actuator *) child->data);
-
- g_slist_free (*data);
-}
-
-/* **************** container_simple **************** */
-static void
-container_simple_init (GSList ***data)
-{
- *data = g_new0 (GSList *, 1);
-}
-
-static void
-container_simple_cleanup (GSList **data)
-{
- container_cleanup (data);
- g_free (data);
-}
-
-static void
-container_simple_exec (const struct pn_actuator_option *opts,
-		 GSList **data)
-{
- GSList *child;
-
- for (child = *data; child; child = child->next)
- exec_actuator ((struct pn_actuator *) child->data);
-}
-
-struct pn_actuator_desc builtin_container_simple =
-{
- "container_simple",
- "Simple Container",
- "A simple (unconditional) container\n\n"
- "This is usually used as the root actuator of a list",
- ACTUATOR_FLAG_CONTAINER, NULL,
- PN_ACTUATOR_INIT_FUNC (container_simple_init),
- PN_ACTUATOR_CLEANUP_FUNC (container_simple_cleanup),
- PN_ACTUATOR_EXEC_FUNC (container_simple_exec)
-};
-
-/* **************** container_once **************** */
-struct container_once_data
-{
- GSList *children; /* This MUST be first! */
-
- gboolean done;
-};
-
-static void
-container_once_init (struct container_once_data **data)
-{
- *data = g_new0 (struct container_once_data, 1);
-}
-
-static void
-container_once_cleanup (GSList **data)
-{
- container_cleanup (data);
- g_free (data);
-}
-
-static void
-container_once_exec (const struct pn_actuator_option *opts,
-		 struct container_once_data *data)
-{
- if (! data->done)
- {
- GSList *child;
-
- for (child = data->children; child; child = child->next)
-	exec_actuator ((struct pn_actuator *) child->data);
-
- data->done = TRUE;
- }
-}
-
-struct pn_actuator_desc builtin_container_once =
-{
- "container_once",
- "Initialization Container",
- "A container whose contents get executed exactly once.\n\n"
- "This is often used to set initial graphics states such as the\n"
- "pixel depth, or to display some text (such as credits)",
- ACTUATOR_FLAG_CONTAINER, NULL,
- PN_ACTUATOR_INIT_FUNC (container_once_init),
- PN_ACTUATOR_CLEANUP_FUNC (container_once_cleanup),
- PN_ACTUATOR_EXEC_FUNC (container_once_exec)
-};
-
-/* **************** container_cycle ***************** */
-static struct pn_actuator_option_desc container_cycle_opts[] =
-{
- { "change_interval", "The number of seconds between changing the "
- "child to be executed", OPT_TYPE_INT, { ival: 20 } },
- { "beat", "Whether or not the change should only occur on a beat",
- OPT_TYPE_BOOLEAN, { bval: TRUE } },
- { NULL }
-};
-
-struct container_cycle_data
-{
- GSList *children;
- GSList *current;
- int last_change;
-};
-
-static void
-container_cycle_init (gpointer *data)
-{
- *data = g_new0 (struct container_cycle_data, 1);
-}
-
-static void
-container_cycle_cleanup (gpointer data)
-{
- container_cleanup (data);
- g_free (data);
-}
-
-static void
-container_cycle_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- struct container_cycle_data *cdata = (struct container_cycle_data*)data;
- int now;
-
- /*
- * Change branch if all of the requirements are met for the branch to change.
- */
- if ((opts[1].val.bval == TRUE && pn_new_beat != FALSE) || opts[1].val.bval == FALSE)
- {
- now = SDL_GetTicks();	
-
- if (now - cdata->last_change
- > opts[0].val.ival * 1000)
- {
- cdata->last_change = now;
-
- /* FIXME: add randomization support */
- if (cdata->current)
- cdata->current = cdata->current->next;
- }
- }
-
- if (! cdata->current)
- cdata->current = cdata->children;
-
- if (cdata->current)
- exec_actuator ((struct pn_actuator*)cdata->current->data);
-}
-
-struct pn_actuator_desc builtin_container_cycle =
-{
- "container_cycle",
- "Branched-execution Container",
- "A container that alternates which of its children is executed; it "
- "can either change on an interval, or only on a beat.",
- ACTUATOR_FLAG_CONTAINER, container_cycle_opts,
- container_cycle_init, container_cycle_cleanup, container_cycle_exec
-};
-
-/* **************** container_onbeat **************** */
-static void
-container_onbeat_init (GSList ***data)
-{
- *data = g_new0 (GSList *, 1);
-}
-
-static void
-container_onbeat_cleanup (GSList **data)
-{
- container_cleanup (data);
- g_free (data);
-}
-
-static void
-container_onbeat_exec (const struct pn_actuator_option *opts,
-		 GSList **data)
-{
- GSList *child;
-
- if (pn_new_beat == TRUE)
- {
- for (child = *data; child; child = child->next)
- exec_actuator ((struct pn_actuator *) child->data);
- }
-}
-
-struct pn_actuator_desc builtin_container_onbeat =
-{
- "container_onbeat",
- "OnBeat Container",
- "A simple container which only triggers on a beat.",
- ACTUATOR_FLAG_CONTAINER, NULL,
- PN_ACTUATOR_INIT_FUNC (container_onbeat_init),
- PN_ACTUATOR_CLEANUP_FUNC (container_onbeat_cleanup),
- PN_ACTUATOR_EXEC_FUNC (container_onbeat_exec)
-};

audacious-plugins-2.5.3.tar.gz/src/paranormal/containers.h Deleted

@@ -1,27 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef _PN_CONTAINERS_H
-#define _PN_CONTAINERS_H
-
-void container_add_actuator (struct pn_actuator *container, struct pn_actuator *a);
-void container_remove_actuator (struct pn_actuator *container, struct pn_actuator *a);
-void container_unlink_actuators (struct pn_actuator *container);
-
-#endif /* _CONTAINERS_H */

audacious-plugins-2.5.3.tar.gz/src/paranormal/drawing.c Deleted

@@ -1,62 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <math.h>
-
-#include "paranormal.h"
-#include "actuators.h"
-#include "pn_utils.h"
-
-void
-pn_draw_dot (guint x, guint y, guchar value)
-{
- if (x > pn_image_data->width || y > pn_image_data->height)
- return;
-
- pn_image_data->surface[0][PN_IMG_INDEX(x, y)] = value;
-}
-
-void
-pn_draw_line (guint _x0, guint _y0, guint _x1, guint _y1, guchar value)
-{
- gint x0 = _x0;
- gint y0 = _y0;
- gint x1 = _x1;
- gint y1 = _y1;
-
- gint dx = x1 - x0;
- gint dy = y1 - y0;
-
- pn_draw_dot(x0, y0, value);
-
- if (dx != 0)
- {
- gfloat m = (gfloat) dy / (gfloat) dx;
- gfloat b = y0 - m * x0;
-
- dx = (x1 > x0) ? 1 : - 1;
- while (x0 != x1)
- {
- x0 += dx;
- y0 = m * x0 + b;
-
- pn_draw_dot(x0, y0, value);
- }
- }
-}

audacious-plugins-2.5.3.tar.gz/src/paranormal/drawing.h Deleted

@@ -1,28 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <glib.h>
-
-#ifndef PN_DRAWING_H
-#define PN_DRAWING_H
-
-void pn_draw_dot (guint x, guint y, guchar value);
-void pn_draw_line (guint _x0, guint _y0, guint _x1, guint _y1, guchar value);
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/paranormal/freq.c Deleted

@@ -1,81 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <glib.h>
-
-#include "paranormal.h"
-#include "actuators.h"
-#include "pn_utils.h"
-
-/* **************** freq_dots **************** */
-/* FIXME: take this piece of crap out */
-static void
-freq_dots_exec (const struct pn_actuator_option *opts,
-		gpointer data)
-{
- int i, basex;
-
- basex = (pn_image_data->width>>1)-128;
- for (i=basex < 0 ? -basex : 0 ; i < 256; i++)
- {
- pn_image_data->surface[0][PN_IMG_INDEX (basex+i, (pn_image_data->height>>1)
-					 - CAP (pn_sound_data->freq_data[0][i], 120))]
-	= 0xff;
- pn_image_data->surface[0][PN_IMG_INDEX (basex+256-i, (pn_image_data->height>>1)
-					 + CAP (pn_sound_data->freq_data[1][i], 120))]
-	= 0xff;
- }
-}
-
-struct pn_actuator_desc builtin_freq_dots =
-{
- "freq_dots",
- "Frequency Scope",
- "Draws dots varying vertically with the freqency data.",
- 0, NULL,
- NULL, NULL, freq_dots_exec
-};
-
-/* **************** freq_drops **************** */
-static void
-freq_drops_exec (const struct pn_actuator_option *opts,
-		gpointer data)
-{
- int i,j;
- 
- for (i=0; i<256; i++)
- for (j=0; j<pn_sound_data->freq_data[0][i]>>3; i++)
- pn_image_data->surface[0][PN_IMG_INDEX (rand() % pn_image_data->width,
-					 rand() % pn_image_data->height)]
-	= 0xff;
-}
-
-struct pn_actuator_desc builtin_freq_drops =
-{
- "freq_drops",
- "Random Dots",
- "Draws dots at random on the image (louder music = more dots)",
- 0, NULL,
- NULL, NULL, freq_drops_exec
-};

audacious-plugins-2.5.3.tar.gz/src/paranormal/general.c Deleted

@@ -1,410 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/* FIXME: what to name this file? */
-
-#include <config.h>
-
-#include "paranormal.h"
-#include "actuators.h"
-#include "pn_utils.h"
-#include "libcalc/calc.h"
-
-/* **************** general_fade **************** */
-static struct pn_actuator_option_desc general_fade_opts[] =
-{
- { "amount", "The amount by which the color index of each "
- "pixel should be decreased by each frame (MAX 255)",
- OPT_TYPE_INT, { ival: 3 } },
- { NULL }
-};
-
-static void
-general_fade_exec (const struct pn_actuator_option *opts,
-	 gpointer data)
-{
- int amt = opts[0].val.ival > 255 || opts[0].val.ival < 0 ? 3 : opts[0].val.ival;
- int i, j;
-
- for (j=0; j<pn_image_data->height; j++)
- for (i=0; i<pn_image_data->width; i++)
- pn_image_data->surface[0][PN_IMG_INDEX (i, j)] =
-	CAPLO (pn_image_data->surface[0][PN_IMG_INDEX (i, j)]
-	 - amt, 0);
-}
-
-struct pn_actuator_desc builtin_general_fade =
-{
- "general_fade", "Fade-out", "Decreases the color index of each pixel",
- 0, general_fade_opts,
- NULL, NULL, general_fade_exec
-};
-
-/* **************** general_blur **************** */
-/* FIXME: add a variable radius */
-/* FIXME: SPEEEED */
-static void
-general_blur_exec (const struct pn_actuator_option *opts,
-	 gpointer data)
-{
- int i,j;
- register guchar *srcptr = pn_image_data->surface[0];
- register guchar *destptr = pn_image_data->surface[1];
- register int sum;
-
- for (j=0; j<pn_image_data->height; j++)
- for (i=0; i<pn_image_data->width; i++)
- {
-	sum = *(srcptr)<<2;
-
-	/* top */
-	if (j > 0)
-	 {
-	 sum += *(srcptr-pn_image_data->width)<<1;
-	 if (i > 0)
-	 sum += *(srcptr-pn_image_data->width-1);
-	 if (i < pn_image_data->width-1)
-	 sum += *(srcptr-pn_image_data->width+1);
-	 }
-	/* bottom */
-	if (j < pn_image_data->height-1)
-	 {
-	 sum += *(srcptr+pn_image_data->width)<<1;
-	 if (i > 0)
-	 sum += *(srcptr+pn_image_data->width-1);
-	 if (i < pn_image_data->width-1)
-	 sum += *(srcptr+pn_image_data->width+1);
-	 }
-	/* left */
-	if (i > 0)
-	 sum += *(srcptr-1)<<1;
-	/* right */
-	if (i < pn_image_data->width-1)
-	 sum += *(srcptr+1)<<1;
-
-	*destptr++ = (guchar)(sum >> 4);
-	srcptr++;
- }
-
- pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_general_blur = 
-{
- "general_blur", "Blur", "A simple 1 pixel radius blur",
- 0, NULL,
- NULL, NULL, general_blur_exec
-};
-
-/* **************** general_mosaic **************** */
-/* FIXME: add a variable radius */
-/* FIXME: SPEEEED */
-static struct pn_actuator_option_desc general_mosaic_opts[] =
-{
- { "radius", "The pixel radius that should be used for the effect.",
- OPT_TYPE_INT, { ival: 6 } },
- { NULL }
-};
-
-static void
-general_mosaic_exec (const struct pn_actuator_option *opts,
-	 gpointer data)
-{
- int i,j;
- register guchar *srcptr = pn_image_data->surface[0];
- register guchar *destptr = pn_image_data->surface[1];
- int radius = opts[0].val.ival > 255 || opts[0].val.ival < 0 ? 6 : opts[0].val.ival;
-
- for (j=0; j<pn_image_data->height; j += radius)
- for (i=0; i<pn_image_data->width; i += radius)
- {
- int ii = 0, jj = 0;
- guchar bval = 0;
-
- /* find the brightest colour */
- for (jj = 0; jj < radius && (j + jj < pn_image_data->height); jj++)
- for (ii = 0; ii < radius && (i + ii < pn_image_data->width); ii++)
- {
- guchar val = srcptr[PN_IMG_INDEX(i + ii, j + jj)];
-
- if (val > bval)
- bval = val;
- }
-
- for (jj = 0; jj < radius && (j + jj < pn_image_data->height); jj++)
- for (ii = 0; ii < radius && (i + ii < pn_image_data->width); ii++)
- {
- destptr[PN_IMG_INDEX(i + ii, j + jj)] = bval;
- }
- }
-
- pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_general_mosaic = 
-{
- "general_mosaic", "Mosaic", "A simple mosaic effect.",
- 0, general_mosaic_opts,
- NULL, NULL, general_mosaic_exec
-};
-
-/* **************** general_clear **************** */
-static void
-general_clear_exec (const struct pn_actuator_option *opts,
-	 gpointer data)
-{
- memset(pn_image_data->surface[0], '\0',
-	 (pn_image_data->height * pn_image_data->width));
-}
-
-struct pn_actuator_desc builtin_general_clear =
-{
- "general_clear", "Clear Surface", "Clears the surface.",
- 0, NULL,
- NULL, NULL, general_clear_exec
-};
-
-/* **************** general_noop **************** */
-static void
-general_noop_exec (const struct pn_actuator_option *opts,
-	 gpointer data)
-{
- return;
-}
-
-struct pn_actuator_desc builtin_general_noop =
-{
- "general_noop", "Do Nothing", "Does absolutely nothing.",
- 0, NULL,
- NULL, NULL, general_noop_exec
-};
-
-/* **************** general_invert **************** */
-static void
-general_invert_exec (const struct pn_actuator_option *opts,
-	 gpointer data)
-{
- int i, j;
-
- for (j=0; j < pn_image_data->height; j++)
- for (i=0; i < pn_image_data->width; i++)
- pn_image_data->surface[0][PN_IMG_INDEX (i, j)] =
-	255 - pn_image_data->surface[0][PN_IMG_INDEX (i, j)];
-}
-
-struct pn_actuator_desc builtin_general_invert =
-{
- "general_invert", "Value Invert", "Performs a value invert.",
- 0, NULL,
- NULL, NULL, general_invert_exec
-};
-
-/* **************** general_replace **************** */
-static struct pn_actuator_option_desc general_replace_opts[] =
-{
- { "start", "The beginning colour value that should be replaced by the value of out.",
- OPT_TYPE_INT, { ival: 250 } },
- { "end", "The ending colour value that should be replaced by the value of out.",
- OPT_TYPE_INT, { ival: 255 } },
- { "out", "The colour value that in is replaced with.",
- OPT_TYPE_INT, { ival: 0 } },
- { NULL }
-};
-
-static void
-general_replace_exec (const struct pn_actuator_option *opts,
-	 gpointer data)
-{
- register int i, j;
- register guchar val;
- guchar begin = opts[0].val.ival > 255 || opts[0].val.ival < 0 ? 250 : opts[0].val.ival;
- guchar end = opts[1].val.ival > 255 || opts[1].val.ival < 0 ? 255 : opts[1].val.ival;
- guchar out = opts[2].val.ival > 255 || opts[2].val.ival < 0 ? 0 : opts[2].val.ival;
-
- for (j=0; j < pn_image_data->height; j++)
- for (i=0; i < pn_image_data->width; i++)
- {
- val = pn_image_data->surface[0][PN_IMG_INDEX (i, j)];
- if (val >= begin && val <= end)
- pn_image_data->surface[0][PN_IMG_INDEX (i, j)] = out;
- }
-}
-
-struct pn_actuator_desc builtin_general_replace =
-{
- "general_replace", "Value Replace", "Performs a value replace on a range of values.",
- 0, general_replace_opts,
- NULL, NULL, general_replace_exec
-};
-
-/* **************** general_swap **************** */
-static void
-general_swap_exec (const struct pn_actuator_option *opts,
-	 gpointer data)
-{
- pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_general_swap =
-{
- "general_swap", "Swap Surface", "Swaps the surface.",
- 0, NULL,
- NULL, NULL, general_swap_exec
-};
-
-/* **************** general_copy **************** */
-static void
-general_copy_exec (const struct pn_actuator_option *opts,
-	 gpointer data)
-{
- memcpy(pn_image_data->surface[1], pn_image_data->surface[0], 
- (pn_image_data->width * pn_image_data->height));
-}
-
-struct pn_actuator_desc builtin_general_copy =
-{
- "general_copy", "Copy Surface", "Copies the surface to the other surface.",
- 0, NULL,
- NULL, NULL, general_copy_exec
-};
-
-/* **************** general_flip **************** */
-static struct pn_actuator_option_desc general_flip_opts[] =
-{
- { "direction", "Negative is horizontal, positive is vertical.",
- OPT_TYPE_INT, { ival: -1 } },
- { NULL }
-};
-
-static void
-general_flip_exec (const struct pn_actuator_option *opts,
-	 gpointer data)
-{
- gint x, y;
-
- if (opts[0].val.ival < 0)
- {
- for (y = 0; y < pn_image_data->height; y++)
- for (x = 0; x < pn_image_data->width; x++)
- {
- pn_image_data->surface[1][PN_IMG_INDEX(pn_image_data->width - x, y)] = 
- pn_image_data->surface[0][PN_IMG_INDEX(x, y)];
- }
- }
- else
- {
- for (y = 0; y < pn_image_data->height; y++)
- for (x = 0; x < pn_image_data->width; x++)
- {
- pn_image_data->surface[1][PN_IMG_INDEX(x, pn_image_data->height - y)] = 
- pn_image_data->surface[0][PN_IMG_INDEX(x, y)];
- }
- }
-
- pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_general_flip =
-{
- "general_flip", "Flip Surface", "Flips the surface.",
- 0, general_flip_opts,
- NULL, NULL, general_flip_exec
-};
-
-/* ***************** general_evaluate ***************** */
-
-static struct pn_actuator_option_desc general_evaluate_opts[] =
-{
- { "init_script", "Script to run on start.", OPT_TYPE_STRING, {sval: "global_reg0 = 27;"} },
- { "frame_script", "Script to run.", OPT_TYPE_STRING, {sval: "global_reg0 = global_reg0 + 1;"} },
- { NULL }
-};
-
-struct pn_evaluate_ctx
-{
- expression_t *expr_on_init, *expr_on_frame;
- symbol_dict_t *dict;
- gboolean reset;
-};
-
-static void
-general_evaluate_init(gpointer *data)
-{
- *data = g_new0(struct pn_evaluate_ctx, 1);
-
- ((struct pn_evaluate_ctx *)*data)->reset = TRUE;
-}
-
-static void
-general_evaluate_cleanup(gpointer op_data)
-{
- struct pn_evaluate_ctx *data = (struct pn_evaluate_ctx *) op_data;
-
- g_return_if_fail(data != NULL);
-
- if (data->expr_on_init)
- expr_free(data->expr_on_init);
-
- if (data->expr_on_frame)
- expr_free(data->expr_on_frame);
-
- if (data->dict)
- dict_free(data->dict);
-
- if (data)
- g_free(data);
-}
-
-static void
-general_evaluate_exec(const struct pn_actuator_option *opts,
- gpointer op_data)
-{
- struct pn_evaluate_ctx *data = (struct pn_evaluate_ctx *) op_data;
-
- if (data->reset)
- {
- if (data->dict)
- dict_free(data->dict);
-
- data->dict = dict_new();
-
- if (opts[0].val.sval != NULL);
- data->expr_on_init = expr_compile_string(opts[0].val.sval, data->dict);
-
- if (opts[1].val.sval != NULL);
- data->expr_on_frame = expr_compile_string(opts[1].val.sval, data->dict);
-
- if (data->expr_on_init != NULL)
- expr_execute(data->expr_on_init, data->dict);
-
- data->reset = FALSE;
- }
-
- if (data->expr_on_frame != NULL)
- expr_execute(data->expr_on_frame, data->dict);
-}
-
-struct pn_actuator_desc builtin_general_evaluate =
-{
- "general_evaluate", "Evalulate VM Code",
- "Evaluates arbitrary VM code. Does not draw anything.",
- 0, general_evaluate_opts,
- general_evaluate_init, general_evaluate_cleanup, general_evaluate_exec
-};
-

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc/calc.h Deleted

@@ -1,30 +0,0 @@
-/* calc.h -- an all-in-one include file for libcalc
- *
- * Copyright (C) 2001 Janusz Gregorczyk <jgregor@kki.net.pl>
- *
- * This file is part of xvs.
- *
- * 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.
- */
-
-#ifndef Included_CALC_H
-#define Included_CALC_H
-
-#include "dict.h"
-#include "execute.h"
-#include "parser.h"
-#include "storage.h"
-
-#endif /* Included_CALC_H */

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc/dict.c Deleted

@@ -1,128 +0,0 @@
-/* dict.c -- symbol dictionary structures
- *
- * Copyright (C) 2001 Janusz Gregorczyk <jgregor@kki.net.pl>
- *
- * This file is part of xvs.
- *
- * 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.
- */
- 
-#define V_SPACE_INIT 8
-#define V_SPACE_INCR 8
- 
-#include <glib.h>
-#include <string.h>
-
-#include "dict.h"
-
-static int global_dict_initialized = 0;
-static symbol_dict_t global_dict;
-
-static void more_variables (symbol_dict_t *dict) {
- var_t *new_var;
-
- dict->v_space += V_SPACE_INCR;
-
- new_var = g_new(var_t, dict->v_space + 1);
- memcpy (new_var, dict->variables, dict->v_count * sizeof(var_t));
- g_free (dict->variables);
-
- dict->variables = new_var;
-}
-
-static int dict_define_variable (symbol_dict_t *dict, const char *name) {
- var_t *var;
-
- if (dict->v_count >= dict->v_space)
- more_variables (dict);
-
- var = &dict->variables[dict->v_count];
-
- var->value = 0.0;
- var->name = g_strdup (name);
-
- return dict->v_count++;
-}
-
-symbol_dict_t *dict_new (void) {
- symbol_dict_t *dict;
-
- if (global_dict_initialized != 1) {
- int i;
-
- global_dict.v_count = 0;
- global_dict.v_space = V_SPACE_INIT;
- global_dict.variables = (var_t *) g_new(var_t, global_dict.v_space + 1);
- global_dict_initialized = 1;
-
- for (i = 0; i < 100; i++) {
- gchar tmpbuf[40];
- g_snprintf(tmpbuf, 40, "global_reg%d", i);
- dict_define_variable(&global_dict, tmpbuf);
- }
- }
-
- dict = g_new(symbol_dict_t, 1);
-
- /* Allocate space for variables. */
- dict->v_count = 0;
- dict->v_space = V_SPACE_INIT;
- dict->variables = (var_t *) g_new (var_t, dict->v_space + 1);
- 
- return dict;
-}
-
-void dict_free (symbol_dict_t *dict) {
- int i;
-
- if (!dict)
- return;
-
- /* Free memory used by variables. */
- for (i = 0; i < dict->v_count; i++)
- g_free (dict->variables[i].name);
- g_free (dict->variables);
-
- g_free (dict);
-}
-
-int dict_lookup (symbol_dict_t *dict, const char *name) {
- int i;
-
- for (i = 0; i < global_dict.v_count; i++) {
- if (strcmp (global_dict.variables[i].name, name) == 0)
- return -i;
- }
-
- for (i = 0; i < dict->v_count; i++) {
- if (strcmp (dict->variables[i].name, name) == 0)
- return i;
- }
- 
- /* Not defined -- define a new variable. */
- return dict_define_variable (dict, name);
-}
-
-double *dict_variable (symbol_dict_t *dict, const char *var_name) {
- int id = dict_lookup (dict, var_name);
-
- /* global variables are presented as negative offset. negating
- * a negative number results in a positive offset. --nenolod
- */
- if (id < 0)
- return &global_dict.variables[-id].value;
-
- return &dict->variables[id].value;
-}

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc/dict.h Deleted

@@ -1,46 +0,0 @@
-/* dict.h -- symbol dictionary structures
- *
- * Copyright (C) 2001 Janusz Gregorczyk <jgregor@kki.net.pl>
- *
- * This file is part of xvs.
- *
- * 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.
- */
-
-#ifndef Included_DICT_H
-#define Included_DICT_H
-
-/* A variable. */
-typedef struct {
- char *name;
- double value;
-} var_t;
-
-/* A symbol dictionary. */
-typedef struct {
- /* Variables. */
- var_t *variables;
- int v_count;
- int v_space;
-} symbol_dict_t;
-
-/* Prototypes. */
-symbol_dict_t *dict_new (void);
-void dict_free (symbol_dict_t *dict);
-
-int dict_lookup (symbol_dict_t *calc, const char *name);
-double* dict_variable (symbol_dict_t *calc, const char *var_name);
-
-#endif /* Included_DICT_H */

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc/execute.c Deleted

@@ -1,121 +0,0 @@
-/* execute.c -- execute precompiled expression expr
- *
- * Copyright (C) 2001 Janusz Gregorczyk <jgregor@kki.net.pl>
- *
- * This file is part of xvs.
- *
- * 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 <glib.h>
-#include <math.h>
- 
-#include "execute.h"
-#include "function.h"
-
-/* Execution stack. */
-
-gboolean check_stack (ex_stack *stack, int depth) {
- if (stack->sp < depth) {
- g_warning ("Stack error");
- return FALSE;
- }
-
- return TRUE;
-}
-
-void push (ex_stack *stack, double value) {
- g_assert (stack);
-
- if (stack->sp < STACK_DEPTH) {
- stack->value[stack->sp++] = value;
- } else {
- g_warning ("Stack overflow");
- }
-}
-
-double pop (ex_stack *stack) {
- g_assert (stack);
-
- if (stack->sp > 0) {
- return stack->value[--stack->sp];
- } else {
- g_warning ("Stack error (stack empty)");
- return 0.0;
- }
-}
-
-/* */
-
-void expr_execute (expression_t *expr, symbol_dict_t *dict) {
- char op, *str = expr->data->str;
- ex_stack stack = { 0, { 0.0 }};
-
- while ((op = *str++)) {
- switch (op) { 
- case 'l': /* Load a variable. */
- push (&stack, dict->variables[load_int (str)].value);
- str += sizeof (int);
- break;
- 
- case 's': /* Store to a variable. */
- dict->variables[load_int (str)].value = pop (&stack);
- str += sizeof (int);
- break;
- 
- case 'f': /* Call a function. */
- function_call (load_int (str), &stack);
- str += sizeof (int);
- break;
- 
- case 'c': /* Load a constant. */
- push (&stack, load_double (str));
- str += sizeof (double);
- break;
-
- case 'n': /* Do a negation. */
- push (&stack, -pop (&stack));
- break;
-
- case '+': /* Do an addition. */
- push (&stack, pop (&stack) + pop (&stack));
- break;
- case '-': /* Do a subtraction. */
- push (&stack, pop (&stack) - pop (&stack));
- break;
- case '*': /* Do a multiplication. */
- push (&stack, pop (&stack) * pop (&stack));
- break;
- case '/': /* Do a division. */
- if (check_stack (&stack, 2)) {
- double y = stack.value[stack.sp - 2] / stack.value[stack.sp - 1];
-	stack.sp -= 2;
-	push (&stack, y);
- }
- break;
- case '^': /* Do an exponentiation. */
- if (check_stack (&stack, 2)) {
- double y = pow (stack.value[stack.sp - 2], stack.value[stack.sp - 1]);
-	stack.sp -= 2;
-	push (&stack, y);
- }
- break;
-
- default:
- g_warning ("Invalid opcode: %c", op);
- return;
- }
- }
-}

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc/execute.h Deleted

@@ -1,46 +0,0 @@
-/* execute.h -- execute precompiled expression code
- *
- * Copyright (C) 2001 Janusz Gregorczyk <jgregor@kki.net.pl>
- *
- * This file is part of xvs.
- *
- * 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.
- */
-
-#ifndef Included_EXECUTE_H
-#define Included_EXECUTE_H
-
-#include <glib.h>
-
-#include "dict.h"
-#include "storage.h"
-
-/* Execution stack. */
-
-typedef struct { 
-#define STACK_DEPTH 64
- int sp;			/* stack pointer */
- double value[STACK_DEPTH];
-} ex_stack;
-
-/* Prototypes. */
-
-gboolean check_stack (ex_stack *stack, int depth);
-void push (ex_stack *stack, double value);
-double pop (ex_stack *stack);
-
-void expr_execute (expression_t *expr, symbol_dict_t *dict);
-
-#endif /* Included_EXECUTE_H */

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc/function.c Deleted

@@ -1,111 +0,0 @@
-/* function.c --
- *
- * Copyright (C) 2001 Janusz Gregorczyk <jgregor@kki.net.pl>
- *
- * This file is part of xvs.
- *
- * 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 <glib.h>
-#include <math.h>
-#include <string.h>
- 
-#include "function.h"
-
-/* Function pointer type. */
-typedef struct {
- char *name;
- double (*funcptr)(ex_stack *stack);
-} func_t;
-
-/* */
-
-static double f_log (ex_stack *stack) {
- return log (pop (stack));
-}
-
-static double f_sin (ex_stack *stack) {
- return sin (pop (stack));
-}
-
-static double f_cos (ex_stack *stack) {
- return cos (pop (stack));
-}
-
-static double f_tan (ex_stack *stack) {
- return tan (pop (stack));
-}
-
-static double f_asin (ex_stack *stack) {
- return asin (pop (stack));
-}
-
-static double f_acos (ex_stack *stack) {
- return acos (pop (stack));
-}
-
-static double f_atan (ex_stack *stack) {
- return atan (pop (stack));
-}
-
-static double f_if (ex_stack *stack) {
- double a = pop (stack);
- double b = pop (stack);
- return (pop (stack) != 0.0) ? a : b;
-}
-
-static double f_div (ex_stack *stack) {
- int y = (int)pop (stack);
- int x = (int)pop (stack);
- return (y == 0) ? 0 : (x / y);
-}
-
-static double f_rand (ex_stack *stack) {
- return g_random_double_range((double) pop(stack), (double) pop(stack));
-}
-
-/* */
-
-static const func_t init[] = {
- { "sin", f_sin },
- { "cos", f_cos },
- { "tan", f_tan },
- { "asin", f_asin },
- { "acos", f_acos },
- { "atan", f_atan },
- { "log", f_log },
- { "if", f_if },
- { "div", f_div },
- { "rand", f_rand }
-};
-
-int function_lookup (const char *name) {
- int i;
-
- for (i = 0; i < sizeof (init) / sizeof (init[0]); i++)
- if (strcmp (init[i].name, name) == 0)
- return i;
-
- g_warning ("Unknown function: %s\n", name);
- return -1;
-}
-
-void function_call (int func_id, ex_stack *stack) {
- g_assert (func_id >= 0);
- g_assert (func_id < sizeof (init) / sizeof (init[0]));
-
- push (stack, (*init[func_id].funcptr)(stack));
-}

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc/function.h Deleted

@@ -1,32 +0,0 @@
-/* function.h --
- *
- * Copyright (C) 2001 Janusz Gregorczyk <jgregor@kki.net.pl>
- *
- * This file is part of xvs.
- *
- * 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.
- */
-
-#ifndef Included_FUNCTION
-#define Included_FUNCTION
-
-#include "execute.h"
-
-/* Prototypes. */
-
-int function_lookup (const char *name);
-void function_call (int func_id, ex_stack *stack);
-
-#endif /* Included_FUNCTION */

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc/parser.c Deleted

@@ -1,1896 +0,0 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1. */
-
-/* Skeleton implementation for Bison's Yacc-like parsers in C
- 
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
- 
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* As a special exception, you may create a larger work that contains
- part or all of the Bison parser skeleton and distribute that work
- under terms of your choice, so long as that work isn't itself a
- parser generator using the skeleton or a modified version thereof
- as a parser skeleton. Alternatively, if you modify or redistribute
- the parser skeleton itself, you may (at your option) remove this
- special exception, which will cause the skeleton and the resulting
- Bison output files to be licensed under the GNU General Public
- License without this special exception.
- 
- This special exception was added by the Free Software Foundation in
- version 2.2 of Bison. */
-
-/* C LALR(1) parser skeleton written by Richard Stallman, by
- simplifying the original so-called "semantic" parser. */
-
-/* All symbols defined below should begin with yy or YY, to avoid
- infringing on user name space. This should be done even for local
- variables, as they might otherwise be expanded by user macros.
- There are some unavoidable exceptions within include files to
- define necessary library symbols; they are noted "INFRINGES ON
- USER NAME SPACE" below. */
-
-/* Identify Bison output. */
-#define YYBISON 1
-
-/* Bison version. */
-#define YYBISON_VERSION "2.4.1"
-
-/* Skeleton name. */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers. */
-#define YYPURE 1
-
-/* Push parsers. */
-#define YYPUSH 0
-
-/* Pull parsers. */
-#define YYPULL 1
-
-/* Using locations. */
-#define YYLSP_NEEDED 0
-
-
-
-/* Copy the first part of user declarations. */
-
-/* Line 189 of yacc.c */
-#line 26 "parser.yacc"
-
-#include <ctype.h>
-#include <glib.h>
-#include <locale.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "dict.h"
-#include "execute.h"
-#include "function.h"
-#include "parser.h"
-#include "storage.h"
-
-#define YYPARSE_PARAM yyparam
-#define YYLEX_PARAM yyparam
-
-static gboolean expr_add_compile (expression_t *expr, symbol_dict_t *dict,
-				 char *str);
-
-#define GENERATE(str) if (!expr_add_compile (((parser_control *)yyparam)->expr, \
-				 ((parser_control *)yyparam)->dict, str)) \
- YYABORT;
-
-
-/* Line 189 of yacc.c */
-#line 99 "parser.c"
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- NAME = 258,
- NUMBER = 259,
- NEG = 260
- };
-#endif
-/* Tokens. */
-#define NAME 258
-#define NUMBER 259
-#define NEG 260
-
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{
-
-/* Line 214 of yacc.c */
-#line 52 "parser.yacc"
-
-char *s_value;
-char c_value;
-double d_value;
-int i_value;
-
-
-
-/* Line 214 of yacc.c */
-#line 154 "parser.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
-/* Copy the second part of user declarations. */
-
-/* Line 264 of yacc.c */
-#line 59 "parser.yacc"
-
-int yyerror (char * s);
-int yylex (YYSTYPE * yylval, void * yyparam);
-
-
-/* Line 264 of yacc.c */
-#line 172 "parser.c"
-
-#ifdef short
-# undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
-#else
-typedef short int yytype_int8;
-#endif
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-# define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-# define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-# else
-# define YYSIZE_T unsigned int
-# endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
-#ifndef YY_
-# if YYENABLE_NLS
-# if ENABLE_NLS
-# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-# define YY_(msgid) dgettext ("bison-runtime", msgid)
-# endif
-# endif
-# ifndef YY_
-# define YY_(msgid) msgid
-# endif
-#endif
-
-/* Suppress unused-variable warnings by "using" E. */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
-#else
-# define YYUSE(e) /* empty */
-#endif
-
-/* Identity function, used to suppress warnings about constant conditions. */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
- int yyi;
-#endif
-{
- return yyi;
-}
-#endif
-
-#if ! defined yyoverflow || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols. */
-
-# ifdef YYSTACK_USE_ALLOCA
-# if YYSTACK_USE_ALLOCA
-# ifdef __GNUC__
-# define YYSTACK_ALLOC __builtin_alloca
-# elif defined __BUILTIN_VA_ARG_INCR
-# include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-# elif defined _AIX
-# define YYSTACK_ALLOC __alloca
-# elif defined _MSC_VER
-# include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-# define alloca _alloca
-# else
-# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
-# endif
-# endif
-# endif
-# endif
-# endif
-
-# ifdef YYSTACK_ALLOC
- /* Pacify GCC's `empty if-body' warning. */
-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
-# ifndef YYSTACK_ALLOC_MAXIMUM
- /* The OS might guarantee only one guard page at the bottom of the stack,
- and a page size can be as small as 4096 bytes. So we cannot safely
- invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
- to allow for a few compiler-allocated temporary stack slots. */
-# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-# endif
-# else
-# define YYSTACK_ALLOC YYMALLOC
-# define YYSTACK_FREE YYFREE
-# ifndef YYSTACK_ALLOC_MAXIMUM
-# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-# endif
-# if (defined __cplusplus && ! defined _STDLIB_H \
- && ! ((defined YYMALLOC || defined malloc) \
-	 && (defined YYFREE || defined free)))
-# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
-# endif
-# endif
-# ifndef YYMALLOC
-# define YYMALLOC malloc
-# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-# endif
-# endif
-# ifndef YYFREE
-# define YYFREE free
-# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-# endif
-# endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
-
-#if (! defined yyoverflow \
- && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member. */
-union yyalloc
-{
- yytype_int16 yyss_alloc;
- YYSTYPE yyvs_alloc;
-};
-
-/* The size of the maximum gap between one aligned stack and the next. */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
- N elements. */
-# define YYSTACK_BYTES(N) \
- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
- + YYSTACK_GAP_MAXIMUM)
-
-/* Copy COUNT objects from FROM to TO. The source and destination do
- not overlap. */
-# ifndef YYCOPY
-# if defined __GNUC__ && 1 < __GNUC__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-# else
-# define YYCOPY(To, From, Count)		\
- do					\
-	{					\
-	 YYSIZE_T yyi;				\
-	 for (yyi = 0; yyi < (Count); yyi++)	\
-	 (To)[yyi] = (From)[yyi];		\
-	}					\
- while (YYID (0))
-# endif
-# endif
-
-/* Relocate STACK from its old location to the new one. The
- local variables YYSIZE and YYSTACKSIZE give the old and new number of
- elements in the stack, and YYPTR gives the new location of the
- stack. Advance YYPTR to a properly aligned location for the next
- stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
- do									\
- {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
- }									\
- while (YYID (0))
-
-#endif
-
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 2
-/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 65
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 18
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 5
-/* YYNRULES -- Number of rules. */
-#define YYNRULES 22
-/* YYNRULES -- Number of states. */
-#define YYNSTATES 37
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
-#define YYUNDEFTOK 2
-#define YYMAXUTOK 260
-
-#define YYTRANSLATE(YYX)						\
- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
-static const yytype_uint8 yytranslate[] =
-{
- 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 14, 15, 8, 7, 13, 6, 2, 9, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 12,
- 17, 5, 16, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 11, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
- 10
-};
-
-#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
- YYRHS. */
-static const yytype_uint8 yyprhs[] =
-{
- 0, 0, 3, 4, 7, 8, 10, 13, 16, 18,
- 22, 24, 26, 30, 35, 39, 43, 47, 51, 55,
- 59, 62, 66
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yytype_int8 yyrhs[] =
-{
- 19, 0, -1, -1, 19, 20, -1, -1, 22, -1,
- 20, 12, -1, 1, 12, -1, 22, -1, 21, 13,
- 22, -1, 4, -1, 3, -1, 3, 5, 22, -1,
- 3, 14, 21, 15, -1, 22, 16, 22, -1, 22,
- 17, 22, -1, 22, 7, 22, -1, 22, 6, 22,
- -1, 22, 8, 22, -1, 22, 9, 22, -1, 6,
- 22, -1, 22, 11, 22, -1, 14, 22, 15, -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const yytype_uint8 yyrline[] =
-{
- 0, 81, 81, 82, 86, 87, 89, 90, 95, 98,
- 103, 109, 115, 121, 128, 130, 133, 135, 137, 139,
- 141, 143, 145
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
- First, the terminals, then, starting at YYNTOKENS, nonterminals. */
-static const char *const yytname[] =
-{
- "$end", "error", "$undefined", "NAME", "NUMBER", "'='", "'-'", "'+'",
- "'*'", "'/'", "NEG", "'^'", "';'", "','", "'('", "')'", "'>'", "'<'",
- "$accept", "input", "expression_list", "argument_list", "expression", 0
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
- token YYLEX-NUM. */
-static const yytype_uint16 yytoknum[] =
-{
- 0, 256, 257, 258, 259, 61, 45, 43, 42, 47,
- 260, 94, 59, 44, 40, 41, 62, 60
-};
-# endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const yytype_uint8 yyr1[] =
-{
- 0, 18, 19, 19, 20, 20, 20, 20, 21, 21,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const yytype_uint8 yyr2[] =
-{
- 0, 2, 0, 2, 0, 1, 2, 2, 1, 3,
- 1, 1, 3, 4, 3, 3, 3, 3, 3, 3,
- 2, 3, 3
-};
-
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
- STATE-NUM when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
-static const yytype_uint8 yydefact[] =
-{
- 2, 0, 1, 0, 11, 10, 0, 0, 3, 5,
- 7, 0, 0, 20, 0, 6, 0, 0, 0, 0,
- 0, 0, 0, 12, 0, 8, 22, 17, 16, 18,
- 19, 21, 14, 15, 0, 13, 9
-};
-
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yytype_int8 yydefgoto[] =
-{
- -1, 1, 8, 24, 9
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
- STATE-NUM. */
-#define YYPACT_NINF -10
-static const yytype_int8 yypact[] =
-{
- -10, 17, -10, -8, 22, -10, 47, 47, -3, 38,
- -10, 47, 47, -9, 26, -10, 47, 47, 47, 47,
- 47, 47, 47, 38, 9, 38, -10, 48, 48, -9,
- -9, -9, 38, 38, 47, -10, 38
-};
-
-/* YYPGOTO[NTERM-NUM]. */
-static const yytype_int8 yypgoto[] =
-{
- -10, -10, -10, -10, -6
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
- number is the opposite. If zero, do what YYDEFACT says.
- If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -5
-static const yytype_int8 yytable[] =
-{
- 13, 14, 20, 0, 10, 23, 25, 21, 22, 15,
- 27, 28, 29, 30, 31, 32, 33, 2, 3, 0,
- 4, 5, 34, 6, 35, 0, 0, 11, 36, -4,
- 0, 7, 16, 17, 18, 19, 12, 20, 0, 0,
- 0, 26, 21, 22, 16, 17, 18, 19, 0, 20,
- 4, 5, 0, 6, 21, 22, 18, 19, 0, 20,
- 0, 7, 0, 0, 21, 22
-};
-
-static const yytype_int8 yycheck[] =
-{
- 6, 7, 11, -1, 12, 11, 12, 16, 17, 12,
- 16, 17, 18, 19, 20, 21, 22, 0, 1, -1,
- 3, 4, 13, 6, 15, -1, -1, 5, 34, 12,
- -1, 14, 6, 7, 8, 9, 14, 11, -1, -1,
- -1, 15, 16, 17, 6, 7, 8, 9, -1, 11,
- 3, 4, -1, 6, 16, 17, 8, 9, -1, 11,
- -1, 14, -1, -1, 16, 17
-};
-
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
-static const yytype_uint8 yystos[] =
-{
- 0, 19, 0, 1, 3, 4, 6, 14, 20, 22,
- 12, 5, 14, 22, 22, 12, 6, 7, 8, 9,
- 11, 16, 17, 22, 21, 22, 15, 22, 22, 22,
- 22, 22, 22, 22, 13, 15, 22
-};
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror. This remains here temporarily
- to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
-
-#define YYFAIL		goto yyerrlab
-
-#define YYRECOVERING() (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)					\
-do								\
- if (yychar == YYEMPTY && yylen == 1)				\
- {								\
- yychar = (Token);						\
- yylval = (Value);						\
- yytoken = YYTRANSLATE (yychar);				\
- YYPOPSTACK (1);						\
- goto yybackup;						\
- }								\
- else								\
- {								\
- yyerror (YY_("syntax error: cannot back up")); \
- YYERROR;							\
- }								\
-while (YYID (0))
-
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
- If N is 0, then set CURRENT to the empty location which ends
- the previous symbol: RHS[0] (always defined). */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
- do									\
- if (YYID (N)) \
-	{								\
-	 (Current).first_line = YYRHSLOC (Rhs, 1).first_line;	\
-	 (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	 (Current).last_line = YYRHSLOC (Rhs, N).last_line;		\
-	 (Current).last_column = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
- else								\
-	{								\
-	 (Current).first_line = (Current).last_line =		\
-	 YYRHSLOC (Rhs, 0).last_line;				\
-	 (Current).first_column = (Current).last_column =		\
-	 YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
- while (YYID (0))
-#endif
-
-
-/* YY_LOCATION_PRINT -- Print the location on the stream.
- This macro was not mandated originally: define only if we know
- we won't break user code: when these are the locations we know. */
-
-#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-# define YY_LOCATION_PRINT(File, Loc)			\
- fprintf (File, "%d.%d-%d.%d",			\
-	 (Loc).first_line, (Loc).first_column,	\
-	 (Loc).last_line, (Loc).last_column)
-# else
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments. */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval)
-#endif
-
-/* Enable debugging if requested. */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-# define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
- if (yydebug)					\
- YYFPRINTF Args;				\
-} while (YYID (0))
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			 \
-do {									 \
- if (yydebug)								 \
- {									 \
- YYFPRINTF (stderr, "%s ", Title);					 \
- yy_symbol_print (stderr,						 \
-		 Type, Value); \
- YYFPRINTF (stderr, "\n");						 \
- }									 \
-} while (YYID (0))
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
-#endif
-{
- if (!yyvaluep)
- return;
-# ifdef YYPRINT
- if (yytype < YYNTOKENS)
- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
- YYUSE (yyoutput);
-# endif
- switch (yytype)
- {
- default:
-	break;
- }
-}
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
-#endif
-{
- if (yytype < YYNTOKENS)
- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
- else
- YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
- yy_symbol_value_print (yyoutput, yytype, yyvaluep);
- YYFPRINTF (yyoutput, ")");
-}
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included). |
-`------------------------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
-#endif
-{
- YYFPRINTF (stderr, "Stack now");
- for (; yybottom <= yytop; yybottom++)
- {
- int yybot = *yybottom;
- YYFPRINTF (stderr, " %d", yybot);
- }
- YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
- if (yydebug)							\
- yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced. |
-`------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
- YYSTYPE *yyvsp;
- int yyrule;
-#endif
-{
- int yynrhs = yyr2[yyrule];
- int yyi;
- unsigned long int yylno = yyrline[yyrule];
- YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	 yyrule - 1, yylno);
- /* The symbols being reduced. */
- for (yyi = 0; yyi < yynrhs; yyi++)
- {
- YYFPRINTF (stderr, " $%d = ", yyi + 1);
- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		 &(yyvsp[(yyi + 1) - (yynrhs)])
-		 		 );
- YYFPRINTF (stderr, "\n");
- }
-}
-
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
- if (yydebug)				\
- yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
-
-/* Nonzero means print parse trace. It is left uninitialized so that
- multiple parsers can coexist. */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-
-/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
- if the built-in stack extension method is used).
-
- Do not make this value too large; the results are undefined if
- YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
- evaluated with infinite-precision integer arithmetic. */
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-&#xc;
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-# if defined __GLIBC__ && defined _STRING_H
-# define yystrlen strlen
-# else
-/* Return the length of YYSTR. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static YYSIZE_T
-yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
- const char *yystr;
-#endif
-{
- YYSIZE_T yylen;
- for (yylen = 0; yystr[yylen]; yylen++)
- continue;
- return yylen;
-}
-# endif
-# endif
-
-# ifndef yystpcpy
-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-# define yystpcpy stpcpy
-# else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
- YYDEST. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
- char *yydest;
- const char *yysrc;
-#endif
-{
- char *yyd = yydest;
- const char *yys = yysrc;
-
- while ((*yyd++ = *yys++) != '\0')
- continue;
-
- return yyd - 1;
-}
-# endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
- quotes and backslashes, so that it's suitable for yyerror. The
- heuristic is that double-quoting is unnecessary unless the string
- contains an apostrophe, a comma, or backslash (other than
- backslash-backslash). YYSTR is taken from yytname. If YYRES is
- null, do not copy; instead, return the length of what the result
- would have been. */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
- if (*yystr == '"')
- {
- YYSIZE_T yyn = 0;
- char const *yyp = yystr;
-
- for (;;)
-	switch (*++yyp)
-	 {
-	 case '\'':
-	 case ',':
-	 goto do_not_strip_quotes;
-
-	 case '\\':
-	 if (*++yyp != '\\')
-	 goto do_not_strip_quotes;
-	 /* Fall through. */
-	 default:
-	 if (yyres)
-	 yyres[yyn] = *yyp;
-	 yyn++;
-	 break;
-
-	 case '"':
-	 if (yyres)
-	 yyres[yyn] = '\0';
-	 return yyn;
-	 }
- do_not_strip_quotes: ;
- }
-
- if (! yyres)
- return yystrlen (yystr);
-
- return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
-
-/* Copy into YYRESULT an error message about the unexpected token
- YYCHAR while in state YYSTATE. Return the number of bytes copied,
- including the terminating null byte. If YYRESULT is null, do not
- copy anything; just return the number of bytes that would be
- copied. As a special case, return 0 if an ordinary "syntax error"
- message will do. Return YYSIZE_MAXIMUM if overflow occurs during
- size calculation. */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
- int yyn = yypact[yystate];
-
- if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
- return 0;
- else
- {
- int yytype = YYTRANSLATE (yychar);
- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
- YYSIZE_T yysize = yysize0;
- YYSIZE_T yysize1;
- int yysize_overflow = 0;
- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
- int yyx;
-
-# if 0
- /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly. */
- YY_("syntax error, unexpected %s");
- YY_("syntax error, unexpected %s, expecting %s");
- YY_("syntax error, unexpected %s, expecting %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
- char *yyfmt;
- char const *yyf;
- static char const yyunexpected[] = "syntax error, unexpected %s";
- static char const yyexpecting[] = ", expecting %s";
- static char const yyor[] = " or %s";
- char yyformat[sizeof yyunexpected
-		 + sizeof yyexpecting - 1
-		 + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		 * (sizeof yyor - 1))];
- char const *yyprefix = yyexpecting;
-
- /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK. */
- int yyxbegin = yyn < 0 ? -yyn : 0;
-
- /* Stay within bounds of both yycheck and yytname. */
- int yychecklim = YYLAST - yyn + 1;
- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yycount = 1;
-
- yyarg[0] = yytname[yytype];
- yyfmt = yystpcpy (yyformat, yyunexpected);
-
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	 {
-	 if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	 {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	 }
-	 yyarg[yycount++] = yytname[yyx];
-	 yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	 yysize_overflow |= (yysize1 < yysize);
-	 yysize = yysize1;
-	 yyfmt = yystpcpy (yyfmt, yyprefix);
-	 yyprefix = yyor;
-	 }
-
- yyf = YY_(yyformat);
- yysize1 = yysize + yystrlen (yyf);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
-
- if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
-
- if (yyresult)
-	{
-	 /* Avoid sprintf, as that infringes on the user's name space.
-	 Don't have undefined behavior even if the translation
-	 produced a string with the wrong number of "%s"s. */
-	 char *yyp = yyresult;
-	 int yyi = 0;
-	 while ((*yyp = *yyf) != '\0')
-	 {
-	 if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		 yyp += yytnamerr (yyp, yyarg[yyi++]);
-		 yyf += 2;
-		}
-	 else
-		{
-		 yyp++;
-		 yyf++;
-		}
-	 }
-	}
- return yysize;
- }
-}
-#endif /* YYERROR_VERBOSE */
-&#xc;
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol. |
-`-----------------------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
- const char *yymsg;
- int yytype;
- YYSTYPE *yyvaluep;
-#endif
-{
- YYUSE (yyvaluep);
-
- if (!yymsg)
- yymsg = "Deleting";
- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
- switch (yytype)
- {
-
- default:
-	break;
- }
-}
-
-/* Prevent warnings from -Wmissing-prototypes. */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
-
-
-
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
-
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
- void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
-{
-/* The lookahead symbol. */
-int yychar;
-
-/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval;
-
- /* Number of syntax errors so far. */
- int yynerrs;
-
- int yystate;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
-
- /* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
-
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss;
- yytype_int16 *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
-
- YYSIZE_T yystacksize;
-
- int yyn;
- int yyresult;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken;
- /* The variables used to return semantic value and location from the
- action routines. */
- YYSTYPE yyval;
-
-#if YYERROR_VERBOSE
- /* Buffer for error messages, and its allocated size. */
- char yymsgbuf[128];
- char *yymsg = yymsgbuf;
- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
-
- /* The number of symbols on the RHS of the reduced rule.
- Keep to zero when no symbol should be popped. */
- int yylen = 0;
-
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
- yystacksize = YYINITDEPTH;
-
- YYDPRINTF ((stderr, "Starting parse\n"));
-
- yystate = 0;
- yyerrstatus = 0;
- yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
-
- /* Initialize stack pointers.
- Waste one element of value and location stack
- so that they stay on the same level as the state stack.
- The wasted elements are never initialized. */
- yyssp = yyss;
- yyvsp = yyvs;
-
- goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate. |
-`------------------------------------------------------------*/
- yynewstate:
- /* In all cases, when you get here, the value and location stacks
- have just been pushed. So pushing a state here evens the stacks. */
- yyssp++;
-
- yysetstate:
- *yyssp = yystate;
-
- if (yyss + yystacksize - 1 <= yyssp)
- {
- /* Get the current used size of the three stacks, in elements. */
- YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
- {
-	/* Give user a chance to reallocate the stack. Use copies of
-	 these so that the &'s don't force the real ones into
-	 memory. */
-	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-
-	/* Each stack pointer address is followed by the size of the
-	 data in use in that stack, in bytes. This used to be a
-	 conditional around just the two extra args, but that might
-	 be undefined if yyoverflow is a macro. */
-	yyoverflow (YY_("memory exhausted"),
-		 &yyss1, yysize * sizeof (*yyssp),
-		 &yyvs1, yysize * sizeof (*yyvsp),
-		 &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
- }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
- goto yyexhaustedlab;
-# else
- /* Extend the stack our own way. */
- if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
- yystacksize *= 2;
- if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
-
- {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	 (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	 goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-# undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	 YYSTACK_FREE (yyss1);
- }
-# endif
-#endif /* no yyoverflow */
-
- yyssp = yyss + yysize - 1;
- yyvsp = yyvs + yysize - 1;
-
- YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		 (unsigned long int) yystacksize));
-
- if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
- }
-
- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
- if (yystate == YYFINAL)
- YYACCEPT;
-
- goto yybackup;
-
-/*-----------.
-| yybackup. |
-`-----------*/
-yybackup:
-
- /* Do appropriate processing given the current state. Read a
- lookahead token if we need one and don't already have one. */
-
- /* First try to decide what to do without reference to lookahead token. */
- yyn = yypact[yystate];
- if (yyn == YYPACT_NINF)
- goto yydefault;
-
- /* Not known => get a lookahead token if don't already have one. */
-
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
- if (yychar == YYEMPTY)
- {
- YYDPRINTF ((stderr, "Reading a token: "));
- yychar = YYLEX;
- }
-
- if (yychar <= YYEOF)
- {
- yychar = yytoken = YYEOF;
- YYDPRINTF ((stderr, "Now at end of input.\n"));
- }
- else
- {
- yytoken = YYTRANSLATE (yychar);
- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
- }
-
- /* If the proper action on seeing token YYTOKEN is to reduce or to
- detect an error, take that action. */
- yyn += yytoken;
- if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
- goto yydefault;
- yyn = yytable[yyn];
- if (yyn <= 0)
- {
- if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
- yyn = -yyn;
- goto yyreduce;
- }
-
- /* Count tokens shifted since error; after three, turn off error
- status. */
- if (yyerrstatus)
- yyerrstatus--;
-
- /* Shift the lookahead token. */
- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
- /* Discard the shifted token. */
- yychar = YYEMPTY;
-
- yystate = yyn;
- *++yyvsp = yylval;
-
- goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state. |
-`-----------------------------------------------------------*/
-yydefault:
- yyn = yydefact[yystate];
- if (yyn == 0)
- goto yyerrlab;
- goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction. |
-`-----------------------------*/
-yyreduce:
- /* yyn is the number of a rule to reduce with. */
- yylen = yyr2[yyn];
-
- /* If YYLEN is nonzero, implement the default value of the action:
- `$$ = $1'.
-
- Otherwise, the following line sets YYVAL to garbage.
- This behavior is undocumented and Bison
- users should not rely upon it. Assigning to YYVAL
- unconditionally makes the parser a bit smaller, and it avoids a
- GCC warning that YYVAL may be used uninitialized. */
- yyval = yyvsp[1-yylen];
-
-
- YY_REDUCE_PRINT (yyn);
- switch (yyn)
- {
- case 5:
-
-/* Line 1455 of yacc.c */
-#line 88 "parser.yacc"
- { }
- break;
-
- case 7:
-
-/* Line 1455 of yacc.c */
-#line 91 "parser.yacc"
- { yyerrok; }
- break;
-
- case 8:
-
-/* Line 1455 of yacc.c */
-#line 96 "parser.yacc"
- {
- }
- break;
-
- case 9:
-
-/* Line 1455 of yacc.c */
-#line 99 "parser.yacc"
- {
- }
- break;
-
- case 10:
-
-/* Line 1455 of yacc.c */
-#line 104 "parser.yacc"
- {
- char *buf = g_strdup_printf ("c%f:", (yyvsp[(1) - (1)].d_value));
- GENERATE (buf);
- g_free (buf);
- }
- break;
-
- case 11:
-
-/* Line 1455 of yacc.c */
-#line 110 "parser.yacc"
- {
- char *buf = g_strdup_printf ("l%s:", (yyvsp[(1) - (1)].s_value));
- GENERATE (buf);
- g_free (buf);
- }
- break;
-
- case 12:
-
-/* Line 1455 of yacc.c */
-#line 116 "parser.yacc"
- {
- char *buf = g_strdup_printf ("s%s:", (yyvsp[(1) - (3)].s_value));
- GENERATE (buf);
- g_free (buf);
- }
- break;
-
- case 13:
-
-/* Line 1455 of yacc.c */
-#line 122 "parser.yacc"
- {
- char *buf = g_strdup_printf ("f%s:", (yyvsp[(1) - (4)].s_value));
- GENERATE (buf);
- g_free (buf);
- }
- break;
-
- case 14:
-
-/* Line 1455 of yacc.c */
-#line 129 "parser.yacc"
- { GENERATE (">"); }
- break;
-
- case 15:
-
-/* Line 1455 of yacc.c */
-#line 131 "parser.yacc"
- { GENERATE ("<"); }
- break;
-
- case 16:
-
-/* Line 1455 of yacc.c */
-#line 134 "parser.yacc"
- { GENERATE ("+"); }
- break;
-
- case 17:
-
-/* Line 1455 of yacc.c */
-#line 136 "parser.yacc"
- { GENERATE ("-"); }
- break;
-
- case 18:
-
-/* Line 1455 of yacc.c */
-#line 138 "parser.yacc"
- { GENERATE ("*"); }
- break;
-
- case 19:
-
-/* Line 1455 of yacc.c */
-#line 140 "parser.yacc"
- { GENERATE ("/"); }
- break;
-
- case 20:
-
-/* Line 1455 of yacc.c */
-#line 142 "parser.yacc"
- { GENERATE ("n"); }
- break;
-
- case 21:
-
-/* Line 1455 of yacc.c */
-#line 144 "parser.yacc"
- { GENERATE ("^"); }
- break;
-
- case 22:
-
-/* Line 1455 of yacc.c */
-#line 146 "parser.yacc"
- { }
- break;
-
-
-
-/* Line 1455 of yacc.c */
-#line 1523 "parser.c"
- default: break;
- }
- YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
- YYPOPSTACK (yylen);
- yylen = 0;
- YY_STACK_PRINT (yyss, yyssp);
-
- *++yyvsp = yyval;
-
- /* Now `shift' the result of the reduction. Determine what state
- that goes to, based on the state we popped back to and the rule
- number reduced by. */
-
- yyn = yyr1[yyn];
-
- yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
- if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
- yystate = yytable[yystate];
- else
- yystate = yydefgoto[yyn - YYNTOKENS];
-
- goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
- /* If not already recovering from an error, report this error. */
- if (!yyerrstatus)
- {
- ++yynerrs;
-#if ! YYERROR_VERBOSE
- yyerror (YY_("syntax error"));
-#else
- {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	 {
-	 YYSIZE_T yyalloc = 2 * yysize;
-	 if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	 yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	 if (yymsg != yymsgbuf)
-	 YYSTACK_FREE (yymsg);
-	 yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	 if (yymsg)
-	 yymsg_alloc = yyalloc;
-	 else
-	 {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	 }
-	 }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	 {
-	 (void) yysyntax_error (yymsg, yystate, yychar);
-	 yyerror (yymsg);
-	 }
-	else
-	 {
-	 yyerror (YY_("syntax error"));
-	 if (yysize != 0)
-	 goto yyexhaustedlab;
-	 }
- }
-#endif
- }
-
-
-
- if (yyerrstatus == 3)
- {
- /* If just tried and failed to reuse lookahead token after an
-	 error, discard it. */
-
- if (yychar <= YYEOF)
-	{
-	 /* Return failure if at end of input. */
-	 if (yychar == YYEOF)
-	 YYABORT;
-	}
- else
-	{
-	 yydestruct ("Error: discarding",
-		 yytoken, &yylval);
-	 yychar = YYEMPTY;
-	}
- }
-
- /* Else will try to reuse lookahead token after shifting the error
- token. */
- goto yyerrlab1;
-
-
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR. |
-`---------------------------------------------------*/
-yyerrorlab:
-
- /* Pacify compilers like GCC when the user code never invokes
- YYERROR and the label yyerrorlab therefore never appears in user
- code. */
- if (/*CONSTCOND*/ 0)
- goto yyerrorlab;
-
- /* Do not reclaim the symbols of the rule which action triggered
- this YYERROR. */
- YYPOPSTACK (yylen);
- yylen = 0;
- YY_STACK_PRINT (yyss, yyssp);
- yystate = *yyssp;
- goto yyerrlab1;
-
-
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR. |
-`-------------------------------------------------------------*/
-yyerrlab1:
- yyerrstatus = 3;	/* Each real token shifted decrements this. */
-
- for (;;)
- {
- yyn = yypact[yystate];
- if (yyn != YYPACT_NINF)
-	{
-	 yyn += YYTERROR;
-	 if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	 {
-	 yyn = yytable[yyn];
-	 if (0 < yyn)
-		break;
-	 }
-	}
-
- /* Pop the current state because it cannot handle the error token. */
- if (yyssp == yyss)
-	YYABORT;
-
-
- yydestruct ("Error: popping",
-		 yystos[yystate], yyvsp);
- YYPOPSTACK (1);
- yystate = *yyssp;
- YY_STACK_PRINT (yyss, yyssp);
- }
-
- *++yyvsp = yylval;
-
-
- /* Shift the error token. */
- YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
-
- yystate = yyn;
- goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here. |
-`-------------------------------------*/
-yyacceptlab:
- yyresult = 0;
- goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here. |
-`-----------------------------------*/
-yyabortlab:
- yyresult = 1;
- goto yyreturn;
-
-#if !defined(yyoverflow) || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here. |
-`-------------------------------------------------*/
-yyexhaustedlab:
- yyerror (YY_("memory exhausted"));
- yyresult = 2;
- /* Fall through. */
-#endif
-
-yyreturn:
- if (yychar != YYEMPTY)
- yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
- /* Do not reclaim the symbols of the rule which action triggered
- this YYABORT or YYACCEPT. */
- YYPOPSTACK (yylen);
- YY_STACK_PRINT (yyss, yyssp);
- while (yyssp != yyss)
- {
- yydestruct ("Cleanup: popping",
-		 yystos[*yyssp], yyvsp);
- YYPOPSTACK (1);
- }
-#ifndef yyoverflow
- if (yyss != yyssa)
- YYSTACK_FREE (yyss);
-#endif
-#if YYERROR_VERBOSE
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
-#endif
- /* Make sure YYID is used. */
- return YYID (yyresult);
-}
-
-
-
-/* Line 1675 of yacc.c */
-#line 149 "parser.yacc"
-
-/* End of grammar */
-
-/* Called by yyparse on error. */
-int yyerror (char *s) {
- /* Ignore errors, just print a warning. */
- g_warning ("%s\n", s);
- return 0;
-}
-
-int yylex (YYSTYPE *yylval, void *yyparam) {
- int c;
- parser_control *pc = (parser_control *) yyparam;
-
- /* Ignore whitespace, get first nonwhite character. */
- while ((c = vfs_getc (pc->input)) == ' ' || c == '\t' || c == '\n');
-
- /* End of input ? */
- if (c == EOF)
- return 0;
-
- /* Char starts a number => parse the number. */
- if (isdigit (c)) {
- if (vfs_ungetc (c, pc->input) == EOF)
- return 0;
-
- {
- char *old_locale, *saved_locale;
-
- old_locale = setlocale (LC_ALL, NULL);
- saved_locale = g_strdup (old_locale);
- setlocale (LC_ALL, "C");
- sscanf ((gchar *) ((VFSBuffer *)(pc->input->handle))->iter, "%lf", & yylval->d_value);
-
- while (isdigit(c) || c == '.')
- {
- c = vfs_getc(pc->input);
- }
-
- if (c != EOF && vfs_ungetc (c, pc->input) == EOF)
- return 0;
-
- setlocale (LC_ALL, saved_locale);
- g_free (saved_locale);
- }
- return NUMBER;
- }
-
- /* Char starts an identifier => read the name. */
- if (isalpha (c)) {
- GString *sym_name;
-
- sym_name = g_string_new (NULL);
-
- do {
- sym_name = g_string_append_c (sym_name, c);
-
- /* Get another character. */
- c = vfs_getc (pc->input);
- } while (c != EOF && isalnum (c));
-
- if (c != EOF && vfs_ungetc (c, pc->input) == EOF) {
- g_string_free (sym_name, FALSE);
- return 0;
- }
-
- yylval->s_value = sym_name->str;
-
- g_string_free (sym_name, FALSE);
-
- return NAME;
- }
-
- /* Any other character is a token by itself. */
- return c;
-}
-
-static int load_name (char *str, char **name) {
- int count = 0;
- GString *new = g_string_new (NULL);
-
- while (*str != 0 && *str != ':') {
- g_string_append_c (new, *str++);
- count++;
- }
-
- *name = new->str;
- g_string_free (new, FALSE);
-
- return count;
-}
-
-static gboolean expr_add_compile (expression_t *expr, symbol_dict_t *dict,
-				 char *str) {
- char op;
- double dval;
- int i;
- char *name;
-
- while ((op = *str++)) {
- switch (op) {
- case 'c':			/* A constant. */
- store_byte (expr, 'c');
- sscanf (str, "%lf%n", &dval, &i);
- str += i;
- store_double (expr, dval);
- str++;			/* Skip ';' */
- break;
-
- case 'f':			/* A function call. */
- store_byte (expr, 'f');
- str += load_name (str, &name);
- i = function_lookup (name);
- if (i < 0) return FALSE;	/* Fail on error. */
- store_int (expr, i);
- g_free (name);
- str++;			/* Skip ';' */
- break;
-
- case 'l':			/* Load a variable. */
- case 's':			/* Store a variable. */
- store_byte (expr, op);
- str += load_name (str, &name);
- i = dict_lookup (dict, name);
- store_int (expr, i);
- g_free (name);
- str++;			/* Skip ';' */
- break;
-
- default:			/* Copy verbatim. */
- store_byte (expr, op);
- break;
- }
- }
-
- return TRUE;
-}
-
-expression_t *expr_compile_string (const char* str, symbol_dict_t *dict)
-{
- parser_control pc;
- VFSFile *stream;
-
- g_return_val_if_fail(str != NULL && dict != NULL, NULL);
-
- stream = vfs_buffer_new_from_string ( (char *) str );
-
- pc.input = stream;
- pc.expr = expr_new ();
- pc.dict = dict;
-
- if (yyparse (&pc) != 0) {
- /* Check for error. */
- expr_free (pc.expr);
- pc.expr = NULL;
- }
-
- vfs_fclose (stream);
-
- return pc.expr;
-}
-

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc/parser.h Deleted

@@ -1,42 +0,0 @@
-/* parser.h -- header file for libexp
- *
- * Copyright (C) 2001 Janusz Gregorczyk <jgregor@kki.net.pl>
- *
- * This file is part of xvs.
- *
- * 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.
- */
-
-#ifndef Included_PARSER_H
-#define Included_PARSER_H
-
-#include <glib.h>
-#include <stdio.h>
-#include <audacious/plugin.h>
-#include <libaudcore/vfs_buffer.h>
-
-#include "execute.h"
-
-/* Structure passed do yyparse. */
-typedef struct {
- VFSFile *input;
- expression_t *expr;
- symbol_dict_t *dict;
-} parser_control;
-
-/* Prototypes. */
-expression_t *expr_compile_string (const char *str, symbol_dict_t *dict);
-
-#endif /* Included_PARSER_H */

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc/parser.yacc Deleted

@@ -1,309 +0,0 @@
-/* parser.y -- Bison parser for libexp
- *
- * Copyright (C) 2001 Janusz Gregorczyk <jgregor@kki.net.pl>
- *
- * This file is part of xvs.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/* suppress conflict warnings */
-%expect 37
-
-/* C declarations. */
-%{
-#include <ctype.h>
-#include <glib.h>
-#include <locale.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "dict.h"
-#include "execute.h"
-#include "function.h"
-#include "parser.h"
-#include "storage.h"
-
-#define YYPARSE_PARAM yyparam
-#define YYLEX_PARAM yyparam
-
-static gboolean expr_add_compile (expression_t *expr, symbol_dict_t *dict,
-				 char *str);
-
-#define GENERATE(str) if (!expr_add_compile (((parser_control *)yyparam)->expr, \
-				 ((parser_control *)yyparam)->dict, str)) \
- YYABORT;
-%}
-
-/* Data types. */
-%union {
-char *s_value;
-char c_value;
-double d_value;
-int i_value;
-}
-
-%{
-int yyerror (char * s);
-int yylex (YYSTYPE * yylval, void * yyparam);
-%}
-
-%pure_parser
-
-/* Terminal symbols. */
-%token <s_value> NAME
-%token <d_value> NUMBER
-
-/* Precedence rules. */
-%right '='
-%left '-' '+'
-%left '*' '/'
-%left NEG
-%right '^'
-
-/* Grammar follows */
-%%
-
-/* Input consits of a (possibly empty) list of expressions. */
-input:			/* empty */
-			| input expression_list
-;
-
-/* expression_list is a ';' separated list of expressions. */
-expression_list:	/* empty */
- 			| expression
-			 { }
- | expression_list ';'
- 			| error ';'
-			 { yyerrok; }
-
-/* argument list is a comma separated list od expressions */
-argument_list:
-			expression
- {
- }
- | argument_list ',' expression
- {
- }
-
-/* expression is a C-like expression. */
-expression:		NUMBER
-			 {
- char *buf = g_strdup_printf ("c%f:", $1);
- GENERATE (buf);
- g_free (buf);
- }
-		 | NAME
-			 {
- char *buf = g_strdup_printf ("l%s:", $1);
- GENERATE (buf);
- g_free (buf);
- }
- 			| NAME '=' expression
-			 {
- char *buf = g_strdup_printf ("s%s:", $1);
- GENERATE (buf);
- g_free (buf);
- }
- | NAME '(' argument_list ')'
- {
- char *buf = g_strdup_printf ("f%s:", $1);
- GENERATE (buf);
- g_free (buf);
- }
-
-			| expression '>' expression
-			 { GENERATE (">"); }
-			| expression '<' expression
-			 { GENERATE ("<"); }
-
-			| expression '+' expression
-			 { GENERATE ("+"); }
-			| expression '-' expression
-			 { GENERATE ("-"); }
-			| expression '*' expression
-			 { GENERATE ("*"); }
-			| expression '/' expression
-			 { GENERATE ("/"); }
-			| '-' expression %prec NEG
-			 { GENERATE ("n"); }
-			| expression '^' expression
-			 { GENERATE ("^"); }
-			| '(' expression ')'
-			 { }
-;
-
-%%
-/* End of grammar */
-
-/* Called by yyparse on error. */
-int yyerror (char *s) {
- /* Ignore errors, just print a warning. */
- g_warning ("%s\n", s);
- return 0;
-}
-
-int yylex (YYSTYPE *yylval, void *yyparam) {
- int c;
- parser_control *pc = (parser_control *) yyparam;
-
- /* Ignore whitespace, get first nonwhite character. */
- while ((c = vfs_getc (pc->input)) == ' ' || c == '\t' || c == '\n');
-
- /* End of input ? */
- if (c == EOF)
- return 0;
-
- /* Char starts a number => parse the number. */
- if (isdigit (c)) {
- if (vfs_ungetc (c, pc->input) == EOF)
- return 0;
-
- {
- char *old_locale, *saved_locale;
-
- old_locale = setlocale (LC_ALL, NULL);
- saved_locale = g_strdup (old_locale);
- setlocale (LC_ALL, "C");
- sscanf ((gchar *) ((VFSBuffer *)(pc->input->handle))->iter, "%lf", & yylval->d_value);
-
- while (isdigit(c) || c == '.')
- {
- c = vfs_getc(pc->input);
- }
-
- if (c != EOF && vfs_ungetc (c, pc->input) == EOF)
- return 0;
-
- setlocale (LC_ALL, saved_locale);
- g_free (saved_locale);
- }
- return NUMBER;
- }
-
- /* Char starts an identifier => read the name. */
- if (isalpha (c)) {
- GString *sym_name;
-
- sym_name = g_string_new (NULL);
-
- do {
- sym_name = g_string_append_c (sym_name, c);
-
- /* Get another character. */
- c = vfs_getc (pc->input);
- } while (c != EOF && isalnum (c));
-
- if (c != EOF && vfs_ungetc (c, pc->input) == EOF) {
- g_string_free (sym_name, FALSE);
- return 0;
- }
-
- yylval->s_value = sym_name->str;
-
- g_string_free (sym_name, FALSE);
-
- return NAME;
- }
-
- /* Any other character is a token by itself. */
- return c;
-}
-
-static int load_name (char *str, char **name) {
- int count = 0;
- GString *new = g_string_new (NULL);
-
- while (*str != 0 && *str != ':') {
- g_string_append_c (new, *str++);
- count++;
- }
-
- *name = new->str;
- g_string_free (new, FALSE);
-
- return count;
-}
-
-static gboolean expr_add_compile (expression_t *expr, symbol_dict_t *dict,
-				 char *str) {
- char op;
- double dval;
- int i;
- char *name;
-
- while ((op = *str++)) {
- switch (op) {
- case 'c':			/* A constant. */
- store_byte (expr, 'c');
- sscanf (str, "%lf%n", &dval, &i);
- str += i;
- store_double (expr, dval);
- str++;			/* Skip ';' */
- break;
-
- case 'f':			/* A function call. */
- store_byte (expr, 'f');
- str += load_name (str, &name);
- i = function_lookup (name);
- if (i < 0) return FALSE;	/* Fail on error. */
- store_int (expr, i);
- g_free (name);
- str++;			/* Skip ';' */
- break;
-
- case 'l':			/* Load a variable. */
- case 's':			/* Store a variable. */
- store_byte (expr, op);
- str += load_name (str, &name);
- i = dict_lookup (dict, name);
- store_int (expr, i);
- g_free (name);
- str++;			/* Skip ';' */
- break;
-
- default:			/* Copy verbatim. */
- store_byte (expr, op);
- break;
- }
- }
-
- return TRUE;
-}
-
-expression_t *expr_compile_string (const char* str, symbol_dict_t *dict)
-{
- parser_control pc;
- VFSFile *stream;
-
- g_return_val_if_fail(str != NULL && dict != NULL, NULL);
-
- stream = vfs_buffer_new_from_string ( (char *) str );
-
- pc.input = stream;
- pc.expr = expr_new ();
- pc.dict = dict;
-
- if (yyparse (&pc) != 0) {
- /* Check for error. */
- expr_free (pc.expr);
- pc.expr = NULL;
- }
-
- vfs_fclose (stream);
-
- return pc.expr;
-}

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc/storage.c Deleted

@@ -1,79 +0,0 @@
-/* storage.c --
- *
- * Copyright (C) 2001 Janusz Gregorczyk <jgregor@kki.net.pl>
- *
- * This file is part of xvs.
- *
- * 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 <glib.h>
-#include <stddef.h>
- 
-#include "storage.h"
-
-/* Code block. */
-
-expression_t *expr_new (void) {
- expression_t *new_expr;
-
- new_expr = (expression_t *)g_malloc (sizeof(expression_t));
- new_expr->data = g_string_new (NULL);
- return new_expr;
-}
-
-void expr_free (expression_t *expr) {
- if (!expr)
- return;
-
- g_string_free (expr->data, TRUE);
- g_free (expr);
-}
-
-static void load_data (char *str, void *dest, size_t size) {
- char *ch = (char *)dest;
- while (size--)
- *ch++ = *str++;
-}
-
-int load_int (char *str) {
- int val;
- load_data (str, &val, sizeof(val));
- return val;
-}
-
-double load_double (char *str) {
- double val;
- load_data (str, &val, sizeof(val));
- return val;
-}
-
-static void store_data (expression_t *expr, void *src, size_t size) {
- char *ch = (char *)src;
- while (size--)
- store_byte (expr, *ch++);
-}
-
-void store_byte (expression_t *expr, char byte) {
- g_string_append_c (expr->data, byte);
-}
-
-void store_int (expression_t *expr, int val) {
- store_data (expr, &val, sizeof(val));
-}
-
-void store_double (expression_t *expr, double val) {
- store_data (expr, &val, sizeof(val));
-}

audacious-plugins-2.5.3.tar.gz/src/paranormal/libcalc/storage.h Deleted

@@ -1,42 +0,0 @@
-/* storage.h -- 
- *
- * Copyright (C) 2001 Janusz Gregorczyk <jgregor@kki.net.pl>
- *
- * This file is part of xvs.
- *
- * 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.
- */
-
-#ifndef Included_STORAGE_H
-#define Included_STORAGE_H
-
-#include <glib.h>
-
-typedef struct {
- GString *data;
-} expression_t;
-
-/* Expr block. */
-expression_t *expr_new (void);
-void expr_free (expression_t *expr);
-
-int load_int (char *str);
-double load_double (char *str);
-
-void store_byte (expression_t *expr, char byte);
-void store_int (expression_t *expr, int val);
-void store_double (expression_t *expr, double val);
-
-#endif /* Included_STORAGE_H */

audacious-plugins-2.5.3.tar.gz/src/paranormal/misc.c Deleted

@@ -1,145 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <glib.h>
-
-#include "paranormal.h"
-#include "actuators.h"
-#include "pn_utils.h"
-
-/* ******************** misc_floater ******************** */
-static struct pn_actuator_option_desc misc_floater_opts[] =
-{
- { "value", "The colour value for the floater.",
- OPT_TYPE_INT, { ival: 255 } },
- { NULL }
-};
-
-typedef enum
-{
- float_up = 0x1,
- float_down = 0x2,
- float_left = 0x4,
- float_right = 0x8,
-} FloaterDirection;
-
-struct floater_state_data
-{
- FloaterDirection dir;
- gint x;
- gint y;
-};
-
-static void
-misc_floater_init(gpointer *data)
-{
- struct floater_state_data *opaque_data = g_new0(struct floater_state_data, 1);
- *data = opaque_data;
- opaque_data->x = rand() % pn_image_data->width;
- opaque_data->y = rand() % pn_image_data->height;
- opaque_data->dir = (FloaterDirection) rand() % 15; /* sum of all dir values */
-}
-
-static void
-misc_floater_cleanup(gpointer data)
-{
- g_free(data);
-}
-
-/*
- * This implementation isn't very great.
- * Anyone want to improve it? :(
- */
-static void
-misc_floater_exec(const struct pn_actuator_option *opts, gpointer data)
-{
- struct floater_state_data *opaque_data = (struct floater_state_data *) data;
- guchar value = (opts[0].val.ival < 0 || opts[0].val.ival > 255) ? 255 : opts[0].val.ival;
-
- /* determine the root coordinate first */
- if (opaque_data->dir & float_up)
- opaque_data->y -= 1;
- if (opaque_data->dir & float_down)
- opaque_data->y += 1;
-
- if (opaque_data->dir & float_left)
- opaque_data->x -= 1;
- if (opaque_data->dir & float_right)
- opaque_data->x += 1;
-
- /* make sure we're within surface boundaries. segfaults suck, afterall. */
- if (opaque_data->x + 1 <= pn_image_data->width &&
- opaque_data->x - 1 >= 0 &&
- opaque_data->y + 1 <= pn_image_data->height &&
- opaque_data->y - 1 >= 0)
- {
- /* draw it. i could use a loop here, but i don't see much reason in it,
- * so i don't think i will at this time. -nenolod
- */
- pn_image_data->surface[0][PN_IMG_INDEX(opaque_data->x, opaque_data->y)] = value;
- pn_image_data->surface[0][PN_IMG_INDEX(opaque_data->x + 1, opaque_data->y)] = value;
- pn_image_data->surface[0][PN_IMG_INDEX(opaque_data->x - 1, opaque_data->y)] = value;
- pn_image_data->surface[0][PN_IMG_INDEX(opaque_data->x, opaque_data->y + 1)] = value;
- pn_image_data->surface[0][PN_IMG_INDEX(opaque_data->x, opaque_data->y - 1)] = value;
- }
-
- /* check if we need to change direction yet, and if so, do so. */
- if (pn_new_beat == TRUE)
- opaque_data->dir = (FloaterDirection) rand() % 15; /* sum of all dir values */
-
- /* now adjust the direction so we stay in boundary */
- if (opaque_data->x - 1 <= 0 && opaque_data->dir & float_left)
- {
- opaque_data->dir &= ~float_left;
- opaque_data->dir |= float_right;
- }
-
- if (opaque_data->x + 1 >= pn_image_data->width && opaque_data->dir & float_right)
- {
- opaque_data->dir &= ~float_right;
- opaque_data->dir |= float_left;
- }
-
- if (opaque_data->y - 1 <= 0 && opaque_data->dir & float_up)
- {
- opaque_data->dir &= ~float_up;
- opaque_data->dir |= float_down;
- }
-
- if (opaque_data->y + 1 >= pn_image_data->height && opaque_data->dir & float_down)
- {
- opaque_data->dir &= ~float_down;
- opaque_data->dir |= float_up;
- }
-}
-
-struct pn_actuator_desc builtin_misc_floater =
-{
- "misc_floater",
- "Floating Particle",
- "A floating particle.",
- 0, misc_floater_opts,
- misc_floater_init, misc_floater_cleanup, misc_floater_exec
-};
-

audacious-plugins-2.5.3.tar.gz/src/paranormal/paranormal.c Deleted

@@ -1,243 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <math.h>
-
-#include <SDL.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-
-#include "paranormal.h"
-#include "actuators.h"
-
-/* SDL stuffs */
-SDL_Surface *screen;
-
-/* Globals */
-struct pn_rc *pn_rc;
-struct pn_image_data *pn_image_data;
-struct pn_sound_data *pn_sound_data;
-
-/* Trig Pre-Computes */
-float sin_val[360];
-float cos_val[360];
-
-gboolean pn_new_beat;
-
-/* **************** drawing doodads **************** */
-
-static void
-blit_to_screen (void)
-{
- int j;
-
- SDL_LockSurface (screen);
-
- /* FIXME: add scaling support */
-
- SDL_SetPalette (screen, SDL_LOGPAL|SDL_PHYSPAL,
-		 (SDL_Color*)pn_image_data->cmap, 0, 256);
- SDL_SetAlpha (screen, 0, 255);
-
- for (j=0; j<pn_image_data->height; j++)
- memcpy (screen->pixels + j*screen->pitch,
-	 pn_image_data->surface[0] + j*pn_image_data->width,
-	 pn_image_data->width);
-
-
- SDL_UnlockSurface (screen);
-
- SDL_UpdateRect (screen, 0, 0, 0, 0);
-}
-
-static void
-resize_video (guint w, guint h)
-{
- pn_image_data->width = w;
- pn_image_data->height = h;
-
- if (pn_image_data->surface[0])
- g_free (pn_image_data->surface[0]);
- if (pn_image_data->surface[1])
- g_free (pn_image_data->surface[1]);
-
- pn_image_data->surface[0] = g_malloc0 (w * h);
- pn_image_data->surface[1] = g_malloc0 (w * h);
-
- screen = SDL_SetVideoMode (w, h, 8, SDL_HWSURFACE |
-			 SDL_HWPALETTE | SDL_RESIZABLE);
- if (! screen)
- pn_fatal_error ("Unable to create a new SDL window: %s",
-		 SDL_GetError ());
-}
-
-static void
-take_screenshot (void)
-{
- char fname[32];
- struct stat buf;
- int i=0;
-
- do
- sprintf (fname, "pn_%05d.bmp", ++i);
- while (stat (fname, &buf) == 0);
-
- SDL_SaveBMP (screen, fname);
-}
-
-/* FIXME: This should resize the video to a user-set
- fullscreen res */
-static void
-toggle_fullscreen (void)
-{
- SDL_WM_ToggleFullScreen (screen);
- if (SDL_ShowCursor (SDL_QUERY) == SDL_ENABLE)
- SDL_ShowCursor (SDL_DISABLE);
- else
- SDL_ShowCursor (SDL_ENABLE);
-}
-
-/* **************** basic renderer management **************** */
-void
-pn_init (void)
-{
- int i;
-#ifdef FULLSCREEN_HACK
- char SDL_windowhack[32];
- GdkScreen *screen;
-#endif
-
- pn_sound_data = g_new0 (struct pn_sound_data, 1);
- pn_image_data = g_new0 (struct pn_image_data, 1);
-
-#ifdef FULLSCREEN_HACK
- screen = gdk_screen_get_default();
- sprintf(SDL_windowhack,"SDL_WINDOWID=%d",
- GDK_WINDOW_XWINDOW(gdk_screen_get_root_window(screen)));
- putenv(SDL_windowhack);
-#endif
-
- if (SDL_Init (SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE) < 0)
- pn_fatal_error ("Unable to initialize SDL: %s", SDL_GetError ());
-
-#ifndef FULLSCREEN_HACK
- resize_video (640, 360);
-#else
- resize_video (1280, 1024);
-#endif
-
- SDL_WM_SetCaption ("Paranormal Visualization Studio", PACKAGE);
-
- for(i=0; i<360; i++)
- {
- sin_val[i] = sin(i*(M_PI/180.0));
- cos_val[i] = cos(i*(M_PI/180.0));
- }
-}
-
-void
-pn_cleanup (void)
-{
- SDL_FreeSurface (screen);
- SDL_Quit ();
-
-
- if (pn_image_data)
- {
- if (pn_image_data->surface[0])
-	g_free (pn_image_data->surface[0]);
- if (pn_image_data->surface[1])
-	g_free (pn_image_data->surface[1]);
- g_free (pn_image_data);
- }
- if (pn_sound_data)
- g_free (pn_sound_data);
-}
-
-/* Renders one frame and handles the SDL window */
-void
-pn_render (void)
-{
- SDL_Event event;
-
- /* Handle window events */
- while (SDL_PollEvent (&event))
- {
- switch (event.type)
-	{
-	case SDL_QUIT:
-	 pn_quit ();
-	 g_assert_not_reached ();
-	case SDL_KEYDOWN:
-	 switch (event.key.keysym.sym)
-	 {
-	 case SDLK_ESCAPE:
-	 pn_quit ();
-	 g_assert_not_reached ();
-	 case SDLK_RETURN:
-	 if (event.key.keysym.mod & (KMOD_ALT | KMOD_META))
-		toggle_fullscreen ();
-	 break;
-	 case SDLK_BACKQUOTE:
-	 take_screenshot ();
-	 break;
-	 default:
- break;
-	 }
-	 break;
-	case SDL_VIDEORESIZE:
-	 resize_video (event.resize.w, event.resize.h);
-	 break;
-	}
- }
-
- pn_new_beat = pn_is_new_beat();
-
- if (pn_rc->actuator)
- {
- exec_actuator (pn_rc->actuator);
- blit_to_screen ();
- }
-}
-
-/* this MUST be called if a builtin's output is to surface[1]
- (by the builtin, after it is done) */
-void
-pn_swap_surfaces (void)
-{
- guchar *tmp = pn_image_data->surface[0];
- pn_image_data->surface[0] = pn_image_data->surface[1];
- pn_image_data->surface[1] = tmp;
-}
-
-
-
-
-
-
-
-
-
-

audacious-plugins-2.5.3.tar.gz/src/paranormal/paranormal.h Deleted

@@ -1,77 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef _PARANORMAL_H
-#define _PARANORMAL_H
-
-#include <glib.h>
-
-#include "actuators.h"
-
-struct pn_sound_data
-{
- gint16 pcm_data[2][512];
- gint16 freq_data[2][256];
-};
-
-struct pn_image_data
-{
- int width, height;
- struct pn_color cmap[256];
- guchar *surface[2];
-};
-
-/* The executable (ie xmms.c or standalone.c)
- is responsible for allocating this and filling
- it with default/saved values */
-struct pn_rc
-{
- struct pn_actuator *actuator;
-};
-
-/* core funcs */
-void pn_init (void);
-void pn_cleanup (void);
-void pn_render (void);
-void pn_swap_surfaces (void);
-
-/* Implemented elsewhere (ie xmms.c or standalone.c) */
-void pn_set_rc ();
-void pn_fatal_error (const char *fmt, ...);
-void pn_error (const char *fmt, ...);
-void pn_quit (void);
-
-/* Implimented in cfg.c */
-void pn_configure (void);
-
-/* globals used for rendering */
-extern struct pn_rc *pn_rc;
-extern struct pn_sound_data *pn_sound_data;
-extern struct pn_image_data *pn_image_data;
-
-extern gboolean pn_new_beat;
-
-/* global trig pre-computes */
-extern float sin_val[360];
-extern float cos_val[360];
-
-/* beat detection */
-int pn_is_new_beat(void);
-
-#endif /* _PARANORMAL_H */

audacious-plugins-2.5.3.tar.gz/src/paranormal/plugin.c Deleted

@@ -1,480 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/* FIXME: issues with not uniniting variables between
- enables? I wasn't too careful about that, but it
- seems to work fine. If there are problems perhaps
- look for a bug there?
-*/
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <memory.h>
-#include <math.h>
-#include <setjmp.h>
-#include <unistd.h>
-
-#include <gtk/gtk.h>
-#include <SDL.h>
-#include <SDL_thread.h>
-
-#ifdef _POSIX_PRIORITY_SCHEDULING
-#include <sched.h>
-#endif
-
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
-#include <audacious/plugins.h>
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-#include "paranormal.h"
-#include "actuators.h"
-#include "presets.h"
-#include "containers.h"
-
-/* Error reporting dlg */
-static GtkWidget *err_dialog;
-
-/* Draw thread stuff */
-/* FIXME: Do I need mutex for pn_done? */
-static SDL_Thread *draw_thread = NULL;
-static SDL_mutex *sound_data_mutex;
-static SDL_mutex *config_mutex;
-
-static gboolean pn_done = FALSE;
-jmp_buf quit_jmp;
-gboolean timeout_set = FALSE;
-guint quit_timeout;
-
-/* Sound stuffs */
-static gboolean new_pcm_data = FALSE;
-static gboolean new_freq_data = FALSE;
-static gint16 tmp_pcm_data[2][512];
-static gint16 tmp_freq_data[2][256];
-
-/* XMMS interface */
-static gboolean pn_xmms_init (void);
-static void pn_xmms_cleanup (void);
-static void pn_xmms_about (void);
-static void pn_xmms_configure (void);
-static void pn_xmms_render_pcm (gint16 data[2][512]);
-static void pn_xmms_render_freq (gint16 data[2][256]);
-
-static VisPlugin pn_vp =
-{
- .description = "Paranormal Visualization Studio",
- .num_pcm_chs_wanted = 2,
- .num_freq_chs_wanted = 2,
- .init = pn_xmms_init,
- .cleanup = pn_xmms_cleanup,
- .about = pn_xmms_about,
- .configure = pn_xmms_configure,
- .render_pcm = pn_xmms_render_pcm,
- .render_freq = pn_xmms_render_freq
-};
-
-VisPlugin *pn_vplist[] = { &pn_vp, NULL };
-
-DECLARE_PLUGIN(paranormal, NULL, NULL, NULL, NULL, NULL, NULL, pn_vplist,NULL);
-
-static void
-load_pn_rc (void)
-{
- struct pn_actuator *a, *b;
-
- if (! pn_rc)
- pn_rc = g_new0 (struct pn_rc, 1);
-
- /* load a default preset */
- pn_rc->actuator = create_actuator ("container_simple");
- if (! pn_rc->actuator) goto ugh;
- a = create_actuator ("container_once");
- if (! a) goto ugh;
- b = create_actuator ("cmap_bwgradient");
- if (! b) goto ugh;
- b->options[2].val.cval.r = 64;
- b->options[2].val.cval.g = 128;
- container_add_actuator (a, b);
- container_add_actuator (pn_rc->actuator, a);
-
- a = create_actuator ("wave_horizontal");
- if (! a) goto ugh;
- container_add_actuator (pn_rc->actuator, a);
-
- a = create_actuator ("xform_movement");
- if (! a) goto ugh;
- a->options[0].val.sval = g_strdup("d = cos(d)^2;");
- container_add_actuator (pn_rc->actuator, a);
-
- a = create_actuator ("general_fade");
- if (! a) goto ugh;
- container_add_actuator (pn_rc->actuator, a);
-
- a = create_actuator ("general_blur");
- if (! a) goto ugh;
- container_add_actuator (pn_rc->actuator, a);
-
- return;
-
- ugh:
- if (pn_rc->actuator)
- destroy_actuator (pn_rc->actuator);
- pn_error ("Error loading default preset");
-}
-
-static int
-draw_thread_fn (gpointer data)
-{
- gfloat fps = 0.0;
- guint last_time = 0, last_second = 0;
- guint this_time;
- pn_init ();
-
- /* Used when pn_quit is called from this thread */
- if (setjmp (quit_jmp) != 0)
- pn_done = TRUE;
-
- while (! pn_done)
- {
- SDL_mutexP (sound_data_mutex);
- if (new_freq_data)
-	{
-	 memcpy (pn_sound_data->freq_data, tmp_freq_data,
-		 sizeof (gint16) * 2 * 256);
-	 new_freq_data = FALSE;
-	}
- if (new_pcm_data)
-	{
-	 memcpy (pn_sound_data->pcm_data, tmp_pcm_data,
-		 sizeof (gint16) * 2 * 512);
-	 new_freq_data = FALSE;
-	}
- SDL_mutexV (sound_data_mutex);
- SDL_mutexP (config_mutex);
- pn_render ();
- SDL_mutexV (config_mutex);
-
- /* Compute the FPS */
- this_time = SDL_GetTicks ();
-
- fps = fps * .95 + (1000. / (gfloat) (this_time - last_time)) * .05;
- if (this_time > 2000 + last_second)
- {
- last_second = this_time;
- g_print ("FPS: %f\n", fps);
- }
- last_time = this_time;
-
-#ifdef _POSIX_PRIORITY_SCHEDULING
- sched_yield();
-#endif
- }
-
- /* Just in case a pn_quit () was called in the loop */
-/* SDL_mutexV (sound_data_mutex); */
-
- pn_cleanup ();
-
- return 0;
-}
-
-/* Is there a better way to do this? this = messy
- It appears that calling disable_plugin () in some
- thread other than the one that called pn_xmms_init ()
- causes a seg fault :( */
-static int
-quit_timeout_fn (gpointer data)
-{
- if (pn_done)
- {
- aud_plugin_enable (aud_plugin_by_header (& pn_vp), FALSE);
- return FALSE;
- }
-
- return TRUE;
-}
-
-static gboolean pn_xmms_init (void)
-{
- /* If it isn't already loaded, load the run control */
- if (! pn_rc)
-	 load_pn_rc ();
-
- sound_data_mutex = SDL_CreateMutex ();
- config_mutex = SDL_CreateMutex ();
- if (! sound_data_mutex)
- pn_fatal_error ("Unable to create a new mutex: %s",
-		 SDL_GetError ());
-
- pn_done = FALSE;
- draw_thread = SDL_CreateThread (draw_thread_fn, NULL);
- if (! draw_thread)
- pn_fatal_error ("Unable to create a new thread: %s",
-		 SDL_GetError ());
-
- /* Add a gtk timeout to test for quits */
- quit_timeout = gtk_timeout_add (1000, quit_timeout_fn, NULL);
- timeout_set = TRUE;
-
- return TRUE;
-}
-
-static void
-pn_xmms_cleanup (void)
-{
- if (timeout_set)
- {
- gtk_timeout_remove (quit_timeout);
- timeout_set = FALSE;
- }
-
- if (draw_thread)
- {
- pn_done = TRUE;
- SDL_WaitThread (draw_thread, NULL);
- draw_thread = NULL;
- }
-
- if (sound_data_mutex)
- {
- SDL_DestroyMutex (sound_data_mutex);
- sound_data_mutex = NULL;
- }
-
- if (config_mutex)
- {
- SDL_DestroyMutex (config_mutex);
- config_mutex = NULL;
- }
-}
-
-static void
-pn_xmms_about (void)
-{
- static GtkWidget * aboutbox = NULL;
- audgui_simple_message (& aboutbox, GTK_MESSAGE_INFO,
- "About Paranormal Visualization Studio",
-"Paranormal Visualization Studio " VERSION "\n\n\
-Copyright (C) 2006, William Pitcock <nenolod -at- nenolod.net>\n\
-Portions Copyright (C) 2001, Jamie Gennis <jgennis -at- mindspring.com>\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");
-}
-
-static void
-pn_xmms_configure (void)
-{
- /* We should already have a GDK_THREADS_ENTER
- but we need to give it config_mutex */
- if (config_mutex)
- SDL_mutexP (config_mutex);
-
- if (! pn_rc)
-	 load_pn_rc ();
-
- pn_configure ();
-
- if (config_mutex)
- SDL_mutexV (config_mutex);
-}
-
-static void
-pn_xmms_render_pcm (gint16 data[2][512])
-{
- SDL_mutexP (sound_data_mutex);
- memcpy (tmp_pcm_data, data, sizeof (gint16) * 2 * 512);
- new_pcm_data = TRUE;
- SDL_mutexV (sound_data_mutex);
-}
-
-static void
-pn_xmms_render_freq (gint16 data[2][256])
-{
- SDL_mutexP (sound_data_mutex);
- memcpy (tmp_freq_data, data, sizeof (gint16) * 2 * 256);
- new_freq_data = TRUE;
- SDL_mutexV (sound_data_mutex);
-}
-
-/* **************** paranormal.h stuff **************** */
-
-void
-pn_set_rc (struct pn_rc *new_rc)
-{
- if (config_mutex)
- SDL_mutexP (config_mutex);
-
- if (! pn_rc)
- load_pn_rc ();
-
- if (pn_rc->actuator)
- destroy_actuator (pn_rc->actuator);
- pn_rc->actuator = new_rc->actuator;
-
- if (config_mutex)
- SDL_mutexV (config_mutex);
-}
-
-void
-pn_fatal_error (const char *fmt, ...)
-{
- char *errstr;
- va_list ap;
- GtkWidget *dialog;
- GtkWidget *close, *label;
-
- /* Don't wanna try to lock GDK if we already have it */
- if (draw_thread && SDL_ThreadID () == SDL_GetThreadID (draw_thread))
- GDK_THREADS_ENTER ();
-
- /* now report the error... */
- va_start (ap, fmt);
- errstr = g_strdup_vprintf (fmt, ap);
- va_end (ap);
-
- dialog=gtk_dialog_new();
- gtk_window_set_title(GTK_WINDOW(dialog), "Error - Paranormal Visualization Studio - " VERSION);
- gtk_container_border_width (GTK_CONTAINER (dialog), 8);
-
- label=gtk_label_new(errstr);
- fprintf (stderr, "%s\n", errstr);
- g_free (errstr);
-
- close = gtk_button_new_with_label ("Close");
- gtk_signal_connect_object (GTK_OBJECT (close), "clicked",
-			 GTK_SIGNAL_FUNC (gtk_widget_destroy),
-			 GTK_OBJECT (dialog));
-
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE,
-		 FALSE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), close,
-		 FALSE, FALSE, 0);
- gtk_widget_show (label);
- gtk_widget_show (close);
-
- gtk_widget_show (dialog);
- gtk_widget_grab_focus (dialog);
-
- if (draw_thread && SDL_ThreadID () == SDL_GetThreadID (draw_thread))
- GDK_THREADS_LEAVE ();
-
- pn_quit ();
-}
-
-
-void
-pn_error (const char *fmt, ...)
-{
- char *errstr;
- va_list ap;
- static GtkWidget *text;
- static GtkTextBuffer *textbuf;
-
- /* now report the error... */
- va_start (ap, fmt);
- errstr = g_strdup_vprintf (fmt, ap);
- va_end (ap);
- fprintf (stderr, "Paranormal-CRITICAL **: %s\n", errstr);
-
- /* This is the easiest way of making sure we don't
- get stuck trying to lock a mutex that this thread
- already owns since this fn can be called from either
- thread */
- if (draw_thread && SDL_ThreadID () == SDL_GetThreadID (draw_thread))
- GDK_THREADS_ENTER ();
-
- if (! err_dialog)
- {
- GtkWidget *close;
-
- err_dialog=gtk_dialog_new();
- gtk_window_set_title (GTK_WINDOW (err_dialog), "Error - Paranormal Visualization Studio - " VERSION);
- gtk_window_set_policy (GTK_WINDOW (err_dialog), FALSE, FALSE, FALSE);
- gtk_widget_set_usize (err_dialog, 400, 200);
- gtk_container_border_width (GTK_CONTAINER (err_dialog), 8);
-
- textbuf = gtk_text_buffer_new(NULL);
- text = gtk_text_view_new_with_buffer (textbuf);
-
- close = gtk_button_new_with_label ("Close");
- gtk_signal_connect_object (GTK_OBJECT (close), "clicked",
-				 GTK_SIGNAL_FUNC (gtk_widget_hide),
-				 GTK_OBJECT (err_dialog));
- gtk_signal_connect_object (GTK_OBJECT (err_dialog), "delete-event",
-				 GTK_SIGNAL_FUNC (gtk_widget_hide),
-				 GTK_OBJECT (err_dialog));
-
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (err_dialog)->vbox), text, FALSE,
-			 FALSE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (err_dialog)->action_area), close,
-			 FALSE, FALSE, 0);
- gtk_widget_show (text);
- gtk_widget_show (close);
- }
-
- gtk_text_buffer_set_text(GTK_TEXT_BUFFER(textbuf), errstr, -1);
- g_free (errstr);
-
- gtk_widget_show (err_dialog);
- gtk_widget_grab_focus (err_dialog);
-
- if (draw_thread && SDL_ThreadID () == SDL_GetThreadID (draw_thread))
- GDK_THREADS_LEAVE ();
-}
-
-
-/* This is confusing...
- Don't call this from anywhere but the draw thread or
- the initialization xmms thread (ie NOT the xmms sound
- data functions) */
-void
-pn_quit (void)
-{
- if (draw_thread && SDL_ThreadID () == SDL_GetThreadID (draw_thread))
- {
- /* We're in the draw thread so be careful */
- longjmp (quit_jmp, 1);
- }
- else
- {
- /* We're not in the draw thread, so don't sweat it...
-	 addendum: looks like we have to bend over backwards (forwards?)
-	 for xmms here too */
- aud_plugin_enable (aud_plugin_by_header (& pn_vp), FALSE);
- while (1)
-	gtk_main_iteration ();
- }
-}

audacious-plugins-2.5.3.tar.gz/src/paranormal/pn_utils.h Deleted

@@ -1,34 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef _PN_UTILS_H
-#define _PN_UTILS_H
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-#define CAP(i,c) (i > c ? c : i < -(c) ? -(c) : i)
-#define CAPHILO(i,h,l) (i > h ? h : i < l ? l : i)
-#define CAPHI(i,h) (i > h ? h : i)
-#define CAPLO(i,l) (i < l ? l : i)
-
-#define PN_IMG_INDEX(x,y) ((x) + (pn_image_data->width * (y)))
-
-#endif /* _PN_UTILS_H */

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets.c Deleted

@@ -1,278 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/* FIXME: add documentation support to preset files */
-/* FIXME: add multiple-presets-per-file support (maybe) */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-
-#include <glib.h>
-#include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
-
-#include "paranormal.h"
-#include "actuators.h"
-#include "containers.h"
-
-/* cur->name should be the actuator name */
-static void
-parse_actuator (xmlNodePtr cur, struct pn_actuator *a)
-{
- int i;
- char *content;
- struct pn_actuator *child;
-
- for (cur = cur->xmlChildrenNode; cur; cur = cur->next)
- {
- if (xmlIsBlankNode (cur) || cur->type != XML_ELEMENT_NODE)
-	continue;
-
- /* see if it's an option */
- for (i=0; a->options && a->options[i].desc; i++)
-	if (! xmlStrcmp (cur->name,
-			 (const xmlChar *) a->options[i].desc->name))
-	 break;
-
- if (a->options && a->options[i].desc)
-	{
-	 /* it is an option, so let's set it! */
-	 content = (char*)xmlNodeGetContent (cur);
-
-	 /* FIXME: warning? */
-	 if (! content)
-	 continue;
-
-	 /* FIXME: perhaps do a little better job of error checking? */
-	 switch (a->options[i].desc->type)
-	 {
-	 case OPT_TYPE_INT:
-	 a->options[i].val.ival = (int)strtol (content, NULL, 0);
-	 break;
-	 case OPT_TYPE_FLOAT:
-	 a->options[i].val.fval = (float)strtod (content, NULL);
-	 break;
-	 case OPT_TYPE_STRING:
-	 a->options[i].val.sval = g_strdup (content);
-	 break;
-	 case OPT_TYPE_COLOR:
-	 {
-		guint r,g,b;
-		char *s = content+1;
-		r = strtoul (s, &s, 0);
-		if (r > 255 || ! (s = strchr (s, ',')))
-		 goto bad_color;
-		g = strtoul (s+1, &s, 0);
-		if (g > 255 || ! (s = strchr (s, ',')))
-		 goto bad_color;
-		b = strtoul (s+1, NULL, 0);
-		if (b > 255)
-		 goto bad_color;
-
-		a->options[i].val.cval.r = (guchar)r;
-		a->options[i].val.cval.g = (guchar)g;
-		a->options[i].val.cval.b = (guchar)b;
-
-		break;
-	 }
-	 bad_color:
-	 pn_error ("parse error: invalid color value: option \"%s\" ignored.\n"
-			" correct syntax: (r,g,b) where r, g, and b are the\n"
-			" red, green, and blue components of the "
-			"color, respectively", cur->name);
-	 break;
-	 
-	 case OPT_TYPE_COLOR_INDEX:
-	 {
-		int c = (int)strtol (content, NULL, 0);
-		if (c < 0 || c > 255)
-		 pn_error ("parse error: invalid color index \"%s\" (%d): option ignored.\n"
-			 " the value must be between 0 and 255",
-			 cur->name, c);
-		else
-		 a->options[i].val.ival = c;
-		break;
-	 }
-	 case OPT_TYPE_BOOLEAN:
-	 {
-		char *c, *d;
-		for (c=content; isspace (*c); c++);
-		for (d=c; !isspace(*d); d++);
-		*d = '\0';
-		if (g_strcasecmp (c, "true") == 0)
-		 a->options[i].val.bval = TRUE;
-		else if (g_strcasecmp (c, "false") == 0)
-		 a->options[i].val.bval = FALSE;
-		else
-		 pn_error ("parse error: invalid boolean value \"%s\" (%s): option ignored.\n"
-			 " the value must be either 'true' or 'false'",
-			 cur->name, c);
-	 }
-	 }
-
-	 /* gotta free content */
-	 xmlFree ((xmlChar*)content);
-	}
- /* See if we have a child actuator */
- else if (a->desc->flags & ACTUATOR_FLAG_CONTAINER
-	 && (child = create_actuator ((char*)cur->name)))
-	{
-	 container_add_actuator (a, child);
-	 parse_actuator (cur, child);
-	}
- else
-	/* We have an error */
-	pn_error ("parse error: unknown entity \"%s\": ignored.", cur->name);
- }
-}
-
-struct pn_actuator *
-load_preset (const char *filename)
-{
- xmlDocPtr doc;
- xmlNodePtr cur;
- struct pn_actuator *a = NULL;
-
- doc = xmlParseFile (filename);
- if (! doc)
- return NULL;
-
- cur = xmlDocGetRootElement (doc);
- if (! cur)
- xmlFreeDoc (doc);
-
- if (xmlStrcmp (cur->name, (const xmlChar *) "paranormal_preset"))
- {
- xmlFreeDoc (doc);
- return NULL;
- }
-
- for (cur = cur->children; cur; cur = cur->next)
- {
- if (xmlIsBlankNode (cur) || cur->type != XML_ELEMENT_NODE)
-	continue;
-
- /* if (...) { ... } else if (is_documentation [see top of file]) ... else */
- {
-	a = create_actuator ((char*)cur->name);
-
-	/* FIXME: warn? */
-	if (! a)
-	 continue;
-
-	parse_actuator (cur, a);
-	break;
- }
- }
-
- /* Don't need this any longer */
- xmlFreeDoc (doc);
-
- return a;
-}
-
-/* FIXME: do the file writing w/ error checking */
-static gboolean
-save_preset_recursive (FILE *file, const struct pn_actuator *actuator,
-		 int recursion_depth)
-{
- int i;
- GSList *child;
-
- /* open this actuator */
- fprintf (file, "%*s<%s>\n", recursion_depth, "", actuator->desc->name);
-
- /* options */
- if (actuator->options)
- for (i=0; actuator->options[i].desc; i++)
- {
-	fprintf (file, "%*s <%s> ", recursion_depth, "",
-		 actuator->desc->option_descs[i].name);
-	switch (actuator->desc->option_descs[i].type)
-	 {
-	 case OPT_TYPE_INT:
-	 case OPT_TYPE_COLOR_INDEX:
-	 fprintf (file, "%d", actuator->options[i].val.ival);
-	 break;
-	 case OPT_TYPE_FLOAT:
-	 fprintf (file, "%.5f", actuator->options[i].val.fval);
-	 break;
-	 case OPT_TYPE_STRING:
-	 fprintf (file, "%s", actuator->options[i].val.sval);
-	 break;
-	 case OPT_TYPE_COLOR:
-	 fprintf (file, "%d, %d, %d", actuator->options[i].val.cval.r,
-		 actuator->options[i].val.cval.g,
-		 actuator->options[i].val.cval.b);
-	 break;
-	 case OPT_TYPE_BOOLEAN:
-	 if (actuator->options[i].val.bval)
-	 fprintf (file, "TRUE");
-	 else
-	 fprintf (file, "FALSE");
-	 break;
-	 }
-	fprintf (file, " </%s>\n", actuator->desc->option_descs[i].name);
- }
-
- /* children */
- if (actuator->desc->flags & ACTUATOR_FLAG_CONTAINER)
- for (child = *(GSList **)actuator->data; child; child = child->next)
- if (! save_preset_recursive (file, (struct pn_actuator*) child->data,
-				 recursion_depth+1))
-	return FALSE;
-
- /* close the actuator */
- fprintf (file, "%*s</%s>\n", recursion_depth, "", actuator->desc->name);
-
- return TRUE;
-}
-
-gboolean
-save_preset (const char *filename, const struct pn_actuator *actuator)
-{
- FILE *file;
-
- file = fopen (filename, "w");
- if (! file)
- {
- pn_error ("fopen: %s", strerror (errno));
- return FALSE;
- }
-
- fprintf (file, "<?xml version=\"1.0\"?>\n\n<paranormal_preset>\n");
-
- if (actuator)
- if (! save_preset_recursive (file, actuator, 1))
- {
-	fclose (file);
-	return FALSE;
- }
-
- fprintf (file, "</paranormal_preset>");
-
- fclose (file);
-
- return TRUE;
-
-}

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets.h Deleted

@@ -1,30 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef _PRESETS_H
-#define _PRESETS_H
-
-#include <glib.h>
-
-#include "actuators.h"
-
-struct pn_actuator *load_preset (const char *filename);
-gboolean save_preset (const char *filename, const struct pn_actuator *actuator);
-
-#endif /* _PRESETS_H */

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/Makefile Deleted

@@ -1,38 +0,0 @@
-DATA = nazca_-_smoke_on_the_water.pnv		\
-       nenolod_-_3d_wave.pnv			\
-       nenolod_-_aquamarine_dream.pnv		\
-       nenolod_-_purple_flower.pnv		\
-       nenolod_-_bumblebees.pnv			\
-       nenolod_-_flying_into_pastels.pnv	\
-       nenolod_-_phosphor_flame.pnv		\
-       nenolod_-_psuedo_starfield.pnv		\
-       nenolod_-_quakingscope.pnv		\
-       nenolod_-_beatscope.pnv			\
-       nenolod_-_branchscope.pnv		\
-       nenolod_-_retroscope.pnv			\
-       nenolod_-_technicolour_nightmare.pnv	\
-       nenolod_-_trapped.pnv			\
-       nenolod_-_value_replace_fun.pnv		\
-       nenolod_-_rush.pnv			\
-       nenolod_-_worms.pnv			\
-       nenolod_-_scopefun.pnv			\
-       nenolod_-_smoke.pnv			\
-       nenolod_-_swarm.pnv			\
-       nenolod_-_interlaced.pnv			\
-       nenolod_-_cubism.pnv			\
-       nenolod_-_transform_fun.pnv		\
-       nenolod_-_tunnel_vision.pnv		\
-       nenolod_-_kaliedoscope.pnv		\
-       nenolod_-_simple_yet_pretty.pnv		\
-       nenolod_-_quasar.pnv			\
-       aerdan_-_bloody_vortex.pnv		\
-       aerdan_-_cloudscape.pnv			\
-       aerdan_-_cloudscape2.pnv			\
-       aerdan_-_dancing_snow.pnv		\
-       aerdan_-_portal_to_hell.pnv		\
-       aerdan_-_telestatic.pnv			\
-       ticpu_-_colored_beat-o-scope.pnv	
-
-include ../../../buildsys.mk
-
-PACKAGE = audacious/paranormal/Presets

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/aerdan_-_bloody_vortex.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/aerdan_-_cloudscape.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/aerdan_-_cloudscape2.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/aerdan_-_dancing_snow.pnv Deleted

@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 146, 191, 225 </color>
- </cmap_bwgradient>
- </container_once>
- <xform_spin>
- <angle> 0.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 0.96500 </r_scale>
- </xform_spin>
- <general_fade>
- <amount> 1 </amount>
- </general_fade>
- <wave_radial>
- <base_radius> 1.00000 </base_radius>
- <value> 250 </value>
- </wave_radial>
- <general_blur>
- </general_blur>
- <freq_drops>
- </freq_drops>
- <xform_bump_spin>
- <angle> 0.00000 </angle>
- <bumps> 10.00000 </bumps>
- <base_scale> 0.95000 </base_scale>
- <mod_scale> 0.10000 </mod_scale>
- </xform_bump_spin>
- <xform_spin>
- <angle> -5.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 0.96500 </r_scale>
- </xform_spin>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/aerdan_-_portal_to_hell.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/aerdan_-_stonervision.pnv Deleted

@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <wave_smooth>
- <channels> 0 </channels>
- </wave_smooth>
- <cmap_dynamic>
- <low_index> 5 </low_index>
- <high_index> 250 </high_index>
- <script> red = red + 0.05; blue = blue + 0.03; green = green + 0.01; </script>
- </cmap_dynamic>
- </container_once>
- <general_blur>
- </general_blur>
- <general_fade>
- <amount> 1 </amount>
- </general_fade>
- <wave_radial>
- <base_radius> -1.00000 </base_radius>
- <value> 253 </value>
- </wave_radial>
- <xform_ripple>
- <angle> 0.00000 </angle>
- <ripples> 8.00000 </ripples>
- <base_speed> 2.00000 </base_speed>
- <mod_speed> 5.00000 </mod_speed>
- </xform_ripple>
- <misc_floater>
- <value> 256 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <wave_scope>
- <init_script> n = 800; t = -0.05; </init_script>
- <frame_script> t = t + 0.05; </frame_script>
- <sample_script> d = index + value; r = t + index * 3.141952924 * 4; x = cos(r) * d; y = sin(r) * d; </sample_script>
- <lines> TRUE </lines>
- </wave_scope>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/aerdan_-_telestatic.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nazca_-_smoke_on_the_water.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_3d_wave.pnv Deleted

@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 0, 191, 255 </color>
- </cmap_bwgradient>
- </container_once>
- <wave_scope>
- <init_script> n=7;r=0.5;mx=0;my=0;mz=0;dst=2;rx=0;ry=0;rz=0;rdx=1;rdy=1;rdz=1;p=3.14159265;p2=2.0*p;p3=180/p; </init_script>
- <frame_script> ;rx=rx+rdx;ry=ry+rdy;rz=rz+rdz;xs=sin(rx/p3);ys=sin(ry/p3);zs=sin(rz/p3);xc=cos(rx/p3);yc=cos(ry/p3);zc=cos(rz/p3); </frame_script>
- <sample_script> x1=value*sin(p2*index);y1=value * index / cos(z1);z1=r*cos(p2*index);y2=y1*xc-z1*xs;z2=y1*xs+z1*xc;x2=z2*ys+x1*yc;z3=z2*yc-x1*ys;x3=x2*zc-y2*zs;y3=y2*zc+x2*zs;x4=mx+x3;y4=my+y3;z4=mz+z3;x=x4/(1+z4/dst);y=y4/(1+z4/dst); </sample_script>
- <lines> TRUE </lines>
- </wave_scope>
- <general_fade>
- <amount> 10 </amount>
- </general_fade>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_aquamarine_dream.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_beatscope.pnv Deleted

@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 138 </high_index>
- <color> 119, 239, 163 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 139 </low_index>
- <high_index> 255 </high_index>
- <color> 151, 179, 234 </color>
- </cmap_bwgradient>
- </container_once>
- <wave_horizontal>
- <channels> -1 </channels>
- </wave_horizontal>
- <general_blur>
- </general_blur>
- <container_cycle>
- <change_interval> 0 </change_interval>
- <beat> TRUE </beat>
- <xform_spin>
- <angle> 0.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 1.04000 </r_scale>
- </xform_spin>
- <xform_spin>
- <angle> 0.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 0.98700 </r_scale>
- </xform_spin>
- <container_cycle>
- <change_interval> 0 </change_interval>
- <beat> TRUE </beat>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 138 </high_index>
- <color> 119, 239, 163 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 139 </low_index>
- <high_index> 255 </high_index>
- <color> 151, 179, 234 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 138 </high_index>
- <color> 151, 179, 234 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 139 </low_index>
- <high_index> 255 </high_index>
- <color> 119, 239, 163 </color>
- </cmap_bwgradient>
- </container_cycle>
- <xform_spin>
- <angle> 1.25000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 0.98700 </r_scale>
- </xform_spin>
- <xform_spin>
- <angle> -1.25000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 1.04000 </r_scale>
- </xform_spin>
- </container_cycle>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_branchscope.pnv Deleted

@@ -1,114 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 138 </high_index>
- <color> 119, 239, 163 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 139 </low_index>
- <high_index> 255 </high_index>
- <color> 151, 179, 234 </color>
- </cmap_bwgradient>
- </container_once>
- <container_onbeat>
- <freq_drops>
- </freq_drops>
- </container_onbeat>
- <container_cycle>
- <change_interval> 0 </change_interval>
- <beat> TRUE </beat>
- <container_simple>
- <wave_horizontal>
- <channels> -1 </channels>
- </wave_horizontal>
- <wave_radial>
- <base_radius> 0.00000 </base_radius>
- </wave_radial>
- </container_simple>
- <container_simple>
- <wave_horizontal>
- <channels> -1 </channels>
- </wave_horizontal>
- </container_simple>
- <container_simple>
- <wave_radial>
- <base_radius> 0.00000 </base_radius>
- </wave_radial>
- </container_simple>
- </container_cycle>
- <container_cycle>
- <change_interval> 0 </change_interval>
- <beat> TRUE </beat>
- <container_simple>
- <general_blur>
- </general_blur>
- </container_simple>
- <general_noop>
- </general_noop>
- <container_simple>
- <general_mosaic>
- <radius> 3 </radius>
- </general_mosaic>
- <general_blur>
- </general_blur>
- <general_fade>
- <amount> 30 </amount>
- </general_fade>
- </container_simple>
- </container_cycle>
- <container_cycle>
- <change_interval> 0 </change_interval>
- <beat> TRUE </beat>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 138 </high_index>
- <color> 119, 239, 163 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 139 </low_index>
- <high_index> 255 </high_index>
- <color> 151, 179, 234 </color>
- </cmap_bwgradient>
- <general_noop>
- </general_noop>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 138 </high_index>
- <color> 151, 179, 234 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 139 </low_index>
- <high_index> 255 </high_index>
- <color> 119, 239, 163 </color>
- </cmap_bwgradient>
- </container_cycle>
- <container_cycle>
- <change_interval> 0 </change_interval>
- <beat> TRUE </beat>
- <xform_spin>
- <angle> 0.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 0.98700 </r_scale>
- </xform_spin>
- <xform_spin>
- <angle> 0.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 1.04000 </r_scale>
- </xform_spin>
- <xform_spin>
- <angle> 1.25000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 0.98700 </r_scale>
- </xform_spin>
- <xform_spin>
- <angle> -1.25000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 1.04000 </r_scale>
- </xform_spin>
- </container_cycle>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_bumblebees.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_cubism.pnv Deleted

@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 0, 0, 255 </color>
- </cmap_bwgradient>
- </container_once>
- <wave_horizontal>
- <channels> -1 </channels>
- <value> 250 </value>
- <lines> TRUE </lines>
- </wave_horizontal>
- <xform_halfrender>
- <direction> -1 </direction>
- <render_twice> FALSE </render_twice>
- </xform_halfrender>
- <xform_halfrender>
- <direction> 1 </direction>
- <render_twice> FALSE </render_twice>
- </xform_halfrender>
- <xform_spin>
- <angle> -4.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 0.90000 </r_scale>
- </xform_spin>
- <xform_spin>
- <angle> 1.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> -1.00000 </r_scale>
- </xform_spin>
- <container_cycle>
- <change_interval> 0 </change_interval>
- <beat> TRUE </beat>
- <general_invert>
- </general_invert>
- <general_noop>
- </general_noop>
- </container_cycle>
- <general_replace>
- <start> 250 </start>
- <end> 255 </end>
- <out> 0 </out>
- </general_replace>
- <general_replace>
- <start> 128 </start>
- <end> 149 </end>
- <out> 0 </out>
- </general_replace>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_flying_into_pastels.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_interlaced.pnv Deleted

@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <general_clear>
- </general_clear>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 0, 151, 255 </color>
- </cmap_bwgradient>
- </container_once>
- <container_simple>
- <misc_floater>
- <value> 180 </value>
- </misc_floater>
- <misc_floater>
- <value> 180 </value>
- </misc_floater>
- <misc_floater>
- <value> 180 </value>
- </misc_floater>
- <misc_floater>
- <value> 180 </value>
- </misc_floater>
- <misc_floater>
- <value> 180 </value>
- </misc_floater>
- <misc_floater>
- <value> 180 </value>
- </misc_floater>
- </container_simple>
- <container_onbeat>
- <freq_drops>
- </freq_drops>
- <general_replace>
- <start> 250 </start>
- <end> 255 </end>
- <out> 150 </out>
- </general_replace>
- <xform_halfrender>
- <direction> 1 </direction>
- <render_twice> TRUE </render_twice>
- </xform_halfrender>
- </container_onbeat>
- <xform_halfrender>
- <direction> -1 </direction>
- <render_twice> TRUE </render_twice>
- </xform_halfrender>
- <general_fade>
- <amount> 3 </amount>
- </general_fade>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_kaliedoscope.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_phosphor_flame.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_psuedo_starfield.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_purple_flower.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_quakingscope.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_quasar.pnv Deleted

@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 0, 191, 255 </color>
- </cmap_bwgradient>
- </container_once>
- <wave_scope>
- <init_script> points=513;r=0.5;mx=0;my=0;mz=0;dst=2;rx=0;ry=0;rz=0;rdx=1;rdy=1;rdz=1;p=3.14159265;p2=2.0*p;p3=180/p; </init_script>
- <frame_script> ;rx=rx+rdx;ry=ry+rdy;rz=rz+rdz;xs=sin(rx/p3);ys=sin(ry/p3);zs=sin(rz/p3);xc=cos(rx/p3);yc=cos(ry/p3);zc=cos(rz/p3); </frame_script>
- <sample_script> x1=value*sin(p2*index);y1=0;z1=r*cos(p2*index);y2=y1*xc-z1*xs;z2=y1*xs+z1*xc;x2=z2*ys+x1*yc;z3=z2*yc-x1*ys;x3=x2*zc-y2*zs;y3=y2*zc+x2*zs;x4=mx+x3;y4=my+y3;z4=mz+z3;x=x4/(1+z4/dst);y=y4/(1+z4/dst); </sample_script>
- <lines> TRUE </lines>
- </wave_scope>
- <wave_scope>
- <init_script> points=513;r=0.5;mx=0;my=0;mz=0;dst=2;rx=0;ry=0;rz=0;rdx=1;rdy=1;rdz=1;p=3.14159265;p2=2.0*p;p3=180/p; </init_script>
- <frame_script> ;rx=rx+rdx;ry=ry+rdy;rz=rz+rdz;xs=sin(rx/p3);ys=sin(ry/p3);zs=sin(rz/p3);xc=cos(rx/p3);yc=cos(ry/p3);zc=cos(rz/p3); </frame_script>
- <sample_script> y1=value*cos(p2*index);x1=0;z1=r*sin(p2*index);y2=y1*xc-z1*xs;z2=y1*xs+z1*xc;x2=z2*ys+x1*yc;z3=z2*yc-x1*ys;x3=x2*zc-y2*zs;y3=y2*zc+x2*zs;x4=mx+x3;y4=my+y3;z4=mz+z3;x=x4/(1+z4/dst);y=y4/(1+z4/dst); </sample_script>
- <lines> TRUE </lines>
- </wave_scope>
- <wave_scope>
- <init_script> points=5;r=0.5;mx=0;my=0;mz=0;dst=2;rx=0;ry=0;rz=0;rdx=1;rdy=1;rdz=1;p=3.14159265;p2=2.0*p;p3=180/p; </init_script>
- <frame_script> ;rx=rx+rdx;ry=ry+rdy;rz=rz+rdz;xs=sin(rx/p3);ys=sin(ry/p3);zs=sin(rz/p3);xc=cos(rx/p3);yc=cos(ry/p3);zc=cos(rz/p3); </frame_script>
- <sample_script> z1=r*sin(p2*index);x1=0;y1=0*sin(p2*index);y2=y1*xc-z1*xs;z2=y1*xs+z1*xc;x2=z2*ys+x1*yc;z3=z2*yc-x1*ys;x3=x2*zc-y2*zs;y3=y2*zc+x2*zs;x4=mx+x3;y4=my+y3;z4=mz+z3;x=x4/(1+z4/dst);y=y4/(1+z4/dst); </sample_script>
- <lines> TRUE </lines>
- </wave_scope>
- <general_fade>
- <amount> 10 </amount>
- </general_fade>
- <general_blur>
- </general_blur>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_retroscope.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_rush.pnv Deleted

@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <cmap_gradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <lcolor> 0, 0, 127 </lcolor>
- <hcolor> 0, 127, 255 </hcolor>
- </cmap_gradient>
- </container_once>
- <wave_horizontal>
- <channels> -1 </channels>
- <value> 255 </value>
- <lines> FALSE </lines>
- </wave_horizontal>
- <wave_vertical>
- <channels> -1 </channels>
- <value> 255 </value>
- <lines> FALSE </lines>
- </wave_vertical>
- <container_cycle>
- <change_interval> 0 </change_interval>
- <beat> TRUE </beat>
- <xform_spin>
- <angle> -4.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 0.75000 </r_scale>
- </xform_spin>
- <xform_spin>
- <angle> 4.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 0.75000 </r_scale>
- </xform_spin>
- <xform_spin>
- <angle> -8.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 0.75000 </r_scale>
- </xform_spin>
- <xform_spin>
- <angle> 8.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 0.75000 </r_scale>
- </xform_spin>
- </container_cycle>
- <general_fade>
- <amount> 3 </amount>
- </general_fade>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_scopefun.pnv Deleted

@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 0, 191, 255 </color>
- </cmap_bwgradient>
- </container_once>
- <general_invert>
- </general_invert>
- <wave_scope>
- <init_script> n=7;r=0.5;mx=0;my=0;mz=0;dst=2;rx=0;ry=0;rz=0;rdx=1;rdy=1;rdz=1;p=3.14159265;p2=2.0*p;p3=180/p; </init_script>
- <frame_script> ;rx=rx+rdx;ry=ry+rdy;rz=rz+rdz;xs=sin(rx/p3);ys=sin(ry/p3);zs=sin(rz/p3);xc=cos(rx/p3);yc=cos(ry/p3);zc=cos(rz/p3); </frame_script>
- <sample_script> x1=value*sin(p2*index);y1=cos(p2*index);z1=r*cos(p2*index);y2=y1*xc-z1*xs;z2=y1*xs+z1*xc;x2=z2*ys+x1*yc;z3=z2*yc-x1*ys;x3=x2*zc-y2*zs;y3=y2*zc+x2*zs;x4=mx+x3;y4=my+y3;z4=mz+z3;x=x4/(1+z4/dst);y=y4/(1+z4/dst); </sample_script>
- <lines> TRUE </lines>
- </wave_scope>
- <general_fade>
- <amount> 10 </amount>
- </general_fade>
- <general_invert>
- </general_invert>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_simple_yet_pretty.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_smoke.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_swarm.pnv Deleted

@@ -1,923 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 0, 127, 255 </color>
- </cmap_bwgradient>
- <general_clear>
- </general_clear>
- </container_once>
- <container_simple>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- </container_simple>
- <container_simple>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- </container_simple>
- <xform_spin>
- <angle> 1.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 0.96000 </r_scale>
- </xform_spin>
- <general_blur>
- </general_blur>
- <general_fade>
- <amount> 1 </amount>
- </general_fade>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_technicolour_nightmare.pnv Deleted

@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 100, 62, 191 </color>
- </cmap_bwgradient>
- </container_once>
- <wave_horizontal>
- <channels> -1 </channels>
- <value> 157 </value>
- <lines> TRUE </lines>
- </wave_horizontal>
- <xform_spin>
- <angle> 0.03000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 1.04000 </r_scale>
- </xform_spin>
- <xform_halfrender>
- <direction> 1 </direction>
- </xform_halfrender>
- <wave_horizontal>
- <channels> -1 </channels>
- <value> 151 </value>
- <lines> TRUE </lines>
- </wave_horizontal>
- <container_onbeat>
- <xform_halfrender>
- <direction> -1 </direction>
- </xform_halfrender>
- </container_onbeat>
- <container_onbeat>
- <container_cycle>
- <change_interval> 0 </change_interval>
- <beat> FALSE </beat>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 69, 75, 191 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 120, 191, 191 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 100, 62, 191 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 100, 191, 62 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 62, 191, 100 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 239, 123, 227 </color>
- </cmap_bwgradient>
- </container_cycle>
- </container_onbeat>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_transform_fun.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_trapped.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_tunnel_vision.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_value_replace_fun.pnv Deleted

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/nenolod_-_worms.pnv Deleted

@@ -1,920 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_once>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 255 </high_index>
- <color> 0, 127, 255 </color>
- </cmap_bwgradient>
- </container_once>
- <general_invert>
- </general_invert>
- <container_simple>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- </container_simple>
- <container_simple>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- <misc_floater>
- <value> 255 </value>
- </misc_floater>
- </container_simple>
- <xform_spin>
- <angle> 0.00000 </angle>
- <r_add> 0.00000 </r_add>
- <r_scale> 1.02000 </r_scale>
- </xform_spin>
- <general_invert>
- </general_invert>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/presets/ticpu_-_colored_beat-o-scope.pnv Deleted

@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-
-<paranormal_preset>
- <container_simple>
- <container_onbeat>
- <container_simple>
- <general_blur>
- </general_blur>
- <general_blur>
- </general_blur>
- <general_blur>
- </general_blur>
- </container_simple>
- <xform_spin>
- <angle> 8.00000 </angle>
- <r_add> 1.00000 </r_add>
- <r_scale> 0.60000 </r_scale>
- </xform_spin>
- </container_onbeat>
- <container_cycle>
- <change_interval> 3 </change_interval>
- <beat> FALSE </beat>
- <cmap_bwgradient>
- <low_index> 26 </low_index>
- <high_index> 169 </high_index>
- <color> 0, 191, 255 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 94 </high_index>
- <color> 83, 127, 150 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 84 </low_index>
- <high_index> 255 </high_index>
- <color> 208, 95, 89 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 173 </high_index>
- <color> 71, 255, 51 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 114 </low_index>
- <high_index> 255 </high_index>
- <color> 242, 50, 253 </color>
- </cmap_bwgradient>
- <cmap_bwgradient>
- <low_index> 0 </low_index>
- <high_index> 157 </high_index>
- <color> 15, 239, 231 </color>
- </cmap_bwgradient>
- </container_cycle>
- <container_cycle>
- <change_interval> 0 </change_interval>
- <beat> FALSE </beat>
- <general_blur>
- </general_blur>
- <general_noop>
- </general_noop>
- <general_noop>
- </general_noop>
- <general_noop>
- </general_noop>
- </container_cycle>
- <container_cycle>
- <change_interval> 8 </change_interval>
- <beat> TRUE </beat>
- <wave_scope>
- <init_script> n=7;r=0.5;mx=0;my=0;mz=0;dst=2;rx=0;ry=0;rz=0;rdx=1;rdy=1;rdz=1;p=3.14159265;p2=2.0*p;p3=180/p; </init_script>
- <frame_script> ;rx=rx+rdx;ry=ry+rdy;rz=rz+rdz;xs=sin(rx/p3);ys=sin(ry/p3);zs=sin(rz/p3);xc=cos(rx/p3);yc=cos(ry/p3);zc=cos(rz/p3); </frame_script>
- <sample_script> x1=value*sin(p2*index);y1=value * index / cos(z1);z1=r*cos(p2*index);y2=y1*xc-z1*xs;z2=y1*xs+z1*xc;x2=z2*ys+x1*yc;z3=z2*yc-x1*ys;x3=x2*zc-y2*zs;y3=y2*zc+x2*zs;x4=mx+x3;y4=my+y3;z4=mz+z3;x=x4/(1+z4/dst);y=y4/(1+z4/dst); </sample_script>
- <lines> TRUE </lines>
- </wave_scope>
- <wave_scope>
- <init_script> n=7;r=0.5;mx=0;my=0;mz=0;dst=2;rx=0;ry=0;rz=0;rdx=1;rdy=1;rdz=1;p=3.14159265;p2=2.0*p;p3=180/p; </init_script>
- <frame_script> ;rx=rx+rdx;ry=ry+rdy;rz=rz+rdz;xs=sin(rx/p3);ys=sin(ry/p3);zs=sin(rz/p3);xc=cos(rx/p3);yc=cos(ry/p3);zc=cos(rz/p3); </frame_script>
- <sample_script> x1=value*sin(p2*index);y1=value * index / cos(z1);z1=r*cos(p2*index);y2=y1*xc-z1*xs;z2=y1*xs+z1*xc;x2=z2*ys+x1*yc;z3=z2*yc-x1*ys;x3=x2*zc-y2*zs;y3=y2*zc+x2*zs;x4=mx+x3;y4=my+y3;z4=mz+z3;x=x4/(1+z4/dst);y=y4/(1+z4/dst); </sample_script>
- <lines> TRUE </lines>
- </wave_scope>
- </container_cycle>
- <general_fade>
- <amount> 4 </amount>
- </general_fade>
- </container_simple>
-</paranormal_preset>
\ No newline at end of file

audacious-plugins-2.5.3.tar.gz/src/paranormal/wave.c Deleted

@@ -1,545 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <math.h>
-
-#include "paranormal.h"
-#include "actuators.h"
-#include "pn_utils.h"
-
-#include "drawing.h"
-
-#include "libcalc/calc.h"
-
-/* **************** wave_horizontal **************** */
-struct pn_actuator_option_desc wave_horizontal_opts[] =
-{
- {"channels", "Which sound channels to use: negative = channel 1, \npositive = channel 2, "
- "zero = both (two wave-forms.)", OPT_TYPE_INT, {ival: -1} },
- {"value", "The colour value to use.", OPT_TYPE_INT, {ival: 255} },
- {"lines", "Use lines instead of dots.", OPT_TYPE_BOOLEAN, {bval: TRUE} },
- { NULL }
-};
-
-static void
-wave_horizontal_exec_dots (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- int i;
- int channel = ( opts[0].val.ival < 0 ) ? 0 : 1;
- guchar value = (opts[1].val.ival < 0 || opts[1].val.ival > 255) ? 255 : opts[1].val.ival;
-
- for (i=0; i<pn_image_data->width; i++) {
-
- /*single channel, centered horz.*/
- if ( opts[0].val.ival ) {
- pn_image_data->surface[0][PN_IMG_INDEX (i, (pn_image_data->height>>1)
-					 - CAP (pn_sound_data->pcm_data[channel]
-						 [i*512/pn_image_data->width]>>8,
-						 (pn_image_data->height>>1)-1))]
-	= value;
- }
-
- /*both channels, at 1/4 and 3/4 of the screen*/
- else {
- pn_image_data->surface[0][PN_IMG_INDEX( i, (pn_image_data->height>>2) -
-					 CAP( (pn_sound_data->pcm_data[0]
-						 [i*512/pn_image_data->width]>>9),
-						 (pn_image_data->height>>2)-1))]
-	= value;
-
- pn_image_data->surface[0][PN_IMG_INDEX( i, 3*(pn_image_data->height>>2) -
-					 CAP( (pn_sound_data->pcm_data[1]
-						 [i*512/pn_image_data->width]>>9),
-						 (pn_image_data->height>>2)-1))]
-	= value;
- }
- }
-}
-
-void
-wave_horizontal_exec_lines (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- int channel = ( opts[0].val.ival < 0 ) ? 0 : 1;
- guchar value = (opts[1].val.ival < 0 || opts[1].val.ival > 255) ? 255 : opts[1].val.ival;
- int *x_pos, *y_pos;	/* dynamic tables which store the positions for the line */
- int *x2_pos, *y2_pos;	/* dynamic tables which store the positions for the line */
- int i;
- float step;
-
- x_pos = g_new0(int, 257);
- y_pos = g_new0(int, 257);
- x2_pos = g_new0(int, 257);
- y2_pos = g_new0(int, 257);
-
- step = pn_image_data->width / 256.;
-
- /* calculate the line. */
- for (i = 0; i < 256; i++)
- {
- if (opts[0].val.ival != 0)
- {
- x_pos[i] = i * step;
- y_pos[i] = (pn_image_data->height>>1) - 
-			CAP (pn_sound_data->pcm_data[channel][i * 2]>>8, 
-			(pn_image_data->height>>1)-1);
- }
- else
- {
- x_pos[i] = i * step;
- y_pos[i] = (pn_image_data->height>>2) - 
-			CAP (pn_sound_data->pcm_data[0][i * 2]>>9,
-			(pn_image_data->height>>2)-1);
-
- x2_pos[i] = i * step;
- y2_pos[i] = 3*(pn_image_data->height>>2) - 
-			CAP (pn_sound_data->pcm_data[1][i * 2]>>9,
-			(pn_image_data->height>>2)-1);
-
- }
- }
-
- /* draw the line. */
- for (i = 1; i < 256; i++)
- {
- pn_draw_line(x_pos[i - 1], y_pos[i - 1], x_pos[i], y_pos[i], value);
-
- if ( opts[0].val.ival == 0 )
- pn_draw_line(x2_pos[i - 1], y2_pos[i - 1], x2_pos[i], y2_pos[i], value);
- }
-
- g_free(x_pos);
- g_free(y_pos);
- g_free(x2_pos);
- g_free(y2_pos);
-}
-
-static void
-wave_horizontal_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- if (opts[2].val.bval == TRUE)
- wave_horizontal_exec_lines(opts, data);
- else
- wave_horizontal_exec_dots(opts, data);
-}
-
-struct pn_actuator_desc builtin_wave_horizontal =
-{
- "wave_horizontal", "Horizontal Waveform",
- "Draws one or two waveforms horizontally across "
- "the drawing surface",
- 0, wave_horizontal_opts,
- NULL, NULL, wave_horizontal_exec
-};
-
-/* **************** wave_vertical **************** */
-struct pn_actuator_option_desc wave_vertical_opts[] =
-{
- {"channels", "Which sound channels to use: negative = channel 1, \npositive = channel 2, "
- "zero = both (two wave-forms.)", OPT_TYPE_INT, {ival: -1} },
- {"value", "The colour value to use.", OPT_TYPE_INT, {ival: 255} },
- {"lines", "Use lines instead of dots.", OPT_TYPE_BOOLEAN, {bval: TRUE} },
- { NULL }
-};
-
-static void
-wave_vertical_exec_dots (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- int i;
- int channel = ( opts[0].val.ival < 0 ) ? 0 : 1;
- guchar value = (opts[1].val.ival < 0 || opts[1].val.ival > 255) ? 255 : opts[1].val.ival;
-
- for (i=0; i<pn_image_data->height; i++) {
- if ( opts[0].val.ival ) {
- pn_image_data->surface[0][PN_IMG_INDEX ((pn_image_data->width>>1)
-					 - CAP (pn_sound_data->pcm_data[channel]
-						 [i*512/pn_image_data->height]>>8,
-						 (pn_image_data->width>>1)-1), i)]
-	= value;
- }
- else {
- pn_image_data->surface[0][PN_IMG_INDEX ((pn_image_data->width>>2) 
-					 - CAP (pn_sound_data->pcm_data[0]
-						 [i*512/pn_image_data->height]>>9,
-						 (pn_image_data->width>>2)-1), i)]
-	= value;
- pn_image_data->surface[0][PN_IMG_INDEX ((3*pn_image_data->width>>2) 
-						 -CAP (pn_sound_data->pcm_data[1]
-						 [i*512/pn_image_data->height]>>9,
-						 (pn_image_data->width>>2)-1), i)]
-			 
-	= value;
- }
- }
-}
-
-static void
-wave_vertical_exec_lines (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- int channel = ( opts[0].val.ival < 0 ) ? 0 : 1;
- guchar value = (opts[1].val.ival < 0 || opts[1].val.ival > 255) ? 255 : opts[1].val.ival;
- int *x_pos, *y_pos;	/* dynamic tables which store the positions for the line */
- int *x2_pos, *y2_pos;	/* dynamic tables which store the positions for the line */
- int i;
- float step;
-
- x_pos = g_new0(int, 129);
- y_pos = g_new0(int, 129);
- x2_pos = g_new0(int, 129);
- y2_pos = g_new0(int, 129);
-
- step = pn_image_data->height / 128.;
-
- /* calculate the line. */
- for (i = 0; i < 128; i++)
- {
- if (opts[0].val.ival != 0)
- {
- x_pos[i] = (pn_image_data->width>>1) - 
-			CAP (pn_sound_data->pcm_data[channel]
-			[i*4]>>8,
-			(pn_image_data->width>>1)-1);
-	 y_pos[i] = i * step;
- }
- else
- {
- x_pos[i] = (pn_image_data->width>>2) 
-		 - CAP (pn_sound_data->pcm_data[0]
-		 [i*4]>>9,
-		 (pn_image_data->width>>2)-1);
- y_pos[i] = i * step;
-
- x2_pos[i] = 3*(pn_image_data->width>>2) 
-		 - CAP (pn_sound_data->pcm_data[1]
-		 [i*4]>>9,
-		 (pn_image_data->width>>2)-1);
- y2_pos[i] = i * step;
- }
- }
-
- /* draw the line. */
- for (i = 1; i < 128; i++)
- {
- pn_draw_line(x_pos[i - 1], y_pos[i - 1], x_pos[i], y_pos[i], value);
-
- if ( opts[0].val.ival == 0 )
- pn_draw_line(x2_pos[i - 1], y2_pos[i - 1], x2_pos[i], y2_pos[i], value);
- }
-
- g_free(x_pos);
- g_free(y_pos);
- g_free(x2_pos);
- g_free(y2_pos);
-}
-
-static void
-wave_vertical_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- if (opts[2].val.bval == TRUE)
- wave_vertical_exec_lines(opts, data);
- else
- wave_vertical_exec_dots(opts, data);
-}
-
-struct pn_actuator_desc builtin_wave_vertical =
-{
- "wave_vertical", "Vertical Waveform",
- "Draws one or two waveforms vertically across "
- "the drawing surface",
- 0, wave_vertical_opts,
- NULL, NULL, wave_vertical_exec
-};
-
-/* FIXME: allow for only 1 channel for wave_normalize & wave_smooth */
-/* **************** wave_normalize **************** */
-static struct pn_actuator_option_desc wave_normalize_opts[] =
-{
- { "height", "If positive, the height, in pixels, to which the waveform will be "
- "normalized; if negative, hfrac is used", OPT_TYPE_INT, { ival: -1 } },
- { "hfrac", "If positive, the fraction of the horizontal image size to which the "
- "waveform will be normalized; if negative, vfrac is used",
- OPT_TYPE_FLOAT, { fval: -1 } },
- { "vfrac", "If positive, the fraction of the vertical image size to which the "
- "waveform will be normalized",
- OPT_TYPE_FLOAT, { fval: .125 } },
- { "channels", "Which sound channel(s) to normalize: negative = channel 1,\n"
- "\tpositive = channel 2, 0 = both channels.",
- OPT_TYPE_INT, { ival: 0 } },
- { NULL }
-};
-
-static void
-wave_normalize_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- int i, j, max=0;
- float denom;
-
- for (j=0; j<2; j++)
- {
- if ( !(opts[3].val.ival) || (opts[3].val.ival < 0 && j == 0) ||
-	 (opts[3].val.ival > 0 && j == 1) ) {
-	
-	for (i=0; i<512; i++)
-	 if (abs(pn_sound_data->pcm_data[j][i]) > max)
-	 max = abs(pn_sound_data->pcm_data[j][i]);
-	
-	if (opts[0].val.ival > 0)
-	 denom = max/(opts[0].val.ival<<8);
-	else if (opts[1].val.fval > 0)
-	 denom = max/(opts[1].val.fval * (pn_image_data->width<<8));
-	else
-	 denom = max/(opts[2].val.fval * (pn_image_data->height<<8));
-	
-	if (denom > 0)
-	 for (i=0; i<512; i++)
-	 pn_sound_data->pcm_data[j][i]
-	 /= denom;
- }
- }
-}
-
-struct pn_actuator_desc builtin_wave_normalize =
-{
- "wave_normalize", "Normalize Waveform Data",
- "Normalizes the waveform data used by the wave_* actuators",
- 0, wave_normalize_opts,
- NULL, NULL, wave_normalize_exec
-};
-
-/* **************** wave_smooth **************** */
-struct pn_actuator_option_desc wave_smooth_opts[] = 
-{
- { "channels", "Which sound channel(s) to smooth: negative = channel 1, \n"
- "\tpositive = channel 2, 0 = both channels.",
- OPT_TYPE_INT, { ival: 0 } },
- {0}
-};
-
-static void
-wave_smooth_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- int i, j, k;
- gint16 tmp[512];
-
- for (j=0; j<2; j++)
- {
- if ( !(opts[0].val.ival) || (opts[0].val.ival < 0 && j == 0) ||
-	 (opts[0].val.ival > 0 && j == 1) ) { 
-	
-	for (i=4; i<508; i++)
-	 {
-	 k = (pn_sound_data->pcm_data[j][i]<<3)
-	 + (pn_sound_data->pcm_data[j][i+1]<<2)
-	 + (pn_sound_data->pcm_data[j][i-1]<<2)
-	 + (pn_sound_data->pcm_data[j][i+2]<<2)
-	 + (pn_sound_data->pcm_data[j][i-2]<<2)
-	 + (pn_sound_data->pcm_data[j][i+3]<<1)
-	 + (pn_sound_data->pcm_data[j][i-3]<<1)
-	 + (pn_sound_data->pcm_data[j][i+4]<<1)
-	 + (pn_sound_data->pcm_data[j][i-4]<<1);
-	 tmp[i] = k >> 5;
-	 }
-	memcpy (pn_sound_data->pcm_data[j]+4, tmp, sizeof (gint16) * 504);
- } 
- }
-}
-
-struct pn_actuator_desc builtin_wave_smooth =
-{
- "wave_smooth", "Smooth Waveform Data",
- "Smooth out the waveform data used by the wave_* actuators",
- 0, wave_smooth_opts,
- NULL, NULL, wave_smooth_exec
-};
-
-/* **************** wave_radial **************** */
-static struct pn_actuator_option_desc wave_radial_opts[] =
-{
- { "base_radius", " ", 
- OPT_TYPE_FLOAT, { fval: 0 } },
- {"value", "The colour value to use.", OPT_TYPE_INT, {ival: 255} },
-/* {"lines", "Use lines instead of dots.", OPT_TYPE_BOOLEAN, {bval: TRUE} }, */
- { NULL }
-};
-
-static void
-wave_radial_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- int i, x, y;
- guchar value = (opts[1].val.ival < 0 || opts[1].val.ival > 255) ? 255 : opts[1].val.ival;
- 
- for(i=0; i<360; i++)
- {
- x = (pn_image_data->width>>1)
-	+ (opts[0].val.fval + (pn_sound_data->pcm_data[0][(int)(i*(512.0/360.0))]>>8))
-	* cos_val[i];
- y = (pn_image_data->height>>1) 
-	+ (opts[0].val.fval + (pn_sound_data->pcm_data[0][(int)(i*(512.0/360.0))]>>8))
-	* sin_val[i];
-
- pn_image_data->surface[0][PN_IMG_INDEX (CAPHILO(x,pn_image_data->width,0),
-					 CAPHILO(y,pn_image_data->height,0))]
-	= value;
- }
-};	 
-
-struct pn_actuator_desc builtin_wave_radial =
-{
- "wave_radial", "Radial Waveform",
- "Draws a single waveform varying"
- " radially from the center of the image",
- 0, wave_radial_opts,
- NULL, NULL, wave_radial_exec
-};
-
-/* **************** wave_scope **************** */
-
-static struct pn_actuator_option_desc wave_scope_opts[] =
-{
- {"init_script", "Initialization script.", OPT_TYPE_STRING, {sval: "n = 800; t = -0.05;"} },
- {"frame_script", "Script to run at the beginning of each frame.", OPT_TYPE_STRING, {sval: "t = t + 0.05;"} },
- {"sample_script", "Script to run for each sample.", OPT_TYPE_STRING, {sval: "d = index + value; r = t + index * 3.141952924 * 4; x = cos(r) * d; y = sin(r) * d;"} },
- {"lines", "Use lines instead of dots.", OPT_TYPE_BOOLEAN, {bval: TRUE} },
- { NULL }
-};
-
-struct pn_scope_data
-{
- expression_t *expr_on_init, *expr_on_frame, *expr_on_sample;
- symbol_dict_t *dict;
- gboolean reset;
-};
-
-static void
-wave_scope_init(gpointer *data)
-{
- *data = g_new0(struct pn_scope_data, 1);
-
- /* the expressions will need to be compiled, so prepare for that */
- ((struct pn_scope_data *)*data)->reset = TRUE;
-}
-
-static void
-wave_scope_cleanup(gpointer op_data)
-{
- struct pn_scope_data *data = (struct pn_scope_data *) op_data;
-
- g_return_if_fail(data != NULL);
-
- if (data->expr_on_init)
- expr_free(data->expr_on_init);
-
- if (data->expr_on_frame)
- expr_free(data->expr_on_frame);
-
- if (data->expr_on_sample)
- expr_free(data->expr_on_sample);
-
- if (data->dict)
- dict_free(data->dict);
-
- if (data)
- g_free(data);
-}
-
-static void
-wave_scope_exec(const struct pn_actuator_option *opts,
-		gpointer op_data)
-{
- struct pn_scope_data *data = (struct pn_scope_data *) op_data;
- gint i;
- gdouble *xf, *yf, *index, *value, *points;
-
- if (data->reset)
- {
- if (data->dict)
- dict_free(data->dict);
-
- data->dict = dict_new();
-
- if (opts[0].val.sval != NULL)
- data->expr_on_init = expr_compile_string(opts[0].val.sval, data->dict);
-
- if (opts[1].val.sval != NULL)
- data->expr_on_frame = expr_compile_string(opts[1].val.sval, 
-		data->dict);
-
- if (opts[2].val.sval != NULL)
- data->expr_on_sample = expr_compile_string(opts[2].val.sval, 
-		data->dict);
-
- if (data->expr_on_init != NULL)
- expr_execute(data->expr_on_init, data->dict);
-
- data->reset = FALSE;
- }
-
- xf = dict_variable(data->dict, "x");
- yf = dict_variable(data->dict, "y");
- index = dict_variable(data->dict, "index");
- value = dict_variable(data->dict, "value");
- points = dict_variable(data->dict, "points");
-
- if (data->expr_on_frame != NULL)
- expr_execute(data->expr_on_frame, data->dict);
-
- if (*points > 513 || *points == 0)
- *points = 513;
-
- if (data->expr_on_sample != NULL)
- {
- for (i = 0; i < *points; i++)
- {
- gint x, y;
- static gint oldx, oldy;
-
- *value = 1.0 * pn_sound_data->pcm_data[0][i & 511] / 32768.0;
- *index = i / (*points - 1);
-
- expr_execute(data->expr_on_sample, data->dict);
-
- x = (gint)(((*xf + 1.0) * (pn_image_data->width - 1) / 2) + 0.5);
- y = (gint)(((*yf + 1.0) * (pn_image_data->height - 1) / 2) + 0.5);
-
- if (i != 0)
- pn_draw_line(oldx, oldy, x, y, 255);
-
- oldx = x;
- oldy = y;
- }
- }
-}
-
-struct pn_actuator_desc builtin_wave_scope =
-{
- "wave_scope", "Scope",
- "A programmable scope.",
- 0, wave_scope_opts,
- wave_scope_init, wave_scope_cleanup, wave_scope_exec
-};

audacious-plugins-2.5.3.tar.gz/src/paranormal/xform.c Deleted

@@ -1,766 +0,0 @@
-/*
- * paranormal: iterated pipeline-driven visualization plugin
- * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
- * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/* FIXME: allow for only using an xform on part of the img? */
-/* FIXME: perhaps combine these into a single vector field
- so that only 1 apply_xform needs to be done for as many
- of these as someone wants to use */
-
-#include <config.h>
-
-#include <math.h>
-
-#include <glib.h>
-
-#include "paranormal.h"
-#include "actuators.h"
-#include "pn_utils.h"
-
-#include "libcalc/calc.h"
-
-struct xform_vector
-{
- gint32 offset; /* the offset of the top left pixel */
- guint16 w; /* 4:4:4:4 NE, NW, SE, SW pixel weights
-		 The total should be 16 */
-
- /* if offset < 0 then w is the color index to
- which the pixel will be set */
-};
-
-static void
-xfvec (float x, float y, struct xform_vector *v)
-{
- float xd, yd;
- int weight[4];
-
- if (x >= pn_image_data->width-1 || y >= pn_image_data->height-1
- || x < 0 || y < 0)
- {
- v->offset = -1;
- v->w = 0;
- return;
- }
-
- v->offset = PN_IMG_INDEX (floor(x), floor(y));
-
- xd = x - floor (x);
- yd = y - floor (y);
-
- weight[3] = xd * yd * 16;
- weight[2] = (1-xd) * yd * 16;
- weight[1] = xd * (1-yd) * 16;
- weight[0] = 16 - weight[3] - weight[2] - weight[1]; /* just in case */
-
- v->w = (weight[0]<<12) | (weight[1]<<8) | (weight[2]<<4) | weight[3];
-}
-
-static void
-apply_xform (struct xform_vector *vfield)
-{
- int i;
- struct xform_vector *v;
- register guchar *srcptr;
- register guchar *destptr;
- register int color;
-
- if (vfield == NULL)
- return;
-
- for (i=0, v=vfield, destptr=pn_image_data->surface[1];
- i<pn_image_data->width*pn_image_data->height;
- i++, v++, destptr++)
- {
- /* off the screen */
- if (v->offset < 0)
-	{
-	 *destptr = (guchar)v->w;
-	 continue;
-	}
-
- srcptr = pn_image_data->surface[0] + v->offset;
-
- /* exactly on the pixel */
- if (v->w == 0)
-	 *destptr = *srcptr;
-
- /* gotta blend the points */
- else
-	{
-	 color = *srcptr * (v->w>>12);
-	 color += *++srcptr * ((v->w>>8) & 0x0f);
-	 color += *(srcptr+=pn_image_data->width) * (v->w & 0x0f);
-	 color += *(--srcptr) * ((v->w>>4) & 0x0f);
-	 color >>= 4;
-	 *destptr = (guchar)color;
-	}
- }
-}
-
-/* **************** xform_spin **************** */
-/* FIXME: Describe these better, how they are backwards */
-/* FIXME: better name? */
-struct pn_actuator_option_desc xform_spin_opts[] =
-{
- { "angle", "The angle of rotation", OPT_TYPE_FLOAT, { fval: -8.0 } },
- { "r_add", "The number of pixels by which the r coordinate will be "
- "increased (before scaling)", OPT_TYPE_FLOAT, { fval: 0.0 } },
- { "r_scale", "The amount by which the r coordinate of each pixel will "
- "be scaled", OPT_TYPE_FLOAT, { fval: 1.0 } },
- { NULL }
-};
-
-struct xform_spin_data
-{
- int width, height;
- struct xform_vector *vfield;
-};
-
-static void
-xform_spin_init (gpointer *data)
-{
- *data = g_new0 (struct xform_spin_data, 1);
-}
-
-static void
-xform_spin_cleanup (gpointer data)
-{
- struct xform_spin_data *d = (struct xform_spin_data *) data;
-
-
- if (d)
- {
- if (d->vfield)
-	g_free (d->vfield);
- g_free (d);
- }
-}
-
-static void
-xform_spin_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- struct xform_spin_data *d = (struct xform_spin_data*)data;
- float i, j;
-
- if (d->width != pn_image_data->width
- || d->height != pn_image_data->height)
- {
- d->width = pn_image_data->width;
- d->height = pn_image_data->height;
-
- if (d->vfield)
-	g_free (d->vfield);
-
- d->vfield = g_malloc0 (sizeof(struct xform_vector)
-			 * d->width * d->height);
-
- for (j=-(pn_image_data->height>>1)+1; j<=pn_image_data->height>>1; j++)
-	for (i=-(pn_image_data->width>>1); i<pn_image_data->width>>1; i++)
-	 {
-	 float r, t = 0;
-	 float x, y;
-
-	 r = sqrt (i*i + j*j);
-	 if (r)
-	 t = asin (j/r);
-	 if (i < 0)
-	 t = M_PI - t;
-
-	 t += opts[0].val.fval * M_PI/180.0;
-	 r += opts[1].val.fval;
-	 r *= opts[2].val.fval;
-
-	 x = (r * cos (t)) + (pn_image_data->width>>1);
-	 y = (pn_image_data->height>>1) - (r * sin (t));
-
-	 xfvec (x, y, &d->vfield
-		 [PN_IMG_INDEX ((pn_image_data->width>>1)+(int)rint(i),
-				 ((pn_image_data->height>>1)-(int)rint(j)))]);
-	 }
- }
-
- apply_xform (d->vfield);
- pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_xform_spin =
-{
- "xform_spin", "Spin Transform",
- "Rotates and radially scales the image",
- 0, xform_spin_opts,
- xform_spin_init, xform_spin_cleanup, xform_spin_exec
-};
-
-/* **************** xform_ripple **************** */
-struct pn_actuator_option_desc xform_ripple_opts[] =
-{
- { "angle", "The angle of rotation", OPT_TYPE_FLOAT, { fval: 0 } },
- { "ripples", "The number of ripples that fit on the screen "
- "(horizontally)", OPT_TYPE_FLOAT, { fval: 8 } },
- { "base_speed", "The minimum number of pixels to move each pixel",
- OPT_TYPE_FLOAT, { fval: 1 } },
- { "mod_speed", "The maximum number of pixels by which base_speed"
- " will be modified", OPT_TYPE_FLOAT, { fval: 1 } },
- { NULL }
-};
-
-struct xform_ripple_data
-{
- int width, height;
- struct xform_vector *vfield;
-};
-
-static void
-xform_ripple_init (gpointer *data)
-{
- *data = g_new0 (struct xform_ripple_data, 1);
-}
-
-static void
-xform_ripple_cleanup (gpointer data)
-{
- struct xform_ripple_data *d = (struct xform_ripple_data*) data;
-
- if (d)
- {
- if (d->vfield)
-	g_free (d->vfield);
- g_free (d);
- }
-}
-
-static void
-xform_ripple_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- struct xform_ripple_data *d = (struct xform_ripple_data*)data;
- float i, j;
-
- if (d->width != pn_image_data->width
- || d->height != pn_image_data->height)
- {
- d->width = pn_image_data->width;
- d->height = pn_image_data->height;
-
- if (d->vfield)
-	g_free (d->vfield);
-
- d->vfield = g_malloc (sizeof(struct xform_vector)
-			 * d->width * d->height);
-
- for (j=-(pn_image_data->height>>1)+1; j<=pn_image_data->height>>1; j++)
-	for (i=-(pn_image_data->width>>1); i<pn_image_data->width>>1; i++)
-	 {
-	 float r, t = 0;
-	 float x, y;
-
-	 r = sqrt (i*i + j*j);
-	 if (r)
-	 t = asin (j/r);
-	 if (i < 0)
-	 t = M_PI - t;
-
-	 t += opts[0].val.fval * M_PI/180.0;
-
-	 if (r > 4)//(pn_image_data->width/(2*opts[1].val.fval)))
-	 r -= opts[2].val.fval + (opts[3].val.fval/2) *
-		(1 + sin ((r/(pn_image_data->width/(2*opts[1].val.fval)))*M_PI));
-/* 	 else if (r > 4) */
-/* 	 r *= r/(pn_image_data->width/opts[1].val.fval); */
-	 else /* don't let it explode */
-	 r = 1000000;
-
-
-	 x = (r * cos (t)) + (pn_image_data->width>>1);
-	 y = (pn_image_data->height>>1) - (r * sin (t));
-
-	 xfvec (x, y, &d->vfield
-		 [PN_IMG_INDEX ((pn_image_data->width>>1)+(int)rint(i),
-				 ((pn_image_data->height>>1)-(int)rint(j)))]);
-	 }
- }
-
- apply_xform (d->vfield);
- pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_xform_ripple =
-{
- "xform_ripple", "Ripple Transform", "Creates an ripple effect",
- 0, xform_ripple_opts,
- xform_ripple_init, xform_ripple_cleanup, xform_ripple_exec
-};
-
-/* **************** xform_bump_spin **************** */
-struct pn_actuator_option_desc xform_bump_spin_opts[] =
-{
- { "angle", "The angle of rotation", OPT_TYPE_FLOAT, { fval: 0 } },
- { "bumps", "The number of bumps that on the image",
- OPT_TYPE_FLOAT, { fval: 8 } },
- { "base_scale", "The base radial scale",
- OPT_TYPE_FLOAT, { fval: 0.95 } },
- { "mod_scale", "The maximum amount that should be "
- "added to the base_scale to create the 'bump' effect",
- OPT_TYPE_FLOAT, { fval: .1 } },
- { NULL }
-};
-
-struct xform_bump_spin_data
-{
- int width, height;
- struct xform_vector *vfield;
-};
-
-static void
-xform_bump_spin_init (gpointer *data)
-{
- *data = g_new0 (struct xform_bump_spin_data, 1);
-}
-
-static void
-xform_bump_spin_cleanup (gpointer data)
-{
- struct xform_bump_spin_data *d = (struct xform_bump_spin_data*) data;
-
- if (d)
- {
- if (d->vfield)
-	g_free (d->vfield);
- g_free (d);
- }
-}
-
-static void
-xform_bump_spin_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- struct xform_bump_spin_data *d = (struct xform_bump_spin_data*)data;
- float i, j;
-
- if (d->width != pn_image_data->width
- || d->height != pn_image_data->height)
- {
- d->width = pn_image_data->width;
- d->height = pn_image_data->height;
-
- if (d->vfield)
-	g_free (d->vfield);
-
- d->vfield = g_malloc (sizeof(struct xform_vector)
-			 * d->width * d->height);
-
- for (j=-(pn_image_data->height>>1)+1; j<=pn_image_data->height>>1; j++)
-	for (i=-(pn_image_data->width>>1); i<pn_image_data->width>>1; i++)
-	 {
-	 float r, t = 0;
-	 float x, y;
-
-	 r = sqrt (i*i + j*j);
-	 if (r)
-	 t = asin (j/r);
-	 if (i < 0)
-	 t = M_PI - t;
-
-	 t += opts[0].val.fval * M_PI/180.0;
-
-	 r *= opts[2].val.fval + opts[3].val.fval
-	 * (1 + sin (t*opts[1].val.fval));
-
-	 x = (r * cos (t)) + (pn_image_data->width>>1);
-	 y = (pn_image_data->height>>1) - (r * sin (t));
-
-	 xfvec (x, y, &d->vfield
-		 [PN_IMG_INDEX ((pn_image_data->width>>1)+(int)rint(i),
-				 ((pn_image_data->height>>1)-(int)rint(j)))]);
-	 }
- }
-
- apply_xform (d->vfield);
- pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_xform_bump_spin =
-{
- "xform_bump_spin", "Bump Transform",
- "Rotate the image at a varying speed to create "
- "the illusion of bumps",
- 0, xform_bump_spin_opts,
- xform_bump_spin_init, xform_bump_spin_cleanup, xform_bump_spin_exec
-};
-
-/* **************** xform_halfrender **************** */
-struct pn_actuator_option_desc xform_halfrender_opts[] =
-{
- { "direction", "Negative is horizontal, positive is vertical.",
- OPT_TYPE_INT, { ival: 1 } },
- { "render_twice", "Render the second image.",
- OPT_TYPE_BOOLEAN, { bval: TRUE } },
- { NULL }
-};
-
-static void
-xform_halfrender_exec (const struct pn_actuator_option *opts,
-		 gpointer data)
-{
- gint x, y;
-
- if (opts[0].val.ival < 0)
- {
- for (y = 0; y < pn_image_data->height; y += 2)
- {
- for (x = 0; x < pn_image_data->width; x++)
- {
- pn_image_data->surface[1][PN_IMG_INDEX(x, y / 2)] =
- pn_image_data->surface[0][PN_IMG_INDEX(x, y)];
-	 if (opts[1].val.bval)
- {
- pn_image_data->surface[1][PN_IMG_INDEX(x, (y / 2) + (pn_image_data->height / 2))] =
- pn_image_data->surface[0][PN_IMG_INDEX(x, y)];
- }
- }
- }
- }
- else
- {
- for (y = 0; y < pn_image_data->height; y++)
- {
- for (x = 0; x < pn_image_data->width; x += 2)
- {
- pn_image_data->surface[1][PN_IMG_INDEX(x / 2, y)] =
- pn_image_data->surface[0][PN_IMG_INDEX(x, y)];
- if (opts[1].val.bval)
- {
- pn_image_data->surface[1][PN_IMG_INDEX((x / 2) + (pn_image_data->width / 2), y)] =
- pn_image_data->surface[0][PN_IMG_INDEX(x, y)];
- }
- }
- }
- }
-
- pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_xform_halfrender =
-{
- "xform_halfrender", "Halfrender Transform",
- "Divides the surface in half and renders it twice.",
- 0, xform_halfrender_opts,
- NULL, NULL, xform_halfrender_exec
-};
-
-/* **************** xform_movement **************** */
-struct pn_actuator_option_desc xform_movement_opts[] =
-{
- { "formula", "The formula to evaluate.",
- OPT_TYPE_STRING, { sval: "r = r * cos(r); d = sin(d);" } },
- { "polar", "Whether the coordinates are polar or not.",
- OPT_TYPE_BOOLEAN, { bval: TRUE } },
- { NULL }
-};
-
-typedef struct {
- int width, height; /* Previous width and height. */
- struct xform_vector *vfield;
-} PnMovementData;
-
-static void
-xform_movement_init (gpointer *data)
-{
- *data = g_new0(PnMovementData, 1);
-}
-
-static void
-xform_movement_cleanup (gpointer data)
-{
- PnMovementData *d = (PnMovementData *) data;
-
- if (d)
- {
- if (d->vfield)
- 	 g_free (d->vfield);
- g_free (d);
- }
-}
-
-inline void
-xform_trans_polar (struct xform_vector *vfield, gint x, gint y,
-	expression_t *expr, symbol_dict_t *dict)
-{
- gdouble *rf, *df;
- gdouble xf, yf;
- gint xn, yn;
-
- rf = dict_variable(dict, "r");
- df = dict_variable(dict, "d");
-
- /* Points (xf, yf) must be in a (-1..1) square. */
- xf = 2.0 * x / (pn_image_data->width - 1) - 1.0;
- yf = 2.0 * y / (pn_image_data->height - 1) - 1.0;
-
- /* Now, convert to polar coordinates r and d. */
- *rf = hypot(xf, yf);
- *df = atan2(yf, xf);
-
- /* Run the script. */
- expr_execute(expr, dict);
-
- /* Back to (-1..1) square. */
- xf = (*rf) * cos ((*df));
- yf = (*rf) * sin ((*df));
-
- /* Convert back to physical coordinates. */
- xn = (int)(((xf + 1.0) * (pn_image_data->width - 1) / 2) + 0.5);
- yn = (int)(((yf + 1.0) * (pn_image_data->height - 1) / 2) + 0.5);
-
- if (xn < 0 || xn >= pn_image_data->width || yn < 0 || yn >= pn_image_data->height)
- {
- xn = x; yn = y;
- }
-
- xfvec (xn, yn, &vfield[PN_IMG_INDEX (x, y)]);
-}
-
-inline void
-xform_trans_literal (struct xform_vector *vfield, gint x, gint y,
-	expression_t *expr, symbol_dict_t *dict)
-{
- gint xn, yn;
- gdouble *xf = dict_variable(dict, "x");
- gdouble *yf = dict_variable(dict, "y");
-
- /* Points (xf, yf) must be in a (-1..1) square. */
- *xf = 2.0 * x / (pn_image_data->width - 1) - 1.0;
- *yf = 2.0 * y / (pn_image_data->height - 1) - 1.0;
-
- /* Run the script. */
- expr_execute(expr, dict);
-
- /* Convert back to physical coordinates. */
- xn = (int)(((*xf + 1.0) * (pn_image_data->width - 1) / 2) + 0.5);
- yn = (int)(((*yf + 1.0) * (pn_image_data->height - 1) / 2) + 0.5);
-
- if (xn < 0 || xn >= pn_image_data->width || yn < 0 || yn >= pn_image_data->height)
- {
- xn = x; yn = y;
- }
-
- xfvec (xn, yn, &vfield[PN_IMG_INDEX (x, y)]);
-}
-
-static void
-xform_movement_exec (const struct pn_actuator_option *opts,
-		 gpointer odata)
-{
- PnMovementData *d = (PnMovementData *) odata;
- void (*transform_func)(struct xform_vector *, gint, gint, expression_t *, symbol_dict_t *) =
- opts[1].val.bval == TRUE ? xform_trans_polar : xform_trans_literal;
-
- if (d->width != pn_image_data->width
- || d->height != pn_image_data->height)
- {
- gint i, j;
- expression_t *expr;
- symbol_dict_t *dict;
-
- d->width = pn_image_data->width;
- d->height = pn_image_data->height;
-
- if (d->vfield)
- {
- 	 g_free (d->vfield);
- d->vfield = NULL;
- }
-
- if (opts[0].val.sval == NULL)
- return;
-
- dict = dict_new();
- expr = expr_compile_string(opts[0].val.sval, dict);
- if (!expr)
- {
- dict_free(dict);
- return;
- }
-
- d->vfield = g_malloc (sizeof(struct xform_vector)
-			 * d->width * d->height);
-
- for (j = 0; j < pn_image_data->height; j++)
-	for (i = 0; i < pn_image_data->width; i++)
-	 {
- transform_func(d->vfield, i, j, expr, dict);
-	 }
- }
-
- apply_xform (d->vfield);
- pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_xform_movement =
-{
- "xform_movement", "Movement Transform",
- "A customizable blitter.",
- 0, xform_movement_opts,
- xform_movement_init, xform_movement_cleanup, xform_movement_exec
-};
-
-/* **************** xform_dynmovement **************** */
-/* FIXME: really slow */
-struct pn_actuator_option_desc xform_dynmovement_opts[] =
-{
- { "init_script", "The formula to evaluate on init.",
- OPT_TYPE_STRING, { sval: "" } },
- { "beat_script", "The formula to evaluate on each beat.",
- OPT_TYPE_STRING, { sval: "" } },
- { "frame_script", "The formula to evaluate on each frame.",
- OPT_TYPE_STRING, { sval: "" } },
- { "point_script", "The formula to evaluate.",
- OPT_TYPE_STRING, { sval: "d = 0.15;" } },
- { "polar", "Whether or not the coordinates to use are polar.",
- OPT_TYPE_BOOLEAN, { bval: TRUE } },
- { NULL }
-};
-
-typedef struct {
- int width, height; /* Previous width and height. */
- expression_t *expr_init;
- expression_t *expr_frame;
- expression_t *expr_beat;
- expression_t *expr_point;
- symbol_dict_t *dict;
- struct xform_vector *vfield;
-} PnDynMovementData;
-
-static void
-xform_dynmovement_init (gpointer *data)
-{
- *data = g_new0(PnDynMovementData, 1);
-}
-
-static void
-xform_dynmovement_cleanup (gpointer data)
-{
- PnDynMovementData *d = (PnDynMovementData *) data;
-
- if (d)
- {
- if (d->expr_init)
- expr_free (d->expr_init);
- if (d->expr_beat)
- expr_free (d->expr_beat);
- if (d->expr_frame)
- expr_free (d->expr_frame);
- if (d->expr_point)
- expr_free (d->expr_point);
- if (d->dict)
- dict_free (d->dict);
- if (d->vfield)
- 	 g_free (d->vfield);
- g_free (d);
- }
-}
-
-static void
-xform_dynmovement_exec (const struct pn_actuator_option *opts,
-		 gpointer odata)
-{
- PnDynMovementData *d = (PnDynMovementData *) odata;
- gint i, j;
- void (*transform_func)(struct xform_vector *, gint, gint, expression_t *, symbol_dict_t *) =
- opts[4].val.bval == TRUE ? xform_trans_polar : xform_trans_literal;
- gboolean make_table = FALSE;
-
- if (d->width != pn_image_data->width
- || d->height != pn_image_data->height)
- {
- d->width = pn_image_data->width;
- d->height = pn_image_data->height;
-
- if (d->vfield)
- {
- 	 g_free (d->vfield);
- d->vfield = NULL;
- }
-
- if (opts[3].val.sval == NULL)
- return;
-
- if (!d->dict)
- d->dict = dict_new();
- else
- {
- dict_free(d->dict);
- d->dict = dict_new();
- }
-
- if (d->expr_init)
- {
- expr_free(d->expr_init);
- d->expr_init = NULL;
- }
-
- /* initialize */
- d->expr_init = expr_compile_string(opts[0].val.sval, d->dict);
-
- if (d->expr_init != NULL)
- {
- expr_execute(d->expr_init, d->dict);
- }
-
- d->expr_beat = expr_compile_string(opts[1].val.sval, d->dict);
- d->expr_frame = expr_compile_string(opts[2].val.sval, d->dict);
- d->expr_point = expr_compile_string(opts[3].val.sval, d->dict);
-
- d->vfield = g_malloc (sizeof(struct xform_vector)
-			 * d->width * d->height);
-
- make_table = TRUE;
- }
-
- if (*opts[2].val.sval != '\0' || pn_new_beat)
- make_table = TRUE;
-
- /* run the on-frame script. */
- if (make_table == TRUE)
- {
- if (d->expr_beat != NULL)
- expr_execute(d->expr_beat, d->dict);
-
- if (d->expr_frame != NULL)
- expr_execute(d->expr_frame, d->dict);
-
- for (j = 0; j < pn_image_data->height; j++)
- for (i = 0; i < pn_image_data->width; i++)
- {
- transform_func(d->vfield, i, j, d->expr_point, d->dict);
- }
- }
-
- apply_xform (d->vfield);
- pn_swap_surfaces ();
-}
-
-struct pn_actuator_desc builtin_xform_dynmovement =
-{
- "xform_dynmovement", "Dynamic Movement Transform",
- "A customizable blitter.",
- 0, xform_dynmovement_opts,
- xform_dynmovement_init, xform_dynmovement_cleanup, xform_dynmovement_exec
-};

audacious-plugins-2.5.3.tar.gz/src/projectm-1.0 Deleted

audacious-plugins-2.5.3.tar.gz/src/projectm-1.0/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/projectm-1.0/gtk_projectm_impl.cxx Deleted

@@ -1,336 +0,0 @@
-/*
- * gtk_projectm_impl.cxx: GTK+ ProjectM Implementation.
- * Copyright (c) 2008 William Pitcock <nenolod@sacredspiral.co.uk>
- * Portions copyright (c) 2004-2006 Peter Sperl
- *
- * This program is free software; you may distribute it under the terms
- * of the GNU General Public License; version 2.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <string>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkgl.h>
-
-#include "gtk_projectm_impl.h"
-
-#include <math.h>
-
-#include <libprojectM/projectM.hpp>
-#include <libprojectM/event.h>
-
-#include <GL/gl.h>
-#define CONFIG_FILE "/share/projectM/config.inp"
-
-// Forward declarations
-static std::string read_config();
-
-int SDLThreadWrapper(void *);
-void handle_playback_trigger(void *, void *);
-
-static void _gtk_projectm_realize_impl(GtkWidget *widget, gpointer data);
-static void unrealize_cb (GtkWidget * widget, struct _GtkProjectMPrivate * priv);
-static gboolean _gtk_projectm_redraw_impl(GtkWidget *widget);
-static gboolean _gtk_projectm_expose_impl(GtkWidget *widget, GdkEventExpose *event, gpointer data);
-static gboolean _gtk_projectm_configure_impl(GtkWidget *widget, GdkEventConfigure *event, gpointer data);
-static void _gtk_projectm_destroy_impl(GtkWidget *widget);
-
-struct _GtkProjectMPrivate {
- projectM *pm;
- GdkGLConfig *glconfig;
- GtkWidget *drawing_area;
- gint idle_id;
- GTimer *timer;
- gint frames;
-};
-
-extern "C" GtkWidget *
-gtk_projectm_new(void)
-{
- struct _GtkProjectMPrivate *priv = g_slice_new0(struct _GtkProjectMPrivate);
-
- gtk_gl_init(NULL, NULL);
-
- priv->glconfig = gdk_gl_config_new_by_mode((GdkGLConfigMode) (GDK_GL_MODE_RGBA | GDK_GL_MODE_DEPTH | GDK_GL_MODE_DOUBLE));
- if (!priv->glconfig)
- return NULL;
-
- priv->drawing_area = gtk_drawing_area_new();
- gtk_widget_set_size_request(priv->drawing_area, 512, 512);
- gtk_widget_set_gl_capability(priv->drawing_area, priv->glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE);
- gtk_widget_add_events(priv->drawing_area, GDK_VISIBILITY_NOTIFY_MASK);
-
- g_signal_connect_after(G_OBJECT(priv->drawing_area), "realize",
- G_CALLBACK(_gtk_projectm_realize_impl), priv);
- g_signal_connect (priv->drawing_area, "unrealize", (GCallback) unrealize_cb,
- priv);
- g_signal_connect(G_OBJECT(priv->drawing_area), "expose_event",
- G_CALLBACK(_gtk_projectm_expose_impl), priv);
- g_signal_connect(G_OBJECT(priv->drawing_area), "destroy",
- G_CALLBACK(_gtk_projectm_destroy_impl), priv);
-
- priv->timer = g_timer_new();
- priv->frames = 0;
-
- g_object_set_data(G_OBJECT(priv->drawing_area), "GtkProjectMPrivate", priv);
-
- return priv->drawing_area;
-}
-
-extern "C" void
-gtk_projectm_add_pcm_data(GtkWidget *widget, gint16 pcm_data[2][512])
-{
- struct _GtkProjectMPrivate *priv = (struct _GtkProjectMPrivate *) g_object_get_data(G_OBJECT(widget), "GtkProjectMPrivate");
-
- g_return_if_fail(priv != NULL);
-
- if (priv->pm != NULL)
- priv->pm->pcm()->addPCM16 (pcm_data);
-}
-
-extern "C" void
-gtk_projectm_toggle_preset_lock(GtkWidget *widget)
-{
- struct _GtkProjectMPrivate *priv = (struct _GtkProjectMPrivate *) g_object_get_data(G_OBJECT(widget), "GtkProjectMPrivate");
-
- g_return_if_fail(priv != NULL);
- g_return_if_fail(priv->pm != NULL);
-
- priv->pm->key_handler(PROJECTM_KEYDOWN, PROJECTM_K_l, PROJECTM_KMOD_LSHIFT);
-}
-
-extern "C" void
-gtk_projectm_preset_prev(GtkWidget *widget)
-{
- struct _GtkProjectMPrivate *priv = (struct _GtkProjectMPrivate *) g_object_get_data(G_OBJECT(widget), "GtkProjectMPrivate");
-
- g_return_if_fail(priv != NULL);
- g_return_if_fail(priv->pm != NULL);
-
- priv->pm->key_handler(PROJECTM_KEYDOWN, PROJECTM_K_p, PROJECTM_KMOD_LSHIFT);
-}
-
-extern "C" void
-gtk_projectm_preset_next(GtkWidget *widget)
-{
- struct _GtkProjectMPrivate *priv = (struct _GtkProjectMPrivate *) g_object_get_data(G_OBJECT(widget), "GtkProjectMPrivate");
-
- g_return_if_fail(priv != NULL);
- g_return_if_fail(priv->pm != NULL);
-
- priv->pm->key_handler(PROJECTM_KEYDOWN, PROJECTM_K_n, PROJECTM_KMOD_LSHIFT);
-}
-
-static void
-_gtk_projectm_realize_impl(GtkWidget *widget, gpointer data)
-{
- GdkGLContext *glcontext = gtk_widget_get_gl_context(widget);
- GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(widget);
- struct _GtkProjectMPrivate *priv = (struct _GtkProjectMPrivate *) data;
-
- if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
- return;
-
- std::string configFile = read_config();
- priv->pm = new projectM(configFile);
-
- priv->pm->projectM_resetGL(widget->allocation.width, widget->allocation.height);
-
- gdk_gl_drawable_swap_buffers(gldrawable);
- gdk_gl_drawable_gl_end(gldrawable);
-
- g_signal_connect(G_OBJECT(widget), "configure_event",
- G_CALLBACK(_gtk_projectm_configure_impl), priv);
-
- priv->idle_id = g_timeout_add (1000 / 30,
- (GSourceFunc) _gtk_projectm_redraw_impl,
- priv->drawing_area);
-}
-
-static void unrealize_cb (GtkWidget * widget, struct _GtkProjectMPrivate * priv)
-{
- if (priv->idle_id)
- {
- g_source_remove (priv->idle_id);
- priv->idle_id = 0;
- }
-
- if (priv->pm != NULL)
- {
- delete priv->pm;
- priv->pm = NULL;
- }
-}
-
-static gboolean
-_gtk_projectm_configure_impl(GtkWidget *widget, GdkEventConfigure *event, gpointer data)
-{
- GdkGLContext *glcontext = gtk_widget_get_gl_context(widget);
- GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(widget);
- struct _GtkProjectMPrivate *priv = (struct _GtkProjectMPrivate *) data;
-
- if (priv->pm == NULL)
- return FALSE;
-
- if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
- return FALSE;
-
- priv->pm->projectM_resetGL(widget->allocation.width, widget->allocation.height);
-
- gdk_gl_drawable_swap_buffers(gldrawable);
- gdk_gl_drawable_gl_end(gldrawable);
-
- return TRUE;
-}
-
-static gboolean
-_gtk_projectm_expose_impl(GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
- GdkGLContext *glcontext = gtk_widget_get_gl_context(widget);
- GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(widget);
- struct _GtkProjectMPrivate *priv = (struct _GtkProjectMPrivate *) data;
-
- if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
- return FALSE;
-
- priv->pm->renderFrame();
- priv->frames++;
-
- gdk_gl_drawable_swap_buffers(gldrawable);
- gdk_gl_drawable_gl_end(gldrawable);
-
- gdouble seconds = g_timer_elapsed (priv->timer, NULL);
- if (seconds >= 5.0)
- {
- gdouble fps = priv->frames / seconds;
- g_print ("%d frames in %6.3f seconds = %6.3f FPS\n", priv->frames, seconds, fps);
- g_timer_reset (priv->timer);
- priv->frames = 0;
- }
-
- return TRUE;
-}
-
-static gboolean
-_gtk_projectm_redraw_impl(GtkWidget *widget)
-{
- gdk_window_invalidate_rect(widget->window, &widget->allocation, FALSE);
-
- return TRUE;
-}
-
-static void
-_gtk_projectm_destroy_impl(GtkWidget *widget)
-{
- struct _GtkProjectMPrivate *priv = (struct _GtkProjectMPrivate *) g_object_get_data(G_OBJECT(widget), "GtkProjectMPrivate");
-
- if (priv->idle_id)
- g_source_remove(priv->idle_id);
-
- delete priv->pm;
- g_free(priv->timer);
- g_slice_free(struct _GtkProjectMPrivate, priv);
-}
-
-/********************************************************************************
- * XXX: This code is from projectM and still needs to be rewritten! *
- ********************************************************************************/
-static std::string read_config()
-{
-
-// int n;
-
- char num[512];
- FILE *in;
- FILE *out;
-
- char *home;
- char projectM_home[1024];
- char projectM_config[1024];
-
- strcpy(projectM_config, PROJECTM_PREFIX);
- strcpy(projectM_config + strlen(PROJECTM_PREFIX), CONFIG_FILE);
- projectM_config[strlen(PROJECTM_PREFIX) + strlen(CONFIG_FILE)] = '\0';
- //printf("dir:%s \n",projectM_config);
- home = getenv("HOME");
- strcpy(projectM_home, home);
- strcpy(projectM_home + strlen(home), "/.projectM/config.inp");
- projectM_home[strlen(home) + strlen("/.projectM/config.inp")] = '\0';
-
-
- if ((in = fopen(projectM_home, "r")) != 0)
- {
- //printf("reading ~/.projectM/config.inp \n");
- fclose(in);
- return std::string(projectM_home);
- }
- else
- {
- printf("trying to create ~/.projectM/config.inp \n");
-
- strcpy(projectM_home, home);
- strcpy(projectM_home + strlen(home), "/.projectM");
- projectM_home[strlen(home) + strlen("/.projectM")] = '\0';
- mkdir(projectM_home, 0755);
-
- strcpy(projectM_home, home);
- strcpy(projectM_home + strlen(home), "/.projectM/config.inp");
- projectM_home[strlen(home) + strlen("/.projectM/config.inp")] = '\0';
-
- if ((out = fopen(projectM_home, "w")) != 0)
- {
-
- if ((in = fopen(projectM_config, "r")) != 0)
- {
-
- while (fgets(num, 80, in) != NULL)
- {
- fputs(num, out);
- }
- fclose(in);
- fclose(out);
-
-
- if ((in = fopen(projectM_home, "r")) != 0)
- {
- printf("created ~/.projectM/config.inp successfully\n");
- fclose(in);
- return std::string(projectM_home);
- }
- else
- {
- printf("This shouldn't happen, using implementation defualts\n");
- abort();
- }
- }
- else
- {
- printf("Cannot find projectM default config, using implementation defaults\n");
- abort();
- }
- }
- else
- {
- printf("Cannot create ~/.projectM/config.inp, using default config file\n");
- if ((in = fopen(projectM_config, "r")) != 0)
- {
- printf("Successfully opened default config file\n");
- fclose(in);
- return std::string(projectM_config);
- }
- else
- {
- printf("Using implementation defaults, your system is really messed up, I'm suprised we even got this far\n");
- abort();
- }
- }
-
- }
-
- abort();
-}

audacious-plugins-2.5.3.tar.gz/src/projectm-1.0/gtk_projectm_impl.h Deleted

audacious-plugins-2.5.3.tar.gz/src/projectm-1.0/main.c Deleted

@@ -1,49 +0,0 @@
-/*
- * main.cxx: plugin glue to libprojectm
- * Copyright (c) 2008 William Pitcock <nenolod@sacredspiral.co.uk>
- *
- * This program is free software; you may distribute it under the terms
- * of the GNU General Public License; version 2.
- */
-
-#include "config.h"
-
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
-
-#include "gtk_projectm_impl.h"
-
-static GtkWidget *projectm = NULL;
-
-void /* GtkWidget */ *
-projectM_get_widget(void)
-{
- if (projectm == NULL)
- {
- projectm = gtk_projectm_new ();
- g_signal_connect (projectm, "destroy", (GCallback) gtk_widget_destroyed,
- & projectm);
- }
-
- return projectm;
-}
-
-void
-projectM_render_pcm(gint16 pcm_data[2][512])
-{
- g_return_if_fail(projectm != NULL);
-
- gtk_projectm_add_pcm_data(projectm, pcm_data);
-}
-
-VisPlugin projectM_vtable = {
- .description = "projectM",
- .num_pcm_chs_wanted = 2,
- .render_pcm = projectM_render_pcm,
- .get_widget = projectM_get_widget,
-};
-
-VisPlugin *projectM_vplist[] = { &projectM_vtable, NULL };
-
-DECLARE_PLUGIN(projectm, NULL, NULL, NULL, NULL, NULL, NULL,
- projectM_vplist, NULL);

audacious-plugins-2.5.3.tar.gz/src/skins/debug.h Deleted

@@ -1,44 +0,0 @@
-#ifndef DEBUG_H
-#define DEBUG_H
-
-#include <glib.h>
-
-#ifdef NDEBUG
-
-/* void REQUIRE_LOCK(GMutex *m); */
-# define REQUIRE_LOCK(m)
-
-/* void REQUIRE_STR_UTF8(const gchar *str); */
-# define REQUIRE_STR_UTF8(str)
-
-/* void REQUIRE_STATIC_LOCK(GStaticMutex *m); */
-# define REQUIRE_STATIC_LOCK(m)
-
-#else /* !NDEBUG */
-
-/* void REQUIRE_LOCK(GMutex *m); */
-# define REQUIRE_LOCK(m) G_STMT_START { \
- if (g_mutex_trylock(m)) { \
- g_critical(G_STRLOC ": Mutex not locked!"); \
- g_mutex_unlock(m); \
- } \
- } G_STMT_END
-
-/* void REQUIRE_STATIC_LOCK(GStaticMutex *m); */
-# define REQUIRE_STATIC_LOCK(m) G_STMT_START { \
- if (G_TRYLOCK(m)) { \
- g_critical(G_STRLOC ": Mutex not locked!"); \
- G_UNLOCK(m); \
- } \
- } G_STMT_END
-
-/* void REQUIRE_STR_UTF8(const gchar *str); */
-# define REQUIRE_STR_UTF8(str) G_STMT_START { \
- if (!g_utf_validate(str, -1, NULL)) \
- g_warning(G_STRLOC ": String is not UTF-8!"); \
- } G_STMT_END
-
-#endif /* NDEBUG */
-
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/skins/dnd.c Deleted

@@ -1,34 +0,0 @@
-/* Audacious
- * Copyright (C) 2005-2007 Audacious development team.
- *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS 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 "dnd.h"
-
-void
-aud_drag_dest_set(GtkWidget *widget)
-{
- gtk_drag_dest_set(widget, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
-					 aud_drop_types, 5,
- GDK_ACTION_COPY | GDK_ACTION_MOVE);
-}

audacious-plugins-2.5.3.tar.gz/src/skins/pixbuf_effects.c Deleted

@@ -1,88 +0,0 @@
-/*
- * Audacious
- * Copyright (c) 2006-2007 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 <glib.h>
-
-#include "platform/smartinclude.h"
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-static GdkPixbuf *
-create_new_pixbuf (GdkPixbuf *src)
-{
- g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
- g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
- && gdk_pixbuf_get_n_channels (src) == 3)
- || (gdk_pixbuf_get_has_alpha (src)
- && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-
- return gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src),
- gdk_pixbuf_get_has_alpha (src),
- gdk_pixbuf_get_bits_per_sample (src),
- gdk_pixbuf_get_width (src),
- gdk_pixbuf_get_height (src));
-}
-
-GdkPixbuf *
-audacious_create_colorized_pixbuf (GdkPixbuf *src,
- int red_value,
- int green_value,
- int blue_value)
-{
- int i, j;
- int width, height, has_alpha, src_row_stride, dst_row_stride;
- guchar *target_pixels;
- guchar *original_pixels;
- guchar *pixsrc;
- guchar *pixdest;
- GdkPixbuf *dest;
-
- g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
- g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
- && gdk_pixbuf_get_n_channels (src) == 3)
- || (gdk_pixbuf_get_has_alpha (src)
- && gdk_pixbuf_get_n_channels (src) == 4), NULL);
- g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
-
- dest = create_new_pixbuf (src);
-
- has_alpha = gdk_pixbuf_get_has_alpha (src);
- width = gdk_pixbuf_get_width (src);
- height = gdk_pixbuf_get_height (src);
- src_row_stride = gdk_pixbuf_get_rowstride (src);
- dst_row_stride = gdk_pixbuf_get_rowstride (dest);
- target_pixels = gdk_pixbuf_get_pixels (dest);
- original_pixels = gdk_pixbuf_get_pixels (src);
-
- for (i = 0; i < height; i++) {
- pixdest = target_pixels + i*dst_row_stride;
- pixsrc = original_pixels + i*src_row_stride;
- for (j = 0; j < width; j++) {
- *pixdest++ = (*pixsrc++ * red_value) >> 8;
- *pixdest++ = (*pixsrc++ * green_value) >> 8;
- *pixdest++ = (*pixsrc++ * blue_value) >> 8;
- if (has_alpha) {
- *pixdest++ = *pixsrc++;
- }
- }
- }
- return dest;
-}
-

audacious-plugins-2.5.3.tar.gz/src/skins/ui/carbon-menubar.ui Deleted

@@ -1,122 +0,0 @@
-<?xml version="1.0" standalone="yes" encoding="utf-8" ?>
-
-<ui>
-	<menubar name="carbon-menubar">
-		<menu action="dummy" name="main-menu">
-			<menu action="file">
-				<menuitem action="play file" />
-				<menuitem action="play location" />
- 			<separator />
-				<menuitem action="preferences" />
-				<menuitem action="quit" />
-			</menu>
-			<menu action="playback">
-				<menuitem action="playback repeat" />
-				<menuitem action="playback shuffle" />
-				<menuitem action="playback no playlist advance" />
-				<menuitem action="stop after current song" />
-				<separator />
-				<menuitem action="playback play" />
-				<menuitem action="playback pause" />
-				<menuitem action="playback stop" />
-				<menuitem action="playback previous" />
-				<menuitem action="playback next" />
-				<separator />
-				<menuitem action="jump to playlist start" />
-				<separator />
-				<menuitem action="ab set" />
-				<menuitem action="ab clear" />
-				<separator />
-				<menuitem action="jump to file" />
-				<menuitem action="jump to time" />
-				<separator />
-				<menuitem action="current track info" />
-			</menu>
-			<menu action="playlist">
-				<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 default" />
-				<separator />
-				<menuitem action="playlist manager" />
-				<separator />
-				<menuitem action="playlist refresh" />
-				<separator />
-
-			</menu>
-			<menu action="view">
-				<menuitem action="show player" />
-				<menuitem action="show playlist editor" />
-				<menuitem action="show equalizer" />
-				<separator />
-				<menuitem action="view time elapsed" />
-				<menuitem action="view time remaining" />
-				<separator />
-				<menuitem action="view always on top" />
-				<menuitem action="view put on all workspaces" />
-				<menuitem action="autoscroll songname" />
-				<separator />
-				<menuitem action="roll up player" />
-				<menuitem action="roll up playlist editor" />
-				<menuitem action="roll up equalizer" />
-				<separator />
-				<menuitem action="view scaled" />
-				<menuitem action="view easy move" />
-			</menu>
-			<menu action="visualization">
-				<menu action="vismode">
-					<menuitem action="vismode analyzer" />
-					<menuitem action="vismode scope" />
-					<menuitem action="vismode voiceprint" />
-					<menuitem action="vismode off" />
-				</menu>
-				<menu action="anamode">
-					<menuitem action="anamode normal" />
-					<menuitem action="anamode fire" />
-					<menuitem action="anamode vertical lines" />
-					<separator />
-					<menuitem action="anatype lines" />
-					<menuitem action="anatype bars" />
-					<separator />
-					<menuitem action="anamode peaks" />
-				</menu>
-				<menu action="scomode">
-					<menuitem action="scomode dot" />
-					<menuitem action="scomode line" />
-					<menuitem action="scomode solid" />
-				</menu>
-				<menu action="vprmode">
-					<menuitem action="vprmode normal" />
-					<menuitem action="vprmode fire" />
-					<menuitem action="vprmode ice" />
-				</menu>
-				<menu action="wshmode">
-					<menuitem action="wshmode normal" />
-					<menuitem action="wshmode smooth" />
-				</menu>
-				<menu action="anafoff">
-					<menuitem action="anafoff slowest" />
-					<menuitem action="anafoff slow" />
-					<menuitem action="anafoff medium" />
-					<menuitem action="anafoff fast" />
-					<menuitem action="anafoff fastest" />
-				</menu>
-				<menu action="peafoff">
-					<menuitem action="peafoff slowest" />
-					<menuitem action="peafoff slow" />
-					<menuitem action="peafoff medium" />
-					<menuitem action="peafoff fast" />
-					<menuitem action="peafoff fastest" />
-				</menu>
-			</menu>
-			<menu action="help">
-				<menuitem action="about audacious" />
-			</menu>
-		</menu>
-	</menubar>
-</ui>

audacious-plugins-2.5.3.tar.gz/src/skins/ui_playlist_evlisteners.c Deleted

@@ -1,42 +0,0 @@
-/*
- * Audacious
- * Copyright (c) 2006-2007 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 <glib.h>
-#include <libaudcore/hook.h>
-
-#include "ui_playlist.h"
-#include "ui_playlist_evlisteners.h"
-
-static void
-ui_playlist_evlistener_playlistwin_show(gpointer hook_data, gpointer user_data)
-{
- gboolean *show = (gboolean*)hook_data;
- playlistwin_show (* show);
-}
-
-void ui_playlist_evlistener_init(void)
-{
- hook_associate("playlistwin show", ui_playlist_evlistener_playlistwin_show, NULL);
-}
-
-void ui_playlist_evlistener_dissociate(void)
-{
- hook_dissociate("playlistwin show", ui_playlist_evlistener_playlistwin_show);
-}

audacious-plugins-2.5.3.tar.gz/src/skins/ui_playlist_evlisteners.h Deleted

@@ -1,27 +0,0 @@
-/*
- * Audacious
- * Copyright (c) 2006-2007 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 AUDACIOUS_UI_PLAYLIST_EVLISTENERS_H
-#define AUDACIOUS_UI_PLAYLIST_EVLISTENERS_H
-
-void ui_playlist_evlistener_init(void);
-void ui_playlist_evlistener_dissociate(void);
-
-#endif /* AUDACIOUS_UI_PLAYLIST_EVLISTENERS_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_svis.h Deleted

@@ -1,63 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 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 UISVIS_H
-#define UISVIS_H
-
-#include <gtk/gtk.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UI_SVIS(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_svis_get_type (), UiSVis)
-#define UI_SVIS_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_svis_get_type (), UiSVisClass)
-#define UI_IS_SVIS(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_svis_get_type ())
-
-typedef struct _UiSVis UiSVis;
-typedef struct _UiSVisClass UiSVisClass;
-
-struct _UiSVis {
- GtkWidget widget;
-
- gint x, y, width, height;
- gint data[75];
- gint refresh_delay;
- gboolean scaled;
- GtkWidget *fixed;
- gboolean visible_window;
- GdkWindow *event_window;
-};
-
-struct _UiSVisClass {
- GtkWidgetClass parent_class;
- void (* scaled) (UiSVis *vis);
-};
-
-GtkWidget* ui_svis_new (GtkWidget *fixed, gint x, gint y);
-GType ui_svis_get_type(void);
-void ui_svis_clear_data(GtkWidget *widget);
-void ui_svis_timeout_func(GtkWidget *widget, guchar * data);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

audacious-plugins-2.5.3.tar.gz/src/spectrum Deleted

audacious-plugins-2.5.3.tar.gz/src/spectrum/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/spectrum/logo.xpm Deleted

@@ -1,123 +0,0 @@
-/* XPM */
-static char * logo_xpm[] = {
-"275 116 4 1",
-" 	c #F9E0D7",
-".	c #F0B19B",
-"+	c #EA9172",
-"@	c #E16236",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"                        ........................++++++++++++++++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};

audacious-plugins-2.5.3.tar.gz/src/spectrum/spectrum.c Deleted

@@ -1,225 +0,0 @@
-/* Spectrum Analyzer Visualization Plugin for Audacious
- *
- * Copyright (C) 2006 William Pitcock
- * Copyright (C) 1998-2001 V�gv�lgyi Attila, Peter Alm, Mikael Alm,
- * Olle Hallnas, Thomas Nilsson and 4Front Technologies
- *
- * 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 "config.h"
-
-#include <gtk/gtk.h>
-#include <math.h>
-
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
-#include <audacious/plugins.h>
-
-#include "logo.xpm"
-
-/* WIDTH should be kept 256, this is the hardwired resolution of the
- spectrum given by XMMS */
-#define WIDTH 256
-
-/* HEIGHT can be modified at your pleasure */
-#define HEIGHT 128
-
-/* Linearity of the amplitude scale (0.5 for linear, keep in [0.1, 0.9]) */
-#define d 0.33
-
-/* Time factor of the band dinamics. 3 means that the coefficient of the
- last value is half of the current one's. (see source) */
-#define tau 3
-
-/* Factor used for the diffusion. 4 means that half of the height is
- added to the neighbouring bars */
-#define dif 4
-
-static GtkWidget *window = NULL,*area;
-static GdkPixmap *bg_pixmap = NULL, *draw_pixmap = NULL, *bar = NULL;
-static GdkGC *gc = NULL;
-static gint16 bar_heights[WIDTH];
-/*static gint timeout_tag;*/
-static gdouble scale, x00, y00;
-
-static gboolean fsanalyzer_init (void);
-static void fsanalyzer_cleanup(void);
-static void fsanalyzer_playback_start(void);
-static void fsanalyzer_playback_stop(void);
-static void fsanalyzer_render_freq(gint16 data[2][256]);
-
-VisPlugin fsanalyzer_vp = {
-	.description = "Spectrum Analyzer",
-	.num_pcm_chs_wanted = 0,
-	.num_freq_chs_wanted = 1,
-	.init = fsanalyzer_init, /* init */
-	.cleanup = fsanalyzer_cleanup, /* cleanup */
-	.playback_start = fsanalyzer_playback_start, /* playback_start */
-	.playback_stop = fsanalyzer_playback_stop, /* playback_stop */
-	.render_freq = fsanalyzer_render_freq /* render_freq */
-};
-
-VisPlugin *spectrum_vplist[] = { &fsanalyzer_vp, NULL };
-
-DECLARE_PLUGIN(spectrum, NULL, NULL, NULL, NULL, NULL, NULL, spectrum_vplist,NULL);
-
-static void fsanalyzer_destroy_cb (void)
-{
-	aud_plugin_enable (aud_plugin_by_header (& fsanalyzer_vp), FALSE);
-}
-
-static gboolean fsanalyzer_init (void)
-{
-	GdkColor color;
-	int i;
-
-	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title(GTK_WINDOW(window), _("Spectrum Analyzer"));
-	gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
-	gtk_widget_realize(window);
-	bg_pixmap = gdk_pixmap_create_from_xpm_d(window->window,NULL,NULL,logo_xpm);
-	gdk_window_set_back_pixmap(window->window,bg_pixmap,0);
-	g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(fsanalyzer_destroy_cb),NULL);
-	g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_widget_destroyed), &window);
-	gtk_widget_set_size_request(GTK_WIDGET(window), WIDTH, HEIGHT);
-	gc = gdk_gc_new(window->window);
-	draw_pixmap = gdk_pixmap_new(window->window,WIDTH,HEIGHT,gdk_rgb_get_visual()->depth);
-
-	bar = gdk_pixmap_new(window->window,25, HEIGHT, gdk_rgb_get_visual()->depth);
-	for(i = 0; i < HEIGHT / 2; i++) {
-		color.red = 0xFFFF;
-		color.green = ((i * 255) / (HEIGHT / 2)) << 8;
-		color.blue = 0;
-
-		gdk_color_alloc(gdk_colormap_get_system(),&color);
-		gdk_gc_set_foreground(gc,&color);
-		gdk_draw_line(bar,gc,0,i,24,i);
-	}
-	for(i = 0; i < HEIGHT / 2; i++) {
-		color.red = (255 - ((i * 255) / (HEIGHT / 2))) <<8;
-		color.green = 0xFFFF;
-		color.blue = 0;
-
-		gdk_color_alloc(gdk_colormap_get_system(),&color);
-		gdk_gc_set_foreground(gc,&color);
-		gdk_draw_line(bar,gc,0,i + (HEIGHT / 2),24,i + (HEIGHT / 2));
-	}
-
-	scale = HEIGHT / ( log((1 - d) / d) * 2 );
-	x00 = d*d*32768.0/(2 * d - 1);
-	y00 = -log(-x00) * scale;
-
-/* d=0.2, HEIGHT=128
-	scale = 46.1662413084;
-	x00 = -2184.53333333;
-	y00 = -354.979500941;
-*/
-
-	gdk_color_black(gdk_colormap_get_system(),&color);
-	gdk_gc_set_foreground(gc,&color);
-
-	area = gtk_drawing_area_new();
-	gtk_container_add(GTK_CONTAINER(window),area);
-	gtk_widget_realize(area);
-	gdk_window_set_back_pixmap(area->window,bg_pixmap,0);
-
-	gtk_widget_show(area);
-	gtk_widget_show(window);
-	gdk_window_clear(window->window);
-	gdk_window_clear(area->window);
-
-	return TRUE;
-}
-
-static void fsanalyzer_cleanup(void) {
-	if(window) {
-		gtk_widget_destroy(window);
-	}
-	if(gc) {
-		gdk_gc_unref(gc);
-		gc = NULL;
-	}
-	if(bg_pixmap) {
-		gdk_pixmap_unref(bg_pixmap);
-		bg_pixmap = NULL;
-	}
-	if(draw_pixmap) {
-		gdk_pixmap_unref(draw_pixmap);
-		draw_pixmap = NULL;
-	}
-	if(bar) {
-		gdk_pixmap_unref(bar);
-		bar = NULL;
-	}
-}
-
-static gint draw_func(gpointer data) {
-	gint i;
-
-	/* FIXME: should allow spare redrawing like the vis. in the main window */
-	if(!window) {
-/*		timeout_tag = 0;*/
-		return FALSE;
-	}
-
-	GDK_THREADS_ENTER();
-	gdk_draw_rectangle(draw_pixmap, gc, TRUE, 0, 0, WIDTH, HEIGHT);
-
-	for(i = 0; i < WIDTH; i++)
-		gdk_draw_pixmap(draw_pixmap, gc, bar, 0, HEIGHT-1-bar_heights[i], i, HEIGHT-1-bar_heights[i], 1, bar_heights[i]);
-
-	gdk_window_clear(area->window);
-	GDK_THREADS_LEAVE();
-
-	return TRUE;
-}
-
-static void fsanalyzer_playback_start(void) {
-	if(window) {
-		gdk_window_set_back_pixmap(area->window,draw_pixmap,0);
-		gdk_window_clear(area->window);
-	}
-}
-
-
-static void fsanalyzer_playback_stop(void) {
-	if(GTK_WIDGET_REALIZED(area)) {
-		gdk_window_set_back_pixmap(area->window,bg_pixmap,0);
-		gdk_window_clear(area->window);
-	}
-}
-
-static void fsanalyzer_render_freq(gint16 data[2][256]) {
-	gint i;
-	gdouble y;
-
-	if(!window)
-		return;
-
-	/* FIXME: can anything taken out of the main thread? */
-	for (i = 0; i < WIDTH; i++) {
-		y = (gdouble)data[0][i] * (i + 1); /* Compensating the energy */
-		y = ( log(y - x00) * scale + y00 ); /* Logarithmic amplitude */
-
-		y = ( (dif-2)*y + /* FIXME: conditionals should be rolled out of the loop */
-			(i==0 ? y : bar_heights[i-1]) +
-			(i==WIDTH-1 ? y : bar_heights[i+1])) / dif; /* Add some diffusion */
-		y = ((tau-1)*bar_heights[i] + y) / tau; /* Add some dynamics */
-		bar_heights[i] = (gint16)y;
-	}
-	draw_func(NULL);
-	return;
-}

audacious-plugins-2.5.3.tar.gz/src/streambrowser Deleted

audacious-plugins-2.5.3.tar.gz/src/streambrowser/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/streambrowser/bookmarks.c Deleted

@@ -1,177 +0,0 @@
-/*
- * 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-2.5.3.tar.gz/src/streambrowser/bookmarks.h Deleted

@@ -1,52 +0,0 @@
-/*
- * 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-2.5.3.tar.gz/src/streambrowser/gui Deleted

audacious-plugins-2.5.3.tar.gz/src/streambrowser/gui/streambrowser_win.c Deleted

@@ -1,645 +0,0 @@
-
-#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, GtkNotebookPage *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)
-{
-	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;
-}
-
-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, new_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, &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_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, GtkNotebookPage *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_Return || event->keyval == GDK_KP_Enter) {
-		on_add_button_clicked(GTK_BUTTON(add_button), NULL);
-		return TRUE;
-	}
-
-	if (event->keyval == GDK_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_Down || event->keyval == GDK_Up)
-		return FALSE;
-	else
-		if (event->keyval == GDK_Return || event->keyval == GDK_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-2.5.3.tar.gz/src/streambrowser/gui/streambrowser_win.h Deleted

audacious-plugins-2.5.3.tar.gz/src/streambrowser/images Deleted

audacious-plugins-2.5.3.tar.gz/src/streambrowser/images/bookmarks.png Deleted

audacious-plugins-2.5.3.tar.gz/src/streambrowser/images/shoutcast.png Deleted

audacious-plugins-2.5.3.tar.gz/src/streambrowser/images/streambrowser-16x16.png Deleted

audacious-plugins-2.5.3.tar.gz/src/streambrowser/images/streambrowser-64x64.png Deleted

audacious-plugins-2.5.3.tar.gz/src/streambrowser/images/streambrowser.svg Deleted

@@ -1,251 +0,0 @@
-<?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-2.5.3.tar.gz/src/streambrowser/images/xiph.png Deleted

audacious-plugins-2.5.3.tar.gz/src/streambrowser/shoutcast.c Deleted

@@ -1,290 +0,0 @@
-/*
- * 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' 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;
- }
-
- /* 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-2.5.3.tar.gz/src/streambrowser/shoutcast.h Deleted

@@ -1,40 +0,0 @@
-/*
- * 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://classic.shoutcast.com/sbin/newxml.phtml"
-#define SHOUTCAST_CATEGORY_URL		"http://classic.shoutcast.com/sbin/newxml.phtml?genre=%s"
-#define SHOUTCAST_STREAMINFO_URL	"http://classic.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-2.5.3.tar.gz/src/streambrowser/streambrowser.c Deleted

@@ -1,739 +0,0 @@
-/*
- * 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;
-
-streambrowser_cfg_t streambrowser_cfg;
-
-GtkWidget *sb_gui_widget = NULL;
-
-static gpointer sb_widget ()
-{
-	return sb_gui_widget;
-}
-
-static GeneralPlugin sb_plugin =
-{
- .description = "Stream Browser",
- .init = sb_init,
- .about = sb_about,
- .configure = sb_configure,
- .cleanup = sb_cleanup,
- .get_widget = sb_widget,
-};
-
-GeneralPlugin *sb_gplist[] =
-{
- &sb_plugin,
- NULL
-};
-
-SIMPLE_GENERAL_PLUGIN (streambrowser, sb_gplist);
-
-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)
-{
- /* Preload http:// transport for access from secondary thread */
- vfs_prepare ("http");
-
- 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 ();
-
- AUDDBG("gui initialized\n");
-
- streamdir_update (NULL, NULL, NULL, FALSE);
-}
-
-static void gui_done ()
-{
- /* others */
- if (update_thread_mutex)
- g_mutex_free (update_thread_mutex);
- update_thread_mutex = NULL;
- if (update_thread_data_queue)
- g_queue_free (update_thread_data_queue);
- update_thread_data_queue = 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
- {
- 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");
-
- /* try to get the last item in the queue, but don't remove it */
- 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_peek_head (update_thread_data_queue);
- }
- g_mutex_unlock (update_thread_mutex);
-
- /* repetitively process the queue elements, until queue is empty */
- while (data != NULL && g_queue_get_length (update_thread_data_queue) > 0)
- {
- if (data->streamdir && !streamdir_is_valid(data->streamdir)) {
- g_free(data);
- g_mutex_lock(update_thread_mutex);
- /* remove the just processed data from the queue */
- g_queue_pop_head(update_thread_data_queue);
- /* try to get the last item in the queue */
- if (g_queue_get_length(update_thread_data_queue) > 0)
- data = g_queue_peek_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)
- {
- shoutcast_streaminfo_fetch (data->category,
- data->streaminfo);
- }
- /* xiph */
- else if (strncmp
- (data->streamdir->name, XIPH_NAME,
- strlen (XIPH_NAME)) == 0)
- {
- xiph_streaminfo_fetch (data->category, data->streaminfo);
- }
- /* bookmarks */
- else if (strncmp
- (data->streamdir->name, BOOKMARKS_NAME,
- strlen (BOOKMARKS_NAME)) == 0)
- {
- bookmarks_streaminfo_fetch (data->category,
- data->streaminfo);
- }
- }
-
- 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)
- {
- shoutcast_category_fetch (data->streamdir, data->category);
- }
- /* xiph */
- else if (strncmp
- (data->streamdir->name, XIPH_NAME,
- strlen (XIPH_NAME)) == 0)
- {
- xiph_category_fetch (data->streamdir, data->category);
- }
- /* bookmarks */
- else if (strncmp
- (data->streamdir->name, BOOKMARKS_NAME,
- strlen (BOOKMARKS_NAME)) == 0)
- {
- bookmarks_category_fetch (data->streamdir, data->category);
- }
-
- 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)
- {
- streamdir_t *streamdir = shoutcast_streamdir_fetch ();
- 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)
- {
- streamdir_t *streamdir = xiph_streamdir_fetch ();
- 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)
- {
- streamdir_t *streamdir =
- bookmarks_streamdir_fetch (&streambrowser_cfg.bookmarks,
- &streambrowser_cfg.bookmarks_count);
- 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 */
- streamdir_t *streamdir = shoutcast_streamdir_fetch ();
- if (streamdir != NULL)
- {
- gdk_threads_enter ();
- if (sb_gui_widget)
- streambrowser_win_set_streamdir (streamdir, SHOUTCAST_ICON);
- gdk_threads_leave ();
- }
- /* xiph */
- streamdir = xiph_streamdir_fetch ();
- if (streamdir != NULL)
- {
- gdk_threads_enter ();
- if (sb_gui_widget)
- streambrowser_win_set_streamdir (streamdir, XIPH_ICON);
- gdk_threads_leave ();
- }
- /* bookmarks */
- streamdir =
- bookmarks_streamdir_fetch (&streambrowser_cfg.bookmarks,
- &streambrowser_cfg.bookmarks_count);
- 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);
-
- g_mutex_lock (update_thread_mutex);
-
- /* remove the just processed data from the queue */
- g_queue_pop_head (update_thread_data_queue);
-
- /* try to get the last item in the queue */
- if (g_queue_get_length (update_thread_data_queue) > 0)
- data = g_queue_peek_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_insert_playlist (playlist, -1, uri_name);
- 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);
- AUDDBG("stream '%s' added\n", streaminfo->url);
- }
-
-DONE:
- g_free (unix_name);
- g_free (uri_name);
-}

audacious-plugins-2.5.3.tar.gz/src/streambrowser/streambrowser.h Deleted

@@ -1,47 +0,0 @@
-/*
- * 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);
-
-
-#endif // STREAMBROWSER_H

audacious-plugins-2.5.3.tar.gz/src/streambrowser/streamdir.c Deleted

@@ -1,187 +0,0 @@
-/*
- * 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-2.5.3.tar.gz/src/streambrowser/streamdir.h Deleted

@@ -1,77 +0,0 @@
-/*
- * 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-2.5.3.tar.gz/src/streambrowser/xiph.c Deleted

@@ -1,304 +0,0 @@
-/*
- * 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&amp;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-2.5.3.tar.gz/src/streambrowser/xiph.h Deleted

@@ -1,38 +0,0 @@
-/*
- * 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-2.5.3.tar.gz/src/wininet Deleted

audacious-plugins-2.5.3.tar.gz/src/wininet/Makefile Deleted

audacious-plugins-2.5.3.tar.gz/src/wininet/inet.c Deleted

@@ -1,362 +0,0 @@
-/*
- * WinINet Transport Plugin for Audacious
- * Copyright 2010 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 <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <glib.h>
-#include <wininet.h>
-
-#include <audacious/debug.h>
-#include <audacious/plugin.h>
-
-#define MAGIC ('I' | ('N' << 8) | ('E' << 16) | ('T' << 24))
-#define NO_SIZE_YET (-2)
-#define BUFSIZE 16384
-
-#define error(...) printf ("inet: " __VA_ARGS__)
-
-typedef struct {
- VFSFile v;
- int magic;
- HINTERNET h;
- int64_t size, pos;
- int ungotten;
- unsigned char buf[BUFSIZE];
- int bufstart, buflen;
-} InetFile;
-
-static HINTERNET sess = NULL;
-
-static VFSFile * inet_fopen (const char * uri, const char * mode)
-{
- if (! sess)
- {
- AUDDBG ("Connecting ...\n");
- sess = InternetOpen ("", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0);
- if (! sess)
- {
- error ("Failed to connect (code %d).\n", (int) GetLastError ());
- return NULL;
- }
- }
-
- AUDDBG ("fopen %s, mode = %s\n", uri, mode);
-
- if (mode[0] != 'r' || strchr (mode, '+'))
- {
- error ("Unsupported file mode: %s\n", mode);
- return NULL;
- }
-
- InetFile * file = g_malloc0 (sizeof (InetFile));
- file->magic = MAGIC;
-
- file->h = InternetOpenUrl (sess, uri, NULL, 0, INTERNET_FLAG_RELOAD, 0);
- if (! file->h)
- {
- error ("Failed to open %s (code %d).\n", uri, (int) GetLastError ());
- g_free (file);
- return NULL;
- }
-
- file->size = NO_SIZE_YET;
- file->pos = 0;
- file->ungotten = EOF;
- file->bufstart = 0;
- file->buflen = 0;
-
- AUDDBG (" = %p\n", file);
- return (VFSFile *) file;
-}
-
-static int inet_fclose (VFSFile * _file)
-{
- InetFile * file = (InetFile *) _file;
- assert (file->magic == MAGIC);
-
- AUDDBG ("[%p] fclose\n", file);
- InternetCloseHandle (file->h);
-
- memset ((unsigned char *) file + sizeof (VFSFile), 0,
- sizeof (InetFile) - sizeof (VFSFile));
- return 0;
-}
-
-static char fill_buf (InetFile * file)
-{
- if (file->buflen > 0)
- return 1;
-
- file->bufstart = 0;
-
- DWORD readed = 0;
- if (! InternetReadFile (file->h, file->buf, BUFSIZE, & readed))
- {
- error ("Read error (code %d).\n", (int) GetLastError ());
- return 0;
- }
- if (! readed)
- {
- AUDDBG ("[%p] End of file reached.\n", file);
- return 0;
- }
-
- file->buflen = readed;
- return 1;
-}
-
-static int64_t inet_fread (void * _buf, int64_t size, int64_t items,
- VFSFile * _file)
-{
- unsigned char * buf = _buf;
- InetFile * file = (InetFile *) _file;
- assert (file->magic == MAGIC);
-
-/* AUDDBG ("[%p] fread %d\n", file, (int) (size * items)); */
- int64_t goal = size * items;
- int64_t total = 0;
-
- while (total < goal)
- {
- if (file->ungotten != EOF)
- {
- buf[total ++] = file->ungotten;
- file->ungotten = EOF;
- }
- else if (file->buflen > goal - total)
- {
- memcpy (buf + total, file->buf + file->bufstart, goal - total);
- file->bufstart += goal - total;
- file->buflen -= goal - total;
- total = goal;
- }
- else if (file->buflen > 0)
- {
- memcpy (buf + total, file->buf + file->bufstart, file->buflen);
- total += file->buflen;
- file->buflen = 0;
- }
- else
- {
- if (! fill_buf (file))
- break;
- }
- }
-
-/* AUDDBG (" = %d\n", (int) total); */
- file->pos += total;
- return (size > 0) ? total / size : 0;
-}
-
-static int64_t inet_fwrite (const void * data, int64_t size, int64_t items,
- VFSFile * _file)
-{
- InetFile * file = (InetFile *) _file;
- assert (file->magic == MAGIC);
-
- error ("Writing is not supported.\n");
- return 0;
-}
-
-static void get_content_length (InetFile * file)
-{
- if (file->size != NO_SIZE_YET)
- return;
-
- char buf[32];
- DWORD buflen = sizeof buf - 1;
- DWORD index = 0;
- if (! HttpQueryInfo (file->h, HTTP_QUERY_CONTENT_LENGTH, buf, & buflen,
- & index))
- {
- int error = GetLastError ();
- if (error == ERROR_HTTP_HEADER_NOT_FOUND)
- AUDDBG ("[%p] Unknown content length.\n", file);
- else
- error ("HTTP_QUERY_CONTENT_LENGTH failed (code %d).\n", error);
-
- file->size = -1;
- return;
- }
-
- if (sscanf (buf, "%I64d", & file->size) != 1)
- {
- error ("Invalid content length.\n");
- file->size = -1;
- return;
- }
-}
-
-static int inet_fseek (VFSFile * _file, int64_t offset, int whence)
-{
- InetFile * file = (InetFile *) _file;
- assert (file->magic == MAGIC);
-
- AUDDBG ("[%p] fseek %d, whence = %d\n", file, (int) offset, whence);
-
- if (file->size == NO_SIZE_YET)
- get_content_length (file);
-
- if (file->size < 0)
- {
- error ("Attempt to seek in content of unknown length.\n");
- return -1;
- }
-
- if (whence == SEEK_SET)
- whence = FILE_BEGIN;
- else if (whence == SEEK_CUR)
- whence = FILE_CURRENT;
- else if (whence == SEEK_END)
- whence = FILE_END;
- else
- {
- error ("Invalid whence: %d.\n", whence);
- return -1;
- }
-
- file->ungotten = EOF;
- file->bufstart = 0;
- file->buflen = 0;
-
- long low = offset & 0xffffffff;
- long high = (offset >> 32) & 0xffffffff;
- low = InternetSetFilePointer (file->h, low, & high, whence, 0);
-
- if (low == INVALID_SET_FILE_POINTER) /* may be a valid return value! */
- {
- int error = GetLastError ();
- if (error != NO_ERROR)
- {
- error ("Seek error (code %d).\n", error);
- return -1;
- }
- }
-
- file->pos = (((int64_t) high & 0xffffffff) << 32) |
- ((int64_t) low & 0xffffffff);
- return 0;
-}
-
-static int64_t inet_ftell (VFSFile * _file)
-{
- InetFile * file = (InetFile *) _file;
- assert (file->magic == MAGIC);
- return file->pos;
-}
-
-static int inet_getc (VFSFile * file)
-{
- unsigned char c;
- return (inet_fread (& c, 1, 1, file) == 1) ? c : EOF;
-}
-
-static int inet_ungetc (int c, VFSFile * _file)
-{
- InetFile * file = (InetFile *) _file;
- assert (file->magic == MAGIC);
-
- if (file->ungotten != EOF)
- {
- error ("Too many ungetc's.\n");
- return EOF;
- }
-
- file->ungotten = c;
- return c;
-}
-
-static void inet_rewind (VFSFile * file)
-{
- inet_fseek (file, 0, SEEK_SET);
-}
-
-static int inet_feof (VFSFile * _file)
-{
- InetFile * file = (InetFile *) _file;
- assert (file->magic == MAGIC);
-
- if (file->ungotten != EOF || file->buflen > 0)
- return 0;
-
- return ! fill_buf (file);
-}
-
-static int inet_ftruncate (VFSFile * _file, int64_t length)
-{
- InetFile * file = (InetFile *) _file;
- assert (file->magic == MAGIC);
-
- error ("Writing is not supported.\n");
- return 0;
-}
-
-static int64_t inet_fsize (VFSFile * _file)
-{
- InetFile * file = (InetFile *) _file;
- assert (file->magic == MAGIC);
-
- AUDDBG ("[%p] fsize\n", file);
-
- if (file->size == NO_SIZE_YET)
- get_content_length (file);
-
- AUDDBG (" = %d\n", (int) file->size);
- return file->size;
-}
-
-void inet_cleanup (void)
-{
- if (sess)
- {
- InternetCloseHandle (sess);
- sess = NULL;
- }
-}
-
-static const char * const inet_schemes[] = {"http", "https", NULL};
-
-static VFSConstructor constructor = {
- .vfs_fopen_impl = inet_fopen,
- .vfs_fclose_impl = inet_fclose,
- .vfs_fread_impl = inet_fread,
- .vfs_fwrite_impl = inet_fwrite,
- .vfs_getc_impl = inet_getc,
- .vfs_ungetc_impl = inet_ungetc,
- .vfs_fseek_impl = inet_fseek,
- .vfs_rewind_impl = inet_rewind,
- .vfs_ftell_impl = inet_ftell,
- .vfs_feof_impl = inet_feof,
- .vfs_ftruncate_impl = inet_ftruncate,
- .vfs_fsize_impl = inet_fsize
-};
-
-static TransportPlugin inet_plugin = {
- .description = "WinINet-based HTTP/HTTPS support",
- .cleanup = inet_cleanup,
- .schemes = inet_schemes,
- .vtable = & constructor,
-};
-
-static TransportPlugin * const inet_plugins[] = {& inet_plugin, NULL};
-
-SIMPLE_TRANSPORT_PLUGIN (inet, inet_plugins)

audacious-plugins-2.5.3.tar.gz/AUTHORS -> audacious-plugins-3.0.tar.gz/AUTHORS Changed

@@ -1,19 +1,20 @@
-Audacious (C) GPL 2005-2008
+Audacious (C) GPL 2005-2009
 
 Authors listed alphabetically, by last name:
 --------------------------------------------
 
 George Averill <nhjm449@gmail.com>
+Kieran Clancy <clancy.kieran+audacious@gmail.com>
 Michael Färber <0102@gmx.at>
 Matti Hämäläinen <ccr@tnsp.org>
 Giacomo Lozito <james@develia.org>
-William Pitcock <nenolod@nenolod.net>
+Tomasz Moń <desowin@gmail.com>
+William Pitcock <nenolod@sacredspiral.co.uk>
 Derek Pomery <nemo@m8y.org>
 Mohammed Sameer <msameer@foolab.org>
 Jonathan Schleifer <js-audacious@webkeks.org>
-Andrew O. Shadoura <bugzilla@tut.by>
-Aaron Sheldon <asheldon at uiuc.edu>
 Stephen Sokolow <deitarion@gmail.com>
+Ben Tucker <ben@tucker.org>
 Tony Vroon <chainsaw@gentoo.org>
 Yoshiki Yazawa <yaz@cc.or.rim.jp>
 
@@ -21,7 +22,7 @@
 -----------
 
 Dutch - Tony Vroon
-Hungarian - Laszlo Dvornik
+Hungarian - Dvornik László
 German - Michael Hanselmann
 Matthias Debus
 Greek - Kouzinopoulos Haris
@@ -29,6 +30,8 @@
 Stathis Kamperis
 Italian - Diego Petteno
 Japanese - Dai
+Finnish - Pauli Virtanen
+ Matti Hämäläinen
 
 -
 
@@ -89,7 +92,7 @@
 Finnish - Pauli Virtanen <pauli.virtanen@hut.fi>
 French - David Le Brun <david@dyn-ns.net>
 Hindi - Dhananjaya Sharma <dysxhi@yahoo.co.in>
-Hungarian - Laszlo Dvornik <dvornik@gnome.hu>
+Hungarian - Dvornik László <dvornik@gnome.hu>
 Italian - Alessio D'Ascanio <otaku@fastwebnet.it>
 Japanese - Takeshi Aihana <aihana@gnome.gr.jp>
 Korean - DongCheon Park <dcpark@kaist.ac.kr>

audacious-plugins-2.5.3.tar.gz/GIT-Access -> audacious-plugins-3.0.tar.gz/GIT-Access Changed

audacious-plugins-2.5.3.tar.gz/acinclude.m4 -> audacious-plugins-3.0.tar.gz/acinclude.m4 Changed

audacious-plugins-2.5.3.tar.gz/aclocal.m4 -> audacious-plugins-3.0.tar.gz/aclocal.m4 Changed

audacious-plugins-2.5.3.tar.gz/buildsys.mk.in -> audacious-plugins-3.0.tar.gz/buildsys.mk.in Changed

@@ -1,5 +1,6 @@
 #
-# Copyright (c) 2007 - 2009, Jonathan Schleifer <js@webkeks.org>
+# Copyright (c) 2007, 2008, 2009, 2010, 2011
+# Jonathan Schleifer <js@webkeks.org>
 #
 # https://webkeks.org/hg/buildsys/
 #
@@ -63,6 +64,10 @@
 INSTALL = @INSTALL@
 SHELL = @SHELL@
 MSGFMT = @MSGFMT@
+JAVAC = @JAVAC@
+JAVACFLAGS = @JAVACFLAGS@
+JAR = @JAR@
+WINDRES = @WINDRES@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
@@ -82,11 +87,13 @@
 OBJS3 = ${OBJS2:.cxx=.o}
 OBJS4 = ${OBJS3:.d=.o}
 OBJS5 = ${OBJS4:.erl=.beam}
-OBJS6 = ${OBJS5:.m=.o}
-OBJS7 = ${OBJS6:.mm=.o}
-OBJS8 = ${OBJS7:.py=.pyc}
-OBJS9 = ${OBJS8:.xpm=.o}
-OBJS += ${OBJS9:.S=.o}
+OBJS6 = ${OBJS5:.java=.class}
+OBJS7 = ${OBJS6:.m=.o}
+OBJS8 = ${OBJS7:.mm=.o}
+OBJS9 = ${OBJS8:.py=.pyc}
+OBJS10 = ${OBJS9:.rc=.o}
+OBJS11 = ${OBJS10:.S=.o}
+OBJS += ${OBJS11:.xpm=.o}
 
 LIB_OBJS = ${OBJS:.o=.lib.o}
 PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
@@ -95,13 +102,13 @@
 
 .SILENT:
 .SUFFIXES:
-.SUFFIXES: .beam .c .c.dep .cc .cc.dep .cxx .cxx.dep .d .erl .lib.o .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .xpm .S .S.dep
+.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
 .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales
 
 all:
-	${MAKE} ${MFLAGS} subdirs || exit 1
-	${MAKE} ${MFLAGS} depend || exit 1
-	${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${LIB} ${LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} locales || exit 1
+	${MAKE} ${MFLAGS} subdirs
+	${MAKE} ${MFLAGS} depend
+	${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${LIB} ${LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
 
 subdirs:
 	for i in ${SUBDIRS}; do \
@@ -122,7 +129,7 @@
 				;; \
 		esac; \
 	done; \
-	if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \
+	if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
 		${DEPEND_STATUS}; \
 		if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \
 			rm -f $$deps; \
@@ -149,20 +156,29 @@
 		${LINK_FAILED}; \
 	fi
 
+${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS}
+	${LINK_STATUS}
+	if test x"${JAR_MANIFEST}" != x""; then \
+		if ${JAR} cfm ${JARFILE} ${JAR_MANIFEST} ${OBJS}; then \
+			${LINK_OK}; \
+		else \
+			${LINK_FAILED}; \
+		fi \
+	else \
+		if ${JAR} cf ${JARFILE} ${OBJS}; then \
+			${LINK_OK}; \
+		else \
+			${LINK_FAILED}; \
+		fi \
+	fi
+
 ${LIB} ${LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS}
-	case $@ in \
-		*.a) \
-			${MAKE} ${MFLAGS} STATIC_LIB=${LIB} LIB= $@ || exit 1 \
-			;; \
-		*) \
-			${LINK_STATUS}; \
-			if ${LD} -o $@ ${LIB_OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
-				${LINK_OK}; \
-			else \
-				${LINK_FAILED}; \
-			fi \
-			;; \
-	esac
+	${LINK_STATUS}; \
+	if ${LD} -o $@ ${LIB_OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
+		${LINK_OK}; \
+	else \
+		${LINK_FAILED}; \
+	fi \
 
 ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
 	${LINK_STATUS}
@@ -174,7 +190,44 @@
 
 ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS}
 	${LINK_STATUS}
-	if ${AR} cr $@ ${OBJS} && ${RANLIB} $@; then \
+	rm -f $@
+	objs=""; \
+	ars=""; \
+	for i in ${OBJS}; do \
+		case $$i in \
+			*.a) \
+				ars="$$ars $$i" \
+				;; \
+			*.o) \
+				objs="$$objs $$i" \
+				;; \
+		esac \
+	done; \
+	for i in $$ars; do \
+		dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
+		rm -fr $$dir; \
+		mkdir -p $$dir; \
+		cd $$dir; \
+		ar x ../$$i; \
+		for j in *.o; do \
+			objs="$$objs $$dir/$$j"; \
+		done; \
+		cd ..; \
+	done; \
+	if ${AR} cr $@ $$objs && ${RANLIB} $@; then \
+		${LINK_OK}; \
+	else \
+		${LINK_FAILED}; \
+		rm -f $@; \
+	fi; \
+	for i in $$ars; do \
+		dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
+		rm -fr $$dir; \
+	done
+
+${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS}
+	${LINK_STATUS}
+	if ${AR} cr $@ ${LIB_OBJS} && ${RANLIB} $@; then \
 		${LINK_OK}; \
 	else \
 		${LINK_FAILED}; \
@@ -251,6 +304,14 @@
 		${COMPILE_FAILED}; \
 	fi
 
+.java.class:
+	${COMPILE_STATUS}
+	if ${JAVAC} ${JAVACFLAGS} $<; then \
+		${COMPILE_OK}; \
+	else \
+		${COMPILE_FAILED}; \
+	fi
+
 .m.o:
 	${COMPILE_STATUS}
 	if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
@@ -311,51 +372,59 @@
 		${COMPILE_FAILED}; \
 	fi
 
-.xpm.o:
+.rc.o .rc.lib.o .rc.plugin.o:
 	${COMPILE_STATUS}
-	if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+	if ${WINDRES} ${CPPFLAGS} -J rc -O coff -o $@ $<; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
-.xpm.lib.o:
+
+.S.o:
+	${COMPILE_STATUS}
+	if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+		${COMPILE_OK}; \
+	else \
+		${COMPILE_FAILED}; \
+	fi
+.S.lib.o:
 	${COMPILE_LIB_STATUS}
-	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+	if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
-.xpm.plugin.o:
+.S.plugin.o:
 	${COMPILE_PLUGIN_STATUS}
-	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+	if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
 	fi
 
-.S.o:
+.xpm.o:
 	${COMPILE_STATUS}
-	if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
-.S.lib.o:
+.xpm.lib.o:
 	${COMPILE_LIB_STATUS}
-	if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
-.S.plugin.o:
+.xpm.plugin.o:
 	${COMPILE_PLUGIN_STATUS}
-	if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
 	fi
 
-install: ${LIB} ${STATIC_LIB} ${PLUGIN} ${PROG} install-extra
+install: ${LIB} ${STATIC_LIB} ${STATIC_PIC_LIB} ${PLUGIN} ${PROG} install-extra
 	for i in ${SUBDIRS}; do \
 		${DIR_ENTER}; \
 		${MAKE} ${MFLAGS} install || exit 1; \
@@ -364,14 +433,14 @@
 
 	for i in ${LIB}; do \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL_LIB}; then \
+		if ${MKDIR_P} ${DESTDIR}${libdir} ${INSTALL_LIB}; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
 		fi \
 	done
 
-	for i in ${STATIC_LIB}; do \
+	for i in ${STATIC_LIB} ${STATIC_PIC_LIB}; do \
 		${INSTALL_STATUS}; \
 		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \
 			${INSTALL_OK}; \
@@ -446,7 +515,7 @@
 
 	for i in ${LIB}; do \
 		if test -f ${DESTDIR}${libdir}/$$i; then \
-			if ${UNINSTALL_LIB}; then \
+			if : ${UNINSTALL_LIB}; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
@@ -454,7 +523,7 @@
 		fi; \
 	done
 
-	for i in ${STATIC_LIB}; do \
+	for i in ${STATIC_LIB} ${STATIC_PIC_LIB}; do \
 		if test -f ${DESTDIR}${libdir}/$$i; then \
 			if rm -f ${DESTDIR}${libdir}/$$i; then \
 				${DELETE_OK}; \
@@ -537,7 +606,7 @@
 		${DIR_LEAVE}; \
 	done
 
-	for i in ${DEPS} ${OBJS} ${LIB_OBJS} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${LIB} ${LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \
+	for i in ${DEPS} ${OBJS} ${LIB_OBJS} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${LIB} ${LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \
 		if test -f $$i -o -d $$i; then \
 			if rm -fr $$i; then \
 				${DELETE_OK}; \

audacious-plugins-2.5.3.tar.gz/config.h.in -> audacious-plugins-3.0.tar.gz/config.h.in Changed

@@ -73,6 +73,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* 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
 
@@ -88,15 +91,9 @@
 /* Define if the OSS output plugin should be built */
 #undef HAVE_OSS
 
-/* Define if the OSS4 output plugin should be built */
-#undef HAVE_OSS4
-
 /* Define if you have reSID for libSIDPlay 2 */
 #undef HAVE_RESID_BUILDER
 
-/* Set to 1 if you have libsamplerate. */
-#undef HAVE_SAMPLERATE
-
 /* Define if you have and want to use libSIDPlay1 */
 #undef HAVE_SIDPLAY1
 
@@ -110,9 +107,6 @@
 */
 #undef HAVE_SIDPLAY2_DISTORTION
 
-/* Define if you have snd_device_name_hint */
-#undef HAVE_SND_DEVICE_NAME_HINT
-
 /* Define to 1 if you have the <soundcard.h> header file. */
 #undef HAVE_SOUNDCARD_H
 
@@ -155,9 +149,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if you have the <wininet.h> header file. */
-#undef HAVE_WININET_H
-
 /* X Composite extension available */
 #undef HAVE_XCOMPOSITE
 
@@ -211,3 +202,9 @@
 # undef WORDS_BIGENDIAN
 # endif
 #endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES

audacious-plugins-2.5.3.tar.gz/configure -> audacious-plugins-3.0.tar.gz/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 2.5.3.
+# Generated by GNU Autoconf 2.68 for audacious-plugins 3.0.
 #
 #
 # 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='2.5.3'
-PACKAGE_STRING='audacious-plugins 2.5.3'
+PACKAGE_VERSION='3.0'
+PACKAGE_STRING='audacious-plugins 3.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -637,16 +637,10 @@
 FLAC_CFLAGS
 GTK218_LIBS
 GTK218_CFLAGS
-GTKGLEXT_LIBS
-GTKGLEXT_CFLAGS
-LIBPROJECTM1_LIBS
-LIBPROJECTM1_CFLAGS
 CUE_LIBS
 CUE_CFLAGS
 XML_LIBS
 XML_CFLAGS
-BLUEZ_LIBS
-BLUEZ_CFLAGS
 MTP_LIBS
 MTP_CFLAGS
 MMS_LIBS
@@ -674,6 +668,7 @@
 SDL_CONFIG
 ALSA_LIBS
 ALSA_CFLAGS
+OSS4_CPPFLAGS
 OSS_LIBS
 OSS_CFLAGS
 CXXCPP
@@ -684,14 +679,10 @@
 SIDPLAY2_LIBS
 SIDPLAY1_CFLAGS
 SIDPLAY1_LIBS
-SAMPLERATE_LIBS
-SAMPLERATE_CFLAGS
 JACK_LIBS
 JACK_CFLAGS
 FFMPEG_LIBS
 FFMPEG_CFLAGS
-NEED_AVCORE_LIBS
-NEED_AVCORE_CFLAGS
 SNDFILE_LIBS
 SNDFILE_CFLAGS
 FAAD_LIBS
@@ -718,6 +709,8 @@
 DBUS_CFLAGS
 GDKX11_LIBS
 GDKX11_CFLAGS
+MPG123_LIBS
+MPG123_CFLAGS
 OPENAL_LIBS
 OPENAL_CFLAGS
 LIBROAR_LIBS
@@ -763,13 +756,11 @@
 CAIRO_CFLAGS
 PANGO_LIBS
 PANGO_CFLAGS
-GTK_LIBS
-GTK_CFLAGS
-GTHREAD_LIBS
-GTHREAD_CFLAGS
 GLIB_LIBS
 GLIB_CFLAGS
 MAKE
+GTK_LIBS
+GTK_CFLAGS
 PC_REQUIRES
 AUDACIOUS_LIBS
 AUDACIOUS_CFLAGS
@@ -886,6 +877,7 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_largefile
 enable_dependency_tracking
 enable_nls
 with_gnu_ld
@@ -912,8 +904,6 @@
 enable_usf
 enable_mp3
 enable_rocklight
-enable_lirc
-enable_evdevplug
 enable_hotkey
 enable_gnomeshortcuts
 enable_songchange
@@ -951,16 +941,12 @@
 enable_amidiplug_alsa
 enable_amidiplug_flsyn
 enable_cdaudio
-enable_streambrowser
 enable_scrobbler
 enable_neon
-enable_wininet
 enable_mms
+enable_smb
 enable_mtp_up
-enable_bluetooth
-enable_paranormal
 enable_cue
-enable_projectm_1_0
 enable_moodbar
 enable_filewriter
 enable_filewriter_mp3
@@ -991,12 +977,10 @@
 PKG_CONFIG_LIBDIR
 AUDACIOUS_CFLAGS
 AUDACIOUS_LIBS
-GLIB_CFLAGS
-GLIB_LIBS
-GTHREAD_CFLAGS
-GTHREAD_LIBS
 GTK_CFLAGS
 GTK_LIBS
+GLIB_CFLAGS
+GLIB_LIBS
 PANGO_CFLAGS
 PANGO_LIBS
 CAIRO_CFLAGS
@@ -1013,6 +997,8 @@
 LIBROAR_LIBS
 OPENAL_CFLAGS
 OPENAL_LIBS
+MPG123_CFLAGS
+MPG123_LIBS
 GDKX11_CFLAGS
 GDKX11_LIBS
 DBUS_CFLAGS
@@ -1037,14 +1023,10 @@
 WAVPACK_LIBS
 SNDFILE_CFLAGS
 SNDFILE_LIBS
-NEED_AVCORE_CFLAGS
-NEED_AVCORE_LIBS
 FFMPEG_CFLAGS
 FFMPEG_LIBS
 JACK_CFLAGS
 JACK_LIBS
-SAMPLERATE_CFLAGS
-SAMPLERATE_LIBS
 CXXCPP
 ALSA_CFLAGS
 ALSA_LIBS
@@ -1064,16 +1046,10 @@
 MMS_LIBS
 MTP_CFLAGS
 MTP_LIBS
-BLUEZ_CFLAGS
-BLUEZ_LIBS
 XML_CFLAGS
 XML_LIBS
 CUE_CFLAGS
 CUE_LIBS
-LIBPROJECTM1_CFLAGS
-LIBPROJECTM1_LIBS
-GTKGLEXT_CFLAGS
-GTKGLEXT_LIBS
 GTK218_CFLAGS
 GTK218_LIBS
 FLAC_CFLAGS
@@ -1624,7 +1600,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 2.5.3 to adapt to many kinds of systems.
+\`configure' configures audacious-plugins 3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1691,7 +1667,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of audacious-plugins 2.5.3:";;
+ short | recursive ) echo "Configuration of audacious-plugins 3.0:";;
 esac
 cat <<\_ACEOF
 
@@ -1699,14 +1675,15 @@
 --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-nls do not use Native Language Support
 --disable-rpath do not hardcode runtime library paths
- --enable-gtk3 Use GTK3 instead of GTK2
+ --disable-gtk3 Use GTK2 even if GTK3 is present
 --disable-sse2 Disable SSE2 support (def: enabled)
 --disable-altivec Disable AltiVec support (def: enabled)
- --disable-gio disable GIO support (default=enabled if GIO present)
+ --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)
@@ -1719,10 +1696,8 @@
 --disable-dockalbumart disable MacOS dock albumart plugin (default=guess)
 --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-mp3 disable MP3 plugin (default=enabled)
 --disable-rocklight disable Rocklight vis plugin (default=enabled)
- --disable-lirc disable LIRC plugin (default=enabled)
- --disable-evdevplug disable Linux evdev plugin (default=enabled)
 --disable-hotkey disable global hotkey plugin (default=enabled)
 --disable-gnomeshortcuts disable gnome shortcuts (default=enabled)
 --disable-songchange disable song change plugin
@@ -1738,10 +1713,10 @@
 --disable-sndfile disable sndfile extensions. default=enabled
 --disable-modplug disable ModPlug plugin (default=enabled)
 --disable-ffaudio disable ffaudio plugin (default=enabled)
- --disable-jack disable jack output 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)
- --enable-oss4 enable the OSS4 output plugin (default=disabled)
+ --disable-oss4 disable the 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
@@ -1749,16 +1724,12 @@
 --disable-amidiplug-alsa disable amidi-plug ALSA backend (default=enabled)
 --disable-amidiplug-flsyn disable amidi-plug FluidSynth backend (default=enabled)
 --disable-cdaudio disable cdaudio-ng input plugin (default=enabled)
- --disable-streambrowser disable streambrowser general plugin (default=enabled)
 --disable-scrobbler disable Scrobbler plugin (default=enabled)
 --disable-neon disable neon HTTP support (default=enabled)
- --enable-wininet enable WinINet HTTP support
 --disable-mms disable mms support. (default=enabled)
+ --disable-smb disable SMB transport (default=enabled)
 --disable-mtp_up disable mtp upload support. (default=enabled)
- --disable-bluetooth disable bluetooth audio support. (default=enabled)
- --disable-paranormal disable paranormal vis plugin. (default=enabled)
 --disable-cue disable cue support. (default=enabled)
- --disable-projectm-1.0 disable projectM 1.0+ vis plugin. (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)
@@ -1814,14 +1785,10 @@
 C compiler flags for AUDACIOUS, overriding pkg-config
 AUDACIOUS_LIBS
 linker flags for AUDACIOUS, 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
 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
 PANGO_CFLAGS
 C compiler flags for PANGO, overriding pkg-config
 PANGO_LIBS linker flags for PANGO, overriding pkg-config
@@ -1846,6 +1813,9 @@
 OPENAL_CFLAGS
 C compiler flags for OPENAL, overriding pkg-config
 OPENAL_LIBS linker flags for OPENAL, overriding pkg-config
+ MPG123_CFLAGS
+ C compiler flags for MPG123, overriding pkg-config
+ MPG123_LIBS linker flags for MPG123, overriding pkg-config
 GDKX11_CFLAGS
 C compiler flags for GDKX11, overriding pkg-config
 GDKX11_LIBS linker flags for GDKX11, overriding pkg-config
@@ -1888,19 +1858,11 @@
 C compiler flags for SNDFILE, overriding pkg-config
 SNDFILE_LIBS
 linker flags for SNDFILE, overriding pkg-config
- NEED_AVCORE_CFLAGS
- C compiler flags for NEED_AVCORE, overriding pkg-config
- NEED_AVCORE_LIBS
- linker flags for NEED_AVCORE, overriding pkg-config
 FFMPEG_CFLAGS
 C compiler flags for FFMPEG, overriding pkg-config
 FFMPEG_LIBS linker flags for FFMPEG, overriding pkg-config
 JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
 JACK_LIBS linker flags for JACK, overriding pkg-config
- SAMPLERATE_CFLAGS
- C compiler flags for SAMPLERATE, overriding pkg-config
- SAMPLERATE_LIBS
- linker flags for SAMPLERATE, overriding pkg-config
 CXXCPP C++ preprocessor
 ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
 ALSA_LIBS linker flags for ALSA, overriding pkg-config
@@ -1924,21 +1886,10 @@
 MMS_LIBS linker flags for MMS, overriding pkg-config
 MTP_CFLAGS C compiler flags for MTP, overriding pkg-config
 MTP_LIBS linker flags for MTP, overriding pkg-config
- BLUEZ_CFLAGS
- C compiler flags for BLUEZ, overriding pkg-config
- BLUEZ_LIBS linker flags for BLUEZ, overriding pkg-config
 XML_CFLAGS C compiler flags for XML, overriding pkg-config
 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
- LIBPROJECTM1_CFLAGS
- C compiler flags for LIBPROJECTM1, overriding pkg-config
- LIBPROJECTM1_LIBS
- linker flags for LIBPROJECTM1, overriding pkg-config
- GTKGLEXT_CFLAGS
- C compiler flags for GTKGLEXT, overriding pkg-config
- GTKGLEXT_LIBS
- linker flags for GTKGLEXT, overriding pkg-config
 GTK218_CFLAGS
 C compiler flags for GTK218, overriding pkg-config
 GTK218_LIBS linker flags for GTK218, overriding pkg-config
@@ -2017,7 +1968,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-audacious-plugins configure 2.5.3
+audacious-plugins configure 3.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2551,7 +2502,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 2.5.3, which was
+It was created by audacious-plugins $as_me 3.0, which was
 generated by GNU Autoconf 2.68. Invocation command line was
 
 $ $0 $@
@@ -3055,7 +3006,7 @@
 
 PACKAGE=audacious-plugins
 
-VERSION=2.5.3
+VERSION=3.0
 
 
 
@@ -4802,7 +4753,204 @@
 fi
 
 
-CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+ enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_sys_largefile_CC=no
+ if test "$GCC" != yes; then
+ ac_save_CC=$CC
+ while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		 && LARGE_OFF_T % 2147483647 == 1)
+		 ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+	 if ac_fn_c_try_compile "$LINENO"; then :
+ break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+ done
+ CC=$ac_save_CC
+ rm -f conftest.$ac_ext
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+ if test "$ac_cv_sys_largefile_CC" != no; then
+ CC=$CC$ac_cv_sys_largefile_CC
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		 && LARGE_OFF_T % 2147483647 == 1)
+		 ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		 && LARGE_OFF_T % 2147483647 == 1)
+		 ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_file_offset_bits=unknown
+ break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+ no | unknown) ;;
+ *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+ if test $ac_cv_sys_file_offset_bits = unknown; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		 && LARGE_OFF_T % 2147483647 == 1)
+		 ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		 && LARGE_OFF_T % 2147483647 == 1)
+		 ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_large_files=unknown
+ break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+ no | unknown) ;;
+ *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+ fi
+fi
+
 
 
 
@@ -7570,9 +7718,9 @@
 
 INPUT_PLUGINS="tonegen metronom vtx"
 OUTPUT_PLUGINS="null"
-EFFECT_PLUGINS="compressor crossfade crystalizer mixdown ladspa sndstretch stereo_plugin voice_removal echo_plugin"
-GENERAL_PLUGINS="alarm albumart"
-VISUALIZATION_PLUGINS="blur_scope spectrum cairo-spectrum"
+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"
 
@@ -7706,12 +7854,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 >= 2.5\""; } >&5
- ($PKG_CONFIG --exists --print-errors "audacious >= 2.5") 2>&5
+ { { $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
 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 >= 2.5" 2>/dev/null`
+ pkg_cv_AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 3.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -7723,12 +7871,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 >= 2.5\""; } >&5
- ($PKG_CONFIG --exists --print-errors "audacious >= 2.5") 2>&5
+ { { $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
 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 >= 2.5" 2>/dev/null`
+ pkg_cv_AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 3.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -7749,19 +7897,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 >= 2.5" 2>&1`
+	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audacious >= 3.0" 2>&1`
 else
-	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audacious >= 2.5" 2>&1`
+	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audacious >= 3.0" 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 2.5 or later, have you installed audacious yet?" "$LINENO" 5
+	as_fn_error $? "Cannot find Audacious 3.0 or later, 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 2.5 or later, have you installed audacious yet?" "$LINENO" 5
+	as_fn_error $? "Cannot find Audacious 3.0 or later, have you installed audacious yet?" "$LINENO" 5
 
 else
 	AUDACIOUS_CFLAGS=$pkg_cv_AUDACIOUS_CFLAGS
@@ -7770,9 +7918,9 @@
 $as_echo "yes" >&6; }
 
 if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="audacious >= 2.5"
+ PC_REQUIRES="audacious >= 3.0"
 else
- PC_REQUIRES="$PC_REQUIRES, audacious >= 2.5"
+ PC_REQUIRES="$PC_REQUIRES, audacious >= 3.0"
 fi
 
 
@@ -7787,13 +7935,164 @@
 if test "${enable_gtk3+set}" = set; then :
 enableval=$enable_gtk3; use_gtk3=$enableval
 else
- use_gtk3=no
+ use_gtk3=yes
+fi
+
+
+if test $use_gtk3 = yes ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+$as_echo_n "checking for GTK... " >&6; }
+
+if test -n "$GTK_CFLAGS"; then
+ pkg_cv_GTK_CFLAGS="$GTK_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+-3.0 >= 3.0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GTK_LIBS"; then
+ pkg_cv_GTK_LIBS="$GTK_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+-3.0 >= 3.0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0.0" 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
+	 GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0.0" 2>&1`
+ else
+	 GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0.0" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTK_PKG_ERRORS" >&5
+
+	use_gtk3=no
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	use_gtk3=no
+else
+	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+	GTK_LIBS=$pkg_cv_GTK_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	use_gtk3=yes
+fi
+fi
+
+if test $use_gtk3 = no ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+$as_echo_n "checking for GTK... " >&6; }
+
+if test -n "$GTK_CFLAGS"; then
+ pkg_cv_GTK_CFLAGS="$GTK_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.12.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.12.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GTK_LIBS"; then
+ pkg_cv_GTK_LIBS="$GTK_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.12.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.12.0" 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
+	 GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.12.0" 2>&1`
+ else
+	 GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.12.0" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTK_PKG_ERRORS" >&5
+
+	as_fn_error $? "Cannot find GTK headers. Aborting ..." "$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 GTK headers. Aborting ..." "$LINENO" 5
+else
+	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+	GTK_LIBS=$pkg_cv_GTK_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	use_gtk3=no
+fi
 fi
 
 
 
 
 
+
+
 { $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 :
@@ -9358,12 +9657,12 @@
 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.12.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.12.0") 2>&5
+ { { $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.12.0" 2>/dev/null`
+ 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
@@ -9375,12 +9674,12 @@
 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.12.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.12.0") 2>&5
+ { { $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.12.0" 2>/dev/null`
+ 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
@@ -9401,9 +9700,9 @@
 _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.12.0" 2>&1`
+	 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.12.0" 2>&1`
+	 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
@@ -9418,7 +9717,7 @@
 
 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.12.0 is required.
+Glib2 version $cv_pkg_version was found, but glib-2.0 >= 2.16 is required.
 " "$LINENO" 5
 
 else
@@ -9443,7 +9742,7 @@
 
 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.12.0 is required.
+Glib2 version $cv_pkg_version was found, but glib-2.0 >= 2.16 is required.
 " "$LINENO" 5
 
 else
@@ -9463,133 +9762,9 @@
 
 
 if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="glib-2.0 >= 2.12.0"
- else
- PC_REQUIRES="$PC_REQUIRES, glib-2.0 >= 2.12.0"
- 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.12.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.12.0") 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.12.0" 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.12.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.12.0") 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.12.0" 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.12.0" 2>&1`
- else
-	 GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0 >= 2.12.0" 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-2.0 version $cv_pkg_version was found, but gthread-2.0 >= 2.12.0 is required.
-" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find gthread-2.0! 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-2.0 version $cv_pkg_version was found, but gthread-2.0 >= 2.12.0 is required.
-" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find gthread-2.0! 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.12.0"
+ PC_REQUIRES="glib-2.0 >= 2.16"
 else
- PC_REQUIRES="$PC_REQUIRES, gthread-2.0 >= 2.12.0"
+ PC_REQUIRES="$PC_REQUIRES, glib-2.0 >= 2.16"
 fi
 
 
@@ -9597,259 +9772,6 @@
 fi
 
 
-if test $use_gtk3 = yes ; then
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
-$as_echo_n "checking for GTK... " >&6; }
-
-if test -n "$GTK_CFLAGS"; then
- pkg_cv_GTK_CFLAGS="$GTK_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+-3.0 >= 3.0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0.0" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$GTK_LIBS"; then
- pkg_cv_GTK_LIBS="$GTK_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+-3.0 >= 3.0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0.0" 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
-	 GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0.0" 2>&1`
- else
-	 GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0.0" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTK_PKG_ERRORS" >&5
-
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.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 "gtk+-3.0" 2>/dev/null`
- as_fn_error $? "
-Gtk+3 version $cv_pkg_version was found, but gtk+-3.0 >= 3.0.0 is required.
-" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find Gtk+3! 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 \"gtk+-3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.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 "gtk+-3.0" 2>/dev/null`
- as_fn_error $? "
-Gtk+3 version $cv_pkg_version was found, but gtk+-3.0 >= 3.0.0 is required.
-" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find Gtk+3! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-" "$LINENO" 5
-
-fi
-
-else
-	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
-	GTK_LIBS=$pkg_cv_GTK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="gtk+-3.0 >= 3.0.0"
- else
- PC_REQUIRES="$PC_REQUIRES, gtk+-3.0 >= 3.0.0"
- fi
-
-
-
-fi
-
-else
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
-$as_echo_n "checking for GTK... " >&6; }
-
-if test -n "$GTK_CFLAGS"; then
- pkg_cv_GTK_CFLAGS="$GTK_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.8.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.8.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.8.0" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$GTK_LIBS"; then
- pkg_cv_GTK_LIBS="$GTK_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.8.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.8.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.8.0" 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
-	 GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.8.0" 2>&1`
- else
-	 GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.8.0" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTK_PKG_ERRORS" >&5
-
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-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 "gtk+-2.0" 2>/dev/null`
- as_fn_error $? "
-Gtk+2 version $cv_pkg_version was found, but gtk+-2.0 >= 2.8.0 is required.
-" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find Gtk+2! 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 \"gtk+-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-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 "gtk+-2.0" 2>/dev/null`
- as_fn_error $? "
-Gtk+2 version $cv_pkg_version was found, but gtk+-2.0 >= 2.8.0 is required.
-" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find Gtk+2! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-" "$LINENO" 5
-
-fi
-
-else
-	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
-	GTK_LIBS=$pkg_cv_GTK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="gtk+-2.0 >= 2.8.0"
- else
- PC_REQUIRES="$PC_REQUIRES, gtk+-2.0 >= 2.8.0"
- fi
-
-
-
-fi
-
-fi
-
-
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
@@ -9859,12 +9781,12 @@
 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.8.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango >= 1.8.0") 2>&5
+ { { $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.8.0" 2>/dev/null`
+ pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.20" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -9876,12 +9798,12 @@
 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.8.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango >= 1.8.0") 2>&5
+ { { $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.8.0" 2>/dev/null`
+ pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pango >= 1.20" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -9902,9 +9824,9 @@
 _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.8.0" 2>&1`
+	 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.8.0" 2>&1`
+	 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
@@ -9919,7 +9841,7 @@
 
 cv_pkg_version=`$PKG_CONFIG --modversion "pango" 2>/dev/null`
 as_fn_error $? "
-Pango version $cv_pkg_version was found, but pango >= 1.8.0 is required.
+Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
 " "$LINENO" 5
 
 else
@@ -9944,7 +9866,7 @@
 
 cv_pkg_version=`$PKG_CONFIG --modversion "pango" 2>/dev/null`
 as_fn_error $? "
-Pango version $cv_pkg_version was found, but pango >= 1.8.0 is required.
+Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
 " "$LINENO" 5
 
 else
@@ -9964,9 +9886,9 @@
 
 
 if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="pango >= 1.8.0"
+ PC_REQUIRES="pango >= 1.20"
 else
- PC_REQUIRES="$PC_REQUIRES, pango >= 1.8.0"
+ PC_REQUIRES="$PC_REQUIRES, pango >= 1.20"
 fi
 
 
@@ -9983,12 +9905,12 @@
 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.2.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo >= 1.2.4") 2>&5
+ { { $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.2.4" 2>/dev/null`
+ pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.6" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10000,12 +9922,12 @@
 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.2.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo >= 1.2.4") 2>&5
+ { { $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.2.4" 2>/dev/null`
+ pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.6" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10026,9 +9948,9 @@
 _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.2.4" 2>&1`
+	 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.2.4" 2>&1`
+	 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
@@ -10043,7 +9965,7 @@
 
 cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
 as_fn_error $? "
-Cairo version $cv_pkg_version was found, but cairo >= 1.2.4 is required.
+Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
 " "$LINENO" 5
 
 else
@@ -10068,7 +9990,7 @@
 
 cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
 as_fn_error $? "
-Cairo version $cv_pkg_version was found, but cairo >= 1.2.4 is required.
+Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
 " "$LINENO" 5
 
 else
@@ -10088,9 +10010,9 @@
 
 
 if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="cairo >= 1.2.4"
+ PC_REQUIRES="cairo >= 1.6"
 else
- PC_REQUIRES="$PC_REQUIRES, cairo >= 1.2.4"
+ PC_REQUIRES="$PC_REQUIRES, cairo >= 1.6"
 fi
 
 
@@ -10468,7 +10390,7 @@
 if test "${enable_gio+set}" = set; then :
 enableval=$enable_gio; enable_gio=$enableval
 else
- enable_gio=yes
+ enable_gio=no
 fi
 
 
@@ -10863,8 +10785,8 @@
 			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'
+			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*)
@@ -10878,8 +10800,8 @@
 			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}'
+			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*)
@@ -10893,8 +10815,8 @@
 			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'
+			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
+			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
 			CLEAN_LIB=''
 			;;
 		cygwin* | mingw*)
@@ -10908,8 +10830,8 @@
 			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'
+			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'
 			;;
 		*)
@@ -10923,8 +10845,8 @@
 			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'
+			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
@@ -11418,131 +11340,102 @@
 enableval=$enable_mp3; enable_mp3=$enableval
 else
 enable_mp3=yes
-
 fi
 
 
-if test "x$enable_mp3" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
-fi
+if test $enable_mp3 = yes ; then
 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPG123" >&5
+$as_echo_n "checking for MPG123... " >&6; }
 
-# Check whether --enable-rocklight was given.
-if test "${enable_rocklight+set}" = set; then :
- enableval=$enable_rocklight; enable_rocklight="$enableval"
+if test -n "$MPG123_CFLAGS"; then
+ pkg_cv_MPG123_CFLAGS="$MPG123_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.12") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MPG123_CFLAGS=`$PKG_CONFIG --cflags "libmpg123 >= 1.12" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- enable_rocklight="yes"
-
+ pkg_failed=yes
 fi
-
-
-if test "x$enable_rocklight" = "xyes"; then
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS rocklight"
+ else
+ pkg_failed=untried
 fi
-
-
-# Check whether --enable-lirc was given.
-if test "${enable_lirc+set}" = set; then :
- enableval=$enable_lirc; enable_lirc=$enableval
+if test -n "$MPG123_LIBS"; then
+ pkg_cv_MPG123_LIBS="$MPG123_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.12") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MPG123_LIBS=`$PKG_CONFIG --libs "libmpg123 >= 1.12" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- enable_lirc="yes"
-
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
 fi
 
 
-if test "x$enable_lirc" = "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lirc_init in -llirc_client" >&5
-$as_echo_n "checking for lirc_init in -llirc_client... " >&6; }
-if ${ac_cv_lib_lirc_client_lirc_init+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-llirc_client $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 lirc_init ();
-int
-main ()
-{
-return lirc_init ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_lirc_client_lirc_init=yes
-else
- ac_cv_lib_lirc_client_lirc_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lirc_client_lirc_init" >&5
-$as_echo "$ac_cv_lib_lirc_client_lirc_init" >&6; }
-if test "x$ac_cv_lib_lirc_client_lirc_init" = xyes; then :
- have_lirc=yes
-else
- have_lirc=no
-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
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** LIRC plugin disabled per user request ***" >&5
-$as_echo "*** LIRC plugin disabled per user request ***" >&6; }
- have_lirc="no"
+ _pkg_short_errors_supported=no
 fi
+ if test $_pkg_short_errors_supported = yes; then
+	 MPG123_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpg123 >= 1.12" 2>&1`
+ else
+	 MPG123_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpg123 >= 1.12" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$MPG123_PKG_ERRORS" >&5
 
-if test "x$have_lirc" = "xyes"; then
-	ac_fn_c_check_header_mongrel "$LINENO" "lirc/lirc_client.h" "ac_cv_header_lirc_lirc_client_h" "$ac_includes_default"
-if test "x$ac_cv_header_lirc_lirc_client_h" = xyes; then :
-
+	enable_mp3=no
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	enable_mp3=no
 else
- have_lirc=no
-fi
-
-
+	MPG123_CFLAGS=$pkg_cv_MPG123_CFLAGS
+	MPG123_LIBS=$pkg_cv_MPG123_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	enable_mp3=yes
 fi
 
-if test "x$have_lirc" = "xyes"; then
-	GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"
+ if test $enable_mp3 = yes ; then
+ INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** libmpg123 not found; MP3 plugin disabled" >&5
+$as_echo "*** libmpg123 not found; MP3 plugin disabled" >&6; }
+ fi
 fi
 
 
-# Check whether --enable-evdevplug was given.
-if test "${enable_evdevplug+set}" = set; then :
- enableval=$enable_evdevplug; enable_evdevplug=$enableval
+# Check whether --enable-rocklight was given.
+if test "${enable_rocklight+set}" = set; then :
+ enableval=$enable_rocklight; enable_rocklight="$enableval"
 else
- enable_evdevplug="yes"
+ enable_rocklight="yes"
 
 fi
 
 
-if test "x$enable_evdevplug" = "xyes"; then
- case "$target" in
- *-*-linux*)
- have_evdevplug="yes"
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** Linux evdev plugin disabled (host does not run linux) ***" >&5
-$as_echo "*** Linux evdev plugin disabled (host does not run linux) ***" >&6; }
- have_evdevplug="no"
- ;;
- esac
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** Linux evdev plugin disabled per user request ***" >&5
-$as_echo "*** Linux evdev plugin disabled per user request ***" >&6; }
- have_evdevplug="no"
-fi
-
-if test "x$have_evdevplug" = "xyes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS evdev-plug"
+if test "x$enable_rocklight" = "xyes"; then
+ VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS rocklight"
 fi
 
 
@@ -13092,155 +12985,9 @@
 fi
 
 
-
 if test $enable_ffaudio = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NEED_AVCORE" >&5
-$as_echo_n "checking for NEED_AVCORE... " >&6; }
-
-if test -n "$NEED_AVCORE_CFLAGS"; then
- pkg_cv_NEED_AVCORE_CFLAGS="$NEED_AVCORE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 52.94.3 libavcodec <= 52.113.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 52.94.3 libavcodec <= 52.113.1") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_NEED_AVCORE_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 52.94.3 libavcodec <= 52.113.1" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$NEED_AVCORE_LIBS"; then
- pkg_cv_NEED_AVCORE_LIBS="$NEED_AVCORE_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 52.94.3 libavcodec <= 52.113.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 52.94.3 libavcodec <= 52.113.1") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_NEED_AVCORE_LIBS=`$PKG_CONFIG --libs "libavcodec >= 52.94.3 libavcodec <= 52.113.1" 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
-	 NEED_AVCORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 52.94.3 libavcodec <= 52.113.1" 2>&1`
- else
-	 NEED_AVCORE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 52.94.3 libavcodec <= 52.113.1" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$NEED_AVCORE_PKG_ERRORS" >&5
-
-	have_split_ffmpeg=no
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_split_ffmpeg=no
-else
-	NEED_AVCORE_CFLAGS=$pkg_cv_NEED_AVCORE_CFLAGS
-	NEED_AVCORE_LIBS=$pkg_cv_NEED_AVCORE_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_split_ffmpeg=yes
-fi
-
- if test $have_split_ffmpeg = yes ; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5
-$as_echo_n "checking for FFMPEG... " >&6; }
-
-if test -n "$FFMPEG_CFLAGS"; then
- pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$FFMPEG_LIBS"; then
- pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 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
-	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>&1`
- else
-	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$FFMPEG_PKG_ERRORS" >&5
-
-	have_ffaudio=no
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_ffaudio=no
-else
-	FFMPEG_CFLAGS=$pkg_cv_FFMPEG_CFLAGS
-	FFMPEG_LIBS=$pkg_cv_FFMPEG_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_ffaudio=yes
-fi
- else
-
-pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5
 $as_echo_n "checking for FFMPEG... " >&6; }
 
@@ -13248,12 +12995,12 @@
 pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 52.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavcodec >= 52.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>/dev/null`
+ pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 52.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13265,12 +13012,12 @@
 pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 52.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavcodec >= 52.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>/dev/null`
+ pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 52.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13291,9 +13038,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>&1`
+	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 52.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0" 2>&1`
 else
-	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>&1`
+	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 52.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$FFMPEG_PKG_ERRORS" >&5
@@ -13310,22 +13057,22 @@
 $as_echo "yes" >&6; }
 	have_ffaudio=yes
 fi
- fi
 fi
 
 if test "x$have_ffaudio" = "xyes"; then
 INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
 fi
 
+
 # Check whether --enable-jack was given.
 if test "${enable_jack+set}" = set; then :
 enableval=$enable_jack; enable_jack=$enableval
 else
- enable_jack="yes"
+ enable_jack=yes
 fi
 
 
-if test "x$enable_jack" = "xyes"; then
+if test $enable_jack = yes ; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
@@ -13335,12 +13082,12 @@
 pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.100.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "jack >= 0.100.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 1.9.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "jack >= 1.9.7") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 0.100.0" 2>/dev/null`
+ pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 1.9.7" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13352,12 +13099,12 @@
 pkg_cv_JACK_LIBS="$JACK_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.100.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "jack >= 0.100.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 1.9.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "jack >= 1.9.7") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 0.100.0" 2>/dev/null`
+ pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 1.9.7" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13378,126 +13125,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 0.100.0" 2>&1`
+	 JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 1.9.7" 2>&1`
 else
-	 JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 0.100.0" 2>&1`
+	 JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 1.9.7" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$JACK_PKG_ERRORS" >&5
 
-	have_jack=no
+	enable_jack=no
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_jack=no
+	enable_jack=no
 else
 	JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
 	JACK_LIBS=$pkg_cv_JACK_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_jack=yes
-fi
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5
-$as_echo_n "checking for SAMPLERATE... " >&6; }
-
-if test -n "$SAMPLERATE_CFLAGS"; then
- pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.0.15\""; } >&5
- ($PKG_CONFIG --exists --print-errors "samplerate >= 0.0.15") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.0.15" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$SAMPLERATE_LIBS"; then
- pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.0.15\""; } >&5
- ($PKG_CONFIG --exists --print-errors "samplerate >= 0.0.15") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.0.15" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
+	enable_jack=$enable_jack
 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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for src_process in -lsamplerate" >&5
+$as_echo_n "checking for src_process in -lsamplerate... " >&6; }
+if ${ac_cv_lib_samplerate_src_process+:} false; then :
+ $as_echo_n "(cached) " >&6
 else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate >= 0.0.15" 2>&1`
- else
-	 SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate >= 0.0.15" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SAMPLERATE_PKG_ERRORS" >&5
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsamplerate $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
 
-	ac_cv_samplerate=0
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	ac_cv_samplerate=0
+/* 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 src_process ();
+int
+main ()
+{
+return src_process ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_samplerate_src_process=yes
 else
-	SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
-	SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	ac_cv_samplerate=1
+ ac_cv_lib_samplerate_src_process=no
 fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SAMPLERATE ${ac_cv_samplerate}
-_ACEOF
-
-
-if test "x${ac_cv_samplerate}" = "x0"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find libsamplerate, necessary for jack output plugin." >&5
-$as_echo "$as_me: WARNING: Could not find libsamplerate, necessary for jack output plugin." >&2;}
- have_jack=no
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-
-
-if test "x$have_jack" = "xno"; then
- have_jack=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_samplerate_src_process" >&5
+$as_echo "$ac_cv_lib_samplerate_src_process" >&6; }
+if test "x$ac_cv_lib_samplerate_src_process" = xyes; then :
+ enable_jack=$enable_jack
 else
- have_jack=yes
+ enable_jack=no
 fi
 
 
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** jack plugin disabled per user request ***" >&5
-$as_echo "*** jack plugin disabled per user request ***" >&6; }
- have_jack=no
-fi
-
-if test "x$have_jack" = "xyes"; then
-	OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
+ if test $enable_jack = yes ; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** JACK or libsamplerate not found; JACK output plugin disabled" >&5
+$as_echo "*** JACK or libsamplerate not found; JACK output plugin disabled" >&6; }
+ fi
 fi
 
 # Check whether --enable-sid was given.
@@ -14935,129 +14630,73 @@
 if test "${enable_oss4+set}" = set; then :
 enableval=$enable_oss4; enable_oss4=$enableval
 else
- enable_oss4=no
+ enable_oss4=yes
 
 fi
 
 
-have_oss4=no
 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; }
- OSS4_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
- OSS4_CFLAGS="-I$t/include"
- fi
- fi
- done
- fi
- if test -n "$OSS4_CFLAGS" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSS4_CFLAGS" >&5
-$as_echo "$OSS4_CFLAGS" >&6; }
+
+ if test -f "/etc/oss.conf"; then
+ . "/etc/oss.conf"
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
+ OSSLIBDIR="/usr/lib/oss"
 fi
- CFLAGS_save=$CFLAGS
- CFLAGS="$CFLAGS $OSS4_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
-
-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
 
-fi
-
-done
-
- for ac_header in machine/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 :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_MACHINE_SOUNDCARD_H 1
-_ACEOF
-
-fi
-
-done
-
- CFLAGS=$CFLAGS_save
+ 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 "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
+ 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
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -lossaudio" >&5
-$as_echo_n "checking whether we need -lossaudio... " >&6; }
+ 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
 
-		#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;
-}
 _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
+ have_oss4=no
 
-		OSS_LIBS="-lossaudio"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
 fi
+rm -f conftest*
 
-if test "x$have_oss4" = "xyes"; then
-
-$as_echo "#define HAVE_OSS4 1" >>confdefs.h
-
+ { $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
 fi
 
 if test "x$have_oss4" = "xyes"; then
-	OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
-fi
-
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
 
+fi
 
 
 # Check whether --enable-alsa was given.
@@ -15079,12 +14718,12 @@
 pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "alsa >= 1.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.16") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0" 2>/dev/null`
+ pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0.16" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -15096,12 +14735,12 @@
 pkg_cv_ALSA_LIBS="$ALSA_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "alsa >= 1.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.16") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0" 2>/dev/null`
+ pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0.16" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -15122,9 +14761,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "alsa >= 1.0" 2>&1`
+	 ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "alsa >= 1.0.16" 2>&1`
 else
-	 ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "alsa >= 1.0" 2>&1`
+	 ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "alsa >= 1.0.16" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$ALSA_PKG_ERRORS" >&5
@@ -15141,48 +14780,6 @@
 $as_echo "yes" >&6; }
 	have_alsa=yes
 fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_device_name_hint in -lasound" >&5
-$as_echo_n "checking for snd_device_name_hint in -lasound... " >&6; }
-if ${ac_cv_lib_asound_snd_device_name_hint+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lasound $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 snd_device_name_hint ();
-int
-main ()
-{
-return snd_device_name_hint ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_asound_snd_device_name_hint=yes
-else
- ac_cv_lib_asound_snd_device_name_hint=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_device_name_hint" >&5
-$as_echo "$ac_cv_lib_asound_snd_device_name_hint" >&6; }
-if test "x$ac_cv_lib_asound_snd_device_name_hint" = xyes; then :
-
-$as_echo "#define HAVE_SND_DEVICE_NAME_HINT 1" >>confdefs.h
-
-fi
-
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** ALSA output plugin disabled per user request ***" >&5
 $as_echo "*** ALSA output plugin disabled per user request ***" >&6; }
@@ -16195,20 +15792,6 @@
 fi
 fi
 
-
-# Check whether --enable-streambrowser was given.
-if test "${enable_streambrowser+set}" = set; then :
- enableval=$enable_streambrowser; enable_streambrowser=$enableval
-else
- enable_streambrowser=yes
-
-fi
-
-
-if test "$enable_streambrowser" = "yes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS streambrowser"
-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='#'
@@ -16509,37 +16092,6 @@
 
 
 
-enable_wininet=yes
-if test $have_neon = yes ; then
- enable_wininet=no
-fi
-
-# Check whether --enable-wininet was given.
-if test "${enable_wininet+set}" = set; then :
- enableval=$enable_wininet; enable_wininet=$enableval
-else
- enable_wininet=$enable_wininet
-fi
-
-
-if test $enable_wininet = yes ; then
- for ac_header in wininet.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "wininet.h" "ac_cv_header_wininet_h" "$ac_includes_default"
-if test "x$ac_cv_header_wininet_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_WININET_H 1
-_ACEOF
- TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS wininet"
-else
- enable_wininet=no
-fi
-
-done
-
-fi
-
-
 # Check whether --enable-mms was given.
 if test "${enable_mms+set}" = set; then :
 enableval=$enable_mms; have_mms=$enableval
@@ -16628,6 +16180,38 @@
 fi
 
 
+# Check whether --enable-smb was given.
+if test "${enable_smb+set}" = set; then :
+ enableval=$enable_smb; enable_smb=$enableval
+else
+ enable_smb=yes
+fi
+
+
+if test $enable_smb = yes ; then
+ for ac_header in libsmbclient.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "libsmbclient.h" "ac_cv_header_libsmbclient_h" "$ac_includes_default"
+if test "x$ac_cv_header_libsmbclient_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSMBCLIENT_H 1
+_ACEOF
+ enable_smb=yes
+else
+ enable_smb=no
+fi
+
+done
+
+
+ if test $enable_smb = yes ; then
+ TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS smb"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** libsmbclient not found; SMB client disabled" >&5
+$as_echo "*** libsmbclient not found; SMB client disabled" >&6; }
+ fi
+fi
+
 
 # Check whether --enable-mtp_up was given.
 if test "${enable_mtp_up+set}" = set; then :
@@ -16721,380 +16305,6 @@
 
 
 
-# Check whether --enable-bluetooth was given.
-if test "${enable_bluetooth+set}" = set; then :
- enableval=$enable_bluetooth; have_bluetooth=$enableval
-else
- have_bluetooth=yes
-fi
-
-
-have_bluetooth=no
-if test "x$have_bluetooth" = "xyes" -a "x$have_alsa" = "xyes"; then
- have_bluetooth=yes
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLUEZ" >&5
-$as_echo_n "checking for BLUEZ... " >&6; }
-
-if test -n "$BLUEZ_CFLAGS"; then
- pkg_cv_BLUEZ_CFLAGS="$BLUEZ_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 2.22\""; } >&5
- ($PKG_CONFIG --exists --print-errors "bluez >= 2.22") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_BLUEZ_CFLAGS=`$PKG_CONFIG --cflags "bluez >= 2.22" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$BLUEZ_LIBS"; then
- pkg_cv_BLUEZ_LIBS="$BLUEZ_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 2.22\""; } >&5
- ($PKG_CONFIG --exists --print-errors "bluez >= 2.22") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_BLUEZ_LIBS=`$PKG_CONFIG --libs "bluez >= 2.22" 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
-	 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "bluez >= 2.22" 2>&1`
- else
-	 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "bluez >= 2.22" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$BLUEZ_PKG_ERRORS" >&5
-
-	have_bluetooth="no"
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_bluetooth="no"
-else
-	BLUEZ_CFLAGS=$pkg_cv_BLUEZ_CFLAGS
-	BLUEZ_LIBS=$pkg_cv_BLUEZ_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	GENERAL_PLUGINS="$GENERAL_PLUGINS bluetooth"
-fi
- BLUEZ_LIBS=`pkg-config --libs bluez`
- BLUEZ_CFLAGS=`pkg-config --cflags bluez`
-else
- have_bluetooth=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** bluetooth audio support plugin disabled by request ***" >&5
-$as_echo "*** bluetooth audio support plugin disabled by request ***" >&6; }
-fi
-
-
-
-
-# Check whether --enable-paranormal was given.
-if test "${enable_paranormal+set}" = set; then :
- enableval=$enable_paranormal; have_paranormal=$enableval
-else
- have_paranormal=yes
-fi
-
-
-if test "x$have_paranormal" = "xyes"; then
- have_paranormal=yes
-
-# Check whether --with-sdl-prefix was given.
-if test "${with_sdl_prefix+set}" = set; then :
- withval=$with_sdl_prefix; sdl_prefix="$withval"
-else
- sdl_prefix=""
-fi
-
-
-# Check whether --with-sdl-exec-prefix was given.
-if test "${with_sdl_exec_prefix+set}" = set; then :
- withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
-else
- sdl_exec_prefix=""
-fi
-
-# Check whether --enable-sdltest was given.
-if test "${enable_sdltest+set}" = set; then :
- enableval=$enable_sdltest;
-else
- enable_sdltest=yes
-fi
-
-
- if test x$sdl_exec_prefix != x ; then
- sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
- if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
- fi
- fi
- if test x$sdl_prefix != x ; then
- sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
- if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_prefix/bin/sdl-config
- fi
- fi
-
- as_save_PATH="$PATH"
- if test "x$prefix" != xNONE; then
- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
- fi
- # Extract the first word of "sdl-config", so it can be a program name with args.
-set dummy sdl-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_SDL_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $SDL_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_SDL_CONFIG="$SDL_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_SDL_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
-
- test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
- ;;
-esac
-fi
-SDL_CONFIG=$ac_cv_path_SDL_CONFIG
-if test -n "$SDL_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5
-$as_echo "$SDL_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- PATH="$as_save_PATH"
- min_sdl_version=1.2.5
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5
-$as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
- no_sdl=""
- if test "$SDL_CONFIG" = "no" ; then
- no_sdl=yes
- else
- SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
- SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
-
- sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
- sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`
- sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
- sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\2/'`
- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
- sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\3/'`
- if test "x$enable_sdltest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_CXXFLAGS="$CXXFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- rm -f conf.sdltest
- if test "$cross_compiling" = yes; then :
- echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "SDL.h"
-
-char*
-my_strdup (char *str)
-{
- char *new_str;
-
- if (str)
- {
- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
- strcpy (new_str, str);
- }
- else
- new_str = NULL;
-
- return new_str;
-}
-
-int main (int argc, char *argv[])
-{
- int major, minor, micro;
- char *tmp_version;
-
- /* This hangs on some systems (?)
- system ("touch conf.sdltest");
- */
- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = my_strdup("$min_sdl_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
- printf("%s, bad version string\n", "$min_sdl_version");
- exit(1);
- }
-
- if (($sdl_major_version > major) ||
- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
- printf("*** to point to the correct copy of sdl-config, and remove the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
- }
-}
-
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
- no_sdl=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_sdl" = x ; 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; }
- if test "$SDL_CONFIG" = "no" ; then
- echo "*** The sdl-config script installed by SDL could not be found"
- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the SDL_CONFIG environment variable to the"
- echo "*** full path to sdl-config."
- else
- if test -f conf.sdltest ; then
- :
- else
- echo "*** Could not run SDL test program, checking why..."
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef main
-#define main K_and_R_C_main
-
-int
-main ()
-{
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding SDL or finding the wrong"
- echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
-	 echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-else
- echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
- echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- SDL_CFLAGS=""
- SDL_LIBS=""
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** SDL is not installed. Paranormal will not be built. ***" >&5
-$as_echo "$as_me: WARNING: *** SDL is not installed. Paranormal will not be built. ***" >&2;}
-	have_paranormal="no"
-
- fi
-
-
- rm -f conf.sdltest
-
-else
- have_paranormal=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** paranormal plugin disabled by request ***" >&5
-$as_echo "*** paranormal plugin disabled by request ***" >&6; }
-fi
-
-if test "x$have_paranormal" = "xyes"; then
-	VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS paranormal"
-fi
-
-
-
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML" >&5
@@ -17263,179 +16473,6 @@
 fi
 
 
-# Check whether --enable-projectm-1.0 was given.
-if test "${enable_projectm_1_0+set}" = set; then :
- enableval=$enable_projectm_1_0; have_projectm1=$enableval
-else
- have_projectm1=yes
-fi
-
-
-if test "$have_projectm1" = "yes"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPROJECTM1" >&5
-$as_echo_n "checking for LIBPROJECTM1... " >&6; }
-
-if test -n "$LIBPROJECTM1_CFLAGS"; then
- pkg_cv_LIBPROJECTM1_CFLAGS="$LIBPROJECTM1_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM >= 1.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libprojectM >= 1.1") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBPROJECTM1_CFLAGS=`$PKG_CONFIG --cflags "libprojectM >= 1.1" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$LIBPROJECTM1_LIBS"; then
- pkg_cv_LIBPROJECTM1_LIBS="$LIBPROJECTM1_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM >= 1.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libprojectM >= 1.1") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBPROJECTM1_LIBS=`$PKG_CONFIG --libs "libprojectM >= 1.1" 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
-	 LIBPROJECTM1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libprojectM >= 1.1" 2>&1`
- else
-	 LIBPROJECTM1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libprojectM >= 1.1" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBPROJECTM1_PKG_ERRORS" >&5
-
-	have_projectm1="no"
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_projectm1="no"
-else
-	LIBPROJECTM1_CFLAGS=$pkg_cv_LIBPROJECTM1_CFLAGS
-	LIBPROJECTM1_LIBS=$pkg_cv_LIBPROJECTM1_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_projectm1="yes"
-fi
-fi
-
-if test "$have_projectm1" = "yes"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKGLEXT" >&5
-$as_echo_n "checking for GTKGLEXT... " >&6; }
-
-if test -n "$GTKGLEXT_CFLAGS"; then
- pkg_cv_GTKGLEXT_CFLAGS="$GTKGLEXT_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkglext-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtkglext-1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTKGLEXT_CFLAGS=`$PKG_CONFIG --cflags "gtkglext-1.0" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$GTKGLEXT_LIBS"; then
- pkg_cv_GTKGLEXT_LIBS="$GTKGLEXT_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkglext-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtkglext-1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTKGLEXT_LIBS=`$PKG_CONFIG --libs "gtkglext-1.0" 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
-	 GTKGLEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtkglext-1.0" 2>&1`
- else
-	 GTKGLEXT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtkglext-1.0" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTKGLEXT_PKG_ERRORS" >&5
-
-	have_projectm1="no"
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_projectm1="no"
-else
-	GTKGLEXT_CFLAGS=$pkg_cv_GTKGLEXT_CFLAGS
-	GTKGLEXT_LIBS=$pkg_cv_GTKGLEXT_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_projectm1="yes"
-fi
-fi
-
-if test "$have_projectm1" = "yes"; then
-	LIBPROJECTM1_datadir=`pkg-config --variable=pkgdatadir libprojectM`;
-	LIBPROJECTM1_sysconfdir=`pkg-config --variable=sysconfdir libprojectM`;
- LIBPROJECTM1_prefix=`pkg-config --variable=prefix libprojectM`;
-	LIBPROJECTM1_CFLAGS="$LIBPROJECTM1_CFLAGS -DPROJECTM_DATADIR=\\\"$LIBPROJECTM1_datadir\\\" -DPROJECTM_SYSCONFDIR=\\\"$LIBPROJECTM1_sysconfdir\\\" -DPROJECTM_PREFIX=\\\"$LIBPROJECTM1_prefix\\\"";
-fi
-
-
-
-
-
-
-if test "x$have_projectm1" = "xyes"; then
-	VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS projectm-1.0"
-fi
-
-
 # Check whether --enable-moodbar was given.
 if test "${enable_moodbar+set}" = set; then :
 enableval=$enable_moodbar; enable_moodbar=$enableval
@@ -18058,35 +17095,6 @@
 fi
 
 
-if test $use_gtk3 = yes ; then
- for name in adplug alarm aosd evdev-plug jack ladspa lirc modplug moodbar paranormal projectm-1.0 sid skins spectrum streambrowser
- do
- echo " *** Disabling plugin because not GTK3-compatible: $name"
- CONTAINER_PLUGINS=`sed s/$name// << EOF
-$CONTAINER_PLUGINS
-EOF`
- EFFECT_PLUGINS=`sed s/$name// << EOF
-$EFFECT_PLUGINS
-EOF`
- GENERAL_PLUGINS=`sed s/$name// << EOF
-$GENERAL_PLUGINS
-EOF`
- INPUT_PLUGINS=`sed s/$name// << EOF
-$INPUT_PLUGINS
-EOF`
- OUTPUT_PLUGINS=`sed s/$name// << EOF
-$OUTPUT_PLUGINS
-EOF`
- TRANSPORT_PLUGINS=`sed s/$name// << EOF
-$TRANSPORT_PLUGINS
-EOF`
- VISUALIZATION_PLUGINS=`sed s/$name// << EOF
-$VISUALIZATION_PLUGINS
-EOF`
- done
-fi
-
-
 
 
 if test "x$arch_type" = "xix86"; then
@@ -18736,7 +17744,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 2.5.3, which was
+This file was extended by audacious-plugins $as_me 3.0, which was
 generated by GNU Autoconf 2.68. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -18802,7 +17810,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 2.5.3
+audacious-plugins config.status 3.0
 configured by $0, generated by GNU Autoconf 2.68,
 with options \\"\$ac_cs_config\\"
 
@@ -19762,7 +18770,7 @@
 echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
 echo " PulseAudio (pulse): $have_pulse"
 echo " RoarAudio (roaraudio): $have_roar"
-echo " Jack Audio Connection Kit (jack): $have_jack"
+echo " Jack Audio Connection Kit (jack): $enable_jack"
 echo " Mac OS X sound support (CoreAudio): $have_coreaudio"
 echo " Simple DirectMedia Layer (sdlout): $enable_sdlout"
 echo " FileWriter: $enable_filewriter"
@@ -19793,7 +18801,7 @@
 echo " -> distortion patched libSIDPlay2: $xs_have_distortion"
 echo " Game music (spc, nsf & gbs): $enable_console"
 echo " PlayStation (psf/psf2) audio: $enable_psf"
-echo " Nintendo 64 audio (usf): $enable_usf"
+echo " Nintendo 64 audio (usf) (experimental): $enable_usf"
 echo " Nintendo DS audio (xsf): $enable_xsf"
 echo " AdLib synthesizer (adplug): $have_adplug"
 echo " WavPack 4.31+ (wavpack): $have_wavpack"
@@ -19801,28 +18809,22 @@
 echo
 echo " General"
 echo " -------"
-echo " Alarm: yes"
 echo " Song Change: $enable_songchange"
 echo " Status Icon: $have_statusicon"
 echo " Audacious OSD: $have_aosd"
 echo " -> X Composite support: $have_aosd_xcomp"
 echo " libnotify OSD: $have_notify"
-echo " Control via event device (evdev-plug): $have_evdevplug"
 echo " Global Hotkey Plugin: $have_hotkey"
 echo " Gnome Shortcuts Plugin: $have_gnomeshortcuts"
-echo " LIRC: $have_lirc"
 echo " AudioScrobbler Client: $have_scrobbler"
 echo " Upload to MTP device: $have_mtp_up"
-echo " Bluetooth audio support: $have_bluetooth"
 echo " MacOS Dock Album Art plugin: $have_dockalbumart"
-echo " Streambrowser: $enable_streambrowser"
 echo " LyricWiki viewer: $enable_lyricwiki"
 echo " Album Art widget: yes"
 echo
 echo " Effect"
 echo " ------"
 echo " Dynamic Range Compressor: yes"
-echo " LADSPA effects host (ladspa): yes"
 echo " Voice Removal: yes"
 echo " Extra Stereo: yes"
 echo " Echo/Surround: yes"
@@ -19835,18 +18837,15 @@
 echo " Visualization"
 echo " -------------"
 echo " Blur Scope: yes"
-echo " Spectrum Analyzer: yes"
 echo " Cairo Spectrum Analyzer: yes"
 echo " Moodbar data renderer: $enable_moodbar"
-echo " Paranormal Visualization Library: $have_paranormal"
-echo " projectM 1.x (GL milkdrop): $have_projectm1"
 echo
 echo " Transport"
 echo " ---------"
-echo " gio transport: $enable_gio"
+echo " gio transport (experimental): $enable_gio"
 echo " neon-based http/https: $have_neon"
-echo " WinINet-based http/https: $enable_wininet"
 echo " libmms-based mms: $have_mms"
+echo " SMB transport: $enable_smb"
 echo
 echo " Container"
 echo " ---------"

audacious-plugins-2.5.3.tar.gz/configure.ac -> audacious-plugins-3.0.tar.gz/configure.ac Changed

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([audacious-plugins], [2.5.3])
+AC_INIT([audacious-plugins], [3.0])
 AC_COPYRIGHT([(C) 2005-2011 Audacious Team])
 AC_PREREQ([2.59])
 
@@ -42,7 +42,7 @@
 
 dnl Large file support
 dnl ==================
-CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
+AC_SYS_LARGEFILE
 
 dnl Locate a program and check that its version is acceptable.
 dnl AC_PROG_CHECK_VER(var, namelist, version-switch,
@@ -127,17 +127,17 @@
 
 INPUT_PLUGINS="tonegen metronom vtx"
 OUTPUT_PLUGINS="null"
-EFFECT_PLUGINS="compressor crossfade crystalizer mixdown ladspa sndstretch stereo_plugin voice_removal echo_plugin"
-GENERAL_PLUGINS="alarm albumart"
-VISUALIZATION_PLUGINS="blur_scope spectrum cairo-spectrum"
+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"
 
 dnl Check for Audacious
 
-PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 2.5],
- [ADD_PC_REQUIRES([audacious >= 2.5])],
- [AC_MSG_ERROR([Cannot find Audacious 2.5 or later, have you installed audacious yet?])]
+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"
@@ -147,13 +147,26 @@
 dnl Check for GTK/GLib/GThread/Pango
 
 AC_ARG_ENABLE([gtk3],
- [AS_HELP_STRING([--enable-gtk3], [Use GTK3 instead of GTK2])],
- [use_gtk3=$enableval], [use_gtk3=no])
+ [AS_HELP_STRING([--disable-gtk3], [Use GTK2 even if GTK3 is present])],
+ [use_gtk3=$enableval], [use_gtk3=yes])
+
+if test $use_gtk3 = yes ; then
+ PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.0.0], [use_gtk3=yes], [use_gtk3=no])
+fi
+
+if test $use_gtk3 = no ; then
+ PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.12.0], [use_gtk3=no],
+ AC_MSG_ERROR([Cannot find GTK headers. Aborting ...]))
+fi
+
+AC_SUBST([GTK_LIBS])
+AC_SUBST([GTK_CFLAGS])
 
 AUD_COMMON_PROGS
 
-AC_ARG_ENABLE(gio, [ --disable-gio disable GIO support (default=enabled if GIO present)],
- enable_gio=$enableval, enable_gio=yes)
+AC_ARG_ENABLE(gio,
+ AS_HELP_STRING([--enable-gio], [enable GIO support (default=disabled)]),
+ enable_gio=$enableval, enable_gio=no)
 
 if test "x$enable_gio" = "xyes"; then
 PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.0], [ADD_PC_REQUIRES([gio-2.0 >= 2.0])], [enable_gio=no])
@@ -403,13 +416,18 @@
 dnl *** MP3
 
 AC_ARG_ENABLE(mp3,
- [ --disable-mp3 disable mp3 plugin. (default=enabled) ],
- [enable_mp3=$enableval],
- [enable_mp3=yes]
-)
+ AS_HELP_STRING([--disable-mp3], [disable MP3 plugin (default=enabled)]),
+ [enable_mp3=$enableval], [enable_mp3=yes])
+
+if test $enable_mp3 = yes ; then
+ PKG_CHECK_MODULES(MPG123, [libmpg123 >= 1.12],
+ [enable_mp3=yes], [enable_mp3=no])
 
-if test "x$enable_mp3" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
+ if test $enable_mp3 = yes ; then
+ INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
+ else
+ AC_MSG_RESULT([*** libmpg123 not found; MP3 plugin disabled])
+ fi
 fi
 
 dnl *** Rocklight
@@ -424,56 +442,6 @@
 VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS rocklight"
 fi
 
-dnl *** LIRC client libraries
-
-AC_ARG_ENABLE(lirc,
- [ --disable-lirc disable LIRC plugin (default=enabled)],
- [enable_lirc=$enableval],
- [enable_lirc="yes"]
-)
-
-if test "x$enable_lirc" = "xyes"; then
- AC_CHECK_LIB([lirc_client],[lirc_init],[have_lirc=yes],[have_lirc=no])
-else
- AC_MSG_RESULT([*** LIRC plugin disabled per user request ***])
- have_lirc="no"
-fi
-
-if test "x$have_lirc" = "xyes"; then
-	AC_CHECK_HEADER(lirc/lirc_client.h,[],[have_lirc=no])
-fi
-
-if test "x$have_lirc" = "xyes"; then
-	GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"
-fi
-
-dnl *** EvDev-Plug general plugin (only built on Linux)
-
-AC_ARG_ENABLE(evdevplug,
- [ --disable-evdevplug disable Linux evdev plugin (default=enabled)],
- [enable_evdevplug=$enableval],
- [enable_evdevplug="yes"]
-)
-
-if test "x$enable_evdevplug" = "xyes"; then
- case "$target" in
- *-*-linux*)
- have_evdevplug="yes"
- ;;
- *)
- AC_MSG_RESULT([*** Linux evdev plugin disabled (host does not run linux) ***])
- have_evdevplug="no"
- ;;
- esac
-else
- AC_MSG_RESULT([*** Linux evdev plugin disabled per user request ***])
- have_evdevplug="no"
-fi
-
-if test "x$have_evdevplug" = "xyes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS evdev-plug"
-fi
-
 dnl *** Global Hotkey general plugin (only built on X11)
 
 AC_ARG_ENABLE(hotkey,
@@ -814,23 +782,10 @@
 [enable_ffaudio="yes"]
 )
 
-dnl In 2010, some libavcodec functions were moved into a new library called
-dnl libavcore, making our checks here a bit complex.
-dnl Later, in Feb, 2011 they got merged back into libavcodec.
-
 if test $enable_ffaudio = yes ; then
- PKG_CHECK_MODULES([NEED_AVCORE], [libavcodec >= 52.94.3 libavcodec <= 52.113.1],
- [have_split_ffmpeg=yes], [have_split_ffmpeg=no])
-
- if test $have_split_ffmpeg = yes ; then
- PKG_CHECK_MODULES([FFMPEG],
- [libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0],
- [have_ffaudio=yes], [have_ffaudio=no])
- else
- PKG_CHECK_MODULES([FFMPEG],
- [libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0],
- [have_ffaudio=yes], [have_ffaudio=no])
- fi
+ PKG_CHECK_MODULES([FFMPEG],
+ [libavcodec >= 52.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0],
+ [have_ffaudio=yes], [have_ffaudio=no])
 fi
 
 if test "x$have_ffaudio" = "xyes"; then
@@ -838,19 +793,22 @@
 fi
 
 dnl *** jack output plugin
-AC_ARG_ENABLE( jack,
-[ --disable-jack disable jack output plugin (default=enabled)], [enable_jack=$enableval],
- [enable_jack="yes"])
 
-if test "x$enable_jack" = "xyes"; then
- AM_PATH_JACK(have_jack=yes, have_jack=no)
-else
- AC_MSG_RESULT([*** jack plugin disabled per user request ***])
- have_jack=no
-fi
+AC_ARG_ENABLE(jack,
+ AS_HELP_STRING([--disable-jack], [disable JACK output plugin (default=enabled)]),
+ [enable_jack=$enableval], [enable_jack=yes])
 
-if test "x$have_jack" = "xyes"; then
-	OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
+if test $enable_jack = yes ; then
+ PKG_CHECK_MODULES(JACK, [jack >= 1.9.7],
+ [enable_jack=$enable_jack], [enable_jack=no])
+ AC_CHECK_LIB([samplerate], [src_process],
+ [enable_jack=$enable_jack], [enable_jack=no])
+
+ if test $enable_jack = yes ; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
+ else
+ AC_MSG_RESULT([*** JACK or libsamplerate not found; JACK output plugin disabled])
+ fi
 fi
 
 dnl *** sid
@@ -942,72 +900,60 @@
 dnl *** OSS4 output
 
 AC_ARG_ENABLE(oss4,
- [ --enable-oss4 enable the OSS4 output plugin (default=disabled)],
+ [ --disable-oss4 disable the OSS4 output plugin],
 [enable_oss4=$enableval],
- [enable_oss4=no]
+ [enable_oss4=yes]
 )
 
-have_oss4=no
 if test "x$enable_oss4" = "xyes"; then
 AC_MSG_CHECKING(for OSS4 include dir)
- OSS4_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
- OSS4_CFLAGS="-I$t/include"
- fi
- fi
- done
- fi
- if test -n "$OSS4_CFLAGS" ; then
- AC_MSG_RESULT([$OSS4_CFLAGS])
+
+ if test -f "/etc/oss.conf"; then
+ . "/etc/oss.conf"
 else
- AC_MSG_RESULT([not found])
+ OSSLIBDIR="/usr/lib/oss"
 fi
- CFLAGS_save=$CFLAGS
- CFLAGS="$CFLAGS $OSS4_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_oss4=yes
+ 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 "x${have_oss4}" = "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 -n "$OSS4_CPPFLAGS"; then
+ AC_MSG_RESULT([$OSS4_CPPFLAGS])
+ have_oss4=yes
+ else
+ AC_MSG_RESULT([not found])
+ have_oss4=no
+ fi
 
-if test "x$have_oss4" = "xyes"; then
- AC_DEFINE(HAVE_OSS4, 1, [Define if the OSS4 output plugin should be built])
+ if test "x$have_oss4" = "xyes"; then
+ CPPFLAGS_save=$CPPFLAGS
+ CPPFLAGS=$OSS4_CPPFLAGS
+ AC_MSG_CHECKING(for OSS4)
+ AC_EGREP_CPP(yes,
+ [#include <soundcard.h>
+ #if OSS_VERSION >= 0x040000
+ 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
 fi
 
 if test "x$have_oss4" = "xyes"; then
-	OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
+ AC_SUBST(OSS4_CPPFLAGS)
 fi
 
-AC_SUBST(OSS_LIBS)
-
 dnl *** ALSA output plugin
 
 AC_ARG_ENABLE(alsa,
@@ -1017,9 +963,7 @@
 )
 
 if test "x$enable_alsa" = "xyes"; then
- PKG_CHECK_MODULES([ALSA], [alsa >= 1.0], [have_alsa=yes], [have_alsa=no])
- AC_CHECK_LIB([asound], [snd_device_name_hint],
- AC_DEFINE(HAVE_SND_DEVICE_NAME_HINT, 1, Define if you have snd_device_name_hint))
+ PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.16], [have_alsa=yes], [have_alsa=no])
 else
 AC_MSG_RESULT([*** ALSA output plugin disabled per user request ***])
 have_alsa=no
@@ -1181,19 +1125,6 @@
 )
 fi
 
-dnl Streambrowser
-dnl =============
-
-AC_ARG_ENABLE(streambrowser,
- [ --disable-streambrowser disable streambrowser general plugin (default=enabled) ],
- [enable_streambrowser=$enableval],
- [enable_streambrowser=yes]
-)
-
-if test "$enable_streambrowser" = "yes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS streambrowser"
-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")
 
@@ -1280,23 +1211,6 @@
 AC_SUBST([NEON_LIBS])
 AC_SUBST([NEON_CFLAGS])
 
-dnl WinINet HTTP plugin
-dnl ===================
-
-enable_wininet=yes
-if test $have_neon = yes ; then
- enable_wininet=no
-fi
-
-AC_ARG_ENABLE(wininet,
- [ --enable-wininet enable WinINet HTTP support],
- enable_wininet=$enableval, enable_wininet=$enable_wininet)
-
-if test $enable_wininet = yes ; then
- AC_CHECK_HEADERS([wininet.h],
- [TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS wininet"], [enable_wininet=no])
-fi
-
 dnl MMS
 dnl ===
 
@@ -1313,6 +1227,22 @@
 AC_MSG_RESULT([*** mms plugin disabled by request ***])
 fi
 
+dnl SMB
+dnl ===
+
+AC_ARG_ENABLE(smb,
+ AS_HELP_STRING([--disable-smb], [disable SMB transport (default=enabled)]),
+ [enable_smb=$enableval], [enable_smb=yes])
+
+if test $enable_smb = yes ; then
+ AC_CHECK_HEADERS([libsmbclient.h], [enable_smb=yes], [enable_smb=no])
+
+ if test $enable_smb = yes ; then
+ TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS smb"
+ else
+ AC_MSG_RESULT([*** libsmbclient not found; SMB client disabled])
+ fi
+fi
 
 dnl *** MTP Upload
 
@@ -1333,51 +1263,6 @@
 AC_SUBST(MTP_LIBS)
 AC_SUBST(MTP_CFLAGS)
 
-dnl *** Bluetooth audio support
-
-AC_ARG_ENABLE(bluetooth,
-[ --disable-bluetooth disable bluetooth audio support. (default=enabled)],
-[have_bluetooth=$enableval],
-[have_bluetooth=yes])
-
-dnl This has been broken by the output plugin on-demand work
-have_bluetooth=no
-if test "x$have_bluetooth" = "xyes" -a "x$have_alsa" = "xyes"; then
- have_bluetooth=yes
- PKG_CHECK_MODULES(BLUEZ, [bluez >= 2.22],
- [GENERAL_PLUGINS="$GENERAL_PLUGINS bluetooth" ], [have_bluetooth="no"])
- BLUEZ_LIBS=`pkg-config --libs bluez`
- BLUEZ_CFLAGS=`pkg-config --cflags bluez`
-else
- have_bluetooth=no
- AC_MSG_RESULT([*** bluetooth audio support plugin disabled by request ***])
-fi
-AC_SUBST(BLUEZ_LIBS)
-AC_SUBST(BLUEZ_CFLAGS)
-
-dnl *** libparanormal checks
-
-AC_ARG_ENABLE(paranormal,
-[ --disable-paranormal disable paranormal vis plugin. (default=enabled)],
-[have_paranormal=$enableval],
-[have_paranormal=yes])
-
-if test "x$have_paranormal" = "xyes"; then
- have_paranormal=yes
- AM_PATH_SDL(1.2.5, , [
-	AC_MSG_WARN([*** SDL is not installed. Paranormal will not be built. ***])
-	have_paranormal="no"
- ])
-else
- have_paranormal=no
- AC_MSG_RESULT([*** paranormal plugin disabled by request ***])
-fi
-
-if test "x$have_paranormal" = "xyes"; then
-	VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS paranormal"
-fi
-
-
 dnl XSPF
 dnl ----
 
@@ -1406,37 +1291,6 @@
 AC_MSG_RESULT([*** cue plugin disabled by request ***])
 fi
 
-dnl *** projectM (GL Milkdrop port)
-
-AC_ARG_ENABLE(projectm-1.0,
-[ --disable-projectm-1.0 disable projectM 1.0+ vis plugin. (default=enabled)],
-[have_projectm1=$enableval],
-[have_projectm1=yes])
-
-if test "$have_projectm1" = "yes"; then
-	PKG_CHECK_MODULES(LIBPROJECTM1, [libprojectM >= 1.1], [have_projectm1="yes"], [have_projectm1="no"])
-fi
-
-if test "$have_projectm1" = "yes"; then
-	PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0], [have_projectm1="yes"], [have_projectm1="no"])
-fi
-
-if test "$have_projectm1" = "yes"; then
-	LIBPROJECTM1_datadir=`pkg-config --variable=pkgdatadir libprojectM`;
-	LIBPROJECTM1_sysconfdir=`pkg-config --variable=sysconfdir libprojectM`;
- LIBPROJECTM1_prefix=`pkg-config --variable=prefix libprojectM`;
-	LIBPROJECTM1_CFLAGS="$LIBPROJECTM1_CFLAGS -DPROJECTM_DATADIR=\\\"$LIBPROJECTM1_datadir\\\" -DPROJECTM_SYSCONFDIR=\\\"$LIBPROJECTM1_sysconfdir\\\" -DPROJECTM_PREFIX=\\\"$LIBPROJECTM1_prefix\\\"";
-fi
-
-AC_SUBST(LIBPROJECTM1_LIBS)
-AC_SUBST(LIBPROJECTM1_CFLAGS)
-AC_SUBST(GTKGLEXT_LIBS)
-AC_SUBST(GTKGLEXT_CFLAGS)
-
-if test "x$have_projectm1" = "xyes"; then
-	VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS projectm-1.0"
-fi
-
 dnl Moodbar
 dnl =========
 
@@ -1596,37 +1450,6 @@
 GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"
 fi
 
-dnl GTK3 overrides
-dnl ==============
-
-if test $use_gtk3 = yes ; then
- for name in adplug alarm aosd evdev-plug jack ladspa lirc modplug moodbar paranormal projectm-1.0 sid skins spectrum streambrowser
- do
- echo " *** Disabling plugin because not GTK3-compatible: $name"
- CONTAINER_PLUGINS=`sed s/$name// << EOF
-$CONTAINER_PLUGINS
-EOF`
- EFFECT_PLUGINS=`sed s/$name// << EOF
-$EFFECT_PLUGINS
-EOF`
- GENERAL_PLUGINS=`sed s/$name// << EOF
-$GENERAL_PLUGINS
-EOF`
- INPUT_PLUGINS=`sed s/$name// << EOF
-$INPUT_PLUGINS
-EOF`
- OUTPUT_PLUGINS=`sed s/$name// << EOF
-$OUTPUT_PLUGINS
-EOF`
- TRANSPORT_PLUGINS=`sed s/$name// << EOF
-$TRANSPORT_PLUGINS
-EOF`
- VISUALIZATION_PLUGINS=`sed s/$name// << EOF
-$VISUALIZATION_PLUGINS
-EOF`
- done
-fi
-
 dnl *** End of all plugin checks ***
 
 AC_SUBST(ARCH_DEFINES)
@@ -1707,7 +1530,7 @@
 echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
 echo " PulseAudio (pulse): $have_pulse"
 echo " RoarAudio (roaraudio): $have_roar"
-echo " Jack Audio Connection Kit (jack): $have_jack"
+echo " Jack Audio Connection Kit (jack): $enable_jack"
 echo " Mac OS X sound support (CoreAudio): $have_coreaudio"
 echo " Simple DirectMedia Layer (sdlout): $enable_sdlout"
 echo " FileWriter: $enable_filewriter"
@@ -1738,7 +1561,7 @@
 echo " -> distortion patched libSIDPlay2: $xs_have_distortion"
 echo " Game music (spc, nsf & gbs): $enable_console"
 echo " PlayStation (psf/psf2) audio: $enable_psf"
-echo " Nintendo 64 audio (usf): $enable_usf"
+echo " Nintendo 64 audio (usf) (experimental): $enable_usf"
 echo " Nintendo DS audio (xsf): $enable_xsf"
 echo " AdLib synthesizer (adplug): $have_adplug"
 echo " WavPack 4.31+ (wavpack): $have_wavpack"
@@ -1746,28 +1569,22 @@
 echo
 echo " General"
 echo " -------"
-echo " Alarm: yes"
 echo " Song Change: $enable_songchange"
 echo " Status Icon: $have_statusicon"
 echo " Audacious OSD: $have_aosd"
 echo " -> X Composite support: $have_aosd_xcomp"
 echo " libnotify OSD: $have_notify"
-echo " Control via event device (evdev-plug): $have_evdevplug"
 echo " Global Hotkey Plugin: $have_hotkey"
 echo " Gnome Shortcuts Plugin: $have_gnomeshortcuts"
-echo " LIRC: $have_lirc"
 echo " AudioScrobbler Client: $have_scrobbler"
 echo " Upload to MTP device: $have_mtp_up"
-echo " Bluetooth audio support: $have_bluetooth"
 echo " MacOS Dock Album Art plugin: $have_dockalbumart"
-echo " Streambrowser: $enable_streambrowser"
 echo " LyricWiki viewer: $enable_lyricwiki"
 echo " Album Art widget: yes"
 echo
 echo " Effect"
 echo " ------"
 echo " Dynamic Range Compressor: yes"
-echo " LADSPA effects host (ladspa): yes"
 echo " Voice Removal: yes"
 echo " Extra Stereo: yes"
 echo " Echo/Surround: yes"
@@ -1780,18 +1597,15 @@
 echo " Visualization"
 echo " -------------"
 echo " Blur Scope: yes"
-echo " Spectrum Analyzer: yes"
 echo " Cairo Spectrum Analyzer: yes"
 echo " Moodbar data renderer: $enable_moodbar"
-echo " Paranormal Visualization Library: $have_paranormal"
-echo " projectM 1.x (GL milkdrop): $have_projectm1"
 echo
 echo " Transport"
 echo " ---------"
-echo " gio transport: $enable_gio"
+echo " gio transport (experimental): $enable_gio"
 echo " neon-based http/https: $have_neon"
-echo " WinINet-based http/https: $enable_wininet"
 echo " libmms-based mms: $have_mms"
+echo " SMB transport: $enable_smb"
 echo
 echo " Container"
 echo " ---------"

audacious-plugins-2.5.3.tar.gz/extra.mk.in -> audacious-plugins-3.0.tar.gz/extra.mk.in Changed

audacious-plugins-2.5.3.tar.gz/m4/buildsys.m4 -> audacious-plugins-3.0.tar.gz/m4/buildsys.m4 Changed

@@ -101,8 +101,8 @@
 			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'
+			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*)
@@ -115,8 +115,8 @@
 			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}'
+			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*)
@@ -129,8 +129,8 @@
 			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'
+			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
+			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
 			CLEAN_LIB=''
 			;;
 		cygwin* | mingw*)
@@ -143,8 +143,8 @@
 			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'
+			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'
 			;;
 		*)
@@ -157,8 +157,8 @@
 			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'
+			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

audacious-plugins-2.5.3.tar.gz/po/POTFILES.in -> audacious-plugins-3.0.tar.gz/po/POTFILES.in Changed

@@ -1,7 +1,5 @@
 # Please don't update this file manually - use ./update-potfiles.sh instead!
 src/aac/libmp4.c
-src/adplug/adplug-xmms.cc
-src/alarm/interface.c
 src/alsa/config.c
 src/alsa/plugin.c
 src/amidi-plug/amidi-plug.c
@@ -17,10 +15,6 @@
 src/aosd/aosd_style.c
 src/aosd/aosd_trigger.c
 src/aosd/aosd_ui.c
-src/bluetooth/agent.c
-src/bluetooth/bluetooth.c
-src/bluetooth/gui.c
-src/bluetooth/scan_gui.c
 src/blur_scope/config.c
 src/cdaudio-ng/cdaudio-ng.c
 src/cdaudio-ng/configure.c
@@ -59,9 +53,6 @@
 src/crystalizer/crystalizer.c
 src/daemon/daemon.c
 src/echo_plugin/gui.c
-src/evdev-plug/ed.c
-src/evdev-plug/ed_internals.c
-src/evdev-plug/ed_ui.c
 src/ffaudio/ffaudio-core.c
 src/filewriter/filewriter.c
 src/filewriter/mp3.c
@@ -70,36 +61,27 @@
 src/gnomeshortcuts/gnomeshortcuts.c
 src/gntui/fileselector.c
 src/gntui/gntui.c
-src/gtkui/actions.c
 src/gtkui/columns.c
 src/gtkui/layout.c
+src/gtkui/menus.c
 src/gtkui/ui_gtk.c
-src/gtkui/ui_manager.c
 src/gtkui/ui_playlist_widget.c
 src/gtkui/ui_statusbar.c
 src/hotkey/gui.c
 src/jack/bio2jack.c
 src/jack/configure.c
 src/jack/jack.c
-src/ladspa/ladspa.c
-src/lirc/about.c
-src/lirc/interface.c
-src/lirc/lirc.c
 src/lyricwiki/lyricwiki.c
 src/metronom/metronom.c
-src/modplug/gui/interface.cxx
-src/modplug/gui/main.cxx
-src/modplug/gui/modplug.glade
-src/modplug/gui/support.cxx
 src/mpg123/mpg123.c
 src/mtp_up/mtp.c
+src/notify/libnotify-aosd_event.c
 src/null/null.c
 src/oss4/configure.c
 src/oss4/plugin.c
 src/oss4/utils.c
 src/OSS/configure.c
 src/OSS/OSS.c
-src/paranormal/libcalc/parser.c
 src/pulse_audio/pulse_audio.c
 src/resample/plugin.c
 src/scrobbler/configure.c
@@ -118,17 +100,13 @@
 src/skins/ui_main.c
 src/skins/ui_manager.c
 src/skins/ui_playlist.c
-src/skins/ui_skinned_equalizer_slider.c
 src/skins/ui_skinselector.c
 src/skins/util.c
 src/sndfile/plugin.c
 src/sndstretch/sndstretch_xmms.c
 src/song_change/song_change.c
-src/spectrum/spectrum.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

audacious-plugins-2.5.3.tar.gz/po/audacious-plugins.pot -> audacious-plugins-3.0.tar.gz/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-05-23 08:33-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-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"
@@ -18,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -26,525 +26,47 @@
 "Copyright (c) 2005-2006 Audacious team"
 msgstr ""
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:155
-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 ""
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr ""
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr ""
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr ""
-
-#: src/alarm/interface.c:56
-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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr ""
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr ""
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr ""
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr ""
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr ""
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr ""
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr ""
-
-#: src/alarm/interface.c:213
-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:229
-msgid "Oh Well"
-msgstr ""
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr ""
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr ""
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr ""
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr ""
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr ""
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr ""
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr ""
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr ""
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr ""
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr ""
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr ""
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr ""
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr ""
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr ""
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr ""
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr ""
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr ""
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr ""
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr ""
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr ""
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr ""
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr ""
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr ""
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr ""
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr ""
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr ""
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr ""
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr ""
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr ""
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr ""
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr ""
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr ""
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr ""
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr ""
-
-#: src/alarm/interface.c:1364
-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:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr ""
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr ""
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr ""
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr ""
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 msgid "Default mixer device"
 msgstr ""
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 msgid "ALSA Output Plugin Preferences"
 msgstr ""
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 msgid "PCM device:"
 msgstr ""
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr ""
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 msgid "Mixer element:"
 msgstr ""
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
 msgstr ""
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -692,6 +214,10 @@
 msgid "SoundFont settings"
 msgstr ""
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr ""
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr ""
@@ -794,8 +320,7 @@
 "backend"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr ""
 
@@ -941,198 +466,198 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:808
+#: 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"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1145,125 +670,6 @@
 "\n"
 msgstr ""
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr ""
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr ""
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr ""
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr ""
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr ""
-
-#: src/bluetooth/gui.c:224
-msgid "Current Headset"
-msgstr ""
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr ""
-
-#: src/bluetooth/gui.c:231
-msgid "_Connect"
-msgstr ""
-
-#: src/bluetooth/gui.c:237
-msgid "_Close"
-msgstr ""
-
-#: src/bluetooth/gui.c:274
-msgid "Class"
-msgstr ""
-
-#: src/bluetooth/gui.c:278
-msgid "Address:"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:138
-msgid "Rescan"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr ""
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr ""
@@ -1272,11 +678,11 @@
 msgid "Options:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 msgid "About Audio CD Plugin"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1291,15 +697,15 @@
 "Copyright 2009 John Lindgren"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 msgid "Audio CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -1347,11 +753,23 @@
 msgid "Override default device: "
 msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+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 ""
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr ""
 
@@ -1375,6 +793,14 @@
 msgid "Game Console Music Decoder"
 msgstr ""
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr ""
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr ""
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr ""
@@ -1392,8 +818,7 @@
 msgid "Default song length:"
 msgstr ""
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr ""
 
@@ -1405,6 +830,10 @@
 msgid "Resampling rate:"
 msgstr ""
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr ""
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr ""
@@ -1464,16 +893,16 @@
 "same rate."
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr ""
 
@@ -1509,335 +938,31 @@
 msgid "Volume: (%)"
 msgstr ""
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr ""
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr ""
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr ""
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr ""
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr ""
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr ""
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr ""
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr ""
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr ""
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr ""
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr ""
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr ""
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr ""
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr ""
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr ""
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr ""
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:212
-msgid "Detected"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:217
-msgid "Custom"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:223
-msgid "Not Detected"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:353
-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 ""
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:1491
-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 ""
-
-#: src/ffaudio/ffaudio-core.c:765
+#: 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"
 "Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -1857,51 +982,51 @@
 "USA."
 msgstr ""
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr ""
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr ""
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr ""
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -1913,6 +1038,14 @@
 msgid "Joint Stereo"
 msgstr ""
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr ""
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr ""
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr ""
@@ -1958,7 +1091,6 @@
 msgstr ""
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr ""
 
@@ -2060,11 +1192,11 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2073,58 +1205,22 @@
 "\n"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 msgid "Add Files"
 msgstr ""
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 msgid "Audacious2"
 msgstr ""
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr ""
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr ""
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr ""
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr ""
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr ""
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr ""
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-msgid "Export Playlist"
-msgstr ""
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-msgid "Import Playlist"
-msgstr ""
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr ""
@@ -2209,402 +1305,271 @@
 msgid "Disable"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
+#: src/gtkui/menus.c:132
+msgid "_Open Files ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
+#: src/gtkui/menus.c:133
+msgid "Open _URL ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:55
-msgid "Show statusbar"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:56
-msgid "Show/hide statusbar"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:60
-msgid "Scroll on Song Change"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:95
-msgid "Import Playlist ..."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:98
-msgid "Export Playlist ..."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-msgid "Save All Playlists"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:106
-msgid "Refresh"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
+#: src/gtkui/menus.c:134
+msgid "_Add File ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:110
-msgid "Refresh Selected"
+#: src/gtkui/menus.c:135
+msgid "Add U_RL ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
+#: src/gtkui/menus.c:137
+msgid "A_bout ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:115
-msgid "Playlist Manager"
+#: src/gtkui/menus.c:138
+msgid "_Preferences ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
+#: src/gtkui/menus.c:142
+msgid "_Play"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
+#: src/gtkui/menus.c:143
+msgid "Paus_e"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:123
-msgid "Add Files ..."
+#: src/gtkui/menus.c:144
+msgid "_Stop"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
+#: src/gtkui/menus.c:145
+msgid "Pre_vious"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
+#: src/gtkui/menus.c:146
+msgid "_Next"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
+#: src/gtkui/menus.c:148
+msgid "_Repeat"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
+#: src/gtkui/menus.c:149
+msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
+#: src/gtkui/menus.c:150
+msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
+#: src/gtkui/menus.c:151
+msgid "Stop _After This Song"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
+#: src/gtkui/menus.c:154
+msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:140
-msgid "Edit the playlist title."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
+#: src/gtkui/menus.c:158
+msgid "By Track _Number"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:146
-msgid "Sort"
+#: src/gtkui/menus.c:159
+msgid "By _Title"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
+#: src/gtkui/menus.c:160
+msgid "By _Artist"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
+#: src/gtkui/menus.c:161
+msgid "By A_lbum"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
+#: src/gtkui/menus.c:162
+msgid "By Release _Date"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
-msgid "By Album"
+#: src/gtkui/menus.c:163
+msgid "By _File Path"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:155
-msgid "By Release Date"
+#: src/gtkui/menus.c:164
+msgid "By _Custom Title"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:157
-msgid "By File Path"
+#: src/gtkui/menus.c:166
+msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:159
-msgid "By Formatted Title"
+#: src/gtkui/menus.c:167
+msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
+#: src/gtkui/menus.c:172
+msgid "_Sort"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
+#: src/gtkui/menus.c:174
+msgid "_New"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
+#: src/gtkui/menus.c:175
+msgid "_Close"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
+#: src/gtkui/menus.c:177
+msgid "_Import ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
+#: src/gtkui/menus.c:178
+msgid "_Export ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
+#: src/gtkui/menus.c:180
+msgid "_Playlist Manager ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
+#: src/gtkui/menus.c:183
+msgid "Volume _Up"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:188
-msgid "Components"
+#: src/gtkui/menus.c:184
+msgid "Volume _Down"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
+#: src/gtkui/menus.c:186
+msgid "_Equalizer"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
+#: src/gtkui/menus.c:188
+msgid "E_ffects"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
+#: src/gtkui/menus.c:191
+msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
+#: src/gtkui/menus.c:194
+msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
+#: src/gtkui/menus.c:195
+msgid "Show _Status Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
+#: src/gtkui/menus.c:197
+msgid "Show Column _Headers"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
+#: src/gtkui/menus.c:198
+msgid "Choose _Columns ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
+#: src/gtkui/menus.c:199
+msgid "Scrol_l on Song Change"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
+#: src/gtkui/menus.c:202
+msgid "_File"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
+#: src/gtkui/menus.c:203
+msgid "_Playback"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
+#: src/gtkui/menus.c:204
+msgid "P_laylist"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+msgid "_Services"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
+#: src/gtkui/menus.c:206
+msgid "_Output"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
+#: src/gtkui/menus.c:207
+msgid "_View"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
+#: src/gtkui/menus.c:215
+msgid "_Copy"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
+#: src/gtkui/menus.c:216
+msgid "_Paste"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-msgid "Cut"
+#: src/gtkui/menus.c:217
+msgid "Select _All"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
+#: src/gtkui/menus.c:222
+msgid "_Rename"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
+#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+msgid "Audacious"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, c-format
 msgid "%d kbps"
 msgstr ""
@@ -2613,10 +1578,18 @@
 msgid "Previous Track"
 msgstr ""
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr ""
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr ""
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr ""
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr ""
@@ -2641,6 +1614,10 @@
 msgid "Volume Down"
 msgstr ""
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr ""
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr ""
@@ -2649,11 +1626,19 @@
 msgid "Show On-Screen-Display"
 msgstr ""
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+msgid "Toggle Repeat"
+msgstr ""
+
+#: src/hotkey/gui.c:85
+msgid "Toggle Shuffle"
+msgstr ""
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr ""
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2661,37 +1646,37 @@
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr ""
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr ""
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr ""
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr ""
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr ""
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr ""
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -2746,125 +1731,29 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr ""
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr ""
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr ""
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr ""
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr ""
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr ""
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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 ""
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr ""
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr ""
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr ""
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
+"Looking for lyrics..."
 msgstr ""
 
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr ""
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr ""
-
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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 ""
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr ""
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr ""
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr ""
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
 msgstr ""
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr ""
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2873,231 +1762,38 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:286
-msgid "96 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr ""
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr ""
-
-#: src/modplug/gui/main.cxx:52
-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 ""
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr ""
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
+#: src/mtp_up/mtp.c:298
+msgid "Upload in progress..."
 msgstr ""
 
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
 msgstr ""
 
-#: src/mtp_up/mtp.c:290
-msgid "Upload in progress..."
+#: src/mtp_up/mtp.c:311
+msgid "Disconnect MTP Device"
 msgstr ""
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
+#: src/notify/libnotify-aosd_event.c:47
+msgid "Stopped"
 msgstr ""
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
+#: src/notify/libnotify-aosd_event.c:47
+msgid "Audacious is not playing."
 msgstr ""
 
 #: src/null/null.c:64
@@ -3146,11 +1842,11 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr ""
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
@@ -3181,6 +1877,11 @@
 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 ""
@@ -3237,11 +1938,11 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3281,27 +1982,27 @@
 msgid "Method:"
 msgstr ""
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 msgid "Change password"
 msgstr ""
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr ""
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr ""
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr ""
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 msgid "Scrobbler URL:"
 msgstr ""
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr ""
 
@@ -3309,7 +2010,7 @@
 msgid "Scrobbler"
 msgstr ""
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3317,15 +2018,15 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr ""
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 msgid "About SDL Output Plugin"
 msgstr ""
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 msgid "SDL error"
 msgstr ""
 
@@ -3334,10 +2035,18 @@
 msgid "About %s"
 msgstr ""
 
-#: src/sid/xs_config.c:323
+#: 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 ""
@@ -3347,6 +2056,11 @@
 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 ""
@@ -3621,15 +2335,15 @@
 msgid "Use"
 msgstr ""
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: 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:435
+#: 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:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr ""
 
@@ -3660,6 +2374,11 @@
 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 ""
@@ -3891,678 +2610,815 @@
 msgid "No"
 msgstr ""
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr ""
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 msgstr ""
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr ""
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr ""
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr ""
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
-msgstr ""
-
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr ""
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
 msgstr ""
 
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
+#: src/skins/skins_cfg.c:393
+msgid "Interface Preferences"
 msgstr ""
 
-#: src/skins/skins_cfg.c:330
-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 ""
-
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
 msgstr ""
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr ""
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr ""
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr ""
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr ""
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr ""
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr ""
-
-#: src/skins/ui_main.c:993
-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 ""
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr ""
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr ""
-
-#: src/skins/ui_main.c:1052
-#, c-format
-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 ""
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr ""
-
-#: src/skins/ui_main.c:1275
+#: src/skins/ui_main.c:807
 #, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr ""
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr ""
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr ""
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr ""
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr ""
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 msgid "Playlist mode."
 msgstr ""
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr ""
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr ""
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr ""
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
-msgid "Peaks"
-msgstr ""
-
 #: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
-msgid "Show Player"
+msgid "Stop after Current Song"
 msgstr ""
 
 #: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
-msgid "Show Playlist Editor"
+msgid "Peaks"
 msgstr ""
 
 #: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
-msgid "Show Equalizer"
+msgid "Repeat"
 msgstr ""
 
 #: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
-msgid "Always on Top"
+msgid "Shuffle"
 msgstr ""
 
 #: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
-msgid "Put on All Workspaces"
+msgid "No Playlist Advance"
 msgstr ""
 
 #: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
-msgid "Roll up Player"
+msgid "Show Player"
 msgstr ""
 
 #: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
-msgid "Roll up Playlist Editor"
+msgid "Show Playlist Editor"
 msgstr ""
 
 #: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
-msgid "Roll up Equalizer"
+msgid "Show Equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+msgid "Always on Top"
 msgstr ""
 
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+msgid "Put on All Workspaces"
 msgstr ""
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+msgid "Roll up Player"
 msgstr ""
 
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+msgid "Roll up Playlist Editor"
+msgstr ""
+
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+msgid "Roll up Equalizer"
+msgstr ""
+
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr ""
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr ""
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr ""
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr ""
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr ""
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr ""
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr ""
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr ""
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr ""
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr ""
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr ""
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr ""
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr ""
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr ""
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr ""
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr ""
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr ""
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr ""
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr ""
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr ""
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+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:228
-msgid "List Manager"
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
 msgstr ""
 
 #: src/skins/ui_manager.c:238
+msgid "List Manager"
+msgstr ""
+
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr ""
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr ""
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr ""
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr ""
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr ""
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr ""
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr ""
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:270
-msgid "Clear Queue"
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr ""
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
 msgstr ""
 
 #: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr ""
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:277
+msgid "Remove All"
+msgstr ""
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:281
+msgid "Clear Queue"
+msgstr ""
+
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr ""
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr ""
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr ""
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr ""
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr ""
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr ""
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr ""
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr ""
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr ""
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+msgid "By Album"
+msgstr ""
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr ""
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr ""
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr ""
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr ""
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr ""
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr ""
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr ""
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr ""
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr ""
 
-#: src/skins/ui_manager.c:379
-msgid "Plugin Services"
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr ""
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
 msgstr ""
 
 #: src/skins/ui_manager.c:390
+msgid "Plugin Services"
+msgstr ""
+
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr ""
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr ""
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr ""
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr ""
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr ""
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr ""
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr ""
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr ""
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr ""
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr ""
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr ""
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr ""
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr ""
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr ""
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr ""
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr ""
+
+#: src/skins/ui_manager.c:436
+msgid "Cut"
+msgstr ""
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr ""
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr ""
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr ""
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr ""
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:374
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:382
+#: 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 "
@@ -4570,104 +3426,52 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr ""
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:419
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:422
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:425
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:776
-msgid "Save as Static Playlist"
-msgstr ""
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr ""
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr ""
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr ""
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "250 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "500 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "1 kHz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "2 kHz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "4 kHz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "8 kHz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "16 kHz"
-msgstr ""
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr ""
@@ -4699,53 +3503,61 @@
 "Boston, MA 02110-1301 USA"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr ""
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr ""
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr ""
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr ""
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr ""
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr ""
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -4764,24 +3576,20 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 msgid "Song Change"
 msgstr ""
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr ""
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr ""
@@ -4844,60 +3652,19 @@
 "By Johan Levin 1999."
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr ""
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-msgid "Search:"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-msgid "Stream name"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-msgid "Remove Bookmark"
-msgstr ""
-
-#: src/streambrowser/streambrowser.c:340
-msgid "About Stream Browser"
-msgstr ""
-
-#: src/streambrowser/streambrowser.c:341
-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:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4906,12 +3673,12 @@
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr ""
 
@@ -4931,15 +3698,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr ""
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr ""
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr ""
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"

audacious-plugins-2.5.3.tar.gz/po/ca.po -> audacious-plugins-3.0.tar.gz/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-05-19 10:53-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"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, fuzzy, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -26,618 +26,55 @@
 "Descodificador FAAD2 AAC/HE-AAC/HE-AACv2/DRM (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Equip de l'Audacious"
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 #, fuzzy
 msgid "About MP4 AAC decoder plugin"
 msgstr "Quant al connector per a àudio MPEG"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "Quant al connector "
-
-#: src/adplug/adplug-xmms.cc:155
-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"
-"Aquest connector s'ha publicat sota els termes i condicions de la\n"
-"llicència GNU LGPL. Vegeu http://www.gnu.org/licenses/lgpl.html per a\n"
-"més detalls.\n"
-"\n"
-"Aquest connector fa ús de la llibreria AdPlug, el copyright (C) de la qual\n"
-"pertany a Simon Peter, et al.\n"
-"\n"
-"Versió de la llibreria AdPlug enllaçada: "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: Configuració"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "D'acord"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "General"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Qualitat de so"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Resolució"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8 bits"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16 bits"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Canals"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Estèreo"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-"Activar l'estèreo no és recomanable, si no ho heu de fer. Això no afegirà "
-"cap efecte estèreo al so -l'OPL2 és mono- però consumeix més CPU!"
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Freqüència"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Reproducció"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Detecta el final de la pista"
-
-#: src/adplug/adplug-xmms.cc:362
-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 està activat, l'XMMS detectarà el final de la pista, pararà i passarà a "
-"la següent. Si no està activat, l'XMMS pot no detectar que la pista s'ha "
-"acabat i seguir reproduint-la un cop i un altre."
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Formats"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Selecció de formats"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Format"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Extensió"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-"Els tipus de fitxers seleccionats seran reconeguts i reproduïts per aquest "
-"connector. Els tipus no seleccionats seran ignorats, i podran ser reproduïts "
-"per altres connectors."
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: Informació del fitxer"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Nom del fitxer"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Títol: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Autor: "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Tipus de fitxer: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "Sub-pistes: "
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Instruments: "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "Ordres: "
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Pautes: "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Cançó"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Nom de l'instrument"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Missatge de la cançó"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "Selecció de sub-pistes"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Ordre: "
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Pauta: "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Fila: "
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Velocitat: "
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Temporitzador: "
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "Quant a l'alarma XMMS"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "Alarma XMMS"
-
-#: src/alarm/interface.c:56
-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 connector XMMS que es pot fer servir\n"
-"per a començar a reproduir a una certa hora.\n"
-"\n"
-"Envieu totes les queixes a:\n"
-"Adam Feakin <adamf@snika.uklinux.net>\n"
-"\n"
-"http://www.snika.uklinux.net/xmms-alarm/"
-
-#: src/alarm/interface.c:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Tanca"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Alarma"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "Això és l'avís per despertar-se."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "D'acord"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Seleccioneu una llista de reproducció"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Ho sentim"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Atenció"
-
-#: src/alarm/interface.c:213
-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 ""
-"Per raons de seguretat, el temps \"tranquil\" ha de durar almenys 65 segons "
-"més que el temps de fosa, i ha de durar més de 10 segons. Això bàsicament "
-"significa que hi ha un \"bug\" en el codi i que fins que no trobi la manera "
-"de resoldre'l sortirà aquest missatge :)\n"
-"\n"
-"Els paràmetres de fosa NO s'han desat\n"
-"\n"
-"--\n"
-"Adam"
-
-#: src/alarm/interface.c:229
-msgid "Oh Well"
-msgstr "Vaja"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Paràmetres de l'alarma"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Hora"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "hores"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "minuts"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Para al cap de:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Alarma (per defecte) a les:"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Trieu els dies que ha de saltar l'alarma"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Per defecte"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Dia"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Dimarts"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Dimecres"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Dijous"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Divendres"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Dissabte"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Diumenge"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Dilluns"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Dies"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Fosa"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "segons"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Volum"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Actual"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "posa al volum de sortida actual"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Comença a"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Final"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Ordre Addicional"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "activa"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Llista de reproducció (opcional)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Vés a..."
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Recordatori"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Activa els recordatoris"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Opcions"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Què signifiquen aquestes opcions?"
-
-#: src/alarm/interface.c:1364
-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"
-"Temps\n"
-" Alarma a les: \n"
-" Hora en que salta l'alarma.\n"
-"\n"
-" Para al cap de: \n"
-" Para l'alarma quan hagi passat aquesta estona.\n"
-" (si no heu tancat el diàleg de despertada)\n"
-"\n"
-"\n"
-"Dies\n"
-" Dia:\n"
-" Els dies de la setmana en que s'activa l'alarma.\n"
-"\n"
-" Hora:\n"
-" L'hora en que salta l'alarma cada dia, o bé marqueu\n"
-" la casella per a fer servir l'hora per defecte.\n"
-"\n"
-"\n"
-"Volum\n"
-" Fosa: \n"
-" Augmenta el volum fins el nivell especificat durant el \n"
-" temps indicat.\n"
-"\n"
-" Comença a: \n"
-" Comença amb aquest volum.\n"
-"\n"
-" Final: \n"
-" El nivell de volum final. Si el temps de fosa\n"
-" és 0, es començarà a reproduir a aquest nivell\n"
-" des del principi.\n"
-"\n"
-"\n"
-"Opcions:\n"
-" Ordre addicional:\n"
-" Executa aquesta ordre quan salta l'alarma.\n"
-"\n"
-" Llista de reproducció: \n"
-" Carrega aquesta llista de reproducció (ha\n"
-" de tenir extensió .m3u). Si no introduïu cap\n"
-" llista, es faran servir les cançons que hi\n"
-" hagin a la llista en aquest moment.\n"
-" També és possible introduir un URL d'un flux\n"
-" mp3/ogg, però carregar llistes de reproducció\n"
-" des d'URLS de moment no està suportat.\n"
-"\n"
-" Recordatori:\n"
-" Mostra un recordatori quan salta l'alarma,\n"
-" escriviu el recordatori en el camp de text i\n"
-" marqueu la casella si voleu que es mostri.\n"
-
-#: src/alarm/interface.c:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Ajuda"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "El vostre recordatori d'avui és.."
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Gràcies"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 #, fuzzy
 msgid "Default PCM device"
 msgstr "Dispositiu PCM per defecte (%s)"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 #, fuzzy
 msgid "Default mixer device"
 msgstr "Dispositiu PCM per defecte (%s)"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 #, fuzzy
 msgid "ALSA Output Plugin Preferences"
 msgstr "Connector d'Icona d'Estat - Preferències"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 #, fuzzy
 msgid "PCM device:"
 msgstr "Dispositiu de mescla:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Dispositiu de mescla:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 #, fuzzy
 msgid "Mixer element:"
 msgstr "Dispositiu de mescla:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 #, fuzzy
 msgid "About ALSA Output Plugin"
 msgstr "Quant al connector de sortida JACK 0.17"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 #, fuzzy
 msgid "ALSA error"
 msgstr "Error"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -805,6 +242,10 @@
 msgid "SoundFont settings"
 msgstr "Paràmetres SoundFont"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Nom del fitxer"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Mida (octets)"
@@ -911,8 +352,7 @@
 "Fons\n"
 "Timidity"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Nom:"
 
@@ -1085,119 +525,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Activa l'OSD quan la reproducció deixa d'estar en pausa."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Posició"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "Desplaçament relatiu X:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Desplaçament relatiu Y:"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "Amplada màxima de l'OSD:"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Opcions multi-monitor"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "Mostra l'OSD en:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "tots els monitors"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "el monitor %i"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Durada (ms)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "Visible:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "Fosa entrant:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "Fosa sortint:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Foses"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "Fosa %i:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Ombra"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Internacionalització"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "Desactiva la conversió del text a UTF-8 (a l'aosd)"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "Seleccioneu un fitxer de decoració"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Estil de representació"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Colors"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "Color %i:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "Decoració personalitzada"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "Fitxer de decoració:"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "Explora"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Habilita activador"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Esdeveniment"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "S'ha detectat un gestor Composite"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1207,73 +647,73 @@
 "tret que sapigueu que ja n'està funcionant un, activeu un gestor Composite o "
 "l'OSD no funcionarà correctament"
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "La transparència simulada no requereix un gestor Composite"
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Transparència"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Transparència simulada"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparència real (requereix l'ext. X composite)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "L'extensió Composite no està carregada"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "L'extensió Composite no està disponible"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "OSD de l'Audacious"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - Configuració"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Prova"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Posició"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Animació"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Decoració"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Llançador"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Misc"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "Quant a l'OSD de l'Audacious"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1281,7 +721,7 @@
 "\n"
 "Audacious OSD "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1303,133 +743,6 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr ""
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr ""
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr ""
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr ""
-
-#: src/bluetooth/gui.c:221
-#, fuzzy
-msgid "Available Headsets"
-msgstr "Aplicacions de fons disponibles"
-
-#: src/bluetooth/gui.c:224
-#, fuzzy
-msgid "Current Headset"
-msgstr "Actual"
-
-#: src/bluetooth/gui.c:227
-#, fuzzy
-msgid "_Refresh"
-msgstr "Velocitat de refresc"
-
-#: src/bluetooth/gui.c:231
-#, fuzzy
-msgid "_Connect"
-msgstr "Connexió"
-
-#: src/bluetooth/gui.c:237
-#, fuzzy
-msgid "_Close"
-msgstr "Tanca"
-
-#: src/bluetooth/gui.c:274
-#, fuzzy
-msgid "Class"
-msgstr "Clàssica"
-
-#: src/bluetooth/gui.c:278
-#, fuzzy
-msgid "Address:"
-msgstr "Adreça del dispositiu"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:138
-#, fuzzy
-msgid "Rescan"
-msgstr "Rellegeix el CD"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "Reprodueix"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Oscil·loscopi difús: Selecció de color"
@@ -1438,12 +751,12 @@
 msgid "Options:"
 msgstr "Opcions:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 #, fuzzy
 msgid "About Audio CD Plugin"
 msgstr "Quant al connector d'àudio FLAC"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 #, fuzzy
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
@@ -1469,16 +782,16 @@
 "\n"
 "Això va ser un projecte del Google Summer of Code de 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 #, fuzzy
 msgid "Audio CD"
 msgstr "Àudio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -1527,12 +840,24 @@
 msgid "Override default device: "
 msgstr "Ignora el dispositiu per defecte:"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+msgid "Ok"
+msgstr "D'acord"
+
+#: 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 "Cancel·la"
+
+#: src/cd-menu-items/cd-menu-items.c:34
 #, fuzzy
 msgid "Play CD"
 msgstr "Reprodueix"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "Afegeix CD"
 
@@ -1560,6 +885,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Descodificador de música de consoles"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "General"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Reproducció"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Baixos:"
@@ -1577,8 +910,7 @@
 msgid "Default song length:"
 msgstr "Durada per defecte:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Remostratge"
 
@@ -1590,6 +922,10 @@
 msgid "Resampling rate:"
 msgstr "Taxa de remostratge:"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1661,16 +997,16 @@
 "same rate."
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "Configuració del Crystalizer"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Intensitat de l'efecte:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Aplica"
 
@@ -1710,393 +1046,32 @@
 msgid "Volume: (%)"
 msgstr "Volum: (%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "Reproducció->Reprodueix"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "Reproducció->Para"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "Reproducció->Pausa"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "Reproducció->Anterior"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "Reproducció->Següent"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "Reproducció->Expulsa"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "Llista de reproducció->Repeteix"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "Llista de reproducció->Barreja"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "Volum->Amunt_5"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "Volum->Avall_5"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "Volum->Amunt_10"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "Volum->Avall_10"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "Volum->Silenciat"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "Finestra->Principal"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "Finestra->Llista de reproducció"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "Finestra->Equalitzador"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "Finestra->SaltaAlFitxer"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-"event-device-plugin: no s'ha pogut obrir el fitxer de dispositiu %s, s'omet "
-"aquest dispositiu; comproveu que el fitxer existeix i que teniu permís de "
-"lectura\n"
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-"event-device-plugin: no s'ha pogut crear un canal e/s pel fitxer de "
-"dispositiu %s, s'omet aquest dispositiu\n"
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: no s'ha pogut obrir /proc/bus/input/devices, no "
-"funcionarà la detecció automàtica de dispositius.\n"
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-"event-device-plugin: no s'ha pogut obrir un canal e/s per a /proc/bus/input/"
-"devices, la detecció automàtica de dispositius no funcionarà.\n"
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: s'ha produït un error en llegir /proc/bus/input/"
-"devices, la detecció automàtica de dispositius no funcionarà.\n"
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-"event-device-plugin: el dispositiu %s no s'ha trobat a /dev/input, s'omet.\n"
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-"event-device-plugin: no s'ha pogut carregar el fitxer de configuració %s, "
-"s'utilitzaran els paràmetres per defecte.\n"
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-"event-device-plugin: informació incompleta en el fitxer de config per al "
-"dispositiu \"%s\", s'omet.\n"
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: configuració, no s'ha pogut obtenir el valor is_active "
-"pel dispositiu \"%s\", s'omet.\n"
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-"event-device-plugin: no s'ha pogut accedir al directori local %s, no es "
-"desaran les preferències.\n"
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: configuració, no s'ha pogut obtenir el valor filename "
-"per al dispositiu \"%s\", s'omet.\n"
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-"event-device-plugin: configuració, no s'ha pogut el valor get phys per al "
-"dispositiu \"%s\", s'omet.\n"
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: configuració, no s'ha pogut obtenir el valor is_custom "
-"per al dispositiu \"%s\", s'omet.\n"
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-"event-device-plugin: configuració, valor inesperat per al dispositiu \"%s\", "
-"s'omet.\n"
-
-#: src/evdev-plug/ed_ui.c:212
-#, fuzzy
-msgid "Detected"
-msgstr "Detecta el final de la pista"
-
-#: src/evdev-plug/ed_ui.c:217
-#, fuzzy
-msgid "Custom"
-msgstr "personalitzat"
-
-#: src/evdev-plug/ed_ui.c:223
-#, fuzzy
-msgid "Not Detected"
-msgstr "Ordena els seleccionats"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "Informació"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-"No es pot obrir la finestra de vincles per a un dispositiu no detectat.\n"
-"Assegureu-vos que el dispositiu està ben endollat."
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Error"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-"No es pot obrir el dispositiu seleccionat.\n"
-"Comproveu que teniu permís de lectura per a aquest dispositiu."
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "EvDev-Plug - Afegiu un dispositiu personalitzat"
-
-#: src/evdev-plug/ed_ui.c:353
-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 intenta detectar i actualitzar informació sobre dispositius\n"
-"d'esdeveniments disponibles al sistema de manera automàtica.\n"
-"De totes maneres, si l'auto-detecció no funciona en el vostre sistema, o bé\n"
-"teniu dispositius d'esdeveniments en ubicacions no-estàndard (actualment\n"
-"només es busquen a /dev/input/), potser voldreu afegir un dispositiu\n"
-"personalitzat, especificant explícitament el nom i el fitxer del dispositiu."
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Nom del dispositiu:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Fitxer del dispositiu:"
-
-#: src/evdev-plug/ed_ui.c:404
-#, fuzzy
-msgid "(custom)"
-msgstr "personalitzat"
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-"Si us plau, especifiqueu un nom i un fitxer.\n"
-"El fitxer s'ha d'especificar amb un camí absolut."
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr ""
-"Voleu eliminar la configuració existent per al dispositiu seleccionat?\n"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "Voleu eliminar el dispositiu seleccionat?\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "EvDev-Plug - Configuració"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Actiu"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Estat"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Nom del dispositiu"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Fitxer del dispositiu"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Adreça del dispositiu"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "_Vincles"
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-"Premeu una tecla del dispositiu per a vincular-la;\n"
-"si no premeu cap tecla en 5 segons, aquesta finestra\n"
-"es tancarà sense fer cap canvi."
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-"Aquest esdeveniment d'entrada ja està assignat.\n"
-"\n"
-"No és possible assignar múltiples accions al mateix esdeveniment d'entrada "
-"(és possible assignar la mateixa acció a múltiples esdeveniments, però)."
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Plug - Configuració dels vincles"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "Nom: "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Nom del fitxer: "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Adreça física: "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "Quant al connector EvDev-Plug"
-
-#: src/evdev-plug/ed_ui.c:1491
-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"
-"control remot del reproductor via dispositius d'esdeveniments\n"
-"http://www.develia.org/projects.php?p=audacious#evdevplug\n"
-"\n"
-"escrit per Giacomo Lozito\n"
-
-#: src/ffaudio/ffaudio-core.c:765
+#: 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"
 "Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "Quant al connector d'àudio FLAC"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "Quant al connector FileWriter"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2133,51 +1108,51 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "Configuració de l'escriptura al disc"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Format del fitxer de sortida:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Configuració"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Desa al directori original"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Desa a un altre directori"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Directori de sortida:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Trieu un directori"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Agafa el nom del fitxer de:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "etiquetes del fitxer originals"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "nom del fitxer original"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Deixa l'extensió del fitxer"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "Precedeix el nom del fitxer pel nombre de pista"
 
@@ -2190,6 +1165,14 @@
 msgid "Joint Stereo"
 msgstr "Estèreo conjunt"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Estèreo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Mono"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "Configuració d'MP3"
@@ -2235,7 +1218,6 @@
 msgstr "Protecció d'errors"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Qualitat"
 
@@ -2343,11 +1325,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "Quant al connector de tecles ràpides de Gnome"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2361,62 +1343,24 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 #, fuzzy
 msgid "Add Files"
 msgstr "Afegeix fitxers..."
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 #, fuzzy
 msgid "Audacious2"
 msgstr "Audacious"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr ""
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr "No es pot saltar al temps quan no s'està reproduint cap pista.\n"
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr "Salta al temps"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr "minuts:segons"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr "Durada de la pista:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr "Error quan s'escrivia la llista de reproducció \"%s\": %s"
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-#, fuzzy
-msgid "Export Playlist"
-msgstr "Carrega una llista de reproducció"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-#, fuzzy
-msgid "Import Playlist"
-msgstr "Carrega una llista de reproducció"
-
 #: src/gtkui/columns.c:36
 #, fuzzy
 msgid "Entry number"
@@ -2515,429 +1459,319 @@
 msgid "Disable"
 msgstr "variable"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr ""
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr "Para quan s'acabi la cançó"
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr "Repeteix"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr "Barreja"
-
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr "Discontinua la reproducció programada"
-
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:52
+#: src/gtkui/menus.c:132
 #, fuzzy
-msgid "Show main menu"
-msgstr "Mostra la finestra principal"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr ""
+msgid "_Open Files ..."
+msgstr "Afegeix fitxers..."
 
-#: src/gtkui/ui_manager.c:55
+#: src/gtkui/menus.c:133
 #, fuzzy
-msgid "Show statusbar"
-msgstr "Estat"
+msgid "Open _URL ..."
+msgstr "Afegeix fitxers..."
 
-#: src/gtkui/ui_manager.c:56
+#: src/gtkui/menus.c:134
 #, fuzzy
-msgid "Show/hide statusbar"
-msgstr "Desa una llista de reproducció"
+msgid "_Add File ..."
+msgstr "Afegeix fitxers..."
 
-#: src/gtkui/ui_manager.c:58
+#: src/gtkui/menus.c:135
 #, fuzzy
-msgid "Show Column Headers"
-msgstr "Mostra el reproductor"
+msgid "Add U_RL ..."
+msgstr "Afegeix fitxers..."
 
-#: src/gtkui/ui_manager.c:60
+#: src/gtkui/menus.c:137
 #, fuzzy
-msgid "Scroll on Song Change"
-msgstr "Missatge de la cançó"
-
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
-msgstr "Para"
-
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
-msgstr "Anterior"
-
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
-msgstr "Següent"
-
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "Llistes"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "Llista de reproducció nova"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "Esborra la llista"
+msgid "A_bout ..."
+msgstr "Quant al connector "
 
-#: src/gtkui/ui_manager.c:95
+#: src/gtkui/menus.c:138
 #, fuzzy
-msgid "Import Playlist ..."
-msgstr "Carrega una llista de reproducció"
+msgid "_Preferences ..."
+msgstr "Preferències"
 
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr "Afegeix una llista de reproducció a la llista seleccionada"
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
+msgstr "_Surt"
 
-#: src/gtkui/ui_manager.c:98
+#: src/gtkui/menus.c:142
 #, fuzzy
-msgid "Export Playlist ..."
-msgstr "Carrega una llista de reproducció"
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "Desa les llistes de reproducció seleccionades."
+msgid "_Play"
+msgstr "Reprodueix"
 
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
+#: src/gtkui/menus.c:143
 #, fuzzy
-msgid "Save All Playlists"
-msgstr "Desa una llista de reproducció"
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
+msgid "Paus_e"
+msgstr "Pausa"
 
-#: src/gtkui/ui_manager.c:106
+#: src/gtkui/menus.c:144
 #, fuzzy
-msgid "Refresh"
-msgstr "Velocitat de refresc"
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Refresca les meta-dades associades a cada element de la llista."
+msgid "_Stop"
+msgstr "Para"
 
-#: src/gtkui/ui_manager.c:110
+#: src/gtkui/menus.c:145
 #, fuzzy
-msgid "Refresh Selected"
-msgstr "Treu els seleccionats"
+msgid "Pre_vious"
+msgstr "Anterior"
 
-#: src/gtkui/ui_manager.c:111
+#: src/gtkui/menus.c:146
 #, fuzzy
-msgid "Refreshes metadata associated with selected entries."
-msgstr "Refresca les meta-dades associades a cada element de la llista."
+msgid "_Next"
+msgstr "Següent"
 
-#: src/gtkui/ui_manager.c:115
+#: src/gtkui/menus.c:148
 #, fuzzy
-msgid "Playlist Manager"
-msgstr "Gestor de llistes"
-
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr "Obre el gestor de llistes de reproducció."
+msgid "_Repeat"
+msgstr "Repeteix"
 
-#: src/gtkui/ui_manager.c:119
+#: src/gtkui/menus.c:149
 #, fuzzy
-msgid "Add URL ..."
-msgstr "Afegeix fitxers..."
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr "Afegeix una pista remota a la llista de reproducció."
+msgid "S_huffle"
+msgstr "Barreja"
 
-#: src/gtkui/ui_manager.c:123
+#: src/gtkui/menus.c:150
 #, fuzzy
-msgid "Add Files ..."
-msgstr "Afegeix fitxers..."
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr "Afegeix fitxers a la llista de reproducció."
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr "Treu tots els elements"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr "Treu tots els elements de la llista de reproducció."
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr "Treu els no seleccionats"
-
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr "Treu els elements no seleccionats de la llista de reproducció."
-
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr "Treu els seleccionats"
+msgid "N_o Playlist Advance"
+msgstr "Discontinua la reproducció programada"
 
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr "Treu els elements seleccionats de la llista de reproducció."
+#: src/gtkui/menus.c:151
+#, fuzzy
+msgid "Stop _After This Song"
+msgstr "Para quan s'acabi la cançó"
 
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:140
+#: src/gtkui/menus.c:154
 #, fuzzy
-msgid "Edit the playlist title."
-msgstr "Reordena la llista de forma aleatòria."
+msgid "Jump to _Time ..."
+msgstr "Salta al temps"
 
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:146
+#: src/gtkui/menus.c:158
 #, fuzzy
-msgid "Sort"
-msgstr "Port"
-
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
+msgid "By Track _Number"
 msgstr "Pel número de pista"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
+#: src/gtkui/menus.c:159
+#, fuzzy
+msgid "By _Title"
 msgstr "Per títol"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
+#: src/gtkui/menus.c:160
+#, fuzzy
+msgid "By _Artist"
 msgstr "Per l'artista"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
+#: src/gtkui/menus.c:161
 #, fuzzy
-msgid "By Album"
+msgid "By A_lbum"
 msgstr "Àlbum:"
 
-#: src/gtkui/ui_manager.c:155
+#: src/gtkui/menus.c:162
 #, fuzzy
-msgid "By Release Date"
+msgid "By Release _Date"
 msgstr "Per la data"
 
-#: src/gtkui/ui_manager.c:157
+#: src/gtkui/menus.c:163
 #, fuzzy
-msgid "By File Path"
+msgid "By _File Path"
 msgstr "Per nom de fitxer"
 
-#: src/gtkui/ui_manager.c:159
+#: src/gtkui/menus.c:164
 #, fuzzy
-msgid "By Formatted Title"
-msgstr "Per títol"
+msgid "By _Custom Title"
+msgstr "Decoració personalitzada"
 
-#: src/gtkui/ui_manager.c:161
+#: src/gtkui/menus.c:166
 #, fuzzy
-msgid "Reverse Order"
+msgid "R_everse Order"
 msgstr "Inverteix la llista"
 
-#: src/gtkui/ui_manager.c:163
+#: src/gtkui/menus.c:167
 #, fuzzy
-msgid "Random Order"
+msgid "_Random Order"
 msgstr "_Aleatori"
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "Efectes"
-
-#: src/gtkui/ui_manager.c:172
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
 #, fuzzy
-msgid "Equalizer"
-msgstr "Mostra l'equalitzador"
+msgid "_Refresh"
+msgstr "Velocitat de refresc"
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "Finestres"
+#: src/gtkui/menus.c:172
+#, fuzzy
+msgid "_Sort"
+msgstr "Port"
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
+#: src/gtkui/menus.c:174
+msgid "_New"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "Fitxer"
+#: src/gtkui/menus.c:175
+#, fuzzy
+msgid "_Close"
+msgstr "Tanca"
 
-#: src/gtkui/ui_manager.c:188
+#: src/gtkui/menus.c:177
 #, fuzzy
-msgid "Components"
-msgstr "Comentari:"
+msgid "_Import ..."
+msgstr "Importa"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr "Mostra detalls de la pista"
+#: src/gtkui/menus.c:178
+#, fuzzy
+msgid "_Export ..."
+msgstr "Exporta"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr "Mostra detalls de la pista"
+#: src/gtkui/menus.c:180
+#, fuzzy
+msgid "_Playlist Manager ..."
+msgstr "Gestor de llistes"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "Quant a l'Audacious"
+#: src/gtkui/menus.c:183
+#, fuzzy
+msgid "Volume _Up"
+msgstr "Puja el volum"
 
-#: src/gtkui/ui_manager.c:199
+#: src/gtkui/menus.c:184
 #, fuzzy
-msgid "Open Files ..."
-msgstr "Afegeix fitxers..."
+msgid "Volume _Down"
+msgstr "Baixa el volum"
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
-msgstr "Carrega i reprodueix un fitxer"
+#: src/gtkui/menus.c:186
+#, fuzzy
+msgid "_Equalizer"
+msgstr "Mostra l'equalitzador"
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
+#: src/gtkui/menus.c:188
+#, fuzzy
+msgid "E_ffects"
+msgstr "Efectes"
+
+#: src/gtkui/menus.c:191
+msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr "Reprodueix un mitjà des de la ubicació seleccionada"
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "Serveis de connectors"
+#: src/gtkui/menus.c:194
+msgid "Show I_nfo Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "Preferències"
+#: src/gtkui/menus.c:195
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "Estat"
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr "Obre la finestra de preferències"
+#: src/gtkui/menus.c:197
+#, fuzzy
+msgid "Show Column _Headers"
+msgstr "Mostra el reproductor"
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
-msgstr "_Surt"
+#: src/gtkui/menus.c:198
+#, fuzzy
+msgid "Choose _Columns ..."
+msgstr "Mostra el reproductor"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "Tanca l'Audacious"
+#: src/gtkui/menus.c:199
+#, fuzzy
+msgid "Scrol_l on Song Change"
+msgstr "Missatge de la cançó"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr "Estableix A-B"
+#: src/gtkui/menus.c:202
+#, fuzzy
+msgid "_File"
+msgstr "Fitxer"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr "Esborra A-B"
+#: src/gtkui/menus.c:203
+#, fuzzy
+msgid "_Playback"
+msgstr "Reproducció"
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr "Salta a l'inici de la llista"
+#: src/gtkui/menus.c:204
+#, fuzzy
+msgid "P_laylist"
+msgstr "Llistes"
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
-msgstr "Salta al fitxer"
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#, fuzzy
+msgid "_Services"
+msgstr "Dispositius"
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr "Posa o treu de la cua"
+#: src/gtkui/menus.c:206
+#, fuzzy
+msgid "_Output"
+msgstr "Connector de sortida nul"
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Posa o lleva un element de la cua."
+#: src/gtkui/menus.c:207
+#, fuzzy
+msgid "_View"
+msgstr "Finestres"
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-#, fuzzy
-msgid "Cut"
-msgstr "De culte"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
+#: src/gtkui/menus.c:215
+msgid "_Copy"
+msgstr ""
+
+#: src/gtkui/menus.c:216
 #, fuzzy
-msgid "Paste"
+msgid "_Paste"
 msgstr "Al màxim"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
+#: src/gtkui/menus.c:217
+#, fuzzy
+msgid "Select _All"
 msgstr "Selecciona tots els elements"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr "Selecciona tots els elements de la llista de reproducció."
+#: src/gtkui/menus.c:222
+#, fuzzy
+msgid "_Rename"
+msgstr "Nom del fitxer"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr "Selecciona no res"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr "Deselecciona tots els elements de la llista de reproducció."
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Error"
+
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "estèreo"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "Canals"
 msgstr[1] "Canals"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, c-format
 msgid "%d kbps"
 msgstr ""
@@ -2946,10 +1780,18 @@
 msgid "Previous Track"
 msgstr "Pista anterior"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Reprodueix"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr "Pausa/Represa"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Para"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr "Següent pista"
@@ -2974,6 +1816,10 @@
 msgid "Volume Down"
 msgstr "Baixa el volum"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr "Salta al fitxer"
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr "Commuta les finestres"
@@ -2982,11 +1828,21 @@
 msgid "Show On-Screen-Display"
 msgstr "Activa l'OSD (sobre-impressió)"
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "Repeteix"
+
+#: src/hotkey/gui.c:85
+#, fuzzy
+msgid "Toggle Shuffle"
+msgstr "Barreja"
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(cap)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2998,15 +1854,15 @@
 "\n"
 "Voleu continuar?"
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr "Vinculació dels botons del ratolí"
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Configuració del connector de tecles ràpides globals"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -3014,23 +1870,23 @@
 "Premeu una combinació de tecles dins del camp de text.\n"
 "També podeu vincular botons del ratolí."
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr "Tecles ràpides:"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr "Acció:"
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr "Vinculació de tecles:"
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr "Quant al connector de tecles ràpides globals"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -3105,139 +1961,29 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "Quant al connector de sortida JACK 0.17"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr "Aquest connector LADSPA no té controls d'usuari"
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "Nom"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "Connectors instal·lats"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "Connectors actius"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "Afegeix"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "Elimina"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "Catàleg de connectors LADSPA"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "Quant al connector LIRC de l'Audacious"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "Connector per a LIRC"
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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"
-"Un simple connector que permet controlar\n"
-"l'Audacious amb el dimoni de control remot LIRC.\n"
-"\n"
-"Adapatat per a l'Audacious per Tony Vroon <chainsaw@gentoo.org>\n"
-"a partir del connector LIRC de l'XMMS de:\n"
-"Carl van Schaik <carl@leg.uct.ac.za>\n"
-"Christoph Bartelmus <xmms@bartelmus.de>\n"
-"Andrew O. Shadoura <bugzilla@tut.by>\n"
-"Podeu trobar informació sobre el LIRC a:\n"
-"http://lirc.org"
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr "Paràmetres del connector LIRC"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr "Reconnecta amb el servidor LIRC"
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr "Temps d'espera abans d'intentar reconnectar (segons): "
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr "Reconnexió"
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr "Connexió"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: no s'ha pogut inicialitzar el suport per a LIRC\n"
+"Looking for lyrics..."
+msgstr ""
 
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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: no s'ha pogut llegir el firxer de configuració de LIRC\n"
-"%s: si us plau, llegiu la documentació de LIRC, per a saber\n"
-"%s: com crear un fitxer de configuració adequat\n"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr "%s: tractant de reconnectar...\n"
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: ordre desconeguda \"%s\"\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: desconnectat del LIRC\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
-msgstr "%s: s'intentarà reconnectar cada %d segons...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
 msgstr ""
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "Quant al connector Metronom"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3251,264 +1997,43 @@
 "p.e. tact://77 per a fer 77 tocs per minut\n"
 "o tact://60*3/4 per fer 70 tocs per minut en 3/4."
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de compassos: %d bpm"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generador de compassos: %d bpm %d/%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "Configuració del connector ModPlug"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 bits"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 bits"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr "Mono (remescla)"
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr "Més proper (molt ràpid)"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "Lineal (ràpid)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr "Spline (bona qualitat)"
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr "8-tap Fir (qualitat extremament alta)"
-
-#: src/modplug/gui/interface.cxx:286
-#, fuzzy
-msgid "96 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Freqüència de mostra"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "Activa"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "Profunditat"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "Retard"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "Reverberació"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "Quantitat"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "Amplitud"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "Amplificació de baixos"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "So envolvent"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-"Nota: Posar el preamplificador\n"
-"massa alt pot escapçar el senyal\n"
-"(sorollets emprenyadors)!\""
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "Preamplificació"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "Usa el nom del fitxer com a títol"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "Informació de la llista de reproducció ràpida"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "Reducció de soroll"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Reprodueix MODs d'Amiga"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "Al final, torna a començar"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "Al final, no torna a començar"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "cop(s)"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "Torna a començar sempre"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "Iteracions"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "Informació MOD"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-"Fitxer:\n"
-"Títol:\n"
-"Tipus:\n"
-"Durada:\n"
-"Velocitat:\n"
-"Tempo:\n"
-"Mostres:\n"
-"Instruments:\n"
-"Patrons:\n"
-"Canals:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "Mostres"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "Instruments"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "Missatge"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Connector d'entrada Modplug per a l'Audacious, ver"
-
-#: src/modplug/gui/main.cxx:52
-#, fuzzy
-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"
-"Motor de so del Modplug escrit per Olivier Lapicque.\n"
-"Interfície XMMS per al Modplug per Kenton Varda.\n"
-"(c)2000 Olivier Lapicque i Kenton Varda.\n"
-"Actualitzacions i manteniment per Konstanty Bialkowski.\n"
-"Portat al BMP per Theofilos Intzoglou."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "Quant al connector Modplug"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "No s'ha trobat el fitxer de mapa-de-bits: %s"
-
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr "Puja les pistes seleccionades"
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr "Pujada en curs..."
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr "Gestor de dispositius MTP"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
+msgstr ""
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
+#: src/mtp_up/mtp.c:311
+#, fuzzy
+msgid "Disconnect MTP Device"
 msgstr "Desconnecta el dispositiu"
 
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "Para"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Audacious - avís de visibilitat"
+
 #: src/null/null.c:64
 msgid "Null output plugin "
 msgstr "Connector de sortida nul"
@@ -3560,12 +2085,12 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 #, fuzzy
 msgid "About OSS4 Plugin"
 msgstr "Quant al connector ESounD"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 #, fuzzy
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
@@ -3614,6 +2139,11 @@
 msgid "Default (%s)"
 msgstr "Per defecte (%s)"
 
+#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Per defecte"
+
 #: src/OSS/configure.c:187
 msgid "OSS Driver configuration"
 msgstr "Configuració del driver OSS"
@@ -3686,11 +2216,11 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Quant al connector de sortida PulseAudio"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3747,29 +2277,29 @@
 msgid "Method:"
 msgstr ""
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 #, fuzzy
 msgid "Change password"
 msgstr "Canvia la cançó"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Serveis"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 #, fuzzy
 msgid "Scrobbler URL:"
 msgstr "Error de Scrobbler"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3778,7 +2308,7 @@
 msgid "Scrobbler"
 msgstr "Error de Scrobbler"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3790,16 +2320,16 @@
 "Creat originalment per Audun Hove <audun@nlc.no> i Pipian <pipian@pipian."
 "com>\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "Quant al connector Scrobbler"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 #, fuzzy
 msgid "About SDL Output Plugin"
 msgstr "Quant al connector de sortida JACK 0.17"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 #, fuzzy
 msgid "SDL error"
 msgstr "Error"
@@ -3809,11 +2339,19 @@
 msgid "About %s"
 msgstr "Quant a %s"
 
-#: src/sid/xs_config.c:323
+#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
+msgid "Close"
+msgstr "Tanca"
+
+#: src/sid/xs_config.c:326
 #, fuzzy
 msgid " Error"
 msgstr "Error"
 
+#: src/sid/xs_config.c:326
+msgid "OK"
+msgstr "D'acord"
+
 #: src/sid/xs_fileinfo.c:151
 msgid "General info"
 msgstr "Informació general"
@@ -3823,6 +2361,11 @@
 msgid "Tune #%i: "
 msgstr "Melodia #%i: "
 
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "No s'ha trobat el fitxer de mapa-de-bits: %s"
+
 #: src/sid/xs_interface.c:234
 msgid "Audacious-SID configuration"
 msgstr "Configuració del connector Audacious-SID"
@@ -4138,15 +2681,15 @@
 msgid "Use"
 msgstr "Usa"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Desa"
 
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:435
+#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importa"
 
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Elimina"
 
@@ -4179,6 +2722,11 @@
 msgid "Playtime:"
 msgstr "Durada:"
 
+#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
+#: src/sid/xs_interface.c:1155
+msgid "seconds"
+msgstr "segons"
+
 #: src/sid/xs_interface.c:928
 msgid "Minimum playtime:"
 msgstr "Durada mínima de reproducció"
@@ -4441,11 +2989,11 @@
 msgid "No"
 msgstr "No"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "Quant a la interfície d'usuari gràfica"
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -4453,475 +3001,462 @@
 "Copyright (c) 2008, per Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr ""
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr "_Reproductor:"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr "Trieu la fosa de la finestra principal:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "_Llista de reproducció:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr "Trieu la fosa de la llista de reproducció:"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr "_Foses"
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr "Usa foses mapa de bits, si n'hi ha de disponibles"
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr ""
 
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
 msgstr ""
-"Usa foses tipus mapa de bits, si n'hi ha de disponibles. Les fonts de mapa "
-"de bits no suporten cadenes Unicode."
 
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr "_Miscel·lània"
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "_Decoració"
 
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr "Mostra separadors a la llista de reproducció"
+#: src/skins/skins_cfg.c:393
+#, fuzzy
+msgid "Interface Preferences"
+msgstr "Preferències"
 
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr "Mostra la decoració del gestor de finestres"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Preamplificació"
 
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
 msgstr ""
-"Això permet al gestor de finestres mostrar la decoració de les finestres."
-
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr "Usa desplaçament de text bidireccional"
 
-#: src/skins/skins_cfg.c:330
-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."
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
 msgstr ""
-"Si està seleccionat, la informació del fitxer a la finestra principal es "
-"desplaçarà endavant i enrere. Si no està seleccionat, el text es desplaçarà "
-"en una sola direcció."
-
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr "Deshabilita els temes GTK en línia"
-
-#: src/skins/skins_cfg.c:333
-#, fuzzy
-msgid "Random skin on play"
-msgstr "Reordena la llista de forma aleatòria."
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
-msgstr "Permet carregar decoracions incompletes"
-
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
 msgstr ""
-"Si està seleccionat, l'Audacious no refusarà carregar decoracions "
-"defectuoses. Useu-ho només si la vostra decoració favorita no funciona"
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "Ajustament del color"
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "250 Hz"
+msgstr "22050 Hz "
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
-"L'Audacious us permet alterar el balanç de colors de la decoració de la IG. "
-"Els controls de sota us permetran fer això."
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "500 Hz"
+msgstr "11000 Hz"
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "Blau"
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "1 kHz"
+msgstr "11 kHz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "Verd"
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "2 kHz"
+msgstr "22 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "Roig"
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "4 kHz"
+msgstr "44 kHz"
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "_Decoració"
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "8 kHz"
+msgstr "48 kHz"
 
-#: src/skins/skins_cfg.c:574
+#: src/skins/ui_equalizer.c:336
 #, fuzzy
-msgid "Color adjustment ..."
-msgstr "Ajustament del color"
+msgid "16 kHz"
+msgstr "48 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Equalitzador de l'Audacious"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr "Perfils"
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 #, fuzzy
 msgid "kHz"
 msgstr "Hz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 #, fuzzy
 msgid "surround"
 msgstr "So envolvent"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious - avís de visibilitat"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "Mostra la finestra principal"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "Ignora"
-
-#: src/skins/ui_main.c:993
-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 ""
-"L'Audacious ha arrencat amb totes les finestres ocultes.\n"
-"Potser voldreu mostrar la finestra del reproductor per a controlar "
-"l'Audacious; en cas contrari, l'haureu de controlar remotament via l'audtool "
-"o connectors (com ara el connector statusicon)."
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr "Ignora sempre, mostra/oculta es controla remotament"
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious- avís de motor GTK defectuós"
-
-#: src/skins/ui_main.c:1052
-#, c-format
-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>Esteu utilitzant un motor GTK defectuós</big>\n"
-"\n"
-"L'Audacious ha detectat que esteu utilitzant un motor GTK defectuós.\n"
-"\n"
-"El motor de temes que esteu usant, %s, és incompatible amb algunes "
-"funcions que usen moltes decoracions actuals. Les funcions en qüestió s'han "
-"deshabilitat per a aquesta sessió.\n"
-"\n"
-"Si voleu utilitzar aquestes funcions, considereu canviar el motor GTK actual."
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr "No mostrar més aquest avís"
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
+#: src/skins/ui_main.c:807
+#, fuzzy, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Anar a: %d:%-2.2d/%d:%-2.2d (%d%%)"
 
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volum: %d%%"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balanç: %d%% esquerra"
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balanç: centrat"
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balanç: %d%% dreta"
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Menú d'opcions"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Desactiva 'Sempre per sobre'"
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Activa 'Sempre per sobre'"
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Informació del fitxer"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "Desactiva l'escalat de la IUG"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "Activa l'escalat de la IUG"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Menú de visualització"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 #, fuzzy
 msgid "Playlist mode."
 msgstr "Llistes"
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 #, fuzzy
 msgid "Stopping after song."
 msgstr "Para quan s'acabi la cançó"
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr ""
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr "Belluga el títol"
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Para quan s'acabi la cançó"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
 msgstr "Pics"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Repeteix"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Barreja"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "Discontinua la reproducció programada"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr "Mostra el reproductor"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr "Mostra l'editor de llistes"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr "Mostra l'equalitzador"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr "Sempre per sobre"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr "A tots els espais de treball"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr "Enrotlla el reproductor"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr "Enrotlla l'editor de llistes"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr "Enrotlla l'equalitzador"
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "Escala"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr "Dobla la mida"
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr "Moviment fàcil"
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr "Analitzador"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr "Oscil·loscopi"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr "Empremta de veu"
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "Apagat"
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr "Foc"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr "Línies verticals"
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr "Línies"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr "Barres"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr "Oscil·loscopi de punts"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr "Oscil·loscopi de línies"
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr "Oscil·loscopi sòlid"
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr "Gel"
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr "Suau"
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "Mínim"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "Lent"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "Mitjà"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "Ràpid"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "Al màxim"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr "Temps transcorregut"
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr "Temps que queda"
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "Següent"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "Visualització"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr "Mode de visualització"
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr "Mode de l'analitzador"
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr "Mode de l'oscil·loscopi"
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr "Mode de l'empremta de veu"
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr "Mode del WindowShade VU"
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr "Caiguda de l'analitzador"
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr "Caiguda dels pics"
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Llistes"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Llista de reproducció nova"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr "Selecciona la llista següent"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr "Selecciona la llista anterior"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Esborra la llista"
+
+#: src/skins/ui_manager.c:222
+#, fuzzy
+msgid "Import Playlist"
+msgstr "Carrega una llista de reproducció"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Afegeix una llista de reproducció a la llista seleccionada"
+
+#: src/skins/ui_manager.c:226
+#, fuzzy
+msgid "Export Playlist"
+msgstr "Carrega una llista de reproducció"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr "Desa les llistes de reproducció seleccionades."
+
+#: src/skins/ui_manager.c:229
+#, fuzzy
+msgid "Save All Playlists"
+msgstr "Desa una llista de reproducció"
+
+#: 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 "Refresca la llista"
 
-#: src/skins/ui_manager.c:228
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Refresca les meta-dades associades a cada element de la llista."
+
+#: src/skins/ui_manager.c:238
 msgid "List Manager"
 msgstr "Gestor de llistes"
 
-#: src/skins/ui_manager.c:238
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr "Obre el gestor de llistes de reproducció."
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Finestres"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr ""
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "Preferències"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr "Afegeix una adreça d'Internet..."
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr "Afegeix una pista remota a la llista de reproducció."
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr "Afegeix fitxers..."
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr "Afegeix fitxers a la llista de reproducció."
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr "Cerca i selecciona"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
@@ -4929,227 +3464,367 @@
 "Cerca a la llista de reproducció i selecciona elements basant-se en criteris "
 "específics."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr "Inverteix la selecció"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr "Inverteix els elements seleccionats i no seleccionats."
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "Selecciona tots els elements"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
+msgstr "Selecciona tots els elements de la llista de reproducció."
+
+#: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr "Selecciona no res"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr "Deselecciona tots els elements de la llista de reproducció."
+
+#: src/skins/ui_manager.c:277
+msgid "Remove All"
+msgstr "Treu tots els elements"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr "Treu tots els elements de la llista de reproducció."
+
+#: src/skins/ui_manager.c:281
 msgid "Clear Queue"
 msgstr "Neteja la cua"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr "Neteja la cua associada a aquesta llista de reproducció. "
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "Treu els fitxers no disponibles"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr "Treu els fitxers no disponibles de la llista de reproducció."
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "Treu els duplicats"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "Per títol"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Treu els elements duplicats de la llista de reproducció per títol."
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "Per nom de fitxer"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 "Treu els elements duplicats de la llista de reproducció per nom de fitxer."
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "Per ubicació i nom de fitxer"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 "Treu els elements duplicats de la llista de reproducció per l'ubicació "
 "completa."
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr "Treu els no seleccionats"
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr "Treu els elements no seleccionats de la llista de reproducció."
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr "Treu els seleccionats"
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr "Treu els elements seleccionats de la llista de reproducció."
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr "Barreja la llista"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr "Reordena la llista de forma aleatòria."
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr "Inverteix la llista"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr "Inverteix l'ordre de la llista."
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "Ordena la llista"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr "Ordena la llista pel títol."
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#, fuzzy
+msgid "By Album"
+msgstr "Àlbum:"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 #, fuzzy
 msgid "Sorts the list by album."
 msgstr "Ordena la llista pel títol."
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "Per l'artista"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr "Ordena la llista per l'artista."
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr "Ordena la llista pel nom de fitxer."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr "Ordena la llista per la ubicació completa."
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "Per la data"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr "Ordena la llista per la data de modificació."
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr "Pel número de pista"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr "Ordena la llista pel número de pista."
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr "Ordena els seleccionats"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "Fitxer"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Ajuda"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr "Serveis de connectors"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr "Mostra detalls de la pista"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr "Mostra detalls de la pista"
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "Quant a l'Audacious"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "Reprodueix fitxer"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr "Carrega i reprodueix un fitxer"
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "Reprodueix una font remota"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr "Reprodueix un mitjà des de la ubicació seleccionada"
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "Serveis de connectors"
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "Preferències"
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr "Obre la finestra de preferències"
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "Tanca l'Audacious"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr "Estableix A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr "Esborra A-B"
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr "Salta a l'inici de la llista"
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr "Salta al temps"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr "Posa o treu de la cua"
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Posa o lleva un element de la cua."
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr ""
+
+#: src/skins/ui_manager.c:436
+#, fuzzy
+msgid "Cut"
+msgstr "De culte"
+
+#: src/skins/ui_manager.c:438
+#, fuzzy
+msgid "Paste"
+msgstr "Al màxim"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Carrega"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Perfil"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Carrega un perfil"
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Perfil automàtics"
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Carrega un perfil automàtic"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Carrega el perfil per defecte a l'equalitzador"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Zero"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Posa els valors de l'equalitzador a zero"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Des d'un fitxer"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Carrega el perfil des d'un fitxer"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "D'un fitxer EQF del WinAMP"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Carrega el perfil des d'un fitxer EQF del WinAMP"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Perfils del WinAMP"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importa perfils del WinAMP"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Desa el perfil"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Desa com a perfil automàtic"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Desa com a perfil per defecte"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "En un fitxer"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Desa el perfil en un fitxer"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "En un fitxer EQF del WinAMP"
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Desa els valors en un fitxer EQF del WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Esborra el perfil"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Esborra el perfil automàtic"
 
-#: src/skins/ui_playlist.c:374
+#: 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:382
+#: 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 "
@@ -5161,111 +3836,52 @@
 "insensibles a la capitalització. Si no sabeu com funcionen les expressions "
 "regulars, podeu escriure literalment el text que busqueu."
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Títol: "
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Àlbum:"
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Nom del fitxer: "
 
-#: src/skins/ui_playlist.c:419
+#: 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:422
+#: 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:425
+#: 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:776
-msgid "Save as Static Playlist"
-msgstr "Desa com a llista de reproducció estàtica"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr "Usa camins relatius"
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "Carrega una llista de reproducció"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "Desa una llista de reproducció"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Editor de llistes de l'Audacious"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "250 Hz"
-msgstr "22050 Hz "
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "500 Hz"
-msgstr "11000 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "1 kHz"
-msgstr "11 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "2 kHz"
-msgstr "22 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "4 kHz"
-msgstr "44 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "8 kHz"
-msgstr "48 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "16 kHz"
-msgstr "48 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr "Decoració del Winamp 2.x arxivada"
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Decoració del Winamp 2.x no arxivada"
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "No s'ha pogut crear el directori (%s): %s\n"
@@ -5315,56 +3931,64 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "Quant a SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr "Correcció de volum"
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "Encavalcament curt"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "Velocitat"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "To"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "Escala"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Opcions"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - Configuració"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr "Ordre a executar quan l'Audacious comença una nova cançó."
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "Ordre:"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr "Ordre a executar cap al final de la cançó."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 "Ordre a executar quan l'Audacious arriba al final de la llista de "
 "reproducció."
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "Ordre a executar quan canvia el títol d'una cançó (en fluxos de xarxa)."
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 #, fuzzy
 msgid ""
 "You can use the following format strings which\n"
@@ -5396,7 +4020,7 @@
 "%%t: Posició a la llista de reproducció (%%02d)\n"
 "%%p: Reproducció en curs (1 o 0)"
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5405,19 +4029,15 @@
 "entre\n"
 "cometes. Altrament seria un risc per a la seguretat."
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "Ordres"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 #, fuzzy
 msgid "Song Change"
 msgstr "Missatge de la cançó"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "Analitzador d'espectre"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "Quant al connector d'icona d'estat"
@@ -5489,76 +4109,19 @@
 "\n"
 "Per Johan Levin, 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "Quant al connector d'estèreo extra"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "Configuració de l'estèreo extra"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-#, fuzzy
-msgid "Search:"
-msgstr "Any:"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-#, fuzzy
-msgid "Stream name"
-msgstr "Nom de l'instrument"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-#, fuzzy
-msgid "Now playing"
-msgstr "Llista de reproducció nova"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Esborra l'etiqueta"
-
-#: src/streambrowser/streambrowser.c:340
-#, fuzzy
-msgid "About Stream Browser"
-msgstr "Quant al driver OSS"
-
-#: src/streambrowser/streambrowser.c:341
-#, fuzzy
-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) 2007, per Calin Crisan <ccrisan@gmail.com> i l'Equip "
-"Audacious.\n"
-"\n"
-"Moltes gràcies als desenvolupadors de la libcdio <http://www.gnu.org/"
-"software/libcdio/>\n"
-"\ti als desenvolupadors de la libcddb <http://libcddb.sourceforge.net/>.\n"
-"\n"
-"També gràcies al meu mentor Tony Vroon pels seus consells.\n"
-"\n"
-"Això va ser un projecte del Google Summer of Code de 2007."
-
-#: src/tonegen/tonegen.c:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "Quant al connector generador de tons"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5573,12 +4136,12 @@
 "e.g. tone://2000;2005 per a generar un to de 2000 Hz i un to\n"
 "de 2005 Hz."
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "Generador de tons:"
 
@@ -5600,15 +4163,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Etiquetes Ogg Vorbis:"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Configuració del connector d'àudio Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Quant al connector d'àudio Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5683,9 +4246,1258 @@
 "Alguns trossos del codi són de Miles Egan\n"
 "Visiteu la plana web de Wavpack a http://www.wavpack.com/\n"
 
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "Usa foses mapa de bits, si n'hi ha de disponibles"
+
+#~ msgid ""
+#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
+#~ "Unicode strings."
+#~ msgstr ""
+#~ "Usa foses tipus mapa de bits, si n'hi ha de disponibles. Les fonts de "
+#~ "mapa de bits no suporten cadenes Unicode."
+
+#~ msgid "_Miscellaneous"
+#~ msgstr "_Miscel·lània"
+
+#~ msgid "Use two-way text scroller"
+#~ msgstr "Usa desplaçament de text bidireccional"
+
+#~ msgid "About "
+#~ msgstr "Quant al connector "
+
+#~ 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"
+#~ "Aquest connector s'ha publicat sota els termes i condicions de la\n"
+#~ "llicència GNU LGPL. Vegeu http://www.gnu.org/licenses/lgpl.html per a\n"
+#~ "més detalls.\n"
+#~ "\n"
+#~ "Aquest connector fa ús de la llibreria AdPlug, el copyright (C) de la "
+#~ "qual\n"
+#~ "pertany a Simon Peter, et al.\n"
+#~ "\n"
+#~ "Versió de la llibreria AdPlug enllaçada: "
+
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AdPlug :: Configuració"
+
+#~ msgid "Sound quality"
+#~ msgstr "Qualitat de so"
+
+#~ msgid "Resolution"
+#~ msgstr "Resolució"
+
+#~ msgid "8bit"
+#~ msgstr "8 bits"
+
+#~ msgid "16bit"
+#~ msgstr "16 bits"
+
+#~ msgid "Channels"
+#~ msgstr "Canals"
+
+#~ 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 ""
+#~ "Activar l'estèreo no és recomanable, si no ho heu de fer. Això no afegirà "
+#~ "cap efecte estèreo al so -l'OPL2 és mono- però consumeix més CPU!"
+
+#~ msgid "Frequency"
+#~ msgstr "Freqüència"
+
+#~ msgid "Detect songend"
+#~ msgstr "Detecta el final de la pista"
+
+#~ 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 està activat, l'XMMS detectarà el final de la pista, pararà i passarà "
+#~ "a la següent. Si no està activat, l'XMMS pot no detectar que la pista "
+#~ "s'ha acabat i seguir reproduint-la un cop i un altre."
+
+#~ msgid "Formats"
+#~ msgstr "Formats"
+
+#~ msgid "Format selection"
+#~ msgstr "Selecció de formats"
+
+#~ msgid "Format"
+#~ msgstr "Format"
+
+#~ msgid "Extension"
+#~ msgstr "Extensió"
+
+#~ 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 ""
+#~ "Els tipus de fitxers seleccionats seran reconeguts i reproduïts per "
+#~ "aquest connector. Els tipus no seleccionats seran ignorats, i podran ser "
+#~ "reproduïts per altres connectors."
+
+#~ msgid "AdPlug :: File Info"
+#~ msgstr "AdPlug :: Informació del fitxer"
+
+#~ msgid "Author: "
+#~ msgstr "Autor: "
+
+#~ msgid "File Type: "
+#~ msgstr "Tipus de fitxer: "
+
+#~ msgid "Subsongs: "
+#~ msgstr "Sub-pistes: "
+
+#~ msgid "Instruments: "
+#~ msgstr "Instruments: "
+
+#~ msgid "Orders: "
+#~ msgstr "Ordres: "
+
+#~ msgid "Patterns: "
+#~ msgstr "Pautes: "
+
+#~ msgid "Song"
+#~ msgstr "Cançó"
+
+#~ msgid "Instrument name"
+#~ msgstr "Nom de l'instrument"
+
+#~ msgid "Song message"
+#~ msgstr "Missatge de la cançó"
+
+#~ msgid "Subsong selection"
+#~ msgstr "Selecció de sub-pistes"
+
+#~ msgid "Order: "
+#~ msgstr "Ordre: "
+
+#~ msgid "Pattern: "
+#~ msgstr "Pauta: "
+
+#~ msgid "Row: "
+#~ msgstr "Fila: "
+
+#~ msgid "Speed: "
+#~ msgstr "Velocitat: "
+
+#~ msgid "Timer: "
+#~ msgstr "Temporitzador: "
+
+#~ msgid "About XMMS Alarm"
+#~ msgstr "Quant a l'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 ""
+#~ "Un connector XMMS que es pot fer servir\n"
+#~ "per a començar a reproduir a una certa hora.\n"
+#~ "\n"
+#~ "Envieu totes les queixes a:\n"
+#~ "Adam Feakin <adamf@snika.uklinux.net>\n"
+#~ "\n"
+#~ "http://www.snika.uklinux.net/xmms-alarm/"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarma"
+
+#~ msgid "This is your wakeup call."
+#~ msgstr "Això és l'avís per despertar-se."
+
+#~ msgid "Select Playlist"
+#~ msgstr "Seleccioneu una llista de reproducció"
+
+#~ msgid "Sorry"
+#~ msgstr "Ho sentim"
+
+#~ msgid "Warning"
+#~ msgstr "Atenció"
+
+#~ 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 ""
+#~ "Per raons de seguretat, el temps \"tranquil\" ha de durar almenys 65 "
+#~ "segons més que el temps de fosa, i ha de durar més de 10 segons. Això "
+#~ "bàsicament significa que hi ha un \"bug\" en el codi i que fins que no "
+#~ "trobi la manera de resoldre'l sortirà aquest missatge :)\n"
+#~ "\n"
+#~ "Els paràmetres de fosa NO s'han desat\n"
+#~ "\n"
+#~ "--\n"
+#~ "Adam"
+
+#~ msgid "Oh Well"
+#~ msgstr "Vaja"
+
+#~ msgid "Alarm Settings"
+#~ msgstr "Paràmetres de l'alarma"
+
+#~ msgid "Time"
+#~ msgstr "Hora"
+
+#~ msgid "hours"
+#~ msgstr "hores"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "minutes"
+#~ msgstr "minuts"
+
+#~ msgid "Quiet after:"
+#~ msgstr "Para al cap de:"
+
+#~ msgid "Alarm at (default):"
+#~ msgstr "Alarma (per defecte) a les:"
+
+#~ msgid "Choose the days for the alarm to come on"
+#~ msgstr "Trieu els dies que ha de saltar l'alarma"
+
+#~ msgid "Day"
+#~ msgstr "Dia"
+
+#~ msgid "Tuesday"
+#~ msgstr "Dimarts"
+
+#~ msgid "Wednesday"
+#~ msgstr "Dimecres"
+
+#~ msgid "Thursday"
+#~ msgstr "Dijous"
+
+#~ msgid "Friday"
+#~ msgstr "Divendres"
+
+#~ msgid "Saturday"
+#~ msgstr "Dissabte"
+
+#~ msgid "Sunday"
+#~ msgstr "Diumenge"
+
+#~ msgid "Monday"
+#~ msgstr "Dilluns"
+
+#~ msgid "Days"
+#~ msgstr "Dies"
+
+#~ msgid "Fading"
+#~ msgstr "Fosa"
+
+#~ msgid "Volume"
+#~ msgstr "Volum"
+
+#~ msgid "Current"
+#~ msgstr "Actual"
+
+#~ msgid "reset to current output volume"
+#~ msgstr "posa al volum de sortida actual"
+
+#~ msgid "Start at"
+#~ msgstr "Comença a"
+
+#~ msgid "%"
+#~ msgstr "%"
+
+#~ msgid "Final"
+#~ msgstr "Final"
+
+#~ msgid "Additional Command"
+#~ msgstr "Ordre Addicional"
+
+#~ msgid "enable"
+#~ msgstr "activa"
+
+#~ msgid "Playlist (optional)"
+#~ msgstr "Llista de reproducció (opcional)"
+
+#~ msgid "Browse..."
+#~ msgstr "Vés a..."
+
+#~ msgid "Reminder"
+#~ msgstr "Recordatori"
+
+#~ msgid "Use reminder"
+#~ msgstr "Activa els recordatoris"
+
+#~ msgid "What do these options mean?"
+#~ msgstr "Què signifiquen aquestes opcions?"
+
+#~ 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"
+#~ "Temps\n"
+#~ " Alarma a les: \n"
+#~ " Hora en que salta l'alarma.\n"
+#~ "\n"
+#~ " Para al cap de: \n"
+#~ " Para l'alarma quan hagi passat aquesta estona.\n"
+#~ " (si no heu tancat el diàleg de despertada)\n"
+#~ "\n"
+#~ "\n"
+#~ "Dies\n"
+#~ " Dia:\n"
+#~ " Els dies de la setmana en que s'activa l'alarma.\n"
+#~ "\n"
+#~ " Hora:\n"
+#~ " L'hora en que salta l'alarma cada dia, o bé marqueu\n"
+#~ " la casella per a fer servir l'hora per defecte.\n"
+#~ "\n"
+#~ "\n"
+#~ "Volum\n"
+#~ " Fosa: \n"
+#~ " Augmenta el volum fins el nivell especificat durant el \n"
+#~ " temps indicat.\n"
+#~ "\n"
+#~ " Comença a: \n"
+#~ " Comença amb aquest volum.\n"
+#~ "\n"
+#~ " Final: \n"
+#~ " El nivell de volum final. Si el temps de fosa\n"
+#~ " és 0, es començarà a reproduir a aquest nivell\n"
+#~ " des del principi.\n"
+#~ "\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ " Ordre addicional:\n"
+#~ " Executa aquesta ordre quan salta l'alarma.\n"
+#~ "\n"
+#~ " Llista de reproducció: \n"
+#~ " Carrega aquesta llista de reproducció (ha\n"
+#~ " de tenir extensió .m3u). Si no introduïu cap\n"
+#~ " llista, es faran servir les cançons que hi\n"
+#~ " hagin a la llista en aquest moment.\n"
+#~ " També és possible introduir un URL d'un flux\n"
+#~ " mp3/ogg, però carregar llistes de reproducció\n"
+#~ " des d'URLS de moment no està suportat.\n"
+#~ "\n"
+#~ " Recordatori:\n"
+#~ " Mostra un recordatori quan salta l'alarma,\n"
+#~ " escriviu el recordatori en el camp de text i\n"
+#~ " marqueu la casella si voleu que es mostri.\n"
+
+#~ msgid "Your reminder for today is.."
+#~ msgstr "El vostre recordatori d'avui és.."
+
+#~ msgid "Thankyou"
+#~ msgstr "Gràcies"
+
+#, fuzzy
+#~ msgid "Available Headsets"
+#~ msgstr "Aplicacions de fons disponibles"
+
+#, fuzzy
+#~ msgid "Current Headset"
+#~ msgstr "Actual"
+
+#, fuzzy
+#~ msgid "_Connect"
+#~ msgstr "Connexió"
+
+#, fuzzy
+#~ msgid "Class"
+#~ msgstr "Clàssica"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "Adreça del dispositiu"
+
+#, fuzzy
+#~ msgid "Rescan"
+#~ msgstr "Rellegeix el CD"
+
+#~ msgid "Playback->Play"
+#~ msgstr "Reproducció->Reprodueix"
+
+#~ msgid "Playback->Stop"
+#~ msgstr "Reproducció->Para"
+
+#~ msgid "Playback->Pause"
+#~ msgstr "Reproducció->Pausa"
+
+#~ msgid "Playback->Prev"
+#~ msgstr "Reproducció->Anterior"
+
+#~ msgid "Playback->Next"
+#~ msgstr "Reproducció->Següent"
+
+#~ msgid "Playback->Eject"
+#~ msgstr "Reproducció->Expulsa"
+
+#~ msgid "Playlist->Repeat"
+#~ msgstr "Llista de reproducció->Repeteix"
+
+#~ msgid "Playlist->Shuffle"
+#~ msgstr "Llista de reproducció->Barreja"
+
+#~ msgid "Volume->Up_5"
+#~ msgstr "Volum->Amunt_5"
+
+#~ msgid "Volume->Down_5"
+#~ msgstr "Volum->Avall_5"
+
+#~ msgid "Volume->Up_10"
+#~ msgstr "Volum->Amunt_10"
+
+#~ msgid "Volume->Down_10"
+#~ msgstr "Volum->Avall_10"
+
+#~ msgid "Volume->Mute"
+#~ msgstr "Volum->Silenciat"
+
+#~ msgid "Window->Main"
+#~ msgstr "Finestra->Principal"
+
+#~ msgid "Window->Playlist"
+#~ msgstr "Finestra->Llista de reproducció"
+
+#~ msgid "Window->Equalizer"
+#~ msgstr "Finestra->Equalitzador"
+
+#~ msgid "Window->JumpToFile"
+#~ msgstr "Finestra->SaltaAlFitxer"
+
+#~ 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 ""
+#~ "event-device-plugin: no s'ha pogut obrir el fitxer de dispositiu %s, "
+#~ "s'omet aquest dispositiu; comproveu que el fitxer existeix i que teniu "
+#~ "permís de lectura\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to create a io_channel for device file %s ,"
+#~ "skipping this device\n"
+#~ msgstr ""
+#~ "event-device-plugin: no s'ha pogut crear un canal e/s pel fitxer de "
+#~ "dispositiu %s, s'omet aquest dispositiu\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to open /proc/bus/input/devices , automatic "
+#~ "detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: no s'ha pogut obrir /proc/bus/input/devices, no "
+#~ "funcionarà la detecció automàtica de dispositius.\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 ""
+#~ "event-device-plugin: no s'ha pogut obrir un canal e/s per a /proc/bus/"
+#~ "input/devices, la detecció automàtica de dispositius no funcionarà.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: an error occurred while reading /proc/bus/input/"
+#~ "devices , automatic detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: s'ha produït un error en llegir /proc/bus/input/"
+#~ "devices, la detecció automàtica de dispositius no funcionarà.\n"
+
+#~ msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: el dispositiu %s no s'ha trobat a /dev/input, "
+#~ "s'omet.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to load config file %s , default settings "
+#~ "will be used.\n"
+#~ msgstr ""
+#~ "event-device-plugin: no s'ha pogut carregar el fitxer de configuració %s, "
+#~ "s'utilitzaran els paràmetres per defecte.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: incomplete information in config file for device \"%s"
+#~ "\" , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: informació incompleta en el fitxer de config per al "
+#~ "dispositiu \"%s\", s'omet.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_active value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: configuració, no s'ha pogut obtenir el valor "
+#~ "is_active pel dispositiu \"%s\", s'omet.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to access local directory %s , settings will "
+#~ "not be saved.\n"
+#~ msgstr ""
+#~ "event-device-plugin: no s'ha pogut accedir al directori local %s, no es "
+#~ "desaran les preferències.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get filename value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: configuració, no s'ha pogut obtenir el valor "
+#~ "filename per al dispositiu \"%s\", s'omet.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get phys value for device "
+#~ "\"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: configuració, no s'ha pogut el valor get phys per al "
+#~ "dispositiu \"%s\", s'omet.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_custom value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: configuració, no s'ha pogut obtenir el valor "
+#~ "is_custom per al dispositiu \"%s\", s'omet.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unexpected value for device \"%s\", "
+#~ "skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: configuració, valor inesperat per al dispositiu \"%s"
+#~ "\", s'omet.\n"
+
+#, fuzzy
+#~ msgid "Detected"
+#~ msgstr "Detecta el final de la pista"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "personalitzat"
+
+#, fuzzy
+#~ msgid "Not Detected"
+#~ msgstr "Ordena els seleccionats"
+
+#~ msgid "Information"
+#~ msgstr "Informació"
+
+#~ msgid ""
+#~ "Cannot open bindings window for a not-detected device.\n"
+#~ "Ensure that the device has been correctly plugged in."
+#~ msgstr ""
+#~ "No es pot obrir la finestra de vincles per a un dispositiu no detectat.\n"
+#~ "Assegureu-vos que el dispositiu està ben endollat."
+
+#~ msgid ""
+#~ "Unable to open selected device.\n"
+#~ "Please check read permissions on device file."
+#~ msgstr ""
+#~ "No es pot obrir el dispositiu seleccionat.\n"
+#~ "Comproveu que teniu permís de lectura per a aquest dispositiu."
+
+#~ msgid "EvDev-Plug - Add custom device"
+#~ msgstr "EvDev-Plug - Afegiu un dispositiu personalitzat"
+
+#~ 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 intenta detectar i actualitzar informació sobre dispositius\n"
+#~ "d'esdeveniments disponibles al sistema de manera automàtica.\n"
+#~ "De totes maneres, si l'auto-detecció no funciona en el vostre sistema, o "
+#~ "bé\n"
+#~ "teniu dispositius d'esdeveniments en ubicacions no-estàndard (actualment\n"
+#~ "només es busquen a /dev/input/), potser voldreu afegir un dispositiu\n"
+#~ "personalitzat, especificant explícitament el nom i el fitxer del "
+#~ "dispositiu."
+
+#~ msgid "Device name:"
+#~ msgstr "Nom del dispositiu:"
+
+#~ msgid "Device file:"
+#~ msgstr "Fitxer del dispositiu:"
+
+#, fuzzy
+#~ msgid "(custom)"
+#~ msgstr "personalitzat"
+
+#~ msgid ""
+#~ "Please specify both name and filename.\n"
+#~ "Filename must be specified with absolute path."
+#~ msgstr ""
+#~ "Si us plau, especifiqueu un nom i un fitxer.\n"
+#~ "El fitxer s'ha d'especificar amb un camí absolut."
+
+#~ msgid ""
+#~ "Do you want to remove the existing configuration for selected device?\n"
+#~ msgstr ""
+#~ "Voleu eliminar la configuració existent per al dispositiu seleccionat?\n"
+
+#~ msgid "Do you want to remove the selected custom device?\n"
+#~ msgstr "Voleu eliminar el dispositiu seleccionat?\n"
+
+#~ msgid "EvDev-Plug - Configuration"
+#~ msgstr "EvDev-Plug - Configuració"
+
+#~ msgid "Active"
+#~ msgstr "Actiu"
+
+#~ msgid "Status"
+#~ msgstr "Estat"
+
+#~ msgid "Device Name"
+#~ msgstr "Nom del dispositiu"
+
+#~ msgid "Device File"
+#~ msgstr "Fitxer del dispositiu"
+
+#~ msgid "Device Address"
+#~ msgstr "Adreça del dispositiu"
+
+#~ msgid "_Bindings"
+#~ msgstr "_Vincles"
+
+#~ 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 ""
+#~ "Premeu una tecla del dispositiu per a vincular-la;\n"
+#~ "si no premeu cap tecla en 5 segons, aquesta finestra\n"
+#~ "es tancarà sense fer cap canvi."
+
+#~ 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 ""
+#~ "Aquest esdeveniment d'entrada ja està assignat.\n"
+#~ "\n"
+#~ "No és possible assignar múltiples accions al mateix esdeveniment "
+#~ "d'entrada (és possible assignar la mateixa acció a múltiples "
+#~ "esdeveniments, però)."
+
+#~ msgid "EvDev-Plug - Bindings Configuration"
+#~ msgstr "EvDev-Plug - Configuració dels vincles"
+
+#~ msgid "Name: "
+#~ msgstr "Nom: "
+
+#~ msgid "Filename: "
+#~ msgstr "Nom del fitxer: "
+
+#~ msgid "Phys.Address: "
+#~ msgstr "Adreça física: "
+
+#~ msgid "EvDev-Plug - about"
+#~ msgstr "Quant al connector 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"
+#~ "control remot del reproductor via dispositius d'esdeveniments\n"
+#~ "http://www.develia.org/projects.php?p=audacious#evdevplug\n"
+#~ "\n"
+#~ "escrit per Giacomo Lozito\n"
+
+#~ msgid "This LADSPA plugin has no user controls"
+#~ msgstr "Aquest connector LADSPA no té controls d'usuari"
+
+#~ msgid "Name"
+#~ msgstr "Nom"
+
+#~ msgid "UID"
+#~ msgstr "UID"
+
+#~ msgid "Installed plugins"
+#~ msgstr "Connectors instal·lats"
+
+#~ msgid "Running plugins"
+#~ msgstr "Connectors actius"
+
+#~ msgid "Add"
+#~ msgstr "Afegeix"
+
+#~ msgid "Remove"
+#~ msgstr "Elimina"
+
+#~ msgid "LADSPA Plugin Catalog"
+#~ msgstr "Catàleg de connectors LADSPA"
+
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "Quant al connector LIRC de l'Audacious"
+
+#~ msgid "LIRC Plugin "
+#~ msgstr "Connector per a 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"
+#~ "Un simple connector que permet controlar\n"
+#~ "l'Audacious amb el dimoni de control remot LIRC.\n"
+#~ "\n"
+#~ "Adapatat per a l'Audacious per Tony Vroon <chainsaw@gentoo.org>\n"
+#~ "a partir del connector LIRC de l'XMMS de:\n"
+#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
+#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
+#~ "Andrew O. Shadoura <bugzilla@tut.by>\n"
+#~ "Podeu trobar informació sobre el LIRC a:\n"
+#~ "http://lirc.org"
+
+#~ msgid "LIRC plugin settings"
+#~ msgstr "Paràmetres del connector LIRC"
+
+#~ msgid "Reconnect to LIRC server"
+#~ msgstr "Reconnecta amb el servidor LIRC"
+
+#~ msgid "Timeout before reconnecting (seconds): "
+#~ msgstr "Temps d'espera abans d'intentar reconnectar (segons): "
+
+#~ msgid "Reconnect"
+#~ msgstr "Reconnexió"
+
+#~ msgid "Connection"
+#~ msgstr "Connexió"
+
+#~ msgid "%s: could not init LIRC support\n"
+#~ msgstr "%s: no s'ha pogut inicialitzar el suport per a 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: no s'ha pogut llegir el firxer de configuració de LIRC\n"
+#~ "%s: si us plau, llegiu la documentació de LIRC, per a saber\n"
+#~ "%s: com crear un fitxer de configuració adequat\n"
+
+#~ msgid "%s: trying to reconnect...\n"
+#~ msgstr "%s: tractant de reconnectar...\n"
+
+#~ msgid "%s: unknown command \"%s\"\n"
+#~ msgstr "%s: ordre desconeguda \"%s\"\n"
+
+#~ msgid "%s: disconnected from LIRC\n"
+#~ msgstr "%s: desconnectat del LIRC\n"
+
+#~ msgid "%s: will try reconnect every %d seconds...\n"
+#~ msgstr "%s: s'intentarà reconnectar cada %d segons...\n"
+
+#~ msgid "ModPlug Configuration"
+#~ msgstr "Configuració del connector ModPlug"
+
+#~ msgid "16 bit"
+#~ msgstr "16 bits"
+
+#~ msgid "8 bit"
+#~ msgstr "8 bits"
+
+#~ msgid "Mono (downmix)"
+#~ msgstr "Mono (remescla)"
+
+#~ msgid "Nearest (fastest)"
+#~ msgstr "Més proper (molt ràpid)"
+
+#~ msgid "Linear (fast)"
+#~ msgstr "Lineal (ràpid)"
+
+#~ msgid "Spline (good quality)"
+#~ msgstr "Spline (bona qualitat)"
+
+#~ msgid "8-tap Fir (extremely high quality)"
+#~ msgstr "8-tap Fir (qualitat extremament alta)"
+
+#, fuzzy
+#~ msgid "96 kHz"
+#~ msgstr "48 kHz"
+
+#~ msgid "48 kHz"
+#~ msgstr "48 kHz"
+
+#~ msgid "44 kHz"
+#~ msgstr "44 kHz"
+
+#~ msgid "22 kHz"
+#~ msgstr "22 kHz"
+
+#~ msgid "Sampling Rate"
+#~ msgstr "Freqüència de mostra"
+
+#~ msgid "Enable"
+#~ msgstr "Activa"
+
+#~ msgid "Depth"
+#~ msgstr "Profunditat"
+
+#~ msgid "Delay"
+#~ msgstr "Retard"
+
+#~ msgid "Reverb"
+#~ msgstr "Reverberació"
+
+#~ msgid "Amount"
+#~ msgstr "Quantitat"
+
+#~ msgid "Range"
+#~ msgstr "Amplitud"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Amplificació de baixos"
+
+#~ msgid ""
+#~ "Note: Setting the preamp\n"
+#~ "too high may cause clipping\n"
+#~ "(annoying clicks and pops)!"
+#~ msgstr ""
+#~ "Nota: Posar el preamplificador\n"
+#~ "massa alt pot escapçar el senyal\n"
+#~ "(sorollets emprenyadors)!\""
+
+#~ msgid "Effects"
+#~ msgstr "Efectes"
+
+#~ msgid "Use Filename as Song Title"
+#~ msgstr "Usa el nom del fitxer com a títol"
+
+#~ msgid "Fast Playlist Info"
+#~ msgstr "Informació de la llista de reproducció ràpida"
+
+#~ msgid "Noise Reduction"
+#~ msgstr "Reducció de soroll"
+
+#~ msgid "Play Amiga MOD"
+#~ msgstr "Reprodueix MODs d'Amiga"
+
+#~ msgid "Don't loop"
+#~ msgstr "Al final, torna a començar"
+
+#~ msgid "Loop"
+#~ msgstr "Al final, no torna a començar"
+
+#~ msgid "time(s)"
+#~ msgstr "cop(s)"
+
+#~ msgid "Loop forever"
+#~ msgstr "Torna a començar sempre"
+
+#~ msgid "Looping"
+#~ msgstr "Iteracions"
+
+#~ msgid "MOD Info"
+#~ msgstr "Informació MOD"
+
+#~ msgid ""
+#~ "Filename:\n"
+#~ "Title:\n"
+#~ "Type:\n"
+#~ "Length:\n"
+#~ "Speed:\n"
+#~ "Tempo:\n"
+#~ "Samples:\n"
+#~ "Instruments:\n"
+#~ "Patterns:\n"
+#~ "Channels:"
+#~ msgstr ""
+#~ "Fitxer:\n"
+#~ "Títol:\n"
+#~ "Tipus:\n"
+#~ "Durada:\n"
+#~ "Velocitat:\n"
+#~ "Tempo:\n"
+#~ "Mostres:\n"
+#~ "Instruments:\n"
+#~ "Patrons:\n"
+#~ "Canals:"
+
+#~ msgid ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+#~ msgstr ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+
+#~ msgid "Samples"
+#~ msgstr "Mostres"
+
+#~ msgid "Instruments"
+#~ msgstr "Instruments"
+
+#~ msgid "Message"
+#~ msgstr "Missatge"
+
+#~ msgid "Modplug Input Plugin for Audacious ver"
+#~ msgstr "Connector d'entrada Modplug per a l'Audacious, ver"
+
+#, fuzzy
+#~ 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"
+#~ "Motor de so del Modplug escrit per Olivier Lapicque.\n"
+#~ "Interfície XMMS per al Modplug per Kenton Varda.\n"
+#~ "(c)2000 Olivier Lapicque i Kenton Varda.\n"
+#~ "Actualitzacions i manteniment per Konstanty Bialkowski.\n"
+#~ "Portat al BMP per Theofilos Intzoglou."
+
+#~ msgid "About Modplug"
+#~ msgstr "Quant al connector Modplug"
+
+#~ msgid "Show separators in playlist"
+#~ msgstr "Mostra separadors a la llista de reproducció"
+
+#~ msgid "Show window manager decoration"
+#~ msgstr "Mostra la decoració del gestor de finestres"
+
+#~ msgid "This enables the window manager to show decorations for windows."
+#~ msgstr ""
+#~ "Això permet al gestor de finestres mostrar la decoració de les finestres."
+
+#~ 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 està seleccionat, la informació del fitxer a la finestra principal es "
+#~ "desplaçarà endavant i enrere. Si no està seleccionat, el text es "
+#~ "desplaçarà en una sola direcció."
+
+#~ msgid "Disable inline gtk theme"
+#~ msgstr "Deshabilita els temes GTK en línia"
+
+#, fuzzy
+#~ msgid "Random skin on play"
+#~ msgstr "Reordena la llista de forma aleatòria."
+
+#~ msgid "Allow loading incomplete skins"
+#~ msgstr "Permet carregar decoracions incompletes"
+
+#~ msgid ""
+#~ "If selected, audacious won't refuse loading broken skins. Use only if "
+#~ "your favourite skin doesn't work"
+#~ msgstr ""
+#~ "Si està seleccionat, l'Audacious no refusarà carregar decoracions "
+#~ "defectuoses. Useu-ho només si la vostra decoració favorita no funciona"
+
+#~ msgid "Color Adjustment"
+#~ msgstr "Ajustament del color"
+
+#~ msgid ""
+#~ "Audacious allows you to alter the color balance of the skinned UI. The "
+#~ "sliders below will allow you to do this."
+#~ msgstr ""
+#~ "L'Audacious us permet alterar el balanç de colors de la decoració de la "
+#~ "IG. Els controls de sota us permetran fer això."
+
+#~ msgid "Blue"
+#~ msgstr "Blau"
+
+#~ msgid "Green"
+#~ msgstr "Verd"
+
+#~ msgid "Red"
+#~ msgstr "Roig"
+
+#, fuzzy
+#~ msgid "Color adjustment ..."
+#~ msgstr "Ajustament del color"
+
+#~ msgid "Disable 'GUI Scaling'"
+#~ msgstr "Desactiva l'escalat de la IUG"
+
+#~ msgid "Enable 'GUI Scaling'"
+#~ msgstr "Activa l'escalat de la IUG"
+
+#~ msgid "DoubleSize"
+#~ msgstr "Dobla la mida"
+
+#~ msgid "Easy Move"
+#~ msgstr "Moviment fàcil"
+
+#~ msgid "Spectrum Analyzer"
+#~ msgstr "Analitzador d'espectre"
+
+#, fuzzy
+#~ msgid "Search:"
+#~ msgstr "Any:"
+
+#, fuzzy
+#~ msgid "Stream name"
+#~ msgstr "Nom de l'instrument"
+
+#, fuzzy
+#~ msgid "Now playing"
+#~ msgstr "Llista de reproducció nova"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Esborra l'etiqueta"
+
+#, fuzzy
+#~ msgid "About Stream Browser"
+#~ msgstr "Quant al driver OSS"
+
+#, fuzzy
+#~ 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) 2007, per Calin Crisan <ccrisan@gmail.com> i l'Equip "
+#~ "Audacious.\n"
+#~ "\n"
+#~ "Moltes gràcies als desenvolupadors de la libcdio <http://www.gnu.org/"
+#~ "software/libcdio/>\n"
+#~ "\ti als desenvolupadors de la libcddb <http://libcddb.sourceforge.net/>.\n"
+#~ "\n"
+#~ "També gràcies al meu mentor Tony Vroon pels seus consells.\n"
+#~ "\n"
+#~ "Això va ser un projecte del Google Summer of Code de 2007."
+
+#~ msgid "Can't jump to time when no track is being played.\n"
+#~ msgstr "No es pot saltar al temps quan no s'està reproduint cap pista.\n"
+
+#~ msgid "minutes:seconds"
+#~ msgstr "minuts:segons"
+
+#~ msgid "Track length:"
+#~ msgstr "Durada de la pista:"
+
+#~ msgid "Error writing playlist \"%s\": %s"
+#~ msgstr "Error quan s'escrivia la llista de reproducció \"%s\": %s"
+
 #~ msgid "%s already exist. Continue?"
 #~ msgstr "%s ja existeix. Voleu continuar?"
 
+#, fuzzy
+#~ msgid "Show main menu"
+#~ msgstr "Mostra la finestra principal"
+
+#, fuzzy
+#~ msgid "Show/hide statusbar"
+#~ msgstr "Desa una llista de reproducció"
+
+#, fuzzy
+#~ msgid "Import Playlist ..."
+#~ msgstr "Carrega una llista de reproducció"
+
+#, fuzzy
+#~ msgid "Export Playlist ..."
+#~ msgstr "Carrega una llista de reproducció"
+
+#, fuzzy
+#~ msgid "Refresh"
+#~ msgstr "Velocitat de refresc"
+
+#, fuzzy
+#~ msgid "Refresh Selected"
+#~ msgstr "Treu els seleccionats"
+
+#, fuzzy
+#~ msgid "Refreshes metadata associated with selected entries."
+#~ msgstr "Refresca les meta-dades associades a cada element de la llista."
+
+#, fuzzy
+#~ msgid "Edit the playlist title."
+#~ msgstr "Reordena la llista de forma aleatòria."
+
+#, fuzzy
+#~ msgid "By Formatted Title"
+#~ msgstr "Per títol"
+
+#, fuzzy
+#~ msgid "Components"
+#~ msgstr "Comentari:"
+
+#~ msgid "Upload selected track(s)"
+#~ msgstr "Puja les pistes seleccionades"
+
+#~ msgid "MTP device handler"
+#~ msgstr "Gestor de dispositius MTP"
+
+#~ msgid "Show main player window"
+#~ msgstr "Mostra la finestra principal"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignora"
+
+#~ 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 ""
+#~ "L'Audacious ha arrencat amb totes les finestres ocultes.\n"
+#~ "Potser voldreu mostrar la finestra del reproductor per a controlar "
+#~ "l'Audacious; en cas contrari, l'haureu de controlar remotament via "
+#~ "l'audtool o connectors (com ara el connector statusicon)."
+
+#~ msgid "Always ignore, show/hide is controlled remotely"
+#~ msgstr "Ignora sempre, mostra/oculta es controla remotament"
+
+#~ msgid "Audacious - broken GTK engine usage warning"
+#~ msgstr "Audacious- avís de motor GTK defectuós"
+
+#~ 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>Esteu utilitzant un motor GTK defectuós</big>\n"
+#~ "\n"
+#~ "L'Audacious ha detectat que esteu utilitzant un motor GTK defectuós.\n"
+#~ "\n"
+#~ "El motor de temes que esteu usant, %s, és incompatible amb algunes "
+#~ "funcions que usen moltes decoracions actuals. Les funcions en qüestió "
+#~ "s'han deshabilitat per a aquesta sessió.\n"
+#~ "\n"
+#~ "Si voleu utilitzar aquestes funcions, considereu canviar el motor GTK "
+#~ "actual."
+
+#~ msgid "Do not display this warning again"
+#~ msgstr "No mostrar més aquest avís"
+
+#~ msgid "Save as Static Playlist"
+#~ msgstr "Desa com a llista de reproducció estàtica"
+
+#~ msgid "Use Relative Path"
+#~ msgstr "Usa camins relatius"
+
+#~ msgid "Load Playlist"
+#~ msgstr "Carrega una llista de reproducció"
+
+#~ msgid "Save Playlist"
+#~ msgstr "Desa una llista de reproducció"
+
 #~ msgid ""
 #~ "* Select ALSA output ports *\n"
 #~ "MIDI events will be sent to the ports selected here. In example, if your "
@@ -6516,10 +6328,6 @@
 #~ msgstr "Quant al connector "
 
 #, fuzzy
-#~ msgid "Output plugin"
-#~ msgstr "Connector de sortida nul"
-
-#, fuzzy
 #~ msgid "Throttle Output"
 #~ msgstr "Quant a la sortida aRts"
 
@@ -6643,10 +6451,6 @@
 #~ "Desa les llistes de reproducció seleccionades a la ubicació per defecte."
 
 #, fuzzy
-#~ msgid "_Rename"
-#~ msgstr "Nom del fitxer"
-
-#, fuzzy
 #~ msgid "About Icecast-Plugin"
 #~ msgstr "Quant al connector d'eco"

audacious-plugins-2.5.3.tar.gz/po/cs.po -> audacious-plugins-3.0.tar.gz/po/cs.po Changed

@@ -19,18 +19,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious-plugins 2d9fa6901b3c\n"
+"Project-Id-Version: audacious-plugins audacious-plugins-3.0-beta1\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-05-19 10:53-0400\n"
-"PO-Revision-Date: 2011-04-18 22:05+0200\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
+"PO-Revision-Date: 2011-07-04 19:58+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"
 "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:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -41,607 +42,47 @@
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM dekodér © Nero AG, www.nero.com\n"
 "Copyright © 2005–2006 tým Audacious"
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "O modulu dekodéru MP4 AAC"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "O "
-
-#: src/adplug/adplug-xmms.cc:155
-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 © 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
-"\n"
-"Tento modul je uvolněn za podmínek licence GNU LGPL.\n"
-"Pro podrobnosti vizte http://www.gnu.org/licenses/lgpl.html.\n"
-"\n"
-"Tento modul používá knihovnu AdPlug, copyright © Simon Peter aj.\n"
-"Sestaveno s verzí knihovny AdPlug: "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: Nastavení"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "OK"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "Obecné"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Kvalita zvuku"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Rozlišení"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8 bitů"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16 bitů"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Kanály"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Stereo"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-"Nastavení sterea není doporučeno, pokud jej opravdu nepotřebujete. Tato "
-"volba nepřidává do zvuku žádné stereo efekty – OPL2 je prostě mono – ale "
-"spotřebovává více výkonu CPU!"
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Frekvence"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Přehrát"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Rozpoznat konec skladby"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-"Je-li zapnuto, XMMS pozná konec skladby, zastaví ji a přejde na další ze "
-"seznamu skladeb. Je-li vypnuto, XMMS nebude reagovat na konec skladby a bude "
-"ji opakovat stále dokola."
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Formáty"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Výběr formátu"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Formát"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Přípona"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-"Vybrané druhy souborů budou rozpoznány a hrány tímto modulem. Nevybrané "
-"druhy budou ignorovány a přenechány ostatním modulům."
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: Informace o souboru"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Jméno souboru"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Název: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Autor: "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Velikost souboru: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "Podskladby: "
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Nástroje: "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "Pořadí: "
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Vzorky: "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Skladba"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Jméno nástroje"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Zpráva skladby"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "Výběr podskladby"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Pořadí: "
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Vzorek: "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Řada: "
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Rychlost: "
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Časovač: "
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "O XMMS budíku"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "XMMS budík"
-
-#: src/alarm/interface.c:56
-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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Zavřít"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Budík"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "Toto je váš budící signál."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "Budiž"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Vybrat seznam skladeb"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Je mi líto"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Varování"
-
-#: src/alarm/interface.c:213
-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:229
-msgid "Oh Well"
-msgstr "Dobrá"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Nastavení budíku"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Čas"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "hodin"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "minut"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Ticho po:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Budit v (standardní):"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Vyberte dny, kdy má budík budit"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Standardní"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Den"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Úterý"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Středa"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Čtvrtek"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Pátek"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Sobota"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Neděle"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Pondělí"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Dny"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Zesilování"
-
-#: src/alarm/interface.c:1087 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:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Hlasitost"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Současná"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "navrátit na současnou hlasitost výstupu"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Začít na"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Skončit na"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Dodatečný příkaz"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "zapnout"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Seznam skladeb (volitelné)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Procházet…"
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Upomínání"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Upomínat"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Nastavení"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Co tyto volby znamenají?"
-
-#: src/alarm/interface.c:1364
-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:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Nápověda"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "Váš vzkaz pro dnešek je…"
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Děkuji"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Implicitní PCM zařízení"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 msgid "Default mixer device"
 msgstr "Implicitní směšovací zařízení"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 msgid "ALSA Output Plugin Preferences"
 msgstr "Nastavení výstupního modulu ALSY"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 msgid "PCM device:"
 msgstr "Zařízení PCM:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Zařízení směšovače:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 msgid "Mixer element:"
 msgstr "Prvek směšovače:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr "Obejít zaseknutí při vyprazdňovaní"
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
 msgstr "O výstupním modulu ALSA"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr "Chyba ALSY"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -809,6 +250,10 @@
 msgid "SoundFont settings"
 msgstr "Nastavení SoundFontu"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Jméno souboru"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Velikost (v bajtech):"
@@ -915,8 +360,7 @@
 "Backend\n"
 "TiMidity"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -1092,119 +536,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Spustí OSD, když přehrávání obnoveno."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Umístění"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "Relativní odsazení ve směru osy X:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Relativní odsazení ve směru osy Y"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "Maximální šířka OSD"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Nastavení pro více monitorů"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "Zobrazit OSD na:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "všech monitorech"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "monitoru %i"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Časování (ms)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "Zobrazení:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "Rozsvícení:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "Pohasnutí:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Fonty"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "Font %i:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Stín"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Internacionalizace"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "Zakázat převod textu do UTF-8 (uvnitř aosd)"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "Vyberte soubor se skinem"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Styl vyobrazení"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "Barvy %i:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "Vlastní skin:"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "Soubor se skinem:"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "Procházet"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Povolit spouštěč"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Událost"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "Nalezen kompozitní správce"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1214,73 +658,73 @@
 "Pokud nevíte, že byste jste již nějakého spustili, prosím, aktivujte "
 "kompozitního správce, jinak OSD nebude správně fungovat."
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "Při falešné průhlednosti není kompozitní správce potřeba"
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Průhlednost"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Falešná průhlednost"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Skutečná průhlednost (vyžaduje kompozitní rozšíření X)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "Kompozitní rozšíření není nahráno"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "Kompozitní rozšíření není dostupné"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "OSD Audacious"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "OSD pro Audacious – nastavení"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Vyzkoušet"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Umístění"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Animace"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Výzdoba"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Spouštěč"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Různé"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "OSD pro Audacious – o modulu"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1288,7 +732,7 @@
 "\n"
 "OSD pro Audacious "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1310,134 +754,6 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr "Požadavek na spárování „%s“"
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr "Požadavek na autorizaci %s"
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr "Vazba s %s vytvořena"
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr "Vazba s %s odstraněna"
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr "Zařízení bylo vypnuto"
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr "Zařízení bylo učiněno neobjevitelným"
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr "Zařízení bylo učiněno připojitelným"
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr "Zařízení bylo učiněno objevitelným"
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr "Zařízení bylo učiněno omezeně objevitelným"
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr "Zařízení bylo přepnuto do režimu párování"
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr "Modul podporující náhlavní sady s bluetooth"
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-"Podpora náhlavních sad s bluetooth\n"
-"Copyright © 2008 Paula Stanciu <paula.stanciu@gmail.com>\n"
-"Toto byl projekt GSoC 2008 – Poděkování patří mému učiteli Tony Vroonovi a "
-"týmu Audacious\n"
-" \n"
-"Aby fungoval AVRCP, potřebuje zavést do jádra modul uinput.\n"
-"Tlačítka náhlavní sady se tak budou jevit jako normální multimediální\n"
-"klávesy a mohou být nastaveny pomocí Audacious modulu Globální horké\n"
-"klávesy nebo jinými nástroji, které poskytuje váš správce oken.\n"
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr "Výrobce"
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr "Dostupné náhlavní sady"
-
-#: src/bluetooth/gui.c:224
-msgid "Current Headset"
-msgstr "Současná náhlavní sada"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr "_Obnovit"
-
-#: src/bluetooth/gui.c:231
-msgid "_Connect"
-msgstr "_Spojit"
-
-#: src/bluetooth/gui.c:237
-msgid "_Close"
-msgstr "_Zavřít"
-
-#: src/bluetooth/gui.c:274
-msgid "Class"
-msgstr "Třída"
-
-#: src/bluetooth/gui.c:278
-msgid "Address:"
-msgstr "Adresa:"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr "Vazba vytvořena!"
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr "Žádné zařízení nenalezeno!"
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr "Vyhledává se…"
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr "Páruje se…"
-
-#: src/bluetooth/scan_gui.c:138
-msgid "Rescan"
-msgstr "Znovu vyhledat"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "Hrát"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Blur scope: výběr barvy"
@@ -1446,11 +762,11 @@
 msgid "Options:"
 msgstr "Volby:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 msgid "About Audio CD Plugin"
 msgstr "O zásuvném modulu zvukových CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1474,15 +790,15 @@
 "Toto byl projekt z Google Summer of Code 2007.\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 msgid "Audio CD"
 msgstr "Zvukové CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr "Mechanika je prázdná"
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr "Nepodporovaný druh disku."
 
@@ -1530,11 +846,23 @@
 msgid "Override default device: "
 msgstr "Přebít výchozí zařízení: "
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+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"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "Přidat CD"
 
@@ -1558,6 +886,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Dekodér hudby pro herní konzole"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "Obecné"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Přehrát"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Hloubky:"
@@ -1575,8 +911,7 @@
 msgid "Default song length:"
 msgstr "Implicitní délka skladby:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Převzorkování"
 
@@ -1588,6 +923,10 @@
 msgid "Resampling rate:"
 msgstr "Převzorkovat na:"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1659,16 +998,16 @@
 "Skladby můžete převzorkovat na stejnou frekvenci pomocí efektu Převodníku "
 "vzorkovací frekvence."
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "Nastavit krystalizér"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Síla efektu:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Použít"
 
@@ -1708,396 +1047,42 @@
 msgid "Volume: (%)"
 msgstr "Hlasitost: (%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "Přehrát → Hrát"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "Přehrát → Zastavit"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "Přehrát → Pozastavit"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "Přehrát → Předchozí"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "Přehrát → Další"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "Přehrát → Vysunout"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "Seznam skladeb → Opakovat"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "Seznam skladeb → Náhodné přehrávání"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "Hlasitost → Zvýšit o 5"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "Hlasitost → Snížit o 5"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "Hlasitost → Zvýšit o 10"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "Hlasitost → Snížit o 10"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "Hlasitost → Ztlumit"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "Okno → Hlavní"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "Okno → Seznam skladeb"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "Okno → Ekvalizér"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "Okno → Přejít na soubor"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-"event-device-plugin: nelze otevřít zařízení %s, přeskakuji toto zařízení; "
-"zkontrolujte, že soubor existuje a že máte právo jej číst\n"
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-"event-device-plugin: nelze vytvořit io_channel (vstupně-výstupní kanál) pro "
-"zařízení %s, přeskakuji toto zařízení\n"
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: nelze otevřít /proc/bus/input/devices, samočinné "
-"vyhledávání událostních zařízení nebude fungovat.\n"
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-"event-device-plugin: nelze otevřít io_channel (vstupně-výstupní kanál) pro /"
-"proc/bus/input/devices, samočinné vyhledávání událostních zařízení nebude "
-"fungovat.\n"
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: došlo k chybě při čtení z /proc/bus/input/devices, "
-"samočinné vyhledávání událostních zařízení nebude fungovat.\n"
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-"event-device-plugin: zařízení %s nebylo nalezeno v /dev/input, přeskakuji.\n"
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-"event-device-plugin: nelze načíst konfigurační soubor %s, bude použito "
-"implicitní nastavení.\n"
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-"event-device-plugin: neúplné informace v konfiguračním souboru pro zařízení "
-"„%s“, přeskakuji.\n"
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurace: nelze získat hodnotu is_active pro "
-"zařízení „%s“, přeskakuji.\n"
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-"event-device-plugin: nelze přistoupit k místnímu adresáři %s, nastavení "
-"nebude uloženo.\n"
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurace: nelze získat hodnotu filename pro zařízení "
-"„%s“, přeskakuji.\n"
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurace: nelze získat hodnotu phys pro zařízení "
-"„%s“, přeskakuji.\n"
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurace: nelze získat hodnotu is_custom pro "
-"zařízení „%s“, přeskakuji.\n"
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurace: neočekávaná hodnot pro zařízení „%s“, "
-"přeskakuji.\n"
-
-#: src/evdev-plug/ed_ui.c:212
-msgid "Detected"
-msgstr "Nalezeno"
-
-#: src/evdev-plug/ed_ui.c:217
-msgid "Custom"
-msgstr "Vlastní"
-
-#: src/evdev-plug/ed_ui.c:223
-msgid "Not Detected"
-msgstr "Nenalezeno"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "Podrobnosti"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-"Nelze otevřít okno s vazbami pro nerozpoznané zařízení.\n"
-"Ujistěte se, že zařízení bylo správně zapojeno."
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Chyba"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-"Nelze otevřít vybrané zařízení.\n"
-"Prosím, zkontrolujte práva k tomuto zařízení."
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "EvDev-Plug  – Přidat vlastní zařízení"
-
-#: src/evdev-plug/ed_ui.c:353
-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 zkusí sám rozpoznat událostní zařízení připojená do systému\n"
-"a aktualizovat údaje o nich.\n"
-"Pokud však samočinné vyhledání selže nebo máte událostní zařízení\n"
-"v nestandardním adresáři (v současnosti je prohledáván jen /dev/input),\n"
-"můžete přidat zařízení ručně jako vlastní, přičemž budete muset zadat\n"
-"jeho název a soubor tohoto zařízení."
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Název zařízení:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Soubor zařízení:"
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr "(vlastní)"
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-"Prosím, zadejte jak název, tak název souboru.\n"
-"Název souboru musí být uveden s absolutní cestou."
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr "Přejete si odstranit existující nastavení pro vybrané zařízení?\n"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "Přejete si odstranit vybrané vlastní zařízení?\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "EvDev-Plug – Nastavení"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Aktivní"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Stav"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Název zařízení"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Soubor zařízení"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Adresa zařízení"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "_Vazby"
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-"Pro navázání, prosím, stiskněte klávesu na vašem zařízení;\n"
-"pokud nebude stištěna žádná klávesa do pěti sekund,\n"
-"toto okno bude zavřeno, aniž by se vazba změnila."
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-"Vstupní událost již byla přiřazena.\n"
-"\n"
-"Není možné přiřadit více akcí stejné vstupní události (ačkoliv je možné "
-"přiřadit stejnou akci více událostem)."
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Plug – Nastavení vazeb"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "Název: "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Název souboru: "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Fyzická adresa: "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "EvDev-Plug – o modulu"
-
-#: src/evdev-plug/ed_ui.c:1491
-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"
-"dálkové ovládání přehrávače pomocí událostních zařízení\n"
-"http://www.develia.org/projects.php?p=audacious#evdevplug\n"
-"\n"
-"napsal Giacomo Lozito\n"
-
-#: src/ffaudio/ffaudio-core.c:765
+#: 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"
 "Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 "Víceformátový zvuk dekódující modul pro Audacious založený na\n"
 "multimediálním systému FFmpeg (http://www.ffmpeg.org/)\n"
 "Copyright © 2000–2009 Fabrice Bellard aj.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Modul do Audacious napsali:\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:778
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "O modulu FFaudio"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "O modulu FileWriter"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2131,51 +1116,51 @@
 "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:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "Nastavení zápisu do souboru"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Formát výstupního souboru:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Nastavit"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Ukládat do původního adresáře"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Ukládat do vlastního adresáře"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Složka s výstupními soubory:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Vybrat složku"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Získat jméno souboru z:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "původních značek v souboru"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "jména původního souboru"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Nezkracovat příponu jména souboru"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "Předřadit jménu souboru číslo stopy"
 
@@ -2187,6 +1172,14 @@
 msgid "Joint Stereo"
 msgstr "Joint-stereo"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Mono"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "Nastavení MP3"
@@ -2232,7 +1225,6 @@
 msgstr "Ochrana před chybami"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Kvalita"
 
@@ -2340,11 +1332,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "O modulu pro zkratky Gnome"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2358,58 +1350,22 @@
 "Copyright © 2007–2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr "Otevřít soubory"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 msgid "Add Files"
 msgstr "Přidat soubory"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 msgid "Audacious2"
 msgstr "Audacious2"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr "Rozhraní gnt"
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-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"
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr "Přejít na čas"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr "minuty:sekundy"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr "Délka stopy:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr "Chyba při zapisování seznamu skladeb „%s“: %s"
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-msgid "Export Playlist"
-msgstr "Exportovat seznam skladeb"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-msgid "Import Playlist"
-msgstr "Importovat seznam skladeb"
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Číslo položky"
@@ -2494,417 +1450,292 @@
 msgid "Disable"
 msgstr "Zakázat"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr "Rozhraní GTK"
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s – Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr "Zastavit po současné skladbě"
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr "Opakovat"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr "Náhodné přehrávání"
-
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr "Žádné pokračování dle seznamu skladeb"
-
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr "Zobrazit oblast informací"
-
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr "Zobrazit/skrýt oblast informací"
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr "Zobrazit hlavní nabídku"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr "Zobrazit/skrýt hlavní nabídku"
-
-#: src/gtkui/ui_manager.c:55
-msgid "Show statusbar"
-msgstr "Stav stavový panel"
-
-#: src/gtkui/ui_manager.c:56
-msgid "Show/hide statusbar"
-msgstr "Zobrazit/skrýt stavový panel"
-
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
-msgstr "Zobrazit záhlaví sloupců"
-
-#: src/gtkui/ui_manager.c:60
-msgid "Scroll on Song Change"
-msgstr "Odrolovat na změněnou skladbu"
-
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
-msgstr "Pozastavit"
-
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
-msgstr "Zastavit"
-
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
-msgstr "Předchozí"
-
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
-msgstr "Další"
-
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "Seznam skladeb"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "Nový seznam skladeb"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "Smazat seznam skladeb"
-
-#: src/gtkui/ui_manager.c:95
-msgid "Import Playlist ..."
-msgstr "Importovat seznam skladeb…"
-
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr "Načte soubor se seznamem skladeb do vybraného seznamu."
-
-#: src/gtkui/ui_manager.c:98
-msgid "Export Playlist ..."
-msgstr "Exportovat seznam skladeb…"
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "Uloží vybraný seznam skladeb."
-
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-msgid "Save All Playlists"
-msgstr "Uložit všechny seznamy skladeb"
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-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/gtkui/ui_manager.c:106
-msgid "Refresh"
-msgstr "Obnovit"
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Obnovuje metadata náležící skladbě ze seznamu."
-
-#: src/gtkui/ui_manager.c:110
-msgid "Refresh Selected"
-msgstr "Obnovit označené"
-
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
-msgstr "Obnovuje metadata náležící vybraným položkám."
-
-#: src/gtkui/ui_manager.c:115
-msgid "Playlist Manager"
-msgstr "Správce seznamů skladeb"
-
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr "Otevře správce seznamu skladeb."
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr "Přidat URL…"
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr "Do seznamu přidá vzdálenou stopu."
-
-#: src/gtkui/ui_manager.c:123
-msgid "Add Files ..."
-msgstr "Přidat soubory…"
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr "Přidá soubory do seznamu skladeb."
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr "Odebrat všechny"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr "Ze seznamu odstraní všechny skladby."
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr "Odebrat neoznačené"
-
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr "Odebrat neoznačené skladby se seznamu."
-
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr "Odebrat označené"
-
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr "Odebrat označené skladby ze seznamu."
-
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
-msgstr "Upravit název"
-
-#: src/gtkui/ui_manager.c:140
-msgid "Edit the playlist title."
-msgstr "Upravit název seznamu skladeb."
-
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
-msgstr "Vybrat sloupce…"
-
-#: src/gtkui/ui_manager.c:146
-msgid "Sort"
-msgstr "Seřadit"
-
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
-msgstr "Podle čísla stopy"
-
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
-msgstr "Podle názvu"
-
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
-msgstr "Podle umělce"
-
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
-msgid "By Album"
-msgstr "Podle alba"
-
-#: src/gtkui/ui_manager.c:155
-msgid "By Release Date"
-msgstr "Podle data vydání"
-
-#: src/gtkui/ui_manager.c:157
-msgid "By File Path"
-msgstr "Podle cesty k souboru"
-
-#: src/gtkui/ui_manager.c:159
-msgid "By Formatted Title"
-msgstr "Podle formátovaného názvu"
-
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
-msgstr "Obrátit pořadí"
-
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
-msgstr "Náhodné pořadí"
-
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr "Výstup"
-
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "Efekty"
-
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
-msgstr "Ekvalizér"
-
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "Zobrazení"
-
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
-msgstr "Rozhraní"
-
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "Soubor"
-
-#: src/gtkui/ui_manager.c:188
-msgid "Components"
-msgstr "Součásti"
-
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr "Zobrazit informace o skladbě"
-
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr "Zobrazit informace o skladbě"
-
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "O Audacious"
-
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
-msgstr "Otevřít soubory…"
-
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
-msgstr "Načíst a přehrát soubor"
-
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
-msgstr "Otevřít URL…"
-
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr "Hrát média z vybraného místa"
-
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "Služby modulů"
-
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "Nastavení"
+#: src/gtkui/menus.c:132
+msgid "_Open Files ..."
+msgstr "_Otevřít soubory…"
+
+#: src/gtkui/menus.c:133
+msgid "Open _URL ..."
+msgstr "Otevřít _URL…"
+
+#: src/gtkui/menus.c:134
+msgid "_Add File ..."
+msgstr "Přid_at soubor…"
+
+#: src/gtkui/menus.c:135
+msgid "Add U_RL ..."
+msgstr "Přidat U_RL…"
+
+#: src/gtkui/menus.c:137
+msgid "A_bout ..."
+msgstr "_O programu… "
+
+#: src/gtkui/menus.c:138
+msgid "_Preferences ..."
+msgstr "Nasta_vení…"
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr "Otevřít okno s nastavením"
-
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
 msgid "_Quit"
 msgstr "_Konec"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "O Audacious"
+#: src/gtkui/menus.c:142
+msgid "_Play"
+msgstr "_Hrát"
+
+#: src/gtkui/menus.c:143
+msgid "Paus_e"
+msgstr "P_ozastavit"
+
+#: src/gtkui/menus.c:144
+msgid "_Stop"
+msgstr "Za_stavit"
+
+#: src/gtkui/menus.c:145
+msgid "Pre_vious"
+msgstr "Před_chozí"
+
+#: src/gtkui/menus.c:146
+msgid "_Next"
+msgstr "_Další"
+
+#: src/gtkui/menus.c:148
+msgid "_Repeat"
+msgstr "_Opakovat"
+
+#: src/gtkui/menus.c:149
+msgid "S_huffle"
+msgstr "Ná_hodné přehrávání"
+
+#: src/gtkui/menus.c:150
+msgid "N_o Playlist Advance"
+msgstr "Žádné p_okračování dle seznamu skladeb"
+
+#: src/gtkui/menus.c:151
+msgid "Stop _After This Song"
+msgstr "Z_astavuje po skladbě."
+
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
+msgstr "_Informace o skladbě…"
+
+#: src/gtkui/menus.c:154
+msgid "Jump to _Time ..."
+msgstr "Přejí_t na čas…"
+
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
+msgstr "Pře_jít na skladbu…"
+
+#: src/gtkui/menus.c:158
+msgid "By Track _Number"
+msgstr "Podle čísla _stopy"
+
+#: src/gtkui/menus.c:159
+msgid "By _Title"
+msgstr "Podle ná_zvu"
+
+#: src/gtkui/menus.c:160
+msgid "By _Artist"
+msgstr "Podle _umělce"
+
+#: src/gtkui/menus.c:161
+msgid "By A_lbum"
+msgstr "Podle a_lba"
+
+#: src/gtkui/menus.c:162
+msgid "By Release _Date"
+msgstr "Podle data vy_dání"
+
+#: src/gtkui/menus.c:163
+msgid "By _File Path"
+msgstr "Podle _cesty k souboru"
+
+#: src/gtkui/menus.c:164
+msgid "By _Custom Title"
+msgstr "_Vlastní název"
+
+#: src/gtkui/menus.c:166
+msgid "R_everse Order"
+msgstr "_Obrátit pořadí"
+
+#: src/gtkui/menus.c:167
+msgid "_Random Order"
+msgstr "Ná_hodné pořadí"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr "Nastavit A-B"
-
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr "Vyprázdnit A-B"
-
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr "Přejít na začátek seznamu skladeb"
-
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
-msgstr "Přejít na soubor"
-
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr "Přepnout frontu"
-
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Povolí/zakáže položku ve frontě seznamu skladeb."
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
+msgstr "_Obnovit"
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
-msgstr "Kopírovat"
+#: src/gtkui/menus.c:172
+msgid "_Sort"
+msgstr "_Seřadit"
+
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr "_Nový"
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-msgid "Cut"
-msgstr "Oříznout"
+#: src/gtkui/menus.c:175
+msgid "_Close"
+msgstr "_Zavřít"
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
-msgstr "Vložit"
+#: src/gtkui/menus.c:177
+msgid "_Import ..."
+msgstr "_Importovat…"
+
+#: src/gtkui/menus.c:178
+msgid "_Export ..."
+msgstr "_Exportovat…"
+
+#: src/gtkui/menus.c:180
+msgid "_Playlist Manager ..."
+msgstr "S_právce seznamů skladeb…"
+
+#: src/gtkui/menus.c:183
+msgid "Volume _Up"
+msgstr "Ze_sílit"
+
+#: src/gtkui/menus.c:184
+msgid "Volume _Down"
+msgstr "Z_tišit"
+
+#: src/gtkui/menus.c:186
+msgid "_Equalizer"
+msgstr "_Ekvalizér"
+
+#: src/gtkui/menus.c:188
+msgid "E_ffects"
+msgstr "E_fekty"
+
+#: src/gtkui/menus.c:191
+msgid "_Interface"
+msgstr "_Rozhraní"
+
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
+msgstr "Zobrazit h_lavní nabídku"
+
+#: src/gtkui/menus.c:194
+msgid "Show I_nfo Bar"
+msgstr "Zobrazit oblast i_nformací"
+
+#: src/gtkui/menus.c:195
+msgid "Show _Status Bar"
+msgstr "Zobrazit _stavový panel"
+
+#: src/gtkui/menus.c:197
+msgid "Show Column _Headers"
+msgstr "Zobrazit zá_hlaví sloupců"
+
+#: src/gtkui/menus.c:198
+msgid "Choose _Columns ..."
+msgstr "Vybrat sloup_ce…"
+
+#: src/gtkui/menus.c:199
+msgid "Scrol_l on Song Change"
+msgstr "Odro_lovat na změněnou skladbu"
+
+#: src/gtkui/menus.c:202
+msgid "_File"
+msgstr "_Soubor"
+
+#: src/gtkui/menus.c:203
+msgid "_Playback"
+msgstr "_Přehrát"
+
+#: src/gtkui/menus.c:204
+msgid "P_laylist"
+msgstr "Seznam sk_ladeb"
+
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+msgid "_Services"
+msgstr "_Služby"
+
+#: src/gtkui/menus.c:206
+msgid "_Output"
+msgstr "_Výstup"
+
+#: src/gtkui/menus.c:207
+msgid "_View"
+msgstr "_Zobrazení"
+
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
+msgstr "Ode_brat/přidat z/do fronty"
+
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
+msgstr "V_yjmout"
+
+#: src/gtkui/menus.c:215
+msgid "_Copy"
+msgstr "_Kopírovat"
+
+#: src/gtkui/menus.c:216
+msgid "_Paste"
+msgstr "V_ložit"
+
+#: src/gtkui/menus.c:217
+msgid "Select _All"
+msgstr "Vybr_at vše"
+
+#: src/gtkui/menus.c:222
+msgid "_Rename"
+msgstr "_Přejmenovat"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
-msgstr "Vybrat vše"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
+msgstr "Rozhraní GTK"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr "Vybere všechny skladby v seznamu."
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s – Audacious"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr "Nevybrat žádné"
+#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+msgid "Audacious"
+msgstr "Audacious"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr "Žádná skladba v seznamu nebude vybraná."
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Chyba"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "stereo"
 
-# FIXME: plurals
-#: src/gtkui/ui_statusbar.c:104
-#, fuzzy, c-format
+#: src/gtkui/ui_statusbar.c:106
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] "%d kanálů"
-msgstr[1] "%d kanálů"
+msgstr[0] "%d kanál"
+msgstr[1] "%d kanály"
+msgstr[2] "%d kanálů"
 
-#: src/gtkui/ui_statusbar.c:119
-#, fuzzy, c-format
+#: src/gtkui/ui_statusbar.c:121
+#, c-format
 msgid "%d kbps"
-msgstr "kb/s"
+msgstr "%d kb/s"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
 msgstr "Předchozí stopa"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Hrát"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr "Pozastavit/Pokračovat"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Zastavit"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr "Další stopa"
@@ -2929,6 +1760,10 @@
 msgid "Volume Down"
 msgstr "Ztišit"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr "Přejít na soubor"
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr "Přepnout okna přehrávače"
@@ -2937,11 +1772,19 @@
 msgid "Show On-Screen-Display"
 msgstr "Zobrazit OSD (nápis na obrazovce)"
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+msgid "Toggle Repeat"
+msgstr "Přepnout opakování"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle Shuffle"
+msgstr "Přepnout náhodné přehrávání"
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(žádné)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2952,15 +1795,15 @@
 "\n"
 "Chcete pokračovat?"
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr "Přiřazuji tlačítka myši"
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Hlavní nastavení modulu pro horké klávesy"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2968,23 +1811,23 @@
 "Uvnitř textového pole stiskněte kombinaci kláves.\n"
 "Navázat lze také tlačítka myši."
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr "Horké klávesy:"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr "Akce"
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr "Navázání kláves:"
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr "O modulu Global Hotkey"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -3059,130 +1902,23 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "O výstupním modulu JACK 0.17"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr "Tento LADSPA modul nemá žádné možnosti nastavení uživatelem"
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "Jméno"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "Nainstalované moduly"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "Bežící moduly"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "Přidat"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "Odebrat"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "Katalog LADSPA modulů"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "O modulu LIRC pro Audacious"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "Modul LIRC "
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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"
+"Looking for lyrics..."
 msgstr ""
 "\n"
-"Jednoduchý modul, který vám dovolí ovládat Audacious\n"
-"prostřednictvím démona dálkového ovládání LIRC.\n"
-"\n"
-"Pro Audacious upravil Tony Vroon <chainsaw@gentoo.org>\n"
-"z XMMS LIRC modulu, jehož tvůrci jsou:\n"
-"Carl van Schaik <carl@leg.uct.ac.za>\n"
-"Christoph Bartelmus <xmms@bartelmus.de>\n"
-"Andrew O. Shadoura <bugzilla@tut.by>\n"
-"Informace o LIRC lze získat na:\n"
-"http://lirc.org/"
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr "Nastavení modulu LIRC"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr "Znovu se připojit k serveru LIRC"
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr "Časový limit pro znovupřipojení (sekundy): "
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr "Znovu se připojit"
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr "Spojení"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: nelze inicializovat podporu LIRC\n"
+"Vyhledává se text…"
 
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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: nelze číst z konfiguračního souboru LIRC\n"
-"%s: prosím, přečtěte si dokumentaci k LIRC,\n"
-"%s: jak správně vytvořit konfigurační soubor\n"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr "%s: pokouším se znovu připojit…\n"
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: neznámý příkaz „%s“\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: odpojeno od LIRC\n"
-
-# FIXME: plural
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
-msgstr "%s: pokus o připojení budu opakovat každých %d sekund…\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr ""
+"\n"
+"Připoje se k lyrics.wikia.com…"
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
@@ -3190,11 +1926,11 @@
 "\n"
 "Žádné texty nebyly nalezeny."
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "O metronomu"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3208,265 +1944,45 @@
 "např. tact://77 hraje 77 úderů za minutu\n"
 "nebo tact://60*3/4 hraje v tempu 60 úderu za minutu v 3⁄4 taktu"
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generátor taktu: %d dob/min"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generátor taktu: %d dob/min %d⁄%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "Nastavení ModPlugu"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 bitů"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 bitů"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr "Mono (smísit kanály)"
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr "Nejbližší (nejrychlejší)"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "Lineární (rychlé)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr "Spline (kvalitní)"
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr "FIR filtr osmého řádu (velmi kvalitní)"
-
-#: src/modplug/gui/interface.cxx:286
-msgid "96 kHz"
-msgstr "96 kHz "
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Vzorkovací kmitočet"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "Povolit"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "Hloubka"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "Zpoždění"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "Dozvuk"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "Množství"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "Rozsah"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "Zvýraznění hlubokých tónů"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Prostorový zvuk"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-"Poznámka: Vysoké hodnoty\n"
-"předzesílení mohou vést k ořezu\n"
-"zvuku (obtěžující praskání)!"
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "Předzesílení"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "Použít jméno souboru jako název skladby"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "Rychlé informace o seznamu skladeb"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "Redukce šumu"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Hrát MODY z Amigy"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "Nevracet se ve smyčce"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "Opakovat"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "×"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "Nekonečná smyčka"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "Smyčky"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "Informace o MODU"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-"Jméno souboru:\n"
-"Název skladby:\n"
-"Typ:\n"
-"Délka:\n"
-"Rychlost:\n"
-"Tempo:\n"
-"Vzorků:\n"
-"Nástrojů:\n"
-"Vzory:\n"
-"Kanálů:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "Vzorky"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "Nástroje"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "Vzkaz"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Vstupní modul pro Audacious Modplug verze "
-
-#: src/modplug/gui/main.cxx:52
-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"
-"Zvukové jádro Modplugu napsal Olivier Lapicque.\n"
-"XMMS rozhraní Modplugu od Kentona Varda.\n"
-"© 2000 Olivier Lapicque a Kenton Varda.\n"
-"Aktualizuje a udržuje Konstanty Bialkowski.\n"
-"Na BMP převedl Theofilos Intzoglou."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "O modulu Modplug"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nebylo možné nalézt soubor s pixmapou: %s"
-
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr "Nahrát vybranou stopu(y)"
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr "Nahrávám…"
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr "Deskriptor MTP zařízení"
-
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
-msgstr "Odpojit zařízení"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
+msgstr "Nahrát do zařízení MTP"
+
+#: src/mtp_up/mtp.c:311
+msgid "Disconnect MTP Device"
+msgstr "Odpojit zařízení MTP"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "Zastavit"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Audacious – varování o viditelnosti"
 
 #: src/null/null.c:64
 msgid "Null output plugin "
-msgstr "Slepý výstupní modul "
+msgstr "Hluchý výstupní modul "
 
 #: src/null/null.c:65
 msgid ""
@@ -3512,11 +2028,11 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr "Zapnout převody formátu prostřednictvím OSS."
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "O modulu OSS4"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
@@ -3564,6 +2080,11 @@
 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"
@@ -3634,11 +2155,11 @@
 "nestalo, obraťte se na Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "O výstupním modulu PulseAudio pro Audacious"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3693,27 +2214,27 @@
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Služby"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Přístupové jméno:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 msgid "Scrobbler URL:"
 msgstr "URL Scrobbleru:"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3721,7 +2242,7 @@
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3732,15 +2253,15 @@
 "\n"
 "Původně vytvořil Audun Hove <audun@nlc.no> a Pipian <pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "O modulu Scrobbler"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 msgid "About SDL Output Plugin"
 msgstr "O výstupním modulu SDL"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 msgid "SDL error"
 msgstr "Chyba SDL"
 
@@ -3749,10 +2270,18 @@
 msgid "About %s"
 msgstr "O %s"
 
-#: src/sid/xs_config.c:323
+#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
+msgid "Close"
+msgstr "Zavřít"
+
+#: src/sid/xs_config.c:326
 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"
@@ -3762,6 +2291,11 @@
 msgid "Tune #%i: "
 msgstr "Skladba č. %i:"
 
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nebylo možné nalézt soubor s pixmapou: %s"
+
 #: src/sid/xs_interface.c:234
 msgid "Audacious-SID configuration"
 msgstr "Nastavení Audacious-SID"
@@ -4073,15 +2607,15 @@
 msgid "Use"
 msgstr "Použít"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Uložit"
 
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:435
+#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importovat"
 
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Smazat"
 
@@ -4114,6 +2648,11 @@
 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í:"
@@ -4371,11 +2910,11 @@
 msgid "No"
 msgstr "Ne"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "O GUI s měnitelným vzhledem"
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -4383,692 +2922,808 @@
 "Copyright © 2008, Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr "Témata rozhraní"
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr "_Přehrávač:"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr "Font v hlavním okně přehrávače:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "_Seznamu skladeb:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr "Vyberte font pro seznam skladeb:"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr "_Fonty"
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr "Pokud možno, používat bitmapové fonty"
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Použít bitmapové fonty (podporuje pouze ASCII)"
+
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
+msgstr "Převíjet název skladby oběma směry"
 
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
-msgstr ""
-"Pokud to bude možné, použijí se bitmapové fonty. Bitmapové fonty nepodporují "
-"unicodové řetězce."
-
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr "_Různé"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr "Zobrazovat oddělovače v seznamu skladeb"
-
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr "Zobrazovat dekoraci podle správce oken"
-
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
-msgstr ""
-"Tímto necháte rozhodnutí na správci oken, kdy má zobrazovat dekorace oken."
-
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr "Pohybovat textem v obou směrech"
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "_Vzhled"
 
-#: src/skins/skins_cfg.c:330
-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 ""
-"Bude-li vybráno, text s informacemi v hlavním okně bude běhat tam a zpět. "
-"Nebude-li vybráno, text se bude pohybovat jen jedním směrem."
+#: src/skins/skins_cfg.c:393
+msgid "Interface Preferences"
+msgstr "Nastavení rozhraní"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr "Zakázat vnitřní téma GTK"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Předzesílení"
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
-msgstr "Při přehrávání zvolit náhodné téma"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
-msgstr "Povolit načítání neúplných vzhledů"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Hz"
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
-msgstr ""
-"Je-li vybráno, Audacious neodmítne nahrát rozbitý vzhled. Použijte jen, když "
-"váš oblíbený vzhled nefunguje."
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Hz"
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "Přizpůsobení barvy"
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Hz "
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
-"Audacious umožňuje změnit zabarvení měnitelného vzhledu uživatelského "
-"rozhraní pomocí následujících jezdců."
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Hz"
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "Modrá"
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 kHz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "Zelená"
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "Červená"
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 kHz"
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "_Vzhled"
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 kHz"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr "Přizpůsobení barvy…"
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Ekvalizér"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr "Předvolby"
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kb/s"
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "prostorový zvuk"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious – varování o viditelnosti"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "Zobrazit hlavním okno přehrávače"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "Ignorovat"
-
-#: src/skins/ui_main.c:993
-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 byl spuštěn se všemi svými okny skrytými.\n"
-"Asi budete chtít opět zobrazit okno přehrávače, abyste mohli Audacious "
-"ovládat. V opačném případě si budete muset vystačit se vzdáleným ovládáním "
-"přes audtool nebo povolený zásuvný modul (např. modul statusicon)."
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr "Vždy ignorovat, zobrazit/skrýt se ovládá vzdáleně"
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious – varování o rozbitém jádru GTK"
-
-#: src/skins/ui_main.c:1052
+#: src/skins/ui_main.c:807
 #, c-format
-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>Používá se rozbité jádro GTK</big>\n"
-"\n"
-"Audacious zjistil, že používáte GTK s rozbitým jádrem.\n"
-"\n"
-"Jádro pro zpracování témat, které používáte (%s), není slučitelné "
-"s některými funkcemi používanými moderními vzhledy. Pro tuto relaci byly "
-"problematické funkce vypnuty.\n"
-" \n"
-"Abyste mohli využít těchto funkcí, zvažte použití jiného tématického jádra "
-"GTK."
+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:1063
-msgid "Do not display this warning again"
-msgstr "Toto varování již příště nezobrazovat"
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-msgstr "Přejít na: %d:%-2.2d/%d:%-2.2d (%d %%)"
-
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hlasitost: %d %%"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Vyvážení: %d %% vlevo"
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Vyvážení: střed"
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Vyvážení: %d %% vpravo"
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Nabídka nastavení"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Vypnout „Vždy na vrchu“"
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Zapnout „Vždy na vrchu“"
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Informace o souboru"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "Zakázat „Škálovat GUI“"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "Povolit „škálovat GUI“"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Nabídka znázornění"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr "Režim jedné skladby."
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 msgid "Playlist mode."
 msgstr "Režim seznamu skladeb."
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr "Zastavuje po skladbě."
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr "Po skladbě nezastavuje."
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr "Automatický posun názvu skladby"
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Zastavit po současné skladbě"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
 msgstr "Vrcholky"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Opakovat"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Náhodné přehrávání"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "Žádné pokračování dle seznamu skladeb"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr "Zobrazit přehrávač"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr "Zobrazit editor seznamu skladeb"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr "Ukázat ekvalizér"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr "Vždy na vrchu"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr "Zobrazovat na všech plochách"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr "Sbalit přehrávač"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr "Sbalit editor seznamu skladeb"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr "Sbalit ekvalizér"
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "Natažení"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr "Dvojitá velikost"
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr "Snadný pohyb"
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr "Analyzátor"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr "Vlnovka"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr "Otisk"
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "Žádný"
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr "Normální"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr "Oheň"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr "Svislé čáry"
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr "Čáry"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr "Sloupce"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr "Tečková vlnovka"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr "Čárová vlnovka"
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr "Plná vlnovka"
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr "Led"
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr "Plynulý"
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "Nejpomalejší"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "Pomalé"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "Střední"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "Rychlé"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "Nejrychlejší"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr "Dosažený čas"
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr "Zbývající čas"
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "Pozastavit"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "Předchozí"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "Další"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "Znázornění"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr "Typ znázornění"
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr "Režim analyzátoru"
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr "Typ vlnovky"
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr "Typ otisku"
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr "Typ WindowShade VU"
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr "Klesání sloupců"
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr "Klesání vrcholků"
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Seznam skladeb"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Nový seznam skladeb"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr "Vybrat následující seznam skladeb"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr "Vybrat předchozí seznam skladeb"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Smazat seznam skladeb"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "Importovat seznam skladeb"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Načte soubor se seznamem skladeb do vybraného seznamu."
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "Exportovat seznam skladeb"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+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:228
+#: src/skins/ui_manager.c:235
+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:238
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr "Otevře správce seznamu skladeb."
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Zobrazení"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "Rozhraní"
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr "Nastavení rozhraní…"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr "Přidat internetovou adresu…"
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr "Do seznamu přidá vzdálenou stopu."
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr "Přidat soubory…"
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr "Přidá soubory do seznamu skladeb."
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr "Hledání a výběr"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 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:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr "Invertovat výběr"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr "Zamění vybrané a nevybrané položky."
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "Vybrat vše"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
+msgstr "Vybere všechny skladby v seznamu."
+
+#: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr "Nevybrat žádné"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr "Žádná skladba v seznamu nebude vybraná."
+
+#: src/skins/ui_manager.c:277
+msgid "Remove All"
+msgstr "Odebrat všechny"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr "Ze seznamu odstraní všechny skladby."
+
+#: src/skins/ui_manager.c:281
 msgid "Clear Queue"
 msgstr "Vyprázdnit frontu"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr "Vyprázdní frontu spojenou s tímto seznamem skladeb."
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "Odstranit nedostupné soubory"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr "Ze seznamu skladeb odstraní nedostupné soubory."
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "Odebrat duplikáty"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "Podle názvu"
+
+#: src/skins/ui_manager.c:292
 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:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "Podle jména souboru"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 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:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "Podle cesty a jména souboru"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 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:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr "Odebrat neoznačené"
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr "Odebrat neoznačené skladby se seznamu."
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr "Odebrat označené"
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr "Odebrat označené skladby ze seznamu."
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr "Zamíchat pořadí"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr "Sklady v seznamu seřadí náhodně."
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr "Otočit seznam"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr "Obrátí pořadí skladeb v seznamu."
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "Seřadit seznam"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr "Seřadí seznam podle názvu."
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+msgid "By Album"
+msgstr "Podle alba"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr "Seřadí seznam podle alba."
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "Podle umělce"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr "Skladby v seznam seřadí podle jména umělce."
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr "Skladby v seznamu seřadí podle jména souboru"
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr "Skladby v seznamu seřadí podle celé cesty."
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "Podle data"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 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:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr "Podle čísla stopy"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr "Skladby v seznamu seřadí podle čísla stopy."
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr "Seřadit vybrané"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "Soubor"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Nápověda"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr "Služby modulů"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr "Zobrazit informace o skladbě"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr "Zobrazit informace o skladbě"
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "O Audacious"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "Přehrát soubor"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr "Načíst a přehrát soubor"
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "Hrát z adresy"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr "Hrát média z vybraného místa"
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "Služby modulů"
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "Nastavení"
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr "Otevřít okno s nastavením"
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "O Audacious"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr "Nastavit A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr "Vyprázdnit A-B"
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+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
+msgid "Jump to Time"
+msgstr "Přejít na čas"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr "Přepnout frontu"
+
+#: src/skins/ui_manager.c:431
+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
+msgid "Copy"
+msgstr "Kopírovat"
+
+#: src/skins/ui_manager.c:436
+msgid "Cut"
+msgstr "Oříznout"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Vložit"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Načíst"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Předvolby"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Načíst předvolbu"
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Souborová předvolba"
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Načíst souborovou předvolbu"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Načíst standardní předvolbu do ekvalizéru"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Vynulovat"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Vynulovat předvolby ekvalizéru"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Ze souboru"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Načíst předvolbu ze souboru"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Ze souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Načíst předvolbu ze souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Předvolby WinAMPu"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importovat předvolby WinAMPu"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Uložit předvolbu"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Uložit souborovou předvolbu"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Uložit standardní předvolbu"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Do souboru"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Uložit předvolbu do souboru"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Do souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Uložit předvolbu do souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Smazat předvolbu"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Smazat souborovou předvolbu"
 
-#: src/skins/ui_playlist.c:374
+#: 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:382
+#: 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 "
@@ -5080,105 +3735,53 @@
 "regulárním výrazům nerozumíte, jednoduše vložte části textu, které chcete "
 "vyhledat."
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Název: "
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Umělec: "
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Jméno souboru: "
 
-#: src/skins/ui_playlist.c:419
+#: 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:422
+#: 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:425
+#: 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:776
-msgid "Save as Static Playlist"
-msgstr "Uložit jako statický seznam skladeb"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr "Použít relativní cestu"
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "Načíst seznam skladeb"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "Uložit seznam skladeb"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Zobrazit editor seznamu skladeb"
 
 # FIXME: plural
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "250 Hz"
-msgstr "250 Hz "
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr "Zabalený skin Winapmu 2.x"
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Nezabalený skin Winampu 2.x"
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Adresář („%s“) nebylo možné vytvořit: %s\n"
@@ -5228,56 +3831,64 @@
 "51 Franklin Street, Fifth Floor, \n"
 "Boston, MA  02110-1301  USA"
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "O modulu SndStrech"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr "Oprava hlasitosti"
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "Krátké přesahy"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "Rychlost"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "Výška"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "Natažení"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Nastavení"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "SndStrech – Nastavení"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 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:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "Příkaz:"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 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:471
+#: src/song_change/song_change.c:472
 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:475
+#: src/song_change/song_change.c:476
 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:479
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -5311,7 +3922,7 @@
 "%b: Album\n"
 "%T: Název stopy"
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5319,18 +3930,14 @@
 "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:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "Příkazy"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 msgid "Song Change"
 msgstr "Změna skladby"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "Analyzátor spektra"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "O modulu Stavová ikona"
@@ -5404,71 +4011,19 @@
 "\n"
 "Napsal Johan Levin, 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "O modulu Extra sterou"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "Nastavit Extra sterou"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-msgid "Search:"
-msgstr "Hledat:"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr "Přidat záložku"
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-msgid "Stream name"
-msgstr "Název proudu"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr "Právě hraje"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-msgid "Remove Bookmark"
-msgstr "Odstranit záložku"
-
-#: src/streambrowser/streambrowser.c:340
-msgid "About Stream Browser"
-msgstr "O prohlížeči proudů"
-
-#: src/streambrowser/streambrowser.c:341
-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:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "O generátoru tónů"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5482,19 +4037,18 @@
 "Pro jeho aktivaci zadejte URL: tone://frekvence1;frekvence2;frekvence3;...\n"
 "např. tone://2000;2005 pro přehrání tónů o frekvenci 2000 a 2005 Hz."
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "Generátor tónů:"
 
 #: src/unix-io/gtk.c:34
-#, fuzzy
 msgid "About File I/O Plugin"
-msgstr "O modulu OSS4"
+msgstr "O modulu vstupu/výstupu ze/do souboru"
 
 #: src/vorbis/configure.c:31
 msgid "Override generic titles"
@@ -5508,15 +4062,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Popisky Ogg Vorbis"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Nastavení modulu Ogg Vorbis Audio"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "O modulu Ogg Vorbis Audio"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5592,9 +4146,1308 @@
 "Části kódu modulu napsal Miles Egan\n"
 "Navštivte stránku Wavpacku na http://www.wavpack.com/\n"
 
+#~ msgid "About "
+#~ msgstr "O "
+
+#~ 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 © 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
+#~ "\n"
+#~ "Tento modul je uvolněn za podmínek licence GNU LGPL.\n"
+#~ "Pro podrobnosti vizte http://www.gnu.org/licenses/lgpl.html.\n"
+#~ "\n"
+#~ "Tento modul používá knihovnu AdPlug, copyright © Simon Peter aj.\n"
+#~ "Sestaveno s verzí knihovny AdPlug: "
+
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AdPlug :: Nastavení"
+
+#~ msgid "Sound quality"
+#~ msgstr "Kvalita zvuku"
+
+#~ msgid "Resolution"
+#~ msgstr "Rozlišení"
+
+#~ msgid "8bit"
+#~ msgstr "8 bitů"
+
+#~ msgid "16bit"
+#~ msgstr "16 bitů"
+
+#~ msgid "Channels"
+#~ msgstr "Kanály"
+
+#~ 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 ""
+#~ "Nastavení sterea není doporučeno, pokud jej opravdu nepotřebujete. Tato "
+#~ "volba nepřidává do zvuku žádné stereo efekty – OPL2 je prostě mono – ale "
+#~ "spotřebovává více výkonu CPU!"
+
+#~ msgid "Frequency"
+#~ msgstr "Frekvence"
+
+#~ msgid "Detect songend"
+#~ msgstr "Rozpoznat konec skladby"
+
+#~ 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 ""
+#~ "Je-li zapnuto, XMMS pozná konec skladby, zastaví ji a přejde na další ze "
+#~ "seznamu skladeb. Je-li vypnuto, XMMS nebude reagovat na konec skladby a "
+#~ "bude ji opakovat stále dokola."
+
+#~ msgid "Formats"
+#~ msgstr "Formáty"
+
+#~ msgid "Format selection"
+#~ msgstr "Výběr formátu"
+
+#~ msgid "Format"
+#~ msgstr "Formát"
+
+#~ msgid "Extension"
+#~ msgstr "Přípona"
+
+#~ 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 ""
+#~ "Vybrané druhy souborů budou rozpoznány a hrány tímto modulem. Nevybrané "
+#~ "druhy budou ignorovány a přenechány ostatním modulům."
+
+#~ msgid "AdPlug :: File Info"
+#~ msgstr "AdPlug :: Informace o souboru"
+
+#~ msgid "Author: "
+#~ msgstr "Autor: "
+
+#~ msgid "File Type: "
+#~ msgstr "Velikost souboru: "
+
+#~ msgid "Subsongs: "
+#~ msgstr "Podskladby: "
+
+#~ msgid "Instruments: "
+#~ msgstr "Nástroje: "
+
+#~ msgid "Orders: "
+#~ msgstr "Pořadí: "
+
+#~ msgid "Patterns: "
+#~ msgstr "Vzorky: "
+
+#~ msgid "Song"
+#~ msgstr "Skladba"
+
+#~ msgid "Instrument name"
+#~ msgstr "Jméno nástroje"
+
+#~ msgid "Song message"
+#~ msgstr "Zpráva skladby"
+
+#~ msgid "Subsong selection"
+#~ msgstr "Výběr podskladby"
+
+#~ msgid "Order: "
+#~ msgstr "Pořadí: "
+
+#~ msgid "Pattern: "
+#~ msgstr "Vzorek: "
+
+#~ msgid "Row: "
+#~ msgstr "Řada: "
+
+#~ msgid "Speed: "
+#~ msgstr "Rychlost: "
+
+#~ 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“"
+
+#~ msgid "Authorization request for %s"
+#~ msgstr "Požadavek na autorizaci %s"
+
+#~ msgid "Created bonding with %s"
+#~ msgstr "Vazba s %s vytvořena"
+
+#~ msgid "Removed bonding with %s"
+#~ msgstr "Vazba s %s odstraněna"
+
+#~ msgid "Device has been switched off"
+#~ msgstr "Zařízení bylo vypnuto"
+
+#~ msgid "Device has been made non-discoverable"
+#~ msgstr "Zařízení bylo učiněno neobjevitelným"
+
+#~ msgid "Device has been made connectable"
+#~ msgstr "Zařízení bylo učiněno připojitelným"
+
+#~ msgid "Device has been made discoverable"
+#~ msgstr "Zařízení bylo učiněno objevitelným"
+
+#~ msgid "Device has been made limited discoverable"
+#~ msgstr "Zařízení bylo učiněno omezeně objevitelným"
+
+#~ msgid "Device has been switched into pairing mode"
+#~ msgstr "Zařízení bylo přepnuto do režimu párování"
+
+#~ msgid "Bluetooth headset support plugin"
+#~ msgstr "Modul podporující náhlavní sady s 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 ""
+#~ "Podpora náhlavních sad s bluetooth\n"
+#~ "Copyright © 2008 Paula Stanciu <paula.stanciu@gmail.com>\n"
+#~ "Toto byl projekt GSoC 2008 – Poděkování patří mému učiteli Tony Vroonovi "
+#~ "a týmu Audacious\n"
+#~ " \n"
+#~ "Aby fungoval AVRCP, potřebuje zavést do jádra modul uinput.\n"
+#~ "Tlačítka náhlavní sady se tak budou jevit jako normální multimediální\n"
+#~ "klávesy a mohou být nastaveny pomocí Audacious modulu Globální horké\n"
+#~ "klávesy nebo jinými nástroji, které poskytuje váš správce oken.\n"
+
+#~ msgid "Producer"
+#~ msgstr "Výrobce"
+
+#~ msgid "Available Headsets"
+#~ msgstr "Dostupné náhlavní sady"
+
+#~ msgid "Current Headset"
+#~ msgstr "Současná náhlavní sada"
+
+#~ msgid "_Connect"
+#~ msgstr "_Spojit"
+
+#~ msgid "Class"
+#~ msgstr "Třída"
+
+#~ msgid "Address:"
+#~ msgstr "Adresa:"
+
+#~ msgid "Bonding finish!"
+#~ msgstr "Vazba vytvořena!"
+
+#~ msgid "No devices found!"
+#~ msgstr "Žádné zařízení nenalezeno!"
+
+#~ msgid "Scanning..."
+#~ msgstr "Vyhledává se…"
+
+#~ msgid "Pairing..."
+#~ msgstr "Páruje se…"
+
+#~ msgid "Rescan"
+#~ msgstr "Znovu vyhledat"
+
+#~ msgid "Playback->Play"
+#~ msgstr "Přehrát → Hrát"
+
+#~ msgid "Playback->Stop"
+#~ msgstr "Přehrát → Zastavit"
+
+#~ msgid "Playback->Pause"
+#~ msgstr "Přehrát → Pozastavit"
+
+#~ msgid "Playback->Prev"
+#~ msgstr "Přehrát → Předchozí"
+
+#~ msgid "Playback->Next"
+#~ msgstr "Přehrát → Další"
+
+#~ msgid "Playback->Eject"
+#~ msgstr "Přehrát → Vysunout"
+
+#~ msgid "Playlist->Repeat"
+#~ msgstr "Seznam skladeb → Opakovat"
+
+#~ msgid "Playlist->Shuffle"
+#~ msgstr "Seznam skladeb → Náhodné přehrávání"
+
+#~ msgid "Volume->Up_5"
+#~ msgstr "Hlasitost → Zvýšit o 5"
+
+#~ msgid "Volume->Down_5"
+#~ msgstr "Hlasitost → Snížit o 5"
+
+#~ msgid "Volume->Up_10"
+#~ msgstr "Hlasitost → Zvýšit o 10"
+
+#~ msgid "Volume->Down_10"
+#~ msgstr "Hlasitost → Snížit o 10"
+
+#~ msgid "Volume->Mute"
+#~ msgstr "Hlasitost → Ztlumit"
+
+#~ msgid "Window->Main"
+#~ msgstr "Okno → Hlavní"
+
+#~ msgid "Window->Playlist"
+#~ msgstr "Okno → Seznam skladeb"
+
+#~ msgid "Window->Equalizer"
+#~ msgstr "Okno → Ekvalizér"
+
+#~ msgid "Window->JumpToFile"
+#~ msgstr "Okno → Přejít na soubor"
+
+#~ 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 ""
+#~ "event-device-plugin: nelze otevřít zařízení %s, přeskakuji toto zařízení; "
+#~ "zkontrolujte, že soubor existuje a že máte právo jej číst\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to create a io_channel for device file %s ,"
+#~ "skipping this device\n"
+#~ msgstr ""
+#~ "event-device-plugin: nelze vytvořit io_channel (vstupně-výstupní kanál) "
+#~ "pro zařízení %s, přeskakuji toto zařízení\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to open /proc/bus/input/devices , automatic "
+#~ "detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: nelze otevřít /proc/bus/input/devices, samočinné "
+#~ "vyhledávání událostních zařízení nebude fungovat.\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 ""
+#~ "event-device-plugin: nelze otevřít io_channel (vstupně-výstupní kanál) "
+#~ "pro /proc/bus/input/devices, samočinné vyhledávání událostních zařízení "
+#~ "nebude fungovat.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: an error occurred while reading /proc/bus/input/"
+#~ "devices , automatic detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: došlo k chybě při čtení z /proc/bus/input/devices, "
+#~ "samočinné vyhledávání událostních zařízení nebude fungovat.\n"
+
+#~ msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: zařízení %s nebylo nalezeno v /dev/input, "
+#~ "přeskakuji.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to load config file %s , default settings "
+#~ "will be used.\n"
+#~ msgstr ""
+#~ "event-device-plugin: nelze načíst konfigurační soubor %s, bude použito "
+#~ "implicitní nastavení.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: incomplete information in config file for device \"%s"
+#~ "\" , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: neúplné informace v konfiguračním souboru pro "
+#~ "zařízení „%s“, přeskakuji.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_active value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurace: nelze získat hodnotu is_active pro "
+#~ "zařízení „%s“, přeskakuji.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to access local directory %s , settings will "
+#~ "not be saved.\n"
+#~ msgstr ""
+#~ "event-device-plugin: nelze přistoupit k místnímu adresáři %s, nastavení "
+#~ "nebude uloženo.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get filename value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurace: nelze získat hodnotu filename pro "
+#~ "zařízení „%s“, přeskakuji.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get phys value for device "
+#~ "\"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurace: nelze získat hodnotu phys pro zařízení "
+#~ "„%s“, přeskakuji.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_custom value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurace: nelze získat hodnotu is_custom pro "
+#~ "zařízení „%s“, přeskakuji.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unexpected value for device \"%s\", "
+#~ "skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurace: neočekávaná hodnot pro zařízení „%s“, "
+#~ "přeskakuji.\n"
+
+#~ msgid "Detected"
+#~ msgstr "Nalezeno"
+
+#~ msgid "Custom"
+#~ msgstr "Vlastní"
+
+#~ msgid "Not Detected"
+#~ msgstr "Nenalezeno"
+
+#~ msgid "Information"
+#~ msgstr "Podrobnosti"
+
+#~ msgid ""
+#~ "Cannot open bindings window for a not-detected device.\n"
+#~ "Ensure that the device has been correctly plugged in."
+#~ msgstr ""
+#~ "Nelze otevřít okno s vazbami pro nerozpoznané zařízení.\n"
+#~ "Ujistěte se, že zařízení bylo správně zapojeno."
+
+#~ msgid ""
+#~ "Unable to open selected device.\n"
+#~ "Please check read permissions on device file."
+#~ msgstr ""
+#~ "Nelze otevřít vybrané zařízení.\n"
+#~ "Prosím, zkontrolujte práva k tomuto zařízení."
+
+#~ msgid "EvDev-Plug - Add custom device"
+#~ msgstr "EvDev-Plug  – Přidat vlastní zařízení"
+
+#~ 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 zkusí sám rozpoznat událostní zařízení připojená do systému\n"
+#~ "a aktualizovat údaje o nich.\n"
+#~ "Pokud však samočinné vyhledání selže nebo máte událostní zařízení\n"
+#~ "v nestandardním adresáři (v současnosti je prohledáván jen /dev/input),\n"
+#~ "můžete přidat zařízení ručně jako vlastní, přičemž budete muset zadat\n"
+#~ "jeho název a soubor tohoto zařízení."
+
+#~ msgid "Device name:"
+#~ msgstr "Název zařízení:"
+
+#~ msgid "Device file:"
+#~ msgstr "Soubor zařízení:"
+
+#~ msgid "(custom)"
+#~ msgstr "(vlastní)"
+
+#~ msgid ""
+#~ "Please specify both name and filename.\n"
+#~ "Filename must be specified with absolute path."
+#~ msgstr ""
+#~ "Prosím, zadejte jak název, tak název souboru.\n"
+#~ "Název souboru musí být uveden s absolutní cestou."
+
+#~ msgid ""
+#~ "Do you want to remove the existing configuration for selected device?\n"
+#~ msgstr "Přejete si odstranit existující nastavení pro vybrané zařízení?\n"
+
+#~ msgid "Do you want to remove the selected custom device?\n"
+#~ msgstr "Přejete si odstranit vybrané vlastní zařízení?\n"
+
+#~ msgid "EvDev-Plug - Configuration"
+#~ msgstr "EvDev-Plug – Nastavení"
+
+#~ msgid "Active"
+#~ msgstr "Aktivní"
+
+#~ msgid "Status"
+#~ msgstr "Stav"
+
+#~ msgid "Device Name"
+#~ msgstr "Název zařízení"
+
+#~ msgid "Device File"
+#~ msgstr "Soubor zařízení"
+
+#~ msgid "Device Address"
+#~ msgstr "Adresa zařízení"
+
+#~ msgid "_Bindings"
+#~ msgstr "_Vazby"
+
+#~ 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 ""
+#~ "Pro navázání, prosím, stiskněte klávesu na vašem zařízení;\n"
+#~ "pokud nebude stištěna žádná klávesa do pěti sekund,\n"
+#~ "toto okno bude zavřeno, aniž by se vazba změnila."
+
+#~ 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 ""
+#~ "Vstupní událost již byla přiřazena.\n"
+#~ "\n"
+#~ "Není možné přiřadit více akcí stejné vstupní události (ačkoliv je možné "
+#~ "přiřadit stejnou akci více událostem)."
+
+#~ msgid "EvDev-Plug - Bindings Configuration"
+#~ msgstr "EvDev-Plug – Nastavení vazeb"
+
+#~ msgid "Name: "
+#~ msgstr "Název: "
+
+#~ msgid "Filename: "
+#~ msgstr "Název souboru: "
+
+#~ msgid "Phys.Address: "
+#~ msgstr "Fyzická adresa: "
+
+#~ msgid "EvDev-Plug - about"
+#~ msgstr "EvDev-Plug – o modulu"
+
+#~ 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"
+#~ "dálkové ovládání přehrávače pomocí událostních zařízení\n"
+#~ "http://www.develia.org/projects.php?p=audacious#evdevplug\n"
+#~ "\n"
+#~ "napsal Giacomo Lozito\n"
+
+#~ msgid "This LADSPA plugin has no user controls"
+#~ msgstr "Tento LADSPA modul nemá žádné možnosti nastavení uživatelem"
+
+#~ msgid "Name"
+#~ msgstr "Jméno"
+
+#~ msgid "UID"
+#~ msgstr "UID"
+
+#~ msgid "Installed plugins"
+#~ msgstr "Nainstalované moduly"
+
+#~ msgid "Running plugins"
+#~ msgstr "Bežící moduly"
+
+#~ msgid "Add"
+#~ msgstr "Přidat"
+
+#~ msgid "Remove"
+#~ msgstr "Odebrat"
+
+#~ msgid "LADSPA Plugin Catalog"
+#~ msgstr "Katalog LADSPA modulů"
+
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "O modulu LIRC pro Audacious"
+
+#~ msgid "LIRC Plugin "
+#~ msgstr "Modul 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"
+#~ "Jednoduchý modul, který vám dovolí ovládat Audacious\n"
+#~ "prostřednictvím démona dálkového ovládání LIRC.\n"
+#~ "\n"
+#~ "Pro Audacious upravil Tony Vroon <chainsaw@gentoo.org>\n"
+#~ "z XMMS LIRC modulu, jehož tvůrci jsou:\n"
+#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
+#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
+#~ "Andrew O. Shadoura <bugzilla@tut.by>\n"
+#~ "Informace o LIRC lze získat na:\n"
+#~ "http://lirc.org/"
+
+#~ msgid "LIRC plugin settings"
+#~ msgstr "Nastavení modulu LIRC"
+
+#~ msgid "Reconnect to LIRC server"
+#~ msgstr "Znovu se připojit k serveru LIRC"
+
+#~ msgid "Timeout before reconnecting (seconds): "
+#~ msgstr "Časový limit pro znovupřipojení (sekundy): "
+
+#~ msgid "Reconnect"
+#~ msgstr "Znovu se připojit"
+
+#~ msgid "Connection"
+#~ msgstr "Spojení"
+
+#~ msgid "%s: could not init LIRC support\n"
+#~ msgstr "%s: nelze inicializovat podporu 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: nelze číst z konfiguračního souboru LIRC\n"
+#~ "%s: prosím, přečtěte si dokumentaci k LIRC,\n"
+#~ "%s: jak správně vytvořit konfigurační soubor\n"
+
+#~ msgid "%s: trying to reconnect...\n"
+#~ msgstr "%s: pokouším se znovu připojit…\n"
+
+#~ msgid "%s: unknown command \"%s\"\n"
+#~ msgstr "%s: neznámý příkaz „%s“\n"
+
+#~ msgid "%s: disconnected from LIRC\n"
+#~ msgstr "%s: odpojeno od LIRC\n"
+
+# FIXME: plural
+#~ msgid "%s: will try reconnect every %d seconds...\n"
+#~ msgstr "%s: pokus o připojení budu opakovat každých %d sekund…\n"
+
+#~ msgid "ModPlug Configuration"
+#~ msgstr "Nastavení ModPlugu"
+
+#~ msgid "16 bit"
+#~ msgstr "16 bitů"
+
+#~ msgid "8 bit"
+#~ msgstr "8 bitů"
+
+#~ msgid "Mono (downmix)"
+#~ msgstr "Mono (smísit kanály)"
+
+#~ msgid "Nearest (fastest)"
+#~ msgstr "Nejbližší (nejrychlejší)"
+
+#~ msgid "Linear (fast)"
+#~ msgstr "Lineární (rychlé)"
+
+#~ msgid "Spline (good quality)"
+#~ msgstr "Spline (kvalitní)"
+
+#~ msgid "8-tap Fir (extremely high quality)"
+#~ msgstr "FIR filtr osmého řádu (velmi kvalitní)"
+
+#~ 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 "Vzorkovací kmitočet"
+
+#~ msgid "Enable"
+#~ msgstr "Povolit"
+
+#~ msgid "Depth"
+#~ msgstr "Hloubka"
+
+#~ msgid "Delay"
+#~ msgstr "Zpoždění"
+
+#~ msgid "Reverb"
+#~ msgstr "Dozvuk"
+
+#~ msgid "Amount"
+#~ msgstr "Množství"
+
+#~ msgid "Range"
+#~ msgstr "Rozsah"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Zvýraznění hlubokých tónů"
+
+#~ msgid ""
+#~ "Note: Setting the preamp\n"
+#~ "too high may cause clipping\n"
+#~ "(annoying clicks and pops)!"
+#~ msgstr ""
+#~ "Poznámka: Vysoké hodnoty\n"
+#~ "předzesílení mohou vést k ořezu\n"
+#~ "zvuku (obtěžující praskání)!"
+
+#~ msgid "Effects"
+#~ msgstr "Efekty"
+
+#~ msgid "Use Filename as Song Title"
+#~ msgstr "Použít jméno souboru jako název skladby"
+
+#~ msgid "Fast Playlist Info"
+#~ msgstr "Rychlé informace o seznamu skladeb"
+
+#~ msgid "Noise Reduction"
+#~ msgstr "Redukce šumu"
+
+#~ msgid "Play Amiga MOD"
+#~ msgstr "Hrát MODY z Amigy"
+
+#~ msgid "Don't loop"
+#~ msgstr "Nevracet se ve smyčce"
+
+#~ msgid "Loop"
+#~ msgstr "Opakovat"
+
+#~ msgid "time(s)"
+#~ msgstr "×"
+
+#~ msgid "Loop forever"
+#~ msgstr "Nekonečná smyčka"
+
+#~ msgid "Looping"
+#~ msgstr "Smyčky"
+
+#~ msgid "MOD Info"
+#~ msgstr "Informace o MODU"
+
+#~ msgid ""
+#~ "Filename:\n"
+#~ "Title:\n"
+#~ "Type:\n"
+#~ "Length:\n"
+#~ "Speed:\n"
+#~ "Tempo:\n"
+#~ "Samples:\n"
+#~ "Instruments:\n"
+#~ "Patterns:\n"
+#~ "Channels:"
+#~ msgstr ""
+#~ "Jméno souboru:\n"
+#~ "Název skladby:\n"
+#~ "Typ:\n"
+#~ "Délka:\n"
+#~ "Rychlost:\n"
+#~ "Tempo:\n"
+#~ "Vzorků:\n"
+#~ "Nástrojů:\n"
+#~ "Vzory:\n"
+#~ "Kanálů:"
+
+#~ msgid ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+#~ msgstr ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+
+#~ msgid "Samples"
+#~ msgstr "Vzorky"
+
+#~ msgid "Instruments"
+#~ msgstr "Nástroje"
+
+#~ msgid "Message"
+#~ msgstr "Vzkaz"
+
+#~ msgid "Modplug Input Plugin for Audacious ver"
+#~ msgstr "Vstupní modul pro Audacious Modplug verze "
+
+#~ 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"
+#~ "Zvukové jádro Modplugu napsal Olivier Lapicque.\n"
+#~ "XMMS rozhraní Modplugu od Kentona Varda.\n"
+#~ "© 2000 Olivier Lapicque a Kenton Varda.\n"
+#~ "Aktualizuje a udržuje Konstanty Bialkowski.\n"
+#~ "Na BMP převedl Theofilos Intzoglou."
+
+#~ msgid "About Modplug"
+#~ msgstr "O modulu Modplug"
+
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "Pokud možno, používat bitmapové fonty"
+
+#~ msgid ""
+#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
+#~ "Unicode strings."
+#~ msgstr ""
+#~ "Pokud to bude možné, použijí se bitmapové fonty. Bitmapové fonty "
+#~ "nepodporují unicodové řetězce."
+
+#~ msgid "_Miscellaneous"
+#~ msgstr "_Různé"
+
+#~ msgid "Show separators in playlist"
+#~ msgstr "Zobrazovat oddělovače v seznamu skladeb"
+
+#~ msgid "Show window manager decoration"
+#~ msgstr "Zobrazovat dekoraci podle správce oken"
+
+#~ msgid "This enables the window manager to show decorations for windows."
+#~ msgstr ""
+#~ "Tímto necháte rozhodnutí na správci oken, kdy má zobrazovat dekorace oken."
+
+#~ msgid "Use two-way text scroller"
+#~ msgstr "Pohybovat textem v obou směrech"
+
+#~ 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 ""
+#~ "Bude-li vybráno, text s informacemi v hlavním okně bude běhat tam a zpět. "
+#~ "Nebude-li vybráno, text se bude pohybovat jen jedním směrem."
+
+#~ msgid "Disable inline gtk theme"
+#~ msgstr "Zakázat vnitřní téma GTK"
+
+#~ msgid "Random skin on play"
+#~ msgstr "Při přehrávání zvolit náhodné téma"
+
+#~ msgid "Allow loading incomplete skins"
+#~ msgstr "Povolit načítání neúplných vzhledů"
+
+#~ msgid ""
+#~ "If selected, audacious won't refuse loading broken skins. Use only if "
+#~ "your favourite skin doesn't work"
+#~ msgstr ""
+#~ "Je-li vybráno, Audacious neodmítne nahrát rozbitý vzhled. Použijte jen, "
+#~ "když váš oblíbený vzhled nefunguje."
+
+#~ msgid "Color Adjustment"
+#~ msgstr "Přizpůsobení barvy"
+
+#~ msgid ""
+#~ "Audacious allows you to alter the color balance of the skinned UI. The "
+#~ "sliders below will allow you to do this."
+#~ msgstr ""
+#~ "Audacious umožňuje změnit zabarvení měnitelného vzhledu uživatelského "
+#~ "rozhraní pomocí následujících jezdců."
+
+#~ msgid "Blue"
+#~ msgstr "Modrá"
+
+#~ msgid "Green"
+#~ msgstr "Zelená"
+
+#~ msgid "Red"
+#~ msgstr "Červená"
+
+#~ msgid "Color adjustment ..."
+#~ msgstr "Přizpůsobení barvy…"
+
+#~ msgid "Disable 'GUI Scaling'"
+#~ msgstr "Zakázat „Škálovat GUI“"
+
+#~ msgid "Enable 'GUI Scaling'"
+#~ msgstr "Povolit „škálovat GUI“"
+
+#~ msgid "DoubleSize"
+#~ msgstr "Dvojitá velikost"
+
+#~ msgid "Easy Move"
+#~ msgstr "Snadný pohyb"
+
+#~ 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"
+
+#~ msgid "minutes:seconds"
+#~ msgstr "minuty:sekundy"
+
+#~ msgid "Track length:"
+#~ msgstr "Délka stopy:"
+
+#~ msgid "Error writing playlist \"%s\": %s"
+#~ msgstr "Chyba při zapisování seznamu skladeb „%s“: %s"
+
 #~ msgid "%s already exist. Continue?"
 #~ msgstr "%s už existuje. Pokračovat?"
 
+#~ msgid "Show/hide infoarea"
+#~ msgstr "Zobrazit/skrýt oblast informací"
+
+#~ msgid "Show main menu"
+#~ msgstr "Zobrazit hlavní nabídku"
+
+#~ msgid "Show/hide main menu"
+#~ msgstr "Zobrazit/skrýt hlavní nabídku"
+
+#~ msgid "Show/hide statusbar"
+#~ msgstr "Zobrazit/skrýt stavový panel"
+
+#~ msgid "Import Playlist ..."
+#~ msgstr "Importovat seznam skladeb…"
+
+#~ msgid "Export Playlist ..."
+#~ msgstr "Exportovat seznam skladeb…"
+
+#~ msgid "Refresh"
+#~ msgstr "Obnovit"
+
+#~ msgid "Refresh Selected"
+#~ msgstr "Obnovit označené"
+
+#~ msgid "Refreshes metadata associated with selected entries."
+#~ msgstr "Obnovuje metadata náležící vybraným položkám."
+
+#~ msgid "Edit title"
+#~ msgstr "Upravit název"
+
+#~ msgid "Edit the playlist title."
+#~ msgstr "Upravit název seznamu skladeb."
+
+#~ msgid "By Formatted Title"
+#~ msgstr "Podle formátovaného názvu"
+
+#~ msgid "Components"
+#~ msgstr "Součásti"
+
+#~ msgid "Upload selected track(s)"
+#~ msgstr "Nahrát vybranou stopu(y)"
+
+#~ msgid "MTP device handler"
+#~ msgstr "Deskriptor MTP zařízení"
+
+#~ msgid "Skinned Interface"
+#~ msgstr "Témata rozhraní"
+
+#~ msgid "Show main player window"
+#~ msgstr "Zobrazit hlavním okno přehrávače"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorovat"
+
+#~ 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 byl spuštěn se všemi svými okny skrytými.\n"
+#~ "Asi budete chtít opět zobrazit okno přehrávače, abyste mohli Audacious "
+#~ "ovládat. V opačném případě si budete muset vystačit se vzdáleným "
+#~ "ovládáním přes audtool nebo povolený zásuvný modul (např. modul "
+#~ "statusicon)."
+
+#~ msgid "Always ignore, show/hide is controlled remotely"
+#~ msgstr "Vždy ignorovat, zobrazit/skrýt se ovládá vzdáleně"
+
+#~ msgid "Audacious - broken GTK engine usage warning"
+#~ msgstr "Audacious – varování o rozbitém jádru 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>Používá se rozbité jádro GTK</big>\n"
+#~ "\n"
+#~ "Audacious zjistil, že používáte GTK s rozbitým jádrem.\n"
+#~ "\n"
+#~ "Jádro pro zpracování témat, které používáte (%s), není slučitelné "
+#~ "s některými funkcemi používanými moderními vzhledy. Pro tuto relaci byly "
+#~ "problematické funkce vypnuty.\n"
+#~ " \n"
+#~ "Abyste mohli využít těchto funkcí, zvažte použití jiného tématického "
+#~ "jádra GTK."
+
+#~ msgid "Do not display this warning again"
+#~ msgstr "Toto varování již příště nezobrazovat"
+
+#~ msgid "Save as Static Playlist"
+#~ msgstr "Uložit jako statický seznam skladeb"
+
+#~ msgid "Use Relative Path"
+#~ msgstr "Použít relativní cestu"
+
+#~ msgid "Load Playlist"
+#~ msgstr "Načíst seznam skladeb"
+
+#~ msgid "Save Playlist"
+#~ msgstr "Uložit seznam skladeb"
+
 #~ msgid "%s: %d kbps, %d Hz, %s"
 #~ msgstr "%s: %d kb/s, %d Hz, %s"
 
@@ -7115,9 +6968,6 @@
 #~ msgid "Entries"
 #~ msgstr "Položky"
 
-#~ msgid "_Rename"
-#~ msgstr "_Přejmenovat"
-
 #~ msgid "VBR"
 #~ msgstr "VBR"
 
@@ -9404,9 +9254,6 @@
 #~ msgid "Add/Open URL Dialog"
 #~ msgstr "Dialog Přidat/otevřít URL"
 
-#~ msgid "Un_queue"
-#~ msgstr "Ode_brat z fronty"
-
 #~ msgid "_Filter:"
 #~ msgstr "_Filtr:"

audacious-plugins-2.5.3.tar.gz/po/cy.po -> audacious-plugins-3.0.tar.gz/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-05-19 10:53-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"
@@ -16,7 +16,7 @@
 "X-Poedit-Language: Welsh\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -24,572 +24,55 @@
 "Copyright (c) 2005-2006 Audacious team"
 msgstr ""
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 #, fuzzy
 msgid "About MP4 AAC decoder plugin"
 msgstr "Ynghylch Ategyn Sain MPEG"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "Ynghylch"
-
-#: src/adplug/adplug-xmms.cc:155
-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"
-"Hawlfraint (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
-"\n"
-"Mae'r rhaglen hwn yn rhyddhau â GNU LGPL.\n"
-"Canfod http://www.gnu.org/licenses/lgpl.html am manylion.\n"
-"\n"
-"Mae'r rhaglen defnyddio yn AdPlug llyfrgell, pa ys hawlfraint (C) Simon "
-"Peter, et al.\n"
-"Fersiwn cynnwys AdPlug llyfrgell:"
-
-#: src/adplug/adplug-xmms.cc:232
-#, fuzzy
-msgid "AdPlug :: Configuration"
-msgstr "AMIDI-Plug - ffurfweddu"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "Iawn"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Dileu"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "Cyffredinol"
-
-#: src/adplug/adplug-xmms.cc:279
-#, fuzzy
-msgid "Sound quality"
-msgstr "Clip Sain"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-#, fuzzy
-msgid "Resolution"
-msgstr "Cydraniad:"
-
-#: src/adplug/adplug-xmms.cc:286
-#, fuzzy
-msgid "8bit"
-msgstr "8 did"
-
-#: src/adplug/adplug-xmms.cc:291
-#, fuzzy
-msgid "16bit"
-msgstr "16 did"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Sianeli:"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Stereo"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Chwarae"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-
-#: src/adplug/adplug-xmms.cc:373
-#, fuzzy
-msgid "Formats"
-msgstr "Fformat:"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:383
-#, fuzzy
-msgid "Format"
-msgstr "Fformat:"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Enw ffeil"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-#, fuzzy
-msgid "Title: "
-msgstr "Teitl:"
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:539
-#, fuzzy
-msgid "File Type: "
-msgstr "Maint ffeil:"
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:541
-#, fuzzy
-msgid "Instruments: "
-msgstr "Offerynnol"
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:551
-#, fuzzy
-msgid "Song"
-msgstr "Swing"
-
-#: src/adplug/adplug-xmms.cc:577
-#, fuzzy
-msgid "Instrument name"
-msgstr "Offerynnol"
-
-#: src/adplug/adplug-xmms.cc:619
-#, fuzzy
-msgid "Song message"
-msgstr "Newid Cân %s"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:700
-#, fuzzy
-msgid "Speed: "
-msgstr "Llais"
-
-#: src/adplug/adplug-xmms.cc:701
-#, fuzzy
-msgid "Timer: "
-msgstr "Teitl:"
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr ""
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr ""
-
-#: src/alarm/interface.c:56
-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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Cau"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr ""
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr ""
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "Iawn"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr ""
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr ""
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr ""
-
-#: src/alarm/interface.c:213
-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:229
-msgid "Oh Well"
-msgstr ""
-
-#: src/alarm/interface.c:388
-#, fuzzy
-msgid "Alarm Settings"
-msgstr "Gosodiadau Cymysgu"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-#, fuzzy
-msgid "Time"
-msgstr "Teitl"
-
-#: src/alarm/interface.c:445
-#, fuzzy
-msgid "hours"
-msgstr "Chorus"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr ""
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr ""
-
-#: src/alarm/interface.c:554
-#, fuzzy
-msgid "Quiet after:"
-msgstr "Didradd:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr ""
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr ""
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Rhagosodedig"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr ""
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr ""
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr ""
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr ""
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr ""
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr ""
-
-#: src/alarm/interface.c:1013
-#, fuzzy
-msgid "Sunday"
-msgstr "Trac Sain"
-
-#: src/alarm/interface.c:1023
-#, fuzzy
-msgid "Monday"
-msgstr "Mono"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr ""
-
-#: src/alarm/interface.c:1050
-#, fuzzy
-msgid "Fading"
-msgstr "cynnydd"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-#, fuzzy
-msgid "seconds"
-msgstr "eiliad"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-#, fuzzy
-msgid "Volume"
-msgstr "Sain:(%)"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr ""
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr ""
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr ""
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-#, fuzzy
-msgid "%"
-msgstr "%d"
-
-#: src/alarm/interface.c:1174
-#, fuzzy
-msgid "Final"
-msgstr "Enw ffeil"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr ""
-
-#: src/alarm/interface.c:1253
-#, fuzzy
-msgid "enable"
-msgstr "Cyffredinol"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr ""
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr ""
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr ""
-
-#: src/alarm/interface.c:1312
-#, fuzzy
-msgid "Use reminder"
-msgstr "User Defined"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-#, fuzzy
-msgid "Options"
-msgstr "Dewisiadau:"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr ""
-
-#: src/alarm/interface.c:1364
-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:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr ""
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr ""
-
-#: src/alarm/interface.c:1493
-#, fuzzy
-msgid "Thankyou"
-msgstr "Tango"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 #, fuzzy
 msgid "Default PCM device"
 msgstr "Dyfais PCM rhagosodedig (%s)"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 #, fuzzy
 msgid "Default mixer device"
 msgstr "Dyfais PCM rhagosodedig (%s)"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 #, fuzzy
 msgid "ALSA Output Plugin Preferences"
 msgstr "Ynghylch Ategyn ESounD"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 #, fuzzy
 msgid "PCM device:"
 msgstr "Dyfais cymysgu"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Dyfais cymysgu"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 #, fuzzy
 msgid "Mixer element:"
 msgstr "Dyfais cymysgu"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 #, fuzzy
 msgid "About ALSA Output Plugin"
 msgstr "Ynghylch Ategyn Allbwn JACK 0.17"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 #, fuzzy
 msgid "ALSA error"
 msgstr "Terror"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -737,6 +220,10 @@
 msgid "SoundFont settings"
 msgstr "Ffurfweddu SoundFont"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Enw ffeil"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Maint Ffeil (bytes)"
@@ -844,8 +331,7 @@
 "backend"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Enw:"
 
@@ -994,197 +480,197 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 #, fuzzy
 msgid "Internationalization"
 msgstr "Corff:"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Eiliwiau"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, fuzzy, c-format
 msgid "Color %i:"
 msgstr "Eiliwiau"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Galluogi clicied"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Achlysur"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:808
+#: 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"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - ffurfweddiad"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Prawf"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 #, fuzzy
 msgid "Position"
 msgstr "Disgrifiad:"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 #, fuzzy
 msgid "Animation"
 msgstr "Corff:"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Testun"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Addurniad"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 #, fuzzy
 msgid "Trigger"
 msgstr "Trailer"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 #, fuzzy
 msgid "Misc"
 msgstr "Disgo"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "Audacious OSD - ynghylch"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1192,7 +678,7 @@
 "\n"
 "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 #, fuzzy
 msgid ""
 "\n"
@@ -1215,131 +701,6 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr ""
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr ""
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr ""
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr ""
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr ""
-
-#: src/bluetooth/gui.c:224
-msgid "Current Headset"
-msgstr ""
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr ""
-
-#: src/bluetooth/gui.c:231
-#, fuzzy
-msgid "_Connect"
-msgstr "Lleoliad:"
-
-#: src/bluetooth/gui.c:237
-#, fuzzy
-msgid "_Close"
-msgstr "Cau"
-
-#: src/bluetooth/gui.c:274
-#, fuzzy
-msgid "Class"
-msgstr "Clasurôl"
-
-#: src/bluetooth/gui.c:278
-#, fuzzy
-msgid "Address:"
-msgstr "Dyfeisiau"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:138
-#, fuzzy
-msgid "Rescan"
-msgstr "Cyfongl"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-#, fuzzy
-msgid "Play"
-msgstr "Modd chwarae:"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Blur Scope: Color selection"
@@ -1348,12 +709,12 @@
 msgid "Options:"
 msgstr "Dewisiadau:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 #, fuzzy
 msgid "About Audio CD Plugin"
 msgstr "Ategynnau Sain FLAC"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1368,16 +729,16 @@
 "Copyright 2009 John Lindgren"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 #, fuzzy
 msgid "Audio CD"
 msgstr "Dyfais sain:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -1433,12 +794,24 @@
 msgid "Override default device: "
 msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+msgid "Ok"
+msgstr "Iawn"
+
+#: 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 "Dileu"
+
+#: src/cd-menu-items/cd-menu-items.c:34
 #, fuzzy
 msgid "Play CD"
 msgstr "Modd chwarae:"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr ""
 
@@ -1466,6 +839,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Chwaraeydd Sbort Modiwl"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "Cyffredinol"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Chwarae"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Bas"
@@ -1483,8 +864,7 @@
 msgid "Default song length:"
 msgstr "Hyd cân rhagosodedig:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Samplo"
 
@@ -1496,6 +876,10 @@
 msgid "Resampling rate:"
 msgstr "Graddfa Samplo"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1568,17 +952,17 @@
 "same rate."
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 #, fuzzy
 msgid "Configure Crystalizer"
 msgstr "Ffurfweddu Extra Stereo"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Dwyster yr effaith:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Gosod"
 
@@ -1618,356 +1002,33 @@
 msgid "Volume: (%)"
 msgstr "Sain:(%)"
 
-#: src/evdev-plug/ed.c:60
-#, fuzzy
-msgid "Playback->Play"
-msgstr "Chwarae"
-
-#: src/evdev-plug/ed.c:61
-#, fuzzy
-msgid "Playback->Stop"
-msgstr "Chwarae"
-
-#: src/evdev-plug/ed.c:62
-#, fuzzy
-msgid "Playback->Pause"
-msgstr "Chwarae"
-
-#: src/evdev-plug/ed.c:63
-#, fuzzy
-msgid "Playback->Prev"
-msgstr "Chwarae"
-
-#: src/evdev-plug/ed.c:64
-#, fuzzy
-msgid "Playback->Next"
-msgstr "Chwarae"
-
-#: src/evdev-plug/ed.c:65
-#, fuzzy
-msgid "Playback->Eject"
-msgstr "Chwarae"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr ""
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr ""
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr ""
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr ""
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr ""
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr ""
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr ""
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr ""
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr ""
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr ""
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:212
-#, fuzzy
-msgid "Detected"
-msgstr "Rhagosodedig"
-
-#: src/evdev-plug/ed_ui.c:217
-#, fuzzy
-msgid "Custom"
-msgstr "Ynghylch"
-
-#: src/evdev-plug/ed_ui.c:223
-msgid "Not Detected"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-#, fuzzy
-msgid "Information"
-msgstr "Fformat ID3:"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Gwall"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:353
-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 ""
-
-#: src/evdev-plug/ed_ui.c:361
-#, fuzzy
-msgid "Device name:"
-msgstr "Dyfais:"
-
-#: src/evdev-plug/ed_ui.c:365
-#, fuzzy
-msgid "Device file:"
-msgstr "Dyfais:"
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:612
-#, fuzzy
-msgid "EvDev-Plug - Configuration"
-msgstr "Ffurfweddiad Chwaraeydd MPEG Sain"
-
-#: src/evdev-plug/ed_ui.c:651
-#, fuzzy
-msgid "Active"
-msgstr "Acid"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Statws"
-
-#: src/evdev-plug/ed_ui.c:664
-#, fuzzy
-msgid "Device Name"
-msgstr "Dyfais"
-
-#: src/evdev-plug/ed_ui.c:668
-#, fuzzy
-msgid "Device File"
-msgstr "Dyfais"
-
-#: src/evdev-plug/ed_ui.c:672
-#, fuzzy
-msgid "Device Address"
-msgstr "Dyfeisiau"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-
-#: src/evdev-plug/ed_ui.c:1323
-#, fuzzy
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "Ffurfweddiad Chwaraeydd MPEG Sain"
-
-#: src/evdev-plug/ed_ui.c:1363
-#, fuzzy
-msgid "Name: "
-msgstr "Hatena"
-
-#: src/evdev-plug/ed_ui.c:1372
-#, fuzzy
-msgid "Filename: "
-msgstr "Hatena"
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "EvDev-Plug - ynghylch"
-
-#: src/evdev-plug/ed_ui.c:1491
-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 ""
-
-#: src/ffaudio/ffaudio-core.c:765
+#: 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"
 "Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "Ategynnau Sain FLAC"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "Ynghylch Ategyn Echo"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2004,54 +1065,54 @@
 " MA 02111-1307,\n"
 "USA."
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "Ffurfweddiad Disk Writer"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 #, fuzzy
 msgid "Output file format:"
 msgstr "Ffeil cyfeiriadur allbwn:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 #, fuzzy
 msgid "Configure"
 msgstr "Ffurfweddu Echo"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Ffeil cyfeiriadur allbwn:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Dewis cyfeiriadur"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Cadw enw ffeil estyniad"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2065,6 +1126,14 @@
 msgid "Joint Stereo"
 msgstr "Stereo ar y cyd"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Mono"
+
 #: src/filewriter/mp3.c:724
 #, fuzzy
 msgid "MP3 Configuration"
@@ -2117,7 +1186,6 @@
 msgstr "Amddiffyn Gwall:"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr ""
 
@@ -2226,12 +1294,12 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 #, fuzzy
 msgid "About Gnome Shortcut Plugin"
 msgstr "Ynghylch Ategyn ESounD"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2240,64 +1308,24 @@
 "\n"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 #, fuzzy
 msgid "Add Files"
 msgstr "Ychwaneg gyrrwr"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 #, fuzzy
 msgid "Audacious2"
 msgstr "%s - Audacious"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr ""
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr ""
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr ""
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-#, fuzzy
-msgid "minutes:seconds"
-msgstr "eiliad"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-#, fuzzy
-msgid "Track length:"
-msgstr "Cynnydd trac:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr ""
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-#, fuzzy
-msgid "Export Playlist"
-msgstr "Modd chwarae:"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-#, fuzzy
-msgid "Import Playlist"
-msgstr "Modd chwarae:"
-
 #: src/gtkui/columns.c:36
 #, fuzzy
 msgid "Entry number"
@@ -2394,434 +1422,308 @@
 msgid "Disable"
 msgstr "Cyffredinol"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr ""
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
+#: src/gtkui/menus.c:132
 #, fuzzy
-msgid "Audacious"
-msgstr "%s - Audacious"
+msgid "_Open Files ..."
+msgstr "Ychwaneg gyrrwr"
 
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
+#: src/gtkui/menus.c:133
+msgid "Open _URL ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
+#: src/gtkui/menus.c:134
 #, fuzzy
-msgid "Repeat"
-msgstr "Beat"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr ""
+msgid "_Add File ..."
+msgstr "Ychwaneg gyrrwr"
 
-#: src/gtkui/ui_manager.c:52
+#: src/gtkui/menus.c:135
 #, fuzzy
-msgid "Show main menu"
-msgstr "Dangos ffenestr rhwydwaith"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr ""
+msgid "Add U_RL ..."
+msgstr "Ychwaneg gyrrwr"
 
-#: src/gtkui/ui_manager.c:55
+#: src/gtkui/menus.c:137
 #, fuzzy
-msgid "Show statusbar"
-msgstr "Statws"
+msgid "A_bout ..."
+msgstr "Ynghylch"
 
-#: src/gtkui/ui_manager.c:56
-msgid "Show/hide statusbar"
-msgstr ""
+#: src/gtkui/menus.c:138
+#, fuzzy
+msgid "_Preferences ..."
+msgstr "AudioCompress "
 
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:60
+#: src/gtkui/menus.c:142
 #, fuzzy
-msgid "Scroll on Song Change"
-msgstr "Newid Cân %s"
+msgid "_Play"
+msgstr "Modd chwarae:"
 
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
+#: src/gtkui/menus.c:143
 #, fuzzy
-msgid "Pause"
+msgid "Paus_e"
 msgstr "Chwarae"
 
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
+#: src/gtkui/menus.c:144
 #, fuzzy
-msgid "Stop"
+msgid "_Stop"
 msgstr "Synthpop"
 
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/gtkui/menus.c:145
 #, fuzzy
-msgid "Previous"
+msgid "Pre_vious"
 msgstr "Primus"
 
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+#: src/gtkui/menus.c:146
 #, fuzzy
-msgid "Next"
+msgid "_Next"
 msgstr "Testun"
 
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-#, fuzzy
-msgid "Playlist"
-msgstr "Modd chwarae:"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:95
-#, fuzzy
-msgid "Import Playlist ..."
-msgstr "Modd chwarae:"
-
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:98
+#: src/gtkui/menus.c:148
 #, fuzzy
-msgid "Export Playlist ..."
-msgstr "Modd chwarae:"
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-#, fuzzy
-msgid "Save All Playlists"
-msgstr "Modd chwarae:"
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:106
-msgid "Refresh"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:110
-msgid "Refresh Selected"
-msgstr ""
+msgid "_Repeat"
+msgstr "Beat"
 
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
+#: src/gtkui/menus.c:149
+msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:115
+#: src/gtkui/menus.c:150
 #, fuzzy
-msgid "Playlist Manager"
+msgid "N_o Playlist Advance"
 msgstr "Modd chwarae:"
 
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:123
-#, fuzzy
-msgid "Add Files ..."
-msgstr "Ychwaneg gyrrwr"
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-#, fuzzy
-msgid "Remove All"
-msgstr "Tynnu gyrrwr"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
+#: src/gtkui/menus.c:151
+msgid "Stop _After This Song"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
+#: src/gtkui/menus.c:154
+msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:140
-msgid "Edit the playlist title."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:146
-#, fuzzy
-msgid "Sort"
-msgstr "Porth"
-
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
+#: src/gtkui/menus.c:158
 #, fuzzy
-msgid "By Track Number"
+msgid "By Track _Number"
 msgstr "Rhif y Trac:"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
+#: src/gtkui/menus.c:159
 #, fuzzy
-msgid "By Title"
+msgid "By _Title"
 msgstr "Teitl"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
+#: src/gtkui/menus.c:160
 #, fuzzy
-msgid "By Artist"
+msgid "By _Artist"
 msgstr "Artist:"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
+#: src/gtkui/menus.c:161
 #, fuzzy
-msgid "By Album"
+msgid "By A_lbum"
 msgstr "Albwm:"
 
-#: src/gtkui/ui_manager.c:155
+#: src/gtkui/menus.c:162
 #, fuzzy
-msgid "By Release Date"
+msgid "By Release _Date"
 msgstr "Dyddiad!"
 
-#: src/gtkui/ui_manager.c:157
+#: src/gtkui/menus.c:163
 #, fuzzy
-msgid "By File Path"
+msgid "By _File Path"
 msgstr "Enw ffeil"
 
-#: src/gtkui/ui_manager.c:159
+#: src/gtkui/menus.c:164
 #, fuzzy
-msgid "By Formatted Title"
-msgstr "Teitl"
-
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
-msgstr ""
+msgid "By _Custom Title"
+msgstr "Ynghylch"
 
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
+#: src/gtkui/menus.c:166
+msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
+#: src/gtkui/menus.c:167
+msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
-msgstr ""
+#: src/gtkui/menus.c:172
+#, fuzzy
+msgid "_Sort"
+msgstr "Porth"
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
+#: src/gtkui/menus.c:174
+msgid "_New"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
-msgstr ""
+#: src/gtkui/menus.c:175
+#, fuzzy
+msgid "_Close"
+msgstr "Cau"
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
+#: src/gtkui/menus.c:177
 #, fuzzy
-msgid "File"
-msgstr "Enw ffeil"
+msgid "_Import ..."
+msgstr "Porth"
 
-#: src/gtkui/ui_manager.c:188
+#: src/gtkui/menus.c:178
 #, fuzzy
-msgid "Components"
-msgstr "Sylw:"
+msgid "_Export ..."
+msgstr "Porth"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
+#: src/gtkui/menus.c:180
 #, fuzzy
-msgid "View Track Details"
-msgstr "defnyddiwch Cynnydd/Brig Trac"
+msgid "_Playlist Manager ..."
+msgstr "Modd chwarae:"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr ""
+#: src/gtkui/menus.c:183
+#, fuzzy
+msgid "Volume _Up"
+msgstr "Sain:(%)"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
+#: src/gtkui/menus.c:184
 #, fuzzy
-msgid "About Audacious"
-msgstr "Ynghylch Audacious Ategyn LIRC"
+msgid "Volume _Down"
+msgstr "Sain:(%)"
 
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
+#: src/gtkui/menus.c:186
+msgid "_Equalizer"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
+#: src/gtkui/menus.c:188
+msgid "E_ffects"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
+#: src/gtkui/menus.c:191
+msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
+#: src/gtkui/menus.c:194
+msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr ""
+#: src/gtkui/menus.c:195
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "Statws"
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
+#: src/gtkui/menus.c:197
+msgid "Show Column _Headers"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
+#: src/gtkui/menus.c:198
+msgid "Choose _Columns ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
+#: src/gtkui/menus.c:199
 #, fuzzy
-msgid "Quit Audacious"
-msgstr "%s - Audacious"
+msgid "Scrol_l on Song Change"
+msgstr "Newid Cân %s"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr ""
+#: src/gtkui/menus.c:202
+#, fuzzy
+msgid "_File"
+msgstr "Enw ffeil"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
+#: src/gtkui/menus.c:203
+#, fuzzy
+msgid "_Playback"
+msgstr "Chwarae"
+
+#: src/gtkui/menus.c:204
+#, fuzzy
+msgid "P_laylist"
+msgstr "Modd chwarae:"
+
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#, fuzzy
+msgid "_Services"
+msgstr "Dyfeisiau"
+
+#: src/gtkui/menus.c:206
+#, fuzzy
+msgid "_Output"
+msgstr "Ategyn Allbwn OSS"
+
+#: src/gtkui/menus.c:207
+msgid "_View"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
+#: src/gtkui/menus.c:215
+msgid "_Copy"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
+#: src/gtkui/menus.c:216
+msgid "_Paste"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
+#: src/gtkui/menus.c:217
+msgid "Select _All"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
+#: src/gtkui/menus.c:222
 #, fuzzy
-msgid "Cut"
-msgstr "Cult"
-
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
-msgstr ""
+msgid "_Rename"
+msgstr "Enw ffeil"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr ""
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr ""
+#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+#, fuzzy
+msgid "Audacious"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr ""
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Gwall"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 #, fuzzy
 msgid "mono"
 msgstr "Mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 #, fuzzy
 msgid "stereo"
 msgstr "Stereo"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "Sianeli:"
 msgstr[1] "Sianeli:"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, c-format
 msgid "%d kbps"
 msgstr ""
@@ -2830,10 +1732,20 @@
 msgid "Previous Track"
 msgstr ""
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#, fuzzy
+msgid "Play"
+msgstr "Modd chwarae:"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr ""
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#, fuzzy
+msgid "Stop"
+msgstr "Synthpop"
+
 #: src/hotkey/gui.c:75
 #, fuzzy
 msgid "Next Track"
@@ -2862,6 +1774,10 @@
 msgid "Volume Down"
 msgstr "Sain:(%)"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr ""
+
 #: src/hotkey/gui.c:82
 #, fuzzy
 msgid "Toggle Player Windows"
@@ -2871,12 +1787,21 @@
 msgid "Show On-Screen-Display"
 msgstr ""
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "Beat"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle Shuffle"
+msgstr ""
+
+#: src/hotkey/gui.c:95
 #, fuzzy
 msgid "(none)"
 msgstr "Dim"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2884,41 +1809,41 @@
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr ""
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 #, fuzzy
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Ffurfweddu Ategyn ESD"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 #, fuzzy
 msgid "Hotkeys:"
 msgstr "Gwesteiwr:"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 #, fuzzy
 msgid "Action:"
 msgstr "Hatena"
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr ""
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 #, fuzzy
 msgid "About Global Hotkey Plugin"
 msgstr "Ynghylch Ategyn Scrobbler"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -2982,133 +1907,30 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "Ynghylch Ategyn Allbwn JACK 0.17"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr ""
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-#, fuzzy
-msgid "Name"
-msgstr "Enw:"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1075
-#, fuzzy
-msgid "Remove"
-msgstr "Tynnu gyrrwr"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr ""
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "Ynghylch Audacious Ategyn LIRC"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "Ategyn LIRC"
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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 ""
-
-#: src/lirc/interface.c:37
-#, fuzzy
-msgid "LIRC plugin settings"
-msgstr "Ategyn LIRC"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr ""
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
+"Looking for lyrics..."
 msgstr ""
 
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr ""
-
-#: src/lirc/interface.c:79
-#, fuzzy
-msgid "Connection"
-msgstr "Lleoliad:"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: methu â ymgychwyn LIRC ateg\n"
-
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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: methu â darllen LIRC ffurfweddiad ffeil\n"
-"%s: plesio darllen yn dogfennau am LIRC\n"
-"%s: pa at creu y addas ffurfweddiad ffeil\n"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr ""
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: gorchymyn anhysbys \"%s\"\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: datgysylltu am LIRC\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
 msgstr ""
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 #, fuzzy
 msgid "About Metronom"
 msgstr "Ynghylch"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3117,248 +1939,40 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, fuzzy, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Cynhyrchydd Tôn:"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:137
-#, fuzzy
-msgid "ModPlug Configuration"
-msgstr "Ffurfweddiad TiMidity"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 did"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 did"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:286
-#, fuzzy
-msgid "96 kHz"
-msgstr "44100 Hz"
-
-#: src/modplug/gui/interface.cxx:293
-#, fuzzy
-msgid "48 kHz"
-msgstr "44100 Hz"
-
-#: src/modplug/gui/interface.cxx:300
-#, fuzzy
-msgid "44 kHz"
-msgstr "44100 Hz"
-
-#: src/modplug/gui/interface.cxx:307
-#, fuzzy
-msgid "22 kHz"
-msgstr "22000 Hz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Graddfa Samplo"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-#, fuzzy
-msgid "Enable"
-msgstr "Galluogi clicied"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-#, fuzzy
-msgid "Depth"
-msgstr "Duet"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-#, fuzzy
-msgid "Delay"
-msgstr "Oediad: (ms)"
-
-#: src/modplug/gui/interface.cxx:394
-#, fuzzy
-msgid "Reverb"
-msgstr "adlais"
-
-#: src/modplug/gui/interface.cxx:440
-#, fuzzy
-msgid "Amount"
-msgstr "Ynghylch"
-
-#: src/modplug/gui/interface.cxx:448
-#, fuzzy
-msgid "Range"
-msgstr "Cyfongl"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 #, fuzzy
 msgid "Surround"
 msgstr "Adlais o amgylch"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-#, fuzzy
-msgid "Preamp"
-msgstr "Dream"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:859
-#, fuzzy
-msgid "MOD Info"
-msgstr "Gwybodaeth am y CD"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:913
-#, fuzzy
-msgid "Samples"
-msgstr "Salsa"
-
-#: src/modplug/gui/interface.cxx:938
-#, fuzzy
-msgid "Instruments"
-msgstr "Offerynnol"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
+#: src/mtp_up/mtp.c:298
+msgid "Upload in progress..."
 msgstr ""
 
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
 msgstr ""
 
-#: src/modplug/gui/main.cxx:52
-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."
+#: src/mtp_up/mtp.c:311
+msgid "Disconnect MTP Device"
 msgstr ""
 
-#: src/modplug/gui/main.cxx:55
+#: src/notify/libnotify-aosd_event.c:47
 #, fuzzy
-msgid "About Modplug"
-msgstr "Ynghylch Ategyn Echo"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, fuzzy, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Meth agor dyfais ffeil MIDI"
-
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr ""
-
-#: src/mtp_up/mtp.c:290
-msgid "Upload in progress..."
-msgstr ""
-
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr ""
+msgid "Stopped"
+msgstr "Synthpop"
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
+#: src/notify/libnotify-aosd_event.c:47
+msgid "Audacious is not playing."
 msgstr ""
 
 #: src/null/null.c:64
@@ -3413,12 +2027,12 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 #, fuzzy
 msgid "About OSS4 Plugin"
 msgstr "Ynghylch Ategyn ESounD"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 #, fuzzy
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
@@ -3467,6 +2081,11 @@
 msgid "Default (%s)"
 msgstr "Rhagosodedig (%s)"
 
+#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Rhagosodedig"
+
 #: src/OSS/configure.c:187
 msgid "OSS Driver configuration"
 msgstr "Ffurfweddu'r Gyrrwr OSS"
@@ -3539,12 +2158,12 @@
 " MA 02111-1307,\n"
 "USA."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 #, fuzzy
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Ategyn Allbwn CoreAudio"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 #, fuzzy
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
@@ -3602,28 +2221,28 @@
 msgid "Method:"
 msgstr ""
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 msgid "Change password"
 msgstr ""
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Gwasanaethau"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Enw Defnyddiwr:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 #, fuzzy
 msgid "Scrobbler URL:"
 msgstr "Ategyn Scrobbler"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3632,7 +2251,7 @@
 msgid "Scrobbler"
 msgstr "Ategyn Scrobbler"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3640,16 +2259,16 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "Ynghylch Ategyn Scrobbler"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 #, fuzzy
 msgid "About SDL Output Plugin"
 msgstr "Ynghylch Ategyn Allbwn JACK 0.17"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 #, fuzzy
 msgid "SDL error"
 msgstr "Terror"
@@ -3659,11 +2278,19 @@
 msgid "About %s"
 msgstr "Ynghylch %s"
 
-#: src/sid/xs_config.c:323
+#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
+msgid "Close"
+msgstr "Cau"
+
+#: src/sid/xs_config.c:326
 #, fuzzy
 msgid " Error"
 msgstr "Gwall"
 
+#: src/sid/xs_config.c:326
+msgid "OK"
+msgstr "Iawn"
+
 #: src/sid/xs_fileinfo.c:151
 #, fuzzy
 msgid "General info"
@@ -3674,6 +2301,11 @@
 msgid "Tune #%i: "
 msgstr ""
 
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
+#, fuzzy, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Meth agor dyfais ffeil MIDI"
+
 #: src/sid/xs_interface.c:234
 #, fuzzy
 msgid "Audacious-SID configuration"
@@ -3962,17 +2594,17 @@
 msgid "Use"
 msgstr ""
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
 #, fuzzy
 msgid "Save"
 msgstr "Rave"
 
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:435
+#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
 #, fuzzy
 msgid "Import"
 msgstr "Porth"
 
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 #, fuzzy
 msgid "Delete"
 msgstr "Rhagosodedig"
@@ -4006,6 +2638,12 @@
 msgid "Playtime:"
 msgstr "Modd chwarae:"
 
+#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
+#: src/sid/xs_interface.c:1155
+#, fuzzy
+msgid "seconds"
+msgstr "eiliad"
+
 #: src/sid/xs_interface.c:928
 msgid "Minimum playtime:"
 msgstr ""
@@ -4251,717 +2889,875 @@
 msgid "No"
 msgstr "Na"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr ""
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 msgstr ""
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr ""
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 #, fuzzy
 msgid "_Player:"
 msgstr "Modd chwarae:"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 #, fuzzy
 msgid "_Playlist:"
 msgstr "Modd chwarae:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 #, fuzzy
 msgid "_Fonts"
 msgstr "Hatena"
 
-#: src/skins/skins_cfg.c:323
-#, fuzzy
-msgid "Use Bitmap fonts if available"
-msgstr "Stereo (os ar gael)"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.c:324
-#, fuzzy
-msgid "_Miscellaneous"
-msgstr "Gwasanaethau"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr ""
-
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
-msgstr ""
-
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr ""
+#: src/skins/skins_cfg.c:346
+#, fuzzy
+msgid "_Skin"
+msgstr "Hatena"
 
-#: src/skins/skins_cfg.c:330
-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 ""
+#: src/skins/skins_cfg.c:393
+#, fuzzy
+msgid "Interface Preferences"
+msgstr "AudioCompress "
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr ""
+#: src/skins/ui_equalizer.c:330
+#, fuzzy
+msgid "Preamp"
+msgstr "Dream"
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr ""
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "250 Hz"
+msgstr "22000 Hz"
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "500 Hz"
+msgstr "11000 Hz"
 
-#: src/skins/skins_cfg.c:417
+#: src/skins/ui_equalizer.c:335
 #, fuzzy
-msgid "Blue"
-msgstr "Y Felan"
+msgid "1 kHz"
+msgstr "11000 Hz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr ""
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "2 kHz"
+msgstr "22000 Hz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr ""
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "4 kHz"
+msgstr "44100 Hz"
 
-#: src/skins/skins_cfg.c:569
+#: src/skins/ui_equalizer.c:336
 #, fuzzy
-msgid "_Skin"
-msgstr "Hatena"
+msgid "8 kHz"
+msgstr "44100 Hz"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr ""
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "16 kHz"
+msgstr "44100 Hz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr ""
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 #, fuzzy
 msgid "kHz"
 msgstr "Hz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 #, fuzzy
 msgid "surround"
 msgstr "Adlais o amgylch"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr ""
-
-#: src/skins/ui_main.c:986
-#, fuzzy
-msgid "Show main player window"
-msgstr "Dangos ffenestr rhwydwaith"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr ""
-
-#: src/skins/ui_main.c:993
-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 ""
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr ""
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr ""
-
-#: src/skins/ui_main.c:1052
+#: src/skins/ui_main.c:807
 #, c-format
-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 ""
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-msgstr ""
-
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, fuzzy, c-format
 msgid "Volume: %d%%"
 msgstr "Sain:(%)"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 #, fuzzy
 msgid "Options Menu"
 msgstr "Dewisiadau:"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 #, fuzzy
 msgid "File Info Box"
 msgstr "Gwybodaeth Ffeil - %s"
 
-#: src/skins/ui_main.c:1637
-#, fuzzy
-msgid "Disable 'GUI Scaling'"
-msgstr "Analluogi tagiau ID3V2"
-
-#: src/skins/ui_main.c:1639
-#, fuzzy
-msgid "Enable 'GUI Scaling'"
-msgstr "Gallougi sain dyblusampl"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr ""
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 #, fuzzy
 msgid "Playlist mode."
 msgstr "Modd chwarae:"
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr ""
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr ""
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr ""
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr ""
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 #, fuzzy
 msgid "Peaks"
 msgstr "Pranks"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#, fuzzy
+msgid "Repeat"
+msgstr "Beat"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr ""
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr ""
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr ""
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr ""
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr ""
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr ""
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-#, fuzzy
-msgid "Scale"
-msgstr "Rave"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr ""
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr ""
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 #, fuzzy
 msgid "Scope"
 msgstr "Synthpop"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr ""
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr ""
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 #, fuzzy
 msgid "Normal"
 msgstr "Fformat:"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 #, fuzzy
 msgid "Fire"
 msgstr "Satire"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr ""
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 #, fuzzy
 msgid "Lines"
 msgstr "Lladin"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 #, fuzzy
 msgid "Bars"
 msgstr "Bas"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr ""
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr ""
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 #, fuzzy
 msgid "Slowest"
 msgstr "Showtunes"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 #, fuzzy
 msgid "Slow"
 msgstr "Slow Jam"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr ""
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 #, fuzzy
 msgid "Fast"
 msgstr "Fformat:"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr ""
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr ""
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr ""
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+#, fuzzy
+msgid "Pause"
+msgstr "Chwarae"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#, fuzzy
+msgid "Previous"
+msgstr "Primus"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+#, fuzzy
+msgid "Next"
+msgstr "Testun"
+
+#: src/skins/ui_manager.c:196
 #, fuzzy
 msgid "Visualization"
 msgstr "Corff:"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+#, fuzzy
+msgid "Playlist"
+msgstr "Modd chwarae:"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:222
+#, fuzzy
+msgid "Import Playlist"
+msgstr "Modd chwarae:"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:226
+#, fuzzy
+msgid "Export Playlist"
+msgstr "Modd chwarae:"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:229
+#, fuzzy
+msgid "Save All Playlists"
+msgstr "Modd chwarae:"
+
+#: 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:228
-msgid "List Manager"
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
 msgstr ""
 
 #: src/skins/ui_manager.c:238
+msgid "List Manager"
+msgstr ""
+
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr ""
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr ""
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr ""
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "AudioCompress "
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr ""
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr ""
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr ""
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:270
-msgid "Clear Queue"
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr ""
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
 msgstr ""
 
 #: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr ""
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:277
+#, fuzzy
+msgid "Remove All"
+msgstr "Tynnu gyrrwr"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:281
+msgid "Clear Queue"
+msgstr ""
+
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr ""
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 #, fuzzy
 msgid "Remove Duplicates"
 msgstr "Tynnu gyrrwr"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+#, fuzzy
+msgid "By Title"
+msgstr "Teitl"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 #, fuzzy
 msgid "By Filename"
 msgstr "Enw ffeil"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 #, fuzzy
 msgid "By Path + Filename"
 msgstr "Enw ffeil"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr ""
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr ""
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:313
 #, fuzzy
 msgid "Randomize List"
 msgstr "Rave"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 #, fuzzy
 msgid "Sort List"
 msgstr "Artist:"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#, fuzzy
+msgid "By Album"
+msgstr "Albwm:"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr ""
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#, fuzzy
+msgid "By Artist"
+msgstr "Artist:"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr ""
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr ""
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 #, fuzzy
 msgid "By Date"
 msgstr "Dyddiad!"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr ""
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#, fuzzy
+msgid "By Track Number"
+msgstr "Rhif y Trac:"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr ""
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr ""
 
-#: src/skins/ui_manager.c:379
-msgid "Plugin Services"
+#: src/skins/ui_manager.c:387
+#, fuzzy
+msgid "File"
+msgstr "Enw ffeil"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
 msgstr ""
 
 #: src/skins/ui_manager.c:390
+msgid "Plugin Services"
+msgstr ""
+
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#, fuzzy
+msgid "View Track Details"
+msgstr "defnyddiwch Cynnydd/Brig Trac"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr ""
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#, fuzzy
+msgid "About Audacious"
+msgstr "Ynghylch Audacious Ategyn LIRC"
+
+#: src/skins/ui_manager.c:401
 #, fuzzy
 msgid "Play File"
 msgstr "Modd chwarae:"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr ""
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr ""
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr ""
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr ""
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr ""
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr ""
+
+#: src/skins/ui_manager.c:413
+#, fuzzy
+msgid "Quit Audacious"
+msgstr "%s - Audacious"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr ""
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr ""
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr ""
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr ""
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr ""
+
+#: src/skins/ui_manager.c:436
+#, fuzzy
+msgid "Cut"
+msgstr "Cult"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr ""
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr ""
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 #, fuzzy
 msgid "Preset"
 msgstr "Porth"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 #, fuzzy
 msgid "Zero"
 msgstr "Retro"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr ""
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 #, fuzzy
 msgid "Save default preset"
 msgstr "rhagosodedig"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 #, fuzzy
 msgid "To file"
 msgstr "Teitl:"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 #, fuzzy
 msgid "Save preset to file"
 msgstr "Cadw'r llif i ddisg"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 #, fuzzy
 msgid "Delete preset"
 msgstr "Rhagosodedig"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:374
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:382
+#: 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 "
@@ -4969,114 +3765,56 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+#, fuzzy
+msgid "Title: "
+msgstr "Teitl:"
+
+#: src/skins/ui_playlist.c:267
 #, fuzzy
 msgid "Album: "
 msgstr "Albwm:"
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 #, fuzzy
 msgid "Artist: "
 msgstr "Artist:"
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 #, fuzzy
 msgid "Filename: "
 msgstr "Enw Defnyddiwr:"
 
-#: src/skins/ui_playlist.c:419
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:422
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:425
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:776
-msgid "Save as Static Playlist"
-msgstr ""
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr ""
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr ""
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr ""
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "250 Hz"
-msgstr "22000 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "500 Hz"
-msgstr "11000 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "1 kHz"
-msgstr "11000 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "2 kHz"
-msgstr "22000 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "4 kHz"
-msgstr "44100 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "8 kHz"
-msgstr "44100 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "16 kHz"
-msgstr "44100 Hz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, fuzzy, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr ""
@@ -5129,61 +3867,71 @@
 " MA 02111-1307,\n"
 "USA."
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 #, fuzzy
 msgid "About SndStretch"
 msgstr "Ynghylch Gyrrwr OSS"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 #, fuzzy
 msgid "Volume corr."
 msgstr "Rheolwr sain"
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 #, fuzzy
 msgid "Speed"
 msgstr "Llais"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 #, fuzzy
 msgid "Pitch"
 msgstr "Llwybr:"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+#, fuzzy
+msgid "Scale"
+msgstr "Rave"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+#, fuzzy
+msgid "Options"
+msgstr "Dewisiadau:"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 #, fuzzy
 msgid "SndStretch - Configuration"
 msgstr "Ffurfweddu'r Gyrrwr Sun"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr "Gorchymyn cragen i'w redeg pan fo Audacious yn newid cân."
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "Gorchymyn:"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr ""
 "Gorchymyn cragen, i'w redeg pan fo Audacious wedi cyrraedd diwedd chwarae."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 "Gorchymyn cragen.i'w redeg pan fo Audacious wedi cyrraedd diwedd rhestr "
 "chwarae."
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -5202,7 +3950,7 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5210,19 +3958,15 @@
 "Dylai enw ffeil a thagiau teitl cân fod o fewn dyfynodau "
 "dwb (\"). Gall peidio gwneud achosi risg diogelwch."
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "Gorchymyn:"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 #, fuzzy
 msgid "Song Change"
 msgstr "Newid Cân %s"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr ""
-
 #: src/statusicon/statusicon.c:378
 #, fuzzy
 msgid "About Status Icon Plugin"
@@ -5291,64 +4035,19 @@
 "\n"
 "Gan Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "Ynghylch Ategyn Extra Stereo"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "Ffurfweddu Extra Stereo"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-#, fuzzy
-msgid "Search:"
-msgstr "Blwyddyn:"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-#, fuzzy
-msgid "Stream name"
-msgstr "Offerynnol"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Tynnu gyrrwr"
-
-#: src/streambrowser/streambrowser.c:340
-#, fuzzy
-msgid "About Stream Browser"
-msgstr "Ynghylch Gyrrwr OSS"
-
-#: src/streambrowser/streambrowser.c:341
-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:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "Ynghylch Cynhyrchydd Tôn"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5363,12 +4062,12 @@
 "frequency3;...\n"
 "e.e. tôn://2000;2005 i chwarae tôn 2000Hz a thôn 2005Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "Cynhyrchydd Tôn:"
 
@@ -5390,15 +4089,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Tagiau Ogg Vorbis:"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ffurfweddiad Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Ynghylch Ategyn Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 #, fuzzy
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
@@ -5462,6 +4161,416 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "Stereo (os ar gael)"
+
+#, fuzzy
+#~ msgid "_Miscellaneous"
+#~ msgstr "Gwasanaethau"
+
+#~ msgid "About "
+#~ msgstr "Ynghylch"
+
+#~ 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"
+#~ "Hawlfraint (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
+#~ "\n"
+#~ "Mae'r rhaglen hwn yn rhyddhau â GNU LGPL.\n"
+#~ "Canfod http://www.gnu.org/licenses/lgpl.html am manylion.\n"
+#~ "\n"
+#~ "Mae'r rhaglen defnyddio yn AdPlug llyfrgell, pa ys hawlfraint (C) Simon "
+#~ "Peter, et al.\n"
+#~ "Fersiwn cynnwys AdPlug llyfrgell:"
+
+#, fuzzy
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AMIDI-Plug - ffurfweddu"
+
+#, fuzzy
+#~ msgid "Sound quality"
+#~ msgstr "Clip Sain"
+
+#, fuzzy
+#~ msgid "Resolution"
+#~ msgstr "Cydraniad:"
+
+#, fuzzy
+#~ msgid "8bit"
+#~ msgstr "8 did"
+
+#, fuzzy
+#~ msgid "16bit"
+#~ msgstr "16 did"
+
+#~ msgid "Channels"
+#~ msgstr "Sianeli:"
+
+#, fuzzy
+#~ msgid "Formats"
+#~ msgstr "Fformat:"
+
+#, fuzzy
+#~ msgid "Format"
+#~ msgstr "Fformat:"
+
+#, fuzzy
+#~ msgid "File Type: "
+#~ msgstr "Maint ffeil:"
+
+#, fuzzy
+#~ msgid "Instruments: "
+#~ msgstr "Offerynnol"
+
+#, fuzzy
+#~ msgid "Song"
+#~ msgstr "Swing"
+
+#, fuzzy
+#~ msgid "Instrument name"
+#~ msgstr "Offerynnol"
+
+#, fuzzy
+#~ msgid "Song message"
+#~ msgstr "Newid Cân %s"
+
+#, fuzzy
+#~ msgid "Speed: "
+#~ msgstr "Llais"
+
+#, fuzzy
+#~ msgid "Timer: "
+#~ msgstr "Teitl:"
+
+#, fuzzy
+#~ msgid "Alarm Settings"
+#~ msgstr "Gosodiadau Cymysgu"
+
+#, fuzzy
+#~ msgid "Time"
+#~ msgstr "Teitl"
+
+#, fuzzy
+#~ msgid "hours"
+#~ msgstr "Chorus"
+
+#, fuzzy
+#~ msgid "Quiet after:"
+#~ msgstr "Didradd:"
+
+#, fuzzy
+#~ msgid "Sunday"
+#~ msgstr "Trac Sain"
+
+#, fuzzy
+#~ msgid "Monday"
+#~ msgstr "Mono"
+
+#, fuzzy
+#~ msgid "Fading"
+#~ msgstr "cynnydd"
+
+#, fuzzy
+#~ msgid "Volume"
+#~ msgstr "Sain:(%)"
+
+#, fuzzy
+#~ msgid "%"
+#~ msgstr "%d"
+
+#, fuzzy
+#~ msgid "Final"
+#~ msgstr "Enw ffeil"
+
+#, fuzzy
+#~ msgid "enable"
+#~ msgstr "Cyffredinol"
+
+#, fuzzy
+#~ msgid "Use reminder"
+#~ msgstr "User Defined"
+
+#, fuzzy
+#~ msgid "Thankyou"
+#~ msgstr "Tango"
+
+#, fuzzy
+#~ msgid "_Connect"
+#~ msgstr "Lleoliad:"
+
+#, fuzzy
+#~ msgid "Class"
+#~ msgstr "Clasurôl"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "Dyfeisiau"
+
+#, fuzzy
+#~ msgid "Rescan"
+#~ msgstr "Cyfongl"
+
+#, fuzzy
+#~ msgid "Playback->Play"
+#~ msgstr "Chwarae"
+
+#, fuzzy
+#~ msgid "Playback->Stop"
+#~ msgstr "Chwarae"
+
+#, fuzzy
+#~ msgid "Playback->Pause"
+#~ msgstr "Chwarae"
+
+#, fuzzy
+#~ msgid "Playback->Prev"
+#~ msgstr "Chwarae"
+
+#, fuzzy
+#~ msgid "Playback->Next"
+#~ msgstr "Chwarae"
+
+#, fuzzy
+#~ msgid "Playback->Eject"
+#~ msgstr "Chwarae"
+
+#, fuzzy
+#~ msgid "Detected"
+#~ msgstr "Rhagosodedig"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "Ynghylch"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Fformat ID3:"
+
+#, fuzzy
+#~ msgid "Device name:"
+#~ msgstr "Dyfais:"
+
+#, fuzzy
+#~ msgid "Device file:"
+#~ msgstr "Dyfais:"
+
+#, fuzzy
+#~ msgid "EvDev-Plug - Configuration"
+#~ msgstr "Ffurfweddiad Chwaraeydd MPEG Sain"
+
+#, fuzzy
+#~ msgid "Active"
+#~ msgstr "Acid"
+
+#~ msgid "Status"
+#~ msgstr "Statws"
+
+#, fuzzy
+#~ msgid "Device Name"
+#~ msgstr "Dyfais"
+
+#, fuzzy
+#~ msgid "Device File"
+#~ msgstr "Dyfais"
+
+#, fuzzy
+#~ msgid "Device Address"
+#~ msgstr "Dyfeisiau"
+
+#, fuzzy
+#~ msgid "EvDev-Plug - Bindings Configuration"
+#~ msgstr "Ffurfweddiad Chwaraeydd MPEG Sain"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Hatena"
+
+#, fuzzy
+#~ msgid "Filename: "
+#~ msgstr "Hatena"
+
+#~ msgid "EvDev-Plug - about"
+#~ msgstr "EvDev-Plug - ynghylch"
+
+#, fuzzy
+#~ msgid "Name"
+#~ msgstr "Enw:"
+
+#, fuzzy
+#~ msgid "Remove"
+#~ msgstr "Tynnu gyrrwr"
+
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "Ynghylch Audacious Ategyn LIRC"
+
+#~ msgid "LIRC Plugin "
+#~ msgstr "Ategyn LIRC"
+
+#, fuzzy
+#~ msgid "LIRC plugin settings"
+#~ msgstr "Ategyn LIRC"
+
+#, fuzzy
+#~ msgid "Connection"
+#~ msgstr "Lleoliad:"
+
+#~ msgid "%s: could not init LIRC support\n"
+#~ msgstr "%s: methu â ymgychwyn LIRC ateg\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: methu â darllen LIRC ffurfweddiad ffeil\n"
+#~ "%s: plesio darllen yn dogfennau am LIRC\n"
+#~ "%s: pa at creu y addas ffurfweddiad ffeil\n"
+
+#~ msgid "%s: unknown command \"%s\"\n"
+#~ msgstr "%s: gorchymyn anhysbys \"%s\"\n"
+
+#~ msgid "%s: disconnected from LIRC\n"
+#~ msgstr "%s: datgysylltu am LIRC\n"
+
+#, fuzzy
+#~ msgid "ModPlug Configuration"
+#~ msgstr "Ffurfweddiad TiMidity"
+
+#~ msgid "16 bit"
+#~ msgstr "16 did"
+
+#~ msgid "8 bit"
+#~ msgstr "8 did"
+
+#, fuzzy
+#~ msgid "96 kHz"
+#~ msgstr "44100 Hz"
+
+#, fuzzy
+#~ msgid "48 kHz"
+#~ msgstr "44100 Hz"
+
+#, fuzzy
+#~ msgid "44 kHz"
+#~ msgstr "44100 Hz"
+
+#, fuzzy
+#~ msgid "22 kHz"
+#~ msgstr "22000 Hz"
+
+#~ msgid "Sampling Rate"
+#~ msgstr "Graddfa Samplo"
+
+#, fuzzy
+#~ msgid "Enable"
+#~ msgstr "Galluogi clicied"
+
+#, fuzzy
+#~ msgid "Depth"
+#~ msgstr "Duet"
+
+#, fuzzy
+#~ msgid "Delay"
+#~ msgstr "Oediad: (ms)"
+
+#, fuzzy
+#~ msgid "Reverb"
+#~ msgstr "adlais"
+
+#, fuzzy
+#~ msgid "Amount"
+#~ msgstr "Ynghylch"
+
+#, fuzzy
+#~ msgid "Range"
+#~ msgstr "Cyfongl"
+
+#, fuzzy
+#~ msgid "MOD Info"
+#~ msgstr "Gwybodaeth am y CD"
+
+#, fuzzy
+#~ msgid "Samples"
+#~ msgstr "Salsa"
+
+#, fuzzy
+#~ msgid "Instruments"
+#~ msgstr "Offerynnol"
+
+#, fuzzy
+#~ msgid "About Modplug"
+#~ msgstr "Ynghylch Ategyn Echo"
+
+#, fuzzy
+#~ msgid "Blue"
+#~ msgstr "Y Felan"
+
+#, fuzzy
+#~ msgid "Disable 'GUI Scaling'"
+#~ msgstr "Analluogi tagiau ID3V2"
+
+#, fuzzy
+#~ msgid "Enable 'GUI Scaling'"
+#~ msgstr "Gallougi sain dyblusampl"
+
+#, fuzzy
+#~ msgid "Search:"
+#~ msgstr "Blwyddyn:"
+
+#, fuzzy
+#~ msgid "Stream name"
+#~ msgstr "Offerynnol"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Tynnu gyrrwr"
+
+#, fuzzy
+#~ msgid "About Stream Browser"
+#~ msgstr "Ynghylch Gyrrwr OSS"
+
+#, fuzzy
+#~ msgid "minutes:seconds"
+#~ msgstr "eiliad"
+
+#, fuzzy
+#~ msgid "Track length:"
+#~ msgstr "Cynnydd trac:"
+
+#, fuzzy
+#~ msgid "Show main menu"
+#~ msgstr "Dangos ffenestr rhwydwaith"
+
+#, fuzzy
+#~ msgid "Import Playlist ..."
+#~ msgstr "Modd chwarae:"
+
+#, fuzzy
+#~ msgid "Export Playlist ..."
+#~ msgstr "Modd chwarae:"
+
+#, fuzzy
+#~ msgid "By Formatted Title"
+#~ msgstr "Teitl"
+
+#, fuzzy
+#~ msgid "Components"
+#~ msgstr "Sylw:"
+
+#, fuzzy
+#~ msgid "Show main player window"
+#~ msgstr "Dangos ffenestr rhwydwaith"
+
+#, fuzzy
 #~ msgid "Show playlists"
 #~ msgstr "Modd chwarae:"
 
@@ -5729,10 +4838,6 @@
 #~ msgstr "Ynghylch"
 
 #, fuzzy
-#~ msgid "Output plugin"
-#~ msgstr "Ategyn Allbwn OSS"
-
-#, fuzzy
 #~ msgid "Throttle Output"
 #~ msgstr "Ynghylch Ategyn Allwyn Null"
 
@@ -5829,10 +4934,6 @@
 #~ msgstr "Rhagosodedig (%s)"
 
 #, fuzzy
-#~ msgid "_Rename"
-#~ msgstr "Enw ffeil"
-
-#, fuzzy
 #~ msgid "About Icecast-Plugin"
 #~ msgstr "Ynghylch Ategyn Echo"

audacious-plugins-2.5.3.tar.gz/po/de.po -> audacious-plugins-3.0.tar.gz/po/de.po Changed

@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-05-19 10:53-0400\n"
-"PO-Revision-Date: 2011-04-09 21:40+0100\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
+"PO-Revision-Date: 2011-07-05 23:56+0100\n"
 "Last-Translator: Thomas Lange\n"
 "Language-Team: german\n"
 "Language: \n"
@@ -11,8 +11,9 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: German\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -23,600 +24,47 @@
 "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:273
+#: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "Über MP4-AAC-Player-Plugin"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "Über"
-
-#: src/adplug/adplug-xmms.cc:155
-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"
-"Dieses Plugin wurde veröffentlicht unter den Bedingungen und Auflagen der "
-"GNU LGPL.\n"
-"http://www.gnu.org/licenses/lgpl.html für Details.\n"
-"\n"
-"Dieses Plugin benützt die AdPlug-Bibliothek; diese ist Copyright (C) Simon "
-"Peter, et al.\n"
-"Gelinkte AdPlug-Bibliotheks-Version: "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: Konfiguration"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "OK"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "Allgemein"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Sound-Qualität"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Auflösung"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8 Bit"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16 Bit"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Kanäle"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Stereo"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-"Vom Gebrauch von Stereo wird abgeraten, da es dem Klang keine Stereo-Effekte "
-"hinzufügt - OPL2 ist nur Mono - aber mehr Rechenleistung wird benötigt!"
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Frequenz"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Wiedergabe"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Liedende ermitteln"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-"Falls aktiviert, wird XMMS das Ende eines Titels erkennen, ihn stoppen und "
-"in der Wiedergabeliste fortfahren. Falls deaktiviert, erkennt XMMS dies "
-"nicht und spielt einfach weiter."
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Formate"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Format-Auswahl"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Format"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Erweiterung"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-"Ausgewählte Dateitypen werden von diesem Plugin erkannt und abgespielt. "
-"Deaktivierte Typen werden ignoriert, dass andere Plugins diese Dateien "
-"abspielen können."
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: Dateiinformation"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Dateiname"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Titel: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Autor: "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Dateityp: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "Untertitel: "
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Instrumente: "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Titel"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Instrumentenname"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Titel-Meldung"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "Untertitel-Auswahl"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Reihenfolge: "
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Pattern: "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Row: "
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Geschwindigkeit: "
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Timer: "
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "Über XMMS-Alarm"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "XMMS-Alarm"
-
-#: src/alarm/interface.c:56
-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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Schließen"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "Dies ist dein Aufwach-Signal."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Wiedergabeliste wählen"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Entschuldigung"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Warnung"
-
-#: src/alarm/interface.c:213
-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:229
-msgid "Oh Well"
-msgstr "Jo mei"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Alarm-Einstellungen"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Zeit"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "Stunden"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "Uhr"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "Minuten"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Still nach:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Alarm um (standardmäßig):"
-
-#: src/alarm/interface.c:584
-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:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Standard"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Tag"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Dienstag"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Mittwoch"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Donnerstag"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Freitag"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Samstag"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Sonntag"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Montag"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Tage"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Übergang"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "Sekunden"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Lautstärke"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Momentan"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "Zur momentanen Lautstärke zurücksetzen"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Beginnen bei"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Schluss"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Zusätzlicher Befehl"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "aktivieren"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Wiedergabeliste (optional)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Suchen..."
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Erinnern"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Erinnerung benutzen"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Optionen"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Was bedeuten diese Einstellungen?"
-
-#: src/alarm/interface.c:1364
-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:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Hilfe"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "Die Erinnerung für heute lautet.."
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Danke"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Standard-PCM-Device (%s)"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 msgid "Default mixer device"
 msgstr "Standard-Mixer-Device (%s)"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA-Ausgabeplugin-Einstellungen"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 msgid "PCM device:"
 msgstr "PCM-Gerät:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Mixer-Gerät:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 msgid "Mixer element:"
 msgstr "Mixer-Element:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr "Workaround Drain-Hangup"
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
 msgstr "Über ALSA Output Plugin"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr "ALSA Fehler"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -770,6 +218,10 @@
 msgid "SoundFont settings"
 msgstr "SoundFont-Einstellungen"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Dateiname"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Größe (Bytes)"
@@ -876,8 +328,7 @@
 "TiMidity-\n"
 "Backend"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Name:"
 
@@ -1028,119 +479,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Löst OSD beim Fortsetzen der Wiedergabe aus."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Platzierung"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "Relative X-Verschiebung:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Relative Y-Verschiebung:"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "Maximale OSD-Breite:"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Mehr-Bildschirm-Optionen"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "OSD anzeigen auf:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "allen Bildschirmen"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "Bildschirm %i"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Zeitablauf (ms)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "Anzeige:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "Einblenden:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "Ausblenden:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Schriftarten"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "Schriftart %i:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Schatten"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Internationalisierung"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "UTF-8-Konversion von Text deaktivieren (in Aosd)"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "Skin-Datei auswählen"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Render-Stil"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Farben"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "Farbe %i:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "Eigener Skin"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "Skin-Datei:"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "Suchen"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Auslöser aktivieren"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Ereignis"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "Composite-Manager erkannt"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1150,73 +601,73 @@
 "sofern ein solcher nicht doch aktiv ist, bitte einen solchen aktivieren, "
 "sonst wird das OSD nicht funktionieren"
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "Composite-Manager nicht benötigt für vorgetäuschte Transparenz"
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Transparenz"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Pseudo-Transparenz"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Echte Transparenz (benötigt X-Composite-Erweiterung)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "Composite-Erweiterung nicht geladen"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "Composite-Erweiterung nicht verfügbar"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious-OSD"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Audacious-OSD - Konfiguration"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Test"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Dekoration"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Auslöser"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Verschiedenes"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "Über Audacious-OSD"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1224,7 +675,7 @@
 "\n"
 "Audacious-OSD "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1246,125 +697,6 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr "Pairing-Anfrage für '%s'"
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr "Autorisierungs-Anfrage für %s"
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr "Bonding mit %s erstellt"
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr "Bonding mit %s entfernt"
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr "Gerät wurde ausgeschalten"
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr "Gerät wurde nicht-erkennbar gemacht"
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr "Gerät wurde anschließbar gemacht"
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr "Gerät wurde erkennbar gemacht"
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr "Gerät wurde eingeschränkt erkennbar gemacht"
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr "Gerät wurde in Pairing-Modus geschalten"
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr "Bluetooth Headset Support Plugin"
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr "Hersteller"
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr "Verfügbare Headsets"
-
-#: src/bluetooth/gui.c:224
-msgid "Current Headset"
-msgstr "Derzeitiges Headset"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr "_Aktualisieren"
-
-#: src/bluetooth/gui.c:231
-msgid "_Connect"
-msgstr "_Verbinden"
-
-#: src/bluetooth/gui.c:237
-msgid "_Close"
-msgstr "_Schließen"
-
-#: src/bluetooth/gui.c:274
-msgid "Class"
-msgstr "Klasse"
-
-#: src/bluetooth/gui.c:278
-msgid "Address:"
-msgstr "Adresse:"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr "Einbinden abschließen!"
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr "Keine Geräte gefunden!"
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr "Suche..."
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr "Zusammenführen..."
-
-#: src/bluetooth/scan_gui.c:138
-msgid "Rescan"
-msgstr "Abtasten"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "Wiedergeben"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Blur Scope: Farbauswahl"
@@ -1373,11 +705,11 @@
 msgid "Options:"
 msgstr "Optionen:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 msgid "About Audio CD Plugin"
 msgstr "Über AudioCD-Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1404,15 +736,15 @@
 "\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr "Laufwerk ist leer."
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr "Nicht unterstützter Disk-Typ."
 
@@ -1458,13 +790,25 @@
 
 #: src/cdaudio-ng/configure.c:230
 msgid "Override default device: "
-msgstr "Anderes Device verwenden: "
+msgstr "Anderes Gerät verwenden: "
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+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"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "CD hinzufügen"
 
@@ -1488,6 +832,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Konsolen-Musik-Dekoder"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "Allgemein"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Wiedergabe"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Bass:"
@@ -1505,8 +857,7 @@
 msgid "Default song length:"
 msgstr "Standard-Liedlänge:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Resampling"
 
@@ -1518,6 +869,10 @@
 msgid "Resampling rate:"
 msgstr "Resampling-Frequenz:"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1589,16 +944,16 @@
 "Sie können den Sample-Rate-Converter benutzen, um die Lieder auf die selbe "
 "Bitrate zu resamplen."
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "Crystalizer konfigurieren"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Effektstärke:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Übernehmen"
 
@@ -1613,6 +968,10 @@
 "\n"
 "Surround echo by Carl van Schaik 1999"
 msgstr ""
+"Echo Plugin\n"
+"Von Johan Levin 1999.\n"
+"\n"
+"Surround Echo von Carl van Schaik 1999"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
@@ -1634,385 +993,31 @@
 msgid "Volume: (%)"
 msgstr "Lautstärke: (%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "Wiedergabe->Abspielen"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "Wiedergabe->Stopp"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "Wiedergabe->Pause"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "Wiedergabe->Zurück"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "Wiedergabe->Nächstes"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "Wiedergabe->Auswerfen"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "Wiedergabe->Wiederholen"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "Wiedergabe->Zufällige Wiedergabe"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "Lautstärke->Um 5 erhöhen"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "Lautstärke->Um 5 verringern"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "Lautstärke->Um 10 erhöhen"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "Lautstärke->Um 10 verringern"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "Lautstärke->Lautlos"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "Fenster->Hauptfenster"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "Fenster->Wiedergabeliste"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "Fenster->Equalizer"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "Fenster->Zu Titel springen"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-"Event-Device-Plugin: Konnte Datei %s nicht öffnen, überspringe; Überprüfen "
-"Sie, ob die Datei existiert und Sie Leserechte darauf haben\n"
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-"Event-Device-Plugin: Konnte IO-Channel für Datei %s nicht erstellen, "
-"überspringe\n"
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-"Event-Device-Plugin: Konnte /proc/bus/input/devices nicht öffnen, "
-"automatisches Erkennen von Event-Devices wird nicht funktionieren.\n"
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-"Event-Device-Plugin: Konnte einen IO-Channel für /proc/bus/input/devices "
-"nicht öffnen, automatisches Erkennen von Event-Devices wird nicht "
-"funktionieren.\n"
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-"Event-Device-Plugin: Beim Lesen von /proc/bus/input/devices trat ein Fehler "
-"auf, automatisches Erkennen von Event-Devices wird nicht funktionieren.\n"
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-"Event-Device-Plugin: Gerät %s in /dev/input nicht gefunden, überspringe.\n"
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-"Event-Device-Plugin: Konnte Konfigurationsdatei %s nicht laden, "
-"Standardeinstellungen werden genutzt.\n"
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-"Event-Device-Plugin: unvollständige Information in Konfigurationsdatei für "
-"Gerät \"%s\", überspringe.\n"
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"Event-Device-Plugin: Konnte \"is_active\"-Wert für Gerät \"%s\" nicht "
-"bekommen, überspringe.\n"
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-"Event-Device-Plugin: Konnte auf lokalen Ordner %s nicht zugreifen, "
-"Einstellungen werden nicht gespeichert.\n"
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"Event-Device-Plugin: Konnte Dateinamen-Wert für Gerät \"%s\" nicht bekommen, "
-"überspringe.\n"
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-"Event-Device-Plugin: Konnte \"Phys\"-Wert für Gerät \"%s\" nicht bekommen, "
-"überspringe.\n"
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"Event-Device-Plugin: Konnte \"Is_Custom\"-Wert für Gerät \"%s\" nicht "
-"bekommen, überspringe.\n"
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-"Event-Device-Plugin: Unerwarteter Wert für Gerät \"%s\", überspringe.\n"
-
-#: src/evdev-plug/ed_ui.c:212
-msgid "Detected"
-msgstr "Erkannt"
-
-#: src/evdev-plug/ed_ui.c:217
-msgid "Custom"
-msgstr "Individuell"
-
-#: src/evdev-plug/ed_ui.c:223
-msgid "Not Detected"
-msgstr "Nicht erkannt"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "Information"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-"Konnte Binding-Fenster für ein nicht erkanntes Gerät nicht öffnen.\n"
-"Stellen Sie sicher, dass das Gerät korrekt angeschlossen wurde."
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Fehler"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-"Konnte ausgewähltes Gerät nicht öffnen.\n"
-"Bitte überprüfen Sie die Leserechte."
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "EvDev-Plug - Spezielles Gerät hinzufügen"
-
-#: src/evdev-plug/ed_ui.c:353
-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 versucht automatisch Informationen über verfügbare Geräte des\n"
-"Systems zu erkennen und zu aktualisieren.\n"
-"Falls jedoch die automatische Erkennung auf Ihrem System nicht funktioniert\n"
-"oder Sie die Geräte nicht über den Standardpfad nutzen (momentan werden sie "
-"nur\n"
-"in /dev/input/ gesucht), können Sie ein benutzerdefiniertes Gerät "
-"hinzufügen, bei dem Sie\n"
-"explizit den Gerätenamen und die Datei angeben."
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Gerätename:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Gerätedatei:"
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr "(benutzerdefiniert)"
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-"Bitte geben Sie Name und Dateiname an.\n"
-"Dateinamen müssen mit absolutem Pfad angegeben werden."
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr ""
-"Wollen Sie die existierende Konfiguration des ausgewählten Gerätes löschen?\n"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "Wollen Sie das ausgewählte Custom-Gerät entfernen?\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "EvDev-Plug - Konfiguration"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Aktiv"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Status"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Gerätename"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Gerätedatei"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Geräteadresse"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "_Bindings"
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-"Drücken Sie eine Taste um sie zu binden.\n"
-"Falls in den nächsten fünf Sekunden keine gedrückt wird,\n"
-"schließt sich dieses Fenster ohne Änderungen der Bindings vorzunehmen."
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-"Diese Eingabe wurde schon zugewiesen.\n"
-"\n"
-"Es ist nicht möglich, mehrere Aktionen auf die selbe Eingabe zuzuweisen "
-"(obwohl es möglich ist, die selbe Aktion auf verschiedene Eingaben "
-"zuzuweisen)."
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Plug - Bindungskonfiguration"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "Name: "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Dateiname: "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Phys. Adresse: "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "Über EvDev-Plug"
-
-#: src/evdev-plug/ed_ui.c:1491
-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 ""
-
-#: src/ffaudio/ffaudio-core.c:765
+#: 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"
 "Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "Über FFaudio Plugin"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "Über FileWriter-Plugin"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2032,51 +1037,51 @@
 "USA."
 msgstr ""
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "FileWriter-Konfiguration"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Ausgabedatei-Format:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "In Original-Verzeichnis speichern"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "In anderes Verzeichnis speichern"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Ausgabedatei-Verzeichnis:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Verzeichnis wählen"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Dateiname erhalten von:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "ursprünglichen Datei-Tags"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "ursprünglichen Dateinamen"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Dateiendung nicht entfernen"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "Titelnummer vor Dateinamen anhängen"
 
@@ -2088,6 +1093,14 @@
 msgid "Joint Stereo"
 msgstr "Joint-Stereo"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Mono"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "MP3-Konfiguration"
@@ -2133,7 +1146,6 @@
 msgstr "Fehlerschutz"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Qualität"
 
@@ -2241,11 +1253,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "Über das Gnome-Shortcut-Plugin"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2259,58 +1271,22 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr "Dateien öffnen"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 msgid "Add Files"
 msgstr "Dateien hinzufügen"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 msgid "Audacious2"
 msgstr "Audacious2"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr "GNT Interface"
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr "Kann nicht zu Zeitangabe springen, wenn kein Titel gespielt wird.\n"
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr "Zu Zeitangabe springen"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr "Minuten:Sekunden"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr "Titellänge:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr "Fehler beim Schreiben der Liste \"%s\": %s"
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-msgid "Export Playlist"
-msgstr "Wiedergabeliste exportieren"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-msgid "Import Playlist"
-msgstr "Wiedergabeliste importieren"
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Titelnummer"
@@ -2395,416 +1371,291 @@
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr "GTK Interface"
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr "Nach aktuellem Titel stoppen"
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr "Wiederholen"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr "Zufällige Wiedergabe"
-
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr "Wiedergabeliste nicht weiterspielen"
-
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr "Infobereich anzeigen"
-
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr "Infobereich anzeigen/verstecken"
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr "Hauptfenster anzeigen"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr "Hauptfenster anzeigen/verstecken"
-
-#: src/gtkui/ui_manager.c:55
-msgid "Show statusbar"
-msgstr "Statusleiste anzeigen"
-
-#: src/gtkui/ui_manager.c:56
-msgid "Show/hide statusbar"
-msgstr "Statusleiste anzeigen/verstecken"
-
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
-msgstr "Spaltenüberschriften anzeigen"
-
-#: src/gtkui/ui_manager.c:60
-msgid "Scroll on Song Change"
-msgstr "Mit Songwechsel scrollen"
-
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
-msgstr "Pause"
-
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
-msgstr "Stopp"
-
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
-msgstr "Vorheriger"
-
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
-msgstr "Nächster"
-
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "Wiedergabeliste"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "Neue Wiedergabeliste"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "Wiedergabeliste löschen"
+#: src/gtkui/menus.c:132
+msgid "_Open Files ..."
+msgstr "_Dateien öffnen ..."
+
+#: src/gtkui/menus.c:133
+msgid "Open _URL ..."
+msgstr "_URL öffnen ..."
+
+#: src/gtkui/menus.c:134
+msgid "_Add File ..."
+msgstr "Dateien _hinzufügen ..."
+
+#: src/gtkui/menus.c:135
+msgid "Add U_RL ..."
+msgstr "U_RL hinzufügen ..."
+
+#: src/gtkui/menus.c:137
+msgid "A_bout ..."
+msgstr "_Info ..."
+
+#: src/gtkui/menus.c:138
+msgid "_Preferences ..."
+msgstr "_Einstellungen ..."
 
-#: src/gtkui/ui_manager.c:95
-msgid "Import Playlist ..."
-msgstr "Wiedergabeliste importieren ..."
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
+msgstr "_Beenden"
 
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr "Lade Wiedergabeliste in ausgewählte Wiedergabeliste."
+#: src/gtkui/menus.c:142
+msgid "_Play"
+msgstr "_Wiedergeben"
 
-#: src/gtkui/ui_manager.c:98
-msgid "Export Playlist ..."
-msgstr "Wiedergabeliste exportieren ..."
+#: src/gtkui/menus.c:143
+msgid "Paus_e"
+msgstr "_Pause"
 
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "Ausgewählte Wiedergabelisten speichern."
+#: src/gtkui/menus.c:144
+msgid "_Stop"
+msgstr "_Stopp"
 
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-msgid "Save All Playlists"
-msgstr "Alle Wiedergabelisten speichern"
+#: src/gtkui/menus.c:145
+msgid "Pre_vious"
+msgstr "_Vorheriger"
 
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-"Alle geöffneten Playlisten speichern. Dies geschieht automatisch beim "
-"Beenden von Audacious."
+#: src/gtkui/menus.c:146
+msgid "_Next"
+msgstr "_Nächster"
 
-#: src/gtkui/ui_manager.c:106
-msgid "Refresh"
-msgstr "Aktualisieren"
+#: src/gtkui/menus.c:148
+msgid "_Repeat"
+msgstr "Wieder_holen"
 
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Metadaten aktualisieren."
+#: src/gtkui/menus.c:149
+msgid "S_huffle"
+msgstr "_Zufällige Wiedergabe"
 
-#: src/gtkui/ui_manager.c:110
-msgid "Refresh Selected"
-msgstr "Ausgewählte aktualisieren"
-
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
-msgstr "Metadaten mit dazugehörigen Einträgen aktualisieren."
-
-#: src/gtkui/ui_manager.c:115
-msgid "Playlist Manager"
-msgstr "Wiedergabelisten-Manager"
+#: src/gtkui/menus.c:150
+msgid "N_o Playlist Advance"
+msgstr "Wiedergabeliste ni_cht weiterspielen"
 
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr "Öffne Wiedergabelisten-Manager."
+#: src/gtkui/menus.c:151
+msgid "Stop _After This Song"
+msgstr "N_ach Titel stoppen"
 
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr "URL hinzufügen ..."
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
+msgstr "Titel-_Info ..."
 
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr "Entfernter Titel hinzufügen."
+#: src/gtkui/menus.c:154
+msgid "Jump to _Time ..."
+msgstr "Zu Zeitangabe springen ..."
 
-#: src/gtkui/ui_manager.c:123
-msgid "Add Files ..."
-msgstr "Dateien hinzufügen ..."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
+msgstr "Zu _Titel sp_ringen ..."
 
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr "Fügt Dateien in Wiedergabeliste ein."
+#: src/gtkui/menus.c:158
+msgid "By Track _Number"
+msgstr "Nach Titel_nummer"
 
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr "Alle entfernen"
+#: src/gtkui/menus.c:159
+msgid "By _Title"
+msgstr "Nach _Titel"
 
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr "Entfernt alle Warteschlangeneinträge."
+#: src/gtkui/menus.c:160
+msgid "By _Artist"
+msgstr "Nach _Künstler"
 
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr "Nicht ausgewählte entfernen"
+#: src/gtkui/menus.c:161
+msgid "By A_lbum"
+msgstr "Nach _Album"
 
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr "Entferne nicht ausgewählte Titel."
+#: src/gtkui/menus.c:162
+msgid "By Release _Date"
+msgstr "Nach _Erscheinungsdatum"
 
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr "Auswahl entfernen"
+#: src/gtkui/menus.c:163
+msgid "By _File Path"
+msgstr "Nach _Dateipfad"
 
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr "Ausgewählte Wiedergabelisteneinträge entfernen."
+#: src/gtkui/menus.c:164
+msgid "By _Custom Title"
+msgstr "Nach benutzerdefiniertem Titel"
 
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
-msgstr "Titel bearbeiten"
-
-#: src/gtkui/ui_manager.c:140
-msgid "Edit the playlist title."
-msgstr "Titel der Wiedergabeliste bearbeiten."
-
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
-msgstr "Spalten auswählen ..."
-
-#: src/gtkui/ui_manager.c:146
-msgid "Sort"
-msgstr "Sortieren"
+#: src/gtkui/menus.c:166
+msgid "R_everse Order"
+msgstr "V_ertausche Anordnung"
 
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
-msgstr "Nach Titelnummer"
+#: src/gtkui/menus.c:167
+msgid "_Random Order"
+msgstr "Zufällige Ano_rdnung"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
-msgstr "Nach Titel"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
+msgstr "_Aktualisieren"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
-msgstr "Nach Künstler"
+#: src/gtkui/menus.c:172
+msgid "_Sort"
+msgstr "_Sortieren"
+
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr "_Neu"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
-msgid "By Album"
-msgstr "Nach Album"
+#: src/gtkui/menus.c:175
+msgid "_Close"
+msgstr "S_chließen"
 
-#: src/gtkui/ui_manager.c:155
-msgid "By Release Date"
-msgstr "Nach Erscheinungsdatum"
-
-#: src/gtkui/ui_manager.c:157
-msgid "By File Path"
-msgstr "Nach Dateipfad"
-
-#: src/gtkui/ui_manager.c:159
-msgid "By Formatted Title"
-msgstr "Nach formatiertem Titel"
-
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
-msgstr "Vertausche Anordnung"
-
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
-msgstr "Zufällige Anordnung"
-
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr "Ausgabe"
-
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "Effekte"
-
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
-msgstr "Equalizer"
+#: src/gtkui/menus.c:177
+msgid "_Import ..."
+msgstr "_Importieren ..."
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "Ansicht"
+#: src/gtkui/menus.c:178
+msgid "_Export ..."
+msgstr "_Exportieren ..."
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
-msgstr "Interface"
+#: src/gtkui/menus.c:180
+msgid "_Playlist Manager ..."
+msgstr "Wiedergabelisten-Manager ..."
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "Datei"
+#: src/gtkui/menus.c:183
+msgid "Volume _Up"
+msgstr "Lautstärke er_höhen"
 
-#: src/gtkui/ui_manager.c:188
-msgid "Components"
-msgstr "Komponenten"
+#: src/gtkui/menus.c:184
+msgid "Volume _Down"
+msgstr "Lautstärke _verringern"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr "Zeige Titeldetails"
+#: src/gtkui/menus.c:186
+msgid "_Equalizer"
+msgstr "_Equalizer"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr "Zeige Titeldetails"
+#: src/gtkui/menus.c:188
+msgid "E_ffects"
+msgstr "E_ffekte"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "Über Audacious"
+#: src/gtkui/menus.c:191
+msgid "_Interface"
+msgstr "_Interface"
 
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
-msgstr "Dateien öffnen ..."
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
+msgstr "_Menüleiste anzeigen"
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
-msgstr "Datei laden und abspielen"
+#: src/gtkui/menus.c:194
+msgid "Show I_nfo Bar"
+msgstr "I_nfobereich anzeigen"
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
-msgstr "URL öffnen ..."
+#: src/gtkui/menus.c:195
+msgid "Show _Status Bar"
+msgstr "_Statusleiste anzeigen"
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr "Medien von bestimmter Adresse abspielen"
+#: src/gtkui/menus.c:197
+msgid "Show Column _Headers"
+msgstr "Spaltenüberschriften _anzeigen"
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "Plugin-Dienste"
+#: src/gtkui/menus.c:198
+msgid "Choose _Columns ..."
+msgstr "Spalten aus_wählen ..."
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "Einstellungen"
+#: src/gtkui/menus.c:199
+msgid "Scrol_l on Song Change"
+msgstr "Mit Titelwechsel scrol_len"
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr "Einstellungen anzeigen"
+#: src/gtkui/menus.c:202
+msgid "_File"
+msgstr "_Datei"
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
-msgstr "Beenden"
+#: src/gtkui/menus.c:203
+msgid "_Playback"
+msgstr "_Wiedergabe"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "Audacious beenden"
+#: src/gtkui/menus.c:204
+msgid "P_laylist"
+msgstr "W_iedergabeliste"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr "A-B setzen"
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+msgid "_Services"
+msgstr "Di_enste"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr "A-B leeren"
+#: src/gtkui/menus.c:206
+msgid "_Output"
+msgstr "_Ausgabe"
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr "Zum Anfang der Liste springen"
+#: src/gtkui/menus.c:207
+msgid "_View"
+msgstr "An_sicht"
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
-msgstr "Zu Datei springen"
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
+msgstr "In/Aus _Warteschlange"
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr "In/Aus Warteschlange"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
+msgstr "Aus_schneiden"
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Eintrag in der Wiedergabewarteschleife aktivieren/deaktivieren."
+#: src/gtkui/menus.c:215
+msgid "_Copy"
+msgstr "_Kopieren"
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
-msgstr "Kopieren"
+#: src/gtkui/menus.c:216
+msgid "_Paste"
+msgstr "_Einfügen"
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-msgid "Cut"
-msgstr "Ausschneiden"
+#: src/gtkui/menus.c:217
+msgid "Select _All"
+msgstr "_Alles auswählen"
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
-msgstr "Einfügen"
+#: src/gtkui/menus.c:222
+msgid "_Rename"
+msgstr "_Umbenennen"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
-msgstr "Alles auswählen"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
+msgstr "GTK Interface"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr "Wähle alle Einträge aus."
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr "Nichts auswählen"
+#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+msgid "Audacious"
+msgstr "Audacious"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr "Alle ausgewählten Einträge abwählen."
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Fehler"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "Mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "Stereo"
 
-#: src/gtkui/ui_statusbar.c:104
-#, fuzzy, c-format
+#: src/gtkui/ui_statusbar.c:106
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] "%d Kanäle"
+msgstr[0] "%d Kanal"
 msgstr[1] "%d Kanäle"
 
-#: src/gtkui/ui_statusbar.c:119
-#, fuzzy, c-format
+#: src/gtkui/ui_statusbar.c:121
+#, c-format
 msgid "%d kbps"
-msgstr "kbps"
+msgstr "%d kbps"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
 msgstr "Vorheriger Titel"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Wiedergeben"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr "Pause"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Stopp"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr "Nächster Titel"
@@ -2829,6 +1680,10 @@
 msgid "Volume Down"
 msgstr "Lautstärke verringern"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr "Zu Datei springen"
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr "Player anzeigen/verstecken"
@@ -2837,11 +1692,19 @@
 msgid "Show On-Screen-Display"
 msgstr "On-Screen-Display anzeigen"
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+msgid "Toggle Repeat"
+msgstr "Wiederholen ein-/ausschalten"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle Shuffle"
+msgstr "Zufällige Wiedergabe ein-/ausschalten"
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(keine)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2852,15 +1715,15 @@
 "\n"
 "Trotzdem fortfahren?"
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr "Maustastenkombinationen"
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Global-Hotkey-Konfiguration"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2868,23 +1731,23 @@
 "Bitte eine Tastenkombination innerhalb eines Textfelds drücken.\n"
 "Es ist auch möglich, Maustasten zu verwenden."
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr "Tastaturkürzel:"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr "Aktion:"
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr "Taste festlegen:"
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr "Über das Global-Hotkeys-Plugin"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -2952,128 +1815,23 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "Über JACK Output Plugin 0.17"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr "Dieses LADSPA-Plugin hat keine Benutzeroberfläche"
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "Name"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "Installierte Plugins"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "Aktive Plugins"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "Entfernen"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "LADSPA-Plugin-Liste"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "Über LIRC-Audacious-Plugin"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "LIRC-Plugin "
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 msgid ""
 "\n"
-"A simple plugin that lets you control\n"
-"Audacious using the LIRC remote control daemon\n"
+"Looking for lyrics..."
+msgstr ""
 "\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"
-"Ein einfaches Plugin, das Audacious mithilfe des\n"
-"LIRC-Daemons kontrollieren lässt\n"
-"\n"
-"Für Audacious angepasst von Tony Vroon <chainsaw@gentoo.org>\n"
-"vom XMMS-LIRC-Plugin von:\n"
-"Carl van Schaik <carl@leg.uct.ac.za>\n"
-"Christoph Bartelmus <xmms@bartelmus.de>\n"
-"Informationen zu LIRC sind verfügbar unter:\n"
-"http://lirc.org"
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr "LIRC-Plugin-Einstellungen"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr "Zu LIRC Server wiederverbinden"
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr "Zeitüberschreitung vor Wiederverbindung (Sekunden): "
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr "Wiederverbinden"
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr "Verbindung"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: Konnte LIRC-Unterstützung nicht initialisieren\n"
+"Suche nach Liedtexten..."
 
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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: Konnte LIRC Konfigurationsdatei nicht lesen\n"
-"%s: Bitte in der Dokumentation von LIRC lesen\n"
-"%s: wie man eine funktionierende erstellt\n"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr "%s: versuche wiederzuverbinden...\n"
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: Ungültiger Befehl \"%s\"\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: von LIRC Verbindung trennen\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
-msgstr "%s: versuche jede %d Sekunden wiederzuverbinden...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr ""
+"\n"
+"Verbinde zu lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
@@ -3081,11 +1839,11 @@
 "\n"
 "Keine Liedtexte gefunden."
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "Über Metronom"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3099,250 +1857,41 @@
 "z.B. tact://77 zum Spielen von 77 Schlägen pro Minute\n"
 "oder tact://60*3/4 zum Spielen von 60 bpm im 3/4-Takt"
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takt-Generator: %d bpm"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takt-Generator: %d bpm %d/%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "ModPlug-Konfiguration"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 bit"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 bit"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr "Mono (Downmix)"
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr "Am nächsten (schnellstes)"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "Linear (schnell)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr "Spline (gute Qualität)"
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr "8-tap Fir (extrem hohe Qualität)"
-
-#: src/modplug/gui/interface.cxx:286
-msgid "96 kHz"
-msgstr "96 kHz "
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Abtastfrequenz"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "Aktiv"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "Tiefe"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "Verzögerung"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "Hall"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "Menge"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "Bereich"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "Bassverstärkung"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-"Bemerkung: Eine zu hohe Vorverstärkung kann\n"
-"Clipping verursachen (störende Geräusche)!"
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "Vorverstärkung"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "Dateinamen als Liedtitel verwenden"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "Schnelle Wiedergabeliste-Information"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "Geräuschreduktion"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Amiga MOD abspielen"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "Nicht loopen"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "Loope"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "Mal"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "Für immer loopen"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "Loopen"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "MOD-Information"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-"Dateiname:\n"
-"Titel:\n"
-"Typ:\n"
-"Länge:\n"
-"Geschwindigkeit:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instrumente:\n"
-"Patterns:\n"
-"Kanäle:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "Samples"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "Instrumente"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "Meldung"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Modplug-Input-Plugin für Audacious Version"
-
-#: src/modplug/gui/main.cxx:52
-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 geschrieben von Olivier Lapicque.\n"
-"XMMS interface für Modplug von Kenton Varda.\n"
-"(c)2000 Olivier Lapicque und Kenton Varda.\n"
-"Updates und Betreunung von Konstanty Bialkowski.\n"
-"Portiert für BMP von Theofilos Intzoglou."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "Über Modplug"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: 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/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr "Ausgewählte(n) Titel uploaden"
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr "Upload läuft..."
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr "MTP Geräte-Steuerung"
-
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
-msgstr "Gerät trennen"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
+msgstr "Auf MTP Gerät hochladen"
+
+#: src/mtp_up/mtp.c:311
+msgid "Disconnect MTP Device"
+msgstr "MTP Gerät trennen"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "Stopp"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Fügt Dateien in Wiedergabeliste ein."
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -3392,11 +1941,11 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr "Formatkonvertierung aktivieren"
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "Über OSS4-Plugin"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
@@ -3427,6 +1976,11 @@
 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
 msgid "OSS Driver configuration"
 msgstr "OSS-Treiber-Konfiguration"
@@ -3483,11 +2037,11 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:690
+#: 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:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3527,27 +2081,27 @@
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Dienste"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 msgid "Scrobbler URL:"
 msgstr "Scrobbler-URL:"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3555,23 +2109,27 @@
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
 "Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
 "com>\n"
 msgstr ""
+"Audacious AudioScrobbler Plugin\n"
+"\n"
+"Ursprünglich geschrieben von Audun Hove <audun@nlc.no> und Pipian "
+"<pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "Über Scrobbler-Plugin"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 msgid "About SDL Output Plugin"
 msgstr "Über SDL Output Plugin"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 msgid "SDL error"
 msgstr "SDL Fehler"
 
@@ -3580,10 +2138,18 @@
 msgid "About %s"
 msgstr "Über %s"
 
-#: src/sid/xs_config.c:323
+#: 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"
@@ -3591,7 +2157,12 @@
 #: src/sid/xs_fileinfo.c:164
 #, c-format
 msgid "Tune #%i: "
-msgstr ""
+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"
@@ -3695,6 +2266,9 @@
 "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"
@@ -3766,7 +2340,7 @@
 
 #: src/sid/xs_interface.c:588
 msgid "Emu#1"
-msgstr ""
+msgstr "Emu#1"
 
 #: src/sid/xs_interface.c:611
 msgid "Optimization mode (faster, inaccurate)"
@@ -3879,15 +2453,15 @@
 msgid "Use"
 msgstr "Nutzen"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: 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:435
+#: 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:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Löschen"
 
@@ -3920,6 +2494,11 @@
 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:"
@@ -4171,699 +2750,819 @@
 msgid "No"
 msgstr "Nein"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "Über Skinned GUI"
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 msgstr ""
+"Copyright (c) 2008, von Tomasz Moń <desowin@gmail.com>\n"
+"\n"
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr "Oberfläche"
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr "Hauptfenster:"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr "Hauptfenster-Schrift auswählen:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "Wiedergabeliste:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr "Playlist-Schrift auswählen:"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr "Schriftarten"
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr "Bitmap-Schriften verwenden, falls verfügbar"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
-msgstr ""
-"Bitmap-Schriften verwenden, falls verfügbar (keine Unicode-Strings "
-"Unterstützung)"
-
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr "Verschiedenes"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr "Trennstriche in Wiedergabeliste anzeigen"
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Benutze Bitmap-Schriftarten (nur ASCII-Unterstützung)"
+
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
+msgstr "Titel in beide Richtungen scrollen"
 
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr "Fenstermanager-Dekorationen anzeigen"
-
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
-msgstr "Dies aktiviert die Anzeige der Fenstermanager-Dekorationen."
-
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr "Text hin und her scrollen"
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "_Skin"
 
-#: src/skins/skins_cfg.c:330
-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 ""
-"Wenn ausgewählt, bewegt sich der Text der Dateiinformation abwechselnd von "
-"Links nach Rechts. Ansonsten bewegt er sich nur in eine Richtung."
+#: src/skins/skins_cfg.c:393
+msgid "Interface Preferences"
+msgstr "Interface-Einstellungen"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr "Schalte Inline-GTK-Theme aus"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Vorverstärkung"
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
-msgstr "Zufälliger Skin beim Abspielen"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
-msgstr "Erlaube Laden unvollständiger Skins"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Hz"
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
-msgstr ""
-"Wenn aktiviert, lädt Audacious auch Skins, die nicht vollständig sind. Nur "
-"wenn nötig aktivieren."
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Hz"
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "Farbkorrektur"
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Hz"
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
-"Farbverläufe der Benutzeroberfläche sind durch die Schieberegler unten "
-"anpassbar:"
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Hz"
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "Blau"
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 kHz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "Rot"
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "Grün"
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 kHz"
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "_Skin"
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 kHz"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr "Farbkorrektur ..."
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Audacious Equalizer"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr "Standard"
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "Surround"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious - Visibility-Warnung"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "Hauptfenster anzeigen"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "Ignoriere"
-
-#: src/skins/ui_main.c:993
-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 wurde mit allen Fenstern versteckt gestartet.\n"
-"Das Hauptfenster zum Steuern von Audacious sollte aktiviert sein, ansonsten "
-"muss Audacious via audtool oder aktivierten Plugins ferngesteuert werden."
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr "Immer ignorieren, anzeigen/verstecken wird ferngesteuert"
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious - Warnung: defekte GTK-Engine"
-
-#: src/skins/ui_main.c:1052
+#: src/skins/ui_main.c:807
 #, c-format
-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>Defekte GTK-Engine in Benutzung</big>\n"
-"\n"
-"Audacious hat festgestellt, dass Sie eine defekte GTK-Engine benutzen.\n"
-"\n"
-"Die Theme-Engine %s, welche Sie benutzen, ist mit manchen Features, "
-"die moderne Skins nutzen, inkompatibel.Die inkompatiblen Features wurden für "
-"diese Session deaktiviert.\n"
-"\n"
-"Um diese nutzen zu können, sollten Sie erwägen, eine andere GTK-Engine zu "
-"nutzen."
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr "Diese Warnung nicht mehr anzeigen"
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-msgstr "Suche nach: %d:%-2.2d/%d:%-2.2d (%d%%)"
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Suche nach %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Lautstärke: (%d%%)"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% links"
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balance: Mitte"
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% rechts"
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Optionen"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "'Immer im Vordergrund' aus"
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "'Immer im Vordergrund' an"
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Dateiinformationen"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "'GUI-Skalierung' aus"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "'GUI-Skalierung' an"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Visualisierungs-Menü"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr "Single-Modus."
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 msgid "Playlist mode."
 msgstr "Wiedergabelistenmodus"
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr "Nach Titel stoppen."
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr "Nicht nach Titel stoppen."
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr "Autoscrollen des Titelnamens"
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Nach aktuellem Titel stoppen"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
 msgstr "Spitzen"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Wiederholen"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Zufällige Wiedergabe"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "Wiedergabeliste nicht weiterspielen"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr "Hauptfenster anzeigen"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr "Wiedergabelisten-Editor anzeigen"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr "Equalizer anzeigen"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr "Immer im Vordergrund"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr "Auf allen Arbeitsflächen"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr "Player aufrollen"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr "Wiedergabelisten-Editor aufrollen"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr "Equalizer aufrollen"
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "Skalierung"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr "Doppelte Größe"
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr "Leichtes Bewegen"
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr "Analyzer"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr "Scope"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr "Voiceprint"
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "Aus"
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr "Feuer"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr "Vertikale Linien"
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr "Linien"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr "Balken"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr "Punkte"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr "Linien"
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr "Beständig"
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr "Eis"
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr "Weich"
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "Am langsamsten"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "Langsam"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "Schnell"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "Am schnellsten"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr "Verstrichene Zeit"
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr "Verbleibende Zeit"
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "Pause"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "Vorheriger"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "Nächster"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "Visualisierung"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr "Visualisierungs-Modus"
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr "Analyzer-Modus"
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr "Scope-Modus"
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr "Voiceprint-Modus"
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr "WindowShadeVU-Modus"
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr "Analyzer-Fallgeschwindigkeit"
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr "Spitzen-Fallgeschwindigkeit"
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Wiedergabeliste"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Neue Wiedergabeliste"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr "Nächste Wiedergabeliste wählen"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr "Vorherige Wiedergabeliste wählen"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Wiedergabeliste löschen"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "Wiedergabeliste importieren"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Lade Wiedergabeliste in ausgewählte Wiedergabeliste."
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "Wiedergabeliste exportieren"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr "Ausgewählte Wiedergabelisten speichern."
+
+#: src/skins/ui_manager.c:229
+msgid "Save All Playlists"
+msgstr "Alle Wiedergabelisten speichern"
+
+#: src/skins/ui_manager.c:230
+msgid ""
+"Saves all the playlists that are open. Note that this is done automatically "
+"when Audacious quits."
+msgstr ""
+"Alle geöffneten Playlisten speichern. Dies geschieht automatisch beim "
+"Beenden von Audacious."
+
+#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr "Liste aktualisieren"
 
-#: src/skins/ui_manager.c:228
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Metadaten aktualisieren."
+
+#: src/skins/ui_manager.c:238
 msgid "List Manager"
 msgstr "Listenmanager"
 
-#: src/skins/ui_manager.c:238
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr "Öffne Wiedergabelisten-Manager."
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Ansicht"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "Interface"
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr "Interface-Einstellungen ..."
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr "Internetadresse hinzufügen..."
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr "Entfernter Titel hinzufügen."
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr "Dateien hinzufügen..."
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr "Fügt Dateien in Wiedergabeliste ein."
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr "Suchen und Auswählen"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "Wiedergabeliste auf bestimmte Suchkriterien durchsuchen lassen"
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr "Auswahl invertieren"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr "Invertiere alle Einträge."
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "Alle auswählen"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
+msgstr "Wähle alle Einträge aus."
+
+#: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr "Keine auswählen"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr "Alle ausgewählten Einträge abwählen."
+
+#: src/skins/ui_manager.c:277
+msgid "Remove All"
+msgstr "Alle entfernen"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr "Entfernt alle Warteschlangeneinträge."
+
+#: src/skins/ui_manager.c:281
 msgid "Clear Queue"
 msgstr "Warteschlange löschen"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr "Zugehörige Warteschlange der Wiedergabeliste entfernen."
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "Nicht verfügbare Dateien entfernen"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr "Enfernt alle nicht verfügbaren Dateien aus der Liste."
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "Duplikate entfernen"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "Nach Titel"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Duplikate nach Titel entfernen."
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "Nach Dateinamen"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Duplikate nach Dateinamen entfernen."
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "Nach Pfad + Dateinamen"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Duplikate nach vollem Pfad entfernen."
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr "Nicht ausgewählte entfernen"
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr "Entferne nicht ausgewählte Titel."
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr "Auswahl entfernen"
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr "Ausgewählte Wiedergabelisteneinträge entfernen."
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr "Liste zufällig anordnen"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr "Ordne Liste zufällig an."
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr "Liste umkehren"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr "Wiedergabeliste umkehren."
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "Liste sortieren"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr "Sortiere nach Titel."
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+msgid "By Album"
+msgstr "Nach Album"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr "Sortiere nach Album."
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "Nach Künstler"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr "Sortiere nach Künstler."
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr "Sortiere nach Dateiname."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr "Sortiere Liste nach Pfadnamen."
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "Nach Datum"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr "Sortiere die Liste nach Modifizierungszeitpunkt."
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr "Nach Titelnummer"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr "Sortiere die Liste nach Titelnummer."
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr "Ausgewählte Sortieren"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "Datei"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Hilfe"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr "Plugin-Dienste"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr "Zeige Titeldetails"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr "Zeige Titeldetails"
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "Über Audacious"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "Datei abspielen"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr "Datei laden und abspielen"
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "Internetadresse spielen"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr "Medien von bestimmter Adresse abspielen"
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "Plugin-Dienste"
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr "Einstellungen anzeigen"
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "Audacious beenden"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr "A-B setzen"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr "A-B leeren"
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr "Zum Anfang der Liste springen"
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr "Zu Zeitangabe springen"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr "In/Aus Warteschlange"
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Eintrag in der Wiedergabewarteschleife aktivieren/deaktivieren."
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr "Kopieren"
+
+#: src/skins/ui_manager.c:436
+msgid "Cut"
+msgstr "Ausschneiden"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Einfügen"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Laden"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Voreinstellung"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Voreinstellungen laden"
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Voreinstellungen automatisch laden"
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Voreinstellungen laden"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Standardwerte in Equalizer laden"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Null"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Equalizer Einstellungen auf Null setzen"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Aus Datei"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Standardwerte aus Datei laden"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Aus einer WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Lade Standard aus WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP Standard"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importiere WinAMP Standard"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Speichere"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Speichere"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Standardwerte speichern"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "in Datei"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Speichere in Datei"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "in WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Speichere in WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Lösche Voreinstellungen"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Lösche Voreinstellungen"
 
-#: src/skins/ui_playlist.c:374
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Suche Einträge in aktiver Playliste"
 
-#: src/skins/ui_playlist.c:382
+#: 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 "
@@ -4876,104 +3575,52 @@
 "Ausdrücke funktionieren, geben Sie einfach nur einen Teilbegriff für Ihre "
 "Suche ein."
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Titel: "
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Künstler: "
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Dateiname: "
 
-#: src/skins/ui_playlist.c:419
+#: 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:422
+#: 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:425
+#: 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:776
-msgid "Save as Static Playlist"
-msgstr "Als statische Wiedergabeliste speichern"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr "Relativen Pfad verwenden"
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "Wiedergabenliste laden"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "Wiedergabeliste speichern"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious Wiedergabelisten-Editor"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d von %d)"
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr "Archivierter Winamp 2.x-Skin"
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Nichtarchivierter Winamp 2.x-Skin"
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Konnte Ordner nicht erstellen (%s): %s\n"
@@ -5024,55 +3671,63 @@
 "51 Franklin Street, Fifth Floor, \n"
 "Boston, MA 02110-1301 USA"
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "Über SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr "Lautstärkekorrektur"
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "Kurzes Überlappen"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "Tonhöhe"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "Skalierung"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Optionen"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - Konfiguration"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 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:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "Befehl:"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr "Auszuführender Befehl am Ende eines Lieds."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 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:475
+#: src/song_change/song_change.c:476
 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:479
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -5107,7 +3762,7 @@
 "%b: Album\n"
 "%T: Titelname"
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5115,18 +3770,14 @@
 "Parameter sollten zwischen Anführungszeichen stehen, ohne "
 "besteht ein Sicherheitsrisiko."
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "Befehle"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 msgid "Song Change"
 msgstr "Songwechsel"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "Analyzer-Spektrum"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "Über Status-Icon-Plugin"
@@ -5199,60 +3850,19 @@
 "\n"
 "Von Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "Über das Extra Stereo Plugin"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "Extra Stereo konfigurieren"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-msgid "Search:"
-msgstr "Suchen:"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr "Lesezeichen setzen"
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-msgid "Stream name"
-msgstr "Streamname"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr "Aktueller Song"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-msgid "Remove Bookmark"
-msgstr "Lesezeichen entfernen"
-
-#: src/streambrowser/streambrowser.c:340
-msgid "About Stream Browser"
-msgstr "Über Streambrowser"
-
-#: src/streambrowser/streambrowser.c:341
-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:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "Über Ton-Generator"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5267,19 +3877,18 @@
 "frequency3;...\n"
 "z.B. tone://2000;2005 für einen Ton mit 2000Hz und einen mit 2005Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "Ton-Generator: "
 
 #: src/unix-io/gtk.c:34
-#, fuzzy
 msgid "About File I/O Plugin"
-msgstr "Über OSS4-Plugin"
+msgstr "Über File I/O Plugin"
 
 #: src/vorbis/configure.c:31
 msgid "Override generic titles"
@@ -5293,15 +3902,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Ogg-Vorbis-Tags"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ogg-Vorbis-Audio-Plugin-Konfiguration"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Über Ogg-Vorbis-Audio-Plugin"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5376,6 +3985,3 @@
 "\n"
 "Ein Teil des Plugin-Codes war von Miles Egan\n"
 "Die Wavpack-Seite befindet sich auf http://www.wavpack.com/\n"
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s existiert schon. Trotzdem fortfahren?"

audacious-plugins-2.5.3.tar.gz/po/es.po -> audacious-plugins-3.0.tar.gz/po/es.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Audacious\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-05-19 10:53-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Jorge Andrés <winninglero@gmail.com>\n"
 "Language-Team: \n"
@@ -20,7 +20,7 @@
 "X-Poedit-Country: SPAIN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -31,542 +31,47 @@
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decodificador (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "Acerca del complemento decodificador MP4 AAC"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "Acerca de"
-
-#: src/adplug/adplug-xmms.cc:155
-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: "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: Configuración"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "Ok"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "General"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Calidad de sonido"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Resolución"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8bit"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16bit"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Canales"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Estereo"
-
-#: src/adplug/adplug-xmms.cc:310
-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."
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Frecuencia"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Reproducción"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Detectar canción final"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Formatos"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Selección de formatos"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Formato"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Extensión"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: Información del archivo"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Nombre de archivo"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Título: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Autor:"
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Tipo de archivo: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "Subcanciones:"
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Instrumentos: "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "Órdenes:"
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Patrones: "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Canción"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Nombre del instrumento"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Mensaje de canción"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "Selección de subcanción"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Orden:"
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Patrón:"
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Fila:"
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Velocidad:"
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Temporizador:"
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "Acerca de Alarma XMMS"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "Alarma XMMS"
-
-#: src/alarm/interface.c:56
-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/"
-
-#: src/alarm/interface.c:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Cerrar"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Alarma"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "Este es su llamada para despertar."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Seleccione Lista de Reproducción"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Lo siento"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Advertencia"
-
-#: src/alarm/interface.c:213
-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:229
-msgid "Oh Well"
-msgstr "Oh Bien"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Opciones de la alarma"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Tiempo"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "minutos"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Silencio después de:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Alarma a las (predeterminado):"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Escoge los días para iniciarse la alarma"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Predeterminado"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Día"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Martes"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Miércoles"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Jueves"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Viernes"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Sábado"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Domingo"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Lunes"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Días"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Desvanecimiento"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "segundos"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Volumen"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Actual"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "reiniciar a volumen de salida actual"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Iniciar a las"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Final"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Comandos Adicionales"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "habilitar"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Lista de reproducción (opcional)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Examinar..."
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Usar recordatorio"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Opciones"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "¿Que significan estas opciones?"
-
-#: src/alarm/interface.c:1364
-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:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Ayuda"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "Su recordatorio para hoy es..."
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Gracias"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Dispositivo PCM predeterminado"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 msgid "Default mixer device"
 msgstr "Dispositivo mezclador predeterminado"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 msgid "ALSA Output Plugin Preferences"
 msgstr "Preferencias de complemento de salida ALSA"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 msgid "PCM device:"
 msgstr "Dispositivo PCM:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Dispositivo mexclador"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 msgid "Mixer element:"
 msgstr "Elemento mezclador:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr "Trabajar por la fuga de colgado"
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
 msgstr "Acerca del complemento de salida ALSA"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr "Error de ALSA"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -720,6 +225,10 @@
 msgid "SoundFont settings"
 msgstr "preferencias SoundFont"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Nombre de archivo"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
@@ -826,8 +335,7 @@
 "Motor\n"
 "TiMidity"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -1000,119 +508,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Disparador OSD cuando lista de reproducción es des-pausada."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Colocación"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "Desplazamiento X relativo:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Desplazamiento Y relativo:"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "Máximo ancho OSD:"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Opciones Multi-Monitor"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "Mostrar OSD usando:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "todos los monitores"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Temporización (ms)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "Desvanecimiento de entrada:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "Desvanecimiento de salida:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Fuentes"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "Fuente %i:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Internacionalización"
 
-#: src/aosd/aosd_ui.c:457
+#: 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)"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "Seleccione archivo de piel"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Estilo de renderizado"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Colores"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "Color %i:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "Piel personalizada"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "Archivo de piel:"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "Examinar"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Habilitar disparador"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Evento"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "Administrador composite detectado"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1122,73 +630,73 @@
 "a menos que sepa que tiene uno ejecutándose, por favor active un "
 "administrador composite de otra modo el OSD no trabajará apropiadamente"
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "Administrador composite no requerido para transparencia falsa"
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Transparencia falsa"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparencia real (requiere extensión Composite X)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "Extensión composite no cargada"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "Extensión composite no disponible"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "OSD de Audacious"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - configuración"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Probar"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Posición"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Animación"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Decoración"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Disparador"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Misc"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "Audacious OSD - acerca de"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1196,7 +704,7 @@
 "\n"
 "Audacious OSD "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1218,134 +726,6 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr "Solicitud de emparejamiento para '%s'"
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr "Autorización requerida para %s"
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr "Crear vinculación con %s"
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr "Quitar vinculación con %s"
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr "Dispositivo ha sido apagado"
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr "Dispositivo ha sido hecho con capacidad no-detectable"
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr "Dispositivo ha sido hecho con capacidad conectable"
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr "Dispositivo ha sido hecho con capacidad detectable"
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr "Dispositivo ha sido hecho con capacidad limitada de detectabilidad"
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr "Dispositivo ha sido cambiado en modo de emparejamiento"
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr "Soporte de complementeno de auriculares Bluetooth"
-
-#: src/bluetooth/bluetooth.c:118
-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"
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr "Productor"
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr "Auriculares disponibles"
-
-#: src/bluetooth/gui.c:224
-msgid "Current Headset"
-msgstr "Auricular actual"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr "_Actualizar"
-
-#: src/bluetooth/gui.c:231
-msgid "_Connect"
-msgstr "_Conectar"
-
-#: src/bluetooth/gui.c:237
-msgid "_Close"
-msgstr "_Cerrar"
-
-#: src/bluetooth/gui.c:274
-msgid "Class"
-msgstr "Clase"
-
-#: src/bluetooth/gui.c:278
-msgid "Address:"
-msgstr "Dirección:"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr "¡Termino de vinculación?"
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr "¡No dispositivo encontrado!"
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr "Escaneando..."
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr "Emparejando..."
-
-#: src/bluetooth/scan_gui.c:138
-msgid "Rescan"
-msgstr "Re-escanear"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "Reproducir"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Alcance de desenfoque: Selección de color"
@@ -1354,11 +734,11 @@
 msgid "Options:"
 msgstr "Opciones:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 msgid "About Audio CD Plugin"
 msgstr "Acerca del complemento de CD Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1385,15 +765,15 @@
 "\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 msgid "Audio CD"
 msgstr "CD de audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr "Unidad está vacía"
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr "Tipo de disco no soportado"
 
@@ -1441,11 +821,23 @@
 msgid "Override default device: "
 msgstr "Sobreescribir dispositivo predeterminado: "
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+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"
+
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
 msgstr "Reproducir CD"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "Añadir CD"
 
@@ -1469,6 +861,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Decodificador Musical de Consola de Juego"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "General"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Reproducción"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Bajo:"
@@ -1486,8 +886,7 @@
 msgid "Default song length:"
 msgstr "Longitud de canción predeterminada:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Remuestreo"
 
@@ -1499,6 +898,10 @@
 msgid "Resampling rate:"
 msgstr "Tasa de remuestreo:"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1571,16 +974,16 @@
 "Puede usar el efecto convertidor de frecuencia de muestro para volver a "
 "muestrear las canciones a la misma tasa."
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "Configurar cristalizador"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Intensidad de efectos:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1620,343 +1023,20 @@
 msgid "Volume: (%)"
 msgstr "Volumen: (%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "Reproducción->Reproducir"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "Reproducción->Detener"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "Reproducción->Pausa"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "Reproducción->Previo"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "Reproducción->Siguiente"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "Reproducción->Expulsar"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "Lista de reproducción->Repetir"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "Lista de reproducción->Aleatorio"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "Volumen->Sobre_5"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "Volumen->Bajo_5"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "Volumen->Sobre_10"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "Volumen->Bajo_10"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "Volumen->Silenciar"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "Ventana->Principal"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "Ventana->Lista de reproducción"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "Ventana->Ecualizador"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "Ventana->IrAlArchivo"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:212
-msgid "Detected"
-msgstr "Detectado"
-
-#: src/evdev-plug/ed_ui.c:217
-msgid "Custom"
-msgstr "Personalizado"
-
-#: src/evdev-plug/ed_ui.c:223
-msgid "Not Detected"
-msgstr "No detectado"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "Información"
-
-#: src/evdev-plug/ed_ui.c:276
-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."
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Error"
-
-#: src/evdev-plug/ed_ui.c:320
-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."
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:353
-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 ""
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Nombre del dispositivo:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Archivo del dispositivo:"
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr "(personalizado)"
-
-#: src/evdev-plug/ed_ui.c:412
-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."
-
-#: src/evdev-plug/ed_ui.c:447
-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"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "¿Quiere quitar el dispositivo personalizado seleccionado?\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "EvDev-Complemento - Configuración"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Activo"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Estado"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Nombre de dispositivo"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Archivo de dispositivo"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Dirección de dispositivo"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "_Bindings"
-
-#: src/evdev-plug/ed_ui.c:838
-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."
-
-#: src/evdev-plug/ed_ui.c:875
-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):"
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Complemento - Configuración Bindings"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "Nombre: "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Nombre de archivo: "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Dirección física: "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "EvDev-Complemento - acerca"
-
-#: src/evdev-plug/ed_ui.c:1491
-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"
-
-#: src/ffaudio/ffaudio-core.c:765
+#: src/ffaudio/ffaudio-core.c:763
 #, fuzzy, c-format
 msgid ""
 "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"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 "Multi-format audio decoding plugin for Audacious based on\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1970,15 +1050,15 @@
 " William Pitcock <nenolod@nenolod.net>,\n"
 " Matti Hämäläinen <ccr@tnsp.org>\n"
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "Acerca del complemento FFaudio"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "Acerca del Escritor-de-Archivo-Complemento"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2014,51 +1094,51 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "Configuración de Escritor de Archivo"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Formato de archivo de salida:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Configurar"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Guardar dentro del directorio original"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Guardar dentro de directorio personalizado"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Carpeta de archivo de salida:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Elige una carpeta"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Obtener nombre de archivo desde:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "Etiquetas de archivo originales"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "Nombre de archivo original"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "No mostar extesión del nombre del archivo"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "Anteponer el número de pista al nombre de archivo"
 
@@ -2071,6 +1151,14 @@
 msgid "Joint Stereo"
 msgstr "Unir-estéreo"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Estereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Mono"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "Configuración MP3"
@@ -2116,7 +1204,6 @@
 msgstr "Error de protección"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Calidad"
 
@@ -2224,11 +1311,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2242,58 +1329,22 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 msgid "Add Files"
 msgstr ""
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 msgid "Audacious2"
 msgstr "Audacious2"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr ""
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr ""
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr ""
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr ""
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr ""
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr ""
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-msgid "Export Playlist"
-msgstr ""
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-msgid "Import Playlist"
-msgstr ""
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr ""
@@ -2388,404 +1439,302 @@
 msgid "Disable"
 msgstr "variable"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr ""
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
+#: src/gtkui/menus.c:132
+msgid "_Open Files ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
+#: src/gtkui/menus.c:133
+msgid "Open _URL ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
+#: src/gtkui/menus.c:134
+msgid "_Add File ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
+#: src/gtkui/menus.c:135
+msgid "Add U_RL ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:55
-msgid "Show statusbar"
-msgstr ""
+#: src/gtkui/menus.c:137
+#, fuzzy
+msgid "A_bout ..."
+msgstr "Acerca de"
 
-#: src/gtkui/ui_manager.c:56
-msgid "Show/hide statusbar"
-msgstr ""
+#: src/gtkui/menus.c:138
+#, fuzzy
+msgid "_Preferences ..."
+msgstr "Preferencias"
 
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
-msgstr ""
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
+msgstr "Salir"
 
-#: src/gtkui/ui_manager.c:60
-msgid "Scroll on Song Change"
-msgstr ""
+#: src/gtkui/menus.c:142
+#, fuzzy
+msgid "_Play"
+msgstr "Reproducir"
 
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
+#: src/gtkui/menus.c:143
+#, fuzzy
+msgid "Paus_e"
 msgstr "Pausar"
 
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
+#: src/gtkui/menus.c:144
+#, fuzzy
+msgid "_Stop"
 msgstr "Detener"
 
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
+#: src/gtkui/menus.c:145
+#, fuzzy
+msgid "Pre_vious"
 msgstr "Anterior"
 
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
+#: src/gtkui/menus.c:146
+#, fuzzy
+msgid "_Next"
 msgstr "Siguiente"
 
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "Lista de reproducción"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "Nueva lista de reproducción"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "Eliminar lista de reproducción"
-
-#: src/gtkui/ui_manager.c:95
-msgid "Import Playlist ..."
-msgstr "Importar lista de reproducción ..."
-
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr "Cargar lista de reproducción en la lista seleccionada"
-
-#: src/gtkui/ui_manager.c:98
-msgid "Export Playlist ..."
-msgstr "Exportar lista de reproducción ..."
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "Guardar la lista de reproducción seleccionada"
-
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-msgid "Save All Playlists"
-msgstr "Guardar todas las listas de reproducción"
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:106
-msgid "Refresh"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:110
-msgid "Refresh Selected"
+#: src/gtkui/menus.c:148
+msgid "_Repeat"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
+#: src/gtkui/menus.c:149
+msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:115
-msgid "Playlist Manager"
+#: src/gtkui/menus.c:150
+#, fuzzy
+msgid "N_o Playlist Advance"
 msgstr "Administrador de lista de reproducción"
 
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:123
-msgid "Add Files ..."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr ""
+#: src/gtkui/menus.c:151
+#, fuzzy
+msgid "Stop _After This Song"
+msgstr "Parar después de la canción"
 
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
+#: src/gtkui/menus.c:154
+msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
+#: src/gtkui/menus.c:158
+msgid "By Track _Number"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:140
+#: src/gtkui/menus.c:159
 #, fuzzy
-msgid "Edit the playlist title."
-msgstr "Lista de reproducción aleatoria."
-
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:146
-msgid "Sort"
-msgstr "Ordenar"
-
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
+msgid "By _Title"
 msgstr "Por título"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
+#: src/gtkui/menus.c:160
+#, fuzzy
+msgid "By _Artist"
 msgstr "Por artista"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
-msgid "By Album"
+#: src/gtkui/menus.c:161
+#, fuzzy
+msgid "By A_lbum"
 msgstr "Por álbum"
 
-#: src/gtkui/ui_manager.c:155
+#: src/gtkui/menus.c:162
 #, fuzzy
-msgid "By Release Date"
+msgid "By Release _Date"
 msgstr "Por fecha"
 
-#: src/gtkui/ui_manager.c:157
-msgid "By File Path"
+#: src/gtkui/menus.c:163
+#, fuzzy
+msgid "By _File Path"
 msgstr "Por ruta de archivo"
 
-#: src/gtkui/ui_manager.c:159
-msgid "By Formatted Title"
-msgstr "Por título formateado"
+#: src/gtkui/menus.c:164
+#, fuzzy
+msgid "By _Custom Title"
+msgstr "Piel personalizada"
 
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
+#: src/gtkui/menus.c:166
+msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
+#: src/gtkui/menus.c:167
+msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr ""
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
+msgstr "_Actualizar"
 
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr ""
+#: src/gtkui/menus.c:172
+#, fuzzy
+msgid "_Sort"
+msgstr "Ordenar"
 
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
+#: src/gtkui/menus.c:174
+msgid "_New"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "Ver"
+#: src/gtkui/menus.c:175
+msgid "_Close"
+msgstr "_Cerrar"
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
-msgstr ""
+#: src/gtkui/menus.c:177
+#, fuzzy
+msgid "_Import ..."
+msgstr "Importar lista de reproducción ..."
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "Archivo"
+#: src/gtkui/menus.c:178
+#, fuzzy
+msgid "_Export ..."
+msgstr "Exportar lista de reproducción ..."
 
-#: src/gtkui/ui_manager.c:188
-msgid "Components"
-msgstr ""
+#: src/gtkui/menus.c:180
+#, fuzzy
+msgid "_Playlist Manager ..."
+msgstr "Administrador de lista de reproducción"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr ""
+#: src/gtkui/menus.c:183
+#, fuzzy
+msgid "Volume _Up"
+msgstr "Volumen"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr ""
+#: src/gtkui/menus.c:184
+#, fuzzy
+msgid "Volume _Down"
+msgstr "Volumen->Bajo_5"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "Acerca de Audacious"
+#: src/gtkui/menus.c:186
+#, fuzzy
+msgid "_Equalizer"
+msgstr "Ventana->Ecualizador"
 
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
+#: src/gtkui/menus.c:188
+msgid "E_ffects"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
+#: src/gtkui/menus.c:191
+msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
+#: src/gtkui/menus.c:194
+msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "Servicios de plugins"
+#: src/gtkui/menus.c:195
+msgid "Show _Status Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "Preferencias"
+#: src/gtkui/menus.c:197
+msgid "Show Column _Headers"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
+#: src/gtkui/menus.c:198
+msgid "Choose _Columns ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
-msgstr "Salir"
+#: src/gtkui/menus.c:199
+msgid "Scrol_l on Song Change"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "Cerrar Audacious"
+#: src/gtkui/menus.c:202
+#, fuzzy
+msgid "_File"
+msgstr "Archivo"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr ""
+#: src/gtkui/menus.c:203
+#, fuzzy
+msgid "_Playback"
+msgstr "Reproducción"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr ""
+#: src/gtkui/menus.c:204
+#, fuzzy
+msgid "P_laylist"
+msgstr "Lista de reproducción"
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr ""
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#, fuzzy
+msgid "_Services"
+msgstr "Servicios"
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
+#: src/gtkui/menus.c:206
+msgid "_Output"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
+#: src/gtkui/menus.c:207
+#, fuzzy
+msgid "_View"
+msgstr "Ver"
+
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
+#: src/gtkui/menus.c:215
+#, fuzzy
+msgid "_Copy"
 msgstr "Copiar"
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
+#: src/gtkui/menus.c:216
+#, fuzzy
+msgid "_Paste"
 msgstr "Pegar"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
+#: src/gtkui/menus.c:217
+#, fuzzy
+msgid "Select _All"
 msgstr "Seleccionar todo"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr ""
+#: src/gtkui/menus.c:222
+#, fuzzy
+msgid "_Rename"
+msgstr "Nombre de archivo"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr ""
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, 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
+msgid "Audacious"
+msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Error"
+
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d Canales"
 msgstr[1] "%d Canales"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, fuzzy, c-format
 msgid "%d kbps"
 msgstr "kbps"
@@ -2794,10 +1743,18 @@
 msgid "Previous Track"
 msgstr ""
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Reproducir"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr ""
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Detener"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr ""
@@ -2822,6 +1779,10 @@
 msgid "Volume Down"
 msgstr ""
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr ""
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr ""
@@ -2830,11 +1791,19 @@
 msgid "Show On-Screen-Display"
 msgstr ""
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+msgid "Toggle Repeat"
+msgstr ""
+
+#: src/hotkey/gui.c:85
+msgid "Toggle Shuffle"
+msgstr ""
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr ""
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2842,37 +1811,37 @@
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr ""
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr ""
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr ""
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr ""
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr ""
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr ""
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -2946,136 +1915,29 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr ""
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr ""
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr ""
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr ""
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr ""
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr ""
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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"
+"Looking for lyrics..."
 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"
 
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr ""
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr ""
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr ""
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr ""
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr ""
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr ""
-
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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 ""
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr ""
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr ""
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr ""
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
 msgstr ""
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr ""
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3089,248 +1951,41 @@
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 bit"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 bit"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:286
-msgid "96 kHz"
-msgstr "96 kHz"
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr ""
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr ""
-
-#: src/modplug/gui/main.cxx:52
-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."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr ""
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
+#: src/mtp_up/mtp.c:298
+msgid "Upload in progress..."
 msgstr ""
 
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
 msgstr ""
 
-#: src/mtp_up/mtp.c:290
-msgid "Upload in progress..."
+#: src/mtp_up/mtp.c:311
+msgid "Disconnect MTP Device"
 msgstr ""
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr ""
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "Detener"
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
-msgstr ""
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Audacious - advertencia de visualización"
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -3380,11 +2035,11 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr ""
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
@@ -3433,6 +2088,11 @@
 msgid "Default (%s)"
 msgstr ""
 
+#: 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
 msgid "OSS Driver configuration"
 msgstr ""
@@ -3505,11 +2165,11 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3565,27 +2225,27 @@
 msgid "Method:"
 msgstr ""
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 msgid "Change password"
 msgstr ""
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Servicios"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 msgid "Scrobbler URL:"
 msgstr ""
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr ""
 
@@ -3593,7 +2253,7 @@
 msgid "Scrobbler"
 msgstr ""
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3605,16 +2265,16 @@
 "Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
 "com>\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr ""
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 #, fuzzy
 msgid "About SDL Output Plugin"
 msgstr "Acerca del complemento de salida ALSA"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 #, fuzzy
 msgid "SDL error"
 msgstr "Error de ALSA"
@@ -3624,10 +2284,18 @@
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: src/sid/xs_config.c:323
+#: 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 ""
@@ -3637,6 +2305,11 @@
 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 ""
@@ -3911,15 +2584,15 @@
 msgid "Use"
 msgstr ""
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: 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:435
+#: 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:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr ""
 
@@ -3950,6 +2623,11 @@
 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 ""
@@ -4181,11 +2859,11 @@
 msgid "No"
 msgstr "No"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr ""
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -4193,684 +2871,807 @@
 "Copyright (c) 2008, por Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr ""
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "Lista de reproducción:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr ""
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
-msgstr ""
-
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr ""
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr ""
-
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
-msgstr ""
-
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr ""
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "Piel"
 
-#: src/skins/skins_cfg.c:330
-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 ""
+#: src/skins/skins_cfg.c:393
+#, fuzzy
+msgid "Interface Preferences"
+msgstr "Preferencias de Atenuación Cruzada"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
 msgstr ""
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "Ajuste de color"
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Hz"
 
-#: src/skins/skins_cfg.c:407
-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."
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Hz"
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "Azul"
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 kHz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "Verde"
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "Rojo"
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 kHz"
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "Piel"
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 kHz"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr "Ajuste de color ..."
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Ecualizador audacious"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr ""
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "surround"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious - advertencia de visualización"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "Mostrar ventana principal del reproductor"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: src/skins/ui_main.c:993
-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)."
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr "Ignorar siempre"
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious - advertencia de uso de un motor GTK roto"
-
-#: src/skins/ui_main.c:1052
-#, c-format
-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."
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr "No mostrar esta advertencia otra vez"
-
-#: src/skins/ui_main.c:1275
+#: src/skins/ui_main.c:807
 #, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volumen: %d%%"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Menú de opciones"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Deshabilitar 'Siempre encima'"
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Habilitar 'Siempre encima'"
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "Deshabilitar 'Escalado de la interfaz'"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "Habilitar 'Escalado de la interfaz'"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Menú de visualización"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 msgid "Playlist mode."
 msgstr "Modo de lista de reproducción."
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr "Parar después de la canción"
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr "No parar después de la canción"
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr ""
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
-msgid "Peaks"
-msgstr ""
-
 #: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
-msgid "Show Player"
+msgid "Stop after Current Song"
 msgstr ""
 
 #: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
-msgid "Show Playlist Editor"
+msgid "Peaks"
 msgstr ""
 
 #: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
-msgid "Show Equalizer"
+msgid "Repeat"
 msgstr ""
 
 #: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
-msgid "Always on Top"
-msgstr "Siempre encima"
+msgid "Shuffle"
+msgstr ""
 
 #: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
-msgid "Put on All Workspaces"
+msgid "No Playlist Advance"
 msgstr ""
 
 #: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
-msgid "Roll up Player"
+msgid "Show Player"
 msgstr ""
 
 #: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
-msgid "Roll up Playlist Editor"
+msgid "Show Playlist Editor"
 msgstr ""
 
 #: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
-msgid "Roll up Equalizer"
+msgid "Show Equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+msgid "Always on Top"
+msgstr "Siempre encima"
+
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+msgid "Put on All Workspaces"
 msgstr ""
 
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+msgid "Roll up Player"
 msgstr ""
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+msgid "Roll up Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+msgid "Roll up Equalizer"
+msgstr ""
+
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr ""
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "Off"
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr ""
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr ""
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr ""
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr ""
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr ""
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr ""
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr ""
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "Muy lento"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "Medio"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "Muy rápido"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr ""
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr ""
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "Pausar"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "Siguiente"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "Visualización"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Lista de reproducción"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Nueva lista de reproducción"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Eliminar lista de reproducción"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr ""
+
+#: 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"
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr "Guardar 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 ""
 
-#: src/skins/ui_manager.c:228
-msgid "List Manager"
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
 msgstr ""
 
 #: src/skins/ui_manager.c:238
+msgid "List Manager"
+msgstr ""
+
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr ""
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Ver"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr ""
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "Preferencias de Atenuación Cruzada"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr ""
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr ""
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr ""
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr ""
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:277
+msgid "Remove All"
+msgstr ""
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:281
 msgid "Clear Queue"
 msgstr "Limpiar lista"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr "Limpiar la lista asociada con esta lista de reproducción"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "Eliminar archivos no disponibles"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr "Eliminar archivos no disponibles de la lista de reproducción"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "Eliminar duplicados"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "Por título"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "Por nombre de archivo"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "Por ruta y nombre de archivo"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr ""
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr ""
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr ""
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr "Lista de reproducción aleatoria."
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "Ordenar lista"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+msgid "By Album"
+msgstr "Por álbum"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr ""
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "Por artista"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr ""
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr ""
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "Por fecha"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr ""
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr ""
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr ""
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr ""
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "Archivo"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Ayuda"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr ""
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr ""
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr ""
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "Acerca de Audacious"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "Reproducir archivo"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr ""
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "Reproducir lugar"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr ""
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "Servicios de plugins"
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr ""
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "Cerrar Audacious"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr ""
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr ""
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr ""
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr ""
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr "Copiar"
+
+#: src/skins/ui_manager.c:436
+msgid "Cut"
+msgstr "Cortar"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Pegar"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr ""
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr ""
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr ""
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:374
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:382
+#: 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 "
@@ -4878,104 +3679,52 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Título: "
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Artista"
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Nombre del archivo"
 
-#: src/skins/ui_playlist.c:419
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:422
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:425
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:776
-msgid "Save as Static Playlist"
-msgstr ""
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr ""
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "Cargar lista de reproducción"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "Guardar lista de reproducción"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr ""
@@ -5026,53 +3775,61 @@
 "51 Franklin Street, Fifth Floor, \n"
 "Boston, MA 02110-1301 USA"
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "Solapamiento corto"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr ""
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Opciones"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr ""
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr ""
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr ""
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr ""
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -5091,24 +3848,20 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 msgid "Song Change"
 msgstr ""
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr ""
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "Acerca del plugin Status Icon"
@@ -5181,72 +3934,19 @@
 "\n"
 "By Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr ""
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-msgid "Search:"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-msgid "Stream name"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-msgid "Remove Bookmark"
-msgstr ""
-
-#: src/streambrowser/streambrowser.c:340
-msgid "About Stream Browser"
-msgstr ""
-
-#: src/streambrowser/streambrowser.c:341
-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:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5260,12 +3960,12 @@
 "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"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr ""
 
@@ -5286,15 +3986,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Ogg Vorbis Tags"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Configuración del plugin de audio Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Acerca del plugin de audio Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5369,9 +4069,725 @@
 "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 "

audacious-plugins-2.5.3.tar.gz/po/et.po -> audacious-plugins-3.0.tar.gz/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-05-19 10:53-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"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -25,541 +25,55 @@
 "Copyright (c) 2005-2006 Audacious team"
 msgstr ""
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 #, fuzzy
 msgid "About MP4 AAC decoder plugin"
 msgstr "MP4 AAC esituspluginast lähemalt"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:155
-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 ""
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug'i sätted"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "Olgu"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Loobu"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "Üldine"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Helikvaliteet"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8-bitine"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16-bitine"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Kanaleid"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Stereo"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Sagedus"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Esitamine"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Loo lõpp tuvastatakse"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Vormingud"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Vormingute valimine"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Vorming"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Laiend"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Failinimi"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Pealkiri: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Autor: "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Faili tüüp: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Instrumendid: "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Mustrid: "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Instrumendi nimi"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Loo sõnum"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Muster: "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Kiirus: "
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "XMMS-alarmist lähemalt"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "XMMS-alarm"
-
-#: src/alarm/interface.c:56
-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-plugin, mida saab kasutada esitamise\n"
-"alustamiseks kindlaksmääratud ajal.\n"
-"\n"
-"Kaebused paluks saata aadressidele:\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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Sulge"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "See on sinu äratus."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "Olgu"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Esitusnimekirja valimine"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Vabandust"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Hoiatus"
-
-#: src/alarm/interface.c:213
-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:229
-msgid "Oh Well"
-msgstr ""
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Alarmi sätted"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Aeg"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "tundi"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "t"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "minutit"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Vait pärast:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Alarmi aeg (vaikimisi):"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Alarmi töölehakkamise päevade valimine"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Vaikimisi"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Päev"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Teisipäeval"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Kolmapäeval"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Neljapäeval"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Reedel"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Laupäeval"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Pühapäeval"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Esmaspäeval"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Päevad"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Kahanemine"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "sekundit"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Valjus"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Praegune"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr ""
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Alguses"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Lõpus"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Täiendav käsk"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "lubatud"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Esitusnimekiri (valikuline)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Sirvi..."
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Meeldetuletaja"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Meeldetuletaja on kasutusel"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Valikud"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Mida need valikud tähendavad?"
-
-#: src/alarm/interface.c:1364
-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:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Abi"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr ""
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr ""
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 #, fuzzy
 msgid "Default PCM device"
 msgstr "Vaikimisi PCM-seade (%s)"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 #, fuzzy
 msgid "Default mixer device"
 msgstr "Vaikimisi PCM-seade (%s)"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 #, fuzzy
 msgid "ALSA Output Plugin Preferences"
 msgstr "Olekuikooni plugina eelistused"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 #, fuzzy
 msgid "PCM device:"
 msgstr "Miksimisseade:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Miksimisseade:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 #, fuzzy
 msgid "Mixer element:"
 msgstr "Miksimisseade:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 #, fuzzy
 msgid "About ALSA Output Plugin"
 msgstr "JACK väljundplugina versioonist 0.17 lähemalt"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 #, fuzzy
 msgid "ALSA error"
 msgstr "Viga!"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -707,6 +221,10 @@
 msgid "SoundFont settings"
 msgstr ""
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Failinimi"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr ""
@@ -811,8 +329,7 @@
 "TiMidity\n"
 "taustaprogramm"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -958,198 +475,198 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Paigutamine"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "Suhteline X-nihe:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Suhteline Y-nihe:"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "Suurim OSD laius:"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Mitme monitori valikud"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "OSD-d kuvatakse:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "kõigil monitoridel"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "%i. monitoril"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Ajastus (millisekundites)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "Kuvamine:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "Sujuv näitamine:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "Sujuv peitmine:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Kirjatüübid"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "Kirjatüüp %i:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Vari"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Renderdamise laad"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Värvused"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "Värvus %i:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Päästik on lubatud"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Sündmus"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:808
+#: 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"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Läbipaistvus"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Võltsitud läbipaistvus"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Tegelik läbipaistvus (vajab X Composite laiendust)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Proovi"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Asukoht"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Animatsioon"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Tekst"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Kaunistused"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Päästikud"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Muu"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1162,131 +679,6 @@
 "\n"
 msgstr ""
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr ""
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr ""
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr ""
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr ""
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr ""
-
-#: src/bluetooth/gui.c:224
-#, fuzzy
-msgid "Current Headset"
-msgstr "Praegune"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr ""
-
-#: src/bluetooth/gui.c:231
-#, fuzzy
-msgid "_Connect"
-msgstr "Asukoht:"
-
-#: src/bluetooth/gui.c:237
-#, fuzzy
-msgid "_Close"
-msgstr "Sulge"
-
-#: src/bluetooth/gui.c:274
-#, fuzzy
-msgid "Class"
-msgstr "Sulge"
-
-#: src/bluetooth/gui.c:278
-#, fuzzy
-msgid "Address:"
-msgstr "Seadme aadress"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:138
-msgid "Rescan"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-#, fuzzy
-msgid "Play"
-msgstr "Esitamine"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr ""
@@ -1295,12 +687,12 @@
 msgid "Options:"
 msgstr "Valikud:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 #, fuzzy
 msgid "About Audio CD Plugin"
 msgstr "FLAC audiopluginast lähemalt"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 #, fuzzy
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
@@ -1325,15 +717,15 @@
 "\n"
 "See projekt loodi Google Summer of Code 2007 raames."
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 msgid "Audio CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -1382,12 +774,24 @@
 msgid "Override default device: "
 msgstr "Vaikimisi seadme asemel kasutatakse: "
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+msgid "Ok"
+msgstr "Olgu"
+
+#: 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 "Loobu"
+
+#: src/cd-menu-items/cd-menu-items.c:34
 #, fuzzy
 msgid "Play CD"
 msgstr "Esitamine"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "Lisa CD"
 
@@ -1414,6 +818,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Console Music Decoder pluginast lähemalt"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "Üldine"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Esitamine"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr ""
@@ -1431,8 +843,7 @@
 msgid "Default song length:"
 msgstr ""
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr ""
 
@@ -1444,6 +855,10 @@
 msgid "Resampling rate:"
 msgstr ""
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr ""
@@ -1506,17 +921,17 @@
 "same rate."
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 #, fuzzy
 msgid "Configure Crystalizer"
 msgstr "Seadista..."
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Rakenda"
 
@@ -1556,338 +971,32 @@
 msgid "Volume: (%)"
 msgstr "Valjus: (%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr ""
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr ""
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr ""
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr ""
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr ""
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr ""
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr ""
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr ""
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr ""
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr ""
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr ""
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr ""
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr ""
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr ""
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr ""
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr ""
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:212
-#, fuzzy
-msgid "Detected"
-msgstr "Loo lõpp tuvastatakse"
-
-#: src/evdev-plug/ed_ui.c:217
-msgid "Custom"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:223
-#, fuzzy
-msgid "Not Detected"
-msgstr "Vormingute valimine"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:353
-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 ""
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Seadne nimi:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Seadmefail:"
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Aktiivne"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Olek"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Seadme nimi"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Seadmefail"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Seadme aadress"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "Nimi: "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Failinimi: "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:1491
-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 ""
-
-#: src/ffaudio/ffaudio-core.c:765
+#: 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"
 "Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "FLAC audiopluginast lähemalt"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "FailiKirjutaja pluginast lähemalt"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -1923,51 +1032,51 @@
 "programmiga; kui ei, siis võtke ühendust Free Software Foundation'iga,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "Failikirjutaja sätted"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Väljundfaili vorming:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Seadista..."
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Salvestatakse algkataloogi"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Salvestatakse kohandatud kataloogi"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Väljundkataloog:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Kataloogi valimine"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Failinimi tuletatakse lähtefaili:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "siltidest"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "nimest"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Algse faili laiendit maha ei lõigata"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -1980,6 +1089,14 @@
 msgid "Joint Stereo"
 msgstr "Stereo"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Mono"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "MP3 sätted"
@@ -2025,7 +1142,6 @@
 msgstr ""
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Kvaliteet"
 
@@ -2133,11 +1249,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "Gnome kiirklahvide pluginast lähemalt"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 #, fuzzy
 msgid ""
 "Gnome Shortcut Plugin\n"
@@ -2152,64 +1268,24 @@
 "Autoriõigused (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 #, fuzzy
 msgid "Add Files"
 msgstr "Failinimi"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 #, fuzzy
 msgid "Audacious2"
 msgstr "%s - Audacious"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr ""
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr ""
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr ""
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-#, fuzzy
-msgid "minutes:seconds"
-msgstr "minutit"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-#, fuzzy
-msgid "Track length:"
-msgstr "Loo number:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr ""
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-#, fuzzy
-msgid "Export Playlist"
-msgstr "Esitusnimekirja andmed kiiresti"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-#, fuzzy
-msgid "Import Playlist"
-msgstr "Esitusnimekirja andmed kiiresti"
-
 #: src/gtkui/columns.c:36
 #, fuzzy
 msgid "Entry number"
@@ -2304,439 +1380,307 @@
 msgid "Disable"
 msgstr "lubatud"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr ""
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-#, fuzzy
-msgid "Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:55
+#: src/gtkui/menus.c:132
 #, fuzzy
-msgid "Show statusbar"
-msgstr "Olek"
-
-#: src/gtkui/ui_manager.c:56
-#, fuzzy
-msgid "Show/hide statusbar"
-msgstr "Esitusnimekirja valimine"
+msgid "_Open Files ..."
+msgstr "Failinimi"
 
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
+#: src/gtkui/menus.c:133
+msgid "Open _URL ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:60
+#: src/gtkui/menus.c:134
 #, fuzzy
-msgid "Scroll on Song Change"
-msgstr "Loo sõnum"
+msgid "_Add File ..."
+msgstr "Failinimi"
 
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
+#: src/gtkui/menus.c:135
 #, fuzzy
-msgid "Pause"
-msgstr "Pausimine"
+msgid "Add U_RL ..."
+msgstr "Failinimi"
 
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
+#: src/gtkui/menus.c:137
 #, fuzzy
-msgid "Stop"
-msgstr "Stereo"
+msgid "A_bout ..."
+msgstr "\"%s\" pluginast lähemalt"
 
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
+#: src/gtkui/menus.c:138
+msgid "_Preferences ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-#, fuzzy
-msgid "Next"
-msgstr "Tekst"
-
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
 #, fuzzy
-msgid "Playlist"
-msgstr "Esitusnimekirja valimine"
+msgid "_Quit"
+msgstr "Kvaliteet"
 
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
+#: src/gtkui/menus.c:142
 #, fuzzy
-msgid "New Playlist"
-msgstr "Esitusnimekirja valimine"
+msgid "_Play"
+msgstr "Esitamine"
 
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/gtkui/menus.c:143
 #, fuzzy
-msgid "Delete Playlist"
-msgstr "Esitusnimekirja valimine"
+msgid "Paus_e"
+msgstr "Pausimine"
 
-#: src/gtkui/ui_manager.c:95
+#: src/gtkui/menus.c:144
 #, fuzzy
-msgid "Import Playlist ..."
-msgstr "Esitusnimekirja andmed kiiresti"
+msgid "_Stop"
+msgstr "Stereo"
 
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
+#: src/gtkui/menus.c:145
+msgid "Pre_vious"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:98
-#, fuzzy
-msgid "Export Playlist ..."
-msgstr "Esitusnimekirja andmed kiiresti"
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-#, fuzzy
-msgid "Saves the selected playlist."
-msgstr "Esitusnimekirja valimine"
-
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
+#: src/gtkui/menus.c:146
 #, fuzzy
-msgid "Save All Playlists"
-msgstr "Esitusnimekirja valimine"
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
+msgid "_Next"
+msgstr "Tekst"
 
-#: src/gtkui/ui_manager.c:106
-msgid "Refresh"
+#: src/gtkui/menus.c:148
+msgid "_Repeat"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
+#: src/gtkui/menus.c:149
+msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:110
+#: src/gtkui/menus.c:150
 #, fuzzy
-msgid "Refresh Selected"
-msgstr "Vormingute valimine"
-
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:115
-#, fuzzy
-msgid "Playlist Manager"
+msgid "N_o Playlist Advance"
 msgstr "Esitusnimekirja valimine"
 
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:123
-#, fuzzy
-msgid "Add Files ..."
-msgstr "Failinimi"
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-#, fuzzy
-msgid "Remove All"
-msgstr "Eemalda"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
+#: src/gtkui/menus.c:151
+msgid "Stop _After This Song"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
+#: src/gtkui/menus.c:154
+msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:140
-#, fuzzy
-msgid "Edit the playlist title."
-msgstr "Esitusnimekirja valimine"
-
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:146
-#, fuzzy
-msgid "Sort"
-msgstr "Vabandust"
-
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
+#: src/gtkui/menus.c:158
 #, fuzzy
-msgid "By Track Number"
+msgid "By Track _Number"
 msgstr "Loo number:"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
+#: src/gtkui/menus.c:159
 #, fuzzy
-msgid "By Title"
+msgid "By _Title"
 msgstr "Pealkiri"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
+#: src/gtkui/menus.c:160
 #, fuzzy
-msgid "By Artist"
+msgid "By _Artist"
 msgstr "Esitaja:"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
+#: src/gtkui/menus.c:161
 #, fuzzy
-msgid "By Album"
+msgid "By A_lbum"
 msgstr "Album:"
 
-#: src/gtkui/ui_manager.c:155
+#: src/gtkui/menus.c:162
 #, fuzzy
-msgid "By Release Date"
+msgid "By Release _Date"
 msgstr "Kuupäev:"
 
-#: src/gtkui/ui_manager.c:157
+#: src/gtkui/menus.c:163
 #, fuzzy
-msgid "By File Path"
+msgid "By _File Path"
 msgstr "Failinimi"
 
-#: src/gtkui/ui_manager.c:159
+#: src/gtkui/menus.c:164
 #, fuzzy
-msgid "By Formatted Title"
+msgid "By _Custom Title"
 msgstr "Pealkiri"
 
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
+#: src/gtkui/menus.c:166
+msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
+#: src/gtkui/menus.c:167
+msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "Efektid"
+#: src/gtkui/menus.c:172
+#, fuzzy
+msgid "_Sort"
+msgstr "Vabandust"
 
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
+#: src/gtkui/menus.c:174
+msgid "_New"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr ""
+#: src/gtkui/menus.c:175
+#, fuzzy
+msgid "_Close"
+msgstr "Sulge"
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
-msgstr ""
+#: src/gtkui/menus.c:177
+#, fuzzy
+msgid "_Import ..."
+msgstr "Esitusnimekirja andmed kiiresti"
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
+#: src/gtkui/menus.c:178
 #, fuzzy
-msgid "File"
-msgstr "Failinimi"
+msgid "_Export ..."
+msgstr "Esitusnimekirja andmed kiiresti"
 
-#: src/gtkui/ui_manager.c:188
+#: src/gtkui/menus.c:180
 #, fuzzy
-msgid "Components"
-msgstr "Kommentaar:"
+msgid "_Playlist Manager ..."
+msgstr "Esitusnimekirja valimine"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr ""
+#: src/gtkui/menus.c:183
+#, fuzzy
+msgid "Volume _Up"
+msgstr "Valjus"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
+#: src/gtkui/menus.c:184
+#, fuzzy
+msgid "Volume _Down"
+msgstr "Valjus"
+
+#: src/gtkui/menus.c:186
+msgid "_Equalizer"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
+#: src/gtkui/menus.c:188
 #, fuzzy
-msgid "About Audacious"
-msgstr "Audacious'e LIRC pluginast lähemalt"
+msgid "E_ffects"
+msgstr "Efektid"
 
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
+#: src/gtkui/menus.c:191
+msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
+#: src/gtkui/menus.c:194
+msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr ""
+#: src/gtkui/menus.c:195
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "Olek"
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
+#: src/gtkui/menus.c:197
+msgid "Show Column _Headers"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
+#: src/gtkui/menus.c:198
+msgid "Choose _Columns ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr ""
+#: src/gtkui/menus.c:199
+#, fuzzy
+msgid "Scrol_l on Song Change"
+msgstr "Loo sõnum"
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
+#: src/gtkui/menus.c:202
 #, fuzzy
-msgid "_Quit"
-msgstr "Kvaliteet"
+msgid "_File"
+msgstr "Failinimi"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
+#: src/gtkui/menus.c:203
 #, fuzzy
-msgid "Quit Audacious"
-msgstr "%s - Audacious"
+msgid "_Playback"
+msgstr "Esitamine"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr ""
+#: src/gtkui/menus.c:204
+#, fuzzy
+msgid "P_laylist"
+msgstr "Esitusnimekirja valimine"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr ""
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#, fuzzy
+msgid "_Services"
+msgstr "Seadmed"
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
+#: src/gtkui/menus.c:206
+msgid "_Output"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
+#: src/gtkui/menus.c:207
+msgid "_View"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
+#: src/gtkui/menus.c:215
+msgid "_Copy"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-#, fuzzy
-msgid "Cut"
-msgstr "Praegune"
-
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
+#: src/gtkui/menus.c:216
+msgid "_Paste"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
+#: src/gtkui/menus.c:217
 #, fuzzy
-msgid "Select All"
+msgid "Select _All"
 msgstr "Esitusnimekirja valimine"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
+#: src/gtkui/menus.c:222
+#, fuzzy
+msgid "_Rename"
+msgstr "Failinimi"
+
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, 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
 #, fuzzy
-msgid "Select None"
-msgstr "Loo lõpp tuvastatakse"
+msgid "Audacious"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 #, fuzzy
 msgid "mono"
 msgstr "Mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 #, fuzzy
 msgid "stereo"
 msgstr "Stereo"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "Kanaleid"
 msgstr[1] "Kanaleid"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, c-format
 msgid "%d kbps"
 msgstr ""
@@ -2745,10 +1689,20 @@
 msgid "Previous Track"
 msgstr ""
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#, fuzzy
+msgid "Play"
+msgstr "Esitamine"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr ""
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#, fuzzy
+msgid "Stop"
+msgstr "Stereo"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr ""
@@ -2775,6 +1729,10 @@
 msgid "Volume Down"
 msgstr "Valjus"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr ""
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr ""
@@ -2783,11 +1741,19 @@
 msgid "Show On-Screen-Display"
 msgstr ""
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+msgid "Toggle Repeat"
+msgstr ""
+
+#: src/hotkey/gui.c:85
+msgid "Toggle Shuffle"
+msgstr ""
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr ""
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2795,39 +1761,39 @@
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr ""
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr ""
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 #, fuzzy
 msgid "Hotkeys:"
 msgstr "Host:"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 #, fuzzy
 msgid "Action:"
 msgstr "Failinimi: "
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr ""
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr ""
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -2882,126 +1848,29 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "JACK väljundplugina versioonist 0.17 lähemalt"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr ""
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "Nimi"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "Paigaldatud pluginad"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "Töötavad pluginad"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "Lisa"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "Eemalda"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "LADSPA pluginate kataloog"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "Audacious'e LIRC pluginast lähemalt"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr ""
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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 ""
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr ""
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr ""
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr ""
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr ""
-
-#: src/lirc/interface.c:79
-#, fuzzy
-msgid "Connection"
-msgstr "Asukoht:"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
+"Looking for lyrics..."
 msgstr ""
 
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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 ""
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr ""
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr ""
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr ""
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
 msgstr ""
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "Metronoomist lähemalt"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3010,262 +1879,42 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Taktigeneraator: %d bpm"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Taktigeneraator: %d bpm %d/%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "ModPlug'i sätted"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16-bitine"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8-bitine"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
+#: src/mpg123/mpg123.c:183
+msgid "Surround"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
+#: src/mtp_up/mtp.c:298
+msgid "Upload in progress..."
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
+#: src/mtp_up/mtp.c:311
+msgid "Disconnect MTP Device"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:286
+#: src/notify/libnotify-aosd_event.c:47
 #, fuzzy
-msgid "96 kHz"
-msgstr "44 kHz"
+msgid "Stopped"
+msgstr "Stereo"
 
-#: src/modplug/gui/interface.cxx:293
+#: src/notify/libnotify-aosd_event.c:47
 #, fuzzy
-msgid "48 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Diskreetimissagedus"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "Lubatud"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "Sügavus"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "Viivitus"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
-msgid "Surround"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "Failinime kasutatakse pealkirjaks"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
+msgid "Audacious is not playing."
 msgstr "Esitusnimekirja andmed kiiresti"
 
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "Müra vähendatakse"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Esitatakse Amiga MOD-e"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "Ei korrata"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "Korratakse"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "kord(a)"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "Korratakse igavesti"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "Kordamine"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "MOD-i andmed"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-"Failinimi:\n"
-"Pealkiri:\n"
-"Liik:\n"
-"Kestus:\n"
-"Kiirus:\n"
-"Tempo:\n"
-"Sämpleid:\n"
-"Instrumente:\n"
-"Mustreid:\n"
-"Kanaleid:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "Sämplid"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "Instrumendid"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "Sõnum"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr ""
-
-#: src/modplug/gui/main.cxx:52
-#, fuzzy
-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 helimootor, autor: Olivier Lapicque.\n"
-"Modplug'i XMMS-liidese autor: Kenton Varda.\n"
-"Autoriõigused (c) 2000 Olivier Lapicque ja Kenton Varda.\n"
-"Uuendused ja hooldus: Konstanty Bialkowski.\n"
-"BMP jaoks portinud Theofilos Intzoglou."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "Modplug'ist lähemalt"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr ""
-
-#: src/mtp_up/mtp.c:290
-msgid "Upload in progress..."
-msgstr ""
-
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr ""
-
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
-msgstr ""
-
 #: src/null/null.c:64
 msgid "Null output plugin "
 msgstr ""
@@ -3314,12 +1963,12 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 #, fuzzy
 msgid "About OSS4 Plugin"
 msgstr "ESounD'i pluginast lähemalt"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 #, fuzzy
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
@@ -3367,6 +2016,11 @@
 msgid "Default (%s)"
 msgstr "Vaikimisi (%s)"
 
+#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Vaikimisi"
+
 #: src/OSS/configure.c:187
 msgid "OSS Driver configuration"
 msgstr "OSS draiveri sätted"
@@ -3438,11 +2092,11 @@
 "programmiga; kui ei, siis võtke ühendust Free Software Foundation'iga,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Audacious'e PulseAudio väljundpluginast lähemalt"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3498,28 +2152,28 @@
 msgid "Method:"
 msgstr ""
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 #, fuzzy
 msgid "Change password"
 msgstr "Vahetatakse esitatavat lugu"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Teenused"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Kasutajanimi:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Parool:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 msgid "Scrobbler URL:"
 msgstr ""
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3527,7 +2181,7 @@
 msgid "Scrobbler"
 msgstr ""
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3535,16 +2189,16 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr ""
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 #, fuzzy
 msgid "About SDL Output Plugin"
 msgstr "JACK väljundplugina versioonist 0.17 lähemalt"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 #, fuzzy
 msgid "SDL error"
 msgstr "Viga!"
@@ -3554,11 +2208,19 @@
 msgid "About %s"
 msgstr "\"%s\" pluginast lähemalt"
 
-#: src/sid/xs_config.c:323
+#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
+msgid "Close"
+msgstr "Sulge"
+
+#: src/sid/xs_config.c:326
 #, fuzzy
 msgid " Error"
 msgstr "Viga!"
 
+#: src/sid/xs_config.c:326
+msgid "OK"
+msgstr "Olgu"
+
 #: src/sid/xs_fileinfo.c:151
 msgid "General info"
 msgstr "Üldandmed"
@@ -3568,6 +2230,11 @@
 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 ""
@@ -3842,15 +2509,15 @@
 msgid "Use"
 msgstr ""
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: 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:435
+#: 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:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr ""
 
@@ -3881,6 +2548,11 @@
 msgid "Playtime:"
 msgstr ""
 
+#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
+#: src/sid/xs_interface.c:1155
+msgid "seconds"
+msgstr "sekundit"
+
 #: src/sid/xs_interface.c:928
 msgid "Minimum playtime:"
 msgstr ""
@@ -4112,713 +2784,874 @@
 msgid "No"
 msgstr ""
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr ""
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 msgstr ""
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr ""
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 #, fuzzy
 msgid "_Player:"
 msgstr "Esitamine"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 #, fuzzy
 msgid "_Playlist:"
 msgstr "Esitusnimekirja valimine"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 #, fuzzy
 msgid "Select playlist font:"
 msgstr "Esitusnimekirja valimine"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 #, fuzzy
 msgid "_Fonts"
 msgstr "Failinimi: "
 
-#: src/skins/skins_cfg.c:323
-#, fuzzy
-msgid "Use Bitmap fonts if available"
-msgstr "Võimaluse korral kasutatakse CDDB-d"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.c:324
-#, fuzzy
-msgid "_Miscellaneous"
-msgstr "Teenused"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr ""
-
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
-msgstr ""
-
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr ""
+#: src/skins/skins_cfg.c:346
+#, fuzzy
+msgid "_Skin"
+msgstr "Failinimi: "
 
-#: src/skins/skins_cfg.c:330
-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."
+#: src/skins/skins_cfg.c:393
+msgid "Interface Preferences"
 msgstr ""
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
 msgstr ""
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr ""
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "250 Hz"
+msgstr "22050 Hz "
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "500 Hz"
+msgstr "11000 Hz"
 
-#: src/skins/skins_cfg.c:417
+#: src/skins/ui_equalizer.c:335
 #, fuzzy
-msgid "Blue"
-msgstr "Valjus"
+msgid "1 kHz"
+msgstr "11 kHz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr ""
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "2 kHz"
+msgstr "22 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr ""
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "4 kHz"
+msgstr "44 kHz"
 
-#: src/skins/skins_cfg.c:569
+#: src/skins/ui_equalizer.c:336
 #, fuzzy
-msgid "_Skin"
-msgstr "Failinimi: "
+msgid "8 kHz"
+msgstr "44 kHz"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr ""
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "16 kHz"
+msgstr "44 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr ""
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 #, fuzzy
 msgid "kHz"
 msgstr "Hz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 #, fuzzy
 msgid "surround"
 msgstr "Surround-kaja"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr ""
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr ""
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr ""
-
-#: src/skins/ui_main.c:993
-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 ""
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr ""
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr ""
-
-#: src/skins/ui_main.c:1052
+#: src/skins/ui_main.c:807
 #, c-format
-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 ""
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-msgstr ""
-
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, fuzzy, c-format
 msgid "Volume: %d%%"
 msgstr "Valjus: (%)"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 #, fuzzy
 msgid "Options Menu"
 msgstr "Valikud"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 #, fuzzy
 msgid "File Info Box"
 msgstr "Faili andmed"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr ""
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr ""
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr ""
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 #, fuzzy
 msgid "Playlist mode."
 msgstr "Esitusnimekirja valimine"
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr ""
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr ""
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr ""
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
-msgid "Peaks"
-msgstr ""
-
 #: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
-msgid "Show Player"
+msgid "Stop after Current Song"
 msgstr ""
 
 #: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
-msgid "Show Playlist Editor"
+msgid "Peaks"
 msgstr ""
 
 #: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
-msgid "Show Equalizer"
+msgid "Repeat"
 msgstr ""
 
 #: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
-msgid "Always on Top"
+msgid "Shuffle"
 msgstr ""
 
 #: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
-msgid "Put on All Workspaces"
+msgid "No Playlist Advance"
 msgstr ""
 
 #: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
-msgid "Roll up Player"
+msgid "Show Player"
 msgstr ""
 
 #: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
-msgid "Roll up Playlist Editor"
+msgid "Show Playlist Editor"
 msgstr ""
 
 #: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
-msgid "Roll up Equalizer"
+msgid "Show Equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+msgid "Always on Top"
 msgstr ""
 
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+msgid "Put on All Workspaces"
 msgstr ""
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+msgid "Roll up Player"
+msgstr ""
+
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+msgid "Roll up Playlist Editor"
+msgstr ""
+
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+msgid "Roll up Equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 #, fuzzy
 msgid "Scope"
 msgstr "Stereo"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr ""
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr ""
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 #, fuzzy
 msgid "Normal"
 msgstr "Vorming"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr ""
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr ""
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 #, fuzzy
 msgid "Lines"
 msgstr "minutit"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr ""
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 #, fuzzy
 msgid "Dot Scope"
 msgstr "Ei korrata"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr ""
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr ""
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr ""
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 #, fuzzy
 msgid "Slow"
 msgstr "Vari"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr ""
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 #, fuzzy
 msgid "Fast"
 msgstr "Vorming"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr ""
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr ""
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr ""
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+#, fuzzy
+msgid "Pause"
+msgstr "Pausimine"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr ""
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+#, fuzzy
+msgid "Next"
+msgstr "Tekst"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr ""
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+#, fuzzy
+msgid "Playlist"
+msgstr "Esitusnimekirja valimine"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#, fuzzy
+msgid "New Playlist"
+msgstr "Esitusnimekirja valimine"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 #, fuzzy
 msgid "Select Next Playlist"
 msgstr "Esitusnimekirja valimine"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 #, fuzzy
 msgid "Select Previous Playlist"
 msgstr "Esitusnimekirja valimine"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#, fuzzy
+msgid "Delete Playlist"
+msgstr "Esitusnimekirja valimine"
+
+#: src/skins/ui_manager.c:222
+#, fuzzy
+msgid "Import Playlist"
+msgstr "Esitusnimekirja andmed kiiresti"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:226
+#, fuzzy
+msgid "Export Playlist"
+msgstr "Esitusnimekirja andmed kiiresti"
+
+#: src/skins/ui_manager.c:227
+#, fuzzy
+msgid "Saves the selected playlist."
+msgstr "Esitusnimekirja valimine"
+
+#: src/skins/ui_manager.c:229
+#, fuzzy
+msgid "Save All Playlists"
+msgstr "Esitusnimekirja valimine"
+
+#: 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:228
-msgid "List Manager"
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
 msgstr ""
 
 #: src/skins/ui_manager.c:238
+msgid "List Manager"
+msgstr ""
+
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr ""
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr ""
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr ""
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr ""
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr ""
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr ""
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 #, fuzzy
 msgid "Invert Selection"
 msgstr "Vormingute valimine"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:270
-msgid "Clear Queue"
+#: src/skins/ui_manager.c:267
+#, fuzzy
+msgid "Select All"
+msgstr "Esitusnimekirja valimine"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
 msgstr ""
 
 #: src/skins/ui_manager.c:271
+#, fuzzy
+msgid "Select None"
+msgstr "Loo lõpp tuvastatakse"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:277
+#, fuzzy
+msgid "Remove All"
+msgstr "Eemalda"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:281
+msgid "Clear Queue"
+msgstr ""
+
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr ""
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr ""
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+#, fuzzy
+msgid "By Title"
+msgstr "Pealkiri"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 #, fuzzy
 msgid "By Filename"
 msgstr "Failinimi"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 #, fuzzy
 msgid "By Path + Filename"
 msgstr "Failinimi"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr ""
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr ""
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr ""
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 #, fuzzy
 msgid "Randomizes the playlist."
 msgstr "Esitusnimekirja valimine"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 #, fuzzy
 msgid "Sort List"
 msgstr "Esitaja:"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#, fuzzy
+msgid "By Album"
+msgstr "Album:"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr ""
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#, fuzzy
+msgid "By Artist"
+msgstr "Esitaja:"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr ""
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr ""
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 #, fuzzy
 msgid "By Date"
 msgstr "Kuupäev:"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr ""
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#, fuzzy
+msgid "By Track Number"
+msgstr "Loo number:"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr ""
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 #, fuzzy
 msgid "Sort Selected"
 msgstr "Vormingute valimine"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+#, fuzzy
+msgid "File"
+msgstr "Failinimi"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Abi"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr ""
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr ""
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr ""
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#, fuzzy
+msgid "About Audacious"
+msgstr "Audacious'e LIRC pluginast lähemalt"
+
+#: src/skins/ui_manager.c:401
 #, fuzzy
 msgid "Play File"
 msgstr "Esitamine"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr ""
+
+#: src/skins/ui_manager.c:404
 #, fuzzy
 msgid "Play Location"
 msgstr "Esitusnimekiri (valikuline)"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr ""
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr ""
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr ""
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr ""
+
+#: src/skins/ui_manager.c:413
+#, fuzzy
+msgid "Quit Audacious"
+msgstr "%s - Audacious"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr ""
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr ""
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr ""
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr ""
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr ""
+
+#: src/skins/ui_manager.c:436
+#, fuzzy
+msgid "Cut"
+msgstr "Praegune"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr ""
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr ""
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 #, fuzzy
 msgid "Preset"
 msgstr "Proovi"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 #, fuzzy
 msgid "Load default preset into equalizer"
 msgstr "Laadi vaikeväärtused"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 #, fuzzy
 msgid "Zero"
 msgstr "Stereo"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr ""
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 #, fuzzy
 msgid "Save default preset"
 msgstr "Laadi vaikeväärtused"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 #, fuzzy
 msgid "To file"
 msgstr "Pealkiri"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:374
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:382
+#: 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 "
@@ -4826,118 +3659,56 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Pealkiri: "
+
+#: src/skins/ui_playlist.c:267
 #, fuzzy
 msgid "Album: "
 msgstr "Album:"
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 #, fuzzy
 msgid "Artist: "
 msgstr "Esitaja:"
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 #, fuzzy
 msgid "Filename: "
 msgstr "Failinimi:"
 
-#: src/skins/ui_playlist.c:419
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:422
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:425
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:776
-#, fuzzy
-msgid "Save as Static Playlist"
-msgstr "Esitusnimekirja valimine"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr ""
-
-#: src/skins/ui_playlist.c:806
-#, fuzzy
-msgid "Load Playlist"
-msgstr "Esitusnimekirja andmed kiiresti"
-
-#: src/skins/ui_playlist.c:819
-#, fuzzy
-msgid "Save Playlist"
-msgstr "Esitusnimekirja valimine"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 #, fuzzy
 msgid "Audacious Playlist Editor"
 msgstr "Esitusnimekirja andmed kiiresti"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "250 Hz"
-msgstr "22050 Hz "
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "500 Hz"
-msgstr "11000 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "1 kHz"
-msgstr "11 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "2 kHz"
-msgstr "22 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "4 kHz"
-msgstr "44 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "8 kHz"
-msgstr "44 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "16 kHz"
-msgstr "44 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr ""
@@ -4970,53 +3741,61 @@
 "Boston, MA 02110-1301 USA"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "Kiirus"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr ""
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Valikud"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr ""
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr ""
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr ""
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr ""
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -5035,25 +3814,21 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 #, fuzzy
 msgid "Song Change"
 msgstr "Loo sõnum"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr ""
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "Olekuikooni pluginast lähemalt"
@@ -5117,74 +3892,19 @@
 "By Johan Levin 1999."
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "Ekstra stereo pluginast lähemalt"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr ""
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-#, fuzzy
-msgid "Search:"
-msgstr "Aasta:"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-#, fuzzy
-msgid "Stream name"
-msgstr "Instrumendi nimi"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-#, fuzzy
-msgid "Now playing"
-msgstr "Esitusnimekirja valimine"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-msgid "Remove Bookmark"
-msgstr ""
-
-#: src/streambrowser/streambrowser.c:340
-#, fuzzy
-msgid "About Stream Browser"
-msgstr "OSS draiverist lähemalt"
-
-#: src/streambrowser/streambrowser.c:341
-#, fuzzy
-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 ""
-"Autoriõigused (c) 2007, Calin Crisan <ccrisan@gmail.com> ja Audacious'e "
-"meeskond.\n"
-"\n"
-"Palju tänu libcdio arendajatele <http://www.gnu.org/software/libcdio/>\n"
-"\tja libcddb arendajatele <http://libcddb.sourceforge.net/>.\n"
-"\n"
-"Samuti tänan Tony Vroon'i minu juhendamise eest.\n"
-"\n"
-"See projekt loodi Google Summer of Code 2007 raames."
-
-#: src/tonegen/tonegen.c:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "Toonigeneraatorist lähemalt"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5193,12 +3913,12 @@
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr ""
 
@@ -5220,15 +3940,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Ogg Vorbis sildid:"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ogg Vorbis audioplugina sätted"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Ogg Vorbis audiopluginast lähemalt"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 #, fuzzy
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
@@ -5291,6 +4011,507 @@
 "Visit the Wavpack site at http://www.wavpack.com/\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "Võimaluse korral kasutatakse CDDB-d"
+
+#, fuzzy
+#~ msgid "_Miscellaneous"
+#~ msgstr "Teenused"
+
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AdPlug'i sätted"
+
+#~ msgid "Sound quality"
+#~ msgstr "Helikvaliteet"
+
+#~ msgid "8bit"
+#~ msgstr "8-bitine"
+
+#~ msgid "16bit"
+#~ msgstr "16-bitine"
+
+#~ msgid "Channels"
+#~ msgstr "Kanaleid"
+
+#~ msgid "Frequency"
+#~ msgstr "Sagedus"
+
+#~ msgid "Detect songend"
+#~ msgstr "Loo lõpp tuvastatakse"
+
+#~ msgid "Formats"
+#~ msgstr "Vormingud"
+
+#~ msgid "Format selection"
+#~ msgstr "Vormingute valimine"
+
+#~ msgid "Format"
+#~ msgstr "Vorming"
+
+#~ msgid "Extension"
+#~ msgstr "Laiend"
+
+#~ msgid "Author: "
+#~ msgstr "Autor: "
+
+#~ msgid "File Type: "
+#~ msgstr "Faili tüüp: "
+
+#~ msgid "Instruments: "
+#~ msgstr "Instrumendid: "
+
+#~ msgid "Patterns: "
+#~ msgstr "Mustrid: "
+
+#~ msgid "Instrument name"
+#~ msgstr "Instrumendi nimi"
+
+#~ msgid "Song message"
+#~ msgstr "Loo sõnum"
+
+#~ msgid "Pattern: "
+#~ msgstr "Muster: "
+
+#~ msgid "Speed: "
+#~ msgstr "Kiirus: "
+
+#~ msgid "About XMMS Alarm"
+#~ msgstr "XMMS-alarmist lähemalt"
+
+#~ 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 ""
+#~ "XMMS-plugin, mida saab kasutada esitamise\n"
+#~ "alustamiseks kindlaksmääratud ajal.\n"
+#~ "\n"
+#~ "Kaebused paluks saata aadressidele:\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 "See on sinu äratus."
+
+#~ msgid "Select Playlist"
+#~ msgstr "Esitusnimekirja valimine"
+
+#~ msgid "Sorry"
+#~ msgstr "Vabandust"
+
+#~ msgid "Warning"
+#~ msgstr "Hoiatus"
+
+#~ msgid "Alarm Settings"
+#~ msgstr "Alarmi sätted"
+
+#~ msgid "Time"
+#~ msgstr "Aeg"
+
+#~ msgid "hours"
+#~ msgstr "tundi"
+
+#~ msgid "h"
+#~ msgstr "t"
+
+#~ msgid "minutes"
+#~ msgstr "minutit"
+
+#~ msgid "Quiet after:"
+#~ msgstr "Vait pärast:"
+
+#~ msgid "Alarm at (default):"
+#~ msgstr "Alarmi aeg (vaikimisi):"
+
+#~ msgid "Choose the days for the alarm to come on"
+#~ msgstr "Alarmi töölehakkamise päevade valimine"
+
+#~ msgid "Day"
+#~ msgstr "Päev"
+
+#~ msgid "Tuesday"
+#~ msgstr "Teisipäeval"
+
+#~ msgid "Wednesday"
+#~ msgstr "Kolmapäeval"
+
+#~ msgid "Thursday"
+#~ msgstr "Neljapäeval"
+
+#~ msgid "Friday"
+#~ msgstr "Reedel"
+
+#~ msgid "Saturday"
+#~ msgstr "Laupäeval"
+
+#~ msgid "Sunday"
+#~ msgstr "Pühapäeval"
+
+#~ msgid "Monday"
+#~ msgstr "Esmaspäeval"
+
+#~ msgid "Days"
+#~ msgstr "Päevad"
+
+#~ msgid "Fading"
+#~ msgstr "Kahanemine"
+
+#~ msgid "Volume"
+#~ msgstr "Valjus"
+
+#~ msgid "Current"
+#~ msgstr "Praegune"
+
+#~ msgid "Start at"
+#~ msgstr "Alguses"
+
+#~ msgid "%"
+#~ msgstr "%"
+
+#~ msgid "Final"
+#~ msgstr "Lõpus"
+
+#~ msgid "Additional Command"
+#~ msgstr "Täiendav käsk"
+
+#~ msgid "enable"
+#~ msgstr "lubatud"
+
+#~ msgid "Playlist (optional)"
+#~ msgstr "Esitusnimekiri (valikuline)"
+
+#~ msgid "Browse..."
+#~ msgstr "Sirvi..."
+
+#~ msgid "Reminder"
+#~ msgstr "Meeldetuletaja"
+
+#~ msgid "Use reminder"
+#~ msgstr "Meeldetuletaja on kasutusel"
+
+#~ msgid "What do these options mean?"
+#~ msgstr "Mida need valikud tähendavad?"
+
+#, fuzzy
+#~ msgid "Current Headset"
+#~ msgstr "Praegune"
+
+#, fuzzy
+#~ msgid "_Connect"
+#~ msgstr "Asukoht:"
+
+#, fuzzy
+#~ msgid "Class"
+#~ msgstr "Sulge"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "Seadme aadress"
+
+#, fuzzy
+#~ msgid "Detected"
+#~ msgstr "Loo lõpp tuvastatakse"
+
+#, fuzzy
+#~ msgid "Not Detected"
+#~ msgstr "Vormingute valimine"
+
+#~ msgid "Device name:"
+#~ msgstr "Seadne nimi:"
+
+#~ msgid "Device file:"
+#~ msgstr "Seadmefail:"
+
+#~ msgid "Active"
+#~ msgstr "Aktiivne"
+
+#~ msgid "Status"
+#~ msgstr "Olek"
+
+#~ msgid "Device Name"
+#~ msgstr "Seadme nimi"
+
+#~ msgid "Device File"
+#~ msgstr "Seadmefail"
+
+#~ msgid "Device Address"
+#~ msgstr "Seadme aadress"
+
+#~ msgid "Name: "
+#~ msgstr "Nimi: "
+
+#~ msgid "Filename: "
+#~ msgstr "Failinimi: "
+
+#~ msgid "Name"
+#~ msgstr "Nimi"
+
+#~ msgid "UID"
+#~ msgstr "UID"
+
+#~ msgid "Installed plugins"
+#~ msgstr "Paigaldatud pluginad"
+
+#~ msgid "Running plugins"
+#~ msgstr "Töötavad pluginad"
+
+#~ msgid "Add"
+#~ msgstr "Lisa"
+
+#~ msgid "Remove"
+#~ msgstr "Eemalda"
+
+#~ msgid "LADSPA Plugin Catalog"
+#~ msgstr "LADSPA pluginate kataloog"
+
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "Audacious'e LIRC pluginast lähemalt"
+
+#, fuzzy
+#~ msgid "Connection"
+#~ msgstr "Asukoht:"
+
+#~ msgid "ModPlug Configuration"
+#~ msgstr "ModPlug'i sätted"
+
+#~ msgid "16 bit"
+#~ msgstr "16-bitine"
+
+#~ msgid "8 bit"
+#~ msgstr "8-bitine"
+
+#, fuzzy
+#~ msgid "96 kHz"
+#~ msgstr "44 kHz"
+
+#, fuzzy
+#~ msgid "48 kHz"
+#~ msgstr "44 kHz"
+
+#~ msgid "44 kHz"
+#~ msgstr "44 kHz"
+
+#~ msgid "22 kHz"
+#~ msgstr "22 kHz"
+
+#~ msgid "Sampling Rate"
+#~ msgstr "Diskreetimissagedus"
+
+#~ msgid "Enable"
+#~ msgstr "Lubatud"
+
+#~ msgid "Depth"
+#~ msgstr "Sügavus"
+
+#~ msgid "Delay"
+#~ msgstr "Viivitus"
+
+#~ msgid "Effects"
+#~ msgstr "Efektid"
+
+#~ msgid "Use Filename as Song Title"
+#~ msgstr "Failinime kasutatakse pealkirjaks"
+
+#~ msgid "Fast Playlist Info"
+#~ msgstr "Esitusnimekirja andmed kiiresti"
+
+#~ msgid "Noise Reduction"
+#~ msgstr "Müra vähendatakse"
+
+#~ msgid "Play Amiga MOD"
+#~ msgstr "Esitatakse Amiga MOD-e"
+
+#~ msgid "Don't loop"
+#~ msgstr "Ei korrata"
+
+#~ msgid "Loop"
+#~ msgstr "Korratakse"
+
+#~ msgid "time(s)"
+#~ msgstr "kord(a)"
+
+#~ msgid "Loop forever"
+#~ msgstr "Korratakse igavesti"
+
+#~ msgid "Looping"
+#~ msgstr "Kordamine"
+
+#~ msgid "MOD Info"
+#~ msgstr "MOD-i andmed"
+
+#~ msgid ""
+#~ "Filename:\n"
+#~ "Title:\n"
+#~ "Type:\n"
+#~ "Length:\n"
+#~ "Speed:\n"
+#~ "Tempo:\n"
+#~ "Samples:\n"
+#~ "Instruments:\n"
+#~ "Patterns:\n"
+#~ "Channels:"
+#~ msgstr ""
+#~ "Failinimi:\n"
+#~ "Pealkiri:\n"
+#~ "Liik:\n"
+#~ "Kestus:\n"
+#~ "Kiirus:\n"
+#~ "Tempo:\n"
+#~ "Sämpleid:\n"
+#~ "Instrumente:\n"
+#~ "Mustreid:\n"
+#~ "Kanaleid:"
+
+#~ msgid ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+#~ msgstr ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+
+#~ msgid "Samples"
+#~ msgstr "Sämplid"
+
+#~ msgid "Instruments"
+#~ msgstr "Instrumendid"
+
+#~ msgid "Message"
+#~ msgstr "Sõnum"
+
+#, fuzzy
+#~ 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 helimootor, autor: Olivier Lapicque.\n"
+#~ "Modplug'i XMMS-liidese autor: Kenton Varda.\n"
+#~ "Autoriõigused (c) 2000 Olivier Lapicque ja Kenton Varda.\n"
+#~ "Uuendused ja hooldus: Konstanty Bialkowski.\n"
+#~ "BMP jaoks portinud Theofilos Intzoglou."
+
+#~ msgid "About Modplug"
+#~ msgstr "Modplug'ist lähemalt"
+
+#, fuzzy
+#~ msgid "Blue"
+#~ msgstr "Valjus"
+
+#, fuzzy
+#~ msgid "Search:"
+#~ msgstr "Aasta:"
+
+#, fuzzy
+#~ msgid "Stream name"
+#~ msgstr "Instrumendi nimi"
+
+#, fuzzy
+#~ msgid "Now playing"
+#~ msgstr "Esitusnimekirja valimine"
+
+#, fuzzy
+#~ msgid "About Stream Browser"
+#~ msgstr "OSS draiverist lähemalt"
+
+#, fuzzy
+#~ 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 ""
+#~ "Autoriõigused (c) 2007, Calin Crisan <ccrisan@gmail.com> ja Audacious'e "
+#~ "meeskond.\n"
+#~ "\n"
+#~ "Palju tänu libcdio arendajatele <http://www.gnu.org/software/libcdio/>\n"
+#~ "\tja libcddb arendajatele <http://libcddb.sourceforge.net/>.\n"
+#~ "\n"
+#~ "Samuti tänan Tony Vroon'i minu juhendamise eest.\n"
+#~ "\n"
+#~ "See projekt loodi Google Summer of Code 2007 raames."
+
+#, fuzzy
+#~ msgid "minutes:seconds"
+#~ msgstr "minutit"
+
+#, fuzzy
+#~ msgid "Track length:"
+#~ msgstr "Loo number:"
+
+#, fuzzy
+#~ msgid "Show/hide statusbar"
+#~ msgstr "Esitusnimekirja valimine"
+
+#, fuzzy
+#~ msgid "Refresh Selected"
+#~ msgstr "Vormingute valimine"
+
+#, fuzzy
+#~ msgid "Edit the playlist title."
+#~ msgstr "Esitusnimekirja valimine"
+
+#, fuzzy
+#~ msgid "By Formatted Title"
+#~ msgstr "Pealkiri"
+
+#, fuzzy
+#~ msgid "Components"
+#~ msgstr "Kommentaar:"
+
+#, fuzzy
+#~ msgid "Save as Static Playlist"
+#~ msgstr "Esitusnimekirja valimine"
+
+#, fuzzy
+#~ msgid "Load Playlist"
+#~ msgstr "Esitusnimekirja andmed kiiresti"
+
+#, fuzzy
+#~ msgid "Save Playlist"
+#~ msgstr "Esitusnimekirja valimine"
+
 #~ msgid ""
 #~ "best/slowest:0;\n"
 #~ "worst/fastest:9;\n"
@@ -5614,10 +4835,6 @@
 #~ msgstr "Vaikimisi (%s)"
 
 #, fuzzy
-#~ msgid "_Rename"
-#~ msgstr "Failinimi"
-
-#, fuzzy
 #~ msgid "About Icecast-Plugin"
 #~ msgstr "Kajapluginast lähemalt"

audacious-plugins-2.5.3.tar.gz/po/eu.po -> audacious-plugins-3.0.tar.gz/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-05-19 10:53-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"
@@ -18,7 +18,7 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, fuzzy, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -29,620 +29,54 @@
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM (c) Nero AG, www.nero.com\n"
 "Copyright-a (c) 2005-2006 Audacious taldea"
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 #, fuzzy
 msgid "About MP4 AAC decoder plugin"
 msgstr "MP4 AAC erreproduzitzailearen pluginari buruz"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "Honi buruz: "
-
-#: src/adplug/adplug-xmms.cc:155
-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-a (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
-"\n"
-"Plugin hau GNU GPL lizentziako terminoen eta baldintzen pean kaleratua.\n"
-"Xehetasunetarako ikusi honako web orrialdea:\n"
-"http://www.gnu.org/licenses/lgpl.html\n"
-"\n"
-"Plugin honek AdPlug liburutegia erabiltzen du. AdPlug-en copyright-a (C) "
-"Simon Peter, eta al.\n"
-"Estekatutako AdPlug liburutegiaren bertsioa: "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: Konfigurazioa"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "Ados"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Utzi"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "Orokorra"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Soinuaren kalitatea"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Bereizmena"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8 bit"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16 bit"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Kanalak"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Monoa"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Estereoa"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-"Estereoa ezartzea ez da gomendagarria, ez baduzu behar bederen. Honek ez dio "
-"inolako estereo efekturik gehituko soinuari (OPL2 monoa da soilik) eta "
-"PUZaren errendimendu gehiago beharko du."
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Maiztasuna"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Erreprodukzioa"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Detektatu abestiaren amaiera"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-"Gaitzen bada XMMS-ek abestiaren amaiera detektatuko du, gelditu eta "
-"erreprodukzio-zerrendan aurrera egingo du. Desgaitzen bada, XMMS ez da "
-"ohartuko abesti baten amaierarekin eta behin eta berriz begiztatuko du."
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Formatuak"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Formatuaren hautapena"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Formatua"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Luzapena"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-"Hautatutako fitxategi motak ezagutuko dira eta plugin honek erreproduzituko "
-"ditu. Desautatutako motei ezikusi egingo zaie, beste plugin batzuei lekua "
-"egiteko fitxategi hauek erreproduzitzeko."
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: Fitxategiaren informazioa"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Fitxategi-Izena"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Izenburua: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Egilea: "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Fitxategi mota: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "Azpiabestiak: "
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Instrumentuak: "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "Ordenak: "
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Ereduak: "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Abestia"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Instrumentuaren izena"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Abestiaren mezua"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "Azpiabestiaren hautapena"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Ordena: "
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Eredua: "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Errenkada: "
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Abiadura: "
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Tenporizadorea: "
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "XMMS alarmari buruz"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "XMMS alarma"
-
-#: src/alarm/interface.c:56
-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 ""
-"XMMSren plugin bat denbora zehatz batean\n"
-"erreproduzitzen hasteko.\n"
-"\n"
-"Bidali kexuak hona:\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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Itxi"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Alarma"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "Hau zu esnatzeko deia da."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "Ados"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Hautatu erreprodukzio-zerrenda"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Barkatu"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Abisua"
-
-#: src/alarm/interface.c:213
-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 ""
-"Segurtasuneko arrazoiak direla medio, \"quiet\" (isilik) denbora iraungitze-"
-"denbora (10 segundo baino gehiagokoa izan behar duelarik) baino gutxienez 65 "
-"segundo luzeagoa izan behar du. Honek kodean akats bat dagoela adierazi nahi "
-"du, eta hau konpondu arte mezu hau agertuko dela :)\n"
-"\n"
-"Iraungitzearen ezarpenak EZ dira gorde\n"
-"\n"
-"--\n"
-"Adam"
-
-#: src/alarm/interface.c:229
-msgid "Oh Well"
-msgstr "Ongi"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Alarmaren ezarpenak"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Ordua"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "ordu"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "o"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "minutu"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Isildu honen ondoren:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Alarma (lehenetsia):"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Aukeratu zein egunetan alarma aktibatuko den"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Lehenetsia"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Eguna"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Asteartea"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Asteazkena"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Osteguna"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Ostirala"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Larunbata"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Igandea"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Astelehena"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Egunak"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Iraungitzea"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "segundo"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Bolumena"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Unekoa"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "berrezarri uneko irteera bolumenera"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Hasiera:"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Amaiera"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Komando gehigarria"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "gaitu"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Erreprodukzio-zerrenda (aukerakoa)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Arakatu..."
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Oroigarria"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Erabili oroigarria"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Aukerak"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Zer esanahi dute aukera hauek?"
-
-#: src/alarm/interface.c:1364
-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"
-"Ordua\n"
-" Alarma: \n"
-"\n"
-" Ordua alarma aktibatzeko\n"
-"\n"
-" Isildu honen ondoren: \n"
-" Gelditu alarma denbora kopuruaren ostean.\n"
-" (iratzartzeko elkarrizketa-koadroa ez bada ixten)\n"
-"\n"
-"\n"
-"Egunak\n"
-" Eguna:\n"
-" Hautatu egunak alarma aktibatzeko.\n"
-"\n"
-" Ordua:\n"
-" Aukeratu egun bakoitzeko alarmaren ordua,\n"
-" (edo hautatu txandakatzeko botoia denbora\n"
-" lehenetsia erabiltzeko).\n"
-"\n"
-"\n"
-"Bolumena\n"
-" Iraungitzea: \n"
-" Iraungitu bolumena gorantz aukeratutako bolumenerarte\n"
-" denbora kopuru honentzako.\n"
-"\n"
-" Hasiera: \n"
-" Hasi iraungitzea bolumen honetatik\n"
-"\n"
-" Amaiera: \n"
-" Amaierako bolumenean iraungitzea gelditzeko. Iraungitzearen\n"
-" denbora 0 bada, bolumena honekin ezartzen du eta\n"
-" erreproduzitzen hasten da.\n"
-"\n"
-"\n"
-"Aukerak:\n"
-" Komando gehigarriak:\n"
-" Exekutatu komando hau alarmaren orduan.\n"
-"\n"
-" Erreprodukzio-zerrenda: \n"
-" Kargatu erreprodukzio-zerrenda hau bertatik\n"
-" abestiak erreproduzitzeko (.m3u luzapena\n"
-" eduki behar du). Ez bada erreprodukzio-zerrendarik\n"
-" ematen, uneko zerrendan dauden abestiak\n"
-" erabiliko dira.\n"
-" Hemen mp3/ogg korrontearen URLa sar daitekeen\n"
-" arren, oraingoz xmms-ek ez du URLrik onartzen.\n"
-"\n"
-" Oroigarria: \n"
-" Oroigarri bat bistaratzen du alarma itzaltzean,\n"
-" idatzi oroigarria kutxan eta piztu txandakatzeko\n"
-" botoia oroigarri hori bistaratzea nahi baduzu.\n"
-
-#: src/alarm/interface.c:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Laguntza"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "Gaurko zure oroigarria: "
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Eskerrik asko"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 #, fuzzy
 msgid "Default PCM device"
 msgstr "PCM gailu lehenetsia (%s)"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 #, fuzzy
 msgid "Default mixer device"
 msgstr "PCM gailu lehenetsia (%s)"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 #, fuzzy
 msgid "ALSA Output Plugin Preferences"
 msgstr "Egoeraren ikonoa plugina - Hobespenak"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 #, fuzzy
 msgid "PCM device:"
 msgstr "Nahastailearen gailua:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Nahastailearen gailua:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 #, fuzzy
 msgid "Mixer element:"
 msgstr "Nahastailearen gailua:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 #, fuzzy
 msgid "About ALSA Output Plugin"
 msgstr "JACK irteerako plugina 0.17 buruz"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -809,6 +243,10 @@
 msgid "SoundFont settings"
 msgstr "SoundFont ezarpenak"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Fitxategi-Izena"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Tamaina (byte)"
@@ -915,8 +353,7 @@
 "TiMidity\n"
 "motorra"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Izena:"
 
@@ -1089,119 +526,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSDa abiarazten du erreprodukzioa jarraitzean."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Kokalekua"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "X desplazamendu erlatiboa:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Y desplazamendu erlatiboa:"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "OSDaren gehi. zabalera:"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Pantaila anitzen aukerak"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "Bistaratu OSDa hau erabiliz:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "pantaila guztiak"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "%i. pantaila"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Tenporizadorea (ms)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "Bistaratu:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "Pixkanaka agertu:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "Iraungitu:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Letra-tipoak"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "%i letra-tipoa:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Itzala"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Nazioartekotzea"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "Desgaitu testuaren UTF-8 bihurketa (aosd-en)"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "Hautatu azalaren fitxategia"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Errendatze estiloa"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Koloreak"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "%i kolorea:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "Azal pertsonalizatua"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "Azalaren fitxategia:"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "Arakatu"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Gaitu abiarazlea"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Gertaera"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "Kudeatzaile konposatua detektatuta"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1211,73 +648,73 @@
 "Bat exekutatzen dagoela jakin ezean, aktibatu konposaketako kudeatzalea "
 "bestela OSDak ez du ongi funtzionatuko"
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "Gardentasun faltsua egiteko ez da konposaketako kudeaketak behar"
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Gardentasuna"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Gardentasun faltsua"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Egitako gardentasuna (Xen konposaketa hed. behar da)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "Konposaketako hedapena ez da kargatu"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "Konposaketako hedapena ez dago erabilgarri"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSDa"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSDa - konfigurazioa"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Proba"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Posizioa"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Animazioa"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Testua"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Dekorazioa"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Abiarazlea"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Hainbat"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "Audacious OSDa - honi buruz"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1285,7 +722,7 @@
 "\n"
 "Audacious OSDa "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1307,132 +744,6 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr ""
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr ""
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr ""
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr ""
-
-#: src/bluetooth/gui.c:221
-#, fuzzy
-msgid "Available Headsets"
-msgstr "Motor erabilgarriak"
-
-#: src/bluetooth/gui.c:224
-#, fuzzy
-msgid "Current Headset"
-msgstr "Unekoa"
-
-#: src/bluetooth/gui.c:227
-#, fuzzy
-msgid "_Refresh"
-msgstr "Freskatu tasa"
-
-#: src/bluetooth/gui.c:231
-#, fuzzy
-msgid "_Connect"
-msgstr "Konexioa"
-
-#: src/bluetooth/gui.c:237
-#, fuzzy
-msgid "_Close"
-msgstr "Itxi"
-
-#: src/bluetooth/gui.c:274
-msgid "Class"
-msgstr ""
-
-#: src/bluetooth/gui.c:278
-#, fuzzy
-msgid "Address:"
-msgstr "Gailuaren helbidea"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:138
-#, fuzzy
-msgid "Rescan"
-msgstr "Berreskaneatu CDa"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "Erreproduzitu"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Lausotu esparrua: kolore hautapena"
@@ -1441,12 +752,12 @@
 msgid "Options:"
 msgstr "Aukerak:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 #, fuzzy
 msgid "About Audio CD Plugin"
 msgstr "FLAC audioaren pluginari buruz"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 #, fuzzy
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
@@ -1472,16 +783,16 @@
 "\n"
 "Google Summer of Code 2007 proiektu bat izan da."
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 #, fuzzy
 msgid "Audio CD"
 msgstr "Audioa"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -1530,12 +841,24 @@
 msgid "Override default device: "
 msgstr "Gainidatzi gailu lehenetsia: "
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+msgid "Ok"
+msgstr "Ados"
+
+#: 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 "Utzi"
+
+#: src/cd-menu-items/cd-menu-items.c:34
 #, fuzzy
 msgid "Play CD"
 msgstr "Erreproduzitu"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "Gehitu CDa"
 
@@ -1563,6 +886,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Kontsolako musika dekodetzailea"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "Orokorra"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Erreprodukzioa"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Baxua:"
@@ -1580,8 +911,7 @@
 msgid "Default song length:"
 msgstr "Abestiaren luzera lehenetsia:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Birlagintzea"
 
@@ -1593,6 +923,10 @@
 msgid "Resampling rate:"
 msgstr "Birlagintze-tasa:"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1664,16 +998,16 @@
 "same rate."
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "Konfiguratu Crystalizer"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Efektuaren intentsitatea:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Aplikatu"
 
@@ -1713,392 +1047,32 @@
 msgid "Volume: (%)"
 msgstr "Bolumena (%):"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "Erreprodukzioa->Erreproduzitu"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "Erreprodukzioa->Gelditu"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "Erreprodukzioa->Pausarazi"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "Erreprodukzioa->Aurrekoa"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "Erreprodukzioa->Hurrengoa"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "Erreprodukzioa->Egotzi"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "Erreprodukzio-zerrenda->Errepikatu"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "Erreprodukzio-zerrenda->Ausaz"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "Bolumena->Igo _5"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "Bolumena->Jeitsi _5"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "Bolumena->Igo _10"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "Bolumena->Jeitsi _10"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "Bolumena->Mututu"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "Leihoa->Nagusia"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "Leihoa->Erreprodukzio-zerrenda"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "Leihoa->Ekualizadorea"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "Leihoa->Jauzi fitxategira"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-"event-device-plugin: ezin da gailuko %s fitxategia ireki, gailu hau "
-"saltatzen. Egiaztatu fitxategia existitzen dela eta hura irakurtzeko "
-"baimenak dituzula.\n"
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-"event-device-plugin: ezin da io_channel sortu gailuko %s fitxategiarentzako."
-"Gailua saltatzen\n"
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: ezin da /proc/bus/input/devices ireki, gertaeren "
-"gailuaren detekzio automatikoak ez du funtzionatuko.\n"
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-"event-device-plugin: ezin da io_channel ireki /proc/bus/input/devices-"
-"rentzako, gertaeren gailuaren detekzio automatikoak ez du funtzionatuko.\n"
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: errorea gertatu da /proc/bus/input/devices irakurtzean, "
-"gertaeren gailuaren detekzio automatikoak ez du funtzionatuko.\n"
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr "event-device-plugin: ez da %s aurkitu /dev/input-en, saltatzen.\n"
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-"event-device-plugin: ezin da %s konfigurazio-fitxategia kargatu, ezarpen "
-"lehenetsiak erabiliko dira.\n"
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-"event-device-plugin: osatu gabeko informazioa \"%s\" gailuaren "
-"konfigurazioko fitxategian, saltatzen.\n"
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurazioa, ezin da \"%s\" gailuaren is_active "
-"balioa lortu, saltatzen.\n"
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-"event-device-plugin: ezin da lokaleko %s direktorioa atzitu, ezarpenak ez "
-"dira gordeko.\n"
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurazioa, ezin da \"%s\" gailuaren fitxategi-"
-"izenaren balioa, saltatzen.\n"
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurazioa, ezin da \"%s\" gailuaren balio fisikoa a "
-"lortu, saltatzen.\n"
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurazioa, ezin da \"%s\" gailuaren is_custom "
-"balioa lortu, saltatzen.\n"
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurazioa, \"%s\" gailuaren ustekabeko balioa, "
-"saltatzen.\n"
-
-#: src/evdev-plug/ed_ui.c:212
-#, fuzzy
-msgid "Detected"
-msgstr "Detektatu abestiaren amaiera"
-
-#: src/evdev-plug/ed_ui.c:217
-#, fuzzy
-msgid "Custom"
-msgstr "pertsonalizatua "
-
-#: src/evdev-plug/ed_ui.c:223
-#, fuzzy
-msgid "Not Detected"
-msgstr "Ordenatu hautatutakoak"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "Informazioa"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-"Ezin da detektatu ez den gailuaren loturen leihoa ireki.\n"
-"Ziurtatu gailua ongi konektatuta dagoela."
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Errorea"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-"Ezin da hautatutako gailua ireki.\n"
-"Egiaztatu gailuko fitxategia irakurtzeko baimenak dituzula."
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "EvDev-Plug - Gehitu gailu pertsonalizatua"
-
-#: src/evdev-plug/ed_ui.c:353
-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 ""
-"Sisteman erabilgarri dauden gailuen gertaerak automatikoki \n"
-"detektatu eta informazioa eguneratzen saiatzen da EvDev-Plug.\n"
-"Hala ere, detekzio automatikoak ez badu funtzionatzen sisteman,\n"
-"edo gertaeren gailuak leku ez estandar batean badaude (unean \n"
-"/dev/input-en soilik egiten da bilaketa), gailu pertsonalizatua gehitzea\n"
-"nahi izan dezakezu gailuaren izena eta fitxategia zehaztuz. "
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Gailuaren izena:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Gailuaren fitxategia:"
-
-#: src/evdev-plug/ed_ui.c:404
-#, fuzzy
-msgid "(custom)"
-msgstr "pertsonalizatua "
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-"Zehaztu bai izena bai fitxategi-izena.\n"
-"Fitxategi-izenak bide-izen absolutua eduki behar du."
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr ""
-"Nahi duzu hautatutako gailuaren existitzen den konfigurazioa kentzea?\n"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "Nahi duzu hautatutako gailu pertsonalizatua kentzea?\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "EvDev-Plug - Konfigurazioa"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Aktibo"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Egoera"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Gailuaren izena"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Gailuaren fitxategia"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Gailuaren helbidea"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "_Loturak"
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-"Sakatu gailuaren tekla bat lotzeko; \n"
-"bost segundotan ez bada teklarik sakatzen,\n"
-"leiho hau itxi egingo da loturak aldatu gabe."
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-"Sarrerako gertaera hau jadanik lotuta dago.\n"
-"\n"
-"Ezin da hainbat ekintza sarrerako gertaera berdinari esleitu (nahiz eta "
-"ekintza berdina hainbat gertaerei esleitzea posiblea den)."
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Plug - Loturen konfigurazoa"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "Izena: "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Fitxategi-izena: "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Helbide fisikoa: "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "EvDev-Plug - honi buruz"
-
-#: src/evdev-plug/ed_ui.c:1491
-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"
-"erreproduzitzailearen urruneko kontrola gertaera-gailuen bidez.\n"
-"http://www.develia.org/projects.php?p=audacious#evdevplug\n"
-"\n"
-"garatzailea: Giacomo Lozito\n"
-
-#: src/ffaudio/ffaudio-core.c:765
+#: 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"
 "Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "FLAC audioaren pluginari buruz"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "FileWriter-pluginari buruz"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2135,51 +1109,51 @@
 "02110-1301,\n"
 "USA."
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "FileWriter konfigurazioa"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Irteerako fitxategi-formatua:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Konfiguratu"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Gorde jatorrizko direktorioan"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Gorde direktorio pertsonalizatuan"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Irteerako fitxategiaren karpeta:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Hautatu karpeta"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Lortu fitxategi-izena hemendik:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "jatorrizko fitxategi-etiketak"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "jatorrizko fitxategi-izena"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Ez kendu fitxategi-izenaren luzapena"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "Jarri pistaren zenbakia fitxategi-izenaren aurretik"
 
@@ -2192,6 +1166,14 @@
 msgid "Joint Stereo"
 msgstr "Estereo-lotura"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Estereoa"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Monoa"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "MP3 konfigurazioa"
@@ -2237,7 +1219,6 @@
 msgstr "Erroreen aurkako babesa"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Kalitatea"
 
@@ -2345,11 +1326,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "GNOMEko lasterbideen pluginari buruz"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2363,62 +1344,24 @@
 "Copyright-a (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 #, fuzzy
 msgid "Add Files"
 msgstr "Gehitu fitxategiak..."
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 #, fuzzy
 msgid "Audacious2"
 msgstr "Audacious"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr ""
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr "Ezin da denboran jauzirik egin pista ez denean erreproduzitzen ari.\n"
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr "Jauzi denborara"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr "minutu:segundo"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr "Pistaren luzera:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr "Errorea \"%s\" erreprodukzio-zerrenda idaztean: %s"
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-#, fuzzy
-msgid "Export Playlist"
-msgstr "Kargatu erreprodukzio-zerrenda"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-#, fuzzy
-msgid "Import Playlist"
-msgstr "Kargatu erreprodukzio-zerrenda"
-
 #: src/gtkui/columns.c:36
 #, fuzzy
 msgid "Entry number"
@@ -2517,435 +1460,318 @@
 msgid "Disable"
 msgstr "aldagaia"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr ""
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr "Gelditu uneko abestiaren ondoren"
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr "Errepikatu"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr "Ausazkoa"
-
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr "Erreprodukzio-zerrenda aurreraturik ez"
-
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:52
+#: src/gtkui/menus.c:132
 #, fuzzy
-msgid "Show main menu"
-msgstr "Erakutsi erreproduzitzaile nagusiaren leihoa"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr ""
+msgid "_Open Files ..."
+msgstr "Gehitu fitxategiak..."
 
-#: src/gtkui/ui_manager.c:55
+#: src/gtkui/menus.c:133
 #, fuzzy
-msgid "Show statusbar"
-msgstr "Egoera"
+msgid "Open _URL ..."
+msgstr "Gehitu fitxategiak..."
 
-#: src/gtkui/ui_manager.c:56
+#: src/gtkui/menus.c:134
 #, fuzzy
-msgid "Show/hide statusbar"
-msgstr "Kargatu erreprodukzio-zerrenda"
+msgid "_Add File ..."
+msgstr "Gehitu fitxategiak..."
 
-#: src/gtkui/ui_manager.c:58
+#: src/gtkui/menus.c:135
 #, fuzzy
-msgid "Show Column Headers"
-msgstr "Erakutsi erreproduzitzailea"
+msgid "Add U_RL ..."
+msgstr "Gehitu fitxategiak..."
 
-#: src/gtkui/ui_manager.c:60
+#: src/gtkui/menus.c:137
 #, fuzzy
-msgid "Scroll on Song Change"
-msgstr "Abestiaren mezua"
-
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
-msgstr "Pausatu"
-
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
-msgstr "Gelditu"
-
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
-msgstr "Aurrekoa"
-
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
-msgstr "Hurrengoa"
-
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "Erreprodukzio-zerrenda"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "Erreprodukzio-zerrenda berria"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "Ezabatu erreprodukzio-zerrenda"
+msgid "A_bout ..."
+msgstr "Honi buruz: "
 
-#: src/gtkui/ui_manager.c:95
+#: src/gtkui/menus.c:138
 #, fuzzy
-msgid "Import Playlist ..."
-msgstr "Kargatu erreprodukzio-zerrenda"
+msgid "_Preferences ..."
+msgstr "Hobespenak"
 
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr ""
-"Erreprodukzio-zerrendaren fitxategia kargatzen du hautatutako erreprodukzio-"
-"zerrendan."
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
+msgstr "I_rten"
 
-#: src/gtkui/ui_manager.c:98
+#: src/gtkui/menus.c:142
 #, fuzzy
-msgid "Export Playlist ..."
-msgstr "Kargatu erreprodukzio-zerrenda"
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "Hautatutako erreprodukzio-zerrenda gordetzen du"
+msgid "_Play"
+msgstr "Erreproduzitu"
 
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
+#: src/gtkui/menus.c:143
 #, fuzzy
-msgid "Save All Playlists"
-msgstr "Gorde erreprodukzio-zerrenda"
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
+msgid "Paus_e"
+msgstr "Pausatu"
 
-#: src/gtkui/ui_manager.c:106
+#: src/gtkui/menus.c:144
 #, fuzzy
-msgid "Refresh"
-msgstr "Freskatu tasa"
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr ""
-"Erreprodukzio-zerrendako sarrera bati esleituta dagoen metadatuak freskatzen "
-"ditu."
+msgid "_Stop"
+msgstr "Gelditu"
 
-#: src/gtkui/ui_manager.c:110
+#: src/gtkui/menus.c:145
 #, fuzzy
-msgid "Refresh Selected"
-msgstr "Kendu hautatutakoak"
+msgid "Pre_vious"
+msgstr "Aurrekoa"
 
-#: src/gtkui/ui_manager.c:111
+#: src/gtkui/menus.c:146
 #, fuzzy
-msgid "Refreshes metadata associated with selected entries."
-msgstr ""
-"Erreprodukzio-zerrendako sarrera bati esleituta dagoen metadatuak freskatzen "
-"ditu."
+msgid "_Next"
+msgstr "Hurrengoa"
 
-#: src/gtkui/ui_manager.c:115
+#: src/gtkui/menus.c:148
 #, fuzzy
-msgid "Playlist Manager"
-msgstr "Zerrenda-kudeatzailea"
-
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr "Erreprodukzio-zerrenden kudeatzailea irekitzen du."
+msgid "_Repeat"
+msgstr "Errepikatu"
 
-#: src/gtkui/ui_manager.c:119
+#: src/gtkui/menus.c:149
 #, fuzzy
-msgid "Add URL ..."
-msgstr "Gehitu fitxategiak..."
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr "Gehitu urruneko pista erreprodukzio-zerrendari."
+msgid "S_huffle"
+msgstr "Ausazkoa"
 
-#: src/gtkui/ui_manager.c:123
+#: src/gtkui/menus.c:150
 #, fuzzy
-msgid "Add Files ..."
-msgstr "Gehitu fitxategiak..."
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr "Gehitu fitxategiak erreprodukzio-zerrendari."
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr "Kendu guztiak"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr "Sarrera guztiak kentzen ditu erreprodukzio-zerrendatik"
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr "Kendu desautatutakoak"
-
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr "Desautatutako sarrerak kentzen ditu erreprodukzio-zerrendatik."
-
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr "Kendu hautatutakoak"
+msgid "N_o Playlist Advance"
+msgstr "Erreprodukzio-zerrenda aurreraturik ez"
 
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr "Hautatutako sarrerak kentzen ditu erreprodukzio-zerrendatik."
+#: src/gtkui/menus.c:151
+#, fuzzy
+msgid "Stop _After This Song"
+msgstr "Gelditu uneko abestiaren ondoren"
 
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:140
+#: src/gtkui/menus.c:154
 #, fuzzy
-msgid "Edit the playlist title."
-msgstr "Nahastu ausaz erreprodukzio-zerrenda"
+msgid "Jump to _Time ..."
+msgstr "Jauzi denborara"
 
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:146
+#: src/gtkui/menus.c:158
 #, fuzzy
-msgid "Sort"
-msgstr "Ataka"
-
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
+msgid "By Track _Number"
 msgstr "Pista zenbakiaren arabera"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
+#: src/gtkui/menus.c:159
+#, fuzzy
+msgid "By _Title"
 msgstr "Tituluaren arabera"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
+#: src/gtkui/menus.c:160
+#, fuzzy
+msgid "By _Artist"
 msgstr "Artistaren arabera"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
+#: src/gtkui/menus.c:161
 #, fuzzy
-msgid "By Album"
+msgid "By A_lbum"
 msgstr "Albuma:"
 
-#: src/gtkui/ui_manager.c:155
+#: src/gtkui/menus.c:162
 #, fuzzy
-msgid "By Release Date"
+msgid "By Release _Date"
 msgstr "Dataren arabera"
 
-#: src/gtkui/ui_manager.c:157
+#: src/gtkui/menus.c:163
 #, fuzzy
-msgid "By File Path"
+msgid "By _File Path"
 msgstr "Fitxategi-izenaren arabera"
 
-#: src/gtkui/ui_manager.c:159
+#: src/gtkui/menus.c:164
 #, fuzzy
-msgid "By Formatted Title"
-msgstr "Tituluaren arabera"
+msgid "By _Custom Title"
+msgstr "Azal pertsonalizatua"
 
-#: src/gtkui/ui_manager.c:161
+#: src/gtkui/menus.c:166
 #, fuzzy
-msgid "Reverse Order"
+msgid "R_everse Order"
 msgstr "Alderantzikatu zerrenda"
 
-#: src/gtkui/ui_manager.c:163
+#: src/gtkui/menus.c:167
 #, fuzzy
-msgid "Random Order"
+msgid "_Random Order"
 msgstr "_Ausazkoa"
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "Efektuak"
-
-#: src/gtkui/ui_manager.c:172
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
 #, fuzzy
-msgid "Equalizer"
-msgstr "Erakutsi ekualizadorea"
+msgid "_Refresh"
+msgstr "Freskatu tasa"
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "Ikusi"
+#: src/gtkui/menus.c:172
+#, fuzzy
+msgid "_Sort"
+msgstr "Ataka"
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
+#: src/gtkui/menus.c:174
+msgid "_New"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "Fitxategia"
+#: src/gtkui/menus.c:175
+#, fuzzy
+msgid "_Close"
+msgstr "Itxi"
 
-#: src/gtkui/ui_manager.c:188
+#: src/gtkui/menus.c:177
 #, fuzzy
-msgid "Components"
-msgstr "Konpositorea:"
+msgid "_Import ..."
+msgstr "Inportatu"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr "Ikusi pistaren xehetasunak"
+#: src/gtkui/menus.c:178
+#, fuzzy
+msgid "_Export ..."
+msgstr "Esportatu"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr "Ikusi pistaren xehetasunak"
+#: src/gtkui/menus.c:180
+#, fuzzy
+msgid "_Playlist Manager ..."
+msgstr "Zerrenda-kudeatzailea"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "Audacious-i buruz"
+#: src/gtkui/menus.c:183
+#, fuzzy
+msgid "Volume _Up"
+msgstr "Igo bolumena"
 
-#: src/gtkui/ui_manager.c:199
+#: src/gtkui/menus.c:184
 #, fuzzy
-msgid "Open Files ..."
-msgstr "Gehitu fitxategiak..."
+msgid "Volume _Down"
+msgstr "Jeitsi bolumena"
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
-msgstr "Kargatu eta erreproduzitu fitxategi bat"
+#: src/gtkui/menus.c:186
+#, fuzzy
+msgid "_Equalizer"
+msgstr "Erakutsi ekualizadorea"
+
+#: src/gtkui/menus.c:188
+#, fuzzy
+msgid "E_ffects"
+msgstr "Efektuak"
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
+#: src/gtkui/menus.c:191
+msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr "Erreproduzitu multimedia hautatutako kokalekutik"
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "Pluginen zerbitzuak"
+#: src/gtkui/menus.c:194
+msgid "Show I_nfo Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "Hobespenak"
+#: src/gtkui/menus.c:195
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "Egoera"
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr "Ireki hobespenen leihoa"
+#: src/gtkui/menus.c:197
+#, fuzzy
+msgid "Show Column _Headers"
+msgstr "Erakutsi erreproduzitzailea"
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
-msgstr "I_rten"
+#: src/gtkui/menus.c:198
+#, fuzzy
+msgid "Choose _Columns ..."
+msgstr "Erakutsi erreproduzitzailea"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "Irten Audacious-etik"
+#: src/gtkui/menus.c:199
+#, fuzzy
+msgid "Scrol_l on Song Change"
+msgstr "Abestiaren mezua"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr "Ezarri A-B"
+#: src/gtkui/menus.c:202
+#, fuzzy
+msgid "_File"
+msgstr "Fitxategia"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr "Garbitu A-B"
+#: src/gtkui/menus.c:203
+#, fuzzy
+msgid "_Playback"
+msgstr "Erreprodukzioa"
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr "Saltatu zerrendaren hasierara"
+#: src/gtkui/menus.c:204
+#, fuzzy
+msgid "P_laylist"
+msgstr "Erreprodukzio-zerrenda"
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
-msgstr "Joan fitxategira"
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#, fuzzy
+msgid "_Services"
+msgstr "Gailuak"
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr "Txandakatu ilara"
+#: src/gtkui/menus.c:206
+msgid "_Output"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Erreprodukzio-zerrendako ilarako sarrerak gaitzen/desgaitzen ditu."
+#: src/gtkui/menus.c:207
+#, fuzzy
+msgid "_View"
+msgstr "Ikusi"
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-#, fuzzy
-msgid "Cut"
-msgstr "Unekoa"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
+msgstr ""
+
+#: src/gtkui/menus.c:215
+msgid "_Copy"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
+#: src/gtkui/menus.c:216
 #, fuzzy
-msgid "Paste"
+msgid "_Paste"
 msgstr "Azkarrena"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
+#: src/gtkui/menus.c:217
+#, fuzzy
+msgid "Select _All"
 msgstr "Hautatu denak"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr "Hautatu erreprodukzio-zerrendako sarrera guztiak."
+#: src/gtkui/menus.c:222
+#, fuzzy
+msgid "_Rename"
+msgstr "Fitxategi-Izena"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr "Ez hautatu ezer"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr "Erreprodukzio-zerrendako sarrera guztiak desautatzen ditu."
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, 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
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Errorea"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "monoa"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "estereoa"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "Kanalak"
 msgstr[1] "Kanalak"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, c-format
 msgid "%d kbps"
 msgstr ""
@@ -2954,10 +1780,18 @@
 msgid "Previous Track"
 msgstr "Aurreko pista"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Erreproduzitu"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr "Pausatu/jarraitu"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Gelditu"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr "Hurrengo pista"
@@ -2982,6 +1816,10 @@
 msgid "Volume Down"
 msgstr "Jeitsi bolumena"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr "Joan fitxategira"
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr "Txandakatu erreproduzitzailearen leihoak"
@@ -2990,11 +1828,21 @@
 msgid "Show On-Screen-Display"
 msgstr "Erakutsi pantaila gaineko mezuak (OSD)"
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "Errepikatu"
+
+#: src/hotkey/gui.c:85
+#, fuzzy
+msgid "Toggle Shuffle"
+msgstr "Ausazkoa"
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -3005,15 +1853,15 @@
 "\n"
 "Jarraitzea nahi duzu?"
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr "Saguaren botoiak lotzea"
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Laster-tekla globalen pluginaren konfigurazioa"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -3021,23 +1869,23 @@
 "Sakatu tekla konbinazioa testu-eremuaren barruan.\n"
 "Saguaren botoiak ere lotu ditzakezu."
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr "Laster-teklak"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr "Ekintza:"
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr "Tekla-konbinazioa:"
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr "Laster-tekla globalen pluginari buruz"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -3112,139 +1960,29 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "JACK irteerako plugina 0.17 buruz"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr "LADSPA plugin honek ez du erabiltzale-kontrolik"
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "Izena"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UIDa"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "Instalatutako pluginak"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "Exekutatzen dauden pluginak"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "Gehitu"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "Kendu"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "LADSPA pluginen katalogoa"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "LIRC Audacious plugina"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "LIRC plugina "
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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"
-"Plugin bakun bat LIRC urruneko kontrolaren daemonarekin\n"
-"Audacious kontrolatzen uzteko.\n"
-"\n"
-"Audacious-ek erabiltzeko moldatua: Tony Vroon <chainsaw@gentoo.org>\n"
-"XMMS LIRC pluginetik:\n"
-"Carl van Schaik <carl@leg.uct.ac.za>\n"
-"Christoph Bartelmus <xmms@bartelmus.de>\n"
-"Andrew O. Shadoura <bugzilla@tut.by>\n"
-"LIRC-ren informazio gehiagorako ikusi:\n"
-"http://lirc.org"
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr "LIRC pluginaren ezarpenak"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr "Birkonektatu LIRC zerbitzariarekin"
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr "Denbora-muga birkonektatu aurretik (seg.):"
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr "Birkonektatu"
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr "Konexioa"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: ezin izan da LIRC euskarria hasieratu\n"
+"Looking for lyrics..."
+msgstr ""
 
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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: ezin izan da LIRCen konfigurazio-fitxategia irakurri\n"
-"%s: irakur ezazu LIRCren dokumentazioa\n"
-"%s: konfigurazio-fitxategi egokia nola sortzen den jakiteko\n"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr "%s: birkonektatzen saiatzen...\n"
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: \"%s\" komando ezezaguna\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: LIRCtik deskonektatuta\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
-msgstr "%s: saiatu %d segundoro birkonektatzen...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
 msgstr ""
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "Metronom-i buruz"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3259,264 +1997,43 @@
 "adib. tact://77 77 kolpe minutuko erreproduzitzeko\n"
 "edo tact://60*3/4 60 bpm erreproduzitzeko 3/4 ukimenean"
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Ukimen sortzailea: %d bpm"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Ukimen sortzailea: %d bpm %d/%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "ModPlug konfigurazioa"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 bit"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 bit"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr "Monoa (bildu kanalak)"
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr "Gertuena (azkarrena)"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "Lineala (azkarra)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr "Spline (kalitate ona)"
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr "8-tap Fir (oso kalitate altua)"
-
-#: src/modplug/gui/interface.cxx:286
-#, fuzzy
-msgid "96 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Lagin-tasa"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "Gaitu"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "Sakonera"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "Atzerapena"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "Reverb"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "Kopurua"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "Barrutia"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "Baxuen bultzada"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-"Oharra: aurre-anp altuegi jartzeak\n"
-" mozketak sor ditzake\n"
-"(klik eta pop nazkagarriekin!)"
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "Aurre-anp"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "Erabili fitxategi-izena abestiaren titulu gisa"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "Erreprodukzio-zerrendaren informazio azkarra"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "Zarataren murriztapena"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Erreproduzitu Amiga MOD"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "Ez begiztatu"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "Begizta"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "denbora(k)"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "Begiztatu beti"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "Begiztatzen"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "MOD informazioa"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-"Fitxategi-izena:\n"
-"Titulua:\n"
-"Mota:\n"
-"Luzera:\n"
-"Abiadura:\n"
-"Tenpoa:\n"
-"Laginak:\n"
-"Instrumentuak:\n"
-"Ereduak:\n"
-"Kanalak:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "Laginak"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "Instrumentuak"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "Mezua"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Modplug sarrerako plugina Audacious-en bertsio honentzako: "
-
-#: src/modplug/gui/main.cxx:52
-#, fuzzy
-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 soinu-motorra Olivier Lapicque-k garatua.\n"
-"XMMSen interfazea Modplug-arentzako Kenton Varda-k garatua.\n"
-"(c)2000 Olivier Lapicque eta Kenton Varda.\n"
-"Eguneraketak eta mantetze lanak: Konstanty Bialkowski.\n"
-"BMPrako moldaketak: Theofilos Intzoglou."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "Modplug-i buruz"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Ezin izan da pixmaparen fitxategia aurkitu: %s"
-
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr "Igo hautatutako pistak"
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr "Igotzearen aurrerapena..."
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr "MTP gailuaren kudeatzailea"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
+msgstr ""
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
+#: src/mtp_up/mtp.c:311
+#, fuzzy
+msgid "Disconnect MTP Device"
 msgstr "Deskonektatu gailua"
 
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "Gelditu"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Audacious - ikusgaitasunaren abisua"
+
 #: src/null/null.c:64
 msgid "Null output plugin "
 msgstr "Null irteerako plugina "
@@ -3568,12 +2085,12 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 #, fuzzy
 msgid "About OSS4 Plugin"
 msgstr "ESounD pluginari buruz"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 #, fuzzy
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
@@ -3621,6 +2138,11 @@
 msgid "Default (%s)"
 msgstr "Lehenetsia (%s)"
 
+#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Lehenetsia"
+
 #: src/OSS/configure.c:187
 msgid "OSS Driver configuration"
 msgstr "OSS kontrolatzailearen konfigurazioa"
@@ -3693,11 +2215,11 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Audacious PulseAudio irteeraren plugina"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3754,29 +2276,29 @@
 msgid "Method:"
 msgstr ""
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 #, fuzzy
 msgid "Change password"
 msgstr "Aldatu erreprodukzioaren abestia"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Zerbitzuak"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Erabiltzaile-izena:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 #, fuzzy
 msgid "Scrobbler URL:"
 msgstr "Scrobbler errorea"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3785,7 +2307,7 @@
 msgid "Scrobbler"
 msgstr "Scrobbler errorea"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3797,16 +2319,16 @@
 "Jatorriko garatzaileak: Audun Hove <audun@nlc.no> eta Pipian <pipian@pipian."
 "com>\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "Scrobbler pluginari buruz"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 #, fuzzy
 msgid "About SDL Output Plugin"
 msgstr "JACK irteerako plugina 0.17 buruz"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 #, fuzzy
 msgid "SDL error"
 msgstr "Errorea"
@@ -3816,11 +2338,19 @@
 msgid "About %s"
 msgstr "%s(r)i buruz"
 
-#: src/sid/xs_config.c:323
+#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
+msgid "Close"
+msgstr "Itxi"
+
+#: src/sid/xs_config.c:326
 #, fuzzy
 msgid " Error"
 msgstr "Errorea"
 
+#: src/sid/xs_config.c:326
+msgid "OK"
+msgstr "Ados"
+
 #: src/sid/xs_fileinfo.c:151
 msgid "General info"
 msgstr "Informazio orokorra"
@@ -3830,6 +2360,11 @@
 msgid "Tune #%i: "
 msgstr "%i. doinua: "
 
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Ezin izan da pixmaparen fitxategia aurkitu: %s"
+
 #: src/sid/xs_interface.c:234
 msgid "Audacious-SID configuration"
 msgstr "Audacious-SID konfigurazioa"
@@ -4145,15 +2680,15 @@
 msgid "Use"
 msgstr "Erabili"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Gorde"
 
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:435
+#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Inportatu"
 
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -4186,6 +2721,11 @@
 msgid "Playtime:"
 msgstr "Erreprodukzio-denbora:"
 
+#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
+#: src/sid/xs_interface.c:1155
+msgid "seconds"
+msgstr "segundo"
+
 #: src/sid/xs_interface.c:928
 msgid "Minimum playtime:"
 msgstr "Gutxieneko erreprodukzio-denbora:"
@@ -4446,11 +2986,11 @@
 msgid "No"
 msgstr "Ez"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "Azaldun interfazeari buruz"
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -4458,475 +2998,466 @@
 "Copyright-a (c) 2008, Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr ""
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr "_Erreproduzitzailea:"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr "Hautatu erreproduzitzaile nagusiaren leihoko letra-tipoa:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "_Erreprodukzio-zerrenda:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr "Hautatu erreprodukzio-zerrendaren letra-tipoa:"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr "_Letra-tipoak"
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr "Erabili bitmapako letra-tipoak erabilgarri badaude"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
-"Erabili bitmapako letra-tipoak erabilgarri egonez gero. Bitmapako letra-"
-"tipoek ez dituzte Unicode kateak onartzen."
-
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr "_Hainbat"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr "Erakutsi bereizleak erreprodukzio-zerrendan"
-
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr "Erakutsi leiho-kudeatzailearen dekorazioa"
 
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
-msgstr "Leiho-kudeatzailea gaitzen du leihoen dekorazioak erakusteko."
-
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr "Erabili bi bideko testu-korritzailea"
-
-#: src/skins/skins_cfg.c:330
-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."
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
 msgstr ""
-"Hautatzen bada, leiho nagusiko fitxategi-informazioaren testua bi "
-"norabidetan korrituko da. Ez bada hautatzen, testua norabide bakar batean "
-"korrituko da."
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr "Desgaitu barneko gtk gaia"
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "_Azala"
 
-#: src/skins/skins_cfg.c:333
+#: src/skins/skins_cfg.c:393
 #, fuzzy
-msgid "Random skin on play"
-msgstr "Nahastu ausaz erreprodukzio-zerrenda"
+msgid "Interface Preferences"
+msgstr "Hobespenak"
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
-msgstr "Baimendu azal osatugabeak kargatzea"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Aurre-anp"
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
 msgstr ""
-"Hautatzen bada, Audacious-ek ez du ukatuko hondatutako azalak kargatzea. "
-"Baldin eta zure azal gogokoenak ez badu funtzionatzen soilik."
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "Kolorea doitzea"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr ""
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
 msgstr ""
-"Audacious-ek azaldun interfazeko kolorearen balantzea aldatzea baimentzen "
-"dizu. Azpiko graduatzaileak hori egitea utziko dizu."
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "Urdina"
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "250 Hz"
+msgstr "22050 Hz "
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "Berdea"
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "500 Hz"
+msgstr "11000 Hz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "Gorria"
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "1 kHz"
+msgstr "11 kHz"
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "_Azala"
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "2 kHz"
+msgstr "22 kHz"
+
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "4 kHz"
+msgstr "44 kHz"
 
-#: src/skins/skins_cfg.c:574
+#: src/skins/ui_equalizer.c:336
 #, fuzzy
-msgid "Color adjustment ..."
-msgstr "Kolorea doitzea"
+msgid "8 kHz"
+msgstr "48 kHz"
+
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "16 kHz"
+msgstr "48 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Audacious-en ekualizadorea"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr "Aurrezarpenak"
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 #, fuzzy
 msgid "kHz"
 msgstr "Hz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 #, fuzzy
 msgid "surround"
 msgstr "Surround"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious - ikusgaitasunaren abisua"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "Erakutsi erreproduzitzaile nagusiaren leihoa"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "Ezikusi egin"
-
-#: src/skins/ui_main.c:993
-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 bere leiho guztiak ezkutatuta dituela abiatu da.\n"
-"Erreproduzitzailearen leihoa erakustea nahiko duzu Audacious kontrolatzeko; "
-"bestela, audtool edo gaitutako pluginen ('egoeraren ikonoa' plugina "
-"bezalakoa) bidez urrunetik kontrola dezakezu."
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr "Ezikusi egin, erakutsi/ezkutatu beti kontrolatzen da urrunetik"
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious - hondatutako GTK motorraren erabileraren abisua"
-
-#: src/skins/ui_main.c:1052
-#, c-format
-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>Hondatutako GTK motorra erabiltzen</big>\n"
-"\n"
-"Audacious-ek hondatutako GTK motorra erabiltzen ari zarela detektatu du.\n"
-"\n"
-"Erabiltzen ari zaren gai-motorra, %s, azal modernoek dituzten "
-"eginbide batzuetatik bateraezina da. Bateragarriak ez diren eginbideak "
-"desgaitu egn dira saio honetan.\n"
-"\n"
-"Eginbide hauek erabiltzeko, egokiena bestelako GTK gai-motor bat erabiltzea "
-"izango duzu."
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr "Ez bistaratu abisu hau berriro"
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
+#: src/skins/ui_main.c:807
+#, fuzzy, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Bilatu: %d:%-2.2d/%d:%-2.2d (%% %d)"
 
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Bolumena: %% %d"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balantzea: %% %d ezkerrean"
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balantzea: erdian"
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balantzea: %% %d eskuinean"
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Aukeren menua"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Desgaitu 'Beti gainean'"
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Gaitu 'Beti gainean'"
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Fitxategi-informazioaren koadroa"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "Desgaitu 'Interfazea eskalatzea'"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "Gaitu 'Interfazea eskalatzea'"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Bisualizazioaren menua"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 #, fuzzy
 msgid "Playlist mode."
 msgstr "Erreprodukzio-zerrenda"
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 #, fuzzy
 msgid "Stopping after song."
 msgstr "Gelditu uneko abestiaren ondoren"
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr ""
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr "Autokorritu abesti-izena"
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Gelditu uneko abestiaren ondoren"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
 msgstr "Erpinak"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Errepikatu"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Ausazkoa"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "Erreprodukzio-zerrenda aurreraturik ez"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr "Erakutsi erreproduzitzailea"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr "Erakutsi erreprodukzio-zerrendaren editorea"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr "Erakutsi ekualizadorea"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr "Beti gainean"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr "Jarri laneko area guztietan"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr "Bildu erreproduzitzailea"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr "Bildu erreprodukzio-zerrendaren editorea"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr "Bildu ekualizadorea"
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "Eskalatu"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr "Tamaina bikoitza"
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr "Erraz mugitu"
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr "Analizatzailea"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr "Esparrua"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr "Ahotsmarka"
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "Itzalita"
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr "Normala"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr "Sua"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr "Marra bertikalak"
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr "Marrak"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr "Barrak"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr "Puntu esparrua"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr "Marra esparrua"
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr "Esparru soila"
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr "Izotza"
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr "Leuna"
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "Motelena"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "Motela"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "Tartekoa"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "Azkarra"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "Azkarrena"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr "Igarotako denbora"
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr "Geratzen den denbora"
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "Pausatu"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "Aurrekoa"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "Hurrengoa"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "Bisualizazioa"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr "Bisualizazio modua"
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr "Analizatzaile modua"
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr "Esparru modua"
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr "Ahotsmarkaren modua"
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr "LeihoItzaldura VU modua"
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr "Analizatzailearen erortzea"
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr "Erpinen erortzea"
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Erreprodukzio-zerrenda"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Erreprodukzio-zerrenda berria"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr "Hautatu hurrengo erreprodukzio-zerrenda"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr "Hautatu aurreko erreprodukzio-zerrenda"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Ezabatu erreprodukzio-zerrenda"
+
+#: src/skins/ui_manager.c:222
+#, fuzzy
+msgid "Import Playlist"
+msgstr "Kargatu erreprodukzio-zerrenda"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr ""
+"Erreprodukzio-zerrendaren fitxategia kargatzen du hautatutako erreprodukzio-"
+"zerrendan."
+
+#: src/skins/ui_manager.c:226
+#, fuzzy
+msgid "Export Playlist"
+msgstr "Kargatu erreprodukzio-zerrenda"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr "Hautatutako erreprodukzio-zerrenda gordetzen du"
+
+#: src/skins/ui_manager.c:229
+#, fuzzy
+msgid "Save All Playlists"
+msgstr "Gorde erreprodukzio-zerrenda"
+
+#: 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 "Freskatu zerrenda"
 
-#: src/skins/ui_manager.c:228
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr ""
+"Erreprodukzio-zerrendako sarrera bati esleituta dagoen metadatuak freskatzen "
+"ditu."
+
+#: src/skins/ui_manager.c:238
 msgid "List Manager"
 msgstr "Zerrenda-kudeatzailea"
 
-#: src/skins/ui_manager.c:238
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr "Erreprodukzio-zerrenden kudeatzailea irekitzen du."
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Ikusi"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr ""
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "Hobespenak"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr "Gehitu interneteko helbidea..."
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr "Gehitu urruneko pista erreprodukzio-zerrendari."
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr "Gehitu fitxategiak..."
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr "Gehitu fitxategiak erreprodukzio-zerrendari."
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr "Bilatu eta hautatu"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
@@ -4934,231 +3465,371 @@
 "Erreprodukzio-zerrendan bilatzen du eta irizpide zehatz batzuetan "
 "oinarritutako erreprodukzio-zerrendako sarrerak hautatzen ditu."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr "Alderantzikatu hautapena"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr "Hautatutako edo hautatu gabeko sarrerak alderantzikatzen ditu."
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "Hautatu denak"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
+msgstr "Hautatu erreprodukzio-zerrendako sarrera guztiak."
+
+#: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr "Ez hautatu ezer"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr "Erreprodukzio-zerrendako sarrera guztiak desautatzen ditu."
+
+#: src/skins/ui_manager.c:277
+msgid "Remove All"
+msgstr "Kendu guztiak"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr "Sarrera guztiak kentzen ditu erreprodukzio-zerrendatik"
+
+#: src/skins/ui_manager.c:281
 msgid "Clear Queue"
 msgstr "Garbitu ilara"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr "Erreprodukzio-zerrendarekin esleitutako ilara garbitzen du."
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "Kendu fitxategi erabilkaitzak"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr ""
 "Erabilgarri ez dauden fitxategiak kentzen ditu erreprodukzio-zerrendatik."
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "Kendu bikoiztuak"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "Tituluaren arabera"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr ""
 "Tituluaren arabera bikoiztutako sarrerak kentzen ditu erreprodukzio-"
 "zerrendatik."
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "Fitxategi-izenaren arabera"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 "Fitxategi-izenaren arabera bikoiztutako sarrerak kenten ditu erreprodukzio-"
 "zerrendatik."
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "Bide-izenaren arabera"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 "Bide-izen osoaren arabera bikoiztutako sarrerak kentzen ditu erreprodukzio-"
 "zerrendatik."
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr "Kendu desautatutakoak"
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr "Desautatutako sarrerak kentzen ditu erreprodukzio-zerrendatik."
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr "Kendu hautatutakoak"
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr "Hautatutako sarrerak kentzen ditu erreprodukzio-zerrendatik."
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr "Nahastu ausaz zerrenda"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr "Nahastu ausaz erreprodukzio-zerrenda"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr "Alderantzikatu zerrenda"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr "Alderantzikatu erreprodukzio-zerrenda."
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "Ordenatu zerrenda"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr "Tituluaren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#, fuzzy
+msgid "By Album"
+msgstr "Albuma:"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 #, fuzzy
 msgid "Sorts the list by album."
 msgstr "Tituluaren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "Artistaren arabera"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr "Artistaren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr "Fitxategi-izenaren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr "Bide-izen osoaren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "Dataren arabera"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr "Eraldatze-dataren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr "Pista zenbakiaren arabera"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr "Pista zenbakiaren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr "Ordenatu hautatutakoak"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "Fitxategia"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Laguntza"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr "Pluginen zerbitzuak"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr "Ikusi pistaren xehetasunak"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr "Ikusi pistaren xehetasunak"
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "Audacious-i buruz"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "Erreproduzitu fitxategia"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr "Kargatu eta erreproduzitu fitxategi bat"
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "Erreproduzitu kokalekua"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr "Erreproduzitu multimedia hautatutako kokalekutik"
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "Pluginen zerbitzuak"
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "Hobespenak"
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr "Ireki hobespenen leihoa"
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "Irten Audacious-etik"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr "Ezarri A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr "Garbitu A-B"
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr "Saltatu zerrendaren hasierara"
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr "Jauzi denborara"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr "Txandakatu ilara"
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Erreprodukzio-zerrendako ilarako sarrerak gaitzen/desgaitzen ditu."
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr ""
+
+#: src/skins/ui_manager.c:436
+#, fuzzy
+msgid "Cut"
+msgstr "Unekoa"
+
+#: src/skins/ui_manager.c:438
+#, fuzzy
+msgid "Paste"
+msgstr "Azkarrena"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Kargatu"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Aurrezarpena"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Kargatu aurrezarpena"
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Autokargaren aurrezarpena"
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Kargatu autokargaren aurrezarpenak"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Kargatu aurrezarpen lehenetsia ekualizadorean"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Zero"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Ezarri ekualizadorearen aurrezarpenen maila zerorekin"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Fitxategitik"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Kargatu aurrezarpenak fitxategitik"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "WinAMP EQF fitxategitik"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Kargatu aurrezarpenak WinAMP EQF fitxategitik"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP aurrezarpenak"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Inportatu WinAMP aurrezarpenak"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Gorde aurrezarpenak"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Gorde autokargaren aurrezarpenak"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Gorde aurrezarpen lehenetsia"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Fitxategian"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Gorde aurrezarpena fitxategian"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "WinAMP EQF fitxategian"
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Gorde aurrezarpena WinAMP EQF fitxategian"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Ezabatu aurrezarpena"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Ezabatu autokargaren aurrezarpenak"
 
-#: src/skins/ui_playlist.c:374
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Bilatu sarrerak erreprodukzio-zerrenda aktiboan"
 
-#: src/skins/ui_playlist.c:382
+#: 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 "
@@ -5170,111 +3841,52 @@
 "minuskulak ez bereiztuz. Ez badakizu adierazpen erregularrak nola ibiltzen "
 "diren, sartu bilatzea nahi duzunaren zati literal bat."
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Izenburua: "
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Albuma: "
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Fitxategi-izena: "
 
-#: src/skins/ui_playlist.c:419
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Garbitu aurreko hautapena bilatu aurretik"
 
-#: src/skins/ui_playlist.c:422
+#: 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:425
+#: 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:776
-msgid "Save as Static Playlist"
-msgstr "Gorde erreprodukzio-zerrenda estatiko gisa"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr "Erabili bide-izen erlatiboa"
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "Kargatu erreprodukzio-zerrenda"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "Gorde erreprodukzio-zerrenda"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious erreprodukzio-zerrendaren editorea"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "250 Hz"
-msgstr "22050 Hz "
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "500 Hz"
-msgstr "11000 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "1 kHz"
-msgstr "11 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "2 kHz"
-msgstr "22 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "4 kHz"
-msgstr "44 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "8 kHz"
-msgstr "48 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "16 kHz"
-msgstr "48 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr "Konprimitutako Winamp 2.x azala"
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Deskonprimitutako Winamp 2.x azala"
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Ezin izan da direktorioa (%s) sortu: %s\n"
@@ -5324,57 +3936,65 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301, USA."
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "SndStretch-i buruz"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr "Bolumenaren korr."
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "Teilakatze laburra"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "Abiadura"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "Tonua"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "Eskalatu"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Aukerak"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - Konfigurazioa"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr "Exekutatuko den komandoa audacious-ek abesti berria hastean."
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "Komandoa:"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr "Exekutatuko den komandoa abestiaren amaierantz joatean."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 "Exekutatuko den komandoa Audacious erreprodukzio-zerrendaren amaierara "
 "iristean."
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "Exekutatuko den komandoa abesti baten titulua aldatzean (adib. sareko "
 "korronteen tituluak)."
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 #, fuzzy
 msgid ""
 "You can use the following format strings which\n"
@@ -5407,7 +4027,7 @@
 "%%t: erreprodukzio-zerrendaren posizioa (%%02d)\n"
 "%%p: unean erreproduzitzen (1 edo 0)"
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5415,19 +4035,15 @@
 "Shell-ari emandako parametroak komatxoen artean kapsulatu "
 "behar dira. Bestela segurtasunezko arriskua izan daiteke."
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "Komandoak"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 #, fuzzy
 msgid "Song Change"
 msgstr "Abestiaren mezua"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "Espektro-analizatzailea"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "Egoeraren ikonoa pluginari buruz"
@@ -5500,74 +4116,19 @@
 "\n"
 "Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "Estra Estereo plugina"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "Konfiguratu Estra Estereo"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-msgid "Search:"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-#, fuzzy
-msgid "Stream name"
-msgstr "Instrumentuaren izena"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Kendu etiketa"
-
-#: src/streambrowser/streambrowser.c:340
-#, fuzzy
-msgid "About Stream Browser"
-msgstr "OSS kontrolatzaileari buruz"
-
-#: src/streambrowser/streambrowser.c:341
-#, fuzzy
-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-a (c) 2007, Calin Crisan <ccrisan@gmail.com> eta Audacious "
-"taldea.\n"
-"\n"
-"Eskerrik asko libcdio-ren garatzaileei <http://www.gnu.org/software/libcdio/"
-">\n"
-"\teta libcddb-eko garatzaileei <http://libcddb.sourceforge.net/>.\n"
-"\n"
-"Eskerrik asko Tony Vroon-i gainbegiratzeagatik eta ni gidatzeagatik\n"
-"\n"
-"Google Summer of Code 2007 proiektu bat izan da."
-
-#: src/tonegen/tonegen.c:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "Tonu-sortzaileari buruz"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5582,12 +4143,12 @@
 "Hau erabiltzeko gehitu URL bat, tone://maiztasun1;maiztasun2;maiztasun3;...\n"
 "adib. tone://2000;2005 2000Hz eta 2005Hz tonuak erreproduzitzeko"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "Tonu-sortzailea: "
 
@@ -5609,15 +4170,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Ogg Vorbis etiketak:"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ogg Vorbis audioaren pluginaren konfigurazioa"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Ogg Vorbis audioaren pluginari buruz"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5694,9 +4255,1247 @@
 "Pluginaren kode batzuk Miles Egan-ek garatua\n"
 "Bisitatu Wavpack gunea: http://www.wavpack.com/\n"
 
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "Erabili bitmapako letra-tipoak erabilgarri badaude"
+
+#~ msgid ""
+#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
+#~ "Unicode strings."
+#~ msgstr ""
+#~ "Erabili bitmapako letra-tipoak erabilgarri egonez gero. Bitmapako letra-"
+#~ "tipoek ez dituzte Unicode kateak onartzen."
+
+#~ msgid "_Miscellaneous"
+#~ msgstr "_Hainbat"
+
+#~ msgid "Use two-way text scroller"
+#~ msgstr "Erabili bi bideko testu-korritzailea"
+
+#~ msgid "About "
+#~ msgstr "Honi buruz: "
+
+#~ 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-a (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
+#~ "\n"
+#~ "Plugin hau GNU GPL lizentziako terminoen eta baldintzen pean kaleratua.\n"
+#~ "Xehetasunetarako ikusi honako web orrialdea:\n"
+#~ "http://www.gnu.org/licenses/lgpl.html\n"
+#~ "\n"
+#~ "Plugin honek AdPlug liburutegia erabiltzen du. AdPlug-en copyright-a (C) "
+#~ "Simon Peter, eta al.\n"
+#~ "Estekatutako AdPlug liburutegiaren bertsioa: "
+
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AdPlug :: Konfigurazioa"
+
+#~ msgid "Sound quality"
+#~ msgstr "Soinuaren kalitatea"
+
+#~ msgid "Resolution"
+#~ msgstr "Bereizmena"
+
+#~ msgid "8bit"
+#~ msgstr "8 bit"
+
+#~ msgid "16bit"
+#~ msgstr "16 bit"
+
+#~ msgid "Channels"
+#~ msgstr "Kanalak"
+
+#~ 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 ""
+#~ "Estereoa ezartzea ez da gomendagarria, ez baduzu behar bederen. Honek ez "
+#~ "dio inolako estereo efekturik gehituko soinuari (OPL2 monoa da soilik) "
+#~ "eta PUZaren errendimendu gehiago beharko du."
+
+#~ msgid "Frequency"
+#~ msgstr "Maiztasuna"
+
+#~ msgid "Detect songend"
+#~ msgstr "Detektatu abestiaren amaiera"
+
+#~ 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 ""
+#~ "Gaitzen bada XMMS-ek abestiaren amaiera detektatuko du, gelditu eta "
+#~ "erreprodukzio-zerrendan aurrera egingo du. Desgaitzen bada, XMMS ez da "
+#~ "ohartuko abesti baten amaierarekin eta behin eta berriz begiztatuko du."
+
+#~ msgid "Formats"
+#~ msgstr "Formatuak"
+
+#~ msgid "Format selection"
+#~ msgstr "Formatuaren hautapena"
+
+#~ msgid "Format"
+#~ msgstr "Formatua"
+
+#~ msgid "Extension"
+#~ msgstr "Luzapena"
+
+#~ 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 ""
+#~ "Hautatutako fitxategi motak ezagutuko dira eta plugin honek "
+#~ "erreproduzituko ditu. Desautatutako motei ezikusi egingo zaie, beste "
+#~ "plugin batzuei lekua egiteko fitxategi hauek erreproduzitzeko."
+
+#~ msgid "AdPlug :: File Info"
+#~ msgstr "AdPlug :: Fitxategiaren informazioa"
+
+#~ msgid "Author: "
+#~ msgstr "Egilea: "
+
+#~ msgid "File Type: "
+#~ msgstr "Fitxategi mota: "
+
+#~ msgid "Subsongs: "
+#~ msgstr "Azpiabestiak: "
+
+#~ msgid "Instruments: "
+#~ msgstr "Instrumentuak: "
+
+#~ msgid "Orders: "
+#~ msgstr "Ordenak: "
+
+#~ msgid "Patterns: "
+#~ msgstr "Ereduak: "
+
+#~ msgid "Song"
+#~ msgstr "Abestia"
+
+#~ msgid "Instrument name"
+#~ msgstr "Instrumentuaren izena"
+
+#~ msgid "Song message"
+#~ msgstr "Abestiaren mezua"
+
+#~ msgid "Subsong selection"
+#~ msgstr "Azpiabestiaren hautapena"
+
+#~ msgid "Order: "
+#~ msgstr "Ordena: "
+
+#~ msgid "Pattern: "
+#~ msgstr "Eredua: "
+
+#~ msgid "Row: "
+#~ msgstr "Errenkada: "
+
+#~ msgid "Speed: "
+#~ msgstr "Abiadura: "
+
+#~ msgid "Timer: "
+#~ msgstr "Tenporizadorea: "
+
+#~ msgid "About XMMS Alarm"
+#~ msgstr "XMMS alarmari buruz"
+
+#~ msgid "XMMS Alarm"
+#~ msgstr "XMMS alarma"
+
+#~ 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 ""
+#~ "XMMSren plugin bat denbora zehatz batean\n"
+#~ "erreproduzitzen hasteko.\n"
+#~ "\n"
+#~ "Bidali kexuak hona:\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 "Hau zu esnatzeko deia da."
+
+#~ msgid "Select Playlist"
+#~ msgstr "Hautatu erreprodukzio-zerrenda"
+
+#~ msgid "Sorry"
+#~ msgstr "Barkatu"
+
+#~ msgid "Warning"
+#~ msgstr "Abisua"
+
+#~ 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 ""
+#~ "Segurtasuneko arrazoiak direla medio, \"quiet\" (isilik) denbora "
+#~ "iraungitze-denbora (10 segundo baino gehiagokoa izan behar duelarik) "
+#~ "baino gutxienez 65 segundo luzeagoa izan behar du. Honek kodean akats bat "
+#~ "dagoela adierazi nahi du, eta hau konpondu arte mezu hau agertuko "
+#~ "dela :)\n"
+#~ "\n"
+#~ "Iraungitzearen ezarpenak EZ dira gorde\n"
+#~ "\n"
+#~ "--\n"
+#~ "Adam"
+
+#~ msgid "Oh Well"
+#~ msgstr "Ongi"
+
+#~ msgid "Alarm Settings"
+#~ msgstr "Alarmaren ezarpenak"
+
+#~ msgid "Time"
+#~ msgstr "Ordua"
+
+#~ msgid "hours"
+#~ msgstr "ordu"
+
+#~ msgid "h"
+#~ msgstr "o"
+
+#~ msgid "minutes"
+#~ msgstr "minutu"
+
+#~ msgid "Quiet after:"
+#~ msgstr "Isildu honen ondoren:"
+
+#~ msgid "Alarm at (default):"
+#~ msgstr "Alarma (lehenetsia):"
+
+#~ msgid "Choose the days for the alarm to come on"
+#~ msgstr "Aukeratu zein egunetan alarma aktibatuko den"
+
+#~ msgid "Day"
+#~ msgstr "Eguna"
+
+#~ msgid "Tuesday"
+#~ msgstr "Asteartea"
+
+#~ msgid "Wednesday"
+#~ msgstr "Asteazkena"
+
+#~ msgid "Thursday"
+#~ msgstr "Osteguna"
+
+#~ msgid "Friday"
+#~ msgstr "Ostirala"
+
+#~ msgid "Saturday"
+#~ msgstr "Larunbata"
+
+#~ msgid "Sunday"
+#~ msgstr "Igandea"
+
+#~ msgid "Monday"
+#~ msgstr "Astelehena"
+
+#~ msgid "Days"
+#~ msgstr "Egunak"
+
+#~ msgid "Fading"
+#~ msgstr "Iraungitzea"
+
+#~ msgid "Volume"
+#~ msgstr "Bolumena"
+
+#~ msgid "Current"
+#~ msgstr "Unekoa"
+
+#~ msgid "reset to current output volume"
+#~ msgstr "berrezarri uneko irteera bolumenera"
+
+#~ msgid "Start at"
+#~ msgstr "Hasiera:"
+
+#~ msgid "%"
+#~ msgstr "%"
+
+#~ msgid "Final"
+#~ msgstr "Amaiera"
+
+#~ msgid "Additional Command"
+#~ msgstr "Komando gehigarria"
+
+#~ msgid "enable"
+#~ msgstr "gaitu"
+
+#~ msgid "Playlist (optional)"
+#~ msgstr "Erreprodukzio-zerrenda (aukerakoa)"
+
+#~ msgid "Browse..."
+#~ msgstr "Arakatu..."
+
+#~ msgid "Reminder"
+#~ msgstr "Oroigarria"
+
+#~ msgid "Use reminder"
+#~ msgstr "Erabili oroigarria"
+
+#~ msgid "What do these options mean?"
+#~ msgstr "Zer esanahi dute aukera hauek?"
+
+#~ 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"
+#~ "Ordua\n"
+#~ " Alarma: \n"
+#~ "\n"
+#~ " Ordua alarma aktibatzeko\n"
+#~ "\n"
+#~ " Isildu honen ondoren: \n"
+#~ " Gelditu alarma denbora kopuruaren ostean.\n"
+#~ " (iratzartzeko elkarrizketa-koadroa ez bada ixten)\n"
+#~ "\n"
+#~ "\n"
+#~ "Egunak\n"
+#~ " Eguna:\n"
+#~ " Hautatu egunak alarma aktibatzeko.\n"
+#~ "\n"
+#~ " Ordua:\n"
+#~ " Aukeratu egun bakoitzeko alarmaren ordua,\n"
+#~ " (edo hautatu txandakatzeko botoia denbora\n"
+#~ " lehenetsia erabiltzeko).\n"
+#~ "\n"
+#~ "\n"
+#~ "Bolumena\n"
+#~ " Iraungitzea: \n"
+#~ " Iraungitu bolumena gorantz aukeratutako bolumenerarte\n"
+#~ " denbora kopuru honentzako.\n"
+#~ "\n"
+#~ " Hasiera: \n"
+#~ " Hasi iraungitzea bolumen honetatik\n"
+#~ "\n"
+#~ " Amaiera: \n"
+#~ " Amaierako bolumenean iraungitzea gelditzeko. Iraungitzearen\n"
+#~ " denbora 0 bada, bolumena honekin ezartzen du eta\n"
+#~ " erreproduzitzen hasten da.\n"
+#~ "\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ " Komando gehigarriak:\n"
+#~ " Exekutatu komando hau alarmaren orduan.\n"
+#~ "\n"
+#~ " Erreprodukzio-zerrenda: \n"
+#~ " Kargatu erreprodukzio-zerrenda hau bertatik\n"
+#~ " abestiak erreproduzitzeko (.m3u luzapena\n"
+#~ " eduki behar du). Ez bada erreprodukzio-zerrendarik\n"
+#~ " ematen, uneko zerrendan dauden abestiak\n"
+#~ " erabiliko dira.\n"
+#~ " Hemen mp3/ogg korrontearen URLa sar daitekeen\n"
+#~ " arren, oraingoz xmms-ek ez du URLrik onartzen.\n"
+#~ "\n"
+#~ " Oroigarria: \n"
+#~ " Oroigarri bat bistaratzen du alarma itzaltzean,\n"
+#~ " idatzi oroigarria kutxan eta piztu txandakatzeko\n"
+#~ " botoia oroigarri hori bistaratzea nahi baduzu.\n"
+
+#~ msgid "Your reminder for today is.."
+#~ msgstr "Gaurko zure oroigarria: "
+
+#~ msgid "Thankyou"
+#~ msgstr "Eskerrik asko"
+
+#, fuzzy
+#~ msgid "Available Headsets"
+#~ msgstr "Motor erabilgarriak"
+
+#, fuzzy
+#~ msgid "Current Headset"
+#~ msgstr "Unekoa"
+
+#, fuzzy
+#~ msgid "_Connect"
+#~ msgstr "Konexioa"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "Gailuaren helbidea"
+
+#, fuzzy
+#~ msgid "Rescan"
+#~ msgstr "Berreskaneatu CDa"
+
+#~ msgid "Playback->Play"
+#~ msgstr "Erreprodukzioa->Erreproduzitu"
+
+#~ msgid "Playback->Stop"
+#~ msgstr "Erreprodukzioa->Gelditu"
+
+#~ msgid "Playback->Pause"
+#~ msgstr "Erreprodukzioa->Pausarazi"
+
+#~ msgid "Playback->Prev"
+#~ msgstr "Erreprodukzioa->Aurrekoa"
+
+#~ msgid "Playback->Next"
+#~ msgstr "Erreprodukzioa->Hurrengoa"
+
+#~ msgid "Playback->Eject"
+#~ msgstr "Erreprodukzioa->Egotzi"
+
+#~ msgid "Playlist->Repeat"
+#~ msgstr "Erreprodukzio-zerrenda->Errepikatu"
+
+#~ msgid "Playlist->Shuffle"
+#~ msgstr "Erreprodukzio-zerrenda->Ausaz"
+
+#~ msgid "Volume->Up_5"
+#~ msgstr "Bolumena->Igo _5"
+
+#~ msgid "Volume->Down_5"
+#~ msgstr "Bolumena->Jeitsi _5"
+
+#~ msgid "Volume->Up_10"
+#~ msgstr "Bolumena->Igo _10"
+
+#~ msgid "Volume->Down_10"
+#~ msgstr "Bolumena->Jeitsi _10"
+
+#~ msgid "Volume->Mute"
+#~ msgstr "Bolumena->Mututu"
+
+#~ msgid "Window->Main"
+#~ msgstr "Leihoa->Nagusia"
+
+#~ msgid "Window->Playlist"
+#~ msgstr "Leihoa->Erreprodukzio-zerrenda"
+
+#~ msgid "Window->Equalizer"
+#~ msgstr "Leihoa->Ekualizadorea"
+
+#~ msgid "Window->JumpToFile"
+#~ msgstr "Leihoa->Jauzi fitxategira"
+
+#~ 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 ""
+#~ "event-device-plugin: ezin da gailuko %s fitxategia ireki, gailu hau "
+#~ "saltatzen. Egiaztatu fitxategia existitzen dela eta hura irakurtzeko "
+#~ "baimenak dituzula.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to create a io_channel for device file %s ,"
+#~ "skipping this device\n"
+#~ msgstr ""
+#~ "event-device-plugin: ezin da io_channel sortu gailuko %s "
+#~ "fitxategiarentzako.Gailua saltatzen\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to open /proc/bus/input/devices , automatic "
+#~ "detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: ezin da /proc/bus/input/devices ireki, gertaeren "
+#~ "gailuaren detekzio automatikoak ez du funtzionatuko.\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 ""
+#~ "event-device-plugin: ezin da io_channel ireki /proc/bus/input/devices-"
+#~ "rentzako, gertaeren gailuaren detekzio automatikoak ez du funtzionatuko.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: an error occurred while reading /proc/bus/input/"
+#~ "devices , automatic detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: errorea gertatu da /proc/bus/input/devices "
+#~ "irakurtzean, gertaeren gailuaren detekzio automatikoak ez du "
+#~ "funtzionatuko.\n"
+
+#~ msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
+#~ msgstr "event-device-plugin: ez da %s aurkitu /dev/input-en, saltatzen.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to load config file %s , default settings "
+#~ "will be used.\n"
+#~ msgstr ""
+#~ "event-device-plugin: ezin da %s konfigurazio-fitxategia kargatu, ezarpen "
+#~ "lehenetsiak erabiliko dira.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: incomplete information in config file for device \"%s"
+#~ "\" , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: osatu gabeko informazioa \"%s\" gailuaren "
+#~ "konfigurazioko fitxategian, saltatzen.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_active value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurazioa, ezin da \"%s\" gailuaren is_active "
+#~ "balioa lortu, saltatzen.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to access local directory %s , settings will "
+#~ "not be saved.\n"
+#~ msgstr ""
+#~ "event-device-plugin: ezin da lokaleko %s direktorioa atzitu, ezarpenak ez "
+#~ "dira gordeko.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get filename value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurazioa, ezin da \"%s\" gailuaren fitxategi-"
+#~ "izenaren balioa, saltatzen.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get phys value for device "
+#~ "\"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurazioa, ezin da \"%s\" gailuaren balio "
+#~ "fisikoa a lortu, saltatzen.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_custom value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurazioa, ezin da \"%s\" gailuaren is_custom "
+#~ "balioa lortu, saltatzen.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unexpected value for device \"%s\", "
+#~ "skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurazioa, \"%s\" gailuaren ustekabeko balioa, "
+#~ "saltatzen.\n"
+
+#, fuzzy
+#~ msgid "Detected"
+#~ msgstr "Detektatu abestiaren amaiera"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "pertsonalizatua "
+
+#, fuzzy
+#~ msgid "Not Detected"
+#~ msgstr "Ordenatu hautatutakoak"
+
+#~ msgid "Information"
+#~ msgstr "Informazioa"
+
+#~ msgid ""
+#~ "Cannot open bindings window for a not-detected device.\n"
+#~ "Ensure that the device has been correctly plugged in."
+#~ msgstr ""
+#~ "Ezin da detektatu ez den gailuaren loturen leihoa ireki.\n"
+#~ "Ziurtatu gailua ongi konektatuta dagoela."
+
+#~ msgid ""
+#~ "Unable to open selected device.\n"
+#~ "Please check read permissions on device file."
+#~ msgstr ""
+#~ "Ezin da hautatutako gailua ireki.\n"
+#~ "Egiaztatu gailuko fitxategia irakurtzeko baimenak dituzula."
+
+#~ msgid "EvDev-Plug - Add custom device"
+#~ msgstr "EvDev-Plug - Gehitu gailu pertsonalizatua"
+
+#~ 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 ""
+#~ "Sisteman erabilgarri dauden gailuen gertaerak automatikoki \n"
+#~ "detektatu eta informazioa eguneratzen saiatzen da EvDev-Plug.\n"
+#~ "Hala ere, detekzio automatikoak ez badu funtzionatzen sisteman,\n"
+#~ "edo gertaeren gailuak leku ez estandar batean badaude (unean \n"
+#~ "/dev/input-en soilik egiten da bilaketa), gailu pertsonalizatua gehitzea\n"
+#~ "nahi izan dezakezu gailuaren izena eta fitxategia zehaztuz. "
+
+#~ msgid "Device name:"
+#~ msgstr "Gailuaren izena:"
+
+#~ msgid "Device file:"
+#~ msgstr "Gailuaren fitxategia:"
+
+#, fuzzy
+#~ msgid "(custom)"
+#~ msgstr "pertsonalizatua "
+
+#~ msgid ""
+#~ "Please specify both name and filename.\n"
+#~ "Filename must be specified with absolute path."
+#~ msgstr ""
+#~ "Zehaztu bai izena bai fitxategi-izena.\n"
+#~ "Fitxategi-izenak bide-izen absolutua eduki behar du."
+
+#~ msgid ""
+#~ "Do you want to remove the existing configuration for selected device?\n"
+#~ msgstr ""
+#~ "Nahi duzu hautatutako gailuaren existitzen den konfigurazioa kentzea?\n"
+
+#~ msgid "Do you want to remove the selected custom device?\n"
+#~ msgstr "Nahi duzu hautatutako gailu pertsonalizatua kentzea?\n"
+
+#~ msgid "EvDev-Plug - Configuration"
+#~ msgstr "EvDev-Plug - Konfigurazioa"
+
+#~ msgid "Active"
+#~ msgstr "Aktibo"
+
+#~ msgid "Status"
+#~ msgstr "Egoera"
+
+#~ msgid "Device Name"
+#~ msgstr "Gailuaren izena"
+
+#~ msgid "Device File"
+#~ msgstr "Gailuaren fitxategia"
+
+#~ msgid "Device Address"
+#~ msgstr "Gailuaren helbidea"
+
+#~ msgid "_Bindings"
+#~ msgstr "_Loturak"
+
+#~ 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 ""
+#~ "Sakatu gailuaren tekla bat lotzeko; \n"
+#~ "bost segundotan ez bada teklarik sakatzen,\n"
+#~ "leiho hau itxi egingo da loturak aldatu gabe."
+
+#~ 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 ""
+#~ "Sarrerako gertaera hau jadanik lotuta dago.\n"
+#~ "\n"
+#~ "Ezin da hainbat ekintza sarrerako gertaera berdinari esleitu (nahiz eta "
+#~ "ekintza berdina hainbat gertaerei esleitzea posiblea den)."
+
+#~ msgid "EvDev-Plug - Bindings Configuration"
+#~ msgstr "EvDev-Plug - Loturen konfigurazoa"
+
+#~ msgid "Name: "
+#~ msgstr "Izena: "
+
+#~ msgid "Filename: "
+#~ msgstr "Fitxategi-izena: "
+
+#~ msgid "Phys.Address: "
+#~ msgstr "Helbide fisikoa: "
+
+#~ msgid "EvDev-Plug - about"
+#~ msgstr "EvDev-Plug - honi buruz"
+
+#~ 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"
+#~ "erreproduzitzailearen urruneko kontrola gertaera-gailuen bidez.\n"
+#~ "http://www.develia.org/projects.php?p=audacious#evdevplug\n"
+#~ "\n"
+#~ "garatzailea: Giacomo Lozito\n"
+
+#~ msgid "This LADSPA plugin has no user controls"
+#~ msgstr "LADSPA plugin honek ez du erabiltzale-kontrolik"
+
+#~ msgid "Name"
+#~ msgstr "Izena"
+
+#~ msgid "UID"
+#~ msgstr "UIDa"
+
+#~ msgid "Installed plugins"
+#~ msgstr "Instalatutako pluginak"
+
+#~ msgid "Running plugins"
+#~ msgstr "Exekutatzen dauden pluginak"
+
+#~ msgid "Add"
+#~ msgstr "Gehitu"
+
+#~ msgid "Remove"
+#~ msgstr "Kendu"
+
+#~ msgid "LADSPA Plugin Catalog"
+#~ msgstr "LADSPA pluginen katalogoa"
+
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "LIRC Audacious plugina"
+
+#~ msgid "LIRC Plugin "
+#~ msgstr "LIRC plugina "
+
+#~ 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"
+#~ "Plugin bakun bat LIRC urruneko kontrolaren daemonarekin\n"
+#~ "Audacious kontrolatzen uzteko.\n"
+#~ "\n"
+#~ "Audacious-ek erabiltzeko moldatua: Tony Vroon <chainsaw@gentoo.org>\n"
+#~ "XMMS LIRC pluginetik:\n"
+#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
+#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
+#~ "Andrew O. Shadoura <bugzilla@tut.by>\n"
+#~ "LIRC-ren informazio gehiagorako ikusi:\n"
+#~ "http://lirc.org"
+
+#~ msgid "LIRC plugin settings"
+#~ msgstr "LIRC pluginaren ezarpenak"
+
+#~ msgid "Reconnect to LIRC server"
+#~ msgstr "Birkonektatu LIRC zerbitzariarekin"
+
+#~ msgid "Timeout before reconnecting (seconds): "
+#~ msgstr "Denbora-muga birkonektatu aurretik (seg.):"
+
+#~ msgid "Reconnect"
+#~ msgstr "Birkonektatu"
+
+#~ msgid "Connection"
+#~ msgstr "Konexioa"
+
+#~ msgid "%s: could not init LIRC support\n"
+#~ msgstr "%s: ezin izan da LIRC euskarria hasieratu\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: ezin izan da LIRCen konfigurazio-fitxategia irakurri\n"
+#~ "%s: irakur ezazu LIRCren dokumentazioa\n"
+#~ "%s: konfigurazio-fitxategi egokia nola sortzen den jakiteko\n"
+
+#~ msgid "%s: trying to reconnect...\n"
+#~ msgstr "%s: birkonektatzen saiatzen...\n"
+
+#~ msgid "%s: unknown command \"%s\"\n"
+#~ msgstr "%s: \"%s\" komando ezezaguna\n"
+
+#~ msgid "%s: disconnected from LIRC\n"
+#~ msgstr "%s: LIRCtik deskonektatuta\n"
+
+#~ msgid "%s: will try reconnect every %d seconds...\n"
+#~ msgstr "%s: saiatu %d segundoro birkonektatzen...\n"
+
+#~ msgid "ModPlug Configuration"
+#~ msgstr "ModPlug konfigurazioa"
+
+#~ msgid "16 bit"
+#~ msgstr "16 bit"
+
+#~ msgid "8 bit"
+#~ msgstr "8 bit"
+
+#~ msgid "Mono (downmix)"
+#~ msgstr "Monoa (bildu kanalak)"
+
+#~ msgid "Nearest (fastest)"
+#~ msgstr "Gertuena (azkarrena)"
+
+#~ msgid "Linear (fast)"
+#~ msgstr "Lineala (azkarra)"
+
+#~ msgid "Spline (good quality)"
+#~ msgstr "Spline (kalitate ona)"
+
+#~ msgid "8-tap Fir (extremely high quality)"
+#~ msgstr "8-tap Fir (oso kalitate altua)"
+
+#, fuzzy
+#~ msgid "96 kHz"
+#~ msgstr "48 kHz"
+
+#~ msgid "48 kHz"
+#~ msgstr "48 kHz"
+
+#~ msgid "44 kHz"
+#~ msgstr "44 kHz"
+
+#~ msgid "22 kHz"
+#~ msgstr "22 kHz"
+
+#~ msgid "Sampling Rate"
+#~ msgstr "Lagin-tasa"
+
+#~ msgid "Enable"
+#~ msgstr "Gaitu"
+
+#~ msgid "Depth"
+#~ msgstr "Sakonera"
+
+#~ msgid "Delay"
+#~ msgstr "Atzerapena"
+
+#~ msgid "Reverb"
+#~ msgstr "Reverb"
+
+#~ msgid "Amount"
+#~ msgstr "Kopurua"
+
+#~ msgid "Range"
+#~ msgstr "Barrutia"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Baxuen bultzada"
+
+#~ msgid ""
+#~ "Note: Setting the preamp\n"
+#~ "too high may cause clipping\n"
+#~ "(annoying clicks and pops)!"
+#~ msgstr ""
+#~ "Oharra: aurre-anp altuegi jartzeak\n"
+#~ " mozketak sor ditzake\n"
+#~ "(klik eta pop nazkagarriekin!)"
+
+#~ msgid "Effects"
+#~ msgstr "Efektuak"
+
+#~ msgid "Use Filename as Song Title"
+#~ msgstr "Erabili fitxategi-izena abestiaren titulu gisa"
+
+#~ msgid "Fast Playlist Info"
+#~ msgstr "Erreprodukzio-zerrendaren informazio azkarra"
+
+#~ msgid "Noise Reduction"
+#~ msgstr "Zarataren murriztapena"
+
+#~ msgid "Play Amiga MOD"
+#~ msgstr "Erreproduzitu Amiga MOD"
+
+#~ msgid "Don't loop"
+#~ msgstr "Ez begiztatu"
+
+#~ msgid "Loop"
+#~ msgstr "Begizta"
+
+#~ msgid "time(s)"
+#~ msgstr "denbora(k)"
+
+#~ msgid "Loop forever"
+#~ msgstr "Begiztatu beti"
+
+#~ msgid "Looping"
+#~ msgstr "Begiztatzen"
+
+#~ msgid "MOD Info"
+#~ msgstr "MOD informazioa"
+
+#~ msgid ""
+#~ "Filename:\n"
+#~ "Title:\n"
+#~ "Type:\n"
+#~ "Length:\n"
+#~ "Speed:\n"
+#~ "Tempo:\n"
+#~ "Samples:\n"
+#~ "Instruments:\n"
+#~ "Patterns:\n"
+#~ "Channels:"
+#~ msgstr ""
+#~ "Fitxategi-izena:\n"
+#~ "Titulua:\n"
+#~ "Mota:\n"
+#~ "Luzera:\n"
+#~ "Abiadura:\n"
+#~ "Tenpoa:\n"
+#~ "Laginak:\n"
+#~ "Instrumentuak:\n"
+#~ "Ereduak:\n"
+#~ "Kanalak:"
+
+#~ msgid ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+#~ msgstr ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+
+#~ msgid "Samples"
+#~ msgstr "Laginak"
+
+#~ msgid "Instruments"
+#~ msgstr "Instrumentuak"
+
+#~ msgid "Message"
+#~ msgstr "Mezua"
+
+#~ msgid "Modplug Input Plugin for Audacious ver"
+#~ msgstr "Modplug sarrerako plugina Audacious-en bertsio honentzako: "
+
+#, fuzzy
+#~ 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 soinu-motorra Olivier Lapicque-k garatua.\n"
+#~ "XMMSen interfazea Modplug-arentzako Kenton Varda-k garatua.\n"
+#~ "(c)2000 Olivier Lapicque eta Kenton Varda.\n"
+#~ "Eguneraketak eta mantetze lanak: Konstanty Bialkowski.\n"
+#~ "BMPrako moldaketak: Theofilos Intzoglou."
+
+#~ msgid "About Modplug"
+#~ msgstr "Modplug-i buruz"
+
+#~ msgid "Show separators in playlist"
+#~ msgstr "Erakutsi bereizleak erreprodukzio-zerrendan"
+
+#~ msgid "Show window manager decoration"
+#~ msgstr "Erakutsi leiho-kudeatzailearen dekorazioa"
+
+#~ msgid "This enables the window manager to show decorations for windows."
+#~ msgstr "Leiho-kudeatzailea gaitzen du leihoen dekorazioak erakusteko."
+
+#~ 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 ""
+#~ "Hautatzen bada, leiho nagusiko fitxategi-informazioaren testua bi "
+#~ "norabidetan korrituko da. Ez bada hautatzen, testua norabide bakar batean "
+#~ "korrituko da."
+
+#~ msgid "Disable inline gtk theme"
+#~ msgstr "Desgaitu barneko gtk gaia"
+
+#, fuzzy
+#~ msgid "Random skin on play"
+#~ msgstr "Nahastu ausaz erreprodukzio-zerrenda"
+
+#~ msgid "Allow loading incomplete skins"
+#~ msgstr "Baimendu azal osatugabeak kargatzea"
+
+#~ msgid ""
+#~ "If selected, audacious won't refuse loading broken skins. Use only if "
+#~ "your favourite skin doesn't work"
+#~ msgstr ""
+#~ "Hautatzen bada, Audacious-ek ez du ukatuko hondatutako azalak kargatzea. "
+#~ "Baldin eta zure azal gogokoenak ez badu funtzionatzen soilik."
+
+#~ msgid "Color Adjustment"
+#~ msgstr "Kolorea doitzea"
+
+#~ msgid ""
+#~ "Audacious allows you to alter the color balance of the skinned UI. The "
+#~ "sliders below will allow you to do this."
+#~ msgstr ""
+#~ "Audacious-ek azaldun interfazeko kolorearen balantzea aldatzea baimentzen "
+#~ "dizu. Azpiko graduatzaileak hori egitea utziko dizu."
+
+#~ msgid "Blue"
+#~ msgstr "Urdina"
+
+#~ msgid "Green"
+#~ msgstr "Berdea"
+
+#~ msgid "Red"
+#~ msgstr "Gorria"
+
+#, fuzzy
+#~ msgid "Color adjustment ..."
+#~ msgstr "Kolorea doitzea"
+
+#~ msgid "Disable 'GUI Scaling'"
+#~ msgstr "Desgaitu 'Interfazea eskalatzea'"
+
+#~ msgid "Enable 'GUI Scaling'"
+#~ msgstr "Gaitu 'Interfazea eskalatzea'"
+
+#~ msgid "DoubleSize"
+#~ msgstr "Tamaina bikoitza"
+
+#~ msgid "Easy Move"
+#~ msgstr "Erraz mugitu"
+
+#~ msgid "Spectrum Analyzer"
+#~ msgstr "Espektro-analizatzailea"
+
+#, fuzzy
+#~ msgid "Stream name"
+#~ msgstr "Instrumentuaren izena"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Kendu etiketa"
+
+#, fuzzy
+#~ msgid "About Stream Browser"
+#~ msgstr "OSS kontrolatzaileari buruz"
+
+#, fuzzy
+#~ 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-a (c) 2007, Calin Crisan <ccrisan@gmail.com> eta Audacious "
+#~ "taldea.\n"
+#~ "\n"
+#~ "Eskerrik asko libcdio-ren garatzaileei <http://www.gnu.org/software/"
+#~ "libcdio/>\n"
+#~ "\teta libcddb-eko garatzaileei <http://libcddb.sourceforge.net/>.\n"
+#~ "\n"
+#~ "Eskerrik asko Tony Vroon-i gainbegiratzeagatik eta ni gidatzeagatik\n"
+#~ "\n"
+#~ "Google Summer of Code 2007 proiektu bat izan da."
+
+#~ msgid "Can't jump to time when no track is being played.\n"
+#~ msgstr ""
+#~ "Ezin da denboran jauzirik egin pista ez denean erreproduzitzen ari.\n"
+
+#~ msgid "minutes:seconds"
+#~ msgstr "minutu:segundo"
+
+#~ msgid "Track length:"
+#~ msgstr "Pistaren luzera:"
+
+#~ msgid "Error writing playlist \"%s\": %s"
+#~ msgstr "Errorea \"%s\" erreprodukzio-zerrenda idaztean: %s"
+
 #~ msgid "%s already exist. Continue?"
 #~ msgstr "%s badago lehendik ere. Jarraitu?"
 
+#, fuzzy
+#~ msgid "Show main menu"
+#~ msgstr "Erakutsi erreproduzitzaile nagusiaren leihoa"
+
+#, fuzzy
+#~ msgid "Show/hide statusbar"
+#~ msgstr "Kargatu erreprodukzio-zerrenda"
+
+#, fuzzy
+#~ msgid "Import Playlist ..."
+#~ msgstr "Kargatu erreprodukzio-zerrenda"
+
+#, fuzzy
+#~ msgid "Export Playlist ..."
+#~ msgstr "Kargatu erreprodukzio-zerrenda"
+
+#, fuzzy
+#~ msgid "Refresh"
+#~ msgstr "Freskatu tasa"
+
+#, fuzzy
+#~ msgid "Refresh Selected"
+#~ msgstr "Kendu hautatutakoak"
+
+#, fuzzy
+#~ msgid "Refreshes metadata associated with selected entries."
+#~ msgstr ""
+#~ "Erreprodukzio-zerrendako sarrera bati esleituta dagoen metadatuak "
+#~ "freskatzen ditu."
+
+#, fuzzy
+#~ msgid "Edit the playlist title."
+#~ msgstr "Nahastu ausaz erreprodukzio-zerrenda"
+
+#, fuzzy
+#~ msgid "By Formatted Title"
+#~ msgstr "Tituluaren arabera"
+
+#, fuzzy
+#~ msgid "Components"
+#~ msgstr "Konpositorea:"
+
+#~ msgid "Upload selected track(s)"
+#~ msgstr "Igo hautatutako pistak"
+
+#~ msgid "MTP device handler"
+#~ msgstr "MTP gailuaren kudeatzailea"
+
+#~ msgid "Show main player window"
+#~ msgstr "Erakutsi erreproduzitzaile nagusiaren leihoa"
+
+#~ msgid "Ignore"
+#~ msgstr "Ezikusi egin"
+
+#~ 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 bere leiho guztiak ezkutatuta dituela abiatu da.\n"
+#~ "Erreproduzitzailearen leihoa erakustea nahiko duzu Audacious "
+#~ "kontrolatzeko; bestela, audtool edo gaitutako pluginen ('egoeraren "
+#~ "ikonoa' plugina bezalakoa) bidez urrunetik kontrola dezakezu."
+
+#~ msgid "Always ignore, show/hide is controlled remotely"
+#~ msgstr "Ezikusi egin, erakutsi/ezkutatu beti kontrolatzen da urrunetik"
+
+#~ msgid "Audacious - broken GTK engine usage warning"
+#~ msgstr "Audacious - hondatutako GTK motorraren erabileraren abisua"
+
+#~ 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>Hondatutako GTK motorra erabiltzen</big>\n"
+#~ "\n"
+#~ "Audacious-ek hondatutako GTK motorra erabiltzen ari zarela detektatu du.\n"
+#~ "\n"
+#~ "Erabiltzen ari zaren gai-motorra, %s, azal modernoek dituzten "
+#~ "eginbide batzuetatik bateraezina da. Bateragarriak ez diren eginbideak "
+#~ "desgaitu egn dira saio honetan.\n"
+#~ "\n"
+#~ "Eginbide hauek erabiltzeko, egokiena bestelako GTK gai-motor bat "
+#~ "erabiltzea izango duzu."
+
+#~ msgid "Do not display this warning again"
+#~ msgstr "Ez bistaratu abisu hau berriro"
+
+#~ msgid "Save as Static Playlist"
+#~ msgstr "Gorde erreprodukzio-zerrenda estatiko gisa"
+
+#~ msgid "Use Relative Path"
+#~ msgstr "Erabili bide-izen erlatiboa"
+
+#~ msgid "Load Playlist"
+#~ msgstr "Kargatu erreprodukzio-zerrenda"
+
+#~ msgid "Save Playlist"
+#~ msgstr "Gorde erreprodukzio-zerrenda"
+
 #~ msgid ""
 #~ "* Select ALSA output ports *\n"
 #~ "MIDI events will be sent to the ports selected here. In example, if your "

audacious-plugins-2.5.3.tar.gz/po/fr.po -> audacious-plugins-3.0.tar.gz/po/fr.po Changed

@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: Audacious-plugins 2.4\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-05-19 10:53-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2011-04-18 19:16+0200\n"
 "Last-Translator: Jean-Alexandre Anglès d'Auriac <jagw40k@free.fr>\n"
 "Language-Team: français <>\n"
@@ -23,7 +23,7 @@
 "X-Poedit-Country: BELGIUM\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -36,640 +36,47 @@
 "\n"
 "Droit d'utilisation 2005-2006 : Équipe de développement Audacious"
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "À propos du décodeur « MP4 AAC »"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "À propos du module "
-
-#: src/adplug/adplug-xmms.cc:155
-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 : "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "Configuration du module « AdPlug »"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "OK"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Annuler"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "Général"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Qualité du son"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Résolution"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8 bits"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16 bits"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Sortie"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Stéréo"
-
-#: src/adplug/adplug-xmms.cc:310
-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 !"
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Fréquence"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Lecture"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Détecter la fin du morceau"
-
-#: src/adplug/adplug-xmms.cc:362
-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."
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Formats"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Choix des formats"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Format"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Extension"
-
-#: src/adplug/adplug-xmms.cc:423
-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."
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "Informations sur le fichier"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Nom du fichier"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Titre : "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Auteur : "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Format : "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "Sous-modules : "
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Instruments : "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "Partitions : "
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Séquences : "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Morceau"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Nom de l'instrument"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Commentaires"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "Sélection du sous-module"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Partition : "
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Séquence : "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Ligne : "
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Vitesse : "
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Fréquence : "
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "À propos du module « XMMS Alarm »"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "XMMS Alarm"
-
-#: src/alarm/interface.c:56
-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/"
-
-#: src/alarm/interface.c:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Fermer"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "L'appel du réveil... ;-)"
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Choix d'une liste de lecture"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Désolé"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Avertissement"
-
-#: src/alarm/interface.c:213
-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"
-
-#: src/alarm/interface.c:229
-msgid "Oh Well"
-msgstr "Bon, d'accord"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Préférences du module « Alarm »"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Heure"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr " heures "
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr " minutes "
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr " minutes "
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Extinction après :"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Heure du réveil (par défaut) :"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Jours d'activation de l'alarme"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Défaut"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Jour"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Mardi"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Mercredi"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Jeudi"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Vendredi"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Samedi"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Dimanche"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Lundi"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Jours"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Fondu"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "secondes"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Volume"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Volume actuel"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "Réinitialise au volume de sortie actuel."
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Début"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Fin"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Commande supplémentaire"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "Activer"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Liste de lecture (option facultative)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Parcourir"
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Pense-bête"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Utiliser le pense-bête"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Options"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Que signifient ces options ?"
-
-#: src/alarm/interface.c:1364
-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"
-
-#: src/alarm/interface.c:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Aide"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "Le pense-bête du jour est..."
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Merci"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Périphérique PCM par défaut"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 msgid "Default mixer device"
 msgstr "Mélangeur audio par défaut"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 msgid "ALSA Output Plugin Preferences"
 msgstr "Préférences du module de sortie « ALSA »"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 msgid "PCM device:"
 msgstr "Périphérique PCM :"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Canal de mélange audio :"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 msgid "Mixer element:"
 msgstr "Mélangeur :"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr "Contourner le problème d'interruption du flux ( « drain hang-up » )"
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
 msgstr "À propos du module de sortie « ALSA »"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr "Erreur ALSA"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -841,6 +248,10 @@
 msgid "SoundFont settings"
 msgstr "Paramètres de la banque de sons « SoundFont »"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Nom du fichier"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Taille (bytes)"
@@ -949,8 +360,7 @@
 "Sortie\n"
 "'TiMidity'"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Nom :"
 
@@ -1131,119 +541,119 @@
 "Déclenche la fonction « OSD » lorsque la lecture n'est plus en mode « pause "
 "»."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "Décalage horizontal :"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Décalage vertical :"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "Largeur maximale :"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Options de l'affichage multiple"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "Afficher OSD sur"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "tous les moniteurs"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "le moniteur %i"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Durée (ms)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "Affichage :"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "Fondu d'entrée :"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "Fondu de sortie :"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Polices"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "Police %i :"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Ombre"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Internationalisation"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "Désactiver la conversion UTF-8 du texte (dans le module « aOSD »)"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "Choisir un fichier de thème"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Style du rendu"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "Couleur %i :"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "Thème personnalisé"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "Fichier du thème"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "Parcourir"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Activer le déclencheur"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Événement"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "Gestionnaire composite détecté"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1254,73 +664,73 @@
 "veuillez activer un gestionnaire composite approprié. Sinon, l'affichage « "
 "OSD » ne fonctionnera pas correctement."
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "La fausse transparence ne nécessite pas de gestionnaire composite."
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Transparence"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Fausse transparence"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Véritable transparence (nécessite l'extension « composite » de X)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "L'extension « composite » n'est pas chargée"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "L'extension « composite » n'est pas disponible"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Configuration du module « Audacious OSD »"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Essai"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Arrangement"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Texte"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Décoration"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Déclenchement"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Options diverses"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "À propos du module « OSD » pour Audacious"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1328,7 +738,7 @@
 "\n"
 "Module « OSD » pour Audacious "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1350,141 +760,6 @@
 "\n"
 "http://neugierig.org/software/ghosd/\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr "Demande de connexion couplée pour \"%s\""
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr "Demande d'autorisation pour \"%s\""
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr "Une liaison avec \"%s\" a été créée."
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr "La liaison avec \"%s\" a été supprimée."
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr "Le périphérique a été éteint."
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr "Le périphérique est maintenant en mode « privé »."
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr "Le périphérique peut maintenant initier une connexion."
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr "Le périphérique est maintenant en mode « public »."
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr "Le périphérique est maintenant en mode « public limité »."
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr "Le périphérique est entré en mode « connexion couplée »."
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr "Module de gestion des périphériques audio « Bluetooth »"
-
-#: src/bluetooth/bluetooth.c:118
-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"
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr "Fabricant"
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr "Casques/écouteurs disponibles"
-
-#: src/bluetooth/gui.c:224
-msgid "Current Headset"
-msgstr "Casque/accessoire actuel"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr "_Réactualiser"
-
-#: src/bluetooth/gui.c:231
-msgid "_Connect"
-msgstr "_Connecter"
-
-#: src/bluetooth/gui.c:237
-msgid "_Close"
-msgstr "_Fermer"
-
-#: src/bluetooth/gui.c:274
-msgid "Class"
-msgstr "Classe"
-
-#: src/bluetooth/gui.c:278
-msgid "Address:"
-msgstr "Adresse :"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr "Liaison terminée !"
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr "Aucun accessoire détecté !"
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr "Détection..."
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr "Processus de connexion couplée..."
-
-#: src/bluetooth/scan_gui.c:138
-msgid "Rescan"
-msgstr "Redétecter"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "Lecture"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Module « Blur Scope » : sélection de la couleur"
@@ -1493,11 +768,11 @@
 msgid "Options:"
 msgstr "Options :"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 msgid "About Audio CD Plugin"
 msgstr "À propos du module « CD Audio »"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1527,15 +802,15 @@
 "\n"
 "Droits d'utilisation (2009) : John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 msgid "Audio CD"
 msgstr "CD audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr "Le lecteur est vide"
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr "Type de disque non supporté"
 
@@ -1583,11 +858,23 @@
 msgid "Override default device: "
 msgstr "Remplacer le périphérique par défaut : "
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+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"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "Ajouter les pistes du CD"
 
@@ -1611,6 +898,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Décodeur « Game Console Music »"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "Général"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Lecture"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Basses :"
@@ -1628,8 +923,7 @@
 msgid "Default song length:"
 msgstr "Durée par défaut :"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Rééchantillonnage"
 
@@ -1641,6 +935,10 @@
 msgid "Resampling rate:"
 msgstr "Fréquence de rééchantillonnage"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1718,16 +1016,16 @@
 "Vous pouvez utiliser l'effet « Sample Rate Converter » pour rééchantillonner "
 "les titres à la même fréquence."
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "Configuration de « Crystalizer »"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Intensité de l'effet :"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -1768,387 +1066,20 @@
 msgid "Volume: (%)"
 msgstr "Volume : (%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "Lecture -> Lire"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "Lecture -> Arrêter"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "Lecture -> Pause"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "Lecture -> Précédent"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "Lecture -> Suivant"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "Lecture -> Éjecter"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "Liste de lecture -> Répéter"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "Liste de lecture -> Aléatoire"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "Volume -> Augmenter de 5"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "Volume -> Diminuer de 5"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "Volume -> Augmenter de 10"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "Volume -> Diminuer de 10"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "Volume -> Couper"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "Fenêtre -> Principale"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "Fenêtre -> Liste de lecture"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "Fenêtre -> Égaliseur"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "Fenêtre -> Aller au titre..."
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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"
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-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"
-
-#: src/evdev-plug/ed_internals.c:342
-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"
-
-#: src/evdev-plug/ed_internals.c:351
-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"
-
-#: src/evdev-plug/ed_internals.c:361
-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"
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-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"
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-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"
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-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"
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-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"
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-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"
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-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"
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-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"
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-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"
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-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"
-
-#: src/evdev-plug/ed_ui.c:212
-msgid "Detected"
-msgstr "Détecté"
-
-#: src/evdev-plug/ed_ui.c:217
-msgid "Custom"
-msgstr "Personnalisé"
-
-#: src/evdev-plug/ed_ui.c:223
-msgid "Not Detected"
-msgstr "Non détécté"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "Informations"
-
-#: src/evdev-plug/ed_ui.c:276
-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é."
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Erreur"
-
-#: src/evdev-plug/ed_ui.c:320
-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."
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "Ajouter un périphérique personnalisé"
-
-#: src/evdev-plug/ed_ui.c:353
-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."
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Nom du périphérique :"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Fichier du périphérique :"
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr "(personnalisée)"
-
-#: src/evdev-plug/ed_ui.c:412
-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."
-
-#: src/evdev-plug/ed_ui.c:447
-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"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "Voulez-vous supprimer le périphérique personnalisé sélectionné ?\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "Configuration du module « EvDev-Plug »"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Actif"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "État"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Nom du périphérique"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Fichier du périphérique"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Adresse du périphérique"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "_Associations"
-
-#: src/evdev-plug/ed_ui.c:838
-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é."
-
-#: src/evdev-plug/ed_ui.c:875
-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)."
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "Configuration des associations"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "Nom : "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Nom du fichier : "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Adresse physique : "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "À propos du module « EvDev-Plug »"
-
-#: src/evdev-plug/ed_ui.c:1491
-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"
-
-#: src/ffaudio/ffaudio-core.c:765
-#, c-format
+#: src/ffaudio/ffaudio-core.c:763
+#, fuzzy, c-format
 msgid ""
 "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"
-"\n"
 "Audacious plugin by:\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"
 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"
@@ -2163,15 +1094,15 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>\n"
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "À propos du module « FFaudio »"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "À propos du module « FileWriter »"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2217,51 +1148,51 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
 "MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "Configuration du module « File Writer »"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Format du fichier de sortie :"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Configurer"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Enregistrer dans le répertoire d'origine"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Enregistrer dans un répertoire personnel"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Dossier de destination :"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Choix d'un répertoire"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Déterminer le nom du fichier à partir :"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "des métadonnées du fichier d'origine"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "du nom du fichier d'origine"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Conserver l'extension du nom de fichier"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "Ajouter le numéro de la piste au début du nom du fichier"
 
@@ -2274,6 +1205,14 @@
 msgid "Joint Stereo"
 msgstr "Stéréo jointe"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Stéréo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Mono"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "Configuration de l'encodeur « MP3 »"
@@ -2319,7 +1258,6 @@
 msgstr "Protection contre les erreurs"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Qualité"
 
@@ -2427,11 +1365,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "À propos du module « Gnome Shortcut »"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2447,60 +1385,22 @@
 "Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr "Ouvrir des fichiers"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 msgid "Add Files"
 msgstr "Ajouter des fichiers"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 msgid "Audacious2"
 msgstr "Audacious2"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr "Interface gnt"
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-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"
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr "Aller au temps..."
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr " minutes : secondes"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr "Durée du morceau :"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr "Erreur lors de l'écriture de la liste de lecture \"%s\": %s"
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-msgid "Export Playlist"
-msgstr "Exporter la liste de lecture"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-msgid "Import Playlist"
-msgstr "Importer une liste de lecture"
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Place dans la liste"
@@ -2585,405 +1485,320 @@
 msgid "Disable"
 msgstr "Désactiver"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr "Interface GTK"
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr "Arrêter après le titre en cours de lecture"
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr "Mode « répétition »"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr "Mode « lecture aléatoire »"
+#: src/gtkui/menus.c:132
+#, fuzzy
+msgid "_Open Files ..."
+msgstr "Ouvrir des fichiers ..."
 
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr "Ne pas avancer dans la liste de lecture"
+#: src/gtkui/menus.c:133
+#, fuzzy
+msgid "Open _URL ..."
+msgstr "Ouvrir l'adresse d'un flux ..."
 
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr "Afficher l'espace informatif"
+#: src/gtkui/menus.c:134
+#, fuzzy
+msgid "_Add File ..."
+msgstr "Ajouter des fichiers ..."
 
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr "Afficher/cacher l'espace informatif"
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr "Afficher le menu principal"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr "Afficher/cacher le menu principal"
+#: src/gtkui/menus.c:135
+#, fuzzy
+msgid "Add U_RL ..."
+msgstr "Ajouter l'adresse d'un flux ..."
 
-#: src/gtkui/ui_manager.c:55
-msgid "Show statusbar"
-msgstr "Afficher la barre d'état"
+#: src/gtkui/menus.c:137
+#, fuzzy
+msgid "A_bout ..."
+msgstr "À propos du module "
 
-#: src/gtkui/ui_manager.c:56
-msgid "Show/hide statusbar"
-msgstr "Afficher/cacher la barre d'état"
+#: src/gtkui/menus.c:138
+#, fuzzy
+msgid "_Preferences ..."
+msgstr "Préférences..."
 
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
-msgstr "Afficher le titre des colonnes"
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
+msgstr "_Quitter"
 
-#: src/gtkui/ui_manager.c:60
-msgid "Scroll on Song Change"
-msgstr "Afficher le morceau courant au changement de pistes"
+#: src/gtkui/menus.c:142
+#, fuzzy
+msgid "_Play"
+msgstr "Lecture"
 
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
+#: src/gtkui/menus.c:143
+#, fuzzy
+msgid "Paus_e"
 msgstr "Pause"
 
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
+#: src/gtkui/menus.c:144
+#, fuzzy
+msgid "_Stop"
 msgstr "Arrêt"
 
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
+#: src/gtkui/menus.c:145
+#, fuzzy
+msgid "Pre_vious"
 msgstr "Précédent"
 
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
+#: src/gtkui/menus.c:146
+#, fuzzy
+msgid "_Next"
 msgstr "Suivant"
 
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "Liste de lecture"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "Nouvelle liste"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "Supprimer la liste"
-
-#: src/gtkui/ui_manager.c:95
-msgid "Import Playlist ..."
-msgstr "Importer une liste de lecture ..."
-
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr "Importe une liste de lecture dans la liste active."
+#: src/gtkui/menus.c:148
+#, fuzzy
+msgid "_Repeat"
+msgstr "Mode « répétition »"
 
-#: src/gtkui/ui_manager.c:98
-msgid "Export Playlist ..."
-msgstr "Exporter la liste de lecture ..."
+#: src/gtkui/menus.c:149
+#, fuzzy
+msgid "S_huffle"
+msgstr "Mode « lecture aléatoire »"
 
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "Enregistre la liste de lecture active."
+#: src/gtkui/menus.c:150
+#, fuzzy
+msgid "N_o Playlist Advance"
+msgstr "Ne pas avancer dans la liste de lecture"
 
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-msgid "Save All Playlists"
-msgstr "Enregistrer toutes les listes"
+#: src/gtkui/menus.c:151
+#, fuzzy
+msgid "Stop _After This Song"
+msgstr "Arrêter après le titre en cours de lecture."
 
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 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/gtkui/ui_manager.c:106
-msgid "Refresh"
-msgstr "Réactualiser"
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Actualise les métadonnées associées à une entrée de la liste."
-
-#: src/gtkui/ui_manager.c:110
-msgid "Refresh Selected"
-msgstr "Réactualiser la sélection"
+#: src/gtkui/menus.c:154
+#, fuzzy
+msgid "Jump to _Time ..."
+msgstr "Aller au temps..."
 
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
 msgstr ""
-"Actualise les métadonnées associées aux entrées de la liste.sélectionnées"
-
-#: src/gtkui/ui_manager.c:115
-msgid "Playlist Manager"
-msgstr "Gestionnaire de listes de lecture"
 
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr "Ouvre le gestionnaire de listes de lecture."
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr "Ajouter l'adresse d'un flux ..."
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr "Ajoute un flux distant à la liste de lecture."
-
-#: src/gtkui/ui_manager.c:123
-msgid "Add Files ..."
-msgstr "Ajouter des fichiers ..."
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr "Ajoute des fichiers à la liste de lecture."
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr "Effacer toutes les entrées"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr "Efface toutes les entrées de la liste de lecture."
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr "Ne garder que la sélection"
-
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr "Efface les entrées non sélectionnées de la liste de lecture."
-
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr "Effacer la sélection"
-
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr "Efface les entrées sélectionnées de la liste de lecture."
-
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
-msgstr "Modifier le titre"
-
-#: src/gtkui/ui_manager.c:140
-msgid "Edit the playlist title."
-msgstr "Modifie le titre de la liste de lecture."
-
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
-msgstr "Choisir les colonnes à afficher"
-
-#: src/gtkui/ui_manager.c:146
-msgid "Sort"
-msgstr "Trier"
-
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
+#: src/gtkui/menus.c:158
+#, fuzzy
+msgid "By Track _Number"
 msgstr "Par numéro de piste"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
+#: src/gtkui/menus.c:159
+#, fuzzy
+msgid "By _Title"
 msgstr "Par titre"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
+#: src/gtkui/menus.c:160
+#, fuzzy
+msgid "By _Artist"
 msgstr "Par artiste"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
-msgid "By Album"
+#: src/gtkui/menus.c:161
+#, fuzzy
+msgid "By A_lbum"
 msgstr "Par album"
 
-#: src/gtkui/ui_manager.c:155
-msgid "By Release Date"
+#: src/gtkui/menus.c:162
+#, fuzzy
+msgid "By Release _Date"
 msgstr "Par date"
 
-#: src/gtkui/ui_manager.c:157
-msgid "By File Path"
+#: src/gtkui/menus.c:163
+#, fuzzy
+msgid "By _File Path"
 msgstr "Par emplacement de fichier"
 
-#: src/gtkui/ui_manager.c:159
-msgid "By Formatted Title"
-msgstr "Par titre formaté"
+#: src/gtkui/menus.c:164
+#, fuzzy
+msgid "By _Custom Title"
+msgstr "Titre formaté"
 
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
+#: src/gtkui/menus.c:166
+#, fuzzy
+msgid "R_everse Order"
 msgstr "Inverser l'ordre"
 
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
+#: src/gtkui/menus.c:167
+#, fuzzy
+msgid "_Random Order"
 msgstr "Mélanger aléatoirement"
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr "Sortie"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
+msgstr "_Réactualiser"
 
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "Effets audio"
+#: src/gtkui/menus.c:172
+#, fuzzy
+msgid "_Sort"
+msgstr "Trier"
 
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
-msgstr "Égaliseur"
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "Affichage"
+#: src/gtkui/menus.c:175
+msgid "_Close"
+msgstr "_Fermer"
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
-msgstr "Interface"
+#: src/gtkui/menus.c:177
+#, fuzzy
+msgid "_Import ..."
+msgstr "Importer"
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "Fichier"
+#: src/gtkui/menus.c:178
+#, fuzzy
+msgid "_Export ..."
+msgstr "Exporter"
 
-#: src/gtkui/ui_manager.c:188
-msgid "Components"
-msgstr "Composants"
+#: src/gtkui/menus.c:180
+#, fuzzy
+msgid "_Playlist Manager ..."
+msgstr "Gestionnaire de listes de lecture"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr "Afficher les détails"
+#: src/gtkui/menus.c:183
+#, fuzzy
+msgid "Volume _Up"
+msgstr "Augmenter le volume"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr "Affiche les informations relatives au morceau."
+#: src/gtkui/menus.c:184
+#, fuzzy
+msgid "Volume _Down"
+msgstr "Réduire le volume"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "À propos d'Audacious"
+#: src/gtkui/menus.c:186
+#, fuzzy
+msgid "_Equalizer"
+msgstr "Égaliseur"
 
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
-msgstr "Ouvrir des fichiers ..."
+#: src/gtkui/menus.c:188
+#, fuzzy
+msgid "E_ffects"
+msgstr "Effets audio"
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
-msgstr "Charge et lit un fichier."
+#: src/gtkui/menus.c:191
+#, fuzzy
+msgid "_Interface"
+msgstr "Interface"
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
-msgstr "Ouvrir l'adresse d'un flux ..."
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr "Lit les média de l'emplacement sélectionné."
+#: src/gtkui/menus.c:194
+#, fuzzy
+msgid "Show I_nfo Bar"
+msgstr "Afficher l'espace informatif"
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "Affiche le menu propre à certains modules."
+#: src/gtkui/menus.c:195
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "Afficher la barre d'état"
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "Préférences..."
+#: src/gtkui/menus.c:197
+#, fuzzy
+msgid "Show Column _Headers"
+msgstr "Afficher le titre des colonnes"
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr "Ouvre la fenêtre des préférences."
+#: src/gtkui/menus.c:198
+#, fuzzy
+msgid "Choose _Columns ..."
+msgstr "Choisir les colonnes à afficher"
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
-msgstr "_Quitter"
+#: src/gtkui/menus.c:199
+#, fuzzy
+msgid "Scrol_l on Song Change"
+msgstr "Afficher le morceau courant au changement de pistes"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "Ferme Audacious."
+#: src/gtkui/menus.c:202
+#, fuzzy
+msgid "_File"
+msgstr "Fichier"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr "Marquer une boucle A-B"
+#: src/gtkui/menus.c:203
+#, fuzzy
+msgid "_Playback"
+msgstr "Lecture"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr "Effacer la boucle A-B"
+#: src/gtkui/menus.c:204
+#, fuzzy
+msgid "P_laylist"
+msgstr "Liste de lecture"
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr "Aller au début de la liste"
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#, fuzzy
+msgid "_Services"
+msgstr "Périphériques"
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
-msgstr "Aller au fichier..."
+#: src/gtkui/menus.c:206
+#, fuzzy
+msgid "_Output"
+msgstr "Sortie"
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr "Mettre dans la file d'attente"
+#: src/gtkui/menus.c:207
+#, fuzzy
+msgid "_View"
+msgstr "Affichage"
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-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/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
-msgstr "Copier"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-msgid "Cut"
-msgstr "Couper"
+#: src/gtkui/menus.c:215
+#, fuzzy
+msgid "_Copy"
+msgstr "Copier"
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
+#: src/gtkui/menus.c:216
+#, fuzzy
+msgid "_Paste"
 msgstr "Coller"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
+#: src/gtkui/menus.c:217
+#, fuzzy
+msgid "Select _All"
 msgstr "Tout sélectionner"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr "Sélectionne toutes les entrées de la liste."
+#: src/gtkui/menus.c:222
+#, fuzzy
+msgid "_Rename"
+msgstr "Nom du fichier"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr "Ne rien sélectionner"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
+msgstr "Interface GTK"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr "Annule la sélection de toutes les entrées de la liste."
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Erreur"
+
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d voies"
 msgstr[1] "%d voies"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, fuzzy, c-format
 msgid "%d kbps"
 msgstr "kbps"
@@ -2992,10 +1807,18 @@
 msgid "Previous Track"
 msgstr "Piste précédente"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Lecture"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr "Pause / Reprise"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Arrêt"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr "Piste suivante"
@@ -3020,6 +1843,10 @@
 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
+msgid "Jump to File"
+msgstr "Aller au fichier..."
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr "Afficher / Cacher les fenêtres du lecteur"
@@ -3028,11 +1855,21 @@
 msgid "Show On-Screen-Display"
 msgstr "Activer l'affichage à l'écran (« OSD »)"
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "Mode « répétition »"
+
+#: src/hotkey/gui.c:85
+#, fuzzy
+msgid "Toggle Shuffle"
+msgstr "Mode « lecture aléatoire »"
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(néant)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -3045,15 +1882,15 @@
 "\n"
 "Souhaitez-vous quand même poursuivre ?"
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr "Association des boutons de la souris"
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Configuration du module « Global Hotkey »"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -3063,23 +1900,23 @@
 " Vous pouvez aussi créer des associations avec les boutons de la souris.\n"
 " "
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr "Raccourcis clavier :"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr "Action : "
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr "Touche associée :"
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr "À propos du module « Global Hotkey »"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -3161,134 +1998,19 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "À propos du module « JACK » 0.17"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr "Cette extension « LADSPA » ne dispose pas de contrôles utilisateur"
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "Nom"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "Extensions installées"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "Extensions utilisées"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "Ajouter"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "Enlever"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "Liste des extensions « LADSPA »"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "À propos du module « LIRC »"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "Module « LIRC » "
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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"
+"Looking for lyrics..."
 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"
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr "Paramètres du module « LIRC » "
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr "Se reconnecter au serveur « LIRC »"
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr "Délai (secondes) avant la reconnexion :"
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr "Reconnexion"
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr "Connexion"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: impossible d'initialiser le support « LIRC »\n"
 
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr "%s: tentative de reconnexion...\n"
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: commande inconnue \"%s\"\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: déconnecté de « LIRC »\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
 msgstr ""
-"%s: le système va essayer de se reconnecter toutes les %d secondes...\n"
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
@@ -3296,11 +2018,11 @@
 "\n"
 "Les paroles n'ont pas été trouvées."
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "À propos du module « Métronome »"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3319,265 +2041,43 @@
 "'tact://77' produira 77 battements par minute\n"
 "'tact://60*3/4' produira 60 battements par minute (mesure à 3/4)"
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Métronome : %d bpm"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Métronome : %d bpm %d/%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "Configuration du module « ModPlug »"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 bits"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 bits"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr "Mono (sous-mélange)"
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr "Méthode « au plus proche » (la plus rapide)"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "Interpolation linéaire (rapide)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr "Interpolation par segments ('spline') (bonne qualité)"
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr "Filtre à réponse impulsionnelle finie ('8-tap FIR') (qualité optimale)"
-
-#: src/modplug/gui/interface.cxx:286
-msgid "96 kHz"
-msgstr "96 kHz"
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Fréquence d'échantillonnage"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "Activer"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "Profondeur"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "Délai"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "Réverbération"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "Intensité"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "Portée"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "Amplification des basses"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Son d'ambiance"
 
-#: src/modplug/gui/interface.cxx:561
-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) !"
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "Préamplification"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "Utiliser le nom du fichier comme titre du morceau"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "Informations rapides sur la liste de lecture"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "Réduction du bruit"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Lire les modules musicaux Amiga"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "Ne pas répéter"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "Répéter"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "fois"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "Répéter en boucle"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "Répétition"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "Informations sur le module"
-
-#: src/modplug/gui/interface.cxx:878
-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 :"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "Échantillons"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "Instruments"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "Commentaires"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Module d'entrée « Modplug » pour Audacious, version "
-
-#: src/modplug/gui/main.cxx:52
-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."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "À propos de « Modplug »"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: 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/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr "Transférer la sélection"
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr "Transfert en cours..."
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr "Support MTP"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
+msgstr ""
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
+#: src/mtp_up/mtp.c:311
+#, fuzzy
+msgid "Disconnect MTP Device"
 msgstr "Déconnecter le périphérique"
 
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "Arrêt"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Audacious - avertissement concernant l'affichage"
+
 #: src/null/null.c:64
 msgid "Null output plugin "
 msgstr "Module de sortie « Null » "
@@ -3628,11 +2128,11 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr "Activer les conversions de format logicielles de « OSS »."
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "À propos du module « OSS4 »"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
@@ -3691,6 +2191,11 @@
 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
 msgid "OSS Driver configuration"
 msgstr "Configuration du pilote « OSS »"
@@ -3773,11 +2278,11 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
 "MA 02110-1301, USA."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: 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:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3843,27 +2348,27 @@
 msgid "Method:"
 msgstr "Méthode :"
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Services"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 msgid "Scrobbler URL:"
 msgstr "Adresse Scrobbler :"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3871,7 +2376,7 @@
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3883,15 +2388,15 @@
 "Initialement créé par Audun Hove <audun@nlc.no> et Pipian <pipian@pipian."
 "com>\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "À propos du module « Scrobbler »"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 msgid "About SDL Output Plugin"
 msgstr "À propos du module de sortie SDL"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 msgid "SDL error"
 msgstr "Erreur SDL"
 
@@ -3900,10 +2405,18 @@
 msgid "About %s"
 msgstr "À propos du module « %s »"
 
-#: src/sid/xs_config.c:323
+#: 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"
@@ -3913,6 +2426,11 @@
 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 »"
@@ -4235,15 +2753,15 @@
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: 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:435
+#: 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:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -4277,6 +2795,11 @@
 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 :"
@@ -4548,11 +3071,11 @@
 msgid "No"
 msgstr "Aucun"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "À propos de l'interface à thème"
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -4560,479 +3083,450 @@
 "Droits d'utilisation : Tomasz Moń <desowin@gmail.com> (2008)\n"
 "\n"
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr "Interface à thème"
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr "F_enêtre principale"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr "Police de la fenêtre principale du lecteur"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "_Liste de lecture"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr "Police de la liste de lecture"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr "_Polices"
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr "Utiliser les polices matricielles (si elles sont disponibles)"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 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)."
-
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr "_Divers"
 
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr "Afficher les barres de séparation dans la liste de lecture"
-
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr "Montrer la décoration du gestionnaire de fenêtres"
-
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
 msgstr ""
-"Cette option affiche les ornements propres au gestionnaire de fenêtres du "
-"système."
 
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr "Utiliser le défilement de texte bidirectionnel"
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "_Thème"
 
-#: src/skins/skins_cfg.c:330
-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."
+#: src/skins/skins_cfg.c:393
+#, fuzzy
+msgid "Interface Preferences"
+msgstr "Préférences du module « Crossfade »"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr "Ne pas appliquer aux menus le style « GTK » du thème sélectionné"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Préamplification"
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
-msgstr "Changer de thème de manière aléatoire, lors de la lecture"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
-msgstr "Permettre le chargement des thèmes incomplets"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Hz"
 
-#: src/skins/skins_cfg.c:335
-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."
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Hz"
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "Ajustement des couleurs"
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Hz"
 
-#: src/skins/skins_cfg.c:407
-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."
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Hz"
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "Bleu"
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 kHz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "Vert"
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "Rouge"
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 kHz"
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "_Thème"
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 kHz"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr "Ajustement des couleurs ..."
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Égaliseur d'Audacious"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr "Préréglages"
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "son d'ambiance"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious - avertissement concernant l'affichage"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "Montrer la fenêtre principale"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "Ignorer"
-
-#: src/skins/ui_main.c:993
-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"
-" "
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr ""
-"Toujours ignorer : la fonction « montrer/cacher » est contrôlée à distance."
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious - défaillance du moteur « GTK »"
-
-#: src/skins/ui_main.c:1052
-#, c-format
-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"
-" "
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr "Ne plus afficher cet avertissement"
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
+#: src/skins/ui_main.c:807
+#, fuzzy, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Position : %d:%-2.2d/%d:%-2.2d (%d%%)"
 
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume : %d%%"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance : %d%% gauche"
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balance : centre"
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance : %d%% droite"
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Menu des options"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Annuler « Toujours au premier plan »"
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Activer « Toujours au premier plan »"
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Informations sur le fichier"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "Annuler « Agrandissement de l'interface »"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "Activer « Agrandissement de l'interface »"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Menu des effets visuels"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr "Mode « Fichier unique »."
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 msgid "Playlist mode."
 msgstr "Mode « Liste de lecture »."
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr "Arrêter après le titre en cours de lecture."
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr "Ne pas arrêter après le titre en cours de lecture."
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr "Activer le défilement du titre"
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Arrêter après le titre en cours de lecture"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
 msgstr "Pics"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Mode « répétition »"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Mode « lecture aléatoire »"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "Ne pas avancer dans la liste de lecture"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr "Montrer le lecteur"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr "Montrer la liste de lecture"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr "Montrer l'égaliseur"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr "Toujours au premier plan"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr "Afficher sur tous les bureaux"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr "Enrouler le lecteur"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr "Enrouler la liste de lecture"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr "Enrouler l'égaliseur"
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "Échelle"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr "Taille double"
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr "Déplacement facile"
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr "Analyseur"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr "Oscilloscope"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr "Spectrogramme"
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "Arrêt"
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr "Feu"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr "Lignes verticales"
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr "Lignes"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr "Barres"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr "Points"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr "Lignes"
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr "Vagues"
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr "Glace"
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr "Lissé"
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "Très lente"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "Lente"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "Moyenne"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "Rapide"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "Très rapide"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr "Temps écoulé"
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr "Temps restant"
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "Pause"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "Précédent"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "Suivant"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "Effets visuels"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr "Type d'effet visuel"
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr "Mode « analyseur »"
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr "Mode « oscilloscope »"
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr "Mode « spectrogramme »"
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr "Mode « VU en fenêtre réduite »"
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr "Retombée de l'analyseur"
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr "Retombée des pics"
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Liste de lecture"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Nouvelle liste"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr "Liste suivante"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr "Liste précédente"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Supprimer la liste"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "Importer une liste de lecture"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Importe une liste de lecture dans la liste active."
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "Exporter la liste de lecture"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+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:228
+#: src/skins/ui_manager.c:235
+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:238
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr "Ouvre le gestionnaire de listes de lecture."
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Affichage"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "Interface"
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "Préférences du module « Crossfade »"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr "Ajouter un flux Internet..."
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr "Ajoute un flux distant à la liste de lecture."
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr "Ajouter des fichiers..."
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr "Ajoute des fichiers à la liste de lecture."
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr "Chercher et sélectionner"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
@@ -5040,224 +3534,361 @@
 "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:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr "Inverser la sélection"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 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:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "Tout sélectionner"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
+msgstr "Sélectionne toutes les entrées de la liste."
+
+#: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr "Ne rien sélectionner"
+
+#: src/skins/ui_manager.c:272
+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
+msgid "Remove All"
+msgstr "Effacer toutes les entrées"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr "Efface toutes les entrées de la liste de lecture."
+
+#: src/skins/ui_manager.c:281
 msgid "Clear Queue"
 msgstr "Vider la file d'attente"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 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:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "Effacer les fichiers inexistants"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 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:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "Effacer les éléments redondants"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "Par titre"
+
+#: src/skins/ui_manager.c:292
 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:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "Par nom de fichier"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 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:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "Par chemin et nom de fichier"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 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:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr "Ne garder que la sélection"
+
+#: src/skins/ui_manager.c:304
+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
+msgid "Remove Selected"
+msgstr "Effacer la sélection"
+
+#: src/skins/ui_manager.c:308
+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
 msgid "Randomize List"
 msgstr "Mélanger aléatoirement la liste"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr "Mélange aléatoirement la liste de lecture."
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr "Inverser la liste"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr "Inverse l'ordre de la liste de lecture."
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "Trier la liste"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr "Trie la liste, en fonction du titre des entrées."
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+msgid "By Album"
+msgstr "Par album"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr "Trie la liste, en fonction du nom de l'album."
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "Par artiste"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr "Trie la liste, en fonction de l'artiste."
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr "Trie la liste, en fonction du nom de fichier des entrées."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr "Trie la liste, en fonction du chemin complet des entrées."
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "Par date"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 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:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr "Par numéro de piste"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr "Trie la liste, en fonction du numéro des pistes."
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr "Trier la sélection"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "Fichier"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Aide"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr "Services des modules"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr "Afficher les détails"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr "Affiche les informations relatives au morceau."
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "À propos d'Audacious"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "Lire un fichier..."
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr "Charge et lit un fichier."
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "Lire un emplacement..."
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr "Lit les média de l'emplacement sélectionné."
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "Affiche le menu propre à certains modules."
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "Préférences..."
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr "Ouvre la fenêtre des préférences."
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "Ferme Audacious."
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr "Marquer une boucle A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr "Effacer la boucle A-B"
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+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
+msgid "Jump to Time"
+msgstr "Aller au temps..."
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr "Mettre dans la file d'attente"
+
+#: src/skins/ui_manager.c:431
+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
+msgid "Copy"
+msgstr "Copier"
+
+#: src/skins/ui_manager.c:436
+msgid "Cut"
+msgstr "Couper"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Coller"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Charger"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Préréglage général"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Charge un préréglage général."
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Préréglage spécifique"
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Charge un préréglage spécifique."
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Charge le préréglage par défaut dans l'égaliseur."
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Remise à zéro"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Réinitialise les niveaux de l'égaliseur."
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "À partir d'un fichier"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Charge un préréglage à partir d'un fichier."
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "À partir d'un fichier « EQF » de « WinAMP »"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 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:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Préréglages de « WinAMP »"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importe les préréglages de « WinAMP »."
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Enregistre comme préréglage général."
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Enregistre comme préréglage spécifique."
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Enregistre comme préréglage par défaut."
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Dans un fichier"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Enregistre le préréglage dans un fichier."
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Dans un fichier « EQF » pour « WinAMP »"
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Enregistre le préréglage dans un fichier « EQF » pour « WinAMP »."
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Efface un préréglage."
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Efface un préréglage spécifique."
 
-#: src/skins/ui_playlist.c:374
+#: 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:382
+#: 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 "
@@ -5273,104 +3904,52 @@
 "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:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Titre : "
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Titre de l'album : "
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Nom de l'artiste : "
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Nom du fichier : "
 
-#: src/skins/ui_playlist.c:419
+#: 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:422
+#: 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:425
+#: 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:776
-msgid "Save as Static Playlist"
-msgstr "Enregistrer comme liste statique"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr "Utiliser une arborescence relative"
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "Charger une liste de lecture"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "Enregistrer la liste"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Éditeur de la liste de lecture d'Audacious"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d sur %d)"
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr "Thème « Winamp 2.x » archivé"
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Thème « Winamp 2.x » non archivé"
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Impossible de créer le répertoire (%s) : %s\n"
@@ -5431,56 +4010,64 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
 "MA 02110-1301, USA."
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "À propos de « SndStretch »"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr "Correction du volume"
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "Chevauchement léger"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "Vitesse"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "Hauteur"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "Échelle"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Options"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "Configuration de « SndStretch »"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 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:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "Commande :"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 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:471
+#: src/song_change/song_change.c:472
 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:475
+#: src/song_change/song_change.c:476
 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) :"
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -5515,7 +4102,7 @@
 "%b : Album du morceau\n"
 "%T : Titre du morceau"
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5524,18 +4111,14 @@
 "entourés de guillemets.\n"
 "Une utilisation différente constitue un risque en matière de sécurité."
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "Commandes"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 msgid "Song Change"
 msgstr "Song Change"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "Analyseur Spectral"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "À propos du module « Status Icon »"
@@ -5608,75 +4191,19 @@
 "\n"
 "Écrit par Johan Levin (1999)."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "À propos de « Extra Stereo »"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "Configuration de « Extra Stereo »"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-msgid "Search:"
-msgstr "Recherche :"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr "Ajouter le favori"
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-msgid "Stream name"
-msgstr "Nom du flux"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr "En cours de diffusion"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-msgid "Remove Bookmark"
-msgstr "Supprimer le favori"
-
-#: src/streambrowser/streambrowser.c:340
-msgid "About Stream Browser"
-msgstr "À propos du module « Stream Browser »"
-
-#: src/streambrowser/streambrowser.c:341
-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 »."
-
-#: src/tonegen/tonegen.c:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "À propos de « Tone Generator »"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5694,12 +4221,12 @@
 "Par exemple, \"tone://2000;2005\" émettra un son de 2000 Hz et un son de "
 "2005 Hz."
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "Générateur de sons : "
 
@@ -5720,15 +4247,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Métadonnées « Ogg Vorbis »"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Configuration du module audio « Ogg Vorbis »"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "À propos du module audio « Ogg Vorbis »"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5813,9 +4340,1393 @@
 "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"

audacious-plugins-2.5.3.tar.gz/po/hu.po -> audacious-plugins-3.0.tar.gz/po/hu.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: audacious 2.4\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-05-19 10:53-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-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"
@@ -18,7 +18,7 @@
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -29,575 +29,47 @@
 "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:273
+#: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "MP4 AAC dekóder bővítmény névjegye"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "Névjegy"
-
-#: src/adplug/adplug-xmms.cc:155
-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 ""
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: Beállítások"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "Ok"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "Általános"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Hang minőség"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Felbontás"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8bit"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16bit"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Csatornák"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Monó"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Sztereó"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Frekvencia"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Lejátszás"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Dalvég érzékelése"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Formátumok"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Formátum választás"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Formátum"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Kiterjesztés"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: Fájl infomráció"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Fájlnév"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Cím:"
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Szerző:"
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Fájtípus:"
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Hangszerek:"
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "Sorrend:"
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Minták:"
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Dal"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Hangszer neve"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Dal üzenet"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Sorrend:"
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Minta:"
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Sor:"
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Sebesség:"
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Időzítő:"
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "XMMS Ébresztő névjegye"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "XMMS Ébresztő"
-
-#: src/alarm/interface.c:56
-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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Bezár"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Ébresztő"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "Ez egy ébresztő üzenet."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Lejátszólista választása"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Sajnálom"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Figyelmeztetés"
-
-#: src/alarm/interface.c:213
-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:229
-msgid "Oh Well"
-msgstr "Hát igen"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Ébresztő beállítások"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Idő"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "óra"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "ó"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "perc"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Elnémítás ezután:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Ébresztés ekkor (alapértelmezett):"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Válassza ki az ébresztés napjait a listáról"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Alapértelmezett"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Nap"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Kedd"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Szerda"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Csütörtök"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Péntek"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Szombat"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Vasárnap"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Hétfő"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Napok"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Áttűnés"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "másodperc"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Hangerő"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Jelenlegi"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "a jelenlegi hangerőre állít"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Kezdés ekkor"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Vége"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Kiegészító parancs"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "engedélyezve"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Lejátszólista (opcionális)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Keresés..."
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Emlékeztető"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Emlékeztető használata"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Opciók"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Mit jelentenek ezek a lehetőségek?"
-
-#: src/alarm/interface.c:1364
-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"
-
-#: src/alarm/interface.c:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Súgó"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr ""
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Köszönöm"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Alapértelmezett PCM eszköz"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 msgid "Default mixer device"
 msgstr "Alapértelmezett keverő eszköz"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA Kimeneti bővítmény beállítások"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 msgid "PCM device:"
 msgstr "PCM eszköz:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Keverő eszköz:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 msgid "Mixer element:"
 msgstr "Mixer elem:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
 msgstr "ALSA Kimeneti bővítmény névjegye"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr "ALSA hiba"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -747,6 +219,10 @@
 msgid "SoundFont settings"
 msgstr "SoundFont beállítások"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Fájlnév"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Méret (byte)"
@@ -851,8 +327,7 @@
 "TiMidity\n"
 "backend"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Név"
 
@@ -1000,119 +475,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSD használata ha elindítják a lejátszást."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Elhelyezés"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "Relatív X pozíció:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Relatív Y pozíció:"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "Max OSD szélesség:"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Több monitoros opciók"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "OSD képernyők használata:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "minden monitoron"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Időtartam (mp)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "Képernyő:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "Áttűnés be:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "Áttűnés ki:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Betűkészletek"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "Betűkészlet %i:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Árnyék"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Nemzetközi"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "UTF-8 karakter konverzió letiltása (aosd-ben)"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "Téma fájl választás"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Renderelési stílus"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Színek"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "Szín %i:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "Egyedi téma"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "Téma fájl:"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "Böngészés"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Esemény engedélyezése"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Esemény"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "Kompozit kezelő detektálva"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1122,73 +597,73 @@
 "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:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "Kompozít kezelő nem szükséges a nem valódi átlátszósághoz"
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Átlátszóság"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Nem valódi átlátszóság"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Valódi átlászóság (szükséges X Composite Ext.)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "Kompozit kiterjesztés nem tölthető be"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "Kompozit kiterjesztés nem érhető el"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - beállítás"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Teszt"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Pozíció"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Animáció"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Szöveg"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Dekoráció"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Esemény"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Egyéb"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "Audacious OSD - névjegy"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1196,7 +671,7 @@
 "\n"
 "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1218,125 +693,6 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr "Párosításkérés a(z) %s eszköztől"
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr "Engedély kérés ehhez %s"
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr "Kötés létrehozva: %s"
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr "Kötés eltávolítva: %s"
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr "Az eszköz kikapcsolva"
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr "Az eszköz nem felfedezhető"
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr "Az eszköz csatlakoztatható"
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr "Az eszköz felfedezhető"
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr "Az eszköz korlátozottan felfedezhető"
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr "Az eszköz párosítás módban"
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr "Bluetooth fejhallgató támogatás bővítmény"
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr "Készítő"
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr "Elérhető fejhallgatók"
-
-#: src/bluetooth/gui.c:224
-msgid "Current Headset"
-msgstr "Aktuális fejhallgató"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr "_Frissítés"
-
-#: src/bluetooth/gui.c:231
-msgid "_Connect"
-msgstr "Kap_csolódás"
-
-#: src/bluetooth/gui.c:237
-msgid "_Close"
-msgstr "_Bezár"
-
-#: src/bluetooth/gui.c:274
-msgid "Class"
-msgstr "Osztály"
-
-#: src/bluetooth/gui.c:278
-msgid "Address:"
-msgstr "Cím:"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr "Kötés sikeres!"
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr "Nem találtam eszközt!"
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr "Keresés..."
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr "Párosítás"
-
-#: src/bluetooth/scan_gui.c:138
-msgid "Rescan"
-msgstr "Újraolvasás"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "Lejátszás"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Blur Scope: Szín választás"
@@ -1345,11 +701,11 @@
 msgid "Options:"
 msgstr "Beállítások:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 msgid "About Audio CD Plugin"
 msgstr "Audio CD bővítmény néjvegye"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1364,16 +720,16 @@
 "Copyright 2009 John Lindgren"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 #, fuzzy
 msgid "Audio CD"
 msgstr "Hang"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -1421,11 +777,23 @@
 msgid "Override default device: "
 msgstr "Alapértelmezett eszköz felülírása:"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+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"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "CD Hozzáadása"
 
@@ -1450,6 +818,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Játék Konzol Zene Dekóder"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "Általános"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Lejátszás"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Basszus:"
@@ -1467,8 +843,7 @@
 msgid "Default song length:"
 msgstr "Alapértelmezett szám hossz:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Újra mintavételezés"
 
@@ -1480,6 +855,10 @@
 msgid "Resampling rate:"
 msgstr "Újra mintavételezési arány:"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1539,16 +918,16 @@
 "same rate."
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "Crystalizer beállítása"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Effektus intenzitása:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Alkalmazás"
 
@@ -1588,335 +967,31 @@
 msgid "Volume: (%)"
 msgstr "Hangerő: (%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "Lejátszás->Indítás"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "Lejátszás->Megállítás"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "Lejátszás->Szünet"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "Lejátszás->Előző"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "Lejátszás->Következő"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "Lejátszás->Kiadás"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "Lejátszólista->Ismétlés"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "Lejátszólista->Véletlenszerű"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "Hangerő ->Fel_5"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "Hangerő->Le_5"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "Hangerő->Fel_10"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "Hangerő->Le_10"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "Hangerő->Némítás"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "Ablak->Főablak"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "Ablak->Lejátszólista"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "Ablak->Ekvalízer"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "Ablak->FájlhozUgrás"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:212
-msgid "Detected"
-msgstr "Detektálva"
-
-#: src/evdev-plug/ed_ui.c:217
-msgid "Custom"
-msgstr "Egyéni"
-
-#: src/evdev-plug/ed_ui.c:223
-msgid "Not Detected"
-msgstr "Nem talált"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "Információ"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Hiba"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "EvDev-Plug - Egyéb eszköz hozzáadása"
-
-#: src/evdev-plug/ed_ui.c:353
-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 ""
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Eszköz neve:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Eszköz fájl:"
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr "(egyéni)"
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "EvDev-Plug - beállítások"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Aktív"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Státusz"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Eszköz neve"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Eszköz fájl"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Eszköz cím"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "_Kötések"
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Plug - Kötések konfiguráció"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "Név:"
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Fájlnév:"
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Phys.Cím: "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "EvDev-Plug - névjegy"
-
-#: src/evdev-plug/ed_ui.c:1491
-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 ""
-
-#: src/ffaudio/ffaudio-core.c:765
+#: 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"
 "Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "FFaudio bővítmény névjegye"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "Fájlíró bővítmény névjegye"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -1936,51 +1011,51 @@
 "USA."
 msgstr ""
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "Fájl Író beállítások"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Kimeneti fájl formátum:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Beállítás"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Mentés az eredeti könyvtárba"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Mentés egyéb könyvtárba"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Kimeneti fájl könyvtára:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Válasszon egy mappát"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Legyen a fájlnévből:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "eredeti fájl kiterjesztések"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "eredeti fájlnév"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Ne vágja le a fájl kiterjesztést"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -1993,6 +1068,14 @@
 msgid "Joint Stereo"
 msgstr "Joint-Stereo"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Sztereó"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Monó"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "MP3 Beállítás"
@@ -2038,7 +1121,6 @@
 msgstr "Hiba védelem"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Minőség"
 
@@ -2140,11 +1222,11 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "Gnome Parancsikon bővítmény névjegye"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2153,58 +1235,22 @@
 "\n"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr "Fájlok megnyitása"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 msgid "Add Files"
 msgstr "Fájlok hozzáadása"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 msgid "Audacious2"
 msgstr "Audacious2"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr "gnt felület"
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr ""
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr "Ugrás a megadott időre"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr "perc:másodperc"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr "Szám hossza:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr "Hiba a lejátszólista írásakor \"%s\": %s"
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-msgid "Export Playlist"
-msgstr "Lejátszólista exportálása"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-msgid "Import Playlist"
-msgstr "Lejátszólista importálása"
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr ""
@@ -2301,411 +1347,319 @@
 msgid "Disable"
 msgstr "változó"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr "GTK+ felület"
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr "Leállítás az aktuális dal után"
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr "Ismétlés"
+#: src/gtkui/menus.c:132
+#, fuzzy
+msgid "_Open Files ..."
+msgstr "Fájlok megnyitása ..."
 
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr "Véletlenszerű"
+#: src/gtkui/menus.c:133
+#, fuzzy
+msgid "Open _URL ..."
+msgstr "URL megnyitása ..."
 
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr "Ne legyen léptetés a lejátszólistában"
+#: src/gtkui/menus.c:134
+#, fuzzy
+msgid "_Add File ..."
+msgstr "Fájlok hozzáadása ..."
 
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr "Információs terület mutatása"
+#: src/gtkui/menus.c:135
+#, fuzzy
+msgid "Add U_RL ..."
+msgstr "URL hozzáadása ..."
 
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr "Információs terület megjelenítése/elrejtése"
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr "Főmenü megjelenítése"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr "Főmenü megjelenítése/elrejtése"
+#: src/gtkui/menus.c:137
+#, fuzzy
+msgid "A_bout ..."
+msgstr "Névjegy"
 
-#: src/gtkui/ui_manager.c:55
-msgid "Show statusbar"
-msgstr "Az állapotsor megjelenítése"
+#: src/gtkui/menus.c:138
+#, fuzzy
+msgid "_Preferences ..."
+msgstr "Beállítások"
 
-#: src/gtkui/ui_manager.c:56
-msgid "Show/hide statusbar"
-msgstr "Az állapotsor megjelenítése/elrejtése"
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
+msgstr "_Kilépés"
 
-#: src/gtkui/ui_manager.c:58
+#: src/gtkui/menus.c:142
 #, fuzzy
-msgid "Show Column Headers"
-msgstr "Lejátszó mutatása"
+msgid "_Play"
+msgstr "Lejátszás"
 
-#: src/gtkui/ui_manager.c:60
+#: src/gtkui/menus.c:143
 #, fuzzy
-msgid "Scroll on Song Change"
-msgstr "Szám váltás"
-
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
+msgid "Paus_e"
 msgstr "Szünet"
 
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
+#: src/gtkui/menus.c:144
+#, fuzzy
+msgid "_Stop"
 msgstr "Leállít"
 
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
+#: src/gtkui/menus.c:145
+#, fuzzy
+msgid "Pre_vious"
 msgstr "Előző"
 
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
+#: src/gtkui/menus.c:146
+#, fuzzy
+msgid "_Next"
 msgstr "Következő"
 
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "Lejátszólista"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "Új lejátszólista"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "Lejátszólista törlése"
-
-#: src/gtkui/ui_manager.c:95
-msgid "Import Playlist ..."
-msgstr "Lejátszólista importálása ..."
-
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr "Lejátszólista betöltése a kiválasztott lejátszólistába."
-
-#: src/gtkui/ui_manager.c:98
-msgid "Export Playlist ..."
-msgstr "Lejátszólista exportálása ..."
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "Kiválasztott lejátszólista mentése."
-
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-msgid "Save All Playlists"
-msgstr "Minden lejátszó lista mentése"
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-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/gtkui/ui_manager.c:106
-msgid "Refresh"
-msgstr "Frissítés"
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr "A lejátszólista elemek metaadatainak frissítése."
-
-#: src/gtkui/ui_manager.c:110
+#: src/gtkui/menus.c:148
 #, fuzzy
-msgid "Refresh Selected"
-msgstr "Kijelölt törlése"
+msgid "_Repeat"
+msgstr "Ismétlés"
 
-#: src/gtkui/ui_manager.c:111
+#: src/gtkui/menus.c:149
 #, fuzzy
-msgid "Refreshes metadata associated with selected entries."
-msgstr "A lejátszólista elemek metaadatainak frissítése."
-
-#: src/gtkui/ui_manager.c:115
-msgid "Playlist Manager"
-msgstr "Lejátszólista kezelő"
-
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr "Lejátszólista kezelő megnyitása."
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr "URL hozzáadása ..."
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr "Távoli sávok hozzáadása a lejátszólistához."
-
-#: src/gtkui/ui_manager.c:123
-msgid "Add Files ..."
-msgstr "Fájlok hozzáadása ..."
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr "Fájlok hozzáadása a lejátszólistához."
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr "Összes törlése"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr "Minden elem eltávolítása a lejátszólistáról."
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr "Nem kiválasztottak törlése"
-
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr "Minden nem kiválasztott elem törlése a lejátszólistáról."
+msgid "S_huffle"
+msgstr "Véletlenszerű"
 
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr "Kijelölt törlése"
+#: src/gtkui/menus.c:150
+#, fuzzy
+msgid "N_o Playlist Advance"
+msgstr "Ne legyen léptetés a lejátszólistában"
 
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr "Kijelölt elemek törlése a lejátszólistáról"
+#: src/gtkui/menus.c:151
+#, fuzzy
+msgid "Stop _After This Song"
+msgstr "Leállítás az aktuális dal után."
 
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:140
+#: src/gtkui/menus.c:154
 #, fuzzy
-msgid "Edit the playlist title."
-msgstr "Lista rendezése cím alapján."
+msgid "Jump to _Time ..."
+msgstr "Ugrás a megadott időre"
 
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:146
-msgid "Sort"
-msgstr "Rendezés"
-
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
+#: src/gtkui/menus.c:158
+#, fuzzy
+msgid "By Track _Number"
 msgstr "A dal sorszáma szerint"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
+#: src/gtkui/menus.c:159
+#, fuzzy
+msgid "By _Title"
 msgstr "Cím szerint"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
+#: src/gtkui/menus.c:160
+#, fuzzy
+msgid "By _Artist"
 msgstr "Előadó szerint"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
-msgid "By Album"
+#: src/gtkui/menus.c:161
+#, fuzzy
+msgid "By A_lbum"
 msgstr "Album szerint"
 
-#: src/gtkui/ui_manager.c:155
+#: src/gtkui/menus.c:162
 #, fuzzy
-msgid "By Release Date"
+msgid "By Release _Date"
 msgstr "Dátum alapján"
 
-#: src/gtkui/ui_manager.c:157
-msgid "By File Path"
+#: src/gtkui/menus.c:163
+#, fuzzy
+msgid "By _File Path"
 msgstr "Fájl útvonal szerint"
 
-#: src/gtkui/ui_manager.c:159
+#: src/gtkui/menus.c:164
 #, fuzzy
-msgid "By Formatted Title"
-msgstr "Cím szerint"
+msgid "By _Custom Title"
+msgstr "Egyedi téma"
 
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
+#: src/gtkui/menus.c:166
+#, fuzzy
+msgid "R_everse Order"
 msgstr "Fordított sorrend"
 
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
+#: src/gtkui/menus.c:167
+msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr "Kimenet"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
+msgstr "_Frissítés"
 
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "Effektek"
+#: src/gtkui/menus.c:172
+#, fuzzy
+msgid "_Sort"
+msgstr "Rendezés"
 
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
-msgstr "Hangszínszabályzó"
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "Nézet"
+#: src/gtkui/menus.c:175
+msgid "_Close"
+msgstr "_Bezár"
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
-msgstr "Felület"
+#: src/gtkui/menus.c:177
+#, fuzzy
+msgid "_Import ..."
+msgstr "Importálás"
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "Fájl"
+#: src/gtkui/menus.c:178
+#, fuzzy
+msgid "_Export ..."
+msgstr "Exportálás"
 
-#: src/gtkui/ui_manager.c:188
-msgid "Components"
-msgstr "Komponensek"
+#: src/gtkui/menus.c:180
+#, fuzzy
+msgid "_Playlist Manager ..."
+msgstr "Lejátszólista kezelő"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr "Szám részleteinek megjelenítése"
+#: src/gtkui/menus.c:183
+#, fuzzy
+msgid "Volume _Up"
+msgstr "Hangerő fel"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr "Szám részleteinek megjelenítése"
+#: src/gtkui/menus.c:184
+#, fuzzy
+msgid "Volume _Down"
+msgstr "Hangerő le"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "Audacious névjegye"
+#: src/gtkui/menus.c:186
+#, fuzzy
+msgid "_Equalizer"
+msgstr "Hangszínszabályzó"
 
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
-msgstr "Fájlok megnyitása ..."
+#: src/gtkui/menus.c:188
+#, fuzzy
+msgid "E_ffects"
+msgstr "Effektek"
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
-msgstr "Megyitja és lejátsza a fájlt"
+#: src/gtkui/menus.c:191
+#, fuzzy
+msgid "_Interface"
+msgstr "Felület"
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
-msgstr "URL megnyitása ..."
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr "Média lejátszása a kiválasztott helyről"
+#: src/gtkui/menus.c:194
+#, fuzzy
+msgid "Show I_nfo Bar"
+msgstr "Információs terület mutatása"
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "Szolgáltatások kezelése"
+#: src/gtkui/menus.c:195
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "Az állapotsor megjelenítése"
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "Beállítások"
+#: src/gtkui/menus.c:197
+#, fuzzy
+msgid "Show Column _Headers"
+msgstr "Lejátszó mutatása"
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr "Tulajdonságok ablak megnyitása"
+#: src/gtkui/menus.c:198
+#, fuzzy
+msgid "Choose _Columns ..."
+msgstr "Lejátszó mutatása"
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
-msgstr "_Kilépés"
+#: src/gtkui/menus.c:199
+#, fuzzy
+msgid "Scrol_l on Song Change"
+msgstr "Szám váltás"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "Kilépés az Audaciousból"
+#: src/gtkui/menus.c:202
+#, fuzzy
+msgid "_File"
+msgstr "Fájl"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr "Beállítás A-B"
+#: src/gtkui/menus.c:203
+#, fuzzy
+msgid "_Playback"
+msgstr "Lejátszás"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr "Törlés A-B"
+#: src/gtkui/menus.c:204
+#, fuzzy
+msgid "P_laylist"
+msgstr "Lejátszólista"
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr "Ugrás a lejátszólista kezdetére"
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#, fuzzy
+msgid "_Services"
+msgstr "Eszközök"
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
-msgstr "Ugrás fájlhoz"
+#: src/gtkui/menus.c:206
+#, fuzzy
+msgid "_Output"
+msgstr "Kimenet"
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr "Várakozási sor váltása"
+#: src/gtkui/menus.c:207
+#, fuzzy
+msgid "_View"
+msgstr "Nézet"
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-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/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
-msgstr "Másolás"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-msgid "Cut"
-msgstr "Kivágás"
+#: src/gtkui/menus.c:215
+#, fuzzy
+msgid "_Copy"
+msgstr "Másolás"
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
+#: src/gtkui/menus.c:216
+#, fuzzy
+msgid "_Paste"
 msgstr "Beillesztés"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
+#: src/gtkui/menus.c:217
+#, fuzzy
+msgid "Select _All"
 msgstr "Mindet kijelöl"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr "Minden szám kiválasztása a lejátszólistán."
+#: src/gtkui/menus.c:222
+#, fuzzy
+msgid "_Rename"
+msgstr "Fájlnév"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr "Nincs kijelölés"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
+msgstr "GTK+ felület"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr "Minden kijelölés megszüntetése a lejátszólista elemein."
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, 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
+msgid "Audacious"
+msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Hiba"
+
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "sztereó"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d csatorna"
 msgstr[1] "%d csatorna"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, fuzzy, c-format
 msgid "%d kbps"
 msgstr "kbps"
@@ -2714,10 +1668,18 @@
 msgid "Previous Track"
 msgstr "Előző szám"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Lejátszás"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr "Szünet/Folytatás"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Leállít"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr "Következő szám"
@@ -2742,6 +1704,10 @@
 msgid "Volume Down"
 msgstr "Hangerő le"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr "Ugrás fájlhoz"
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr "Lejátszó ablakok váltása"
@@ -2750,11 +1716,21 @@
 msgid "Show On-Screen-Display"
 msgstr "On-Screen-Display mutatása"
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "Ismétlés"
+
+#: src/hotkey/gui.c:85
+#, fuzzy
+msgid "Toggle Shuffle"
+msgstr "Véletlenszerű"
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(nincs)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2762,37 +1738,37 @@
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr "Egér gombok hozzárendelése"
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr ""
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr "Gyorsbillentyűk:"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr "Művelet:"
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr "Billentyű kötések:"
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr ""
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -2854,115 +1830,19 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "JACK kimenet bővítmény névjegye 0.17"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr ""
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "Név"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "Telepített bővímények"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "Futó bővítmények"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "Hozzáadás"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "Eltávolítás"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "LADSPA bővítmény katalógus"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "LIRC audacious bővítmény névjegye"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "LIRC bővítmény"
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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 ""
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr "LIRC bővítmény beállítások"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr "Újracsatlakozás a LIRC szerverhez"
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr "Újracsatlakozás a megadott idő után (másodperc):"
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr "Újracsatlakozás"
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr "Kapcsolat"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
+"Looking for lyrics..."
 msgstr ""
 
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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 ""
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr "%s: újrakapcsolódás megkisérlése...\n"
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: ismeretlen parancs \"%s\"\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: kapcsolat bontva a LIRC-cel\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
@@ -2970,11 +1850,11 @@
 "\n"
 "Dalszöveg nem található."
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "Metronom névjegye"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2983,253 +1863,43 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact generátor: %d bpm"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact generátor: %d bpm %d/%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "ModPlug beállítások"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 bit"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 bit"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "Lineáris (gyors)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:286
-msgid "96 kHz"
-msgstr "96 kHz"
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Mintavételi sebesség"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "Engedélyez"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "Mélység"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "Késleltetés"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "Visszhang"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "Összeg"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "Tartomány"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "Basszus kiemelés"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Térhatású"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "Preamp"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "Használja a fáljnevét a dal címének"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "Gyors lejátszólista információ"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "Zaj csökkentés"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Amiga MOD lejátszása"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "Ne ismételjen"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "Ismétlés"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "idő"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "Végtelen ismétlés"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "Ismétlés"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "MOD információ"
-
-#: src/modplug/gui/interface.cxx:878
-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:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "Minták"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "Hangszerek"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "Üzenet"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Modplug bemeneti bővítmény az Audacioushoz verzió"
-
-#: src/modplug/gui/main.cxx:52
-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 ""
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "Modplug névjegye"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: 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/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr "Kijelölt szám(ok) feltöltése"
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr "Feltöltés folyamatban..."
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
 msgstr ""
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
+#: src/mtp_up/mtp.c:311
+#, fuzzy
+msgid "Disconnect MTP Device"
 msgstr "Eszköz leválasztása"
 
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "Leállít"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Audacious - láthatósági figyelmeztetés"
+
 #: src/null/null.c:64
 msgid "Null output plugin "
 msgstr "Null kimeneti bővítmény"
@@ -3276,11 +1946,11 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "OSS4 bővítmény névjegye"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
@@ -3311,6 +1981,11 @@
 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
 msgid "OSS Driver configuration"
 msgstr "OSS meghajtó beállítások"
@@ -3367,11 +2042,11 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:690
+#: 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:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3411,27 +2086,27 @@
 msgid "Method:"
 msgstr "Módszer: "
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Szolgáltatások"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Felhasználónév:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 msgid "Scrobbler URL:"
 msgstr "Scrobbler URL:"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last FM"
 
@@ -3439,7 +2114,7 @@
 msgid "Scrobbler"
 msgstr ""
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3447,16 +2122,16 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "Scrobbler bővítmény névjegye"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 #, fuzzy
 msgid "About SDL Output Plugin"
 msgstr "ALSA Kimeneti bővítmény névjegye"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 #, fuzzy
 msgid "SDL error"
 msgstr "ALSA hiba"
@@ -3466,10 +2141,18 @@
 msgid "About %s"
 msgstr "%s névjegye"
 
-#: src/sid/xs_config.c:323
+#: 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ó"
@@ -3479,6 +2162,11 @@
 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"
@@ -3753,15 +2441,15 @@
 msgid "Use"
 msgstr "Használ"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: 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:435
+#: 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:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Törlés"
 
@@ -3792,6 +2480,11 @@
 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ő:"
@@ -4023,686 +2716,823 @@
 msgid "No"
 msgstr "Nem"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "Felhasználói GUI névjegye"
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 msgstr ""
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr "Felhasználói felület"
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr "_Lejátszó:"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr "Főablak betűtípus kiválasztás:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "_Lejátszólista:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr "Válassza ki a lejátszólista betűkészletét:"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr "_Betűkészletek"
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr "Bitmap betűtípus használata ha elérhető"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
-"Bitmap betűtípus használata ha elérhető. A Bitmap betűtípusok nem támogatják "
-"az Unicode szövegeket."
-
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr "_Egyebek"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr "Elválasztók mutatása a lejátszólistában"
-
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr "Ablakkezelő dekoráció mutatása"
-
-#: src/skins/skins_cfg.c:328
-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."
 
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.c:330
-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 ""
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "_Bőr"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr "A beépített gtk téma tiltása"
+#: src/skins/skins_cfg.c:393
+#, fuzzy
+msgid "Interface Preferences"
+msgstr "Átfedés beállítások"
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
-msgstr "Véletlenszerű bőr lejátszáskor"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Preamp"
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
-msgstr "A nem teljesen kész bőrök betöltése mindig"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/skins_cfg.c:335
-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"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Hz"
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "Szín beállítás"
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Hz"
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Hz"
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "Kék"
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Hz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "Zöld"
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "Vörös"
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 kHz"
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "_Bőr"
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 kHz"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr "Szín beállítás ..."
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Audacious Equalizer"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr "Profilok"
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "térhatású"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious - láthatósági figyelmeztetés"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "Lejátszó főablakának mutatása"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "Mellőzés"
-
-#: src/skins/ui_main.c:993
-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 ""
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr ""
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious - hibás GTK téma megjelenítő használat figyelmeztetés"
-
-#: src/skins/ui_main.c:1052
-#, c-format
-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 ""
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr "Ne mutassa ezt a figyelmeztetést ismét"
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
+#: src/skins/ui_main.c:807
+#, fuzzy, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Pozicionálás: %d:%-2.2d/%d:%-2.2d (%d%%)"
 
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hangerő: %d%%"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balansz: %d%% bal"
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balansz: közép"
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balansz: %d%% jobb"
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Beállítások menü"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Tiltja a 'Mindig felül' opciót"
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Engedélyezi a 'Mindig felül' opciót"
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Fájl Információs doboz"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "'GUI méretezés' tiltása"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "'GUI méretezés' engedélyezése"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Megjelenítési menü"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr "Egyszerű mód."
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 msgid "Playlist mode."
 msgstr "Lejátszólista mód."
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr "Leállítás az aktuális dal után."
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr "Nincs leállítás az aktuális dal után."
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr "Szám nevének automatikus görgetése"
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Leállítás az aktuális dal után"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
 msgstr "Csúcsérték"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Ismétlés"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Véletlenszerű"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "Ne legyen léptetés a lejátszólistában"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr "Lejátszó mutatása"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr "Lejátszólista szerkesztő mutatása"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr "Hangszínszabályzó mutatása"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr "Mindig felül"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr "Minden munkaterületre elhelyez"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr "Lejátszó felgördítése"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr "Lejátszólista szerkesztő felgördítése"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr "Hangszínszabályzó felgördítése"
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "Skála"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr "KétszeresMéret"
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr "Könnyű mozgatás"
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr "Analizátor"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr ""
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "Kikapcsolva"
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr "Szokásos"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr "Tűz"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr "Függőleges vonalak"
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr "Vonalak"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr "Csíkok"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr "Jég"
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr "Sima"
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "Lasabb"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "Lassú"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "Közepes"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "Gyors"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "Leggyorsabb"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr "Eltelt idő"
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr "Hátralévő idő"
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "Szünet"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "Előző"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "Következő"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "Megjelenítés"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr "Megjelenítési mód"
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr "Analizátor mód"
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr "Analizátor kikapcsolása"
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr "Csúcsérték ki"
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Lejátszólista"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Új lejátszólista"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr "A következő lejátszólista kijelölése"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr "Az előző lejátszólista kijelölése"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Lejátszólista törlése"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "Lejátszólista importálása"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Lejátszólista betöltése a kiválasztott lejátszólistába."
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "Lejátszólista exportálása"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+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:228
+#: src/skins/ui_manager.c:235
+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:238
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr "Lejátszólista kezelő megnyitása."
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Nézet"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "Felület"
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "Átfedés beállítások"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr "Internetes cím hozzáadása ..."
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+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
 msgid "Add Files..."
 msgstr "Fájlok hozzáadása ..."
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr "Fájlok hozzáadása a lejátszólistához."
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr "Keresés és választ"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr "Kijelölés megfordítása"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "Mindet kijelöl"
+
+#: src/skins/ui_manager.c:268
+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
+msgid "Select None"
+msgstr "Nincs kijelölés"
+
+#: src/skins/ui_manager.c:272
+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
+msgid "Remove All"
+msgstr "Összes törlése"
+
+#: src/skins/ui_manager.c:278
+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
 msgid "Clear Queue"
 msgstr "Várólista törlése"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "Elérhetetlen fájlok törlése"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 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:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "Kettőzöttek eltávolítása"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "Cím szerint"
+
+#: src/skins/ui_manager.c:292
 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:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "Fájlnév szerint"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 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:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "Útvonal + fájlnév szerint"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 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:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr "Nem kiválasztottak törlése"
+
+#: src/skins/ui_manager.c:304
+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
+msgid "Remove Selected"
+msgstr "Kijelölt törlése"
+
+#: src/skins/ui_manager.c:308
+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
 msgid "Randomize List"
 msgstr ""
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 #, fuzzy
 msgid "Randomizes the playlist."
 msgstr "Megfordítja a lejátszólistát."
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr "Fordított lista"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr "Megfordítja a lejátszólistát."
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "Lista rendezése"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr "Lista rendezése cím alapján."
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+msgid "By Album"
+msgstr "Album szerint"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr "Lista rendezése album szerint."
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "Előadó szerint"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr "Lista rendezése előadók szerint."
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr "A lista rendezése fájlok neve szerint."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr "Lista rendezése teljes útvonal alapján."
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "Dátum alapján"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr "A lista rendezése a módosítás ideje szerint"
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr "A dal sorszáma szerint"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr "Lista rendezése a szám sorszáma alapján."
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr "Kijelöltek rendezése"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "Fájl"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Súgó"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr "Bővítmények karbantartása"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr "Szám részleteinek megjelenítése"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr "Szám részleteinek megjelenítése"
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "Audacious névjegye"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "Fájl lejátszáa"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr "Megyitja és lejátsza a fájlt"
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "Hely lejátszása"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr "Média lejátszása a kiválasztott helyről"
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "Szolgáltatások kezelése"
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "Beállítások"
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr "Tulajdonságok ablak megnyitása"
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "Kilépés az Audaciousból"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr "Beállítás A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr "Törlés A-B"
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+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
+msgid "Jump to Time"
+msgstr "Ugrás a megadott időre"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr "Várakozási sor váltása"
+
+#: src/skins/ui_manager.c:431
+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
+msgid "Copy"
+msgstr "Másolás"
+
+#: src/skins/ui_manager.c:436
+msgid "Cut"
+msgstr "Kivágás"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Beillesztés"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Betöltés"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Előre beállított"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Előre beállított betöltése"
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Előre beállított automatikus betöltése"
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Nulla"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Legyen minden hangszínszabályozó értéke nulla"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Fájlból"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Fájlba"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:374
+#: 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:382
+#: 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 "
@@ -4710,104 +3540,52 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Cím:"
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album:"
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Előadó:"
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Fájlnév:"
 
-#: src/skins/ui_playlist.c:419
+#: 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:422
+#: 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:425
+#: 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:776
-msgid "Save as Static Playlist"
-msgstr "Mentés statikus lejátszólistaként"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr "Relatív útvonal használata"
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "Lejátszólista betöltése"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "Lejátszólista mentése"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious lejátszólista szerkesztő"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d / %d)"
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr "Régi Winamp 2.x bőr"
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Nem régi Winamp 2.x bőr"
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nem lehet létrehozni a könyvtárat (%s): %s\n"
@@ -4839,53 +3617,61 @@
 "Boston, MA 02110-1301 USA"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "SndStretch névjegye"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr "Hangerő korrekció"
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "Rövid átfedés"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "Sebesség"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "Hangmagasság"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "Skála"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Opciók"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - beállítások"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 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:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "Parancs:"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr ""
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -4904,24 +3690,20 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "Parancsok"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 msgid "Song Change"
 msgstr "Szám váltás"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "Spektrum ábrázolása"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "Státusz ikon bővítmény névjegye"
@@ -4995,60 +3777,19 @@
 "\n"
 "Írta: Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "Extra sztereó bővítmény névjegye"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "Extra sztereó beállítások"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-msgid "Search:"
-msgstr "Keresés:"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr "Könyvjelző hozzáadása"
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-msgid "Stream name"
-msgstr "Folyam neve"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr "Éppen szól"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-msgid "Remove Bookmark"
-msgstr "Könyvjelző eltávolítása"
-
-#: src/streambrowser/streambrowser.c:340
-msgid "About Stream Browser"
-msgstr "Folyam böngésző névjegye"
-
-#: src/streambrowser/streambrowser.c:341
-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:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "Hang generátor névjegye"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5057,12 +3798,12 @@
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "Hang generátor:"
 
@@ -5083,15 +3824,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Ogg Vorbis címkék"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ogg Vorbis Audio bővítmény beállítások"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Ogg Vorbis Audio bővítmény névjegye"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5143,9 +3884,849 @@
 "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"

audacious-plugins-2.5.3.tar.gz/po/ja.po -> audacious-plugins-3.0.tar.gz/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-05-19 10:53-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"
@@ -22,7 +22,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, fuzzy, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -33,616 +33,55 @@
 "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:273
+#: src/aac/libmp4.c:261
 #, fuzzy
 msgid "About MP4 AAC decoder plugin"
 msgstr "MP4 AAC プレイヤプラグインについて"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "プラグインについて"
-
-#: src/adplug/adplug-xmms.cc:155
-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"
-"このプラグインは GNU LGPL の条項と条件のもとに配布されている.\n"
-"詳細は http://www.gnu.org/licenses/lgpl.html を見よ.\n"
-"\n"
-"このプラグインは, copyright (C) Simon Peter およびその他によるAdPlug ライブラ"
-"リを用いている.\n"
-"リンクしている AdPlug ライブラリのヴァージョン: "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: 設定"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "OK"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "一般"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "音質"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "解像度"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr " 8ビット"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16ビット"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "チャンネル数"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "モノラル"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "ステレオ"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-"必要でないならば, ステレオ設定は推奨しません. OPL2 は単にモノラルなので, サウ"
-"ンドにステレオエフェクトはかかりませんが, より CPU パワーを消費します!"
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "周波数"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "演奏"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "曲の終わりを検出する"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-"有効ならば, XMMS は曲の終わりを検出し, 曲を停止してプレイリストを進みます. 無"
-"効ならば, XMMS は曲の終わりを通知せずに, 曲全体を何度も繰り返します. "
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "フォーマット"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "フォーマット選択"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "フォーマット"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "拡張子"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-"選択されたファイルタイプが認識され, このプラグインによって再生されます. 選択"
-"されていないタイプは, このプラグインからは無視され, 他のプラグインによって再"
-"生されます. "
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: ファイル情報"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "ファイル名"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "タイトル: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "作者: "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "ファイルタイプ: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "サブソング: "
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "楽器: "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "順序: "
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "パターン: "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "曲"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "楽器名"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "曲メッセージ"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "サブソング選択"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "順序: "
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "パターン: "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "列: "
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "早さ: "
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "タイマー: "
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "XMMS アラームについて"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "XMMS アラーム"
-
-#: src/alarm/interface.c:56
-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 ""
-"特定の時間に演奏を開始するのに\n"
-"用いられる 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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "閉じる"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "アラーム"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "目覚ましです."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "プレイリストの選択"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "ごめんなさい"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "警告"
-
-#: src/alarm/interface.c:213
-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"
-"Adam"
-
-#: src/alarm/interface.c:229
-msgid "Oh Well"
-msgstr "わかりました"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "アラーム設定"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "時間"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "時"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "時"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "分"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "静かになるまで:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "アラーム(デフォルト):"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "アラームを鳴らす曜日の選択"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "デフォルト"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "曜日"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "火"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "水"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "木"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "金"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "土"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "日"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "月"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "曜日"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "フェーディング"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "秒"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "音量"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "現在の値"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "現在の出力音量にリセット"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "開始"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "最終"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "追加コマンド"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "有効"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "プレイリスト (オプショナル)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "参照..."
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "リマインダ"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "リマインダを使う"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "オプション"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "オプションの意味"
-
-#: src/alarm/interface.c:1364
-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"
-" 最終: \n"
-" この音量でフェーディングを終えます.\n"
-" もしフェーディング時間が 0 ならば,\n"
-" この音量で演奏が開始されます.\n"
-"\n"
-"\n"
-"オプション:\n"
-" 追加コマンド:\n"
-" アラームの時間に指定のコマンドを実行します.\n"
-"\n"
-" プレイリスト: \n"
-" 曲を演奏するためのプレイリストを読み込みます\n"
-" (.m3u 拡張子でなければなりません). \n"
-" プレイリストが指定されなければ, \n"
-" 現在のリストの曲が用いられます.\n"
-" mp3 か ogg ストリームの URL も指定できますが,\n"
-" URL からのプレイリスト読み込みは\n"
-" 現在の xmms ではサポートされていません.\n"
-"\n"
-" リマインダ:\n"
-" アラームを停止する際にリマインダを表示します.\n"
-" これを利用するにはボックス内にリマインダを書き\n"
-" トグルボタンを有効にします.\n"
-
-#: src/alarm/interface.c:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "ヘルプ"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "今日のリマインダは.."
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "ありがとう"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 #, fuzzy
 msgid "Default PCM device"
 msgstr "デフォルト PCM デバイス (%s)"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 #, fuzzy
 msgid "Default mixer device"
 msgstr "デフォルト PCM デバイス (%s)"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 #, fuzzy
 msgid "ALSA Output Plugin Preferences"
 msgstr "ステータスアイコンプラグイン - 設定"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 #, fuzzy
 msgid "PCM device:"
 msgstr "ミキサデバイス:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "ミキサデバイス:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 #, fuzzy
 msgid "Mixer element:"
 msgstr "ミキサデバイス:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 #, fuzzy
 msgid "About ALSA Output Plugin"
 msgstr "JACK 出力プラグイン 0.17 について"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 #, fuzzy
 msgid "ALSA error"
 msgstr "エラー"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -808,6 +247,10 @@
 msgid "SoundFont settings"
 msgstr "サウンドフォント設定"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "ファイル名"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "サイズ (バイト)"
@@ -914,8 +357,7 @@
 "TiMidity\n"
 "バックエンド"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "名前:"
 
@@ -1087,119 +529,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "演奏が再開されたら OSD が動作します."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "相対 X オフセット:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "相対 Y オフセット:"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "最大 OSD 幅:"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "マルチモニタ オプション"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "OSD を表示するモニタ:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "全てのモニタ"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "モニタ %i"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "タイミング (ミリ秒)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "表示:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "フェードイン:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "フェードアウト:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "フォント"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "フォント %i:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "影"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "国際化"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "aosd ではテキストの UTF-8 変換を無効にする"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "スキンファイル選択"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "描画形式"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "色"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "色 %i:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "カスタムスキン"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "スキンファイル:"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "参照"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "トリガー有効"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "イベント"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "Composite マネージャが検出されました"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1209,73 +651,73 @@
 "動作させているかわからなければ, Composite マネージャを有効にしてください. そ"
 "うしなければ OSD は正常に動作しないでしょう."
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "Composite マネージャは偽の透明化には必要ではありません"
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "透明化"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "偽の透明化"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "真の透明化 (X Composite 拡張が必要)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "Composite 拡張が読み込まれていません"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "Composite 拡張が有効ではありません"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - 設定"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "テスト"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "アニメーション"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "文字"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "装飾"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "トリガー"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "その他"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "Audacious OSD について"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1283,7 +725,7 @@
 "\n"
 "Audacious OSD "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1305,133 +747,6 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr ""
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr ""
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr ""
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr ""
-
-#: src/bluetooth/gui.c:221
-#, fuzzy
-msgid "Available Headsets"
-msgstr "有効なバックエンド"
-
-#: src/bluetooth/gui.c:224
-#, fuzzy
-msgid "Current Headset"
-msgstr "現在の値"
-
-#: src/bluetooth/gui.c:227
-#, fuzzy
-msgid "_Refresh"
-msgstr "リフレッシュレート"
-
-#: src/bluetooth/gui.c:231
-#, fuzzy
-msgid "_Connect"
-msgstr "接続"
-
-#: src/bluetooth/gui.c:237
-#, fuzzy
-msgid "_Close"
-msgstr "閉じる"
-
-#: src/bluetooth/gui.c:274
-#, fuzzy
-msgid "Class"
-msgstr "閉じる"
-
-#: src/bluetooth/gui.c:278
-#, fuzzy
-msgid "Address:"
-msgstr "デバイスアドレス"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:138
-#, fuzzy
-msgid "Rescan"
-msgstr "CD を再スキャン"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "演奏"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "ブラースコープ: 色の選択"
@@ -1440,12 +755,12 @@
 msgid "Options:"
 msgstr "オプション:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 #, fuzzy
 msgid "About Audio CD Plugin"
 msgstr "FLAC オーディオプラグインについて"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 #, fuzzy
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
@@ -1470,16 +785,16 @@
 "\n"
 "これは Google Summer of Code 2007 のプロジェクトでした."
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 #, fuzzy
 msgid "Audio CD"
 msgstr "オーディオ"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -1528,12 +843,24 @@
 msgid "Override default device: "
 msgstr "デフォルトデバイスを上書きする: "
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+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 "キャンセル"
+
+#: src/cd-menu-items/cd-menu-items.c:34
 #, fuzzy
 msgid "Play CD"
 msgstr "演奏"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "CD を追加"
 
@@ -1561,6 +888,14 @@
 msgid "Game Console Music Decoder"
 msgstr "コンソールミュージックデコーダ"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "一般"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "演奏"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "ベース:"
@@ -1578,8 +913,7 @@
 msgid "Default song length:"
 msgstr "デフォルトの曲の長さ:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "リサンプリング"
 
@@ -1591,6 +925,10 @@
 msgid "Resampling rate:"
 msgstr "リサンプリングレート:"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1663,16 +1001,16 @@
 "same rate."
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "Crystalizer の設定"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "エフェクトの強さ:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "適用"
 
@@ -1712,393 +1050,32 @@
 msgid "Volume: (%)"
 msgstr "音量: (%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "演奏->開始"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "演奏->停止"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "演奏->一時停止"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "演奏->前の曲"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "演奏->次の曲"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "演奏->イジェクト"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "演奏->リピート"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "演奏->シャッフル"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "音量->5上げる"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "音量->5下げる"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "音量->10上げる"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "音量->10下げる"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "音量->ミュート"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "ウィンドウ->メイン"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "ウィンドウ->プレイリスト"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "ウィンドウ->イコライザー"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "ウィンドウ->ファイルへジャンプ"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-"event-device-plugin: デバイスファイル %s を開けません, このデバイスをスキップ"
-"します; ファイルが存在することと読み込みパーミッションがあるか確認してくださ"
-"い\n"
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-"event-device-plugin: デバイスファイル %s の io_channel を作成できません,この"
-"デバイスをスキップします\n"
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: /proc/bus/input/devices を開けません, イベントデバイスの"
-"自動検出は動作しません.\n"
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-"event-device-plugin: /proc/bus/input/ デバイスの io_channel を開けません, イ"
-"ベントデバイスの自動検出は動作しません.\n"
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: /proc/bus/input/ デバイスの読み込み中にエラーが発生しま"
-"した, イベントデバイスの自動検出は動作しません.\n"
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-"event-device-plugin: デバイス %s が /dev/input に見つかりません, スキップしま"
-"す.\n"
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-"event-device-plugin: コンフィグファイル %s が読み込めません, デフォルト設定が"
-"用いられます.\n"
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-"event-device-plugin: デバイス \"%s\" のコンフィグファイルの情報が不完全です, "
-"スキップします.\n"
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: 設定: デバイス \"%s\" の is_active 値が取得できません, "
-"スキップします.\n"
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-"event-device-plugin: ローカルディレクトリ %s にアクセスできません, 設定は保存"
-"されません.\n"
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: 設定: デバイス \"%s\" のファイル名が取得できません, ス"
-"キップします.\n"
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-"event-device-plugin: 設定: デバイス \"%s\" の phys 値が取得できません, スキッ"
-"プします.\n"
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: 設定: デバイス \"%s\" の is_custom 値が取得できません, "
-"スキップします.\n"
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-"event-device-plugin: 設定: デバイス \"%s\" の予期せぬ値です, スキップしま"
-"す.\n"
-
-#: src/evdev-plug/ed_ui.c:212
-#, fuzzy
-msgid "Detected"
-msgstr "曲の終わりを検出する"
-
-#: src/evdev-plug/ed_ui.c:217
-#, fuzzy
-msgid "Custom"
-msgstr "カスタム "
-
-#: src/evdev-plug/ed_ui.c:223
-#, fuzzy
-msgid "Not Detected"
-msgstr "選択範囲のソート"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "情報"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-"デバイスが検出されていないため, バインディングウィンドウが開けません.\n"
-"デバイスが正しく接続されていることを確認してください."
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "エラー"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-"選択されたデバイスが開けません.\n"
-"デバイスファイルの読み込みパーミッションを確認してください."
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "EvDev-Plug - カスタムデバイスの追加"
-
-#: src/evdev-plug/ed_ui.c:353
-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 は, システムで有効なイベントデバイスの情報を自動的に検出して更新し"
-"ようとします.\n"
-"しかし, システムで自動検出が動作しない, あるいはイベントデバイスが非標準な位"
-"置にある場合(現状 /dev/input/ のみを検索します), \n"
-"名前とデバイスファイルを明確に指定してカスタムデバイスとして追加してください."
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "デバイス名:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "デバイスファイル:"
-
-#: src/evdev-plug/ed_ui.c:404
-#, fuzzy
-msgid "(custom)"
-msgstr "カスタム "
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-"名前とファイル名の両方を指定してください.\n"
-"ファイル名は絶対パスで指定しなければなりません."
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr "選択したデバイスを現在の設定から削除しますか?\n"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "選択したカスタムデバイスを削除しますか?\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "EvDev-Plug - 設定"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "アクティブ"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "状態"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "デバイス名"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "デバイスファイル"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "デバイスアドレス"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "バインディング(_B)"
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-"バインドするデバイスのキーを押してください.\n"
-"5秒以内にキーが押されなければ, \n"
-"バインディングを変更せずにウィンドウを閉じます. "
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-"この入力イベントは既に割り当てられています.\n"
-"\n"
-"同じ入力イベントに複数のアクションを割り当てることはできません. (しかし, 複数"
-"のイベントに同じアクションを割り当てることは可能です)"
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Plug - バインディング設定"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "名前: "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "ファイル名: "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Phys.アドレス: "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "EvDev-Plug について"
-
-#: src/evdev-plug/ed_ui.c:1491
-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"
-"http://www.develia.org/projects.php?p=audacious#evdevplug\n"
-"\n"
-"Giacomo Lozito によって書かれた.\n"
-"\n"
-
-#: src/ffaudio/ffaudio-core.c:765
+#: 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"
 "Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "FLAC オーディオプラグインについて"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "ファイルライタ・プラグインについて"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2135,51 +1112,51 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA.へ手紙を書いて下さい."
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "ファイルライタの設定"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "出力ファイルフォーマット:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "設定"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "元のディレクトリに保存する"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "指定のディレクトリに保存する"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "ファイル出力先ディレクトリ:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "ディレクトリの選択"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "ファイル名の取得元:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "元のファイルのタグ"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "元のファイル名"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "ファイル名から拡張子を取り除かない"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "ファイル名の先頭にトラック番号を付加する"
 
@@ -2192,6 +1169,14 @@
 msgid "Joint Stereo"
 msgstr "ジョイントステレオ"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "ステレオ"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "モノラル"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "MP3 設定"
@@ -2237,7 +1222,6 @@
 msgstr "エラー保護"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "音質"
 
@@ -2345,11 +1329,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "Gnome ショートカットプラグインについて"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2363,62 +1347,24 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 #, fuzzy
 msgid "Add Files"
 msgstr "ファイルの追加..."
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 #, fuzzy
 msgid "Audacious2"
 msgstr "Audacious"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr ""
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr "再生されるトラックがない時間へは移動できません.\n"
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr "指定した時間へ移動"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr "分:秒"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr "トラックの合計時間:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr "プレイリスト \"%s\" を書き込む際にエラー: %s"
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-#, fuzzy
-msgid "Export Playlist"
-msgstr "プレイリストの読み込み"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-#, fuzzy
-msgid "Import Playlist"
-msgstr "プレイリストの読み込み"
-
 #: src/gtkui/columns.c:36
 #, fuzzy
 msgid "Entry number"
@@ -2517,429 +1463,319 @@
 msgid "Disable"
 msgstr "可変"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr ""
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr "現在の曲の後に停止する"
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr "リピート"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr "シャッフル"
-
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr "次の曲に進まない"
-
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:52
+#: src/gtkui/menus.c:132
 #, fuzzy
-msgid "Show main menu"
-msgstr "メインウィンドウを表示する"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr ""
+msgid "_Open Files ..."
+msgstr "ファイルの追加..."
 
-#: src/gtkui/ui_manager.c:55
+#: src/gtkui/menus.c:133
 #, fuzzy
-msgid "Show statusbar"
-msgstr "状態"
+msgid "Open _URL ..."
+msgstr "ファイルの追加..."
 
-#: src/gtkui/ui_manager.c:56
+#: src/gtkui/menus.c:134
 #, fuzzy
-msgid "Show/hide statusbar"
-msgstr "プレイリストの保存"
+msgid "_Add File ..."
+msgstr "ファイルの追加..."
 
-#: src/gtkui/ui_manager.c:58
+#: src/gtkui/menus.c:135
 #, fuzzy
-msgid "Show Column Headers"
-msgstr "プレイヤを表示する"
+msgid "Add U_RL ..."
+msgstr "ファイルの追加..."
 
-#: src/gtkui/ui_manager.c:60
+#: src/gtkui/menus.c:137
 #, fuzzy
-msgid "Scroll on Song Change"
-msgstr "曲メッセージ"
-
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
-msgstr "一時停止"
-
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
-msgstr "停止"
-
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
-msgstr "前の曲"
-
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
-msgstr "次の曲"
-
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "プレイリスト"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "新しいプレイリスト"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "プレイリストの削除"
+msgid "A_bout ..."
+msgstr "プラグインについて"
 
-#: src/gtkui/ui_manager.c:95
+#: src/gtkui/menus.c:138
 #, fuzzy
-msgid "Import Playlist ..."
-msgstr "プレイリストの読み込み"
+msgid "_Preferences ..."
+msgstr "設定"
 
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr "選択したプレイリストにプレイリストファイルを読み込みます."
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
+msgstr "終了(_Q)"
 
-#: src/gtkui/ui_manager.c:98
+#: src/gtkui/menus.c:142
 #, fuzzy
-msgid "Export Playlist ..."
-msgstr "プレイリストの読み込み"
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "選択したプレイリストを保存します."
+msgid "_Play"
+msgstr "演奏"
 
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
+#: src/gtkui/menus.c:143
 #, fuzzy
-msgid "Save All Playlists"
-msgstr "プレイリストの保存"
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
+msgid "Paus_e"
+msgstr "一時停止"
 
-#: src/gtkui/ui_manager.c:106
+#: src/gtkui/menus.c:144
 #, fuzzy
-msgid "Refresh"
-msgstr "リフレッシュレート"
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr "プレイリストのエントリに関連付けられたメタデータを更新します."
+msgid "_Stop"
+msgstr "停止"
 
-#: src/gtkui/ui_manager.c:110
+#: src/gtkui/menus.c:145
 #, fuzzy
-msgid "Refresh Selected"
-msgstr "選択したエントリの削除"
+msgid "Pre_vious"
+msgstr "前の曲"
 
-#: src/gtkui/ui_manager.c:111
+#: src/gtkui/menus.c:146
 #, fuzzy
-msgid "Refreshes metadata associated with selected entries."
-msgstr "プレイリストのエントリに関連付けられたメタデータを更新します."
+msgid "_Next"
+msgstr "次の曲"
 
-#: src/gtkui/ui_manager.c:115
+#: src/gtkui/menus.c:148
 #, fuzzy
-msgid "Playlist Manager"
-msgstr "プレイリストマネージャ"
-
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr "プレイリストマネージャを開きます."
+msgid "_Repeat"
+msgstr "リピート"
 
-#: src/gtkui/ui_manager.c:119
+#: src/gtkui/menus.c:149
 #, fuzzy
-msgid "Add URL ..."
-msgstr "ファイルの追加..."
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr "リモートトラックをプレイリストに追加します."
+msgid "S_huffle"
+msgstr "シャッフル"
 
-#: src/gtkui/ui_manager.c:123
+#: src/gtkui/menus.c:150
 #, fuzzy
-msgid "Add Files ..."
-msgstr "ファイルの追加..."
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr "ファイルをプレイリストに追加します."
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr "全て削除"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr "全てのエントリをプレイリストから削除します."
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr "選択していないエントリの削除"
-
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr "選択していないエントリをプレイリストから削除します."
-
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr "選択したエントリの削除"
+msgid "N_o Playlist Advance"
+msgstr "次の曲に進まない"
 
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr "選択したエントリをプレイリストから削除します."
+#: src/gtkui/menus.c:151
+#, fuzzy
+msgid "Stop _After This Song"
+msgstr "現在の曲の後に停止する"
 
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:140
+#: src/gtkui/menus.c:154
 #, fuzzy
-msgid "Edit the playlist title."
-msgstr "プレイリストの順序をランダムにします."
+msgid "Jump to _Time ..."
+msgstr "指定した時間へ移動"
 
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:146
+#: src/gtkui/menus.c:158
 #, fuzzy
-msgid "Sort"
-msgstr "ポート"
-
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
+msgid "By Track _Number"
 msgstr "トラック番号"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
+#: src/gtkui/menus.c:159
+#, fuzzy
+msgid "By _Title"
 msgstr "タイトル"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
+#: src/gtkui/menus.c:160
+#, fuzzy
+msgid "By _Artist"
 msgstr "アーティスト"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
+#: src/gtkui/menus.c:161
 #, fuzzy
-msgid "By Album"
+msgid "By A_lbum"
 msgstr "アルバム名:"
 
-#: src/gtkui/ui_manager.c:155
+#: src/gtkui/menus.c:162
 #, fuzzy
-msgid "By Release Date"
+msgid "By Release _Date"
 msgstr "日付"
 
-#: src/gtkui/ui_manager.c:157
+#: src/gtkui/menus.c:163
 #, fuzzy
-msgid "By File Path"
+msgid "By _File Path"
 msgstr "ファイル名"
 
-#: src/gtkui/ui_manager.c:159
+#: src/gtkui/menus.c:164
 #, fuzzy
-msgid "By Formatted Title"
-msgstr "タイトル"
+msgid "By _Custom Title"
+msgstr "カスタムスキン"
 
-#: src/gtkui/ui_manager.c:161
+#: src/gtkui/menus.c:166
 #, fuzzy
-msgid "Reverse Order"
+msgid "R_everse Order"
 msgstr "プレイリストを逆順にする"
 
-#: src/gtkui/ui_manager.c:163
+#: src/gtkui/menus.c:167
 #, fuzzy
-msgid "Random Order"
+msgid "_Random Order"
 msgstr "ランダム(R_)"
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "エフェクト"
-
-#: src/gtkui/ui_manager.c:172
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
 #, fuzzy
-msgid "Equalizer"
-msgstr "イコライザを表示する"
+msgid "_Refresh"
+msgstr "リフレッシュレート"
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "表示"
+#: src/gtkui/menus.c:172
+#, fuzzy
+msgid "_Sort"
+msgstr "ポート"
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
+#: src/gtkui/menus.c:174
+msgid "_New"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "ファイル"
+#: src/gtkui/menus.c:175
+#, fuzzy
+msgid "_Close"
+msgstr "閉じる"
 
-#: src/gtkui/ui_manager.c:188
+#: src/gtkui/menus.c:177
 #, fuzzy
-msgid "Components"
-msgstr "コメント:"
+msgid "_Import ..."
+msgstr "インポート"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr "トラックの詳細"
+#: src/gtkui/menus.c:178
+#, fuzzy
+msgid "_Export ..."
+msgstr "エクスポート"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr "トラックの詳細"
+#: src/gtkui/menus.c:180
+#, fuzzy
+msgid "_Playlist Manager ..."
+msgstr "プレイリストマネージャ"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "Audacious について"
+#: src/gtkui/menus.c:183
+#, fuzzy
+msgid "Volume _Up"
+msgstr "音量を上げる"
 
-#: src/gtkui/ui_manager.c:199
+#: src/gtkui/menus.c:184
 #, fuzzy
-msgid "Open Files ..."
-msgstr "ファイルの追加..."
+msgid "Volume _Down"
+msgstr "音量を下げる"
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
-msgstr "ファイルを読み込んで演奏"
+#: src/gtkui/menus.c:186
+#, fuzzy
+msgid "_Equalizer"
+msgstr "イコライザを表示する"
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
+#: src/gtkui/menus.c:188
+#, fuzzy
+msgid "E_ffects"
+msgstr "エフェクト"
+
+#: src/gtkui/menus.c:191
+msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr "選択した場所からメディアを演奏"
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "プラグインサービス"
+#: src/gtkui/menus.c:194
+msgid "Show I_nfo Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "設定"
+#: src/gtkui/menus.c:195
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "状態"
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr "設定ウィンドウを開く"
+#: src/gtkui/menus.c:197
+#, fuzzy
+msgid "Show Column _Headers"
+msgstr "プレイヤを表示する"
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
-msgstr "終了(_Q)"
+#: src/gtkui/menus.c:198
+#, fuzzy
+msgid "Choose _Columns ..."
+msgstr "プレイヤを表示する"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "Audacious を終了する"
+#: src/gtkui/menus.c:199
+#, fuzzy
+msgid "Scrol_l on Song Change"
+msgstr "曲メッセージ"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr "A-B をセット"
+#: src/gtkui/menus.c:202
+#, fuzzy
+msgid "_File"
+msgstr "ファイル"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr "A-B をクリア"
+#: src/gtkui/menus.c:203
+#, fuzzy
+msgid "_Playback"
+msgstr "演奏"
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr "最初の曲へ移動"
+#: src/gtkui/menus.c:204
+#, fuzzy
+msgid "P_laylist"
+msgstr "プレイリスト"
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
-msgstr "指定したファイルへ移動"
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#, fuzzy
+msgid "_Services"
+msgstr "デバイス"
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr "キューを切り替える"
+#: src/gtkui/menus.c:206
+#, fuzzy
+msgid "_Output"
+msgstr "出力プラグインエラー\n"
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
-msgstr "プレイリストのキューに入っているエントリの有効/無効を切り替えます."
+#: src/gtkui/menus.c:207
+#, fuzzy
+msgid "_View"
+msgstr "表示"
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-#, fuzzy
-msgid "Cut"
-msgstr "カスタム "
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
+msgstr ""
+
+#: src/gtkui/menus.c:215
+msgid "_Copy"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
+#: src/gtkui/menus.c:216
 #, fuzzy
-msgid "Paste"
+msgid "_Paste"
 msgstr "最も早い"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
+#: src/gtkui/menus.c:217
+#, fuzzy
+msgid "Select _All"
 msgstr "全て選択"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr "プレイリストの全てのエントリを選択します."
+#: src/gtkui/menus.c:222
+#, fuzzy
+msgid "_Rename"
+msgstr "ファイル名"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr "未選択にする"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr "プレイリストの全てのエントリを未選択にします."
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, 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
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "エラー"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "モノラル"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "ステレオ"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "チャンネル数"
 msgstr[1] "チャンネル数"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, c-format
 msgid "%d kbps"
 msgstr ""
@@ -2948,10 +1784,18 @@
 msgid "Previous Track"
 msgstr "前のトラック"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "演奏"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr "一時停止/再開"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "停止"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr "次のトラック"
@@ -2976,6 +1820,10 @@
 msgid "Volume Down"
 msgstr "音量を下げる"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr "指定したファイルへ移動"
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr "プレイヤウィンドウを切り替える"
@@ -2984,11 +1832,21 @@
 msgid "Show On-Screen-Display"
 msgstr "On-Screen-Display を表示する"
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "リピート"
+
+#: src/hotkey/gui.c:85
+#, fuzzy
+msgid "Toggle Shuffle"
+msgstr "シャッフル"
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(なし)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2999,15 +1857,15 @@
 "\n"
 "続けますか?"
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr "マウスボタン割り当て"
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr "グローバルホットキープラグイン設定"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -3015,23 +1873,23 @@
 "テキストフィールド内でキーコンビネーションを押してください.\n"
 "マウスボタンを組み合わせることもできます."
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr "ホットキー:"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr "動作:"
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr "キーバインド:"
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr "グローバルホットキープラグインについて"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -3105,139 +1963,29 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "JACK 出力プラグイン 0.17 について"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr "LADSPA プラグインにユーザコントロールはありません"
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "名前"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "インストール済プラグイン"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "動作中のプラグイン"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "追加"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "削除"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "LADSPA プラグイン カタログ"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "LIRC Audacious プラグインについて"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "LIRC プラグイン"
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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"
-"LIRC リモートコントロールデーモンを用いて\n"
-"Audacious をコントロールするシンプルなプラグイン\n"
-"\n"
-"Tony Vroon <chainsaw@gentoo.org> による Audacious への適用\n"
-"元となった XMMS LIRC プラグインは\n"
-"Carl van Schaik <carl@leg.uct.ac.za>\n"
-"Christoph Bartelmus <xmms@bartelmus.de>\n"
-"Andrew O. Shadoura <bugzilla@tut.by> による.\n"
-"LIRC の情報は以下で得られる.\n"
-"http://lirc.org"
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr "LIRC プラグイン設定"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr "LIRC サーバに再接続"
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr "再接続までのタイムアウト(秒): "
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr "再接続"
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr "接続"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: LIRC サポートを初期化できませんでした\n"
+"Looking for lyrics..."
+msgstr ""
 
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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: LIRC 設定ファイルを読み込めませんでした\n"
-"%s: 正しい設定ファイルの作り方を知るには\n"
-"%s: LIRC のドキュメントを読んでください\n"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr "%s: 再接続を試行中...\n"
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: 不明なコマンド \"%s\"\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: LIRC から切断されました\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
-msgstr "%s: %d 秒ごとに再接続を試みます...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
 msgstr ""
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "Metronom について"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3251,264 +1999,43 @@
 "例: tact://77 - 毎分 77 拍を演奏\n"
 " tact://60*3/4 - 60 bpm を 3/4 拍子で演奏"
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "タクトジェネレータ: %d bpm"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "タクトジェネレータ: %d bpm %d/%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "ModPlug 設定"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16ビット"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr " 8ビット"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr "モノラル (ダウンミックス)"
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr "最短 (最速)"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "線形 (高速)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr "スプライン (良品質)"
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr "8 タップ Fir (非常に高品質)"
-
-#: src/modplug/gui/interface.cxx:286
-#, fuzzy
-msgid "96 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "サンプリングレート"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "有効"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "深さ"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "遅延"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "リバーブ"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "量"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "範囲"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "ベース増加"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "サラウンド"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-"注意: プリアンプの設定が高すぎると\n"
-"クリッピング(うるさいカチカチ音や\n"
-"ブツブツ音)の原因になります!"
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "プリアンプ"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "ファイル名を曲名として使う"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "高速なプレイリスト情報"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "ノイズリダクション"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Amiga MOD を演奏する"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "ループしない"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "ループ回数"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "回"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "永遠にループ"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "ループ"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "MOD 情報"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-"ファイル名:\n"
-"曲名:\n"
-"タイプ:\n"
-"長さ:\n"
-"速さ:\n"
-"テンポ:\n"
-"サンプリングレート:\n"
-"楽器:\n"
-"パターン:\n"
-"チャンネル:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "サンプリングレート"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "楽器"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "メッセージ"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Modplug 入力プラグイン for Audacious ver"
-
-#: src/modplug/gui/main.cxx:52
-#, fuzzy
-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 サウンドエンジンは Olivier Lapicque によって書かれた.\n"
-"Modplug XMMS インタフェイスは Kenton Vard による.\n"
-"(c)2000 Olivier Lapicque and Kenton Varda.\n"
-"更新とメンテナンスは Konstanty Bialkowski による.\n"
-"BMP へのポートは Theofilos Intzoglou による."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "Modplug について"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: 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/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr "選択されたトラックをアップロード"
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr "アップロード進行中..."
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr "MTP デバイスハンドラ"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
+msgstr ""
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
+#: src/mtp_up/mtp.c:311
+#, fuzzy
+msgid "Disconnect MTP Device"
 msgstr "デバイスを切断"
 
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "停止"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Audacious - 可視警告"
+
 #: src/null/null.c:64
 msgid "Null output plugin "
 msgstr "ヌル出力プラグイン "
@@ -3560,12 +2087,12 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 #, fuzzy
 msgid "About OSS4 Plugin"
 msgstr "ESounD プラグインについて"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 #, fuzzy
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
@@ -3614,6 +2141,11 @@
 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
 msgid "OSS Driver configuration"
 msgstr "OSS ドライバの設定"
@@ -3686,11 +2218,11 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA. へ手紙を書いて下さい."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Audacious PulseAudio 出力プラグインについて"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3747,29 +2279,29 @@
 msgid "Method:"
 msgstr ""
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 #, fuzzy
 msgid "Change password"
 msgstr "演奏曲の変更"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "サービス"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "ユーザ名:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 #, fuzzy
 msgid "Scrobbler URL:"
 msgstr "Scrobbler エラー"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3778,7 +2310,7 @@
 msgid "Scrobbler"
 msgstr "Scrobbler エラー"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3790,16 +2322,16 @@
 "Audun Hove <audun@nlc.no> と Pipian <pipian@pipian.com> によってオリジナルは"
 "作成された\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "Scrobbler プラグインについて"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 #, fuzzy
 msgid "About SDL Output Plugin"
 msgstr "JACK 出力プラグイン 0.17 について"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 #, fuzzy
 msgid "SDL error"
 msgstr "エラー"
@@ -3809,11 +2341,19 @@
 msgid "About %s"
 msgstr "%s について"
 
-#: src/sid/xs_config.c:323
+#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
+msgid "Close"
+msgstr "閉じる"
+
+#: src/sid/xs_config.c:326
 #, fuzzy
 msgid " Error"
 msgstr "エラー"
 
+#: src/sid/xs_config.c:326
+msgid "OK"
+msgstr "OK"
+
 #: src/sid/xs_fileinfo.c:151
 msgid "General info"
 msgstr "一般情報"
@@ -3823,6 +2363,11 @@
 msgid "Tune #%i: "
 msgstr "チューン #%i:"
 
+#: 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 設定"
@@ -4132,15 +2677,15 @@
 msgid "Use"
 msgstr "使用"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: 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:435
+#: 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:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "削除"
 
@@ -4173,6 +2718,11 @@
 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 "最小演奏時間:"
@@ -4429,11 +2979,11 @@
 msgid "No"
 msgstr "いいえ"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "スキン GUI について"
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -4441,694 +2991,825 @@
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr ""
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr "プレイヤ(_P):"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr "メインウィンドウで使用するフォントの選択"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "プレイリスト(_P):"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr "プレイリストで使用するフォントの選択"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr "フォント(_F)"
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr "可能ならばビットマップフォントを使用"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
-"可能ならばビットマップフォントを使用します. ビットマップフォントは Unicode 文"
-"字列をサポートしていません."
 
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr "その他(_M)"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr "プレイリストの区切り線を表示する"
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
+msgstr ""
 
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr "ウィンドウマネージャ装飾を表示する"
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "スキン(_S)"
 
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
-msgstr "ウィンドウマネージャによるウィンドウ装飾を有効にします."
+#: src/skins/skins_cfg.c:393
+#, fuzzy
+msgid "Interface Preferences"
+msgstr "設定"
 
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr "双方向テキストスクロールを使う"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "プリアンプ"
 
-#: src/skins/skins_cfg.c:330
-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."
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
 msgstr ""
-"これを使うと，メインウィンドウのファイル情報テキストが前後にスクロールしま"
-"す．そうでなければ，テキストは一方向のみにスクロールします．"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr "インライン GTK テーマを無効にする"
-
-#: src/skins/skins_cfg.c:333
-#, fuzzy
-msgid "Random skin on play"
-msgstr "プレイリストの順序をランダムにします."
-
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
-msgstr "不完全なスキンの読み込みを許可する"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr ""
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
 msgstr ""
-"これを使うと，audacious は壊れたスキンの読み込みを拒絶しません．お気に入りの"
-"スキンが動かないときだけ使用してください．"
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "色補正"
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "250 Hz"
+msgstr "22000 Hz "
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr "以下のスライダを用いてスキン UI の色合いの変更ができます."
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "500 Hz"
+msgstr "11000 Hz"
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "青"
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "1 kHz"
+msgstr "11 kHz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "緑"
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "2 kHz"
+msgstr "22 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "赤"
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "4 kHz"
+msgstr "44 kHz"
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "スキン(_S)"
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "8 kHz"
+msgstr "48 kHz"
 
-#: src/skins/skins_cfg.c:574
+#: src/skins/ui_equalizer.c:336
 #, fuzzy
-msgid "Color adjustment ..."
-msgstr "色補正"
+msgid "16 kHz"
+msgstr "48 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Audacious イコライザ"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr "プリセット"
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 #, fuzzy
 msgid "kHz"
 msgstr "Hz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 #, fuzzy
 msgid "surround"
 msgstr "サラウンド"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious - 可視警告"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "メインウィンドウを表示する"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "無視"
-
-#: src/skins/ui_main.c:993
-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 はすべてのウィンドウが隠された状態で開始されました．\n"
-"再度プレイヤウィンドウを表示するか，そのまま Audacious を操作するためには，"
-"audtool を用いるか statusicon のようなプラグインを有効にすることで遠隔操作し"
-"てください．"
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr "常に無視し，表示する/隠す は遠隔操作する"
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious - 壊れた GTK エンジンの使用警告"
-
-#: src/skins/ui_main.c:1052
-#, c-format
-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>壊れた GTK エンジンが使われています</big>\n"
-"\n"
-"Audacious は GTK エンジンが使われていることを検出しました.\n"
-"\n"
-"テーマエンジン %s は最近のスキンで用いられている特徴と非互換です.非互"
-"換な特徴はこのセッションでは無効にされました.\n"
-"\n"
-"これらの特徴を用いるには, 他の GTK テーマエンジンを使うことを考慮してくださ"
-"い."
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr "次回からこの警告を表示しない"
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
+#: src/skins/ui_main.c:807
+#, fuzzy, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "移動先: %d:%-2.2d/%d:%-2.2d (%d%%)"
 
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "音量: %d%%"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "バランス: %d%% 左"
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "バランス: 中央"
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "バランス: %d%% 右"
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "オプションメニュー"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "「常に最前面に配置」無効"
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "「常に最前面に配置」有効"
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "ファイル情報ボックス"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "「GUI スケーリング」無効"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "「GUI スケーリング」有効"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "視覚化メニュー"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 #, fuzzy
 msgid "Playlist mode."
 msgstr "プレイリスト"
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 #, fuzzy
 msgid "Stopping after song."
 msgstr "現在の曲の後に停止する"
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr ""
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr "曲名の自動スクロール"
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "現在の曲の後に停止する"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
 msgstr "ピーク"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "リピート"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "シャッフル"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "次の曲に進まない"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr "プレイヤを表示する"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr "プレイリストエディタを表示する"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr "イコライザを表示する"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr "常に最前面に配置する"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr "全ワークスペースに配置する"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr "プレイヤを巻き上げる"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr "プレイリストエディタを巻き上げる"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr "イコライザを巻き上げる"
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "スケール"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr "ダブルサイズ"
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr "簡単移動"
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr "アナライザ"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr "スコープ"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr "声紋"
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "オフ"
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr "標準"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr "ファイア"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr "垂直ライン"
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr "ライン"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr "バー"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr "ドット"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr "ライン"
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr "ソリッド"
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr "アイス"
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr "スムーズ"
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "最も遅い"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "遅い"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "中"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "早い"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "最も早い"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr "経過時間を表示する"
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr "残り時間を表示する"
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "一時停止"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "前の曲"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "次の曲"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "視覚化"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr "視覚化モード"
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr "アナライザモード"
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr "スコープモード"
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr "声紋モード"
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr "WindowShade VU モード"
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr "アナライザ フォールオフ"
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr "ピーク フォールオフ"
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "プレイリスト"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "新しいプレイリスト"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr "次のプレイリストを選択"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr "前のプレイリストを選択"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "プレイリストの削除"
+
+#: src/skins/ui_manager.c:222
+#, fuzzy
+msgid "Import Playlist"
+msgstr "プレイリストの読み込み"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "選択したプレイリストにプレイリストファイルを読み込みます."
+
+#: src/skins/ui_manager.c:226
+#, fuzzy
+msgid "Export Playlist"
+msgstr "プレイリストの読み込み"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr "選択したプレイリストを保存します."
+
+#: src/skins/ui_manager.c:229
+#, fuzzy
+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:228
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "プレイリストのエントリに関連付けられたメタデータを更新します."
+
+#: src/skins/ui_manager.c:238
 msgid "List Manager"
 msgstr "プレイリストマネージャ"
 
-#: src/skins/ui_manager.c:238
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr "プレイリストマネージャを開きます."
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "表示"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr ""
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "設定"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr "インターネットアドレスの追加..."
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr "リモートトラックをプレイリストに追加します."
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr "ファイルの追加..."
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr "ファイルをプレイリストに追加します."
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr "検索と選択"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "プレイリストを検索し, 特定の判定基準に基いて選択します."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr "選択範囲の反転"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr "エントリの選択と未選択を反転します."
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "全て選択"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
+msgstr "プレイリストの全てのエントリを選択します."
+
+#: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr "未選択にする"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr "プレイリストの全てのエントリを未選択にします."
+
+#: src/skins/ui_manager.c:277
+msgid "Remove All"
+msgstr "全て削除"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr "全てのエントリをプレイリストから削除します."
+
+#: src/skins/ui_manager.c:281
 msgid "Clear Queue"
 msgstr "キューのクリア"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr "プレイリストに関連付けられたキューをクリアします."
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "利用不可ファイルの削除"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr "利用不可ファイルをプレイリストから削除します."
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "重複エントリの削除"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "タイトル"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "重複するタイトルのエントリをプレイリストから削除します."
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "ファイル名"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "重複するファイル名のエントリをプレイリストから削除します."
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "パス名とファイル名"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "重複するパス名とファイル名のエントリをプレイリストから削除します."
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr "選択していないエントリの削除"
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr "選択していないエントリをプレイリストから削除します."
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr "選択したエントリの削除"
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr "選択したエントリをプレイリストから削除します."
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr "プレイリストをランダムにする"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr "プレイリストの順序をランダムにします."
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr "プレイリストを逆順にする"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr "プレイリストの順序を逆順にします."
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "プレイリストのソート"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr "タイトル順でプレイリストをソートします."
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#, fuzzy
+msgid "By Album"
+msgstr "アルバム名:"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 #, fuzzy
 msgid "Sorts the list by album."
 msgstr "タイトル順でプレイリストをソートします."
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "アーティスト"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr "アーティスト順でプレイリストをソートします."
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr "ファイル名順でプレイリストをソートします."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr "ファイルのパス名でプレイリストをソートします."
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "日付"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr "変更時間でプレイリストをソートします."
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr "トラック番号"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr "トラック番号順でプレイリストをソートします."
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr "選択範囲のソート"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "ファイル"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "ヘルプ"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr "プラグインサービス"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr "トラックの詳細"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr "トラックの詳細"
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "Audacious について"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "ファイルを演奏"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr "ファイルを読み込んで演奏"
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "場所を演奏"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr "選択した場所からメディアを演奏"
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "プラグインサービス"
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "設定"
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr "設定ウィンドウを開く"
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "Audacious を終了する"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr "A-B をセット"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr "A-B をクリア"
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr "最初の曲へ移動"
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr "指定した時間へ移動"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr "キューを切り替える"
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "プレイリストのキューに入っているエントリの有効/無効を切り替えます."
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr ""
+
+#: src/skins/ui_manager.c:436
+#, fuzzy
+msgid "Cut"
+msgstr "カスタム "
+
+#: src/skins/ui_manager.c:438
+#, fuzzy
+msgid "Paste"
+msgstr "最も早い"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "読み込み"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "プリセット"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "プリセットの読み込み"
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "自動読み込みのプリセット"
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "自動読み込みのプリセット"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "イコライザにデフォルトプリセットを読み込む"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "ゼロ"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "イコライザプリセットレベルをゼロにセット"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "ファイル"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "ファイルからプリセットを読み込み"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "WinAMP EQF ファイル"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "WinAMP EQF ファイルからプリセットを読み込み"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP プリセット"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "WinAMP プリセット"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "プリセットの保存"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "自動読み込みのプリセットの保存"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "デフォルトプリセットの保存"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "ファイル"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "プリセットをファイルへ保存"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "WinAMP EQF ファイル"
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "プリセットを WinAMP EQF ファイルへ保存"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "プリセットの削除"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "自動読み込みのプリセットの削除"
 
-#: src/skins/ui_playlist.c:374
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "有効になっているプレイリストのエントリを検索"
 
-#: src/skins/ui_playlist.c:382
+#: 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 "
@@ -5139,111 +3820,52 @@
 "正規表現が使え, 大文字と小文字を区別しません. 正規表現がどのように動作するか"
 "わからない場合は, 単純に検索しようとしているものの文字を入力します."
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "タイトル: "
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "アルバム名: "
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "アーティスト: "
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "ファイル名: "
 
-#: src/skins/ui_playlist.c:419
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "検索前に以前の選択をクリア"
 
-#: src/skins/ui_playlist.c:422
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "マッチしたエントリのキューを自動的にトグル"
 
-#: src/skins/ui_playlist.c:425
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "マッチしたエントリで新しいプレイリストを作成"
 
-#: src/skins/ui_playlist.c:776
-msgid "Save as Static Playlist"
-msgstr "スタティックプレイリストとして保存"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr "相対パスを使う"
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "プレイリストの読み込み"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "プレイリストの保存"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious プレイリストエディタ"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "250 Hz"
-msgstr "22000 Hz "
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "500 Hz"
-msgstr "11000 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "1 kHz"
-msgstr "11 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "2 kHz"
-msgstr "22 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "4 kHz"
-msgstr "44 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "8 kHz"
-msgstr "48 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "16 kHz"
-msgstr "48 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr "Archived Winamp 2.x スキン"
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Unarchived Winamp 2.x スキン"
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "ディレクトリ (%s) を作成できませんでした: %s\n"
@@ -5294,55 +3916,63 @@
 "51 Franklin Street, Fifth Floor, \n"
 "Boston, MA 02110-1301 USA へ手紙を書いて下さい."
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "SndStretch について"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr "音量補正"
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "一部重ね合わせ"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "スピード"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "ピッチ"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "スケール"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "オプション"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - 設定"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr "Audacious が新しい曲を開始したときに実行するコマンド"
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "コマンド:"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr "曲の終わりで実行するコマンド."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Audacious がプレイリストの最後に到達したときに実行するコマンド."
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "例えばネットワークストリームのタイトルなど, 曲のタイトルが変わったときに実行"
 "するコマンド."
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 #, fuzzy
 msgid ""
 "You can use the following format strings which\n"
@@ -5373,7 +4003,7 @@
 "%%t: プレイリストの位置 (%%02d)\n"
 "%%p: 現在演奏中か (1 or 0)"
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5381,19 +4011,15 @@
 "シェルに渡されるパラメータはクォートでくくられるべきです."
 "さもないとセキュリティ上の危険があります."
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "コマンド"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 #, fuzzy
 msgid "Song Change"
 msgstr "曲メッセージ"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "スペクトラムアナライザ"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "ステータスアイコン プラグインについて"
@@ -5466,75 +4092,19 @@
 "\n"
 "1999. Johan Levin による"
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "エクストラステレオプラグインについて"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "エクストラステレオの設定"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-#, fuzzy
-msgid "Search:"
-msgstr "年:"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-#, fuzzy
-msgid "Stream name"
-msgstr "楽器名"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-#, fuzzy
-msgid "Now playing"
-msgstr "新しいプレイリスト"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "タグの削除"
-
-#: src/streambrowser/streambrowser.c:340
-#, fuzzy
-msgid "About Stream Browser"
-msgstr "OSS ドライバについて"
-
-#: src/streambrowser/streambrowser.c:341
-#, fuzzy
-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) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
-"\n"
-"libcdio 開発者 <http://www.gnu.org/software/libcdio/> と\n"
-"\tlibcddb 開発者 <http://libcddb.sourceforge.net/> に多大なる感謝.\n"
-"\n"
-"Tony Vroon による助言と指針に感謝.\n"
-"\n"
-"これは Google Summer of Code 2007 のプロジェクトでした."
-
-#: src/tonegen/tonegen.c:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "トーンジェネレータについて"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5548,12 +4118,12 @@
 "URLに tone://frequency1;frequency2;frequency3;... と追加して使用します\n"
 "例 tone://2000;2005 は 2000Hz トーンと 2005Hz トーンを演奏します"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "トーンジェネレータ: "
 
@@ -5575,15 +4145,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Ogg Vorbis タグ:"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ogg Vorbis オーディオプラグインの設定"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Ogg Vorbis オーディオ プラグインについて"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5658,9 +4228,1248 @@
 "プラグインコードの一部は Miles Egan による\n"
 "Wavpack のサイト http://www.wavpack.com/ をご覧ください\n"
 
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "可能ならばビットマップフォントを使用"
+
+#~ msgid ""
+#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
+#~ "Unicode strings."
+#~ msgstr ""
+#~ "可能ならばビットマップフォントを使用します. ビットマップフォントは "
+#~ "Unicode 文字列をサポートしていません."
+
+#~ msgid "_Miscellaneous"
+#~ msgstr "その他(_M)"
+
+#~ msgid "Use two-way text scroller"
+#~ msgstr "双方向テキストスクロールを使う"
+
+#~ msgid "About "
+#~ msgstr "プラグインについて"
+
+#~ 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"
+#~ "このプラグインは GNU LGPL の条項と条件のもとに配布されている.\n"
+#~ "詳細は http://www.gnu.org/licenses/lgpl.html を見よ.\n"
+#~ "\n"
+#~ "このプラグインは, copyright (C) Simon Peter およびその他によるAdPlug ライ"
+#~ "ブラリを用いている.\n"
+#~ "リンクしている AdPlug ライブラリのヴァージョン: "
+
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AdPlug :: 設定"
+
+#~ msgid "Sound quality"
+#~ msgstr "音質"
+
+#~ msgid "Resolution"
+#~ msgstr "解像度"
+
+#~ msgid "8bit"
+#~ msgstr " 8ビット"
+
+#~ msgid "16bit"
+#~ msgstr "16ビット"
+
+#~ msgid "Channels"
+#~ msgstr "チャンネル数"
+
+#~ 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 ""
+#~ "必要でないならば, ステレオ設定は推奨しません. OPL2 は単にモノラルなので, "
+#~ "サウンドにステレオエフェクトはかかりませんが, より CPU パワーを消費します!"
+
+#~ msgid "Frequency"
+#~ msgstr "周波数"
+
+#~ msgid "Detect songend"
+#~ msgstr "曲の終わりを検出する"
+
+#~ 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 ""
+#~ "有効ならば, XMMS は曲の終わりを検出し, 曲を停止してプレイリストを進みま"
+#~ "す. 無効ならば, XMMS は曲の終わりを通知せずに, 曲全体を何度も繰り返しま"
+#~ "す. "
+
+#~ msgid "Formats"
+#~ msgstr "フォーマット"
+
+#~ msgid "Format selection"
+#~ msgstr "フォーマット選択"
+
+#~ msgid "Format"
+#~ msgstr "フォーマット"
+
+#~ msgid "Extension"
+#~ msgstr "拡張子"
+
+#~ 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 ""
+#~ "選択されたファイルタイプが認識され, このプラグインによって再生されます. 選"
+#~ "択されていないタイプは, このプラグインからは無視され, 他のプラグインによっ"
+#~ "て再生されます. "
+
+#~ msgid "AdPlug :: File Info"
+#~ msgstr "AdPlug :: ファイル情報"
+
+#~ msgid "Author: "
+#~ msgstr "作者: "
+
+#~ msgid "File Type: "
+#~ msgstr "ファイルタイプ: "
+
+#~ msgid "Subsongs: "
+#~ msgstr "サブソング: "
+
+#~ msgid "Instruments: "
+#~ msgstr "楽器: "
+
+#~ msgid "Orders: "
+#~ msgstr "順序: "
+
+#~ msgid "Patterns: "
+#~ msgstr "パターン: "
+
+#~ msgid "Song"
+#~ msgstr "曲"
+
+#~ msgid "Instrument name"
+#~ msgstr "楽器名"
+
+#~ msgid "Song message"
+#~ msgstr "曲メッセージ"
+
+#~ msgid "Subsong selection"
+#~ msgstr "サブソング選択"
+
+#~ msgid "Order: "
+#~ msgstr "順序: "
+
+#~ msgid "Pattern: "
+#~ msgstr "パターン: "
+
+#~ msgid "Row: "
+#~ msgstr "列: "
+
+#~ msgid "Speed: "
+#~ msgstr "早さ: "
+
+#~ 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 ""
+#~ "特定の時間に演奏を開始するのに\n"
+#~ "用いられる 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"
+#~ "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"
+#~ " 最終: \n"
+#~ " この音量でフェーディングを終えます.\n"
+#~ " もしフェーディング時間が 0 ならば,\n"
+#~ " この音量で演奏が開始されます.\n"
+#~ "\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ " 追加コマンド:\n"
+#~ " アラームの時間に指定のコマンドを実行します.\n"
+#~ "\n"
+#~ " プレイリスト: \n"
+#~ " 曲を演奏するためのプレイリストを読み込みます\n"
+#~ " (.m3u 拡張子でなければなりません). \n"
+#~ " プレイリストが指定されなければ, \n"
+#~ " 現在のリストの曲が用いられます.\n"
+#~ " mp3 か ogg ストリームの URL も指定できますが,\n"
+#~ " URL からのプレイリスト読み込みは\n"
+#~ " 現在の xmms ではサポートされていません.\n"
+#~ "\n"
+#~ " リマインダ:\n"
+#~ " アラームを停止する際にリマインダを表示します.\n"
+#~ " これを利用するにはボックス内にリマインダを書き\n"
+#~ " トグルボタンを有効にします.\n"
+
+#~ msgid "Your reminder for today is.."
+#~ msgstr "今日のリマインダは.."
+
+#~ msgid "Thankyou"
+#~ msgstr "ありがとう"
+
+#, fuzzy
+#~ msgid "Available Headsets"
+#~ msgstr "有効なバックエンド"
+
+#, fuzzy
+#~ msgid "Current Headset"
+#~ msgstr "現在の値"
+
+#, fuzzy
+#~ msgid "_Connect"
+#~ msgstr "接続"
+
+#, fuzzy
+#~ msgid "Class"
+#~ msgstr "閉じる"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "デバイスアドレス"
+
+#, fuzzy
+#~ msgid "Rescan"
+#~ msgstr "CD を再スキャン"
+
+#~ msgid "Playback->Play"
+#~ msgstr "演奏->開始"
+
+#~ msgid "Playback->Stop"
+#~ msgstr "演奏->停止"
+
+#~ msgid "Playback->Pause"
+#~ msgstr "演奏->一時停止"
+
+#~ msgid "Playback->Prev"
+#~ msgstr "演奏->前の曲"
+
+#~ msgid "Playback->Next"
+#~ msgstr "演奏->次の曲"
+
+#~ msgid "Playback->Eject"
+#~ msgstr "演奏->イジェクト"
+
+#~ msgid "Playlist->Repeat"
+#~ msgstr "演奏->リピート"
+
+#~ msgid "Playlist->Shuffle"
+#~ msgstr "演奏->シャッフル"
+
+#~ msgid "Volume->Up_5"
+#~ msgstr "音量->5上げる"
+
+#~ msgid "Volume->Down_5"
+#~ msgstr "音量->5下げる"
+
+#~ msgid "Volume->Up_10"
+#~ msgstr "音量->10上げる"
+
+#~ msgid "Volume->Down_10"
+#~ msgstr "音量->10下げる"
+
+#~ msgid "Volume->Mute"
+#~ msgstr "音量->ミュート"
+
+#~ msgid "Window->Main"
+#~ msgstr "ウィンドウ->メイン"
+
+#~ msgid "Window->Playlist"
+#~ msgstr "ウィンドウ->プレイリスト"
+
+#~ msgid "Window->Equalizer"
+#~ msgstr "ウィンドウ->イコライザー"
+
+#~ msgid "Window->JumpToFile"
+#~ msgstr "ウィンドウ->ファイルへジャンプ"
+
+#~ 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 ""
+#~ "event-device-plugin: デバイスファイル %s を開けません, このデバイスをス"
+#~ "キップします; ファイルが存在することと読み込みパーミッションがあるか確認し"
+#~ "てください\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to create a io_channel for device file %s ,"
+#~ "skipping this device\n"
+#~ msgstr ""
+#~ "event-device-plugin: デバイスファイル %s の io_channel を作成できません,こ"
+#~ "のデバイスをスキップします\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to open /proc/bus/input/devices , automatic "
+#~ "detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: /proc/bus/input/devices を開けません, イベントデバイ"
+#~ "スの自動検出は動作しません.\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 ""
+#~ "event-device-plugin: /proc/bus/input/ デバイスの io_channel を開けません, "
+#~ "イベントデバイスの自動検出は動作しません.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: an error occurred while reading /proc/bus/input/"
+#~ "devices , automatic detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: /proc/bus/input/ デバイスの読み込み中にエラーが発生し"
+#~ "ました, イベントデバイスの自動検出は動作しません.\n"
+
+#~ msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: デバイス %s が /dev/input に見つかりません, スキップ"
+#~ "します.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to load config file %s , default settings "
+#~ "will be used.\n"
+#~ msgstr ""
+#~ "event-device-plugin: コンフィグファイル %s が読み込めません, デフォルト設"
+#~ "定が用いられます.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: incomplete information in config file for device \"%s"
+#~ "\" , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: デバイス \"%s\" のコンフィグファイルの情報が不完全で"
+#~ "す, スキップします.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_active value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: 設定: デバイス \"%s\" の is_active 値が取得できませ"
+#~ "ん, スキップします.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to access local directory %s , settings will "
+#~ "not be saved.\n"
+#~ msgstr ""
+#~ "event-device-plugin: ローカルディレクトリ %s にアクセスできません, 設定は"
+#~ "保存されません.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get filename value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: 設定: デバイス \"%s\" のファイル名が取得できません, "
+#~ "スキップします.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get phys value for device "
+#~ "\"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: 設定: デバイス \"%s\" の phys 値が取得できません, ス"
+#~ "キップします.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_custom value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: 設定: デバイス \"%s\" の is_custom 値が取得できませ"
+#~ "ん, スキップします.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unexpected value for device \"%s\", "
+#~ "skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: 設定: デバイス \"%s\" の予期せぬ値です, スキップしま"
+#~ "す.\n"
+
+#, fuzzy
+#~ msgid "Detected"
+#~ msgstr "曲の終わりを検出する"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "カスタム "
+
+#, fuzzy
+#~ msgid "Not Detected"
+#~ msgstr "選択範囲のソート"
+
+#~ msgid "Information"
+#~ msgstr "情報"
+
+#~ msgid ""
+#~ "Cannot open bindings window for a not-detected device.\n"
+#~ "Ensure that the device has been correctly plugged in."
+#~ msgstr ""
+#~ "デバイスが検出されていないため, バインディングウィンドウが開けません.\n"
+#~ "デバイスが正しく接続されていることを確認してください."
+
+#~ msgid ""
+#~ "Unable to open selected device.\n"
+#~ "Please check read permissions on device file."
+#~ msgstr ""
+#~ "選択されたデバイスが開けません.\n"
+#~ "デバイスファイルの読み込みパーミッションを確認してください."
+
+#~ msgid "EvDev-Plug - Add custom device"
+#~ msgstr "EvDev-Plug - カスタムデバイスの追加"
+
+#~ 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 は, システムで有効なイベントデバイスの情報を自動的に検出して更"
+#~ "新しようとします.\n"
+#~ "しかし, システムで自動検出が動作しない, あるいはイベントデバイスが非標準な"
+#~ "位置にある場合(現状 /dev/input/ のみを検索します), \n"
+#~ "名前とデバイスファイルを明確に指定してカスタムデバイスとして追加してくださ"
+#~ "い."
+
+#~ msgid "Device name:"
+#~ msgstr "デバイス名:"
+
+#~ msgid "Device file:"
+#~ msgstr "デバイスファイル:"
+
+#, fuzzy
+#~ msgid "(custom)"
+#~ msgstr "カスタム "
+
+#~ msgid ""
+#~ "Please specify both name and filename.\n"
+#~ "Filename must be specified with absolute path."
+#~ msgstr ""
+#~ "名前とファイル名の両方を指定してください.\n"
+#~ "ファイル名は絶対パスで指定しなければなりません."
+
+#~ msgid ""
+#~ "Do you want to remove the existing configuration for selected device?\n"
+#~ msgstr "選択したデバイスを現在の設定から削除しますか?\n"
+
+#~ msgid "Do you want to remove the selected custom device?\n"
+#~ msgstr "選択したカスタムデバイスを削除しますか?\n"
+
+#~ msgid "EvDev-Plug - Configuration"
+#~ msgstr "EvDev-Plug - 設定"
+
+#~ msgid "Active"
+#~ msgstr "アクティブ"
+
+#~ msgid "Status"
+#~ msgstr "状態"
+
+#~ msgid "Device Name"
+#~ msgstr "デバイス名"
+
+#~ msgid "Device File"
+#~ msgstr "デバイスファイル"
+
+#~ msgid "Device Address"
+#~ msgstr "デバイスアドレス"
+
+#~ msgid "_Bindings"
+#~ msgstr "バインディング(_B)"
+
+#~ 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 ""
+#~ "バインドするデバイスのキーを押してください.\n"
+#~ "5秒以内にキーが押されなければ, \n"
+#~ "バインディングを変更せずにウィンドウを閉じます. "
+
+#~ 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 ""
+#~ "この入力イベントは既に割り当てられています.\n"
+#~ "\n"
+#~ "同じ入力イベントに複数のアクションを割り当てることはできません. (しかし, "
+#~ "複数のイベントに同じアクションを割り当てることは可能です)"
+
+#~ msgid "EvDev-Plug - Bindings Configuration"
+#~ msgstr "EvDev-Plug - バインディング設定"
+
+#~ msgid "Name: "
+#~ msgstr "名前: "
+
+#~ msgid "Filename: "
+#~ msgstr "ファイル名: "
+
+#~ msgid "Phys.Address: "
+#~ msgstr "Phys.アドレス: "
+
+#~ msgid "EvDev-Plug - about"
+#~ msgstr "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"
+#~ "http://www.develia.org/projects.php?p=audacious#evdevplug\n"
+#~ "\n"
+#~ "Giacomo Lozito によって書かれた.\n"
+#~ "\n"
+
+#~ msgid "This LADSPA plugin has no user controls"
+#~ msgstr "LADSPA プラグインにユーザコントロールはありません"
+
+#~ msgid "Name"
+#~ msgstr "名前"
+
+#~ msgid "UID"
+#~ msgstr "UID"
+
+#~ msgid "Installed plugins"
+#~ msgstr "インストール済プラグイン"
+
+#~ msgid "Running plugins"
+#~ msgstr "動作中のプラグイン"
+
+#~ msgid "Add"
+#~ msgstr "追加"
+
+#~ msgid "Remove"
+#~ msgstr "削除"
+
+#~ msgid "LADSPA Plugin Catalog"
+#~ msgstr "LADSPA プラグイン カタログ"
+
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "LIRC Audacious プラグインについて"
+
+#~ msgid "LIRC Plugin "
+#~ msgstr "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"
+#~ "LIRC リモートコントロールデーモンを用いて\n"
+#~ "Audacious をコントロールするシンプルなプラグイン\n"
+#~ "\n"
+#~ "Tony Vroon <chainsaw@gentoo.org> による Audacious への適用\n"
+#~ "元となった XMMS LIRC プラグインは\n"
+#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
+#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
+#~ "Andrew O. Shadoura <bugzilla@tut.by> による.\n"
+#~ "LIRC の情報は以下で得られる.\n"
+#~ "http://lirc.org"
+
+#~ msgid "LIRC plugin settings"
+#~ msgstr "LIRC プラグイン設定"
+
+#~ msgid "Reconnect to LIRC server"
+#~ msgstr "LIRC サーバに再接続"
+
+#~ msgid "Timeout before reconnecting (seconds): "
+#~ msgstr "再接続までのタイムアウト(秒): "
+
+#~ msgid "Reconnect"
+#~ msgstr "再接続"
+
+#~ msgid "Connection"
+#~ msgstr "接続"
+
+#~ msgid "%s: could not init LIRC support\n"
+#~ msgstr "%s: 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: LIRC 設定ファイルを読み込めませんでした\n"
+#~ "%s: 正しい設定ファイルの作り方を知るには\n"
+#~ "%s: LIRC のドキュメントを読んでください\n"
+
+#~ msgid "%s: trying to reconnect...\n"
+#~ msgstr "%s: 再接続を試行中...\n"
+
+#~ msgid "%s: unknown command \"%s\"\n"
+#~ msgstr "%s: 不明なコマンド \"%s\"\n"
+
+#~ msgid "%s: disconnected from LIRC\n"
+#~ msgstr "%s: LIRC から切断されました\n"
+
+#~ msgid "%s: will try reconnect every %d seconds...\n"
+#~ msgstr "%s: %d 秒ごとに再接続を試みます...\n"
+
+#~ msgid "ModPlug Configuration"
+#~ msgstr "ModPlug 設定"
+
+#~ msgid "16 bit"
+#~ msgstr "16ビット"
+
+#~ msgid "8 bit"
+#~ msgstr " 8ビット"
+
+#~ msgid "Mono (downmix)"
+#~ msgstr "モノラル (ダウンミックス)"
+
+#~ msgid "Nearest (fastest)"
+#~ msgstr "最短 (最速)"
+
+#~ msgid "Linear (fast)"
+#~ msgstr "線形 (高速)"
+
+#~ msgid "Spline (good quality)"
+#~ msgstr "スプライン (良品質)"
+
+#~ msgid "8-tap Fir (extremely high quality)"
+#~ msgstr "8 タップ Fir (非常に高品質)"
+
+#, fuzzy
+#~ msgid "96 kHz"
+#~ msgstr "48 kHz"
+
+#~ msgid "48 kHz"
+#~ msgstr "48 kHz"
+
+#~ msgid "44 kHz"
+#~ msgstr "44 kHz"
+
+#~ msgid "22 kHz"
+#~ msgstr "22 kHz"
+
+#~ msgid "Sampling Rate"
+#~ msgstr "サンプリングレート"
+
+#~ msgid "Enable"
+#~ msgstr "有効"
+
+#~ msgid "Depth"
+#~ msgstr "深さ"
+
+#~ msgid "Delay"
+#~ msgstr "遅延"
+
+#~ msgid "Reverb"
+#~ msgstr "リバーブ"
+
+#~ msgid "Amount"
+#~ msgstr "量"
+
+#~ msgid "Range"
+#~ msgstr "範囲"
+
+#~ msgid "Bass Boost"
+#~ msgstr "ベース増加"
+
+#~ msgid ""
+#~ "Note: Setting the preamp\n"
+#~ "too high may cause clipping\n"
+#~ "(annoying clicks and pops)!"
+#~ msgstr ""
+#~ "注意: プリアンプの設定が高すぎると\n"
+#~ "クリッピング(うるさいカチカチ音や\n"
+#~ "ブツブツ音)の原因になります!"
+
+#~ msgid "Effects"
+#~ msgstr "エフェクト"
+
+#~ msgid "Use Filename as Song Title"
+#~ msgstr "ファイル名を曲名として使う"
+
+#~ msgid "Fast Playlist Info"
+#~ msgstr "高速なプレイリスト情報"
+
+#~ msgid "Noise Reduction"
+#~ msgstr "ノイズリダクション"
+
+#~ msgid "Play Amiga MOD"
+#~ msgstr "Amiga MOD を演奏する"
+
+#~ msgid "Don't loop"
+#~ msgstr "ループしない"
+
+#~ msgid "Loop"
+#~ msgstr "ループ回数"
+
+#~ msgid "time(s)"
+#~ msgstr "回"
+
+#~ msgid "Loop forever"
+#~ msgstr "永遠にループ"
+
+#~ msgid "Looping"
+#~ msgstr "ループ"
+
+#~ msgid "MOD Info"
+#~ msgstr "MOD 情報"
+
+#~ msgid ""
+#~ "Filename:\n"
+#~ "Title:\n"
+#~ "Type:\n"
+#~ "Length:\n"
+#~ "Speed:\n"
+#~ "Tempo:\n"
+#~ "Samples:\n"
+#~ "Instruments:\n"
+#~ "Patterns:\n"
+#~ "Channels:"
+#~ msgstr ""
+#~ "ファイル名:\n"
+#~ "曲名:\n"
+#~ "タイプ:\n"
+#~ "長さ:\n"
+#~ "速さ:\n"
+#~ "テンポ:\n"
+#~ "サンプリングレート:\n"
+#~ "楽器:\n"
+#~ "パターン:\n"
+#~ "チャンネル:"
+
+#~ msgid ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+#~ msgstr ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+
+#~ msgid "Samples"
+#~ msgstr "サンプリングレート"
+
+#~ msgid "Instruments"
+#~ msgstr "楽器"
+
+#~ msgid "Message"
+#~ msgstr "メッセージ"
+
+#~ msgid "Modplug Input Plugin for Audacious ver"
+#~ msgstr "Modplug 入力プラグイン for Audacious ver"
+
+#, fuzzy
+#~ 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 サウンドエンジンは Olivier Lapicque によって書かれた.\n"
+#~ "Modplug XMMS インタフェイスは Kenton Vard による.\n"
+#~ "(c)2000 Olivier Lapicque and Kenton Varda.\n"
+#~ "更新とメンテナンスは Konstanty Bialkowski による.\n"
+#~ "BMP へのポートは Theofilos Intzoglou による."
+
+#~ msgid "About Modplug"
+#~ msgstr "Modplug について"
+
+#~ msgid "Show separators in playlist"
+#~ msgstr "プレイリストの区切り線を表示する"
+
+#~ msgid "Show window manager decoration"
+#~ msgstr "ウィンドウマネージャ装飾を表示する"
+
+#~ msgid "This enables the window manager to show decorations for windows."
+#~ msgstr "ウィンドウマネージャによるウィンドウ装飾を有効にします."
+
+#~ 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 ""
+#~ "これを使うと，メインウィンドウのファイル情報テキストが前後にスクロールしま"
+#~ "す．そうでなければ，テキストは一方向のみにスクロールします．"
+
+#~ msgid "Disable inline gtk theme"
+#~ msgstr "インライン GTK テーマを無効にする"
+
+#, fuzzy
+#~ msgid "Random skin on play"
+#~ msgstr "プレイリストの順序をランダムにします."
+
+#~ msgid "Allow loading incomplete skins"
+#~ msgstr "不完全なスキンの読み込みを許可する"
+
+#~ msgid ""
+#~ "If selected, audacious won't refuse loading broken skins. Use only if "
+#~ "your favourite skin doesn't work"
+#~ msgstr ""
+#~ "これを使うと，audacious は壊れたスキンの読み込みを拒絶しません．お気に入り"
+#~ "のスキンが動かないときだけ使用してください．"
+
+#~ msgid "Color Adjustment"
+#~ msgstr "色補正"
+
+#~ msgid ""
+#~ "Audacious allows you to alter the color balance of the skinned UI. The "
+#~ "sliders below will allow you to do this."
+#~ msgstr "以下のスライダを用いてスキン UI の色合いの変更ができます."
+
+#~ msgid "Blue"
+#~ msgstr "青"
+
+#~ msgid "Green"
+#~ msgstr "緑"
+
+#~ msgid "Red"
+#~ msgstr "赤"
+
+#, fuzzy
+#~ msgid "Color adjustment ..."
+#~ msgstr "色補正"
+
+#~ msgid "Disable 'GUI Scaling'"
+#~ msgstr "「GUI スケーリング」無効"
+
+#~ msgid "Enable 'GUI Scaling'"
+#~ msgstr "「GUI スケーリング」有効"
+
+#~ msgid "DoubleSize"
+#~ msgstr "ダブルサイズ"
+
+#~ msgid "Easy Move"
+#~ msgstr "簡単移動"
+
+#~ msgid "Spectrum Analyzer"
+#~ msgstr "スペクトラムアナライザ"
+
+#, fuzzy
+#~ msgid "Search:"
+#~ msgstr "年:"
+
+#, fuzzy
+#~ msgid "Stream name"
+#~ msgstr "楽器名"
+
+#, fuzzy
+#~ msgid "Now playing"
+#~ msgstr "新しいプレイリスト"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "タグの削除"
+
+#, fuzzy
+#~ msgid "About Stream Browser"
+#~ msgstr "OSS ドライバについて"
+
+#, fuzzy
+#~ 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) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
+#~ "Team.\n"
+#~ "\n"
+#~ "libcdio 開発者 <http://www.gnu.org/software/libcdio/> と\n"
+#~ "\tlibcddb 開発者 <http://libcddb.sourceforge.net/> に多大なる感謝.\n"
+#~ "\n"
+#~ "Tony Vroon による助言と指針に感謝.\n"
+#~ "\n"
+#~ "これは Google Summer of Code 2007 のプロジェクトでした."
+
+#~ msgid "Can't jump to time when no track is being played.\n"
+#~ msgstr "再生されるトラックがない時間へは移動できません.\n"
+
+#~ msgid "minutes:seconds"
+#~ msgstr "分:秒"
+
+#~ msgid "Track length:"
+#~ msgstr "トラックの合計時間:"
+
+#~ msgid "Error writing playlist \"%s\": %s"
+#~ msgstr "プレイリスト \"%s\" を書き込む際にエラー: %s"
+
 #~ msgid "%s already exist. Continue?"
 #~ msgstr "%s は既に存在しています. 続行しますか？"
 
+#, fuzzy
+#~ msgid "Show main menu"
+#~ msgstr "メインウィンドウを表示する"
+
+#, fuzzy
+#~ msgid "Show/hide statusbar"
+#~ msgstr "プレイリストの保存"
+
+#, fuzzy
+#~ msgid "Import Playlist ..."
+#~ msgstr "プレイリストの読み込み"
+
+#, fuzzy
+#~ msgid "Export Playlist ..."
+#~ msgstr "プレイリストの読み込み"
+
+#, fuzzy
+#~ msgid "Refresh"
+#~ msgstr "リフレッシュレート"
+
+#, fuzzy
+#~ msgid "Refresh Selected"
+#~ msgstr "選択したエントリの削除"
+
+#, fuzzy
+#~ msgid "Refreshes metadata associated with selected entries."
+#~ msgstr "プレイリストのエントリに関連付けられたメタデータを更新します."
+
+#, fuzzy
+#~ msgid "Edit the playlist title."
+#~ msgstr "プレイリストの順序をランダムにします."
+
+#, fuzzy
+#~ msgid "By Formatted Title"
+#~ msgstr "タイトル"
+
+#, fuzzy
+#~ msgid "Components"
+#~ msgstr "コメント:"
+
+#~ msgid "Upload selected track(s)"
+#~ msgstr "選択されたトラックをアップロード"
+
+#~ msgid "MTP device handler"
+#~ msgstr "MTP デバイスハンドラ"
+
+#~ msgid "Show main player window"
+#~ msgstr "メインウィンドウを表示する"
+
+#~ msgid "Ignore"
+#~ msgstr "無視"
+
+#~ 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 はすべてのウィンドウが隠された状態で開始されました．\n"
+#~ "再度プレイヤウィンドウを表示するか，そのまま Audacious を操作するために"
+#~ "は，audtool を用いるか statusicon のようなプラグインを有効にすることで遠隔"
+#~ "操作してください．"
+
+#~ msgid "Always ignore, show/hide is controlled remotely"
+#~ msgstr "常に無視し，表示する/隠す は遠隔操作する"
+
+#~ msgid "Audacious - broken GTK engine usage warning"
+#~ msgstr "Audacious - 壊れた 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>壊れた GTK エンジンが使われています</big>\n"
+#~ "\n"
+#~ "Audacious は GTK エンジンが使われていることを検出しました.\n"
+#~ "\n"
+#~ "テーマエンジン %s は最近のスキンで用いられている特徴と非互換です.非"
+#~ "互換な特徴はこのセッションでは無効にされました.\n"
+#~ "\n"
+#~ "これらの特徴を用いるには, 他の GTK テーマエンジンを使うことを考慮してくだ"
+#~ "さい."
+
+#~ msgid "Do not display this warning again"
+#~ msgstr "次回からこの警告を表示しない"
+
+#~ msgid "Save as Static Playlist"
+#~ msgstr "スタティックプレイリストとして保存"
+
+#~ msgid "Use Relative Path"
+#~ msgstr "相対パスを使う"
+
+#~ msgid "Load Playlist"
+#~ msgstr "プレイリストの読み込み"
+
+#~ msgid "Save Playlist"
+#~ msgstr "プレイリストの保存"
+
 #~ msgid ""
 #~ "* Select ALSA output ports *\n"
 #~ "MIDI events will be sent to the ports selected here. In example, if your "
@@ -6460,10 +6269,6 @@
 #~ msgstr "プラグインについて"
 
 #, fuzzy
-#~ msgid "Output plugin"
-#~ msgstr "出力プラグインエラー\n"
-
-#, fuzzy
 #~ msgid "Throttle Output"
 #~ msgstr "aRts 出力プラグインについて"
 
@@ -6570,10 +6375,6 @@
 #~ msgstr "選択したプレイリストをデフォルト位置に保存します."
 
 #, fuzzy
-#~ msgid "_Rename"
-#~ msgstr "ファイル名"
-
-#, fuzzy
 #~ msgid "About Icecast-Plugin"
 #~ msgstr "エコー プラグインについて"

audacious-plugins-2.5.3.tar.gz/po/lv.po -> audacious-plugins-3.0.tar.gz/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-05-19 10:53-0400\n"
-"PO-Revision-Date: 2011-03-02 01:41+0200\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
+"PO-Revision-Date: 2011-06-27 04:01+0300\n"
 "Last-Translator: Einars Sprugis <einars8@gmail.com>\n"
 "Language-Team: Latvian <kde-i18n-doc@kde.org>\n"
 "Language: lv\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -29,609 +29,47 @@
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM dekodētājs (c) Nero AG, www.nero.com\n"
 "Autortiesības (c) 2005-2006 Audacious komanda"
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "Par MP4 AAC dekodētāja spraudni"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "Par"
-
-#: src/adplug/adplug-xmms.cc:155
-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"
-"Autortiesības (c) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
-"\n"
-"Šis spraudnis ir izlaists zem GNU LGPL nosacījumiem.\n"
-"Detaļas skatīt http://www.gnu.org/licenses/lgpl.html\n"
-"\n"
-"Šis spraudnis izmanto AdPlug bibliotēku, autortiesības (C) Simon Peter u.c.\n"
-"Saistītās AdPlug bibliotēkas versija: "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: Konfigurācija"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "Labi"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Atcelt"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "Vispārīgi"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Skaņas kvalitāte"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Izšķirtspēja"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8bit"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16bit"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Kanāli"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Stereo"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-"Ieslēgt stereo režīmu nav ieteicams, ja vien jums to nevajag. Tas "
-"nepievienos skaņai stereo efektu (OPL2 ir tikai mono), bet patērēs vairāk "
-"procesora resursu!"
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Frekvence"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Atskaņošana"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Noteikt dziesmas beigas"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-"Ja ieslēgts, XMMS noteiks dziesmas beigas, apturēs to un pavirzīsies uz "
-"priekšu repertuārā. Ja izslēgts, XMMS neievēros dziesmas beigas un atkārtos "
-"to."
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Formāti"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Formāta izvēle"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Formāts"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Paplašinājums"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-"Šis spraudnis atpazīs un atskaņos izvēlētos faila tipus. Neizvēlētie tipi "
-"tiks ignorēti, lai atļautu tos atskaņot citiem spraudņiem."
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: Faila informācija"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Faila nosaukums"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Nosaukums: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Autors: "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Faila tips: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "Apakšdziesmas: "
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Instrumenti: "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "Kārtības: "
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Paraugi: "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Dziesma"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Instrumenta nosaukums"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Dziesmas ziņojums"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "Apakšdziesmas izvēle"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Kārtība: "
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Paraugs: "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Rinda: "
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Ātrums: "
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Taimeris: "
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "Par XMMS Alarm"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "XMMS Alarm"
-
-#: src/alarm/interface.c:56
-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 spraudnis, kas var tikt izmantots,\n"
-"lai sāktu atskaņošanu noteiktā laikā.\n"
-"\n"
-"Sūtiet visas sūdzības uz:\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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Aizvērt"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Modinātājs"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "Šis ir jūsu mošanās zvans."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "Labi"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Izvēlieties repertuāru"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Atvainojiet"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Brīdinājums"
-
-#: src/alarm/interface.c:213
-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 ""
-"Drošības dēļ \"kluss\" ilgumam jābūt vismaz par 65 sekundēm garākam nekā "
-"izdzišanas ilgumam, tam jābūt arī garākam par 10 sekundēm. Būtībā tas "
-"nozīmē, ka kodā ir kļūda un, līdz tiks atrasts risinājums, jums būs jāredz "
-"šis ziņojums :)\n"
-"\n"
-"Jūsu izdzišanas ilguma iestatījumi NAV saglabāti\n"
-"\n"
-"--\n"
-"Adam"
-
-#: src/alarm/interface.c:229
-msgid "Oh Well"
-msgstr "Nu, labi"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Modinātājs iestatījumi"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Laiks"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "stundas"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "minūtes"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Kluss pēc:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Modināt (noklusējums):"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Izvēlieties dienas, kurās ieslēgsies modinātājs"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Noklusētais"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Diena"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Otrdiena"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Trešdiena"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Ceturtdiena"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Piektdiena"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Sestdiena"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Svētdiena"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Pirmdiena"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Dienas"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Izdzišana"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "sekundes"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Skaļums"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Pašreizējais"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "Atstatīt uz pašreizējo izvades skaļumu"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Sākumā"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Beigās"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Papildu komanda"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "ieslēgt"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Repertuārs (neobligāts)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Pārlūkot..."
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Atgādinājums"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Izmantot atgādinājumu"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Opcijas"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Ko šīs opcijas nozīmē?"
-
-#: src/alarm/interface.c:1364
-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"
-"Laiks\n"
-" Modināt: \n"
-" Laiks, kad ieslēdzas modinātājs.\n"
-"\n"
-" Kluss pēc: \n"
-" Izslēgt modinātāju pēc šī laika sprīža.\n"
-" (ja netiek aizvērts pamošanās dialogs)\n"
-"\n"
-"\n"
-"Dienas\n"
-" Diena:\n"
-" Izvēlieties dienas, kad modinātājam jāieslēdzas.\n"
-"\n"
-" Laiks:\n"
-" Izvēlieties modināšanas laiku katrai dienai\n"
-" vai arī atzīmējiet 'Noklusētais', lai izmantotu\n"
-" noklusēto laiku.\n"
-"\n"
-"\n"
-"Skaļums\n"
-" Izdzišana:\n"
-" Palielināt skaļumu līdz izvēlētajam līmenim\n"
-" šajā laika brīdī.\n"
-"\n"
-" Sākt: \n"
-" Sākt skaļuma palielināšanu no šī līmeņa.\n"
-"\n"
-" Beigt: \n"
-" Līmenis, pie kura pārtraukt skaļuma palielināšanu.\n"
-" Ja izdzišanas laiks ir 0, tad iestatīt skaļumu uz šo\n"
-" līmeni un sākt atskaņošanu.\n"
-"\n"
-"\n"
-"Opcijas:\n"
-" Papildu komanda:\n"
-" Palaist šo komandu modinātāja palaišanas brīdī.\n"
-"\n"
-" Repertuārs: \n"
-" Ielādēt repertuāru, no kura tiks atskaņotas dziesmas\n"
-" (jābūt ar .m3u paplašinājumu). Ja tas netiek norādīts,\n"
-" tiks izmantotas dziesmas no pašreizējā repertuāra.\n"
-" Šeit var ievadīt arī mp3/ogg straumes URL, bet\n"
-" repertuāru ielādēšanu no URL xmms pašreiz\n"
-" neatbalsta.\n"
-"\n"
-" Atgādinājums:\n"
-" Modinātājam izslēdzoties, parāda atgādinājumu.\n"
-" Ievadiet atgādinājumu teksta laukā un ielieciet\n"
-" ķeksīti blakus esošajā rūtī, ja vēlieties, lai tas tiktu\n"
-" parādīts.\n"
-
-#: src/alarm/interface.c:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Palīdzība"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "Jūsu atgādinājums šodienai ir.."
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Paldies"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Noklusētā PCM ierīce"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 msgid "Default mixer device"
 msgstr "Noklusētā miksera ierīce"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA izvades spraudņa iestatījumi"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 msgid "PCM device:"
 msgstr "PCM ierīce:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Miksera ierīce:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 msgid "Mixer element:"
 msgstr "Miksera elements:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr "Apiet 'drain hangup' problēmai"
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
 msgstr "Par ALSA izvades spraudni"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr "ALSA kļūda"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -799,6 +237,10 @@
 msgid "SoundFont settings"
 msgstr "SoundFont iestatījumi"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Faila nosaukums"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Izmērs (baitos)"
@@ -905,8 +347,7 @@
 "TiMidity\n"
 "aizmugure"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Nosaukums:"
 
@@ -1078,119 +519,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Palaiž OSD, kad tiek atjaunota atskaņošana pēc pauzes."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Novietojums"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "Relatīvā X nobīde:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Relatīvā Y nobīde:"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "Maksimālais OSD platums:"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Daudzmonitoru opcijas"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "Rādīt OSD izmantojot:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "visi monitori"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "%i. monitors"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Ilgums (ms)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "Rādīt:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "Parādīties:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "Izgaist:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Fonti"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "%i. fonts:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Ēna"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Internacionalizācija"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "Atslēgt teksta UTF-8 pārveidi (iekš aosd)"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "Izvēlieties apdares failu"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Renderēšanas stils"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Krāsas"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "%i. krāsa:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "Pielāgota apdare"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "Apdares fails:"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "Pārlūkot"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Ieslēgt palaidēju"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Notikums"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "Kompozitēšanas pārvaldnieks atrasts"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1200,73 +641,73 @@
 "ja vien esat pārliecināts, ka jums tas ir palaists, lūdzu, aktivizējiet "
 "kompozitēšanas pārvaldnieku, citādi OSD nefunkcionēs pareizi"
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "Viltus caurspīdībai kompozitēšanas pārvaldnieks nav nepieciešams"
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Caurspīdība"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Viltus caurspīdība"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Īsta caurspīdība (nepieciešams X Composite paplašin.)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "Composite paplašinājums nav ielādēts"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "Composite paplašinājums nav pieejams"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - konfigurācija"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Testēt"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Novietojums"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Animācija"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Teksts"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Noformējums"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Palaidējs"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Dažādi"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "Audacious OSD - par"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1274,7 +715,7 @@
 "\n"
 "Audacious OSD "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1296,135 +737,6 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr "Pārošanas pieprasījums priekš '%s'"
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr "Autorizācijas pieprasījums priekš '%s'"
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr "Izveidots saite ar %s"
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr "Atcelta saite ar %s"
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr "Ierīce tika izslēgta"
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr "Ierīce tika padarīta neatklājama"
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr "Ierīce tika padarīta savienojama"
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr "Ierīce tika padarīta atklājama"
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr "Ierīce tika padarīta ierobežoti atklājama"
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr "Ierīce tika pārslēgta pārošanas režīmā"
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr "Bluetooth austiņu atbalsta spraudnis"
-
-#: src/bluetooth/bluetooth.c:118
-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 austiņu atbalsts\n"
-"autortiesības (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
-"Šis bija GSoC 2008 projekts - liels paldies manam padomdevējam Tony Vroon un "
-"Audacious komandai\n"
-"\n"
-"Lai izmantotu AVRCP, kodolā jābūt ielādētam 'uinput' modulim\n"
-"Austiņu taustiņi tiks atpazīti kā parasti multivides taustiņi\n"
-"un var tikt konfigurēti, izmantojot Audacious globālo īsinājumtaustiņu "
-"spraudni\n"
-"vai citus jūsu logu pārvaldītāja rīkus\n"
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr "Ražotājs"
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr "Pieejamās austiņas"
-
-#: src/bluetooth/gui.c:224
-msgid "Current Headset"
-msgstr "Pašreizējās austiņas"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr "A_tsvaidzināt"
-
-#: src/bluetooth/gui.c:231
-msgid "_Connect"
-msgstr "_Pievienot"
-
-#: src/bluetooth/gui.c:237
-msgid "_Close"
-msgstr "Ai_zvērt"
-
-#: src/bluetooth/gui.c:274
-msgid "Class"
-msgstr "Klase"
-
-#: src/bluetooth/gui.c:278
-msgid "Address:"
-msgstr "Adrese:"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr "Sasaiste pabeigta!"
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr "Nav atrasta neviena ierīce!"
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr "Skenē..."
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr "Pāro..."
-
-#: src/bluetooth/scan_gui.c:138
-msgid "Rescan"
-msgstr "Pārskenēt"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "Atskaņot"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Blur Scope: krāsu izvēle"
@@ -1433,11 +745,11 @@
 msgid "Options:"
 msgstr "Iestatījumi:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 msgid "About Audio CD Plugin"
 msgstr "Par audio CD spraudni"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1462,15 +774,15 @@
 "\n"
 "Autortiesības 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr "Dzinis ir tukšs."
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr "Neatbalstīts diska tips."
 
@@ -1518,11 +830,23 @@
 msgid "Override default device: "
 msgstr "Aizstāt noklusēto ierīci: "
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+msgid "Ok"
+msgstr "Labi"
+
+#: 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 "Atcelt"
+
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
 msgstr "Atskaņot CD"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "Pievienot CD"
 
@@ -1546,6 +870,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Spēļu konsoles mūzikas dekodētājs"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "Vispārīgi"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Atskaņošana"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Bass:"
@@ -1563,8 +895,7 @@
 msgid "Default song length:"
 msgstr "Noklusētais dziesmas garums:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Iztveršanas tempa pārveidošana"
 
@@ -1576,6 +907,10 @@
 msgid "Resampling rate:"
 msgstr "Iztveršanas temps:"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1645,16 +980,16 @@
 "Varat izmantot Sample Rate Converter efektu, lai pārveidotu dziesmas uz to "
 "pašu iztveršanas frekvenci."
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "Konfigurēt Crystalizer"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Efekta intensitāte:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Pielietot"
 
@@ -1694,377 +1029,20 @@
 msgid "Volume: (%)"
 msgstr "Skaļums: (%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "Atskaņošana->Atskaņot"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "Atskaņošana->Stop"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "Atskaņošana->Pauze"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "Atskaņošana->Iepriekšējā"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "Atskaņošana->Nākamā"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "Atskaņošana->Izņemt"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "Repertuārs->Atkārtot"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "Repertuārs->Sajaukt"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "Skaļums->Uz_augšu_5"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "Skaļums->Uz_leju_5"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "Skaļums->Uz_augšu_10"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "Skaļums->Uz_leju_10"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "Skaļums->Apklusināt"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "Logs->Galvenais"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "Logs->Repertuārs"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "Logs->Balansieris"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "Logs->PārietUzFailu"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-"event-device-plugin: neizdevās atvērt ierīces failu %s , ierīce tika "
-"izlaista; pārbaudiet, vai fails eksistē un vai jums ir lasīšanas atļauja šim "
-"failam\n"
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-"event-device-plugin: neizdevās izveidot io_channel ierīces failam %s , "
-"ierīce tika izlaista\n"
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: neizdevās atvērt /proc/bus/input/devices , automātiskā "
-"notikumu ierīču atrašana nedarbosies.\n"
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-"event-device-plugin: neizdevās atvērt io_channel /proc/bus/input/ ierīcēm , "
-"automātiskā notikumu ierīču atrašana nedarbosies.\n"
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: kļūda lasot /proc/bus/input/ ierīces , automātiskā "
-"notikumu ierīču atrašana nedarbosies.\n"
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-"event-device-plugin: ierīce %s nav atrasta iekš /dev/input , tā tiek\n"
-"izlaista.\n"
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-"event-device-plugin: neizdevās ielādēt konfigurācijas failu %s , tiks "
-"izmantoti noklusētie iestatījumi.\n"
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-"event-device-plugin: nepilnīga informācija konfigurācijas failā ierīcei \"%s"
-"\", tā tiks izlaista.\n"
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurācija, neizdevās iegūt is_active vērtību "
-"ierīcei \"%s\", tā tiks izlaista.\n"
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-"event-device-plugin: neizdevās piekļūt vietējai mapei %s , iestatījumi "
-"netiks saglabāti.\n"
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurācija, neizdevās iegūt filename vērtību ierīcei "
-"\"%s\", tā tiks izlaista.\n"
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurācija, neizdevās iegūt phys vērtību ierīcei "
-"\"%s \", tā tiks izlaista.\n"
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurācija, neizdevās iegūt is_custom vērtību "
-"ierīcei \"%s\", tā tiks izlaista.\n"
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurācija, negaidīta vērtība ierīcei \"%s \", tā "
-"tiks izlaista.\n"
-
-#: src/evdev-plug/ed_ui.c:212
-msgid "Detected"
-msgstr "Atrasts"
-
-#: src/evdev-plug/ed_ui.c:217
-msgid "Custom"
-msgstr "Pielāgots"
-
-#: src/evdev-plug/ed_ui.c:223
-msgid "Not Detected"
-msgstr "Nav atrasts"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "Informācija"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-"Nevar atvērt piesaistu logu ierīcei, kas nav atrasta.\n"
-"Pārliecinieties, ka ir pareizi pievienota."
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Kļūda"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-"Neizdevās atvērt izvēlēto ierīci.\n"
-"Lūdzu, pārbaudiet lasīšanas atļaujas ierīces failam."
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "EvDev-Plug - Pievienot pielāgotu ierīci"
-
-#: src/evdev-plug/ed_ui.c:353
-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 mēģina automātiski atrast un atjaunot informāciju par notikumu\n"
-"ierīcēm, kas pieejamas jūsu sistēmā.\n"
-"Tomēr, ja automātiskā atrašana jūsu sistēmā nedarbojas, vai arī notikumu\n"
-"ierīces ir nestandarta vietā (pašreiz tās tiek meklētas tikai iekš /dev/"
-"input/ ),\n"
-"jūs varat pievienot pielāgotu ierīci, norādot tās nosaukumu un ierīces failu."
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Ierīces nosaukums:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Ierīces fails:"
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr "(pielāgots)"
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-"Lūdzu, norādiet gan nosaukumu, gan faila nosaukumu.\n"
-"Faila nosaukumu jānorāda ar pilno ceļu."
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr "Vai vēlaties dzēst pašreizējo konfigurāciju izvēlētajai ierīcei?\n"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "Vai vēlaties dzēst izvēlēto pielāgoto ierīci?\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "EvDev-Plug - Konfigurācija"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Aktīvs"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Statuss"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Ierīces nosaukums"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Ierīces fails"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Ierīces adrese"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "Pie_saistes"
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-"Nospiediet jūsu ierīces taustiņu, lai to piesaistītu;\n"
-"ja pēc piecu sekunžu laikā netiks nospiests neviens\n"
-"taustiņš, šis logs aizvērsies, neizmainot piesaistes."
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-"Šis ievades notikums jau ir piesaistīts.\n"
-"\n"
-"Nav iespējams piesaistīt vairākas darbības vienam ievades notikumam (tomēr "
-"ir iespējams piesaistīt vienu darbību vairākiem notikumiem)."
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Plug - Piesaistu konfigurācija"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "Nosaukums: "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Faila nosaukums: "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Fiz. adrese: "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "EvDev-Plug - par"
-
-#: src/evdev-plug/ed_ui.c:1491
-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"
-"atskaņotāja tālvadība ar notikumu ierīcēm\n"
-"http://www.develia.org/projects.php?p=audacious#evdevplug\n"
-"\n"
-"autors Giacomo Lozito\n"
-
-#: src/ffaudio/ffaudio-core.c:765
-#, c-format
+#: src/ffaudio/ffaudio-core.c:763
+#, fuzzy, c-format
 msgid ""
 "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"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 "Daudzformātu audio dekodēšanas Audacious spraudnis, kas balstīts uz\n"
 "FFmpeg multivides karkasu (http://www.ffmpeg.org/)\n"
@@ -2076,15 +1054,15 @@
 " William Pitcock <nenolod@nenolod.net>,\n"
 " Matti Hämäläinen <ccr@tnsp.org>\n"
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "Par FFaudio spraudni"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "Par FileWriter spraudni"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2118,51 +1096,51 @@
 "Ja tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "Failu rakstītāja konfigurācija"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Izvades faila formāts:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Konfigurēt"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Saglabāt oriģinālajā mapē"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Saglabāt pielāgotā mapē"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Izvades faila mape:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Izvēlieties mapi"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Iegūt faila nosaukumu no:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "oriģinālajiem faila tagiem"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "oriģinālā faila nosaukuma"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Neatmest faila paplašinājumu"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "Pievienot celiņa numuru pirms faila nosaukuma"
 
@@ -2174,6 +1152,14 @@
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Mono"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "MP3 konfigurācija"
@@ -2219,7 +1205,6 @@
 msgstr "Kļūdu aizsardzība"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Kvalitāte"
 
@@ -2327,11 +1312,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "Par Gnome īsceļu spraudni"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2345,58 +1330,22 @@
 "Autortiesības (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr "Atvērt failus"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 msgid "Add Files"
 msgstr "Pievienot failus"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 msgid "Audacious2"
 msgstr "Audacious2"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr "gnt saskarne"
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr "Nevar pāriet uz noteiktu laiku, ja nekas netiek atskaņots.\n"
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr "Pāriet uz laiku"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr "minūtes:sekundes"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr "Celiņa garums:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr "Kļūda rakstot repertuāru \"%s\": %s"
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-msgid "Export Playlist"
-msgstr "Eksportēt repertuāru"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-msgid "Import Playlist"
-msgstr "Importēt repertuāru"
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Ieraksta numurs"
@@ -2442,9 +1391,8 @@
 msgstr "Pielāgots nosaukums"
 
 #: src/gtkui/columns.c:39
-#, fuzzy
 msgid "Bitrate"
-msgstr "Bitātrums (kbps):"
+msgstr "Bitātrums"
 
 #: src/gtkui/columns.c:286
 msgid "Choose Columns"
@@ -2482,419 +1430,292 @@
 msgid "Disable"
 msgstr "Atslēgt"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr "GTK saskarne"
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr "Apturēt pēc pašreizējās dziesmas"
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr "Atkārtot"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr "Jaukt"
-
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr "Nevirzīties uz priekšu repertuārā"
-
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr "Rādīt infoapgabalu"
-
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr "Rādīt/slēpt infoapgabalu"
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr "Rādīt galveno izvēlni"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr "Rādīt/slēpt galveno izvēlni"
-
-#: src/gtkui/ui_manager.c:55
-msgid "Show statusbar"
-msgstr "Rādīt stāvokļjoslu"
-
-#: src/gtkui/ui_manager.c:56
-msgid "Show/hide statusbar"
-msgstr "Rādīt/slēpt stāvokļjoslu"
-
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
-msgstr "Rādīt kolonnu galvenes"
-
-#: src/gtkui/ui_manager.c:60
-#, fuzzy
-msgid "Scroll on Song Change"
-msgstr "Dziesmas maiņa"
-
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
-msgstr "Pauze"
-
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
-msgstr "Stop"
-
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
-msgstr "Iepriekšējais"
-
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
-msgstr "Nākamais"
-
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "Repertuārs"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "Jauns repertuārs"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "Dzēst repertuāru"
-
-#: src/gtkui/ui_manager.c:95
-msgid "Import Playlist ..."
-msgstr "Importēt repertuāru ..."
-
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr "Ielādē repertuāra failu izvēlētajā repertuārā."
-
-#: src/gtkui/ui_manager.c:98
-msgid "Export Playlist ..."
-msgstr "Eksportēt repertuāru ..."
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "Saglabā izvēlēto repertuāru."
-
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-msgid "Save All Playlists"
-msgstr "Saglabāt visus repertuārus"
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-"Saglabā visus atvērtos repertuārus. Ievēro, ka tas tiek izdarīts "
-"automātiski, izejot no Audacious."
-
-#: src/gtkui/ui_manager.c:106
-msgid "Refresh"
-msgstr "Atsvaidzināt"
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Atsvaidzina ar repertuāra ierakstu saistītos metadatus."
-
-#: src/gtkui/ui_manager.c:110
-msgid "Refresh Selected"
-msgstr "Atsvaidzināt iezīmētos"
-
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
-msgstr "Atsvaidzina ar izvēlēto repertuāra ierakstu saistītos metadatus."
-
-#: src/gtkui/ui_manager.c:115
-msgid "Playlist Manager"
-msgstr "Repertuāru pārvaldnieks"
-
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr "Atver repertuāru pārvaldnieku."
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr "Pievienot URL ..."
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr "Pievieno repertuāram attālinātu celiņu."
-
-#: src/gtkui/ui_manager.c:123
-msgid "Add Files ..."
-msgstr "Pievienot failus ..."
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr "Pievieno failus repertuāram."
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr "Izņemt visus"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr "Izņem no repertuāra visus ierakstus."
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr "Izņemt neiezīmētos"
-
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr "Izņem no repertuāra neiezīmētos ierakstus."
-
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr "Izņemt iezīmētos"
-
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr "Izņem no repertuāra iezīmētos ierakstus."
-
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
-msgstr "Rediģēt nosaukumu"
-
-#: src/gtkui/ui_manager.c:140
-#, fuzzy
-msgid "Edit the playlist title."
-msgstr "Rediģē repertuāra nosaukumu."
-
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
-msgstr "Izvēlēties kolonnas ..."
-
-#: src/gtkui/ui_manager.c:146
-msgid "Sort"
-msgstr "Kārtot"
-
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
-msgstr "Pēc celiņa numura"
-
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
-msgstr "Pēc nosaukuma"
-
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
-msgstr "Pēc izpildītāja"
-
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
-msgid "By Album"
-msgstr "Pēc albuma"
-
-#: src/gtkui/ui_manager.c:155
-msgid "By Release Date"
-msgstr "Pēc izlaiduma datuma"
-
-#: src/gtkui/ui_manager.c:157
-msgid "By File Path"
-msgstr "Pēc faila ceļa"
-
-#: src/gtkui/ui_manager.c:159
-msgid "By Formatted Title"
-msgstr "Pēc formatētā nosaukuma"
-
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
-msgstr "Apgrieztā kārtībā"
-
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
-msgstr "Nejaušā kārtībā"
-
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr "Izvade"
-
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "Efekti"
-
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
-msgstr "Balansieris"
-
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "Skatīt"
-
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
-msgstr "Saskarne"
-
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "Fails"
-
-#: src/gtkui/ui_manager.c:188
-msgid "Components"
-msgstr "Komponentes"
-
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr "Skatīt celiņa detaļas"
+#: src/gtkui/menus.c:132
+msgid "_Open Files ..."
+msgstr "Atvērt _failus ..."
+
+#: src/gtkui/menus.c:133
+msgid "Open _URL ..."
+msgstr "Atvērt _URL ..."
+
+#: src/gtkui/menus.c:134
+msgid "_Add File ..."
+msgstr "_Pievienot failus ..."
+
+#: src/gtkui/menus.c:135
+msgid "Add U_RL ..."
+msgstr "Pievienot U_RL ..."
+
+#: src/gtkui/menus.c:137
+msgid "A_bout ..."
+msgstr "_Par ..."
+
+#: src/gtkui/menus.c:138
+msgid "_Preferences ..."
+msgstr "_Iestatījumi ..."
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr "Skatīt celiņa detaļas"
-
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "Par Audacious"
-
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
-msgstr "Atvērt failus ..."
-
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
-msgstr "Ielādēt un atskaņot failu"
-
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
-msgstr "Atvērt URL ..."
-
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr "Atskaņot multitvides failu no izvēlētās vietas"
-
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "Spraudņu servisi"
-
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "Iestatījumi"
-
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr "Atver iestatījumu logu"
-
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
 msgid "_Quit"
 msgstr "I_ziet"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "Aizver Audacious"
-
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr "Uzstādīt A-B"
-
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr "Notīrīt A-B"
-
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr "Pāriet uz repertuāra sākumu"
-
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
-msgstr "Pāriet uz failu"
+#: src/gtkui/menus.c:142
+msgid "_Play"
+msgstr "A_tskaņot"
+
+#: src/gtkui/menus.c:143
+msgid "Paus_e"
+msgstr "Pauz_e"
+
+#: src/gtkui/menus.c:144
+msgid "_Stop"
+msgstr "_Stop"
+
+#: src/gtkui/menus.c:145
+msgid "Pre_vious"
+msgstr "_Iepriekšējais"
+
+#: src/gtkui/menus.c:146
+msgid "_Next"
+msgstr "_Nākamais"
+
+#: src/gtkui/menus.c:148
+msgid "_Repeat"
+msgstr "_Atkārtot"
+
+#: src/gtkui/menus.c:149
+msgid "S_huffle"
+msgstr "_Jaukt"
+
+#: src/gtkui/menus.c:150
+msgid "N_o Playlist Advance"
+msgstr "Ne_virzīties uz priekšu repertuārā"
+
+#: src/gtkui/menus.c:151
+msgid "Stop _After This Song"
+msgstr "Apt_urēt pēc pašreizējās dziesmas"
+
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
+msgstr "Dziesmas _info ..."
+
+#: src/gtkui/menus.c:154
+msgid "Jump to _Time ..."
+msgstr "Pāriet uz _laiku ..."
+
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
+msgstr "Pāriet uz _dziesmu ..."
+
+#: src/gtkui/menus.c:158
+msgid "By Track _Number"
+msgstr "Pēc celiņa _numura"
+
+#: src/gtkui/menus.c:159
+msgid "By _Title"
+msgstr "Pēc n_osaukuma"
+
+#: src/gtkui/menus.c:160
+msgid "By _Artist"
+msgstr "Pēc _izpildītāja"
+
+#: src/gtkui/menus.c:161
+msgid "By A_lbum"
+msgstr "Pēc a_lbuma"
+
+#: src/gtkui/menus.c:162
+msgid "By Release _Date"
+msgstr "Pēc izlaišanas _datuma"
+
+#: src/gtkui/menus.c:163
+msgid "By _File Path"
+msgstr "Pēc _faila ceļa"
+
+#: src/gtkui/menus.c:164
+msgid "By _Custom Title"
+msgstr "Pēc _pielāgota nosaukuma"
+
+#: src/gtkui/menus.c:166
+msgid "R_everse Order"
+msgstr "Apgri_eztā kārtībā"
+
+#: src/gtkui/menus.c:167
+msgid "_Random Order"
+msgstr "Nejaušā _kārtībā"
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr "Pārslēgt ierindošanau"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
+msgstr "A_tsvaidzināt"
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Ieslēdz/izslēdz repertuāra ieraksta ierindošanu."
+#: src/gtkui/menus.c:172
+msgid "_Sort"
+msgstr "_Kārtot"
+
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr "_Jauns"
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
-msgstr "Kopēt"
+#: src/gtkui/menus.c:175
+msgid "_Close"
+msgstr "Ai_zvērt"
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-msgid "Cut"
-msgstr "Izgriezt"
+#: src/gtkui/menus.c:177
+msgid "_Import ..."
+msgstr "_Importēt ..."
+
+#: src/gtkui/menus.c:178
+msgid "_Export ..."
+msgstr "_Eksportēt ..."
+
+#: src/gtkui/menus.c:180
+msgid "_Playlist Manager ..."
+msgstr "_Repertuāru pārvaldnieks ..."
+
+#: src/gtkui/menus.c:183
+msgid "Volume _Up"
+msgstr "_Palielināt skaļumu"
+
+#: src/gtkui/menus.c:184
+msgid "Volume _Down"
+msgstr "_Samazināt skaļumu"
+
+#: src/gtkui/menus.c:186
+msgid "_Equalizer"
+msgstr "_Balansieris"
+
+#: src/gtkui/menus.c:188
+msgid "E_ffects"
+msgstr "E_fekti"
+
+#: src/gtkui/menus.c:191
+msgid "_Interface"
+msgstr "S_askarne"
+
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
+msgstr "Rādīt _izvēlnes joslu"
+
+#: src/gtkui/menus.c:194
+msgid "Show I_nfo Bar"
+msgstr "Rādīt i_nfoapgabalu"
+
+#: src/gtkui/menus.c:195
+msgid "Show _Status Bar"
+msgstr "Rādīt _stāvokļjoslu"
+
+#: src/gtkui/menus.c:197
+msgid "Show Column _Headers"
+msgstr "Rādīt kolonnu _galvenes"
+
+#: src/gtkui/menus.c:198
+msgid "Choose _Columns ..."
+msgstr "Izvēlēties _kolonnas ..."
+
+#: src/gtkui/menus.c:199
+msgid "Scrol_l on Song Change"
+msgstr "Ritināt, _dziesmām mainoties"
+
+#: src/gtkui/menus.c:202
+msgid "_File"
+msgstr "_Fails"
+
+#: src/gtkui/menus.c:203
+msgid "_Playback"
+msgstr "_Atskaņošana"
+
+#: src/gtkui/menus.c:204
+msgid "P_laylist"
+msgstr "_Repertuārs"
+
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+msgid "_Services"
+msgstr "_Servisi"
+
+#: src/gtkui/menus.c:206
+msgid "_Output"
+msgstr "I_zvade"
+
+#: src/gtkui/menus.c:207
+msgid "_View"
+msgstr "S_kats"
+
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
+msgstr "Ie_rindot/Izņ. no rindas"
+
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
+msgstr "_Izgriezt"
+
+#: src/gtkui/menus.c:215
+msgid "_Copy"
+msgstr "_Kopēt"
+
+#: src/gtkui/menus.c:216
+msgid "_Paste"
+msgstr "I_elīmēt"
+
+#: src/gtkui/menus.c:217
+msgid "Select _All"
+msgstr "Iezīmēt _visu"
+
+#: src/gtkui/menus.c:222
+msgid "_Rename"
+msgstr "Pā_rdēvēt"
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
-msgstr "Ielīmēt"
-
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
-msgstr "Iezīmēt visus"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
+msgstr "GTK saskarne"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr "Iezīmē visus repertuāra ierakstus."
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr "Notīrīt iezīmējumu"
+#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+msgid "Audacious"
+msgstr "Audacious"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr "Noņem iezīmējumu no visiem ierakstiem."
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Kļūda"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.c:104
-#, fuzzy, c-format
+#: src/gtkui/ui_statusbar.c:106
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] "%d kanāli"
+msgstr[0] "%d kanāls"
 msgstr[1] "%d kanāli"
-msgstr[2] "%d kanāli"
+msgstr[2] "%d kanālu"
 
-#: src/gtkui/ui_statusbar.c:119
-#, fuzzy, c-format
+#: src/gtkui/ui_statusbar.c:121
+#, c-format
 msgid "%d kbps"
-msgstr "kbps"
+msgstr "%d kbps"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
 msgstr "Iepriekšējais celiņš"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Atskaņot"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr "Pauze/Atsākt"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Stop"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr "Nākamais celiņš"
@@ -2919,6 +1740,10 @@
 msgid "Volume Down"
 msgstr "Samazināt skaļumu"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr "Pāriet uz failu"
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr "Pārslēgt atskaņotāja logus"
@@ -2927,11 +1752,21 @@
 msgid "Show On-Screen-Display"
 msgstr "Parādīt uz-ekrāna-attēlu"
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "Atkārtot"
+
+#: src/hotkey/gui.c:85
+#, fuzzy
+msgid "Toggle Shuffle"
+msgstr "Jaukt"
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(nekas)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2942,15 +1777,15 @@
 "\n"
 "Vai vēlaties turpināt?"
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr "Piesaista peles pogas"
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Globālo īsinājumtaustiņu spraudņa konfigurācija"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2958,23 +1793,23 @@
 "Nospiediet taustiņu kombināciju teksta laukā.\n"
 "Jūs varat piesaistīt arī peles pogas."
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr "Īsinājumtaustiņi:"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr "Darbība:"
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr "Taustiņa piesaiste:"
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr "Par globālo īsinājumtaustiņu spraudni"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -3049,129 +1884,19 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "Par JACK izvades spraudni 0.17"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr "Šim LADSPA spraudnim nav lietotāja vadīklu"
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "Nosaukums"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "Instalētie spraudņi"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "Spraudņi, kas pašreiz darbojas"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "Pievienot"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "Izņemt"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "LADSPA spraudņu katalogs"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "Par LIRC Audacious spraudni"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "LIRC spraudnis "
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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"
-"vienkāršs spraudnis, kas ļauj jums kontrolēt\n"
-"Audacious, izmantojot LIRC attālinātās vadības dēmonu\n"
-"\n"
-"Piemērojis izmantošanai Audacious - Tony Vroon <chainsaw@gentoo.org>\n"
-"no XMMS LIRC spraudņa, kura autori ir:\n"
-"Carl van Schaik <carl@leg.uct.ac.za>\n"
-"Christoph Bartelmus <xmms@bartelmus.de>\n"
-"Andrew O. Shadoura <bugzilla@tut.by>\n"
-"Varat iegūt informāciju par LIRC:\n"
-"http://lirc.org"
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr "LIRC spraudņa iestatījumi"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr "Pieslēgties vēlreiz LIRC serverim"
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr "Noildze pirms atkārtotas pieslēgšanās (sekundes): "
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr "Pieslēgties vēlreiz"
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr "Pieslēgties"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: neizdevās inicializēt LIRC atbalstu\n"
+"Looking for lyrics..."
+msgstr ""
 
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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: neizdevās nolasīt LIRC konf. failu\n"
-"%s: lūdzu, lasiet LIRC dokumentācijā\n"
-"%s: kā izveidot pareizu konf. failu\n"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr "%s: mēģina pieslēgties vēlreiz...\n"
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: nezināma komanda \"%s\"\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: atvienots no LIRC\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
-msgstr "%s: tiks mēģināts pieslēgties vēlreiz katras %d sekundes...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
@@ -3179,11 +1904,11 @@
 "\n"
 "Dziesmas vārdi netika atrasti."
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "Par Metronom"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3197,262 +1922,41 @@
 "piem., tact://77 , lai atskaņotu 77 sitienus minūtē\n"
 "vai tact://60*3/4 , lai atskaņotu 60 sit./min. 3/4 taktīs"
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takts ģenerators: %d sit./min."
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takts ģenerators: %d sit./min. %d/%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "ModPlug konfigurācija"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 bit"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 bit"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr "Mono (lejupmiksēšana)"
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr "Tuvākais (ātrākais)"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "Lineārais (ātri)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr "Spline (laba kvalitāte)"
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr "8-tap Fir (ļoti augsta kvalitāte)"
-
-#: src/modplug/gui/interface.cxx:286
-msgid "96 kHz"
-msgstr "96 kHz"
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Iztveršanas temps"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "Ieslēgt"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "Dziļums"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "Aizture"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "Atbalss"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "Daudzums"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "Apgabals"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "Basu uzsvēršana"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Ieskaušana"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-"Piezīme: pārāk augsta\n"
-"priekšpastiprinājuma iestatīšana\n"
-"var izraisīt apgriešanu\n"
-"(kaitinošus klikšķus un paukšķus)!"
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "Priekšpastiprinājums"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "Lietot faila nosaukumu kā dziesmas nosaukumu"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "Ātrais repertuāra info"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "Trokšņu samazināšana"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Atskaņot Amiga MOD"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "Neciklot"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "Ciklot"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "reize(s)"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "Ciklot bezgalīgi"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "Ciklošanās"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "MOD info"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-"Faila nosaukums:\n"
-"Nosaukums:\n"
-"Tips:\n"
-"Garums:\n"
-"Ātrums:\n"
-"Temps:\n"
-"Paraugi:\n"
-"Instrumenti:\n"
-"Struktūras:\n"
-"Kanāli:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "Paraugi"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "Instrumenti"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "Ziņojums"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Audacious Modplug ievades spraudnis ver"
-
-#: src/modplug/gui/main.cxx:52
-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 skaņas dzinējs, autors Olivier Lapicque.\n"
-"Modplug XMMS saskarnes autors Kenton Varda.\n"
-"(c)2000 Olivier Lapicque un Kenton Varda.\n"
-"Atjauninājumi un uzturēšana - Konstanty Bialkowski.\n"
-"BMP porta autors Theofilos Intzoglou."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "Par Modplug"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Neizdevās atrast pikseļkartes failu: %s"
-
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr "Augšupielādēt izvēlēto celiņu(s)"
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr "Notiek augšupielāde..."
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr "MTP ierīces apstrādātājs"
-
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
-msgstr "Atvienot ierīci"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
+msgstr "Augšupielādēt uz MTP ierīci"
+
+#: src/mtp_up/mtp.c:311
+msgid "Disconnect MTP Device"
+msgstr "Atvienot MTP ierīci"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "Stop"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Audacious - redzamības brīdinājums"
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -3503,11 +2007,11 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr "Ieslēgt OSS programmatūras veiktās formāta pārveides."
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "Par OSS4 spraudni"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
@@ -3556,6 +2060,11 @@
 msgid "Default (%s)"
 msgstr "Noklusētais (%s)"
 
+#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Noklusētais"
+
 #: src/OSS/configure.c:187
 msgid "OSS Driver configuration"
 msgstr "OSS dziņa konfigurācija"
@@ -3626,11 +2135,11 @@
 "Ja tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Par Audacious PulseAudio izvades spraudni"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3684,27 +2193,27 @@
 msgid "Method:"
 msgstr "Metode:"
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 msgid "Change password"
 msgstr "Mainīt paroli"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Servisi"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Lietotājvārds:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Parole:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 msgid "Scrobbler URL:"
 msgstr "Scrobbler URL:"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3712,7 +2221,7 @@
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3724,15 +2233,15 @@
 "Oriģinālie izveidotāji: Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
 "com>\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "Par Scrobbler spraudni"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 msgid "About SDL Output Plugin"
 msgstr "Par SDL izvades spraudni"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 msgid "SDL error"
 msgstr "SDL kļūda"
 
@@ -3741,10 +2250,18 @@
 msgid "About %s"
 msgstr "Par %s"
 
-#: src/sid/xs_config.c:323
+#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
+msgid "Close"
+msgstr "Aizvērt"
+
+#: src/sid/xs_config.c:326
 msgid " Error"
 msgstr " Kļūda"
 
+#: src/sid/xs_config.c:326
+msgid "OK"
+msgstr "Labi"
+
 #: src/sid/xs_fileinfo.c:151
 msgid "General info"
 msgstr "Vispārējā informācija"
@@ -3754,6 +2271,11 @@
 msgid "Tune #%i: "
 msgstr "Melodija #%i: "
 
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Neizdevās atrast pikseļkartes failu: %s"
+
 #: src/sid/xs_interface.c:234
 msgid "Audacious-SID configuration"
 msgstr "Audacious-SID konfigurācija"
@@ -4067,15 +2589,15 @@
 msgid "Use"
 msgstr "Lietot"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Saglabāt"
 
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:435
+#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importēt"
 
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Dzēst"
 
@@ -4108,6 +2630,11 @@
 msgid "Playtime:"
 msgstr "Atskaņošanas ilgums:"
 
+#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
+#: src/sid/xs_interface.c:1155
+msgid "seconds"
+msgstr "sekundes"
+
 #: src/sid/xs_interface.c:928
 msgid "Minimum playtime:"
 msgstr "Minimālais atskaņošanas ilgums:"
@@ -4364,11 +2891,11 @@
 msgid "No"
 msgstr "Nē"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "Par apdarināto GLS"
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -4376,690 +2903,808 @@
 "Autortiesības (c) 2008, autors Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr "Apdarinātā saskarne"
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr "A_tskaņotājs:"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr "Izvēlieties galvenā atskaņotāja loga fontu:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "Re_pertuārs:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr "Izvēlieties repertuāra fontu:"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr "_Fonti"
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr "Lietot bitmap fontus, ja pieejami"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
-"Lietot bitmap fontus, ja tie ir pieejami. Bitmap fonti neatbalsta unikoda "
-"virknes."
-
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr "_Dažādi"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr "Rādīt atdalītājus repertuārā"
 
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr "Rādīt logu pārvaldnieka apdares"
-
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
 msgstr ""
-"Ieslēdziet šo, lai rādītu loga pārvaldnieka apdares atskaņotāja logiem."
 
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr "Lietot divvirzienu teksta ritinātāju"
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "_Apdare"
 
-#: src/skins/skins_cfg.c:330
-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 ""
-"Ja ieslēgts, faila informācijas teksts galvenajā logā ritināsies uz priekšu "
-"un atpakaļ. Ja izslēgts, teksta ritināšana notiks tikai vienā virzienā."
+#: src/skins/skins_cfg.c:393
+msgid "Interface Preferences"
+msgstr "Saskarnes iestatījumi"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr "Atslēgt iekļauto GTK tēmu"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Priekšpastiprinājums"
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
-msgstr "Nejauša apdare atskaņojot"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
-msgstr "Atļaut ielādēt nepilnīgas apdares"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Hz"
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
-msgstr ""
-"Ja atzīmēts, Audacious atļaus nepilnīgu apdaru ielādi. Izmantojiet tikai "
-"gadījumā, ja jūsu iecienītā apdare nestrādā."
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Hz"
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "Krāsu regulēšana"
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Hz"
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
-"Audacious atļauj jums mainīt lietotāja saskarnes apdaru krāsu balansu. Lai "
-"to darītu, lietojiet apakšā esošos slīdņus."
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Hz"
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "Zils"
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 kHz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "Zaļš"
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "Sarkans"
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 kHz"
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "_Apdare"
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 kHz"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr "Krāsu regulēšana ..."
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Audacious balansieris"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr "Gatavie regulējumi"
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "ieskaušana"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious - redzamības brīdinājums"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "Rādīt galveno atskaņotāja logu"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "Ignorēt"
-
-#: src/skins/ui_main.c:993
-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 startējās, visiem logiem esot slēptā stāvoklī.\n"
-"Jūs, iespējams, vēlaties logus atkal padarīt redzamus, lai kontrolētu "
-"Audacious. Ja nē, jums nāksies to kontrolēt attālināti ar 'audtool' vai "
-"spraudņu (piemēram, sistēmjoslas ikonas spraudņa) palīdzību."
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr "Vienmēr ignorēt, rādīt/slēpt tiek kontrolēts attālināti"
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious - salauzta GTK dzinēja izmantošanas brīdinājums"
-
-#: src/skins/ui_main.c:1052
+#: src/skins/ui_main.c:807
 #, c-format
-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>Tiek izmantots salauzts GTK dzinējs</big>\n"
-"\n"
-"Audacious atklāja, ka jūs izmantojat salauztu GTK dzinēju.\n"
-"\n"
-"Tēmu dzinējs, ko izmantojat, %s, nav savietojams ar dažām moderno "
-"spraudņu iespējām. Nesavietojamās iespējas šīs sesijas laikā ir atslēgtas.\n"
-"\n"
-"Lai izmantotu šīs iespējas, lūdzu, izmantojiet citu GTK tēmu dzinēju."
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Pāriet uz %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr "Vairs nerādīt šo brīdinājumu"
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-msgstr "Pārlekt uz:%d:%-2.2d/%d:%-2.2d (%d%%)"
-
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Skaļums: %d%%"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balanss: %d%% pa kreisi"
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balanss: centrs"
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balanss: %d%% pa labi"
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Iestatījumu izvēlne"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Izslēgt 'Vienmēr virspusē'"
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Ieslēgt 'Vienmēr virspusē'"
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Faila info lodziņš"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "Atslēgt 'GLS mērogošana'"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "Ieslēgt 'GLS mērogošana'"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Vizualizēšanas izvēlne"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr "Vieninstances režīms."
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 msgid "Playlist mode."
 msgstr "Repertuāra režīms."
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr "Aptur pēc pašreizējās dziesmas."
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr "Neaptur pēc pašreizējās dziesmas."
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr "Automātiski tīt dziesmas nosaukumu"
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Apturēt pēc pašreizējās dziesmas"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
 msgstr "Maksimumi"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Atkārtot"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Jaukt"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "Nevirzīties uz priekšu repertuārā"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr "Rādīt atskaņotāju"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr "Rādīt repertuāra redaktoru"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr "Rādīt balansieri"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr "Vienmēr virspusē"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr "Uzlikt uz visām darbvirsmām"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr "Saritināt atskaņotāju"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr "Saritināt repertuāra redaktoru"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr "Saritināt balansieri"
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "Mērogot"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr "Dubultizmērs"
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr "Vienkāršā pārvietošana"
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr "Analizators"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr "Loks"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr "Balss vizualizēšana"
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "Izslēgts"
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr "Normāls"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr "Uguns"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr "Vertikālas līnijas"
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr "Līnijas"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr "Joslas"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr "Punktēts loks"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr "Līnijveida loks"
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr "Aizpildīts loks"
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr "Ledus"
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr "Gluds"
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "Lēnākais"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "Lēni"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "Vidēji"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "Ātri"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "Ātrākais"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr "Pavadītais laiks"
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr "Atlikušais laiks"
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "Pauze"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "Iepriekšējais"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "Nākamais"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "Vizualizēšana"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr "Vizualizēšanas režīms"
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr "Analizatora režīms"
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr "Loka režīms"
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr "Balss vizualizēšanas režīms"
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr "Loga saritināšanas VU režīms"
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr "Analizatora krišana"
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr "Maksimumu krišana"
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Repertuārs"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Jauns repertuārs"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr "Iezīmēt nākamo repertuāru"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr "Iezīmēt iepriekšējo repertuāru"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Dzēst repertuāru"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "Importēt repertuāru"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Ielādē repertuāra failu izvēlētajā repertuārā."
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "Eksportēt repertuāru"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr "Saglabā izvēlēto repertuāru."
+
+#: src/skins/ui_manager.c:229
+msgid "Save All Playlists"
+msgstr "Saglabāt visus repertuārus"
+
+#: src/skins/ui_manager.c:230
+msgid ""
+"Saves all the playlists that are open. Note that this is done automatically "
+"when Audacious quits."
+msgstr ""
+"Saglabā visus atvērtos repertuārus. Ievēro, ka tas tiek izdarīts "
+"automātiski, izejot no Audacious."
+
+#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr "Atsvaidzināt repertuāru"
 
-#: src/skins/ui_manager.c:228
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Atsvaidzina ar repertuāra ierakstu saistītos metadatus."
+
+#: src/skins/ui_manager.c:238
 msgid "List Manager"
 msgstr "Repertuāru pārvaldnieks"
 
-#: src/skins/ui_manager.c:238
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr "Atver repertuāru pārvaldnieku."
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Skatīt"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "Saskarne"
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr "Saskarnes iestatījumi ..."
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr "Pievienot interneta adresi..."
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr "Pievieno repertuāram attālinātu celiņu."
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr "Pievienot failus..."
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr "Pievieno failus repertuāram."
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr "Meklēt un iezīmēt"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 "Meklē un atlasa repertuāra ierakstus, balstoties uz norādītajiem kritērijiem."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr "Apgriezt iezīmēto"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr "Invertē iezīmētos un neiezīmētos ierakstus."
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "Iezīmēt visus"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
+msgstr "Iezīmē visus repertuāra ierakstus."
+
+#: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr "Notīrīt iezīmējumu"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr "Noņem iezīmējumu no visiem ierakstiem."
+
+#: src/skins/ui_manager.c:277
+msgid "Remove All"
+msgstr "Izņemt visus"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr "Izņem no repertuāra visus ierakstus."
+
+#: src/skins/ui_manager.c:281
 msgid "Clear Queue"
 msgstr "Notīrīt ierindošanu"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr "Notīra ar šo repertuāru saistīto ierindošanu."
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "Izņemt nepieejamos failus"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr "Izņem no repertuāra nepieejamos failus."
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "Izņemt dublikātus"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "Pēc nosaukuma"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Izņem no repertuāra dublikātus pēc nosaukuma."
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "Pēc faila nosaukuma"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Izņem no repertuāra dublikātus pēc faila nosaukuma."
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "Pēc ceļa + faila nosaukuma"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Izņem no repertuāra dublikātus pēc to pilna ceļa."
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr "Izņemt neiezīmētos"
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr "Izņem no repertuāra neiezīmētos ierakstus."
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr "Izņemt iezīmētos"
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr "Izņem no repertuāra iezīmētos ierakstus."
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr "Sajaukt repertuāru"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr "Sajauc repertuāra ierakstu atskaņošanas kārtību."
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr "Apgriezt repertuāru"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr "Apgriež repertuāru."
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "Kārtot repertuāru"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr "Kārto repertuāru pēc nosaukuma."
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+msgid "By Album"
+msgstr "Pēc albuma"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr "Kārto sarakstu pēc albuma."
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "Pēc izpildītāja"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr "Kārto repertuāru pēc izpildītāja."
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr "Kārto repertuāru pēc faila nosaukuma."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr "Kārto repertuāru pēc pilnā ceļa."
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "Pēc datuma"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr "Kārto repertuāru pēc izmaiņas datuma."
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr "Pēc celiņa numura"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr "Kārto repertuāru pēc celiņa numura."
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr "Kārtot iezīmētos"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "Fails"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Palīdzība"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr "Spraudņu servisi"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr "Skatīt celiņa detaļas"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr "Skatīt celiņa detaļas"
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "Par Audacious"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "Atskaņot failu"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr "Ielādēt un atskaņot failu"
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "Atskaņot vietu"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr "Atskaņot multitvides failu no izvēlētās vietas"
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "Spraudņu servisi"
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "Iestatījumi"
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr "Atver iestatījumu logu"
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "Aizver Audacious"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr "Uzstādīt A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr "Notīrīt A-B"
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr "Pāriet uz repertuāra sākumu"
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr "Pāriet uz laiku"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr "Pārslēgt ierindošanau"
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Ieslēdz/izslēdz repertuāra ieraksta ierindošanu."
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr "Kopēt"
+
+#: src/skins/ui_manager.c:436
+msgid "Cut"
+msgstr "Izgriezt"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Ielīmēt"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Ielādēt"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Sākumuzstādījumi"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Ielādēt sākumuzstādījumu"
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Auto-ielādes sākumuzstādījums"
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Ielādē auto-ielādes sākumuzstādījumu"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Ielādēt noklusēto sākumuzstādījumu"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Nulle"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Uzstādīt balansiera sākumuzstādījumu līmeņus uz 0"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "No faila"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Ielādēt sākumuzstādījumu no faila"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "No WinAMP EQF faila"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Ielādēt sākumuzstādījumu no WinAMP EQF faila"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP sākumuzstādījumi"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importēt WinAMP sākumuzstādījumus"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Saglabāt sākumuzstādījumu"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Saglabāt auto-ielādes sākumuzstādījumu"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Saglabāt noklusēto sākumuzstādījumu"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Uz failu"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Saglabāt sākumuzstādījumu failā"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Uz WinAMP EQF failu"
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Saglabāt sākumuzstādījumu WinAMP EQF failā"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Dzēst sākumuzstādījumu"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Dzēst auto-ielādes sākumuzstādījumu"
 
-#: src/skins/ui_playlist.c:374
+#: 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:382
+#: 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 "
@@ -5070,104 +3715,52 @@
 "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:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Nosaukums: "
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Albums: "
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Izpildītājs: "
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Faila nosaukums: "
 
-#: src/skins/ui_playlist.c:419
+#: 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:422
+#: 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:425
+#: 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:776
-msgid "Save as Static Playlist"
-msgstr "Saglabāt kā statisko repertuāru"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr "Izmantot relatīvo ceļu"
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "Ielādēt repertuāru"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "Saglabāt repertuāru"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious repertuāra redaktors"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d of %d)"
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr "Arhivēta Winamp 2.x apdare"
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Atarhivēta Winamp 2.x apdare"
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Neizdevās izveidot mapi (%s): %s\n"
@@ -5215,55 +3808,62 @@
 "Ja tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "Par SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr "Skaļuma kor."
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "Īsa pārklāšanās"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "Ātrums"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "Augstums"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "Mērogot"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Opcijas"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - konfigurācija"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr "Komanda, ko palaist, kad Audacious sāk atskaņot jaunu dziesmu."
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "Komanda:"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr "Komanda, ko palaist dziesmas beigās."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Komanda, ko palaist, kad Audacious sasniedz repertuāra beigas."
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "Komanda, ko palaist, kad nomainās dziesmas nosaukums (piem., tīkla plūsmas)."
 
-#: src/song_change/song_change.c:479
-#, fuzzy
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -5285,19 +3885,19 @@
 "pirms komandas izsaukšanas tiks aizvietotas\n"
 "(ne visas ir derīgas repertuāra-beigas komandai).\n"
 "\n"
-"%F: Frekvence (hercos)\n"
-"%c: Kanālu skaits\n"
+"%F: frekvence (hercos)\n"
+"%c: kanālu skaits\n"
 "%f: faila nosaukums (pilns ceļš)\n"
 "%l: ilgums (milisekundēs)\n"
-"%n vai %s: Dziesmas nosaukums\n"
-"%r: Ātrums (bitos sekundē)\n"
-"%t: Repertuāra pozīcija (%02d)\n"
-"%p: Pašreiz atskaņo (1 vai 0)\n"
-"%a: Izpildītājs\n"
-"%b: Albums\n"
-"%r: Celiņa nosaukums"
+"%n vai %s: dziesmas nosaukums\n"
+"%r: ātrums (bitos sekundē)\n"
+"%t: repertuāra pozīcija (%02d)\n"
+"%p: pašreiz atskaņo (1 vai 0)\n"
+"%a: izpildītājs\n"
+"%b: albums\n"
+"%T: celiņa nosaukums"
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5305,18 +3905,14 @@
 "Parametrus, kuri tiek padoti čaulai, vajadzētu ietvert "
 "pēdiņās. Pretējā gadījumā rodas risks drošībai."
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "Komandas"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 msgid "Song Change"
 msgstr "Dziesmas maiņa"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "Spektra analizators"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "Par statusa ikonas spraudni"
@@ -5389,72 +3985,19 @@
 "\n"
 "Autors Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "Par Extra Stereo spraudni"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "Konfigurēt Extra Stereo"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-msgid "Search:"
-msgstr "Meklēt:"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr "Pievienot grāmatzīmi"
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-msgid "Stream name"
-msgstr "Plūsmas nosaukums"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr "Pašreiz atskaņo"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-msgid "Remove Bookmark"
-msgstr "Dzēst grāmatzīmi"
-
-#: src/streambrowser/streambrowser.c:340
-msgid "About Stream Browser"
-msgstr "Par plūsmu pārlūku"
-
-#: src/streambrowser/streambrowser.c:341
-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 ""
-"Autortiesības (c) 2008, Calin Crisan <ccrisan@gmail.com> un Audacious "
-"komanda.\n"
-"\n"
-"Šis ir vienkāršs plūsmu pārlūks, kurā ir iekļautas populārākās plūsmu "
-"mapes.\n"
-"Liels paldies Streamtuner izstrādātājiem <http://www.nongnu.org/"
-"streamtuner>,\n"
-"\tun, protams, visai Audacious kopienai.\n"
-"\n"
-"Paldies arī Tony Vroon par padomiem, vēlreiz.\n"
-"\n"
-"Šis bija Google Summer of Code 2008 projekts."
-
-#: src/tonegen/tonegen.c:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "Par toņa ģeneratoru"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5468,19 +4011,18 @@
 "Lai to izmantotu, ievadiet URL: tone://frekvence1;frekvence2;frekvence3;...\n"
 "piem., tone://2000;2005 , lai atskaņotu 2000Hz un 2005Hz toni"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "Toņa ģenerators: "
 
 #: src/unix-io/gtk.c:34
-#, fuzzy
 msgid "About File I/O Plugin"
-msgstr "Par OSS4 spraudni"
+msgstr "Par File I/O spraudni"
 
 #: src/vorbis/configure.c:31
 msgid "Override generic titles"
@@ -5494,15 +4036,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Ogg Vorbis tagi"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ogg Vorbis Audio spraudņa konfigurācija"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Par Ogg Vorbis Audio spraudni"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5577,9 +4119,1315 @@
 "Daļas spraudņa koda autors Miles Egan\n"
 "Apciemojiet Wavpack vietni http://www.wavpack.com/\n"
 
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "Lietot bitmap fontus, ja pieejami"
+
+#~ msgid ""
+#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
+#~ "Unicode strings."
+#~ msgstr ""
+#~ "Lietot bitmap fontus, ja tie ir pieejami. Bitmap fonti neatbalsta unikoda "
+#~ "virknes."
+
+#~ msgid "_Miscellaneous"
+#~ msgstr "_Dažādi"
+
+#~ msgid "Use two-way text scroller"
+#~ msgstr "Lietot divvirzienu teksta ritinātāju"
+
+#~ msgid "About "
+#~ msgstr "Par"
+
+#~ 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"
+#~ "Autortiesības (c) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
+#~ "\n"
+#~ "Šis spraudnis ir izlaists zem GNU LGPL nosacījumiem.\n"
+#~ "Detaļas skatīt http://www.gnu.org/licenses/lgpl.html\n"
+#~ "\n"
+#~ "Šis spraudnis izmanto AdPlug bibliotēku, autortiesības (C) Simon Peter u."
+#~ "c.\n"
+#~ "Saistītās AdPlug bibliotēkas versija: "
+
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AdPlug :: Konfigurācija"
+
+#~ msgid "Sound quality"
+#~ msgstr "Skaņas kvalitāte"
+
+#~ msgid "Resolution"
+#~ msgstr "Izšķirtspēja"
+
+#~ msgid "8bit"
+#~ msgstr "8bit"
+
+#~ msgid "16bit"
+#~ msgstr "16bit"
+
+#~ msgid "Channels"
+#~ msgstr "Kanāli"
+
+#~ 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 ""
+#~ "Ieslēgt stereo režīmu nav ieteicams, ja vien jums to nevajag. Tas "
+#~ "nepievienos skaņai stereo efektu (OPL2 ir tikai mono), bet patērēs vairāk "
+#~ "procesora resursu!"
+
+#~ msgid "Frequency"
+#~ msgstr "Frekvence"
+
+#~ msgid "Detect songend"
+#~ msgstr "Noteikt dziesmas beigas"
+
+#~ 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 ""
+#~ "Ja ieslēgts, XMMS noteiks dziesmas beigas, apturēs to un pavirzīsies uz "
+#~ "priekšu repertuārā. Ja izslēgts, XMMS neievēros dziesmas beigas un "
+#~ "atkārtos to."
+
+#~ msgid "Formats"
+#~ msgstr "Formāti"
+
+#~ msgid "Format selection"
+#~ msgstr "Formāta izvēle"
+
+#~ msgid "Format"
+#~ msgstr "Formāts"
+
+#~ msgid "Extension"
+#~ msgstr "Paplašinājums"
+
+#~ 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 ""
+#~ "Šis spraudnis atpazīs un atskaņos izvēlētos faila tipus. Neizvēlētie tipi "
+#~ "tiks ignorēti, lai atļautu tos atskaņot citiem spraudņiem."
+
+#~ msgid "AdPlug :: File Info"
+#~ msgstr "AdPlug :: Faila informācija"
+
+#~ msgid "Author: "
+#~ msgstr "Autors: "
+
+#~ msgid "File Type: "
+#~ msgstr "Faila tips: "
+
+#~ msgid "Subsongs: "
+#~ msgstr "Apakšdziesmas: "
+
+#~ msgid "Instruments: "
+#~ msgstr "Instrumenti: "
+
+#~ msgid "Orders: "
+#~ msgstr "Kārtības: "
+
+#~ msgid "Patterns: "
+#~ msgstr "Paraugi: "
+
+#~ msgid "Song"
+#~ msgstr "Dziesma"
+
+#~ msgid "Instrument name"
+#~ msgstr "Instrumenta nosaukums"
+
+#~ msgid "Song message"
+#~ msgstr "Dziesmas ziņojums"
+
+#~ msgid "Subsong selection"
+#~ msgstr "Apakšdziesmas izvēle"
+
+#~ msgid "Order: "
+#~ msgstr "Kārtība: "
+
+#~ msgid "Pattern: "
+#~ msgstr "Paraugs: "
+
+#~ msgid "Row: "
+#~ msgstr "Rinda: "
+
+#~ msgid "Speed: "
+#~ msgstr "Ātrums: "
+
+#~ msgid "Timer: "
+#~ msgstr "Taimeris: "
+
+#~ msgid "About XMMS Alarm"
+#~ msgstr "Par 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 ""
+#~ "XMMS spraudnis, kas var tikt izmantots,\n"
+#~ "lai sāktu atskaņošanu noteiktā laikā.\n"
+#~ "\n"
+#~ "Sūtiet visas sūdzības uz:\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 "Modinātājs"
+
+#~ msgid "This is your wakeup call."
+#~ msgstr "Šis ir jūsu mošanās zvans."
+
+#~ msgid "Select Playlist"
+#~ msgstr "Izvēlieties repertuāru"
+
+#~ msgid "Sorry"
+#~ msgstr "Atvainojiet"
+
+#~ msgid "Warning"
+#~ msgstr "Brīdinājums"
+
+#~ 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 ""
+#~ "Drošības dēļ \"kluss\" ilgumam jābūt vismaz par 65 sekundēm garākam nekā "
+#~ "izdzišanas ilgumam, tam jābūt arī garākam par 10 sekundēm. Būtībā tas "
+#~ "nozīmē, ka kodā ir kļūda un, līdz tiks atrasts risinājums, jums būs "
+#~ "jāredz šis ziņojums :)\n"
+#~ "\n"
+#~ "Jūsu izdzišanas ilguma iestatījumi NAV saglabāti\n"
+#~ "\n"
+#~ "--\n"
+#~ "Adam"
+
+#~ msgid "Oh Well"
+#~ msgstr "Nu, labi"
+
+#~ msgid "Alarm Settings"
+#~ msgstr "Modinātājs iestatījumi"
+
+#~ msgid "Time"
+#~ msgstr "Laiks"
+
+#~ msgid "hours"
+#~ msgstr "stundas"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "minutes"
+#~ msgstr "minūtes"
+
+#~ msgid "Quiet after:"
+#~ msgstr "Kluss pēc:"
+
+#~ msgid "Alarm at (default):"
+#~ msgstr "Modināt (noklusējums):"
+
+#~ msgid "Choose the days for the alarm to come on"
+#~ msgstr "Izvēlieties dienas, kurās ieslēgsies modinātājs"
+
+#~ msgid "Day"
+#~ msgstr "Diena"
+
+#~ msgid "Tuesday"
+#~ msgstr "Otrdiena"
+
+#~ msgid "Wednesday"
+#~ msgstr "Trešdiena"
+
+#~ msgid "Thursday"
+#~ msgstr "Ceturtdiena"
+
+#~ msgid "Friday"
+#~ msgstr "Piektdiena"
+
+#~ msgid "Saturday"
+#~ msgstr "Sestdiena"
+
+#~ msgid "Sunday"
+#~ msgstr "Svētdiena"
+
+#~ msgid "Monday"
+#~ msgstr "Pirmdiena"
+
+#~ msgid "Days"
+#~ msgstr "Dienas"
+
+#~ msgid "Fading"
+#~ msgstr "Izdzišana"
+
+#~ msgid "Volume"
+#~ msgstr "Skaļums"
+
+#~ msgid "Current"
+#~ msgstr "Pašreizējais"
+
+#~ msgid "reset to current output volume"
+#~ msgstr "Atstatīt uz pašreizējo izvades skaļumu"
+
+#~ msgid "Start at"
+#~ msgstr "Sākumā"
+
+#~ msgid "%"
+#~ msgstr "%"
+
+#~ msgid "Final"
+#~ msgstr "Beigās"
+
+#~ msgid "Additional Command"
+#~ msgstr "Papildu komanda"
+
+#~ msgid "enable"
+#~ msgstr "ieslēgt"
+
+#~ msgid "Playlist (optional)"
+#~ msgstr "Repertuārs (neobligāts)"
+
+#~ msgid "Browse..."
+#~ msgstr "Pārlūkot..."
+
+#~ msgid "Reminder"
+#~ msgstr "Atgādinājums"
+
+#~ msgid "Use reminder"
+#~ msgstr "Izmantot atgādinājumu"
+
+#~ msgid "What do these options mean?"
+#~ msgstr "Ko šīs opcijas nozīmē?"
+
+#~ 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"
+#~ "Laiks\n"
+#~ " Modināt: \n"
+#~ " Laiks, kad ieslēdzas modinātājs.\n"
+#~ "\n"
+#~ " Kluss pēc: \n"
+#~ " Izslēgt modinātāju pēc šī laika sprīža.\n"
+#~ " (ja netiek aizvērts pamošanās dialogs)\n"
+#~ "\n"
+#~ "\n"
+#~ "Dienas\n"
+#~ " Diena:\n"
+#~ " Izvēlieties dienas, kad modinātājam jāieslēdzas.\n"
+#~ "\n"
+#~ " Laiks:\n"
+#~ " Izvēlieties modināšanas laiku katrai dienai\n"
+#~ " vai arī atzīmējiet 'Noklusētais', lai izmantotu\n"
+#~ " noklusēto laiku.\n"
+#~ "\n"
+#~ "\n"
+#~ "Skaļums\n"
+#~ " Izdzišana:\n"
+#~ " Palielināt skaļumu līdz izvēlētajam līmenim\n"
+#~ " šajā laika brīdī.\n"
+#~ "\n"
+#~ " Sākt: \n"
+#~ " Sākt skaļuma palielināšanu no šī līmeņa.\n"
+#~ "\n"
+#~ " Beigt: \n"
+#~ " Līmenis, pie kura pārtraukt skaļuma palielināšanu.\n"
+#~ " Ja izdzišanas laiks ir 0, tad iestatīt skaļumu uz šo\n"
+#~ " līmeni un sākt atskaņošanu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Opcijas:\n"
+#~ " Papildu komanda:\n"
+#~ " Palaist šo komandu modinātāja palaišanas brīdī.\n"
+#~ "\n"
+#~ " Repertuārs: \n"
+#~ " Ielādēt repertuāru, no kura tiks atskaņotas dziesmas\n"
+#~ " (jābūt ar .m3u paplašinājumu). Ja tas netiek norādīts,\n"
+#~ " tiks izmantotas dziesmas no pašreizējā repertuāra.\n"
+#~ " Šeit var ievadīt arī mp3/ogg straumes URL, bet\n"
+#~ " repertuāru ielādēšanu no URL xmms pašreiz\n"
+#~ " neatbalsta.\n"
+#~ "\n"
+#~ " Atgādinājums:\n"
+#~ " Modinātājam izslēdzoties, parāda atgādinājumu.\n"
+#~ " Ievadiet atgādinājumu teksta laukā un ielieciet\n"
+#~ " ķeksīti blakus esošajā rūtī, ja vēlieties, lai tas tiktu\n"
+#~ " parādīts.\n"
+
+#~ msgid "Your reminder for today is.."
+#~ msgstr "Jūsu atgādinājums šodienai ir.."
+
+#~ msgid "Thankyou"
+#~ msgstr "Paldies"
+
+#~ msgid "Pairing request for '%s'"
+#~ msgstr "Pārošanas pieprasījums priekš '%s'"
+
+#~ msgid "Authorization request for %s"
+#~ msgstr "Autorizācijas pieprasījums priekš '%s'"
+
+#~ msgid "Created bonding with %s"
+#~ msgstr "Izveidots saite ar %s"
+
+#~ msgid "Removed bonding with %s"
+#~ msgstr "Atcelta saite ar %s"
+
+#~ msgid "Device has been switched off"
+#~ msgstr "Ierīce tika izslēgta"
+
+#~ msgid "Device has been made non-discoverable"
+#~ msgstr "Ierīce tika padarīta neatklājama"
+
+#~ msgid "Device has been made connectable"
+#~ msgstr "Ierīce tika padarīta savienojama"
+
+#~ msgid "Device has been made discoverable"
+#~ msgstr "Ierīce tika padarīta atklājama"
+
+#~ msgid "Device has been made limited discoverable"
+#~ msgstr "Ierīce tika padarīta ierobežoti atklājama"
+
+#~ msgid "Device has been switched into pairing mode"
+#~ msgstr "Ierīce tika pārslēgta pārošanas režīmā"
+
+#~ msgid "Bluetooth headset support plugin"
+#~ msgstr "Bluetooth austiņu atbalsta spraudnis"
+
+#~ 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 austiņu atbalsts\n"
+#~ "autortiesības (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
+#~ "Šis bija GSoC 2008 projekts - liels paldies manam padomdevējam Tony Vroon "
+#~ "un Audacious komandai\n"
+#~ "\n"
+#~ "Lai izmantotu AVRCP, kodolā jābūt ielādētam 'uinput' modulim\n"
+#~ "Austiņu taustiņi tiks atpazīti kā parasti multivides taustiņi\n"
+#~ "un var tikt konfigurēti, izmantojot Audacious globālo īsinājumtaustiņu "
+#~ "spraudni\n"
+#~ "vai citus jūsu logu pārvaldītāja rīkus\n"
+
+#~ msgid "Producer"
+#~ msgstr "Ražotājs"
+
+#~ msgid "Available Headsets"
+#~ msgstr "Pieejamās austiņas"
+
+#~ msgid "Current Headset"
+#~ msgstr "Pašreizējās austiņas"
+
+#~ msgid "_Connect"
+#~ msgstr "_Pievienot"
+
+#~ msgid "Class"
+#~ msgstr "Klase"
+
+#~ msgid "Address:"
+#~ msgstr "Adrese:"
+
+#~ msgid "Bonding finish!"
+#~ msgstr "Sasaiste pabeigta!"
+
+#~ msgid "No devices found!"
+#~ msgstr "Nav atrasta neviena ierīce!"
+
+#~ msgid "Scanning..."
+#~ msgstr "Skenē..."
+
+#~ msgid "Pairing..."
+#~ msgstr "Pāro..."
+
+#~ msgid "Rescan"
+#~ msgstr "Pārskenēt"
+
+#~ msgid "Playback->Play"
+#~ msgstr "Atskaņošana->Atskaņot"
+
+#~ msgid "Playback->Stop"
+#~ msgstr "Atskaņošana->Stop"
+
+#~ msgid "Playback->Pause"
+#~ msgstr "Atskaņošana->Pauze"
+
+#~ msgid "Playback->Prev"
+#~ msgstr "Atskaņošana->Iepriekšējā"
+
+#~ msgid "Playback->Next"
+#~ msgstr "Atskaņošana->Nākamā"
+
+#~ msgid "Playback->Eject"
+#~ msgstr "Atskaņošana->Izņemt"
+
+#~ msgid "Playlist->Repeat"
+#~ msgstr "Repertuārs->Atkārtot"
+
+#~ msgid "Playlist->Shuffle"
+#~ msgstr "Repertuārs->Sajaukt"
+
+#~ msgid "Volume->Up_5"
+#~ msgstr "Skaļums->Uz_augšu_5"
+
+#~ msgid "Volume->Down_5"
+#~ msgstr "Skaļums->Uz_leju_5"
+
+#~ msgid "Volume->Up_10"
+#~ msgstr "Skaļums->Uz_augšu_10"
+
+#~ msgid "Volume->Down_10"
+#~ msgstr "Skaļums->Uz_leju_10"
+
+#~ msgid "Volume->Mute"
+#~ msgstr "Skaļums->Apklusināt"
+
+#~ msgid "Window->Main"
+#~ msgstr "Logs->Galvenais"
+
+#~ msgid "Window->Playlist"
+#~ msgstr "Logs->Repertuārs"
+
+#~ msgid "Window->Equalizer"
+#~ msgstr "Logs->Balansieris"
+
+#~ msgid "Window->JumpToFile"
+#~ msgstr "Logs->PārietUzFailu"
+
+#~ 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 ""
+#~ "event-device-plugin: neizdevās atvērt ierīces failu %s , ierīce tika "
+#~ "izlaista; pārbaudiet, vai fails eksistē un vai jums ir lasīšanas atļauja "
+#~ "šim failam\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to create a io_channel for device file %s ,"
+#~ "skipping this device\n"
+#~ msgstr ""
+#~ "event-device-plugin: neizdevās izveidot io_channel ierīces failam %s , "
+#~ "ierīce tika izlaista\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to open /proc/bus/input/devices , automatic "
+#~ "detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: neizdevās atvērt /proc/bus/input/devices , "
+#~ "automātiskā notikumu ierīču atrašana nedarbosies.\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 ""
+#~ "event-device-plugin: neizdevās atvērt io_channel /proc/bus/input/ "
+#~ "ierīcēm , automātiskā notikumu ierīču atrašana nedarbosies.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: an error occurred while reading /proc/bus/input/"
+#~ "devices , automatic detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: kļūda lasot /proc/bus/input/ ierīces , automātiskā "
+#~ "notikumu ierīču atrašana nedarbosies.\n"
+
+#~ msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: ierīce %s nav atrasta iekš /dev/input , tā tiek\n"
+#~ "izlaista.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to load config file %s , default settings "
+#~ "will be used.\n"
+#~ msgstr ""
+#~ "event-device-plugin: neizdevās ielādēt konfigurācijas failu %s , tiks "
+#~ "izmantoti noklusētie iestatījumi.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: incomplete information in config file for device \"%s"
+#~ "\" , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: nepilnīga informācija konfigurācijas failā ierīcei "
+#~ "\"%s\", tā tiks izlaista.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_active value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurācija, neizdevās iegūt is_active vērtību "
+#~ "ierīcei \"%s\", tā tiks izlaista.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to access local directory %s , settings will "
+#~ "not be saved.\n"
+#~ msgstr ""
+#~ "event-device-plugin: neizdevās piekļūt vietējai mapei %s , iestatījumi "
+#~ "netiks saglabāti.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get filename value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurācija, neizdevās iegūt filename vērtību "
+#~ "ierīcei \"%s\", tā tiks izlaista.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get phys value for device "
+#~ "\"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurācija, neizdevās iegūt phys vērtību ierīcei "
+#~ "\"%s \", tā tiks izlaista.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_custom value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurācija, neizdevās iegūt is_custom vērtību "
+#~ "ierīcei \"%s\", tā tiks izlaista.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unexpected value for device \"%s\", "
+#~ "skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurācija, negaidīta vērtība ierīcei \"%s \", tā "
+#~ "tiks izlaista.\n"
+
+#~ msgid "Detected"
+#~ msgstr "Atrasts"
+
+#~ msgid "Custom"
+#~ msgstr "Pielāgots"
+
+#~ msgid "Not Detected"
+#~ msgstr "Nav atrasts"
+
+#~ msgid "Information"
+#~ msgstr "Informācija"
+
+#~ msgid ""
+#~ "Cannot open bindings window for a not-detected device.\n"
+#~ "Ensure that the device has been correctly plugged in."
+#~ msgstr ""
+#~ "Nevar atvērt piesaistu logu ierīcei, kas nav atrasta.\n"
+#~ "Pārliecinieties, ka ir pareizi pievienota."
+
+#~ msgid ""
+#~ "Unable to open selected device.\n"
+#~ "Please check read permissions on device file."
+#~ msgstr ""
+#~ "Neizdevās atvērt izvēlēto ierīci.\n"
+#~ "Lūdzu, pārbaudiet lasīšanas atļaujas ierīces failam."
+
+#~ msgid "EvDev-Plug - Add custom device"
+#~ msgstr "EvDev-Plug - Pievienot pielāgotu ierīci"
+
+#~ 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 mēģina automātiski atrast un atjaunot informāciju par "
+#~ "notikumu\n"
+#~ "ierīcēm, kas pieejamas jūsu sistēmā.\n"
+#~ "Tomēr, ja automātiskā atrašana jūsu sistēmā nedarbojas, vai arī notikumu\n"
+#~ "ierīces ir nestandarta vietā (pašreiz tās tiek meklētas tikai iekš /dev/"
+#~ "input/ ),\n"
+#~ "jūs varat pievienot pielāgotu ierīci, norādot tās nosaukumu un ierīces "
+#~ "failu."
+
+#~ msgid "Device name:"
+#~ msgstr "Ierīces nosaukums:"
+
+#~ msgid "Device file:"
+#~ msgstr "Ierīces fails:"
+
+#~ msgid "(custom)"
+#~ msgstr "(pielāgots)"
+
+#~ msgid ""
+#~ "Please specify both name and filename.\n"
+#~ "Filename must be specified with absolute path."
+#~ msgstr ""
+#~ "Lūdzu, norādiet gan nosaukumu, gan faila nosaukumu.\n"
+#~ "Faila nosaukumu jānorāda ar pilno ceļu."
+
+#~ msgid ""
+#~ "Do you want to remove the existing configuration for selected device?\n"
+#~ msgstr "Vai vēlaties dzēst pašreizējo konfigurāciju izvēlētajai ierīcei?\n"
+
+#~ msgid "Do you want to remove the selected custom device?\n"
+#~ msgstr "Vai vēlaties dzēst izvēlēto pielāgoto ierīci?\n"
+
+#~ msgid "EvDev-Plug - Configuration"
+#~ msgstr "EvDev-Plug - Konfigurācija"
+
+#~ msgid "Active"
+#~ msgstr "Aktīvs"
+
+#~ msgid "Status"
+#~ msgstr "Statuss"
+
+#~ msgid "Device Name"
+#~ msgstr "Ierīces nosaukums"
+
+#~ msgid "Device File"
+#~ msgstr "Ierīces fails"
+
+#~ msgid "Device Address"
+#~ msgstr "Ierīces adrese"
+
+#~ msgid "_Bindings"
+#~ msgstr "Pie_saistes"
+
+#~ 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 ""
+#~ "Nospiediet jūsu ierīces taustiņu, lai to piesaistītu;\n"
+#~ "ja pēc piecu sekunžu laikā netiks nospiests neviens\n"
+#~ "taustiņš, šis logs aizvērsies, neizmainot piesaistes."
+
+#~ 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 ""
+#~ "Šis ievades notikums jau ir piesaistīts.\n"
+#~ "\n"
+#~ "Nav iespējams piesaistīt vairākas darbības vienam ievades notikumam "
+#~ "(tomēr ir iespējams piesaistīt vienu darbību vairākiem notikumiem)."
+
+#~ msgid "EvDev-Plug - Bindings Configuration"
+#~ msgstr "EvDev-Plug - Piesaistu konfigurācija"
+
+#~ msgid "Name: "
+#~ msgstr "Nosaukums: "
+
+#~ msgid "Filename: "
+#~ msgstr "Faila nosaukums: "
+
+#~ msgid "Phys.Address: "
+#~ msgstr "Fiz. adrese: "
+
+#~ msgid "EvDev-Plug - about"
+#~ msgstr "EvDev-Plug - par"
+
+#~ 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"
+#~ "atskaņotāja tālvadība ar notikumu ierīcēm\n"
+#~ "http://www.develia.org/projects.php?p=audacious#evdevplug\n"
+#~ "\n"
+#~ "autors Giacomo Lozito\n"
+
+#~ msgid "This LADSPA plugin has no user controls"
+#~ msgstr "Šim LADSPA spraudnim nav lietotāja vadīklu"
+
+#~ msgid "Name"
+#~ msgstr "Nosaukums"
+
+#~ msgid "UID"
+#~ msgstr "UID"
+
+#~ msgid "Installed plugins"
+#~ msgstr "Instalētie spraudņi"
+
+#~ msgid "Running plugins"
+#~ msgstr "Spraudņi, kas pašreiz darbojas"
+
+#~ msgid "Add"
+#~ msgstr "Pievienot"
+
+#~ msgid "Remove"
+#~ msgstr "Izņemt"
+
+#~ msgid "LADSPA Plugin Catalog"
+#~ msgstr "LADSPA spraudņu katalogs"
+
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "Par LIRC Audacious spraudni"
+
+#~ msgid "LIRC Plugin "
+#~ msgstr "LIRC spraudnis "
+
+#~ 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"
+#~ "vienkāršs spraudnis, kas ļauj jums kontrolēt\n"
+#~ "Audacious, izmantojot LIRC attālinātās vadības dēmonu\n"
+#~ "\n"
+#~ "Piemērojis izmantošanai Audacious - Tony Vroon <chainsaw@gentoo.org>\n"
+#~ "no XMMS LIRC spraudņa, kura autori ir:\n"
+#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
+#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
+#~ "Andrew O. Shadoura <bugzilla@tut.by>\n"
+#~ "Varat iegūt informāciju par LIRC:\n"
+#~ "http://lirc.org"
+
+#~ msgid "LIRC plugin settings"
+#~ msgstr "LIRC spraudņa iestatījumi"
+
+#~ msgid "Reconnect to LIRC server"
+#~ msgstr "Pieslēgties vēlreiz LIRC serverim"
+
+#~ msgid "Timeout before reconnecting (seconds): "
+#~ msgstr "Noildze pirms atkārtotas pieslēgšanās (sekundes): "
+
+#~ msgid "Reconnect"
+#~ msgstr "Pieslēgties vēlreiz"
+
+#~ msgid "Connection"
+#~ msgstr "Pieslēgties"
+
+#~ msgid "%s: could not init LIRC support\n"
+#~ msgstr "%s: neizdevās inicializēt LIRC atbalstu\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: neizdevās nolasīt LIRC konf. failu\n"
+#~ "%s: lūdzu, lasiet LIRC dokumentācijā\n"
+#~ "%s: kā izveidot pareizu konf. failu\n"
+
+#~ msgid "%s: trying to reconnect...\n"
+#~ msgstr "%s: mēģina pieslēgties vēlreiz...\n"
+
+#~ msgid "%s: unknown command \"%s\"\n"
+#~ msgstr "%s: nezināma komanda \"%s\"\n"
+
+#~ msgid "%s: disconnected from LIRC\n"
+#~ msgstr "%s: atvienots no LIRC\n"
+
+#~ msgid "%s: will try reconnect every %d seconds...\n"
+#~ msgstr "%s: tiks mēģināts pieslēgties vēlreiz katras %d sekundes...\n"
+
+#~ msgid "ModPlug Configuration"
+#~ msgstr "ModPlug konfigurācija"
+
+#~ msgid "16 bit"
+#~ msgstr "16 bit"
+
+#~ msgid "8 bit"
+#~ msgstr "8 bit"
+
+#~ msgid "Mono (downmix)"
+#~ msgstr "Mono (lejupmiksēšana)"
+
+#~ msgid "Nearest (fastest)"
+#~ msgstr "Tuvākais (ātrākais)"
+
+#~ msgid "Linear (fast)"
+#~ msgstr "Lineārais (ātri)"
+
+#~ msgid "Spline (good quality)"
+#~ msgstr "Spline (laba kvalitāte)"
+
+#~ msgid "8-tap Fir (extremely high quality)"
+#~ msgstr "8-tap Fir (ļoti augsta kvalitāte)"
+
+#~ 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 "Iztveršanas temps"
+
+#~ msgid "Enable"
+#~ msgstr "Ieslēgt"
+
+#~ msgid "Depth"
+#~ msgstr "Dziļums"
+
+#~ msgid "Delay"
+#~ msgstr "Aizture"
+
+#~ msgid "Reverb"
+#~ msgstr "Atbalss"
+
+#~ msgid "Amount"
+#~ msgstr "Daudzums"
+
+#~ msgid "Range"
+#~ msgstr "Apgabals"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Basu uzsvēršana"
+
+#~ msgid ""
+#~ "Note: Setting the preamp\n"
+#~ "too high may cause clipping\n"
+#~ "(annoying clicks and pops)!"
+#~ msgstr ""
+#~ "Piezīme: pārāk augsta\n"
+#~ "priekšpastiprinājuma iestatīšana\n"
+#~ "var izraisīt apgriešanu\n"
+#~ "(kaitinošus klikšķus un paukšķus)!"
+
+#~ msgid "Effects"
+#~ msgstr "Efekti"
+
+#~ msgid "Use Filename as Song Title"
+#~ msgstr "Lietot faila nosaukumu kā dziesmas nosaukumu"
+
+#~ msgid "Fast Playlist Info"
+#~ msgstr "Ātrais repertuāra info"
+
+#~ msgid "Noise Reduction"
+#~ msgstr "Trokšņu samazināšana"
+
+#~ msgid "Play Amiga MOD"
+#~ msgstr "Atskaņot Amiga MOD"
+
+#~ msgid "Don't loop"
+#~ msgstr "Neciklot"
+
+#~ msgid "Loop"
+#~ msgstr "Ciklot"
+
+#~ msgid "time(s)"
+#~ msgstr "reize(s)"
+
+#~ msgid "Loop forever"
+#~ msgstr "Ciklot bezgalīgi"
+
+#~ msgid "Looping"
+#~ msgstr "Ciklošanās"
+
+#~ msgid "MOD Info"
+#~ msgstr "MOD info"
+
+#~ msgid ""
+#~ "Filename:\n"
+#~ "Title:\n"
+#~ "Type:\n"
+#~ "Length:\n"
+#~ "Speed:\n"
+#~ "Tempo:\n"
+#~ "Samples:\n"
+#~ "Instruments:\n"
+#~ "Patterns:\n"
+#~ "Channels:"
+#~ msgstr ""
+#~ "Faila nosaukums:\n"
+#~ "Nosaukums:\n"
+#~ "Tips:\n"
+#~ "Garums:\n"
+#~ "Ātrums:\n"
+#~ "Temps:\n"
+#~ "Paraugi:\n"
+#~ "Instrumenti:\n"
+#~ "Struktūras:\n"
+#~ "Kanāli:"
+
+#~ msgid ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+#~ msgstr ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+
+#~ msgid "Samples"
+#~ msgstr "Paraugi"
+
+#~ msgid "Instruments"
+#~ msgstr "Instrumenti"
+
+#~ msgid "Message"
+#~ msgstr "Ziņojums"
+
+#~ msgid "Modplug Input Plugin for Audacious ver"
+#~ msgstr "Audacious Modplug ievades spraudnis ver"
+
+#~ 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 skaņas dzinējs, autors Olivier Lapicque.\n"
+#~ "Modplug XMMS saskarnes autors Kenton Varda.\n"
+#~ "(c)2000 Olivier Lapicque un Kenton Varda.\n"
+#~ "Atjauninājumi un uzturēšana - Konstanty Bialkowski.\n"
+#~ "BMP porta autors Theofilos Intzoglou."
+
+#~ msgid "About Modplug"
+#~ msgstr "Par Modplug"
+
+#~ msgid "Show separators in playlist"
+#~ msgstr "Rādīt atdalītājus repertuārā"
+
+#~ msgid "Show window manager decoration"
+#~ msgstr "Rādīt logu pārvaldnieka apdares"
+
+#~ msgid "This enables the window manager to show decorations for windows."
+#~ msgstr ""
+#~ "Ieslēdziet šo, lai rādītu loga pārvaldnieka apdares atskaņotāja logiem."
+
+#~ 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 ""
+#~ "Ja ieslēgts, faila informācijas teksts galvenajā logā ritināsies uz "
+#~ "priekšu un atpakaļ. Ja izslēgts, teksta ritināšana notiks tikai vienā "
+#~ "virzienā."
+
+#~ msgid "Disable inline gtk theme"
+#~ msgstr "Atslēgt iekļauto GTK tēmu"
+
+#~ msgid "Random skin on play"
+#~ msgstr "Nejauša apdare atskaņojot"
+
+#~ msgid "Allow loading incomplete skins"
+#~ msgstr "Atļaut ielādēt nepilnīgas apdares"
+
+#~ msgid ""
+#~ "If selected, audacious won't refuse loading broken skins. Use only if "
+#~ "your favourite skin doesn't work"
+#~ msgstr ""
+#~ "Ja atzīmēts, Audacious atļaus nepilnīgu apdaru ielādi. Izmantojiet tikai "
+#~ "gadījumā, ja jūsu iecienītā apdare nestrādā."
+
+#~ msgid "Color Adjustment"
+#~ msgstr "Krāsu regulēšana"
+
+#~ msgid ""
+#~ "Audacious allows you to alter the color balance of the skinned UI. The "
+#~ "sliders below will allow you to do this."
+#~ msgstr ""
+#~ "Audacious atļauj jums mainīt lietotāja saskarnes apdaru krāsu balansu. "
+#~ "Lai to darītu, lietojiet apakšā esošos slīdņus."
+
+#~ msgid "Blue"
+#~ msgstr "Zils"
+
+#~ msgid "Green"
+#~ msgstr "Zaļš"
+
+#~ msgid "Red"
+#~ msgstr "Sarkans"
+
+#~ msgid "Color adjustment ..."
+#~ msgstr "Krāsu regulēšana ..."
+
+#~ msgid "Disable 'GUI Scaling'"
+#~ msgstr "Atslēgt 'GLS mērogošana'"
+
+#~ msgid "Enable 'GUI Scaling'"
+#~ msgstr "Ieslēgt 'GLS mērogošana'"
+
+#~ msgid "DoubleSize"
+#~ msgstr "Dubultizmērs"
+
+#~ msgid "Easy Move"
+#~ msgstr "Vienkāršā pārvietošana"
+
+#~ msgid "Spectrum Analyzer"
+#~ msgstr "Spektra analizators"
+
+#~ msgid "Search:"
+#~ msgstr "Meklēt:"
+
+#~ msgid "Add Bookmark"
+#~ msgstr "Pievienot grāmatzīmi"
+
+#~ msgid "Stream name"
+#~ msgstr "Plūsmas nosaukums"
+
+#~ msgid "Now playing"
+#~ msgstr "Pašreiz atskaņo"
+
+#~ msgid "Remove Bookmark"
+#~ msgstr "Dzēst grāmatzīmi"
+
+#~ msgid "About Stream Browser"
+#~ msgstr "Par plūsmu pārlūku"
+
+#~ 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 ""
+#~ "Autortiesības (c) 2008, Calin Crisan <ccrisan@gmail.com> un Audacious "
+#~ "komanda.\n"
+#~ "\n"
+#~ "Šis ir vienkāršs plūsmu pārlūks, kurā ir iekļautas populārākās plūsmu "
+#~ "mapes.\n"
+#~ "Liels paldies Streamtuner izstrādātājiem <http://www.nongnu.org/"
+#~ "streamtuner>,\n"
+#~ "\tun, protams, visai Audacious kopienai.\n"
+#~ "\n"
+#~ "Paldies arī Tony Vroon par padomiem, vēlreiz.\n"
+#~ "\n"
+#~ "Šis bija Google Summer of Code 2008 projekts."
+
+#~ msgid "Can't jump to time when no track is being played.\n"
+#~ msgstr "Nevar pāriet uz noteiktu laiku, ja nekas netiek atskaņots.\n"
+
+#~ msgid "minutes:seconds"
+#~ msgstr "minūtes:sekundes"
+
+#~ msgid "Track length:"
+#~ msgstr "Celiņa garums:"
+
+#~ msgid "Error writing playlist \"%s\": %s"
+#~ msgstr "Kļūda rakstot repertuāru \"%s\": %s"
+
 #~ msgid "%s already exist. Continue?"
 #~ msgstr "%s jau pastāv. Turpināt?"
 
+#~ msgid "Show/hide infoarea"
+#~ msgstr "Rādīt/slēpt infoapgabalu"
+
+#~ msgid "Show main menu"
+#~ msgstr "Rādīt galveno izvēlni"
+
+#~ msgid "Show/hide main menu"
+#~ msgstr "Rādīt/slēpt galveno izvēlni"
+
+#~ msgid "Show/hide statusbar"
+#~ msgstr "Rādīt/slēpt stāvokļjoslu"
+
+#~ msgid "Import Playlist ..."
+#~ msgstr "Importēt repertuāru ..."
+
+#~ msgid "Export Playlist ..."
+#~ msgstr "Eksportēt repertuāru ..."
+
+#~ msgid "Refresh"
+#~ msgstr "Atsvaidzināt"
+
+#~ msgid "Refresh Selected"
+#~ msgstr "Atsvaidzināt iezīmētos"
+
+#~ msgid "Refreshes metadata associated with selected entries."
+#~ msgstr "Atsvaidzina ar izvēlēto repertuāra ierakstu saistītos metadatus."
+
+#~ msgid "Edit title"
+#~ msgstr "Rediģēt nosaukumu"
+
+#, fuzzy
+#~ msgid "Edit the playlist title."
+#~ msgstr "Rediģē repertuāra nosaukumu."
+
+#~ msgid "By Formatted Title"
+#~ msgstr "Pēc formatētā nosaukuma"
+
+#~ msgid "Components"
+#~ msgstr "Komponentes"
+
+#~ msgid "Upload selected track(s)"
+#~ msgstr "Augšupielādēt izvēlēto celiņu(s)"
+
+#~ msgid "MTP device handler"
+#~ msgstr "MTP ierīces apstrādātājs"
+
+#~ msgid "Show main player window"
+#~ msgstr "Rādīt galveno atskaņotāja logu"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorēt"
+
+#~ 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 startējās, visiem logiem esot slēptā stāvoklī.\n"
+#~ "Jūs, iespējams, vēlaties logus atkal padarīt redzamus, lai kontrolētu "
+#~ "Audacious. Ja nē, jums nāksies to kontrolēt attālināti ar 'audtool' vai "
+#~ "spraudņu (piemēram, sistēmjoslas ikonas spraudņa) palīdzību."
+
+#~ msgid "Always ignore, show/hide is controlled remotely"
+#~ msgstr "Vienmēr ignorēt, rādīt/slēpt tiek kontrolēts attālināti"
+
+#~ msgid "Audacious - broken GTK engine usage warning"
+#~ msgstr "Audacious - salauzta GTK dzinēja izmantošanas brīdinājums"
+
+#~ 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>Tiek izmantots salauzts GTK dzinējs</big>\n"
+#~ "\n"
+#~ "Audacious atklāja, ka jūs izmantojat salauztu GTK dzinēju.\n"
+#~ "\n"
+#~ "Tēmu dzinējs, ko izmantojat, %s, nav savietojams ar dažām moderno "
+#~ "spraudņu iespējām. Nesavietojamās iespējas šīs sesijas laikā ir "
+#~ "atslēgtas.\n"
+#~ "\n"
+#~ "Lai izmantotu šīs iespējas, lūdzu, izmantojiet citu GTK tēmu dzinēju."
+
+#~ msgid "Do not display this warning again"
+#~ msgstr "Vairs nerādīt šo brīdinājumu"
+
+#~ msgid "Save as Static Playlist"
+#~ msgstr "Saglabāt kā statisko repertuāru"
+
+#~ msgid "Use Relative Path"
+#~ msgstr "Izmantot relatīvo ceļu"
+
+#~ msgid "Load Playlist"
+#~ msgstr "Ielādēt repertuāru"
+
+#~ msgid "Save Playlist"
+#~ msgstr "Saglabāt repertuāru"
+
+#~ msgid "Skinned Interface"
+#~ msgstr "Apdarinātā saskarne"
+
 #~ msgid "%s: %d kbps, %d Hz, %s"
 #~ msgstr "%s: %d kbps, %d Hz, %s"
 
@@ -6961,9 +6809,6 @@
 #~ msgid "Entries"
 #~ msgstr "Ieraksti"
 
-#~ msgid "_Rename"
-#~ msgstr "Pā_rdēvēt"
-
 #~ msgid "About Icecast-Plugin"
 #~ msgstr "Par Icecast spraudni"

audacious-plugins-2.5.3.tar.gz/po/pl.po -> audacious-plugins-3.0.tar.gz/po/pl.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-05-23 08:33-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2011-05-22 12:08+0200\n"
 "Last-Translator: Szymon Weihs <sz.weihs@gmail.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -28,608 +28,47 @@
 "Dekoder FAAD2 AAC/HE-AAC/HE-AACv2/DRM (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Zespół Audacious"
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "O wtyczce dekodera MP4 AAC"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "O programie"
-
-#: src/adplug/adplug-xmms.cc:155
-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"
-"Ta wtyczka została wydana na zasadach licencji GNU LGPL.\n"
-"Zobacz http://www.gnu.org/licenses/lgpl.html .\n"
-"\n"
-"Ten plugin używa biblioteki AdPlug - Copyright (C) Simon Peter, et al.\n"
-"Podłączona wersja biblioteki AdPlug: "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: Konfiguracja"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "Ok"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "Ogólne"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Jakość dźwięku"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Rozdzielczość"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8bit"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16bit"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Kanały"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Stereo"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-"Nie należy wybierać opcji Stereo, jeśli nie jest to konieczne. Nie poprawi "
-"to wcale jakości dźwięku - OPL2 obsługuje tylko mono - ale będzie zużywac "
-"większą ilość mocy obliczeniowej procesora!"
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Częstotliwość"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Odtwarzanie"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Wykryj koniec utworu"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-"Gdy włączone, XMMS wykrywa koniec utworu, zatrzymuje go i przeskakuje do "
-"następnego na liście. Gdy wyłączone, XMMS nie rozpoznaje zakończenia utworu "
-"i powtarza go w nieskończoność."
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Formaty"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Wybór formatu"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Format"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Rozszerzenie"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-"Wybrane typy plików zostaną rozpoznane i odtworzone przy pomocy tej wtyczki. "
-"Odznaczone formaty zostaną zignorowane, aby umożliwić innym pluginom ich "
-"odtworzenie."
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: Informacja o pliku"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Nazwa pliku"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Tytuł: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Autor: "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Typ pliku: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "Teksty: "
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Instrumenty: "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "Kolejność: "
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Wzory: "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Utwór"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Nazwa instrumentu"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Informacja"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "Wybór tekstu"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Kolejność: "
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Wzór: "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Linia: "
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Szybkość: "
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Czas: "
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "O wtyczce Alarm XMMS"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "Alarm XMMS"
-
-#: src/alarm/interface.c:56
-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 ""
-"Wtyczka XMMS, która może zostać użyta\n"
-"do rozpoczęcia odtwarzania o określonej porze.\n"
-"\n"
-"Wszelkie uwagi należy zgłaszać do:\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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Zamknij"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Budzik"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "To jest twój sygnał budzenia."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Wybierz listę odtwarzania"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Przepraszam"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#: src/alarm/interface.c:213
-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 powodów bezpieczeństwa czas \"ciszy\" powinien być przynajmniej o 65 "
-"sekund dłuższy od czasu wyciszania, musi być także dłuższy niż 10 sekund. "
-"Jest to spowodowane bugiem w kodzie wtyczki, więc do czasu jego naprawienia "
-"będzie pojawiał się ten komunikat :)\n"
-"Twoje ustawienia wyciszania NIE zostały zapisane\n"
-"\n"
-"--\n"
-"Adam"
-
-#: src/alarm/interface.c:229
-msgid "Oh Well"
-msgstr "No dobrze... :)"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Ustawienia budzika"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Czas"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "godziny"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "minuty"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Wycisz po:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Alarm o (domyślnie):"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Wybierz dni, w których budzik zostanie uruchomiony"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Domyślnie"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Dzień"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Wtorek"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Środa"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Czwartek"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Piątek"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Sobota"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Niedziela"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Poniedziałek"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Dni"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Czas przejścia"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "sekundy"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Głośność"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Aktualny"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "zresetuj do bieżącej głośności wyjścia"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Rozpocznij od"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Końcowa głośność"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Dodatkowe komendy"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "włącz"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Playlista (opcjonalnie)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Przeglądaj..."
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Przypominacz"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Użyj przypominacza"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Opcje"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Co oznaczają te opcje?"
-
-#: src/alarm/interface.c:1364
-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"
-"Czas\n"
-" Alarm o: \n"
-" Określ godzinę budzenia.\n"
-"\n"
-" Wycisz po: \n"
-" Zatrzymaj budzik po upływie określonego czasu .\n"
-" (jeśli okienko informacyjne nie zostanie wcześniej zamknięte)\n"
-"\n"
-"\n"
-"Dni\n"
-" Dzień:\n"
-" Wybierz dni, w których budzik zostanie włączony.\n"
-"\n"
-" Czas:\n"
-" Wybierz czas dla budzika każdego dnia,\n"
-" albo ustaw opcję domyślną.\n"
-"\n"
-"\n"
-"Głośność\n"
-" Czas przejścia: \n"
-" Ustaw czas, przez który nastąpi zwiększenie głośności \n"
-" do wybranej wartości.\n"
-"\n"
-" Rozpocznij od: \n"
-" Rozpocznij zwiększanie od tej głośności.\n"
-"\n"
-" Końcowa głośność: \n"
-" Maksymalna głośność dla budzika. Jeśli czas przejścia\n"
-" ustawiony jest na 0, to wtedy następuje natychmiastowe\n"
-" ustawienie tej głośności i rozpoczęcie odtwarzania.\n"
-"\n"
-"\n"
-"Opcje:\n"
-" Dodatkowe komendy:\n"
-" Uruchom wybrane programy/skrypty przy budzeniu.\n"
-"\n"
-" Playlista: \n"
-" Załaduj wybraną listę odtwarzania \n"
-" (musi mieć rozszerzenie .m3u). Jeśli nie wybrano\n"
-" playlisty, to zostaną użyte utwory znajdujące się\n"
-" w danej chwili na liście.\n"
-" Adres URL strumienia mp3/ogg może również zostać\n"
-" tutaj użyty, ale ładowanie playlist z adresów\n"
-" URL nie jest na razie wspierane przez xmms.\n"
-"\n"
-" Przypominacz:\n"
-" Wyświetl powiadomienie, gdy budzik zostanie wyłączony.\n"
-" Wpisz w podane pole treść komunkatu i zaznacz odpowiednią\n"
-" opcję, jeśli chcesz, aby było ono pokazywane..\n"
-
-#: src/alarm/interface.c:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Pomoc"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "Powiadomienie na dzisiaj to..."
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Dziękuję"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Domyślne urządzenie PCM"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 msgid "Default mixer device"
 msgstr "Domyślne urządzenie miksera"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 msgid "ALSA Output Plugin Preferences"
 msgstr "Preferencje wtyczki wyjściowej ALSA"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 msgid "PCM device:"
 msgstr "Urządzenie PCM:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Urządzenie miksera:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 msgid "Mixer element:"
 msgstr "Element miksera:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr "Obejście rozłączania"
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
 msgstr "O wtyczce wyjściowej ALSA"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr "Błąd ALSA"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -797,6 +236,10 @@
 msgid "SoundFont settings"
 msgstr "Ustawienia SoundFont"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Nazwa pliku"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Wielkość (w bajtach)"
@@ -903,8 +346,7 @@
 "Backend\n"
 "TiMidity"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Nazwa:"
 
@@ -1076,119 +518,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Wyświetla OSD, gdy odtwarzanie zostanie wznowione."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Rozmieszczenie"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "Przesunięcie wzdłuż osi X:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Przesunięcie wzdłuż osi Y:"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "Maksymalna szerokość OSD:"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Ustawienia wielu monitorów"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "Wyświetl OSD używając:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "wszystkie"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Czas (ms)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "Wyświetlanie:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "Pojawianie:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "Zanikanie:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "Czcionka %i:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Cień"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Języki"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "Wyłącz konwersję tekstu na UTF-8 (w aosd)"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "Wybierz plik skórki"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Renderuj styl"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "Kolor %i:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "Własna skórka"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "Plik skórki:"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Uruchom ten wyzwalacz"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Zdarzenia"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "Wykryto menedżer okien obsługujący przezroczystość"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1198,73 +640,73 @@
 "Aby OSD działał teraz prawidłowo, należy uruchomić menedżer okien "
 "obsługujący przeroczystość (np. Compiz)."
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "Menedżer okien obsługujący przezroczystość nie jest wymagany"
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Przezroczystość"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Udawana przezroczystość"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Prawdziwa przezroczystość (wymaga rozszerzenia X Composite)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "Rozszerzenie Composite nie zostało załadowane"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "Rozszerzenie Composite nie jest dostępne"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - konfiguracja"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Test"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Pozycja"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Animacja"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Tekst"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Dekoracja"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Wyzwalacz"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Różne"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "O wtyczce Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1272,7 +714,7 @@
 "\n"
 "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1294,134 +736,6 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr "Prośba o uwierzytelnienie dla '%s'"
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr "Prośba o autoryzację dla %s"
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr "Utworzono połączenie z %s"
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr "Usunięto połączenie z %s"
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr "Urządzenie zostało wyłączone"
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr "Urządzenie jest poza zasięgiem"
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr "Urządzenie jest możliwe do podłączenia"
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr "Urządzenie jest w zasięgu"
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr "Urządzenie jest w ograniczonym zasiegu"
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr "Urządzenie zostało przełączone w tryb uwierzytelniania"
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr "Wtyczka obsługi słuchawek bluetooth"
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-"Obsługa zestawu słuchawkowego Bluetooth\n"
-"Copyright (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
-"To był projekt GSoC 2008 - Podziękowania dla mojego mentora Tony Vroon i dla "
-"zespołu Audacious\n"
-" \n"
-"Aby móc używać AVRCP, musisz załadować moduł uinput do jądra systemu.\n"
-"Przyciski na słuchawkach zostaną rozpoznane jako zwykłe klawisze \n"
-"multimedialne i mogą zostać skonfigurowane przez wtyczkę Audacious Global \n"
-"Hotkey lub inne narzędzia dostarczane z twoim menedżerem okien.\n"
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr "Producent"
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr "Dostępne słuchawki"
-
-#: src/bluetooth/gui.c:224
-msgid "Current Headset"
-msgstr "Aktywne słuchawki"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr "_Odśwież"
-
-#: src/bluetooth/gui.c:231
-msgid "_Connect"
-msgstr "_Podłącz"
-
-#: src/bluetooth/gui.c:237
-msgid "_Close"
-msgstr "_Zamknij"
-
-#: src/bluetooth/gui.c:274
-msgid "Class"
-msgstr "Klasa"
-
-#: src/bluetooth/gui.c:278
-msgid "Address:"
-msgstr "Adres:"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr "Podłączanie zakończone!"
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr "Nie znaleziono urządzeń!"
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr "Szukanie..."
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr "Uwierzytelnianie..."
-
-#: src/bluetooth/scan_gui.c:138
-msgid "Rescan"
-msgstr "Szukaj ponownie"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "Odtwarzaj"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Blur Scope: wybór koloru"
@@ -1430,11 +744,11 @@
 msgid "Options:"
 msgstr "Opcje:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 msgid "About Audio CD Plugin"
 msgstr "O wtyczce Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1460,15 +774,15 @@
 "\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr "Brak płyty w napędzie."
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr "Nieobsługiwany rodzaj dysku."
 
@@ -1516,11 +830,23 @@
 msgid "Override default device: "
 msgstr "Urządzenie inne, niż domyślne: "
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+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 "Anuluj"
+
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
 msgstr "Odtwarzaj CD"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "Dodaj CD"
 
@@ -1544,6 +870,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Game Console Music Decoder"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "Ogólne"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Odtwarzanie"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Bas:"
@@ -1561,8 +895,7 @@
 msgid "Default song length:"
 msgstr "Domyślna długość piosenki:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Konwersja częstotliwości próbkowania"
 
@@ -1574,6 +907,10 @@
 msgid "Resampling rate:"
 msgstr "Częstotliwość:"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1643,16 +980,16 @@
 "Możesz użyć efektu Sample Rate Converter, aby przekonwertować piosenki do "
 "tej samej częstotliwości."
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "Konfiguruj Crystalizer"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Intensywność efektu:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Zastosuj"
 
@@ -1691,375 +1028,20 @@
 msgid "Volume: (%)"
 msgstr "Głośność: (%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "Odtwarzanie->Graj"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "Odtwarzanie->Stop"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "Odtwarzanie->Pauza"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "Odtwarzanie->Poprzedni"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "Odtwarzanie->Następny"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "Odtwarzanie->Wysuń"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "Odtwarzanie->Powtarzaj"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "Odtwarzanie->Losuj"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "Głośność-> +_5"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "Głośność- -_5>"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "Głośność-> +_10"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "Głośność-> -_10"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "Głośność->Wycisz"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "Okno->Główne"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "Okno->Playlista"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "Okno->Equalizer"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "Okno->PrzeskoczDoPliku"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-"event-device-plugin: nie można otworzyć pliku urządzenia %s , pomijanie tego "
-"urządzenia; sprawdź, czy plik istnieje i czy masz uprawnienia do jego "
-"czytania.\n"
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-"event-device-plugin: nie można utworzyć _kanału we/wy dla pliku urządzenia "
-"%s , pomijanie tego urządzenia.\n"
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: nie można otworzyć /proc/bus/input/devices , "
-"automatyczne wykrywanie zdarzeń dla urządzeń nie zadziała.\n"
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-"event-device-plugin: nie można otworzyć _kanału we/wy dla urządzeń /proc/bus/"
-"input , automatyczne wykrywanie zdarzeń dla urządzeń nie zadziała.\n"
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: wystąpił błąd podczas czytania urządzeń z/proc/bus/"
-"input/ , automatyczne wykrywanie zdarzeń dla urządzeń nie zadziała.\n"
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-"event-device-plugin: nie znaleziono urządzenia %s w /dev/input ,pomijanie.\n"
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-"event-device-plugin: nie można załadować pliku konfiguracji %s , zostaną "
-"użyte domyślne ustawienia.\n"
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-"event-device-plugin: niekompletne informacje w pliku konfiguracji dla "
-"urządzenia \"%s\" , pomijanie.\n"
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfiguracja, nie można znaleźć wartość is_active dla "
-"urządzenia \"%s\" , pomijanie.\n"
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-"event-device-plugin: nie można uzyskać dostępu do lokalnego katalogu %s , "
-"ustawienia nie zostaną zapisane.\n"
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfiguracja, nie można znaleźć wartości nazwy pliku "
-"dla urządzenia \"%s\" , pomijanie.\n"
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfiguracja, nie można uzyskać wartości phys dla "
-"urządzenia \"%s\" , pomijanie.\n"
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfiguracja, nie można uzyskać wartości is_custom dla "
-"urządzenia \"%s\" , pomijanie.\n"
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-"event-device-plugin: konfiguracja, niespodziewana wartość dla urządzenia \"%s"
-"\" , pomijanie.\n"
-
-#: src/evdev-plug/ed_ui.c:212
-msgid "Detected"
-msgstr "Wykryto"
-
-#: src/evdev-plug/ed_ui.c:217
-msgid "Custom"
-msgstr "Własne"
-
-#: src/evdev-plug/ed_ui.c:223
-msgid "Not Detected"
-msgstr "Nie wykryto"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "Informacja"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-"Nie można otworzyć okna dowiązań dla nie-wykrytego urządzenia.\n"
-"Upewnij się, że urządzenie zostało poprawnie podłączone."
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Błąd"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-"Nie można otworzyć wybranego urządzenia.\n"
-"Proszę sprawdzić uprawnienia czytania dla pliku urządzenia."
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "EvDev-Plug - Dodaj niestandardowe urządzenie"
-
-#: src/evdev-plug/ed_ui.c:353
-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 próbuje automatycznie wykryć i zaktualizować informacje o\n"
-"urządzeniach zdarzeń dostępnych w systemie.\n"
-"Jeśli jednak auto-detekcja nie zadziała bądź posiadasz nietypowe urządzenia\n"
-"(znajdują się obecnie tylko w /dev/input/), możesz spróbować dodać je\n"
-"ręcznie podając przy tym nazwę oraz plik urządzenia."
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Nazwa urządzenia:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Plik urządzenia:"
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr "(własne)"
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-"Proszę podać zarówno nazwę, jak i lokalizację pliku.\n"
-"Nazwa pliku musi zostać podana z bezpośrednią ścieżką."
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr "Czy chcesz usunąć istniejącą konfigurację dla wybranego urządzenia?\n"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "Czy chcesz usunąć wybrane niestandardowe urządzenie?\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "EvDev-Plug - Konfiguracja"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Aktywne"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Stan"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Nazwa urządzenia"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Plik urządzenia"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Adres urządzenia"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "_Dowiązania"
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-"Wciśnij przycisk twojego urządzenia, aby skojarzyć go z wtyczką;\n"
-"jeśli żaden przycisk nie zostanie wciśnięŧy przez kolejne 5 sekund, \n"
-"to nastąpi zamknięcie tego okna bez dokonywania zmian."
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-"To zdarzenie wejścia zostało już przypisane.\n"
-"\n"
-"Nie można przydzielić wielu akcji do tego samego zdarzenia wejścia (jednakże "
-"można przypisać tą samą akcję do wielu zdarzeń)."
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Plug - Konfiguracja dowiązań"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "Nazwa: "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Lokalizacja pliku: "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Adres fizyczny: "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "O wtyczce EvDev-Plug"
-
-#: src/evdev-plug/ed_ui.c:1491
-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"
-"Zdalna kontrola odtwarzacza poprzez urządzenia zdarzeń\n"
-"http://www.develia.org/projects.php?p=audacious#evdevplug\n"
-"\n"
-"Autor: Giacomo Lozito\n"
-
-#: src/ffaudio/ffaudio-core.c:765
-#, c-format
+#: src/ffaudio/ffaudio-core.c:763
+#, fuzzy, c-format
 msgid ""
 "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"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 "Wtyczka dekodera audio dla Audacious obsługująca wiele formatów.\n"
 "Oparta na framework'u multimedialnym FFmpeg (http://www.ffmpeg.org/)\n"
@@ -2071,15 +1053,15 @@
 " William Pitcock <nenolod@nenolod.net>,\n"
 " Matti Hämäläinen <ccr@tnsp.org>\n"
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "O wtyczce FFaudio"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "O wtyczce File-Writer"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2115,51 +1097,51 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "Konfiguracja File Writer"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Format pliku wyjściowego:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Zapisz w oryginalnym katalogu"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Zapisz we własnym katalogu"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Folder pliku wyjściowego:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Wybierz folder"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Uzyskaj nazwę pliku z:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "tagi pliku oryginalnego"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "oryginalna nazwa pliku"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Nie ucinaj rozszerzenia pliku"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "Dodaj do nazwy pliku numer ścieżki"
 
@@ -2171,6 +1153,14 @@
 msgid "Joint Stereo"
 msgstr "Złącze Stereo"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Mono"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "Konfiguracja MP3"
@@ -2216,7 +1206,6 @@
 msgstr "Zabezpieczenie przed błędami"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Jakość"
 
@@ -2324,11 +1313,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "O wtyczce Gnome Shortcut"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2342,58 +1331,22 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr "Otwórz pliki"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 msgid "Add Files"
 msgstr "Dodaj pliki"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 msgid "Audacious2"
 msgstr "Audacious2"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr "interfejs gnt"
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr "Nie można przeskoczyć do czasu, gdy żaden utwór nie jest odtwarzany.\n"
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr "Przeskocz do czasu"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr "minuty:sekundy"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr "Długość utworu:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr "Błąd zapisywania playlisty \"%s\": %s"
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-msgid "Export Playlist"
-msgstr "Eksportuj listę odtwarzania"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-msgid "Import Playlist"
-msgstr "Importuj listę odtwarzania"
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Numer porządkowy"
@@ -2478,404 +1431,320 @@
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr "Interfejs GTK"
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr "Zatrzymaj po tym utworze"
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr "Powtarzaj"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr "Losuj"
+#: src/gtkui/menus.c:132
+#, fuzzy
+msgid "_Open Files ..."
+msgstr "Otwórz pliki ..."
 
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr "Odtwarzaj pojedynczo"
+#: src/gtkui/menus.c:133
+#, fuzzy
+msgid "Open _URL ..."
+msgstr "Otwórz URL ..."
 
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr "Pokaż obszar informacji"
+#: src/gtkui/menus.c:134
+#, fuzzy
+msgid "_Add File ..."
+msgstr "Dodaj pliki ..."
 
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr "Pokaż/ukryj obszar informacji"
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr "Pokaż menu główne"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr "Pokaż/ukryj menu główne"
+#: src/gtkui/menus.c:135
+#, fuzzy
+msgid "Add U_RL ..."
+msgstr "Dodaj URL ..."
 
-#: src/gtkui/ui_manager.c:55
-msgid "Show statusbar"
-msgstr "Pokaż pasek stanu"
+#: src/gtkui/menus.c:137
+#, fuzzy
+msgid "A_bout ..."
+msgstr "O programie"
 
-#: src/gtkui/ui_manager.c:56
-msgid "Show/hide statusbar"
-msgstr "Pokaż/ukryj pasek stanu"
+#: src/gtkui/menus.c:138
+#, fuzzy
+msgid "_Preferences ..."
+msgstr "Ustawienia"
 
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
-msgstr "Pokaż nagłówki kolumn"
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
+msgstr "_Zamknij"
 
-#: src/gtkui/ui_manager.c:60
-msgid "Scroll on Song Change"
-msgstr "Przewijaj przy zmianie utworu"
+#: src/gtkui/menus.c:142
+#, fuzzy
+msgid "_Play"
+msgstr "Odtwarzaj"
 
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
+#: src/gtkui/menus.c:143
+#, fuzzy
+msgid "Paus_e"
 msgstr "Pauza"
 
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
+#: src/gtkui/menus.c:144
+#, fuzzy
+msgid "_Stop"
 msgstr "Stop"
 
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
+#: src/gtkui/menus.c:145
+#, fuzzy
+msgid "Pre_vious"
 msgstr "Poprzedni"
 
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
+#: src/gtkui/menus.c:146
+#, fuzzy
+msgid "_Next"
 msgstr "Następny"
 
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "Playlista"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "Nowa playlista"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "Usuń playlistę"
-
-#: src/gtkui/ui_manager.c:95
-msgid "Import Playlist ..."
-msgstr "Importuj playlistę ..."
-
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr "Ładuje playlistę z pliku do obecnej listy"
+#: src/gtkui/menus.c:148
+#, fuzzy
+msgid "_Repeat"
+msgstr "Powtarzaj"
 
-#: src/gtkui/ui_manager.c:98
-msgid "Export Playlist ..."
-msgstr "Eksportuj playlistę ..."
+#: src/gtkui/menus.c:149
+#, fuzzy
+msgid "S_huffle"
+msgstr "Losuj"
 
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "Zapisuje wybrane listy odtwarzania"
+#: src/gtkui/menus.c:150
+#, fuzzy
+msgid "N_o Playlist Advance"
+msgstr "Odtwarzaj pojedynczo"
 
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-msgid "Save All Playlists"
-msgstr "Zapisz wszystkie playlisty"
+#: src/gtkui/menus.c:151
+#, fuzzy
+msgid "Stop _After This Song"
+msgstr "Zatrzymaj po tym utworze."
 
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
-"Zapisuje wszystkie otwarte listy odtwarzania. Akcja ta jest również "
-"wykonywana automatycznie przy zamykaniu programu."
 
-#: src/gtkui/ui_manager.c:106
-msgid "Refresh"
-msgstr "Odśwież"
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Odświeża metadane związane z wpisem na liście."
-
-#: src/gtkui/ui_manager.c:110
-msgid "Refresh Selected"
-msgstr "Odśwież zaznaczone"
-
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
-msgstr "Odświeża metadane przypisane do wybranych utworów."
-
-#: src/gtkui/ui_manager.c:115
-msgid "Playlist Manager"
-msgstr "Menedżer playlist"
-
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr "Otwiera menedżera list odtwarzania"
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr "Dodaj URL ..."
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr "Dodaje zdalny utwór do playlisty."
-
-#: src/gtkui/ui_manager.c:123
-msgid "Add Files ..."
-msgstr "Dodaj pliki ..."
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr "Dodaje pliki do playlisty."
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr "Usuń wszystkie"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr "Usuwa wszystkie wpisy z playlisty."
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr "Usuń niezaznaczone"
-
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr "Usuwa niezaznaczone wpisy z playlisty."
-
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr "Usuń zaznaczone"
-
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr "Usuwa zaznaczone wpisy z playlisty"
-
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
-msgstr "Zmień nazwę"
-
-#: src/gtkui/ui_manager.c:140
-msgid "Edit the playlist title."
-msgstr "Pozwala edytować tytuł playlisty."
-
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
-msgstr "Wybierz kolumny ..."
+#: src/gtkui/menus.c:154
+#, fuzzy
+msgid "Jump to _Time ..."
+msgstr "Przeskocz do czasu"
 
-#: src/gtkui/ui_manager.c:146
-msgid "Sort"
-msgstr "Sortuj"
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
+msgstr ""
 
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
+#: src/gtkui/menus.c:158
+#, fuzzy
+msgid "By Track _Number"
 msgstr "Numer utworu"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
+#: src/gtkui/menus.c:159
+#, fuzzy
+msgid "By _Title"
 msgstr "Tytuł"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
+#: src/gtkui/menus.c:160
+#, fuzzy
+msgid "By _Artist"
 msgstr "Wykonawca"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
-msgid "By Album"
+#: src/gtkui/menus.c:161
+#, fuzzy
+msgid "By A_lbum"
 msgstr "Album"
 
-#: src/gtkui/ui_manager.c:155
-msgid "By Release Date"
+#: src/gtkui/menus.c:162
+#, fuzzy
+msgid "By Release _Date"
 msgstr "Data premiery"
 
-#: src/gtkui/ui_manager.c:157
-msgid "By File Path"
+#: src/gtkui/menus.c:163
+#, fuzzy
+msgid "By _File Path"
 msgstr "Położenie pliku"
 
-#: src/gtkui/ui_manager.c:159
-msgid "By Formatted Title"
-msgstr "Sformatowany tytuł"
+#: src/gtkui/menus.c:164
+#, fuzzy
+msgid "By _Custom Title"
+msgstr "Własny tytuł (z ustawień)"
 
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
+#: src/gtkui/menus.c:166
+#, fuzzy
+msgid "R_everse Order"
 msgstr "Odwróć kolejność"
 
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
+#: src/gtkui/menus.c:167
+#, fuzzy
+msgid "_Random Order"
 msgstr "Losowa kolejność"
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr "Dźwięk"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
+msgstr "_Odśwież"
 
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "Efekty"
+#: src/gtkui/menus.c:172
+#, fuzzy
+msgid "_Sort"
+msgstr "Sortuj"
 
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
-msgstr "Korektor graficzny"
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "Widok"
+#: src/gtkui/menus.c:175
+msgid "_Close"
+msgstr "_Zamknij"
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
-msgstr "Interfejs"
+#: src/gtkui/menus.c:177
+#, fuzzy
+msgid "_Import ..."
+msgstr "Importuj"
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "Plik"
+#: src/gtkui/menus.c:178
+#, fuzzy
+msgid "_Export ..."
+msgstr "Eksportuj"
 
-#: src/gtkui/ui_manager.c:188
-msgid "Components"
-msgstr "Wtyczki"
+#: src/gtkui/menus.c:180
+#, fuzzy
+msgid "_Playlist Manager ..."
+msgstr "Menedżer playlist"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr "Pokaż szczegóły utworu"
+#: src/gtkui/menus.c:183
+#, fuzzy
+msgid "Volume _Up"
+msgstr "Zwiększ głośność"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr "Pokaż szczegóły utworu"
+#: src/gtkui/menus.c:184
+#, fuzzy
+msgid "Volume _Down"
+msgstr "Zmniejsz głośność"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "O Audacious"
+#: src/gtkui/menus.c:186
+#, fuzzy
+msgid "_Equalizer"
+msgstr "Korektor graficzny"
 
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
-msgstr "Otwórz pliki ..."
+#: src/gtkui/menus.c:188
+#, fuzzy
+msgid "E_ffects"
+msgstr "Efekty"
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
-msgstr "Ładuje i odtwarza wybrany plik"
+#: src/gtkui/menus.c:191
+#, fuzzy
+msgid "_Interface"
+msgstr "Interfejs"
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
-msgstr "Otwórz URL ..."
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr "Odtwarza utwór z wybranej lokalizacji"
+#: src/gtkui/menus.c:194
+#, fuzzy
+msgid "Show I_nfo Bar"
+msgstr "Pokaż obszar informacji"
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "Wtyczki"
+#: src/gtkui/menus.c:195
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "Pokaż pasek stanu"
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "Ustawienia"
+#: src/gtkui/menus.c:197
+#, fuzzy
+msgid "Show Column _Headers"
+msgstr "Pokaż nagłówki kolumn"
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr "Otwiera okno preferencji"
+#: src/gtkui/menus.c:198
+#, fuzzy
+msgid "Choose _Columns ..."
+msgstr "Wybierz kolumny ..."
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
-msgstr "_Zamknij"
+#: src/gtkui/menus.c:199
+#, fuzzy
+msgid "Scrol_l on Song Change"
+msgstr "Przewijaj przy zmianie utworu"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "Zamyka Audacious"
+#: src/gtkui/menus.c:202
+#, fuzzy
+msgid "_File"
+msgstr "Plik"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr "Ustaw A-B"
+#: src/gtkui/menus.c:203
+#, fuzzy
+msgid "_Playback"
+msgstr "Odtwarzanie"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr "Wyczyść A-B"
+#: src/gtkui/menus.c:204
+#, fuzzy
+msgid "P_laylist"
+msgstr "Playlista"
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr "Przeskocz do początku playlisty"
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#, fuzzy
+msgid "_Services"
+msgstr "Urządzenia"
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
-msgstr "Przeskocz do pliku"
+#: src/gtkui/menus.c:206
+#, fuzzy
+msgid "_Output"
+msgstr "Dźwięk"
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr "Przełącz kolejkę"
+#: src/gtkui/menus.c:207
+#, fuzzy
+msgid "_View"
+msgstr "Widok"
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Dodaje/usuwa wpis z kolejki listy odtwarzania"
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
-msgstr "Kopiuj"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-msgid "Cut"
-msgstr "Wytnij"
+#: src/gtkui/menus.c:215
+#, fuzzy
+msgid "_Copy"
+msgstr "Kopiuj"
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
+#: src/gtkui/menus.c:216
+#, fuzzy
+msgid "_Paste"
 msgstr "Wklej"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
+#: src/gtkui/menus.c:217
+#, fuzzy
+msgid "Select _All"
 msgstr "Zaznacz wszystko"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr "Zaznacza wszystkie wpisy na playliście"
+#: src/gtkui/menus.c:222
+#, fuzzy
+msgid "_Rename"
+msgstr "Nazwa pliku"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr "Wyczyść zaznaczenie"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
+msgstr "Interfejs GTK"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr "Odznacza wszystkie wpisy na playliście"
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, 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
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Błąd"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d kanały"
 msgstr[1] "%d kanały"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, fuzzy, c-format
 msgid "%d kbps"
 msgstr "kbps"
@@ -2884,10 +1753,18 @@
 msgid "Previous Track"
 msgstr "Poprzedni utwór"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Odtwarzaj"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr "Pauzuj/Wznów"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Stop"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr "Następny utwór"
@@ -2912,6 +1789,10 @@
 msgid "Volume Down"
 msgstr "Zmniejsz głośność"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr "Przeskocz do pliku"
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr "Przełącz okno odtwarzacza"
@@ -2920,11 +1801,21 @@
 msgid "Show On-Screen-Display"
 msgstr "Pokaż OSD"
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "Powtarzaj"
+
+#: src/hotkey/gui.c:85
+#, fuzzy
+msgid "Toggle Shuffle"
+msgstr "Losuj"
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(---)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2936,15 +1827,15 @@
 "\n"
 "Czy chcesz kontynuować?"
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr "Przyciski dowiązań myszy"
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Konfiguracja wtyczki Global Hotkey"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2952,23 +1843,23 @@
 "Proszę wcisnąć kombinację klawiszy wewnątrz pola\n"
 "tekstowego. Możesz również użyć przycisków myszy."
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr "Skróty klawiszowe:"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr "Akcja:"
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr "Dowiązany klawisz:"
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr "O wtyczce Global Hotkey"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -3043,130 +1934,19 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "O wtyczce wyjściowej JACK 0.17"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr "Ta wtyczka LADSPA nie ma żadnych kontrolek użytkownika"
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "Nazwa"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "Zainstalowane wtyczki"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "Uruchomione wtyczki"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "Usuń"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "Katalog wtyczki LADSPA"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "O wtyczce LIRC Audacious"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "Wtyczka LIRC "
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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"
-"Prosta wtyczka pozwalająca na kontrolowanie\n"
-"Audacious poprzez demona zdalnego sterowania LIRC\n"
-"\n"
-"Przystosowany do użycia z Audacious przez:\n"
-"Tony Vroon <chainsaw@gentoo.org>\n"
-"Oryginalna wtyczka LIRC dla XMMS stworzona przez:\n"
-"Carl van Schaik <carl@leg.uct.ac.za>\n"
-"Christoph Bartelmus <xmms@bartelmus.de>\n"
-"Andrew O. Shadoura <bugzilla@tut.by>\n"
-"Więcej informacji o LIRC na:\n"
-"http://lirc.org"
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr "Ustawienia wtyczki LIRC"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr "Połącz ponownie z serwerem LIRC"
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr "Czas oczekiwania przed re-połączeniem (w sekundach): "
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr "Połącz ponownie"
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr "Połączenie"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: nie można zainicjować wsparcia LIRC\n"
+"Looking for lyrics..."
+msgstr ""
 
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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: błąd czytania pliku konfiguracji LIRC\n"
-"%s: proszę przeczytać dokumentację LIRC\n"
-"%s: jak stworzyć poprawny plik konfiguracji\n"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr "%s: próba ponownego połączenia...\n"
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: nieznana komenda \"%s\"\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: rozłączony z LIRC\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
-msgstr "%s: próba ponownego połączenia po każdych %d sekundach...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
@@ -3174,11 +1954,11 @@
 "\n"
 "Nie znaleziono żadnych tekstów do piosenki."
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "O wtyczce Metronom"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3192,262 +1972,43 @@
 "np. tact://77 by zagrać 77 beat'ów na minutę\n"
 "lub tact://60*3/4 by zagrać 60 bpm w 3/4 taktu"
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generator taktu: %d bpm"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generator taktu: %d bpm %d/%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "Konfiguracja ModPlug"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 bit"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 bit"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr "Mono (downmix)"
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr "Najbliższy (najszybszy)"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "Liniowy (szybki)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr "Spline (dobra jakość)"
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr "8-tap Fir (bardzo wysoka jakość)"
-
-#: src/modplug/gui/interface.cxx:286
-msgid "96 kHz"
-msgstr "96 kHz"
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Częstotliwość próbkowania"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "Włącz"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "Głębia"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "Opóźnienie"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "Pogłos"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "Ilość"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "Zakres"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "Bass Boost"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-"Uwaga: Zbyt wysokie ustawienie\n"
-"przedwzmacniacza może wywołać\n"
-"denerwujące kliki i trzaski!"
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "Przedwzm"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "Użyj nazwy pliku jako tytułu piosenki"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "Szybkie info playlisty"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "Redukcja zakłóceń"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Odtwarzaj Amiga MOD"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "Nie powtarzaj"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "Powtarzaj"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "raz(y)"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "Powtarzaj w nieskończoność"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "Powtarzanie"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "Info MOD"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-"Nazwa pliku:\n"
-"Tytuł:\n"
-"Typ:\n"
-"Czas trwania:\n"
-"Szybkość:\n"
-"Tempo:\n"
-"Próbki:\n"
-"Instrumenty:\n"
-"Wzory:\n"
-"Kanały:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "Próbki"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "Instrumenty"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "Wiadomość"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Wtyczka wejścia Modplug dla Audacious ver"
-
-#: src/modplug/gui/main.cxx:52
-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"
-"Silnik dźwiękowy Modplug napisany przez Olivier Lapicque.\n"
-"Interfejs XMMS dla Modplug przez Kenton Varda.\n"
-"(c)2000 Olivier Lapicque i Kenton Varda.\n"
-"Aktualizacje i konserwacja przez Konstanty Bialkowski.\n"
-"Portowany do BMP przez Theofilos Intzoglou."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "O Modplug"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nie można znaleźć pliku pixmap: %s"
-
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr "Wgraj zaznaczone ścieżki"
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr "Trwa wgrywanie..."
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr "Urządzenie MTP"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
+msgstr ""
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
+#: src/mtp_up/mtp.c:311
+#, fuzzy
+msgid "Disconnect MTP Device"
 msgstr "Rozłącz urządzenie"
 
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "Stop"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Audacious - ostrzeżenie o widoczności"
+
 #: src/null/null.c:64
 msgid "Null output plugin "
 msgstr "Wtyczka wyjściowa Null"
@@ -3496,11 +2057,11 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr "Włącz konwersje formatu poprzez oprogramowanie OSS"
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "O wtyczce OSS4"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
@@ -3549,6 +2110,11 @@
 msgid "Default (%s)"
 msgstr "Domyślny (%s)"
 
+#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Domyślnie"
+
 #: src/OSS/configure.c:187
 msgid "OSS Driver configuration"
 msgstr "Konfiguracja sterownika OSS"
@@ -3621,11 +2187,11 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "O wtyczce wyjściowej PulseAudio dla Audacious"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3681,27 +2247,27 @@
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Usługi"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Nazwa użytkownika:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 msgid "Scrobbler URL:"
 msgstr "Adres URL Scrobblera:"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3709,7 +2275,7 @@
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3721,15 +2287,15 @@
 "Oryginalnie utworzona przez Audun Hove <audun@nlc.no> oraz Pipian "
 "<pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "O wtyczce Scrobbler"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 msgid "About SDL Output Plugin"
 msgstr "O wtyczce wyjściowej SDL"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 msgid "SDL error"
 msgstr "Błąd SDL"
 
@@ -3738,10 +2304,18 @@
 msgid "About %s"
 msgstr "O wtyczce %s"
 
-#: src/sid/xs_config.c:323
+#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
+msgid "Close"
+msgstr "Zamknij"
+
+#: src/sid/xs_config.c:326
 msgid " Error"
 msgstr " Błąd"
 
+#: src/sid/xs_config.c:326
+msgid "OK"
+msgstr "OK"
+
 #: src/sid/xs_fileinfo.c:151
 msgid "General info"
 msgstr "Ogólne informacje"
@@ -3751,6 +2325,11 @@
 msgid "Tune #%i: "
 msgstr "Melodia #%i: "
 
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nie można znaleźć pliku pixmap: %s"
+
 #: src/sid/xs_interface.c:234
 msgid "Audacious-SID configuration"
 msgstr "Konfiguracja Audacious-SID"
@@ -4067,15 +2646,15 @@
 msgid "Use"
 msgstr "Zastosuj"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Zapisz"
 
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:435
+#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importuj"
 
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Usuń"
 
@@ -4108,6 +2687,11 @@
 msgid "Playtime:"
 msgstr "Czas odtwarzania:"
 
+#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
+#: src/sid/xs_interface.c:1155
+msgid "seconds"
+msgstr "sekundy"
+
 #: src/sid/xs_interface.c:928
 msgid "Minimum playtime:"
 msgstr "Minimalny czas odtwarzania"
@@ -4367,11 +2951,11 @@
 msgid "No"
 msgstr "Nie"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "O interfejsie skórkowym"
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -4379,691 +2963,810 @@
 "Copyright (c) 2008, Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr "Skórkowy Interfejs"
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr "_Odtwarzacz:"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr "Wybierz czcionkę dla głownego okna odtwarzacza:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "_Playlista:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr "Wybierz czcionkę dla playlisty:"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr "_Czcionki"
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr "Użyj bitmapowych czcionek, jeśli dostępne"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
-"Używa bitmapowych czcionek, jeżeli są one dostępne. Bitmapowe czcionki nie "
-"obsługują znaków Unicode."
-
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr "_Różne"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr "Pokaż separatory na playliście"
-
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr "Pokaż dekoracje menedżera okien"
 
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
-msgstr "Używa dla okna odtwarzacza obramowania włączonego menedżera okien."
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
+msgstr ""
 
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr "Używaj dwukierunkowego przewijania tekstu"
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "_Skórka"
 
-#: src/skins/skins_cfg.c:330
-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 ""
-"Jeśli zaznaczone, informacje o pliku w oknie głównym są przewijane tam i z "
-"powrotem. Gdy niezaznaczone, tekst jest przewijany w jednym kierunku."
+#: src/skins/skins_cfg.c:393
+#, fuzzy
+msgid "Interface Preferences"
+msgstr "Konfiguracja Crossfade"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr "Użyj globalnego stylu gtk"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Przedwzm"
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
-msgstr "Losowa skórka przy odtwarzaniu"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
-msgstr "Pozwól na ładowanie niekompletnych skórek"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Hz"
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
-msgstr ""
-"Jeśli zaznaczone, Audacious nie wstrzymie ładowania zepsutych skórek. Używaj "
-"tylko wtedy, gdy twoja ulubiona skórka nie chce działać."
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Hz"
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "Dopasowanie kolorów"
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Hz"
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
-"Audacious pozwala na zmianę balansu kolorów dowolnej skórki przy użyciu "
-"poniższych suwaków."
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Hz"
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "Niebieski"
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 kHz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "Zielony"
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "Czerwony"
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 kHz"
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "_Skórka"
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 kHz"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr "Dopasowanie kolorów..."
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Equalizer Audacious"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr "Schematy ustawień"
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "surround"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious - ostrzeżenie o widoczności"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "Pokaż głowne okno odtwarzacza"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "Ignoruj"
-
-#: src/skins/ui_main.c:993
-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 został uruchomiony z ukrytymi wszystkimi oknami.\n"
-"Być może zechcesz ponownie włączyć główne okno odtwarzacza; jeśli nie, "
-"będziesz musiał kontrolować Audacious zdalnie poprzez audtool lub załadowane "
-"wtyczki (takie jak Status Icon)."
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr "Zawsze ignoruj, pokazywanie/ukrywanie kontrolowane zdalnie"
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious - ostrzeżenie o użyciu wadliwego silnika GTK"
-
-#: src/skins/ui_main.c:1052
-#, c-format
-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>Wadliwy silnik GTK jest w użyciu</big>\n"
-"\n"
-"Audacious wykrył, że używasz niesprawnego silnika GTK.\n"
-"\n"
-"Silnik motywów, którego używasz: %s jest niezgodny z niektórymi "
-"elementami używanymi przez nowoczesne skórki. Niedziałające obiekty zostały "
-"wyłączone na czas trwania tej sesji.\n"
-"\n"
-"Aby uzyskać możliwość używania tych elementów, powinieneś rozważyć zmianę "
-"silnika motywów GTK."
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr "Nie wyświetlaj tego ostrzeżenia ponownie"
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
+#: src/skins/ui_main.c:807
+#, fuzzy, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Skocz do: %d:%-2.2d/%d:%-2.2d (%d%%)"
 
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Głośność: %d%%"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balans: %d%% lewy"
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balans: centralny"
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balans: %d%% prawy"
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Menu opcji"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Wyłącz 'Zawsze na wierzchu'"
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Włącz 'Zawsze na wierzchu'"
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Obszar informacji o pliku"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "Wyłącz 'Skalowanie GUI'"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "Włącz 'Skalowanie GUI'"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Menu wizualizacji"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr "Tryb prosty."
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 msgid "Playlist mode."
 msgstr "Tryb playlisty."
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr "Zatrzymaj po tym utworze."
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr "Nie zatrzymuj po utworze."
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr "Auto-przewijanie nazwy piosenki"
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Zatrzymaj po tym utworze"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
 msgstr "Wierzchołki"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Powtarzaj"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Losuj"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "Odtwarzaj pojedynczo"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr "Pokaż odtwarzacz"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr "Pokaż listę odtwarzania"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr "Pokaż korektor graficzny"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr "Zawsze na wierzchu"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr "Umieść na wszystkich pulpitach"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr "Zwiń odtwarzacz"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr "Zwiń listę odtwarzania"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr "Zwiń korektor graficzny"
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "Skaluj"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr "Podwójna wielkość"
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr "Łatwe przesuwanie"
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr "Analizator"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr "Scope"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr "Voiceprint"
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "Wyłączony"
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr "Normalny"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr "Ognisty"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr "Pionowe linie"
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr "Linie"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr "Kolumny"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr "Kropkowany"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr "Liniowy"
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr "Gładki"
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr "Lodowy"
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr "Wygładzony"
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "Najwolniejszy"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "Wolny"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "Średni"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "Szybki"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "Najszybszy"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr "Miniony czas"
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr "Pozostały czas"
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "Pauza"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "Poprzedni"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "Następny"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "Wizualizacja"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr "Tryb wizualizacji"
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr "Tryb analizatora"
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr "Tryb Scope"
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr "Tryb Voiceprint"
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr "Tryb WindowShade VU"
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr "Spadek linii/kolumn"
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr "Spadek wierzchołków"
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Playlista"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Nowa playlista"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr "Następna playlista"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr "Poprzednia playlista"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Usuń playlistę"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "Importuj listę odtwarzania"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Ładuje playlistę z pliku do obecnej listy"
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "Eksportuj listę odtwarzania"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr "Zapisuje wybrane listy odtwarzania"
+
+#: src/skins/ui_manager.c:229
+msgid "Save All Playlists"
+msgstr "Zapisz wszystkie playlisty"
+
+#: src/skins/ui_manager.c:230
+msgid ""
+"Saves all the playlists that are open. Note that this is done automatically "
+"when Audacious quits."
+msgstr ""
+"Zapisuje wszystkie otwarte listy odtwarzania. Akcja ta jest również "
+"wykonywana automatycznie przy zamykaniu programu."
+
+#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr "Odśwież listę"
 
-#: src/skins/ui_manager.c:228
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Odświeża metadane związane z wpisem na liście."
+
+#: src/skins/ui_manager.c:238
 msgid "List Manager"
 msgstr "Menedżer list odtwarzania"
 
-#: src/skins/ui_manager.c:238
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr "Otwiera menedżera list odtwarzania"
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Widok"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "Interfejs"
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "Konfiguracja Crossfade"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr "Dodaj adres internetowy..."
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr "Dodaje zdalny utwór do playlisty."
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr "Dodaj pliki..."
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr "Dodaje pliki do playlisty."
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr "Szukaj i zaznacz"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 "Przeszukuje playlistę i zaznacza wpisy na podstawie ustalonych kryteriów."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr "Odwróć zaznaczenie"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr "Odwraca zaznaczone i niezaznaczone wpisy."
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "Zaznacz wszystko"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
+msgstr "Zaznacza wszystkie wpisy na playliście"
+
+#: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr "Wyczyść zaznaczenie"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr "Odznacza wszystkie wpisy na playliście"
+
+#: src/skins/ui_manager.c:277
+msgid "Remove All"
+msgstr "Usuń wszystkie"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr "Usuwa wszystkie wpisy z playlisty."
+
+#: src/skins/ui_manager.c:281
 msgid "Clear Queue"
 msgstr "Wyczyść kolejkę"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr "Usuwa kolejkę powiązaną z tą listą odtwarzania."
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "Usuń niedostępne"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr "Usuwa niedostępne pliki z playlisty."
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "Usuń duplikaty"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "Tytuł"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Usuwa duplikaty z playlisty na podstawie tytułu utworu."
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "Nazwa pliku"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Usuwa duplikaty z playlisty na podstawie nazwy pliku."
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "Ścieżka + Nazwa pliku"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Usuwa duplikaty z playlisty na podstawie ich pełnej ścieżki."
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr "Usuń niezaznaczone"
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr "Usuwa niezaznaczone wpisy z playlisty."
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr "Usuń zaznaczone"
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr "Usuwa zaznaczone wpisy z playlisty"
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr "Wymieszaj listę"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr "Losowo zmienia kolejność wpisów na playliście"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr "Odwróć listę"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr "Odwraca kolejność wpisów na playliście"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "Sortuj listę"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr "Porządkuje listę na podstawie tytułu."
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+msgid "By Album"
+msgstr "Album"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr "Porządkuje listę na podstawie albumu."
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "Wykonawca"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr "Porządkuje listę na podstawie artysty."
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr "Porządkuje listę na podstawie nazwy pliku."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr "Porządkuje listę na podstawie pełnej ścieżki."
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "Data"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr "Porządkuje listę na podstawie daty modyfikacji."
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr "Numer utworu"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr "Porządkuje listę na podstawie numeru utworu."
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr "Sortuj zaznaczone"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "Plik"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Pomoc"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr "Wtyczki"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr "Pokaż szczegóły utworu"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr "Pokaż szczegóły utworu"
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "O Audacious"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "Wczytaj plik"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr "Ładuje i odtwarza wybrany plik"
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "Wczytaj lokalizację"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr "Odtwarza utwór z wybranej lokalizacji"
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "Wtyczki"
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "Ustawienia"
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr "Otwiera okno preferencji"
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "Zamyka Audacious"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr "Ustaw A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr "Wyczyść A-B"
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr "Przeskocz do początku playlisty"
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr "Przeskocz do czasu"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr "Przełącz kolejkę"
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Dodaje/usuwa wpis z kolejki listy odtwarzania"
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr "Kopiuj"
+
+#: src/skins/ui_manager.c:436
+msgid "Cut"
+msgstr "Wytnij"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Wklej"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Wczytaj"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Ustawienia"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Wczytaj ustawienia"
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Auto-ładowane ustawienia"
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Wczytaj auto-ładowane ustawienia"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Wczytaj domyślne ustawienia equalizera"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Wyzeruj"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Wyzeruj ustawienia equalizera"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Z pliku"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Wczytaj ustawienia z pliku"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Z pliku WinAMP EQF"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Wczytaj ustawienia z pliku WinAMP EQF"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Ustawienia WinAMPa"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importuj ustawienia WinAMPa"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Zapisz ustawienia"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Zapisz auto-ładowane ustawienia"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Zapisz domyślne ustawienia"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Do pliku"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Zapisz ustawienia do pliku"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Do pliku WinAMP EQF"
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Zapisz ustawienia do pliku WinAMP EQF"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Usuń ustawienia"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Usuń auto-ładowane ustawienia"
 
-#: src/skins/ui_playlist.c:374
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Wyszukaj wpisy w aktywnej playliście"
 
-#: src/skins/ui_playlist.c:382
+#: 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 "
@@ -5075,104 +3778,52 @@
 "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:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Tytuł: "
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album:"
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Artysta:"
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Nazwa pliku:"
 
-#: src/skins/ui_playlist.c:419
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Wyczyść poprzednie zaznaczenie przed szukaniem"
 
-#: src/skins/ui_playlist.c:422
+#: 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:425
+#: 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:776
-msgid "Save as Static Playlist"
-msgstr "Zapisz jako statyczną playlistę"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr "Użyj względnej ścieżki"
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "Wczytaj playlistę"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "Zapisz playlistę"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Edytor playlisty Audacious"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr "Spakowana skórka Winamp 2.x"
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Skórka Winamp 2.x"
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nie można utworzyć katalogu (%s): %s\n"
@@ -5223,55 +3874,63 @@
 "51 Franklin Street, Fifth Floor, \n"
 "Boston, MA 02110-1301 USA"
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "O SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr "Korekcja dźwięku"
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "Krótkie zazębianie się"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "Szybkość odtwarzania"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "Wysokość dźwięku"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "Skaluj"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Opcje"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - Konfiguracja"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr "Komenda wywoływana przy rozpoczęciu nowej piosenki."
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "Komenda:"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr "Komenda wywoływana przy końcu piosenki."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Komenda wywoływana, gdy Audacious dotrze do końca playlisty."
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "Komenda wywoływana, gdy zmieni się tytuł piosenki (np. dla internetowych "
 "strumieni)."
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -5304,7 +3963,7 @@
 "%b: Album\n"
 "%T: Tytuł utworu"
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5312,18 +3971,14 @@
 "Parametry przekazane do powłoki powinny być zawarte w "
 "cudzysłowach. Ich brak jest zagrożeniem dla bezpieczeństwa."
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "Komendy"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 msgid "Song Change"
 msgstr "Zmiana piosenki"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "Analizator Spektrum"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "O wtyczce Status Icon"
@@ -5396,70 +4051,19 @@
 "\n"
 "Johan Levin, 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "O wtyczce Extra Stereo"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "Konfiguruj dźwięk stereo"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-msgid "Search:"
-msgstr "Szukaj:"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr "Dodaj zakładkę"
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-msgid "Stream name"
-msgstr "Nazwa strumienia"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr "Teraz odtwarzane"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-msgid "Remove Bookmark"
-msgstr "Usuń zakładkę"
-
-#: src/streambrowser/streambrowser.c:340
-msgid "About Stream Browser"
-msgstr "O przeglądarce strumieni"
-
-#: src/streambrowser/streambrowser.c:341
-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, Calin Crisan <ccrisan@gmail.com> oraz zespół Audacious.\n"
-"To jest prosta przeglądarka strumieni, która zawiera najpopularniejsze "
-"katalogi strumieni.\n"
-"Podziękowania dla deweloperów Streamtuner: <http://www.nongnu.org/"
-"streamtuner>,\n"
-"\ti oczywiście dla całej społeczności Audacious.\n"
-"\n"
-"Poza tym dziękuję Tony Vroon za prowadzenie i udzielanie wskazówek.\n"
-"\n"
-"To był projekt na Google Summer of Code 2008."
-
-#: src/tonegen/tonegen.c:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "O generatorze sygnałów"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5475,12 +4079,12 @@
 "np. tone://2000;2005 aby odtworzyć sygnał o kombinacji częstotliwości 2000Hz "
 "oraz 2005Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "Generator sygnałów: "
 
@@ -5501,15 +4105,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Tagi Ogg Vorbis"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Konfiguracja wtyczki Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "O wtyczce dźwięku Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5585,9 +4189,1310 @@
 "Część kodu napisał Miles Egan\n"
 "Odwiedź witrynę internetową Wavpack: http://www.wavpack.com/\n"
 
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "Użyj bitmapowych czcionek, jeśli dostępne"
+
+#~ msgid ""
+#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
+#~ "Unicode strings."
+#~ msgstr ""
+#~ "Używa bitmapowych czcionek, jeżeli są one dostępne. Bitmapowe czcionki "
+#~ "nie obsługują znaków Unicode."
+
+#~ msgid "_Miscellaneous"
+#~ msgstr "_Różne"
+
+#~ msgid "Use two-way text scroller"
+#~ msgstr "Używaj dwukierunkowego przewijania tekstu"
+
+#~ msgid "About "
+#~ msgstr "O programie"
+
+#~ 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"
+#~ "Ta wtyczka została wydana na zasadach licencji GNU LGPL.\n"
+#~ "Zobacz http://www.gnu.org/licenses/lgpl.html .\n"
+#~ "\n"
+#~ "Ten plugin używa biblioteki AdPlug - Copyright (C) Simon Peter, et al.\n"
+#~ "Podłączona wersja biblioteki AdPlug: "
+
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AdPlug :: Konfiguracja"
+
+#~ msgid "Sound quality"
+#~ msgstr "Jakość dźwięku"
+
+#~ msgid "Resolution"
+#~ msgstr "Rozdzielczość"
+
+#~ msgid "8bit"
+#~ msgstr "8bit"
+
+#~ msgid "16bit"
+#~ msgstr "16bit"
+
+#~ msgid "Channels"
+#~ msgstr "Kanały"
+
+#~ 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 ""
+#~ "Nie należy wybierać opcji Stereo, jeśli nie jest to konieczne. Nie "
+#~ "poprawi to wcale jakości dźwięku - OPL2 obsługuje tylko mono - ale będzie "
+#~ "zużywac większą ilość mocy obliczeniowej procesora!"
+
+#~ msgid "Frequency"
+#~ msgstr "Częstotliwość"
+
+#~ msgid "Detect songend"
+#~ msgstr "Wykryj koniec utworu"
+
+#~ 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 ""
+#~ "Gdy włączone, XMMS wykrywa koniec utworu, zatrzymuje go i przeskakuje do "
+#~ "następnego na liście. Gdy wyłączone, XMMS nie rozpoznaje zakończenia "
+#~ "utworu i powtarza go w nieskończoność."
+
+#~ msgid "Formats"
+#~ msgstr "Formaty"
+
+#~ msgid "Format selection"
+#~ msgstr "Wybór formatu"
+
+#~ msgid "Format"
+#~ msgstr "Format"
+
+#~ msgid "Extension"
+#~ msgstr "Rozszerzenie"
+
+#~ 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 ""
+#~ "Wybrane typy plików zostaną rozpoznane i odtworzone przy pomocy tej "
+#~ "wtyczki. Odznaczone formaty zostaną zignorowane, aby umożliwić innym "
+#~ "pluginom ich odtworzenie."
+
+#~ msgid "AdPlug :: File Info"
+#~ msgstr "AdPlug :: Informacja o pliku"
+
+#~ msgid "Author: "
+#~ msgstr "Autor: "
+
+#~ msgid "File Type: "
+#~ msgstr "Typ pliku: "
+
+#~ msgid "Subsongs: "
+#~ msgstr "Teksty: "
+
+#~ msgid "Instruments: "
+#~ msgstr "Instrumenty: "
+
+#~ msgid "Orders: "
+#~ msgstr "Kolejność: "
+
+#~ msgid "Patterns: "
+#~ msgstr "Wzory: "
+
+#~ msgid "Song"
+#~ msgstr "Utwór"
+
+#~ msgid "Instrument name"
+#~ msgstr "Nazwa instrumentu"
+
+#~ msgid "Song message"
+#~ msgstr "Informacja"
+
+#~ msgid "Subsong selection"
+#~ msgstr "Wybór tekstu"
+
+#~ msgid "Order: "
+#~ msgstr "Kolejność: "
+
+#~ msgid "Pattern: "
+#~ msgstr "Wzór: "
+
+#~ msgid "Row: "
+#~ msgstr "Linia: "
+
+#~ msgid "Speed: "
+#~ msgstr "Szybkość: "
+
+#~ msgid "Timer: "
+#~ msgstr "Czas: "
+
+#~ msgid "About XMMS Alarm"
+#~ msgstr "O wtyczce Alarm XMMS"
+
+#~ msgid "XMMS Alarm"
+#~ msgstr "Alarm 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 ""
+#~ "Wtyczka XMMS, która może zostać użyta\n"
+#~ "do rozpoczęcia odtwarzania o określonej porze.\n"
+#~ "\n"
+#~ "Wszelkie uwagi należy zgłaszać do:\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 "Budzik"
+
+#~ msgid "This is your wakeup call."
+#~ msgstr "To jest twój sygnał budzenia."
+
+#~ msgid "Select Playlist"
+#~ msgstr "Wybierz listę odtwarzania"
+
+#~ msgid "Sorry"
+#~ msgstr "Przepraszam"
+
+#~ msgid "Warning"
+#~ msgstr "Ostrzeżenie"
+
+#~ 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 powodów bezpieczeństwa czas \"ciszy\" powinien być przynajmniej o 65 "
+#~ "sekund dłuższy od czasu wyciszania, musi być także dłuższy niż 10 sekund. "
+#~ "Jest to spowodowane bugiem w kodzie wtyczki, więc do czasu jego "
+#~ "naprawienia będzie pojawiał się ten komunikat :)\n"
+#~ "Twoje ustawienia wyciszania NIE zostały zapisane\n"
+#~ "\n"
+#~ "--\n"
+#~ "Adam"
+
+#~ msgid "Oh Well"
+#~ msgstr "No dobrze... :)"
+
+#~ msgid "Alarm Settings"
+#~ msgstr "Ustawienia budzika"
+
+#~ msgid "Time"
+#~ msgstr "Czas"
+
+#~ msgid "hours"
+#~ msgstr "godziny"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "minutes"
+#~ msgstr "minuty"
+
+#~ msgid "Quiet after:"
+#~ msgstr "Wycisz po:"
+
+#~ msgid "Alarm at (default):"
+#~ msgstr "Alarm o (domyślnie):"
+
+#~ msgid "Choose the days for the alarm to come on"
+#~ msgstr "Wybierz dni, w których budzik zostanie uruchomiony"
+
+#~ msgid "Day"
+#~ msgstr "Dzień"
+
+#~ msgid "Tuesday"
+#~ msgstr "Wtorek"
+
+#~ msgid "Wednesday"
+#~ msgstr "Środa"
+
+#~ msgid "Thursday"
+#~ msgstr "Czwartek"
+
+#~ msgid "Friday"
+#~ msgstr "Piątek"
+
+#~ msgid "Saturday"
+#~ msgstr "Sobota"
+
+#~ msgid "Sunday"
+#~ msgstr "Niedziela"
+
+#~ msgid "Monday"
+#~ msgstr "Poniedziałek"
+
+#~ msgid "Days"
+#~ msgstr "Dni"
+
+#~ msgid "Fading"
+#~ msgstr "Czas przejścia"
+
+#~ msgid "Volume"
+#~ msgstr "Głośność"
+
+#~ msgid "Current"
+#~ msgstr "Aktualny"
+
+#~ msgid "reset to current output volume"
+#~ msgstr "zresetuj do bieżącej głośności wyjścia"
+
+#~ msgid "Start at"
+#~ msgstr "Rozpocznij od"
+
+#~ msgid "%"
+#~ msgstr "%"
+
+#~ msgid "Final"
+#~ msgstr "Końcowa głośność"
+
+#~ msgid "Additional Command"
+#~ msgstr "Dodatkowe komendy"
+
+#~ msgid "enable"
+#~ msgstr "włącz"
+
+#~ msgid "Playlist (optional)"
+#~ msgstr "Playlista (opcjonalnie)"
+
+#~ msgid "Browse..."
+#~ msgstr "Przeglądaj..."
+
+#~ msgid "Reminder"
+#~ msgstr "Przypominacz"
+
+#~ msgid "Use reminder"
+#~ msgstr "Użyj przypominacza"
+
+#~ msgid "What do these options mean?"
+#~ msgstr "Co oznaczają te opcje?"
+
+#~ 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"
+#~ "Czas\n"
+#~ " Alarm o: \n"
+#~ " Określ godzinę budzenia.\n"
+#~ "\n"
+#~ " Wycisz po: \n"
+#~ " Zatrzymaj budzik po upływie określonego czasu .\n"
+#~ " (jeśli okienko informacyjne nie zostanie wcześniej zamknięte)\n"
+#~ "\n"
+#~ "\n"
+#~ "Dni\n"
+#~ " Dzień:\n"
+#~ " Wybierz dni, w których budzik zostanie włączony.\n"
+#~ "\n"
+#~ " Czas:\n"
+#~ " Wybierz czas dla budzika każdego dnia,\n"
+#~ " albo ustaw opcję domyślną.\n"
+#~ "\n"
+#~ "\n"
+#~ "Głośność\n"
+#~ " Czas przejścia: \n"
+#~ " Ustaw czas, przez który nastąpi zwiększenie głośności \n"
+#~ " do wybranej wartości.\n"
+#~ "\n"
+#~ " Rozpocznij od: \n"
+#~ " Rozpocznij zwiększanie od tej głośności.\n"
+#~ "\n"
+#~ " Końcowa głośność: \n"
+#~ " Maksymalna głośność dla budzika. Jeśli czas przejścia\n"
+#~ " ustawiony jest na 0, to wtedy następuje natychmiastowe\n"
+#~ " ustawienie tej głośności i rozpoczęcie odtwarzania.\n"
+#~ "\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ " Dodatkowe komendy:\n"
+#~ " Uruchom wybrane programy/skrypty przy budzeniu.\n"
+#~ "\n"
+#~ " Playlista: \n"
+#~ " Załaduj wybraną listę odtwarzania \n"
+#~ " (musi mieć rozszerzenie .m3u). Jeśli nie wybrano\n"
+#~ " playlisty, to zostaną użyte utwory znajdujące się\n"
+#~ " w danej chwili na liście.\n"
+#~ " Adres URL strumienia mp3/ogg może również zostać\n"
+#~ " tutaj użyty, ale ładowanie playlist z adresów\n"
+#~ " URL nie jest na razie wspierane przez xmms.\n"
+#~ "\n"
+#~ " Przypominacz:\n"
+#~ " Wyświetl powiadomienie, gdy budzik zostanie wyłączony.\n"
+#~ " Wpisz w podane pole treść komunkatu i zaznacz odpowiednią\n"
+#~ " opcję, jeśli chcesz, aby było ono pokazywane..\n"
+
+#~ msgid "Your reminder for today is.."
+#~ msgstr "Powiadomienie na dzisiaj to..."
+
+#~ msgid "Thankyou"
+#~ msgstr "Dziękuję"
+
+#~ msgid "Pairing request for '%s'"
+#~ msgstr "Prośba o uwierzytelnienie dla '%s'"
+
+#~ msgid "Authorization request for %s"
+#~ msgstr "Prośba o autoryzację dla %s"
+
+#~ msgid "Created bonding with %s"
+#~ msgstr "Utworzono połączenie z %s"
+
+#~ msgid "Removed bonding with %s"
+#~ msgstr "Usunięto połączenie z %s"
+
+#~ msgid "Device has been switched off"
+#~ msgstr "Urządzenie zostało wyłączone"
+
+#~ msgid "Device has been made non-discoverable"
+#~ msgstr "Urządzenie jest poza zasięgiem"
+
+#~ msgid "Device has been made connectable"
+#~ msgstr "Urządzenie jest możliwe do podłączenia"
+
+#~ msgid "Device has been made discoverable"
+#~ msgstr "Urządzenie jest w zasięgu"
+
+#~ msgid "Device has been made limited discoverable"
+#~ msgstr "Urządzenie jest w ograniczonym zasiegu"
+
+#~ msgid "Device has been switched into pairing mode"
+#~ msgstr "Urządzenie zostało przełączone w tryb uwierzytelniania"
+
+#~ msgid "Bluetooth headset support plugin"
+#~ msgstr "Wtyczka obsługi słuchawek 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 ""
+#~ "Obsługa zestawu słuchawkowego Bluetooth\n"
+#~ "Copyright (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
+#~ "To był projekt GSoC 2008 - Podziękowania dla mojego mentora Tony Vroon i "
+#~ "dla zespołu Audacious\n"
+#~ " \n"
+#~ "Aby móc używać AVRCP, musisz załadować moduł uinput do jądra systemu.\n"
+#~ "Przyciski na słuchawkach zostaną rozpoznane jako zwykłe klawisze \n"
+#~ "multimedialne i mogą zostać skonfigurowane przez wtyczkę Audacious "
+#~ "Global \n"
+#~ "Hotkey lub inne narzędzia dostarczane z twoim menedżerem okien.\n"
+
+#~ msgid "Producer"
+#~ msgstr "Producent"
+
+#~ msgid "Available Headsets"
+#~ msgstr "Dostępne słuchawki"
+
+#~ msgid "Current Headset"
+#~ msgstr "Aktywne słuchawki"
+
+#~ msgid "_Connect"
+#~ msgstr "_Podłącz"
+
+#~ msgid "Class"
+#~ msgstr "Klasa"
+
+#~ msgid "Address:"
+#~ msgstr "Adres:"
+
+#~ msgid "Bonding finish!"
+#~ msgstr "Podłączanie zakończone!"
+
+#~ msgid "No devices found!"
+#~ msgstr "Nie znaleziono urządzeń!"
+
+#~ msgid "Scanning..."
+#~ msgstr "Szukanie..."
+
+#~ msgid "Pairing..."
+#~ msgstr "Uwierzytelnianie..."
+
+#~ msgid "Rescan"
+#~ msgstr "Szukaj ponownie"
+
+#~ msgid "Playback->Play"
+#~ msgstr "Odtwarzanie->Graj"
+
+#~ msgid "Playback->Stop"
+#~ msgstr "Odtwarzanie->Stop"
+
+#~ msgid "Playback->Pause"
+#~ msgstr "Odtwarzanie->Pauza"
+
+#~ msgid "Playback->Prev"
+#~ msgstr "Odtwarzanie->Poprzedni"
+
+#~ msgid "Playback->Next"
+#~ msgstr "Odtwarzanie->Następny"
+
+#~ msgid "Playback->Eject"
+#~ msgstr "Odtwarzanie->Wysuń"
+
+#~ msgid "Playlist->Repeat"
+#~ msgstr "Odtwarzanie->Powtarzaj"
+
+#~ msgid "Playlist->Shuffle"
+#~ msgstr "Odtwarzanie->Losuj"
+
+#~ msgid "Volume->Up_5"
+#~ msgstr "Głośność-> +_5"
+
+#~ msgid "Volume->Down_5"
+#~ msgstr "Głośność- -_5>"
+
+#~ msgid "Volume->Up_10"
+#~ msgstr "Głośność-> +_10"
+
+#~ msgid "Volume->Down_10"
+#~ msgstr "Głośność-> -_10"
+
+#~ msgid "Volume->Mute"
+#~ msgstr "Głośność->Wycisz"
+
+#~ msgid "Window->Main"
+#~ msgstr "Okno->Główne"
+
+#~ msgid "Window->Playlist"
+#~ msgstr "Okno->Playlista"
+
+#~ msgid "Window->Equalizer"
+#~ msgstr "Okno->Equalizer"
+
+#~ msgid "Window->JumpToFile"
+#~ msgstr "Okno->PrzeskoczDoPliku"
+
+#~ 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 ""
+#~ "event-device-plugin: nie można otworzyć pliku urządzenia %s , pomijanie "
+#~ "tego urządzenia; sprawdź, czy plik istnieje i czy masz uprawnienia do "
+#~ "jego czytania.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to create a io_channel for device file %s ,"
+#~ "skipping this device\n"
+#~ msgstr ""
+#~ "event-device-plugin: nie można utworzyć _kanału we/wy dla pliku "
+#~ "urządzenia %s , pomijanie tego urządzenia.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to open /proc/bus/input/devices , automatic "
+#~ "detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: nie można otworzyć /proc/bus/input/devices , "
+#~ "automatyczne wykrywanie zdarzeń dla urządzeń nie zadziała.\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 ""
+#~ "event-device-plugin: nie można otworzyć _kanału we/wy dla urządzeń /proc/"
+#~ "bus/input , automatyczne wykrywanie zdarzeń dla urządzeń nie zadziała.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: an error occurred while reading /proc/bus/input/"
+#~ "devices , automatic detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: wystąpił błąd podczas czytania urządzeń z/proc/bus/"
+#~ "input/ , automatyczne wykrywanie zdarzeń dla urządzeń nie zadziała.\n"
+
+#~ msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: nie znaleziono urządzenia %s w /dev/input ,"
+#~ "pomijanie.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to load config file %s , default settings "
+#~ "will be used.\n"
+#~ msgstr ""
+#~ "event-device-plugin: nie można załadować pliku konfiguracji %s , zostaną "
+#~ "użyte domyślne ustawienia.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: incomplete information in config file for device \"%s"
+#~ "\" , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: niekompletne informacje w pliku konfiguracji dla "
+#~ "urządzenia \"%s\" , pomijanie.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_active value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfiguracja, nie można znaleźć wartość is_active "
+#~ "dla urządzenia \"%s\" , pomijanie.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to access local directory %s , settings will "
+#~ "not be saved.\n"
+#~ msgstr ""
+#~ "event-device-plugin: nie można uzyskać dostępu do lokalnego katalogu %s , "
+#~ "ustawienia nie zostaną zapisane.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get filename value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfiguracja, nie można znaleźć wartości nazwy pliku "
+#~ "dla urządzenia \"%s\" , pomijanie.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get phys value for device "
+#~ "\"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfiguracja, nie można uzyskać wartości phys dla "
+#~ "urządzenia \"%s\" , pomijanie.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_custom value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfiguracja, nie można uzyskać wartości is_custom "
+#~ "dla urządzenia \"%s\" , pomijanie.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unexpected value for device \"%s\", "
+#~ "skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfiguracja, niespodziewana wartość dla urządzenia "
+#~ "\"%s\" , pomijanie.\n"
+
+#~ msgid "Detected"
+#~ msgstr "Wykryto"
+
+#~ msgid "Custom"
+#~ msgstr "Własne"
+
+#~ msgid "Not Detected"
+#~ msgstr "Nie wykryto"
+
+#~ msgid "Information"
+#~ msgstr "Informacja"
+
+#~ msgid ""
+#~ "Cannot open bindings window for a not-detected device.\n"
+#~ "Ensure that the device has been correctly plugged in."
+#~ msgstr ""
+#~ "Nie można otworzyć okna dowiązań dla nie-wykrytego urządzenia.\n"
+#~ "Upewnij się, że urządzenie zostało poprawnie podłączone."
+
+#~ msgid ""
+#~ "Unable to open selected device.\n"
+#~ "Please check read permissions on device file."
+#~ msgstr ""
+#~ "Nie można otworzyć wybranego urządzenia.\n"
+#~ "Proszę sprawdzić uprawnienia czytania dla pliku urządzenia."
+
+#~ msgid "EvDev-Plug - Add custom device"
+#~ msgstr "EvDev-Plug - Dodaj niestandardowe urządzenie"
+
+#~ 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 próbuje automatycznie wykryć i zaktualizować informacje o\n"
+#~ "urządzeniach zdarzeń dostępnych w systemie.\n"
+#~ "Jeśli jednak auto-detekcja nie zadziała bądź posiadasz nietypowe "
+#~ "urządzenia\n"
+#~ "(znajdują się obecnie tylko w /dev/input/), możesz spróbować dodać je\n"
+#~ "ręcznie podając przy tym nazwę oraz plik urządzenia."
+
+#~ msgid "Device name:"
+#~ msgstr "Nazwa urządzenia:"
+
+#~ msgid "Device file:"
+#~ msgstr "Plik urządzenia:"
+
+#~ msgid "(custom)"
+#~ msgstr "(własne)"
+
+#~ msgid ""
+#~ "Please specify both name and filename.\n"
+#~ "Filename must be specified with absolute path."
+#~ msgstr ""
+#~ "Proszę podać zarówno nazwę, jak i lokalizację pliku.\n"
+#~ "Nazwa pliku musi zostać podana z bezpośrednią ścieżką."
+
+#~ msgid ""
+#~ "Do you want to remove the existing configuration for selected device?\n"
+#~ msgstr ""
+#~ "Czy chcesz usunąć istniejącą konfigurację dla wybranego urządzenia?\n"
+
+#~ msgid "Do you want to remove the selected custom device?\n"
+#~ msgstr "Czy chcesz usunąć wybrane niestandardowe urządzenie?\n"
+
+#~ msgid "EvDev-Plug - Configuration"
+#~ msgstr "EvDev-Plug - Konfiguracja"
+
+#~ msgid "Active"
+#~ msgstr "Aktywne"
+
+#~ msgid "Status"
+#~ msgstr "Stan"
+
+#~ msgid "Device Name"
+#~ msgstr "Nazwa urządzenia"
+
+#~ msgid "Device File"
+#~ msgstr "Plik urządzenia"
+
+#~ msgid "Device Address"
+#~ msgstr "Adres urządzenia"
+
+#~ msgid "_Bindings"
+#~ msgstr "_Dowiązania"
+
+#~ 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 ""
+#~ "Wciśnij przycisk twojego urządzenia, aby skojarzyć go z wtyczką;\n"
+#~ "jeśli żaden przycisk nie zostanie wciśnięŧy przez kolejne 5 sekund, \n"
+#~ "to nastąpi zamknięcie tego okna bez dokonywania zmian."
+
+#~ 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 ""
+#~ "To zdarzenie wejścia zostało już przypisane.\n"
+#~ "\n"
+#~ "Nie można przydzielić wielu akcji do tego samego zdarzenia wejścia "
+#~ "(jednakże można przypisać tą samą akcję do wielu zdarzeń)."
+
+#~ msgid "EvDev-Plug - Bindings Configuration"
+#~ msgstr "EvDev-Plug - Konfiguracja dowiązań"
+
+#~ msgid "Name: "
+#~ msgstr "Nazwa: "
+
+#~ msgid "Filename: "
+#~ msgstr "Lokalizacja pliku: "
+
+#~ msgid "Phys.Address: "
+#~ msgstr "Adres fizyczny: "
+
+#~ msgid "EvDev-Plug - about"
+#~ msgstr "O wtyczce 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"
+#~ "Zdalna kontrola odtwarzacza poprzez urządzenia zdarzeń\n"
+#~ "http://www.develia.org/projects.php?p=audacious#evdevplug\n"
+#~ "\n"
+#~ "Autor: Giacomo Lozito\n"
+
+#~ msgid "This LADSPA plugin has no user controls"
+#~ msgstr "Ta wtyczka LADSPA nie ma żadnych kontrolek użytkownika"
+
+#~ msgid "Name"
+#~ msgstr "Nazwa"
+
+#~ msgid "UID"
+#~ msgstr "UID"
+
+#~ msgid "Installed plugins"
+#~ msgstr "Zainstalowane wtyczki"
+
+#~ msgid "Running plugins"
+#~ msgstr "Uruchomione wtyczki"
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Remove"
+#~ msgstr "Usuń"
+
+#~ msgid "LADSPA Plugin Catalog"
+#~ msgstr "Katalog wtyczki LADSPA"
+
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "O wtyczce LIRC Audacious"
+
+#~ msgid "LIRC Plugin "
+#~ msgstr "Wtyczka 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"
+#~ "Prosta wtyczka pozwalająca na kontrolowanie\n"
+#~ "Audacious poprzez demona zdalnego sterowania LIRC\n"
+#~ "\n"
+#~ "Przystosowany do użycia z Audacious przez:\n"
+#~ "Tony Vroon <chainsaw@gentoo.org>\n"
+#~ "Oryginalna wtyczka LIRC dla XMMS stworzona przez:\n"
+#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
+#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
+#~ "Andrew O. Shadoura <bugzilla@tut.by>\n"
+#~ "Więcej informacji o LIRC na:\n"
+#~ "http://lirc.org"
+
+#~ msgid "LIRC plugin settings"
+#~ msgstr "Ustawienia wtyczki LIRC"
+
+#~ msgid "Reconnect to LIRC server"
+#~ msgstr "Połącz ponownie z serwerem LIRC"
+
+#~ msgid "Timeout before reconnecting (seconds): "
+#~ msgstr "Czas oczekiwania przed re-połączeniem (w sekundach): "
+
+#~ msgid "Reconnect"
+#~ msgstr "Połącz ponownie"
+
+#~ msgid "Connection"
+#~ msgstr "Połączenie"
+
+#~ msgid "%s: could not init LIRC support\n"
+#~ msgstr "%s: nie można zainicjować wsparcia 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: błąd czytania pliku konfiguracji LIRC\n"
+#~ "%s: proszę przeczytać dokumentację LIRC\n"
+#~ "%s: jak stworzyć poprawny plik konfiguracji\n"
+
+#~ msgid "%s: trying to reconnect...\n"
+#~ msgstr "%s: próba ponownego połączenia...\n"
+
+#~ msgid "%s: unknown command \"%s\"\n"
+#~ msgstr "%s: nieznana komenda \"%s\"\n"
+
+#~ msgid "%s: disconnected from LIRC\n"
+#~ msgstr "%s: rozłączony z LIRC\n"
+
+#~ msgid "%s: will try reconnect every %d seconds...\n"
+#~ msgstr "%s: próba ponownego połączenia po każdych %d sekundach...\n"
+
+#~ msgid "ModPlug Configuration"
+#~ msgstr "Konfiguracja ModPlug"
+
+#~ msgid "16 bit"
+#~ msgstr "16 bit"
+
+#~ msgid "8 bit"
+#~ msgstr "8 bit"
+
+#~ msgid "Mono (downmix)"
+#~ msgstr "Mono (downmix)"
+
+#~ msgid "Nearest (fastest)"
+#~ msgstr "Najbliższy (najszybszy)"
+
+#~ msgid "Linear (fast)"
+#~ msgstr "Liniowy (szybki)"
+
+#~ msgid "Spline (good quality)"
+#~ msgstr "Spline (dobra jakość)"
+
+#~ msgid "8-tap Fir (extremely high quality)"
+#~ msgstr "8-tap Fir (bardzo wysoka jakość)"
+
+#~ 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 "Częstotliwość próbkowania"
+
+#~ msgid "Enable"
+#~ msgstr "Włącz"
+
+#~ msgid "Depth"
+#~ msgstr "Głębia"
+
+#~ msgid "Delay"
+#~ msgstr "Opóźnienie"
+
+#~ msgid "Reverb"
+#~ msgstr "Pogłos"
+
+#~ msgid "Amount"
+#~ msgstr "Ilość"
+
+#~ msgid "Range"
+#~ msgstr "Zakres"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Bass Boost"
+
+#~ msgid ""
+#~ "Note: Setting the preamp\n"
+#~ "too high may cause clipping\n"
+#~ "(annoying clicks and pops)!"
+#~ msgstr ""
+#~ "Uwaga: Zbyt wysokie ustawienie\n"
+#~ "przedwzmacniacza może wywołać\n"
+#~ "denerwujące kliki i trzaski!"
+
+#~ msgid "Effects"
+#~ msgstr "Efekty"
+
+#~ msgid "Use Filename as Song Title"
+#~ msgstr "Użyj nazwy pliku jako tytułu piosenki"
+
+#~ msgid "Fast Playlist Info"
+#~ msgstr "Szybkie info playlisty"
+
+#~ msgid "Noise Reduction"
+#~ msgstr "Redukcja zakłóceń"
+
+#~ msgid "Play Amiga MOD"
+#~ msgstr "Odtwarzaj Amiga MOD"
+
+#~ msgid "Don't loop"
+#~ msgstr "Nie powtarzaj"
+
+#~ msgid "Loop"
+#~ msgstr "Powtarzaj"
+
+#~ msgid "time(s)"
+#~ msgstr "raz(y)"
+
+#~ msgid "Loop forever"
+#~ msgstr "Powtarzaj w nieskończoność"
+
+#~ msgid "Looping"
+#~ msgstr "Powtarzanie"
+
+#~ msgid "MOD Info"
+#~ msgstr "Info MOD"
+
+#~ msgid ""
+#~ "Filename:\n"
+#~ "Title:\n"
+#~ "Type:\n"
+#~ "Length:\n"
+#~ "Speed:\n"
+#~ "Tempo:\n"
+#~ "Samples:\n"
+#~ "Instruments:\n"
+#~ "Patterns:\n"
+#~ "Channels:"
+#~ msgstr ""
+#~ "Nazwa pliku:\n"
+#~ "Tytuł:\n"
+#~ "Typ:\n"
+#~ "Czas trwania:\n"
+#~ "Szybkość:\n"
+#~ "Tempo:\n"
+#~ "Próbki:\n"
+#~ "Instrumenty:\n"
+#~ "Wzory:\n"
+#~ "Kanały:"
+
+#~ msgid ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+#~ msgstr ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+
+#~ msgid "Samples"
+#~ msgstr "Próbki"
+
+#~ msgid "Instruments"
+#~ msgstr "Instrumenty"
+
+#~ msgid "Message"
+#~ msgstr "Wiadomość"
+
+#~ msgid "Modplug Input Plugin for Audacious ver"
+#~ msgstr "Wtyczka wejścia Modplug dla Audacious ver"
+
+#~ 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"
+#~ "Silnik dźwiękowy Modplug napisany przez Olivier Lapicque.\n"
+#~ "Interfejs XMMS dla Modplug przez Kenton Varda.\n"
+#~ "(c)2000 Olivier Lapicque i Kenton Varda.\n"
+#~ "Aktualizacje i konserwacja przez Konstanty Bialkowski.\n"
+#~ "Portowany do BMP przez Theofilos Intzoglou."
+
+#~ msgid "About Modplug"
+#~ msgstr "O Modplug"
+
+#~ msgid "Show separators in playlist"
+#~ msgstr "Pokaż separatory na playliście"
+
+#~ msgid "Show window manager decoration"
+#~ msgstr "Pokaż dekoracje menedżera okien"
+
+#~ msgid "This enables the window manager to show decorations for windows."
+#~ msgstr "Używa dla okna odtwarzacza obramowania włączonego menedżera okien."
+
+#~ 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 ""
+#~ "Jeśli zaznaczone, informacje o pliku w oknie głównym są przewijane tam i "
+#~ "z powrotem. Gdy niezaznaczone, tekst jest przewijany w jednym kierunku."
+
+#~ msgid "Disable inline gtk theme"
+#~ msgstr "Użyj globalnego stylu gtk"
+
+#~ msgid "Random skin on play"
+#~ msgstr "Losowa skórka przy odtwarzaniu"
+
+#~ msgid "Allow loading incomplete skins"
+#~ msgstr "Pozwól na ładowanie niekompletnych skórek"
+
+#~ msgid ""
+#~ "If selected, audacious won't refuse loading broken skins. Use only if "
+#~ "your favourite skin doesn't work"
+#~ msgstr ""
+#~ "Jeśli zaznaczone, Audacious nie wstrzymie ładowania zepsutych skórek. "
+#~ "Używaj tylko wtedy, gdy twoja ulubiona skórka nie chce działać."
+
+#~ msgid "Color Adjustment"
+#~ msgstr "Dopasowanie kolorów"
+
+#~ msgid ""
+#~ "Audacious allows you to alter the color balance of the skinned UI. The "
+#~ "sliders below will allow you to do this."
+#~ msgstr ""
+#~ "Audacious pozwala na zmianę balansu kolorów dowolnej skórki przy użyciu "
+#~ "poniższych suwaków."
+
+#~ msgid "Blue"
+#~ msgstr "Niebieski"
+
+#~ msgid "Green"
+#~ msgstr "Zielony"
+
+#~ msgid "Red"
+#~ msgstr "Czerwony"
+
+#~ msgid "Color adjustment ..."
+#~ msgstr "Dopasowanie kolorów..."
+
+#~ msgid "Disable 'GUI Scaling'"
+#~ msgstr "Wyłącz 'Skalowanie GUI'"
+
+#~ msgid "Enable 'GUI Scaling'"
+#~ msgstr "Włącz 'Skalowanie GUI'"
+
+#~ msgid "DoubleSize"
+#~ msgstr "Podwójna wielkość"
+
+#~ msgid "Easy Move"
+#~ msgstr "Łatwe przesuwanie"
+
+#~ msgid "Spectrum Analyzer"
+#~ msgstr "Analizator Spektrum"
+
+#~ msgid "Search:"
+#~ msgstr "Szukaj:"
+
+#~ msgid "Add Bookmark"
+#~ msgstr "Dodaj zakładkę"
+
+#~ msgid "Stream name"
+#~ msgstr "Nazwa strumienia"
+
+#~ msgid "Now playing"
+#~ msgstr "Teraz odtwarzane"
+
+#~ msgid "Remove Bookmark"
+#~ msgstr "Usuń zakładkę"
+
+#~ msgid "About Stream Browser"
+#~ msgstr "O przeglądarce strumieni"
+
+#~ 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, Calin Crisan <ccrisan@gmail.com> oraz zespół "
+#~ "Audacious.\n"
+#~ "To jest prosta przeglądarka strumieni, która zawiera najpopularniejsze "
+#~ "katalogi strumieni.\n"
+#~ "Podziękowania dla deweloperów Streamtuner: <http://www.nongnu.org/"
+#~ "streamtuner>,\n"
+#~ "\ti oczywiście dla całej społeczności Audacious.\n"
+#~ "\n"
+#~ "Poza tym dziękuję Tony Vroon za prowadzenie i udzielanie wskazówek.\n"
+#~ "\n"
+#~ "To był projekt na Google Summer of Code 2008."
+
+#~ msgid "Can't jump to time when no track is being played.\n"
+#~ msgstr ""
+#~ "Nie można przeskoczyć do czasu, gdy żaden utwór nie jest odtwarzany.\n"
+
+#~ msgid "minutes:seconds"
+#~ msgstr "minuty:sekundy"
+
+#~ msgid "Track length:"
+#~ msgstr "Długość utworu:"
+
+#~ msgid "Error writing playlist \"%s\": %s"
+#~ msgstr "Błąd zapisywania playlisty \"%s\": %s"
+
 #~ msgid "%s already exist. Continue?"
 #~ msgstr "%s już istnieje. Kontynuować?"
 
+#~ msgid "Show/hide infoarea"
+#~ msgstr "Pokaż/ukryj obszar informacji"
+
+#~ msgid "Show main menu"
+#~ msgstr "Pokaż menu główne"
+
+#~ msgid "Show/hide main menu"
+#~ msgstr "Pokaż/ukryj menu główne"
+
+#~ msgid "Show/hide statusbar"
+#~ msgstr "Pokaż/ukryj pasek stanu"
+
+#~ msgid "Import Playlist ..."
+#~ msgstr "Importuj playlistę ..."
+
+#~ msgid "Export Playlist ..."
+#~ msgstr "Eksportuj playlistę ..."
+
+#~ msgid "Refresh"
+#~ msgstr "Odśwież"
+
+#~ msgid "Refresh Selected"
+#~ msgstr "Odśwież zaznaczone"
+
+#~ msgid "Refreshes metadata associated with selected entries."
+#~ msgstr "Odświeża metadane przypisane do wybranych utworów."
+
+#~ msgid "Edit title"
+#~ msgstr "Zmień nazwę"
+
+#~ msgid "Edit the playlist title."
+#~ msgstr "Pozwala edytować tytuł playlisty."
+
+#~ msgid "By Formatted Title"
+#~ msgstr "Sformatowany tytuł"
+
+#~ msgid "Components"
+#~ msgstr "Wtyczki"
+
+#~ msgid "Upload selected track(s)"
+#~ msgstr "Wgraj zaznaczone ścieżki"
+
+#~ msgid "MTP device handler"
+#~ msgstr "Urządzenie MTP"
+
+#~ msgid "Skinned Interface"
+#~ msgstr "Skórkowy Interfejs"
+
+#~ msgid "Show main player window"
+#~ msgstr "Pokaż głowne okno odtwarzacza"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignoruj"
+
+#~ 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 został uruchomiony z ukrytymi wszystkimi oknami.\n"
+#~ "Być może zechcesz ponownie włączyć główne okno odtwarzacza; jeśli nie, "
+#~ "będziesz musiał kontrolować Audacious zdalnie poprzez audtool lub "
+#~ "załadowane wtyczki (takie jak Status Icon)."
+
+#~ msgid "Always ignore, show/hide is controlled remotely"
+#~ msgstr "Zawsze ignoruj, pokazywanie/ukrywanie kontrolowane zdalnie"
+
+#~ msgid "Audacious - broken GTK engine usage warning"
+#~ msgstr "Audacious - ostrzeżenie o użyciu wadliwego silnika 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>Wadliwy silnik GTK jest w użyciu</big>\n"
+#~ "\n"
+#~ "Audacious wykrył, że używasz niesprawnego silnika GTK.\n"
+#~ "\n"
+#~ "Silnik motywów, którego używasz: %s jest niezgodny z niektórymi "
+#~ "elementami używanymi przez nowoczesne skórki. Niedziałające obiekty "
+#~ "zostały wyłączone na czas trwania tej sesji.\n"
+#~ "\n"
+#~ "Aby uzyskać możliwość używania tych elementów, powinieneś rozważyć zmianę "
+#~ "silnika motywów GTK."
+
+#~ msgid "Do not display this warning again"
+#~ msgstr "Nie wyświetlaj tego ostrzeżenia ponownie"
+
+#~ msgid "Save as Static Playlist"
+#~ msgstr "Zapisz jako statyczną playlistę"
+
+#~ msgid "Use Relative Path"
+#~ msgstr "Użyj względnej ścieżki"
+
+#~ msgid "Load Playlist"
+#~ msgstr "Wczytaj playlistę"
+
+#~ msgid "Save Playlist"
+#~ msgstr "Zapisz playlistę"
+
 #~ msgid "%s: %d kbps, %d Hz, %s"
 #~ msgstr "%s: %d kbps, %d Hz, %s"

audacious-plugins-2.5.3.tar.gz/po/ro.po -> audacious-plugins-3.0.tar.gz/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-05-19 10:53-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"
@@ -19,7 +19,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, fuzzy, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -31,629 +31,55 @@
 "decoder-ul este ·(C)·Nero·AG,·www.nero.com\n"
 "Copyright·(c)·2005-2006·Echipa de dezvoltare Audacious"
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 #, fuzzy
 msgid "About MP4 AAC decoder plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "Despre "
-
-#: src/adplug/adplug-xmms.cc:155
-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"
-"Acest plugin este distribuit conform termenilor și condițiilor licenței GNU "
-"LGPL.\n"
-"Vedeți·http://www.gnu.org/licenses/lgpl.html·tentru detalii.\n"
-"\n"
-"Plugin-ul folosește biblioteca AdPlug,·Copyright·(C)·Simon·Peter·și alții.\n"
-"Versiunea AdPlug pentru care a fost link-editat:·"
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug·::·Configurare"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "Ok"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Anulează"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "General"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Calitatea sunetului"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Rezoluție"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8 biți"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16 biți"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Canale"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Stereo"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-"Nu este recomandată setarea forțată Stereo, decât dacă este neapărată "
-"nevoieAceastă setare nu va adăuga efecte stereo, deoarece OPL2 suportă doar "
-"MonoVa consuma însă mai multe resurse de calcul!"
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Frecvența"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Redare"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Detectează sfârșitul melodiei"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-"Dacă este activat, Audacious va detecta·sfârșitul melodiei, va opri redarea "
-"și va avansa la melodia următoare. Dacă este dezactivat, nu se va ști când s-"
-"a terminat melodia și va fi redată din nou, la infinit. "
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Formate"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Selecția formatelor"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Format"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Extensie"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-"Tipurile de fișiere selectate vor fi recunoscute și redate de acest plugin. "
-"Cele deselectate vor fi ignorate, dar pot fi redate de alte pluginuri."
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug·::·Informații despre fișier"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Numele Fișierului:"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Titlu: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Autor: "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Tipul Fișierului: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "Sub-melodii: "
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Instrumente: "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "Ordine: "
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Șabloane: "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Melodia"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Numele Instrumentului"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Mesajul melodiei"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "Selecția sub-melodiei"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Ordine: "
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Șablon: "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Linie: "
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Viteză: "
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Cronometru: "
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "Despre plugin-ul·pentru Alarmă"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "XMMS·Alarm"
-
-#: src/alarm/interface.c:56
-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 ""
-"Acest plugin poate fi folosit pentru\n"
-"a orni redarea la un anumit timp.\n"
-"\n"
-"Trimiteți eventualele reclamații la:\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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Închide"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Alarmă"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "Acesta este semnalul de deșteptare."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "Ok"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Selectați Playlist-ul"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Ne pare rău"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Avertizare"
-
-#: src/alarm/interface.c:213
-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 ""
-"Din motive de siguranță, timpul de \"liniște\" trebuie să fie de minim 65 "
-"secunde.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"
-
-#: src/alarm/interface.c:229
-msgid "Oh Well"
-msgstr "Ok"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Opțiuni ale plugin-ului Alarm"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Timp"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "ore"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr ""
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Oprește după:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Alarmă la (implicit):"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Alegeți zilele în care să pornească alarma"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-#, fuzzy
-msgid "Default"
-msgstr "Implicit"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Ziua"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Marți"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Miercuri"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Joi"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Vineri"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Sâmbătă"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Duminică"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Luni"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Zile"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Tranziție"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-#, fuzzy
-msgid "seconds"
-msgstr "secunde"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-#, fuzzy
-msgid "Volume"
-msgstr "Volum: %d%%"
-
-#: src/alarm/interface.c:1121
-#, fuzzy
-msgid "Current"
-msgstr "Plugin-ul de ieșire curent"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "resetează la volumul curent"
-
-#: src/alarm/interface.c:1130
-#, fuzzy
-msgid "Start at"
-msgstr "Începe redarea playlist-ului curent"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Final"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Comandă adițională"
-
-#: src/alarm/interface.c:1253
-#, fuzzy
-msgid "enable"
-msgstr "Activează modul 'Mărime Dublă'"
-
-#: src/alarm/interface.c:1261
-#, fuzzy
-msgid "Playlist (optional)"
-msgstr "Selectați Playlist-ul"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Răsfoiește"
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-#, fuzzy
-msgid "Reminder"
-msgstr "Reminder"
-
-#: src/alarm/interface.c:1312
-#, fuzzy
-msgid "Use reminder"
-msgstr "Folosește cursoare de mouse personalizate (oferite de skin)"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-#, fuzzy
-msgid "Options"
-msgstr "Meniu de Opțiuni"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Ce înseamnă opțiunile acestea?"
-
-#: src/alarm/interface.c:1364
-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"
-"Timp\n"
-" Alarmă la: \n"
-" Ora la care se va declanșa alarma.\n"
-"\n"
-" Oprește după: \n"
-" Oprește alarma după atât timp.\n"
-" (dacă dialogul de trezire nu este închis)\n"
-"\n"
-"\n"
-"Zile\n"
-" Ziua:\n"
-" Selectați zilele în care să se activeze alarma.\n"
-"\n"
-" Timp:\n"
-" Alegeți timpul la care va porni alarma în fiecare zi.\n"
-" sau selectați valoarea implicită folosind butonul\n"
-"\n"
-"\n"
-"Volum\n"
-" Tranziție: \n"
-" Va face volumul să crească lent până la valoarea \n"
-" maximă, iar aceasta este durata perioadei de\n"
-" tranziție.\n"
-"\n"
-"\n"
-" Volum inițial: \n"
-" Începe tranziția de la această valoare inițială a \n"
-" volumului.\n"
-"\n"
-" Volum final: \n"
-" Volumul maxim la care se va ajunge în timpul \n"
-" tranziției.\n"
-"\n"
-"\n"
-"Opțiuni:\n"
-" Comandă adițională:\n"
-" Comandă ce va fi rulată la momentul declanșării \n"
-" alarmei.\n"
-"\n"
-" Playlist: \n"
-" Încarcă un playlist a cărui melodii vor fi redate\n"
-" la declanșarea alarmei. (cu extensie .m3u), sau \n"
-" un link spre un fișier sau stream audio.\n"
-" Dacă nu este dat nimic vor fi folosite melodiile\n"
-" existente în playlist.\n"
-"\n"
-" Reminder:\n"
-" Afișează un mesaj de reamintire când alarma se \n"
-" oprește. Editați mesajul și activați-l dacă doriți \n"
-" ca acesta să fie afișat.\n"
-
-#: src/alarm/interface.c:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Ajutor"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "Mesajul de reamintire pentru ziua de azi este..."
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Mulțumesc"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 #, fuzzy
 msgid "Default PCM device"
 msgstr "Salvează Lista Implicită"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 #, fuzzy
 msgid "Default mixer device"
 msgstr "Salvează Lista Implicită"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 #, fuzzy
 msgid "ALSA Output Plugin Preferences"
 msgstr "Preferințele Plugin-ului de Ieșire"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 #, fuzzy
 msgid "PCM device:"
 msgstr "Dispozitiv mixer:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Dispozitiv mixer:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 #, fuzzy
 msgid "Mixer element:"
 msgstr "Dispozitiv mixer:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 #, fuzzy
 msgid "About ALSA Output Plugin"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 #, fuzzy
 msgid "ALSA error"
 msgstr "Terror"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -824,6 +250,10 @@
 msgid "SoundFont settings"
 msgstr "Opțiuni pentru Popup-ul cu informații suplimentare"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Numele Fișierului:"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 #, fuzzy
 msgid "Size (bytes)"
@@ -936,8 +366,7 @@
 "backend"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 #, fuzzy
 msgid "Name:"
 msgstr "Numele Instrumentului"
@@ -1097,212 +526,212 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Pozitionare"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 #, fuzzy
 msgid "Relative X offset:"
 msgstr "Folosește cale relativă"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 #, fuzzy
 msgid "Relative Y offset:"
 msgstr "Folosește cale relativă"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 #, fuzzy
 msgid "Display OSD using:"
 msgstr "Arată fereastra principală"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 #, fuzzy
 msgid "all monitors"
 msgstr "Selectează Tot"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 #, fuzzy
 msgid "Display:"
 msgstr "La afișare"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 #, fuzzy
 msgid "Fade in:"
 msgstr "Pornește"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 #, fuzzy
 msgid "Fonts"
 msgstr "_Fonturi"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, fuzzy, c-format
 msgid "Font %i:"
 msgstr "Alege fontul playlist-ului"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Internaţionalizare"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 #, fuzzy
 msgid "Select Skin File"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Culori"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, fuzzy, c-format
 msgid "Color %i:"
 msgstr "Ajustarea culorii"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 #, fuzzy
 msgid "Custom Skin"
 msgstr "Skin-ul implicit:"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 #, fuzzy
 msgid "Skin file:"
 msgstr "Tipul Fișierului: "
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 #, fuzzy
 msgid "Enable trigger"
 msgstr "Activează modul 'Mărime Dublă'"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Eveniment"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 #, fuzzy
 msgid "Composite manager detected"
 msgstr "Deschide Managerul de Playlist-uri"
 
-#: src/aosd/aosd_ui.c:808
+#: 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"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Transparenţă"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Transparenţă falsă"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparenţă reală (necesita Extensia X Composite)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "Extensia composită nu a fost încărcată"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "Extensia composită nu este disponibilă"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 #, fuzzy
 msgid "Audacious OSD - configuration"
 msgstr "Developerii Audacious:"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Test"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Poziţie"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Animaţie"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Decoraţii"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Declanşator"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 #, fuzzy
 msgid "Audacious OSD - about"
 msgstr "Despre plugin-ul·pentru Alarmă"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1315,133 +744,6 @@
 "\n"
 msgstr ""
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr ""
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr ""
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr ""
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr ""
-
-#: src/bluetooth/gui.c:221
-#, fuzzy
-msgid "Available Headsets"
-msgstr "_Preset-uri disponibile:"
-
-#: src/bluetooth/gui.c:224
-#, fuzzy
-msgid "Current Headset"
-msgstr "Plugin-ul de ieșire curent"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr ""
-
-#: src/bluetooth/gui.c:231
-#, fuzzy
-msgid "_Connect"
-msgstr "Mod de Vizualizare"
-
-#: src/bluetooth/gui.c:237
-#, fuzzy
-msgid "_Close"
-msgstr "Închide"
-
-#: src/bluetooth/gui.c:274
-#, fuzzy
-msgid "Class"
-msgstr "Classical"
-
-#: src/bluetooth/gui.c:278
-#, fuzzy
-msgid "Address:"
-msgstr "Adaugă Adresa Internet..."
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:138
-#, fuzzy
-msgid "Rescan"
-msgstr "Dreptunghi"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-#, fuzzy
-msgid "Play"
-msgstr "Pauză pentru"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr ""
@@ -1451,12 +753,12 @@
 msgid "Options:"
 msgstr "Meniu de Opțiuni"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 #, fuzzy
 msgid "About Audio CD Plugin"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1471,16 +773,16 @@
 "Copyright 2009 John Lindgren"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 #, fuzzy
 msgid "Audio CD"
 msgstr "Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -1536,12 +838,24 @@
 msgid "Override default device: "
 msgstr "Salvează Lista Implicită"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+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 "Anulează"
+
+#: src/cd-menu-items/cd-menu-items.c:34
 #, fuzzy
 msgid "Play CD"
 msgstr "Pauză pentru"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 #, fuzzy
 msgid "Add CD"
 msgstr "Adauga CD..."
@@ -1569,6 +883,14 @@
 msgid "Game Console Music Decoder"
 msgstr ""
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "General"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Redare"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Bass:"
@@ -1587,8 +909,7 @@
 msgid "Default song length:"
 msgstr "Pauză"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr ""
 
@@ -1602,6 +923,10 @@
 msgid "Resampling rate:"
 msgstr "Rata de Reîmprospătare"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1664,18 +989,18 @@
 "same rate."
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 #, fuzzy
 msgid "Configure Crystalizer"
 msgstr "Configurează"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 #, fuzzy
 msgid "Effect intensity:"
 msgstr "Lista plugin-urilor de _Efecte"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr ""
 
@@ -1713,369 +1038,33 @@
 msgid "Volume: (%)"
 msgstr "Volum: %d%%"
 
-#: src/evdev-plug/ed.c:60
-#, fuzzy
-msgid "Playback->Play"
-msgstr "Redă fișiere"
-
-#: src/evdev-plug/ed.c:61
-#, fuzzy
-msgid "Playback->Stop"
-msgstr "Oprește melodia curentă"
-
-#: src/evdev-plug/ed.c:62
-#, fuzzy
-msgid "Playback->Pause"
-msgstr "Pauză pentru"
-
-#: src/evdev-plug/ed.c:63
-#, fuzzy
-msgid "Playback->Prev"
-msgstr "Continuă redarea la pornire"
-
-#: src/evdev-plug/ed.c:64
-#, fuzzy
-msgid "Playback->Next"
-msgstr "Selectează Playlist-ul Următor"
-
-#: src/evdev-plug/ed.c:65
-#, fuzzy
-msgid "Playback->Eject"
-msgstr "Continuă redarea la pornire"
-
-#: src/evdev-plug/ed.c:67
-#, fuzzy
-msgid "Playlist->Repeat"
-msgstr "Selectați Playlist-ul"
-
-#: src/evdev-plug/ed.c:68
-#, fuzzy
-msgid "Playlist->Shuffle"
-msgstr "Selectați Playlist-ul"
-
-#: src/evdev-plug/ed.c:70
-#, fuzzy
-msgid "Volume->Up_5"
-msgstr "Restrânge player-ul"
-
-#: src/evdev-plug/ed.c:71
-#, fuzzy
-msgid "Volume->Down_5"
-msgstr "Schimbă volumul cu"
-
-#: src/evdev-plug/ed.c:72
-#, fuzzy
-msgid "Volume->Up_10"
-msgstr "Restrânge player-ul"
-
-#: src/evdev-plug/ed.c:73
-#, fuzzy
-msgid "Volume->Down_10"
-msgstr "Schimbă volumul cu"
-
-#: src/evdev-plug/ed.c:74
-#, fuzzy
-msgid "Volume->Mute"
-msgstr "Schimbă volumul cu"
-
-#: src/evdev-plug/ed.c:76
-#, fuzzy
-msgid "Window->Main"
-msgstr "Arată fereastra principală"
-
-#: src/evdev-plug/ed.c:77
-#, fuzzy
-msgid "Window->Playlist"
-msgstr "Selectați Playlist-ul"
-
-#: src/evdev-plug/ed.c:78
-#, fuzzy
-msgid "Window->Equalizer"
-msgstr "Egalizator Audacious"
-
-#: src/evdev-plug/ed.c:79
-#, fuzzy
-msgid "Window->JumpToFile"
-msgstr "Fereastra de Preferințe"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:212
-#, fuzzy
-msgid "Detected"
-msgstr "Detectează sfârșitul melodiei"
-
-#: src/evdev-plug/ed_ui.c:217
-#, fuzzy
-msgid "Custom"
-msgstr "Format specificat:"
-
-#: src/evdev-plug/ed_ui.c:223
-#, fuzzy
-msgid "Not Detected"
-msgstr "Selecția formatelor"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-#, fuzzy
-msgid "Information"
-msgstr "Informații despre Track"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-#, fuzzy
-msgid "Error"
-msgstr "Eroare în Audacious"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:353
-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 ""
-
-#: src/evdev-plug/ed_ui.c:361
-#, fuzzy
-msgid "Device name:"
-msgstr "Numele Instrumentului"
-
-#: src/evdev-plug/ed_ui.c:365
-#, fuzzy
-msgid "Device file:"
-msgstr "Tipul Fișierului: "
-
-#: src/evdev-plug/ed_ui.c:404
-#, fuzzy
-msgid "(custom)"
-msgstr "Format specificat:"
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Activ"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Statut"
-
-#: src/evdev-plug/ed_ui.c:664
-#, fuzzy
-msgid "Device Name"
-msgstr "Numele Instrumentului"
-
-#: src/evdev-plug/ed_ui.c:668
-#, fuzzy
-msgid "Device File"
-msgstr "Tipul Fișierului: "
-
-#: src/evdev-plug/ed_ui.c:672
-#, fuzzy
-msgid "Device Address"
-msgstr "Adaugă Adresa Internet..."
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr ""
-
-#: src/evdev-plug/ed_ui.c:1363
-#, fuzzy
-msgid "Name: "
-msgstr "Numele Instrumentului"
-
-#: src/evdev-plug/ed_ui.c:1372
-#, fuzzy
-msgid "Filename: "
-msgstr "Numele Fișierului:"
-
-#: src/evdev-plug/ed_ui.c:1381
-#, fuzzy
-msgid "Phys.Address: "
-msgstr "Adaugă Adresa Internet..."
-
-#: src/evdev-plug/ed_ui.c:1460
-#, fuzzy
-msgid "EvDev-Plug - about"
-msgstr "Despre plugin-ul·pentru Alarmă"
-
-#: src/evdev-plug/ed_ui.c:1491
-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 ""
-
-#: src/ffaudio/ffaudio-core.c:765
+#: 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"
 "Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 #, fuzzy
 msgid "About FileWriter-Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2111,57 +1100,57 @@
 "\n"
 "Autor: Matthieu Sozeau (mattam@altern.org)"
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 #, fuzzy
 msgid "File Writer Configuration"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 #, fuzzy
 msgid "Output file format:"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Configurează"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Salvează în directorul original"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Salvează în directorul specificat"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 #, fuzzy
 msgid "Output file folder:"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Alegeţi un director"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 #, fuzzy
 msgid "Get filename from:"
 msgstr "După calea completă"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 #, fuzzy
 msgid "original file tags"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 #, fuzzy
 msgid "original filename"
 msgstr "După Fișier"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr ""
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr ""
 
@@ -2175,6 +1164,14 @@
 msgid "Joint Stereo"
 msgstr "Stereo"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Mono"
+
 #: src/filewriter/mp3.c:724
 #, fuzzy
 msgid "MP3 Configuration"
@@ -2226,7 +1223,6 @@
 msgstr "Eroare în Audacious"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 #, fuzzy
 msgid "Quality"
 msgstr "Calitatea sunetului"
@@ -2336,12 +1332,12 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 #, fuzzy
 msgid "About Gnome Shortcut Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2350,65 +1346,24 @@
 "\n"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 #, fuzzy
 msgid "Add Files"
 msgstr "Numele Fișierului:"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 #, fuzzy
 msgid "Audacious2"
 msgstr "%s - Audacious"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr ""
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr ""
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-#, fuzzy
-msgid "Jump to Time"
-msgstr "Fereastra de Preferințe"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-#, fuzzy
-msgid "minutes:seconds"
-msgstr "secunde"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-#, fuzzy
-msgid "Track length:"
-msgstr "Informații despre Track"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr ""
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-#, fuzzy
-msgid "Export Playlist"
-msgstr "AdPlug·::·Informații despre fișier"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-#, fuzzy
-msgid "Import Playlist"
-msgstr "AdPlug·::·Informații despre fișier"
-
 #: src/gtkui/columns.c:36
 #, fuzzy
 msgid "Entry number"
@@ -2507,447 +1462,314 @@
 msgid "Disable"
 msgstr "variabil"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr ""
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, fuzzy, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
+#: src/gtkui/menus.c:132
 #, fuzzy
-msgid "Audacious"
-msgstr "%s - Audacious"
+msgid "_Open Files ..."
+msgstr "Numele Fișierului:"
 
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
+#: src/gtkui/menus.c:133
+msgid "Open _URL ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
+#: src/gtkui/menus.c:134
 #, fuzzy
-msgid "Repeat"
-msgstr "Beat"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr ""
+msgid "_Add File ..."
+msgstr "Numele Fișierului:"
 
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr ""
+#: src/gtkui/menus.c:135
+#, fuzzy
+msgid "Add U_RL ..."
+msgstr "Numele Fișierului:"
 
-#: src/gtkui/ui_manager.c:55
+#: src/gtkui/menus.c:137
 #, fuzzy
-msgid "Show statusbar"
-msgstr "Statut"
+msgid "A_bout ..."
+msgstr "Despre "
 
-#: src/gtkui/ui_manager.c:56
+#: src/gtkui/menus.c:138
 #, fuzzy
-msgid "Show/hide statusbar"
-msgstr "Selectați Playlist-ul"
+msgid "_Preferences ..."
+msgstr "Preferințe Audacious"
 
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
-msgstr ""
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#, fuzzy
+msgid "_Quit"
+msgstr "Calitatea sunetului"
 
-#: src/gtkui/ui_manager.c:60
+#: src/gtkui/menus.c:142
 #, fuzzy
-msgid "Scroll on Song Change"
-msgstr "Mesajul melodiei"
+msgid "_Play"
+msgstr "Pauză pentru"
 
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
+#: src/gtkui/menus.c:143
 #, fuzzy
-msgid "Pause"
+msgid "Paus_e"
 msgstr "La încărcare"
 
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
+#: src/gtkui/menus.c:144
 #, fuzzy
-msgid "Stop"
+msgid "_Stop"
 msgstr "Synthpop"
 
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/gtkui/menus.c:145
 #, fuzzy
-msgid "Previous"
+msgid "Pre_vious"
 msgstr "Primus"
 
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+#: src/gtkui/menus.c:146
 #, fuzzy
-msgid "Next"
+msgid "_Next"
 msgstr "Text"
 
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-#, fuzzy
-msgid "Playlist"
-msgstr "Selectați Playlist-ul"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
+#: src/gtkui/menus.c:148
 #, fuzzy
-msgid "New Playlist"
-msgstr "Selectați Playlist-ul"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-#, fuzzy
-msgid "Delete Playlist"
-msgstr "Selectați Playlist-ul"
-
-#: src/gtkui/ui_manager.c:95
-#, fuzzy
-msgid "Import Playlist ..."
-msgstr "AdPlug·::·Informații despre fișier"
+msgid "_Repeat"
+msgstr "Beat"
 
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
+#: src/gtkui/menus.c:149
+msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:98
+#: src/gtkui/menus.c:150
 #, fuzzy
-msgid "Export Playlist ..."
-msgstr "AdPlug·::·Informații despre fișier"
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-#, fuzzy
-msgid "Saves the selected playlist."
-msgstr "Selectați Playlist-ul"
-
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-#, fuzzy
-msgid "Save All Playlists"
+msgid "N_o Playlist Advance"
 msgstr "Selectați Playlist-ul"
 
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
+#: src/gtkui/menus.c:151
+msgid "Stop _After This Song"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:106
-msgid "Refresh"
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:110
+#: src/gtkui/menus.c:154
 #, fuzzy
-msgid "Refresh Selected"
-msgstr "Selecția formatelor"
+msgid "Jump to _Time ..."
+msgstr "Fereastra de Preferințe"
 
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:115
+#: src/gtkui/menus.c:158
 #, fuzzy
-msgid "Playlist Manager"
-msgstr "Selectați Playlist-ul"
-
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr ""
+msgid "By Track _Number"
+msgstr "Numărul Trackului"
 
-#: src/gtkui/ui_manager.c:123
+#: src/gtkui/menus.c:159
 #, fuzzy
-msgid "Add Files ..."
-msgstr "Numele Fișierului:"
+msgid "By _Title"
+msgstr "Titlu"
 
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr ""
+#: src/gtkui/menus.c:160
+#, fuzzy
+msgid "By _Artist"
+msgstr "Artist"
 
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
+#: src/gtkui/menus.c:161
 #, fuzzy
-msgid "Remove All"
-msgstr "Șterge Duplicatele"
+msgid "By A_lbum"
+msgstr "Album"
 
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr ""
+#: src/gtkui/menus.c:162
+#, fuzzy
+msgid "By Release _Date"
+msgstr "Data:"
 
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr ""
+#: src/gtkui/menus.c:163
+#, fuzzy
+msgid "By _File Path"
+msgstr "Numele Fișierului:"
 
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr ""
+#: src/gtkui/menus.c:164
+#, fuzzy
+msgid "By _Custom Title"
+msgstr "Skin-ul implicit:"
 
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
+#: src/gtkui/menus.c:166
+msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
+#: src/gtkui/menus.c:167
+msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:140
+#: src/gtkui/menus.c:172
 #, fuzzy
-msgid "Edit the playlist title."
-msgstr "Selectați Playlist-ul"
+msgid "_Sort"
+msgstr "Port-ul:"
 
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
+#: src/gtkui/menus.c:174
+msgid "_New"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:146
+#: src/gtkui/menus.c:175
 #, fuzzy
-msgid "Sort"
-msgstr "Port-ul:"
+msgid "_Close"
+msgstr "Închide"
 
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
+#: src/gtkui/menus.c:177
 #, fuzzy
-msgid "By Track Number"
-msgstr "Numărul Trackului"
+msgid "_Import ..."
+msgstr "Importă"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
+#: src/gtkui/menus.c:178
 #, fuzzy
-msgid "By Title"
-msgstr "Titlu"
+msgid "_Export ..."
+msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
+#: src/gtkui/menus.c:180
 #, fuzzy
-msgid "By Artist"
-msgstr "Artist"
+msgid "_Playlist Manager ..."
+msgstr "Selectați Playlist-ul"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
+#: src/gtkui/menus.c:183
 #, fuzzy
-msgid "By Album"
-msgstr "Album"
+msgid "Volume _Up"
+msgstr "Volum: %d%%"
 
-#: src/gtkui/ui_manager.c:155
+#: src/gtkui/menus.c:184
 #, fuzzy
-msgid "By Release Date"
-msgstr "Data:"
+msgid "Volume _Down"
+msgstr "Schimbă volumul cu"
 
-#: src/gtkui/ui_manager.c:157
+#: src/gtkui/menus.c:186
 #, fuzzy
-msgid "By File Path"
-msgstr "Numele Fișierului:"
+msgid "_Equalizer"
+msgstr "Egalizator Audacious"
 
-#: src/gtkui/ui_manager.c:159
+#: src/gtkui/menus.c:188
 #, fuzzy
-msgid "By Formatted Title"
-msgstr "Titlu"
+msgid "E_ffects"
+msgstr "Efecte"
 
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
+#: src/gtkui/menus.c:191
+msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
+#: src/gtkui/menus.c:194
+msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-#, fuzzy
-msgid "Effects"
-msgstr "Efecte"
-
-#: src/gtkui/ui_manager.c:172
+#: src/gtkui/menus.c:195
 #, fuzzy
-msgid "Equalizer"
-msgstr "Egalizator Audacious"
+msgid "Show _Status Bar"
+msgstr "Statut"
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
+#: src/gtkui/menus.c:197
+msgid "Show Column _Headers"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
+#: src/gtkui/menus.c:198
+msgid "Choose _Columns ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
+#: src/gtkui/menus.c:199
 #, fuzzy
-msgid "File"
-msgstr "Numele Fișierului:"
+msgid "Scrol_l on Song Change"
+msgstr "Mesajul melodiei"
 
-#: src/gtkui/ui_manager.c:188
+#: src/gtkui/menus.c:202
 #, fuzzy
-msgid "Components"
-msgstr "Comentariu"
+msgid "_File"
+msgstr "Numele Fișierului:"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
+#: src/gtkui/menus.c:203
 #, fuzzy
-msgid "View Track Details"
-msgstr "Fereastra cu informații despre Track"
-
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr ""
+msgid "_Playback"
+msgstr "Redare"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
+#: src/gtkui/menus.c:204
 #, fuzzy
-msgid "About Audacious"
-msgstr "Despre plugin-ul decodor MP4·AAC"
-
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
-msgstr ""
+msgid "P_laylist"
+msgstr "Selectați Playlist-ul"
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
 #, fuzzy
-msgid "Load and play a file"
-msgstr "Încarcă SF la pornirea playerului"
-
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
-msgstr ""
+msgid "_Services"
+msgstr "Server"
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
+#: src/gtkui/menus.c:206
 #, fuzzy
-msgid "Play media from the selected location"
-msgstr "Selecția formatelor"
-
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr ""
+msgid "_Output"
+msgstr "Plugin-ul de ieșire curent"
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
+#: src/gtkui/menus.c:207
+msgid "_View"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-#, fuzzy
-msgid "_Quit"
-msgstr "Calitatea sunetului"
-
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-#, fuzzy
-msgid "Quit Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
+#: src/gtkui/menus.c:215
+msgid "_Copy"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
+#: src/gtkui/menus.c:216
+msgid "_Paste"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:217
 #, fuzzy
-msgid "Jump to File"
-msgstr "Fereastra de Preferințe"
-
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
-msgstr ""
+msgid "Select _All"
+msgstr "Selectați Playlist-ul"
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
+#: src/gtkui/menus.c:222
 #, fuzzy
-msgid "Cut"
-msgstr "Cult"
+msgid "_Rename"
+msgstr "Numele Fișierului:"
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-#, fuzzy
-msgid "Select All"
-msgstr "Selectați Playlist-ul"
-
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr ""
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, fuzzy, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
+#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
 #, fuzzy
-msgid "Select None"
-msgstr "AdPlug·::·Informații despre fișier"
+msgid "Audacious"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr ""
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#, fuzzy
+msgid "Error"
+msgstr "Eroare în Audacious"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 #, fuzzy
 msgid "mono"
 msgstr "Mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 #, fuzzy
 msgid "stereo"
 msgstr "Stereo"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "Canale"
 msgstr[1] "Canale"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, c-format
 msgid "%d kbps"
 msgstr ""
@@ -2956,11 +1778,21 @@
 msgid "Previous Track"
 msgstr ""
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#, fuzzy
+msgid "Play"
+msgstr "Pauză pentru"
+
 #: src/hotkey/gui.c:73
 #, fuzzy
 msgid "Pause/Resume"
 msgstr "La încărcare"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#, fuzzy
+msgid "Stop"
+msgstr "Synthpop"
+
 #: src/hotkey/gui.c:75
 #, fuzzy
 msgid "Next Track"
@@ -2989,6 +1821,11 @@
 msgid "Volume Down"
 msgstr "Schimbă volumul cu"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#, fuzzy
+msgid "Jump to File"
+msgstr "Fereastra de Preferințe"
+
 #: src/hotkey/gui.c:82
 #, fuzzy
 msgid "Toggle Player Windows"
@@ -2998,12 +1835,21 @@
 msgid "Show On-Screen-Display"
 msgstr ""
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "Beat"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle Shuffle"
+msgstr ""
+
+#: src/hotkey/gui.c:95
 #, fuzzy
 msgid "(none)"
 msgstr "Deselectează tot"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -3011,40 +1857,40 @@
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr ""
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 #, fuzzy
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Lista plugin-urilor _Generale"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr ""
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 #, fuzzy
 msgid "Action:"
 msgstr "Numele Fișierului:"
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr ""
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 #, fuzzy
 msgid "About Global Hotkey Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -3102,136 +1948,30 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr ""
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr ""
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-#, fuzzy
-msgid "Name"
-msgstr "Numele Instrumentului"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr ""
-
-#: src/ladspa/ladspa.c:1049
-#, fuzzy
-msgid "Installed plugins"
-msgstr "Reîncarcă Plugin-urile"
-
-#: src/ladspa/ladspa.c:1057
-#, fuzzy
-msgid "Running plugins"
-msgstr "Reîncarcă Plugin-urile"
-
-#: src/ladspa/ladspa.c:1072
-#, fuzzy
-msgid "Add"
-msgstr "Adaugă Fișiere"
-
-#: src/ladspa/ladspa.c:1075
-#, fuzzy
-msgid "Remove"
-msgstr "Șterge Duplicatele"
-
-#: src/ladspa/ladspa.c:1086
-#, fuzzy
-msgid "LADSPA Plugin Catalog"
-msgstr "Lista plugin-urilor _Generale"
-
-#: src/lirc/about.c:63
-#, fuzzy
-msgid "About LIRC Audacious Plugin"
-msgstr "Despre plugin-ul decodor MP4·AAC"
-
-#: src/lirc/about.c:90
-#, fuzzy
-msgid "LIRC Plugin "
-msgstr "Plugin de intrare: %s"
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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 ""
-
-#: src/lirc/interface.c:37
-#, fuzzy
-msgid "LIRC plugin settings"
-msgstr "Plugin de intrare: %s"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
+"Looking for lyrics..."
 msgstr ""
 
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr ""
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr ""
-
-#: src/lirc/interface.c:79
-#, fuzzy
-msgid "Connection"
-msgstr "Mod de Vizualizare"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr ""
-
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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 ""
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr ""
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr ""
-
-#: src/lirc/lirc.c:343
-#, fuzzy, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "Încarcă preset din fișier"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
 msgstr ""
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 #, fuzzy
 msgid "About Metronom"
 msgstr "Despre Audacious"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3240,247 +1980,42 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:137
-#, fuzzy
-msgid "ModPlug Configuration"
-msgstr "AdPlug·::·Configurare"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 bit"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 bit"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:286
-#, fuzzy
-msgid "96 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-#, fuzzy
-msgid "Sampling Rate"
-msgstr "Convertor pentru rata de eșantionare"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-#, fuzzy
-msgid "Enable"
-msgstr "Activează modul 'Mărime Dublă'"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-#, fuzzy
-msgid "Depth"
-msgstr "Adancimea cautarii"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-#, fuzzy
-msgid "Preamp"
-msgstr "PREAMP"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
+#: src/mtp_up/mtp.c:298
+msgid "Upload in progress..."
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:606
-#, fuzzy
-msgid "Fast Playlist Info"
-msgstr "AdPlug·::·Informații despre fișier"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:623
-#, fuzzy
-msgid "Play Amiga MOD"
-msgstr "- redă fișierele multimedia"
-
-#: src/modplug/gui/interface.cxx:646
-#, fuzzy
-msgid "Don't loop"
-msgstr "Nu curăța playlist-ul"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
+#: src/mtp_up/mtp.c:311
+msgid "Disconnect MTP Device"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:671
+#: src/notify/libnotify-aosd_event.c:47
 #, fuzzy
-msgid "time(s)"
-msgstr "Timp Scurs"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr ""
+msgid "Stopped"
+msgstr "Synthpop"
 
-#: src/modplug/gui/interface.cxx:859
+#: src/notify/libnotify-aosd_event.c:47
 #, fuzzy
-msgid "MOD Info"
+msgid "Audacious is not playing."
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:938
-#, fuzzy
-msgid "Instruments"
-msgstr "Instrumente: "
-
-#: src/modplug/gui/interface.cxx:959
-#, fuzzy
-msgid "Message"
-msgstr "Mesajul melodiei"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr ""
-
-#: src/modplug/gui/main.cxx:52
-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 ""
-
-#: src/modplug/gui/main.cxx:55
-#, fuzzy
-msgid "About Modplug"
-msgstr "Despre Audacious"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr ""
-
-#: src/mtp_up/mtp.c:290
-msgid "Upload in progress..."
-msgstr ""
-
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr ""
-
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
-msgstr ""
-
 #: src/null/null.c:64
 #, fuzzy
 msgid "Null output plugin "
@@ -3534,12 +2069,12 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 #, fuzzy
 msgid "About OSS4 Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 #, fuzzy
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
@@ -3587,6 +2122,12 @@
 msgid "Default (%s)"
 msgstr "Implicit"
 
+#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+#, fuzzy
+msgid "Default"
+msgstr "Implicit"
+
 #: src/OSS/configure.c:187
 msgid "OSS Driver configuration"
 msgstr ""
@@ -3645,12 +2186,12 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 #, fuzzy
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 #, fuzzy
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
@@ -3707,31 +2248,31 @@
 msgid "Method:"
 msgstr ""
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 #, fuzzy
 msgid "Change password"
 msgstr "Pauză"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr ""
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 #, fuzzy
 msgid "Username:"
 msgstr "Utilizator:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 #, fuzzy
 msgid "Password:"
 msgstr "Parolă:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 #, fuzzy
 msgid "Scrobbler URL:"
 msgstr "Eroare în Audacious"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 #, fuzzy
 msgid "Last.FM"
 msgstr "Radio Last.fm"
@@ -3741,7 +2282,7 @@
 msgid "Scrobbler"
 msgstr "Eroare în Audacious"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3749,17 +2290,17 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 #, fuzzy
 msgid "About Scrobbler Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 #, fuzzy
 msgid "About SDL Output Plugin"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 #, fuzzy
 msgid "SDL error"
 msgstr "Terror"
@@ -3769,11 +2310,19 @@
 msgid "About %s"
 msgstr "Despre %s"
 
-#: src/sid/xs_config.c:323
+#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
+msgid "Close"
+msgstr "Închide"
+
+#: src/sid/xs_config.c:326
 #, fuzzy
 msgid " Error"
 msgstr "Eroare în Audacious"
 
+#: src/sid/xs_config.c:326
+msgid "OK"
+msgstr "Ok"
+
 #: src/sid/xs_fileinfo.c:151
 #, fuzzy
 msgid "General info"
@@ -3784,6 +2333,11 @@
 msgid "Tune #%i: "
 msgstr "Pornește"
 
+#: 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
 #, fuzzy
 msgid "Audacious-SID configuration"
@@ -4070,17 +2624,17 @@
 msgid "Use"
 msgstr ""
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
 #, fuzzy
 msgid "Save"
 msgstr "Salvează"
 
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:435
+#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
 #, fuzzy
 msgid "Import"
 msgstr "Importă"
 
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 #, fuzzy
 msgid "Delete"
 msgstr "Implicit"
@@ -4112,6 +2666,12 @@
 msgid "Playtime:"
 msgstr ""
 
+#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
+#: src/sid/xs_interface.c:1155
+#, fuzzy
+msgid "seconds"
+msgstr "secunde"
+
 #: src/sid/xs_interface.c:928
 msgid "Minimum playtime:"
 msgstr ""
@@ -4358,725 +2918,894 @@
 msgid "No"
 msgstr "Deselectează tot"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr ""
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 msgstr ""
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr ""
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 #, fuzzy
 msgid "_Player:"
 msgstr "Pauză pentru"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 #, fuzzy
 msgid "_Playlist:"
 msgstr "Selectați Playlist-ul"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 #, fuzzy
 msgid "Select playlist font:"
 msgstr "Selectați Playlist-ul"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 #, fuzzy
 msgid "_Fonts"
 msgstr "Numele Fișierului:"
 
-#: src/skins/skins_cfg.c:323
-#, fuzzy
-msgid "Use Bitmap fonts if available"
-msgstr "Folosește fonturi Bitmap dacă sunt disponibile"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.c:324
-#, fuzzy
-msgid "_Miscellaneous"
-msgstr "Meniu de Opțiuni"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr ""
-
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
-msgstr ""
-
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr ""
+#: src/skins/skins_cfg.c:346
+#, fuzzy
+msgid "_Skin"
+msgstr "Numele Fișierului:"
 
-#: src/skins/skins_cfg.c:330
-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 ""
+#: src/skins/skins_cfg.c:393
+#, fuzzy
+msgid "Interface Preferences"
+msgstr "Preferințe Audacious"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr ""
+#: src/skins/ui_equalizer.c:330
+#, fuzzy
+msgid "Preamp"
+msgstr "PREAMP"
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr ""
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "250 Hz"
+msgstr "Rata de eșantionare [Hz]:"
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "500 Hz"
+msgstr "11000 Hz"
 
-#: src/skins/skins_cfg.c:417
+#: src/skins/ui_equalizer.c:335
 #, fuzzy
-msgid "Blue"
-msgstr "Blues"
+msgid "1 kHz"
+msgstr "11 kHz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr ""
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "2 kHz"
+msgstr "22 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr ""
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "4 kHz"
+msgstr "44 kHz"
 
-#: src/skins/skins_cfg.c:569
+#: src/skins/ui_equalizer.c:336
 #, fuzzy
-msgid "_Skin"
-msgstr "Numele Fișierului:"
+msgid "8 kHz"
+msgstr "48 kHz"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr ""
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "16 kHz"
+msgstr "48 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 #, fuzzy
 msgid "Audacious Equalizer"
 msgstr "Egalizator Audacious"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr ""
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 #, fuzzy
 msgid "kHz"
 msgstr "Hz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr ""
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr ""
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr ""
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr ""
-
-#: src/skins/ui_main.c:993
-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 ""
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr ""
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr ""
-
-#: src/skins/ui_main.c:1052
+#: src/skins/ui_main.c:807
 #, c-format
-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."
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr ""
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-msgstr ""
-
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, fuzzy, c-format
 msgid "Volume: %d%%"
 msgstr "Volum: %d%%"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 #, fuzzy
 msgid "Options Menu"
 msgstr "Meniu de Opțiuni"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 #, fuzzy
 msgid "File Info Box"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr ""
-
-#: src/skins/ui_main.c:1639
-#, fuzzy
-msgid "Enable 'GUI Scaling'"
-msgstr "Activează proxy"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr ""
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 #, fuzzy
 msgid "Playlist mode."
 msgstr "Selectați Playlist-ul"
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr ""
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr ""
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr ""
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
-#, fuzzy
-msgid "Peaks"
-msgstr "Pranks"
-
 #: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
-msgid "Show Player"
+msgid "Stop after Current Song"
 msgstr ""
 
 #: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
-msgid "Show Playlist Editor"
-msgstr ""
+#, fuzzy
+msgid "Peaks"
+msgstr "Pranks"
 
 #: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
 #, fuzzy
-msgid "Show Equalizer"
-msgstr "Egalizator Audacious"
+msgid "Repeat"
+msgstr "Beat"
 
 #: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
-msgid "Always on Top"
+msgid "Shuffle"
 msgstr ""
 
 #: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
-msgid "Put on All Workspaces"
+msgid "No Playlist Advance"
 msgstr ""
 
 #: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
-msgid "Roll up Player"
+msgid "Show Player"
 msgstr ""
 
 #: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
-msgid "Roll up Playlist Editor"
+msgid "Show Playlist Editor"
 msgstr ""
 
 #: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
-msgid "Roll up Equalizer"
+#, fuzzy
+msgid "Show Equalizer"
+msgstr "Egalizator Audacious"
+
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+msgid "Always on Top"
 msgstr ""
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+msgid "Put on All Workspaces"
 msgstr ""
 
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+msgid "Roll up Player"
 msgstr ""
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+msgid "Roll up Playlist Editor"
+msgstr ""
+
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+msgid "Roll up Equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 #, fuzzy
 msgid "Analyzer"
 msgstr "Modul Analizatorului"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 #, fuzzy
 msgid "Scope"
 msgstr "Synthpop"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr ""
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr ""
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 #, fuzzy
 msgid "Normal"
 msgstr "Format"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 #, fuzzy
 msgid "Fire"
 msgstr "Satire"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr ""
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 #, fuzzy
 msgid "Lines"
 msgstr "Latin"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 #, fuzzy
 msgid "Bars"
 msgstr "Bass"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 #, fuzzy
 msgid "Dot Scope"
 msgstr "Nu curăța playlist-ul"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr ""
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr ""
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 #, fuzzy
 msgid "Slowest"
 msgstr "Showtunes"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 #, fuzzy
 msgid "Slow"
 msgstr "Slow Jam"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr ""
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 #, fuzzy
 msgid "Fast"
 msgstr "Format"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr ""
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr ""
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr ""
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+#, fuzzy
+msgid "Pause"
+msgstr "La încărcare"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#, fuzzy
+msgid "Previous"
+msgstr "Primus"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+#, fuzzy
+msgid "Next"
+msgstr "Text"
+
+#: src/skins/ui_manager.c:196
 #, fuzzy
 msgid "Visualization"
 msgstr "Internaţionalizare"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+#, fuzzy
+msgid "Playlist"
+msgstr "Selectați Playlist-ul"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#, fuzzy
+msgid "New Playlist"
+msgstr "Selectați Playlist-ul"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 #, fuzzy
 msgid "Select Next Playlist"
 msgstr "Selectați Playlist-ul"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 #, fuzzy
 msgid "Select Previous Playlist"
 msgstr "Selectați Playlist-ul"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#, fuzzy
+msgid "Delete Playlist"
+msgstr "Selectați Playlist-ul"
+
+#: src/skins/ui_manager.c:222
+#, fuzzy
+msgid "Import Playlist"
+msgstr "AdPlug·::·Informații despre fișier"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:226
+#, fuzzy
+msgid "Export Playlist"
+msgstr "AdPlug·::·Informații despre fișier"
+
+#: src/skins/ui_manager.c:227
+#, fuzzy
+msgid "Saves the selected playlist."
+msgstr "Selectați Playlist-ul"
+
+#: src/skins/ui_manager.c:229
+#, fuzzy
+msgid "Save All Playlists"
+msgstr "Selectați Playlist-ul"
+
+#: 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:228
-msgid "List Manager"
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
 msgstr ""
 
 #: src/skins/ui_manager.c:238
+msgid "List Manager"
+msgstr ""
+
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr ""
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr ""
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr ""
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "Preferințe Audacious"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr ""
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr ""
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 #, fuzzy
 msgid "Invert Selection"
 msgstr "Selecția formatelor"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:270
-msgid "Clear Queue"
+#: src/skins/ui_manager.c:267
+#, fuzzy
+msgid "Select All"
+msgstr "Selectați Playlist-ul"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
 msgstr ""
 
 #: src/skins/ui_manager.c:271
+#, fuzzy
+msgid "Select None"
+msgstr "AdPlug·::·Informații despre fișier"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:277
+#, fuzzy
+msgid "Remove All"
+msgstr "Șterge Duplicatele"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:281
+msgid "Clear Queue"
+msgstr ""
+
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr ""
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr ""
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+#, fuzzy
+msgid "By Title"
+msgstr "Titlu"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 #, fuzzy
 msgid "By Filename"
 msgstr "Numele Fișierului:"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 #, fuzzy
 msgid "By Path + Filename"
 msgstr "Numele Fișierului:"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr ""
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr ""
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:313
 #, fuzzy
 msgid "Randomize List"
 msgstr "Salvează"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 #, fuzzy
 msgid "Randomizes the playlist."
 msgstr "Selectați Playlist-ul"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 #, fuzzy
 msgid "Sort List"
 msgstr "Artist"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#, fuzzy
+msgid "By Album"
+msgstr "Album"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr ""
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#, fuzzy
+msgid "By Artist"
+msgstr "Artist"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr ""
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr ""
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 #, fuzzy
 msgid "By Date"
 msgstr "Data:"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr ""
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#, fuzzy
+msgid "By Track Number"
+msgstr "Numărul Trackului"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr ""
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 #, fuzzy
 msgid "Sort Selected"
 msgstr "Selecția formatelor"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+#, fuzzy
+msgid "File"
+msgstr "Numele Fișierului:"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Ajutor"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr ""
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#, fuzzy
+msgid "View Track Details"
+msgstr "Fereastra cu informații despre Track"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr ""
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#, fuzzy
+msgid "About Audacious"
+msgstr "Despre plugin-ul decodor MP4·AAC"
+
+#: src/skins/ui_manager.c:401
 #, fuzzy
 msgid "Play File"
 msgstr "Pauză pentru"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+#, fuzzy
+msgid "Load and play a file"
+msgstr "Încarcă SF la pornirea playerului"
+
+#: src/skins/ui_manager.c:404
 #, fuzzy
 msgid "Play Location"
 msgstr "Locaţie:"
 
+#: src/skins/ui_manager.c:405
+#, fuzzy
+msgid "Play media from the selected location"
+msgstr "Selecția formatelor"
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr ""
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr ""
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr ""
+
+#: src/skins/ui_manager.c:413
+#, fuzzy
+msgid "Quit Audacious"
+msgstr "%s - Audacious"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr ""
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#, fuzzy
+msgid "Jump to Time"
+msgstr "Fereastra de Preferințe"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr ""
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr ""
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr ""
+
+#: src/skins/ui_manager.c:436
+#, fuzzy
+msgid "Cut"
+msgstr "Cult"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr ""
+
+#: src/skins/ui_manager.c:445
 #, fuzzy
 msgid "Load"
 msgstr "Încarcă"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 #, fuzzy
 msgid "Preset"
 msgstr "Port-ul:"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 #, fuzzy
 msgid "Load default preset into equalizer"
 msgstr "Încarcă presetarea implicită a egalizatorului"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 #, fuzzy
 msgid "Zero"
 msgstr "Retro"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr ""
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 #, fuzzy
 msgid "Load preset from file"
 msgstr "Încarcă preset din fișier"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 #, fuzzy
 msgid "Save default preset"
 msgstr "Încarcă presetarea implicită a egalizatorului"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 #, fuzzy
 msgid "To file"
 msgstr "Fisierul STIL:"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 #, fuzzy
 msgid "Delete preset"
 msgstr "Implicit"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:374
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:382
+#: 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 "
@@ -5084,118 +3813,56 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Titlu: "
+
+#: src/skins/ui_playlist.c:267
 #, fuzzy
 msgid "Album: "
 msgstr "Album"
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 #, fuzzy
 msgid "Artist: "
 msgstr "Artist"
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 #, fuzzy
 msgid "Filename: "
 msgstr "Fișier:"
 
-#: src/skins/ui_playlist.c:419
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:422
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:425
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:776
-#, fuzzy
-msgid "Save as Static Playlist"
-msgstr "Selectați Playlist-ul"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr ""
-
-#: src/skins/ui_playlist.c:806
-#, fuzzy
-msgid "Load Playlist"
-msgstr "AdPlug·::·Informații despre fișier"
-
-#: src/skins/ui_playlist.c:819
-#, fuzzy
-msgid "Save Playlist"
-msgstr "Selectați Playlist-ul"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 #, fuzzy
 msgid "Audacious Playlist Editor"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "250 Hz"
-msgstr "Rata de eșantionare [Hz]:"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "500 Hz"
-msgstr "11000 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "1 kHz"
-msgstr "11 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "2 kHz"
-msgstr "22 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "4 kHz"
-msgstr "44 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "8 kHz"
-msgstr "48 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "16 kHz"
-msgstr "48 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, fuzzy, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nu s-a putut crea directorul (%s): %s\n"
@@ -5228,57 +3895,66 @@
 "Boston, MA 02110-1301 USA"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 #, fuzzy
 msgid "About SndStretch"
 msgstr "Despre Audacious"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 #, fuzzy
 msgid "Volume corr."
 msgstr "Schimbă volumul cu"
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 #, fuzzy
 msgid "Speed"
 msgstr "Viteză: "
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr ""
+
+#: src/sndstretch/sndstretch_xmms.c:363
+#, fuzzy
+msgid "Options"
+msgstr "Meniu de Opțiuni"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 #, fuzzy
 msgid "SndStretch - Configuration"
 msgstr "AdPlug·::·Configurare"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr ""
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr ""
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr ""
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -5297,26 +3973,21 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 #, fuzzy
 msgid "Song Change"
 msgstr "Mesajul melodiei"
 
-#: src/spectrum/spectrum.c:90
-#, fuzzy
-msgid "Spectrum Analyzer"
-msgstr "Modul Analizatorului"
-
 #: src/statusicon/statusicon.c:378
 #, fuzzy
 msgid "About Status Icon Plugin"
@@ -5385,67 +4056,21 @@
 "By Johan Levin 1999."
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 #, fuzzy
 msgid "About Extra Stereo Plugin"
 msgstr "Despre plugin-ul decodor MP4·AAC"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr ""
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-#, fuzzy
-msgid "Search:"
-msgstr "Anul"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-#, fuzzy
-msgid "Stream name"
-msgstr "Numele Instrumentului"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-#, fuzzy
-msgid "Now playing"
-msgstr "Selectați Playlist-ul"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Șterge Duplicatele"
-
-#: src/streambrowser/streambrowser.c:340
-#, fuzzy
-msgid "About Stream Browser"
-msgstr "Despre plugin-ul·pentru Alarmă"
-
-#: src/streambrowser/streambrowser.c:341
-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:56
+#: src/tonegen/tonegen.c:48
 #, fuzzy
 msgid "About Tone Generator"
 msgstr "Despre plugin-ul·pentru Alarmă"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5454,12 +4079,12 @@
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr ""
 
@@ -5482,16 +4107,16 @@
 msgid "Ogg Vorbis Tags"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr ""
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 #, fuzzy
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5540,6 +4165,768 @@
 "Visit the Wavpack site at http://www.wavpack.com/\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "Folosește fonturi Bitmap dacă sunt disponibile"
+
+#, fuzzy
+#~ msgid "_Miscellaneous"
+#~ msgstr "Meniu de Opțiuni"
+
+#~ msgid "About "
+#~ msgstr "Despre "
+
+#~ 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"
+#~ "Acest plugin este distribuit conform termenilor și condițiilor licenței "
+#~ "GNU LGPL.\n"
+#~ "Vedeți·http://www.gnu.org/licenses/lgpl.html·tentru detalii.\n"
+#~ "\n"
+#~ "Plugin-ul folosește biblioteca AdPlug,·Copyright·(C)·Simon·Peter·și "
+#~ "alții.\n"
+#~ "Versiunea AdPlug pentru care a fost link-editat:·"
+
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AdPlug·::·Configurare"
+
+#~ msgid "Sound quality"
+#~ msgstr "Calitatea sunetului"
+
+#~ msgid "Resolution"
+#~ msgstr "Rezoluție"
+
+#~ msgid "8bit"
+#~ msgstr "8 biți"
+
+#~ msgid "16bit"
+#~ msgstr "16 biți"
+
+#~ msgid "Channels"
+#~ msgstr "Canale"
+
+#~ 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 ""
+#~ "Nu este recomandată setarea forțată Stereo, decât dacă este neapărată "
+#~ "nevoieAceastă setare nu va adăuga efecte stereo, deoarece OPL2 suportă "
+#~ "doar MonoVa consuma însă mai multe resurse de calcul!"
+
+#~ msgid "Frequency"
+#~ msgstr "Frecvența"
+
+#~ msgid "Detect songend"
+#~ msgstr "Detectează sfârșitul melodiei"
+
+#~ 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 ""
+#~ "Dacă este activat, Audacious va detecta·sfârșitul melodiei, va opri "
+#~ "redarea și va avansa la melodia următoare. Dacă este dezactivat, nu se va "
+#~ "ști când s-a terminat melodia și va fi redată din nou, la infinit. "
+
+#~ msgid "Formats"
+#~ msgstr "Formate"
+
+#~ msgid "Format selection"
+#~ msgstr "Selecția formatelor"
+
+#~ msgid "Format"
+#~ msgstr "Format"
+
+#~ msgid "Extension"
+#~ msgstr "Extensie"
+
+#~ 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 ""
+#~ "Tipurile de fișiere selectate vor fi recunoscute și redate de acest "
+#~ "plugin. Cele deselectate vor fi ignorate, dar pot fi redate de alte "
+#~ "pluginuri."
+
+#~ msgid "AdPlug :: File Info"
+#~ msgstr "AdPlug·::·Informații despre fișier"
+
+#~ msgid "Author: "
+#~ msgstr "Autor: "
+
+#~ msgid "File Type: "
+#~ msgstr "Tipul Fișierului: "
+
+#~ msgid "Subsongs: "
+#~ msgstr "Sub-melodii: "
+
+#~ msgid "Instruments: "
+#~ msgstr "Instrumente: "
+
+#~ msgid "Orders: "
+#~ msgstr "Ordine: "
+
+#~ msgid "Patterns: "
+#~ msgstr "Șabloane: "
+
+#~ msgid "Song"
+#~ msgstr "Melodia"
+
+#~ msgid "Instrument name"
+#~ msgstr "Numele Instrumentului"
+
+#~ msgid "Song message"
+#~ msgstr "Mesajul melodiei"
+
+#~ msgid "Subsong selection"
+#~ msgstr "Selecția sub-melodiei"
+
+#~ msgid "Order: "
+#~ msgstr "Ordine: "
+
+#~ msgid "Pattern: "
+#~ msgstr "Șablon: "
+
+#~ msgid "Row: "
+#~ msgstr "Linie: "
+
+#~ msgid "Speed: "
+#~ msgstr "Viteză: "
+
+#~ msgid "Timer: "
+#~ msgstr "Cronometru: "
+
+#~ msgid "About XMMS Alarm"
+#~ msgstr "Despre plugin-ul·pentru 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 ""
+#~ "Acest plugin poate fi folosit pentru\n"
+#~ "a orni redarea la un anumit timp.\n"
+#~ "\n"
+#~ "Trimiteți eventualele reclamații la:\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 "Acesta este semnalul de deșteptare."
+
+#~ msgid "Select Playlist"
+#~ msgstr "Selectați Playlist-ul"
+
+#~ msgid "Sorry"
+#~ msgstr "Ne pare rău"
+
+#~ msgid "Warning"
+#~ msgstr "Avertizare"
+
+#~ 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 ""
+#~ "Din motive de siguranță, timpul de \"liniște\" trebuie să fie de minim 65 "
+#~ "secunde.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"
+
+#~ msgid "Oh Well"
+#~ msgstr "Ok"
+
+#~ msgid "Alarm Settings"
+#~ msgstr "Opțiuni ale plugin-ului Alarm"
+
+#~ msgid "Time"
+#~ msgstr "Timp"
+
+#~ msgid "hours"
+#~ msgstr "ore"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "Quiet after:"
+#~ msgstr "Oprește după:"
+
+#~ msgid "Alarm at (default):"
+#~ msgstr "Alarmă la (implicit):"
+
+#~ msgid "Choose the days for the alarm to come on"
+#~ msgstr "Alegeți zilele în care să pornească alarma"
+
+#~ msgid "Day"
+#~ msgstr "Ziua"
+
+#~ msgid "Tuesday"
+#~ msgstr "Marți"
+
+#~ msgid "Wednesday"
+#~ msgstr "Miercuri"
+
+#~ msgid "Thursday"
+#~ msgstr "Joi"
+
+#~ msgid "Friday"
+#~ msgstr "Vineri"
+
+#~ msgid "Saturday"
+#~ msgstr "Sâmbătă"
+
+#~ msgid "Sunday"
+#~ msgstr "Duminică"
+
+#~ msgid "Monday"
+#~ msgstr "Luni"
+
+#~ msgid "Days"
+#~ msgstr "Zile"
+
+#~ msgid "Fading"
+#~ msgstr "Tranziție"
+
+#, fuzzy
+#~ msgid "Volume"
+#~ msgstr "Volum: %d%%"
+
+#, fuzzy
+#~ msgid "Current"
+#~ msgstr "Plugin-ul de ieșire curent"
+
+#~ msgid "reset to current output volume"
+#~ msgstr "resetează la volumul curent"
+
+#, fuzzy
+#~ msgid "Start at"
+#~ msgstr "Începe redarea playlist-ului curent"
+
+#~ msgid "%"
+#~ msgstr "%"
+
+#~ msgid "Final"
+#~ msgstr "Final"
+
+#~ msgid "Additional Command"
+#~ msgstr "Comandă adițională"
+
+#, fuzzy
+#~ msgid "enable"
+#~ msgstr "Activează modul 'Mărime Dublă'"
+
+#, fuzzy
+#~ msgid "Playlist (optional)"
+#~ msgstr "Selectați Playlist-ul"
+
+#~ msgid "Browse..."
+#~ msgstr "Răsfoiește"
+
+#, fuzzy
+#~ msgid "Reminder"
+#~ msgstr "Reminder"
+
+#, fuzzy
+#~ msgid "Use reminder"
+#~ msgstr "Folosește cursoare de mouse personalizate (oferite de skin)"
+
+#~ msgid "What do these options mean?"
+#~ msgstr "Ce înseamnă opțiunile acestea?"
+
+#~ 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"
+#~ "Timp\n"
+#~ " Alarmă la: \n"
+#~ " Ora la care se va declanșa alarma.\n"
+#~ "\n"
+#~ " Oprește după: \n"
+#~ " Oprește alarma după atât timp.\n"
+#~ " (dacă dialogul de trezire nu este închis)\n"
+#~ "\n"
+#~ "\n"
+#~ "Zile\n"
+#~ " Ziua:\n"
+#~ " Selectați zilele în care să se activeze alarma.\n"
+#~ "\n"
+#~ " Timp:\n"
+#~ " Alegeți timpul la care va porni alarma în fiecare zi.\n"
+#~ " sau selectați valoarea implicită folosind butonul\n"
+#~ "\n"
+#~ "\n"
+#~ "Volum\n"
+#~ " Tranziție: \n"
+#~ " Va face volumul să crească lent până la valoarea \n"
+#~ " maximă, iar aceasta este durata perioadei de\n"
+#~ " tranziție.\n"
+#~ "\n"
+#~ "\n"
+#~ " Volum inițial: \n"
+#~ " Începe tranziția de la această valoare inițială a \n"
+#~ " volumului.\n"
+#~ "\n"
+#~ " Volum final: \n"
+#~ " Volumul maxim la care se va ajunge în timpul \n"
+#~ " tranziției.\n"
+#~ "\n"
+#~ "\n"
+#~ "Opțiuni:\n"
+#~ " Comandă adițională:\n"
+#~ " Comandă ce va fi rulată la momentul declanșării \n"
+#~ " alarmei.\n"
+#~ "\n"
+#~ " Playlist: \n"
+#~ " Încarcă un playlist a cărui melodii vor fi redate\n"
+#~ " la declanșarea alarmei. (cu extensie .m3u), sau \n"
+#~ " un link spre un fișier sau stream audio.\n"
+#~ " Dacă nu este dat nimic vor fi folosite melodiile\n"
+#~ " existente în playlist.\n"
+#~ "\n"
+#~ " Reminder:\n"
+#~ " Afișează un mesaj de reamintire când alarma se \n"
+#~ " oprește. Editați mesajul și activați-l dacă doriți \n"
+#~ " ca acesta să fie afișat.\n"
+
+#~ msgid "Your reminder for today is.."
+#~ msgstr "Mesajul de reamintire pentru ziua de azi este..."
+
+#~ msgid "Thankyou"
+#~ msgstr "Mulțumesc"
+
+#, fuzzy
+#~ msgid "Available Headsets"
+#~ msgstr "_Preset-uri disponibile:"
+
+#, fuzzy
+#~ msgid "Current Headset"
+#~ msgstr "Plugin-ul de ieșire curent"
+
+#, fuzzy
+#~ msgid "_Connect"
+#~ msgstr "Mod de Vizualizare"
+
+#, fuzzy
+#~ msgid "Class"
+#~ msgstr "Classical"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "Adaugă Adresa Internet..."
+
+#, fuzzy
+#~ msgid "Rescan"
+#~ msgstr "Dreptunghi"
+
+#, fuzzy
+#~ msgid "Playback->Play"
+#~ msgstr "Redă fișiere"
+
+#, fuzzy
+#~ msgid "Playback->Stop"
+#~ msgstr "Oprește melodia curentă"
+
+#, fuzzy
+#~ msgid "Playback->Pause"
+#~ msgstr "Pauză pentru"
+
+#, fuzzy
+#~ msgid "Playback->Prev"
+#~ msgstr "Continuă redarea la pornire"
+
+#, fuzzy
+#~ msgid "Playback->Next"
+#~ msgstr "Selectează Playlist-ul Următor"
+
+#, fuzzy
+#~ msgid "Playback->Eject"
+#~ msgstr "Continuă redarea la pornire"
+
+#, fuzzy
+#~ msgid "Playlist->Repeat"
+#~ msgstr "Selectați Playlist-ul"
+
+#, fuzzy
+#~ msgid "Playlist->Shuffle"
+#~ msgstr "Selectați Playlist-ul"
+
+#, fuzzy
+#~ msgid "Volume->Up_5"
+#~ msgstr "Restrânge player-ul"
+
+#, fuzzy
+#~ msgid "Volume->Down_5"
+#~ msgstr "Schimbă volumul cu"
+
+#, fuzzy
+#~ msgid "Volume->Up_10"
+#~ msgstr "Restrânge player-ul"
+
+#, fuzzy
+#~ msgid "Volume->Down_10"
+#~ msgstr "Schimbă volumul cu"
+
+#, fuzzy
+#~ msgid "Volume->Mute"
+#~ msgstr "Schimbă volumul cu"
+
+#, fuzzy
+#~ msgid "Window->Main"
+#~ msgstr "Arată fereastra principală"
+
+#, fuzzy
+#~ msgid "Window->Playlist"
+#~ msgstr "Selectați Playlist-ul"
+
+#, fuzzy
+#~ msgid "Window->Equalizer"
+#~ msgstr "Egalizator Audacious"
+
+#, fuzzy
+#~ msgid "Window->JumpToFile"
+#~ msgstr "Fereastra de Preferințe"
+
+#, fuzzy
+#~ msgid "Detected"
+#~ msgstr "Detectează sfârșitul melodiei"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "Format specificat:"
+
+#, fuzzy
+#~ msgid "Not Detected"
+#~ msgstr "Selecția formatelor"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Informații despre Track"
+
+#, fuzzy
+#~ msgid "Device name:"
+#~ msgstr "Numele Instrumentului"
+
+#, fuzzy
+#~ msgid "Device file:"
+#~ msgstr "Tipul Fișierului: "
+
+#, fuzzy
+#~ msgid "(custom)"
+#~ msgstr "Format specificat:"
+
+#~ msgid "Active"
+#~ msgstr "Activ"
+
+#~ msgid "Status"
+#~ msgstr "Statut"
+
+#, fuzzy
+#~ msgid "Device Name"
+#~ msgstr "Numele Instrumentului"
+
+#, fuzzy
+#~ msgid "Device File"
+#~ msgstr "Tipul Fișierului: "
+
+#, fuzzy
+#~ msgid "Device Address"
+#~ msgstr "Adaugă Adresa Internet..."
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Numele Instrumentului"
+
+#, fuzzy
+#~ msgid "Filename: "
+#~ msgstr "Numele Fișierului:"
+
+#, fuzzy
+#~ msgid "Phys.Address: "
+#~ msgstr "Adaugă Adresa Internet..."
+
+#, fuzzy
+#~ msgid "EvDev-Plug - about"
+#~ msgstr "Despre plugin-ul·pentru Alarmă"
+
+#, fuzzy
+#~ msgid "Name"
+#~ msgstr "Numele Instrumentului"
+
+#, fuzzy
+#~ msgid "Installed plugins"
+#~ msgstr "Reîncarcă Plugin-urile"
+
+#, fuzzy
+#~ msgid "Running plugins"
+#~ msgstr "Reîncarcă Plugin-urile"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Adaugă Fișiere"
+
+#, fuzzy
+#~ msgid "Remove"
+#~ msgstr "Șterge Duplicatele"
+
+#, fuzzy
+#~ msgid "LADSPA Plugin Catalog"
+#~ msgstr "Lista plugin-urilor _Generale"
+
+#, fuzzy
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "Despre plugin-ul decodor MP4·AAC"
+
+#, fuzzy
+#~ msgid "LIRC Plugin "
+#~ msgstr "Plugin de intrare: %s"
+
+#, fuzzy
+#~ msgid "LIRC plugin settings"
+#~ msgstr "Plugin de intrare: %s"
+
+#, fuzzy
+#~ msgid "Connection"
+#~ msgstr "Mod de Vizualizare"
+
+#, fuzzy
+#~ msgid "%s: disconnected from LIRC\n"
+#~ msgstr "Încarcă preset din fișier"
+
+#, fuzzy
+#~ msgid "ModPlug Configuration"
+#~ msgstr "AdPlug·::·Configurare"
+
+#~ msgid "16 bit"
+#~ msgstr "16 bit"
+
+#~ msgid "8 bit"
+#~ msgstr "8 bit"
+
+#, fuzzy
+#~ msgid "96 kHz"
+#~ msgstr "48 kHz"
+
+#~ msgid "48 kHz"
+#~ msgstr "48 kHz"
+
+#~ msgid "44 kHz"
+#~ msgstr "44 kHz"
+
+#~ msgid "22 kHz"
+#~ msgstr "22 kHz"
+
+#, fuzzy
+#~ msgid "Sampling Rate"
+#~ msgstr "Convertor pentru rata de eșantionare"
+
+#, fuzzy
+#~ msgid "Enable"
+#~ msgstr "Activează modul 'Mărime Dublă'"
+
+#, fuzzy
+#~ msgid "Depth"
+#~ msgstr "Adancimea cautarii"
+
+#, fuzzy
+#~ msgid "Effects"
+#~ msgstr "Efecte"
+
+#, fuzzy
+#~ msgid "Fast Playlist Info"
+#~ msgstr "AdPlug·::·Informații despre fișier"
+
+#, fuzzy
+#~ msgid "Play Amiga MOD"
+#~ msgstr "- redă fișierele multimedia"
+
+#, fuzzy
+#~ msgid "Don't loop"
+#~ msgstr "Nu curăța playlist-ul"
+
+#, fuzzy
+#~ msgid "time(s)"
+#~ msgstr "Timp Scurs"
+
+#, fuzzy
+#~ msgid "MOD Info"
+#~ msgstr "AdPlug·::·Informații despre fișier"
+
+#, fuzzy
+#~ msgid "Instruments"
+#~ msgstr "Instrumente: "
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Mesajul melodiei"
+
+#, fuzzy
+#~ msgid "About Modplug"
+#~ msgstr "Despre Audacious"
+
+#, fuzzy
+#~ msgid "Blue"
+#~ msgstr "Blues"
+
+#, fuzzy
+#~ msgid "Enable 'GUI Scaling'"
+#~ msgstr "Activează proxy"
+
+#, fuzzy
+#~ msgid "Spectrum Analyzer"
+#~ msgstr "Modul Analizatorului"
+
+#, fuzzy
+#~ msgid "Search:"
+#~ msgstr "Anul"
+
+#, fuzzy
+#~ msgid "Stream name"
+#~ msgstr "Numele Instrumentului"
+
+#, fuzzy
+#~ msgid "Now playing"
+#~ msgstr "Selectați Playlist-ul"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Șterge Duplicatele"
+
+#, fuzzy
+#~ msgid "About Stream Browser"
+#~ msgstr "Despre plugin-ul·pentru Alarmă"
+
+#, fuzzy
+#~ msgid "minutes:seconds"
+#~ msgstr "secunde"
+
+#, fuzzy
+#~ msgid "Track length:"
+#~ msgstr "Informații despre Track"
+
+#, fuzzy
+#~ msgid "Show/hide statusbar"
+#~ msgstr "Selectați Playlist-ul"
+
+#, fuzzy
+#~ msgid "Import Playlist ..."
+#~ msgstr "AdPlug·::·Informații despre fișier"
+
+#, fuzzy
+#~ msgid "Refresh Selected"
+#~ msgstr "Selecția formatelor"
+
+#, fuzzy
+#~ msgid "Edit the playlist title."
+#~ msgstr "Selectați Playlist-ul"
+
+#, fuzzy
+#~ msgid "By Formatted Title"
+#~ msgstr "Titlu"
+
+#, fuzzy
+#~ msgid "Components"
+#~ msgstr "Comentariu"
+
+#, fuzzy
+#~ msgid "Save as Static Playlist"
+#~ msgstr "Selectați Playlist-ul"
+
+#, fuzzy
+#~ msgid "Load Playlist"
+#~ msgstr "AdPlug·::·Informații despre fișier"
+
+#, fuzzy
+#~ msgid "Save Playlist"
+#~ msgstr "Selectați Playlist-ul"
+
 #~ msgid "Variable bitrate"
 #~ msgstr "Bitrate variabil"
 
@@ -5598,9 +4985,6 @@
 #~ msgid "Port:"
 #~ msgstr "Port-ul:"
 
-#~ msgid "Server"
-#~ msgstr "Server"
-
 #, fuzzy
 #~ msgid "Load List"
 #~ msgstr "Încarcă"
@@ -5821,10 +5205,6 @@
 #~ msgstr "Despre "
 
 #, fuzzy
-#~ msgid "Output plugin"
-#~ msgstr "Plugin-ul de ieșire curent"
-
-#, fuzzy
 #~ msgid "Throttle Output"
 #~ msgstr "Plugin-ul de ieșire curent"
 
@@ -5933,10 +5313,6 @@
 #~ msgstr "Implicit"
 
 #, fuzzy
-#~ msgid "_Rename"
-#~ msgstr "Numele Fișierului:"
-
-#, fuzzy
 #~ msgid "About Icecast-Plugin"
 #~ msgstr "Despre plugin-ul decodor MP4·AAC"

audacious-plugins-2.5.3.tar.gz/po/ru.po -> audacious-plugins-3.0.tar.gz/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-05-19 10:53-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"
@@ -26,7 +26,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -37,611 +37,47 @@
 "Декодер FAAD2 AAC/HE-AAC/HE-AACv2/DRM (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 команда разработчиков Audacious"
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "О модуле MP4 AAC"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "О "
-
-#: src/adplug/adplug-xmms.cc:155
-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"
-"Этот модуль распространяется на условиях GNU LGPL.\n"
-"Смотрите http://www.gnu.org/licenses/lgpl.html для дополнительной "
-"информации.\n"
-"\n"
-"Этот модуль использует библиотеку AdPlug, Copyright (C) Simon Peter.\n"
-"Версия библиотеки AdPlug: "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: Настройка"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "ОК"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Отмена"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "Основной"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Качество звука"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Разрешение"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8 бит"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16 бит"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Каналы"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Моно"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Стерео"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-"Настройка режима стерео не рекомендуется, если вам это не требуется. Эта "
-"функция не добавит стереоэффектов к звучанию, но увеличит загрузку "
-"процессора!"
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Частота"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Воспроизведение"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Определить конец дорожки"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-"Если включено, то Audacious определит окончание дорожки, остановит "
-"воспроизведение и выведет сообщение в списке воспроизведения. Если "
-"отключено, то Audacious не станет сообщать об окончании дорожки и "
-"воспроизведение продолжится по кругу."
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Форматы"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Выбор формата"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Формат"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Расширение"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-"С помощью этих модулей можно выбрать типы файлов для воспроизведения. Если "
-"модули не отмечены, то для воспроизведения этих файлов будут использоваться "
-"другие модули."
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: Информация о файле"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Имя файла"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Название: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Автор: "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Тип файла: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "Поддорожки: "
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Инструменты:"
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "Порядки: "
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Ритмы: "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Дорожка"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Название инструмента"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Сообщение дорожки"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "Выбор поддорожки"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Порядок: "
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Ритм: "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Ряд: "
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Скорость:"
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Таймер:"
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Гц"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "О модуле Будильник"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "Будильник"
-
-#: src/alarm/interface.c:56
-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"
-"Все замечания направляйте по адресу:\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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Закрыть"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Сигнал"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "Ваш сигнал будильника."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "ОК"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Выберите список воспроизведения"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Извините"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Предупреждение"
-
-#: src/alarm/interface.c:213
-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"
-"Adam"
-
-#: src/alarm/interface.c:229
-msgid "Oh Well"
-msgstr "Отлично"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Параметры будильника"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Время"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "часов"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "ч."
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "минут"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Отключить после:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Время сигнала (по умолчанию):"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Выберите дни включения будильника"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "По умолчанию"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "День"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Вторник"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Среда"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Четверг"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Пятница"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Суббота"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Воскресенье"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Понедельник"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Дни"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Затухание"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "секунд"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Громкость"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Сейчас"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "сбросить до текущей громкости"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Начальная"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Конечная"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Дополнительные команды"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "Запустить"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Список воспроизведения"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Обзор..."
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Напоминание"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Включить напоминание"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Параметры"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Что означают эти параметры?"
-
-#: src/alarm/interface.c:1364
-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"
-" Громкость, на которой останавливается затухание. Если\n"
-" время затухания равно 0, установите громкость и начните\n"
-" воспроизведение.\n"
-"\n"
-"\n"
-"Параметры:\n"
-" Дополнительные команды:\n"
-" Запуск указанной команды в это время.\n"
-"\n"
-" Список воспроизведения:\n"
-" Загрузка списка воспроизведения для сигнала\n"
-" (используется расширение .m3u). Если список\n"
-" воспроизведения указан, то дорожки будут воспроизводиться\n"
-" из этого списка.\n"
-" Могут также быть использованы URL потоков mp3/ogg,\n"
-" но загрузка списков воспроизведения по URL в настоящее\n"
-" время не поддерживается Audacious.\n"
-"\n"
-" Напоминание:\n"
-" Отображение текста напоминания при выключении сигнала.\n"
-" Введите текст напоминания в поле и установите флажок\n"
-" \"Включить напоминание\".\n"
-
-#: src/alarm/interface.c:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Справка"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "Напоминание на сегодняшний день..."
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Спасибо"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Устройство PCM по умолчанию"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 msgid "Default mixer device"
 msgstr "Микшер по умолчанию"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 msgid "ALSA Output Plugin Preferences"
 msgstr "Параметры модуля вывода ALSA"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 msgid "PCM device:"
 msgstr "Устройство PCM:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Микшер:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 msgid "Mixer element:"
 msgstr "Компонент микшера:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
 msgstr "О модуле вывода ALSA"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr "Ошибка ALSA"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -809,6 +245,10 @@
 msgid "SoundFont settings"
 msgstr "Параметры SoundFont"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Имя файла"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Размер (байт)"
@@ -915,8 +355,7 @@
 "Модуль\n"
 "TiMidity"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Имя:"
 
@@ -1088,119 +527,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Показать OSD, когда воспроизведение возобновляется."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Расположение"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "Смещение по оси X:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Смещение по оси Y:"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "Максимальная ширина OSD:"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Параметры для систем с несколькими мониторами"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "Показать OSD:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "на всех мониторах"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "на мониторе %i"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Время (мс)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "отображения:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "появления:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "затухания:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "Шрифт %i:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Тень"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Поддержка местных языков"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "Отключить преобразование текста в UTF-8"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "Выберите файл стиля"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Стиль отображения"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "Цвет %i:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "Другой стиль"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "Файл стиля:"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "Обзор"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Включить событие"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Событие"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "Найден композитный менеджер"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1210,74 +649,74 @@
 "Пожалуйста, запустите композитный менеджер; в противном случае\n"
 "OSD не будет работать корректно."
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 "Для режима \"Имитированная прозрачность\" композитный менеджер не требуется."
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Прозрачность"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Имитированная прозрачность"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Настоящая прозрачность (требуется расширение X Composite)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "Расширение X Composite не загружено"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "Расширение X Composite недоступно"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Параметры модуля Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Проверить"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Положение"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Анимация"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Стиль"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "События"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Прочее"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "О модуле Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1285,7 +724,7 @@
 "\n"
 "Audacious OSD "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1307,135 +746,6 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr "Парный запрос для '%s'"
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr "Запрос на авторизацию для %s"
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr "Установлено соединение с %s"
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr "Соединение с %s прервано"
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr "Устройство было выключено"
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr "Невозможно обнаружить устройство"
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr "Устройство доступно для подключения"
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr "Устройство определяется"
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr "Устройство определилось частично"
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr "Устройство переведено в режим подключения"
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr "О модуле поддержки гарнитуры Bluetooth"
-
-#: src/bluetooth/bluetooth.c:118
-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\n"
-"Copyright (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
-"Это проект Google Summer of Code 2008. Благодарю моего наставника Tony Vroon "
-"и членов команды Audacious\n"
-" \n"
-"Для использования AVRCP нужно загрузить модуль ядра uinput\n"
-"Кнопки гарнитуры будут распознаны как обычные мультимедийные кнопки\n"
-"и могут быть настроены с помощью модуля Global Hotkey в Audacious или с "
-"помощью других программ,\n"
-"предоставляемых вашим оконным менеджером.\n"
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr "Производитель"
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr "Доступная гарнитура"
-
-#: src/bluetooth/gui.c:224
-msgid "Current Headset"
-msgstr "Текущая гарнитура"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr "Обновить"
-
-#: src/bluetooth/gui.c:231
-msgid "_Connect"
-msgstr "Соединение"
-
-#: src/bluetooth/gui.c:237
-msgid "_Close"
-msgstr "Закрыть"
-
-#: src/bluetooth/gui.c:274
-msgid "Class"
-msgstr "Класс"
-
-#: src/bluetooth/gui.c:278
-msgid "Address:"
-msgstr "Адрес:"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr "Соединение завершено!"
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr "Устройства не обнаружены!"
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr "Сканирование..."
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr "Подключение..."
-
-#: src/bluetooth/scan_gui.c:138
-msgid "Rescan"
-msgstr "Повторное сканирование"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "Воспроизвести"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Размытый осциллоскоп: выбор цвета"
@@ -1444,11 +754,11 @@
 msgid "Options:"
 msgstr "Параметры:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 msgid "About Audio CD Plugin"
 msgstr "О модуле Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1475,16 +785,16 @@
 "\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 #, fuzzy
 msgid "Audio CD"
 msgstr "Звук"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -1532,11 +842,23 @@
 msgid "Override default device: "
 msgstr "Изменить устройство по умолчанию: "
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+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-диск"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "Добавить CD-диск"
 
@@ -1561,6 +883,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Модуль поддержки звука игровой консоли"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "Основной"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Воспроизведение"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Бас:"
@@ -1578,8 +908,7 @@
 msgid "Default song length:"
 msgstr "Длительность композиции по умолчанию:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Преобразование частоты"
 
@@ -1591,6 +920,10 @@
 msgid "Resampling rate:"
 msgstr "Преобразование частоты:"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Гц"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1665,16 +998,16 @@
 "Вы можете использовать модуль Преобразования частоты для приведения "
 "композиций к единому битрейту."
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "Параметры модуля Crystalizer"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Интенсивность эффекта:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Применить"
 
@@ -1714,379 +1047,20 @@
 msgid "Volume: (%)"
 msgstr "Громкость (%):"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "Воспроизведение->Играть"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "Воспроизведение->Стоп"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "Воспроизведение->Пауза"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "Воспроизведение->Предыдущая"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "Воспроизведение->Следующая"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "Воспроизведение->Извлечь"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "Список->Повтор"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "Список->Случайно"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "Громкость->Вверх_5"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "Громкость->Вниз_5"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "Громкость->Вверх_10"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "Громкость->Вниз_10"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "Громкость->Приглушить"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "Окно->Главное"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "Окно->Список воспроизведения"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "Окно->Эквалайзер"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "Окно->Перейти к файлу"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-"event-device-plugin: невозможно открыть файл устройства %s , устройство "
-"пропущено; проверьте, что файл существует и что у вас есть права на его "
-"чтение\n"
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-"event-device-plugin: невозможно создать io_channel для устройства %s, "
-"устройство пропущено\n"
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: невозможно открыть /proc/bus/input/devices, "
-"автоматическое распознавание устройств событий не будет работать.\n"
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-"event-device-plugin: невозможно открыть io_channel для /proc/bus/input/"
-"devices, автоматическое распознавание устройств событий не будет работать.\n"
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: произошла ошибка при чтении /proc/bus/input/devices, "
-"автоматическое распознавание устройств событий не будет работать.\n"
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-"event-device-plugin: устройство %s не найдено в /dev/input, пропущено.\n"
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-"event-device-plugin: невозможно загрузить конфигурационный файл %s, будут "
-"использованы настройки по умолчанию.\n"
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-"event-device-plugin: неполная информация в конфигурационном файле для "
-"устройства \"%s\", пропущено.\n"
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: настройка, невозможно получить значение is_active для "
-"устройства \"%s\", пропущено.\n"
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-"event-device-plugin: невозможно получить доступ к локальному каталогу %s, "
-"настройки не будут сохранены.\n"
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: настройка, невозможно получить имя файла для устройства "
-"\"%s\", пропущено.\n"
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-"event-device-plugin: настройка, невозможно получить физическое значение для "
-"устройства \"%s\", пропущено.\n"
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: настройка, невозможно получить значение is_custom для "
-"устройства \"%s\", пропущено.\n"
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-"event-device-plugin: настройка, непредусмотренное значение для устройства "
-"\"%s\", пропущено.\n"
-
-#: src/evdev-plug/ed_ui.c:212
-msgid "Detected"
-msgstr "Определено"
-
-#: src/evdev-plug/ed_ui.c:217
-msgid "Custom"
-msgstr "Другое"
-
-#: src/evdev-plug/ed_ui.c:223
-msgid "Not Detected"
-msgstr "Не определено"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "Информация"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-"Невозможно открыть окно для неопознанного устройства.\n"
-"Убедитесь, что устройство подключено правильно."
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Ошибка"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-"Невозможно открыть выбранное устройство.\n"
-"Пожалуйста, проверьте права доступа к файлу устройства."
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "EvDev-Plug - Добавить другое устройство"
-
-#: src/evdev-plug/ed_ui.c:353
-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 пытается автоматически определить и обновить информацию\n"
-"о событиях устройств, присутствующих в системе.\n"
-"Однако, если автоматическое определение в вашей системе не работает\n"
-"или же устройства размещены не там, где обычно (сейчас просматривается\n"
-"только каталог /dev/input/), то вы можете добавить устройство вручную,\n"
-"указав название и файл устройства."
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Имя устройства:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Файл устройства:"
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr "(другое)"
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-"Пожалуйста укажите название и имя файла.\n"
-"Имя файла должно иметь абсолютный путь."
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr ""
-"Вы хотите удалить существующую конфигурацию для выбранного устройства?\n"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "Вы хотите удалить выбранное устройство?\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "Параметры модуля EvDev-Plug"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Активное"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Статус"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Название устройства"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Файл устройства"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Адрес устройства"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "_Привязки клавиш"
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-"Нажмите клавишу на вашем устройстве, чтобы сделать\n"
-"привязку к ней. Если ни одна клавиша не будет нажата\n"
-"в течении 5 секунд, окно закроется без изменения привязок."
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-"Это событие уже назначено.\n"
-"\n"
-"Невозможно назначить несколько действий на одно и тоже входное событие (так "
-"же, как нельзя назначить одно действие на несколько событий)."
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Plug - Настройка привязок клавиш"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "Название: "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Имя файла: "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Физ. адрес: "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "О модуле EvDev-Plug"
-
-#: src/evdev-plug/ed_ui.c:1491
-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"
-"http://www.develia.org/projects.php?p=evdevplug\n"
-"\n"
-"Модуль написал Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-
-#: src/ffaudio/ffaudio-core.c:765
-#, c-format
+#: src/ffaudio/ffaudio-core.c:763
+#, fuzzy, c-format
 msgid ""
 "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"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 "Многоформатный модуль декодирования звука для Audacious,\n"
 "основан на FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -2098,15 +1072,15 @@
 " William Pitcock <nenolod@nenolod.net>,\n"
 " Matti Hämäläinen <ccr@tnsp.org>\n"
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "О модуле FFaudio"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "О модуле Запись в файл"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2144,51 +1118,51 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, "
 "USA."
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "Параметры записи в файл"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Формат записываемого файла:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Настройка"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Сохранить в тот же каталог"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Сохранить в другой каталог"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Каталог для записываемых файлов:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Поиск каталога"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Создать название файла из:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "имеющихся тегов файла"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "имеющегося имени файла"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Не удалять расширение имени файла"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "Вписать до названия файла номер дорожки"
 
@@ -2201,6 +1175,14 @@
 msgid "Joint Stereo"
 msgstr "Joint стерео"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Стерео"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Моно"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "Параметры MP3"
@@ -2246,7 +1228,6 @@
 msgstr "Защита от ошибок"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Качество"
 
@@ -2354,11 +1335,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "О модуле \"Горячие клавиши\" для Gnome"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2373,59 +1354,22 @@
 "Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr "Открыть файлы"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 msgid "Add Files"
 msgstr "Добавить файлы"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 msgid "Audacious2"
 msgstr "Audacious2"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr "интерфейс gnt"
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr ""
-"Невозможно перейти к указанному времени, если дорожка не проигрывается.\n"
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr "Перейти к указанному времени"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr "минут:секунд"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr "Длина дорожки:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr "Ошибка записи списка воспроизведения \"%s\": %s"
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-msgid "Export Playlist"
-msgstr "Выгрузить список воспроизведения"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-msgid "Import Playlist"
-msgstr "Загрузить список воспроизведения"
-
 #: src/gtkui/columns.c:36
 #, fuzzy
 msgid "Entry number"
@@ -2524,404 +1468,311 @@
 msgid "Disable"
 msgstr "переменный"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr "Интерфейс GTK"
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr "Остановить после текущей дорожки"
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr "Повтор"
+#: src/gtkui/menus.c:132
+#, fuzzy
+msgid "_Open Files ..."
+msgstr "Открыть файлы..."
 
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr "Случайно"
+#: src/gtkui/menus.c:133
+#, fuzzy
+msgid "Open _URL ..."
+msgstr "Открыть адрес..."
 
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr "Без движения по списку воспроизведения"
+#: src/gtkui/menus.c:134
+#, fuzzy
+msgid "_Add File ..."
+msgstr "Добавить файлы..."
 
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr "Показать информационное поле"
+#: src/gtkui/menus.c:135
+#, fuzzy
+msgid "Add U_RL ..."
+msgstr "Добавить адрес..."
 
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr "Показать/скрыть информационное поле"
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr "Показать главное меню"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr "Показать/скрыть главное меню"
+#: src/gtkui/menus.c:137
+#, fuzzy
+msgid "A_bout ..."
+msgstr "О "
 
-#: src/gtkui/ui_manager.c:55
-msgid "Show statusbar"
-msgstr "Показать строку состояния"
+#: src/gtkui/menus.c:138
+#, fuzzy
+msgid "_Preferences ..."
+msgstr "Параметры"
 
-#: src/gtkui/ui_manager.c:56
-msgid "Show/hide statusbar"
-msgstr "Показать/скрыть строку состояния"
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
+msgstr "_Выход"
 
-#: src/gtkui/ui_manager.c:58
+#: src/gtkui/menus.c:142
 #, fuzzy
-msgid "Show Column Headers"
-msgstr "Отобразить проигрыватель"
+msgid "_Play"
+msgstr "Воспроизвести"
 
-#: src/gtkui/ui_manager.c:60
+#: src/gtkui/menus.c:143
 #, fuzzy
-msgid "Scroll on Song Change"
-msgstr "Смена дорожки"
-
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
+msgid "Paus_e"
 msgstr "Пауза"
 
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
+#: src/gtkui/menus.c:144
+#, fuzzy
+msgid "_Stop"
 msgstr "Остановить"
 
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
+#: src/gtkui/menus.c:145
+#, fuzzy
+msgid "Pre_vious"
 msgstr "Предыдущая дорожка"
 
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
+#: src/gtkui/menus.c:146
+#, fuzzy
+msgid "_Next"
 msgstr "Следующая дорожка"
 
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "Список воспроизведения"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "Новый список"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "Удалить список"
-
-#: src/gtkui/ui_manager.c:95
-msgid "Import Playlist ..."
-msgstr "Загрузить список..."
-
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr "Загрузить список воспроизведения из файла в выбранный список."
-
-#: src/gtkui/ui_manager.c:98
-msgid "Export Playlist ..."
-msgstr "Выгрузить список..."
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "Сохранить выбранный список воспроизведения."
-
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-msgid "Save All Playlists"
-msgstr "Сохранить все списки воспроизведения"
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-"Сохранить все открытые списки воспроизведения. Это делается автоматически "
-"при закрытии Audacious."
-
-#: src/gtkui/ui_manager.c:106
-msgid "Refresh"
-msgstr "Обновить"
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Обновить метаданные и соотнести их с записями списка воспроизведения."
-
-#: src/gtkui/ui_manager.c:110
+#: src/gtkui/menus.c:148
 #, fuzzy
-msgid "Refresh Selected"
-msgstr "Удалить выбранные"
+msgid "_Repeat"
+msgstr "Повтор"
 
-#: src/gtkui/ui_manager.c:111
+#: src/gtkui/menus.c:149
 #, fuzzy
-msgid "Refreshes metadata associated with selected entries."
-msgstr "Обновить метаданные и соотнести их с записями списка воспроизведения."
-
-#: src/gtkui/ui_manager.c:115
-msgid "Playlist Manager"
-msgstr "Менеджер списков"
-
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr "Открыть менеджер списков."
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr "Добавить адрес..."
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr "Добавить звуковой поток из сети в список воспроизведения."
-
-#: src/gtkui/ui_manager.c:123
-msgid "Add Files ..."
-msgstr "Добавить файлы..."
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr "Добавить файлы в список воспроизведения."
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr "Удалить все"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr "Удалить все записи из списка воспроизведения."
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr "Удалить не отмеченные"
-
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr "Удалить из списка воспроизведения не выделенные записи."
+msgid "S_huffle"
+msgstr "Случайно"
 
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr "Удалить выбранные"
+#: src/gtkui/menus.c:150
+#, fuzzy
+msgid "N_o Playlist Advance"
+msgstr "Без движения по списку воспроизведения"
 
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr "Удалить из списка воспроизведения выделенные записи."
+#: src/gtkui/menus.c:151
+#, fuzzy
+msgid "Stop _After This Song"
+msgstr "Остановить после дорожки."
 
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:140
+#: src/gtkui/menus.c:154
 #, fuzzy
-msgid "Edit the playlist title."
-msgstr "Сортировать записи в списке воспроизведения в случайном порядке."
+msgid "Jump to _Time ..."
+msgstr "Перейти к указанному времени"
 
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:146
-msgid "Sort"
-msgstr "Сортировка"
-
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
+#: src/gtkui/menus.c:158
+#, fuzzy
+msgid "By Track _Number"
 msgstr "По номеру дорожки"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
+#: src/gtkui/menus.c:159
+#, fuzzy
+msgid "By _Title"
 msgstr "По названию"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
+#: src/gtkui/menus.c:160
+#, fuzzy
+msgid "By _Artist"
 msgstr "По исполнителю"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
-msgid "By Album"
+#: src/gtkui/menus.c:161
+#, fuzzy
+msgid "By A_lbum"
 msgstr "По альбому"
 
-#: src/gtkui/ui_manager.c:155
+#: src/gtkui/menus.c:162
 #, fuzzy
-msgid "By Release Date"
+msgid "By Release _Date"
 msgstr "По дате"
 
-#: src/gtkui/ui_manager.c:157
-msgid "By File Path"
+#: src/gtkui/menus.c:163
+#, fuzzy
+msgid "By _File Path"
 msgstr "По имени файла"
 
-#: src/gtkui/ui_manager.c:159
+#: src/gtkui/menus.c:164
 #, fuzzy
-msgid "By Formatted Title"
-msgstr "По названию"
+msgid "By _Custom Title"
+msgstr "Другой стиль"
 
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
+#: src/gtkui/menus.c:166
+#, fuzzy
+msgid "R_everse Order"
 msgstr "В обратном порядке"
 
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
+#: src/gtkui/menus.c:167
+msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr "Вывод"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
+msgstr "Обновить"
 
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "Эффекты"
+#: src/gtkui/menus.c:172
+#, fuzzy
+msgid "_Sort"
+msgstr "Сортировка"
 
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
-msgstr "Эквалайзер"
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "Вид"
+#: src/gtkui/menus.c:175
+msgid "_Close"
+msgstr "Закрыть"
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
-msgstr "Интерфейс"
+#: src/gtkui/menus.c:177
+#, fuzzy
+msgid "_Import ..."
+msgstr "Импорт"
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "Файл"
+#: src/gtkui/menus.c:178
+#, fuzzy
+msgid "_Export ..."
+msgstr "Экспорт"
 
-#: src/gtkui/ui_manager.c:188
-msgid "Components"
-msgstr "Компоненты"
+#: src/gtkui/menus.c:180
+#, fuzzy
+msgid "_Playlist Manager ..."
+msgstr "Менеджер списков"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr "Информация о дорожке"
+#: src/gtkui/menus.c:183
+#, fuzzy
+msgid "Volume _Up"
+msgstr "Громче"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr "Просмотреть информацию о дорожке."
+#: src/gtkui/menus.c:184
+#, fuzzy
+msgid "Volume _Down"
+msgstr "Тише"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "Об Audacious"
+#: src/gtkui/menus.c:186
+#, fuzzy
+msgid "_Equalizer"
+msgstr "Эквалайзер"
 
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
-msgstr "Открыть файлы..."
+#: src/gtkui/menus.c:188
+#, fuzzy
+msgid "E_ffects"
+msgstr "Эффекты"
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
-msgstr "Загрузить и воспроизвести файл"
+#: src/gtkui/menus.c:191
+#, fuzzy
+msgid "_Interface"
+msgstr "Интерфейс"
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
-msgstr "Открыть адрес..."
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr "Воспроизвести аудиоданные из выбранного места."
+#: src/gtkui/menus.c:194
+#, fuzzy
+msgid "Show I_nfo Bar"
+msgstr "Показать информационное поле"
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "Службы модулей"
+#: src/gtkui/menus.c:195
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "Показать строку состояния"
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "Параметры"
+#: src/gtkui/menus.c:197
+#, fuzzy
+msgid "Show Column _Headers"
+msgstr "Отобразить проигрыватель"
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr "Открыть окно параметров"
+#: src/gtkui/menus.c:198
+#, fuzzy
+msgid "Choose _Columns ..."
+msgstr "Отобразить проигрыватель"
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
-msgstr "_Выход"
+#: src/gtkui/menus.c:199
+#, fuzzy
+msgid "Scrol_l on Song Change"
+msgstr "Смена дорожки"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "Закрыть Audacious"
+#: src/gtkui/menus.c:202
+#, fuzzy
+msgid "_File"
+msgstr "Файл"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr "Установить A-B"
+#: src/gtkui/menus.c:203
+#, fuzzy
+msgid "_Playback"
+msgstr "Воспроизведение"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr "Очистить A-B"
+#: src/gtkui/menus.c:204
+#, fuzzy
+msgid "P_laylist"
+msgstr "Список воспроизведения"
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr "Перейти к началу списка"
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#, fuzzy
+msgid "_Services"
+msgstr "Устройства"
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
-msgstr "Перейти к файлу"
+#: src/gtkui/menus.c:206
+#, fuzzy
+msgid "_Output"
+msgstr "Вывод"
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr "Показать/скрыть очередь"
+#: src/gtkui/menus.c:207
+#, fuzzy
+msgid "_View"
+msgstr "Вид"
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Включить или отключить очерёдность записей в списке воспроизведения."
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
-msgstr "Копировать"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-msgid "Cut"
-msgstr "Вырезать"
+#: src/gtkui/menus.c:215
+#, fuzzy
+msgid "_Copy"
+msgstr "Копировать"
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
+#: src/gtkui/menus.c:216
+#, fuzzy
+msgid "_Paste"
 msgstr "Вставить"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
+#: src/gtkui/menus.c:217
+#, fuzzy
+msgid "Select _All"
 msgstr "Выбрать все"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr "Выбрать все записи списка воспроизведения."
+#: src/gtkui/menus.c:222
+msgid "_Rename"
+msgstr "_Переименовать"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr "Снять выделение"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
+msgstr "Интерфейс GTK"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr "Снять выделение с ранее выделенных записей."
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Ошибка"
+
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "моно"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "стерео"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -2929,7 +1780,7 @@
 msgstr[1] "%d каналов"
 msgstr[2] "%d каналов"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, fuzzy, c-format
 msgid "%d kbps"
 msgstr "кбит/с"
@@ -2938,10 +1789,18 @@
 msgid "Previous Track"
 msgstr "Предыдущая дорожка"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Воспроизвести"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr "Пауза/Продолжить"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Остановить"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr "Следующая дорожка"
@@ -2966,6 +1825,10 @@
 msgid "Volume Down"
 msgstr "Тише"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr "Перейти к файлу"
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr "Показать/скрыть окна проигрывателя"
@@ -2974,11 +1837,21 @@
 msgid "Show On-Screen-Display"
 msgstr "Отобразить экранное сообщение (OSD)"
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "Повтор"
+
+#: src/hotkey/gui.c:85
+#, fuzzy
+msgid "Toggle Shuffle"
+msgstr "Случайно"
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(нет)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2990,15 +1863,15 @@
 "\n"
 "Продолжить?"
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr "Привязки к кнопкам мыши"
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Параметры модуля Глобальные \"горячие клавиши\""
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -3006,23 +1879,23 @@
 "Нажмите комбинацию клавиш в текстовом поле.\n"
 "Можно также сделать привязки к кнопкам мыши."
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr "Горячие клавиши:"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr "Действие:"
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr "Привязка клавиш:"
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr "О модуле Глобальные \"горячие клавиши\""
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -3097,131 +1970,19 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "О модуле вывода JACK 0.17"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr "Этот модуль LADSPA не имеет пользовательских настроек"
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "Имя"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "Установленные модули"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "Активные модули"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "Добавить"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "Удалить"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "Каталог модулей LADSPA"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "О модуле LIRC"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "Модуль LIRC "
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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"
-"Простой модуль, позволяющий управлять Audacious\n"
-"с помощью инфракрасного пульта управления\n"
-"и системного сервиса LIRC\n"
-"\n"
-"Адаптировано для Audacious:\n"
-"Tony Vroon <chainsaw@gentoo.org>,\n"
-"основано на модуле XMMS LIRC:\n"
-"Carl van Schaik <carl@leg.uct.ac.za>\n"
-"Christoph Bartelmus <xmms@bartelmus.de>\n"
-"Andrew O. Shadoura <bugzilla@tut.by>\n"
-"Информацию о LIRC можно найти на:\n"
-"http://lirc.org"
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr "Параметры модуля LIRC"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr "Повторно подключиться к серверу LIRC"
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr "Время до повторного соединения (секунд): "
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr "Повторное подключение"
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr "Соединение"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: невозможно инициализировать поддержку LIRC\n"
+"Looking for lyrics..."
+msgstr ""
 
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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: невозможно прочитать конфигурационный файл LIRC\n"
-"%s: пожалуйста, обратитесь к документации LIRC\n"
-"%s: как создать рабочий конфигурационный файл\n"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr "%s: повторное соединение...\n"
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: неизвестная команда \"%s\"\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: отключение от LIRC\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
-msgstr "%s: пытаться подключиться повторно каждые %d секунд...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
@@ -3229,11 +1990,11 @@
 "\n"
 "Тексты не обнаружены."
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "О модуле Метроном"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3249,262 +2010,43 @@
 "или tact://60*3/4 для воспроизведения 60и тактов в минуту\n"
 "в размере 3/4"
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Тактовый генератор: %d тактов/с"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Тактовый генератор: %d такт/мин %d/%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "Параметры модуля ModPlug"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 бит"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 бит"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr "Моно (микшировать 2 канала в 1)"
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr "Кусочно-постоянное (быстрейшее)"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "Линейное (быстрое)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr "Сплайны (хорошее качество)"
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr "8-точечный КИХ (наилучшее качество)"
-
-#: src/modplug/gui/interface.cxx:286
-msgid "96 kHz"
-msgstr "96 кГц"
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 кГц"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 кГц"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 кГц"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Частота"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "Включить"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "Глубина"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "Задержка"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "Реверберация"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "Величина"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "Диапазон"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "Усиление баса"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Объёмное звучание"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-"Важно: Установка слишком большого значения\n"
-"предусиления может вызвать отсечение сигнала,\n"
-"и, как следствие, щелчки и треск!"
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "Предусиление"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "Использовать имя файла как название дорожки"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "Быстрая информация списка воспроизведения"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "Шумоподавление"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Играть Amiga MOD"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "Не по кругу"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "По кругу"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "время(с)"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "По кругу беспрерывно"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "Беспрерывно"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "Информация MOD"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-"Имя файла:\n"
-"Название:\n"
-"Тип:\n"
-"Длина:\n"
-"Скорость:\n"
-"Темп:\n"
-"Сэмплы:\n"
-"Инструменты:\n"
-"Ритмичность:\n"
-"Каналы:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "Сэмплы"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "Инструменты"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "Сообщение"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Модуль ввода Modplug для Audacious, версия "
-
-#: src/modplug/gui/main.cxx:52
-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 написал Olivier Lapicque.\n"
-"XMMS interface for Modplug написал Kenton Varda.\n"
-"(c)2000 Olivier Lapicque and Kenton Varda.\n"
-"Обновления и сопровождение Konstanty Bialkowski.\n"
-"Портировал в BMP Theofilos Intzoglou."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "О модуле Modplug"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Не удалось найти файл изображения: %s"
-
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr "Выгрузка выбранных дорожек"
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr "Проводится выгрузка..."
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr "Оператор устройства MTP"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
+msgstr ""
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
+#: src/mtp_up/mtp.c:311
+#, fuzzy
+msgid "Disconnect MTP Device"
 msgstr "Отключить устройство"
 
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "Остановить"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Audacious - предупреждение о неразличимости"
+
 #: src/null/null.c:64
 msgid "Null output plugin "
 msgstr "Модуль Нулевой вывод"
@@ -3553,11 +2095,11 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr "Включить преобразование формата с помощью OSS."
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "О модуле OSS4"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
@@ -3608,6 +2150,11 @@
 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
 msgid "OSS Driver configuration"
 msgstr "Параметры модуля OSS"
@@ -3682,11 +2229,11 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, "
 "USA."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "О модуле вывода PulseAudio"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3744,27 +2291,27 @@
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 msgid "Change password"
 msgstr "Сменить пароль"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Службы"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 msgid "Scrobbler URL:"
 msgstr "Scrobbler URL:"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3772,7 +2319,7 @@
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3784,16 +2331,16 @@
 "Первоначально был разработан Audun Hove <audun@nlc.no> и Pipian "
 "<pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "О модуле Scrobbler"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 #, fuzzy
 msgid "About SDL Output Plugin"
 msgstr "О модуле вывода ALSA"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 #, fuzzy
 msgid "SDL error"
 msgstr "Ошибка ALSA"
@@ -3803,10 +2350,18 @@
 msgid "About %s"
 msgstr "О модуле %s"
 
-#: src/sid/xs_config.c:323
+#: 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 "Общая информация"
@@ -3816,6 +2371,11 @@
 msgid "Tune #%i: "
 msgstr "Дорожка #%i: "
 
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Не удалось найти файл изображения: %s"
+
 #: src/sid/xs_interface.c:234
 msgid "Audacious-SID configuration"
 msgstr "Параметры Audacious-SID"
@@ -4134,15 +2694,15 @@
 msgid "Use"
 msgstr "Использовать"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: 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:435
+#: 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:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Удалить"
 
@@ -4175,6 +2735,11 @@
 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 "Минимальное время воспроизведения:"
@@ -4436,11 +3001,11 @@
 msgid "No"
 msgstr "No"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "О графическом интерфейсе, использующем стили"
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -4448,469 +3013,450 @@
 "Copyright (c) 2008, Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr "Стили"
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr "Проигрыватель:"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr "Выберите шрифт основного окна проигрывателя:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "Список воспроизведения:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr "Выберите шрифт списка воспроизведения:"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr "Шрифты"
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr "Использовать растровые шрифты, если возможно"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
-"Использовать растровые шрифты, если они доступны. Растровые шрифты не "
-"поддерживают кодировку Юникод."
-
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr "Разное"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr "Показать разделители в списке воспроизведения"
 
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr "Использовать оформление оконного менеджера"
-
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
-msgstr "Применить к окнам проигрывателя оформление оконного менеджера."
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
+msgstr ""
 
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr "Прокрутка названия в обоих направлениях"
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "Стиль"
 
-#: src/skins/skins_cfg.c:330
-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 ""
-"Если включено, то текст названия в основном окне проигрывателя будет "
-"двигаться вперёд и назад. Если не включено, то текст будет двигаться только "
-"в одном направлении."
+#: src/skins/skins_cfg.c:393
+#, fuzzy
+msgid "Interface Preferences"
+msgstr "Параметры модуля Перекрёстное затухание"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr "Отключить тему, основанную на библиотеке gtk."
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Предусиление"
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
-msgstr "Случайный стиль при воспроизведении"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Гц"
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
-msgstr "Разрешить загрузку незавершённых стилей"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Гц"
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
-msgstr ""
-"Если включено, то audacious не станет отвергать нерабочие стили. Используйте "
-"лишь тогда, когда ваш любимый стиль не работает."
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Гц"
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "Настройка цвета"
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Гц"
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
-"Audacious может изменять цветовой баланс графического интерфейса стилей. "
-"Ползунки ниже позволят сделать это."
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Гц"
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "Синий"
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 кГц"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "Зелёный"
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 кГц"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "Красный"
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 кГц"
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "Стиль"
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 кГц"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr "Настройка цвета..."
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 кГц"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Эквалайзер Audacious"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr "Предустановки"
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "кбит/с"
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "кГц"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "объёмное звучание"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious - предупреждение о неразличимости"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "Отобразить основное окно проигрывателя"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "Игнорировать"
-
-#: src/skins/ui_main.c:993
-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 скрыты.\n"
-"Вам может потребоваться отобразить окна проигрывателя для управления "
-"Audacious; иначе вы должны управлять ей с помощью активных модулей "
-"(например, через значок в системном лотке)."
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr "Всегда игнорировать, скрытие/отображения управляется удалённо"
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious - предупреждение о нерабочем движке GTK"
-
-#: src/skins/ui_main.c:1052
-#, c-format
-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>Используется нерабочий движок GTK</big>\n"
-"\n"
-"Audacious определила, что используется нерабочий движок GTK.\n"
-"\n"
-"Движок тем, который вы используете, %s, несовместим с некоторыми "
-"возможностями, используемыми современными стилями. Не поддерживаемые "
-"возможности отключены в этой сессии.\n"
-"\n"
-"Для использования этих возможностей попробуйте использовать другой движок "
-"тем GTK."
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr "Больше не показывать это предупреждение"
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
+#: src/skins/ui_main.c:807
+#, fuzzy, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Поиск: %d:%-2.2d/%d:%-2.2d (%d%%)"
 
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Громкость: %d%%"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Баланс: %d%% влево"
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Баланс: по центру"
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Баланс: %d%% вправо"
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Меню параметров"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Отключить \"Видимый всегда\""
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Включить \"Видимый всегда\""
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Информация о файле"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "Отключить масштабирование"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "Включить масштабирование"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Меню визуализации"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr "Одиночный режим."
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 msgid "Playlist mode."
 msgstr "Режим списка воспроизведения."
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr "Остановить после дорожки."
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr "Не останавливать после дорожки."
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr "Автопрокрутка названия дорожки"
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Остановить после текущей дорожки"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
 msgstr "Пики"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Повтор"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Случайно"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "Без движения по списку воспроизведения"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr "Отобразить проигрыватель"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr "Отобразить редактор списка воспроизведения"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr "Отобразить эквалайзер"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr "Видимый всегда"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr "Разместить на все рабочие столы"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr "Свернуть проигрыватель"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr "Свернуть список воспроизведения"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr "Свернуть эквалайзер"
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "Масштабирование"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr "Двойной размер"
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr "Простое перемещение"
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr "Анализатор"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr "Осциллограмма"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr "Отпечаток голоса"
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "Выкл."
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr "Обычный"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr "Огонь"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr "Вертикальные линии"
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr "Линии"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr "Полоски"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr "Точечная осциллограмма"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr "Линейная осциллограмма"
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr "Непрерывная осциллограмма"
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr "Лёд"
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr "Сглаженный"
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "Очень медленно"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "Медленно"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "Средне"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "Быстро"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "Очень быстро"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr "Прошедшее время"
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr "Оставшееся время"
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "Пауза"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "Предыдущая дорожка"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "Следующая дорожка"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "Визуализация"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr "Режим визуализации"
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr "Анализатор"
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr "Осциллограмма"
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr "Отпечаток голоса"
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr "Режим WindowShade VU"
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr "Падение анализатора"
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr "Падение пиков"
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Список воспроизведения"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Новый список"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr "Выбрать следующий список"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr "Выбрать предыдущий список"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Удалить список"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "Загрузить список воспроизведения"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Загрузить список воспроизведения из файла в выбранный список."
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "Выгрузить список воспроизведения"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+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:228
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Обновить метаданные и соотнести их с записями списка воспроизведения."
+
+#: src/skins/ui_manager.c:238
 msgid "List Manager"
 msgstr "Менеджер списков"
 
-#: src/skins/ui_manager.c:238
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr "Открыть менеджер списков."
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Вид"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "Параметры модуля Перекрёстное затухание"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr "Добавить адрес..."
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr "Добавить звуковой поток из сети в список воспроизведения."
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr "Добавить файлы..."
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr "Добавить файлы в список воспроизведения."
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr "Найти и выбрать"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
@@ -4918,229 +3464,366 @@
 "Найти в списке воспроизведения и отметить записи, соответствующие заданному "
 "критерию."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr "Инвертировать выбор"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr "Снять выделение с отмеченных пунктов и пометить не отмеченные."
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "Выбрать все"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
+msgstr "Выбрать все записи списка воспроизведения."
+
+#: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr "Снять выделение"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr "Снять выделение с ранее выделенных записей."
+
+#: src/skins/ui_manager.c:277
+msgid "Remove All"
+msgstr "Удалить все"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr "Удалить все записи из списка воспроизведения."
+
+#: src/skins/ui_manager.c:281
 msgid "Clear Queue"
 msgstr "Очистить очередь"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr "Очистить очередь, связанную с этим списком воспроизведения."
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "Удалить недоступные файлы"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr "Удалить недоступные файлы из списка воспроизведения."
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "Удалить дубликаты"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "По названию"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr ""
 "Удалить из списка воспроизведения дублирующиеся записи с одинаковым "
 "названием."
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "По имени файла"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 "Удалить из списка воспроизведения дублирующиеся записи с одинаковыми именами "
 "файлов."
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "По пути и имени файла"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 "Удалить из списка воспроизведения дублирующиеся записи, имеющие одинаковый "
 "абсолютный путь."
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr "Удалить не отмеченные"
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr "Удалить из списка воспроизведения не выделенные записи."
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr "Удалить выбранные"
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr "Удалить из списка воспроизведения выделенные записи."
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr "Сортировать в случайном порядке"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr "Сортировать записи в списке воспроизведения в случайном порядке."
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr "В обратном порядке"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr "Обратить порядок записей в списке воспроизведения на противоположный."
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "Сортировать список"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr "Сортировать список воспроизведения по названию."
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+msgid "By Album"
+msgstr "По альбому"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr "Сортировать список воспроизведения по альбому."
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "По исполнителю"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr "Сортировать список воспроизведения по исполнителю."
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr "Сортировать список воспроизведения по имени файла."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr "Сортировать список воспроизведения по абсолютному пути к файлу."
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "По дате"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr "Сортировать список воспроизведения по дате изменения."
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr "По номеру дорожки"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr "Сортировать список воспроизведения по номеру дорожки."
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr "Сортировать выбранные"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "Файл"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Справка"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr "Службы модулей"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr "Информация о дорожке"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr "Просмотреть информацию о дорожке."
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "Об Audacious"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "Воспроизвести файл"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr "Загрузить и воспроизвести файл"
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "Воспроизвести из адреса"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr "Воспроизвести аудиоданные из выбранного места."
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "Службы модулей"
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "Параметры"
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr "Открыть окно параметров"
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "Закрыть Audacious"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr "Установить A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr "Очистить A-B"
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr "Перейти к началу списка"
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr "Перейти к указанному времени"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr "Показать/скрыть очередь"
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Включить или отключить очерёдность записей в списке воспроизведения."
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr "Копировать"
+
+#: src/skins/ui_manager.c:436
+msgid "Cut"
+msgstr "Вырезать"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Вставить"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Загрузить"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Предустановка"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Загрузить предустановку"
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Автоматически загружаемая предустановка"
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Загрузить автоматически загружаемую предустановку"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Загрузить в эквалайзер предустановку по умолчанию"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Нулевой уровень"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Сбросить установки эквалайзера в нулевой уровень"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Из файла"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Загрузить предустановку из файла"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Из EQF файла WinAMP'a"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Загрузить предустановки из EQF файла WinAMP'a"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Предустановки WinAMP'a"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Импортировать предустановки WinAMP'a"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Сохранить предустановки"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Сохранить автозагружаемые предустановки"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Сохранить предустановки по умолчанию"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "В файл"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Сохранить предустановки в файл"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "В файл EQF WinAMP'a"
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Сохранить предустановки в файл EQF WinAMP'a"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Удалить предустановку"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Удалить автозагружаемую предустановку"
 
-#: src/skins/ui_playlist.c:374
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Поиск записей в активном списке воспроизведения"
 
-#: src/skins/ui_playlist.c:382
+#: 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 "
@@ -5152,104 +3835,52 @@
 "чувствительное к регистру. Если вы не знаете, как работают регулярные "
 "выражения, просто вставьте часть букв из слова, которые хотите найти."
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Название: "
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Альбом: "
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Исполнитель: "
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Имя файла: "
 
-#: src/skins/ui_playlist.c:419
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Очистить предыдущий выбор до начала поиска"
 
-#: src/skins/ui_playlist.c:422
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "Автоматически переключать поочерёдно на соответствующим записям"
 
-#: src/skins/ui_playlist.c:425
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "Создать новый список воспроизведения с соответствующими записями"
 
-#: src/skins/ui_playlist.c:776
-msgid "Save as Static Playlist"
-msgstr "Сохранить как статический список воспроизведения"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr "Относительный путь"
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "Загрузить список воспроизведения"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "Сохранить список воспроизведения"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Редактор списков воспроизведения Audacious"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d из %d)"
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr "31 Гц"
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr "63 Гц"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr "125 Гц"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "250 Hz"
-msgstr "250 Гц"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "500 Hz"
-msgstr "500 Гц"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "1 kHz"
-msgstr "1 кГц"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "2 kHz"
-msgstr "2 кГц"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "4 kHz"
-msgstr "4 кГц"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "8 kHz"
-msgstr "8 кГц"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "16 kHz"
-msgstr "16 кГц"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr "Архивированная тема Winamp 2.x"
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Не архивированная тема Winamp 2.x"
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Невозможно создать каталог (%s): %s\n"
@@ -5301,56 +3932,64 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, "
 "USA."
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "О модуле SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr "Коррекция громкости"
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "Короткое перекрытие"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "Скорость"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "Смена высоты тона"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "Масштабирование"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Параметры"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "Параметры модуля SndStretch"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr "Команда, запускаемая Audacious в начале воспроизведения новой дорожки."
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "Команда:"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr "Команда, запускаемая после окончания дорожки."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 "Команда, запускаемая Audacious при достижении конца списка воспроизведения."
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "Команда, запускаемая при изменении названия дорожки (например, при "
 "воспроизведении из сети)."
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 #, fuzzy
 msgid ""
 "You can use the following format strings which\n"
@@ -5382,7 +4021,7 @@
 "%t: Положение списка воспроизведения (%02d)\n"
 "%p: Воспроизведение сейчас (1 или 0)"
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5390,18 +4029,14 @@
 "Параметры, передаваемые оболочке, должны быть заключены в "
 "кавычки. В противном случае возможны проблемы с безопасностью."
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "Команды"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 msgid "Song Change"
 msgstr "Смена дорожки"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "Анализатор спектра"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "О модуле Статус"
@@ -5474,71 +4109,19 @@
 "\n"
 "Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "О модуле Дополнительное стерео"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "Параметры модуля Дополнительное стерео"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-msgid "Search:"
-msgstr "Поиск:"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr "Добавить закладку"
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-msgid "Stream name"
-msgstr "Название потока"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr "Воспроизводится"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-msgid "Remove Bookmark"
-msgstr "Удалить закладку"
-
-#: src/streambrowser/streambrowser.c:340
-msgid "About Stream Browser"
-msgstr "О модуле Потоковый браузер"
-
-#: src/streambrowser/streambrowser.c:341
-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, Calin Crisan <ccrisan@gmail.com> и команда Audacious.\n"
-"\n"
-"Это простой потоковый браузер, который включает большинство самых популярных "
-"потоковых каталогов.\n"
-"Благодарности разработчикам Streamtuner <http://www.nongnu.org/"
-"streamtuner>,\n"
-"и, конечно, всему сообществу Audacious.\n"
-"\n"
-"Также благодарности Tony Vroon за наставления и оказанную мне помощь.\n"
-"\n"
-"Это проект Google Summer of Code 2008."
-
-#: src/tonegen/tonegen.c:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "О модуле Генератор сигналов"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5553,12 +4136,12 @@
 "частота1;частота2;частота3;...\n"
 "Например, tone://2000;2005 для воспроизведения сигналов 2000 Гц и 2005 Гц"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "Генератор сигналов: "
 
@@ -5579,15 +4162,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Теги Ogg Vorbis"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Параметры модуля Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "О модуле Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5661,9 +4244,1320 @@
 "Часть кода этого модуля написал Miles Egan\n"
 "Посетите сайт Wavpack по адресу http://www.wavpack.com/\n"
 
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "Использовать растровые шрифты, если возможно"
+
+#~ msgid ""
+#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
+#~ "Unicode strings."
+#~ msgstr ""
+#~ "Использовать растровые шрифты, если они доступны. Растровые шрифты не "
+#~ "поддерживают кодировку Юникод."
+
+#~ msgid "_Miscellaneous"
+#~ msgstr "Разное"
+
+#~ msgid "Use two-way text scroller"
+#~ msgstr "Прокрутка названия в обоих направлениях"
+
+#~ msgid "About "
+#~ msgstr "О "
+
+#~ 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"
+#~ "Этот модуль распространяется на условиях GNU LGPL.\n"
+#~ "Смотрите http://www.gnu.org/licenses/lgpl.html для дополнительной "
+#~ "информации.\n"
+#~ "\n"
+#~ "Этот модуль использует библиотеку AdPlug, Copyright (C) Simon Peter.\n"
+#~ "Версия библиотеки AdPlug: "
+
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AdPlug :: Настройка"
+
+#~ msgid "Sound quality"
+#~ msgstr "Качество звука"
+
+#~ msgid "Resolution"
+#~ msgstr "Разрешение"
+
+#~ msgid "8bit"
+#~ msgstr "8 бит"
+
+#~ msgid "16bit"
+#~ msgstr "16 бит"
+
+#~ msgid "Channels"
+#~ msgstr "Каналы"
+
+#~ 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 ""
+#~ "Настройка режима стерео не рекомендуется, если вам это не требуется. Эта "
+#~ "функция не добавит стереоэффектов к звучанию, но увеличит загрузку "
+#~ "процессора!"
+
+#~ msgid "Frequency"
+#~ msgstr "Частота"
+
+#~ msgid "Detect songend"
+#~ msgstr "Определить конец дорожки"
+
+#~ 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 ""
+#~ "Если включено, то Audacious определит окончание дорожки, остановит "
+#~ "воспроизведение и выведет сообщение в списке воспроизведения. Если "
+#~ "отключено, то Audacious не станет сообщать об окончании дорожки и "
+#~ "воспроизведение продолжится по кругу."
+
+#~ msgid "Formats"
+#~ msgstr "Форматы"
+
+#~ msgid "Format selection"
+#~ msgstr "Выбор формата"
+
+#~ msgid "Format"
+#~ msgstr "Формат"
+
+#~ msgid "Extension"
+#~ msgstr "Расширение"
+
+#~ 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 ""
+#~ "С помощью этих модулей можно выбрать типы файлов для воспроизведения. "
+#~ "Если модули не отмечены, то для воспроизведения этих файлов будут "
+#~ "использоваться другие модули."
+
+#~ msgid "AdPlug :: File Info"
+#~ msgstr "AdPlug :: Информация о файле"
+
+#~ msgid "Author: "
+#~ msgstr "Автор: "
+
+#~ msgid "File Type: "
+#~ msgstr "Тип файла: "
+
+#~ msgid "Subsongs: "
+#~ msgstr "Поддорожки: "
+
+#~ msgid "Instruments: "
+#~ msgstr "Инструменты:"
+
+#~ msgid "Orders: "
+#~ msgstr "Порядки: "
+
+#~ msgid "Patterns: "
+#~ msgstr "Ритмы: "
+
+#~ msgid "Song"
+#~ msgstr "Дорожка"
+
+#~ msgid "Instrument name"
+#~ msgstr "Название инструмента"
+
+#~ msgid "Song message"
+#~ msgstr "Сообщение дорожки"
+
+#~ msgid "Subsong selection"
+#~ msgstr "Выбор поддорожки"
+
+#~ msgid "Order: "
+#~ msgstr "Порядок: "
+
+#~ msgid "Pattern: "
+#~ msgstr "Ритм: "
+
+#~ msgid "Row: "
+#~ msgstr "Ряд: "
+
+#~ msgid "Speed: "
+#~ msgstr "Скорость:"
+
+#~ msgid "Timer: "
+#~ msgstr "Таймер:"
+
+#~ msgid "About XMMS Alarm"
+#~ msgstr "О модуле Будильник"
+
+#~ msgid "XMMS Alarm"
+#~ msgstr "Будильник"
+
+#~ 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"
+#~ "Все замечания направляйте по адресу:\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"
+#~ "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"
+#~ " Громкость, на которой останавливается затухание. Если\n"
+#~ " время затухания равно 0, установите громкость и начните\n"
+#~ " воспроизведение.\n"
+#~ "\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ " Дополнительные команды:\n"
+#~ " Запуск указанной команды в это время.\n"
+#~ "\n"
+#~ " Список воспроизведения:\n"
+#~ " Загрузка списка воспроизведения для сигнала\n"
+#~ " (используется расширение .m3u). Если список\n"
+#~ " воспроизведения указан, то дорожки будут воспроизводиться\n"
+#~ " из этого списка.\n"
+#~ " Могут также быть использованы URL потоков mp3/ogg,\n"
+#~ " но загрузка списков воспроизведения по URL в настоящее\n"
+#~ " время не поддерживается Audacious.\n"
+#~ "\n"
+#~ " Напоминание:\n"
+#~ " Отображение текста напоминания при выключении сигнала.\n"
+#~ " Введите текст напоминания в поле и установите флажок\n"
+#~ " \"Включить напоминание\".\n"
+
+#~ msgid "Your reminder for today is.."
+#~ msgstr "Напоминание на сегодняшний день..."
+
+#~ msgid "Thankyou"
+#~ msgstr "Спасибо"
+
+#~ msgid "Pairing request for '%s'"
+#~ msgstr "Парный запрос для '%s'"
+
+#~ msgid "Authorization request for %s"
+#~ msgstr "Запрос на авторизацию для %s"
+
+#~ msgid "Created bonding with %s"
+#~ msgstr "Установлено соединение с %s"
+
+#~ msgid "Removed bonding with %s"
+#~ msgstr "Соединение с %s прервано"
+
+#~ msgid "Device has been switched off"
+#~ msgstr "Устройство было выключено"
+
+#~ msgid "Device has been made non-discoverable"
+#~ msgstr "Невозможно обнаружить устройство"
+
+#~ msgid "Device has been made connectable"
+#~ msgstr "Устройство доступно для подключения"
+
+#~ msgid "Device has been made discoverable"
+#~ msgstr "Устройство определяется"
+
+#~ msgid "Device has been made limited discoverable"
+#~ msgstr "Устройство определилось частично"
+
+#~ msgid "Device has been switched into pairing mode"
+#~ msgstr "Устройство переведено в режим подключения"
+
+#~ msgid "Bluetooth headset support plugin"
+#~ msgstr "О модуле поддержки гарнитуры 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\n"
+#~ "Copyright (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
+#~ "Это проект Google Summer of Code 2008. Благодарю моего наставника Tony "
+#~ "Vroon и членов команды Audacious\n"
+#~ " \n"
+#~ "Для использования AVRCP нужно загрузить модуль ядра uinput\n"
+#~ "Кнопки гарнитуры будут распознаны как обычные мультимедийные кнопки\n"
+#~ "и могут быть настроены с помощью модуля Global Hotkey в Audacious или с "
+#~ "помощью других программ,\n"
+#~ "предоставляемых вашим оконным менеджером.\n"
+
+#~ msgid "Producer"
+#~ msgstr "Производитель"
+
+#~ msgid "Available Headsets"
+#~ msgstr "Доступная гарнитура"
+
+#~ msgid "Current Headset"
+#~ msgstr "Текущая гарнитура"
+
+#~ msgid "_Connect"
+#~ msgstr "Соединение"
+
+#~ msgid "Class"
+#~ msgstr "Класс"
+
+#~ msgid "Address:"
+#~ msgstr "Адрес:"
+
+#~ msgid "Bonding finish!"
+#~ msgstr "Соединение завершено!"
+
+#~ msgid "No devices found!"
+#~ msgstr "Устройства не обнаружены!"
+
+#~ msgid "Scanning..."
+#~ msgstr "Сканирование..."
+
+#~ msgid "Pairing..."
+#~ msgstr "Подключение..."
+
+#~ msgid "Rescan"
+#~ msgstr "Повторное сканирование"
+
+#~ msgid "Playback->Play"
+#~ msgstr "Воспроизведение->Играть"
+
+#~ msgid "Playback->Stop"
+#~ msgstr "Воспроизведение->Стоп"
+
+#~ msgid "Playback->Pause"
+#~ msgstr "Воспроизведение->Пауза"
+
+#~ msgid "Playback->Prev"
+#~ msgstr "Воспроизведение->Предыдущая"
+
+#~ msgid "Playback->Next"
+#~ msgstr "Воспроизведение->Следующая"
+
+#~ msgid "Playback->Eject"
+#~ msgstr "Воспроизведение->Извлечь"
+
+#~ msgid "Playlist->Repeat"
+#~ msgstr "Список->Повтор"
+
+#~ msgid "Playlist->Shuffle"
+#~ msgstr "Список->Случайно"
+
+#~ msgid "Volume->Up_5"
+#~ msgstr "Громкость->Вверх_5"
+
+#~ msgid "Volume->Down_5"
+#~ msgstr "Громкость->Вниз_5"
+
+#~ msgid "Volume->Up_10"
+#~ msgstr "Громкость->Вверх_10"
+
+#~ msgid "Volume->Down_10"
+#~ msgstr "Громкость->Вниз_10"
+
+#~ msgid "Volume->Mute"
+#~ msgstr "Громкость->Приглушить"
+
+#~ msgid "Window->Main"
+#~ msgstr "Окно->Главное"
+
+#~ msgid "Window->Playlist"
+#~ msgstr "Окно->Список воспроизведения"
+
+#~ msgid "Window->Equalizer"
+#~ msgstr "Окно->Эквалайзер"
+
+#~ msgid "Window->JumpToFile"
+#~ msgstr "Окно->Перейти к файлу"
+
+#~ 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 ""
+#~ "event-device-plugin: невозможно открыть файл устройства %s , устройство "
+#~ "пропущено; проверьте, что файл существует и что у вас есть права на его "
+#~ "чтение\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to create a io_channel for device file %s ,"
+#~ "skipping this device\n"
+#~ msgstr ""
+#~ "event-device-plugin: невозможно создать io_channel для устройства %s, "
+#~ "устройство пропущено\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to open /proc/bus/input/devices , automatic "
+#~ "detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: невозможно открыть /proc/bus/input/devices, "
+#~ "автоматическое распознавание устройств событий не будет работать.\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 ""
+#~ "event-device-plugin: невозможно открыть io_channel для /proc/bus/input/"
+#~ "devices, автоматическое распознавание устройств событий не будет "
+#~ "работать.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: an error occurred while reading /proc/bus/input/"
+#~ "devices , automatic detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: произошла ошибка при чтении /proc/bus/input/devices, "
+#~ "автоматическое распознавание устройств событий не будет работать.\n"
+
+#~ msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: устройство %s не найдено в /dev/input, пропущено.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to load config file %s , default settings "
+#~ "will be used.\n"
+#~ msgstr ""
+#~ "event-device-plugin: невозможно загрузить конфигурационный файл %s, будут "
+#~ "использованы настройки по умолчанию.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: incomplete information in config file for device \"%s"
+#~ "\" , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: неполная информация в конфигурационном файле для "
+#~ "устройства \"%s\", пропущено.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_active value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: настройка, невозможно получить значение is_active "
+#~ "для устройства \"%s\", пропущено.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to access local directory %s , settings will "
+#~ "not be saved.\n"
+#~ msgstr ""
+#~ "event-device-plugin: невозможно получить доступ к локальному каталогу %s, "
+#~ "настройки не будут сохранены.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get filename value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: настройка, невозможно получить имя файла для "
+#~ "устройства \"%s\", пропущено.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get phys value for device "
+#~ "\"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: настройка, невозможно получить физическое значение "
+#~ "для устройства \"%s\", пропущено.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_custom value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: настройка, невозможно получить значение is_custom "
+#~ "для устройства \"%s\", пропущено.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unexpected value for device \"%s\", "
+#~ "skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: настройка, непредусмотренное значение для устройства "
+#~ "\"%s\", пропущено.\n"
+
+#~ msgid "Detected"
+#~ msgstr "Определено"
+
+#~ msgid "Custom"
+#~ msgstr "Другое"
+
+#~ msgid "Not Detected"
+#~ msgstr "Не определено"
+
+#~ msgid "Information"
+#~ msgstr "Информация"
+
+#~ msgid ""
+#~ "Cannot open bindings window for a not-detected device.\n"
+#~ "Ensure that the device has been correctly plugged in."
+#~ msgstr ""
+#~ "Невозможно открыть окно для неопознанного устройства.\n"
+#~ "Убедитесь, что устройство подключено правильно."
+
+#~ msgid ""
+#~ "Unable to open selected device.\n"
+#~ "Please check read permissions on device file."
+#~ msgstr ""
+#~ "Невозможно открыть выбранное устройство.\n"
+#~ "Пожалуйста, проверьте права доступа к файлу устройства."
+
+#~ msgid "EvDev-Plug - Add custom device"
+#~ msgstr "EvDev-Plug - Добавить другое устройство"
+
+#~ 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 пытается автоматически определить и обновить информацию\n"
+#~ "о событиях устройств, присутствующих в системе.\n"
+#~ "Однако, если автоматическое определение в вашей системе не работает\n"
+#~ "или же устройства размещены не там, где обычно (сейчас просматривается\n"
+#~ "только каталог /dev/input/), то вы можете добавить устройство вручную,\n"
+#~ "указав название и файл устройства."
+
+#~ msgid "Device name:"
+#~ msgstr "Имя устройства:"
+
+#~ msgid "Device file:"
+#~ msgstr "Файл устройства:"
+
+#~ msgid "(custom)"
+#~ msgstr "(другое)"
+
+#~ msgid ""
+#~ "Please specify both name and filename.\n"
+#~ "Filename must be specified with absolute path."
+#~ msgstr ""
+#~ "Пожалуйста укажите название и имя файла.\n"
+#~ "Имя файла должно иметь абсолютный путь."
+
+#~ msgid ""
+#~ "Do you want to remove the existing configuration for selected device?\n"
+#~ msgstr ""
+#~ "Вы хотите удалить существующую конфигурацию для выбранного устройства?\n"
+
+#~ msgid "Do you want to remove the selected custom device?\n"
+#~ msgstr "Вы хотите удалить выбранное устройство?\n"
+
+#~ msgid "EvDev-Plug - Configuration"
+#~ msgstr "Параметры модуля EvDev-Plug"
+
+#~ msgid "Active"
+#~ msgstr "Активное"
+
+#~ msgid "Status"
+#~ msgstr "Статус"
+
+#~ msgid "Device Name"
+#~ msgstr "Название устройства"
+
+#~ msgid "Device File"
+#~ msgstr "Файл устройства"
+
+#~ msgid "Device Address"
+#~ msgstr "Адрес устройства"
+
+#~ msgid "_Bindings"
+#~ msgstr "_Привязки клавиш"
+
+#~ 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 ""
+#~ "Нажмите клавишу на вашем устройстве, чтобы сделать\n"
+#~ "привязку к ней. Если ни одна клавиша не будет нажата\n"
+#~ "в течении 5 секунд, окно закроется без изменения привязок."
+
+#~ 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 ""
+#~ "Это событие уже назначено.\n"
+#~ "\n"
+#~ "Невозможно назначить несколько действий на одно и тоже входное событие "
+#~ "(так же, как нельзя назначить одно действие на несколько событий)."
+
+#~ msgid "EvDev-Plug - Bindings Configuration"
+#~ msgstr "EvDev-Plug - Настройка привязок клавиш"
+
+#~ msgid "Name: "
+#~ msgstr "Название: "
+
+#~ msgid "Filename: "
+#~ msgstr "Имя файла: "
+
+#~ msgid "Phys.Address: "
+#~ msgstr "Физ. адрес: "
+
+#~ msgid "EvDev-Plug - about"
+#~ msgstr "О модуле 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"
+#~ "http://www.develia.org/projects.php?p=evdevplug\n"
+#~ "\n"
+#~ "Модуль написал Giacomo Lozito\n"
+#~ "< james@develia.org >\n"
+#~ "\n"
+
+#~ msgid "This LADSPA plugin has no user controls"
+#~ msgstr "Этот модуль LADSPA не имеет пользовательских настроек"
+
+#~ msgid "Name"
+#~ msgstr "Имя"
+
+#~ msgid "UID"
+#~ msgstr "UID"
+
+#~ msgid "Installed plugins"
+#~ msgstr "Установленные модули"
+
+#~ msgid "Running plugins"
+#~ msgstr "Активные модули"
+
+#~ msgid "Add"
+#~ msgstr "Добавить"
+
+#~ msgid "Remove"
+#~ msgstr "Удалить"
+
+#~ msgid "LADSPA Plugin Catalog"
+#~ msgstr "Каталог модулей LADSPA"
+
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "О модуле LIRC"
+
+#~ msgid "LIRC Plugin "
+#~ msgstr "Модуль 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"
+#~ "Простой модуль, позволяющий управлять Audacious\n"
+#~ "с помощью инфракрасного пульта управления\n"
+#~ "и системного сервиса LIRC\n"
+#~ "\n"
+#~ "Адаптировано для Audacious:\n"
+#~ "Tony Vroon <chainsaw@gentoo.org>,\n"
+#~ "основано на модуле XMMS LIRC:\n"
+#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
+#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
+#~ "Andrew O. Shadoura <bugzilla@tut.by>\n"
+#~ "Информацию о LIRC можно найти на:\n"
+#~ "http://lirc.org"
+
+#~ msgid "LIRC plugin settings"
+#~ msgstr "Параметры модуля LIRC"
+
+#~ msgid "Reconnect to LIRC server"
+#~ msgstr "Повторно подключиться к серверу LIRC"
+
+#~ msgid "Timeout before reconnecting (seconds): "
+#~ msgstr "Время до повторного соединения (секунд): "
+
+#~ msgid "Reconnect"
+#~ msgstr "Повторное подключение"
+
+#~ msgid "Connection"
+#~ msgstr "Соединение"
+
+#~ msgid "%s: could not init LIRC support\n"
+#~ msgstr "%s: невозможно инициализировать поддержку 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: невозможно прочитать конфигурационный файл LIRC\n"
+#~ "%s: пожалуйста, обратитесь к документации LIRC\n"
+#~ "%s: как создать рабочий конфигурационный файл\n"
+
+#~ msgid "%s: trying to reconnect...\n"
+#~ msgstr "%s: повторное соединение...\n"
+
+#~ msgid "%s: unknown command \"%s\"\n"
+#~ msgstr "%s: неизвестная команда \"%s\"\n"
+
+#~ msgid "%s: disconnected from LIRC\n"
+#~ msgstr "%s: отключение от LIRC\n"
+
+#~ msgid "%s: will try reconnect every %d seconds...\n"
+#~ msgstr "%s: пытаться подключиться повторно каждые %d секунд...\n"
+
+#~ msgid "ModPlug Configuration"
+#~ msgstr "Параметры модуля ModPlug"
+
+#~ msgid "16 bit"
+#~ msgstr "16 бит"
+
+#~ msgid "8 bit"
+#~ msgstr "8 бит"
+
+#~ msgid "Mono (downmix)"
+#~ msgstr "Моно (микшировать 2 канала в 1)"
+
+#~ msgid "Nearest (fastest)"
+#~ msgstr "Кусочно-постоянное (быстрейшее)"
+
+#~ msgid "Linear (fast)"
+#~ msgstr "Линейное (быстрое)"
+
+#~ msgid "Spline (good quality)"
+#~ msgstr "Сплайны (хорошее качество)"
+
+#~ msgid "8-tap Fir (extremely high quality)"
+#~ msgstr "8-точечный КИХ (наилучшее качество)"
+
+#~ msgid "96 kHz"
+#~ msgstr "96 кГц"
+
+#~ msgid "48 kHz"
+#~ msgstr "48 кГц"
+
+#~ msgid "44 kHz"
+#~ msgstr "44 кГц"
+
+#~ msgid "22 kHz"
+#~ msgstr "22 кГц"
+
+#~ msgid "Sampling Rate"
+#~ msgstr "Частота"
+
+#~ msgid "Enable"
+#~ msgstr "Включить"
+
+#~ msgid "Depth"
+#~ msgstr "Глубина"
+
+#~ msgid "Delay"
+#~ msgstr "Задержка"
+
+#~ msgid "Reverb"
+#~ msgstr "Реверберация"
+
+#~ msgid "Amount"
+#~ msgstr "Величина"
+
+#~ msgid "Range"
+#~ msgstr "Диапазон"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Усиление баса"
+
+#~ msgid ""
+#~ "Note: Setting the preamp\n"
+#~ "too high may cause clipping\n"
+#~ "(annoying clicks and pops)!"
+#~ msgstr ""
+#~ "Важно: Установка слишком большого значения\n"
+#~ "предусиления может вызвать отсечение сигнала,\n"
+#~ "и, как следствие, щелчки и треск!"
+
+#~ msgid "Effects"
+#~ msgstr "Эффекты"
+
+#~ msgid "Use Filename as Song Title"
+#~ msgstr "Использовать имя файла как название дорожки"
+
+#~ msgid "Fast Playlist Info"
+#~ msgstr "Быстрая информация списка воспроизведения"
+
+#~ msgid "Noise Reduction"
+#~ msgstr "Шумоподавление"
+
+#~ msgid "Play Amiga MOD"
+#~ msgstr "Играть Amiga MOD"
+
+#~ msgid "Don't loop"
+#~ msgstr "Не по кругу"
+
+#~ msgid "Loop"
+#~ msgstr "По кругу"
+
+#~ msgid "time(s)"
+#~ msgstr "время(с)"
+
+#~ msgid "Loop forever"
+#~ msgstr "По кругу беспрерывно"
+
+#~ msgid "Looping"
+#~ msgstr "Беспрерывно"
+
+#~ msgid "MOD Info"
+#~ msgstr "Информация MOD"
+
+#~ msgid ""
+#~ "Filename:\n"
+#~ "Title:\n"
+#~ "Type:\n"
+#~ "Length:\n"
+#~ "Speed:\n"
+#~ "Tempo:\n"
+#~ "Samples:\n"
+#~ "Instruments:\n"
+#~ "Patterns:\n"
+#~ "Channels:"
+#~ msgstr ""
+#~ "Имя файла:\n"
+#~ "Название:\n"
+#~ "Тип:\n"
+#~ "Длина:\n"
+#~ "Скорость:\n"
+#~ "Темп:\n"
+#~ "Сэмплы:\n"
+#~ "Инструменты:\n"
+#~ "Ритмичность:\n"
+#~ "Каналы:"
+
+#~ msgid ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+#~ msgstr ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+
+#~ msgid "Samples"
+#~ msgstr "Сэмплы"
+
+#~ msgid "Instruments"
+#~ msgstr "Инструменты"
+
+#~ msgid "Message"
+#~ msgstr "Сообщение"
+
+#~ msgid "Modplug Input Plugin for Audacious ver"
+#~ msgstr "Модуль ввода Modplug для Audacious, версия "
+
+#~ 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 написал Olivier Lapicque.\n"
+#~ "XMMS interface for Modplug написал Kenton Varda.\n"
+#~ "(c)2000 Olivier Lapicque and Kenton Varda.\n"
+#~ "Обновления и сопровождение Konstanty Bialkowski.\n"
+#~ "Портировал в BMP Theofilos Intzoglou."
+
+#~ msgid "About Modplug"
+#~ msgstr "О модуле Modplug"
+
+#~ msgid "Show separators in playlist"
+#~ msgstr "Показать разделители в списке воспроизведения"
+
+#~ msgid "Show window manager decoration"
+#~ msgstr "Использовать оформление оконного менеджера"
+
+#~ msgid "This enables the window manager to show decorations for windows."
+#~ msgstr "Применить к окнам проигрывателя оформление оконного менеджера."
+
+#~ 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 ""
+#~ "Если включено, то текст названия в основном окне проигрывателя будет "
+#~ "двигаться вперёд и назад. Если не включено, то текст будет двигаться "
+#~ "только в одном направлении."
+
+#~ msgid "Disable inline gtk theme"
+#~ msgstr "Отключить тему, основанную на библиотеке gtk."
+
+#~ msgid "Random skin on play"
+#~ msgstr "Случайный стиль при воспроизведении"
+
+#~ msgid "Allow loading incomplete skins"
+#~ msgstr "Разрешить загрузку незавершённых стилей"
+
+#~ msgid ""
+#~ "If selected, audacious won't refuse loading broken skins. Use only if "
+#~ "your favourite skin doesn't work"
+#~ msgstr ""
+#~ "Если включено, то audacious не станет отвергать нерабочие стили. "
+#~ "Используйте лишь тогда, когда ваш любимый стиль не работает."
+
+#~ msgid "Color Adjustment"
+#~ msgstr "Настройка цвета"
+
+#~ msgid ""
+#~ "Audacious allows you to alter the color balance of the skinned UI. The "
+#~ "sliders below will allow you to do this."
+#~ msgstr ""
+#~ "Audacious может изменять цветовой баланс графического интерфейса стилей. "
+#~ "Ползунки ниже позволят сделать это."
+
+#~ msgid "Blue"
+#~ msgstr "Синий"
+
+#~ msgid "Green"
+#~ msgstr "Зелёный"
+
+#~ msgid "Red"
+#~ msgstr "Красный"
+
+#~ msgid "Color adjustment ..."
+#~ msgstr "Настройка цвета..."
+
+#~ msgid "Disable 'GUI Scaling'"
+#~ msgstr "Отключить масштабирование"
+
+#~ msgid "Enable 'GUI Scaling'"
+#~ msgstr "Включить масштабирование"
+
+#~ msgid "DoubleSize"
+#~ msgstr "Двойной размер"
+
+#~ msgid "Easy Move"
+#~ msgstr "Простое перемещение"
+
+#~ 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 ""
+#~ "Copyright (c) 2008, Calin Crisan <ccrisan@gmail.com> и команда "
+#~ "Audacious.\n"
+#~ "\n"
+#~ "Это простой потоковый браузер, который включает большинство самых "
+#~ "популярных потоковых каталогов.\n"
+#~ "Благодарности разработчикам Streamtuner <http://www.nongnu.org/"
+#~ "streamtuner>,\n"
+#~ "и, конечно, всему сообществу Audacious.\n"
+#~ "\n"
+#~ "Также благодарности Tony Vroon за наставления и оказанную мне помощь.\n"
+#~ "\n"
+#~ "Это проект Google Summer of Code 2008."
+
+#~ msgid "Can't jump to time when no track is being played.\n"
+#~ msgstr ""
+#~ "Невозможно перейти к указанному времени, если дорожка не проигрывается.\n"
+
+#~ msgid "minutes:seconds"
+#~ msgstr "минут:секунд"
+
+#~ msgid "Track length:"
+#~ msgstr "Длина дорожки:"
+
+#~ msgid "Error writing playlist \"%s\": %s"
+#~ msgstr "Ошибка записи списка воспроизведения \"%s\": %s"
+
 #~ msgid "%s already exist. Continue?"
 #~ msgstr "%s уже существует. Продолжить?"
 
+#~ msgid "Show/hide infoarea"
+#~ msgstr "Показать/скрыть информационное поле"
+
+#~ msgid "Show main menu"
+#~ msgstr "Показать главное меню"
+
+#~ msgid "Show/hide main menu"
+#~ msgstr "Показать/скрыть главное меню"
+
+#~ msgid "Show/hide statusbar"
+#~ msgstr "Показать/скрыть строку состояния"
+
+#~ msgid "Import Playlist ..."
+#~ msgstr "Загрузить список..."
+
+#~ msgid "Export Playlist ..."
+#~ msgstr "Выгрузить список..."
+
+#~ msgid "Refresh"
+#~ msgstr "Обновить"
+
+#, fuzzy
+#~ msgid "Refresh Selected"
+#~ msgstr "Удалить выбранные"
+
+#, fuzzy
+#~ msgid "Refreshes metadata associated with selected entries."
+#~ msgstr ""
+#~ "Обновить метаданные и соотнести их с записями списка воспроизведения."
+
+#, fuzzy
+#~ msgid "Edit the playlist title."
+#~ msgstr "Сортировать записи в списке воспроизведения в случайном порядке."
+
+#, fuzzy
+#~ msgid "By Formatted Title"
+#~ msgstr "По названию"
+
+#~ msgid "Components"
+#~ msgstr "Компоненты"
+
+#~ msgid "Upload selected track(s)"
+#~ msgstr "Выгрузка выбранных дорожек"
+
+#~ msgid "MTP device handler"
+#~ msgstr "Оператор устройства MTP"
+
+#~ msgid "Show main player window"
+#~ msgstr "Отобразить основное окно проигрывателя"
+
+#~ msgid "Ignore"
+#~ msgstr "Игнорировать"
+
+#~ 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 скрыты.\n"
+#~ "Вам может потребоваться отобразить окна проигрывателя для управления "
+#~ "Audacious; иначе вы должны управлять ей с помощью активных модулей "
+#~ "(например, через значок в системном лотке)."
+
+#~ msgid "Always ignore, show/hide is controlled remotely"
+#~ msgstr "Всегда игнорировать, скрытие/отображения управляется удалённо"
+
+#~ msgid "Audacious - broken GTK engine usage warning"
+#~ msgstr "Audacious - предупреждение о нерабочем движке 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>Используется нерабочий движок GTK</big>\n"
+#~ "\n"
+#~ "Audacious определила, что используется нерабочий движок GTK.\n"
+#~ "\n"
+#~ "Движок тем, который вы используете, %s, несовместим с некоторыми "
+#~ "возможностями, используемыми современными стилями. Не поддерживаемые "
+#~ "возможности отключены в этой сессии.\n"
+#~ "\n"
+#~ "Для использования этих возможностей попробуйте использовать другой движок "
+#~ "тем GTK."
+
+#~ msgid "Do not display this warning again"
+#~ msgstr "Больше не показывать это предупреждение"
+
+#~ msgid "Save as Static Playlist"
+#~ msgstr "Сохранить как статический список воспроизведения"
+
+#~ msgid "Use Relative Path"
+#~ msgstr "Относительный путь"
+
+#~ msgid "Load Playlist"
+#~ msgstr "Загрузить список воспроизведения"
+
+#~ msgid "Save Playlist"
+#~ msgstr "Сохранить список воспроизведения"
+
+#~ msgid "Skinned Interface"
+#~ msgstr "Стили"
+
 #~ msgid "%s: %d kbps, %d Hz, %s"
 #~ msgstr "%s: %d кбит/с, %d Гц, %s"
 
@@ -7080,9 +6974,6 @@
 #~ msgid "Entries"
 #~ msgstr "Записи"
 
-#~ msgid "_Rename"
-#~ msgstr "_Переименовать"
-
 #~ msgid "About Icecast-Plugin"
 #~ msgstr "О модуле Icecast"

audacious-plugins-2.5.3.tar.gz/po/sk.po -> audacious-plugins-3.0.tar.gz/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-05-19 10:53-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"
@@ -20,7 +20,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -31,608 +31,47 @@
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM dekodér (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 tím Audacious"
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "O module dekodéra MP4 AAC"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "O "
-
-#: src/adplug/adplug-xmms.cc:155
-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"
-"Modul je poskytovaný za podmienok licencie GNU LGPL.\n"
-"Pre podrobnosti navštívte http://www.gnu.org/licenses/lgpl.html\n"
-"\n"
-"Modul používa knižnicu AdPlug, Copyright (C) Simon Peter a ďalší.\n"
-"Zostavené s AdPlug knižnicou verzie: "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: Nastavenie"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "OK"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "Všeobecné"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Kvalita zvuku"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Rozlíšenie"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8 bitov"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16 bitov"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Počet kanálov"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Stereo"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-"Povolenie sterea nie je odporúčané (ak ho naozaj nepotrebujete). Táto voľba "
-"nepridá zvuku žiadne stereoefekty (OPL2 je len mono), a spotrebováva sa viac "
-"výkonu CPU."
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Frekvencia"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Prehrávanie"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Rozoznať koniec skladby"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-"Ak je povolené, XMMS rozozná, že sa skladba skončila, zastaví ju a prejde na "
-"nasledujúcu skladbu v zozname skladieb. Ak je zakázané, XMMS nebude reagovať "
-"na koniec pesničky a bude ju opakovať neustále dookola."
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Formáty"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Výber formátu"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Formát"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Prípona"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-"Vybrané typy súborov budú rozpoznané a prehrávané týmto modulom. Ostatné "
-"budú ignorované a budú prenechané iným modulom."
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: Informácie o súbore"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Názov súboru"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Názov: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Autor: "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Typ súboru: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "Podskladby: "
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Nástroje: "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "Poradia: "
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Úseky: "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Skladba"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Meno nástroja"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Správa skladby"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "Výber podskladby"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Poradie: "
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Úsek: "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Riadok: "
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Rýchlosť: "
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Časovač: "
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "O budíku"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "XMMS budík"
-
-#: src/alarm/interface.c:56
-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, ktorý môže byť použitý\n"
-"k načasovaniu spustenia prehrávanie.\n"
-"\n"
-"Sťažnosti posielajte na adresu:\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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Zatvoriť"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Budík"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "Toto je váš budiaci signál."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Vybrať zoznam skladieb"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Ospravedlnenie"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Upozornenie"
-
-#: src/alarm/interface.c:213
-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čnostých dôvodov musí byť dĺžka ticha aspoň o 65 sekúnd dlhšia ako je "
-"dĺžka zosilňovania a zároveň musí byť dlhá aspoň 10 sekúnd. To v podstate "
-"znamená, že v kóde je chyba a kým nenájdem spôsob, ako ju naozaj odstrániť, "
-"bude sa zobrazovať táto správa. :)\n"
-"\n"
-"Vaše nastavenia zosilňovanie NEBOLI uložené.\n"
-"\n"
-"--\n"
-"Adam"
-
-#: src/alarm/interface.c:229
-msgid "Oh Well"
-msgstr "Tak dobre"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Nastavenia budíka"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Čas"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "hodinách"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "minútach"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Ticho po:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Budiť v (štandardne):"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Zvoľte dni, kedy má budík budiť"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Štandardné"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Deň"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Utorok"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Streda"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Štvrtok"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Piatok"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Sobota"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Nedeľa"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Pondelok"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Dni"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Zosilňovanie"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "sekúnd"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Hlasitosť"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Aktuálna"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "vrátiť na aktuálnu hlasitosť výstupu"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Začať na"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Skončiť na"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Dodatočný príkaz"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "povoliť"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Zoznam skladieb (voliteľné)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Prechádzať…"
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Pripomenutie"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Pripomenúť"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Možnosti"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Čo znamenajú tieto možnosti?"
-
-#: src/alarm/interface.c:1364
-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"
-" Budiť v: \n"
-" Čas, v ktorom sa spustí budenie.\n"
-"\n"
-" Ticho po: \n"
-" Zastaviť budík po uplynutí tejto doby.\n"
-" (ak nie je okno budíka medzi tým zatvorené)\n"
-"\n"
-"\n"
-"Dni\n"
-" Deň:\n"
-" Zvoľte dni, kedy má byť budík aktívny.\n"
-"\n"
-" Čas:\n"
-" Zvoľte čas budenia pre každý deň, alebo zaškrtnite\n"
-" prepínacie tlačidlo na použitie štandardného času.\n"
-"\n"
-"\n"
-"Hlasitosť\n"
-" Zosilňovanie: \n"
-" Počas tohoto času postupne zosilňuje hlasitosť až\n"
-" na zvolenú hodnotu\n"
-"\n"
-" Začať na: \n"
-" Začať zosilňovanie z tejto úrovne.\n"
-"\n"
-" Skončiť na: \n"
-" Úroveň, pri ktorej skončí zosilňovanie. Ak je čas\n"
-"zosilňovania 0, hlasitosť sa nastaví na túto úroveň\n"
-"a spustí sa prehrávanie.\n"
-"\n"
-"\n"
-"Nastavenia:\n"
-" Dodatočný príkaz:\n"
-" Tento príkaz bude pri budení spustený.\n"
-"\n"
-" Zoznam skladieb: \n"
-" Načítať zoznam skladieb, z ktorého sa budú\n"
-" prehrávať skladby (musí mať príponu .m3u).\n"
-" Ak nie je zoznam zadaný, budú sa prehrávať skladby\n"
-" z aktuálneho zoznamu skladieb.\n"
-" Je možné použiť aj URL mp3/ogg prúdu, ale\n"
-" načítavanie zoznamu skladieb z URL nie je momentálne\n"
-" v XMMS podporované.\n"
-"\n"
-" Pripomenutie:\n"
-" Pri vypnutí budíka zobrazí pripomienku.\n"
-" Text pripomienky napíšte do vstupného poľa\n"
-" a zaškrtnite „Pripomenúť“ ak si prajete, aby sa text zobrazil.\n"
-
-#: src/alarm/interface.c:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Pomocník"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "Vaša pripomienka pre dnes je…"
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Ďakujem"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Predvolené PCM zariadenie"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 msgid "Default mixer device"
 msgstr "Predvolené zariadenie mixéra"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 msgid "ALSA Output Plugin Preferences"
 msgstr "Predvoľby výstupného modulu ALSA"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 msgid "PCM device:"
 msgstr "PCM zariadenie:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Zariadenie mixéra:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 msgid "Mixer element:"
 msgstr "Prvok mixéra:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr "Obísť problém so zasekávaním pri vyprázdňovaní"
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
 msgstr "O výstupnom module ALSA"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr "Chyba ALSA"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -801,6 +240,10 @@
 msgid "SoundFont settings"
 msgstr "Nastavenia SoundFont"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Názov súboru"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Veľkosť (v bajtoch)"
@@ -909,8 +352,7 @@
 "Koncové zariadenie\n"
 "TiMidity"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "Názov:"
 
@@ -1082,119 +524,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSD sa zobrazí keď je prehrávanie obnovené."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Umiestnenie"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "Relatívne odsadenie v smere osi X:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Relatívne odsadenie v smere osi Y:"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "Maximálna šírka OSD:"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Nastavenia pre viac monitorov"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "Zobraziť OSD na:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "všetkých monitoroch"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "monitore %i"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Časovanie (ms)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "Zobrazenie:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "Rozsvietenie:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "Zhasnutie:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "Písmo %i:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Tieň"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Internacionalizácia"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "Zakázať prevod textu do kódovania UTF-8 (v knižnici aosd)"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "Vyberte súbor s vzhľadom"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Štýl zobrazenia"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Farby"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "Farba %i:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "Používateľský vzhľad"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "Súbor s vzhľadom:"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "Prechádzať"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Povoliť spúšťač"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Udalosť"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "Bol zistený kompozitný správca"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1204,73 +646,73 @@
 "Ak viete, že žiadny nebeží, prosím, aktivujte kompozitného správcu, inak "
 "nebude OSD pracovať správne"
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "Pri falošnej priehľadnosti nie je potrebný kompozitný správca"
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Priehľadnosť"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Falošná priehľadnosť"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Skutočná priehľadnosť (vyžaduje kompozitné rozšírenie X servera)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "Kompozitné rozšírenie nie je načítané"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "Kompozitné rozšírenie nie je dostupné"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "OSD Audacious"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "OSD pre Audacious - nastavenie"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Vyskúšať"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Umiestnenie"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Animácia"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Výzdoba"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Spúšťač"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Rôzne"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "O module OSD pre Audacious"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1278,7 +720,7 @@
 "\n"
 "OSD pre Audacious "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1300,135 +742,6 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr "Požiadavka o spárovanie pre '%s'"
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr "Požiadavka o autorizáciu pre '%s'"
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr "Vytvorené prepojenie s %s"
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr "Odstránené prepojenie s %s"
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr "Zariadenie bolo vypnuté"
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr "Zariadenie už nebude zistiteľné"
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr "K zariadeniu sa bude môcť pripájať"
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr "Zariadenie bude zistiteľné"
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr "Zariadenie bude obmedzene zistiteľné"
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr "Zariadenie bolo prepnuté do párovacieho režimu"
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr "Modul podporujúci bluetooth slúchadlové súpravy"
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-"Podpora bluetooth slúchadlových súprav\n"
-"Copyright (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
-"Toto bol GSoC 2008 projekt. Veľká vďaka patrí Tonymu Vroonovi a tímu "
-"Audacious\n"
-"\n"
-"Ak sa rozhodnete používať AVRCP budete musieť do jadra zaviesť modul "
-"uinput.\n"
-"Tlačítka súpravy sa budú tváriť ako normálne multimediálne klávesy\n"
-"a môžu byť nastavené pomocou modulu „Globálne klávesové skratky“\n"
-"alebo inými nástrojmi, ktoré poskytuje váš správca okien\n"
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr "Výrobca"
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr "Dostupné slúchadlové súpravy"
-
-#: src/bluetooth/gui.c:224
-msgid "Current Headset"
-msgstr "Aktuálna slúchadlová súprava"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr "_Obnoviť"
-
-#: src/bluetooth/gui.c:231
-msgid "_Connect"
-msgstr "_Spojiť"
-
-#: src/bluetooth/gui.c:237
-msgid "_Close"
-msgstr "_Zatvoriť"
-
-#: src/bluetooth/gui.c:274
-msgid "Class"
-msgstr "Trieda"
-
-#: src/bluetooth/gui.c:278
-msgid "Address:"
-msgstr "Adresa:"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr "Prepojenie vytvorené!"
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr "Nebolo nájdené žiadne zariadenie."
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr "Vyhľadávanie…"
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr "Párovanie…"
-
-#: src/bluetooth/scan_gui.c:138
-msgid "Rescan"
-msgstr "Znovu vyhľadať"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "Prehrať"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Blur Scope: Výber farby"
@@ -1437,11 +750,11 @@
 msgid "Options:"
 msgstr "Možnosti:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 msgid "About Audio CD Plugin"
 msgstr "O module zvukových CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1466,15 +779,15 @@
 "\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 msgid "Audio CD"
 msgstr "Zvukové CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr "Mechanika je prázdna."
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr "Nepodporovaný typ disku."
 
@@ -1522,11 +835,23 @@
 msgid "Override default device: "
 msgstr "Nahradiť predvolené zariadenie: "
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+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šiť"
+
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
 msgstr "Prehrať CD"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "Pridať CD"
 
@@ -1550,6 +875,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Dekodér konzolovej hudby"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "Všeobecné"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Prehrávanie"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Hĺbky:"
@@ -1567,8 +900,7 @@
 msgid "Default song length:"
 msgstr "Predvolená dĺžka skladby:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Prevzorkovanie"
 
@@ -1580,6 +912,10 @@
 msgid "Resampling rate:"
 msgstr "Prevzorkovať na:"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1649,16 +985,16 @@
 "Na prevzorkovanie skladieb na rovnakú frekvenciu môžete použiť efektový "
 "modul „Konvertor vzorkovacej frekvencie“."
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "Nastaviť Crystalizer"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Sila efektu:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Použiť"
 
@@ -1698,377 +1034,20 @@
 msgid "Volume: (%)"
 msgstr "Hlasitosť: (%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "Prehrávanie->Prehrať"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "Prehrávanie->Zastaviť"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "Prehrávanie->Pozastaviť"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "Prehrávanie->Predchádzajúca"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "Prehrávanie->Ďalšia"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "Prehrávanie->Vysunúť"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "Zoznam skladieb->Opakovať"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "Zoznam skladieb->Premiešať zoznam"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "Hlasitosť->Zvýšiť o 5"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "Hlasitosť->Znížiť o 5"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "Hlasitosť->Zvýšiť o 10"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "Hlasitosť->Znížiť o 10"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "Hlasitosť->Stlmiť"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "Okno->Hlavné"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "Okno->Zoznam skladieb"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "Okno->Ekvalizér"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "Okno->Prejsť na súbor"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-"event-device-plugin: zariadenie %s sa nedá otvoriť, toto zariadenie sa "
-"vynechá; skontrolujte, či súbor zariadenia existuje a či máte právo ho "
-"čítať\n"
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-"event-device-plugin: vstupno-výstupný kanál pre zariadenie %s sa nedá "
-"vytvoriť, zariadenie bude vynechané\n"
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: súbor /proc/bus/input/devices sa nedá otvoriť, "
-"automatické detekcia udalostných zariadení nebude fungovať.\n"
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-"event-device-plugin: vstupno-výstupný kanál pre /proc/bus/input/devices sa "
-"nedá otvoriť, automatické detekcia udalostných zariadení nebude fungovať.\n"
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: pri čítaní /proc/bus/input/devices nastala chyba, "
-"automatické detekcia udalostných zariadení nebude fungovať.\n"
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-"event-device-plugin: zariadenie %s nebolo nájdené v /dev/input; zariadenie "
-"bude vynechané.\n"
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-"event-device-plugin: konfiguračný súbor %s sa nedá načítať,budú použité "
-"predvolené nastavenia.\n"
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-"event-device-plugin: v konfiguračnom súbore sú neúplné informácie pre "
-"zariadenie „%s“, zariadenie bude vynechané\n"
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurácia: nedá sa získať hodnota is_active pre "
-"zariadenie „%s“, zariadenie bude vynechané\n"
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-"event-device-plugin: prístup k lokálnemu adresáru %s bol odoprený, "
-"nastavenia nebudú uložené.\n"
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurácia: hodnotu filename pre zariadenie „%s“ sa "
-"nepodarilo získať, zariadenie bude vynechané\n"
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurácia: hodnotu phys pre zariadenie „%s“ sa "
-"nepodarilo získať, zariadenie bude vynechané\n"
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurácia: hodnotu is_custom pre zariadenie „%s“ sa "
-"nepodarilo získať, zariadenie bude vynechané\n"
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-"event-device-plugin: konfigurácia: neočakávaná hodnota pre zariadenie „%s“, "
-"zariadenie bude vynechané\n"
-
-#: src/evdev-plug/ed_ui.c:212
-msgid "Detected"
-msgstr "Nájdené"
-
-#: src/evdev-plug/ed_ui.c:217
-msgid "Custom"
-msgstr "Vlastné"
-
-#: src/evdev-plug/ed_ui.c:223
-msgid "Not Detected"
-msgstr "Nenájdené"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "Podrobnosti"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-"Okno s prepojeniami pre nenájdené zariadenie sa nedá otvoriť.\n"
-"Uistite sa, že zariadenie je správne pripojené."
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Chyba"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-"Zvolené zariadenie sa nedá otvoriť.\n"
-"Skontrolujte prosím, práva na čítanie tohoto zariadenia."
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "EvDev-Plug - Pridať vlastné zariadenie"
-
-#: src/evdev-plug/ed_ui.c:353
-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 sa pokúsi automaticky zistiť udalostné zariadenia dostupné\n"
-"v systéme a aktualizovať o nich informácie.\n"
-"Ak autodetekcia na vašom systéme nepracuje správne, alebo máte udalostné\n"
-"zariadenia v neštandardnom adresári (v súčastnosti je prehľadávaný iba "
-"adresár\n"
-"/dev/input), môžete pridať vlastné zariadenia."
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Názov zariadenia:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Súbor zariadenia:"
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr "(vlastné)"
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-"Prosím zadajte názov a názov súboru.\n"
-"Názov súboru musí byť uvedené s absolútnou cestou."
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr "Prajete si odstrániť existujúce nastavenie pre zvolené zariadenie?\n"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "Prajete si odstrániť zvolené vlastné zariadenie?\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "EvDev-Plug - Nastavenie"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Aktívne"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Stav"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Názov zariadenia"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Súbor zariadenia"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Adresa zariadenia"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "_Prepojenia"
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-"Na zariadení stlačte kláves, ktorý si želáte prepojiť.\n"
-"Ak nebude stlačený žiadny kláves bude toto okno\n"
-"automaticky o päť sekúnd zatvorené."
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-"Táto vstupná udalosť už bola priradená.\n"
-"\n"
-"Nie je možné priradiť viac akcií rovnakej vstupnej udalosti (je ale možné "
-"priradiť jednu akciu viacerým vstupným udalostiam)."
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Plug - Nastavenie prepojení"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "Názov: "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Názov súboru: "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Fyzická adresa: "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "O module EvDev-Plug"
-
-#: src/evdev-plug/ed_ui.c:1491
-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"
-"diaľkové ovládanie prehrávača pomocou udalostných zariadení\n"
-"http://www.develia.org/projects.php?p=audacious#evdevplug\n"
-"\n"
-"napísal Giacomo Lozito\n"
-
-#: src/ffaudio/ffaudio-core.c:765
-#, c-format
+#: src/ffaudio/ffaudio-core.c:763
+#, fuzzy, c-format
 msgid ""
 "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"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 "Viacformátový modul dekódujúci zvuk pre Audacious založený\n"
 "na multimediálnom systéme FFmpeg (http://www.ffmpeg.org/)\n"
@@ -2080,15 +1059,15 @@
 " William Pitcock <nenolod@nenolod.net>,\n"
 " Matti Hämäläinen <ccr@tnsp.org>\n"
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "O module FFaudio"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "O module FileWriter"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2122,51 +1101,51 @@
 "požiadajte o ňu Free Software Foundation, Inc., 51 Franklin Street, Fifth "
 "Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "Nastavenie zápisu do súboru"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Formát výstupného súboru:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Nastaviť"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Ukladať do pôvodného adresára"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Ukladať do vlastného adresára"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Priečinok s výstupnými súbormi:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Vybrať priečinok"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Získať názov súboru z:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "pôvodných značiek v súbore"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "názvu pôvodného súboru"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Neodstraňovať príponu názvu súboru"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "Na začiatok názvu súboru pridať číslo stopy"
 
@@ -2178,6 +1157,14 @@
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Mono"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "Nastavenie MP3"
@@ -2223,7 +1210,6 @@
 msgstr "Ochrana pred chybami"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Kvalita"
 
@@ -2331,11 +1317,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "O module Klávesové skratky Gnome"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2349,58 +1335,22 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr "Otvoriť súbory"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 msgid "Add Files"
 msgstr "Pridať súbory"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 msgid "Audacious2"
 msgstr "Audacious2"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr "GNT rozhranie"
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr "Keď sa neprehráva žiadna skladba nie je možné prejsť na čas.\n"
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr "Prejsť na čas"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr "minúty:sekundy"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr "Dĺžka skladby:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr "Chyba pri ukladaní zoznamu skladieb „%s“: %s"
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-msgid "Export Playlist"
-msgstr "Exportovať zoznam skladieb"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-msgid "Import Playlist"
-msgstr "Importovať zoznam skladieb"
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Číslo položky"
@@ -2485,398 +1435,313 @@
 msgid "Disable"
 msgstr "Zakázať"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr "GTK rozhranie"
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr "Zastaviť po skončení aktuálnej skladby"
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr "Opakovať"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr "Náhodné poradie"
+#: src/gtkui/menus.c:132
+#, fuzzy
+msgid "_Open Files ..."
+msgstr "Otvoriť súbory …"
 
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr "Neprehrávať ďalšiu skladbu zo zoznamu"
+#: src/gtkui/menus.c:133
+#, fuzzy
+msgid "Open _URL ..."
+msgstr "Otvoriť URL …"
 
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr "Zobraziť informačnú plochu"
+#: src/gtkui/menus.c:134
+#, fuzzy
+msgid "_Add File ..."
+msgstr "Pridať súbory …"
 
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr "Zobrazí alebo skryje informačnú plochu"
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr "Zobraziť hlavnú ponuku"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr "Zobrazí alebo skryje hlavnú ponuku"
+#: src/gtkui/menus.c:135
+#, fuzzy
+msgid "Add U_RL ..."
+msgstr "Pridať URL …"
 
-#: src/gtkui/ui_manager.c:55
-msgid "Show statusbar"
-msgstr "Zobraziť stavový riadok"
+#: src/gtkui/menus.c:137
+#, fuzzy
+msgid "A_bout ..."
+msgstr "O "
 
-#: src/gtkui/ui_manager.c:56
-msgid "Show/hide statusbar"
-msgstr "Zobrazí alebo skryje stavový riadok"
+#: src/gtkui/menus.c:138
+#, fuzzy
+msgid "_Preferences ..."
+msgstr "Predvoľby"
 
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
-msgstr "Zobrazovať hlavičky stĺpcov"
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
+msgstr "_Koniec"
 
-#: src/gtkui/ui_manager.c:60
+#: src/gtkui/menus.c:142
 #, fuzzy
-msgid "Scroll on Song Change"
-msgstr "Zmena skladby"
+msgid "_Play"
+msgstr "Prehrať"
 
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
+#: src/gtkui/menus.c:143
+#, fuzzy
+msgid "Paus_e"
 msgstr "Pozastaviť"
 
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
+#: src/gtkui/menus.c:144
+#, fuzzy
+msgid "_Stop"
 msgstr "Zastaviť"
 
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
+#: src/gtkui/menus.c:145
+#, fuzzy
+msgid "Pre_vious"
 msgstr "Predchádzajúca"
 
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
+#: src/gtkui/menus.c:146
+#, fuzzy
+msgid "_Next"
 msgstr "Nasledujúca"
 
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "Zoznam skladieb"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "Nový zoznam skladieb"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "Zmazať zoznam skladieb"
-
-#: src/gtkui/ui_manager.c:95
-msgid "Import Playlist ..."
-msgstr "Importovať zoznam skladieb …"
-
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr "Pridá súbor so zoznamom do vybraného zoznamu skladieb."
+#: src/gtkui/menus.c:148
+#, fuzzy
+msgid "_Repeat"
+msgstr "Opakovať"
 
-#: src/gtkui/ui_manager.c:98
-msgid "Export Playlist ..."
-msgstr "Exportovať zoznam skladieb …"
+#: src/gtkui/menus.c:149
+#, fuzzy
+msgid "S_huffle"
+msgstr "Náhodné poradie"
 
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "Uloží vybraný zoznam skladieb."
+#: src/gtkui/menus.c:150
+#, fuzzy
+msgid "N_o Playlist Advance"
+msgstr "Neprehrávať ďalšiu skladbu zo zoznamu"
 
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-msgid "Save All Playlists"
-msgstr "Uložiť všetky zoznamy skladieb"
+#: src/gtkui/menus.c:151
+#, fuzzy
+msgid "Stop _After This Song"
+msgstr "Zastaviť po skončení skladby."
 
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
-"Uloží všetky otvorené zoznamy skladieb. Berte na vedomie, že toto je "
-"automaticky urobené pri ukončovaní Audacious."
 
-#: src/gtkui/ui_manager.c:106
-msgid "Refresh"
-msgstr "Obnoviť"
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Obnovuje metadáta patriace k skladbe zo zoznamu."
-
-#: src/gtkui/ui_manager.c:110
-msgid "Refresh Selected"
-msgstr "Obnoviť označené"
-
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
-msgstr "Obnovuje metadáta patriace k zvoleným položkám."
-
-#: src/gtkui/ui_manager.c:115
-msgid "Playlist Manager"
-msgstr "Správca zoznamov skladieb"
-
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr "Otvorí správcu zoznamov skladieb."
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr "Pridať URL …"
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr "Do zoznamu skladieb pridá vzdialenú stopu."
-
-#: src/gtkui/ui_manager.c:123
-msgid "Add Files ..."
-msgstr "Pridať súbory …"
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr "Do zoznamu skladieb pridá súbory."
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr "Odstrániť všetky"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr "Zo zoznamu odstráni všetky skladby."
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr "Odstrániť neoznačené"
-
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr "Zo zoznamu odstráni neoznačené skladby."
-
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr "Odstrániť označené"
-
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr "Zo zoznamu odstráni označené skladby."
-
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
-msgstr "Upraviť názov"
-
-#: src/gtkui/ui_manager.c:140
-msgid "Edit the playlist title."
-msgstr "Upraviť názov zoznamu skladieb."
-
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
-msgstr "Vybrať stĺpce …"
+#: src/gtkui/menus.c:154
+#, fuzzy
+msgid "Jump to _Time ..."
+msgstr "Prejsť na čas"
 
-#: src/gtkui/ui_manager.c:146
-msgid "Sort"
-msgstr "Triediť"
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
+msgstr ""
 
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
+#: src/gtkui/menus.c:158
+#, fuzzy
+msgid "By Track _Number"
 msgstr "Podľa čísla stopy"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
+#: src/gtkui/menus.c:159
+#, fuzzy
+msgid "By _Title"
 msgstr "Podľa názvu"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
+#: src/gtkui/menus.c:160
+#, fuzzy
+msgid "By _Artist"
 msgstr "Podľa umelca"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
-msgid "By Album"
+#: src/gtkui/menus.c:161
+#, fuzzy
+msgid "By A_lbum"
 msgstr "Podľa albumu"
 
-#: src/gtkui/ui_manager.c:155
-msgid "By Release Date"
+#: src/gtkui/menus.c:162
+#, fuzzy
+msgid "By Release _Date"
 msgstr "Podľa dátumu vydania"
 
-#: src/gtkui/ui_manager.c:157
-msgid "By File Path"
+#: src/gtkui/menus.c:163
+#, fuzzy
+msgid "By _File Path"
 msgstr "Podľa cesty k súboru"
 
-#: src/gtkui/ui_manager.c:159
-msgid "By Formatted Title"
-msgstr "Podľa formátovaného názvu"
+#: src/gtkui/menus.c:164
+#, fuzzy
+msgid "By _Custom Title"
+msgstr "Vlastný názov"
 
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
+#: src/gtkui/menus.c:166
+#, fuzzy
+msgid "R_everse Order"
 msgstr "Obrátiť poradie"
 
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
+#: src/gtkui/menus.c:167
+#, fuzzy
+msgid "_Random Order"
 msgstr "Náhodné poradie"
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr "Výstup"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
+msgstr "_Obnoviť"
 
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "Efekty"
+#: src/gtkui/menus.c:172
+#, fuzzy
+msgid "_Sort"
+msgstr "Triediť"
 
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
-msgstr "Ekvalizér"
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "Zobrazenie"
+#: src/gtkui/menus.c:175
+msgid "_Close"
+msgstr "_Zatvoriť"
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
-msgstr "Rozhranie"
+#: src/gtkui/menus.c:177
+#, fuzzy
+msgid "_Import ..."
+msgstr "Importovať"
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "Súbor"
+#: src/gtkui/menus.c:178
+#, fuzzy
+msgid "_Export ..."
+msgstr "Exportovať"
 
-#: src/gtkui/ui_manager.c:188
-msgid "Components"
-msgstr "Súčasti"
+#: src/gtkui/menus.c:180
+#, fuzzy
+msgid "_Playlist Manager ..."
+msgstr "Správca zoznamov skladieb"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr "Zobraziť informácie o skladbe"
+#: src/gtkui/menus.c:183
+#, fuzzy
+msgid "Volume _Up"
+msgstr "Zosilniť"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr "Zobrazí informácie o skladbe"
+#: src/gtkui/menus.c:184
+#, fuzzy
+msgid "Volume _Down"
+msgstr "Stíšiť"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "O Audacious"
+#: src/gtkui/menus.c:186
+#, fuzzy
+msgid "_Equalizer"
+msgstr "Ekvalizér"
 
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
-msgstr "Otvoriť súbory …"
+#: src/gtkui/menus.c:188
+#, fuzzy
+msgid "E_ffects"
+msgstr "Efekty"
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
-msgstr "Načíta a prehrá súbor"
+#: src/gtkui/menus.c:191
+#, fuzzy
+msgid "_Interface"
+msgstr "Rozhranie"
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
-msgstr "Otvoriť URL …"
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr "Prehrá súbor z vybranej adresy"
+#: src/gtkui/menus.c:194
+#, fuzzy
+msgid "Show I_nfo Bar"
+msgstr "Zobraziť informačnú plochu"
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "Služby modulov"
+#: src/gtkui/menus.c:195
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "Zobraziť stavový riadok"
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "Predvoľby"
+#: src/gtkui/menus.c:197
+#, fuzzy
+msgid "Show Column _Headers"
+msgstr "Zobrazovať hlavičky stĺpcov"
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr "Otvorí okno s predvoľbami"
+#: src/gtkui/menus.c:198
+#, fuzzy
+msgid "Choose _Columns ..."
+msgstr "Vybrať stĺpce …"
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
-msgstr "_Koniec"
+#: src/gtkui/menus.c:199
+#, fuzzy
+msgid "Scrol_l on Song Change"
+msgstr "Zmena skladby"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "Ukončí Audacious"
+#: src/gtkui/menus.c:202
+#, fuzzy
+msgid "_File"
+msgstr "Súbor"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr "Nastaviť A-B"
+#: src/gtkui/menus.c:203
+#, fuzzy
+msgid "_Playback"
+msgstr "Prehrávanie"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr "Odstrániť A-B"
+#: src/gtkui/menus.c:204
+#, fuzzy
+msgid "P_laylist"
+msgstr "Zoznam skladieb"
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr "Prejsť na začiatok playlistu"
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#, fuzzy
+msgid "_Services"
+msgstr "Zariadenia"
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
-msgstr "Prejsť na súbor"
+#: src/gtkui/menus.c:206
+#, fuzzy
+msgid "_Output"
+msgstr "Výstup"
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr "Prepnúť front"
+#: src/gtkui/menus.c:207
+#, fuzzy
+msgid "_View"
+msgstr "Zobrazenie"
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Povolí/zakáže položku vo fronte zoznamu skladieb."
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
-msgstr "Kopírovať"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-msgid "Cut"
-msgstr "Vystrihnúť"
+#: src/gtkui/menus.c:215
+#, fuzzy
+msgid "_Copy"
+msgstr "Kopírovať"
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
+#: src/gtkui/menus.c:216
+#, fuzzy
+msgid "_Paste"
 msgstr "Vložiť"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
+#: src/gtkui/menus.c:217
+#, fuzzy
+msgid "Select _All"
 msgstr "Vybrať všetko"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr "Vyberie všetky skladby v zozname."
+#: src/gtkui/menus.c:222
+#, fuzzy
+msgid "_Rename"
+msgstr "Názov súboru"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr "Zrušiť výber"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
+msgstr "GTK rozhranie"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr "Zruší výber skladieb zoznamu."
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, 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
+msgid "Audacious"
+msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Chyba"
+
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -2884,7 +1749,7 @@
 msgstr[1] "%d kanálov"
 msgstr[2] "%d kanálov"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, fuzzy, c-format
 msgid "%d kbps"
 msgstr "kb/s"
@@ -2893,10 +1758,18 @@
 msgid "Previous Track"
 msgstr "Predchádzajúca stopa"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Prehrať"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr "Pozastaviť/Pokračovať"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Zastaviť"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr "Nasledujúca stopa"
@@ -2921,6 +1794,10 @@
 msgid "Volume Down"
 msgstr "Stíšiť"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr "Prejsť na súbor"
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr "Prepnúť okná prehrávača"
@@ -2929,11 +1806,21 @@
 msgid "Show On-Screen-Display"
 msgstr "Zobraziť OSD"
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "Opakovať"
+
+#: src/hotkey/gui.c:85
+#, fuzzy
+msgid "Toggle Shuffle"
+msgstr "Náhodné poradie"
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(žiadne)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2944,15 +1831,15 @@
 "\n"
 "Chcete pokračovať?"
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr "Priradenie tlačidiel myši"
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Nastavenie modulu Globálne klávesové skratky"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2960,23 +1847,23 @@
 "V textovom poli stlačte kombináciu klávesov.\n"
 "Môžete priradiť aj tlačítka na myši."
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr "Klávesové skratky:"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr "Činnosť:"
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr "Priradenie klávesu:"
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr "O module Globálne klávesové skratky"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -3051,129 +1938,19 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "O výstupnom module JACK 0.17"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr "Tento LADSPA modul nemá žiadne používateľské nastavenia"
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "Názov"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "Nainštalované moduly"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "Bežiace moduly"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "Pridať"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "Odstrániť"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "Katalóg LADSPA modulov"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "O module LIRC pre Audacious"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "Modul LIRC "
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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"
+"Looking for lyrics..."
 msgstr ""
-"\n"
-"Jednoduchý modul, ktorý vám umožní ovládať Audacious\n"
-"pomocou systémovej služby diaľkového ovládania LIRC\n"
-"\n"
-"Pre Audacious upravil Tony Vroon <chainsaw@gentoo.org>\n"
-"Originálny modul XMMS LIRC napísali:\n"
-"Carl van Schaik <carl@leg.uct.ac.za>\n"
-"Christoph Bartelmus <xmms@bartelmus.de>\n"
-"Andrew O. Shadoura <bugzilla@tut.by>\n"
-"Informácie o LIRC môžete získať na:\n"
-"http://lirc.org"
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr "Nastavenia modulu LIRC"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr "Znovu sa pripojiť k LIRC serveru"
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr "Časový limit pred znovupripojením (sekúnd): "
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr "Znovu pripojiť"
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr "Spojenie"
 
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: LIRC podpora sa nedá inicializovať\n"
-
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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: konfiguračný súbor LIRC sa nedá prečítať,\n"
-"%s: prečítajte si, prosím, dokumentáciu k LIRC\n"
-"%s: ako správne vytvoriť konfiguračný súbor\n"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr "%s: pokúšam sa znovupripojiť…\n"
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: neznámy príkaz „%s“\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: odpojené od LIRC\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
-msgstr "%s: pokus o znovupripojenie budem opakovať každých %d sekúnd…\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
@@ -3181,11 +1958,11 @@
 "\n"
 "Žiadne texty neboli nájdené."
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "O module Metronóm"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3199,262 +1976,43 @@
 "napr. tact://77 pre 77 úderov za minútu\n"
 "alebo tact://60*3/4 pre 60 úderov za minútu v 3/4 takte"
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generátor taktu: %d bpm"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generátor taktu: %d bpm %d/%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "Nastavenie ModPlug"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 bitov"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 bitov"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr "mono (zmiešať kanále)"
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr "Najbližšie (najrýchlejšie)"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "Lineárne (rýchle)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr "Kubická interpolácia (kvalitné)"
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr "8-tap Fir interpolácia (veľmi kvalitné)"
-
-#: src/modplug/gui/interface.cxx:286
-msgid "96 kHz"
-msgstr "96 kHz"
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr "48 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Vzorkovacia frekvencia"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "Povoliť"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "Hĺbka"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "Oneskorenie"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "Dozvuk"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "Stupeň"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "Rozsah"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "Zvýraznenie hlbokých tónov"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Priestorový zvuk"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-"Poznámka: Vysoké hodnoty\n"
-"predzosilnenia môžu spôsobiť\n"
-"orezanie (obťažujúce praskanie)."
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "Predzosilnenie"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "Použiť názov súboru ako názov skladby"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "Rýchle informácie o skladbe"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "Potlačenie šumu"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Prehrávať moduly z Amigy"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "Neopakovať"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "Opakovať"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "krát"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "Opakovať donekonečna"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "Opakovanie"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "Informácie o module"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-"Názov súboru:\n"
-"Názov skladby:\n"
-"Typ:\n"
-"Dĺžka:\n"
-"Rýchlosť:\n"
-"Tempo:\n"
-"Počet vzoriek:\n"
-"Počet nástrojov:\n"
-"Počet úsekov:\n"
-"Počet kanálov:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "Vzorky"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "Nástroje"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "Odkaz"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Vstupný modul Modplug pre Audaciuos verzie "
-
-#: src/modplug/gui/main.cxx:52
-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"
-"Zvukové jadro Modplug napísal Olivier Lapicque.\n"
-"XMMS rozhranie k Modplug napísal Kenton Varda.\n"
-"(c)2000 Olivier Lapicque a Kenton Varda.\n"
-"Aktualizuje a udržuje Konstanty Bialkowski.\n"
-"Pre BMP upravil Theofilos Intzoglou."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "O module Modplug"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nepodarilo sa nájsť súbor s obrázkom: %s"
-
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr "Nahrať vybrané stopy"
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr "Prebieha nahrávanie…"
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr "Obsluha MTP zariadenia"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
+msgstr ""
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
+#: src/mtp_up/mtp.c:311
+#, fuzzy
+msgid "Disconnect MTP Device"
 msgstr "Odpojiť zariadenie"
 
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "Zastaviť"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Audacious - upozornenie o viditeľnosti"
+
 #: src/null/null.c:64
 msgid "Null output plugin "
 msgstr "Slepý výstupný modul"
@@ -3504,11 +2062,11 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr "Povoliť konverziu formátu prostredníctvom OSS."
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "O module OSS4"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
@@ -3557,6 +2115,11 @@
 msgid "Default (%s)"
 msgstr "Predvolené (%s)"
 
+#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Štandardné"
+
 #: src/OSS/configure.c:187
 msgid "OSS Driver configuration"
 msgstr "Nastavenie ovládača OSS"
@@ -3627,11 +2190,11 @@
 "požiadajte o ňu Free Software Foundation, Inc., 51 Franklin Street, Fifth "
 "Floor, Boston, MA 02110-1301, USA."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "O výstupnom module PulseAudio pre Audacious"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3685,27 +2248,27 @@
 msgid "Method:"
 msgstr "Metóda:"
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Služby"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Prístupové meno:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 msgid "Scrobbler URL:"
 msgstr "URL Scrobblera:"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3713,7 +2276,7 @@
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3724,15 +2287,15 @@
 "\n"
 "Pôvodne vytvoril Audun Hove <audun@nlc.no> a Pipian <pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "O module Scrobbler"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 msgid "About SDL Output Plugin"
 msgstr "O výstupnom module SDL"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 msgid "SDL error"
 msgstr "Chyba SDL"
 
@@ -3741,10 +2304,18 @@
 msgid "About %s"
 msgstr "O %s"
 
-#: src/sid/xs_config.c:323
+#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
+msgid "Close"
+msgstr "Zatvoriť"
+
+#: src/sid/xs_config.c:326
 msgid " Error"
 msgstr " Chyba"
 
+#: src/sid/xs_config.c:326
+msgid "OK"
+msgstr "OK"
+
 #: src/sid/xs_fileinfo.c:151
 msgid "General info"
 msgstr "Všeobecné informácie"
@@ -3754,6 +2325,11 @@
 msgid "Tune #%i: "
 msgstr "Skladba č. %i: "
 
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nepodarilo sa nájsť súbor s obrázkom: %s"
+
 #: src/sid/xs_interface.c:234
 msgid "Audacious-SID configuration"
 msgstr "Nastavenie Audacious-SID"
@@ -4066,15 +2642,15 @@
 msgid "Use"
 msgstr "Použiť"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Uložiť"
 
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:435
+#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importovať"
 
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Vymazať"
 
@@ -4107,6 +2683,11 @@
 msgid "Playtime:"
 msgstr "Doba prehrávania:"
 
+#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
+#: src/sid/xs_interface.c:1155
+msgid "seconds"
+msgstr "sekúnd"
+
 #: src/sid/xs_interface.c:928
 msgid "Minimum playtime:"
 msgstr "Minimálna doba prehrávania:"
@@ -4365,11 +2946,11 @@
 msgid "No"
 msgstr "Nie"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "O rozhraní s meniteľným vzhľadom"
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -4377,691 +2958,810 @@
 "Copyright (c) 2008 Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr "Rozhranie s meniteľným vzhľadom"
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr "V _okne prehrávača:"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr "Vyberte písmo pre hlavné okno prehrávača:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "V zozname _skladieb:"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr "Vyberte písmo pre zoznam skladieb:"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr "_Písma"
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr "Ak sú dostupné, použiť bitmapové písma"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
-"Ak sú dostupné, použijú sa bitmapové písma. Bitmapové písma nepodporujú "
-"Unicode reťazce."
-
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr "_Rôzne"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr "Zobrazovať oddeľovače v zozname skladieb"
 
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr "Zobrazovať dekoráciu okien"
-
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
-msgstr "Touto voľbou povolíte zobrazovanie dekorácie okien."
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
+msgstr ""
 
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr "Použiť obojsmerný posun textu"
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "_Vzhľad"
 
-#: src/skins/skins_cfg.c:330
-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 ""
-"Ak je povolené, bude sa text s informáciami v hlavnom okne posúvať tam a "
-"späť. Ak nie je povolené, text sa bude posúvať iba v jednom smere."
+#: src/skins/skins_cfg.c:393
+#, fuzzy
+msgid "Interface Preferences"
+msgstr "Predvoľby prelínania"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr "Zakázať vloženú GTK tému"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Predzosilnenie"
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
-msgstr "Náhodný vzhľad pri prehrávaní"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
-msgstr "Povoliť načítavanie nekompletných vzhľadov"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Hz"
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
-msgstr ""
-"Ak je povolené, Audacious neodmietne načítanie poškodeného vzhľadu. Použite "
-"iba ak váš obľúbený vzhľad nefunguje"
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Hz"
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "Prispôsobenie farby"
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Hz "
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
-"Audacious umožňuje zmeniť zafarbenie témy užívateľského rozhrania pomocou "
-"nasledujúcich jazdcov."
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Hz "
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "Modrá"
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 kHz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "Zelená"
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "Červená"
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 kHz"
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "_Vzhľad"
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 kHz"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr "Prispôsobenie farby …"
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Ekvalizér Audacious"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr "Prednastavenia"
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kb/s"
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "Hz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "Priestorový zvuk"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious - upozornenie o viditeľnosti"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "Zobraziť hlavné okno prehrávača"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "Ignorovať"
-
-#: src/skins/ui_main.c:993
-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 ""
-"Pri spustení Audacious boli všetky okná skryté.\n"
-"Možno budete chcieť kvôli ovládaniu zobraziť okno prehrávača. Inak ho budete "
-"musieť ovládať vzdialene pomocou audtool alebo pomocou zapnutých modulov "
-"(napr. pomocou modulu stavová ikona)."
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr "Vždy ignorovať. Ukázať/skryť je ovládané vzdialene"
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious - GTK modul vzhľadu"
-
-#: src/skins/ui_main.c:1052
-#, c-format
-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>Používa sa chybný modul vzhľadu GTK</big>\n"
-"\n"
-"Audacious zistil, že používate chybný modul vzhľadu GTK.\n"
-"\n"
-"Používaný modul vzhľadu, %s, nie je kompatibilný s niektorými "
-"vlastnosťami moderných tém. Nekompatibilné vlastnosti budú v tejto relácii "
-"zakázané.\n"
-"\n"
-"Ak chcete tieto vlastnosti použiť, zvážte použitie iného modulu vzhľadu pre "
-"GTK."
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr "Toto upozornenie viac nezobrazovať"
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
+#: src/skins/ui_main.c:807
+#, fuzzy, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Prejsť na: %d:%-2.2d/%d:%-2.2d (%d%%)"
 
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hlasitosť: %d%%"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Vyváženie: %d%% vľavo"
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Vyváženie: stred"
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Vyváženie: %d%% vpravo"
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Ponuka s možnosťami"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Vypnúť „Vždy navrchu“"
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Zapnúť „Vždy navrchu“"
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Informácie o súbore"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "Vypnúť „Zväčšiť GUI“"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "Zapnúť „Zväčšiť GUI“"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Ponuka s typom znázornenia"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr "Režim jednej skladby."
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 msgid "Playlist mode."
 msgstr "Režim zoznamu skladieb."
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr "Zastaviť po skončení skladby."
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr "Nezastaviť po skončení skladby."
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr "Automatický posun názvu skladby"
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Zastaviť po skončení aktuálnej skladby"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
 msgstr "Vrcholy"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Opakovať"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Náhodné poradie"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "Neprehrávať ďalšiu skladbu zo zoznamu"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr "Zobraziť prehrávač"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr "Zobraziť editor zoznamu skladieb"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr "Zobraziť ekvalizér"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr "Vždy navrchu"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr "Zobrazovať na všetkých plochách"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr "Zrolovať prehrávač"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr "Zrolovať editor zoznamu skladieb"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr "Zrolovať ekvalizér"
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "Zväčšiť"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr "Dvojitá veľkosť"
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr "Jednoduchý presun"
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr "Analyzátor"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr "Osciloskop"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr "Frekvenčné spektrum"
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "Žiadne"
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr "Normálny"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr "Oheň"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr "Vertikálne čiary"
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr "Čiary"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr "Obdĺžniky"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr "Bodový osciloskop"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr "Čiarový osciloskop"
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr "Vyplnený osciloskop"
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr "Ľad"
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr "Plynulý"
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "Najpomalšie"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "Pomaly"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "Stredne"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "Rýchlo"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "Najrýchlejšie"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr "Ubehnutý čas"
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr "Zostávajúci čas"
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "Pozastaviť"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "Predchádzajúca"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "Nasledujúca"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "Vizualizácia"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr "Typ zobrazenia"
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr "Typ analyzátora"
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr "Typ osciloskopu"
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr "Typ frekvenčného spektra"
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr "Typ vizualizácie pri zrolovanom okne"
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr "Klesanie stĺpcov"
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr "Klesanie vrcholov"
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Zoznam skladieb"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Nový zoznam skladieb"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr "Vybrať nasledujúci zoznam skladieb"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr "Vybrať predchádzajúci zoznam skladieb"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Zmazať zoznam skladieb"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "Importovať zoznam skladieb"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Pridá súbor so zoznamom do vybraného zoznamu skladieb."
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "Exportovať zoznam skladieb"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr "Uloží vybraný zoznam skladieb."
+
+#: src/skins/ui_manager.c:229
+msgid "Save All Playlists"
+msgstr "Uložiť všetky zoznamy skladieb"
+
+#: 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šetky otvorené zoznamy skladieb. Berte na vedomie, že toto je "
+"automaticky urobené pri ukončovaní Audacious."
+
+#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr "Obnoviť zoznam"
 
-#: src/skins/ui_manager.c:228
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Obnovuje metadáta patriace k skladbe zo zoznamu."
+
+#: src/skins/ui_manager.c:238
 msgid "List Manager"
 msgstr "Správca zoznamov"
 
-#: src/skins/ui_manager.c:238
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr "Otvorí správcu zoznamov skladieb."
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Zobrazenie"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "Rozhranie"
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "Predvoľby prelínania"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr "Pridať internetovú adresu…"
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr "Do zoznamu skladieb pridá vzdialenú stopu."
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr "Pridať súbory…"
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr "Do zoznamu skladieb pridá súbory."
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr "Hľadanie a výber"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "Prehľadá zoznam skladieb a vyberie skladby podľa zadaných kritérií."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr "Invertovať výber"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr "Zamení vybrané a nevybrané položky."
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "Vybrať všetko"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
+msgstr "Vyberie všetky skladby v zozname."
+
+#: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr "Zrušiť výber"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr "Zruší výber skladieb zoznamu."
+
+#: src/skins/ui_manager.c:277
+msgid "Remove All"
+msgstr "Odstrániť všetky"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr "Zo zoznamu odstráni všetky skladby."
+
+#: src/skins/ui_manager.c:281
 msgid "Clear Queue"
 msgstr "Vyprázdniť front"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr "Vyprázdni front spojený s týmto zoznamom skladieb."
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "Odstrániť nedostupné súbory"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr "Zo zoznamu skladieb odstráni nedostupné súbory."
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "Odstrániť duplikáty"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "Podľa názvu"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Zo zoznamu skladieb odstráni skladby s rovnakými názvami."
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "Podľa názvu súboru"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Zo zoznamu skladieb odstráni skladby s rovnakými názvami súboru."
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "Podľa cesty a názvu súboru"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 "Zo zoznamu skladieb odstráni skladby s rovnakou cestou a názvom súboru."
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr "Odstrániť neoznačené"
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr "Zo zoznamu odstráni neoznačené skladby."
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr "Odstrániť označené"
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr "Zo zoznamu odstráni označené skladby."
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr "Premiešať poradie"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr "Skladby v zozname zoradí náhodne."
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr "Obrátiť poradie"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr "Obráti poradie skladieb v zozname."
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "Triediť zoznam"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr "Zoradí skladby v zozname podľa názvu."
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+msgid "By Album"
+msgstr "Podľa albumu"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr "Zoradí skladby v zozname podľa názvu."
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "Podľa umelca"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr "Zoradí skladby v zozname podľa umelca."
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr "Zoradí skladby v zozname podľa názvu súboru."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr "Zoradí skladby v zozname podľa celej cesty."
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "Podľa dátumu"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr "Zoradí skladby v zozname podľa dátumu poslednej úpravy súboru."
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr "Podľa čísla stopy"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr "Zoradí skladby v zozname podľa čísla stopy."
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr "Triediť výber"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "Súbor"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Pomocník"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr "Služby modulov"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr "Zobraziť informácie o skladbe"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr "Zobrazí informácie o skladbe"
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "O Audacious"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "Prehrať súbor"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr "Načíta a prehrá súbor"
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "Prehrať z adresy"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr "Prehrá súbor z vybranej adresy"
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "Služby modulov"
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "Predvoľby"
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr "Otvorí okno s predvoľbami"
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "Ukončí Audacious"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr "Nastaviť A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr "Odstrániť A-B"
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr "Prejsť na začiatok playlistu"
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr "Prejsť na čas"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr "Prepnúť front"
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Povolí/zakáže položku vo fronte zoznamu skladieb."
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr "Kopírovať"
+
+#: src/skins/ui_manager.c:436
+msgid "Cut"
+msgstr "Vystrihnúť"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Vložiť"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Načítať"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Prednastavenia"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Načíta prednastavenia"
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Automaticky načítavané prednastavenia"
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Načíta automaticky načítavané prednastavenia"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Načíta štandardné prednastavenia do ekvalizéra"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Vynulovať"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Vynuluje prednastavenia ekvalizéra"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Zo súboru"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Načíta prednastavenia zo súboru"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Zo súboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Načíta prednastavenia zo súboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Prednastavenia WinAMP"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importuje prednastavenia WinAMP"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Uloží prednastavenia"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Uloží automaticky načítavané prednastavenia"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Uloží štandardné prednastavenia"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Do súboru"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Uloží prednastavenia do súboru"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Do súboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Uloží prednastavenia do súboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Vymaže prednastavenia"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Vymaže automaticky načítavané prednastavenia"
 
-#: src/skins/ui_playlist.c:374
+#: 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:382
+#: 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 "
@@ -5073,104 +3773,52 @@
 "regulárnym výrazom nerozumiete, jednoducho zadajte časť textu, ktorý chcete "
 "vyhľadať."
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Názov: "
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Umelec: "
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Názov súboru: "
 
-#: src/skins/ui_playlist.c:419
+#: 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:422
+#: 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:425
+#: 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:776
-msgid "Save as Static Playlist"
-msgstr "Uložiť ako statický zoznam skladieb"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr "Použiť relatívne cesty"
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "Načítať zoznam skladieb"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "Uložiť zoznam skladieb"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Editor zoznamu skladieb"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "250 Hz"
-msgstr "250 Hz "
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "500 Hz"
-msgstr "500 Hz "
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr "Zabalený vzhľad pre WinAMP 2.x"
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Nezabalený vzhľad pre WinAMP 2.x"
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nepodarilo sa vytvoriť adresár (%s): %s\n"
@@ -5218,56 +3866,64 @@
 "požiadajte o ňu Free Software Foundation, Inc., 51 Franklin Street, Fifth "
 "Floor, Boston, MA 02110-1301, USA"
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "O module SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr "Oprava hlasitosti"
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "Krátke presahy"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "Rýchlosť"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "Výška"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "Zväčšiť"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Možnosti"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - Nastavenie"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr "Príkaz, ktorý sa vykoná keď Audacious začne prehrávať novú skladbu."
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "Príkaz:"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr "Príkaz, ktorý sa vykoná na konci skladby."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 "Príkaz, ktorý sa vykoná, keď Audacious dosiahne koniec zoznamu skladieb."
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "Príkaz, ktorý sa vykoná pri zmene názvu skladby (t.j. pre názvy v sieťových "
 "prúdoch)."
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -5301,7 +3957,7 @@
 "%b: Album\n"
 "%T: Názov stopy"
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5310,18 +3966,14 @@
 "úvodzoviek. Nerešpektovanie tejto rady predstavuje bezpečnostné riziko.</"
 "span>"
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "Príkazy"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 msgid "Song Change"
 msgstr "Zmena skladby"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "Analyzátor spektra"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "O module Stavová ikona"
@@ -5394,70 +4046,19 @@
 "\n"
 "Napísal Johan Levin, 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "O module Extra stereo"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "Nastaviť Extra stereo"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-msgid "Search:"
-msgstr "Hľadať:"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr "Pridať záložku"
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-msgid "Stream name"
-msgstr "Názov prúdu"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr "Práve hrá"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-msgid "Remove Bookmark"
-msgstr "Odstrániť záložku"
-
-#: src/streambrowser/streambrowser.c:340
-msgid "About Stream Browser"
-msgstr "O prehliadači prúdov"
-
-#: src/streambrowser/streambrowser.c:341
-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, Calin Crisan <ccrisan@gmail.com> a tím Audacious.\n"
-"\n"
-"Toto je jednoduchý prehliadač prúdov, ktorý obsahuje najobľúbenejšie "
-"adresáre prúdov.\n"
-"Veľká vďaka patrí vývojárom Streamtuner <http://www.nongnu.org/streamtuner>\n"
-"a samozrejme celej komunite okolo Audacious.\n"
-"\n"
-"Opäť ďakujem Tonymu Vroonovi za rady a vedenie.\n"
-"\n"
-"Toto bol Google Summer of Code 2008 projekt."
-
-#: src/tonegen/tonegen.c:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "O generátore tónov"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5472,12 +4073,12 @@
 "napr. na prehranie tónov o frekvencii 2000Hz a 2005Hz zadajte "
 "tone://2000;2005"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "Generátor tónov: "
 
@@ -5498,15 +4099,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Značky Ogg Vorbis"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Nastavenie modulu Ogg Vorbis Audio"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "O module Ogg Vorbis Audio"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5581,5 +4182,1305 @@
 "Niektoré časti kódu modulu napísal Miles Egan\n"
 "Navštívte stránku Wavpack na adrese http://www.wavpack.com/\n"
 
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "Ak sú dostupné, použiť bitmapové písma"
+
+#~ msgid ""
+#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
+#~ "Unicode strings."
+#~ msgstr ""
+#~ "Ak sú dostupné, použijú sa bitmapové písma. Bitmapové písma nepodporujú "
+#~ "Unicode reťazce."
+
+#~ msgid "_Miscellaneous"
+#~ msgstr "_Rôzne"
+
+#~ msgid "Use two-way text scroller"
+#~ msgstr "Použiť obojsmerný posun textu"
+
+#~ msgid "About "
+#~ msgstr "O "
+
+#~ 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"
+#~ "Modul je poskytovaný za podmienok licencie GNU LGPL.\n"
+#~ "Pre podrobnosti navštívte http://www.gnu.org/licenses/lgpl.html\n"
+#~ "\n"
+#~ "Modul používa knižnicu AdPlug, Copyright (C) Simon Peter a ďalší.\n"
+#~ "Zostavené s AdPlug knižnicou verzie: "
+
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AdPlug :: Nastavenie"
+
+#~ msgid "Sound quality"
+#~ msgstr "Kvalita zvuku"
+
+#~ msgid "Resolution"
+#~ msgstr "Rozlíšenie"
+
+#~ msgid "8bit"
+#~ msgstr "8 bitov"
+
+#~ msgid "16bit"
+#~ msgstr "16 bitov"
+
+#~ msgid "Channels"
+#~ msgstr "Počet kanálov"
+
+#~ 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 ""
+#~ "Povolenie sterea nie je odporúčané (ak ho naozaj nepotrebujete). Táto "
+#~ "voľba nepridá zvuku žiadne stereoefekty (OPL2 je len mono), a "
+#~ "spotrebováva sa viac výkonu CPU."
+
+#~ msgid "Frequency"
+#~ msgstr "Frekvencia"
+
+#~ msgid "Detect songend"
+#~ msgstr "Rozoznať koniec skladby"
+
+#~ 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 ""
+#~ "Ak je povolené, XMMS rozozná, že sa skladba skončila, zastaví ju a prejde "
+#~ "na nasledujúcu skladbu v zozname skladieb. Ak je zakázané, XMMS nebude "
+#~ "reagovať na koniec pesničky a bude ju opakovať neustále dookola."
+
+#~ msgid "Formats"
+#~ msgstr "Formáty"
+
+#~ msgid "Format selection"
+#~ msgstr "Výber formátu"
+
+#~ msgid "Format"
+#~ msgstr "Formát"
+
+#~ msgid "Extension"
+#~ msgstr "Prípona"
+
+#~ 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 ""
+#~ "Vybrané typy súborov budú rozpoznané a prehrávané týmto modulom. Ostatné "
+#~ "budú ignorované a budú prenechané iným modulom."
+
+#~ msgid "AdPlug :: File Info"
+#~ msgstr "AdPlug :: Informácie o súbore"
+
+#~ msgid "Author: "
+#~ msgstr "Autor: "
+
+#~ msgid "File Type: "
+#~ msgstr "Typ súboru: "
+
+#~ msgid "Subsongs: "
+#~ msgstr "Podskladby: "
+
+#~ msgid "Instruments: "
+#~ msgstr "Nástroje: "
+
+#~ msgid "Orders: "
+#~ msgstr "Poradia: "
+
+#~ msgid "Patterns: "
+#~ msgstr "Úseky: "
+
+#~ msgid "Song"
+#~ msgstr "Skladba"
+
+#~ msgid "Instrument name"
+#~ msgstr "Meno nástroja"
+
+#~ msgid "Song message"
+#~ msgstr "Správa skladby"
+
+#~ msgid "Subsong selection"
+#~ msgstr "Výber podskladby"
+
+#~ msgid "Order: "
+#~ msgstr "Poradie: "
+
+#~ msgid "Pattern: "
+#~ msgstr "Úsek: "
+
+#~ msgid "Row: "
+#~ msgstr "Riadok: "
+
+#~ msgid "Speed: "
+#~ msgstr "Rýchlosť: "
+
+#~ msgid "Timer: "
+#~ msgstr "Časovač: "
+
+#~ msgid "About XMMS Alarm"
+#~ msgstr "O 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, ktorý môže byť použitý\n"
+#~ "k načasovaniu spustenia prehrávanie.\n"
+#~ "\n"
+#~ "Sťažnosti posielajte na adresu:\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áš budiaci signál."
+
+#~ msgid "Select Playlist"
+#~ msgstr "Vybrať zoznam skladieb"
+
+#~ msgid "Sorry"
+#~ msgstr "Ospravedlnenie"
+
+#~ msgid "Warning"
+#~ msgstr "Upozornenie"
+
+#~ 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čnostých dôvodov musí byť dĺžka ticha aspoň o 65 sekúnd dlhšia ako "
+#~ "je dĺžka zosilňovania a zároveň musí byť dlhá aspoň 10 sekúnd. To v "
+#~ "podstate znamená, že v kóde je chyba a kým nenájdem spôsob, ako ju naozaj "
+#~ "odstrániť, bude sa zobrazovať táto správa. :)\n"
+#~ "\n"
+#~ "Vaše nastavenia zosilňovanie NEBOLI uložené.\n"
+#~ "\n"
+#~ "--\n"
+#~ "Adam"
+
+#~ msgid "Oh Well"
+#~ msgstr "Tak dobre"
+
+#~ msgid "Alarm Settings"
+#~ msgstr "Nastavenia budíka"
+
+#~ msgid "Time"
+#~ msgstr "Čas"
+
+#~ msgid "hours"
+#~ msgstr "hodinách"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "minutes"
+#~ msgstr "minútach"
+
+#~ msgid "Quiet after:"
+#~ msgstr "Ticho po:"
+
+#~ msgid "Alarm at (default):"
+#~ msgstr "Budiť v (štandardne):"
+
+#~ msgid "Choose the days for the alarm to come on"
+#~ msgstr "Zvoľte dni, kedy má budík budiť"
+
+#~ msgid "Day"
+#~ msgstr "Deň"
+
+#~ msgid "Tuesday"
+#~ msgstr "Utorok"
+
+#~ msgid "Wednesday"
+#~ msgstr "Streda"
+
+#~ msgid "Thursday"
+#~ msgstr "Štvrtok"
+
+#~ msgid "Friday"
+#~ msgstr "Piatok"
+
+#~ msgid "Saturday"
+#~ msgstr "Sobota"
+
+#~ msgid "Sunday"
+#~ msgstr "Nedeľa"
+
+#~ msgid "Monday"
+#~ msgstr "Pondelok"
+
+#~ msgid "Days"
+#~ msgstr "Dni"
+
+#~ msgid "Fading"
+#~ msgstr "Zosilňovanie"
+
+#~ msgid "Volume"
+#~ msgstr "Hlasitosť"
+
+#~ msgid "Current"
+#~ msgstr "Aktuálna"
+
+#~ msgid "reset to current output volume"
+#~ msgstr "vrátiť na aktuálnu hlasitosť výstupu"
+
+#~ msgid "Start at"
+#~ msgstr "Začať na"
+
+#~ msgid "%"
+#~ msgstr "%"
+
+#~ msgid "Final"
+#~ msgstr "Skončiť na"
+
+#~ msgid "Additional Command"
+#~ msgstr "Dodatočný príkaz"
+
+#~ msgid "enable"
+#~ msgstr "povoliť"
+
+#~ msgid "Playlist (optional)"
+#~ msgstr "Zoznam skladieb (voliteľné)"
+
+#~ msgid "Browse..."
+#~ msgstr "Prechádzať…"
+
+#~ msgid "Reminder"
+#~ msgstr "Pripomenutie"
+
+#~ msgid "Use reminder"
+#~ msgstr "Pripomenúť"
+
+#~ msgid "What do these options mean?"
+#~ msgstr "Čo znamenajú tieto možnosti?"
+
+#~ 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"
+#~ " Budiť v: \n"
+#~ " Čas, v ktorom sa spustí budenie.\n"
+#~ "\n"
+#~ " Ticho po: \n"
+#~ " Zastaviť budík po uplynutí tejto doby.\n"
+#~ " (ak nie je okno budíka medzi tým zatvorené)\n"
+#~ "\n"
+#~ "\n"
+#~ "Dni\n"
+#~ " Deň:\n"
+#~ " Zvoľte dni, kedy má byť budík aktívny.\n"
+#~ "\n"
+#~ " Čas:\n"
+#~ " Zvoľte čas budenia pre každý deň, alebo zaškrtnite\n"
+#~ " prepínacie tlačidlo na použitie štandardného času.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hlasitosť\n"
+#~ " Zosilňovanie: \n"
+#~ " Počas tohoto času postupne zosilňuje hlasitosť až\n"
+#~ " na zvolenú hodnotu\n"
+#~ "\n"
+#~ " Začať na: \n"
+#~ " Začať zosilňovanie z tejto úrovne.\n"
+#~ "\n"
+#~ " Skončiť na: \n"
+#~ " Úroveň, pri ktorej skončí zosilňovanie. Ak je čas\n"
+#~ "zosilňovania 0, hlasitosť sa nastaví na túto úroveň\n"
+#~ "a spustí sa prehrávanie.\n"
+#~ "\n"
+#~ "\n"
+#~ "Nastavenia:\n"
+#~ " Dodatočný príkaz:\n"
+#~ " Tento príkaz bude pri budení spustený.\n"
+#~ "\n"
+#~ " Zoznam skladieb: \n"
+#~ " Načítať zoznam skladieb, z ktorého sa budú\n"
+#~ " prehrávať skladby (musí mať príponu .m3u).\n"
+#~ " Ak nie je zoznam zadaný, budú sa prehrávať skladby\n"
+#~ " z aktuálneho zoznamu skladieb.\n"
+#~ " Je možné použiť aj URL mp3/ogg prúdu, ale\n"
+#~ " načítavanie zoznamu skladieb z URL nie je momentálne\n"
+#~ " v XMMS podporované.\n"
+#~ "\n"
+#~ " Pripomenutie:\n"
+#~ " Pri vypnutí budíka zobrazí pripomienku.\n"
+#~ " Text pripomienky napíšte do vstupného poľa\n"
+#~ " a zaškrtnite „Pripomenúť“ ak si prajete, aby sa text zobrazil.\n"
+
+#~ msgid "Your reminder for today is.."
+#~ msgstr "Vaša pripomienka pre dnes je…"
+
+#~ msgid "Thankyou"
+#~ msgstr "Ďakujem"
+
+#~ msgid "Pairing request for '%s'"
+#~ msgstr "Požiadavka o spárovanie pre '%s'"
+
+#~ msgid "Authorization request for %s"
+#~ msgstr "Požiadavka o autorizáciu pre '%s'"
+
+#~ msgid "Created bonding with %s"
+#~ msgstr "Vytvorené prepojenie s %s"
+
+#~ msgid "Removed bonding with %s"
+#~ msgstr "Odstránené prepojenie s %s"
+
+#~ msgid "Device has been switched off"
+#~ msgstr "Zariadenie bolo vypnuté"
+
+#~ msgid "Device has been made non-discoverable"
+#~ msgstr "Zariadenie už nebude zistiteľné"
+
+#~ msgid "Device has been made connectable"
+#~ msgstr "K zariadeniu sa bude môcť pripájať"
+
+#~ msgid "Device has been made discoverable"
+#~ msgstr "Zariadenie bude zistiteľné"
+
+#~ msgid "Device has been made limited discoverable"
+#~ msgstr "Zariadenie bude obmedzene zistiteľné"
+
+#~ msgid "Device has been switched into pairing mode"
+#~ msgstr "Zariadenie bolo prepnuté do párovacieho režimu"
+
+#~ msgid "Bluetooth headset support plugin"
+#~ msgstr "Modul podporujúci bluetooth slúchadlové súpravy"
+
+#~ 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 ""
+#~ "Podpora bluetooth slúchadlových súprav\n"
+#~ "Copyright (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
+#~ "Toto bol GSoC 2008 projekt. Veľká vďaka patrí Tonymu Vroonovi a tímu "
+#~ "Audacious\n"
+#~ "\n"
+#~ "Ak sa rozhodnete používať AVRCP budete musieť do jadra zaviesť modul "
+#~ "uinput.\n"
+#~ "Tlačítka súpravy sa budú tváriť ako normálne multimediálne klávesy\n"
+#~ "a môžu byť nastavené pomocou modulu „Globálne klávesové skratky“\n"
+#~ "alebo inými nástrojmi, ktoré poskytuje váš správca okien\n"
+
+#~ msgid "Producer"
+#~ msgstr "Výrobca"
+
+#~ msgid "Available Headsets"
+#~ msgstr "Dostupné slúchadlové súpravy"
+
+#~ msgid "Current Headset"
+#~ msgstr "Aktuálna slúchadlová súprava"
+
+#~ msgid "_Connect"
+#~ msgstr "_Spojiť"
+
+#~ msgid "Class"
+#~ msgstr "Trieda"
+
+#~ msgid "Address:"
+#~ msgstr "Adresa:"
+
+#~ msgid "Bonding finish!"
+#~ msgstr "Prepojenie vytvorené!"
+
+#~ msgid "No devices found!"
+#~ msgstr "Nebolo nájdené žiadne zariadenie."
+
+#~ msgid "Scanning..."
+#~ msgstr "Vyhľadávanie…"
+
+#~ msgid "Pairing..."
+#~ msgstr "Párovanie…"
+
+#~ msgid "Rescan"
+#~ msgstr "Znovu vyhľadať"
+
+#~ msgid "Playback->Play"
+#~ msgstr "Prehrávanie->Prehrať"
+
+#~ msgid "Playback->Stop"
+#~ msgstr "Prehrávanie->Zastaviť"
+
+#~ msgid "Playback->Pause"
+#~ msgstr "Prehrávanie->Pozastaviť"
+
+#~ msgid "Playback->Prev"
+#~ msgstr "Prehrávanie->Predchádzajúca"
+
+#~ msgid "Playback->Next"
+#~ msgstr "Prehrávanie->Ďalšia"
+
+#~ msgid "Playback->Eject"
+#~ msgstr "Prehrávanie->Vysunúť"
+
+#~ msgid "Playlist->Repeat"
+#~ msgstr "Zoznam skladieb->Opakovať"
+
+#~ msgid "Playlist->Shuffle"
+#~ msgstr "Zoznam skladieb->Premiešať zoznam"
+
+#~ msgid "Volume->Up_5"
+#~ msgstr "Hlasitosť->Zvýšiť o 5"
+
+#~ msgid "Volume->Down_5"
+#~ msgstr "Hlasitosť->Znížiť o 5"
+
+#~ msgid "Volume->Up_10"
+#~ msgstr "Hlasitosť->Zvýšiť o 10"
+
+#~ msgid "Volume->Down_10"
+#~ msgstr "Hlasitosť->Znížiť o 10"
+
+#~ msgid "Volume->Mute"
+#~ msgstr "Hlasitosť->Stlmiť"
+
+#~ msgid "Window->Main"
+#~ msgstr "Okno->Hlavné"
+
+#~ msgid "Window->Playlist"
+#~ msgstr "Okno->Zoznam skladieb"
+
+#~ msgid "Window->Equalizer"
+#~ msgstr "Okno->Ekvalizér"
+
+#~ msgid "Window->JumpToFile"
+#~ msgstr "Okno->Prejsť na súbor"
+
+#~ 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 ""
+#~ "event-device-plugin: zariadenie %s sa nedá otvoriť, toto zariadenie sa "
+#~ "vynechá; skontrolujte, či súbor zariadenia existuje a či máte právo ho "
+#~ "čítať\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to create a io_channel for device file %s ,"
+#~ "skipping this device\n"
+#~ msgstr ""
+#~ "event-device-plugin: vstupno-výstupný kanál pre zariadenie %s sa nedá "
+#~ "vytvoriť, zariadenie bude vynechané\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to open /proc/bus/input/devices , automatic "
+#~ "detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: súbor /proc/bus/input/devices sa nedá otvoriť, "
+#~ "automatické detekcia udalostných zariadení nebude fungovať.\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 ""
+#~ "event-device-plugin: vstupno-výstupný kanál pre /proc/bus/input/devices "
+#~ "sa nedá otvoriť, automatické detekcia udalostných zariadení nebude "
+#~ "fungovať.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: an error occurred while reading /proc/bus/input/"
+#~ "devices , automatic detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: pri čítaní /proc/bus/input/devices nastala chyba, "
+#~ "automatické detekcia udalostných zariadení nebude fungovať.\n"
+
+#~ msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: zariadenie %s nebolo nájdené v /dev/input; "
+#~ "zariadenie bude vynechané.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to load config file %s , default settings "
+#~ "will be used.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfiguračný súbor %s sa nedá načítať,budú použité "
+#~ "predvolené nastavenia.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: incomplete information in config file for device \"%s"
+#~ "\" , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: v konfiguračnom súbore sú neúplné informácie pre "
+#~ "zariadenie „%s“, zariadenie bude vynechané\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_active value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurácia: nedá sa získať hodnota is_active pre "
+#~ "zariadenie „%s“, zariadenie bude vynechané\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to access local directory %s , settings will "
+#~ "not be saved.\n"
+#~ msgstr ""
+#~ "event-device-plugin: prístup k lokálnemu adresáru %s bol odoprený, "
+#~ "nastavenia nebudú uložené.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get filename value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurácia: hodnotu filename pre zariadenie „%s“ "
+#~ "sa nepodarilo získať, zariadenie bude vynechané\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get phys value for device "
+#~ "\"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurácia: hodnotu phys pre zariadenie „%s“ sa "
+#~ "nepodarilo získať, zariadenie bude vynechané\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_custom value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurácia: hodnotu is_custom pre zariadenie „%s“ "
+#~ "sa nepodarilo získať, zariadenie bude vynechané\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unexpected value for device \"%s\", "
+#~ "skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: konfigurácia: neočakávaná hodnota pre zariadenie "
+#~ "„%s“, zariadenie bude vynechané\n"
+
+#~ msgid "Detected"
+#~ msgstr "Nájdené"
+
+#~ msgid "Custom"
+#~ msgstr "Vlastné"
+
+#~ msgid "Not Detected"
+#~ msgstr "Nenájdené"
+
+#~ msgid "Information"
+#~ msgstr "Podrobnosti"
+
+#~ msgid ""
+#~ "Cannot open bindings window for a not-detected device.\n"
+#~ "Ensure that the device has been correctly plugged in."
+#~ msgstr ""
+#~ "Okno s prepojeniami pre nenájdené zariadenie sa nedá otvoriť.\n"
+#~ "Uistite sa, že zariadenie je správne pripojené."
+
+#~ msgid ""
+#~ "Unable to open selected device.\n"
+#~ "Please check read permissions on device file."
+#~ msgstr ""
+#~ "Zvolené zariadenie sa nedá otvoriť.\n"
+#~ "Skontrolujte prosím, práva na čítanie tohoto zariadenia."
+
+#~ msgid "EvDev-Plug - Add custom device"
+#~ msgstr "EvDev-Plug - Pridať vlastné zariadenie"
+
+#~ 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 sa pokúsi automaticky zistiť udalostné zariadenia dostupné\n"
+#~ "v systéme a aktualizovať o nich informácie.\n"
+#~ "Ak autodetekcia na vašom systéme nepracuje správne, alebo máte udalostné\n"
+#~ "zariadenia v neštandardnom adresári (v súčastnosti je prehľadávaný iba "
+#~ "adresár\n"
+#~ "/dev/input), môžete pridať vlastné zariadenia."
+
+#~ msgid "Device name:"
+#~ msgstr "Názov zariadenia:"
+
+#~ msgid "Device file:"
+#~ msgstr "Súbor zariadenia:"
+
+#~ msgid "(custom)"
+#~ msgstr "(vlastné)"
+
+#~ msgid ""
+#~ "Please specify both name and filename.\n"
+#~ "Filename must be specified with absolute path."
+#~ msgstr ""
+#~ "Prosím zadajte názov a názov súboru.\n"
+#~ "Názov súboru musí byť uvedené s absolútnou cestou."
+
+#~ msgid ""
+#~ "Do you want to remove the existing configuration for selected device?\n"
+#~ msgstr ""
+#~ "Prajete si odstrániť existujúce nastavenie pre zvolené zariadenie?\n"
+
+#~ msgid "Do you want to remove the selected custom device?\n"
+#~ msgstr "Prajete si odstrániť zvolené vlastné zariadenie?\n"
+
+#~ msgid "EvDev-Plug - Configuration"
+#~ msgstr "EvDev-Plug - Nastavenie"
+
+#~ msgid "Active"
+#~ msgstr "Aktívne"
+
+#~ msgid "Status"
+#~ msgstr "Stav"
+
+#~ msgid "Device Name"
+#~ msgstr "Názov zariadenia"
+
+#~ msgid "Device File"
+#~ msgstr "Súbor zariadenia"
+
+#~ msgid "Device Address"
+#~ msgstr "Adresa zariadenia"
+
+#~ msgid "_Bindings"
+#~ msgstr "_Prepojenia"
+
+#~ 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 ""
+#~ "Na zariadení stlačte kláves, ktorý si želáte prepojiť.\n"
+#~ "Ak nebude stlačený žiadny kláves bude toto okno\n"
+#~ "automaticky o päť sekúnd zatvorené."
+
+#~ 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 ""
+#~ "Táto vstupná udalosť už bola priradená.\n"
+#~ "\n"
+#~ "Nie je možné priradiť viac akcií rovnakej vstupnej udalosti (je ale možné "
+#~ "priradiť jednu akciu viacerým vstupným udalostiam)."
+
+#~ msgid "EvDev-Plug - Bindings Configuration"
+#~ msgstr "EvDev-Plug - Nastavenie prepojení"
+
+#~ msgid "Name: "
+#~ msgstr "Názov: "
+
+#~ msgid "Filename: "
+#~ msgstr "Názov súboru: "
+
+#~ msgid "Phys.Address: "
+#~ msgstr "Fyzická adresa: "
+
+#~ msgid "EvDev-Plug - about"
+#~ msgstr "O 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"
+#~ "diaľkové ovládanie prehrávača pomocou udalostných zariadení\n"
+#~ "http://www.develia.org/projects.php?p=audacious#evdevplug\n"
+#~ "\n"
+#~ "napísal Giacomo Lozito\n"
+
+#~ msgid "This LADSPA plugin has no user controls"
+#~ msgstr "Tento LADSPA modul nemá žiadne používateľské nastavenia"
+
+#~ msgid "Name"
+#~ msgstr "Názov"
+
+#~ msgid "UID"
+#~ msgstr "UID"
+
+#~ msgid "Installed plugins"
+#~ msgstr "Nainštalované moduly"
+
+#~ msgid "Running plugins"
+#~ msgstr "Bežiace moduly"
+
+#~ msgid "Add"
+#~ msgstr "Pridať"
+
+#~ msgid "Remove"
+#~ msgstr "Odstrániť"
+
+#~ msgid "LADSPA Plugin Catalog"
+#~ msgstr "Katalóg LADSPA modulov"
+
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "O module LIRC pre Audacious"
+
+#~ msgid "LIRC Plugin "
+#~ msgstr "Modul 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"
+#~ "Jednoduchý modul, ktorý vám umožní ovládať Audacious\n"
+#~ "pomocou systémovej služby diaľkového ovládania LIRC\n"
+#~ "\n"
+#~ "Pre Audacious upravil Tony Vroon <chainsaw@gentoo.org>\n"
+#~ "Originálny modul XMMS LIRC napísali:\n"
+#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
+#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
+#~ "Andrew O. Shadoura <bugzilla@tut.by>\n"
+#~ "Informácie o LIRC môžete získať na:\n"
+#~ "http://lirc.org"
+
+#~ msgid "LIRC plugin settings"
+#~ msgstr "Nastavenia modulu LIRC"
+
+#~ msgid "Reconnect to LIRC server"
+#~ msgstr "Znovu sa pripojiť k LIRC serveru"
+
+#~ msgid "Timeout before reconnecting (seconds): "
+#~ msgstr "Časový limit pred znovupripojením (sekúnd): "
+
+#~ msgid "Reconnect"
+#~ msgstr "Znovu pripojiť"
+
+#~ msgid "Connection"
+#~ msgstr "Spojenie"
+
+#~ msgid "%s: could not init LIRC support\n"
+#~ msgstr "%s: LIRC podpora sa nedá inicializovať\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: konfiguračný súbor LIRC sa nedá prečítať,\n"
+#~ "%s: prečítajte si, prosím, dokumentáciu k LIRC\n"
+#~ "%s: ako správne vytvoriť konfiguračný súbor\n"
+
+#~ msgid "%s: trying to reconnect...\n"
+#~ msgstr "%s: pokúšam sa znovupripojiť…\n"
+
+#~ msgid "%s: unknown command \"%s\"\n"
+#~ msgstr "%s: neznámy príkaz „%s“\n"
+
+#~ msgid "%s: disconnected from LIRC\n"
+#~ msgstr "%s: odpojené od LIRC\n"
+
+#~ msgid "%s: will try reconnect every %d seconds...\n"
+#~ msgstr "%s: pokus o znovupripojenie budem opakovať každých %d sekúnd…\n"
+
+#~ msgid "ModPlug Configuration"
+#~ msgstr "Nastavenie ModPlug"
+
+#~ msgid "16 bit"
+#~ msgstr "16 bitov"
+
+#~ msgid "8 bit"
+#~ msgstr "8 bitov"
+
+#~ msgid "Mono (downmix)"
+#~ msgstr "mono (zmiešať kanále)"
+
+#~ msgid "Nearest (fastest)"
+#~ msgstr "Najbližšie (najrýchlejšie)"
+
+#~ msgid "Linear (fast)"
+#~ msgstr "Lineárne (rýchle)"
+
+#~ msgid "Spline (good quality)"
+#~ msgstr "Kubická interpolácia (kvalitné)"
+
+#~ msgid "8-tap Fir (extremely high quality)"
+#~ msgstr "8-tap Fir interpolácia (veľmi kvalitné)"
+
+#~ 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 "Vzorkovacia frekvencia"
+
+#~ msgid "Enable"
+#~ msgstr "Povoliť"
+
+#~ msgid "Depth"
+#~ msgstr "Hĺbka"
+
+#~ msgid "Delay"
+#~ msgstr "Oneskorenie"
+
+#~ msgid "Reverb"
+#~ msgstr "Dozvuk"
+
+#~ msgid "Amount"
+#~ msgstr "Stupeň"
+
+#~ msgid "Range"
+#~ msgstr "Rozsah"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Zvýraznenie hlbokých tónov"
+
+#~ msgid ""
+#~ "Note: Setting the preamp\n"
+#~ "too high may cause clipping\n"
+#~ "(annoying clicks and pops)!"
+#~ msgstr ""
+#~ "Poznámka: Vysoké hodnoty\n"
+#~ "predzosilnenia môžu spôsobiť\n"
+#~ "orezanie (obťažujúce praskanie)."
+
+#~ msgid "Effects"
+#~ msgstr "Efekty"
+
+#~ msgid "Use Filename as Song Title"
+#~ msgstr "Použiť názov súboru ako názov skladby"
+
+#~ msgid "Fast Playlist Info"
+#~ msgstr "Rýchle informácie o skladbe"
+
+#~ msgid "Noise Reduction"
+#~ msgstr "Potlačenie šumu"
+
+#~ msgid "Play Amiga MOD"
+#~ msgstr "Prehrávať moduly z Amigy"
+
+#~ msgid "Don't loop"
+#~ msgstr "Neopakovať"
+
+#~ msgid "Loop"
+#~ msgstr "Opakovať"
+
+#~ msgid "time(s)"
+#~ msgstr "krát"
+
+#~ msgid "Loop forever"
+#~ msgstr "Opakovať donekonečna"
+
+#~ msgid "Looping"
+#~ msgstr "Opakovanie"
+
+#~ msgid "MOD Info"
+#~ msgstr "Informácie o module"
+
+#~ msgid ""
+#~ "Filename:\n"
+#~ "Title:\n"
+#~ "Type:\n"
+#~ "Length:\n"
+#~ "Speed:\n"
+#~ "Tempo:\n"
+#~ "Samples:\n"
+#~ "Instruments:\n"
+#~ "Patterns:\n"
+#~ "Channels:"
+#~ msgstr ""
+#~ "Názov súboru:\n"
+#~ "Názov skladby:\n"
+#~ "Typ:\n"
+#~ "Dĺžka:\n"
+#~ "Rýchlosť:\n"
+#~ "Tempo:\n"
+#~ "Počet vzoriek:\n"
+#~ "Počet nástrojov:\n"
+#~ "Počet úsekov:\n"
+#~ "Počet kanálov:"
+
+#~ msgid ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+#~ msgstr ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+
+#~ msgid "Samples"
+#~ msgstr "Vzorky"
+
+#~ msgid "Instruments"
+#~ msgstr "Nástroje"
+
+#~ msgid "Message"
+#~ msgstr "Odkaz"
+
+#~ msgid "Modplug Input Plugin for Audacious ver"
+#~ msgstr "Vstupný modul Modplug pre Audaciuos verzie "
+
+#~ 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"
+#~ "Zvukové jadro Modplug napísal Olivier Lapicque.\n"
+#~ "XMMS rozhranie k Modplug napísal Kenton Varda.\n"
+#~ "(c)2000 Olivier Lapicque a Kenton Varda.\n"
+#~ "Aktualizuje a udržuje Konstanty Bialkowski.\n"
+#~ "Pre BMP upravil Theofilos Intzoglou."
+
+#~ msgid "About Modplug"
+#~ msgstr "O module Modplug"
+
+#~ msgid "Show separators in playlist"
+#~ msgstr "Zobrazovať oddeľovače v zozname skladieb"
+
+#~ msgid "Show window manager decoration"
+#~ msgstr "Zobrazovať dekoráciu okien"
+
+#~ msgid "This enables the window manager to show decorations for windows."
+#~ msgstr "Touto voľbou povolíte zobrazovanie dekorácie okien."
+
+#~ 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 ""
+#~ "Ak je povolené, bude sa text s informáciami v hlavnom okne posúvať tam a "
+#~ "späť. Ak nie je povolené, text sa bude posúvať iba v jednom smere."
+
+#~ msgid "Disable inline gtk theme"
+#~ msgstr "Zakázať vloženú GTK tému"
+
+#~ msgid "Random skin on play"
+#~ msgstr "Náhodný vzhľad pri prehrávaní"
+
+#~ msgid "Allow loading incomplete skins"
+#~ msgstr "Povoliť načítavanie nekompletných vzhľadov"
+
+#~ msgid ""
+#~ "If selected, audacious won't refuse loading broken skins. Use only if "
+#~ "your favourite skin doesn't work"
+#~ msgstr ""
+#~ "Ak je povolené, Audacious neodmietne načítanie poškodeného vzhľadu. "
+#~ "Použite iba ak váš obľúbený vzhľad nefunguje"
+
+#~ msgid "Color Adjustment"
+#~ msgstr "Prispôsobenie farby"
+
+#~ msgid ""
+#~ "Audacious allows you to alter the color balance of the skinned UI. The "
+#~ "sliders below will allow you to do this."
+#~ msgstr ""
+#~ "Audacious umožňuje zmeniť zafarbenie témy užívateľského rozhrania pomocou "
+#~ "nasledujúcich jazdcov."
+
+#~ msgid "Blue"
+#~ msgstr "Modrá"
+
+#~ msgid "Green"
+#~ msgstr "Zelená"
+
+#~ msgid "Red"
+#~ msgstr "Červená"
+
+#~ msgid "Color adjustment ..."
+#~ msgstr "Prispôsobenie farby …"
+
+#~ msgid "Disable 'GUI Scaling'"
+#~ msgstr "Vypnúť „Zväčšiť GUI“"
+
+#~ msgid "Enable 'GUI Scaling'"
+#~ msgstr "Zapnúť „Zväčšiť GUI“"
+
+#~ msgid "DoubleSize"
+#~ msgstr "Dvojitá veľkosť"
+
+#~ msgid "Easy Move"
+#~ msgstr "Jednoduchý presun"
+
+#~ msgid "Spectrum Analyzer"
+#~ msgstr "Analyzátor spektra"
+
+#~ msgid "Search:"
+#~ msgstr "Hľadať:"
+
+#~ msgid "Add Bookmark"
+#~ msgstr "Pridať záložku"
+
+#~ msgid "Stream name"
+#~ msgstr "Názov prúdu"
+
+#~ msgid "Now playing"
+#~ msgstr "Práve hrá"
+
+#~ msgid "Remove Bookmark"
+#~ msgstr "Odstrániť záložku"
+
+#~ msgid "About Stream Browser"
+#~ msgstr "O prehliadači prúdov"
+
+#~ 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, Calin Crisan <ccrisan@gmail.com> a tím Audacious.\n"
+#~ "\n"
+#~ "Toto je jednoduchý prehliadač prúdov, ktorý obsahuje najobľúbenejšie "
+#~ "adresáre prúdov.\n"
+#~ "Veľká vďaka patrí vývojárom Streamtuner <http://www.nongnu.org/"
+#~ "streamtuner>\n"
+#~ "a samozrejme celej komunite okolo Audacious.\n"
+#~ "\n"
+#~ "Opäť ďakujem Tonymu Vroonovi za rady a vedenie.\n"
+#~ "\n"
+#~ "Toto bol Google Summer of Code 2008 projekt."
+
+#~ msgid "Can't jump to time when no track is being played.\n"
+#~ msgstr "Keď sa neprehráva žiadna skladba nie je možné prejsť na čas.\n"
+
+#~ msgid "minutes:seconds"
+#~ msgstr "minúty:sekundy"
+
+#~ msgid "Track length:"
+#~ msgstr "Dĺžka skladby:"
+
+#~ msgid "Error writing playlist \"%s\": %s"
+#~ msgstr "Chyba pri ukladaní zoznamu skladieb „%s“: %s"
+
 #~ msgid "%s already exist. Continue?"
 #~ msgstr "%s už existuje. Pokračovať?"
+
+#~ msgid "Show/hide infoarea"
+#~ msgstr "Zobrazí alebo skryje informačnú plochu"
+
+#~ msgid "Show main menu"
+#~ msgstr "Zobraziť hlavnú ponuku"
+
+#~ msgid "Show/hide main menu"
+#~ msgstr "Zobrazí alebo skryje hlavnú ponuku"
+
+#~ msgid "Show/hide statusbar"
+#~ msgstr "Zobrazí alebo skryje stavový riadok"
+
+#~ msgid "Import Playlist ..."
+#~ msgstr "Importovať zoznam skladieb …"
+
+#~ msgid "Export Playlist ..."
+#~ msgstr "Exportovať zoznam skladieb …"
+
+#~ msgid "Refresh"
+#~ msgstr "Obnoviť"
+
+#~ msgid "Refresh Selected"
+#~ msgstr "Obnoviť označené"
+
+#~ msgid "Refreshes metadata associated with selected entries."
+#~ msgstr "Obnovuje metadáta patriace k zvoleným položkám."
+
+#~ msgid "Edit title"
+#~ msgstr "Upraviť názov"
+
+#~ msgid "Edit the playlist title."
+#~ msgstr "Upraviť názov zoznamu skladieb."
+
+#~ msgid "By Formatted Title"
+#~ msgstr "Podľa formátovaného názvu"
+
+#~ msgid "Components"
+#~ msgstr "Súčasti"
+
+#~ msgid "Upload selected track(s)"
+#~ msgstr "Nahrať vybrané stopy"
+
+#~ msgid "MTP device handler"
+#~ msgstr "Obsluha MTP zariadenia"
+
+#~ msgid "Show main player window"
+#~ msgstr "Zobraziť hlavné okno prehrávača"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorovať"
+
+#~ 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 ""
+#~ "Pri spustení Audacious boli všetky okná skryté.\n"
+#~ "Možno budete chcieť kvôli ovládaniu zobraziť okno prehrávača. Inak ho "
+#~ "budete musieť ovládať vzdialene pomocou audtool alebo pomocou zapnutých "
+#~ "modulov (napr. pomocou modulu stavová ikona)."
+
+#~ msgid "Always ignore, show/hide is controlled remotely"
+#~ msgstr "Vždy ignorovať. Ukázať/skryť je ovládané vzdialene"
+
+#~ msgid "Audacious - broken GTK engine usage warning"
+#~ msgstr "Audacious - GTK modul vzhľadu"
+
+#~ 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>Používa sa chybný modul vzhľadu GTK</big>\n"
+#~ "\n"
+#~ "Audacious zistil, že používate chybný modul vzhľadu GTK.\n"
+#~ "\n"
+#~ "Používaný modul vzhľadu, %s, nie je kompatibilný s niektorými "
+#~ "vlastnosťami moderných tém. Nekompatibilné vlastnosti budú v tejto "
+#~ "relácii zakázané.\n"
+#~ "\n"
+#~ "Ak chcete tieto vlastnosti použiť, zvážte použitie iného modulu vzhľadu "
+#~ "pre GTK."
+
+#~ msgid "Do not display this warning again"
+#~ msgstr "Toto upozornenie viac nezobrazovať"
+
+#~ msgid "Save as Static Playlist"
+#~ msgstr "Uložiť ako statický zoznam skladieb"
+
+#~ msgid "Use Relative Path"
+#~ msgstr "Použiť relatívne cesty"
+
+#~ msgid "Load Playlist"
+#~ msgstr "Načítať zoznam skladieb"
+
+#~ msgid "Save Playlist"
+#~ msgstr "Uložiť zoznam skladieb"
+
+#~ msgid "Skinned Interface"
+#~ msgstr "Rozhranie s meniteľným vzhľadom"

audacious-plugins-2.5.3.tar.gz/po/tr.po -> audacious-plugins-3.0.tar.gz/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-05-19 10:53-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"
@@ -25,7 +25,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, fuzzy, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -36,613 +36,55 @@
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM çözücüsü (c) Nero AG, www.nero.com\n"
 "Telif Hakkı (c) 2005-2006 Audacious ekibi"
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 #, fuzzy
 msgid "About MP4 AAC decoder plugin"
 msgstr "MP4 AAC oynatıcı eklentisi hakkında"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "Hakkında"
-
-#: src/adplug/adplug-xmms.cc:155
-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"
-"Telif Hakkı (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
-"\n"
-"Bu eklenti, GNU LGPL şartları altında yayınlanmaktadır.\n"
-"Daha fazla bilgi için http://www.gnu.org/licenses/lgpl.html adresine "
-"bakınız.\n"
-"\n"
-"Bu eklenti tüm hakları (C) Simon Peter, et al'a ait olan AdPlug "
-"kütüphanesini kullanmaktadır.\n"
-"AdPlug kitaplık sürümü: "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: Yapılandırması"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "Tamam"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "İptal"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "Genel"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "Ses kalitesi"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "Çözünürlük"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr "8bit"
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr "16bit"
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "Kanallar"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "Mono"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "Stereo"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-"Eğer, ihtyacınız yoksa, stereoyu seçmeyin. Çünkü, sese stereo etkisi "
-"eklenmeyecektir. OPL2 sadece mono kullanır fakat daha fazla CPU gücü harcar!"
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "Sıklık"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "Çal"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "Şarkı sonunu tespit et"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-"Eğer etkinleştirilirse, Audacious şarkının sonunu tespit edecek, şarkıyı "
-"durduracak ve parça listesinde ilerleyecek. Bu özellik etkin değilse, "
-"Audacious şarkı sonunu tespit edemeyecek ve şarkıyı tekrar tekrar çalmaya "
-"devam edecek."
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "Biçimler"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "Biçim seçimi"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "Biçim"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "Dosya uzantısı"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-"Seçili dosya türleri, bu eklenti tarafından tanınacak ve çalınacak. "
-"Seçilmemiş türler, diğer eklentilerin bu dosyaları çalması için, dikkate "
-"alınmayacak."
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: Dosya Bilgisi"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "Dosya adı"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "Başlık: "
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "Yazar: "
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "Dosya Türü: "
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "Alt şarkılar: "
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "Enstrumanlar: "
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "Sıralar: "
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "Örnekler: "
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "Şarkı"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "Enstruman adı"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "Şarkı mesajı"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "Arkayüz bölümü"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "Sıra: "
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "Örnek: "
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "Satır: "
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "Hız: "
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "Sayaç: "
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr "Hz"
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "XMMS Alarm Hakkında"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "XMMS Alarm"
-
-#: src/alarm/interface.c:56
-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 ""
-"Audacious'un belli bir zamanda çalmaya başlaması\n"
-"için bir XMMS eklentisi.\n"
-"\n"
-"Şikayetleriniz için:\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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Kapat"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "Bu sizin uyandırma çağrınız."
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "Tamam"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "Parça Listesini Seç"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "Üzgünüm"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "Uyarı"
-
-#: src/alarm/interface.c:213
-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 ""
-"Güvenlik nedenlerinden dolayı, \"sessiz\" zaman en az 10 saniye ve yavaş "
-"geçiş zamanından da en az 65 saniye daha uzun olmalıdır."
-
-#: src/alarm/interface.c:229
-msgid "Oh Well"
-msgstr "Oh Peki"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "Alarm Ayarları"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "Zaman"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "saat"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "s"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "dakika"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "Sonra çık:"
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "Alarmı çal (öntanımlı):"
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "Alarmın çalacağı günleri seçiniz"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "Öntanımlı"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "Gün"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "Salı"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "Çarşamba"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "Perşembe"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "Cuma"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "Cumartesi"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "Pazar"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "Pazartesi"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "Günler"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "Yavaş geçiş"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "saniye"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "Ses"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "Güncel"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "güncel çıktı sesine dön"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "Başlat"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "Sonlandır"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "Ek Komutlar"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "etkinleştir"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "Parça listesi (seçmeli)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "Gözat..."
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "Hatırlatıcı"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "Hatırlatıcıyı kullan"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "Seçenekler"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "Bu seçenekler ne anlama geliyor?"
-
-#: src/alarm/interface.c:1364
-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"
-"Zaman\n"
-" Alarmı çal: \n"
-" Alarmın çalma zamanı.\n"
-"\n"
-" Sonra çık: \n"
-" Belirtilen süreden sonra alarmı kapat.\n"
-" (eğer uyandırma penceresi kapatılmamışsa)\n"
-"\n"
-"\n"
-"Günler\n"
-" Gün:\n"
-" Alarmın etkin olacağı günleri seçin.\n"
-"\n"
-" Zaman:\n"
-" Her bir gün için alarm zamanını seçin,\n"
-" veya önanımlı zamanı kullanmak için\n"
-" değiştirme düğmesini seçin.\n"
-"\n"
-"\n"
-"Ses\n"
-" Yavaş geçiş: \n"
-" Belirtilen sürede sesi istenen ses seviyesine\n"
-" çıkarır.\n"
-"\n"
-" Başlat: \n"
-" Bu ses seviyesinden sesi yükseltmeye başlar.\n"
-"\n"
-" Sonlandır: \n"
-" Yükseltmenin durdurulacağu ses düzeyi. Eğer\n"
-" yavaş geçiş süresi 0 ise, sesi bu düzeye ayarlar\n"
-" ve çalmaya başlar.\n"
-"\n"
-"\n"
-"Seçenekler:\n"
-" El Lomutlar:\n"
-" Alarm zamanında bu komutu çalıştırır.\n"
-"\n"
-" Parça listesi: \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"
-
-#: src/alarm/interface.c:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "Yardım"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "Bugün için hatırlatıcınız.."
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "Teşekkürler"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 #, fuzzy
 msgid "Default PCM device"
 msgstr "Varsayılan PCM aygıtı (%s)"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 #, fuzzy
 msgid "Default mixer device"
 msgstr "Varsayılan PCM aygıtı (%s)"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 #, fuzzy
 msgid "ALSA Output Plugin Preferences"
 msgstr "Durum Simgesi Eklentisi - Tercihler"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 #, fuzzy
 msgid "PCM device:"
 msgstr "Karıştırıcı aygıt:"
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "Karıştırıcı aygıt:"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 #, fuzzy
 msgid "Mixer element:"
 msgstr "Karıştırıcı aygıt:"
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 #, fuzzy
 msgid "About ALSA Output Plugin"
 msgstr "JACK Çıkış Eklentisi 0.17 Hakkında"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 #, fuzzy
 msgid "ALSA error"
 msgstr "Terör"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -806,6 +248,10 @@
 msgid "SoundFont settings"
 msgstr "SoundFont ayarları"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Dosya adı"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "Boyut (bayt)"
@@ -912,8 +358,7 @@
 "TiMidity\n"
 "arkayüzü"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "İsim:"
 
@@ -1085,119 +530,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Çalmaya yeniden başladığında OSD'yi başlatır."
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "Yerleştirme"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "Değişken X değeri:"
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Değişken Y değeri:"
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "Maksimum OSD genişliği:"
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "Çoklu Ekran seçenekleri"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "OSD kullanımını göster:"
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "tüm ekranlar"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "ekran %i"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "Zamanlama (ms)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "Görüntü:"
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "Gecikme:"
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "Kaybolma:"
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "Yazı Tipleri"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "Yazı tipi %i:"
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "Gölge"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "Uluslararasılaştırma"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "Metnin UTF-8 dönüşümünü iptal et (aosd)"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "Deri Dosyasını Seçin"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "Tarama Biçemi"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "Renkler %i:"
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "Özel Deri"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "Deri dosyası:"
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "Gözat"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "Tetikleyiciyi etkinleştir"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "Olay"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "Composite yöneticisi tespit edildi"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1207,73 +652,73 @@
 "Çalışan bir Composite yöneticisinin olduğundan emin değilseniz lütfen "
 "OSD'nin düzgün çalışması için bir Composite yöneticisi çalıştırınız"
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "Sahte şeffaflık için composite yöneticisi gerekli değil"
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "Şeffaflık"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "Sahte şeffaflık"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Gerçek Şeffaflık (X Composite Eklentisi gerekli)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "Composite eklentisi yüklü değil"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "Composite eklentisi erişilebilir değil"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - yapılandırması"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "Test"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "Konum"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "Canlandırma"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "Metin"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "Dekorasyon"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "Başlat"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Çeşitli"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "Audacius OSD - hakkında"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1281,7 +726,7 @@
 "\n"
 "Audacious OSD "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1304,133 +749,6 @@
 "Ghosd kütüphanesini hazırlayan Evan Martin\n"
 "\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr ""
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr ""
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr ""
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr ""
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr ""
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr ""
-
-#: src/bluetooth/bluetooth.c:118
-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 ""
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr ""
-
-#: src/bluetooth/gui.c:221
-#, fuzzy
-msgid "Available Headsets"
-msgstr "Kullanılabilir arkayüzler"
-
-#: src/bluetooth/gui.c:224
-#, fuzzy
-msgid "Current Headset"
-msgstr "Güncel"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr ""
-
-#: src/bluetooth/gui.c:231
-#, fuzzy
-msgid "_Connect"
-msgstr "Bağlantı modu:"
-
-#: src/bluetooth/gui.c:237
-#, fuzzy
-msgid "_Close"
-msgstr "Kapat"
-
-#: src/bluetooth/gui.c:274
-#, fuzzy
-msgid "Class"
-msgstr "Klasik"
-
-#: src/bluetooth/gui.c:278
-#, fuzzy
-msgid "Address:"
-msgstr "Aygıt Adresi"
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr ""
-
-#: src/bluetooth/scan_gui.c:138
-#, fuzzy
-msgid "Rescan"
-msgstr "Dikdörtgen"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-#, fuzzy
-msgid "Play"
-msgstr "Oynatma süresi:"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Bulanık alan: Renk seçimi"
@@ -1439,12 +757,12 @@
 msgid "Options:"
 msgstr "Seçenekler:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 #, fuzzy
 msgid "About Audio CD Plugin"
 msgstr "FLAC Ses Eklentisi Hakkında"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 #, fuzzy
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
@@ -1471,16 +789,16 @@
 "\n"
 "Bu bir Google Summer of Code 2007 projesidir."
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 #, fuzzy
 msgid "Audio CD"
 msgstr "Ses"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -1530,12 +848,24 @@
 msgid "Override default device: "
 msgstr "Öntanımlı aygıtın üstüne yaz: "
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+msgid "Ok"
+msgstr "Tamam"
+
+#: 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 "İptal"
+
+#: src/cd-menu-items/cd-menu-items.c:34
 #, fuzzy
 msgid "Play CD"
 msgstr "Oynatma süresi:"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "CD Ekle"
 
@@ -1563,6 +893,14 @@
 msgid "Game Console Music Decoder"
 msgstr "Konsol Müzik Çözücüsü"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "Genel"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Çal"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "Bas:"
@@ -1580,8 +918,7 @@
 msgid "Default song length:"
 msgstr "Varsayılan şarkı uzunluğu:"
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Yeniden örnekleme"
 
@@ -1593,6 +930,10 @@
 msgid "Resampling rate:"
 msgstr "Örnekleme oranı:"
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr "Hz"
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr "SPC"
@@ -1663,17 +1004,17 @@
 "same rate."
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 #, fuzzy
 msgid "Configure Crystalizer"
 msgstr "Ekstra Stereo Eklentisini Yapılandır"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "Efekt yoğunluğu:"
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "Uygula"
 
@@ -1713,394 +1054,32 @@
 msgid "Volume: (%)"
 msgstr "Ses: (%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "Çal"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "Dur"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "Durakla"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "Geri Sar"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "Playback->İleri"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "Playback->Çıkart"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "Tekrarla"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "Rastgele"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "Sesi 5 Birim Artır"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "Sesi 5 Birim Azalt"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "Sesi 10 Birim Artır"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "Sesi 10 Birim Azalt"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "Sessiz"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "Ana Ekran"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "Çalma Listesi"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "Ekolayzır"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "Dosya Çal"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-"event-device-plugin: %s diye belirtilen dosya açılamıyor.\n"
-"Cihaz durduruldu. Dosya yolunun, adının doğruluğunu\n"
-"ve erişim haklarınızı kontrol edin.\n"
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr ""
-"event-device-plugin: %s aygıt dosyası okunurken giriş-çıkış hatası\n"
-"meydana geldi. Aygıt okuma işlemi durduruldu.\n"
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: /proc/bus/input/devices açılamıyor.\n"
-"Otomatik başlatma yapılamıyor.\n"
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-"event-device-plugin: /proc/bus/input/devices için girdi-çıktı hatası, "
-"otomatik tanımlama yapılamıyor.\n"
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: /proc/bus/input/devices okunurken hata oluştu, otomatik "
-"tanımlama çalışmayacak.\n"
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr ""
-"event-device-plugin: /dev/input içerisinde aygıt %s bulunamadı, es "
-"geçiliyor.\n"
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr ""
-"event-device-plugin: ayar dosyası %s yüklenemiyor, öntanımlı ayarlar "
-"kullanılacak.\n"
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr ""
-"event-device-plugin: ayar dosyasında \"%s\" aygıtı için yetersiz bilgi "
-"bulundu, es geçiliyor.\n"
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: ayarlar, \"%s\" aygıtının çalıştığı bilgisine "
-"ulaşılamadı, es geçiliyor.\n"
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr ""
-"event-device-plugin: yerel dizin %s erişilemiyor, ayarlar kaydedilmeyecek.\n"
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugn: ayarlar, aygıt \"%s\" için filename değeri alınamıyor, "
-"es geçiliyor.\n"
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr ""
-"event-device-plugin: ayarlar, aygıt \"%s\" için phys değeri alınamıyor, es "
-"geçiliyor.\n"
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: ayarlar, aygıt \"%s\" için is_custom değeri alınamıyor, "
-"es geçiliyor.\n"
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr ""
-"event-device-plugin: ayarlar, aygıt \"%s\" için beklenmeyen bir değer "
-"alındı, es geçiliyor.\n"
-
-#: src/evdev-plug/ed_ui.c:212
-#, fuzzy
-msgid "Detected"
-msgstr "Şarkı sonunu tespit et"
-
-#: src/evdev-plug/ed_ui.c:217
-#, fuzzy
-msgid "Custom"
-msgstr "custom "
-
-#: src/evdev-plug/ed_ui.c:223
-#, fuzzy
-msgid "Not Detected"
-msgstr "Biçim seçimi"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "Bilgi"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-"Tanınmamış bir aygıt için ilişkilendirme penceresi açılamıyor.\n"
-"Aygıtın düzgün bir şekilde sisteme takılı olduğundan emin olun."
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "Hata"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-"Seçili aygıt açılamıyor.\n"
-"Aygıt dosyasına okuma hakkınız olduğundan emin olun."
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "EvDev-Plug - Özel aygıt ekle"
-
-#: src/evdev-plug/ed_ui.c:353
-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 otomatik olarak sisteminizde olay üreten aygıtları tanımaya\n"
-"ve hakkında bilgi toplamaya çalışır.\n"
-"Yine de otomatik tanıma başarısız olursa ya da sizin standart dışında bir "
-"yerde\n"
-"olay üreten bir aygıtınız varsa (öntanımlı olarak /dev/input/ altında "
-"aranırlar)\n"
-"elle aygıt adını ve aygıt dosyasını tanımlayarak özel bir aygıt tanımlamak\n"
-"isteyebilirsiniz."
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "Aygıt ismi:"
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "Aygıt dosyası:"
-
-#: src/evdev-plug/ed_ui.c:404
-#, fuzzy
-msgid "(custom)"
-msgstr "custom "
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-"Lütfen hem isim hem de dosya ismi belirleyiniz.\n"
-"Dosya ismi tam dizin bilgisi ile belirlenmelidir."
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr "Seçilen aygıt için mevcut olan ayarları kaldırmak istiyor musunuz?\n"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "Seçili olan özel aygıtı kaldırmak istiyor musunuz?\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "EvDev-Plug - Yapılandırması"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "Etkin"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "Durum"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "Aygıt İsmi"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "Aygıt Dosyası"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "Aygıt Adresi"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "_Bağlantılar"
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-"Bağlamak için aygıtınızda bir tuşa basınız;\n"
-"Beş saniye içerisinde herhangi bir tuşa basılmazsa\n"
-"bu pencere bağlama işlemi yapmadan kapanacaktır."
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-"Bu girdi olayı önceden atanmış.\n"
-"\n"
-"Aynı girdi olayına birden fazla eylem atanamaz (ama aynı eylem birden fazla "
-"olaya atanabilir)."
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Plug - Bağlayıcı Yapılandırması"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "İsim: "
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "Dosya ismi: "
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "Fiziksel Adres: "
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "EvDev-Plug hakkında"
-
-#: src/evdev-plug/ed_ui.c:1491
-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"
-"olay aygıtları ile oynatıcı uzakten yöneticisi\n"
-"http://www.develia.org/projects.php?p=audacious#evdevplug\n"
-"\n"
-"Giacomo Lozito tarafından yazılmıştır\n"
-
-#: src/ffaudio/ffaudio-core.c:765
+#: 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"
 "Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "FLAC Ses Eklentisi Hakkında"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "FileWriter Eklentisi Hakkında"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 #, fuzzy
 msgid ""
 "FileWriter-Plugin\n"
@@ -2139,51 +1118,51 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "File Writer Ayarları"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "Çıktı dosya biçimi:"
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "Yapılandır"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "Orjinal dizine kaydet"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "Özel dizine kaydet"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "Çıktı dosya klasörü:"
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "Dizin seçimi"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "Dosya adı kaynağı:"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "orijinal dosya işaretleri"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "özgün dosya adı"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "Dosya ismi uzantılarını daraltma"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "Parça numarısını dosya adına ekle"
 
@@ -2196,6 +1175,14 @@
 msgid "Joint Stereo"
 msgstr "Birleşik Stereo"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "Mono"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "MP3 Yapılandırması"
@@ -2241,7 +1228,6 @@
 msgstr "Hata koruması"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "Kalite"
 
@@ -2349,11 +1335,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "Gnome Kısayol Eklentisi Hakkında"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 #, fuzzy
 msgid ""
 "Gnome Shortcut Plugin\n"
@@ -2368,65 +1354,24 @@
 "Telif Hakkı (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 #, fuzzy
 msgid "Add Files"
 msgstr "Filtreler"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 #, fuzzy
 msgid "Audacious2"
 msgstr "%s - Audacious"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr ""
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr ""
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-#, fuzzy
-msgid "Jump to Time"
-msgstr "Dosyaya Atla:"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-#, fuzzy
-msgid "minutes:seconds"
-msgstr "dakika"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-#, fuzzy
-msgid "Track length:"
-msgstr "Parça ses yüksekliği:"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr ""
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-#, fuzzy
-msgid "Export Playlist"
-msgstr "Hızlı Parça Listesi Bilgisi"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-#, fuzzy
-msgid "Import Playlist"
-msgstr "Hızlı Parça Listesi Bilgisi"
-
 #: src/gtkui/columns.c:36
 #, fuzzy
 msgid "Entry number"
@@ -2524,447 +1469,313 @@
 msgid "Disable"
 msgstr "değişken"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr ""
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
+#: src/gtkui/menus.c:132
 #, fuzzy
-msgid "Audacious"
-msgstr "%s - Audacious"
+msgid "_Open Files ..."
+msgstr "Filtreler"
 
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
+#: src/gtkui/menus.c:133
+msgid "Open _URL ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
+#: src/gtkui/menus.c:134
 #, fuzzy
-msgid "Repeat"
-msgstr "Beat"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr ""
+msgid "_Add File ..."
+msgstr "Filtreler"
 
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr ""
+#: src/gtkui/menus.c:135
+#, fuzzy
+msgid "Add U_RL ..."
+msgstr "Filtreler"
 
-#: src/gtkui/ui_manager.c:55
+#: src/gtkui/menus.c:137
 #, fuzzy
-msgid "Show statusbar"
-msgstr "Durum"
+msgid "A_bout ..."
+msgstr "Hakkında"
 
-#: src/gtkui/ui_manager.c:56
+#: src/gtkui/menus.c:138
 #, fuzzy
-msgid "Show/hide statusbar"
-msgstr "Parça Listesini Seç"
+msgid "_Preferences ..."
+msgstr "AudioCompress seçenekleri"
 
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
-msgstr ""
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#, fuzzy
+msgid "_Quit"
+msgstr "Kalite"
 
-#: src/gtkui/ui_manager.c:60
+#: src/gtkui/menus.c:142
 #, fuzzy
-msgid "Scroll on Song Change"
-msgstr "Şarkı mesajı"
+msgid "_Play"
+msgstr "Oynatma süresi:"
 
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
+#: src/gtkui/menus.c:143
 #, fuzzy
-msgid "Pause"
+msgid "Paus_e"
 msgstr "Bekletme Açık"
 
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
+#: src/gtkui/menus.c:144
 #, fuzzy
-msgid "Stop"
+msgid "_Stop"
 msgstr "Durdur:"
 
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/gtkui/menus.c:145
 #, fuzzy
-msgid "Previous"
+msgid "Pre_vious"
 msgstr "Önceki Parça:"
 
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+#: src/gtkui/menus.c:146
 #, fuzzy
-msgid "Next"
+msgid "_Next"
 msgstr "Metin"
 
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-#, fuzzy
-msgid "Playlist"
-msgstr "Parça Listesini Seç"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-#, fuzzy
-msgid "New Playlist"
-msgstr "Parça Listesini Seç"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-#, fuzzy
-msgid "Delete Playlist"
-msgstr "Parça Listesini Seç"
-
-#: src/gtkui/ui_manager.c:95
+#: src/gtkui/menus.c:148
 #, fuzzy
-msgid "Import Playlist ..."
-msgstr "Hızlı Parça Listesi Bilgisi"
+msgid "_Repeat"
+msgstr "Beat"
 
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
+#: src/gtkui/menus.c:149
+msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:98
+#: src/gtkui/menus.c:150
 #, fuzzy
-msgid "Export Playlist ..."
-msgstr "Hızlı Parça Listesi Bilgisi"
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-#, fuzzy
-msgid "Saves the selected playlist."
+msgid "N_o Playlist Advance"
 msgstr "Parça Listesini Seç"
 
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-#, fuzzy
-msgid "Save All Playlists"
-msgstr "Parça Listesini Seç"
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:106
-msgid "Refresh"
+#: src/gtkui/menus.c:151
+msgid "Stop _After This Song"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:110
+#: src/gtkui/menus.c:154
 #, fuzzy
-msgid "Refresh Selected"
-msgstr "Biçim seçimi"
+msgid "Jump to _Time ..."
+msgstr "Dosyaya Atla:"
 
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:115
+#: src/gtkui/menus.c:158
 #, fuzzy
-msgid "Playlist Manager"
-msgstr "Parça Listesini Seç"
-
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr ""
+msgid "By Track _Number"
+msgstr "Parça numarası:"
 
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr ""
+#: src/gtkui/menus.c:159
+#, fuzzy
+msgid "By _Title"
+msgstr "Başlık"
 
-#: src/gtkui/ui_manager.c:123
+#: src/gtkui/menus.c:160
 #, fuzzy
-msgid "Add Files ..."
-msgstr "Filtreler"
+msgid "By _Artist"
+msgstr "Sanatçı:"
 
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
+#: src/gtkui/menus.c:161
 #, fuzzy
-msgid "Adds files to the playlist."
-msgstr "Parça listesine alttınılar ekle"
+msgid "By A_lbum"
+msgstr "Albüm:"
 
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
+#: src/gtkui/menus.c:162
 #, fuzzy
-msgid "Remove All"
-msgstr "Kaldır"
+msgid "By Release _Date"
+msgstr "Tarih:"
 
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr ""
+#: src/gtkui/menus.c:163
+#, fuzzy
+msgid "By _File Path"
+msgstr "Dosya adı"
 
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr ""
+#: src/gtkui/menus.c:164
+#, fuzzy
+msgid "By _Custom Title"
+msgstr "Özel Deri"
 
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
+#: src/gtkui/menus.c:166
+msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
+#: src/gtkui/menus.c:167
+msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:140
+#: src/gtkui/menus.c:172
 #, fuzzy
-msgid "Edit the playlist title."
-msgstr "Parça listesine alttınılar ekle"
+msgid "_Sort"
+msgstr "Port"
 
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
+#: src/gtkui/menus.c:174
+msgid "_New"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:146
+#: src/gtkui/menus.c:175
 #, fuzzy
-msgid "Sort"
-msgstr "Port"
+msgid "_Close"
+msgstr "Kapat"
 
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
+#: src/gtkui/menus.c:177
 #, fuzzy
-msgid "By Track Number"
-msgstr "Parça numarası:"
+msgid "_Import ..."
+msgstr "İçe aktar"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
+#: src/gtkui/menus.c:178
 #, fuzzy
-msgid "By Title"
-msgstr "Başlık"
+msgid "_Export ..."
+msgstr "Dışa aktar"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
+#: src/gtkui/menus.c:180
 #, fuzzy
-msgid "By Artist"
-msgstr "Sanatçı:"
+msgid "_Playlist Manager ..."
+msgstr "Parça Listesini Seç"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
+#: src/gtkui/menus.c:183
 #, fuzzy
-msgid "By Album"
-msgstr "Albüm:"
+msgid "Volume _Up"
+msgstr "Sesi yükselt:"
 
-#: src/gtkui/ui_manager.c:155
+#: src/gtkui/menus.c:184
 #, fuzzy
-msgid "By Release Date"
-msgstr "Tarih:"
+msgid "Volume _Down"
+msgstr "Sesi alçalt:"
 
-#: src/gtkui/ui_manager.c:157
+#: src/gtkui/menus.c:186
 #, fuzzy
-msgid "By File Path"
-msgstr "Dosya adı"
+msgid "_Equalizer"
+msgstr "Ekolayzır"
 
-#: src/gtkui/ui_manager.c:159
+#: src/gtkui/menus.c:188
 #, fuzzy
-msgid "By Formatted Title"
-msgstr "Başlık"
+msgid "E_ffects"
+msgstr "Efektler"
 
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
+#: src/gtkui/menus.c:191
+msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
+#: src/gtkui/menus.c:194
+msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "Efektler"
-
-#: src/gtkui/ui_manager.c:172
+#: src/gtkui/menus.c:195
 #, fuzzy
-msgid "Equalizer"
-msgstr "Ekolayzır"
+msgid "Show _Status Bar"
+msgstr "Durum"
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
+#: src/gtkui/menus.c:197
+msgid "Show Column _Headers"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
+#: src/gtkui/menus.c:198
+msgid "Choose _Columns ..."
 msgstr ""
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
+#: src/gtkui/menus.c:199
 #, fuzzy
-msgid "File"
-msgstr "Filtreler"
+msgid "Scrol_l on Song Change"
+msgstr "Şarkı mesajı"
 
-#: src/gtkui/ui_manager.c:188
+#: src/gtkui/menus.c:202
 #, fuzzy
-msgid "Components"
-msgstr "Yorum:"
+msgid "_File"
+msgstr "Filtreler"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
+#: src/gtkui/menus.c:203
 #, fuzzy
-msgid "View Track Details"
-msgstr "Parça Kazancı Kullan"
-
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr ""
+msgid "_Playback"
+msgstr "Çal"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
+#: src/gtkui/menus.c:204
 #, fuzzy
-msgid "About Audacious"
-msgstr "LIRC Audacious Eklentisi Hakkında"
-
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
-msgstr ""
+msgid "P_laylist"
+msgstr "Parça Listesini Seç"
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
 #, fuzzy
-msgid "Load and play a file"
-msgstr "Çalıcı başladığında SF'yi yükle"
-
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
-msgstr ""
+msgid "_Services"
+msgstr "Aygıtlar"
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
+#: src/gtkui/menus.c:206
 #, fuzzy
-msgid "Play media from the selected location"
-msgstr "Seçilen eylemi onayla"
+msgid "_Output"
+msgstr "Çıktı eklentisi hatası\n"
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
+#: src/gtkui/menus.c:207
+msgid "_View"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-#, fuzzy
-msgid "_Quit"
-msgstr "Kalite"
-
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-#, fuzzy
-msgid "Quit Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
+#: src/gtkui/menus.c:215
+msgid "_Copy"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
+#: src/gtkui/menus.c:216
+msgid "_Paste"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:217
 #, fuzzy
-msgid "Jump to File"
-msgstr "Dosyaya Atla:"
-
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
-msgstr ""
-
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
-msgstr ""
+msgid "Select _All"
+msgstr "Parça Listesini Seç"
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
+#: src/gtkui/menus.c:222
 #, fuzzy
-msgid "Cut"
-msgstr "Kült"
+msgid "_Rename"
+msgstr "Dosya adı"
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
 msgstr ""
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-#, fuzzy
-msgid "Select All"
-msgstr "Parça Listesini Seç"
-
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr ""
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
+#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
 #, fuzzy
-msgid "Select None"
-msgstr "Deri Dosyasını Seçin"
+msgid "Audacious"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr ""
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "Hata"
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 #, fuzzy
 msgid "mono"
 msgstr "Mono"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 #, fuzzy
 msgid "stereo"
 msgstr "Stereo"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "Kanallar"
 msgstr[1] "Kanallar"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, c-format
 msgid "%d kbps"
 msgstr ""
@@ -2974,11 +1785,21 @@
 msgid "Previous Track"
 msgstr "Önceki Parça:"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#, fuzzy
+msgid "Play"
+msgstr "Oynatma süresi:"
+
 #: src/hotkey/gui.c:73
 #, fuzzy
 msgid "Pause/Resume"
 msgstr "Beklet:"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#, fuzzy
+msgid "Stop"
+msgstr "Durdur:"
+
 #: src/hotkey/gui.c:75
 #, fuzzy
 msgid "Next Track"
@@ -3009,6 +1830,11 @@
 msgid "Volume Down"
 msgstr "Sesi alçalt:"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#, fuzzy
+msgid "Jump to File"
+msgstr "Dosyaya Atla:"
+
 #: src/hotkey/gui.c:82
 #, fuzzy
 msgid "Toggle Player Windows"
@@ -3018,11 +1844,20 @@
 msgid "Show On-Screen-Display"
 msgstr ""
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "Beat"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle Shuffle"
+msgstr ""
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -3030,40 +1865,40 @@
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr ""
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Genel Kısayol Eklentisi Ayarları"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 #, fuzzy
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr "Metin alanı içinde bir tuş kombinasyonu girin"
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 #, fuzzy
 msgid "Hotkeys:"
 msgstr "Makine:"
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 #, fuzzy
 msgid "Action:"
 msgstr "Dosya ismi: "
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr ""
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr "Genel Kısayol Eklentisi Hakkında"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 #, fuzzy
 msgid ""
 "Global Hotkey Plugin\n"
@@ -3139,141 +1974,29 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "JACK Çıkış Eklentisi 0.17 Hakkında"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr "Bu LADSPA eklentisi kullanıcı ayarı içermiyor"
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "İsim"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "Yüklü eklentiler"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "Çalışan eklentiler"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "Ekle"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "Kaldır"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "LADSPA Eklenti Kataloğu"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "LIRC Audacious Eklentisi Hakkında"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "LIRC Eklentisi"
-
-#: src/lirc/about.c:92
-#, fuzzy
+#: src/lyricwiki/lyricwiki.c:226
 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"
-"LIRC uzaktan kontrol sunucusunu kullanarak\n"
-"Audacious'u kontrol etmenizi sağlayan bir eklenti\n"
-"\n"
-"Audacious kullanımı için uyarlandı - Tony Vroon <chainsaw@gentoo.org>\n"
-"XMMS LIRC eklentisinden:\n"
-"Carl van Schaik <carl@leg.uct.ac.za>\n"
-"Christoph Bartelmus <xmms@bartelmus.de>\n"
-"LIRC hakkında bilgi almak için:\n"
-"http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
-
-#: src/lirc/interface.c:37
-#, fuzzy
-msgid "LIRC plugin settings"
-msgstr "LIRC Eklentisi"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr ""
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
+"Looking for lyrics..."
 msgstr ""
 
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr ""
-
-#: src/lirc/interface.c:79
-#, fuzzy
-msgid "Connection"
-msgstr "Bağlantı modu:"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: LIRC desteği başlatılamadı\n"
-
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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: LIRC yapılandırma dosyası okunamadı\n"
-"%s: lütfen LIRC belgelerini okuyun\n"
-"%s: uygun yapılandırma dosyası nasıl oluşturulur\n"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr ""
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: bilinmeyen komut \"%s\"\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: LIRC bağlantısı kesildi\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
 msgstr ""
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "Metronom Hakkında"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3287,265 +2010,42 @@
 "örneğin tact://77 ile dakikada 77 vurgu ya da\n"
 "tact://60*3/4 ile 60 bpm yi 3/4 tact ile"
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takt oluşturucu: %d bpm"
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takt oluşturucu: %d bpm %d/%d"
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "ModPlug Yapılandırması"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr "16 bit"
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr "8 bit"
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr "Mono (aşağıkarıştırma)"
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr "En yakın (en hızlı)"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "Doğrusal (hızlı)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr "Spline (iyi kalite)"
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr "8-tap FIR (fazla iyi kalite)"
-
-#: src/modplug/gui/interface.cxx:286
-#, fuzzy
-msgid "96 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:293
-#, fuzzy
-msgid "48 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr "44 kHz"
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr "22 kHz"
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "Örnekleme Oranı"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "Etkinleştir"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "Derinlik"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "Gecikme"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "Derinlik"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "Miktar"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "Aralık"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "Bass Güçlendirme"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr ""
-"Not: Preamp değerini\n"
-"yüksek ayarlamak sesde\n"
-"cızırtı ve patlamalara sebep olur!"
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "Preamp"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "Şarkı Adı için Dosya Adı kullan"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "Hızlı Parça Listesi Bilgisi"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "Gürültü Azaltma"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "Amiga MOD Oynat"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "Tekrarlama yapma"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "Tekrar"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "süre(ler)"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "Sonsuz kere tekrarla"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "Tekrarlama"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "MOD Bilgisi"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-"Dosya adı:\n"
-"Başlık:\n"
-"Tip:\n"
-"Uzunluk:\n"
-"Hız:\n"
-"Tempo:\n"
-"Örnekler:\n"
-"Enstrümanlar:\n"
-"Paternler:\n"
-"Kanallar:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "Örnekler"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "Enstrumanlar"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "Mesaj"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Modplug Girdi Eklentisi Audacious sürüm"
-
-#: src/modplug/gui/main.cxx:52
-#, fuzzy
-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 ses motoru Olivier Lapicque tarafından yazılmıştır.\n"
-"Modplug için XMMS arayüzü Kenton Varda.\n"
-"(c)2000 Olivier Lapicque ve Kenton Varda.\n"
-"Güncelleme ve bakım Konstanty Bialkowski.\n"
-"BMP uyarlaması Theofilos Intzoglou."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "Modplug Hakkında"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Resim dosyası bulunamadı: %s"
-
-#: src/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr ""
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr ""
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
 msgstr ""
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
+#: src/mtp_up/mtp.c:311
+msgid "Disconnect MTP Device"
 msgstr ""
 
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "Durdur:"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Parça listesine alttınılar ekle"
+
 #: src/null/null.c:64
 msgid "Null output plugin "
 msgstr "Null Çıkış eklentisi"
@@ -3597,12 +2097,12 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 #, fuzzy
 msgid "About OSS4 Plugin"
 msgstr "ESounD Eklentisi Hakkında"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 #, fuzzy
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
@@ -3653,6 +2153,11 @@
 msgid "Default (%s)"
 msgstr "Varsayılan (%s)"
 
+#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Öntanımlı"
+
 #: src/OSS/configure.c:187
 msgid "OSS Driver configuration"
 msgstr "OSS Sürücüsü ayarları"
@@ -3727,11 +2232,11 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Audacious PulseAudio Çıktı Eklentisi Hakkında"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3790,29 +2295,29 @@
 msgid "Method:"
 msgstr ""
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 #, fuzzy
 msgid "Change password"
 msgstr "Çalan şarkıyı değiştir"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "Hizmetler"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "Kullanıcı adı:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "Şifre:"
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 #, fuzzy
 msgid "Scrobbler URL:"
 msgstr "Scrobbler Hatası"
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr "Last.FM"
 
@@ -3821,7 +2326,7 @@
 msgid "Scrobbler"
 msgstr "Scrobbler Hatası"
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3832,16 +2337,16 @@
 "\n"
 "İlk geliştiricileri Audun Hove <audun@nlc.no> ve Pipian <pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "Scrobbler Eklentisi Hakkında"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 #, fuzzy
 msgid "About SDL Output Plugin"
 msgstr "JACK Çıkış Eklentisi 0.17 Hakkında"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 #, fuzzy
 msgid "SDL error"
 msgstr "Terör"
@@ -3851,11 +2356,19 @@
 msgid "About %s"
 msgstr "%s Hakkında"
 
-#: src/sid/xs_config.c:323
+#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
+msgid "Close"
+msgstr "Kapat"
+
+#: src/sid/xs_config.c:326
 #, fuzzy
 msgid " Error"
 msgstr "Hata"
 
+#: src/sid/xs_config.c:326
+msgid "OK"
+msgstr "Tamam"
+
 #: src/sid/xs_fileinfo.c:151
 msgid "General info"
 msgstr "Genel bilgi"
@@ -3865,6 +2378,11 @@
 msgid "Tune #%i: "
 msgstr "Tını #%i: "
 
+#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Resim dosyası bulunamadı: %s"
+
 #: src/sid/xs_interface.c:234
 msgid "Audacious-SID configuration"
 msgstr "Audacious-SID - yapılandırması"
@@ -4177,15 +2695,15 @@
 msgid "Use"
 msgstr "Kullan"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Kaydet"
 
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:435
+#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "İçe aktar"
 
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Sil"
 
@@ -4218,6 +2736,11 @@
 msgid "Playtime:"
 msgstr "Oynatma süresi:"
 
+#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
+#: src/sid/xs_interface.c:1155
+msgid "seconds"
+msgstr "saniye"
+
 #: src/sid/xs_interface.c:928
 msgid "Minimum playtime:"
 msgstr "En az oynatma süresi:"
@@ -4467,726 +2990,895 @@
 msgid "No"
 msgstr "Hayır"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr ""
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 msgstr ""
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr ""
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 #, fuzzy
 msgid "_Player:"
 msgstr "Oynatma süresi:"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 #, fuzzy
 msgid "_Playlist:"
 msgstr "Parça Listesini Seç"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 #, fuzzy
 msgid "Select playlist font:"
 msgstr "Parça Listesini Seç"
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 #, fuzzy
 msgid "_Fonts"
 msgstr "Dosya ismi: "
 
-#: src/skins/skins_cfg.c:323
-#, fuzzy
-msgid "Use Bitmap fonts if available"
-msgstr "Varsa CDDB kullan"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
-msgstr ""
-
-#: src/skins/skins_cfg.c:324
-#, fuzzy
-msgid "_Miscellaneous"
-msgstr "Hizmetler"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr ""
-
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr ""
+#: src/skins/skins_cfg.c:346
+#, fuzzy
+msgid "_Skin"
+msgstr "Dosya ismi: "
 
-#: src/skins/skins_cfg.c:330
-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 ""
+#: src/skins/skins_cfg.c:393
+#, fuzzy
+msgid "Interface Preferences"
+msgstr "AudioCompress seçenekleri"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr ""
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Preamp"
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
 msgstr ""
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr ""
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "250 Hz"
+msgstr "22050 Hz "
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
+#: src/skins/ui_equalizer.c:335
+#, fuzzy
+msgid "500 Hz"
+msgstr "11000 Hz"
 
-#: src/skins/skins_cfg.c:417
+#: src/skins/ui_equalizer.c:335
 #, fuzzy
-msgid "Blue"
-msgstr "Blues"
+msgid "1 kHz"
+msgstr "11 kHz"
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr ""
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "2 kHz"
+msgstr "22 kHz"
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr ""
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "4 kHz"
+msgstr "44 kHz"
 
-#: src/skins/skins_cfg.c:569
+#: src/skins/ui_equalizer.c:336
 #, fuzzy
-msgid "_Skin"
-msgstr "Dosya ismi: "
+msgid "8 kHz"
+msgstr "44 kHz"
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr ""
+#: src/skins/ui_equalizer.c:336
+#, fuzzy
+msgid "16 kHz"
+msgstr "44 kHz"
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 #, fuzzy
 msgid "Audacious Equalizer"
 msgstr "Ekolayzır"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr ""
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 #, fuzzy
 msgid "kHz"
 msgstr "Hz"
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 #, fuzzy
 msgid "surround"
 msgstr "Surround"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr ""
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr ""
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr ""
-
-#: src/skins/ui_main.c:993
-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 ""
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr ""
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr ""
-
-#: src/skins/ui_main.c:1052
+#: src/skins/ui_main.c:807
 #, c-format
-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."
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr ""
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-msgstr ""
-
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, fuzzy, c-format
 msgid "Volume: %d%%"
 msgstr "Ses: (%)"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 #, fuzzy
 msgid "Options Menu"
 msgstr "Seçenekler"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 #, fuzzy
 msgid "File Info Box"
 msgstr "Dosya Bilgisi"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr ""
-
-#: src/skins/ui_main.c:1639
-#, fuzzy
-msgid "Enable 'GUI Scaling'"
-msgstr "Ses örneklemesini etkinleştir"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr ""
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 #, fuzzy
 msgid "Playlist mode."
 msgstr "Parça Listesini Seç"
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr ""
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr ""
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr ""
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr ""
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 #, fuzzy
 msgid "Peaks"
 msgstr "Pranks"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#, fuzzy
+msgid "Repeat"
+msgstr "Beat"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr ""
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr ""
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr ""
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 #, fuzzy
 msgid "Show Equalizer"
 msgstr "Ekolayzır"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr ""
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr ""
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr ""
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "Yayılma"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr ""
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr ""
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 #, fuzzy
 msgid "Analyzer"
 msgstr "Spektrum Analizi"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 #, fuzzy
 msgid "Scope"
 msgstr "Durdur:"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr ""
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr ""
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 #, fuzzy
 msgid "Normal"
 msgstr "Biçim"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 #, fuzzy
 msgid "Fire"
 msgstr "Taşlama"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr ""
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 #, fuzzy
 msgid "Lines"
 msgstr "dakika"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 #, fuzzy
 msgid "Bars"
 msgstr "Bas"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 #, fuzzy
 msgid "Dot Scope"
 msgstr "Tekrarlama yapma"
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr ""
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr ""
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 #, fuzzy
 msgid "Slowest"
 msgstr "Showtunes"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 #, fuzzy
 msgid "Slow"
 msgstr "Slow Jam"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr ""
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 #, fuzzy
 msgid "Fast"
 msgstr "Biçim"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr ""
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr ""
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr ""
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+#, fuzzy
+msgid "Pause"
+msgstr "Bekletme Açık"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#, fuzzy
+msgid "Previous"
+msgstr "Önceki Parça:"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+#, fuzzy
+msgid "Next"
+msgstr "Metin"
+
+#: src/skins/ui_manager.c:196
 #, fuzzy
 msgid "Visualization"
 msgstr "Kurum:"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+#, fuzzy
+msgid "Playlist"
+msgstr "Parça Listesini Seç"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#, fuzzy
+msgid "New Playlist"
+msgstr "Parça Listesini Seç"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 #, fuzzy
 msgid "Select Next Playlist"
 msgstr "Parça Listesini Seç"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 #, fuzzy
 msgid "Select Previous Playlist"
 msgstr "Parça Listesini Seç"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#, fuzzy
+msgid "Delete Playlist"
+msgstr "Parça Listesini Seç"
+
+#: src/skins/ui_manager.c:222
+#, fuzzy
+msgid "Import Playlist"
+msgstr "Hızlı Parça Listesi Bilgisi"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:226
+#, fuzzy
+msgid "Export Playlist"
+msgstr "Hızlı Parça Listesi Bilgisi"
+
+#: src/skins/ui_manager.c:227
+#, fuzzy
+msgid "Saves the selected playlist."
+msgstr "Parça Listesini Seç"
+
+#: src/skins/ui_manager.c:229
+#, fuzzy
+msgid "Save All Playlists"
+msgstr "Parça Listesini 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 ""
+
+#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr ""
 
-#: src/skins/ui_manager.c:228
-msgid "List Manager"
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
 msgstr ""
 
 #: src/skins/ui_manager.c:238
+msgid "List Manager"
+msgstr ""
+
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr ""
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr ""
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr ""
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "AudioCompress seçenekleri"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr ""
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr ""
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+#, fuzzy
+msgid "Adds files to the playlist."
+msgstr "Parça listesine alttınılar ekle"
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 #, fuzzy
 msgid "Invert Selection"
 msgstr "Biçim seçimi"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:270
-msgid "Clear Queue"
+#: src/skins/ui_manager.c:267
+#, fuzzy
+msgid "Select All"
+msgstr "Parça Listesini Seç"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
 msgstr ""
 
 #: src/skins/ui_manager.c:271
+#, fuzzy
+msgid "Select None"
+msgstr "Deri Dosyasını Seçin"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:277
+#, fuzzy
+msgid "Remove All"
+msgstr "Kaldır"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:281
+msgid "Clear Queue"
+msgstr ""
+
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr ""
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr ""
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+#, fuzzy
+msgid "By Title"
+msgstr "Başlık"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 #, fuzzy
 msgid "By Filename"
 msgstr "Dosya adı"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 #, fuzzy
 msgid "By Path + Filename"
 msgstr "Dosya adı"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr ""
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr ""
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:313
 #, fuzzy
 msgid "Randomize List"
 msgstr "Kaydet"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 #, fuzzy
 msgid "Randomizes the playlist."
 msgstr "Parça listesine alttınılar ekle"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 #, fuzzy
 msgid "Sort List"
 msgstr "Sanatçı:"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#, fuzzy
+msgid "By Album"
+msgstr "Albüm:"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr ""
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#, fuzzy
+msgid "By Artist"
+msgstr "Sanatçı:"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr ""
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr ""
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 #, fuzzy
 msgid "By Date"
 msgstr "Tarih:"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr ""
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#, fuzzy
+msgid "By Track Number"
+msgstr "Parça numarası:"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr ""
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 #, fuzzy
 msgid "Sort Selected"
 msgstr "Biçim seçimi"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+#, fuzzy
+msgid "File"
+msgstr "Filtreler"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "Yardım"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr ""
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#, fuzzy
+msgid "View Track Details"
+msgstr "Parça Kazancı Kullan"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr ""
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#, fuzzy
+msgid "About Audacious"
+msgstr "LIRC Audacious Eklentisi Hakkında"
+
+#: src/skins/ui_manager.c:401
 #, fuzzy
 msgid "Play File"
 msgstr "Oynatma süresi:"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+#, fuzzy
+msgid "Load and play a file"
+msgstr "Çalıcı başladığında SF'yi yükle"
+
+#: src/skins/ui_manager.c:404
 #, fuzzy
 msgid "Play Location"
 msgstr "Yer:"
 
+#: src/skins/ui_manager.c:405
+#, fuzzy
+msgid "Play media from the selected location"
+msgstr "Seçilen eylemi onayla"
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr ""
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr ""
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr ""
+
+#: src/skins/ui_manager.c:413
+#, fuzzy
+msgid "Quit Audacious"
+msgstr "%s - Audacious"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr ""
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#, fuzzy
+msgid "Jump to Time"
+msgstr "Dosyaya Atla:"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr ""
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr ""
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr ""
+
+#: src/skins/ui_manager.c:436
+#, fuzzy
+msgid "Cut"
+msgstr "Kült"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr ""
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr ""
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 #, fuzzy
 msgid "Preset"
 msgstr "Port"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 #, fuzzy
 msgid "Load default preset into equalizer"
 msgstr "Öntanımlı değerleri yükle"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 #, fuzzy
 msgid "Zero"
 msgstr "Retro"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 #, fuzzy
 msgid "From file"
 msgstr "Profil: %s"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 #, fuzzy
 msgid "Load preset from file"
 msgstr "Dosya okunamıyor\n"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 #, fuzzy
 msgid "Save default preset"
 msgstr "Öntanımlı değerleri yükle"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 #, fuzzy
 msgid "To file"
 msgstr "STIL dosyası:"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 #, fuzzy
 msgid "Delete preset"
 msgstr "Sil"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:374
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:382
+#: 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 "
@@ -5194,118 +3886,56 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "Başlık: "
+
+#: src/skins/ui_playlist.c:267
 #, fuzzy
 msgid "Album: "
 msgstr "Albüm:"
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 #, fuzzy
 msgid "Artist: "
 msgstr "Sanatçı:"
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 #, fuzzy
 msgid "Filename: "
 msgstr "Dosya adı:"
 
-#: src/skins/ui_playlist.c:419
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:422
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:425
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:776
-#, fuzzy
-msgid "Save as Static Playlist"
-msgstr "Parça Listesini Seç"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr ""
-
-#: src/skins/ui_playlist.c:806
-#, fuzzy
-msgid "Load Playlist"
-msgstr "Hızlı Parça Listesi Bilgisi"
-
-#: src/skins/ui_playlist.c:819
-#, fuzzy
-msgid "Save Playlist"
-msgstr "Parça Listesini Seç"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 #, fuzzy
 msgid "Audacious Playlist Editor"
 msgstr "Hızlı Parça Listesi Bilgisi"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "250 Hz"
-msgstr "22050 Hz "
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "500 Hz"
-msgstr "11000 Hz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "1 kHz"
-msgstr "11 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-#, fuzzy
-msgid "2 kHz"
-msgstr "22 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "4 kHz"
-msgstr "44 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "8 kHz"
-msgstr "44 kHz"
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-#, fuzzy
-msgid "16 kHz"
-msgstr "44 kHz"
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, fuzzy, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "sidFilename ('%s') ayrılamadı\n"
@@ -5358,55 +3988,63 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "SndStretch Hakkında"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr "Ses düzeltme"
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr "Kısa Bindirme"
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "Hız"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "Tizlik"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "Yayılma"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "Seçenekler"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "SndStretch Ayarları"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr "Audacious yeni bir şarkı başlattığında çalışacak komut."
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "Komut:"
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr "Bir şarkının sonuna doğru çalışacak komut."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Audacious parça listesinin sonuna ulaştığında çalıştırılacak komut."
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "Bir şarkı için başlık değiştiğinde çalıştırılacak komut (örneğin ağ yayını "
 "başlıkları)."
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 #, fuzzy
 msgid ""
 "You can use the following format strings which\n"
@@ -5438,7 +4076,7 @@
 "%%t: Çalma listesi durumu (%%02d)\n"
 "%%p: Şu an oynatılan (1 or 0)"
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5446,19 +4084,15 @@
 "Kabuğa yollanan parametreler tırnak içinde belirtilmeli. "
 "Aksi takdirde güvenlik sorunu yaratır. "
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "Komutlar"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 #, fuzzy
 msgid "Song Change"
 msgstr "Şarkı mesajı"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "Spektrum Analizi"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "Durum Simgesi Eklentisi Hakkında"
@@ -5530,77 +4164,19 @@
 "\n"
 "Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "Ekstra Stereo Eklentisi Hakkında"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "Ekstra Stereo Eklentisini Yapılandır"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-#, fuzzy
-msgid "Search:"
-msgstr "Yıl:"
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-#, fuzzy
-msgid "Stream name"
-msgstr "Enstruman adı"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-#, fuzzy
-msgid "Now playing"
-msgstr "Parça Listesini Seç"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Etiketi kaldır"
-
-#: src/streambrowser/streambrowser.c:340
-#, fuzzy
-msgid "About Stream Browser"
-msgstr "OSS Sürücüsü Hakkında"
-
-#: src/streambrowser/streambrowser.c:341
-#, fuzzy
-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) 2007, Calin Crisan <ccrisan@gmail.com> ve The Audacious "
-"Takımı.\n"
-"\n"
-"libcdio geliştiricilerine <http://www.gnu.org/software/libcdio/>\n"
-"\t ve libcddb geliştiricilerine <http://libcddb.sourceforge.net/> "
-"teşekkürler.\n"
-"\n"
-"Ayrıca Tony Vroon'a beni yönlendirdiği ve danışmanım olduğu için "
-"teşekkürler.\n"
-"\n"
-"Bu bir Google Summer of Code 2007 projesidir."
-
-#: src/tonegen/tonegen.c:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "Ton Oluşturucusu Hakkında"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5614,12 +4190,12 @@
 "Kullanmak için bir URL ekleyin: tone://frequency1;frequency2;frequency3;...\n"
 "ör: 2000Hz ton ve 2005Hz ton çalmak için tone://2000;2005"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr "Ton Oluşturucu: "
 
@@ -5641,15 +4217,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Ogg Vorbis Etiketleri:"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ogg Vorbis Ses Eklentisi Yapılandırması"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "OGG Vorbis Ses Eklentisi Hakkında"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 #, fuzzy
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
@@ -5725,6 +4301,1098 @@
 "Eklenti kodunun bir kısmı Miles Egan tarafından hazırlanmıştır\n"
 "Wavpack sitesine http://www.wavpack.com/ adresinden ulaşabilirsiniz\n"
 
+#, fuzzy
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "Varsa CDDB kullan"
+
+#, fuzzy
+#~ msgid "_Miscellaneous"
+#~ msgstr "Hizmetler"
+
+#~ msgid "About "
+#~ msgstr "Hakkında"
+
+#~ 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"
+#~ "Telif Hakkı (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
+#~ "\n"
+#~ "Bu eklenti, GNU LGPL şartları altında yayınlanmaktadır.\n"
+#~ "Daha fazla bilgi için http://www.gnu.org/licenses/lgpl.html adresine "
+#~ "bakınız.\n"
+#~ "\n"
+#~ "Bu eklenti tüm hakları (C) Simon Peter, et al'a ait olan AdPlug "
+#~ "kütüphanesini kullanmaktadır.\n"
+#~ "AdPlug kitaplık sürümü: "
+
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AdPlug :: Yapılandırması"
+
+#~ msgid "Sound quality"
+#~ msgstr "Ses kalitesi"
+
+#~ msgid "Resolution"
+#~ msgstr "Çözünürlük"
+
+#~ msgid "8bit"
+#~ msgstr "8bit"
+
+#~ msgid "16bit"
+#~ msgstr "16bit"
+
+#~ msgid "Channels"
+#~ msgstr "Kanallar"
+
+#~ 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 ""
+#~ "Eğer, ihtyacınız yoksa, stereoyu seçmeyin. Çünkü, sese stereo etkisi "
+#~ "eklenmeyecektir. OPL2 sadece mono kullanır fakat daha fazla CPU gücü "
+#~ "harcar!"
+
+#~ msgid "Frequency"
+#~ msgstr "Sıklık"
+
+#~ msgid "Detect songend"
+#~ msgstr "Şarkı sonunu tespit et"
+
+#~ 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 ""
+#~ "Eğer etkinleştirilirse, Audacious şarkının sonunu tespit edecek, şarkıyı "
+#~ "durduracak ve parça listesinde ilerleyecek. Bu özellik etkin değilse, "
+#~ "Audacious şarkı sonunu tespit edemeyecek ve şarkıyı tekrar tekrar çalmaya "
+#~ "devam edecek."
+
+#~ msgid "Formats"
+#~ msgstr "Biçimler"
+
+#~ msgid "Format selection"
+#~ msgstr "Biçim seçimi"
+
+#~ msgid "Format"
+#~ msgstr "Biçim"
+
+#~ msgid "Extension"
+#~ msgstr "Dosya uzantısı"
+
+#~ 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 ""
+#~ "Seçili dosya türleri, bu eklenti tarafından tanınacak ve çalınacak. "
+#~ "Seçilmemiş türler, diğer eklentilerin bu dosyaları çalması için, dikkate "
+#~ "alınmayacak."
+
+#~ msgid "AdPlug :: File Info"
+#~ msgstr "AdPlug :: Dosya Bilgisi"
+
+#~ msgid "Author: "
+#~ msgstr "Yazar: "
+
+#~ msgid "File Type: "
+#~ msgstr "Dosya Türü: "
+
+#~ msgid "Subsongs: "
+#~ msgstr "Alt şarkılar: "
+
+#~ msgid "Instruments: "
+#~ msgstr "Enstrumanlar: "
+
+#~ msgid "Orders: "
+#~ msgstr "Sıralar: "
+
+#~ msgid "Patterns: "
+#~ msgstr "Örnekler: "
+
+#~ msgid "Song"
+#~ msgstr "Şarkı"
+
+#~ msgid "Instrument name"
+#~ msgstr "Enstruman adı"
+
+#~ msgid "Song message"
+#~ msgstr "Şarkı mesajı"
+
+#~ msgid "Subsong selection"
+#~ msgstr "Arkayüz bölümü"
+
+#~ msgid "Order: "
+#~ msgstr "Sıra: "
+
+#~ msgid "Pattern: "
+#~ msgstr "Örnek: "
+
+#~ msgid "Row: "
+#~ msgstr "Satır: "
+
+#~ msgid "Speed: "
+#~ msgstr "Hız: "
+
+#~ msgid "Timer: "
+#~ msgstr "Sayaç: "
+
+#~ msgid "About XMMS Alarm"
+#~ msgstr "XMMS Alarm Hakkında"
+
+#~ 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 ""
+#~ "Audacious'un belli bir zamanda çalmaya başlaması\n"
+#~ "için bir XMMS eklentisi.\n"
+#~ "\n"
+#~ "Şikayetleriniz için:\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 "Bu sizin uyandırma çağrınız."
+
+#~ msgid "Select Playlist"
+#~ msgstr "Parça Listesini Seç"
+
+#~ msgid "Sorry"
+#~ msgstr "Üzgünüm"
+
+#~ msgid "Warning"
+#~ msgstr "Uyarı"
+
+#~ 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 ""
+#~ "Güvenlik nedenlerinden dolayı, \"sessiz\" zaman en az 10 saniye ve yavaş "
+#~ "geçiş zamanından da en az 65 saniye daha uzun olmalıdır."
+
+#~ msgid "Oh Well"
+#~ msgstr "Oh Peki"
+
+#~ msgid "Alarm Settings"
+#~ msgstr "Alarm Ayarları"
+
+#~ msgid "Time"
+#~ msgstr "Zaman"
+
+#~ msgid "hours"
+#~ msgstr "saat"
+
+#~ msgid "h"
+#~ msgstr "s"
+
+#~ msgid "minutes"
+#~ msgstr "dakika"
+
+#~ msgid "Quiet after:"
+#~ msgstr "Sonra çık:"
+
+#~ msgid "Alarm at (default):"
+#~ msgstr "Alarmı çal (öntanımlı):"
+
+#~ msgid "Choose the days for the alarm to come on"
+#~ msgstr "Alarmın çalacağı günleri seçiniz"
+
+#~ msgid "Day"
+#~ msgstr "Gün"
+
+#~ msgid "Tuesday"
+#~ msgstr "Salı"
+
+#~ msgid "Wednesday"
+#~ msgstr "Çarşamba"
+
+#~ msgid "Thursday"
+#~ msgstr "Perşembe"
+
+#~ msgid "Friday"
+#~ msgstr "Cuma"
+
+#~ msgid "Saturday"
+#~ msgstr "Cumartesi"
+
+#~ msgid "Sunday"
+#~ msgstr "Pazar"
+
+#~ msgid "Monday"
+#~ msgstr "Pazartesi"
+
+#~ msgid "Days"
+#~ msgstr "Günler"
+
+#~ msgid "Fading"
+#~ msgstr "Yavaş geçiş"
+
+#~ msgid "Volume"
+#~ msgstr "Ses"
+
+#~ msgid "Current"
+#~ msgstr "Güncel"
+
+#~ msgid "reset to current output volume"
+#~ msgstr "güncel çıktı sesine dön"
+
+#~ msgid "Start at"
+#~ msgstr "Başlat"
+
+#~ msgid "%"
+#~ msgstr "%"
+
+#~ msgid "Final"
+#~ msgstr "Sonlandır"
+
+#~ msgid "Additional Command"
+#~ msgstr "Ek Komutlar"
+
+#~ msgid "enable"
+#~ msgstr "etkinleştir"
+
+#~ msgid "Playlist (optional)"
+#~ msgstr "Parça listesi (seçmeli)"
+
+#~ msgid "Browse..."
+#~ msgstr "Gözat..."
+
+#~ msgid "Reminder"
+#~ msgstr "Hatırlatıcı"
+
+#~ msgid "Use reminder"
+#~ msgstr "Hatırlatıcıyı kullan"
+
+#~ msgid "What do these options mean?"
+#~ msgstr "Bu seçenekler ne anlama geliyor?"
+
+#~ 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"
+#~ "Zaman\n"
+#~ " Alarmı çal: \n"
+#~ " Alarmın çalma zamanı.\n"
+#~ "\n"
+#~ " Sonra çık: \n"
+#~ " Belirtilen süreden sonra alarmı kapat.\n"
+#~ " (eğer uyandırma penceresi kapatılmamışsa)\n"
+#~ "\n"
+#~ "\n"
+#~ "Günler\n"
+#~ " Gün:\n"
+#~ " Alarmın etkin olacağı günleri seçin.\n"
+#~ "\n"
+#~ " Zaman:\n"
+#~ " Her bir gün için alarm zamanını seçin,\n"
+#~ " veya önanımlı zamanı kullanmak için\n"
+#~ " değiştirme düğmesini seçin.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ses\n"
+#~ " Yavaş geçiş: \n"
+#~ " Belirtilen sürede sesi istenen ses seviyesine\n"
+#~ " çıkarır.\n"
+#~ "\n"
+#~ " Başlat: \n"
+#~ " Bu ses seviyesinden sesi yükseltmeye başlar.\n"
+#~ "\n"
+#~ " Sonlandır: \n"
+#~ " Yükseltmenin durdurulacağu ses düzeyi. Eğer\n"
+#~ " yavaş geçiş süresi 0 ise, sesi bu düzeye ayarlar\n"
+#~ " ve çalmaya başlar.\n"
+#~ "\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ " El Lomutlar:\n"
+#~ " Alarm zamanında bu komutu çalıştırır.\n"
+#~ "\n"
+#~ " Parça listesi: \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 "Your reminder for today is.."
+#~ msgstr "Bugün için hatırlatıcınız.."
+
+#~ msgid "Thankyou"
+#~ msgstr "Teşekkürler"
+
+#, fuzzy
+#~ msgid "Available Headsets"
+#~ msgstr "Kullanılabilir arkayüzler"
+
+#, fuzzy
+#~ msgid "Current Headset"
+#~ msgstr "Güncel"
+
+#, fuzzy
+#~ msgid "_Connect"
+#~ msgstr "Bağlantı modu:"
+
+#, fuzzy
+#~ msgid "Class"
+#~ msgstr "Klasik"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "Aygıt Adresi"
+
+#, fuzzy
+#~ msgid "Rescan"
+#~ msgstr "Dikdörtgen"
+
+#~ msgid "Playback->Play"
+#~ msgstr "Çal"
+
+#~ msgid "Playback->Stop"
+#~ msgstr "Dur"
+
+#~ msgid "Playback->Pause"
+#~ msgstr "Durakla"
+
+#~ msgid "Playback->Prev"
+#~ msgstr "Geri Sar"
+
+#~ msgid "Playback->Next"
+#~ msgstr "Playback->İleri"
+
+#~ msgid "Playback->Eject"
+#~ msgstr "Playback->Çıkart"
+
+#~ msgid "Playlist->Repeat"
+#~ msgstr "Tekrarla"
+
+#~ msgid "Playlist->Shuffle"
+#~ msgstr "Rastgele"
+
+#~ msgid "Volume->Up_5"
+#~ msgstr "Sesi 5 Birim Artır"
+
+#~ msgid "Volume->Down_5"
+#~ msgstr "Sesi 5 Birim Azalt"
+
+#~ msgid "Volume->Up_10"
+#~ msgstr "Sesi 10 Birim Artır"
+
+#~ msgid "Volume->Down_10"
+#~ msgstr "Sesi 10 Birim Azalt"
+
+#~ msgid "Volume->Mute"
+#~ msgstr "Sessiz"
+
+#~ msgid "Window->Main"
+#~ msgstr "Ana Ekran"
+
+#~ msgid "Window->Playlist"
+#~ msgstr "Çalma Listesi"
+
+#~ msgid "Window->Equalizer"
+#~ msgstr "Ekolayzır"
+
+#~ msgid "Window->JumpToFile"
+#~ msgstr "Dosya Çal"
+
+#~ 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 ""
+#~ "event-device-plugin: %s diye belirtilen dosya açılamıyor.\n"
+#~ "Cihaz durduruldu. Dosya yolunun, adının doğruluğunu\n"
+#~ "ve erişim haklarınızı kontrol edin.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to create a io_channel for device file %s ,"
+#~ "skipping this device\n"
+#~ msgstr ""
+#~ "event-device-plugin: %s aygıt dosyası okunurken giriş-çıkış hatası\n"
+#~ "meydana geldi. Aygıt okuma işlemi durduruldu.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to open /proc/bus/input/devices , automatic "
+#~ "detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: /proc/bus/input/devices açılamıyor.\n"
+#~ "Otomatik başlatma yapılamıyor.\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 ""
+#~ "event-device-plugin: /proc/bus/input/devices için girdi-çıktı hatası, "
+#~ "otomatik tanımlama yapılamıyor.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: an error occurred while reading /proc/bus/input/"
+#~ "devices , automatic detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: /proc/bus/input/devices okunurken hata oluştu, "
+#~ "otomatik tanımlama çalışmayacak.\n"
+
+#~ msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: /dev/input içerisinde aygıt %s bulunamadı, es "
+#~ "geçiliyor.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to load config file %s , default settings "
+#~ "will be used.\n"
+#~ msgstr ""
+#~ "event-device-plugin: ayar dosyası %s yüklenemiyor, öntanımlı ayarlar "
+#~ "kullanılacak.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: incomplete information in config file for device \"%s"
+#~ "\" , skipping.\n"
+#~ msgstr ""
+#~ "event-device-plugin: ayar dosyasında \"%s\" aygıtı için yetersiz bilgi "
+#~ "bulundu, es geçiliyor.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_active value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: ayarlar, \"%s\" aygıtının çalıştığı bilgisine "
+#~ "ulaşılamadı, es geçiliyor.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to access local directory %s , settings will "
+#~ "not be saved.\n"
+#~ msgstr ""
+#~ "event-device-plugin: yerel dizin %s erişilemiyor, ayarlar "
+#~ "kaydedilmeyecek.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get filename value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugn: ayarlar, aygıt \"%s\" için filename değeri "
+#~ "alınamıyor, es geçiliyor.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get phys value for device "
+#~ "\"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: ayarlar, aygıt \"%s\" için phys değeri alınamıyor, "
+#~ "es geçiliyor.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_custom value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: ayarlar, aygıt \"%s\" için is_custom değeri "
+#~ "alınamıyor, es geçiliyor.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unexpected value for device \"%s\", "
+#~ "skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: ayarlar, aygıt \"%s\" için beklenmeyen bir değer "
+#~ "alındı, es geçiliyor.\n"
+
+#, fuzzy
+#~ msgid "Detected"
+#~ msgstr "Şarkı sonunu tespit et"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "custom "
+
+#, fuzzy
+#~ msgid "Not Detected"
+#~ msgstr "Biçim seçimi"
+
+#~ msgid "Information"
+#~ msgstr "Bilgi"
+
+#~ msgid ""
+#~ "Cannot open bindings window for a not-detected device.\n"
+#~ "Ensure that the device has been correctly plugged in."
+#~ msgstr ""
+#~ "Tanınmamış bir aygıt için ilişkilendirme penceresi açılamıyor.\n"
+#~ "Aygıtın düzgün bir şekilde sisteme takılı olduğundan emin olun."
+
+#~ msgid ""
+#~ "Unable to open selected device.\n"
+#~ "Please check read permissions on device file."
+#~ msgstr ""
+#~ "Seçili aygıt açılamıyor.\n"
+#~ "Aygıt dosyasına okuma hakkınız olduğundan emin olun."
+
+#~ msgid "EvDev-Plug - Add custom device"
+#~ msgstr "EvDev-Plug - Özel aygıt ekle"
+
+#~ 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 otomatik olarak sisteminizde olay üreten aygıtları tanımaya\n"
+#~ "ve hakkında bilgi toplamaya çalışır.\n"
+#~ "Yine de otomatik tanıma başarısız olursa ya da sizin standart dışında bir "
+#~ "yerde\n"
+#~ "olay üreten bir aygıtınız varsa (öntanımlı olarak /dev/input/ altında "
+#~ "aranırlar)\n"
+#~ "elle aygıt adını ve aygıt dosyasını tanımlayarak özel bir aygıt "
+#~ "tanımlamak\n"
+#~ "isteyebilirsiniz."
+
+#~ msgid "Device name:"
+#~ msgstr "Aygıt ismi:"
+
+#~ msgid "Device file:"
+#~ msgstr "Aygıt dosyası:"
+
+#, fuzzy
+#~ msgid "(custom)"
+#~ msgstr "custom "
+
+#~ msgid ""
+#~ "Please specify both name and filename.\n"
+#~ "Filename must be specified with absolute path."
+#~ msgstr ""
+#~ "Lütfen hem isim hem de dosya ismi belirleyiniz.\n"
+#~ "Dosya ismi tam dizin bilgisi ile belirlenmelidir."
+
+#~ msgid ""
+#~ "Do you want to remove the existing configuration for selected device?\n"
+#~ msgstr ""
+#~ "Seçilen aygıt için mevcut olan ayarları kaldırmak istiyor musunuz?\n"
+
+#~ msgid "Do you want to remove the selected custom device?\n"
+#~ msgstr "Seçili olan özel aygıtı kaldırmak istiyor musunuz?\n"
+
+#~ msgid "EvDev-Plug - Configuration"
+#~ msgstr "EvDev-Plug - Yapılandırması"
+
+#~ msgid "Active"
+#~ msgstr "Etkin"
+
+#~ msgid "Status"
+#~ msgstr "Durum"
+
+#~ msgid "Device Name"
+#~ msgstr "Aygıt İsmi"
+
+#~ msgid "Device File"
+#~ msgstr "Aygıt Dosyası"
+
+#~ msgid "Device Address"
+#~ msgstr "Aygıt Adresi"
+
+#~ msgid "_Bindings"
+#~ msgstr "_Bağlantılar"
+
+#~ 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 ""
+#~ "Bağlamak için aygıtınızda bir tuşa basınız;\n"
+#~ "Beş saniye içerisinde herhangi bir tuşa basılmazsa\n"
+#~ "bu pencere bağlama işlemi yapmadan kapanacaktır."
+
+#~ 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 ""
+#~ "Bu girdi olayı önceden atanmış.\n"
+#~ "\n"
+#~ "Aynı girdi olayına birden fazla eylem atanamaz (ama aynı eylem birden "
+#~ "fazla olaya atanabilir)."
+
+#~ msgid "EvDev-Plug - Bindings Configuration"
+#~ msgstr "EvDev-Plug - Bağlayıcı Yapılandırması"
+
+#~ msgid "Name: "
+#~ msgstr "İsim: "
+
+#~ msgid "Filename: "
+#~ msgstr "Dosya ismi: "
+
+#~ msgid "Phys.Address: "
+#~ msgstr "Fiziksel Adres: "
+
+#~ msgid "EvDev-Plug - about"
+#~ msgstr "EvDev-Plug hakkında"
+
+#~ 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"
+#~ "olay aygıtları ile oynatıcı uzakten yöneticisi\n"
+#~ "http://www.develia.org/projects.php?p=audacious#evdevplug\n"
+#~ "\n"
+#~ "Giacomo Lozito tarafından yazılmıştır\n"
+
+#~ msgid "This LADSPA plugin has no user controls"
+#~ msgstr "Bu LADSPA eklentisi kullanıcı ayarı içermiyor"
+
+#~ msgid "Name"
+#~ msgstr "İsim"
+
+#~ msgid "UID"
+#~ msgstr "UID"
+
+#~ msgid "Installed plugins"
+#~ msgstr "Yüklü eklentiler"
+
+#~ msgid "Running plugins"
+#~ msgstr "Çalışan eklentiler"
+
+#~ msgid "Add"
+#~ msgstr "Ekle"
+
+#~ msgid "Remove"
+#~ msgstr "Kaldır"
+
+#~ msgid "LADSPA Plugin Catalog"
+#~ msgstr "LADSPA Eklenti Kataloğu"
+
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "LIRC Audacious Eklentisi Hakkında"
+
+#~ msgid "LIRC Plugin "
+#~ msgstr "LIRC Eklentisi"
+
+#, fuzzy
+#~ 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"
+#~ "LIRC uzaktan kontrol sunucusunu kullanarak\n"
+#~ "Audacious'u kontrol etmenizi sağlayan bir eklenti\n"
+#~ "\n"
+#~ "Audacious kullanımı için uyarlandı - Tony Vroon <chainsaw@gentoo.org>\n"
+#~ "XMMS LIRC eklentisinden:\n"
+#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
+#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
+#~ "LIRC hakkında bilgi almak için:\n"
+#~ "http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html"
+
+#, fuzzy
+#~ msgid "LIRC plugin settings"
+#~ msgstr "LIRC Eklentisi"
+
+#, fuzzy
+#~ msgid "Connection"
+#~ msgstr "Bağlantı modu:"
+
+#~ msgid "%s: could not init LIRC support\n"
+#~ msgstr "%s: LIRC desteği başlatılamadı\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: LIRC yapılandırma dosyası okunamadı\n"
+#~ "%s: lütfen LIRC belgelerini okuyun\n"
+#~ "%s: uygun yapılandırma dosyası nasıl oluşturulur\n"
+
+#~ msgid "%s: unknown command \"%s\"\n"
+#~ msgstr "%s: bilinmeyen komut \"%s\"\n"
+
+#~ msgid "%s: disconnected from LIRC\n"
+#~ msgstr "%s: LIRC bağlantısı kesildi\n"
+
+#~ msgid "ModPlug Configuration"
+#~ msgstr "ModPlug Yapılandırması"
+
+#~ msgid "16 bit"
+#~ msgstr "16 bit"
+
+#~ msgid "8 bit"
+#~ msgstr "8 bit"
+
+#~ msgid "Mono (downmix)"
+#~ msgstr "Mono (aşağıkarıştırma)"
+
+#~ msgid "Nearest (fastest)"
+#~ msgstr "En yakın (en hızlı)"
+
+#~ msgid "Linear (fast)"
+#~ msgstr "Doğrusal (hızlı)"
+
+#~ msgid "Spline (good quality)"
+#~ msgstr "Spline (iyi kalite)"
+
+#~ msgid "8-tap Fir (extremely high quality)"
+#~ msgstr "8-tap FIR (fazla iyi kalite)"
+
+#, fuzzy
+#~ msgid "96 kHz"
+#~ msgstr "44 kHz"
+
+#, fuzzy
+#~ msgid "48 kHz"
+#~ msgstr "44 kHz"
+
+#~ msgid "44 kHz"
+#~ msgstr "44 kHz"
+
+#~ msgid "22 kHz"
+#~ msgstr "22 kHz"
+
+#~ msgid "Sampling Rate"
+#~ msgstr "Örnekleme Oranı"
+
+#~ msgid "Enable"
+#~ msgstr "Etkinleştir"
+
+#~ msgid "Depth"
+#~ msgstr "Derinlik"
+
+#~ msgid "Delay"
+#~ msgstr "Gecikme"
+
+#~ msgid "Reverb"
+#~ msgstr "Derinlik"
+
+#~ msgid "Amount"
+#~ msgstr "Miktar"
+
+#~ msgid "Range"
+#~ msgstr "Aralık"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Bass Güçlendirme"
+
+#~ msgid ""
+#~ "Note: Setting the preamp\n"
+#~ "too high may cause clipping\n"
+#~ "(annoying clicks and pops)!"
+#~ msgstr ""
+#~ "Not: Preamp değerini\n"
+#~ "yüksek ayarlamak sesde\n"
+#~ "cızırtı ve patlamalara sebep olur!"
+
+#~ msgid "Effects"
+#~ msgstr "Efektler"
+
+#~ msgid "Use Filename as Song Title"
+#~ msgstr "Şarkı Adı için Dosya Adı kullan"
+
+#~ msgid "Fast Playlist Info"
+#~ msgstr "Hızlı Parça Listesi Bilgisi"
+
+#~ msgid "Noise Reduction"
+#~ msgstr "Gürültü Azaltma"
+
+#~ msgid "Play Amiga MOD"
+#~ msgstr "Amiga MOD Oynat"
+
+#~ msgid "Don't loop"
+#~ msgstr "Tekrarlama yapma"
+
+#~ msgid "Loop"
+#~ msgstr "Tekrar"
+
+#~ msgid "time(s)"
+#~ msgstr "süre(ler)"
+
+#~ msgid "Loop forever"
+#~ msgstr "Sonsuz kere tekrarla"
+
+#~ msgid "Looping"
+#~ msgstr "Tekrarlama"
+
+#~ msgid "MOD Info"
+#~ msgstr "MOD Bilgisi"
+
+#~ msgid ""
+#~ "Filename:\n"
+#~ "Title:\n"
+#~ "Type:\n"
+#~ "Length:\n"
+#~ "Speed:\n"
+#~ "Tempo:\n"
+#~ "Samples:\n"
+#~ "Instruments:\n"
+#~ "Patterns:\n"
+#~ "Channels:"
+#~ msgstr ""
+#~ "Dosya adı:\n"
+#~ "Başlık:\n"
+#~ "Tip:\n"
+#~ "Uzunluk:\n"
+#~ "Hız:\n"
+#~ "Tempo:\n"
+#~ "Örnekler:\n"
+#~ "Enstrümanlar:\n"
+#~ "Paternler:\n"
+#~ "Kanallar:"
+
+#~ msgid ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+#~ msgstr ""
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---\n"
+#~ "---"
+
+#~ msgid "Samples"
+#~ msgstr "Örnekler"
+
+#~ msgid "Instruments"
+#~ msgstr "Enstrumanlar"
+
+#~ msgid "Message"
+#~ msgstr "Mesaj"
+
+#~ msgid "Modplug Input Plugin for Audacious ver"
+#~ msgstr "Modplug Girdi Eklentisi Audacious sürüm"
+
+#, fuzzy
+#~ 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 ses motoru Olivier Lapicque tarafından yazılmıştır.\n"
+#~ "Modplug için XMMS arayüzü Kenton Varda.\n"
+#~ "(c)2000 Olivier Lapicque ve Kenton Varda.\n"
+#~ "Güncelleme ve bakım Konstanty Bialkowski.\n"
+#~ "BMP uyarlaması Theofilos Intzoglou."
+
+#~ msgid "About Modplug"
+#~ msgstr "Modplug Hakkında"
+
+#, fuzzy
+#~ msgid "Blue"
+#~ msgstr "Blues"
+
+#, fuzzy
+#~ msgid "Enable 'GUI Scaling'"
+#~ msgstr "Ses örneklemesini etkinleştir"
+
+#~ msgid "Spectrum Analyzer"
+#~ msgstr "Spektrum Analizi"
+
+#, fuzzy
+#~ msgid "Search:"
+#~ msgstr "Yıl:"
+
+#, fuzzy
+#~ msgid "Stream name"
+#~ msgstr "Enstruman adı"
+
+#, fuzzy
+#~ msgid "Now playing"
+#~ msgstr "Parça Listesini Seç"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Etiketi kaldır"
+
+#, fuzzy
+#~ msgid "About Stream Browser"
+#~ msgstr "OSS Sürücüsü Hakkında"
+
+#, fuzzy
+#~ 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) 2007, Calin Crisan <ccrisan@gmail.com> ve The Audacious "
+#~ "Takımı.\n"
+#~ "\n"
+#~ "libcdio geliştiricilerine <http://www.gnu.org/software/libcdio/>\n"
+#~ "\t ve libcddb geliştiricilerine <http://libcddb.sourceforge.net/> "
+#~ "teşekkürler.\n"
+#~ "\n"
+#~ "Ayrıca Tony Vroon'a beni yönlendirdiği ve danışmanım olduğu için "
+#~ "teşekkürler.\n"
+#~ "\n"
+#~ "Bu bir Google Summer of Code 2007 projesidir."
+
+#, fuzzy
+#~ msgid "minutes:seconds"
+#~ msgstr "dakika"
+
+#, fuzzy
+#~ msgid "Track length:"
+#~ msgstr "Parça ses yüksekliği:"
+
+#, fuzzy
+#~ msgid "Show/hide statusbar"
+#~ msgstr "Parça Listesini Seç"
+
+#, fuzzy
+#~ msgid "Import Playlist ..."
+#~ msgstr "Hızlı Parça Listesi Bilgisi"
+
+#, fuzzy
+#~ msgid "Export Playlist ..."
+#~ msgstr "Hızlı Parça Listesi Bilgisi"
+
+#, fuzzy
+#~ msgid "Refresh Selected"
+#~ msgstr "Biçim seçimi"
+
+#, fuzzy
+#~ msgid "Edit the playlist title."
+#~ msgstr "Parça listesine alttınılar ekle"
+
+#, fuzzy
+#~ msgid "By Formatted Title"
+#~ msgstr "Başlık"
+
+#, fuzzy
+#~ msgid "Components"
+#~ msgstr "Yorum:"
+
+#, fuzzy
+#~ msgid "Save as Static Playlist"
+#~ msgstr "Parça Listesini Seç"
+
+#, fuzzy
+#~ msgid "Load Playlist"
+#~ msgstr "Hızlı Parça Listesi Bilgisi"
+
+#, fuzzy
+#~ msgid "Save Playlist"
+#~ msgstr "Parça Listesini Seç"
+
 #~ msgid ""
 #~ "* Select ALSA output ports *\n"
 #~ "MIDI events will be sent to the ports selected here. In example, if your "
@@ -6500,10 +6168,6 @@
 #~ msgstr "Hakkında"
 
 #, fuzzy
-#~ msgid "Output plugin"
-#~ msgstr "Çıktı eklentisi hatası\n"
-
-#, fuzzy
 #~ msgid "Throttle Output"
 #~ msgstr "aRts Çıkışı Hakkında"
 
@@ -6624,10 +6288,6 @@
 #~ msgstr "Varsayılan (%s)"
 
 #, fuzzy
-#~ msgid "_Rename"
-#~ msgstr "Dosya adı"
-
-#, fuzzy
 #~ msgid "About Icecast-Plugin"
 #~ msgstr "Yankı (Eko) Eklentisi Hakkında"

audacious-plugins-2.5.3.tar.gz/po/zh_CN.po -> audacious-plugins-3.0.tar.gz/po/zh_CN.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Audacious-plugins 2.4\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-05-19 10:53-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2011-04-11 21:58+0800\n"
 "Last-Translator: Chasye <chasye@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/aac/libmp4.c:268
+#: src/aac/libmp4.c:256
 #, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
@@ -28,598 +28,47 @@
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM解码器 (c) Nero AG, www.nero.com\n"
 "版权所有 (c) 2005-2006 Audacious小组"
 
-#: src/aac/libmp4.c:273
+#: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "关于MP4 ACC解码插件"
 
-#: src/adplug/adplug-xmms.cc:151
-msgid "About "
-msgstr "关于"
-
-#: src/adplug/adplug-xmms.cc:155
-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"
-"版权所有 (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"
-"详情请登录http://www.gnu.org/licenses/lgpl.html.\n"
-"\n"
-"此插件基于AdPlug库, 版权所有 (C) Simon Peter, et al.\n"
-"当前AdPlug版本: "
-
-#: src/adplug/adplug-xmms.cc:232
-msgid "AdPlug :: Configuration"
-msgstr "AdPlug :: 设置"
-
-#: src/adplug/adplug-xmms.cc:241 src/adplug/adplug-xmms.cc:504
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:135
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:129
-msgid "Ok"
-msgstr "确定"
-
-#: src/adplug/adplug-xmms.cc:251 src/alarm/interface.c:1398
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:142
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153
-#: src/modplug/gui/interface.cxx:715 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:136
-msgid "Cancel"
-msgstr "取消"
-
-#: src/adplug/adplug-xmms.cc:267 src/console/configure.c:155
-#: src/modplug/gui/interface.cxx:629 src/modplug/gui/interface.cxx:888
-msgid "General"
-msgstr "常规"
-
-#: src/adplug/adplug-xmms.cc:279
-msgid "Sound quality"
-msgstr "音质"
-
-#: src/adplug/adplug-xmms.cc:284 src/modplug/gui/interface.cxx:188
-msgid "Resolution"
-msgstr "分辨率"
-
-#: src/adplug/adplug-xmms.cc:286
-msgid "8bit"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:291
-msgid "16bit"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:299 src/modplug/gui/interface.cxx:219
-msgid "Channels"
-msgstr "声道"
-
-#: src/adplug/adplug-xmms.cc:301 src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:173 src/sid/xs_interface.c:301
-msgid "Mono"
-msgstr "单声道"
-
-#: src/adplug/adplug-xmms.cc:306 src/filewriter/mp3.c:39
-#: src/modplug/gui/interface.cxx:205 src/mpg123/mpg123.c:173
-#: src/sid/xs_interface.c:308
-msgid "Stereo"
-msgstr "立体音"
-
-#: src/adplug/adplug-xmms.cc:310
-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 ""
-"设置为立体音是不推荐的做法，除非你知道自己在做什么。此选项不会带来任何立体音"
-"效果（OPL2只能是单声道的），相反只会占用更多的CPU!"
-
-#: src/adplug/adplug-xmms.cc:318
-msgid "Frequency"
-msgstr "频率"
-
-#: src/adplug/adplug-xmms.cc:354 src/adplug/adplug-xmms.cc:560
-#: src/console/configure.c:157 src/gtkui/ui_manager.c:67
-#: src/skins/ui_manager.c:167
-msgid "Playback"
-msgstr "回放"
-
-#: src/adplug/adplug-xmms.cc:358
-msgid "Detect songend"
-msgstr "检测歌曲结尾"
-
-#: src/adplug/adplug-xmms.cc:362
-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 ""
-"如果启用，XMMS将尝试测试歌曲的结尾，并在结束时，自动播放列表中的下一首歌"
-"曲。\n"
-"如果禁用，XMMS将因无法得知歌曲的结尾而不断重复播放同一首歌曲。"
-
-#: src/adplug/adplug-xmms.cc:373
-msgid "Formats"
-msgstr "格式"
-
-#: src/adplug/adplug-xmms.cc:380
-msgid "Format selection"
-msgstr "格式选择"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Format"
-msgstr "格式"
-
-#: src/adplug/adplug-xmms.cc:383
-msgid "Extension"
-msgstr "后缀"
-
-#: src/adplug/adplug-xmms.cc:423
-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 ""
-"被选中文件类型会被识别并被此插件播放。\n"
-"未选中的，则会被忽略并由其它插件播放"
-
-#: src/adplug/adplug-xmms.cc:511
-msgid "AdPlug :: File Info"
-msgstr "AdPlug :: 文件信息"
-
-#: src/adplug/adplug-xmms.cc:533 src/amidi-plug/i_configure-fluidsynth.c:345
-msgid "Filename"
-msgstr "文件名"
-
-#: src/adplug/adplug-xmms.cc:537 src/skins/ui_playlist.c:390
-msgid "Title: "
-msgstr "标题："
-
-#: src/adplug/adplug-xmms.cc:538
-msgid "Author: "
-msgstr "作者："
-
-#: src/adplug/adplug-xmms.cc:539
-msgid "File Type: "
-msgstr "文件类型："
-
-#: src/adplug/adplug-xmms.cc:540
-msgid "Subsongs: "
-msgstr "子歌曲："
-
-#: src/adplug/adplug-xmms.cc:541
-msgid "Instruments: "
-msgstr "乐器："
-
-#: src/adplug/adplug-xmms.cc:546
-msgid "Orders: "
-msgstr "顺序："
-
-#: src/adplug/adplug-xmms.cc:547
-msgid "Patterns: "
-msgstr "格调："
-
-#: src/adplug/adplug-xmms.cc:551
-msgid "Song"
-msgstr "歌曲"
-
-#: src/adplug/adplug-xmms.cc:577
-msgid "Instrument name"
-msgstr "乐器名"
-
-#: src/adplug/adplug-xmms.cc:619
-msgid "Song message"
-msgstr "歌曲信息"
-
-#: src/adplug/adplug-xmms.cc:642
-msgid "Subsong selection"
-msgstr "子歌曲选项"
-
-#: src/adplug/adplug-xmms.cc:696
-msgid "Order: "
-msgstr "顺序："
-
-#: src/adplug/adplug-xmms.cc:697
-msgid "Pattern: "
-msgstr "格调："
-
-#: src/adplug/adplug-xmms.cc:699
-msgid "Row: "
-msgstr "行："
-
-#: src/adplug/adplug-xmms.cc:700
-msgid "Speed: "
-msgstr "速度："
-
-#: src/adplug/adplug-xmms.cc:701
-msgid "Timer: "
-msgstr "计时："
-
-#: src/adplug/adplug-xmms.cc:702 src/console/configure.c:235
-#: src/sid/xs_interface.c:354
-msgid "Hz"
-msgstr ""
-
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "关于XMMS闹钟"
-
-#: src/alarm/interface.c:47
-msgid "XMMS Alarm"
-msgstr "XMMS闹钟"
-
-#: src/alarm/interface.c:56
-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:71 src/bluetooth/scan_gui.c:149 src/lirc/about.c:115
-#: src/modplug/gui/interface.cxx:972 src/sid/xs_about.c:214
-#: src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "关闭"
-
-#: src/alarm/interface.c:101
-msgid "Alarm"
-msgstr "闹钟"
-
-#: src/alarm/interface.c:109
-msgid "This is your wakeup call."
-msgstr "此为起床闹钟"
-
-#: src/alarm/interface.c:124 src/alarm/interface.c:1389
-#: src/modplug/gui/interface.cxx:703 src/sid/xs_config.c:323
-msgid "OK"
-msgstr "确定"
-
-#: src/alarm/interface.c:152
-msgid "Select Playlist"
-msgstr "选择播放列表"
-
-#: src/alarm/interface.c:196
-msgid "Sorry"
-msgstr "抱歉"
-
-#: src/alarm/interface.c:204
-msgid "Warning"
-msgstr "警告"
-
-#: src/alarm/interface.c:213
-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:229
-msgid "Oh Well"
-msgstr "不错嘛"
-
-#: src/alarm/interface.c:388
-msgid "Alarm Settings"
-msgstr "闹钟设置"
-
-#: src/alarm/interface.c:404 src/alarm/interface.c:576
-#: src/alarm/interface.c:948
-msgid "Time"
-msgstr "时间"
-
-#: src/alarm/interface.c:445
-msgid "hours"
-msgstr "小时"
-
-#: src/alarm/interface.c:506
-msgid "h"
-msgstr "点"
-
-#: src/alarm/interface.c:536
-msgid "minutes"
-msgstr "分"
-
-#: src/alarm/interface.c:554
-msgid "Quiet after:"
-msgstr "静音时间："
-
-#: src/alarm/interface.c:564
-msgid "Alarm at (default):"
-msgstr "响闹钟(默认)："
-
-#: src/alarm/interface.c:584
-msgid "Choose the days for the alarm to come on"
-msgstr "选择响闹钟的日期"
-
-#: src/alarm/interface.c:612 src/alarm/interface.c:660
-#: src/alarm/interface.c:708 src/alarm/interface.c:756
-#: src/alarm/interface.c:804 src/alarm/interface.c:852
-#: src/alarm/interface.c:900 src/OSS/configure.c:162
-#: src/skins/ui_manager.c:445 src/skins/ui_manager.c:466
-msgid "Default"
-msgstr "默认"
-
-#: src/alarm/interface.c:938
-msgid "Day"
-msgstr "日期"
-
-#: src/alarm/interface.c:958
-msgid "Tuesday"
-msgstr "週二"
-
-#: src/alarm/interface.c:969
-msgid "Wednesday"
-msgstr "週三"
-
-#: src/alarm/interface.c:980
-msgid "Thursday"
-msgstr "週四"
-
-#: src/alarm/interface.c:991
-msgid "Friday"
-msgstr "週五"
-
-#: src/alarm/interface.c:1002
-msgid "Saturday"
-msgstr "週末"
-
-#: src/alarm/interface.c:1013
-msgid "Sunday"
-msgstr "週日"
-
-#: src/alarm/interface.c:1023
-msgid "Monday"
-msgstr "週一"
-
-#: src/alarm/interface.c:1034
-msgid "Days"
-msgstr "日期"
-
-#: src/alarm/interface.c:1050
-msgid "Fading"
-msgstr "渐退"
-
-#: src/alarm/interface.c:1087 src/sid/xs_interface.c:921
-#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "秒"
-
-#: src/alarm/interface.c:1095 src/alarm/interface.c:1211
-#: src/modplug/gui/interface.cxx:550
-msgid "Volume"
-msgstr "音量"
-
-#: src/alarm/interface.c:1121
-msgid "Current"
-msgstr "当前"
-
-#: src/alarm/interface.c:1128
-msgid "reset to current output volume"
-msgstr "重置当前输出音量"
-
-#: src/alarm/interface.c:1130
-msgid "Start at"
-msgstr "开始于"
-
-#: src/alarm/interface.c:1158 src/alarm/interface.c:1202
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:1174
-msgid "Final"
-msgstr "完成于"
-
-#: src/alarm/interface.c:1227
-msgid "Additional Command"
-msgstr "附加指令"
-
-#: src/alarm/interface.c:1253
-msgid "enable"
-msgstr "启用"
-
-#: src/alarm/interface.c:1261
-msgid "Playlist (optional)"
-msgstr "播放列表(可选)"
-
-#: src/alarm/interface.c:1287
-msgid "Browse..."
-msgstr "浏览..."
-
-#: src/alarm/interface.c:1295 src/alarm/interface.c:1460
-msgid "Reminder"
-msgstr "提醒器"
-
-#: src/alarm/interface.c:1312
-msgid "Use reminder"
-msgstr "使用提醒器"
-
-#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:366
-msgid "Options"
-msgstr "选项"
-
-#: src/alarm/interface.c:1336
-msgid "What do these options mean?"
-msgstr "这些选项有什么用？"
-
-#: src/alarm/interface.c:1364
-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:1366 src/gtkui/ui_manager.c:186
-#: src/skins/ui_manager.c:377
-msgid "Help"
-msgstr "帮助"
-
-#: src/alarm/interface.c:1468
-msgid "Your reminder for today is.."
-msgstr "你今天的提醒器是.."
-
-#: src/alarm/interface.c:1493
-msgid "Thankyou"
-msgstr "谢谢"
-
-#: src/alsa/config.c:212
+#: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "默认PCM设备"
 
-#: src/alsa/config.c:237
+#: src/alsa/config.c:235
 msgid "Default mixer device"
 msgstr "默认混音设备"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:447
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA输出插件首选项"
 
-#: src/alsa/config.c:448
+#: src/alsa/config.c:454
 msgid "PCM device:"
 msgstr "PCM设备："
 
-#: src/alsa/config.c:450 src/OSS/configure.c:246
+#: src/alsa/config.c:456 src/OSS/configure.c:246
 msgid "Mixer device:"
 msgstr "混音设备"
 
-#: src/alsa/config.c:452
+#: src/alsa/config.c:458
 msgid "Mixer element:"
 msgstr "混音单元："
 
-#: src/alsa/config.c:455
+#: src/alsa/config.c:461
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:63
+#: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
 msgstr "关于ALSA输出插件"
 
-#: src/alsa/plugin.c:85
+#: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr "ALSA错误"
 
-#: src/amidi-plug/amidi-plug.c:338
+#: src/amidi-plug/amidi-plug.c:335
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -779,6 +228,10 @@
 msgid "SoundFont settings"
 msgstr "SoundFont设置"
 
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "文件名"
+
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
 msgstr "大小(bytes)"
@@ -881,8 +334,7 @@
 "backend"
 msgstr "TiMidity后端"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/bluetooth/gui.c:271
-#: src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
 msgid "Name:"
 msgstr "名称："
 
@@ -1053,119 +505,119 @@
 msgid "Triggers OSD when playback is unpaused."
 msgstr "恢复播放时触发OSD"
 
-#: src/aosd/aosd_ui.c:168
+#: src/aosd/aosd_ui.c:180
 msgid "Placement"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.c:202
+#: src/aosd/aosd_ui.c:219
 msgid "Relative X offset:"
 msgstr "X相对位移："
 
-#: src/aosd/aosd_ui.c:211
+#: src/aosd/aosd_ui.c:228
 msgid "Relative Y offset:"
 msgstr "Y相对位移："
 
-#: src/aosd/aosd_ui.c:220
+#: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
 msgstr "最大OSD宽度："
 
-#: src/aosd/aosd_ui.c:233
+#: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
 msgstr "多屏选项"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
 msgstr "OSD显示于："
 
-#: src/aosd/aosd_ui.c:239
+#: src/aosd/aosd_ui.c:265
 msgid "all monitors"
 msgstr "所有显示器"
 
-#: src/aosd/aosd_ui.c:242
+#: src/aosd/aosd_ui.c:268
 #, c-format
 msgid "monitor %i"
 msgstr "显示器%i"
 
-#: src/aosd/aosd_ui.c:295
+#: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
 msgstr "延时(ms)"
 
-#: src/aosd/aosd_ui.c:300
+#: src/aosd/aosd_ui.c:328
 msgid "Display:"
 msgstr "显示："
 
-#: src/aosd/aosd_ui.c:305
+#: src/aosd/aosd_ui.c:333
 msgid "Fade in:"
 msgstr "淡入："
 
-#: src/aosd/aosd_ui.c:310
+#: src/aosd/aosd_ui.c:338
 msgid "Fade out:"
 msgstr "淡出："
 
-#: src/aosd/aosd_ui.c:391
+#: src/aosd/aosd_ui.c:419
 msgid "Fonts"
 msgstr "字体"
 
-#: src/aosd/aosd_ui.c:399
+#: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
 msgstr "字体 %i："
 
-#: src/aosd/aosd_ui.c:416
+#: src/aosd/aosd_ui.c:444
 msgid "Shadow"
 msgstr "阴影"
 
-#: src/aosd/aosd_ui.c:451
+#: src/aosd/aosd_ui.c:479
 msgid "Internationalization"
 msgstr "国际化"
 
-#: src/aosd/aosd_ui.c:457
+#: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "禁用UTF-8转换(在aosd中)"
 
-#: src/aosd/aosd_ui.c:475
+#: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
 msgstr "选择主题文件"
 
-#: src/aosd/aosd_ui.c:586
+#: src/aosd/aosd_ui.c:614
 msgid "Render Style"
 msgstr "渲染风格"
 
-#: src/aosd/aosd_ui.c:602
+#: src/aosd/aosd_ui.c:630
 msgid "Colors"
 msgstr "颜色"
 
-#: src/aosd/aosd_ui.c:615
+#: src/aosd/aosd_ui.c:643
 #, c-format
 msgid "Color %i:"
 msgstr "颜色 %i："
 
-#: src/aosd/aosd_ui.c:635
+#: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
 msgstr "自定义主题"
 
-#: src/aosd/aosd_ui.c:641
+#: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
 msgstr "主题文件："
 
-#: src/aosd/aosd_ui.c:644 src/sid/xs_interface.c:1044
+#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
 #: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
 msgid "Browse"
 msgstr "浏览"
 
-#: src/aosd/aosd_ui.c:746
+#: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
 msgstr "启用触发器"
 
-#: src/aosd/aosd_ui.c:773
+#: src/aosd/aosd_ui.c:801
 msgid "Event"
 msgstr "事件"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
 msgstr "检测到混合管理器"
 
-#: src/aosd/aosd_ui.c:808
+#: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -1174,73 +626,73 @@
 "未检测到混合管理器；\n"
 "OSD无法正常工作，除非你激活混合管理器。"
 
-#: src/aosd/aosd_ui.c:816
+#: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
 msgstr "假透明无需混合管理支持"
 
-#: src/aosd/aosd_ui.c:854
+#: src/aosd/aosd_ui.c:882
 msgid "Transparency"
 msgstr "透明"
 
-#: src/aosd/aosd_ui.c:860
+#: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
 msgstr "假透明"
 
-#: src/aosd/aosd_ui.c:862
+#: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "真透明(需要X Composite扩展)"
 
-#: src/aosd/aosd_ui.c:904
+#: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
 msgstr "X Composite扩展未加载"
 
-#: src/aosd/aosd_ui.c:912
+#: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
 msgstr "X Composite扩展不可用"
 
-#: src/aosd/aosd_ui.c:931
+#: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1012
+#: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - 设置"
 
-#: src/aosd/aosd_ui.c:1033
+#: src/aosd/aosd_ui.c:1061
 msgid "Test"
 msgstr "测试"
 
-#: src/aosd/aosd_ui.c:1048
+#: src/aosd/aosd_ui.c:1076
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.c:1053
+#: src/aosd/aosd_ui.c:1081
 msgid "Animation"
 msgstr "动画"
 
-#: src/aosd/aosd_ui.c:1058
+#: src/aosd/aosd_ui.c:1086
 msgid "Text"
 msgstr "字体"
 
-#: src/aosd/aosd_ui.c:1063
+#: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
 msgstr "装饰器"
 
-#: src/aosd/aosd_ui.c:1068
+#: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
 msgstr "触发器"
 
-#: src/aosd/aosd_ui.c:1073 src/cdaudio-ng/configure.c:171
-#: src/modplug/gui/interface.cxx:689 src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "其它"
 
-#: src/aosd/aosd_ui.c:1110
+#: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
 msgstr "Audacious OSD - 关于"
 
-#: src/aosd/aosd_ui.c:1140
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1248,7 +700,7 @@
 "\n"
 "Audacious OSD "
 
-#: src/aosd/aosd_ui.c:1141
+#: src/aosd/aosd_ui.c:1169
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1269,132 +721,6 @@
 "作者：Evan Martin\n"
 "http://neugierig.org/software/ghosd/\n"
 
-#: src/bluetooth/agent.c:356 src/bluetooth/agent.c:397
-#, c-format
-msgid "Pairing request for '%s'"
-msgstr "正在为'%s'配对请求"
-
-#: src/bluetooth/agent.c:544
-#, c-format
-msgid "Authorization request for %s"
-msgstr "'%s'要求认证"
-
-#: src/bluetooth/agent.c:728
-#, c-format
-msgid "Created bonding with %s"
-msgstr "正在绑定%s"
-
-#: src/bluetooth/agent.c:756
-#, c-format
-msgid "Removed bonding with %s"
-msgstr "正在解除%s"
-
-#: src/bluetooth/agent.c:808
-msgid "Device has been switched off"
-msgstr "设备已关闭"
-
-#: src/bluetooth/agent.c:811
-msgid "Device has been made non-discoverable"
-msgstr "设备不可连接"
-
-#: src/bluetooth/agent.c:813
-msgid "Device has been made connectable"
-msgstr "设备可连接"
-
-#: src/bluetooth/agent.c:815
-msgid "Device has been made discoverable"
-msgstr "设备无法恢复"
-
-#: src/bluetooth/agent.c:817
-msgid "Device has been made limited discoverable"
-msgstr "设备部分可恢复"
-
-#: src/bluetooth/agent.c:819
-msgid "Device has been switched into pairing mode"
-msgstr "设备已切转配对模式"
-
-#: src/bluetooth/bluetooth.c:117
-msgid "Bluetooth headset support plugin"
-msgstr "蓝牙耳机支持插件"
-
-#: src/bluetooth/bluetooth.c:118
-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耳机支持\n"
-"版权所有 (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
-"GSoC 2008 Project - 非常感谢我的导师Tony Vroon及Audacious开发小组\n"
-" \n"
-"要使用AVRCP，你必需为内核加载uinput模块。\n"
-"耳机上的键将会被识别为一般的多媒体键，\n"
-"你可以通过Audacious全局热键插件或窗口管理器提供的工具进行配置。\n"
-
-#: src/bluetooth/gui.c:148
-msgid "Producer"
-msgstr "生产商"
-
-#: src/bluetooth/gui.c:221
-msgid "Available Headsets"
-msgstr "可用耳机"
-
-#: src/bluetooth/gui.c:224
-msgid "Current Headset"
-msgstr "当前耳机"
-
-#: src/bluetooth/gui.c:227
-msgid "_Refresh"
-msgstr "刷新(_R)"
-
-#: src/bluetooth/gui.c:231
-msgid "_Connect"
-msgstr "连接(_C)"
-
-#: src/bluetooth/gui.c:237
-msgid "_Close"
-msgstr "关闭(_C)"
-
-#: src/bluetooth/gui.c:274
-msgid "Class"
-msgstr "类型"
-
-#: src/bluetooth/gui.c:278
-msgid "Address:"
-msgstr "地址："
-
-#: src/bluetooth/scan_gui.c:69
-msgid "Bonding finish!"
-msgstr "绑定完成！"
-
-#: src/bluetooth/scan_gui.c:76
-msgid "No devices found!"
-msgstr "未找到设备！"
-
-#: src/bluetooth/scan_gui.c:119
-msgid "Scanning..."
-msgstr "正在扫描..."
-
-#: src/bluetooth/scan_gui.c:122
-msgid "Pairing..."
-msgstr "正在配对..."
-
-#: src/bluetooth/scan_gui.c:138
-msgid "Rescan"
-msgstr "重新扫描"
-
-#: src/bluetooth/scan_gui.c:142 src/gtkui/ui_manager.c:69
-#: src/gtkui/ui_manager.c:70 src/hotkey/gui.c:72 src/skins/ui_manager.c:169
-#: src/skins/ui_manager.c:170
-msgid "Play"
-msgstr "播放"
-
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr ""
@@ -1403,11 +729,11 @@
 msgid "Options:"
 msgstr "选项"
 
-#: src/cdaudio-ng/cdaudio-ng.c:267
+#: src/cdaudio-ng/cdaudio-ng.c:264
 msgid "About Audio CD Plugin"
 msgstr "关于音频CD插件"
 
-#: src/cdaudio-ng/cdaudio-ng.c:268
+#: src/cdaudio-ng/cdaudio-ng.c:265
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1431,15 +757,15 @@
 "\n"
 "版权所有 (c) 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:561
+#: src/cdaudio-ng/cdaudio-ng.c:558
 msgid "Audio CD"
 msgstr "音频CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:916
+#: src/cdaudio-ng/cdaudio-ng.c:913
 msgid "Drive is empty."
 msgstr "设备为空"
 
-#: src/cdaudio-ng/cdaudio-ng.c:918
+#: src/cdaudio-ng/cdaudio-ng.c:915
 msgid "Unsupported disk type."
 msgstr "未支持光盘类型"
 
@@ -1487,11 +813,23 @@
 msgid "Override default device: "
 msgstr "覆蓋默设备："
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: 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
+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"
 
-#: src/cd-menu-items/cd-menu-items.c:35
+#: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "添加CD"
 
@@ -1515,6 +853,14 @@
 msgid "Game Console Music Decoder"
 msgstr "游戏机音乐解码器"
 
+#: src/console/configure.c:155
+msgid "General"
+msgstr "常规"
+
+#: src/console/configure.c:157 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "回放"
+
 #: src/console/configure.c:172
 msgid "Bass:"
 msgstr "低音："
@@ -1532,8 +878,7 @@
 msgid "Default song length:"
 msgstr "默认歌曲长度："
 
-#: src/console/configure.c:210 src/modplug/gui/interface.cxx:269
-#: src/sid/xs_interface.c:666
+#: src/console/configure.c:210 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "重采样"
 
@@ -1545,6 +890,10 @@
 msgid "Resampling rate:"
 msgstr "采样率："
 
+#: src/console/configure.c:235 src/sid/xs_interface.c:354
+msgid "Hz"
+msgstr ""
+
 #: src/console/configure.c:246
 msgid "SPC"
 msgstr ""
@@ -1613,16 +962,16 @@
 "\n"
 "你可以尝试使用”采样率转换器“使歌曲的采样一致。"
 
-#: src/crystalizer/crystalizer.c:112
+#: src/crystalizer/crystalizer.c:108
 msgid "Configure Crystalizer"
 msgstr "设置Crystalizer"
 
-#: src/crystalizer/crystalizer.c:114 src/stereo_plugin/stereo.c:108
+#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
 msgid "Effect intensity:"
 msgstr "效果强度："
 
-#: src/crystalizer/crystalizer.c:148 src/echo_plugin/gui.c:136
-#: src/modplug/gui/interface.cxx:709 src/stereo_plugin/stereo.c:142
+#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
+#: src/stereo_plugin/stereo.c:138
 msgid "Apply"
 msgstr "应用"
 
@@ -1663,350 +1012,20 @@
 msgid "Volume: (%)"
 msgstr "音量：(%)"
 
-#: src/evdev-plug/ed.c:60
-msgid "Playback->Play"
-msgstr "回放->播放"
-
-#: src/evdev-plug/ed.c:61
-msgid "Playback->Stop"
-msgstr "回放->停止"
-
-#: src/evdev-plug/ed.c:62
-msgid "Playback->Pause"
-msgstr "回放->暂停"
-
-#: src/evdev-plug/ed.c:63
-msgid "Playback->Prev"
-msgstr "回放->前一首"
-
-#: src/evdev-plug/ed.c:64
-msgid "Playback->Next"
-msgstr "回放->下一首"
-
-#: src/evdev-plug/ed.c:65
-msgid "Playback->Eject"
-msgstr "回放->弹出"
-
-#: src/evdev-plug/ed.c:67
-msgid "Playlist->Repeat"
-msgstr "列表->重复"
-
-#: src/evdev-plug/ed.c:68
-msgid "Playlist->Shuffle"
-msgstr "列表->随机"
-
-#: src/evdev-plug/ed.c:70
-msgid "Volume->Up_5"
-msgstr "音量->+5"
-
-#: src/evdev-plug/ed.c:71
-msgid "Volume->Down_5"
-msgstr "音量->-5"
-
-#: src/evdev-plug/ed.c:72
-msgid "Volume->Up_10"
-msgstr "音量->+10"
-
-#: src/evdev-plug/ed.c:73
-msgid "Volume->Down_10"
-msgstr "音量->-10"
-
-#: src/evdev-plug/ed.c:74
-msgid "Volume->Mute"
-msgstr "音量->静音"
-
-#: src/evdev-plug/ed.c:76
-msgid "Window->Main"
-msgstr "窗口->主界面"
-
-#: src/evdev-plug/ed.c:77
-msgid "Window->Playlist"
-msgstr "窗口->播放列表"
-
-#: src/evdev-plug/ed.c:78
-msgid "Window->Equalizer"
-msgstr "窗口->均衡器"
-
-#: src/evdev-plug/ed.c:79
-msgid "Window->JumpToFile"
-msgstr "窗口->跳到文件"
-
-#: src/evdev-plug/ed_internals.c:94
-#, c-format
-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 ""
-"event-device-plugin: 无法打开设备文件 %s，忽略此设备；请检查文件是否存在及你"
-"是否对其有读取权限\n"
-
-#: src/evdev-plug/ed_internals.c:103
-#, c-format
-msgid ""
-"event-device-plugin: unable to create a io_channel for device file %s ,"
-"skipping this device\n"
-msgstr "event-device-plugin: 无法为设备文件 %s 创建io_channel，忽略此设备\n"
-
-#: src/evdev-plug/ed_internals.c:342
-msgid ""
-"event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-"detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: 无法打开/proc/bus/input/devices, 自动检测event设备无法工"
-"作。\n"
-
-#: src/evdev-plug/ed_internals.c:351
-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 ""
-"event-device-plugin: 无法为/proc/bus/input/devices打开io_channel，自动检测"
-"event设备无法工作。\n"
-
-#: src/evdev-plug/ed_internals.c:361
-msgid ""
-"event-device-plugin: an error occurred while reading /proc/bus/input/"
-"devices , automatic detection of event devices won't work.\n"
-msgstr ""
-"event-device-plugin: 读取/proc/bus/input/devices时发生错误，自动检测event设备"
-"无法工作。\n"
-
-#: src/evdev-plug/ed_internals.c:424
-#, c-format
-msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-msgstr "event-device-plugin: /dev/input中不存在设备%s，已忽略。\n"
-
-#: src/evdev-plug/ed_internals.c:489 src/evdev-plug/ed_internals.c:583
-#, c-format
-msgid ""
-"event-device-plugin: unable to load config file %s , default settings will "
-"be used.\n"
-msgstr "event-device-plugin: 无法加载配置文件 %s , 将使用默认设置。\n"
-
-#: src/evdev-plug/ed_internals.c:535
-#, c-format
-msgid ""
-"event-device-plugin: incomplete information in config file for device \"%s"
-"\" , skipping.\n"
-msgstr "event-device-plugin: 设备\"%s\"在配置文件中的信息不完整，已忽略。\n"
-
-#: src/evdev-plug/ed_internals.c:604 src/evdev-plug/ed_internals.c:936
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_active value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: 配置文件，无法取得设备\"%s\" is_active的值, 已忽略.\n"
-
-#: src/evdev-plug/ed_internals.c:840
-#, c-format
-msgid ""
-"event-device-plugin: unable to access local directory %s , settings will not "
-"be saved.\n"
-msgstr "event-device-plugin: 无法访问目录 %s , 设置无法保存。\n"
-
-#: src/evdev-plug/ed_internals.c:890
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get filename value for device "
-"\"%s\", skipping it.\n"
-msgstr "event-device-plugin: 配置文件，无法取得设备\"%s\"的文件名, 已忽略。\n"
-
-#: src/evdev-plug/ed_internals.c:906
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get phys value for device \"%s"
-"\", skipping it.\n"
-msgstr "event-device-plugin: 配置文件, 无法取得设备\"%s\"的phys值，已忽略。\n"
-
-#: src/evdev-plug/ed_internals.c:922
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unable to get is_custom value for device "
-"\"%s\", skipping it.\n"
-msgstr ""
-"event-device-plugin: 配置文件，无法取得设备\"%s\" is_custon的值, 已忽略。\n"
-
-#: src/evdev-plug/ed_internals.c:946
-#, c-format
-msgid ""
-"event-device-plugin: configuration, unexpected value for device \"%s\", "
-"skipping it.\n"
-msgstr "event-device-plugin: 配置文件, 设备\"%s\"的值非法, 已忽略。\n"
-
-#: src/evdev-plug/ed_ui.c:212
-msgid "Detected"
-msgstr "检测到"
-
-#: src/evdev-plug/ed_ui.c:217
-msgid "Custom"
-msgstr "定制"
-
-#: src/evdev-plug/ed_ui.c:223
-msgid "Not Detected"
-msgstr "未检测到"
-
-#: src/evdev-plug/ed_ui.c:275 src/evdev-plug/ed_ui.c:411
-#: src/evdev-plug/ed_ui.c:874
-msgid "Information"
-msgstr "信息"
-
-#: src/evdev-plug/ed_ui.c:276
-msgid ""
-"Cannot open bindings window for a not-detected device.\n"
-"Ensure that the device has been correctly plugged in."
-msgstr ""
-"无法为未检测到的设备打开绑定窗口。\n"
-"请重新确认设备已正确连接。"
-
-#: src/evdev-plug/ed_ui.c:319 src/gtkui/ui_gtk.c:234
-msgid "Error"
-msgstr "错误"
-
-#: src/evdev-plug/ed_ui.c:320
-msgid ""
-"Unable to open selected device.\n"
-"Please check read permissions on device file."
-msgstr ""
-"无法打开选中的设备。\n"
-"请检查设备文件的权限。"
-
-#: src/evdev-plug/ed_ui.c:341
-msgid "EvDev-Plug - Add custom device"
-msgstr "EvDev-Plug - 添加自定义设备"
-
-#: src/evdev-plug/ed_ui.c:353
-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正在尝试自动检测和更新系统上可用的event设备信息\n"
-"如果自动检测失败，或者你的event设备不在标准位置（现在只在/dev/input/中搜"
-"索，\n"
-"你就要手动添加设备，并明确指定名称及设备文件。"
-
-#: src/evdev-plug/ed_ui.c:361
-msgid "Device name:"
-msgstr "设备名："
-
-#: src/evdev-plug/ed_ui.c:365
-msgid "Device file:"
-msgstr "设备文件："
-
-#: src/evdev-plug/ed_ui.c:404
-msgid "(custom)"
-msgstr "(定制)"
-
-#: src/evdev-plug/ed_ui.c:412
-msgid ""
-"Please specify both name and filename.\n"
-"Filename must be specified with absolute path."
-msgstr ""
-"请指定名称及文件名。\n"
-"文件名必需为绝对路径。"
-
-#: src/evdev-plug/ed_ui.c:447
-msgid "Do you want to remove the existing configuration for selected device?\n"
-msgstr "你要删除选中设备现有的配置文件吗？\n"
-
-#: src/evdev-plug/ed_ui.c:466
-msgid "Do you want to remove the selected custom device?\n"
-msgstr "你要删除选中的自定义设备吗？\n"
-
-#: src/evdev-plug/ed_ui.c:612
-msgid "EvDev-Plug - Configuration"
-msgstr "EvDev-Plug - 设置"
-
-#: src/evdev-plug/ed_ui.c:651
-msgid "Active"
-msgstr "已激活"
-
-#: src/evdev-plug/ed_ui.c:655
-msgid "Status"
-msgstr "状态"
-
-#: src/evdev-plug/ed_ui.c:664
-msgid "Device Name"
-msgstr "设备名"
-
-#: src/evdev-plug/ed_ui.c:668
-msgid "Device File"
-msgstr "设备文件"
-
-#: src/evdev-plug/ed_ui.c:672
-msgid "Device Address"
-msgstr "设备地址"
-
-#: src/evdev-plug/ed_ui.c:689
-msgid "_Bindings"
-msgstr "绑定(_B)"
-
-#: src/evdev-plug/ed_ui.c:838
-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 ""
-"请在设备上按下你要绑定的键；如果5秒内未无操作，窗口将自动关闭并取消绑定。"
-
-#: src/evdev-plug/ed_ui.c:875
-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 ""
-
-#: src/evdev-plug/ed_ui.c:1323
-msgid "EvDev-Plug - Bindings Configuration"
-msgstr "EvDev-Plug - 绑定设置"
-
-#: src/evdev-plug/ed_ui.c:1363
-msgid "Name: "
-msgstr "名称："
-
-#: src/evdev-plug/ed_ui.c:1372
-msgid "Filename: "
-msgstr "文件名："
-
-#: src/evdev-plug/ed_ui.c:1381
-msgid "Phys.Address: "
-msgstr "物理地址："
-
-#: src/evdev-plug/ed_ui.c:1460
-msgid "EvDev-Plug - about"
-msgstr "EvDev-Plug - 关于"
-
-#: src/evdev-plug/ed_ui.c:1491
-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"
-"event设备远程控制播放器\n"
-"http://www.develia.org/projects.php?p=audacious#evdevplug\n"
-"\n"
-"作者： Giacomo Lozito\n"
-
-#: src/ffaudio/ffaudio-core.c:765
-#, c-format
+#: src/ffaudio/ffaudio-core.c:763
+#, fuzzy, c-format
 msgid ""
 "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"
-"\n"
 "Audacious plugin by:\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"
 msgstr ""
 "基于FFmepg多媒体框架(http://www.ffmpeg.org/)\n"
 "的Audacious音频解码插件\n"
@@ -2018,15 +1037,15 @@
 " William Pitcock <nenolod@nenolod.net>,\n"
 " Matti Hämäläinen <ccr@tnsp.org>\n"
 
-#: src/ffaudio/ffaudio-core.c:778
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "关于FFaudio插件"
 
-#: src/filewriter/filewriter.c:158
+#: src/filewriter/filewriter.c:155
 msgid "About FileWriter-Plugin"
 msgstr "关于FileWriter插件"
 
-#: src/filewriter/filewriter.c:159
+#: src/filewriter/filewriter.c:156
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -2046,51 +1065,51 @@
 "USA."
 msgstr ""
 
-#: src/filewriter/filewriter.c:447
+#: src/filewriter/filewriter.c:450
 msgid "File Writer Configuration"
 msgstr "FileWriter设置"
 
-#: src/filewriter/filewriter.c:459
+#: src/filewriter/filewriter.c:462
 msgid "Output file format:"
 msgstr "输出文件格式："
 
-#: src/filewriter/filewriter.c:477 src/ladspa/ladspa.c:1078
+#: src/filewriter/filewriter.c:480
 msgid "Configure"
 msgstr "设置"
 
-#: src/filewriter/filewriter.c:492
+#: src/filewriter/filewriter.c:495
 msgid "Save into original directory"
 msgstr "保存到原来的目录"
 
-#: src/filewriter/filewriter.c:497
+#: src/filewriter/filewriter.c:500
 msgid "Save into custom directory"
 msgstr "保存到自定义目录"
 
-#: src/filewriter/filewriter.c:507
+#: src/filewriter/filewriter.c:510
 msgid "Output file folder:"
 msgstr "输出文件目录："
 
-#: src/filewriter/filewriter.c:511
+#: src/filewriter/filewriter.c:514
 msgid "Pick a folder"
 msgstr "选择目录"
 
-#: src/filewriter/filewriter.c:530
+#: src/filewriter/filewriter.c:533
 msgid "Get filename from:"
 msgstr "文件名来自："
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:536
 msgid "original file tags"
 msgstr "原始文件标签"
 
-#: src/filewriter/filewriter.c:539
+#: src/filewriter/filewriter.c:542
 msgid "original filename"
 msgstr "原始文件名"
 
-#: src/filewriter/filewriter.c:549
+#: src/filewriter/filewriter.c:552
 msgid "Don't strip file name extension"
 msgstr "保留文件后缀"
 
-#: src/filewriter/filewriter.c:564
+#: src/filewriter/filewriter.c:567
 msgid "Prepend track number to filename"
 msgstr "文件名前加上音轨号"
 
@@ -2102,6 +1121,14 @@
 msgid "Joint Stereo"
 msgstr "联合立体声"
 
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+msgid "Stereo"
+msgstr "立体音"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+msgid "Mono"
+msgstr "单声道"
+
 #: src/filewriter/mp3.c:724
 msgid "MP3 Configuration"
 msgstr "MP3设置"
@@ -2147,7 +1174,6 @@
 msgstr "错误保护"
 
 #: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
-#: src/modplug/gui/interface.cxx:320
 msgid "Quality"
 msgstr "质量"
 
@@ -2254,11 +1280,11 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:306
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "关于Gnome快捷键插件"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:307
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -2272,58 +1298,22 @@
 "版权所有 (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:273
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
 msgstr "打开文件"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
+#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 msgid "Add Files"
 msgstr "添加文件"
 
-#: src/gntui/gntui.c:271
+#: src/gntui/gntui.c:270
 msgid "Audacious2"
 msgstr "Audacious2"
 
-#: src/gntui/gntui.c:312
+#: src/gntui/gntui.c:311
 msgid "gnt interface"
 msgstr "gnt界面"
 
-#: src/gtkui/actions.c:254 src/skins/ui_main.c:820
-msgid "Can't jump to time when no track is being played.\n"
-msgstr "未开始插放时无法跳到时间。\n"
-
-#: src/gtkui/actions.c:269 src/gtkui/ui_manager.c:225
-#: src/gtkui/ui_manager.c:226 src/skins/ui_main.c:835
-#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
-msgid "Jump to Time"
-msgstr "跳到时间"
-
-#: src/gtkui/actions.c:286 src/skins/ui_main.c:856
-msgid "minutes:seconds"
-msgstr "分:秒"
-
-#: src/gtkui/actions.c:296 src/skins/ui_main.c:866
-msgid "Track length:"
-msgstr "音轨长度"
-
-#: src/gtkui/actions.c:539 src/skins/ui_playlist.c:648
-#, c-format
-msgid "Error writing playlist \"%s\": %s"
-msgstr "写入播放列表\"%s\"时发生错误: %s"
-
-#: src/gtkui/actions.c:554 src/skins/ui_playlist.c:667
-#, c-format
-msgid "Overwrite %s?"
-msgstr ""
-
-#: src/gtkui/actions.c:580 src/skins/ui_manager.c:216
-msgid "Export Playlist"
-msgstr "导出播放列表"
-
-#: src/gtkui/actions.c:656 src/skins/ui_manager.c:213
-msgid "Import Playlist"
-msgstr "导入播放列表"
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "序号"
@@ -2408,402 +1398,320 @@
 msgid "Disable"
 msgstr "禁用"
 
-#: src/gtkui/ui_gtk.c:80
-msgid "GTK Interface"
-msgstr "GTK界面"
-
-#: src/gtkui/ui_gtk.c:182 src/skins/ui_main.c:390
-#, c-format
-msgid "%s - Audacious"
-msgstr ""
-
-#: src/gtkui/ui_gtk.c:188 src/skins/ui_main.c:392 src/skins/ui_main.c:2172
-msgid "Audacious"
-msgstr ""
-
-#: src/gtkui/ui_manager.c:37 src/gtkui/ui_manager.c:38
-#: src/skins/ui_manager.c:55 src/skins/ui_manager.c:56
-msgid "Stop after Current Song"
-msgstr "完成当前歌曲后停止"
-
-#: src/gtkui/ui_manager.c:40 src/gtkui/ui_manager.c:41
-#: src/skins/ui_manager.c:61 src/skins/ui_manager.c:62
-msgid "Repeat"
-msgstr "重复"
-
-#: src/gtkui/ui_manager.c:43 src/gtkui/ui_manager.c:44
-#: src/skins/ui_manager.c:64 src/skins/ui_manager.c:65
-msgid "Shuffle"
-msgstr "随机"
+#: src/gtkui/menus.c:132
+#, fuzzy
+msgid "_Open Files ..."
+msgstr "打开文件..."
 
-#: src/gtkui/ui_manager.c:46 src/gtkui/ui_manager.c:47
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
-msgid "No Playlist Advance"
-msgstr "禁止自动播放下一首"
+#: src/gtkui/menus.c:133
+#, fuzzy
+msgid "Open _URL ..."
+msgstr "打开URL..."
 
-#: src/gtkui/ui_manager.c:49
-msgid "Show infoarea"
-msgstr "显示信息区域"
+#: src/gtkui/menus.c:134
+#, fuzzy
+msgid "_Add File ..."
+msgstr "添加文件..."
 
-#: src/gtkui/ui_manager.c:50
-msgid "Show/hide infoarea"
-msgstr "显示/隐藏信息区域"
-
-#: src/gtkui/ui_manager.c:52
-msgid "Show main menu"
-msgstr "显示主菜单"
-
-#: src/gtkui/ui_manager.c:53
-msgid "Show/hide main menu"
-msgstr "显示/隐藏主菜单"
+#: src/gtkui/menus.c:135
+#, fuzzy
+msgid "Add U_RL ..."
+msgstr "添加URL..."
 
-#: src/gtkui/ui_manager.c:55
-msgid "Show statusbar"
-msgstr "显示状态栏"
+#: src/gtkui/menus.c:137
+#, fuzzy
+msgid "A_bout ..."
+msgstr "关于"
 
-#: src/gtkui/ui_manager.c:56
-msgid "Show/hide statusbar"
-msgstr "显示/隐藏状态栏"
+#: src/gtkui/menus.c:138
+#, fuzzy
+msgid "_Preferences ..."
+msgstr "首选项"
 
-#: src/gtkui/ui_manager.c:58
-msgid "Show Column Headers"
-msgstr "显示表头"
+#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+msgid "_Quit"
+msgstr "退出(_Q)"
 
-#: src/gtkui/ui_manager.c:60
-msgid "Scroll on Song Change"
-msgstr "歌曲改变时滚动"
+#: src/gtkui/menus.c:142
+#, fuzzy
+msgid "_Play"
+msgstr "播放"
 
-#: src/gtkui/ui_manager.c:72 src/gtkui/ui_manager.c:73
-#: src/skins/ui_manager.c:172 src/skins/ui_manager.c:173
-msgid "Pause"
+#: src/gtkui/menus.c:143
+#, fuzzy
+msgid "Paus_e"
 msgstr "暂停"
 
-#: src/gtkui/ui_manager.c:75 src/gtkui/ui_manager.c:76 src/hotkey/gui.c:74
-#: src/skins/ui_manager.c:175 src/skins/ui_manager.c:176
-msgid "Stop"
+#: src/gtkui/menus.c:144
+#, fuzzy
+msgid "_Stop"
 msgstr "停止"
 
-#: src/gtkui/ui_manager.c:78 src/gtkui/ui_manager.c:79
-#: src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-msgid "Previous"
+#: src/gtkui/menus.c:145
+#, fuzzy
+msgid "Pre_vious"
 msgstr "上一首"
 
-#: src/gtkui/ui_manager.c:81 src/gtkui/ui_manager.c:82
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Next"
+#: src/gtkui/menus.c:146
+#, fuzzy
+msgid "_Next"
 msgstr "下一首"
 
-#: src/gtkui/ui_manager.c:87 src/skins/ui_manager.c:199
-msgid "Playlist"
-msgstr "播放列表"
-
-#: src/gtkui/ui_manager.c:89 src/gtkui/ui_manager.c:90
-#: src/skins/ui_manager.c:201 src/skins/ui_manager.c:202
-msgid "New Playlist"
-msgstr "新建播放列表"
-
-#: src/gtkui/ui_manager.c:92 src/gtkui/ui_manager.c:93
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-msgid "Delete Playlist"
-msgstr "删除播放列表"
-
-#: src/gtkui/ui_manager.c:95
-msgid "Import Playlist ..."
-msgstr "导入播放列表..."
-
-#: src/gtkui/ui_manager.c:96 src/skins/ui_manager.c:214
-msgid "Loads a playlist file into the selected playlist."
-msgstr "把列表加载到被选中的播放列表。"
-
-#: src/gtkui/ui_manager.c:98
-msgid "Export Playlist ..."
-msgstr "导出播放列表..."
-
-#: src/gtkui/ui_manager.c:99 src/skins/ui_manager.c:217
-msgid "Saves the selected playlist."
-msgstr "保存被选中的播放列表"
-
-#: src/gtkui/ui_manager.c:101 src/skins/ui_manager.c:219
-msgid "Save All Playlists"
-msgstr "保存所有播放列表"
-
-#: src/gtkui/ui_manager.c:102 src/skins/ui_manager.c:220
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr "保存所有已打开的播放列表（其实Audacious退出时是会自动保存的）。"
-
-#: src/gtkui/ui_manager.c:106
-msgid "Refresh"
-msgstr "刷新"
-
-#: src/gtkui/ui_manager.c:107 src/skins/ui_manager.c:225
-msgid "Refreshes metadata associated with a playlist entry."
-msgstr "刷新播放列表的歌曲信息"
-
-#: src/gtkui/ui_manager.c:110
-msgid "Refresh Selected"
-msgstr "刷新已选中的"
-
-#: src/gtkui/ui_manager.c:111
-msgid "Refreshes metadata associated with selected entries."
-msgstr "刷新已选中的歌曲信息"
-
-#: src/gtkui/ui_manager.c:115
-msgid "Playlist Manager"
-msgstr "播放列表管理器"
-
-#: src/gtkui/ui_manager.c:116 src/skins/ui_manager.c:229
-msgid "Opens the playlist manager."
-msgstr "打开播放列表管理器"
-
-#: src/gtkui/ui_manager.c:119
-msgid "Add URL ..."
-msgstr "添加URL..."
-
-#: src/gtkui/ui_manager.c:120 src/skins/ui_manager.c:239
-msgid "Adds a remote track to the playlist."
-msgstr "添加远程文件到播放列表"
-
-#: src/gtkui/ui_manager.c:123
-msgid "Add Files ..."
-msgstr "添加文件..."
-
-#: src/gtkui/ui_manager.c:124 src/skins/ui_manager.c:243
-msgid "Adds files to the playlist."
-msgstr "添加文件到播放列表。"
-
-#: src/gtkui/ui_manager.c:127 src/skins/ui_manager.c:266
-msgid "Remove All"
-msgstr "清空"
-
-#: src/gtkui/ui_manager.c:128 src/skins/ui_manager.c:267
-msgid "Removes all entries from the playlist."
-msgstr "清空播放列表中的所有条目。"
-
-#: src/gtkui/ui_manager.c:131 src/skins/ui_manager.c:292
-msgid "Remove Unselected"
-msgstr "删除未被选中的"
+#: src/gtkui/menus.c:148
+#, fuzzy
+msgid "_Repeat"
+msgstr "重复"
 
-#: src/gtkui/ui_manager.c:132 src/skins/ui_manager.c:293
-msgid "Remove unselected entries from the playlist."
-msgstr "删除播放列表中未被选中的条目。"
+#: src/gtkui/menus.c:149
+#, fuzzy
+msgid "S_huffle"
+msgstr "随机"
 
-#: src/gtkui/ui_manager.c:135 src/skins/ui_manager.c:296
-msgid "Remove Selected"
-msgstr "删除已选中的"
+#: src/gtkui/menus.c:150
+#, fuzzy
+msgid "N_o Playlist Advance"
+msgstr "禁止自动播放下一首"
 
-#: src/gtkui/ui_manager.c:136 src/skins/ui_manager.c:297
-msgid "Remove selected entries from the playlist."
-msgstr "删除播放列表中已选中的条目。"
+#: src/gtkui/menus.c:151
+#, fuzzy
+msgid "Stop _After This Song"
+msgstr "完成后停止"
 
-#: src/gtkui/ui_manager.c:139
-msgid "Edit title"
-msgstr "编辑标题"
-
-#: src/gtkui/ui_manager.c:140
-msgid "Edit the playlist title."
-msgstr "根据播放列表标题"
+#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+msgid "Song _Info ..."
+msgstr ""
 
-#: src/gtkui/ui_manager.c:143
-msgid "Choose Columns ..."
-msgstr "揀选列..."
+#: src/gtkui/menus.c:154
+#, fuzzy
+msgid "Jump to _Time ..."
+msgstr "跳到时间"
 
-#: src/gtkui/ui_manager.c:146
-msgid "Sort"
-msgstr "排序"
+#: src/gtkui/menus.c:155
+msgid "_Jump to Song ..."
+msgstr ""
 
-#: src/gtkui/ui_manager.c:147 src/skins/ui_manager.c:336
-#: src/skins/ui_manager.c:366
-msgid "By Track Number"
+#: src/gtkui/menus.c:158
+#, fuzzy
+msgid "By Track _Number"
 msgstr "按音轨号码"
 
-#: src/gtkui/ui_manager.c:149 src/skins/ui_manager.c:280
-#: src/skins/ui_manager.c:312 src/skins/ui_manager.c:342
-msgid "By Title"
+#: src/gtkui/menus.c:159
+#, fuzzy
+msgid "By _Title"
 msgstr "按标题"
 
-#: src/gtkui/ui_manager.c:151 src/skins/ui_manager.c:320
-#: src/skins/ui_manager.c:350
-msgid "By Artist"
+#: src/gtkui/menus.c:160
+#, fuzzy
+msgid "By _Artist"
 msgstr "按艺术家"
 
-#: src/gtkui/ui_manager.c:153 src/skins/ui_manager.c:316
-#: src/skins/ui_manager.c:346
-msgid "By Album"
+#: src/gtkui/menus.c:161
+#, fuzzy
+msgid "By A_lbum"
 msgstr "按专辑"
 
-#: src/gtkui/ui_manager.c:155
-msgid "By Release Date"
+#: src/gtkui/menus.c:162
+#, fuzzy
+msgid "By Release _Date"
 msgstr "按发表日期"
 
-#: src/gtkui/ui_manager.c:157
-msgid "By File Path"
+#: src/gtkui/menus.c:163
+#, fuzzy
+msgid "By _File Path"
 msgstr "按文件路径"
 
-#: src/gtkui/ui_manager.c:159
-msgid "By Formatted Title"
-msgstr "按标题"
+#: src/gtkui/menus.c:164
+#, fuzzy
+msgid "By _Custom Title"
+msgstr "定制标题"
 
-#: src/gtkui/ui_manager.c:161
-msgid "Reverse Order"
+#: src/gtkui/menus.c:166
+#, fuzzy
+msgid "R_everse Order"
 msgstr "反转"
 
-#: src/gtkui/ui_manager.c:163
-msgid "Random Order"
+#: src/gtkui/menus.c:167
+#, fuzzy
+msgid "_Random Order"
 msgstr "随机"
 
-#: src/gtkui/ui_manager.c:168
-msgid "Output"
-msgstr "输出"
+#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+msgid "_Refresh"
+msgstr "刷新(_R)"
 
-#: src/gtkui/ui_manager.c:170 src/modplug/gui/interface.cxx:572
-msgid "Effects"
-msgstr "音效"
+#: src/gtkui/menus.c:172
+#, fuzzy
+msgid "_Sort"
+msgstr "排序"
 
-#: src/gtkui/ui_manager.c:172
-msgid "Equalizer"
-msgstr "均衡器"
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:177 src/skins/ui_manager.c:234
-msgid "View"
-msgstr "外观"
+#: src/gtkui/menus.c:175
+msgid "_Close"
+msgstr "关闭(_C)"
 
-#: src/gtkui/ui_manager.c:178 src/skins/ui_manager.c:235
-msgid "Interface"
-msgstr "界面"
+#: src/gtkui/menus.c:177
+#, fuzzy
+msgid "_Import ..."
+msgstr "导入"
 
-#: src/gtkui/ui_manager.c:185 src/skins/ui_manager.c:376
-msgid "File"
-msgstr "文件"
+#: src/gtkui/menus.c:178
+#, fuzzy
+msgid "_Export ..."
+msgstr "导出"
 
-#: src/gtkui/ui_manager.c:188
-msgid "Components"
-msgstr "组件"
+#: src/gtkui/menus.c:180
+#, fuzzy
+msgid "_Playlist Manager ..."
+msgstr "播放列表管理器"
 
-#: src/gtkui/ui_manager.c:190 src/gtkui/ui_manager.c:193
-#: src/skins/ui_manager.c:381 src/skins/ui_manager.c:384
-msgid "View Track Details"
-msgstr "查看音轨信息"
+#: src/gtkui/menus.c:183
+#, fuzzy
+msgid "Volume _Up"
+msgstr "调高音量"
 
-#: src/gtkui/ui_manager.c:191 src/gtkui/ui_manager.c:194
-#: src/skins/ui_manager.c:382 src/skins/ui_manager.c:385
-msgid "View track details"
-msgstr "查看音轨信息"
+#: src/gtkui/menus.c:184
+#, fuzzy
+msgid "Volume _Down"
+msgstr "调低音量"
 
-#: src/gtkui/ui_manager.c:196 src/gtkui/ui_manager.c:197
-#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:388
-msgid "About Audacious"
-msgstr "关于Audacious"
+#: src/gtkui/menus.c:186
+#, fuzzy
+msgid "_Equalizer"
+msgstr "均衡器"
 
-#: src/gtkui/ui_manager.c:199
-msgid "Open Files ..."
-msgstr "打开文件..."
+#: src/gtkui/menus.c:188
+#, fuzzy
+msgid "E_ffects"
+msgstr "音效"
 
-#: src/gtkui/ui_manager.c:200 src/skins/ui_manager.c:391
-msgid "Load and play a file"
-msgstr "加载并播放文件"
+#: src/gtkui/menus.c:191
+#, fuzzy
+msgid "_Interface"
+msgstr "界面"
 
-#: src/gtkui/ui_manager.c:202
-msgid "Open URL ..."
-msgstr "打开URL..."
+#: src/gtkui/menus.c:193
+msgid "Show _Menu Bar"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:203 src/skins/ui_manager.c:394
-msgid "Play media from the selected location"
-msgstr "播放被选中位置的文件"
+#: src/gtkui/menus.c:194
+#, fuzzy
+msgid "Show I_nfo Bar"
+msgstr "显示信息区域"
 
-#: src/gtkui/ui_manager.c:205 src/skins/ui_manager.c:396
-msgid "Plugin services"
-msgstr "插件服务"
+#: src/gtkui/menus.c:195
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "显示状态栏"
 
-#: src/gtkui/ui_manager.c:207 src/skins/ui_manager.c:398
-msgid "Preferences"
-msgstr "首选项"
+#: src/gtkui/menus.c:197
+#, fuzzy
+msgid "Show Column _Headers"
+msgstr "显示表头"
 
-#: src/gtkui/ui_manager.c:208 src/skins/ui_manager.c:399
-msgid "Open preferences window"
-msgstr "打开首选项窗口"
+#: src/gtkui/menus.c:198
+#, fuzzy
+msgid "Choose _Columns ..."
+msgstr "揀选列..."
 
-#: src/gtkui/ui_manager.c:210 src/skins/ui_manager.c:401
-msgid "_Quit"
-msgstr "退出(_Q)"
+#: src/gtkui/menus.c:199
+#, fuzzy
+msgid "Scrol_l on Song Change"
+msgstr "歌曲改变时滚动"
 
-#: src/gtkui/ui_manager.c:211 src/skins/ui_manager.c:402
-msgid "Quit Audacious"
-msgstr "退出Audacious"
+#: src/gtkui/menus.c:202
+#, fuzzy
+msgid "_File"
+msgstr "文件"
 
-#: src/gtkui/ui_manager.c:213 src/gtkui/ui_manager.c:214
-#: src/skins/ui_manager.c:404 src/skins/ui_manager.c:405
-msgid "Set A-B"
-msgstr "设置A-B"
+#: src/gtkui/menus.c:203
+#, fuzzy
+msgid "_Playback"
+msgstr "回放"
 
-#: src/gtkui/ui_manager.c:216 src/gtkui/ui_manager.c:217
-#: src/skins/ui_manager.c:407 src/skins/ui_manager.c:408
-msgid "Clear A-B"
-msgstr "清空A-B"
+#: src/gtkui/menus.c:204
+#, fuzzy
+msgid "P_laylist"
+msgstr "播放列表"
 
-#: src/gtkui/ui_manager.c:219 src/gtkui/ui_manager.c:220
-#: src/skins/ui_manager.c:410 src/skins/ui_manager.c:411
-msgid "Jump to Playlist Start"
-msgstr "跳到被选中列表并播放"
+#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#, fuzzy
+msgid "_Services"
+msgstr "设备"
 
-#: src/gtkui/ui_manager.c:222 src/gtkui/ui_manager.c:223 src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:413 src/skins/ui_manager.c:414
-msgid "Jump to File"
-msgstr "跳到文件"
+#: src/gtkui/menus.c:206
+#, fuzzy
+msgid "_Output"
+msgstr "输出"
 
-#: src/gtkui/ui_manager.c:228 src/skins/ui_manager.c:419
-msgid "Queue Toggle"
-msgstr "队列切换"
+#: src/gtkui/menus.c:207
+#, fuzzy
+msgid "_View"
+msgstr "外观"
 
-#: src/gtkui/ui_manager.c:229 src/skins/ui_manager.c:420
-msgid "Enables/disables the entry in the playlist's queue."
-msgstr "启用/禁用播放队列的条目"
+#: src/gtkui/menus.c:211
+msgid "_Queue/Unqueue"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:232 src/skins/ui_manager.c:423
-msgid "Copy"
-msgstr "复制"
+#: src/gtkui/menus.c:214
+msgid "Cu_t"
+msgstr ""
 
-#: src/gtkui/ui_manager.c:235 src/skins/ui_manager.c:425
-msgid "Cut"
-msgstr "剪切"
+#: src/gtkui/menus.c:215
+#, fuzzy
+msgid "_Copy"
+msgstr "复制"
 
-#: src/gtkui/ui_manager.c:238 src/skins/ui_manager.c:427
-msgid "Paste"
+#: src/gtkui/menus.c:216
+#, fuzzy
+msgid "_Paste"
 msgstr "粘贴"
 
-#: src/gtkui/ui_manager.c:241 src/skins/ui_manager.c:256
-msgid "Select All"
+#: src/gtkui/menus.c:217
+#, fuzzy
+msgid "Select _All"
 msgstr "选中全部"
 
-#: src/gtkui/ui_manager.c:242 src/skins/ui_manager.c:257
-msgid "Selects all of the playlist entries."
-msgstr "选中播放列表中的所有条目。"
+#: src/gtkui/menus.c:222
+#, fuzzy
+msgid "_Rename"
+msgstr "文件名"
 
-#: src/gtkui/ui_manager.c:245 src/skins/ui_manager.c:260
-msgid "Select None"
-msgstr "取消选中"
+#: src/gtkui/ui_gtk.c:75
+msgid "GTK Interface"
+msgstr "GTK界面"
 
-#: src/gtkui/ui_manager.c:246 src/skins/ui_manager.c:261
-msgid "Deselects all of the playlist entries."
-msgstr "取消对播放列表的选择"
+#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.c:100 src/skins/ui_main.c:611
+#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+msgid "Audacious"
+msgstr ""
+
+#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+msgid "Error"
+msgstr "错误"
+
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "单声道"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:610
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "单体声"
 
-#: src/gtkui/ui_statusbar.c:104
+#: src/gtkui/ui_statusbar.c:106
 #, fuzzy, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d声道"
 msgstr[1] "%d声道"
 
-#: src/gtkui/ui_statusbar.c:119
+#: src/gtkui/ui_statusbar.c:121
 #, c-format
 msgid "%d kbps"
 msgstr ""
@@ -2812,10 +1720,18 @@
 msgid "Previous Track"
 msgstr "上一首"
 
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "播放"
+
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
 msgstr "暂停/继续"
 
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "停止"
+
 #: src/hotkey/gui.c:75
 msgid "Next Track"
 msgstr "下一首"
@@ -2840,6 +1756,10 @@
 msgid "Volume Down"
 msgstr "调低音量"
 
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+msgid "Jump to File"
+msgstr "跳到文件"
+
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
 msgstr "播放窗口切换"
@@ -2848,11 +1768,21 @@
 msgid "Show On-Screen-Display"
 msgstr "显示On-Screen-Display"
 
-#: src/hotkey/gui.c:93
+#: src/hotkey/gui.c:84
+#, fuzzy
+msgid "Toggle Repeat"
+msgstr "重复"
+
+#: src/hotkey/gui.c:85
+#, fuzzy
+msgid "Toggle Shuffle"
+msgstr "随机"
+
+#: src/hotkey/gui.c:95
 msgid "(none)"
 msgstr "(无)"
 
-#: src/hotkey/gui.c:230
+#: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -2860,37 +1790,37 @@
 "Do you want to continue?"
 msgstr "并不建议绑定鼠标主键。要继续吗？"
 
-#: src/hotkey/gui.c:232
+#: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
 msgstr "绑定鼠标按键"
 
-#: src/hotkey/gui.c:382
+#: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
 msgstr "全局热键插件设置"
 
-#: src/hotkey/gui.c:398
+#: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr "请在文本区按下要绑定的组合键，你亦可以绑定鼠标键"
 
-#: src/hotkey/gui.c:403
+#: src/hotkey/gui.c:405
 msgid "Hotkeys:"
 msgstr "热键："
 
-#: src/hotkey/gui.c:422
+#: src/hotkey/gui.c:424
 msgid "Action:"
 msgstr "动作："
 
-#: src/hotkey/gui.c:430
+#: src/hotkey/gui.c:432
 msgid "Key Binding:"
 msgstr "键位绑定:"
 
-#: src/hotkey/gui.c:661
+#: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
 msgstr "关于全局热键插件"
 
-#: src/hotkey/gui.c:662
+#: src/hotkey/gui.c:664
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -2962,126 +1892,19 @@
 msgid "About JACK Output Plugin 0.17"
 msgstr "关于JACK输出插件0.17"
 
-#: src/ladspa/ladspa.c:844
-msgid "This LADSPA plugin has no user controls"
-msgstr "LADSPA插件未被其它人所用"
-
-#: src/ladspa/ladspa.c:885 src/ladspa/ladspa.c:972
-msgid "Name"
-msgstr "名字"
-
-#: src/ladspa/ladspa.c:972
-msgid "UID"
-msgstr "UID"
-
-#: src/ladspa/ladspa.c:1049
-msgid "Installed plugins"
-msgstr "已安装插件"
-
-#: src/ladspa/ladspa.c:1057
-msgid "Running plugins"
-msgstr "运行中的插件"
-
-#: src/ladspa/ladspa.c:1072
-msgid "Add"
-msgstr "添加"
-
-#: src/ladspa/ladspa.c:1075
-msgid "Remove"
-msgstr "删除"
-
-#: src/ladspa/ladspa.c:1086
-msgid "LADSPA Plugin Catalog"
-msgstr "LDASPA插件分类"
-
-#: src/lirc/about.c:63
-msgid "About LIRC Audacious Plugin"
-msgstr "关于LIRC Audacious插件"
-
-#: src/lirc/about.c:90
-msgid "LIRC Plugin "
-msgstr "LIRC插件"
-
-#: src/lirc/about.c:92
+#: src/lyricwiki/lyricwiki.c:226
 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"
-"让你能够通过LIRC控制Audacious的小插件。\n"
-"由Tony Vroon <chainsaw@gentoo.org>用XMMS LIRC插件为Audacious进行移植。\n"
-"XMMS LIRC插件作者:\n"
-"Carl van Schaik <carl@leg.uct.ac.za>\n"
-"Christoph Bartelmus <xmms@bartelmus.de>\n"
-"Andrew O. Shadoura <bugzilla@tut.by>\n"
-"你可以在http://lirc.org上找到更多关于LIRC的信息"
-
-#: src/lirc/interface.c:37
-msgid "LIRC plugin settings"
-msgstr "LIRC插件设置"
-
-#: src/lirc/interface.c:61
-msgid "Reconnect to LIRC server"
-msgstr "重新连接到LIRC服务器"
-
-#: src/lirc/interface.c:68
-msgid "Timeout before reconnecting (seconds): "
-msgstr "超时后尝试重新连接(秒):"
-
-#: src/lirc/interface.c:75
-msgid "Reconnect"
-msgstr "重新连接"
-
-#: src/lirc/interface.c:79
-msgid "Connection"
-msgstr "连接"
-
-#: src/lirc/lirc.c:82
-#, c-format
-msgid "%s: could not init LIRC support\n"
-msgstr "%s: 无法初始化LIRC服务\n"
+"Looking for lyrics..."
+msgstr ""
 
-#: src/lirc/lirc.c:90
-#, c-format
+#: src/lyricwiki/lyricwiki.c:249
 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: 未能读取LIRC的设置文件\n"
-"%s: 请阅读LIRC相关文档\n"
-"%s: 并创建正确的设置文件\n"
-
-#: src/lirc/lirc.c:118
-#, c-format
-msgid "%s: trying to reconnect...\n"
-msgstr "%s: 正尝试重新连接...\n"
-
-#: src/lirc/lirc.c:333
-#, c-format
-msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: 未知指令 \"%s\"\n"
-
-#: src/lirc/lirc.c:343
-#, c-format
-msgid "%s: disconnected from LIRC\n"
-msgstr "%s: 已从LIRC上断开连接\n"
-
-#: src/lirc/lirc.c:347
-#, c-format
-msgid "%s: will try reconnect every %d seconds...\n"
-msgstr "%s: 尝试每%d秒重新连接一次...\n"
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:335
+#: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
 "No lyrics were found."
@@ -3089,11 +1912,11 @@
 "\n"
 "未找到相关歌词。"
 
-#: src/metronom/metronom.c:92
+#: src/metronom/metronom.c:85
 msgid "About Metronom"
 msgstr "关于Metronom"
 
-#: src/metronom/metronom.c:93
+#: src/metronom/metronom.c:86
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -3102,249 +1925,43 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:150
+#: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:152
+#: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/modplug/gui/interface.cxx:137
-msgid "ModPlug Configuration"
-msgstr "ModPlug设置"
-
-#: src/modplug/gui/interface.cxx:174
-msgid "16 bit"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:181
-msgid "8 bit"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:212
-msgid "Mono (downmix)"
-msgstr "单音道(downmix)"
-
-#: src/modplug/gui/interface.cxx:241
-msgid "Nearest (fastest)"
-msgstr "最接近(最快)"
-
-#: src/modplug/gui/interface.cxx:248
-msgid "Linear (fast)"
-msgstr "线性(快速)"
-
-#: src/modplug/gui/interface.cxx:255
-msgid "Spline (good quality)"
-msgstr "Spline(高质量)"
-
-#: src/modplug/gui/interface.cxx:262
-msgid "8-tap Fir (extremely high quality)"
-msgstr "8-tap Fir(最高质量)"
-
-#: src/modplug/gui/interface.cxx:286
-msgid "96 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:293
-msgid "48 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:300
-msgid "44 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:307
-msgid "22 kHz"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:315
-msgid "Sampling Rate"
-msgstr "取样率"
-
-#: src/modplug/gui/interface.cxx:349 src/modplug/gui/interface.cxx:411
-#: src/modplug/gui/interface.cxx:477 src/modplug/gui/interface.cxx:539
-msgid "Enable"
-msgstr "启用"
-
-#: src/modplug/gui/interface.cxx:378 src/modplug/gui/interface.cxx:506
-msgid "Depth"
-msgstr "深度"
-
-#: src/modplug/gui/interface.cxx:386 src/modplug/gui/interface.cxx:514
-msgid "Delay"
-msgstr "延时"
-
-#: src/modplug/gui/interface.cxx:394
-msgid "Reverb"
-msgstr "余响"
-
-#: src/modplug/gui/interface.cxx:440
-msgid "Amount"
-msgstr "总量"
-
-#: src/modplug/gui/interface.cxx:448
-msgid "Range"
-msgstr "范围"
-
-#: src/modplug/gui/interface.cxx:456
-msgid "Bass Boost"
-msgstr "低音增强"
-
-#: src/modplug/gui/interface.cxx:522 src/mpg123/mpg123.c:173
+#: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "围绕音"
 
-#: src/modplug/gui/interface.cxx:561
-msgid ""
-"Note: Setting the preamp\n"
-"too high may cause clipping\n"
-"(annoying clicks and pops)!"
-msgstr "注意： 前置放大器的值太高会导致削波!"
-
-#: src/modplug/gui/interface.cxx:567
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "Preamp"
-msgstr "前置放大"
-
-#: src/modplug/gui/interface.cxx:601
-msgid "Use Filename as Song Title"
-msgstr "用文件名作为歌曲标题"
-
-#: src/modplug/gui/interface.cxx:606
-msgid "Fast Playlist Info"
-msgstr "快速播放列表信息"
-
-#: src/modplug/gui/interface.cxx:617
-msgid "Noise Reduction"
-msgstr "降噪"
-
-#: src/modplug/gui/interface.cxx:623
-msgid "Play Amiga MOD"
-msgstr "播放Amiga MOD"
-
-#: src/modplug/gui/interface.cxx:646
-msgid "Don't loop"
-msgstr "不要循环"
-
-#: src/modplug/gui/interface.cxx:658
-msgid "Loop"
-msgstr "循环"
-
-#: src/modplug/gui/interface.cxx:671
-msgid "time(s)"
-msgstr "时间(s)"
-
-#: src/modplug/gui/interface.cxx:677
-msgid "Loop forever"
-msgstr "无限循环"
-
-#: src/modplug/gui/interface.cxx:684
-msgid "Looping"
-msgstr "循环"
-
-#: src/modplug/gui/interface.cxx:859
-msgid "MOD Info"
-msgstr "MOD信息"
-
-#: src/modplug/gui/interface.cxx:878
-msgid ""
-"Filename:\n"
-"Title:\n"
-"Type:\n"
-"Length:\n"
-"Speed:\n"
-"Tempo:\n"
-"Samples:\n"
-"Instruments:\n"
-"Patterns:\n"
-"Channels:"
-msgstr ""
-"文件名:\n"
-"标题:\n"
-"类型:\n"
-"长度:\n"
-"速度:\n"
-"节奏:\n"
-"取样:\n"
-"乐器:\n"
-"格调:\n"
-"声道:"
-
-#: src/modplug/gui/interface.cxx:883
-msgid ""
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---\n"
-"---"
-msgstr ""
-
-#: src/modplug/gui/interface.cxx:913
-msgid "Samples"
-msgstr "取样"
-
-#: src/modplug/gui/interface.cxx:938
-msgid "Instruments"
-msgstr "乐器"
-
-#: src/modplug/gui/interface.cxx:959
-msgid "Message"
-msgstr "信息"
-
-#: src/modplug/gui/main.cxx:51
-msgid "Modplug Input Plugin for Audacious ver"
-msgstr "Audacious的Modplug输入插件"
-
-#: src/modplug/gui/main.cxx:52
-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声音引擎作者：Olivier Lapicque。\n"
-"Modplug的XMMS接口作者是：Kenton Varda.\n"
-"版权所有 (c) 2000 Olivier Lapicque及Kenton Varda.\n"
-"更新及维护：Konstanty Bialkowski.\n"
-"BMP的移植：Theofilos Intzoglou."
-
-#: src/modplug/gui/main.cxx:55
-msgid "About Modplug"
-msgstr "关于Modplug"
-
-#: src/modplug/gui/support.cxx:90 src/modplug/gui/support.cxx:114
-#: 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/mtp_up/mtp.c:35
-msgid "Upload selected track(s)"
-msgstr "上传选中的文件"
-
-#: src/mtp_up/mtp.c:290
+#: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
 msgstr "正在上传..."
 
-#: src/mtp_up/mtp.c:299
-msgid "MTP device handler"
-msgstr "MTP设备句柄"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
+msgstr ""
 
-#: src/mtp_up/mtp.c:303
-msgid "Disconnect the device"
+#: src/mtp_up/mtp.c:311
+#, fuzzy
+msgid "Disconnect MTP Device"
 msgstr "断开与设备的连接"
 
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Stopped"
+msgstr "停止"
+
+#: src/notify/libnotify-aosd_event.c:47
+#, fuzzy
+msgid "Audacious is not playing."
+msgstr "Audacious - 可见性警告"
+
 #: src/null/null.c:64
 msgid "Null output plugin "
 msgstr "Null Output插件 "
@@ -3393,11 +2010,11 @@
 msgid "Enable format conversions made by the OSS software."
 msgstr "使用OSS的格式转换。"
 
-#: src/oss4/plugin.c:54
+#: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "关于OSS4插件"
 
-#: src/oss4/plugin.c:55
+#: src/oss4/plugin.c:52
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
@@ -3428,6 +2045,11 @@
 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
 msgid "OSS Driver configuration"
 msgstr "OSS驱动设置"
@@ -3484,11 +2106,11 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:690
+#: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "关于Audacious PulseAudio输出插件"
 
-#: src/pulse_audio/pulse_audio.c:691
+#: src/pulse_audio/pulse_audio.c:688
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -3528,27 +2150,27 @@
 msgid "Method:"
 msgstr "方法："
 
-#: src/scrobbler/configure.c:129 src/scrobbler/configure.c:205
+#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
 msgid "Change password"
 msgstr "修改密码"
 
-#: src/scrobbler/configure.c:151
+#: src/scrobbler/configure.c:150
 msgid "Services"
 msgstr "服务"
 
-#: src/scrobbler/configure.c:173
+#: src/scrobbler/configure.c:172
 msgid "Username:"
 msgstr "用户名："
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:178
 msgid "Password:"
 msgstr "密码："
 
-#: src/scrobbler/configure.c:187
+#: src/scrobbler/configure.c:186
 msgid "Scrobbler URL:"
 msgstr ""
 
-#: src/scrobbler/configure.c:219
+#: src/scrobbler/configure.c:218
 msgid "Last.FM"
 msgstr ""
 
@@ -3556,7 +2178,7 @@
 msgid "Scrobbler"
 msgstr ""
 
-#: src/scrobbler/plugin.c:214
+#: src/scrobbler/plugin.c:213
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -3567,15 +2189,15 @@
 "\n"
 "原作者：Audun Hove <audun@nlc.no>和Pipian <pipian@pipian.com>。\n"
 
-#: src/scrobbler/plugin.c:216
+#: src/scrobbler/plugin.c:215
 msgid "About Scrobbler Plugin"
 msgstr "关于Scorbbler插件"
 
-#: src/sdlout/plugin.c:62
+#: src/sdlout/plugin.c:58
 msgid "About SDL Output Plugin"
 msgstr "关于SDL输出插件"
 
-#: src/sdlout/plugin.c:82
+#: src/sdlout/plugin.c:78
 msgid "SDL error"
 msgstr "SDL错误"
 
@@ -3584,10 +2206,18 @@
 msgid "About %s"
 msgstr "关于 %s"
 
-#: src/sid/xs_config.c:323
+#: 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 "一般信息"
@@ -3597,6 +2227,11 @@
 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设置"
@@ -3875,15 +2510,15 @@
 msgid "Use"
 msgstr "使用"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:436
+#: 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:435
+#: 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:437
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "删除"
 
@@ -3914,6 +2549,11 @@
 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 "最小播放时间："
@@ -4146,11 +2786,11 @@
 msgid "No"
 msgstr "否"
 
-#: src/skins/plugin.c:180
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "关于主题化界面"
 
-#: src/skins/plugin.c:181
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -4158,681 +2798,807 @@
 "版权所有 (c) 2008, Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/plugin.c:200
-msgid "Skinned Interface"
-msgstr "主题化界面"
-
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "_Player:"
 msgstr "播放器(_P):"
 
-#: src/skins/skins_cfg.c:316
+#: src/skins/skins_cfg.c:254
 msgid "Select main player window font:"
 msgstr "选择主界面字体"
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "_Playlist:"
 msgstr "播放列表(_P)："
 
-#: src/skins/skins_cfg.c:317
+#: src/skins/skins_cfg.c:255
 msgid "Select playlist font:"
 msgstr "选择播放列表字体："
 
-#: src/skins/skins_cfg.c:321
+#: src/skins/skins_cfg.c:259
 msgid "_Fonts"
 msgstr "字体(_F)"
 
-#: src/skins/skins_cfg.c:323
-msgid "Use Bitmap fonts if available"
-msgstr "尽可能使用点阵字体"
-
-#: src/skins/skins_cfg.c:323
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
-msgstr "尽可能使用点阵字体，点阵字体不支持Unicode设置"
-
-#: src/skins/skins_cfg.c:324
-msgid "_Miscellaneous"
-msgstr "其它(_M)"
-
-#: src/skins/skins_cfg.c:325
-msgid "Show separators in playlist"
-msgstr "在播放列表中显示分隔符"
-
-#: src/skins/skins_cfg.c:327
-msgid "Show window manager decoration"
-msgstr "显示窗口管理器的装饰"
+#: src/skins/skins_cfg.c:261
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr ""
 
-#: src/skins/skins_cfg.c:328
-msgid "This enables the window manager to show decorations for windows."
-msgstr "此选项将允许显示窗口管理器的装饰"
+#: src/skins/skins_cfg.c:263
+msgid "Scroll song title in both directions"
+msgstr ""
 
-#: src/skins/skins_cfg.c:329
-msgid "Use two-way text scroller"
-msgstr "使用双向字符滚动"
+#: src/skins/skins_cfg.c:346
+msgid "_Skin"
+msgstr "主题(_S)"
 
-#: src/skins/skins_cfg.c:330
-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 "如果启用，主界面上的文件信息将来回滚动，否则只能向一个方向滚动。"
+#: src/skins/skins_cfg.c:393
+#, fuzzy
+msgid "Interface Preferences"
+msgstr "淡出设置"
 
-#: src/skins/skins_cfg.c:331
-msgid "Disable inline gtk theme"
-msgstr "禁用内部gtk主题"
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "前置放大"
 
-#: src/skins/skins_cfg.c:333
-msgid "Random skin on play"
-msgstr "启动时随机选择主题"
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr ""
 
-#: src/skins/skins_cfg.c:334
-msgid "Allow loading incomplete skins"
-msgstr "允许加载不完整的主题"
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr ""
 
-#: src/skins/skins_cfg.c:335
-msgid ""
-"If selected, audacious won't refuse loading broken skins. Use only if your "
-"favourite skin doesn't work"
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
 msgstr ""
-"如果启用，audacious将允许加载破损的主题。如果你喜欢的主题无法使用，可试试启用"
-"此选项"
 
-#: src/skins/skins_cfg.c:401
-msgid "Color Adjustment"
-msgstr "颜色调整"
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr ""
 
-#: src/skins/skins_cfg.c:407
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr "Audacious允许你修改主题界面的颜色平衡。调整滑动条即可"
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr ""
 
-#: src/skins/skins_cfg.c:417
-msgid "Blue"
-msgstr "蓝"
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr ""
 
-#: src/skins/skins_cfg.c:424
-msgid "Green"
-msgstr "绿"
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr ""
 
-#: src/skins/skins_cfg.c:431
-msgid "Red"
-msgstr "红"
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr ""
 
-#: src/skins/skins_cfg.c:569
-msgid "_Skin"
-msgstr "主题(_S)"
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr ""
 
-#: src/skins/skins_cfg.c:574
-msgid "Color adjustment ..."
-msgstr "颜色调整..."
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr ""
 
-#: src/skins/ui_equalizer.c:463
+#: src/skins/ui_equalizer.c:378
 msgid "Audacious Equalizer"
 msgstr "Audacious均衡器"
 
-#: src/skins/ui_equalizer.c:1000
+#: src/skins/ui_equalizer.c:884
 msgid "Presets"
 msgstr "预设"
 
-#: src/skins/ui_main.c:595
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:603
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr ""
 
-#: src/skins/ui_main.c:610
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "环绕声"
 
-#: src/skins/ui_main.c:983
-msgid "Audacious - visibility warning"
-msgstr "Audacious - 可见性警告"
-
-#: src/skins/ui_main.c:986
-msgid "Show main player window"
-msgstr "显示主界面"
-
-#: src/skins/ui_main.c:987
-msgid "Ignore"
-msgstr "忽略"
-
-#: src/skins/ui_main.c:993
-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启动时已经隐藏所有的窗口。\n"
-"你可能希望通过播放窗口来控制Audacious；否则你只能通过audtool或其它插件（如："
-"状态图标插件）进行控制。"
-
-#: src/skins/ui_main.c:999
-msgid "Always ignore, show/hide is controlled remotely"
-msgstr "总是忽略，显示/隐藏远程控制状态"
-
-#: src/skins/ui_main.c:1044
-msgid "Audacious - broken GTK engine usage warning"
-msgstr "Audacious - 破损的GTK引擎警告"
-
-#: src/skins/ui_main.c:1052
-#, c-format
-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>正在使用损坏的GTK引擎</big>\n"
-"\n"
-"Audacious检测到你正在使用一个已经损坏的GTK引擎。\n"
-"\n"
-"你正在使用的GTK引擎%s, 与现在主题的部分特性并不兼容。当前会话已禁用不"
-"兼容部分的特性。\n"
-" \n"
-"要使用此特性，请考虑使用其它的GTK引擎。"
-
-#: src/skins/ui_main.c:1063
-msgid "Do not display this warning again"
-msgstr "不要再提示"
-
-#: src/skins/ui_main.c:1275
-#, c-format
-msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
+#: src/skins/ui_main.c:807
+#, fuzzy, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "查找： %d:%-2.2d/%d:%-2.2d (%d%%)"
 
-#: src/skins/ui_main.c:1305
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "音量: %d%%"
 
-#: src/skins/ui_main.c:1328
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "平衡: %d%% 左"
 
-#: src/skins/ui_main.c:1330
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "平衡: 中间"
 
-#: src/skins/ui_main.c:1332
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "平衡: %d%% 右"
 
-#: src/skins/ui_main.c:1624
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "选项菜单"
 
-#: src/skins/ui_main.c:1628
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "禁用“顶置窗口”"
 
-#: src/skins/ui_main.c:1630
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "启用“顶置窗口”"
 
-#: src/skins/ui_main.c:1633
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "文件信息"
 
-#: src/skins/ui_main.c:1637
-msgid "Disable 'GUI Scaling'"
-msgstr "禁用“界面缩放”"
-
-#: src/skins/ui_main.c:1639
-msgid "Enable 'GUI Scaling'"
-msgstr "启用“界面缩放”"
-
-#: src/skins/ui_main.c:1642
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "可视化菜单"
 
-#: src/skins/ui_main.c:2354
+#: src/skins/ui_main.c:1645
 msgid "Single mode."
 msgstr "单一窗口模式"
 
-#: src/skins/ui_main.c:2356
+#: src/skins/ui_main.c:1647
 msgid "Playlist mode."
 msgstr "播放列表模式"
 
-#: src/skins/ui_main.c:2380
+#: src/skins/ui_main.c:1669
 msgid "Stopping after song."
 msgstr "完成后停止"
 
-#: src/skins/ui_main.c:2382
+#: src/skins/ui_main.c:1671
 msgid "Not stopping after song."
 msgstr "完成后不停止"
 
-#: src/skins/ui_manager.c:52 src/skins/ui_manager.c:53
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
 msgstr "自动滚动歌曲名"
 
-#: src/skins/ui_manager.c:58 src/skins/ui_manager.c:59
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "完成当前歌曲后停止"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
 msgstr "峰值"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "重复"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "随机"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "禁止自动播放下一首"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
 msgstr "显示播放器"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
 msgstr "显示播放列表编辑器"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
 msgstr "显示均衡器"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
 msgstr "顶置窗口"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
 msgstr "所有工作区可见"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
 msgstr "收起播放器"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
 msgstr "收起播放列表编辑器"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
 msgstr "收起均衡器"
 
-#: src/skins/ui_manager.c:94 src/sndstretch/sndstretch_xmms.c:365
-msgid "Scale"
-msgstr "缩放"
-
-#: src/skins/ui_manager.c:95
-msgid "DoubleSize"
-msgstr "双倍大小"
-
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
-msgid "Easy Move"
-msgstr "简易移动"
-
-#: src/skins/ui_manager.c:106
+#: src/skins/ui_manager.c:115
 msgid "Analyzer"
 msgstr "分析器"
 
-#: src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:116
 msgid "Scope"
 msgstr "范围"
 
-#: src/skins/ui_manager.c:108
+#: src/skins/ui_manager.c:117
 msgid "Voiceprint"
 msgstr "声纹"
 
-#: src/skins/ui_manager.c:109
+#: src/skins/ui_manager.c:118
 msgid "Off"
 msgstr "关闭"
 
-#: src/skins/ui_manager.c:113 src/skins/ui_manager.c:130
-#: src/skins/ui_manager.c:136
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
 msgid "Normal"
 msgstr "一般"
 
-#: src/skins/ui_manager.c:114 src/skins/ui_manager.c:131
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
 msgstr "火炎"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
 msgstr "垂线"
 
-#: src/skins/ui_manager.c:119
+#: src/skins/ui_manager.c:128
 msgid "Lines"
 msgstr "细线"
 
-#: src/skins/ui_manager.c:120
+#: src/skins/ui_manager.c:129
 msgid "Bars"
 msgstr "柱状"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:133
 msgid "Dot Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:125
+#: src/skins/ui_manager.c:134
 msgid "Line Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:126
+#: src/skins/ui_manager.c:135
 msgid "Solid Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:132
+#: src/skins/ui_manager.c:141
 msgid "Ice"
 msgstr "冷蓝"
 
-#: src/skins/ui_manager.c:137
+#: src/skins/ui_manager.c:146
 msgid "Smooth"
 msgstr "平滑"
 
-#: src/skins/ui_manager.c:141 src/skins/ui_manager.c:149
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
 msgstr "最慢"
 
-#: src/skins/ui_manager.c:142 src/skins/ui_manager.c:150
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
 msgstr "慢"
 
-#: src/skins/ui_manager.c:143 src/skins/ui_manager.c:151
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
 msgstr "中速"
 
-#: src/skins/ui_manager.c:144 src/skins/ui_manager.c:152
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fast"
 msgstr "快"
 
-#: src/skins/ui_manager.c:145 src/skins/ui_manager.c:153
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
 msgstr "最快"
 
-#: src/skins/ui_manager.c:157
+#: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
 msgstr "已用时间"
 
-#: src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:167
 msgid "Time Remaining"
 msgstr "剩余时间"
 
-#: src/skins/ui_manager.c:187
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "暂停"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "上一首"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "下一首"
+
+#: src/skins/ui_manager.c:196
 msgid "Visualization"
 msgstr "可视化效果"
 
-#: src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
 msgstr "可视化模式"
 
-#: src/skins/ui_manager.c:189
+#: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
 msgstr "分析器模式"
 
-#: src/skins/ui_manager.c:190
+#: src/skins/ui_manager.c:199
 msgid "Scope Mode"
 msgstr "范围模式"
 
-#: src/skins/ui_manager.c:191
+#: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
 msgstr "声纹模式"
 
-#: src/skins/ui_manager.c:192
+#: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
 msgstr "窗口渲染VU模式"
 
-#: src/skins/ui_manager.c:193
+#: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
 msgstr "分析器减退速度"
 
-#: src/skins/ui_manager.c:194
+#: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
 msgstr "峰值减退速度"
 
-#: src/skins/ui_manager.c:204 src/skins/ui_manager.c:205
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "播放列表"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "新建播放列表"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
 msgstr "前一个播放列表"
 
-#: src/skins/ui_manager.c:207 src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
 msgstr "下一下播放列表"
 
-#: src/skins/ui_manager.c:224
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "删除播放列表"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "导入播放列表"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "把列表加载到被选中的播放列表。"
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "导出播放列表"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+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:228
+#: src/skins/ui_manager.c:235
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "刷新播放列表的歌曲信息"
+
+#: src/skins/ui_manager.c:238
 msgid "List Manager"
 msgstr "列表管理器"
 
-#: src/skins/ui_manager.c:238
+#: src/skins/ui_manager.c:239
+msgid "Opens the playlist manager."
+msgstr "打开播放列表管理器"
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "外观"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "界面"
+
+#: src/skins/ui_manager.c:245
+#, fuzzy
+msgid "Interface Preferences ..."
+msgstr "淡出设置"
+
+#: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
 msgstr "添加网络地址..."
 
-#: src/skins/ui_manager.c:242
+#: src/skins/ui_manager.c:250
+msgid "Adds a remote track to the playlist."
+msgstr "添加远程文件到播放列表"
+
+#: src/skins/ui_manager.c:253
 msgid "Add Files..."
 msgstr "添加文件..."
 
-#: src/skins/ui_manager.c:248
+#: src/skins/ui_manager.c:254
+msgid "Adds files to the playlist."
+msgstr "添加文件到播放列表。"
+
+#: src/skins/ui_manager.c:259
 msgid "Search and Select"
 msgstr "搜索/选择"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:260
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "在列表中搜索并选择符合条件的条目"
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:263
 msgid "Invert Selection"
 msgstr "反选"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:264
 msgid "Inverts the selected and unselected entries."
 msgstr "反转被选中与未被选中的条目"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:267
+msgid "Select All"
+msgstr "选中全部"
+
+#: src/skins/ui_manager.c:268
+msgid "Selects all of the playlist entries."
+msgstr "选中播放列表中的所有条目。"
+
+#: src/skins/ui_manager.c:271
+msgid "Select None"
+msgstr "取消选中"
+
+#: src/skins/ui_manager.c:272
+msgid "Deselects all of the playlist entries."
+msgstr "取消对播放列表的选择"
+
+#: src/skins/ui_manager.c:277
+msgid "Remove All"
+msgstr "清空"
+
+#: src/skins/ui_manager.c:278
+msgid "Removes all entries from the playlist."
+msgstr "清空播放列表中的所有条目。"
+
+#: src/skins/ui_manager.c:281
 msgid "Clear Queue"
 msgstr "清空队列"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:282
 msgid "Clears the queue associated with this playlist."
 msgstr "清空此列表中的队列"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:285
 msgid "Remove Unavailable Files"
 msgstr "删除不可用文件"
 
-#: src/skins/ui_manager.c:275
+#: src/skins/ui_manager.c:286
 msgid "Removes unavailable files from the playlist."
 msgstr "从播放列表中删除不可用文件"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:289
 msgid "Remove Duplicates"
 msgstr "删除重复的条目"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:353
+msgid "By Title"
+msgstr "按标题"
+
+#: src/skins/ui_manager.c:292
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "根据标题删除重复的条目"
 
-#: src/skins/ui_manager.c:284 src/skins/ui_manager.c:324
-#: src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
+#: src/skins/ui_manager.c:365
 msgid "By Filename"
 msgstr "根据文件名"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:296
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "根据文件名删除重复的条目"
 
-#: src/skins/ui_manager.c:288 src/skins/ui_manager.c:328
-#: src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
+#: src/skins/ui_manager.c:369
 msgid "By Path + Filename"
 msgstr "根据路径和文件名"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:300
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "根据文件的完整路径删除重复条目"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:303
+msgid "Remove Unselected"
+msgstr "删除未被选中的"
+
+#: src/skins/ui_manager.c:304
+msgid "Remove unselected entries from the playlist."
+msgstr "删除播放列表中未被选中的条目。"
+
+#: src/skins/ui_manager.c:307
+msgid "Remove Selected"
+msgstr "删除已选中的"
+
+#: src/skins/ui_manager.c:308
+msgid "Remove selected entries from the playlist."
+msgstr "删除播放列表中已选中的条目。"
+
+#: src/skins/ui_manager.c:313
 msgid "Randomize List"
 msgstr "打乱列表"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:314
 msgid "Randomizes the playlist."
 msgstr "播放列表随机"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:317
 msgid "Reverse List"
 msgstr "反转列表"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:318
 msgid "Reverses the playlist."
 msgstr "反转播放列表"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:321
 msgid "Sort List"
 msgstr "排序列表"
 
-#: src/skins/ui_manager.c:313 src/skins/ui_manager.c:343
+#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
 msgid "Sorts the list by title."
 msgstr "按标题"
 
-#: src/skins/ui_manager.c:317 src/skins/ui_manager.c:347
+#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+msgid "By Album"
+msgstr "按专辑"
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "Sorts the list by album."
 msgstr "按专辑"
 
-#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+msgid "By Artist"
+msgstr "按艺术家"
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "Sorts the list by artist."
 msgstr "按艺术家"
 
-#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
 msgid "Sorts the list by filename."
 msgstr "按文件名"
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
 msgid "Sorts the list by full pathname."
 msgstr "按完整路径"
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
 msgid "By Date"
 msgstr "按日期"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "Sorts the list by modification time."
 msgstr "按修改时间"
 
-#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+msgid "By Track Number"
+msgstr "按音轨号码"
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "Sorts the list by track number."
 msgstr "按音轨序号"
 
-#: src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:351
 msgid "Sort Selected"
 msgstr "排序已选中的"
 
-#: src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:387
+msgid "File"
+msgstr "文件"
+
+#: src/skins/ui_manager.c:388
+msgid "Help"
+msgstr "帮助"
+
+#: src/skins/ui_manager.c:390
 msgid "Plugin Services"
 msgstr "插件服务"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+msgid "View Track Details"
+msgstr "查看音轨信息"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View track details"
+msgstr "查看音轨信息"
+
+#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+msgid "About Audacious"
+msgstr "关于Audacious"
+
+#: src/skins/ui_manager.c:401
 msgid "Play File"
 msgstr "播放文件"
 
-#: src/skins/ui_manager.c:393
+#: src/skins/ui_manager.c:402
+msgid "Load and play a file"
+msgstr "加载并播放文件"
+
+#: src/skins/ui_manager.c:404
 msgid "Play Location"
 msgstr "播放位置"
 
+#: src/skins/ui_manager.c:405
+msgid "Play media from the selected location"
+msgstr "播放被选中位置的文件"
+
+#: src/skins/ui_manager.c:407
+msgid "Plugin services"
+msgstr "插件服务"
+
+#: src/skins/ui_manager.c:409
+msgid "Preferences"
+msgstr "首选项"
+
+#: src/skins/ui_manager.c:410
+msgid "Open preferences window"
+msgstr "打开首选项窗口"
+
+#: src/skins/ui_manager.c:413
+msgid "Quit Audacious"
+msgstr "退出Audacious"
+
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Set A-B"
+msgstr "设置A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Clear A-B"
+msgstr "清空A-B"
+
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+msgid "Jump to Playlist Start"
+msgstr "跳到被选中列表并播放"
+
+#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+msgid "Jump to Time"
+msgstr "跳到时间"
+
+#: src/skins/ui_manager.c:430
+msgid "Queue Toggle"
+msgstr "队列切换"
+
+#: src/skins/ui_manager.c:431
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "启用/禁用播放队列的条目"
+
 #: src/skins/ui_manager.c:434
+msgid "Copy"
+msgstr "复制"
+
+#: src/skins/ui_manager.c:436
+msgid "Cut"
+msgstr "剪切"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "粘贴"
+
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "载入"
 
-#: src/skins/ui_manager.c:439 src/skins/ui_manager.c:460
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "预设"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "载入预设"
 
-#: src/skins/ui_manager.c:442 src/skins/ui_manager.c:463
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "自动载入预设"
 
-#: src/skins/ui_manager.c:443
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "载入自动载入预设"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "将默认预设载入到均衡器"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "零"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "将均衡器的预设等级设置为零"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "从文件加载"
 
-#: src/skins/ui_manager.c:452
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "从文件加载预设"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "从WinAMP EQF文件加载"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "从WinAMP EQF文件加载预设"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP 预设"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "导入WinAMP预设"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "保存预设"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "保存自动加载预设"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "保存默认预设"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "保存到文件"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "保存预设到文件"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "保存到WinAMP EQF文件"
 
-#: src/skins/ui_manager.c:473
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "保存预设到WinAMP EQF文件"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "删除预设"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "删除自动加载预设"
 
-#: src/skins/ui_playlist.c:374
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "从当前播放列表中搜索条目"
 
-#: src/skins/ui_playlist.c:382
+#: 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 "
@@ -4842,104 +3608,52 @@
 "按部分字段搜索播放列表中的条目。各个字段都可以使用正则表达式，而且是不分大小"
 "字的。如果你不知道何为正则表达式，简单的输入部分你想搜索的文字亦可。"
 
-#: src/skins/ui_playlist.c:397
+#: src/skins/ui_playlist.c:260
+msgid "Title: "
+msgstr "标题："
+
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "专辑："
 
-#: src/skins/ui_playlist.c:404
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "艺术家："
 
-#: src/skins/ui_playlist.c:411
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "文件名"
 
-#: src/skins/ui_playlist.c:419
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "搜索前清空之前的结果"
 
-#: src/skins/ui_playlist.c:422
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "自动为区配条目切换队列"
 
-#: src/skins/ui_playlist.c:425
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "用匹配的条目创建新的播放列表"
 
-#: src/skins/ui_playlist.c:776
-msgid "Save as Static Playlist"
-msgstr "保存到静态播放列表"
-
-#: src/skins/ui_playlist.c:783
-msgid "Use Relative Path"
-msgstr "使用相对路径"
-
-#: src/skins/ui_playlist.c:806
-msgid "Load Playlist"
-msgstr "加载播放列表"
-
-#: src/skins/ui_playlist.c:819
-msgid "Save Playlist"
-msgstr "保存播放列表"
-
-#: src/skins/ui_playlist.c:1150
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious播放列表编辑器"
 
-#: src/skins/ui_playlist.c:1210
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "31 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:431
-msgid "63 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "125 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "250 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "500 Hz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "1 kHz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:432
-msgid "2 kHz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "4 kHz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "8 kHz"
-msgstr ""
-
-#: src/skins/ui_skinned_equalizer_slider.c:433
-msgid "16 kHz"
-msgstr ""
-
-#: src/skins/ui_skinselector.c:180
+#: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
 msgstr "已打包的Winamp 2.x主题"
 
-#: src/skins/ui_skinselector.c:185
+#: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
 msgstr "未打包的Winamp 2.x主题"
 
-#: src/skins/util.c:875
+#: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "无法创建目录(%s): %s\n"
@@ -4971,53 +3685,61 @@
 "Boston, MA 02110-1301 USA"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:158
+#: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "关于SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:316
+#: src/sndstretch/sndstretch_xmms.c:313
 msgid "Volume corr."
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:317
+#: src/sndstretch/sndstretch_xmms.c:314
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:363
+#: src/sndstretch/sndstretch_xmms.c:360
 msgid "Speed"
 msgstr "速度"
 
-#: src/sndstretch/sndstretch_xmms.c:364
+#: src/sndstretch/sndstretch_xmms.c:361
 msgid "Pitch"
 msgstr "音调"
 
-#: src/sndstretch/sndstretch_xmms.c:385
+#: src/sndstretch/sndstretch_xmms.c:362
+msgid "Scale"
+msgstr "缩放"
+
+#: src/sndstretch/sndstretch_xmms.c:363
+msgid "Options"
+msgstr "选项"
+
+#: src/sndstretch/sndstretch_xmms.c:382
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - 设置"
 
-#: src/song_change/song_change.c:463
+#: src/song_change/song_change.c:464
 msgid "Command to run when Audacious starts a new song."
 msgstr "歌曲开始播放时执行指令。"
 
-#: src/song_change/song_change.c:464 src/song_change/song_change.c:468
-#: src/song_change/song_change.c:472 src/song_change/song_change.c:476
+#: 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
 msgid "Command:"
 msgstr "指令："
 
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:468
 msgid "Command to run toward the end of a song."
 msgstr "歌曲即将完成时执行指令。"
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:472
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "当Audacious播放到列表结尾时执行指令。"
 
-#: src/song_change/song_change.c:475
+#: src/song_change/song_change.c:476
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr "歌曲的标题改变时执行指令(如: 网络媒体的标题)。"
 
-#: src/song_change/song_change.c:479
+#: src/song_change/song_change.c:480
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -5051,7 +3773,7 @@
 "%b: 专辑\n"
 "%T: 音轨标题"
 
-#: src/song_change/song_change.c:506
+#: src/song_change/song_change.c:507
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -5059,18 +3781,14 @@
 "传递到Shell的参数一定要用引号包围，否则会是一件相当危险的"
 "事。"
 
-#: src/song_change/song_change.c:517
+#: src/song_change/song_change.c:518
 msgid "Commands"
 msgstr "指令"
 
-#: src/song_change/song_change.c:553
+#: src/song_change/song_change.c:555
 msgid "Song Change"
 msgstr "歌曲改变"
 
-#: src/spectrum/spectrum.c:90
-msgid "Spectrum Analyzer"
-msgstr "光谱分析器"
-
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
 msgstr "关于状态图标插件"
@@ -5142,70 +3860,19 @@
 "\n"
 "作者: Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:69
+#: src/stereo_plugin/stereo.c:65
 msgid "About Extra Stereo Plugin"
 msgstr "About Extra Stereo插件"
 
-#: src/stereo_plugin/stereo.c:106
+#: src/stereo_plugin/stereo.c:102
 msgid "Configure Extra Stereo"
 msgstr "设置Extra Stereo"
 
-#: src/streambrowser/gui/streambrowser_win.c:74
-msgid "Search:"
-msgstr "搜索："
-
-#: src/streambrowser/gui/streambrowser_win.c:93
-#: src/streambrowser/gui/streambrowser_win.c:368
-msgid "Add Bookmark"
-msgstr "添加书签"
-
-#: src/streambrowser/gui/streambrowser_win.c:320
-msgid "Stream name"
-msgstr "流名称"
-
-#: src/streambrowser/gui/streambrowser_win.c:327
-msgid "Now playing"
-msgstr "正在播放"
-
-#: src/streambrowser/gui/streambrowser_win.c:365
-msgid "Remove Bookmark"
-msgstr "删除书签"
-
-#: src/streambrowser/streambrowser.c:340
-msgid "About Stream Browser"
-msgstr "关于流查看器"
-
-#: src/streambrowser/streambrowser.c:341
-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."
-
-#: src/tonegen/tonegen.c:56
+#: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "关于Tone Generator"
 
-#: src/tonegen/tonegen.c:58
+#: src/tonegen/tonegen.c:50
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -5214,12 +3881,12 @@
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:108
+#: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
 msgstr ""
 
@@ -5240,15 +3907,15 @@
 msgid "Ogg Vorbis Tags"
 msgstr "Ogg Vorbis标签"
 
-#: src/vorbis/configure.c:68
+#: src/vorbis/configure.c:69
 msgid "Ogg Vorbis Audio Plugin Configuration"
 msgstr "Ogg Vorbis音频播放设置"
 
-#: src/vorbis/vorbis.c:526
+#: src/vorbis/vorbis.c:581
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "关于Ogg Vorbis音频插件"
 
-#: src/vorbis/vorbis.c:531
+#: src/vorbis/vorbis.c:586
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -5320,5 +3987,1196 @@
 "插件部分代码来自Miles Egan\n"
 "登录Wavpack网站http://www.wavpack.com/\n"
 
+#~ msgid "Use Bitmap fonts if available"
+#~ msgstr "尽可能使用点阵字体"
+
+#~ msgid ""
+#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
+#~ "Unicode strings."
+#~ msgstr "尽可能使用点阵字体，点阵字体不支持Unicode设置"
+
+#~ msgid "_Miscellaneous"
+#~ msgstr "其它(_M)"
+
+#~ msgid "Use two-way text scroller"
+#~ msgstr "使用双向字符滚动"
+
+#~ msgid "About "
+#~ msgstr "关于"
+
+#~ 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"
+#~ "版权所有 (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"
+#~ "详情请登录http://www.gnu.org/licenses/lgpl.html.\n"
+#~ "\n"
+#~ "此插件基于AdPlug库, 版权所有 (C) Simon Peter, et al.\n"
+#~ "当前AdPlug版本: "
+
+#~ msgid "AdPlug :: Configuration"
+#~ msgstr "AdPlug :: 设置"
+
+#~ msgid "Sound quality"
+#~ msgstr "音质"
+
+#~ msgid "Resolution"
+#~ msgstr "分辨率"
+
+#~ msgid "Channels"
+#~ msgstr "声道"
+
+#~ 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 ""
+#~ "设置为立体音是不推荐的做法，除非你知道自己在做什么。此选项不会带来任何立体"
+#~ "音效果（OPL2只能是单声道的），相反只会占用更多的CPU!"
+
+#~ msgid "Frequency"
+#~ msgstr "频率"
+
+#~ msgid "Detect songend"
+#~ msgstr "检测歌曲结尾"
+
+#~ 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 ""
+#~ "如果启用，XMMS将尝试测试歌曲的结尾，并在结束时，自动播放列表中的下一首歌"
+#~ "曲。\n"
+#~ "如果禁用，XMMS将因无法得知歌曲的结尾而不断重复播放同一首歌曲。"
+
+#~ msgid "Formats"
+#~ msgstr "格式"
+
+#~ msgid "Format selection"
+#~ msgstr "格式选择"
+
+#~ msgid "Format"
+#~ msgstr "格式"
+
+#~ msgid "Extension"
+#~ msgstr "后缀"
+
+#~ 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 ""
+#~ "被选中文件类型会被识别并被此插件播放。\n"
+#~ "未选中的，则会被忽略并由其它插件播放"
+
+#~ msgid "AdPlug :: File Info"
+#~ msgstr "AdPlug :: 文件信息"
+
+#~ msgid "Author: "
+#~ msgstr "作者："
+
+#~ msgid "File Type: "
+#~ msgstr "文件类型："
+
+#~ msgid "Subsongs: "
+#~ msgstr "子歌曲："
+
+#~ msgid "Instruments: "
+#~ msgstr "乐器："
+
+#~ msgid "Orders: "
+#~ msgstr "顺序："
+
+#~ msgid "Patterns: "
+#~ msgstr "格调："
+
+#~ msgid "Song"
+#~ msgstr "歌曲"
+
+#~ msgid "Instrument name"
+#~ msgstr "乐器名"
+
+#~ msgid "Song message"
+#~ msgstr "歌曲信息"
+
+#~ msgid "Subsong selection"
+#~ msgstr "子歌曲选项"
+
+#~ msgid "Order: "
+#~ msgstr "顺序："
+
+#~ msgid "Pattern: "
+#~ msgstr "格调："
+
+#~ msgid "Row: "
+#~ msgstr "行："
+
+#~ msgid "Speed: "
+#~ msgstr "速度："
+
+#~ 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'配对请求"
+
+#~ msgid "Authorization request for %s"
+#~ msgstr "'%s'要求认证"
+
+#~ msgid "Created bonding with %s"
+#~ msgstr "正在绑定%s"
+
+#~ msgid "Removed bonding with %s"
+#~ msgstr "正在解除%s"
+
+#~ msgid "Device has been switched off"
+#~ msgstr "设备已关闭"
+
+#~ msgid "Device has been made non-discoverable"
+#~ msgstr "设备不可连接"
+
+#~ msgid "Device has been made connectable"
+#~ msgstr "设备可连接"
+
+#~ msgid "Device has been made discoverable"
+#~ msgstr "设备无法恢复"
+
+#~ msgid "Device has been made limited discoverable"
+#~ msgstr "设备部分可恢复"
+
+#~ msgid "Device has been switched into pairing mode"
+#~ msgstr "设备已切转配对模式"
+
+#~ msgid "Bluetooth headset support plugin"
+#~ msgstr "蓝牙耳机支持插件"
+
+#~ 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耳机支持\n"
+#~ "版权所有 (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
+#~ "GSoC 2008 Project - 非常感谢我的导师Tony Vroon及Audacious开发小组\n"
+#~ " \n"
+#~ "要使用AVRCP，你必需为内核加载uinput模块。\n"
+#~ "耳机上的键将会被识别为一般的多媒体键，\n"
+#~ "你可以通过Audacious全局热键插件或窗口管理器提供的工具进行配置。\n"
+
+#~ msgid "Producer"
+#~ msgstr "生产商"
+
+#~ msgid "Available Headsets"
+#~ msgstr "可用耳机"
+
+#~ msgid "Current Headset"
+#~ msgstr "当前耳机"
+
+#~ msgid "_Connect"
+#~ msgstr "连接(_C)"
+
+#~ msgid "Class"
+#~ msgstr "类型"
+
+#~ msgid "Address:"
+#~ msgstr "地址："
+
+#~ msgid "Bonding finish!"
+#~ msgstr "绑定完成！"
+
+#~ msgid "No devices found!"
+#~ msgstr "未找到设备！"
+
+#~ msgid "Scanning..."
+#~ msgstr "正在扫描..."
+
+#~ msgid "Pairing..."
+#~ msgstr "正在配对..."
+
+#~ msgid "Rescan"
+#~ msgstr "重新扫描"
+
+#~ msgid "Playback->Play"
+#~ msgstr "回放->播放"
+
+#~ msgid "Playback->Stop"
+#~ msgstr "回放->停止"
+
+#~ msgid "Playback->Pause"
+#~ msgstr "回放->暂停"
+
+#~ msgid "Playback->Prev"
+#~ msgstr "回放->前一首"
+
+#~ msgid "Playback->Next"
+#~ msgstr "回放->下一首"
+
+#~ msgid "Playback->Eject"
+#~ msgstr "回放->弹出"
+
+#~ msgid "Playlist->Repeat"
+#~ msgstr "列表->重复"
+
+#~ msgid "Playlist->Shuffle"
+#~ msgstr "列表->随机"
+
+#~ msgid "Volume->Up_5"
+#~ msgstr "音量->+5"
+
+#~ msgid "Volume->Down_5"
+#~ msgstr "音量->-5"
+
+#~ msgid "Volume->Up_10"
+#~ msgstr "音量->+10"
+
+#~ msgid "Volume->Down_10"
+#~ msgstr "音量->-10"
+
+#~ msgid "Volume->Mute"
+#~ msgstr "音量->静音"
+
+#~ msgid "Window->Main"
+#~ msgstr "窗口->主界面"
+
+#~ msgid "Window->Playlist"
+#~ msgstr "窗口->播放列表"
+
+#~ msgid "Window->Equalizer"
+#~ msgstr "窗口->均衡器"
+
+#~ msgid "Window->JumpToFile"
+#~ msgstr "窗口->跳到文件"
+
+#~ 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 ""
+#~ "event-device-plugin: 无法打开设备文件 %s，忽略此设备；请检查文件是否存在及"
+#~ "你是否对其有读取权限\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to create a io_channel for device file %s ,"
+#~ "skipping this device\n"
+#~ msgstr "event-device-plugin: 无法为设备文件 %s 创建io_channel，忽略此设备\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to open /proc/bus/input/devices , automatic "
+#~ "detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: 无法打开/proc/bus/input/devices, 自动检测event设备无"
+#~ "法工作。\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 ""
+#~ "event-device-plugin: 无法为/proc/bus/input/devices打开io_channel，自动检测"
+#~ "event设备无法工作。\n"
+
+#~ msgid ""
+#~ "event-device-plugin: an error occurred while reading /proc/bus/input/"
+#~ "devices , automatic detection of event devices won't work.\n"
+#~ msgstr ""
+#~ "event-device-plugin: 读取/proc/bus/input/devices时发生错误，自动检测event"
+#~ "设备无法工作。\n"
+
+#~ msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
+#~ msgstr "event-device-plugin: /dev/input中不存在设备%s，已忽略。\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to load config file %s , default settings "
+#~ "will be used.\n"
+#~ msgstr "event-device-plugin: 无法加载配置文件 %s , 将使用默认设置。\n"
+
+#~ msgid ""
+#~ "event-device-plugin: incomplete information in config file for device \"%s"
+#~ "\" , skipping.\n"
+#~ msgstr "event-device-plugin: 设备\"%s\"在配置文件中的信息不完整，已忽略。\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_active value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: 配置文件，无法取得设备\"%s\" is_active的值, 已忽略.\n"
+
+#~ msgid ""
+#~ "event-device-plugin: unable to access local directory %s , settings will "
+#~ "not be saved.\n"
+#~ msgstr "event-device-plugin: 无法访问目录 %s , 设置无法保存。\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get filename value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: 配置文件，无法取得设备\"%s\"的文件名, 已忽略。\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get phys value for device "
+#~ "\"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: 配置文件, 无法取得设备\"%s\"的phys值，已忽略。\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unable to get is_custom value for "
+#~ "device \"%s\", skipping it.\n"
+#~ msgstr ""
+#~ "event-device-plugin: 配置文件，无法取得设备\"%s\" is_custon的值, 已忽"
+#~ "略。\n"
+
+#~ msgid ""
+#~ "event-device-plugin: configuration, unexpected value for device \"%s\", "
+#~ "skipping it.\n"
+#~ msgstr "event-device-plugin: 配置文件, 设备\"%s\"的值非法, 已忽略。\n"
+
+#~ msgid "Detected"
+#~ msgstr "检测到"
+
+#~ msgid "Custom"
+#~ msgstr "定制"
+
+#~ msgid "Not Detected"
+#~ msgstr "未检测到"
+
+#~ msgid "Information"
+#~ msgstr "信息"
+
+#~ msgid ""
+#~ "Cannot open bindings window for a not-detected device.\n"
+#~ "Ensure that the device has been correctly plugged in."
+#~ msgstr ""
+#~ "无法为未检测到的设备打开绑定窗口。\n"
+#~ "请重新确认设备已正确连接。"
+
+#~ msgid ""
+#~ "Unable to open selected device.\n"
+#~ "Please check read permissions on device file."
+#~ msgstr ""
+#~ "无法打开选中的设备。\n"
+#~ "请检查设备文件的权限。"
+
+#~ msgid "EvDev-Plug - Add custom device"
+#~ msgstr "EvDev-Plug - 添加自定义设备"
+
+#~ 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正在尝试自动检测和更新系统上可用的event设备信息\n"
+#~ "如果自动检测失败，或者你的event设备不在标准位置（现在只在/dev/input/中搜"
+#~ "索，\n"
+#~ "你就要手动添加设备，并明确指定名称及设备文件。"
+
+#~ msgid "Device name:"
+#~ msgstr "设备名："
+
+#~ msgid "Device file:"
+#~ msgstr "设备文件："
+
+#~ msgid "(custom)"
+#~ msgstr "(定制)"
+
+#~ msgid ""
+#~ "Please specify both name and filename.\n"
+#~ "Filename must be specified with absolute path."
+#~ msgstr ""
+#~ "请指定名称及文件名。\n"
+#~ "文件名必需为绝对路径。"
+
+#~ msgid ""
+#~ "Do you want to remove the existing configuration for selected device?\n"
+#~ msgstr "你要删除选中设备现有的配置文件吗？\n"
+
+#~ msgid "Do you want to remove the selected custom device?\n"
+#~ msgstr "你要删除选中的自定义设备吗？\n"
+
+#~ msgid "EvDev-Plug - Configuration"
+#~ msgstr "EvDev-Plug - 设置"
+
+#~ msgid "Active"
+#~ msgstr "已激活"
+
+#~ msgid "Status"
+#~ msgstr "状态"
+
+#~ msgid "Device Name"
+#~ msgstr "设备名"
+
+#~ msgid "Device File"
+#~ msgstr "设备文件"
+
+#~ msgid "Device Address"
+#~ msgstr "设备地址"
+
+#~ msgid "_Bindings"
+#~ msgstr "绑定(_B)"
+
+#~ 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 ""
+#~ "请在设备上按下你要绑定的键；如果5秒内未无操作，窗口将自动关闭并取消绑定。"
+
+#~ msgid "EvDev-Plug - Bindings Configuration"
+#~ msgstr "EvDev-Plug - 绑定设置"
+
+#~ msgid "Name: "
+#~ msgstr "名称："
+
+#~ msgid "Filename: "
+#~ msgstr "文件名："
+
+#~ msgid "Phys.Address: "
+#~ msgstr "物理地址："
+
+#~ msgid "EvDev-Plug - about"
+#~ msgstr "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"
+#~ "event设备远程控制播放器\n"
+#~ "http://www.develia.org/projects.php?p=audacious#evdevplug\n"
+#~ "\n"
+#~ "作者： Giacomo Lozito\n"
+
+#~ msgid "This LADSPA plugin has no user controls"
+#~ msgstr "LADSPA插件未被其它人所用"
+
+#~ msgid "Name"
+#~ msgstr "名字"
+
+#~ msgid "UID"
+#~ msgstr "UID"
+
+#~ msgid "Installed plugins"
+#~ msgstr "已安装插件"
+
+#~ msgid "Running plugins"
+#~ msgstr "运行中的插件"
+
+#~ msgid "Add"
+#~ msgstr "添加"
+
+#~ msgid "Remove"
+#~ msgstr "删除"
+
+#~ msgid "LADSPA Plugin Catalog"
+#~ msgstr "LDASPA插件分类"
+
+#~ msgid "About LIRC Audacious Plugin"
+#~ msgstr "关于LIRC Audacious插件"
+
+#~ msgid "LIRC Plugin "
+#~ msgstr "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"
+#~ "让你能够通过LIRC控制Audacious的小插件。\n"
+#~ "由Tony Vroon <chainsaw@gentoo.org>用XMMS LIRC插件为Audacious进行移植。\n"
+#~ "XMMS LIRC插件作者:\n"
+#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
+#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
+#~ "Andrew O. Shadoura <bugzilla@tut.by>\n"
+#~ "你可以在http://lirc.org上找到更多关于LIRC的信息"
+
+#~ msgid "LIRC plugin settings"
+#~ msgstr "LIRC插件设置"
+
+#~ msgid "Reconnect to LIRC server"
+#~ msgstr "重新连接到LIRC服务器"
+
+#~ msgid "Timeout before reconnecting (seconds): "
+#~ msgstr "超时后尝试重新连接(秒):"
+
+#~ msgid "Reconnect"
+#~ msgstr "重新连接"
+
+#~ msgid "Connection"
+#~ msgstr "连接"
+
+#~ msgid "%s: could not init LIRC support\n"
+#~ msgstr "%s: 无法初始化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: 未能读取LIRC的设置文件\n"
+#~ "%s: 请阅读LIRC相关文档\n"
+#~ "%s: 并创建正确的设置文件\n"
+
+#~ msgid "%s: trying to reconnect...\n"
+#~ msgstr "%s: 正尝试重新连接...\n"
+
+#~ msgid "%s: unknown command \"%s\"\n"
+#~ msgstr "%s: 未知指令 \"%s\"\n"
+
+#~ msgid "%s: disconnected from LIRC\n"
+#~ msgstr "%s: 已从LIRC上断开连接\n"
+
+#~ msgid "%s: will try reconnect every %d seconds...\n"
+#~ msgstr "%s: 尝试每%d秒重新连接一次...\n"
+
+#~ msgid "ModPlug Configuration"
+#~ msgstr "ModPlug设置"
+
+#~ msgid "Mono (downmix)"
+#~ msgstr "单音道(downmix)"
+
+#~ msgid "Nearest (fastest)"
+#~ msgstr "最接近(最快)"
+
+#~ msgid "Linear (fast)"
+#~ msgstr "线性(快速)"
+
+#~ msgid "Spline (good quality)"
+#~ msgstr "Spline(高质量)"
+
+#~ msgid "8-tap Fir (extremely high quality)"
+#~ msgstr "8-tap Fir(最高质量)"
+
+#~ msgid "Sampling Rate"
+#~ msgstr "取样率"
+
+#~ msgid "Enable"
+#~ msgstr "启用"
+
+#~ msgid "Depth"
+#~ msgstr "深度"
+
+#~ msgid "Delay"
+#~ msgstr "延时"
+
+#~ msgid "Reverb"
+#~ msgstr "余响"
+
+#~ msgid "Amount"
+#~ msgstr "总量"
+
+#~ msgid "Range"
+#~ msgstr "范围"
+
+#~ msgid "Bass Boost"
+#~ msgstr "低音增强"
+
+#~ msgid ""
+#~ "Note: Setting the preamp\n"
+#~ "too high may cause clipping\n"
+#~ "(annoying clicks and pops)!"
+#~ msgstr "注意： 前置放大器的值太高会导致削波!"
+
+#~ msgid "Effects"
+#~ msgstr "音效"
+
+#~ msgid "Use Filename as Song Title"
+#~ msgstr "用文件名作为歌曲标题"
+
+#~ msgid "Fast Playlist Info"
+#~ msgstr "快速播放列表信息"
+
+#~ msgid "Noise Reduction"
+#~ msgstr "降噪"
+
+#~ msgid "Play Amiga MOD"
+#~ msgstr "播放Amiga MOD"
+
+#~ msgid "Don't loop"
+#~ msgstr "不要循环"
+
+#~ msgid "Loop"
+#~ msgstr "循环"
+
+#~ msgid "time(s)"
+#~ msgstr "时间(s)"
+
+#~ msgid "Loop forever"
+#~ msgstr "无限循环"
+
+#~ msgid "Looping"
+#~ msgstr "循环"
+
+#~ msgid "MOD Info"
+#~ msgstr "MOD信息"
+
+#~ msgid ""
+#~ "Filename:\n"
+#~ "Title:\n"
+#~ "Type:\n"
+#~ "Length:\n"
+#~ "Speed:\n"
+#~ "Tempo:\n"
+#~ "Samples:\n"
+#~ "Instruments:\n"
+#~ "Patterns:\n"
+#~ "Channels:"
+#~ msgstr ""
+#~ "文件名:\n"
+#~ "标题:\n"
+#~ "类型:\n"
+#~ "长度:\n"
+#~ "速度:\n"
+#~ "节奏:\n"
+#~ "取样:\n"
+#~ "乐器:\n"
+#~ "格调:\n"
+#~ "声道:"
+
+#~ msgid "Samples"
+#~ msgstr "取样"
+
+#~ msgid "Instruments"
+#~ msgstr "乐器"
+
+#~ msgid "Message"
+#~ msgstr "信息"
+
+#~ msgid "Modplug Input Plugin for Audacious ver"
+#~ msgstr "Audacious的Modplug输入插件"
+
+#~ 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声音引擎作者：Olivier Lapicque。\n"
+#~ "Modplug的XMMS接口作者是：Kenton Varda.\n"
+#~ "版权所有 (c) 2000 Olivier Lapicque及Kenton Varda.\n"
+#~ "更新及维护：Konstanty Bialkowski.\n"
+#~ "BMP的移植：Theofilos Intzoglou."
+
+#~ msgid "About Modplug"
+#~ msgstr "关于Modplug"
+
+#~ msgid "Show separators in playlist"
+#~ msgstr "在播放列表中显示分隔符"
+
+#~ msgid "Show window manager decoration"
+#~ msgstr "显示窗口管理器的装饰"
+
+#~ msgid "This enables the window manager to show decorations for windows."
+#~ msgstr "此选项将允许显示窗口管理器的装饰"
+
+#~ 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 "如果启用，主界面上的文件信息将来回滚动，否则只能向一个方向滚动。"
+
+#~ msgid "Disable inline gtk theme"
+#~ msgstr "禁用内部gtk主题"
+
+#~ msgid "Random skin on play"
+#~ msgstr "启动时随机选择主题"
+
+#~ msgid "Allow loading incomplete skins"
+#~ msgstr "允许加载不完整的主题"
+
+#~ msgid ""
+#~ "If selected, audacious won't refuse loading broken skins. Use only if "
+#~ "your favourite skin doesn't work"
+#~ msgstr ""
+#~ "如果启用，audacious将允许加载破损的主题。如果你喜欢的主题无法使用，可试试"
+#~ "启用此选项"
+
+#~ msgid "Color Adjustment"
+#~ msgstr "颜色调整"
+
+#~ msgid ""
+#~ "Audacious allows you to alter the color balance of the skinned UI. The "
+#~ "sliders below will allow you to do this."
+#~ msgstr "Audacious允许你修改主题界面的颜色平衡。调整滑动条即可"
+
+#~ msgid "Blue"
+#~ msgstr "蓝"
+
+#~ msgid "Green"
+#~ msgstr "绿"
+
+#~ msgid "Red"
+#~ msgstr "红"
+
+#~ msgid "Color adjustment ..."
+#~ msgstr "颜色调整..."
+
+#~ msgid "Disable 'GUI Scaling'"
+#~ msgstr "禁用“界面缩放”"
+
+#~ msgid "Enable 'GUI Scaling'"
+#~ msgstr "启用“界面缩放”"
+
+#~ msgid "DoubleSize"
+#~ msgstr "双倍大小"
+
+#~ msgid "Easy Move"
+#~ msgstr "简易移动"
+
+#~ 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"
+
+#~ msgid "minutes:seconds"
+#~ msgstr "分:秒"
+
+#~ msgid "Track length:"
+#~ msgstr "音轨长度"
+
+#~ msgid "Error writing playlist \"%s\": %s"
+#~ msgstr "写入播放列表\"%s\"时发生错误: %s"
+
 #~ msgid "%s already exist. Continue?"
 #~ msgstr "%s已存在，要继续吗？"
+
+#~ msgid "Show/hide infoarea"
+#~ msgstr "显示/隐藏信息区域"
+
+#~ msgid "Show main menu"
+#~ msgstr "显示主菜单"
+
+#~ msgid "Show/hide main menu"
+#~ msgstr "显示/隐藏主菜单"
+
+#~ msgid "Show/hide statusbar"
+#~ msgstr "显示/隐藏状态栏"
+
+#~ msgid "Import Playlist ..."
+#~ msgstr "导入播放列表..."
+
+#~ msgid "Export Playlist ..."
+#~ msgstr "导出播放列表..."
+
+#~ msgid "Refresh"
+#~ msgstr "刷新"
+
+#~ msgid "Refresh Selected"
+#~ msgstr "刷新已选中的"
+
+#~ msgid "Refreshes metadata associated with selected entries."
+#~ msgstr "刷新已选中的歌曲信息"
+
+#~ msgid "Edit title"
+#~ msgstr "编辑标题"
+
+#~ msgid "Edit the playlist title."
+#~ msgstr "根据播放列表标题"
+
+#~ msgid "By Formatted Title"
+#~ msgstr "按标题"
+
+#~ msgid "Components"
+#~ msgstr "组件"
+
+#~ msgid "Upload selected track(s)"
+#~ msgstr "上传选中的文件"
+
+#~ msgid "MTP device handler"
+#~ msgstr "MTP设备句柄"
+
+#~ msgid "Show main player window"
+#~ msgstr "显示主界面"
+
+#~ msgid "Ignore"
+#~ msgstr "忽略"
+
+#~ 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启动时已经隐藏所有的窗口。\n"
+#~ "你可能希望通过播放窗口来控制Audacious；否则你只能通过audtool或其它插件"
+#~ "（如：状态图标插件）进行控制。"
+
+#~ msgid "Always ignore, show/hide is controlled remotely"
+#~ msgstr "总是忽略，显示/隐藏远程控制状态"
+
+#~ msgid "Audacious - broken GTK engine usage warning"
+#~ msgstr "Audacious - 破损的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>正在使用损坏的GTK引擎</big>\n"
+#~ "\n"
+#~ "Audacious检测到你正在使用一个已经损坏的GTK引擎。\n"
+#~ "\n"
+#~ "你正在使用的GTK引擎%s, 与现在主题的部分特性并不兼容。当前会话已禁用"
+#~ "不兼容部分的特性。\n"
+#~ " \n"
+#~ "要使用此特性，请考虑使用其它的GTK引擎。"
+
+#~ msgid "Do not display this warning again"
+#~ msgstr "不要再提示"
+
+#~ msgid "Save as Static Playlist"
+#~ msgstr "保存到静态播放列表"
+
+#~ msgid "Use Relative Path"
+#~ msgstr "使用相对路径"
+
+#~ msgid "Load Playlist"
+#~ msgstr "加载播放列表"
+
+#~ msgid "Save Playlist"
+#~ msgstr "保存播放列表"
+
+#~ msgid "Skinned Interface"
+#~ msgstr "主题化界面"

audacious-plugins-2.5.3.tar.gz/src/CoreAudio/coreaudio.c -> audacious-plugins-3.0.tar.gz/src/CoreAudio/coreaudio.c Changed

audacious-plugins-2.5.3.tar.gz/src/OSS/OSS.c -> audacious-plugins-3.0.tar.gz/src/OSS/OSS.c Changed

audacious-plugins-2.5.3.tar.gz/src/aac/libmp4.c -> audacious-plugins-3.0.tar.gz/src/aac/libmp4.c Changed

audacious-plugins-2.5.3.tar.gz/src/adplug/adplug-xmms.cc -> audacious-plugins-3.0.tar.gz/src/adplug/adplug-xmms.cc Changed

@@ -120,330 +120,6 @@
 
 #endif
 
-/***** [Dialog]: Utility functions *****/
-
-static GtkWidget *
-make_framed (GtkWidget * what, const gchar * label)
-{
- GtkWidget *framebox = gtk_frame_new (label);
-
- gtk_container_add (GTK_CONTAINER (framebox), what);
- return framebox;
-}
-
-static GtkWidget *
-print_left (const gchar * text)
-{
- GtkLabel *label = GTK_LABEL (gtk_label_new (text));
-
- gtk_label_set_justify (label, GTK_JUSTIFY_LEFT);
- gtk_misc_set_padding (GTK_MISC (label), 2, 2);
- return GTK_WIDGET (label);
-}
-
-/***** Dialog boxes *****/
-
-extern "C" void
-adplug_about (void)
-{
- if (!about_win)
- {
- gchar *about_title = g_strjoin ("", _("About "), ADPLUG_NAME, NULL);
- const gchar *version_text = CAdPlug::get_version ().c_str ();
- gchar *about_text = g_strjoin ("", ADPLUG_NAME,
- _
- ("\nCopyright (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\nThis plugin uses the AdPlug library, which is copyright (C) Simon Peter, et al.\n"
- "Linked AdPlug library version: "),
- version_text, NULL);
- audgui_simple_message (& about_win, GTK_MESSAGE_INFO, about_title, about_text);
- g_free (about_text);
- g_free (about_title);
- }
-}
-
-static void
-close_config_box_ok (GtkButton * button, GPtrArray * rblist)
-{
- // Apply configuration settings
- conf.bit16 =
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
- (g_ptr_array_index (rblist, 0)));
- conf.stereo =
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
- (g_ptr_array_index (rblist, 1)));
-
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON (g_ptr_array_index (rblist, 2))))
- conf.freq = 11025;
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON (g_ptr_array_index (rblist, 3))))
- conf.freq = 22050;
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON (g_ptr_array_index (rblist, 4))))
- conf.freq = 44100;
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON (g_ptr_array_index (rblist, 5))))
- conf.freq = 48000;
-
- conf.endless =
- !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
- (g_ptr_array_index (rblist, 6)));
-
- conf.players = *(CPlayers *) g_ptr_array_index (rblist, 7);
- delete (CPlayers *) g_ptr_array_index (rblist, 7);
-
- g_ptr_array_free (rblist, FALSE);
-}
-
-static void
-close_config_box_cancel (GtkButton * button, GPtrArray * rblist)
-{
- delete (CPlayers *) g_ptr_array_index (rblist, 7);
- g_ptr_array_free (rblist, FALSE);
-}
-
-static void
-config_fl_row_select (GtkCList * fl, gint row, gint col,
- GdkEventButton * event, CPlayers * pl)
-{
- pl->push_back ((CPlayerDesc *) gtk_clist_get_row_data (fl, row));
- pl->unique ();
-}
-
-static void
-config_fl_row_unselect (GtkCList * fl, gint row, gint col,
- GdkEventButton * event, CPlayers * pl)
-{
- pl->remove ((CPlayerDesc *) gtk_clist_get_row_data (fl, row));
-}
-
-extern "C" void
-adplug_config (void)
-{
- GtkDialog *config_dlg = GTK_DIALOG (gtk_dialog_new ());
- GtkNotebook *notebook = GTK_NOTEBOOK (gtk_notebook_new ());
- GtkTable *table;
- GtkTooltips *tooltips = gtk_tooltips_new ();
- GPtrArray *rblist = g_ptr_array_new ();
-
- gtk_window_set_title (GTK_WINDOW (config_dlg), _("AdPlug :: Configuration"));
- gtk_window_set_policy (GTK_WINDOW (config_dlg), FALSE, FALSE, TRUE); // Window is auto sized
- gtk_window_set_modal (GTK_WINDOW (config_dlg), TRUE);
- gtk_container_add (GTK_CONTAINER (config_dlg->vbox), GTK_WIDGET (notebook));
-
- // Add Ok & Cancel buttons
- {
- GtkWidget *button;
-
- button = gtk_button_new_with_label (_("Ok"));
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (close_config_box_ok), (gpointer) rblist);
- g_signal_connect_data (G_OBJECT (button), "clicked",
- G_CALLBACK (gtk_widget_destroy),
- GTK_OBJECT (config_dlg), NULL,
- (GConnectFlags) (G_CONNECT_AFTER |
- G_CONNECT_SWAPPED));
- gtk_container_add (GTK_CONTAINER (config_dlg->action_area), button);
-
- button = gtk_button_new_with_label (_("Cancel"));
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (close_config_box_cancel),
- (gpointer) rblist);
- g_signal_connect_swapped (G_OBJECT (button), "clicked",
- G_CALLBACK (gtk_widget_destroy),
- GTK_OBJECT (config_dlg));
- gtk_container_add (GTK_CONTAINER (config_dlg->action_area), button);
- }
-
- /***** Page 1: General *****/
-
- table = GTK_TABLE (gtk_table_new (1, 2, TRUE));
- gtk_table_set_row_spacings (table, 5);
- gtk_table_set_col_spacings (table, 5);
- gtk_notebook_append_page (notebook, GTK_WIDGET (table),
- print_left (_("General")));
-
- // Add "Sound quality" section
- {
- GtkTable *sqt = GTK_TABLE (gtk_table_new (2, 2, FALSE));
- GtkVBox *fvb;
- GtkRadioButton *rb;
-
- gtk_table_set_row_spacings (sqt, 5);
- gtk_table_set_col_spacings (sqt, 5);
- gtk_table_attach_defaults (table,
- make_framed (GTK_WIDGET (sqt),
- _("Sound quality")), 0, 1, 0, 1);
-
- // Add "Resolution" section
- fvb = GTK_VBOX (gtk_vbox_new (TRUE, 0));
- gtk_table_attach_defaults (sqt,
- make_framed (GTK_WIDGET (fvb), _("Resolution")),
- 0, 1, 0, 1);
- rb = GTK_RADIO_BUTTON (gtk_radio_button_new_with_label (NULL, _("8bit")));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), !conf.bit16);
- gtk_container_add (GTK_CONTAINER (fvb), GTK_WIDGET (rb));
- rb =
- GTK_RADIO_BUTTON (gtk_radio_button_new_with_label_from_widget
- (rb, _("16bit")));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), conf.bit16);
- gtk_container_add (GTK_CONTAINER (fvb), GTK_WIDGET (rb));
- g_ptr_array_add (rblist, (gpointer) rb);
-
- // Add "Channels" section
- fvb = GTK_VBOX (gtk_vbox_new (TRUE, 0));
- gtk_table_attach_defaults (sqt,
- make_framed (GTK_WIDGET (fvb), _("Channels")), 0,
- 1, 1, 2);
- rb = GTK_RADIO_BUTTON (gtk_radio_button_new_with_label (NULL, _("Mono")));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), !conf.stereo);
- gtk_container_add (GTK_CONTAINER (fvb), GTK_WIDGET (rb));
- rb =
- GTK_RADIO_BUTTON (gtk_radio_button_new_with_label_from_widget
- (rb, _("Stereo")));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), conf.stereo);
- gtk_container_add (GTK_CONTAINER (fvb), GTK_WIDGET (rb));
- gtk_tooltips_set_tip (tooltips, GTK_WIDGET (rb),
- _("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!"), NULL);
- g_ptr_array_add (rblist, (gpointer) rb);
-
- // Add "Frequency" section
- fvb = GTK_VBOX (gtk_vbox_new (TRUE, 0));
- gtk_table_attach_defaults (sqt,
- make_framed (GTK_WIDGET (fvb), _("Frequency")), 1,
- 2, 0, 2);
- rb = GTK_RADIO_BUTTON (gtk_radio_button_new_with_label (NULL, "11025"));
- if (conf.freq == 11025)
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), TRUE);
- gtk_container_add (GTK_CONTAINER (fvb), GTK_WIDGET (rb));
- g_ptr_array_add (rblist, (gpointer) rb);
- rb =
- GTK_RADIO_BUTTON (gtk_radio_button_new_with_label_from_widget
- (rb, "22050"));
- if (conf.freq == 22050)
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), TRUE);
- gtk_container_add (GTK_CONTAINER (fvb), GTK_WIDGET (rb));
- g_ptr_array_add (rblist, (gpointer) rb);
- rb =
- GTK_RADIO_BUTTON (gtk_radio_button_new_with_label_from_widget
- (rb, "44100"));
- if (conf.freq == 44100)
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), TRUE);
- gtk_container_add (GTK_CONTAINER (fvb), GTK_WIDGET (rb));
- g_ptr_array_add (rblist, (gpointer) rb);
- rb =
- GTK_RADIO_BUTTON (gtk_radio_button_new_with_label_from_widget
- (rb, "48000"));
- if (conf.freq == 48000)
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), TRUE);
- gtk_container_add (GTK_CONTAINER (fvb), GTK_WIDGET (rb));
- g_ptr_array_add (rblist, (gpointer) rb);
- }
-
- // Add "Playback" section
- {
- GtkVBox *vb = GTK_VBOX (gtk_vbox_new (FALSE, 0));
- GtkCheckButton *cb;
-
- gtk_table_attach_defaults (table,
- make_framed (GTK_WIDGET (vb), _("Playback")), 1,
- 2, 0, 1);
-
- cb =
- GTK_CHECK_BUTTON (gtk_check_button_new_with_label (_("Detect songend")));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cb), !conf.endless);
- gtk_container_add (GTK_CONTAINER (vb), GTK_WIDGET (cb));
- gtk_tooltips_set_tip (tooltips, GTK_WIDGET (cb),
- _("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."), NULL);
- g_ptr_array_add (rblist, (gpointer) cb);
- }
-
- /***** Page 2: Formats *****/
-
- table = GTK_TABLE (gtk_table_new (1, 1, TRUE));
- gtk_notebook_append_page (notebook, GTK_WIDGET (table),
- print_left (_("Formats")));
-
- // Add "Format selection" section
- {
- GtkHBox *vb = GTK_HBOX (gtk_hbox_new (FALSE, 0));
- gtk_table_attach_defaults (table,
- make_framed (GTK_WIDGET (vb),
- _("Format selection")), 0, 1, 0, 1);
- // Add scrollable list
- {
- const gchar *rowstr[] = { _("Format"), _("Extension") };
- GtkEventBox *eventbox = GTK_EVENT_BOX (gtk_event_box_new ());
- GtkScrolledWindow *formatswnd =
- GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL, NULL));
- GtkCList *fl = GTK_CLIST (gtk_clist_new_with_titles (2, (gchar **)rowstr));
- CPlayers::const_iterator i;
- unsigned int j;
- gtk_clist_set_selection_mode (fl, GTK_SELECTION_MULTIPLE);
-
- // Build list
- for (i = CAdPlug::getPlayers().begin (); i != CAdPlug::getPlayers().end (); i++)
- {
- gint rownum;
-
- gchar *rws[2];
- rws[0] = g_strdup ((*i)->filetype.c_str ());
- rws[1] = g_strdup ((*i)->get_extension (0));
- for (j = 1; (*i)->get_extension (j); j++)
- rws[1] = g_strjoin (", ", rws[1], (*i)->get_extension (j), NULL);
- rownum = gtk_clist_append (fl, rws);
- g_free (rws[0]);
- g_free (rws[1]);
- gtk_clist_set_row_data (fl, rownum, (gpointer) (*i));
- if (find (conf.players.begin (), conf.players.end (), *i) !=
- conf.players.end ())
- gtk_clist_select_row (fl, rownum, 0);
- }
-
- gtk_clist_columns_autosize (fl);
- gtk_scrolled_window_set_policy (formatswnd, GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
- gpointer pl = (gpointer) new CPlayers (conf.players);
- g_signal_connect (G_OBJECT (fl), "select-row",
- G_CALLBACK (config_fl_row_select), pl);
- g_signal_connect (G_OBJECT (fl), "unselect-row",
- G_CALLBACK (config_fl_row_unselect), pl);
- gtk_container_add (GTK_CONTAINER (formatswnd), GTK_WIDGET (fl));
- gtk_container_add (GTK_CONTAINER (eventbox), GTK_WIDGET (formatswnd));
- gtk_container_add (GTK_CONTAINER (vb), GTK_WIDGET (eventbox));
- gtk_tooltips_set_tip (tooltips, GTK_WIDGET (eventbox),
- _("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."), NULL);
- g_ptr_array_add (rblist, pl);
- }
- }
-
- // Show window
- gtk_widget_show_all (GTK_WIDGET (config_dlg));
-}
-
-static void
-add_instlist (GtkCList * instlist, const char *t1, const char *t2)
-{
- gchar *rowstr[2];
-
- rowstr[0] = g_strdup (t1);
- rowstr[1] = g_strdup (t2);
- gtk_clist_append (instlist, rowstr);
- g_free (rowstr[0]);
- g_free (rowstr[1]);
-}
-
 static CPlayer *
 factory (VFSFile * fd, Copl * newopl)
 {
@@ -459,201 +135,6 @@
 gboolean adplug_play(InputPlayback * data, const gchar * filename, VFSFile * file, gint start_time, gint stop_time, gboolean pause);
 }
 
-#if 0
-static void
-subsong_slider (GtkAdjustment * adj)
-{
- adplug_stop (NULL);
- plr.subsong = (unsigned int) adj->value - 1;
- adplug_play (playback, playback->filename, NULL, 0, 0, FALSE);
-}
-#endif
-
-static void
-close_infobox (GtkDialog * infodlg)
-{
- // Forget our references to the instance of the "currently playing song" info
- // box. But only if we're really destroying that one... ;)
- if (infodlg == plr.infodlg)
- {
- plr.infobox = NULL;
- plr.infodlg = NULL;
- }
-}
-
-extern "C" void
-adplug_info_box (const gchar *filename)
-{
- CSilentopl tmpopl;
- VFSFile *fd = vfs_buffered_file_new_from_uri (filename);
-
- if (!fd)
- return;
-
- CPlayer *p = (strcmp (filename, plr.filename) || !plr.p) ?
- factory (fd, &tmpopl) : plr.p;
-
- if (!p)
- return; // bail out if no player could be created
- if (p == plr.p && plr.infodlg)
- return; // only one info box for active song
-
- std::ostringstream infotext;
- unsigned int i;
- GtkDialog *infobox = GTK_DIALOG (gtk_dialog_new ());
- GtkButton *okay_button = GTK_BUTTON (gtk_button_new_with_label (_("Ok")));
-
- GtkVBox *box = GTK_VBOX (gtk_vbox_new (TRUE, 2));
- GtkHBox *hbox = GTK_HBOX (gtk_hbox_new (TRUE, 2));
- GtkHBox *hbox2 = GTK_HBOX (gtk_hbox_new (TRUE, 2));
-
- // Build file info box
- gtk_window_set_title (GTK_WINDOW (infobox), _("AdPlug :: File Info"));
- gtk_window_set_policy (GTK_WINDOW (infobox), FALSE, FALSE, TRUE); // Window is auto sized
-
- gtk_container_add (GTK_CONTAINER (infobox->vbox), GTK_WIDGET (box));
-// Former packer layout, for future reproduction
-// gtk_packer_set_default_border_width(packer, 2);
-
- gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
- g_signal_connect_swapped (G_OBJECT (okay_button), "clicked",
- G_CALLBACK (gtk_widget_destroy),
- GTK_OBJECT (infobox));
- g_signal_connect (G_OBJECT (infobox), "destroy",
- G_CALLBACK (close_infobox), 0);
- gtk_container_add (GTK_CONTAINER (infobox->action_area),
- GTK_WIDGET (okay_button));
-
- // Add filename section
-// Former packer layout, for future reproduction
-// gtk_packer_add_defaults(packer, make_framed(print_left(filename), "Filename"),
-// GTK_SIDE_TOP, GTK_ANCHOR_CENTER, GTK_FILL_X);
- gtk_box_pack_end (GTK_BOX (box), GTK_WIDGET (hbox2), TRUE, TRUE, 2);
- gtk_box_pack_end (GTK_BOX (box),
- make_framed (print_left (filename), _("Filename")), TRUE,
- TRUE, 2);
-
- // Add "Song info" section
- infotext << _("Title: ") << p->gettitle () << std::endl <<
- _("Author: ") << p->getauthor () << std::endl <<
- _("File Type: ") << p->gettype () << std::endl <<
- _("Subsongs: ") << p->getsubsongs () << std::endl <<
- _("Instruments: ") << p->getinstruments ();
- if (plr.p == p)
- infotext << std::ends;
- else
- {
- infotext << std::endl << _("Orders: ") << p->getorders () << std::endl <<
- _("Patterns: ") << p->getpatterns () << std::ends;
- }
- gtk_container_add (GTK_CONTAINER (hbox),
- make_framed (print_left (infotext.str ().c_str ()),
- _("Song")));
-
- // Add "Playback info" section if currently playing
- if (plr.p == p)
- {
- plr.infobox = GTK_LABEL (gtk_label_new (""));
- gtk_label_set_justify (plr.infobox, GTK_JUSTIFY_LEFT);
- gtk_misc_set_padding (GTK_MISC (plr.infobox), 2, 2);
- gtk_container_add (GTK_CONTAINER (hbox),
- make_framed (GTK_WIDGET (plr.infobox), _("Playback")));
- }
-
-// Former packer layout, for future reproduction
-// gtk_packer_add_defaults(packer, GTK_WIDGET(hbox), GTK_SIDE_TOP,
-// GTK_ANCHOR_CENTER, GTK_FILL_X);
- gtk_box_pack_end (GTK_BOX (hbox2), GTK_WIDGET (hbox), TRUE, TRUE, 2);
-
- // Add instrument names section
- if (p->getinstruments ())
- {
- GtkScrolledWindow *instwnd =
- GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL, NULL));
- GtkCList *instnames;
- gchar tmpstr[10];
-
- {
- const gchar *rowstr[] = { "#", _("Instrument name") };
- instnames = GTK_CLIST (gtk_clist_new_with_titles (2, (gchar **)rowstr));
- }
- gtk_clist_set_column_justification (instnames, 0, GTK_JUSTIFY_RIGHT);
-
- for (i = 0; i < p->getinstruments (); i++)
- {
- sprintf (tmpstr, "%d", i + 1);
- add_instlist (instnames, tmpstr, p->getinstrument (i).c_str ());
- }
-
- gtk_clist_columns_autosize (instnames);
- gtk_scrolled_window_set_policy (instwnd, GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
- gtk_container_add (GTK_CONTAINER (instwnd), GTK_WIDGET (instnames));
-// Former packer layout, for future reproduction
-// gtk_packer_add(packer, GTK_WIDGET(instwnd), GTK_SIDE_TOP,
-// GTK_ANCHOR_CENTER, GTK_FILL_X, 0, 0, 0, 0, 50);
- gtk_box_pack_end (GTK_BOX (hbox2), GTK_WIDGET (instwnd), TRUE, TRUE, 2);
- }
-
- // Add "Song message" section
- if (!p->getdesc ().empty ())
- {
- GtkScrolledWindow *msgwnd =
- GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL, NULL));
- GtkTextView *msg = GTK_TEXT_VIEW (gtk_text_view_new ());
-
- gtk_scrolled_window_set_policy (msgwnd, GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
- gtk_text_view_set_editable (msg, FALSE);
- gtk_text_view_set_wrap_mode (msg, GTK_WRAP_WORD_CHAR);
-
- gtk_text_buffer_set_text (gtk_text_view_get_buffer (msg),
- p->getdesc ().c_str (),
- p->getdesc ().length ());
- gtk_container_add (GTK_CONTAINER (msgwnd), GTK_WIDGET (msg));
-
-// Former packer layout, for future reproduction
-// gtk_packer_add(packer, make_framed(GTK_WIDGET(msgwnd), "Song message"),
-// GTK_SIDE_TOP, GTK_ANCHOR_CENTER, GTK_FILL_X, 2, 0, 0, 200, 50);
- gtk_box_pack_end (GTK_BOX (hbox2),
- make_framed (GTK_WIDGET (msgwnd), _("Song message")), TRUE,
- TRUE, 2);
- }
-
-#if 0
- // Add subsong slider section
- if (p == plr.p && p->getsubsongs () > 1)
- {
- GtkAdjustment *adj =
- GTK_ADJUSTMENT (gtk_adjustment_new (plr.subsong + 1, 1,
- p->getsubsongs () + 1,
- 1, 5, 1));
- GtkHScale *slider = GTK_HSCALE (gtk_hscale_new (adj));
-
- g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (subsong_slider), NULL);
- gtk_range_set_update_policy (GTK_RANGE (slider),
- GTK_UPDATE_DISCONTINUOUS);
- gtk_scale_set_digits (GTK_SCALE (slider), 0);
-// Former packer layout, for future reproduction
-// gtk_packer_add_defaults(packer, make_framed(GTK_WIDGET(slider), "Subsong selection"),
-// GTK_SIDE_TOP, GTK_ANCHOR_CENTER, GTK_FILL_X);
- gtk_box_pack_end (GTK_BOX (hbox2),
- make_framed (GTK_WIDGET (slider), _("Subsong selection")),
- TRUE, TRUE, 2);
- }
-#endif
-
- // Show dialog box
- gtk_widget_show_all (GTK_WIDGET (infobox));
- if (p == plr.p)
- { // Remember widget, so we could destroy it later
- plr.infodlg = infobox;
- }
- else // Delete temporary player
- delete p;
-}
-
 /***** Main player (!! threaded !!) *****/
 
 extern "C" Tuple * adplug_get_tuple (const gchar * filename, VFSFile * fd)
@@ -687,25 +168,6 @@
 return ti;
 }
 
-static void
-update_infobox (void)
-{
- std::ostringstream infotext;
-
- // Recreate info string
- infotext << _("Order: ") << plr.p->getorder () << " / " << plr.p->
- getorders () << std::endl << _("Pattern: ") << plr.p->
- getpattern () << " / " << plr.p->
- getpatterns () << std::endl << _("Row: ") << plr.p->
- getrow () << std::endl << _("Speed: ") << plr.p->
- getspeed () << std::endl << _("Timer: ") << plr.p->
- getrefresh () << _("Hz") << std::ends;
-
- GDK_THREADS_ENTER ();
- gtk_label_set_text (plr.infobox, infotext.str ().c_str ());
- GDK_THREADS_LEAVE ();
-}
-
 // Define sampsize macro (only usable inside play_loop()!)
 #define sampsize ((bit16 ? 2 : 1) * (stereo ? 2 : 1))
 
@@ -814,10 +276,6 @@
 }
 
 playback->output->write_audio (sndbuf, SNDBUFSIZE * sampsize);
-
- // update infobox, if necessary
- if (plr.infobox)
- update_infobox ();
 }
 
 while (playback->output->buffer_playing ())

audacious-plugins-2.5.3.tar.gz/src/adplug/plugin.c -> audacious-plugins-3.0.tar.gz/src/adplug/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/albumart/Makefile -> audacious-plugins-3.0.tar.gz/src/albumart/Makefile Changed

audacious-plugins-2.5.3.tar.gz/src/albumart/albumart.c -> audacious-plugins-3.0.tar.gz/src/albumart/albumart.c Changed

audacious-plugins-2.5.3.tar.gz/src/alsa/config.c -> audacious-plugins-3.0.tar.gz/src/alsa/config.c Changed

@@ -70,7 +70,6 @@
 static void get_defined_devices (const char * type, int capture, void (* found)
 (const char * name, const char * description))
 {
-#ifdef HAVE_SND_DEVICE_NAME_HINT
 void * * hints = NULL;
 int count;
 
@@ -96,7 +95,6 @@
 FAILED:
 if (hints != NULL)
 snd_device_name_free_hint (hints);
-#endif
 }
 
 static char * get_card_description (int card)
@@ -278,21 +276,33 @@
 get_mixer_elements (alsa_config_mixer, mixer_element_found);
 }
 
-static void guess_mixer_element (void)
+static void fill_lists (void)
 {
- static const char * guesses[] = {"PCM", "Wave", "Master"};
- int count;
+ if (! pcm_list)
+ {
+ pcm_list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+ pcm_list_fill ();
+ }
 
- if (alsa_config_mixer_element != NULL)
+ if (! mixer_list)
 {
- if (list_has_member (mixer_element_list, alsa_config_mixer_element))
- return;
+ mixer_list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+ mixer_list_fill ();
+ }
 
- free (alsa_config_mixer_element);
- alsa_config_mixer_element = NULL;
+ if (! mixer_element_list)
+ {
+ mixer_element_list = gtk_list_store_new (1, G_TYPE_STRING);
+ mixer_element_list_fill ();
 }
+}
+
+static void guess_mixer_element (void)
+{
+ fill_lists ();
 
- for (count = 0; count < G_N_ELEMENTS (guesses); count ++)
+ static const char * guesses[] = {"PCM", "Wave", "Master"};
+ for (int count = 0; count < G_N_ELEMENTS (guesses); count ++)
 {
 if (list_has_member (mixer_element_list, guesses[count]))
 {
@@ -308,39 +318,18 @@
 {
 mcs_handle_t * database = aud_cfg_db_open ();
 
- pcm_list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
- mixer_list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
- mixer_element_list = gtk_list_store_new (1, G_TYPE_STRING);
-
- pcm_list_fill ();
 aud_cfg_db_get_string (database, "alsa", "pcm", & alsa_config_pcm);
-
- if (alsa_config_pcm == NULL)
- alsa_config_pcm = strdup ("default");
- else if (strcmp (alsa_config_pcm, "default") && ! list_has_member (pcm_list,
- alsa_config_pcm))
- {
- free (alsa_config_pcm);
+ if (! alsa_config_pcm)
 alsa_config_pcm = strdup ("default");
- }
 
- mixer_list_fill ();
- aud_cfg_db_get_string (database, "alsa", "mixer",
- & alsa_config_mixer);
-
- if (alsa_config_mixer == NULL)
- alsa_config_mixer = strdup ("default");
- else if (strcmp (alsa_config_mixer, "default") && ! list_has_member
- (mixer_list, alsa_config_mixer))
- {
- free (alsa_config_mixer);
+ aud_cfg_db_get_string (database, "alsa", "mixer", & alsa_config_mixer);
+ if (! alsa_config_mixer)
 alsa_config_mixer = strdup ("default");
- }
 
- mixer_element_list_fill ();
 aud_cfg_db_get_string (database, "alsa", "mixer-element",
 & alsa_config_mixer_element);
- guess_mixer_element ();
+ if (! alsa_config_mixer_element)
+ guess_mixer_element ();
 
 aud_cfg_db_get_bool (database, "alsa", "drain-workaround", &
 alsa_config_drain_workaround);
@@ -352,9 +341,23 @@
 {
 mcs_handle_t * database = aud_cfg_db_open ();
 
- g_object_unref (pcm_list);
- g_object_unref (mixer_list);
- g_object_unref (mixer_element_list);
+ if (pcm_list)
+ {
+ g_object_unref (pcm_list);
+ pcm_list = NULL;
+ }
+
+ if (mixer_list)
+ {
+ g_object_unref (mixer_list);
+ mixer_list = NULL;
+ }
+
+ if (mixer_element_list)
+ {
+ g_object_unref (mixer_element_list);
+ 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);
@@ -364,8 +367,11 @@
 alsa_config_drain_workaround);
 
 free (alsa_config_pcm);
+ alsa_config_pcm = NULL;
 free (alsa_config_mixer);
+ alsa_config_mixer = NULL;
 free (alsa_config_mixer_element);
+ alsa_config_mixer_element = NULL;
 
 aud_cfg_db_close (database);
 }
@@ -547,6 +553,7 @@
 return;
 }
 
+ fill_lists ();
 create_window ();
 combo_select_by_text (pcm_combo, pcm_list, alsa_config_pcm);
 combo_select_by_text (mixer_combo, mixer_list, alsa_config_mixer);

audacious-plugins-2.5.3.tar.gz/src/alsa/plugin.c -> audacious-plugins-3.0.tar.gz/src/alsa/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/amidi-plug/amidi-plug.c -> audacious-plugins-3.0.tar.gz/src/amidi-plug/amidi-plug.c Changed

audacious-plugins-2.5.3.tar.gz/src/aosd/aosd.c -> audacious-plugins-3.0.tar.gz/src/aosd/aosd.c Changed

audacious-plugins-2.5.3.tar.gz/src/aosd/aosd.h -> audacious-plugins-3.0.tar.gz/src/aosd/aosd.h Changed

audacious-plugins-2.5.3.tar.gz/src/aosd/aosd_trigger.c -> audacious-plugins-3.0.tar.gz/src/aosd/aosd_trigger.c Changed

@@ -245,10 +245,8 @@
 aosd_pb_titlechange_prevs_t *prevs = prevs_gp;
 gint playlist = aud_playlist_get_playing();
 gint pl_entry = aud_playlist_get_position(playlist);
- const gchar * pl_entry_filename = aud_playlist_entry_get_filename (playlist,
- pl_entry);
- const gchar * pl_entry_title = aud_playlist_entry_get_title (playlist,
- pl_entry, FALSE);
+ gchar * pl_entry_filename = aud_playlist_entry_get_filename (playlist, pl_entry);
+ gchar * pl_entry_title = aud_playlist_entry_get_title (playlist, pl_entry, FALSE);
 
 /* same filename but title changed, useful to detect http stream song changes */
 
@@ -291,6 +289,9 @@
 g_free(prevs->filename);
 prevs->filename = g_strdup(pl_entry_filename);
 }
+
+ g_free (pl_entry_filename);
+ g_free (pl_entry_title);
 }
 }
 
@@ -387,7 +388,6 @@
 {
 gint active = aud_playlist_get_active();
 gint pos = aud_playlist_get_position(active);
- const gchar * title;
 gchar *utf8_title, *utf8_title_markup;
 gint time_cur, time_tot;
 gint time_cur_m, time_cur_s, time_tot_m, time_tot_s;
@@ -399,8 +399,7 @@
 time_tot_s = time_tot % 60;
 time_tot_m = (time_tot - time_tot_s) / 60;
 
- title = aud_playlist_entry_get_title (active, pos, FALSE);
- utf8_title = aosd_trigger_utf8convert( title );
+ utf8_title = aud_playlist_entry_get_title (active, pos, FALSE);
 utf8_title_markup = g_markup_printf_escaped(
 "%s (%i:%02i/%i:%02i)" ,
 global_config->osd->text.fonts_name[0] , utf8_title , time_cur_m , time_cur_s , time_tot_m , time_tot_s );

audacious-plugins-2.5.3.tar.gz/src/aosd/aosd_ui.c -> audacious-plugins-3.0.tar.gz/src/aosd/aosd_ui.c Changed

@@ -85,13 +85,25 @@
 
 static gboolean
 aosd_cb_configure_position_expose ( GtkWidget * darea ,
+#if GTK_CHECK_VERSION (3, 0, 0)
+ cairo_t * cr ,
+#else
 GdkEventExpose * event ,
+#endif
 gpointer coord_gp )
 {
 gint coord = GPOINTER_TO_INT(coord_gp);
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+ cairo_set_source_rgb ( cr , 0 , 0 , 0 );
+ cairo_rectangle ( cr , (coord % 3) * 10 , (coord / 3) * 16 , 20 , 8 );
+ cairo_fill ( cr );
+#else
 gdk_draw_rectangle( GDK_DRAWABLE(darea->window) ,
 darea->style->black_gc , TRUE ,
 (coord % 3) * 10 , (coord / 3) * 16 , 20 , 8 );
+#endif
+
 return FALSE;
 }
 
@@ -182,8 +194,13 @@
 pos_placement_bt_darea[i] = gtk_drawing_area_new();
 gtk_widget_set_size_request( pos_placement_bt_darea[i] , 40 , 40 );
 gtk_container_add( GTK_CONTAINER(pos_placement_bt[i]) , pos_placement_bt_darea[i] );
+#if GTK_CHECK_VERSION (3, 0, 0)
+ g_signal_connect( G_OBJECT(pos_placement_bt_darea[i]) , "draw" ,
+ G_CALLBACK(aosd_cb_configure_position_expose) , GINT_TO_POINTER(i) );
+#else
 g_signal_connect( G_OBJECT(pos_placement_bt_darea[i]) , "expose-event" ,
 G_CALLBACK(aosd_cb_configure_position_expose) , GINT_TO_POINTER(i) );
+#endif
 gtk_table_attach( GTK_TABLE(pos_placement_table) , pos_placement_bt[i] ,
 (i % 3) , (i % 3) + 1 , (i / 3) , (i / 3) + 1 ,
 GTK_FILL , GTK_FILL , 0 , 0 );
@@ -235,14 +252,25 @@
 gtk_container_set_border_width( GTK_CONTAINER(pos_multimon_hbox) , 6 );
 gtk_container_add( GTK_CONTAINER(pos_multimon_frame), pos_multimon_hbox );
 pos_multimon_label = gtk_label_new( _("Display OSD using:") );
- pos_multimon_combobox = gtk_combo_box_new_text();
- gtk_combo_box_append_text( GTK_COMBO_BOX(pos_multimon_combobox) , _("all monitors") );
+#if GTK_CHECK_VERSION (3, 0, 0)
+ #define CBT_NEW gtk_combo_box_text_new
+ #define CBT_ADD(widget, text) \
+ gtk_combo_box_text_append( GTK_COMBO_BOX_TEXT(widget) , NULL , text )
+#else
+ #define CBT_NEW gtk_combo_box_new_text
+ #define CBT_ADD(widget, text) \
+ gtk_combo_box_append_text( GTK_COMBO_BOX(widget) , text )
+#endif
+ pos_multimon_combobox = CBT_NEW();
+ CBT_ADD( pos_multimon_combobox , _("all monitors") );
 for ( i = 0 ; i < monitors_num ; i++ )
 {
 gchar *mon_str = g_strdup_printf( _("monitor %i") , i + 1 );
- gtk_combo_box_append_text( GTK_COMBO_BOX(pos_multimon_combobox) , mon_str );
+ CBT_ADD( pos_multimon_combobox , mon_str );
 g_free( mon_str );
 }
+#undef CBT_NEW
+#undef CBT_ADD
 gtk_combo_box_set_active( GTK_COMBO_BOX(pos_multimon_combobox) , (cfg->osd->position.multimon_id + 1) );
 aosd_callback_list_add( cb_list , pos_multimon_combobox , aosd_cb_configure_position_multimon_commit );
 gtk_box_pack_start( GTK_BOX(pos_multimon_hbox) , pos_multimon_label , FALSE , FALSE , 0 );

audacious-plugins-2.5.3.tar.gz/src/asx/asx.c -> audacious-plugins-3.0.tar.gz/src/asx/asx.c Changed

@@ -2,6 +2,7 @@
 * Audacious: A cross-platform multimedia player
 * Copyright (c) 2006 William Pitcock, Tony Vroon, George Averill,
 * Giacomo Lozito, Derek Pomery and Yoshiki Yazawa.
+ * Copyright (c) 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 as published by
@@ -18,42 +19,22 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-/* #define AUD_DEBUG 1 */
-
-#include <glib.h>
-#include <string.h>
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <audacious/debug.h>
 #include <audacious/misc.h>
-#include <audacious/playlist.h>
 #include <audacious/plugin.h>
 #include <libaudcore/audstrings.h>
 
 #include "util.h"
 
-static gboolean playlist_load_asx (const gchar * filename, gint list, gint pos)
+static gboolean playlist_load_asx (const gchar * filename, VFSFile * file,
+ gchar * * title, struct index * filenames, struct index * tuples)
 {
 gint i;
 gchar line_key[16];
 gchar * line;
- gchar *uri = NULL;
- struct index * add;
 
- uri = g_filename_to_uri(filename, NULL, NULL);
+ INIFile * inifile = open_ini_file (file);
 
- INIFile *inifile = open_ini_file(uri ? uri : filename);
- g_free(uri); uri = NULL;
-
- add = index_new ();
+ * title = NULL;
 
 for (i = 1; ; i++) {
 g_snprintf(line_key, sizeof(line_key), "Ref%d", i);
@@ -68,37 +49,27 @@
 uri = str_replace_fragment(uri, strlen(uri), "http://", "mms://");
 
 if (uri != NULL)
- index_append (add, uri);
+ index_append (filenames, uri);
 }
 else
 break;
 }
 
 close_ini_file(inifile);
-
- aud_playlist_entry_insert_batch (list, pos, add, NULL);
 return TRUE;
 }
 
-static gboolean playlist_save_asx (const gchar * filename, gint playlist)
+static gboolean playlist_save_asx (const gchar * filename, VFSFile * file,
+ const gchar * title, struct index * filenames, struct index * tuples)
 {
- gint entries = aud_playlist_entry_count (playlist);
- gchar *uri = g_filename_to_uri(filename, NULL, NULL);
- VFSFile *file = vfs_fopen(uri, "wb");
+ gint entries = index_count (filenames);
 gint count;
 
- AUDDBG("filename=%s\n", filename);
- AUDDBG("uri=%s\n", uri);
-
- if (! file)
- return FALSE;
-
 vfs_fprintf(file, "[Reference]\r\n");
 
 for (count = 0; count < entries; count ++)
 {
- const gchar * filename = aud_playlist_entry_get_filename (playlist,
- count);
+ const gchar * filename = index_get (filenames, count);
 gchar *fn;
 
 if (vfs_is_remote (filename))
@@ -110,19 +81,15 @@
 g_free(fn);
 }
 
- vfs_fclose(file);
 return TRUE;
 }
 
 static const gchar * const asx_exts[] = {"asx", NULL};
 
-static PlaylistPlugin asx_plugin = {
- .description = "ASXv1/ASXv2 Playlist Format",
+AUD_PLAYLIST_PLUGIN
+(
+ .name = "ASXv1/ASXv2 Playlist Format",
 .extensions = asx_exts,
 .load = playlist_load_asx,
 .save = playlist_save_asx
-};
-
-static PlaylistPlugin * const asx_plugins[] = {& asx_plugin, NULL};
-
-SIMPLE_PLAYLIST_PLUGIN (asx, asx_plugins)
+)

audacious-plugins-2.5.3.tar.gz/src/asx/util.c -> audacious-plugins-3.0.tar.gz/src/asx/util.c Changed

@@ -1,5 +1,5 @@
 /* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2009 Audacious development team
+ * Copyright (C) 2005-2011 Audacious development team
 *
 * Based on BMP:
 * Copyright (C) 2003-2004 BMP development team.
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <audacious/plugin.h>
+#include <libaudcore/vfs.h>
 
 #include "util.h"
 
@@ -59,64 +59,20 @@
 g_hash_table_destroy((GHashTable *)section);
 }
 
-INIFile *open_ini_file(const gchar *filename)
+INIFile * open_ini_file (VFSFile * file)
 {
 GHashTable *ini_file = NULL;
 GHashTable *section = NULL;
 GString *section_name, *key_name, *value;
 gpointer section_hash, key_hash;
- guchar * buffer = NULL;
 gsize off = 0;
- gint64 filesize = 0;
 
- unsigned char x[] = { 0xff, 0xfe, 0x00 };
-
- g_return_val_if_fail(filename, NULL);
-
- void * vbuf = NULL;
- vfs_file_get_contents (filename, & vbuf, & filesize);
- if (! vbuf)
+ gint64 filesize = vfs_fsize (file);
+ if (filesize < 1)
 return NULL;
- buffer = vbuf;
-
- /*
- * Convert UTF-16 into something useful. Original implementation
- * by incomp@#audacious. Cleanups \nenolod
- * FIXME: can't we use a GLib function for that? -- 01mf02
- */
- if (filesize > 2 && !memcmp(&buffer[0], &x, 2))
- {
- guchar *outbuf = g_malloc (filesize); /* it's safe to waste memory. */
- guint counter;
 
- for (counter = 2; counter < filesize; counter += 2)
- {
- if (!memcmp(&buffer[counter + 1], &x[2], 1))
- {
- outbuf[(counter - 2) / 2] = buffer[counter];
- }
- else
- {
- g_free(buffer);
- g_free(outbuf);
- return NULL;
- }
- }
-
- outbuf[(counter - 2) / 2] = '\0';
-
- if ((filesize - 2) / 2 == (counter - 2) / 2)
- {
- g_free(buffer);
- buffer = outbuf;
- }
- else
- {
- g_free(buffer);
- g_free(outbuf);
- return NULL; /* XXX wrong encoding */
- }
- }
+ gchar * buffer = g_malloc (filesize);
+ filesize = vfs_fread (buffer, 1, filesize, file);
 
 section_name = g_string_new("");
 key_name = g_string_new(NULL);

audacious-plugins-2.5.3.tar.gz/src/asx/util.h -> audacious-plugins-3.0.tar.gz/src/asx/util.h Changed

audacious-plugins-2.5.3.tar.gz/src/blur_scope/blur_scope.c -> audacious-plugins-3.0.tar.gz/src/blur_scope/blur_scope.c Changed

@@ -32,8 +32,8 @@
 
 #include "blur_scope.h"
 
-#define D_WIDTH 256
-#define D_HEIGHT 128
+#define D_WIDTH 64
+#define D_HEIGHT 32
 
 static gboolean bscope_init (void);
 static void bscope_cleanup(void);
@@ -41,8 +41,9 @@
 static void bscope_render_pcm(gint16 data[2][512]);
 static void /* GtkWidget */ * bscope_get_widget (void);
 
-static VisPlugin bscope_vp = {
-    .description = "Blur Scope",                       /* description */
+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 */
@@ -51,11 +52,7 @@
     .playback_stop = bscope_playback_stop,       /* playback_stop */
     .render_pcm = bscope_render_pcm,          /* render_pcm */
     .get_widget = bscope_get_widget,
-};
-
-static VisPlugin * bscope_vplist[] = {& bscope_vp, NULL};
-
-SIMPLE_VISUAL_PLUGIN (bscope, bscope_vplist)
+)
 
 gint color = 0xFF3F7F;

audacious-plugins-2.5.3.tar.gz/src/bs2b/plugin.c -> audacious-plugins-3.0.tar.gz/src/bs2b/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/cairo-spectrum/Makefile -> audacious-plugins-3.0.tar.gz/src/cairo-spectrum/Makefile Changed

audacious-plugins-2.5.3.tar.gz/src/cairo-spectrum/cairo-spectrum.c -> audacious-plugins-3.0.tar.gz/src/cairo-spectrum/cairo-spectrum.c Changed

audacious-plugins-2.5.3.tar.gz/src/cd-menu-items/Makefile -> audacious-plugins-3.0.tar.gz/src/cd-menu-items/Makefile Changed

audacious-plugins-2.5.3.tar.gz/src/cd-menu-items/cd-menu-items.c -> audacious-plugins-3.0.tar.gz/src/cd-menu-items/cd-menu-items.c Changed

@@ -1,6 +1,6 @@
 /*
 * cd-menu-items.c
- * Copyright 2009 John Lindgren
+ * Copyright 2009-2011 John Lindgren
 *
 * This file is part of Audacious.
 *
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #include <audacious/drct.h>
@@ -33,51 +32,34 @@
 #define N_MENUS 3
 
 static const gchar * titles[N_ITEMS] = {N_("Play CD"), N_("Add CD")};
-static const gint menus[N_MENUS] = {AUDACIOUS_MENU_MAIN,
- AUDACIOUS_MENU_PLAYLIST_ADD, AUDACIOUS_MENU_PLAYLIST_RCLICK};
+static const gint menus[N_MENUS] = {AUD_MENU_MAIN, AUD_MENU_PLAYLIST_ADD,
+ AUD_MENU_PLAYLIST_RCLICK};
 
-static GtkWidget * items[N_ITEMS * N_MENUS];
+static void cd_play (void) {aud_drct_pl_open ("cdda://"); }
+static void cd_add (void) {aud_drct_pl_add ("cdda://", -1); }
+static MenuFunc funcs[N_ITEMS] = {cd_play, cd_add};
 
-static void cd_play (void)
+static gboolean cd_init (void)
 {
- aud_drct_pl_open ("cdda://");
-}
+ for (gint m = 0; m < N_MENUS; m ++)
+ for (gint i = 0; i < N_ITEMS; i ++)
+ aud_plugin_menu_add (menus[m], funcs[i], _(titles[i]),
+ GTK_STOCK_CDROM);
 
-static void cd_add (void)
-{
- aud_drct_pl_add ("cdda://", -1);
-}
-
-static void (* funcs[N_ITEMS]) (void) = {cd_play, cd_add};
-
-static void cd_init (void)
-{
- gint mcount, icount;
- GtkWidget * menu, * item;
-
- for (mcount = 0; mcount < N_MENUS; mcount ++)
- {
- menu = aud_get_plugin_menu (menus[mcount]);
-
- for (icount = 0; icount < N_ITEMS; icount ++)
- {
- item = gtk_image_menu_item_new_with_label (_(titles[icount]));
- gtk_image_menu_item_set_image ((GtkImageMenuItem *) item,
- gtk_image_new_from_stock (GTK_STOCK_CDROM, GTK_ICON_SIZE_MENU));
- gtk_widget_show (item);
- items[N_ITEMS * mcount + icount] = item;
- gtk_menu_shell_append ((GtkMenuShell *) menu, item);
- g_signal_connect (item, "activate", (GCallback) funcs[icount], NULL);
- }
- }
+ return TRUE;
 }
 
 void cd_cleanup (void)
 {
- gint count;
-
- for (count = 0; count < N_ITEMS * N_MENUS; count ++)
- gtk_widget_destroy (items[count]);
+ for (gint m = 0; m < N_MENUS; m ++)
+ for (gint i = 0; i < N_ITEMS; i ++)
+ aud_plugin_menu_remove (menus[m], funcs[i]);
 }
 
-DECLARE_PLUGIN (cd-menu-items, cd_init, cd_cleanup)
+AUD_GENERAL_PLUGIN
+(
+ .name = "Audio CD Menu Items",
+ .enabled_by_default = TRUE,
+ .init = cd_init,
+ .cleanup = cd_cleanup,
+)

audacious-plugins-2.5.3.tar.gz/src/cdaudio-ng/Makefile -> audacious-plugins-3.0.tar.gz/src/cdaudio-ng/Makefile Changed

audacious-plugins-2.5.3.tar.gz/src/cdaudio-ng/cdaudio-ng.c -> audacious-plugins-3.0.tar.gz/src/cdaudio-ng/cdaudio-ng.c Changed

@@ -95,9 +95,11 @@
 static gint calculate_track_length (gint startlsn, gint endlsn);
 static gint find_trackno_from_filename (const gchar * filename);
 
+static const gchar * const schemes[] = {"cdda", NULL};
 
-static InputPlugin inputplugin = {
- .description = "Audio CD Plugin",
+AUD_INPUT_PLUGIN
+(
+ .name = "Audio CD Support",
 .init = cdaudio_init,
 .about = cdaudio_about,
 .configure = cdaudio_configure,
@@ -108,13 +110,9 @@
 .mseek = cdaudio_mseek,
 .cleanup = cdaudio_cleanup,
 .probe_for_tuple = make_tuple,
+ .schemes = schemes,
 .have_subtune = TRUE,
-};
-
-InputPlugin *cdaudio_iplist[] = { &inputplugin, NULL };
-
-SIMPLE_INPUT_PLUGIN (cdaudio, cdaudio_iplist)
-
+)
 
 static void cdaudio_error (const gchar * message_format, ...)
 {
@@ -132,12 +130,10 @@
 static void purge_playlist (gint playlist)
 {
 gint length = aud_playlist_entry_count (playlist);
- gint count;
- const gchar *filename;
 
- for (count = 0; count < length; count++)
+ for (gint count = 0; count < length; count ++)
 {
- filename = aud_playlist_entry_get_filename (playlist, count);
+ gchar * filename = aud_playlist_entry_get_filename (playlist, count);
 
 if (cdaudio_is_our_file (filename, NULL))
 {
@@ -145,6 +141,8 @@
 count--;
 length--;
 }
+
+ g_free (filename);
 }
 }
 
@@ -254,7 +252,6 @@
 
 libcddb_init ();
 
- aud_uri_set_plugin ("cdda://", &inputplugin);
 return TRUE;
 }

audacious-plugins-2.5.3.tar.gz/src/compressor/plugin.c -> audacious-plugins-3.0.tar.gz/src/compressor/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/console/Audacious_Driver.cxx -> audacious-plugins-3.0.tar.gz/src/console/Audacious_Driver.cxx Changed

audacious-plugins-2.5.3.tar.gz/src/console/Sap_Emu.cxx -> audacious-plugins-3.0.tar.gz/src/console/Sap_Emu.cxx Changed

@@ -23,13 +23,13 @@
 Sap_Emu::Sap_Emu()
 {
 	set_type( gme_sap_type );
-	
+
 	static const char* const names [Sap_Apu::osc_count * 2] = {
 		"Wave 1", "Wave 2", "Wave 3", "Wave 4",
 		"Wave 5", "Wave 6", "Wave 7", "Wave 8",
 	};
 	set_voice_names( names );
-	
+
 	static int const types [Sap_Apu::osc_count * 2] = {
 		wave_type | 1, wave_type | 2, wave_type | 3, wave_type | 0,
 		wave_type | 5, wave_type | 6, wave_type | 7, wave_type | 4,
@@ -68,7 +68,7 @@
 {
 	if ( in >= end )
 		return -1;
-	
+
 	int n = 0;
 	while ( in < end )
 	{
@@ -104,10 +104,10 @@
 	out->author [0] = 0;
 	out->name [0] = 0;
 	out->copyright [0] = 0;
-	
+
 	if ( size < 16 || memcmp( in, "SAP\x0D\x0A", 5 ) )
 		return gme_wrong_file_type;
-	
+
 	byte const* file_end = in + size - 5;
 	in += 5;
 	while ( in < file_end && (in [0] != 0xFF || in [1] != 0xFF) )
@@ -115,14 +115,14 @@
 		byte const* line_end = in;
 		while ( line_end < file_end && *line_end != 0x0D )
 			line_end++;
-		
+
 		char const* tag = (char const*) in;
 		while ( in < line_end && *in > ' ' )
 			in++;
 		int tag_len = (char const*) in - tag;
-		
+
 		while ( in < line_end && *in <= ' ' ) in++;
-		
+
 		if ( tag_len <= 0 )
 		{
 			// skip line
@@ -158,10 +158,10 @@
 			case 'C':
 			case 'B':
 				break;
-			
+
 			case 'D':
 				return "Digimusic not supported";
-			
+
 			default:
 				return "Unsupported player type";
 			}
@@ -188,20 +188,20 @@
 		{
 			parse_string( in, line_end, sizeof out->copyright, out->copyright );
 		}
-		
+
 		in = line_end + 2;
 	}
-	
+
 	if ( in [0] != 0xFF || in [1] != 0xFF )
 		return "ROM data missing";
 	out->rom_data = in + 2;
-	
+
 	return 0;
 }
 
 static void copy_sap_fields( Sap_Emu::info_t const& in, track_info_t* out )
 {
-	Gme_File::copy_field_( out->game, in.name );
+	Gme_File::copy_field_( out->song, in.name );
 	Gme_File::copy_field_( out->author, in.author );
 	Gme_File::copy_field_( out->copyright, in.copyright );
 }
@@ -215,16 +215,16 @@
 struct Sap_File : Gme_Info_
 {
 	Sap_Emu::info_t info;
-	
+
 	Sap_File() { set_type( gme_sap_type ); }
-	
+
 	blargg_err_t load_mem_( byte const* begin, long size )
 	{
 		RETURN_ERR( parse_info( begin, size, &info ) );
 		set_track_count( info.track_count );
 		return 0;
 	}
-	
+
 	blargg_err_t track_info_( track_info_t* out, int ) const
 	{
 		copy_sap_fields( info, out );
@@ -244,7 +244,7 @@
 blargg_err_t Sap_Emu::load_mem_( byte const* in, long size )
 {
 	file_end = in + size;
-	
+
 	info.warning = 0;
 	info.type = 'B';
 	info.stereo = false;
@@ -253,12 +253,12 @@
 	info.music_addr = -1;
 	info.fastplay = 312;
 	RETURN_ERR( parse_info( in, size, &info ) );
-	
+
 	set_warning( info.warning );
 	set_track_count( info.track_count );
 	set_voice_count( Sap_Apu::osc_count << info.stereo );
 	apu_impl.volume( gain() );
-	
+
 	return setup_buffer( 1773447 );
 }
 
@@ -312,7 +312,7 @@
 		r.a = track;
 		run_routine( info.init_addr );
 		break;
-	
+
 	case 'C':
 		r.a = 0x70;
 		r.x = info.music_addr&0xFF;
@@ -328,7 +328,7 @@
 blargg_err_t Sap_Emu::start_track_( int track )
 {
 	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	
+
 	memset( &mem, 0, sizeof mem );
 
 	byte const* in = info.rom_data;
@@ -349,22 +349,22 @@
 			set_warning( "Invalid file data block" );
 			break;
 		}
-		
+
 		memcpy( mem.ram + start, in, len );
 		in += len;
 		if ( file_end - in >= 2 && in [0] == 0xFF && in [1] == 0xFF )
 			in += 2;
 	}
-	
+
 	apu.reset( &apu_impl );
 	apu2.reset( &apu_impl );
 	cpu::reset( mem.ram );
 	time_mask = 0; // disables sound during init
 	call_init( track );
 	time_mask = -1;
-	
+
 	next_play = play_period();
-	
+
 	return 0;
 }
 
@@ -380,7 +380,7 @@
 		apu.write_data( time() & time_mask, addr, data );
 		return;
 	}
-	
+
 	if ( (addr ^ (Sap_Apu::start_addr + 0x10)) <= (Sap_Apu::end_addr - Sap_Apu::start_addr) &&
 			info.stereo )
 	{
@@ -400,7 +400,7 @@
 	case 'B':
 		cpu_jsr( info.play_addr );
 		break;
-	
+
 	case 'C':
 		cpu_jsr( info.play_addr + 6 );
 		break;
@@ -414,7 +414,7 @@
 	{
 		if ( cpu::run( duration ) || r.pc > idle_addr )
 			return "Emulation error (illegal instruction)";
-		
+
 		if ( r.pc == idle_addr )
 		{
 			if ( next_play <= duration )
@@ -430,7 +430,7 @@
 			}
 		}
 	}
-	
+
 	duration = time();
 	next_play -= duration;
 	check( next_play >= 0 );
@@ -439,6 +439,6 @@
 	apu.end_frame( duration );
 	if ( info.stereo )
 		apu2.end_frame( duration );
-	
+
 	return 0;
 }

audacious-plugins-2.5.3.tar.gz/src/console/plugin.c -> audacious-plugins-3.0.tar.gz/src/console/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/crossfade/plugin.c -> audacious-plugins-3.0.tar.gz/src/crossfade/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/crystalizer/crystalizer.c -> audacious-plugins-3.0.tar.gz/src/crystalizer/crystalizer.c Changed

audacious-plugins-2.5.3.tar.gz/src/cue/cue.c -> audacious-plugins-3.0.tar.gz/src/cue/cue.c Changed

@@ -1,7 +1,7 @@
 /*
 * Audacious: A cross-platform multimedia player
 * Copyright (c) 2009 William Pitcock <nenolod@dereferenced.org>
- * Copyright (c) 2010 John Lindgren <john.lindgren@tds.net>
+ * Copyright (c) 2010-2011 John Lindgren <john.lindgren@tds.net>
 *
 * 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,23 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-/* #define AUD_DEBUG 1 */
-
-#include <glib.h>
-#include <string.h>
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <audacious/debug.h>
 #include <audacious/misc.h>
-#include <audacious/playlist.h>
 #include <audacious/plugin.h>
 #include <libaudcore/audstrings.h>
 
@@ -70,22 +54,20 @@
 tuple_associate_string(tuple, tuple_type, NULL, text);
 }
 
-static gboolean playlist_load_cue (const gchar * cue_filename, gint list, gint
- at)
+static gboolean playlist_load_cue (const gchar * cue_filename, VFSFile * file,
+ gchar * * title, struct index * filenames, struct index * tuples)
 {
- void * buffer;
- gint64 size;
- vfs_file_get_contents (cue_filename, & buffer, & size);
- if (buffer == NULL)
- return FALSE;
-
- buffer = g_realloc (buffer, size + 1);
- ((gchar *) buffer)[size] = 0;
+ gint64 size = vfs_fsize (file);
+ gchar * buffer = g_malloc (size + 1);
+ size = vfs_fread (buffer, 1, size, file);
+ buffer[size] = 0;
 
 gchar * text = str_to_utf8 (buffer);
 g_free (buffer);
 g_return_val_if_fail (text, FALSE);
 
+ * title = NULL;
+
 Cd * cd = cue_parse_string (text);
 g_free (text);
 if (cd == NULL)
@@ -95,9 +77,6 @@
 if (tracks == 0)
 return FALSE;
 
- struct index * filenames = index_new ();
- struct index * tuples = index_new ();
-
 Track * current = cd_get_track (cd, 1);
 g_return_val_if_fail (current != NULL, FALSE);
 gchar * filename = aud_construct_uri (track_get_filename (current),
@@ -162,18 +141,14 @@
 }
 }
 
- aud_playlist_entry_insert_batch (list, at, filenames, tuples);
 return TRUE;
 }
 
 static const gchar * const cue_exts[] = {"cue", NULL};
 
-static PlaylistPlugin cue_plugin = {
- .description = "Cue Sheet Support",
+AUD_PLAYLIST_PLUGIN
+(
+ .name = "Cue Sheet Support",
 .extensions = cue_exts,
 .load = playlist_load_cue
-};
-
-static PlaylistPlugin * const cue_plugins[] = {& cue_plugin, NULL};
-
-SIMPLE_PLAYLIST_PLUGIN (cue, cue_plugins)
+)

audacious-plugins-2.5.3.tar.gz/src/echo_plugin/echo.c -> audacious-plugins-3.0.tar.gz/src/echo_plugin/echo.c Changed

audacious-plugins-2.5.3.tar.gz/src/ffaudio/Makefile -> audacious-plugins-3.0.tar.gz/src/ffaudio/Makefile Changed

audacious-plugins-2.5.3.tar.gz/src/ffaudio/ffaudio-core.c -> audacious-plugins-3.0.tar.gz/src/ffaudio/ffaudio-core.c Changed

@@ -50,13 +50,6 @@
 avcodec_init();
 av_register_all();
 
- AUDDBG("registering audvfsptr protocol\n");
-#if CHECK_LIBAVFORMAT_VERSION (52, 69, 0)
- av_register_protocol2 (& audvfsptr_protocol, sizeof audvfsptr_protocol);
-#else
- av_register_protocol (& audvfsptr_protocol);
-#endif
-
 AUDDBG("creating seek mutex/cond\n");
 ctrl_mutex = g_mutex_new();
 ctrl_cond = g_cond_new();
@@ -74,31 +67,27 @@
 AUDDBG("cleaning up\n");
 g_mutex_free(ctrl_mutex);
 g_cond_free(ctrl_cond);
- 
+
 if (extension_dict)
 mowgli_patricia_destroy (extension_dict, NULL, NULL);
 }
 
 static const gchar * ffaudio_strerror (gint error)
 {
-#if CHECK_LIBAVUTIL_VERSION (50, 13, 0)
 static gchar buf[256];
 return (! av_strerror (error, buf, sizeof buf)) ? buf : "unknown error";
-#else
- return strerror (AVUNERROR (error));
-#endif
 }
 
 static mowgli_patricia_t * create_extension_dict (void)
 {
 mowgli_patricia_t * dict = mowgli_patricia_create (NULL);
- 
+
 AVInputFormat * f;
 for (f = av_iformat_next (NULL); f; f = av_iformat_next (f))
 {
 if (! f->extensions)
 continue;
- 
+
 gchar * exts = g_ascii_strdown (f->extensions, -1);
 
 gchar * parse, * next;
@@ -110,13 +99,13 @@
 * next = 0;
 next ++;
 }
- 
+
 mowgli_patricia_add (dict, parse, f);
 }
- 
+
 g_free (exts);
 }
- 
+
 return dict;
 }
 
@@ -132,7 +121,7 @@
 extension_dict = create_extension_dict ();
 
 AVInputFormat * f = mowgli_patricia_retrieve (extension_dict, ext);
- 
+
 if (f)
 AUDDBG ("Format %s.\n", f->name);
 else
@@ -142,16 +131,12 @@
 return f;
 }
 
-#if ! CHECK_LIBAVFORMAT_VERSION (52, 62, 0)
-#define av_probe_input_format2(p, i, s) av_probe_input_format(p, i)
-#endif
-
 static AVInputFormat * get_format_by_content (const gchar * name, VFSFile * file)
 {
 AUDDBG ("Get format by content: %s\n", name);
 
 AVInputFormat * f = NULL;
- 
+
 guchar buf[16384 + AVPROBE_PADDING_SIZE];
 gint size = 16;
 gint filled = 0;
@@ -172,7 +157,7 @@
 f = av_probe_input_format2 (& d, TRUE, & score);
 if (f)
 break;
- 
+
 if (size < 16384)
 size *= 4;
 else if (target > 10)
@@ -185,10 +170,10 @@
 AUDDBG ("Format %s, buffer size %d, score %d.\n", f->name, size, score);
 else
 AUDDBG ("Format unknown.\n");
- 
+
 if (vfs_fseek (file, 0, SEEK_SET) < 0)
 ; /* ignore errors here */
- 
+
 return f;
 }
 
@@ -208,22 +193,29 @@
 return NULL;
 }
 
- AVFormatContext * c = NULL;
- gchar buf[64];
- snprintf (buf, sizeof buf, "audvfsptr:%p", file);
+ AVFormatContext * c = avformat_alloc_context ();
+ AVIOContext * io = io_context_new (file);
+ c->pb = io;
 
- gint ret = av_open_input_file (& c, buf, f, 0, NULL);
+ gint ret = avformat_open_input (& c, name, f, NULL);
 
 if (ret < 0)
 {
- fprintf (stderr, "ffaudio: av_open_input_file failed for %s: %s.\n",
- name, ffaudio_strerror (ret));
+ fprintf (stderr, "ffaudio: avformat_open_input failed for %s: %s.\n", name, ffaudio_strerror (ret));
+ io_context_free (io);
 return NULL;
 }
 
 return c;
 }
 
+static void close_input_file (AVFormatContext * c)
+{
+ AVIOContext * io = c->pb;
+ av_close_input_file (c);
+ io_context_free (io);
+}
+
 static gboolean
 ffaudio_codec_is_seekable(AVCodec *codec)
 {
@@ -273,15 +265,15 @@
 static void
 ffaudio_get_meta(Tuple *tuple, AVFormatContext *ic, const ffaudio_meta_t *m)
 {
- AVMetadataTag *tag = NULL;
+ AVDictionaryEntry *tag = NULL;
 
 if (ic->metadata != NULL)
 {
- tag = av_metadata_get(ic->metadata, m->prim_key, NULL, AV_METADATA_IGNORE_SUFFIX);
+ 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_metadata_get(ic->metadata, m->alt_keys[i], NULL, 0);
+ tag = av_dict_get(ic->metadata, m->alt_keys[i], NULL, 0);
 }
 }
 
@@ -341,11 +333,7 @@
 {
 s = ic->streams[i];
 c = s->codec;
-#if CHECK_LIBAVCODEC_VERSION (52, 64, 0)
 if (c->codec_type == AVMEDIA_TYPE_AUDIO)
-#else
- if (c->codec_type == CODEC_TYPE_AUDIO)
-#endif
 {
 av_find_stream_info(ic);
 codec = avcodec_find_decoder(c->codec_id);
@@ -356,7 +344,7 @@
 
 Tuple *tuple = tuple_new_from_filename(filename);
 ffaudio_get_tuple_data(tuple, ic, c, codec);
- av_close_input_file (ic);
+ close_input_file (ic);
 
 return tuple;
 }
@@ -419,11 +407,7 @@
 {
 s = ic->streams[i];
 c = s->codec;
-#if CHECK_LIBAVCODEC_VERSION (52, 64, 0)
 if (c->codec_type == AVMEDIA_TYPE_AUDIO)
-#else
- if (c->codec_type == CODEC_TYPE_AUDIO)
-#endif
 {
 av_find_stream_info(ic);
 codec = avcodec_find_decoder(c->codec_id);
@@ -447,13 +431,8 @@
 codec_opened = TRUE;
 
 /* Determine if audio conversion or resampling is needed */
-#if CHECK_LIBAVCODEC_VERSION (52, 94, 3)
- in_sample_size = av_get_bits_per_sample_fmt (c->sample_fmt) / 8;
- out_sample_size = av_get_bits_per_sample_fmt (SAMPLE_FMT_S16) / 8;
-#else
- in_sample_size = av_get_bits_per_sample_format (c->sample_fmt) / 8;
- out_sample_size = av_get_bits_per_sample_format (SAMPLE_FMT_S16) / 8;
-#endif
+ in_sample_size = av_get_bytes_per_sample (c->sample_fmt);
+ out_sample_size = av_get_bytes_per_sample (SAMPLE_FMT_S16);
 
 chunk_size = out_sample_size * c->channels * (c->sample_rate / 50);
 
@@ -592,11 +571,7 @@
 g_mutex_unlock(ctrl_mutex);
 
 /* Decode whatever we can of the frame data */
-#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 25)
- len = avcodec_decode_audio2(c, (gint16 *)outbuf, &out_size, tmp.data, tmp.size);
-#else
 len = avcodec_decode_audio3(c, (gint16 *)outbuf, &out_size, &tmp);
-#endif
 if (len < 0)
 {
 AUDDBG("codec failure, breaking out of loop\n");
@@ -679,7 +654,7 @@
 if (codec_opened)
 avcodec_close(c);
 if (ic != NULL)
- av_close_input_file(ic);
+ close_input_file(ic);
 
 AUDDBG("exiting thread\n");
 return ! error;
@@ -762,6 +737,14 @@
 NULL
 };
 
+static gchar * version_string (gint version)
+{
+ gint major = version >> 16;
+ gint minor = (version >> 8) & 0xff;
+ gint micro = version & 0xff;
+ return g_strdup_printf ("%d.%d.%d", major, minor, micro);
+}
+
 static void
 ffaudio_about(void)
 {
@@ -769,27 +752,42 @@
 
 if (aboutbox == NULL)
 {
+ gchar * avcodec_local = version_string (avcodec_version ());
+ gchar * avcodec_build = version_string (LIBAVCODEC_VERSION_INT);
+ gchar * avformat_local = version_string (avformat_version ());
+ gchar * avformat_build = version_string (LIBAVFORMAT_VERSION_INT);
+ gchar * avutil_local = version_string (avutil_version ());
+ gchar * avutil_build = version_string (LIBAVUTIL_VERSION_INT);
+
 gchar *description = g_strdup_printf(
 _("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"
- "\n"
 "Audacious plugin by:\n"
 " William Pitcock <nenolod@nenolod.net>,\n"
- " Matti Hämäläinen <ccr@tnsp.org>\n"),
- LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO,
- LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO);
+ " Matti Hämäläinen <ccr@tnsp.org>\n"
+ "\n"
+ "libavcodec %s (%s)\n"
+ "libavformat %s (%s)\n"
+ "libavutil %s (%s)\n"),
+ avcodec_local, avcodec_build, avformat_local, avformat_build, avutil_local, avutil_build);
 
 audgui_simple_message (& aboutbox, GTK_MESSAGE_INFO,
 _("About FFaudio Plugin"), description);
 
 g_free(description);
+ g_free (avcodec_local);
+ g_free (avcodec_build);
+ g_free (avformat_local);
+ g_free (avformat_build);
+ g_free (avutil_local);
+ g_free (avutil_build);
 }
 }
 
-InputPlugin ffaudio_ip = {
+AUD_INPUT_PLUGIN
+(
 .init = ffaudio_init,
 .cleanup = ffaudio_cleanup,
 .is_our_file_from_vfs = ffaudio_probe,
@@ -799,8 +797,8 @@
 .pause = ffaudio_pause,
 .mseek = ffaudio_seek,
 .about = ffaudio_about,
- .description = "FFaudio Plugin",
- .vfs_extensions = ffaudio_fmts,
+ .name = "FFmpeg Support",
+ .extensions = ffaudio_fmts,
 #ifdef FFAUDIO_USE_AUDTAG
 .update_song_tuple = ffaudio_write_tag,
 #endif
@@ -808,8 +806,4 @@
 /* FFMPEG probing takes forever on network files, so try everything else
 * first. -jlindgren */
 .priority = 10,
-};
-
-static InputPlugin *ffaudio_iplist[] = { &ffaudio_ip, NULL };
-
-SIMPLE_INPUT_PLUGIN (ffaudio, ffaudio_iplist)
+)

audacious-plugins-3.0.tar.gz/src/ffaudio/ffaudio-io.c Added

@@ -0,0 +1,50 @@
+/*
+ * ffaudio-io.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 "ffaudio-stdinc.h"
+
+#define IOBUF 4096
+
+static gint read_cb (void * file, guchar * buf, gint size)
+{
+ return vfs_fread (buf, 1, size, file);
+}
+
+static gint64 seek_cb (void * file, gint64 offset, gint whence)
+{
+ if (whence == AVSEEK_SIZE)
+ return vfs_fsize (file);
+ if (vfs_fseek (file, offset, whence & ~(gint) AVSEEK_FORCE))
+ return -1;
+ return vfs_ftell (file);
+}
+
+AVIOContext * io_context_new (VFSFile * file)
+{
+ guchar * buf = av_malloc (IOBUF);
+ return avio_alloc_context (buf, IOBUF, 0, file, read_cb, NULL, seek_cb);
+}
+
+void io_context_free (AVIOContext * io)
+{
+ av_free (io->buffer);
+ av_free (io);
+}

audacious-plugins-2.5.3.tar.gz/src/ffaudio/ffaudio-stdinc.h -> audacious-plugins-3.0.tar.gz/src/ffaudio/ffaudio-stdinc.h Changed

audacious-plugins-2.5.3.tar.gz/src/filewriter/filewriter.c -> audacious-plugins-3.0.tar.gz/src/filewriter/filewriter.c Changed

@@ -90,7 +90,7 @@
 static gchar *file_path = NULL;
 
 VFSFile *output_file = NULL;
-const Tuple *tuple = NULL;
+Tuple *tuple = NULL;
 
 static gint64 samples_written;
 
@@ -140,9 +140,6 @@
         g_return_val_if_fail (file_path != NULL, FALSE);
     }
 
-    /* ensure preloading of file transport */
-    vfs_prepare("file");
-
     set_plugin();
     if (plugin->init)
         plugin->init(&file_write_output);
@@ -229,11 +226,11 @@
     }
     else
     {
-        const gchar * original = strrchr (aud_playlist_entry_get_filename
-         (playlist, pos), '/');
-
+        temp = aud_playlist_entry_get_filename (playlist, pos);
+        gchar * original = strrchr (temp, '/');
         g_return_val_if_fail (original != NULL, 0);
         filename = g_strdup (original + 1);
+        g_free (temp);
 
         if (!use_suffix)
             if ((temp = strrchr(filename, '.')) != NULL)
@@ -253,7 +250,7 @@
 
     if (save_original)
     {
-        directory = g_strdup (aud_playlist_entry_get_filename (playlist, pos));
+        directory = aud_playlist_entry_get_filename (playlist, pos);
         temp = strrchr (directory, '/');
         g_return_val_if_fail (temp != NULL, 0);
         temp[1] = 0;
@@ -308,6 +305,12 @@
     if (output_file != NULL)
         vfs_fclose(output_file);
     output_file = NULL;
+
+    if (tuple)
+    {
+        tuple_free (tuple);
+        tuple = NULL;
+    }
 }
 
 static void file_flush(gint time)
@@ -589,8 +592,9 @@
     }
 }
 
-static OutputPlugin file_op = {
- .description = "FileWriter Plugin",
+AUD_OUTPUT_PLUGIN
+(
+ .name = "FileWriter",
  .init = file_init,
  .about = file_about,
  .configure = file_configure,
@@ -603,8 +607,5 @@
  .output_time = file_get_time,
  .pause = file_pause,
  .flush = file_flush,
- .set_written_time = file_set_written_time};
-
-static OutputPlugin * file_oplist[] = {& file_op, NULL};
-
-SIMPLE_OUTPUT_PLUGIN (filewriter, file_oplist)
+ .set_written_time = file_set_written_time,
+)

audacious-plugins-2.5.3.tar.gz/src/filewriter/filewriter.h -> audacious-plugins-3.0.tar.gz/src/filewriter/filewriter.h Changed

audacious-plugins-2.5.3.tar.gz/src/flacng/plugin.c -> audacious-plugins-3.0.tar.gz/src/flacng/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/gio/gio.c -> audacious-plugins-3.0.tar.gz/src/gio/gio.c Changed

audacious-plugins-2.5.3.tar.gz/src/gnomeshortcuts/gnomeshortcuts.c -> audacious-plugins-3.0.tar.gz/src/gnomeshortcuts/gnomeshortcuts.c Changed

audacious-plugins-2.5.3.tar.gz/src/gntui/gntui.c -> audacious-plugins-3.0.tar.gz/src/gntui/gntui.c Changed

@@ -68,9 +68,11 @@
         gint length = aud_playlist_entry_get_length(playlist, i) / 1000;
         gchar * len = g_strdup_printf("%02i:%02i", length / 60, length % 60);
 
+        gchar * title = aud_playlist_entry_get_title (playlist, i);
         row = gnt_tree_create_row(GNT_TREE(playlist_widget),
-                                  aud_playlist_entry_get_title(playlist, i),
-                                  len, NULL);
+                                  title, len, NULL);
+        g_free (title);
+
         gnt_tree_add_row_after(GNT_TREE(playlist_widget),
                                GINT_TO_POINTER(i+1),
                                row,
@@ -106,12 +108,9 @@
 {
     gint playlist = aud_playlist_get_active();
     gint pos = aud_playlist_get_position(playlist);
-    const gchar *title = aud_playlist_entry_get_title(playlist, pos);
-
-    if (title == NULL)
-        title = "";
-
+    gchar * title = aud_playlist_entry_get_title (playlist, pos);
     gnt_label_set_text(GNT_LABEL(title_widget), title);
+    g_free (title);
 }
 
 static void set_song_info(gpointer hook_data, gpointer user_data)

audacious-plugins-2.5.3.tar.gz/src/gsf/plugin.c -> audacious-plugins-3.0.tar.gz/src/gsf/plugin.c Changed

@@ -126,15 +126,15 @@
 	if (!psftag_getvar(tag, "title", tmp_str, sizeof(tmp_str)-1)) {
 		tuple_associate_string(ti, FIELD_TITLE, NULL, tmp_str);
 	}
-		
+
 	if (!psftag_getvar(tag, "artist", tmp_str, sizeof(tmp_str)-1)) {
 		tuple_associate_string(ti, FIELD_ARTIST, NULL, tmp_str);
 	}
-		
+
 	if (!psftag_getvar(tag, "game", tmp_str, sizeof(tmp_str)-1)) {
 		tuple_associate_string(ti, FIELD_ALBUM, NULL, tmp_str);
 	}
-		
+
 	if (!psftag_getvar(tag, "year", tmp_str, sizeof(tmp_str)-1)) {
 		tuple_associate_string(ti, FIELD_DATE, NULL, tmp_str);
 	}
@@ -142,15 +142,15 @@
 	if (!psftag_getvar(tag, "copyright", tmp_str, sizeof(tmp_str)-1)) {
 		tuple_associate_string(ti, FIELD_COPYRIGHT, NULL, tmp_str);
 	}
-		
+
 	if (!psftag_getvar(tag, "gsfby", tmp_str, sizeof(tmp_str)-1)) {
 		tuple_associate_string(ti, -1, "gsfby", tmp_str);
 	}
-		
+
 	if (!psftag_getvar(tag, "tagger", tmp_str, sizeof(tmp_str)-1)) {
 		tuple_associate_string(ti, -1, "tagger", tmp_str);
 	}
-		
+
 	if (!psftag_raw_getvar(tag, "length", tmp_str, sizeof(tmp_str)-1)) {
 		tuple_associate_int(ti, FIELD_LENGTH, NULL, LengthFromString(tmp_str) + FadeLength);
 	}
@@ -190,18 +190,18 @@
 
 static const gchar *gsf_fmts[] = { "gsf", "minigsf", NULL };
 
-InputPlugin gsf_ip =
-{
-        .description = "Highly Advanced for Audacious",
-        .about = gsf_about,
-        .play = gsf_play,
-        .stop = gsf_stop,
-        .pause = gsf_pause,
-        .mseek = gsf_mseek,
-        .probe_for_tuple = gsf_get_song_tuple,
-        .is_our_file_from_vfs = gsf_is_our_fd,
-	.vfs_extensions = gsf_fmts,
-};
+AUD_INPUT_PLUGIN
+(
+	.description = "Highly Advanced for Audacious",
+	.about = gsf_about,
+	.play = gsf_play,
+	.stop = gsf_stop,
+	.pause = gsf_pause,
+	.mseek = gsf_mseek,
+	.probe_for_tuple = gsf_get_song_tuple,
+	.is_our_file_from_vfs = gsf_is_our_fd,
+	.extensions = gsf_fmts,
+)
 
 static InputPlayback *_playback = NULL;
 
@@ -209,7 +209,7 @@
 {
 	stop_flag = TRUE;
 }
-	
+
 void writeSound(void)
 {
 	int tmp;
@@ -258,7 +258,7 @@
 	soundQuality = 0;
 
 	DetectSilence=1;
-	silencelength=5;	
+	silencelength=5;
 	IgnoreTrackLength=0;
 	DefaultLength=150000;
 	TrailingSilence=1000;
@@ -274,7 +274,7 @@
 	fn = f ? f : filename;
 
 	Tuple *ti = gsf_get_song_tuple(fn, file);
-	
+
 	r = GSFRun(fn);
 	if (!r)
 		return FALSE;
@@ -308,11 +308,3 @@
 
 	return TRUE;
 }
-
-InputPlugin *get_iplugin_info(void)
-{
-	return &gsf_ip;
-}
-
-InputPlugin *gsf_iplist[] = { &gsf_ip, NULL };
-SIMPLE_INPUT_PLUGIN(gsf, gsf_iplist);

audacious-plugins-2.5.3.tar.gz/src/gtkui/Makefile -> audacious-plugins-3.0.tar.gz/src/gtkui/Makefile Changed

audacious-plugins-3.0.tar.gz/src/gtkui/gtkui.h Added

@@ -0,0 +1,40 @@
+/*
+ * gtkui.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 GTKUI_H
+#define GTKUI_H
+
+#include <gtk/gtk.h>
+
+/* menus.c */
+GtkWidget * make_menu_bar (GtkAccelGroup * accel);
+GtkWidget * make_menu_main (GtkAccelGroup * accel);
+GtkWidget * make_menu_rclick (GtkAccelGroup * accel);
+GtkWidget * make_menu_tab (GtkAccelGroup * accel);
+
+/* ui_gtk.c */
+void show_menu (gboolean show);
+void show_infoarea (gboolean show);
+void show_statusbar (gboolean show);
+void popup_menu_rclick (guint button, guint32 time);
+void popup_menu_tab (guint button, guint32 time);
+
+#endif

audacious-plugins-2.5.3.tar.gz/src/gtkui/gtkui_cfg.h -> audacious-plugins-3.0.tar.gz/src/gtkui/gtkui_cfg.h Changed

audacious-plugins-3.0.tar.gz/src/gtkui/menus.c Added

@@ -0,0 +1,340 @@
+/*
+ * menus.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 <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+
+#include <audacious/audconfig.h>
+#include <audacious/drct.h>
+#include <audacious/gtk-compat.h>
+#include <audacious/i18n.h>
+#include <audacious/misc.h>
+#include <audacious/playlist.h>
+#include <libaudcore/hook.h>
+#include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
+
+#include "config.h"
+#include "gtkui.h"
+#include "gtkui_cfg.h"
+#include "playlist_util.h"
+#include "ui_playlist_notebook.h"
+#include "ui_playlist_widget.h"
+
+#define SHIFT GDK_SHIFT_MASK
+#define CTRL GDK_CONTROL_MASK
+#define ALT GDK_MOD1_MASK
+
+struct MenuItem {
+ const gchar * name;
+ const gchar * icon;
+ guint key;
+ GdkModifierType mod;
+
+ /* for normal items */
+ void (* func) (void);
+
+ /* for toggle items */
+ gboolean (* get) (void);
+ void (* set) (gboolean on);
+ const gchar * hook;
+
+ /* for submenus */
+ const struct MenuItem * items;
+ gint n_items;
+
+ /* for custom submenus */
+ GtkWidget * (* get_sub) (void);
+
+ /* for separators */
+ gboolean sep;
+};
+
+static void open_files (void) {audgui_run_filebrowser (TRUE); }
+static void open_url (void) {audgui_show_add_url_window (TRUE); }
+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 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); }
+static void pl_sort_artist (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_ARTIST); }
+static void pl_sort_album (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_ALBUM); }
+static void pl_sort_date (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_DATE); }
+static void pl_sort_path (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_PATH); }
+static void pl_sort_custom (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_FORMATTED_TITLE); }
+static void pl_reverse (void) {aud_playlist_reverse (aud_playlist_get_active ()); }
+static void pl_random (void) {aud_playlist_randomize (aud_playlist_get_active ()); }
+
+static void pl_new (void)
+{
+ aud_playlist_insert (aud_playlist_get_active () + 1);
+ aud_playlist_set_active (aud_playlist_get_active () + 1);
+}
+
+static void pl_refresh (void) {aud_playlist_rescan (aud_playlist_get_active ()); }
+static void pl_close (void) {audgui_confirm_playlist_delete (aud_playlist_get_active ()); }
+static void pl_refresh_sel (void) {aud_playlist_rescan_selected (aud_playlist_get_active ()); }
+static void pl_select_all (void) {aud_playlist_select_all (aud_playlist_get_active (), TRUE); }
+static void pl_rename (void) {ui_playlist_notebook_edit_tab_title (NULL); }
+
+static GtkWidget * get_services_main (void) {return aud_get_plugin_menu (AUD_MENU_MAIN); }
+static GtkWidget * get_services_pl (void) {return aud_get_plugin_menu (AUD_MENU_PLAYLIST_RCLICK); }
+
+static void volume_up (void)
+{
+ int vol = 0;
+ aud_drct_get_volume_main (& vol);
+ aud_drct_set_volume_main (vol + 5);
+}
+
+static void volume_down (void)
+{
+ int vol = 0;
+ aud_drct_get_volume_main (& vol);
+ 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 const struct MenuItem file_items[] = {
+ {N_("_Open Files ..."), GTK_STOCK_OPEN, 'l', .func = open_files},
+ {N_("Open _URL ..."), GTK_STOCK_NETWORK, 'l', CTRL, .func = open_url},
+ {N_("_Add File ..."), GTK_STOCK_ADD, 'f', .func = add_files},
+ {N_("Add U_RL ..."), GTK_STOCK_NETWORK, 'h', CTRL, .func = add_url},
+ {.sep = TRUE},
+ {N_("A_bout ..."), GTK_STOCK_ABOUT, .func = audgui_show_about_window},
+ {N_("_Preferences ..."), GTK_STOCK_PREFERENCES, 'p', CTRL, .func = aud_show_prefs_window},
+ {N_("_Quit"), GTK_STOCK_QUIT, 'q', CTRL, .func = aud_drct_quit}};
+
+static const struct MenuItem playback_items[] = {
+ {N_("_Play"), GTK_STOCK_MEDIA_PLAY, 'x', .func = aud_drct_play},
+ {N_("Paus_e"), GTK_STOCK_MEDIA_PAUSE, 'c', .func = aud_drct_pause},
+ {N_("_Stop"), GTK_STOCK_MEDIA_STOP, 'v', .func = aud_drct_stop},
+ {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"},
+ {.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},
+ {N_("_Jump to Song ..."), GTK_STOCK_JUMP_TO, 'j', .func = audgui_jump_to_track}};
+
+static const struct MenuItem sort_items[] = {
+ {N_("By Track _Number"), .func = pl_sort_track},
+ {N_("By _Title"), .func = pl_sort_title},
+ {N_("By _Artist"), .func = pl_sort_artist},
+ {N_("By A_lbum"), .func = pl_sort_album},
+ {N_("By Release _Date"), .func = pl_sort_date},
+ {N_("By _File Path"), .func = pl_sort_path},
+ {N_("By _Custom Title"), .func = pl_sort_custom},
+ {.sep = TRUE},
+ {N_("R_everse Order"), GTK_STOCK_SORT_DESCENDING, .func = pl_reverse},
+ {N_("_Random Order"), .func = pl_random}};
+
+static const struct MenuItem playlist_items[] = {
+ {N_("_Refresh"), GTK_STOCK_REFRESH, GDK_F5, .func = pl_refresh},
+ {.sep = TRUE},
+ {N_("_Sort"), GTK_STOCK_SORT_ASCENDING, .items = sort_items, G_N_ELEMENTS (sort_items)},
+ {.sep = TRUE},
+ {N_("_New"), GTK_STOCK_NEW, 't', CTRL, .func = pl_new},
+ {N_("_Close"), GTK_STOCK_CLOSE, 'w', CTRL, .func = pl_close},
+ {.sep = TRUE},
+ {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}};
+
+static const struct MenuItem output_items[] = {
+ {N_("Volume _Up"), GTK_STOCK_GO_UP, '+', .func = volume_up},
+ {N_("Volume _Down"), GTK_STOCK_GO_DOWN, '-', .func = volume_down},
+ {.sep = TRUE},
+ {N_("_Equalizer"), GTK_STOCK_PREFERENCES, 'e', CTRL, .func = audgui_show_equalizer_window},
+ {.sep = TRUE},
+ {N_("E_ffects"), .get_sub = audgui_create_effects_menu}};
+
+static const struct MenuItem view_items[] = {
+ {N_("_Interface"), .get_sub = audgui_create_iface_menu},
+ {.sep = TRUE},
+ {N_("Show _Menu Bar"), NULL, 'm', SHIFT | CTRL, .get = menu_bar_get, show_menu},
+ {N_("Show I_nfo Bar"), NULL, 'i', SHIFT | CTRL, .get = info_bar_get, show_infoarea},
+ {N_("Show _Status Bar"), NULL, 's', SHIFT | CTRL, .get = status_bar_get, show_statusbar},
+ {.sep = TRUE},
+ {N_("Show Column _Headers"), .get = column_headers_get, playlist_show_headers},
+ {N_("Choose _Columns ..."), .func = pw_col_choose},
+ {N_("Scrol_l on Song Change"), .get = autoscroll_get, autoscroll_set}};
+
+static const struct MenuItem main_items[] = {
+ {N_("_File"), .items = file_items, G_N_ELEMENTS (file_items)},
+ {N_("_Playback"), .items = playback_items, G_N_ELEMENTS (playback_items)},
+ {N_("P_laylist"), .items = playlist_items, G_N_ELEMENTS (playlist_items)},
+ {N_("_Services"), .get_sub = get_services_main},
+ {N_("_Output"), .items = output_items, G_N_ELEMENTS (output_items)},
+ {N_("_View"), .items = view_items, G_N_ELEMENTS (view_items)}};
+
+static const struct MenuItem rclick_items[] = {
+ {N_("Song _Info ..."), GTK_STOCK_INFO, 'i', ALT, .func = playlist_song_info},
+ {N_("_Queue/Unqueue"), AUD_STOCK_QUEUETOGGLE, 'q', .func = playlist_queue_toggle},
+ {N_("_Refresh"), GTK_STOCK_REFRESH, GDK_F6, .func = pl_refresh_sel},
+ {.sep = TRUE},
+ {N_("Cu_t"), GTK_STOCK_CUT, 'x', CTRL, .func = playlist_cut},
+ {N_("_Copy"), GTK_STOCK_COPY, 'c', CTRL, .func = playlist_copy},
+ {N_("_Paste"), GTK_STOCK_PASTE, 'v', CTRL, .func = playlist_paste},
+ {N_("Select _All"), GTK_STOCK_SELECT_ALL, 'a', CTRL, .func = pl_select_all},
+ {.sep = TRUE},
+ {N_("_Services"), .get_sub = get_services_pl}};
+
+static const struct MenuItem tab_items[] = {
+ {N_("_Rename"), GTK_STOCK_EDIT, GDK_F2, .func = pl_rename}};
+
+static void toggled_cb (GtkCheckMenuItem * check, const struct MenuItem * item)
+{
+ if (item->get () == gtk_check_menu_item_get_active (check))
+ 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)
+{
+ const struct MenuItem * item = g_object_get_data ((GObject *) check, "item");
+ gtk_check_menu_item_set_active ((GtkCheckMenuItem *) check, item->get ());
+}
+
+static void unhook_cb (GtkCheckMenuItem * check, const struct MenuItem * item)
+{
+ hook_dissociate_full (item->hook, (HookFunction) hook_cb, check);
+}
+
+static void populate_menu (GtkWidget * shell, const struct MenuItem * items,
+ gint n_items, GtkAccelGroup * accel)
+{
+ for (gint i = 0; i < n_items; i ++)
+ {
+ const struct MenuItem * item = & items[i];
+ GtkWidget * widget = NULL;
+
+ if (item->name && item->func) /* normal widget */
+ {
+ widget = gtk_image_menu_item_new_with_mnemonic (_(item->name));
+ g_signal_connect (widget, "activate", item->func, NULL);
+
+ if (item->icon)
+ gtk_image_menu_item_set_image ((GtkImageMenuItem *) widget,
+ gtk_image_new_from_stock (item->icon, GTK_ICON_SIZE_MENU));
+ }
+ else if (item->name && item->get && item->set) /* toggle widget */
+ {
+ widget = gtk_check_menu_item_new_with_mnemonic (_(item->name));
+ gtk_check_menu_item_set_active ((GtkCheckMenuItem *) widget,
+ item->get ());
+ g_signal_connect (widget, "toggled", (GCallback) toggled_cb,
+ (void *) item);
+
+ if (item->hook)
+ {
+ g_object_set_data ((GObject *) widget, "item", (void *) item);
+ hook_associate (item->hook, (HookFunction) hook_cb, widget);
+ g_signal_connect (widget, "destroy", (GCallback) unhook_cb,
+ (void *) item);
+ }
+ }
+ else if (item->name && (item->items || item->get_sub)) /* submenu */
+ {
+ widget = gtk_image_menu_item_new_with_mnemonic (_(item->name));
+
+ if (item->icon)
+ gtk_image_menu_item_set_image ((GtkImageMenuItem *) widget,
+ gtk_image_new_from_stock (item->icon, GTK_ICON_SIZE_MENU));
+
+ GtkWidget * sub;
+
+ if (item->get_sub)
+ sub = item->get_sub ();
+ else
+ {
+ sub = gtk_menu_new ();
+ populate_menu (sub, item->items, item->n_items, accel);
+ }
+
+ gtk_menu_item_set_submenu ((GtkMenuItem *) widget, sub);
+ }
+ else if (item->sep) /* separator */
+ widget = gtk_separator_menu_item_new ();
+
+ if (! widget)
+ continue;
+
+ if (item->key)
+ gtk_widget_add_accelerator (widget, "activate", accel, item->key,
+ item->mod, GTK_ACCEL_VISIBLE);
+
+ gtk_widget_show (widget);
+ gtk_menu_shell_append ((GtkMenuShell *) shell, widget);
+ }
+}
+
+GtkWidget * make_menu_bar (GtkAccelGroup * accel)
+{
+ GtkWidget * bar = gtk_menu_bar_new ();
+ populate_menu (bar, main_items, G_N_ELEMENTS (main_items), accel);
+ return bar;
+}
+
+GtkWidget * make_menu_main (GtkAccelGroup * accel)
+{
+ GtkWidget * shell = gtk_menu_new ();
+ populate_menu (shell, main_items, G_N_ELEMENTS (main_items), accel);
+ return shell;
+}
+
+GtkWidget * make_menu_rclick (GtkAccelGroup * accel)
+{
+ GtkWidget * shell = gtk_menu_new ();
+ populate_menu (shell, rclick_items, G_N_ELEMENTS (rclick_items), accel);
+ return shell;
+}
+
+GtkWidget * make_menu_tab (GtkAccelGroup * accel)
+{
+ GtkWidget * shell = gtk_menu_new ();
+ populate_menu (shell, tab_items, G_N_ELEMENTS (tab_items), accel);
+ return shell;
+}

audacious-plugins-2.5.3.tar.gz/src/gtkui/playlist_util.c -> audacious-plugins-3.0.tar.gz/src/gtkui/playlist_util.c Changed

@@ -1,5 +1,5 @@
 /* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2010 Audacious development team
+ * Copyright (C) 2005-2011 Audacious development team
 * Copyright (C) 2010 Michał Lipski <tallica@o2.pl>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,11 @@
 */
 
 #include <gtk/gtk.h>
+
+#include <audacious/drct.h>
 #include <audacious/playlist.h>
+#include <libaudgui/libaudgui.h>
+#include <libaudgui/list.h>
 
 #include "playlist_util.h"
 #include "ui_playlist_notebook.h"
@@ -53,15 +57,92 @@
 GtkWidget * tree = playlist_get_treeview (list);
 g_return_val_if_fail (tree, -1);
 
- GtkTreePath * path = NULL;
- gint focus = -1;
+ return audgui_list_get_focus (tree);
+}
+
+void playlist_song_info (void)
+{
+ gint list = aud_playlist_get_active ();
+ gint focus = playlist_get_focus (list);
+
+ if (focus < 0)
+ return;
+
+ audgui_infowin_show (list, focus);
+}
+
+void playlist_queue_toggle (void)
+{
+ gint list = aud_playlist_get_active ();
+ gint focus = playlist_get_focus (list);
+
+ if (focus < 0)
+ return;
+
+ gint at = aud_playlist_queue_find_entry (list, focus);
+
+ if (at < 0)
+ aud_playlist_queue_insert (list, -1, focus);
+ else
+ aud_playlist_queue_delete (list, at, 1);
+}
+
+void playlist_delete_selected (void)
+{
+ gint list = aud_playlist_get_active ();
+ gint focus = playlist_get_focus (list);
+ focus -= playlist_count_selected_in_range (list, 0, focus);
+
+ aud_drct_pl_delete_selected ();
 
- gtk_tree_view_get_cursor ((GtkTreeView *) tree, & path, NULL);
- if (path)
+ if (aud_playlist_selected_count (list)) /* song changed? */
+ return;
+
+ if (focus == aud_playlist_entry_count (list))
+ focus --;
+ if (focus >= 0)
 {
- focus = gtk_tree_path_get_indices (path)[0];
- gtk_tree_path_free (path);
+ aud_playlist_entry_set_selected (list, focus, TRUE);
+ playlist_set_focus (list, focus);
 }
+}
+
+void playlist_copy (void)
+{
+ gchar * text = audgui_urilist_create_from_selected (aud_playlist_get_active ());
+ if (! text)
+ return;
+
+ gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), text, -1);
+ g_free (text);
+}
+
+void playlist_cut (void)
+{
+ playlist_copy ();
+ playlist_delete_selected ();
+}
+
+void playlist_paste (void)
+{
+ gchar * text = gtk_clipboard_wait_for_text (gtk_clipboard_get
+ (GDK_SELECTION_CLIPBOARD));
+ if (! text)
+ return;
+
+ gint list = aud_playlist_get_active ();
+ audgui_urilist_insert (list, playlist_get_focus (list), text);
+ g_free (text);
+}
+
+void playlist_shift (gint offset)
+{
+ gint list = aud_playlist_get_active ();
+ gint focus = playlist_get_focus (list);
+
+ if (focus < 0 || ! aud_playlist_entry_get_selected (list, focus))
+ return;
 
- return focus;
+ focus += aud_playlist_shift (list, focus, offset);
+ playlist_set_focus (list, focus);
 }

audacious-plugins-2.5.3.tar.gz/src/gtkui/playlist_util.h -> audacious-plugins-3.0.tar.gz/src/gtkui/playlist_util.h Changed

audacious-plugins-2.5.3.tar.gz/src/gtkui/ui_gtk.c -> audacious-plugins-3.0.tar.gz/src/gtkui/ui_gtk.c Changed

@@ -1,5 +1,5 @@
 /* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2010 Audacious development team
+ * Copyright (C) 2005-2011 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
@@ -24,7 +24,7 @@
 #include <audacious/debug.h>
 #include <audacious/drct.h>
 #include <audacious/gtk-compat.h>
-#include <audacious/interface.h>
+#include <audacious/i18n.h>
 #include <audacious/playlist.h>
 #include <audacious/plugin.h>
 #include <audacious/misc.h>
@@ -33,56 +33,57 @@
 #include <libaudgui/libaudgui-gtk.h>
 
 #include "config.h"
+#include "gtkui.h"
 #include "gtkui_cfg.h"
 #include "layout.h"
-#include "ui_gtk.h"
 #include "ui_playlist_notebook.h"
 #include "ui_playlist_widget.h"
-#include "ui_manager.h"
 #include "ui_infoarea.h"
 #include "ui_statusbar.h"
 #include "playlist_util.h"
-#include "actions-mainwin.h"
-#include "actions-playlist.h"
 
-#if GTK_CHECK_VERSION (2, 12, 0)
-#define HAVE_VOLUME
 static GtkWidget *volume;
 static gboolean volume_slider_is_moving = FALSE;
 static guint update_volume_timeout_source = 0;
 static gulong volume_change_handler_id;
-#endif
+
+static GtkAccelGroup * accel;
 
 static GtkWidget * button_play, * button_pause, * button_stop, * slider,
 * label_time, * button_shuffle, * button_repeat;
-GtkWidget *playlist_box;
-GtkWidget *window; /* the main window */
-GtkWidget *vbox; /* the main vertical box */
-GtkWidget *menu;
-GtkWidget *infoarea = NULL;
-GtkWidget *statusbar = NULL;
+static GtkWidget * window, * vbox, * menu_box, * menu, * playlist_box,
+ * infoarea, * statusbar;
+static GtkWidget * menu_main, * menu_rclick, * menu_tab;
 
 static GtkWidget * error_win = NULL;
 
-static gulong slider_change_handler_id;
 static gboolean slider_is_moving = FALSE;
-static gint slider_position;
 static guint delayed_title_change_source = 0;
 static guint update_song_timeout_source = 0;
 
 extern GtkWidget *ui_playlist_notebook_tab_title_editing;
 
-static gboolean _ui_initialize (IfaceCbs * cbs);
-static gboolean _ui_finalize(void);
-
-Iface gtkui_interface = {
- .id = "gtkui",
- .desc = N_("GTK Interface"),
- .init = _ui_initialize,
- .fini = _ui_finalize,
-};
-
-SIMPLE_IFACE_PLUGIN ("gtkui", & gtkui_interface)
+static gboolean init (void);
+static void cleanup (void);
+static void ui_show (gboolean show);
+static gboolean ui_is_shown (void);
+static gboolean ui_is_focused (void);
+static void ui_show_error (const gchar * text);
+
+AUD_IFACE_PLUGIN
+(
+ .name = N_("GTK Interface"),
+ .init = init,
+ .cleanup = cleanup,
+ .show = ui_show,
+ .is_shown = ui_is_shown,
+ .is_focused = ui_is_focused,
+ .show_error = ui_show_error,
+ .show_filebrowser = audgui_run_filebrowser,
+ .show_jump_to_track = audgui_jump_to_track,
+ .run_gtk_plugin = (void *) layout_add,
+ .stop_gtk_plugin = (void *) layout_remove,
+)
 
 static void save_window_size (void)
 {
@@ -107,32 +108,6 @@
 return TRUE;
 }
 
-void show_preferences_window(gboolean show)
-{
- /* static GtkWidget * * prefswin = NULL; */
- static void * * prefswin = NULL;
-
- if (show)
- {
- if ((prefswin != NULL) && (*prefswin != NULL))
- {
- gtk_window_present(GTK_WINDOW(*prefswin));
- return;
- }
-
- prefswin = gtkui_interface.ops->create_prefs_window();
-
- gtk_widget_show_all(*prefswin);
- }
- else
- {
- if ((prefswin != NULL) && (*prefswin != NULL))
- {
- gtkui_interface.ops->destroy_prefs_window();
- }
- }
-}
-
 static void button_open_pressed()
 {
 audgui_run_filebrowser(TRUE);
@@ -143,31 +118,6 @@
 audgui_run_filebrowser(FALSE);
 }
 
-static void button_play_pressed()
-{
- action_playback_play ();
-}
-
-static void button_pause_pressed()
-{
- action_playback_pause ();
-}
-
-static void button_stop_pressed()
-{
- action_playback_stop ();
-}
-
-static void button_previous_pressed()
-{
- action_playback_previous ();
-}
-
-static void button_next_pressed()
-{
- action_playback_next ();
-}
-
 static gboolean title_change_cb (void)
 {
 if (delayed_title_change_source)
@@ -190,43 +140,36 @@
 return FALSE;
 }
 
-static void ui_mainwin_show()
-{
- if (config.save_window_position)
- gtk_window_move(GTK_WINDOW(window), config.player_x, config.player_y);
-
- gtk_widget_show(window);
- gtk_window_present(GTK_WINDOW(window));
-}
-
-static void ui_mainwin_hide()
-{
- if (config.save_window_position)
- gtk_window_get_position(GTK_WINDOW(window), &config.player_x, &config.player_y);
-
- gtk_widget_hide(window);
-}
-
-static void ui_mainwin_toggle_visibility(gpointer hook_data, gpointer user_data)
+static void ui_show (gboolean show)
 {
- gboolean show = GPOINTER_TO_INT(hook_data);
-
 config.player_visible = show;
- aud_cfg->player_visible = show;
 
 if (show)
 {
- ui_mainwin_show();
+ if (config.save_window_position && ! gtk_widget_get_visible (window))
+ gtk_window_move ((GtkWindow *) window, config.player_x,
+ config.player_y);
+
+ gtk_window_present ((GtkWindow *) window);
 }
- else
+ else if (gtk_widget_get_visible (window))
 {
- ui_mainwin_hide();
+ if (config.save_window_position)
+ gtk_window_get_position ((GtkWindow *) window, & config.player_x,
+ & config.player_y);
+
+ gtk_widget_hide (window);
 }
 }
 
-static void ui_toggle_visibility(void)
+static gboolean ui_is_shown (void)
 {
- ui_mainwin_toggle_visibility(GINT_TO_POINTER(!config.player_visible), NULL);
+ return config.player_visible;
+}
+
+static gboolean ui_is_focused (void)
+{
+ return gtk_window_is_active ((GtkWindow *) window);
 }
 
 static void ui_show_error (const gchar * text)
@@ -267,13 +210,7 @@
 
 static void set_slider (gint time)
 {
- if (g_signal_handler_is_connected (slider, slider_change_handler_id))
- g_signal_handler_block (slider, slider_change_handler_id);
-
 gtk_range_set_value ((GtkRange *) slider, time);
-
- if (g_signal_handler_is_connected (slider, slider_change_handler_id))
- g_signal_handler_unblock (slider, slider_change_handler_id);
 }
 
 static gboolean time_counter_cb (void)
@@ -292,23 +229,20 @@
 return TRUE;
 }
 
-static gboolean ui_slider_value_changed_cb(GtkRange * range, gpointer user_data)
-{
- aud_drct_seek (gtk_range_get_value (range));
- slider_is_moving = FALSE;
- return TRUE;
-}
-
 static gboolean ui_slider_change_value_cb(GtkRange * range, GtkScrollType scroll)
 {
- set_time_label (gtk_range_get_value (range), aud_drct_get_length ());
+ gint value = gtk_range_get_value (range);
+ set_time_label (value, aud_drct_get_length ());
+
+ if (!slider_is_moving)
+ aud_drct_seek (gtk_range_get_value (range));
+
 return FALSE;
 }
 
 static gboolean ui_slider_button_press_cb(GtkWidget * widget, GdkEventButton * event, gpointer user_data)
 {
 slider_is_moving = TRUE;
- slider_position = gtk_range_get_value(GTK_RANGE(widget));
 
 /* HACK: clicking with the left mouse button moves the slider
 to the location of the click. */
@@ -324,13 +258,11 @@
 if (event->button == 1)
 event->button = 2;
 
- if (slider_position == (gint) gtk_range_get_value(GTK_RANGE(widget)))
- slider_is_moving = FALSE;
+ slider_is_moving = FALSE;
 
 return FALSE;
 }
 
-#ifdef HAVE_VOLUME
 static gboolean ui_volume_value_changed_cb(GtkButton * button, gdouble volume, gpointer user_data)
 {
 aud_drct_set_volume((gint) volume, (gint) volume);
@@ -373,18 +305,8 @@
 return TRUE;
 }
 
-void set_volume_diff(gint diff)
-{
- gint vol = gtk_scale_button_get_value(GTK_SCALE_BUTTON(volume));
- gtk_scale_button_set_value(GTK_SCALE_BUTTON(volume), CLAMP(vol + diff, 0, 100));
-}
-#endif
-
 static void set_slider_length (gint length)
 {
- if (g_signal_handler_is_connected (slider, slider_change_handler_id))
- g_signal_handler_block (slider, slider_change_handler_id);
-
 if (length > 0)
 {
 gtk_range_set_range ((GtkRange *) slider, 0, length);
@@ -392,9 +314,6 @@
 }
 else
 gtk_widget_hide (slider);
-
- if (g_signal_handler_is_connected (slider, slider_change_handler_id))
- g_signal_handler_unblock (slider, slider_change_handler_id);
 }
 
 static void pause_cb (void)
@@ -458,6 +377,18 @@
 gtk_widget_hide (label_time);
 }
 
+static gboolean rclick_cb (GtkWidget * widget, GdkEventButton * event)
+{
+ if (event->button != 3)
+ return FALSE;
+
+ if (event->type == GDK_BUTTON_PRESS && menu_main)
+ gtk_menu_popup ((GtkMenu *) menu_main, NULL, NULL, NULL, NULL,
+ event->button, event->time);
+
+ return TRUE;
+}
+
 static GtkWidget *gtk_toolbar_button_add(GtkWidget * toolbar, void (*callback) (), const gchar * stock_id)
 {
 GtkWidget *icon;
@@ -471,6 +402,7 @@
 
 gtk_box_pack_start(GTK_BOX(toolbar), button, FALSE, FALSE, 0);
 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(callback), NULL);
+ g_signal_connect (button, "button-press-event", (GCallback) rclick_cb, NULL);
 
 return button;
 }
@@ -522,16 +454,6 @@
 case 0:
 switch (event->keyval)
 {
-#ifdef HAVE_VOLUME
- case GDK_minus: //FIXME
- set_volume_diff(-5);
- break;
-
- case GDK_plus: //FIXME
- set_volume_diff(5);
- break;
-#endif
-
 case GDK_Left:
 case GDK_KP_Left:
 case GDK_KP_7:
@@ -554,10 +476,6 @@
 aud_drct_pl_next();
 break;
 
- case GDK_KP_Insert:
- action_jump_to_file();
- break;
-
 case GDK_space:
 if (aud_drct_get_playing())
 aud_drct_pause();
@@ -570,30 +488,12 @@
 (aud_playlist_get_active ()), NULL);
 break;
 
- default:
- return FALSE;
- }
- break;
-
-	case GDK_CONTROL_MASK:
- switch (event->keyval)
- {
- case GDK_ISO_Left_Tab:
- case GDK_Tab:
- action_playlist_next();
+ case GDK_Delete:
+ playlist_delete_selected ();
 break;
 
- default:
- return FALSE;
- }
- break;
-
- case (GDK_CONTROL_MASK | GDK_SHIFT_MASK):
- switch (event->keyval)
- {
- case GDK_ISO_Left_Tab:
- case GDK_Tab:
- action_playlist_prev();
+ case GDK_Menu:
+ popup_menu_rclick (0, event->time);
 break;
 
 default:
@@ -601,8 +501,44 @@
 }
 break;
 
- default:
+ case GDK_CONTROL_MASK:
+ switch (event->keyval)
+ {
+ case GDK_ISO_Left_Tab:
+ case GDK_Tab:
+ aud_playlist_set_active ((aud_playlist_get_active () + 1) %
+ aud_playlist_count ());
+ break;
+ default:
+ return FALSE;
+ }
+ break;
+ case (GDK_CONTROL_MASK | GDK_SHIFT_MASK):
+ switch (event->keyval)
+ {
+ case GDK_ISO_Left_Tab:
+ case GDK_Tab:
+ aud_playlist_set_active (aud_playlist_get_active () ?
+ aud_playlist_get_active () - 1 : aud_playlist_count () - 1);
+ break;
+ default:
+ return FALSE;
+ }
+ break;
+ case GDK_MOD1_MASK:
+ switch (event->keyval)
+ {
+ case GDK_Up:
+ playlist_shift (-1);
+ break;
+ case GDK_Down:
+ playlist_shift (1);
+ break;
+ default:
 return FALSE;
+ }
+ default:
+ return FALSE;
 }
 
 return TRUE;
@@ -610,19 +546,10 @@
 
 static void update_toggles (void * data, void * user)
 {
- 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, "stop after current song",
- aud_cfg->stopaftersong);
-
- 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);
+ 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);
 }
 
 static void toggle_repeat (GtkToggleButton * button, void * unused)
@@ -659,8 +586,8 @@
 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("mainwin show", ui_mainwin_toggle_visibility, NULL);
 hook_associate("playlist update", ui_playlist_notebook_update, NULL);
+ hook_associate ("playlist activate", ui_playlist_notebook_activate, 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);
@@ -676,8 +603,8 @@
 hook_dissociate ("playback pause", (HookFunction) pause_cb);
 hook_dissociate ("playback unpause", (HookFunction) pause_cb);
 hook_dissociate("playback stop", ui_playback_stop);
- hook_dissociate("mainwin show", ui_mainwin_toggle_visibility);
 hook_dissociate("playlist update", ui_playlist_notebook_update);
+ hook_dissociate ("playlist activate", ui_playlist_notebook_activate);
 hook_dissociate ("playlist position", ui_playlist_notebook_position);
 hook_dissociate ("toggle stop after song", update_toggles);
 hook_dissociate ("toggle shuffle", update_toggles);
@@ -685,22 +612,18 @@
 hook_dissociate ("config save", (HookFunction) config_save);
 }
 
-static gboolean _ui_initialize(IfaceCbs * cbs)
+static gboolean init (void)
 {
 GtkWidget *tophbox; /* box to contain toolbar and shbox */
 GtkWidget *buttonbox; /* contains buttons like "open", "next" */
 GtkWidget *shbox; /* box for volume control + slider + time combo --nenolod */
 GtkWidget *evbox;
- GtkAccelGroup *accel;
 
 gtkui_cfg_load();
 
 audgui_set_default_icon();
 audgui_register_stock_icons();
 
- ui_manager_init();
- ui_manager_create_menus();
-
 pw_col_init ();
 
 window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -720,11 +643,12 @@
 vbox = gtk_vbox_new(FALSE, 0);
 gtk_container_add(GTK_CONTAINER(window), vbox);
 
- menu = ui_manager_get_menus();
- gtk_box_pack_start(GTK_BOX(vbox), menu, FALSE, TRUE, 0);
+ accel = gtk_accel_group_new ();
+ gtk_window_add_accel_group ((GtkWindow *) window, accel);
 
- accel = ui_manager_get_accel_group();
- gtk_window_add_accel_group(GTK_WINDOW(window), accel);
+ menu_box = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_start ((GtkBox *) vbox, menu_box, FALSE, FALSE, 0);
+ show_menu (config.menu_visible);
 
 tophbox = gtk_hbox_new(FALSE, 0);
 gtk_box_pack_start(GTK_BOX(vbox), tophbox, FALSE, TRUE, 0);
@@ -732,11 +656,11 @@
 buttonbox = gtk_hbox_new(FALSE, 0);
 gtk_toolbar_button_add(buttonbox, button_open_pressed, GTK_STOCK_OPEN);
 gtk_toolbar_button_add(buttonbox, button_add_pressed, GTK_STOCK_ADD);
- button_play = gtk_toolbar_button_add(buttonbox, button_play_pressed, GTK_STOCK_MEDIA_PLAY);
- button_pause = gtk_toolbar_button_add(buttonbox, button_pause_pressed, GTK_STOCK_MEDIA_PAUSE);
- button_stop = gtk_toolbar_button_add(buttonbox, button_stop_pressed, GTK_STOCK_MEDIA_STOP);
- gtk_toolbar_button_add(buttonbox, button_previous_pressed, GTK_STOCK_MEDIA_PREVIOUS);
- gtk_toolbar_button_add(buttonbox, button_next_pressed, GTK_STOCK_MEDIA_NEXT);
+ button_play = gtk_toolbar_button_add (buttonbox, aud_drct_play, GTK_STOCK_MEDIA_PLAY);
+ button_pause = gtk_toolbar_button_add (buttonbox, aud_drct_pause, GTK_STOCK_MEDIA_PAUSE);
+ button_stop = gtk_toolbar_button_add (buttonbox, aud_drct_stop, GTK_STOCK_MEDIA_STOP);
+ gtk_toolbar_button_add (buttonbox, aud_drct_pl_prev, GTK_STOCK_MEDIA_PREVIOUS);
+ gtk_toolbar_button_add (buttonbox, aud_drct_pl_next, GTK_STOCK_MEDIA_NEXT);
 
 /* Workaround: Show the play and pause buttons and then hide them again in
 * order to coax GTK into loading icons for them. -jlindgren */
@@ -760,7 +684,6 @@
 
 slider = gtk_hscale_new(NULL);
 gtk_scale_set_draw_value(GTK_SCALE(slider), FALSE);
- gtk_range_set_update_policy(GTK_RANGE(slider), GTK_UPDATE_DISCONTINUOUS);
 gtk_widget_set_size_request(slider, 120, -1);
 gtk_widget_set_can_focus(slider, FALSE);
 gtk_box_pack_start ((GtkBox *) shbox, slider, TRUE, TRUE, 6);
@@ -777,7 +700,6 @@
 mowgli_global_storage_put("gtkui.slider", slider);
 mowgli_global_storage_put("gtkui.label_time", label_time);
 
-#ifdef HAVE_VOLUME
 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)));
@@ -789,7 +711,6 @@
 gtk_scale_button_set_value(GTK_SCALE_BUTTON(volume), (lvol + rvol) / 2);
 
 gtk_box_pack_end ((GtkBox *) tophbox, volume, FALSE, FALSE, 0);
-#endif
 
 button_shuffle = toggle_button_new ("media-playlist-shuffle", "SHUF",
 toggle_shuffle, NULL);
@@ -831,24 +752,17 @@
 AUDDBG("playlist associate\n");
 ui_playlist_notebook_populate();
 
- slider_change_handler_id = g_signal_connect(slider, "value-changed", G_CALLBACK(ui_slider_value_changed_cb), NULL);
-
 g_signal_connect(slider, "change-value", G_CALLBACK(ui_slider_change_value_cb), NULL);
 g_signal_connect(slider, "button-press-event", G_CALLBACK(ui_slider_button_press_cb), NULL);
 g_signal_connect(slider, "button-release-event", G_CALLBACK(ui_slider_button_release_cb), NULL);
 
-#ifdef HAVE_VOLUME
 volume_change_handler_id = g_signal_connect(volume, "value-changed", G_CALLBACK(ui_volume_value_changed_cb), NULL);
 g_signal_connect(volume, "pressed", G_CALLBACK(ui_volume_pressed_cb), NULL);
 g_signal_connect(volume, "released", G_CALLBACK(ui_volume_released_cb), NULL);
 update_volume_timeout_source = g_timeout_add(250, (GSourceFunc) ui_volume_slider_update, volume);
-#endif
 
 g_signal_connect(window, "key-press-event", G_CALLBACK(ui_key_press_cb), NULL);
 
- if (!config.menu_visible)
- gtk_widget_hide(menu);
-
 if (aud_drct_get_playing())
 ui_playback_begin(NULL, NULL);
 else
@@ -859,56 +773,38 @@
 gtk_widget_show_all (vbox);
 
 if (config.player_visible)
- ui_mainwin_toggle_visibility(GINT_TO_POINTER(config.player_visible), NULL);
-
- AUDDBG("check menu settings\n");
- check_set(toggleaction_group_others, "view menu", config.menu_visible);
- check_set(toggleaction_group_others, "view infoarea", config.infoarea_visible);
- check_set(toggleaction_group_others, "view statusbar", config.statusbar_visible);
- check_set(toggleaction_group_others, "playback no playlist advance", aud_cfg->no_playlist_advance);
- check_set (toggleaction_group_others, "playlist show headers",
- config.playlist_headers);
- check_set (toggleaction_group_others, "playlist autoscroll",
- config.autoscroll);
+ ui_show (TRUE);
 
 update_toggles (NULL, NULL);
 
- AUDDBG("callback setup\n");
-
- /* Register interface callbacks */
- cbs->show_prefs_window = show_preferences_window;
- cbs->run_filebrowser = audgui_run_filebrowser;
- cbs->hide_filebrowser = audgui_hide_filebrowser;
- cbs->toggle_visibility = ui_toggle_visibility;
- cbs->show_error = ui_show_error;
- cbs->show_jump_to_track = audgui_jump_to_track;
- cbs->hide_jump_to_track = audgui_jump_to_track_hide;
- cbs->show_about_window = audgui_show_about_window;
- cbs->hide_about_window = audgui_hide_about_window;
- cbs->run_gtk_plugin = (void *) layout_add;
- cbs->stop_gtk_plugin = (void *) layout_remove;
+ menu_rclick = make_menu_rclick (accel);
+ menu_tab = make_menu_tab (accel);
 
 return TRUE;
 }
 
-static gboolean _ui_finalize(void)
+static void cleanup (void)
 {
 if (error_win)
 gtk_widget_destroy (error_win);
 
+ if (menu_main)
+ gtk_widget_destroy (menu_main);
+
+ gtk_widget_destroy (menu_rclick);
+ gtk_widget_destroy (menu_tab);
+
 if (update_song_timeout_source)
 {
 g_source_remove(update_song_timeout_source);
 update_song_timeout_source = 0;
 }
 
-#ifdef HAVE_VOLUME
 if (update_volume_timeout_source)
 {
 g_source_remove(update_volume_timeout_source);
 update_volume_timeout_source = 0;
 }
-#endif
 
 if (delayed_title_change_source)
 {
@@ -919,15 +815,94 @@
 gtkui_cfg_free();
 ui_hooks_disassociate();
 
- /* ui_manager_destroy() must be called to detach plugin services menus
- * before any widgets are destroyed. -jlindgren */
- ui_manager_destroy ();
 pw_col_cleanup ();
 
 g_object_unref ((GObject *) UI_PLAYLIST_NOTEBOOK);
 gtk_widget_destroy (window);
 
 layout_cleanup ();
+}
 
- return TRUE;
+void show_menu (gboolean show)
+{
+ config.menu_visible = show;
+
+ if (config.menu_visible)
+ {
+ if (menu_main)
+ gtk_widget_destroy (menu_main);
+
+ if (! menu)
+ {
+ menu = make_menu_bar (accel);
+ g_signal_connect (menu, "destroy", (GCallback) gtk_widget_destroyed,
+ & menu);
+ gtk_widget_show (menu);
+ gtk_container_add ((GtkContainer *) menu_box, menu);
+ }
+ }
+ else
+ {
+ if (menu)
+ gtk_widget_destroy (menu);
+
+ if (! menu_main)
+ {
+ menu_main = make_menu_main (accel);
+ g_signal_connect (menu_main, "destroy", (GCallback)
+ gtk_widget_destroyed, & menu_main);
+ }
+ }
+}
+
+void show_infoarea (gboolean show)
+{
+ config.infoarea_visible = show;
+
+ if (config.infoarea_visible && ! infoarea)
+ {
+ infoarea = ui_infoarea_new ();
+ gtk_box_pack_end ((GtkBox *) vbox, infoarea, FALSE, FALSE, 0);
+ gtk_box_reorder_child ((GtkBox *) vbox, infoarea, -1);
+ gtk_widget_show_all (infoarea);
+ }
+
+ if (! config.infoarea_visible && infoarea)
+ {
+ gtk_widget_destroy (infoarea);
+ infoarea = NULL;
+ }
+}
+
+void show_statusbar (gboolean show)
+{
+ config.statusbar_visible = show;
+
+ if (config.statusbar_visible && ! statusbar)
+ {
+ statusbar = ui_statusbar_new ();
+ gtk_box_pack_end ((GtkBox *) vbox, statusbar, FALSE, FALSE, 3);
+
+ if (infoarea)
+ gtk_box_reorder_child ((GtkBox *) vbox, infoarea, -1);
+
+ gtk_widget_show_all (statusbar);
+ }
+
+ if (! config.statusbar_visible && statusbar)
+ {
+ gtk_widget_destroy (statusbar);
+ statusbar = NULL;
+ }
+}
+
+void popup_menu_rclick (guint button, guint32 time)
+{
+ gtk_menu_popup ((GtkMenu *) menu_rclick, NULL, NULL, NULL, NULL, button,
+ time);
+}
+
+void popup_menu_tab (guint button, guint32 time)
+{
+ gtk_menu_popup ((GtkMenu *) menu_tab, NULL, NULL, NULL, NULL, button, time);
 }

audacious-plugins-2.5.3.tar.gz/src/gtkui/ui_infoarea.c -> audacious-plugins-3.0.tar.gz/src/gtkui/ui_infoarea.c Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2010 William Pitcock <nenolod@atheme.org>.
- * Copyright (C) 2010 John Lindgren <john.lindgren@tds.net>.
+ * Copyright (C) 2010-2011 John Lindgren <john.lindgren@tds.net>.
 *
 * 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,34 +18,32 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#include <glib/gi18n.h>
+#include <math.h>
+#include <string.h>
+
 #include <gtk/gtk.h>
 
-#include <audacious/debug.h>
 #include <audacious/drct.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/misc.h>
 #include <audacious/playlist.h>
 #include <libaudcore/hook.h>
-#include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
-#include <math.h>
-
-#include "gtkui_cfg.h"
-#include "ui_gtk.h"
-#include "ui_playlist_widget.h"
-#include "ui_manager.h"
 #include "ui_infoarea.h"
 
+#define SPACING 8
 #define ICON_SIZE 64
+#define HEIGHT (ICON_SIZE + 2 * SPACING)
+
 #define VIS_BANDS 12
-#define VIS_OFFSET (10 + 8 * VIS_BANDS + 8)
+#define VIS_WIDTH (8 * VIS_BANDS - 2)
+#define VIS_CENTER (ICON_SIZE * 5 / 8 + SPACING)
 #define VIS_DELAY 2 /* delay before falloff in frames */
 #define VIS_FALLOFF 2 /* falloff in pixels per frame */
 
 typedef struct {
- GtkWidget *parent;
+ GtkWidget * box, * main, * vis;
 
 gchar * title, * artist, * album;
 gchar * last_title, * last_artist, * last_album;
@@ -59,10 +57,6 @@
 GdkPixbuf * pb, * last_pb;
 } UIInfoArea;
 
-static const gfloat alpha_step = 0.10;
-
-static void draw_visualizer (UIInfoArea * area, cairo_t * cr);
-
 /****************************************************************************/
 
 static void vis_update_cb (const VisNode * vis, UIInfoArea * area)
@@ -108,38 +102,39 @@
 }
 }
 
- if (gtk_widget_is_drawable (area->parent))
- {
- cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (area->parent));
- draw_visualizer (area, cr);
- cairo_destroy (cr);
- }
+ gtk_widget_queue_draw (area->vis);
 }
 
 static void vis_clear_cb (void * hook_data, UIInfoArea * area)
 {
 memset (area->bars, 0, sizeof area->bars);
 memset (area->delay, 0, sizeof area->delay);
+
+ gtk_widget_queue_draw (area->vis);
 }
 
 /****************************************************************************/
 
-static void draw_text (UIInfoArea * area, cairo_t * cr, gint x, gint y, gint
+static void clear (GtkWidget * widget, cairo_t * cr)
+{
+ GtkAllocation alloc;
+ gtk_widget_get_allocation (widget, & alloc);
+ cairo_rectangle (cr, 0, 0, alloc.width, alloc.height);
+ cairo_fill (cr);
+}
+
+static void draw_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);
+ gchar * 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(area->parent, NULL);
+ PangoFontDescription * desc = pango_font_description_from_string (font);
+ PangoLayout * 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);
@@ -241,53 +236,53 @@
 hsv_to_rgb (h, s, v, r, g, b);
 }
 
-static void draw_visualizer (UIInfoArea * area, cairo_t * cr)
+#if GTK_CHECK_VERSION (3, 0, 0)
+static gboolean draw_vis_cb (GtkWidget * vis, cairo_t * cr, UIInfoArea * area)
 {
- GtkAllocation alloc;
- gtk_widget_get_allocation(GTK_WIDGET(area->parent), &alloc);
+#else
+static gboolean expose_vis_cb (GtkWidget * vis, GdkEventExpose * event,
+ UIInfoArea * area)
+{
+ cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (vis));
+#endif
+
+ clear (vis, cr);
 
 for (auto gint i = 0; i < VIS_BANDS; i++)
 {
- gint x = alloc.width - VIS_OFFSET + 10 + 8 * i;
- gint t = 50 - area->bars[i];
- gint m = MIN (50 + area->bars[i], 84);
-
- /* erase old (upward) bars */
- cairo_set_source_rgb (cr, 0, 0, 0);
- cairo_rectangle (cr, x, 10, 6, t - 10);
- cairo_fill (cr);
-
- /* erase old (downward) reflection */
- cairo_set_source_rgb (cr, 0, 0, 0);
- cairo_rectangle (cr, x, m, 6, 84 - m);
- cairo_fill (cr);
+ gint x = SPACING + 8 * i;
+ gint t = VIS_CENTER - area->bars[i];
+ gint m = MIN (VIS_CENTER + area->bars[i], HEIGHT);
 
 gfloat r, g, b;
- get_color (area->parent, i, & r, & g, & b);
+ get_color (vis, i, & r, & g, & b);
 
- /* draw new (upward) bars */
 cairo_set_source_rgb (cr, r, g, b);
- cairo_rectangle (cr, x, t, 6, 50 - t);
+ cairo_rectangle (cr, x, t, 6, VIS_CENTER - t);
 cairo_fill (cr);
 
- /* draw new (downward) reflection */
 cairo_set_source_rgb (cr, r * 0.3, g * 0.3, b * 0.3);
- cairo_rectangle (cr, x, 50, 6, m - 50);
+ cairo_rectangle (cr, x, VIS_CENTER, 6, m - VIS_CENTER);
 cairo_fill (cr);
 }
+
+#if ! GTK_CHECK_VERSION (3, 0, 0)
+ cairo_destroy (cr);
+#endif
+ return TRUE;
 }
 
 static void draw_album_art (UIInfoArea * area, cairo_t * cr)
 {
 if (area->pb != NULL)
 {
- gdk_cairo_set_source_pixbuf (cr, area->pb, 10.0, 10.0);
+ gdk_cairo_set_source_pixbuf (cr, area->pb, SPACING, SPACING);
 cairo_paint_with_alpha (cr, area->alpha);
 }
 
 if (area->last_pb != NULL)
 {
- gdk_cairo_set_source_pixbuf (cr, area->last_pb, 10.0, 10.0);
+ gdk_cairo_set_source_pixbuf (cr, area->last_pb, SPACING, SPACING);
 cairo_paint_with_alpha (cr, area->last_alpha);
 }
 }
@@ -295,38 +290,29 @@
 static void draw_title (UIInfoArea * area, cairo_t * cr)
 {
 GtkAllocation alloc;
- gint width;
+ gtk_widget_get_allocation (area->main, & alloc);
 
- gtk_widget_get_allocation (area->parent, & alloc);
- width = alloc.width - (86 + VIS_OFFSET + 6);
+ gint x = ICON_SIZE + SPACING * 2;
+ gint width = alloc.width - x;
 
 if (area->title != NULL)
- draw_text (area, cr, 86, 8, width, 1, 1, 1, area->alpha, "Sans 18",
- area->title);
+ draw_text (area->main, cr, x, SPACING, width, 1, 1, 1, area->alpha,
+ "Sans 18", area->title);
 if (area->last_title != NULL)
- draw_text (area, cr, 86, 8, width, 1, 1, 1, area->last_alpha, "Sans 18",
- area->last_title);
+ draw_text (area->main, cr, x, SPACING, width, 1, 1, 1, area->last_alpha,
+ "Sans 18", area->last_title);
 if (area->artist != NULL)
- draw_text (area, cr, 86, 42, width, 1, 1, 1, area->alpha, "Sans 9",
- area->artist);
+ draw_text (area->main, cr, x, SPACING + ICON_SIZE / 2, width, 1, 1, 1,
+ area->alpha, "Sans 9", area->artist);
 if (area->last_artist != NULL)
- draw_text (area, cr, 86, 42, width, 1, 1, 1, area->last_alpha, "Sans 9",
- area->last_artist);
+ draw_text (area->main, cr, x, SPACING + ICON_SIZE / 2, width, 1, 1, 1,
+ area->last_alpha, "Sans 9", area->last_artist);
 if (area->album != NULL)
- draw_text (area, cr, 86, 58, width, 0.7, 0.7, 0.7, area->alpha,
- "Sans 9", area->album);
+ draw_text (area->main, cr, x, SPACING + ICON_SIZE * 3 / 4, width, 0.7,
+ 0.7, 0.7, area->alpha, "Sans 9", area->album);
 if (area->last_album != NULL)
- draw_text (area, cr, 86, 58, width, 0.7, 0.7, 0.7, area->last_alpha,
- "Sans 9", area->last_album);
-}
-
-static void draw_background (UIInfoArea * area, cairo_t * cr)
-{
- GtkAllocation alloc;
- gtk_widget_get_allocation (area->parent, & alloc);
-
- cairo_rectangle(cr, 0, 0, alloc.width, alloc.height);
- cairo_fill (cr);
+ draw_text (area->main, cr, x, SPACING + ICON_SIZE * 3 / 4, width, 0.7,
+ 0.7, 0.7, area->last_alpha, "Sans 9", area->last_album);
 }
 
 #if GTK_CHECK_VERSION (3, 0, 0)
@@ -336,13 +322,13 @@
 static gboolean expose_cb (GtkWidget * widget, GdkEventExpose * event,
 UIInfoArea * area)
 {
- cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (area->parent));
+ cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (widget));
 #endif
 
- draw_background (area, cr);
+ clear (widget, cr);
+
 draw_album_art (area, cr);
 draw_title (area, cr);
- draw_visualizer (area, cr);
 
 #if ! GTK_CHECK_VERSION (3, 0, 0)
 cairo_destroy (cr);
@@ -356,17 +342,17 @@
 
 if (aud_drct_get_playing () && area->alpha < 1)
 {
- area->alpha += alpha_step;
+ area->alpha += 0.1;
 ret = TRUE;
 }
 
 if (area->last_alpha > 0)
 {
- area->last_alpha -= alpha_step;
+ area->last_alpha -= 0.1;
 ret = TRUE;
 }
 
- gtk_widget_queue_draw ((GtkWidget *) area->parent);
+ gtk_widget_queue_draw (area->main);
 
 if (! ret)
 area->fade_timeout = 0;
@@ -391,22 +377,27 @@
 gint playlist = aud_playlist_get_playing ();
 gint entry = aud_playlist_get_position (playlist);
 
- const gchar * title, * artist, * album;
+ gchar * title, * artist, * album;
 aud_playlist_entry_describe (playlist, entry, & title, & artist, & album,
 FALSE);
 
 if (! strcmp_null (title, area->title) && ! strcmp_null (artist,
 area->artist) && ! strcmp_null (album, area->album))
+ {
+ g_free (title);
+ g_free (artist);
+ g_free (album);
 return;
+ }
 
 g_free (area->title);
 g_free (area->artist);
 g_free (area->album);
- area->title = title ? g_strdup (title) : NULL;
- area->artist = artist ? g_strdup (artist) : NULL;
- area->album = album ? g_strdup (album) : NULL;
+ area->title = title;
+ area->artist = artist;
+ area->album = album;
 
- gtk_widget_queue_draw ((GtkWidget *) area->parent);
+ gtk_widget_queue_draw (area->main);
 }
 
 static void set_album_art (UIInfoArea * area)
@@ -441,7 +432,7 @@
 area->last_alpha = area->alpha;
 area->alpha = 0;
 
- gtk_widget_queue_draw ((GtkWidget *) area->parent);
+ gtk_widget_queue_draw (area->main);
 }
 
 static void ui_infoarea_playback_start (void * data, UIInfoArea * area)
@@ -468,7 +459,7 @@
 ui_infoarea_do_fade, area);
 }
 
-static void destroy_cb (GtkWidget * parent, UIInfoArea * area)
+static void destroy_cb (GtkWidget * widget, UIInfoArea * area)
 {
 hook_dissociate ("playlist update", (HookFunction) ui_infoarea_set_title);
 hook_dissociate ("playback begin", (HookFunction)
@@ -501,32 +492,47 @@
 
 GtkWidget * ui_infoarea_new (void)
 {
- UIInfoArea *area;
- GtkWidget *evbox;
+ UIInfoArea * area = g_slice_new0 (UIInfoArea);
 
- area = g_slice_new0(UIInfoArea);
+ area->box = gtk_hbox_new (FALSE, 0);
 
- evbox = gtk_event_box_new();
- area->parent = evbox;
+ area->main = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (area->main, ICON_SIZE + 2 * SPACING, HEIGHT);
+ gtk_box_pack_start ((GtkBox *) area->box, area->main, TRUE, TRUE, 0);
 
- gtk_widget_set_size_request(GTK_WIDGET(evbox), -1, 84);
+ area->vis = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (area->vis, VIS_WIDTH + 2 * SPACING, HEIGHT);
+ gtk_box_pack_start ((GtkBox *) area->box, area->vis, FALSE, FALSE, 0);
 
 #if GTK_CHECK_VERSION (3, 0, 0)
- g_signal_connect (area->parent, "draw", (GCallback) draw_cb, area);
+ g_signal_connect (area->main, "draw", (GCallback) draw_cb, area);
+ g_signal_connect (area->vis, "draw", (GCallback) draw_vis_cb, area);
 #else
- g_signal_connect (area->parent, "expose-event", (GCallback) expose_cb, area);
+ g_signal_connect (area->main, "expose-event", (GCallback) expose_cb, area);
+ g_signal_connect (area->vis, "expose-event", (GCallback) expose_vis_cb, area);
 #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);
+ 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);
 
- g_signal_connect (area->parent, "destroy", (GCallback) destroy_cb, area);
+ g_signal_connect (area->box, "destroy", (GCallback) destroy_cb, area);
 
 if (aud_drct_get_playing ())
+ {
 ui_infoarea_playback_start (NULL, area);
 
- return area->parent;
+ /* skip fade-in */
+ area->alpha = 1;
+
+ if (area->fade_timeout)
+ {
+ g_source_remove (area->fade_timeout);
+ area->fade_timeout = 0;
+ }
+ }
+
+ return area->box;
 }

audacious-plugins-2.5.3.tar.gz/src/gtkui/ui_playlist_notebook.c -> audacious-plugins-3.0.tar.gz/src/gtkui/ui_playlist_notebook.c Changed

@@ -23,32 +23,30 @@
 #include <gtk/gtk.h>
 
 #include <audacious/debug.h>
-#include <audacious/glib-compat.h>
 #include <audacious/gtk-compat.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_manager.h"
 #include "ui_playlist_notebook.h"
 #include "ui_playlist_widget.h"
 #include "playlist_util.h"
 
+#define CURRENT_POS (-2)
+
 static GtkWidget * notebook = NULL;
 static GQueue follow_queue = G_QUEUE_INIT;
+static gboolean playlist_activated = FALSE;
 static gint bolded_playlist = -1;
 
 static struct index *pages;
 GtkWidget *ui_playlist_notebook_tab_title_editing = NULL;
 
 static gint switch_handler = 0;
-
-#if GTK_CHECK_VERSION (2, 10, 0)
-#define HAVE_REORDER
 static gint reorder_handler = 0;
-#endif
 
 GtkNotebook *ui_playlist_get_notebook(void)
 {
@@ -100,7 +98,7 @@
 GtkWidget *page = g_object_get_data(G_OBJECT(widget), "page");
 
 gtk_notebook_set_current_page(UI_PLAYLIST_NOTEBOOK, gtk_notebook_page_num(UI_PLAYLIST_NOTEBOOK, page));
- ui_manager_popup_menu_show(GTK_MENU(playlist_tab_menu), event->x_root, event->y_root + 2, 3, event->time);
+ popup_menu_tab (event->button, event->time);
 }
 
 return FALSE;
@@ -120,14 +118,12 @@
 }
 }
 
-#ifdef HAVE_REORDER
 static void tab_reordered(GtkNotebook *notebook, GtkWidget *child, guint page_num, gpointer user_data)
 {
 GtkWidget * widget = g_object_get_data ((GObject *) child, "treeview");
 g_return_if_fail (widget);
 aud_playlist_reorder (ui_playlist_widget_get_playlist (widget), page_num, 1);
 }
-#endif
 
 static GtkLabel *get_tab_label(gint playlist)
 {
@@ -138,7 +134,7 @@
 
 static void set_tab_label (gint list, GtkLabel * label)
 {
- const gchar * title = aud_playlist_get_title (list);
+ gchar * title = aud_playlist_get_title (list);
 
 if (list == aud_playlist_get_playing ())
 {
@@ -148,6 +144,8 @@
 }
 else
 gtk_label_set_text (label, title);
+
+ g_free (title);
 }
 
 void ui_playlist_notebook_edit_tab_title(GtkWidget *ebox)
@@ -165,7 +163,9 @@
 GtkWidget *entry = g_object_get_data(G_OBJECT(ebox), "entry");
 gtk_widget_hide(label);
 
- gtk_entry_set_text(GTK_ENTRY(entry), aud_playlist_get_title(aud_playlist_get_active()));
+ gchar * title = aud_playlist_get_title (aud_playlist_get_active ());
+ gtk_entry_set_text ((GtkEntry *) entry, title);
+ g_free (title);
 gtk_widget_grab_focus(entry);
 gtk_editable_select_region(GTK_EDITABLE(entry), 0, -1);
 gtk_widget_show(entry);
@@ -175,22 +175,7 @@
 
 static void change_view (void)
 {
- gint count = index_count (pages);
- if (! count)
- return;
-
- if (count > 1)
- {
- gtk_notebook_set_show_tabs (UI_PLAYLIST_NOTEBOOK, TRUE);
-
- for (gint i = 0; i < count; i ++)
- gtk_container_set_border_width (index_get (pages, i), 0);
- }
- else
- {
- gtk_notebook_set_show_tabs (UI_PLAYLIST_NOTEBOOK, FALSE);
- gtk_container_set_border_width (index_get (pages, 0), 0);
- }
+ gtk_notebook_set_show_tabs (UI_PLAYLIST_NOTEBOOK, (index_count (pages) > 1));
 }
 
 void ui_playlist_notebook_create_tab(gint playlist)
@@ -229,9 +214,7 @@
 g_object_set_data(G_OBJECT(ebox), "page", scrollwin);
 
 gtk_notebook_append_page(UI_PLAYLIST_NOTEBOOK, scrollwin, ebox);
-#ifdef HAVE_REORDER
 gtk_notebook_set_tab_reorderable(UI_PLAYLIST_NOTEBOOK, scrollwin, TRUE);
-#endif
 change_view ();
 
 if (position >= 0)
@@ -274,11 +257,9 @@
 if (! switch_handler)
 switch_handler = g_signal_connect (notebook, "switch-page", (GCallback)
 tab_changed, NULL);
-#ifdef HAVE_REORDER
 if (! reorder_handler)
 reorder_handler = g_signal_connect (notebook, "page-reordered",
 (GCallback) tab_reordered, NULL);
-#endif
 }
 
 void ui_playlist_notebook_empty (void)
@@ -286,11 +267,9 @@
 if (switch_handler)
 g_signal_handler_disconnect (notebook, switch_handler);
 switch_handler = 0;
-#ifdef HAVE_REORDER
 if (reorder_handler)
 g_signal_handler_disconnect (notebook, reorder_handler);
 reorder_handler = 0;
-#endif
 
 gint n_pages = gtk_notebook_get_n_pages ((GtkNotebook *) notebook);
 while (n_pages)
@@ -319,84 +298,103 @@
 
 if (list < 0)
 continue;
- if (row < 0)
- row = aud_playlist_get_position (list);
 
 GtkWidget * widget = playlist_get_treeview (list);
- if (row == aud_playlist_get_position (list))
+
+ if (row == CURRENT_POS)
+ {
+ row = aud_playlist_get_position (list);
 audgui_list_set_highlight (widget, row);
 
- if (config.autoscroll)
- audgui_list_set_focus (widget, row);
+ if (! config.autoscroll)
+ continue;
+ }
+
+ audgui_list_set_focus (widget, row);
 }
 }
 
-void ui_playlist_notebook_update(gpointer hook_data, gpointer user_data)
+static void update_list (gint list, gint type, gint at, gint count)
 {
- gint type = GPOINTER_TO_INT(hook_data);
+ if (type >= PLAYLIST_UPDATE_METADATA)
+ set_tab_label (list, get_tab_label (list));
+
+ ui_playlist_widget_update (playlist_get_treeview (list), type, at, count);
+}
+
+void ui_playlist_notebook_update (void * data, void * user)
+{
+ gint type = GPOINTER_TO_INT (data);
 gint lists = aud_playlist_count ();
 
- if (type == PLAYLIST_UPDATE_STRUCTURE)
- {
- gint i, n_pages;
+ gint list, at, count;
+ gboolean limited = aud_playlist_update_range (& list, & at, & count);
 
- n_pages = gtk_notebook_get_n_pages(UI_PLAYLIST_NOTEBOOK);
+ if (type == PLAYLIST_UPDATE_STRUCTURE && ! limited)
+ {
+ gint n_pages = gtk_notebook_get_n_pages (UI_PLAYLIST_NOTEBOOK);
 
 while (n_pages < lists)
 ui_playlist_notebook_create_tab (n_pages ++);
 while (n_pages > lists)
 ui_playlist_notebook_destroy_tab (-- n_pages);
 
- for (i = 0; i < n_pages; i++)
- {
- set_tab_label (i, get_tab_label (i));
+ for (gint i = 0; i < n_pages; i ++)
 ui_playlist_widget_set_playlist (playlist_get_treeview (i), i);
- }
 
- gtk_notebook_set_current_page(UI_PLAYLIST_NOTEBOOK, aud_playlist_get_active());
- bolded_playlist = aud_playlist_get_playing ();
+ playlist_activated = TRUE;
 }
 
- gint list, at, count;
- if (aud_playlist_update_range (& list, & at, & count))
- ui_playlist_widget_update (playlist_get_treeview (list), type, at, count);
+ if (playlist_activated)
+ {
+ gtk_notebook_set_current_page (UI_PLAYLIST_NOTEBOOK,
+ aud_playlist_get_active ());
+ playlist_activated = FALSE;
+ }
+
+ if (limited)
+ update_list (list, type, at, count);
 else
 {
 for (list = 0; list < lists; list ++)
- ui_playlist_widget_update (playlist_get_treeview (list), type, 0,
- aud_playlist_entry_count (list));
+ update_list (list, type, 0, aud_playlist_entry_count (list));
 }
 
 do_follow ();
 }
 
-/* set row == -1 for current position */
-void playlist_follow (gint list, gint row)
+void playlist_set_focus (gint list, gint row)
 {
- /* push -1 to the queue unchanged */
 g_queue_push_tail (& follow_queue, GINT_TO_POINTER
 (aud_playlist_get_unique_id (list)));
 g_queue_push_tail (& follow_queue, GINT_TO_POINTER (row));
 
- /* now we need the actual row */
- if (row < 0)
- row = aud_playlist_get_position (list);
+ if (! aud_playlist_update_pending ())
+ do_follow ();
+}
+
+void ui_playlist_notebook_position (void * data, void * user)
+{
+ gint list = GPOINTER_TO_INT (data);
 
 if (config.autoscroll)
 {
 aud_playlist_select_all (list, FALSE);
- if (row >= 0)
- aud_playlist_entry_set_selected (list, row, TRUE);
+
+ if (aud_playlist_get_position (list) >= 0)
+ aud_playlist_entry_set_selected (list, aud_playlist_get_position (list), TRUE);
 }
 
- if (! aud_playlist_update_pending ())
- do_follow ();
+ playlist_set_focus (list, CURRENT_POS);
 }
 
-void ui_playlist_notebook_position (void * data, void * user)
+void ui_playlist_notebook_activate (void * data, void * user)
 {
- gint list = GPOINTER_TO_INT (data);
- playlist_follow (list, -1);
+ if (aud_playlist_update_pending ())
+ playlist_activated = TRUE;
+ else
+ gtk_notebook_set_current_page (UI_PLAYLIST_NOTEBOOK,
+ aud_playlist_get_active ());
 }
 
 static void destroy_cb (void)
@@ -405,9 +403,7 @@
 g_queue_clear (& follow_queue);
 index_free (pages);
 switch_handler = 0;
-#ifdef HAVE_REORDER
 reorder_handler = 0;
-#endif
 }
 
 GtkWidget *ui_playlist_notebook_new()
@@ -422,11 +418,11 @@
 return notebook;
 }
 
-void playlist_show_headers (GtkToggleAction * a)
+void playlist_show_headers (gboolean show)
 {
- if (config.playlist_headers == gtk_toggle_action_get_active (a))
+ if (config.playlist_headers == show)
 return;
- config.playlist_headers = gtk_toggle_action_get_active (a);
+ config.playlist_headers = show;
 ui_playlist_notebook_empty ();
 ui_playlist_notebook_populate ();
 }

audacious-plugins-2.5.3.tar.gz/src/gtkui/ui_playlist_notebook.h -> audacious-plugins-3.0.tar.gz/src/gtkui/ui_playlist_notebook.h Changed

audacious-plugins-2.5.3.tar.gz/src/gtkui/ui_playlist_widget.c -> audacious-plugins-3.0.tar.gz/src/gtkui/ui_playlist_widget.c Changed

@@ -25,13 +25,15 @@
 
 #include <audacious/audconfig.h>
 #include <audacious/drct.h>
+#include <audacious/i18n.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_manager.h"
 #include "ui_playlist_widget.h"
 
 static const GType pw_col_types[PW_COLS] = {G_TYPE_INT, G_TYPE_STRING,
@@ -101,8 +103,8 @@
 
 column = pw_cols[column];
 
- const gchar * title = NULL, * artist = NULL, * album = NULL;
- const Tuple * tuple = NULL;
+ gchar * title = NULL, * artist = NULL, * album = NULL;
+ Tuple * tuple = NULL;
 
 if (column == PW_COL_TITLE || column == PW_COL_ARTIST || column ==
 PW_COL_ALBUM)
@@ -118,16 +120,19 @@
 g_value_set_int (value, 1 + row);
 break;
 case PW_COL_TITLE:
- g_value_set_string (value, title);
+ g_value_take_string (value, title);
+ title = NULL;
 break;
 case PW_COL_ARTIST:
- g_value_set_string (value, artist);
+ g_value_take_string (value, artist);
+ artist = NULL;
 break;
 case PW_COL_YEAR:
 set_int_from_tuple (value, tuple, FIELD_YEAR);
 break;
 case PW_COL_ALBUM:
- g_value_set_string (value, album);
+ g_value_take_string (value, album);
+ album = NULL;
 break;
 case PW_COL_TRACK:
 set_int_from_tuple (value, tuple, FIELD_TRACK_NUMBER);
@@ -145,13 +150,19 @@
 set_string_from_tuple (value, tuple, FIELD_FILE_PATH);
 break;
 case PW_COL_CUSTOM:
- g_value_set_string (value, aud_playlist_entry_get_title (data->list,
+ g_value_take_string (value, aud_playlist_entry_get_title (data->list,
 row, TRUE));
 break;
 case PW_COL_BITRATE:
 set_int_from_tuple (value, tuple, FIELD_BITRATE);
 break;
 }
+
+ g_free (title);
+ g_free (artist);
+ g_free (album);
+ if (tuple)
+ tuple_free (tuple);
 }
 
 static gboolean get_selected (void * user, gint row)
@@ -181,8 +192,7 @@
 
 static void right_click (void * user, GdkEventButton * event)
 {
- ui_manager_popup_menu_show ((GtkMenu *) playlistwin_popup_menu,
- event->x_root, event->y_root, event->button, event->time);
+ popup_menu_rclick (event->button, event->time);
 }
 
 static void shift_rows (void * user, gint row, gint before)
@@ -236,7 +246,7 @@
 g_return_val_if_fail (path, TRUE);
 gint row = gtk_tree_path_get_indices (path)[0];
 g_return_val_if_fail (row >= 0, TRUE);
- const gchar * s[3] = {NULL, NULL, NULL};
+ gchar * s[3] = {NULL, NULL, NULL};
 aud_playlist_entry_describe (((PlaylistWidgetData *) user)->list, row,
 & s[0], & s[1], & s[2], FALSE);
 gtk_tree_path_free (path);
@@ -268,6 +278,7 @@
 }
 }
 g_free (temp);
+ g_free (s[i]);
 }
 
 g_strfreev (keys);

audacious-plugins-2.5.3.tar.gz/src/gtkui/ui_statusbar.c -> audacious-plugins-3.0.tar.gz/src/gtkui/ui_statusbar.c Changed

audacious-plugins-2.5.3.tar.gz/src/hotkey/gui.c -> audacious-plugins-3.0.tar.gz/src/hotkey/gui.c Changed

audacious-plugins-2.5.3.tar.gz/src/hotkey/plugin.c -> audacious-plugins-3.0.tar.gz/src/hotkey/plugin.c Changed

@@ -41,6 +41,7 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
+#include <audacious/audconfig.h>
 #include <audacious/configdb.h>
 #include <audacious/drct.h>
 #include <audacious/i18n.h>
@@ -61,21 +62,14 @@
 static PluginConfig plugin_cfg;
 static gboolean loaded = FALSE;
 
-
-
-static GeneralPlugin audacioushotkey =
-{
-	.description = "Global Hotkey",
+AUD_GENERAL_PLUGIN
+(
+	.name = "Global Hotkey",
 	.init = init,
 	.about = show_about,
 	.configure = show_configure,
 	.cleanup = cleanup
-};
-
-GeneralPlugin *hotkey_gplist[] = { &audacioushotkey, NULL };
-SIMPLE_GENERAL_PLUGIN(hotkey, hotkey_gplist);
-
-
+)
 
 PluginConfig* get_config(void)
 {
@@ -255,6 +249,16 @@
 		hook_call("aosd toggle", NULL);
 		return TRUE;
 	}
+	else if (event == EVENT_TOGGLE_REPEAT)
+	{
+		aud_cfg->repeat = ! aud_cfg->repeat;
+		hook_call ("toggle repeat", NULL);
+	}
+	else if (event == EVENT_TOGGLE_SHUFFLE)
+	{
+		aud_cfg->shuffle = ! aud_cfg->shuffle;
+		hook_call ("toggle shuffle", NULL);
+	}
 
 	return FALSE;
 }

audacious-plugins-2.5.3.tar.gz/src/hotkey/plugin.h -> audacious-plugins-3.0.tar.gz/src/hotkey/plugin.h Changed

audacious-plugins-2.5.3.tar.gz/src/jack/Makefile -> audacious-plugins-3.0.tar.gz/src/jack/Makefile Changed

audacious-plugins-2.5.3.tar.gz/src/jack/bio2jack.c -> audacious-plugins-3.0.tar.gz/src/jack/bio2jack.c Changed

@@ -138,8 +138,6 @@
   unsigned long bytes_per_jack_output_frame;    /* (num_output_channels * bits_per_channel) / 8 */
   unsigned long bytes_per_jack_input_frame;     /* (num_input_channels * bits_per_channel) / 8 */
 
-  unsigned long latencyMS;      /* latency in ms between writing and actual audio output of the written data */
-
   long clientBytesInJack;       /* number of INPUT bytes(from the client of bio2jack) we wrote to jack(not necessary the number of bytes we wrote to jack) */
   long jack_buffer_size;        /* size of the buffer jack will pass in to the process callback */
 
@@ -1012,11 +1010,11 @@
 
   /* try to become a client of the JACK server */
   TRACE("client name '%s'\n", our_client_name);
-  if((drv->client = jack_client_new(our_client_name)) == 0)
+  if((drv->client = jack_client_open(our_client_name, JackNullOption | JackNoStartServer, NULL)) == 0)
   {
     /* try once more */
     TRACE("trying once more to jack_client_new");
-    if((drv->client = jack_client_new(our_client_name)) == 0)
+    if((drv->client = jack_client_open(our_client_name, JackNullOption | JackNoStartServer, NULL)) == 0)
     {
       ERR("jack server not running?\n");
       free(our_client_name);
@@ -1701,29 +1699,6 @@
 
   DEBUG("sizeof(sample_t) == %d\n", sizeof(sample_t));
 
-  int periodSize = jack_get_buffer_size(drv->client);
-  int periods = 0;
-  /* FIXME: maybe we should keep different latency values for input vs output? */
-  if(drv->num_output_channels > 0)
-  {
-    periods = jack_port_get_total_latency(drv->client,
-                                          drv->output_port[0]) / periodSize;
-    drv->latencyMS = periodSize * periods * 1000 / (drv->jack_sample_rate *
-                                                    (drv->bits_per_channel / 8 *
-                                                     drv->num_output_channels));
-  }
-  else if(drv->num_input_channels > 0)
-  {
-    periods = jack_port_get_total_latency(drv->client,
-                                          drv->input_port[0]) / periodSize;
-    drv->latencyMS =
-      periodSize * periods * 1000 / (drv->jack_sample_rate *
-                                     (drv->bits_per_channel / 8 *
-                                      drv->num_input_channels));
-  }
-
-  TRACE("drv->latencyMS == %ldms\n", drv->latencyMS);
-
   *deviceID = drv->deviceID;    /* set the deviceID for the caller */
   releaseDriver(drv);
   pthread_mutex_unlock(&device_mutex);
@@ -2613,23 +2588,13 @@
   long return_val = 0;
 
   if(drv->client && drv->num_output_channels)
-    return_val = jack_port_get_total_latency(drv->client, drv->output_port[0]);
-
-  TRACE("got latency of %ld frames\n", return_val);
-
-  releaseDriver(drv);
-  return return_val;
-}
-
-/* Get the latency, in frames, of jack */
-long
-JACK_GetJackInputLatency(int deviceID)
-{
-  jack_driver_t *drv = getDriver(deviceID);
-  long return_val = 0;
-
-  if(drv->client && drv->num_input_channels)
-    return_val = jack_port_get_total_latency(drv->client, drv->input_port[0]);
+  {
+    /* Disclaimer: I have no experience with JACK and don't know if this is
+     * correct. -jlindgren */
+    jack_latency_range_t range;
+    jack_port_get_latency_range(drv->output_port[0], JackPlaybackLatency, & range);
+    return_val = (range.min + range.max) / 2;
+  }
 
   TRACE("got latency of %ld frames\n", return_val);

audacious-plugins-2.5.3.tar.gz/src/jack/bio2jack.h -> audacious-plugins-3.0.tar.gz/src/jack/bio2jack.h Changed

audacious-plugins-2.5.3.tar.gz/src/jack/jack.c -> audacious-plugins-3.0.tar.gz/src/jack/jack.c Changed

audacious-plugins-2.5.3.tar.gz/src/lyricwiki/lyricwiki.c -> audacious-plugins-3.0.tar.gz/src/lyricwiki/lyricwiki.c Changed

@@ -223,6 +223,7 @@
 		return FALSE;
 	}
 
+	update_lyrics_window(tu, _("\nLooking for lyrics..."));
 	vfs_async_file_get_contents(uri, (VFSConsumer) get_lyrics_step_3, tu);
 
 	g_free(buf);
@@ -245,6 +246,7 @@
 	g_free(artist);
 	g_free(title);
 
+	update_lyrics_window(tu, _("\nConnecting to lyrics.wikia.com..."));
 	vfs_async_file_get_contents(uri, (VFSConsumer) get_lyrics_step_2, tuple);
 
 	g_free(uri);
@@ -344,16 +346,18 @@
 lyricwiki_playback_began(void)
 {
 	gint playlist, pos;
-	const Tuple *tu;
 
 	if (!aud_drct_get_playing())
 		return;
 
 	playlist = aud_playlist_get_playing();
 	pos = aud_playlist_get_position(playlist);
-	tu = aud_playlist_entry_get_tuple (playlist, pos, FALSE);
+	Tuple * tu = aud_playlist_entry_get_tuple (playlist, pos, FALSE);
 
 	get_lyrics_step_1(tu);
+
+	if (tu)
+		tuple_free (tu);
 }
 
 static gboolean init (void)
@@ -384,13 +388,10 @@
 	return vbox;
 }
 
-GeneralPlugin lyricwiki =
-{
-	.description = "LyricWiki",
+AUD_GENERAL_PLUGIN
+(
+	.name = "LyricWiki",
 	.init = init,
 	.cleanup = cleanup,
 	.get_widget = get_widget,
-};
-
-GeneralPlugin *lyricwiki_gplist[] = { &lyricwiki, NULL };
-SIMPLE_GENERAL_PLUGIN(lyricwiki, lyricwiki_gplist);
+)

audacious-plugins-2.5.3.tar.gz/src/m3u/m3u.c -> audacious-plugins-3.0.tar.gz/src/m3u/m3u.c Changed

@@ -33,58 +33,48 @@
 gchar a;
 
 while ((a = * text ++))
- {
 if (a != c)
 * set ++ = a;
- }
 
 * set = 0;
 }
 
-static gchar * read_win_text (const gchar * path)
+static gchar * read_win_text (VFSFile * file)
 {
- void * raw;
- gint64 size;
-
- vfs_file_get_contents (path, & raw, & size);
-
- if (raw == NULL)
+ gint64 size = vfs_fsize (file);
+ if (size < 1)
 return NULL;
 
+ gchar * raw = g_malloc (size + 1);
+ size = vfs_fread (raw, 1, size, file);
+ raw[size] = 0;
+
+ strip_char (raw, '\r');
 gchar * text = str_to_utf8 (raw);
 g_free (raw);
- strip_char (text, '\r');
 return text;
 }
 
 static gchar * split_line (gchar * line)
 {
 gchar * feed = strchr (line, '\n');
-
- if (feed == NULL)
+ if (! feed)
 return NULL;
 
 * feed = 0;
 return feed + 1;
 }
 
-static gchar * convert_path (gchar * path, const gchar * base)
+static gboolean playlist_load_m3u (const gchar * path, VFSFile * file,
+ gchar * * title, struct index * filenames, struct index * tuples)
 {
- if (strstr (path, "://") != NULL)
- return g_strdup (path);
-
- return aud_construct_uri (path, base);
-}
-
-static gboolean playlist_load_m3u (const gchar * path, gint list, gint at)
-{
- gchar * text = read_win_text (path);
-
- if (text == NULL)
+ gchar * text = read_win_text (file);
+ if (! text)
 return FALSE;
 
+ * title = NULL;
+
 gchar * parse = text;
- struct index * add = index_new ();
 
 while (parse)
 {
@@ -99,44 +89,35 @@
 if (* parse == '#')
 goto NEXT;
 
- gchar * s = convert_path (parse, path);
-
- if (s != NULL)
- index_append (add, s);
+ gchar * s = aud_construct_uri (parse, path);
+ if (s)
+ index_append (filenames, s);
 
 NEXT:
 parse = next;
 }
 
- aud_playlist_entry_insert_batch (list, at, add, NULL);
 g_free (text);
 return TRUE;
 }
 
-static gboolean playlist_save_m3u (const gchar * filename, gint playlist)
+static gboolean playlist_save_m3u (const gchar * path, VFSFile * file,
+ const gchar * title, struct index * filenames, struct index * tuples)
 {
- VFSFile * file = vfs_fopen (filename, "w");
- if (! file)
- return FALSE;
-
- gint count = aud_playlist_entry_count (playlist);
+ gint count = index_count (filenames);
 
 for (gint i = 0; i < count; i ++)
- vfs_fprintf (file, "%s\n", aud_playlist_entry_get_filename (playlist, i));
+ vfs_fprintf (file, "%s\n", (const gchar *) index_get (filenames, i));
 
- vfs_fclose (file);
 return TRUE;
 }
 
 static const gchar * const m3u_exts[] = {"m3u", NULL};
 
-static PlaylistPlugin m3u_plugin = {
- .description = "M3U Playlist Format",
+AUD_PLAYLIST_PLUGIN
+(
+ .name = "M3U Playlist Format",
 .extensions = m3u_exts,
 .load = playlist_load_m3u,
 .save = playlist_save_m3u
-};
-
-static PlaylistPlugin * const m3u_plugins[] = {& m3u_plugin, NULL};
-
-SIMPLE_PLAYLIST_PLUGIN (m3u, m3u_plugins)
+)

audacious-plugins-2.5.3.tar.gz/src/metronom/metronom.c -> audacious-plugins-3.0.tar.gz/src/metronom/metronom.c Changed

audacious-plugins-2.5.3.tar.gz/src/mixdown/mixdown.c -> audacious-plugins-3.0.tar.gz/src/mixdown/mixdown.c Changed

audacious-plugins-2.5.3.tar.gz/src/mms/mms.c -> audacious-plugins-3.0.tar.gz/src/mms/mms.c Changed

audacious-plugins-2.5.3.tar.gz/src/modplug/Makefile -> audacious-plugins-3.0.tar.gz/src/modplug/Makefile Changed

audacious-plugins-2.5.3.tar.gz/src/modplug/plugin.cxx -> audacious-plugins-3.0.tar.gz/src/modplug/plugin.cxx Changed

audacious-plugins-2.5.3.tar.gz/src/modplug/plugin_main.c -> audacious-plugins-3.0.tar.gz/src/modplug/plugin_main.c Changed

audacious-plugins-3.0.tar.gz/src/moodbar/draw-compat.h Added

@@ -0,0 +1,49 @@
+/*
+ * 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-2.5.3.tar.gz/src/moodbar/moodbar.c -> audacious-plugins-3.0.tar.gz/src/moodbar/moodbar.c Changed

@@ -24,6 +24,8 @@
 #include <audacious/drct.h>
 #include <libaudcore/hook.h>
 
+#include "draw-compat.h"
+
 static GdkColor *parse_mood_file(const gchar *filename)
 {
 	gchar *data, *it;
@@ -33,7 +35,13 @@
 	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++)
 	{
@@ -52,22 +60,22 @@
 	return ret;
 }
 
-static void render_text(GtkWidget * area, gint x, gint y, gint width, gfloat r, gfloat g, gfloat b, gfloat a, const gchar *font, const gchar *text)
+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)
 {
-	cairo_t *cr;
 	PangoLayout *pl;
 	PangoFontDescription *desc;
 	gchar *str;
 
 	str = g_markup_escape_text(text, -1);
 
-	cr = gdk_cairo_create(area->window);
 	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(area->parent, NULL);
+	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);
@@ -76,16 +84,14 @@
 
 	pango_cairo_show_layout(cr, pl);
 
-	cairo_destroy(cr);
 	g_object_unref(pl);
 	g_free(str);
 }
 
-static void render_mood(GtkWidget *widget, const gchar *filename)
+static void render_mood (GtkWidget * widget, cairo_t * cr, const gchar * filename)
 {
 	gint i;
 	GdkColor *mbdata;
-	cairo_t *cr;
 	GtkAllocation a;
 
 	gint time = aud_drct_get_time () / 1000;
@@ -93,8 +99,6 @@
 
 	mbdata = parse_mood_file(filename);
 
-	cr = gdk_cairo_create(widget->window);
-
 	gtk_widget_get_allocation(widget, &a);
 
 	for (i = 0; i < a.width; i++)
@@ -114,23 +118,22 @@
 				 time / 60, time % 60,
 				 length / 60, length % 60);
 
-		render_text(widget, (a.width / 2) - 20, (a.height / 2) - 10, a.width, 1.0, 1.0, 1.0, 1.0, "Sans 9", buf);
+		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);
 	}
-
-	cairo_destroy(cr);
 }
 
-static gboolean expose_event(GtkWidget * widget)
-{
+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 = g_strdup(aud_playlist_entry_get_filename(playlist, pos));
+	file = aud_playlist_entry_get_filename(playlist, pos);
+	g_return_val_if_fail (file, FALSE);
 
 	ext = strrchr(file, '.');
 	if (ext != NULL)
@@ -138,13 +141,11 @@
 
 	moodfile = g_strconcat(file, ".mood", NULL);
 
-	render_mood(widget, moodfile);
+	render_mood (wid, cr, moodfile);
 
 	g_free(file);
 	g_free(moodfile);
-
-	return TRUE;
-}
+DRAW_FUNC_END
 
 static gint update_song_timeout_source = 0;
 
@@ -207,12 +208,13 @@
 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, "expose-event", (GCallback) expose_event, NULL);
+	g_signal_connect(area, DRAW_SIGNAL, (GCallback) expose_event, NULL);
 
 	return TRUE;
 }
@@ -220,10 +222,7 @@
 static gpointer moodbar_widget(void)
 {
 	if (mowgli_global_storage_get("gtkui.shbox"))
-	{
-		g_print("shbox found\n");
 		return NULL;
-	}
 
 	return area;
 }
@@ -236,13 +235,10 @@
 	g_object_unref(area);
 }
 
-VisPlugin moodbar_vp = {
-	.description = "Moodbar",
+AUD_VIS_PLUGIN
+(
+	.name = "Moodbar",
 	.init = moodbar_init,
 	.cleanup = moodbar_done,
 	.get_widget = moodbar_widget,
-};
-
-VisPlugin *moodbar_vplist[] = { &moodbar_vp, NULL };
-
-SIMPLE_VISUAL_PLUGIN(moodbar, moodbar_vplist);
+)

audacious-plugins-2.5.3.tar.gz/src/mpg123/Makefile -> audacious-plugins-3.0.tar.gz/src/mpg123/Makefile Changed

@@ -1,27 +1,6 @@
 PLUGIN = madplug${PLUGIN_SUFFIX}
 
-SRCS = mpg123.c \
-       id3skip.c \
-       libmpg123/compat.c \
-       libmpg123/dct64.c \
-       libmpg123/equalizer.c \
-       libmpg123/feature.c \
-       libmpg123/format.c \
-       libmpg123/frame.c \
-       libmpg123/icy2utf8.c \
-       libmpg123/icy.c \
-       libmpg123/id3.c \
-       libmpg123/index.c \
-       libmpg123/layer1.c \
-       libmpg123/layer2.c \
-       libmpg123/layer3.c \
-       libmpg123/libmpg123.c \
-       libmpg123/optimize.c \
-       libmpg123/parse.c \
-       libmpg123/readers.c \
-       libmpg123/stringbuf.c \
-       libmpg123/synth.c \
-       libmpg123/tabinit.c
+SRCS = mpg123.c
 
 include ../../buildsys.mk
 include ../../extra.mk
@@ -29,6 +8,5 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} -I../..
-LDFLAGS += ${AUDLDFLAGS}
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${MOWGLI_LIBS} -laudtag -lm
+CPPFLAGS += -std=gnu99 ${PLUGIN_CPPFLAGS} ${MPG123_CFLAGS} -I../..
+LIBS += ${MPG123_LIBS} -laudtag -lm

audacious-plugins-2.5.3.tar.gz/src/mpg123/mpg123.c -> audacious-plugins-3.0.tar.gz/src/mpg123/mpg123.c Changed

@@ -19,7 +19,10 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */
 
-#undef DEBUG
+/* must come before <mpg123.h> to get _FILE_OFFSET_BITS */
+#include "config.h"
+
+#include <mpg123.h>
 
 #ifdef DEBUG_MPG123_IO
 # define MPG123_IODBG(...)	AUDDBG(__VA_ARGS__)
@@ -33,15 +36,9 @@
 #include <audacious/plugin.h>
 #include <audacious/audtag.h>
 
-#include "config.h"
-#include "libmpg123/mpg123.h"
-
 /* Define to read all frame headers when calculating file length */
 /* #define FULL_SCAN */
 
-/* id3skip.c */
-gint id3_header_size (const guchar * data, gint size);
-
 static GMutex *ctrl_mutex = NULL;
 static GCond *ctrl_cond = NULL;
 
@@ -79,6 +76,17 @@
 	g_cond_free(ctrl_cond);
 }
 
+static void set_format (mpg123_handle * dec)
+{
+	static const gint rates[] = {8000, 11025, 12000, 16000, 22050, 24000, 32000,
+	 44100, 48000};
+
+	mpg123_format_none (dec);
+	for (gint i = 0; i < G_N_ELEMENTS (rates); i ++)
+		mpg123_format (dec, rates[i], MPG123_MONO | MPG123_STEREO,
+		 MPG123_ENC_FLOAT_32);
+}
+
 static void make_format_string (const struct mpg123_frameinfo * info, gchar *
 buf, gint bsize)
 {
@@ -98,6 +106,7 @@
 	g_return_val_if_fail (dec, FALSE);
 	mpg123_param (dec, MPG123_ADD_FLAGS, MPG123_QUIET, 0);
 	mpg123_replace_reader_handle (dec, replace_read, replace_lseek, NULL);
+	set_format (dec);
 
 	gint res;
 	if ((res = mpg123_open_handle (dec, file)) < 0)
@@ -123,7 +132,7 @@
 	if ((res = mpg123_info (dec, & info)) < 0)
 		goto ERR;
 
-	gint16 out[chan * (rate / 10)];
+	gfloat out[chan * (rate / 10)];
 	size_t done;
 	while ((res = mpg123_read (dec, (void *) out, sizeof out, & done)) < 0)
 	{
@@ -298,6 +307,7 @@
 	mpg123_param (ctx.decoder, MPG123_ADD_FLAGS, MPG123_GAPLESS, 0);
 	mpg123_param (ctx.decoder, MPG123_ADD_FLAGS, MPG123_SEEKBUFFER, 0);
 	mpg123_replace_reader_handle (ctx.decoder, replace_read, replace_lseek, NULL);
+	set_format (ctx.decoder);
 
 	if (mpg123_open_handle (ctx.decoder, file) < 0)
 	{
@@ -308,7 +318,7 @@
 		goto cleanup;
 	}
 
-	gint16 outbuf[8192];
+	gfloat outbuf[8192];
 	size_t outbuf_size = 0;
 
 #ifdef FULL_SCAN
@@ -333,7 +343,7 @@
 		ctx.rate, ctx.channels, ctx.encoding);
 
 	AUDDBG("opening audio\n");
-	if (! data->output->open_audio (FMT_S16_NE, ctx.rate, ctx.channels))
+	if (! data->output->open_audio (FMT_FLOAT, ctx.rate, ctx.channels))
 	{
 		error = TRUE;
 		goto cleanup;
@@ -526,11 +536,12 @@
 /** plugin description header **/
 static const gchar *mpg123_fmts[] = { "mp3", "mp2", "mp1", "bmu", NULL };
 
-static InputPlugin mpg123_ip = {
+AUD_INPUT_PLUGIN
+(
 	.init = aud_mpg123_init,
 	.cleanup = aud_mpg123_deinit,
-	.description = "MPG123",
-	.vfs_extensions = mpg123_fmts,
+	.name = "MPG123",
+	.extensions = mpg123_fmts,
 	.is_our_file_from_vfs = mpg123_probe_for_fd,
 	.probe_for_tuple = mpg123_probe_for_tuple,
 	.play = mpg123_playback_worker,
@@ -539,8 +550,4 @@
 	.pause = mpg123_pause_playback_worker,
 	.update_song_tuple = mpg123_write_tag,
 	.get_song_image = mpg123_get_image,
-};
-
-static InputPlugin *mpg123_iplist[] = { &mpg123_ip, NULL };
-
-SIMPLE_INPUT_PLUGIN(mpg123, mpg123_iplist);
+)

audacious-plugins-2.5.3.tar.gz/src/mtp_up/mtp.c -> audacious-plugins-3.0.tar.gz/src/mtp_up/mtp.c Changed

@@ -32,8 +32,6 @@
 
 #define DEBUG 1
 
-#define UP_DEFAULT_LABEL  _("Upload selected track(s)")
-
 GMutex * mutex = NULL;
 gboolean mtp_initialised = FALSE;
 LIBMTP_mtpdevice_t *mtp_device = NULL;
@@ -45,17 +43,12 @@
 static gboolean mtp_init (void);
 void mtp_cleanup ( void );
 
-GeneralPlugin mtp_gp =
-{
-    .description = "MTP Upload",
+AUD_GENERAL_PLUGIN
+(
+    .name = "MTP Upload",
     .init = mtp_init,
     .cleanup = mtp_cleanup
-};
-GtkWidget *mtp_root_menuitem,*mtp_submenu_item_up,*mtp_submenu_item_free,*mtp_submenu;
-
-GeneralPlugin *mtp_gplist[] = { &mtp_gp, NULL };
-DECLARE_PLUGIN(mtp_gp, NULL, NULL, NULL, NULL, NULL, mtp_gplist, NULL, NULL)
-
+)
 
 void show_dialog(const gchar* message)
 {
@@ -73,7 +66,7 @@
 
 }
 
-gboolean free_device(void)
+static void free_device (void)
 {
 #if DEBUG
     if(mtp_initialised)
@@ -85,23 +78,24 @@
                 "Waiting for the MTP mutex to unlock...\n");
 #endif
     if(!mutex)
-        return TRUE;
+        return;
     g_mutex_lock(mutex);
     if(mtp_device!= NULL)
     {
         LIBMTP_Release_Device(mtp_device);
         mtp_device = NULL;
         mtp_initialised = FALSE;
+#if 0
         gtk_widget_hide(mtp_submenu_item_free);
+#endif
     }
     g_mutex_unlock(mutex);
-    return TRUE;
+    return;
 }
 
 GList *
 get_upload_list(void)
 {
-    const Tuple * tuple;
     GList *up_list=NULL;
     gint current_play = aud_playlist_get_active();
     gint i = (aud_playlist_entry_count(current_play) - 1);
@@ -110,9 +104,12 @@
     {
         if (aud_playlist_entry_get_selected(current_play, i))
         {
-            tuple = aud_playlist_entry_get_tuple (current_play, i, FALSE);
+            Tuple * tuple = aud_playlist_entry_get_tuple (current_play, i, FALSE);
             aud_playlist_entry_set_selected(current_play, i, FALSE);
             up_list = g_list_prepend (up_list, (void *) tuple);
+
+            if (tuple)
+                tuple_free (tuple);
         }
     }
 
@@ -211,18 +208,24 @@
 
 gpointer upload(gpointer arg)
 {
+#if 0
     gtk_widget_hide(mtp_submenu_item_free);
+#endif
     if(!mutex)
     {
+#if 0
         gtk_label_set_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN(mtp_submenu_item_up))),UP_DEFAULT_LABEL);
         gtk_widget_set_sensitive(mtp_submenu_item_up, TRUE);
+#endif
         return NULL;
     }
     g_mutex_lock(mutex);
     if(!mtp_device)
     {
+#if 0
         gtk_label_set_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN(mtp_submenu_item_up))),UP_DEFAULT_LABEL);
         gtk_widget_set_sensitive(mtp_submenu_item_up, TRUE);
+#endif
         g_mutex_unlock(mutex);
         return NULL;
     }
@@ -249,21 +252,25 @@
         node = g_list_next(node);
     }
     g_list_free(up_list);
+#if 0
     gtk_label_set_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN(mtp_submenu_item_up))),UP_DEFAULT_LABEL);
     gtk_widget_set_sensitive(mtp_submenu_item_up, TRUE);
+#endif
     g_mutex_unlock(mutex);
 #if DEBUG
     g_print("MTP upload process finished\n");
 #endif
+#if 0
     gtk_widget_show(mtp_submenu_item_free);
+#endif
     g_thread_exit(NULL);
     return NULL;
 }
 
-gboolean mtp_press()
+static void mtp_press (void)
 {
     if(!mutex)
-        return TRUE;
+        return;
     g_mutex_lock(mutex);
     if(!mtp_initialised)
     {
@@ -273,8 +280,9 @@
         LIBMTP_Init();
         mtp_device = LIBMTP_Get_First_Device();
         mtp_initialised = TRUE;
+#if 0
         gtk_widget_show(mtp_submenu_item_free);
-
+#endif
     }
     g_mutex_unlock(mutex);
     if(mtp_device == NULL)
@@ -284,43 +292,24 @@
 #endif
         /* show_dialog("No MTP devices have been found !!!"); */
         mtp_initialised = FALSE;
-        return TRUE;
-
+        return;
     }
+#if 0
     gtk_label_set_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN(mtp_submenu_item_up))), _("Upload in progress..."));
     gtk_widget_set_sensitive(mtp_submenu_item_up, FALSE);
+#endif
     g_thread_create(upload,NULL,FALSE,NULL);
-    return TRUE;
-
 }
 
 static gboolean mtp_init (void)
 {
-    mtp_root_menuitem=gtk_menu_item_new_with_label(_("MTP device handler"));
-    mtp_submenu=gtk_menu_new();
-
-    mtp_submenu_item_up=gtk_menu_item_new_with_label(UP_DEFAULT_LABEL);
-    mtp_submenu_item_free=gtk_menu_item_new_with_label(_("Disconnect the device"));
-
-
-    gtk_menu_shell_append (GTK_MENU_SHELL (mtp_submenu), mtp_submenu_item_up);
-    gtk_widget_show (mtp_submenu_item_up);
-
-    gtk_menu_shell_append (GTK_MENU_SHELL (mtp_submenu), mtp_submenu_item_free);
-
-    gtk_menu_item_set_submenu(GTK_MENU_ITEM(mtp_root_menuitem),mtp_submenu);
-    gtk_widget_show (mtp_submenu);
-    gtk_widget_show (mtp_root_menuitem);
-
-
-    aud_menu_plugin_item_add(AUDACIOUS_MENU_MAIN, mtp_root_menuitem);
-
-    g_signal_connect (G_OBJECT (mtp_submenu_item_up), "button_press_event",G_CALLBACK (mtp_press), NULL);
-    g_signal_connect (G_OBJECT (mtp_submenu_item_free), "button_press_event",G_CALLBACK (free_device), NULL);
-
     mutex = g_mutex_new();
     plugin_active = TRUE;
     exiting=FALSE;
+
+    aud_plugin_menu_add (AUD_MENU_MAIN, mtp_press, _("Upload to MTP Device"), NULL);
+    aud_plugin_menu_add (AUD_MENU_MAIN, free_device, _("Disconnect MTP Device"), NULL);
+
     return TRUE;
 }
 
@@ -328,6 +317,8 @@
 {
     if (plugin_active)
     {
+        aud_plugin_menu_remove (AUD_MENU_MAIN, mtp_press);
+        aud_plugin_menu_remove (AUD_MENU_MAIN, free_device);
 
 #if DEBUG
         if(mtp_initialised)
@@ -353,14 +344,6 @@
         if(mtp_initialised)
             g_print("The MTP mutex has been unlocked\n");
 #endif
-        aud_menu_plugin_item_remove(AUDACIOUS_MENU_MAIN, mtp_root_menuitem);
-
-        gtk_widget_destroy(mtp_submenu_item_up);
-        gtk_widget_destroy(mtp_submenu_item_free);
-
-        gtk_widget_destroy(mtp_submenu);
-
-        gtk_widget_destroy(mtp_root_menuitem);
 
         g_mutex_free (mutex);
         mutex = NULL;

audacious-plugins-2.5.3.tar.gz/src/neon/neon.c -> audacious-plugins-3.0.tar.gz/src/neon/neon.c Changed

audacious-plugins-2.5.3.tar.gz/src/notify/libnotify-aosd.c -> audacious-plugins-3.0.tar.gz/src/notify/libnotify-aosd.c Changed

audacious-plugins-2.5.3.tar.gz/src/notify/libnotify-aosd_event.c -> audacious-plugins-3.0.tar.gz/src/notify/libnotify-aosd_event.c Changed

@@ -21,10 +21,12 @@
 #include <glib.h>
 
 #include <audacious/drct.h>
+#include <audacious/i18n.h>
 #include <audacious/playlist.h>
 #include <libaudcore/hook.h>
 #include <libaudgui/libaudgui-gtk.h>
 
+#include "config.h"
 #include "libnotify-aosd_common.h"
 
 static gchar * last_title = NULL, * last_message = NULL;
@@ -37,32 +39,41 @@
 last_message = NULL;
 }
 
-static void update (void)
+static void update (void * unused, void * explicit)
 {
 if (! aud_drct_get_playing () || ! aud_drct_get_ready ())
+ {
+ if (GPOINTER_TO_INT (explicit))
+ osd_show (_("Stopped"), _("Audacious is not playing."), NULL, NULL);
+
 return;
+ }
 
 gint list = aud_playlist_get_playing ();
 gint entry = aud_playlist_get_position (list);
 
- const gchar * title, * artist, * album;
+ gchar * title, * artist, * album;
 aud_playlist_entry_describe (list, entry, & title, & artist, & album, FALSE);
 
 gchar * message;
 if (artist)
 {
 if (album)
+ {
 message = g_strdup_printf ("%s\n%s", artist, album);
+ g_free (artist);
+ g_free (album);
+ }
 else
- message = g_strdup (artist);
+ message = artist;
 }
 else if (album)
- message = g_strdup (album);
+ message = album;
 else
 message = g_strdup ("");
 
- if (last_title && last_message && ! strcmp (title, last_title) && ! strcmp
- (message, last_message))
+ if (! GPOINTER_TO_INT (explicit) && last_title && last_message && ! strcmp
+ (title, last_title) && ! strcmp (message, last_message))
 {
 g_free (message);
 return;
@@ -70,7 +81,7 @@
 
 GdkPixbuf * pb = audgui_pixbuf_for_current ();
 if (pb)
- audgui_pixbuf_scale_within (& pb, 128);
+ audgui_pixbuf_scale_within (& pb, 96);
 
 osd_show (title, message, "audio-x-generic", pb);
 
@@ -78,19 +89,22 @@
 g_object_unref (pb);
 
 clear ();
- last_title = g_strdup (title);
+ last_title = title;
 last_message = message;
 }
 
 void event_init (void)
 {
- hook_associate ("playback ready", (HookFunction) update, NULL);
- hook_associate ("playlist update", (HookFunction) update, NULL);
+ update (NULL, GINT_TO_POINTER (FALSE));
+ hook_associate ("aosd toggle", (HookFunction) update, GINT_TO_POINTER (TRUE));
+ hook_associate ("playback ready", (HookFunction) update, GINT_TO_POINTER (FALSE));
+ hook_associate ("playlist update", (HookFunction) update, GINT_TO_POINTER (FALSE));
 hook_associate ("playback stop", (HookFunction) clear, NULL);
 }
 
 void event_uninit (void)
 {
+ hook_dissociate ("aosd toggle", (HookFunction) update);
 hook_dissociate ("playback ready", (HookFunction) update);
 hook_dissociate ("playlist update", (HookFunction) update);
 hook_dissociate ("playback stop", (HookFunction) clear);

audacious-plugins-2.5.3.tar.gz/src/null/null.c -> audacious-plugins-3.0.tar.gz/src/null/null.c Changed

audacious-plugins-2.5.3.tar.gz/src/openal/openal.c -> audacious-plugins-3.0.tar.gz/src/openal/openal.c Changed

audacious-plugins-2.5.3.tar.gz/src/oss4/Makefile -> audacious-plugins-3.0.tar.gz/src/oss4/Makefile Changed

audacious-plugins-2.5.3.tar.gz/src/oss4/oss.h -> audacious-plugins-3.0.tar.gz/src/oss4/oss.h Changed

audacious-plugins-2.5.3.tar.gz/src/oss4/plugin.c -> audacious-plugins-3.0.tar.gz/src/oss4/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/pls/pls.c -> audacious-plugins-3.0.tar.gz/src/pls/pls.c Changed

@@ -2,6 +2,7 @@
 * Audacious: A cross-platform multimedia player
 * Copyright (c) 2006 William Pitcock, Tony Vroon, George Averill,
 * Giacomo Lozito, Derek Pomery and Yoshiki Yazawa.
+ * Copyright (c) 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 as published by
@@ -40,18 +41,16 @@
 
 #include "util.h"
 
-static gboolean playlist_load_pls (const gchar * filename, gint list, gint pos)
+static gboolean playlist_load_pls (const gchar * filename, VFSFile * file,
+ gchar * * title, struct index * filenames, struct index * tuples)
 {
 gint i, count;
 gchar line_key[16];
 gchar * line;
- gchar *uri = NULL;
- struct index * add;
 
- uri = g_filename_to_uri(filename, NULL, NULL);
+ INIFile * inifile = open_ini_file (file);
 
- INIFile *inifile = open_ini_file(uri ? uri : filename);
- g_free(uri); uri = NULL;
+ * title = NULL;
 
 if (!(line = read_ini_string(inifile, "playlist", "NumberOfEntries")))
 {
@@ -62,8 +61,6 @@
 count = atoi(line);
 g_free(line);
 
- add = index_new ();
-
 for (i = 1; i <= count; i++) {
 g_snprintf(line_key, sizeof(line_key), "File%d", i);
 if ((line = read_ini_string(inifile, "playlist", line_key)))
@@ -72,36 +69,26 @@
 g_free(line);
 
 if (uri != NULL)
- index_append (add, uri);
+ index_append (filenames, uri);
 }
 }
 
 close_ini_file(inifile);
-
- aud_playlist_entry_insert_batch (list, pos, add, NULL);
 return TRUE;
 }
 
-static gboolean playlist_save_pls (const gchar * filename, gint playlist)
+static gboolean playlist_save_pls (const gchar * filename, VFSFile * file,
+ const gchar * title, struct index * filenames, struct index * tuples)
 {
- gint entries = aud_playlist_entry_count (playlist);
- gchar *uri = g_filename_to_uri(filename, NULL, NULL);
- VFSFile *file = vfs_fopen(uri, "wb");
+ gint entries = index_count (filenames);
 gint count;
 
- AUDDBG("filename=%s\n", filename);
- AUDDBG("uri=%s\n", uri);
-
- if (! file)
- return FALSE;
-
 vfs_fprintf(file, "[playlist]\n");
 vfs_fprintf(file, "NumberOfEntries=%d\n", entries);
 
 for (count = 0; count < entries; count ++)
 {
- const gchar * filename = aud_playlist_entry_get_filename (playlist,
- count);
+ const gchar * filename = index_get (filenames, count);
 gchar *fn;
 
 if (vfs_is_remote (filename))
@@ -113,19 +100,15 @@
 g_free(fn);
 }
 
- vfs_fclose(file);
 return TRUE;
 }
 
 static const gchar * const pls_exts[] = {"pls", NULL};
 
-static PlaylistPlugin pls_plugin = {
- .description = "PLS Playlist Format",
+AUD_PLAYLIST_PLUGIN
+(
+ .name = "PLS Playlist Format",
 .extensions = pls_exts,
 .load = playlist_load_pls,
 .save = playlist_save_pls
-};
-
-static PlaylistPlugin * const pls_plugins[] = {& pls_plugin, NULL};
-
-SIMPLE_PLAYLIST_PLUGIN (pls, pls_plugins)
+)

audacious-plugins-2.5.3.tar.gz/src/pls/util.c -> audacious-plugins-3.0.tar.gz/src/pls/util.c Changed

audacious-plugins-2.5.3.tar.gz/src/pls/util.h -> audacious-plugins-3.0.tar.gz/src/pls/util.h Changed

audacious-plugins-2.5.3.tar.gz/src/psf/plugin.c -> audacious-plugins-3.0.tar.gz/src/psf/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/pulse_audio/pulse_audio.c -> audacious-plugins-3.0.tar.gz/src/pulse_audio/pulse_audio.c Changed

audacious-plugins-2.5.3.tar.gz/src/resample/plugin.c -> audacious-plugins-3.0.tar.gz/src/resample/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/roaraudio-vio/roaraudio-vio.c -> audacious-plugins-3.0.tar.gz/src/roaraudio-vio/roaraudio-vio.c Changed

audacious-plugins-2.5.3.tar.gz/src/roaraudio/roar.c -> audacious-plugins-3.0.tar.gz/src/roaraudio/roar.c Changed

@@ -29,8 +29,9 @@
 
 #include "all.h"
 
-OutputPlugin roar_op = {
-	.description = "RoarAudio Output Plugin",
+AUD_OUTPUT_PLUGIN
+(
+	.name = "RoarAudio Output",
 	.init = aud_roar_init,
 	.cleanup = NULL,
 	.get_volume = aud_roar_get_volume,
@@ -45,11 +46,8 @@
 	.drain = aud_roar_drain,
 	.buffer_free = aud_roar_buffer_get_size,
 //	.period_wait = aud_roar_period_wait,
-};
+)
 
-OutputPlugin *roar_oplist[] = { &roar_op, NULL };
-
-SIMPLE_OUTPUT_PLUGIN(roaraudio, roar_oplist);
 gboolean aud_roar_init(void)
 {
 	mcs_handle_t *cfgfile;
@@ -285,7 +283,6 @@
 	char empty = 0;
 	const gchar *info = NULL;
 	gint pos, playlist;
-	const Tuple *songtuple;
 	gint i;
 	static struct { int ac_metatype, ra_metatype; } metamap[] = {
 		{FIELD_ARTIST,		ROAR_META_TYPE_ARTIST},
@@ -307,21 +304,21 @@
 
 	roar_stream_meta_set(&(g_inst.con), &(g_inst.stream), ROAR_META_MODE_CLEAR, &meta);
 
-	info = aud_playlist_entry_get_filename(playlist, pos);
-	if (info)
+	gchar * filename = aud_playlist_entry_get_filename (playlist, pos);
+	if (filename)
 	{
-		if (strncmp(info, "http://", 7) == 0)
+		if (! strncmp (filename, "http://", 7))
 			meta.type = ROAR_META_TYPE_FILEURL;
 		else
 			meta.type = ROAR_META_TYPE_FILENAME;
 
-		meta.value = g_strdup(info);
+		meta.value = filename;
 		roar_stream_meta_set(&(g_inst.con), &(g_inst.stream), ROAR_META_MODE_SET, &meta);
 
-		free(meta.value);
+		g_free (filename);
 	}
 
-	songtuple = aud_playlist_entry_get_tuple(playlist, pos, TRUE);
+	Tuple * songtuple = aud_playlist_entry_get_tuple (playlist, pos, TRUE);
 	if (songtuple)
 	{
 		for (i = 0; i < sizeof(metamap)/sizeof(*metamap); i++)
@@ -336,6 +333,8 @@
 				free(meta.value);
 			}
 		}
+
+		tuple_free (songtuple);
 	}
 
 	meta.value = &empty;

audacious-plugins-2.5.3.tar.gz/src/rocklight/rocklight.c -> audacious-plugins-3.0.tar.gz/src/rocklight/rocklight.c Changed

audacious-plugins-2.5.3.tar.gz/src/scrobbler/configure.c -> audacious-plugins-3.0.tar.gz/src/scrobbler/configure.c Changed

audacious-plugins-2.5.3.tar.gz/src/scrobbler/plugin.c -> audacious-plugins-3.0.tar.gz/src/scrobbler/plugin.c Changed

@@ -8,7 +8,6 @@
 
 #include <audacious/configdb.h>
 #include <audacious/debug.h>
-#include <audacious/glib-compat.h>
 #include <audacious/playlist.h>
 #include <audacious/plugin.h>
 #include <audacious/preferences.h>
@@ -52,9 +51,8 @@
 
 static void aud_hook_playback_begin(gpointer hook_data, gpointer user_data)
 {
-	gint playlist = aud_playlist_get_active();
+	gint playlist = aud_playlist_get_playing();
 	gint pos = aud_playlist_get_position(playlist);
-	const Tuple *tuple;
 
 	if (aud_playlist_entry_get_length (playlist, pos, FALSE) < 30)
 	{
@@ -62,22 +60,23 @@
 		return;
 	}
 
-	if (ishttp(aud_playlist_entry_get_filename(playlist, pos)))
+	gchar * filename = aud_playlist_entry_get_filename (playlist, pos);
+	if (ishttp (filename))
 	{
 		AUDDBG(" *** not submitting due to HTTP source");
+		g_free (filename);
 		return;
 	}
+	g_free (filename);
 
 	sc_idle(m_scrobbler);
 
-	tuple = aud_playlist_entry_get_tuple (playlist, pos, FALSE);
-	if (tuple == NULL)
+	if (submit_tuple)
+		tuple_free (submit_tuple);
+	submit_tuple = aud_playlist_entry_get_tuple (playlist, pos, FALSE);
+	if (! submit_tuple)
 		return;
 
-	if (submit_tuple != NULL)
-		mowgli_object_unref(submit_tuple);
-
-	submit_tuple = tuple_copy(tuple);
 	sc_addentry(m_scrobbler, submit_tuple, tuple_get_int(submit_tuple, FIELD_LENGTH, NULL) / 1000);
 
 	if (!track_timeout)
@@ -221,15 +220,11 @@
 
 extern PluginPreferences preferences;
 
-static GeneralPlugin scrobbler_gp =
-{
-	.description = "Scrobbler Plugin",
+AUD_GENERAL_PLUGIN
+(
+	.name = "Scrobbler",
 	.init = init,
 	.about = about_show,
 	.cleanup = cleanup,
 	.settings = &preferences,
-};
-
-GeneralPlugin *scrobbler_gplist[] = { &scrobbler_gp, NULL };
-
-DECLARE_PLUGIN(scrobbler, NULL, NULL, NULL, NULL, NULL, scrobbler_gplist, NULL, NULL);
+)

audacious-plugins-2.5.3.tar.gz/src/sdlout/plugin.c -> audacious-plugins-3.0.tar.gz/src/sdlout/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/sid/Makefile -> audacious-plugins-3.0.tar.gz/src/sid/Makefile Changed

audacious-plugins-2.5.3.tar.gz/src/sid/xs_config.c -> audacious-plugins-3.0.tar.gz/src/sid/xs_config.c Changed

@@ -65,12 +65,14 @@
 /*
  * 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)
 
@@ -306,6 +308,7 @@
 
 /* Filter configuration handling
  */
+#if 0
 static void xs_filters_error(const gchar *fmt, ...)
 {
     va_list ap;
@@ -324,6 +327,7 @@
     g_free(msg);
 #endif
 }
+#endif
 
 
 static void xs_filter_free(xs_sid_filter_t *filter)
@@ -457,7 +461,6 @@
     g_free(tmpValue);
     return TRUE;
 }
-#endif
 
 
 /* Filter exporting and importing. These functions export/import
@@ -671,6 +674,7 @@
 
     return result;
 }
+#endif
 
 
 /* Get the configuration (from file or default)
@@ -797,6 +801,7 @@
 }
 
 
+#if 0
 /* Configuration panel was canceled
  */
 XS_DEF_WINDOW_CLOSE(cfg_cancel, configwin)
@@ -1552,3 +1557,4 @@
     /* Show the widget */
     gtk_widget_show(xs_configwin);
 }
+#endif

audacious-plugins-2.5.3.tar.gz/src/sid/xs_curve.h -> audacious-plugins-3.0.tar.gz/src/sid/xs_curve.h Changed

audacious-plugins-2.5.3.tar.gz/src/sid/xs_init.c -> audacious-plugins-3.0.tar.gz/src/sid/xs_init.c Changed

@@ -26,25 +26,25 @@
 
 static const gchar *xs_sid_fmts[] = { "sid", "psid", NULL };
 
-
-InputPlugin xs_plugin_ip = {
-    .description = XS_PACKAGE_STRING,   /* Plugin description */
+AUD_INPUT_PLUGIN
+(
+    .name = XS_PACKAGE_STRING,          /* Plugin description */
     .init = xs_init,                    /* Initialization */
     .cleanup = xs_close,                /* Cleanup */
+#if 0
     .about = xs_about,                  /* Show aboutbox */
     .configure = xs_configure,          /* Show/edit configuration */
+#endif
 
-    .play = xs_play_file,          /* Play given file */
+    .play = xs_play_file,               /* Play given file */
     .stop = xs_stop,                    /* Stop playing */
     .pause = xs_pause,                  /* Pause playing */
 
+#if 0
     .file_info_box = xs_fileinfo,       /* Show file-information dialog */
+#endif
     .probe_for_tuple = xs_probe_for_tuple,
 
-    .vfs_extensions = xs_sid_fmts,      /* File ext assist */
+    .extensions = xs_sid_fmts,          /* File ext assist */
     .have_subtune = TRUE
-};
-
-static InputPlugin *sid_iplist[] = { &xs_plugin_ip, NULL };
-
-SIMPLE_INPUT_PLUGIN(sid, sid_iplist);
+)

audacious-plugins-2.5.3.tar.gz/src/skins/Makefile -> audacious-plugins-3.0.tar.gz/src/skins/Makefile Changed

@@ -1,9 +1,9 @@
 PLUGIN = skins${PLUGIN_SUFFIX}
 
-SRCS = plugin.c \
+SRCS = drag-handle.c \
+       plugin.c \
        skins_cfg.c \
-       pixbuf_effects.c \
-       dnd.c \
+       surface.c \
        ui_skin.c \
        ui_skinned_window.c \
        ui_dock.c \
@@ -25,7 +25,6 @@
        ui_equalizer.c \
        ui_playlist.c \
        ui_main_evlisteners.c \
-       ui_playlist_evlisteners.c \
        ui_manager.c \
        ui_hints.c \
        ui_skinselector.c
@@ -87,101 +86,6 @@
        Skins/Default/titlebar.png	\
        Skins/Default/viscolor.txt	\
        Skins/Default/volume.png		\
-       Skins/Default/gtk-2.0/Arrows/arrow-down.png \
-       Skins/Default/gtk-2.0/Arrows/arrow-insens.png \
-       Skins/Default/gtk-2.0/Arrows/arrow-left.png \
-       Skins/Default/gtk-2.0/Arrows/arrow-right.png \
-       Skins/Default/gtk-2.0/Arrows/arrow-up.png \
-       Skins/Default/gtk-2.0/Buttons/button-insensitive.png \
-       Skins/Default/gtk-2.0/Buttons/button-normal.png \
-       Skins/Default/gtk-2.0/Buttons/button-prelight.png \
-       Skins/Default/gtk-2.0/Check-Radio/check1.png \
-       Skins/Default/gtk-2.0/Check-Radio/check2.png \
-       Skins/Default/gtk-2.0/Check-Radio/check3.png \
-       Skins/Default/gtk-2.0/Check-Radio/check4.png \
-       Skins/Default/gtk-2.0/Check-Radio/check5.png \
-       Skins/Default/gtk-2.0/Check-Radio/check6.png \
-       Skins/Default/gtk-2.0/Check-Radio/option1.png \
-       Skins/Default/gtk-2.0/Check-Radio/option2.png \
-       Skins/Default/gtk-2.0/Check-Radio/option3.png \
-       Skins/Default/gtk-2.0/Check-Radio/option4.png \
-       Skins/Default/gtk-2.0/Check-Radio/option5.png \
-       Skins/Default/gtk-2.0/Check-Radio/option6.png \
-       Skins/Default/gtk-2.0/Frame-Gap/frame-gap-end.png \
-       Skins/Default/gtk-2.0/Frame-Gap/frame-gap-start.png \
-       Skins/Default/gtk-2.0/Frame-Gap/frame.png \
-       Skins/Default/gtk-2.0/Handles/handle-h.png \
-       Skins/Default/gtk-2.0/Handles/handle-v.png \
-       Skins/Default/gtk-2.0/Lines/line-h.png \
-       Skins/Default/gtk-2.0/Lines/line-v.png \
-       Skins/Default/gtk-2.0/ListHeaders/list_header-insens.png \
-       Skins/Default/gtk-2.0/ListHeaders/list_header-prelight.png \
-       Skins/Default/gtk-2.0/ListHeaders/list_header-pressed.png \
-       Skins/Default/gtk-2.0/ListHeaders/list_header.png \
-       Skins/Default/gtk-2.0/Menu-Menubar/menu.png \
-       Skins/Default/gtk-2.0/Menu-Menubar/menubar-item-active.png \
-       Skins/Default/gtk-2.0/Menu-Menubar/menubar-item.png \
-       Skins/Default/gtk-2.0/Menu-Menubar/menubar.png \
-       Skins/Default/gtk-2.0/Others/null.png \
-       Skins/Default/gtk-2.0/Others/ruler.png \
-       Skins/Default/gtk-2.0/Panel/panel-bg.png \
-       Skins/Default/gtk-2.0/ProgressBar/progressbar-horiz.png \
-       Skins/Default/gtk-2.0/ProgressBar/trough-progressbar-horiz.png \
-       Skins/Default/gtk-2.0/Range/slider-horiz-prelight.png \
-       Skins/Default/gtk-2.0/Range/slider-horiz.png \
-       Skins/Default/gtk-2.0/Range/slider-vert-prelight.png \
-       Skins/Default/gtk-2.0/Range/slider-vert.png \
-       Skins/Default/gtk-2.0/Range/trough-horizontal.png \
-       Skins/Default/gtk-2.0/Range/trough-vertical.png \
-       Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz-pre.png \
-       Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz.png \
-       Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert-pre.png \
-       Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert.png \
-       Skins/Default/gtk-2.0/Scrollbars/slider-horiz-pre.png \
-       Skins/Default/gtk-2.0/Scrollbars/slider-horiz.png \
-       Skins/Default/gtk-2.0/Scrollbars/slider-vert-pre.png \
-       Skins/Default/gtk-2.0/Scrollbars/slider-vert.png \
-       Skins/Default/gtk-2.0/Scrollbars/stepper-down-prelight.png \
-       Skins/Default/gtk-2.0/Scrollbars/stepper-down.png \
-       Skins/Default/gtk-2.0/Scrollbars/stepper-left-prelight.png \
-       Skins/Default/gtk-2.0/Scrollbars/stepper-left.png \
-       Skins/Default/gtk-2.0/Scrollbars/stepper-right-prelight.png \
-       Skins/Default/gtk-2.0/Scrollbars/stepper-right.png \
-       Skins/Default/gtk-2.0/Scrollbars/stepper-up-prelight.png \
-       Skins/Default/gtk-2.0/Scrollbars/stepper-up.png \
-       Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png \
-       Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-vert.png \
-       Skins/Default/gtk-2.0/Shadows/shadow-in.png \
-       Skins/Default/gtk-2.0/Shadows/shadow-out.png \
-       Skins/Default/gtk-2.0/Shadows/text-.png \
-       Skins/Default/gtk-2.0/Shadows/text-entry.png \
-       Skins/Default/gtk-2.0/Spin/spin-down-disable.png \
-       Skins/Default/gtk-2.0/Spin/spin-down-prelight.png \
-       Skins/Default/gtk-2.0/Spin/spin-down.png \
-       Skins/Default/gtk-2.0/Spin/spin-up-disable.png \
-       Skins/Default/gtk-2.0/Spin/spin-up-prelight.png \
-       Skins/Default/gtk-2.0/Spin/spin-up.png \
-       Skins/Default/gtk-2.0/Tabs/gap-bottom-left.png \
-       Skins/Default/gtk-2.0/Tabs/gap-bottom-right.png \
-       Skins/Default/gtk-2.0/Tabs/gap-left-bottom.png \
-       Skins/Default/gtk-2.0/Tabs/gap-left-top.png \
-       Skins/Default/gtk-2.0/Tabs/gap-right-bottom.png \
-       Skins/Default/gtk-2.0/Tabs/gap-right-top.png \
-       Skins/Default/gtk-2.0/Tabs/gap-top-current.png \
-       Skins/Default/gtk-2.0/Tabs/gap-top-left.png \
-       Skins/Default/gtk-2.0/Tabs/gap-top-right.png \
-       Skins/Default/gtk-2.0/Tabs/notebook.png \
-       Skins/Default/gtk-2.0/Tabs/tab-bottom-active.png \
-       Skins/Default/gtk-2.0/Tabs/tab-bottom.png \
-       Skins/Default/gtk-2.0/Tabs/tab-left-active.png \
-       Skins/Default/gtk-2.0/Tabs/tab-left.png \
-       Skins/Default/gtk-2.0/Tabs/tab-right-active.png \
-       Skins/Default/gtk-2.0/Tabs/tab-right.png \
-       Skins/Default/gtk-2.0/Tabs/tab-top-active.png \
-       Skins/Default/gtk-2.0/Tabs/tab-top.png \
-       Skins/Default/gtk-2.0/Toolbar/toolbar.png \
-       Skins/Default/gtk-2.0/gtkrc \
-       Skins/Default/gtk-2.0/panel.rc \
        Skins/Ivory/balance.png		\
        Skins/Ivory/cbuttons.png		\
        Skins/Ivory/eq_ex.png		\
@@ -251,11 +155,9 @@
        Skins/Refugee/volume.png \
        ui/equalizer.ui \
        ui/mainwin.ui \
-       ui/playlist.ui \
-       ui/carbon-menubar.ui
+       ui/playlist.ui
 
 plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CPPFLAGS += -std=gnu99 ${PLUGIN_CPPFLAGS} -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CAIRO_LIBS} ${PANGOCAIRO_LIBS} ${XRENDER_LIBS} ${XCOMPOSITE_LIBS} ${MOWGLI_LIBS} -laudgui -lm

audacious-plugins-2.5.3.tar.gz/src/skins/Skins/Classic/skin.hints -> audacious-plugins-3.0.tar.gz/src/skins/Skins/Classic/skin.hints Changed

audacious-plugins-2.5.3.tar.gz/src/skins/Skins/Classic1.3/skin.hints -> audacious-plugins-3.0.tar.gz/src/skins/Skins/Classic1.3/skin.hints Changed

audacious-plugins-2.5.3.tar.gz/src/skins/Skins/Default/eq_ex.png -> audacious-plugins-3.0.tar.gz/src/skins/Skins/Default/eq_ex.png Changed

audacious-plugins-2.5.3.tar.gz/src/skins/Skins/Default/skin.hints -> audacious-plugins-3.0.tar.gz/src/skins/Skins/Default/skin.hints Changed

audacious-plugins-2.5.3.tar.gz/src/skins/Skins/Default/titlebar.png -> audacious-plugins-3.0.tar.gz/src/skins/Skins/Default/titlebar.png Changed

audacious-plugins-2.5.3.tar.gz/src/skins/Skins/Default/viscolor.txt -> audacious-plugins-3.0.tar.gz/src/skins/Skins/Default/viscolor.txt Changed

audacious-plugins-2.5.3.tar.gz/src/skins/Skins/Ivory/skin.hints -> audacious-plugins-3.0.tar.gz/src/skins/Skins/Ivory/skin.hints Changed

audacious-plugins-2.5.3.tar.gz/src/skins/Skins/Osmosis/skin.hints -> audacious-plugins-3.0.tar.gz/src/skins/Skins/Osmosis/skin.hints Changed

audacious-plugins-2.5.3.tar.gz/src/skins/Skins/Refugee/skin.hints -> audacious-plugins-3.0.tar.gz/src/skins/Skins/Refugee/skin.hints Changed

audacious-plugins-2.5.3.tar.gz/src/skins/Skins/TinyPlayer/skin.hints -> audacious-plugins-3.0.tar.gz/src/skins/Skins/TinyPlayer/skin.hints Changed

audacious-plugins-2.5.3.tar.gz/src/skins/actions-equalizer.h -> audacious-plugins-3.0.tar.gz/src/skins/actions-equalizer.h Changed

audacious-plugins-2.5.3.tar.gz/src/skins/actions-mainwin.h -> audacious-plugins-3.0.tar.gz/src/skins/actions-mainwin.h Changed

@@ -17,10 +17,9 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_ACTIONS_MAINWIN_H
-#define AUDACIOUS_ACTIONS_MAINWIN_H
+#ifndef SKINS_ACTIONS_MAINWIN_H
+#define SKINS_ACTIONS_MAINWIN_H
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 /* actions below are handled in mainwin.c */
@@ -34,15 +33,9 @@
 void action_playback_shuffle(GtkToggleAction*);
 void action_stop_after_current_song(GtkToggleAction*);
 void action_view_always_on_top(GtkToggleAction*);
-void action_view_scaled(GtkToggleAction*);
-void action_view_easymove(GtkToggleAction*);
 void action_view_on_all_workspaces(GtkToggleAction*);
-void action_roll_up_equalizer(GtkToggleAction*);
 void action_roll_up_player(GtkToggleAction*);
-void action_roll_up_playlist_editor(GtkToggleAction*);
-void action_show_equalizer(GtkToggleAction*);
 void action_show_player(GtkToggleAction*);
-void action_show_playlist_editor(GtkToggleAction*);
 
 /* radio actions (one for each radio action group) */
 void action_anafoff(GtkAction*,GtkRadioAction*);
@@ -56,20 +49,9 @@
 void action_viewtime(GtkAction*,GtkRadioAction*);
 
 /* normal actions */
-void action_about_audacious(void);
 void action_ab_clear(void);
 void action_ab_set(void);
-void action_jump_to_file(void);
-void action_jump_to_playlist_start(void);
-void action_jump_to_time(void);
 void action_play_file(void);
 void action_play_location(void);
-void action_playback_next(void);
-void action_playback_pause(void);
-void action_playback_play(void);
-void action_playback_previous(void);
-void action_playback_stop(void);
-void action_preferences(void);
-void action_quit(void);
-void action_current_track_info(void);
-#endif /* AUDACIOUS_ACTIONS_MAINWIN_H */
+
+#endif /* SKINS_ACTIONS_MAINWIN_H */

audacious-plugins-2.5.3.tar.gz/src/skins/actions-playlist.h -> audacious-plugins-3.0.tar.gz/src/skins/actions-playlist.h Changed

audacious-plugins-2.5.3.tar.gz/src/skins/dnd.h -> audacious-plugins-3.0.tar.gz/src/skins/dnd.h Changed

@@ -1,5 +1,5 @@
 /* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2007 Audacious development team
+ * Copyright (C) 2005-2011 Audacious development team
 *
 * Based on BMP:
 * Copyright (C) 2003-2004 BMP development team
@@ -23,29 +23,33 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_DND_H
-#define AUDACIOUS_DND_H
+#ifndef SKINS_DND_H
+#define SKINS_DND_H
 
 #include <gtk/gtk.h>
 
 /* Designate dropped data types that we know and care about */
 enum {
- BMP_DROP_STRING,
- BMP_DROP_PLAINTEXT,
- BMP_DROP_URLENCODED,
- BMP_DROP_SKIN,
- BMP_DROP_FONT
+ DROP_STRING,
+ DROP_PLAINTEXT,
+ DROP_URLENCODED,
+ DROP_SKIN,
+ DROP_FONT
 };
 
 /* Drag data format listing for gtk_drag_dest_set() */
-static const GtkTargetEntry aud_drop_types[] = {
- {"text/plain", 0, BMP_DROP_PLAINTEXT},
- {"text/uri-list", 0, BMP_DROP_URLENCODED},
- {"STRING", 0, BMP_DROP_STRING},
- {"interface/x-winamp-skin", 0, BMP_DROP_SKIN},
- {"application/x-font-ttf", 0, BMP_DROP_FONT},
+static const GtkTargetEntry drop_types[] = {
+ {"text/plain", 0, DROP_PLAINTEXT},
+ {"text/uri-list", 0, DROP_URLENCODED},
+ {"STRING", 0, DROP_STRING},
+ {"interface/x-winamp-skin", 0, DROP_SKIN},
+ {"application/x-font-ttf", 0, DROP_FONT},
 };
 
-void aud_drag_dest_set(GtkWidget*);
+static inline void drag_dest_set (GtkWidget * widget)
+{
+ gtk_drag_dest_set (widget, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
+ drop_types, G_N_ELEMENTS (drop_types), GDK_ACTION_COPY | GDK_ACTION_MOVE);
+}
 
-#endif /* AUDACIOUS_DND_H */
+#endif /* SKINS_DND_H */

audacious-plugins-3.0.tar.gz/src/skins/drag-handle.c Added

@@ -0,0 +1,105 @@
+/*
+ * drag-handle.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 "drag-handle.h"
+
+typedef struct {
+ gboolean held;
+ gint x_origin, y_origin;
+ void (* press) (void);
+ void (* drag) (gint x_offset, gint y_offset);
+} DHandleData;
+
+static gboolean handle_button_press (GtkWidget * handle, GdkEventButton * event)
+{
+ DHandleData * data = g_object_get_data ((GObject *) handle, "dhandledata");
+ g_return_val_if_fail (data, FALSE);
+
+ if (event->button != 1)
+ return FALSE;
+
+ data->held = TRUE;
+ data->x_origin = event->x_root;
+ data->y_origin = event->y_root;
+
+ if (data->press)
+ data->press ();
+
+ return TRUE;
+}
+
+static gboolean handle_button_release (GtkWidget * handle, GdkEventButton *
+ event)
+{
+ DHandleData * data = g_object_get_data ((GObject *) handle, "dhandledata");
+ g_return_val_if_fail (data, FALSE);
+
+ if (event->button != 1)
+ return FALSE;
+
+ data->held = FALSE;
+ return TRUE;
+}
+
+static gboolean handle_motion (GtkWidget * handle, GdkEventMotion * event)
+{
+ DHandleData * data = g_object_get_data ((GObject *) handle, "dhandledata");
+ g_return_val_if_fail (data, FALSE);
+
+ if (! data->held)
+ return TRUE;
+
+ if (data->drag)
+ data->drag (event->x_root - data->x_origin, event->y_root -
+ data->y_origin);
+
+ return TRUE;
+}
+
+static void handle_destroy (GtkWidget * handle)
+{
+ g_free (g_object_get_data ((GObject *) handle, "dhandledata"));
+}
+
+GtkWidget * drag_handle_new (gint w, gint h, void (* press) (void), void
+ (* drag) (gint x, gint y))
+{
+ GtkWidget * handle = gtk_event_box_new ();
+ gtk_event_box_set_visible_window ((GtkEventBox *) handle, FALSE);
+ gtk_widget_set_size_request (handle, w, h);
+ gtk_widget_add_events (handle, GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK);
+
+ g_signal_connect (handle, "button-press-event", (GCallback)
+ handle_button_press, NULL);
+ g_signal_connect (handle, "button-release-event", (GCallback)
+ handle_button_release, NULL);
+ g_signal_connect (handle, "motion-notify-event", (GCallback) handle_motion,
+ NULL);
+ g_signal_connect (handle, "destroy", (GCallback) handle_destroy, NULL);
+
+ DHandleData * data = g_malloc0 (sizeof (DHandleData));
+ data->press = press;
+ data->drag = drag;
+ g_object_set_data ((GObject *) handle, "dhandledata", data);
+
+ return handle;
+}

audacious-plugins-3.0.tar.gz/src/skins/drag-handle.h Added

@@ -0,0 +1,30 @@
+/*
+ * drag-handle.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_DRAG_HANDLE_H
+#define SKINS_DRAG_HANDLE_H
+
+#include <gtk/gtk.h>
+
+GtkWidget * drag_handle_new (gint w, gint h, void (* press) (void), void
+ (* drag) (gint x, gint y));
+
+#endif

audacious-plugins-3.0.tar.gz/src/skins/draw-compat.h Added

@@ -0,0 +1,75 @@
+/*
+ * 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>
+
+static void widget_realized (GtkWidget * w)
+{
+ GdkWindow * window = gtk_widget_get_window (w);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_window_set_background_pattern (window, NULL);
+#else
+ gdk_window_set_back_pixmap (window, NULL, FALSE);
+#endif
+}
+
+#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; }
+
+#define DRAW_CONNECT(w,f) do { \
+ g_signal_connect (w, "realize", (GCallback) widget_realized, NULL); \
+ g_signal_connect (w, DRAW_SIGNAL, (GCallback) f, NULL); \
+ } while (0);
+
+#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; }
+
+/* We set None as the background pixmap in order to avoid flickering. Setting
+ * a blank GtkStyle prevents GTK 2.x from overriding this. */
+
+#define DRAW_CONNECT(w,f) do { \
+ GtkStyle * style = gtk_style_new (); \
+ gtk_widget_set_style (w, style); \
+ g_object_unref (style); \
+ g_signal_connect (w, "realize", (GCallback) widget_realized, NULL); \
+ g_signal_connect (w, DRAW_SIGNAL, (GCallback) f, NULL); \
+ } while (0);
+
+#endif
+
+#endif

audacious-plugins-2.5.3.tar.gz/src/skins/plugin.c -> audacious-plugins-3.0.tar.gz/src/skins/plugin.c Changed

@@ -18,45 +18,50 @@
 * Audacious or using our public API to be a derived work.
 */
 
+#include <audacious/drct.h>
+#include <audacious/i18n.h>
+#include <audacious/plugin.h>
+#include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
 
+#include "config.h"
 #include "plugin.h"
 #include "skins_cfg.h"
-#include "ui_dock.h"
 #include "ui_equalizer.h"
 #include "ui_main.h"
-#include "ui_skin.h"
-#include "ui_manager.h"
 #include "ui_main_evlisteners.h"
-#include "ui_playlist_evlisteners.h"
-
-#include <audacious/audconfig.h>
-#include <audacious/drct.h>
-#include <audacious/i18n.h>
-#include <audacious/misc.h>
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-#include <libintl.h>
+#include "ui_manager.h"
+#include "ui_playlist.h"
+#include "ui_skin.h"
 
 gchar * skins_paths[SKINS_PATH_COUNT];
 
-Iface skins_interface =
-{
- .id = "skinned",
- .desc = "Winamp Classic Interface",
- .init = skins_init,
- .fini = skins_cleanup
-};
+static gboolean skins_init (void);
+static void skins_cleanup (void);
+static void skins_about (void);
+static gboolean ui_is_shown (void);
+static gboolean ui_is_focused (void);
+static void show_error_message (const gchar * text);
 
-SIMPLE_IFACE_PLUGIN (skinned, & skins_interface)
-gboolean plugin_is_active = FALSE;
+AUD_IFACE_PLUGIN
+(
+ .name = "Winamp Classic Interface",
+ .init = skins_init,
+ .cleanup = skins_cleanup,
+ .about = skins_about,
+ .configure = skins_configure,
+ .show = mainwin_show,
+ .is_shown = ui_is_shown,
+ .is_focused = ui_is_focused,
+ .show_error = show_error_message,
+ .show_filebrowser = audgui_run_filebrowser,
+ .show_jump_to_track = audgui_jump_to_track,
+)
+
+static gboolean plugin_is_active = FALSE;
 
 static gint update_source;
-
-static void toggle_visibility(void);
-static void toggle_shuffle(void);
-static void toggle_repeat(void);
-static void show_error_message(const gchar * markup);
+static GtkWidget * error_win;
 
 static void skins_free_paths(void) {
 int i;
@@ -93,7 +98,7 @@
 return TRUE;
 }
 
-gboolean skins_init (IfaceCbs * cbs)
+static gboolean skins_init (void)
 {
 plugin_is_active = TRUE;
 g_log_set_handler(NULL, G_LOG_LEVEL_WARNING, g_log_default_handler, NULL);
@@ -101,8 +106,6 @@
 skins_init_paths();
 skins_cfg_load();
 
- ui_main_check_theme_engine();
-
 audgui_set_default_icon();
 audgui_register_stock_icons();
 
@@ -123,24 +126,7 @@
 else
 mainwin_update_song_info ();
 
- if (config.player_visible)
- mainwin_show (1);
- if (config.equalizer_visible) equalizerwin_show(TRUE);
- if (config.playlist_visible)
- playlistwin_show (1);
-
- /* Register interface callbacks */
- cbs->show_prefs_window = show_preferences_window;
- cbs->run_filebrowser = audgui_run_filebrowser;
- cbs->hide_filebrowser = audgui_hide_filebrowser;
- cbs->toggle_visibility = toggle_visibility;
- cbs->show_error = show_error_message;
- cbs->show_jump_to_track = audgui_jump_to_track;
- cbs->hide_jump_to_track = audgui_jump_to_track_hide;
- cbs->show_about_window = audgui_show_about_window;
- cbs->hide_about_window = audgui_hide_about_window;
- cbs->toggle_shuffle = toggle_shuffle;
- cbs->toggle_repeat = toggle_repeat;
+ mainwin_show (config.player_visible);
 
 eq_init_hooks ();
 update_source = g_timeout_add (250, update_cb, NULL);
@@ -148,10 +134,12 @@
 return TRUE;
 }
 
-gboolean skins_cleanup (void)
+static void skins_cleanup (void)
 {
 if (plugin_is_active)
 {
+ skins_configure_cleanup ();
+
 mainwin_unhook ();
 playlistwin_unhook ();
 eq_end_hooks ();
@@ -159,20 +147,19 @@
 
 skins_cfg_save();
 
- audgui_playlist_manager_destroy();
-
 cleanup_skins();
- clear_dock_window_list ();
 skins_free_paths();
 skins_cfg_free();
 ui_manager_destroy();
+
+ if (error_win)
+ gtk_widget_destroy (error_win);
+
 plugin_is_active = FALSE;
 }
-
- return TRUE;
 }
 
-void skins_about (void)
+static void skins_about (void)
 {
 static GtkWidget * about_window = NULL;
 
@@ -181,90 +168,19 @@
 _("Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n\n"));
 }
 
-void show_preferences_window(gboolean show) {
- /* static GtkWidget * * prefswin = NULL; */
- static void * * prefswin = NULL;
-
- if (show) {
- if ((prefswin != NULL) && (*prefswin != NULL)) {
- gtk_window_present(GTK_WINDOW(*prefswin));
- return;
- }
- GtkWidget *cfgdlg;
-
- prefswin = skins_interface.ops->create_prefs_window();
- cfgdlg = skins_configure();
-
- gchar * path = g_strdup_printf ("%s/images/appearance.png",
- aud_get_path (AUD_PATH_DATA_DIR));
- skins_interface.ops->prefswin_page_new (cfgdlg, _("Skinned Interface"),
- path);
- g_free (path);
-
- gtk_widget_show_all(*prefswin);
- } else {
- if ((prefswin != NULL) && (*prefswin != NULL)) {
- skins_interface.ops->destroy_prefs_window();
- }
- }
-}
-
-static void toggle_visibility(void)
+static gboolean ui_is_shown (void)
 {
- /* use the window visibility status to toggle show/hide
- (if at least one is visible, hide) */
- if ((config.player_visible == TRUE ) ||
- (config.equalizer_visible == TRUE) ||
- (config.playlist_visible == TRUE))
- {
- /* remember the visibility status of the player windows */
- config.player_visible_prev = config.player_visible;
- config.equalizer_visible_prev = config.equalizer_visible;
- config.playlist_visible_prev = config.playlist_visible;
- /* now hide all of them */
- if (config.player_visible_prev == TRUE)
- mainwin_show(FALSE);
- if (config.equalizer_visible_prev == TRUE)
- equalizerwin_show(FALSE);
- if (config.playlist_visible_prev == TRUE)
- playlistwin_show(FALSE);
- }
- else
- {
- /* show the windows that were visible before */
- if (config.player_visible_prev == TRUE)
- mainwin_show(TRUE);
- if (config.equalizer_visible_prev == TRUE)
- equalizerwin_show(TRUE);
- if (config.playlist_visible_prev == TRUE)
- playlistwin_show(TRUE);
- }
+ return config.player_visible;
 }
 
-static void toggle_shuffle(void)
+static gboolean ui_is_focused (void)
 {
- mainwin_shuffle_pushed(aud_cfg->shuffle);
+ return gtk_window_is_active ((GtkWindow *) mainwin) || gtk_window_is_active
+ ((GtkWindow *) equalizerwin) || gtk_window_is_active ((GtkWindow *)
+ playlistwin);
 }
 
-static void toggle_repeat(void)
+static void show_error_message (const gchar * text)
 {
- mainwin_repeat_pushed(aud_cfg->repeat);
+ audgui_simple_message (& error_win, GTK_MESSAGE_ERROR, _("Error"), _(text));
 }
-
-static void show_error_message(const gchar * markup)
-{
- GtkWidget *dialog =
- gtk_message_dialog_new_with_markup(GTK_WINDOW(mainwin),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- "%s",_(markup));
-
- gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
- gtk_widget_show(GTK_WIDGET(dialog));
-
- g_signal_connect_swapped(dialog, "response",
- G_CALLBACK(gtk_widget_destroy),
- dialog);
-}
-

audacious-plugins-2.5.3.tar.gz/src/skins/plugin.h -> audacious-plugins-3.0.tar.gz/src/skins/plugin.h Changed

audacious-plugins-2.5.3.tar.gz/src/skins/skins_cfg.c -> audacious-plugins-3.0.tar.gz/src/skins/skins_cfg.c Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2008 Tomasz Moń
+ * Copyright (c) 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 as published by
@@ -18,66 +19,56 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#include <glib.h>
-#include <stdlib.h>
+#include <gtk/gtk.h>
 
 #include <audacious/configdb.h>
 #include <audacious/debug.h>
+#include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
 #include <audacious/preferences.h>
 #include <libaudcore/audstrings.h>
 
+#include "config.h"
+#include "dnd.h"
 #include "skins_cfg.h"
-#include "ui_dock.h"
-#include "ui_skin.h"
-#include "ui_vis.h"
+#include "ui_equalizer.h"
 #include "ui_main.h"
 #include "ui_playlist.h"
-#include "ui_skinned_window.h"
-#include "ui_skinned_textbox.h"
+#include "ui_skin.h"
 #include "ui_skinned_playlist.h"
+#include "ui_skinned_textbox.h"
 #include "ui_skinselector.h"
-#include "plugin.h"
-#include "dnd.h"
+#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"
+
 skins_cfg_t config;
-GtkWidget *skin_view;
-static GtkWidget *colorize_settings = NULL;
-/* colorize settings scales */
-GtkWidget *green_scale;
-GtkWidget *red_scale;
-GtkWidget *blue_scale;
 
+static GtkWidget * skin_view;
 
-skins_cfg_t skins_default_config = {
- .scaled = FALSE,
+static skins_cfg_t skins_default_config = {
 .autoscroll = TRUE,
 .always_on_top = FALSE,
 .sticky = FALSE,
- .scale_factor = 2.0,
- .always_show_cb = TRUE,
- .close_dialog_open = TRUE,
- .close_dialog_add = TRUE,
 .skin = NULL,
- .filesel_path = NULL,
 .playlist_visible = FALSE,
- .playlist_visible_prev = FALSE,
 .equalizer_visible = FALSE,
- .equalizer_visible_prev = FALSE,
 .player_visible = TRUE,
- .player_visible_prev = TRUE,
 .player_shaded = FALSE,
 .equalizer_shaded = FALSE,
 .playlist_shaded = FALSE,
- .dim_titlebar = TRUE,
- .show_wm_decorations = FALSE,
- .easy_move = TRUE,
- .allow_broken_skins = FALSE,
- .warn_about_broken_gtk_engines = TRUE,
- .warn_about_win_visibility = TRUE,
- .disable_inline_gtk = FALSE,
 .timer_mode = 0,
 .vis_type = VIS_ANALYZER,
 .analyzer_mode = ANALYZER_NORMAL,
@@ -95,16 +86,11 @@
 .playlist_y = PLAYLISTWIN_DEFAULT_POS_Y,
 .playlist_width = PLAYLISTWIN_DEFAULT_WIDTH,
 .playlist_height = PLAYLISTWIN_DEFAULT_HEIGHT,
- .playlist_position = 0,
- .colorize_r = 255, .colorize_g = 255, .colorize_b = 255,
 .analyzer_peaks = TRUE,
 .twoway_scroll = TRUE, /* use back and forth scroll */
 .mainwin_use_bitmapfont = TRUE,
- .eq_scaled_linked = TRUE,
- .show_separator_in_pl = TRUE,
 .playlist_font = NULL,
 .mainwin_font = NULL,
- .random_skin_on_play = FALSE,
 };
 
 typedef struct skins_cfg_boolent_t {
@@ -114,11 +100,8 @@
 } skins_cfg_boolent;
 
 static skins_cfg_boolent skins_boolents[] = {
- {"always_show_cb", &config.always_show_cb, TRUE},
 {"always_on_top", &config.always_on_top, TRUE},
 {"sticky", &config.sticky, TRUE},
- {"always_show_cb", &config.always_show_cb, TRUE},
- {"scaled", &config.scaled, TRUE},
 {"autoscroll_songname", &config.autoscroll, TRUE},
 {"equalizer_visible", &config.equalizer_visible, TRUE},
 {"playlist_visible", &config.playlist_visible, TRUE},
@@ -126,22 +109,9 @@
 {"player_shaded", &config.player_shaded, TRUE},
 {"equalizer_shaded", &config.equalizer_shaded, TRUE},
 {"playlist_shaded", &config.playlist_shaded, TRUE},
- {"equalizer_visible_prev", &config.equalizer_visible_prev, TRUE},
- {"playlist_visible_prev", &config.playlist_visible_prev, TRUE},
- {"player_visible_prev", &config.player_visible_prev, TRUE},
- {"dim_titlebar", &config.dim_titlebar, TRUE},
- {"show_wm_decorations", &config.show_wm_decorations, TRUE},
- {"easy_move", &config.easy_move, TRUE},
- {"allow_broken_skins", &config.allow_broken_skins, TRUE},
- {"disable_inline_gtk", &config.disable_inline_gtk, TRUE},
 {"analyzer_peaks", &config.analyzer_peaks, TRUE},
 {"twoway_scroll", &config.twoway_scroll, TRUE},
- {"warn_about_win_visibility", &config.warn_about_win_visibility, TRUE},
- {"warn_about_broken_gtk_engines", &config.warn_about_broken_gtk_engines, TRUE},
 {"mainwin_use_bitmapfont", &config.mainwin_use_bitmapfont, TRUE},
- {"eq_scaled_linked", &config.eq_scaled_linked, TRUE},
- {"show_separator_in_pl", &config.show_separator_in_pl, TRUE},
- {"random_skin_on_play", &config.random_skin_on_play, TRUE},
 };
 
 static gint ncfgbent = G_N_ELEMENTS(skins_boolents);
@@ -168,12 +138,8 @@
 {"playlist_y", &config.playlist_y, TRUE},
 {"playlist_width", &config.playlist_width, TRUE},
 {"playlist_height", &config.playlist_height, TRUE},
- {"playlist_position", &config.playlist_position, TRUE},
 {"equalizer_x", &config.equalizer_x, TRUE},
 {"equalizer_y", &config.equalizer_y, TRUE},
- {"colorize_r", &config.colorize_r, TRUE},
- {"colorize_g", &config.colorize_g, TRUE},
- {"colorize_b", &config.colorize_b, TRUE},
 };
 
 static gint ncfgient = G_N_ELEMENTS(skins_numents);
@@ -187,13 +153,11 @@
 static skins_cfg_strent skins_strents[] = {
 {"playlist_font", &config.playlist_font, TRUE},
 {"mainwin_font", &config.mainwin_font, TRUE},
- {"skin", &config.skin, FALSE},
+ {"skin", &config.skin, TRUE},
 };
 
 static gint ncfgsent = G_N_ELEMENTS(skins_strents);
 
-static void reload_skin (void);
-
 void skins_cfg_free() {
 gint i;
 for (i = 0; i < ncfgsent; ++i) {
@@ -234,9 +198,6 @@
 if (!config.playlist_font)
 config.playlist_font = g_strdup(PLAYLISTWIN_DEFAULT_FONT);
 
- if (!aud_cfg_db_get_float(cfgfile, "skins", "scale_factor", &(config.scale_factor)))
- config.scale_factor = 2.0;
-
 aud_cfg_db_close(cfgfile);
 }
 
@@ -244,13 +205,6 @@
 void skins_cfg_save() {
 mcs_handle_t *cfgfile = aud_cfg_db_open();
 
- if (aud_active_skin != NULL) {
- if (aud_active_skin->path)
- aud_cfg_db_set_string(cfgfile, "skins", "skin", aud_active_skin->path);
- else
- aud_cfg_db_unset_key(cfgfile, "skins", "skin");
- }
-
 int i;
 
 for (i = 0; i < ncfgsent; ++i) {
@@ -278,7 +232,8 @@
 static void
 mainwin_font_set_cb()
 {
- ui_skinned_textbox_set_xfont(mainwin_info, !config.mainwin_use_bitmapfont, config.mainwin_font);
+ textbox_set_font (mainwin_info, config.mainwin_use_bitmapfont ? NULL :
+ config.mainwin_font);
 }
 
 static void
@@ -286,30 +241,13 @@
 {
 AUDDBG("Attempt to set font \"%s\"\n", config.playlist_font);
 ui_skinned_playlist_set_font (playlistwin_list, config.playlist_font);
- playlistwin_set_sinfo_font(config.playlist_font); /* propagate font setting to playlistwin_sinfo */
- playlistwin_update ();
 }
 
 static void
 bitmap_fonts_cb()
 {
- ui_skinned_textbox_set_xfont(mainwin_info, !config.mainwin_use_bitmapfont, config.mainwin_font);
- playlistwin_set_sinfo_font(config.playlist_font);
-
- if (config.playlist_shaded) {
- playlistwin_update ();
- ui_skinned_window_draw_all(playlistwin);
- }
-}
-
-static void
-show_wm_decorations_cb()
-{
- dock_window_set_decorated (mainwin);
- dock_window_set_decorated (playlistwin);
- dock_window_set_decorated (equalizerwin);
- mainwin_set_shape ();
- equalizerwin_set_shape ();
+ textbox_set_font (mainwin_info, config.mainwin_use_bitmapfont ? NULL :
+ config.mainwin_font);
 }
 
 static PreferencesWidget font_table_elements[] = {
@@ -320,180 +258,10 @@
 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_CHK_BTN, N_("Use Bitmap fonts if available"), &config.mainwin_use_bitmapfont, G_CALLBACK(bitmap_fonts_cb), N_("Use bitmap fonts if they are available. Bitmap fonts do not support Unicode strings."), FALSE},
- {WIDGET_LABEL, N_("_Miscellaneous"), NULL, NULL, NULL, FALSE},
- {WIDGET_CHK_BTN, N_("Show separators in playlist"), &config.show_separator_in_pl,
- (GCallback) playlistwin_update, 0, 0},
- {WIDGET_CHK_BTN, N_("Show window manager decoration"), &config.show_wm_decorations, G_CALLBACK(show_wm_decorations_cb),
- N_("This enables the window manager to show decorations for windows."), FALSE},
- {WIDGET_CHK_BTN, N_("Use two-way text scroller"), &config.twoway_scroll, NULL,
- N_("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."), FALSE},
- {WIDGET_CHK_BTN, N_("Disable inline gtk theme"), &config.disable_inline_gtk,
- reload_skin, NULL, FALSE},
- {WIDGET_CHK_BTN, N_("Random skin on play"), &config.random_skin_on_play, NULL, NULL, FALSE},
- {WIDGET_CHK_BTN, N_("Allow loading incomplete skins"), &config.allow_broken_skins, NULL,
- N_("If selected, audacious won't refuse loading broken skins. Use only if your favourite skin doesn't work"), FALSE},
-};
-
-static gboolean
-on_skin_view_realize(GtkTreeView * treeview,
- gpointer data)
-{
- skin_view_realize(treeview);
- skin_view_update ((GtkTreeView *) skin_view);
-
- return TRUE;
-}
-
-static void
-reload_skin()
-{
- /* reload the skin to apply the change */
- skin_reload_forced();
- ui_skinned_window_draw_all(mainwin);
- ui_skinned_window_draw_all(equalizerwin);
- ui_skinned_window_draw_all(playlistwin);
-}
-
-static void
-on_red_scale_value_changed(GtkHScale *scale, gpointer data)
-{
- config.colorize_r = gtk_range_get_value(GTK_RANGE(scale));
- reload_skin();
-}
-
-static void
-on_green_scale_value_changed(GtkHScale *scale, gpointer data)
-{
- config.colorize_g = gtk_range_get_value(GTK_RANGE(scale));
- reload_skin();
-}
-
-static void
-on_blue_scale_value_changed(GtkHScale *scale, gpointer data)
-{
- config.colorize_b = gtk_range_get_value(GTK_RANGE(scale));
- reload_skin();
-}
-
-static void
-on_colorize_close_clicked(GtkButton *button, gpointer data)
-{
- gtk_widget_destroy(colorize_settings);
- colorize_settings = NULL;
-}
-
-void
-create_colorize_settings(void)
-{
- GtkWidget *vbox;
- GtkWidget *label;
- GtkWidget *table;
- GtkWidget *hbuttonbox;
- GtkWidget *colorize_close;
-
- GtkWidget *green_label;
- GtkWidget *red_label;
- GtkWidget *blue_label;
-
- colorize_settings = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_container_set_border_width(GTK_CONTAINER(colorize_settings), 12);
- gtk_window_set_title(GTK_WINDOW(colorize_settings), _("Color Adjustment"));
- gtk_window_set_type_hint(GTK_WINDOW(colorize_settings), GDK_WINDOW_TYPE_HINT_DIALOG);
-
- vbox = gtk_vbox_new(FALSE, 12);
- gtk_container_add(GTK_CONTAINER(colorize_settings), vbox);
-
- label = gtk_label_new(_("Audacious allows you to alter the color balance of the skinned UI. The sliders below will allow you to do this."));
- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-
- table = gtk_table_new(3, 2, FALSE);
- gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);
- gtk_table_set_row_spacings(GTK_TABLE(table), 6);
- gtk_table_set_col_spacings(GTK_TABLE(table), 12);
-
- blue_label = gtk_label_new(_("Blue"));
- gtk_table_attach(GTK_TABLE(table), blue_label, 0, 1, 2, 3,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify(GTK_LABEL(blue_label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(blue_label), 1, 0.5);
-
- green_label = gtk_label_new(_("Green"));
- gtk_table_attach(GTK_TABLE(table), green_label, 0, 1, 1, 2,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify(GTK_LABEL(green_label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(green_label), 1, 0.5);
-
- red_label = gtk_label_new(_("Red"));
- gtk_table_attach(GTK_TABLE(table), red_label, 0, 1, 0, 1,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify(GTK_LABEL(red_label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(red_label), 1, 0.5);
-
- red_scale = gtk_hscale_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 255, 0, 0, 0)));
- gtk_table_attach(GTK_TABLE(table), red_scale, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
- gtk_scale_set_draw_value(GTK_SCALE(red_scale), FALSE);
- gtk_scale_set_digits(GTK_SCALE(red_scale), 3);
-
- green_scale = gtk_hscale_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 255, 0, 0, 0)));
- gtk_table_attach(GTK_TABLE(table), green_scale, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
- gtk_scale_set_draw_value(GTK_SCALE(green_scale), FALSE);
- gtk_scale_set_digits(GTK_SCALE(green_scale), 3);
-
- blue_scale = gtk_hscale_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 255, 0, 0, 0)));
- gtk_table_attach(GTK_TABLE(table), blue_scale, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
- gtk_scale_set_draw_value(GTK_SCALE(blue_scale), FALSE);
- gtk_scale_set_digits(GTK_SCALE(blue_scale), 3);
-
- hbuttonbox = gtk_hbutton_box_new();
- gtk_box_pack_start(GTK_BOX(vbox), hbuttonbox, FALSE, FALSE, 0);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
- gtk_box_set_spacing(GTK_BOX(hbuttonbox), 6);
-
- colorize_close = gtk_button_new_from_stock("gtk-close");
- gtk_container_add(GTK_CONTAINER(hbuttonbox), colorize_close);
- GTK_WIDGET_SET_FLAGS(colorize_close, GTK_CAN_DEFAULT);
-
- g_signal_connect((gpointer) red_scale, "value_changed",
- G_CALLBACK(on_red_scale_value_changed),
- NULL);
- g_signal_connect((gpointer) green_scale, "value_changed",
- G_CALLBACK(on_green_scale_value_changed),
- NULL);
- g_signal_connect((gpointer) blue_scale, "value_changed",
- G_CALLBACK(on_blue_scale_value_changed),
- NULL);
- g_signal_connect((gpointer) colorize_close, "clicked",
- G_CALLBACK(on_colorize_close_clicked),
- NULL);
-
- gtk_range_set_value(GTK_RANGE(red_scale), config.colorize_r);
- gtk_range_set_value(GTK_RANGE(green_scale), config.colorize_g);
- gtk_range_set_value(GTK_RANGE(blue_scale), config.colorize_b);
-
- gtk_widget_grab_default(colorize_close);
- gtk_widget_show_all(colorize_settings);
-}
-
-static void
-on_colorize_button_clicked(GtkButton *button, gpointer data)
-{
- if (colorize_settings)
- gtk_window_present(GTK_WINDOW(colorize_settings));
- else
- create_colorize_settings();
-}
+ {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"),
+ .cfg_type = VALUE_BOOLEAN, .cfg = & config.twoway_scroll, .callback = textbox_update_all}};
 
 void
 on_skin_view_drag_data_received(GtkWidget * widget,
@@ -506,12 +274,13 @@
 mcs_handle_t *db;
 gchar *path;
 
- if (!selection_data->data) {
+ if (! gtk_selection_data_get_data (selection_data))
+ {
 g_warning("DND data string is NULL");
 return;
 }
 
- path = (gchar *) selection_data->data;
+ path = (gchar *) gtk_selection_data_get_data (selection_data);
 
 /* FIXME: use a real URL validator/parser */
 
@@ -524,7 +293,7 @@
 }
 
 if (file_is_archive(path)) {
- if (!aud_active_skin_load(path))
+ if (! active_skin_load (path))
 return;
 skin_install_skin(path);
 skin_view_update ((GtkTreeView *) widget);
@@ -536,7 +305,16 @@
 }
 }
 
-GtkWidget* skins_configure(void) {
+static GtkWidget * config_window = NULL;
+
+void skins_configure (void)
+{
+ if (config_window)
+ {
+ gtk_window_present ((GtkWindow *) config_window);
+ return;
+ }
+
 GtkWidget *appearance_page_vbox;
 GtkWidget *vbox37;
 GtkWidget *vbox38;
@@ -544,7 +322,6 @@
 GtkWidget *alignment94;
 GtkWidget *hbox13;
 GtkWidget *label103;
- GtkWidget *colorspace_button;
 GtkWidget *alignment95;
 GtkWidget *skin_view_scrolled_window;
 
@@ -571,11 +348,6 @@
 gtk_label_set_use_markup (GTK_LABEL (label103), TRUE);
 gtk_misc_set_alignment (GTK_MISC (label103), 0, 0);
 
- colorspace_button = gtk_button_new_with_label (_("Color adjustment ..."));
- gtk_button_set_image ((GtkButton *) colorspace_button,
- gtk_image_new_from_stock (GTK_STOCK_COLOR_PICKER, GTK_ICON_SIZE_BUTTON));
- gtk_box_pack_start (GTK_BOX (hbox13), colorspace_button, FALSE, FALSE, 0);
-
 alignment95 = gtk_alignment_new (0.5, 0.5, 1, 1);
 gtk_box_pack_start (GTK_BOX (vbox38), alignment95, TRUE, TRUE, 0);
 gtk_widget_set_size_request (alignment95, -1, 172);
@@ -587,28 +359,47 @@
 gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (skin_view_scrolled_window), GTK_SHADOW_IN);
 
 skin_view = gtk_tree_view_new ();
+ skin_view_realize ((GtkTreeView *) skin_view);
+ skin_view_update ((GtkTreeView *) skin_view);
 gtk_container_add (GTK_CONTAINER (skin_view_scrolled_window), skin_view);
 gtk_widget_set_size_request (skin_view, -1, 100);
 
 aud_create_widgets(GTK_BOX(vbox37), appearance_misc_widgets, G_N_ELEMENTS(appearance_misc_widgets));
- gtk_widget_show_all(appearance_page_vbox);
-
-
- g_signal_connect(G_OBJECT(colorspace_button), "clicked",
- G_CALLBACK(on_colorize_button_clicked),
- NULL);
 
 g_signal_connect(skin_view, "drag-data-received",
 G_CALLBACK(on_skin_view_drag_data_received),
 NULL);
- aud_drag_dest_set(skin_view);
+ drag_dest_set(skin_view);
 
 g_signal_connect(mainwin, "drag-data-received",
 G_CALLBACK(mainwin_drag_data_received),
 skin_view);
- g_signal_connect_after(G_OBJECT(skin_view), "realize",
- G_CALLBACK(on_skin_view_realize),
- NULL);
 
- return appearance_page_vbox;
+ GtkWidget * hbox = gtk_hbox_new (FALSE, 6);
+ gtk_box_pack_start ((GtkBox *) appearance_page_vbox, hbox, FALSE, FALSE, 0);
+
+ GtkWidget * button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
+ g_signal_connect (button, "clicked", (GCallback) skins_configure_cleanup,
+ NULL);
+ gtk_widget_set_can_default (button, TRUE);
+ gtk_box_pack_end ((GtkBox *) hbox, button, FALSE, FALSE, 0);
+
+ config_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ g_signal_connect (config_window, "destroy", (GCallback)
+ gtk_widget_destroyed, & config_window);
+
+ gtk_window_set_type_hint ((GtkWindow *) config_window,
+ GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_window_set_title ((GtkWindow *) config_window, _("Interface Preferences"));
+ gtk_window_set_resizable ((GtkWindow *) config_window, FALSE);
+ gtk_container_set_border_width ((GtkContainer *) config_window, 6);
+
+ gtk_container_add ((GtkContainer *) config_window, appearance_page_vbox);
+ gtk_widget_show_all (config_window);
+}
+
+void skins_configure_cleanup (void)
+{
+ if (config_window)
+ gtk_widget_destroy (config_window);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/skins_cfg.h -> audacious-plugins-3.0.tar.gz/src/skins/skins_cfg.h Changed

@@ -21,40 +21,18 @@
 #ifndef SKINS_CFG_H
 #define SKINS_CFG_H
 
-#include <glib.h>
 #include <gtk/gtk.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
-
-
 typedef struct {
 gint player_x, player_y;
 gint equalizer_x, equalizer_y;
 gint playlist_x, playlist_y;
 gint playlist_width, playlist_height;
- gboolean scaled, autoscroll;
+ gboolean autoscroll;
 gboolean always_on_top, sticky;
- gfloat scale_factor;
- gboolean always_show_cb;
- gboolean close_dialog_open;
- gboolean close_dialog_add;
 gchar *skin;
- gchar *filesel_path;
 gboolean player_visible, equalizer_visible, playlist_visible;
 gboolean player_shaded, equalizer_shaded, playlist_shaded;
- gboolean player_visible_prev, equalizer_visible_prev, playlist_visible_prev;
- gboolean dim_titlebar;
- gboolean show_wm_decorations;
- gboolean easy_move;
- gboolean allow_broken_skins;
- gboolean disable_inline_gtk;
 gboolean analyzer_peaks;
 gboolean twoway_scroll;
 gint timer_mode;
@@ -64,16 +42,8 @@
 gint voiceprint_mode;
 gint vu_mode;
 gint analyzer_falloff, peaks_falloff;
- gint playlist_position;
- gint colorize_r; gint colorize_g; gint colorize_b;
- gboolean warn_about_win_visibility;
- gboolean warn_about_broken_gtk_engines;
 gboolean mainwin_use_bitmapfont;
- gboolean eq_scaled_linked;
- gboolean show_separator_in_pl;
 gchar *playlist_font, *mainwin_font;
- gboolean random_skin_on_play;
- gboolean no_confirm_playlist_delete;
 } skins_cfg_t;
 
 extern skins_cfg_t config;
@@ -83,7 +53,9 @@
 void skins_cfg_load();
 void skins_cfg_save();
 
-GtkWidget* skins_configure(void);
+void skins_configure (void);
+void skins_configure_cleanup (void);
+
 void on_skin_view_drag_data_received(GtkWidget * widget,
 GdkDragContext * context,
 gint x, gint y,

audacious-plugins-3.0.tar.gz/src/skins/surface.c Added

@@ -0,0 +1,69 @@
+/*
+ * surface.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 <gdk/gdk.h>
+
+#include "surface.h"
+
+cairo_surface_t * surface_new (int w, int h)
+{
+ return cairo_image_surface_create (CAIRO_FORMAT_RGB24, w, h);
+}
+
+cairo_surface_t * surface_new_from_file (const gchar * name)
+{
+ GError * error = NULL;
+ GdkPixbuf * p = gdk_pixbuf_new_from_file (name, & error);
+ if (error)
+ fprintf (stderr, "Error loading %s: %s.\n", name, error->message);
+ if (! p)
+ return NULL;
+
+ cairo_surface_t * surface = surface_new (gdk_pixbuf_get_width (p),
+ gdk_pixbuf_get_height (p));
+ cairo_t * cr = cairo_create (surface);
+
+ gdk_cairo_set_source_pixbuf (cr, p, 0, 0);
+ cairo_paint (cr);
+
+ cairo_destroy (cr);
+ g_object_unref (p);
+ return surface;
+}
+
+guint32 surface_get_pixel (cairo_surface_t * s, gint x, gint y)
+{
+ g_return_val_if_fail (x >= 0 && x < cairo_image_surface_get_width (s), 0);
+ g_return_val_if_fail (y >= 0 && y < cairo_image_surface_get_height (s), 0);
+
+ return * ((guint32 *) (cairo_image_surface_get_data (s) +
+ cairo_image_surface_get_stride (s) * y) + x) & 0xffffff;
+}
+
+void surface_copy_rect (cairo_surface_t * a, gint ax, gint ay, gint w, gint h,
+ cairo_surface_t * b, gint bx, gint by)
+{
+ cairo_t * cr = cairo_create (b);
+ cairo_set_source_surface (cr, a, bx - ax, by - ay);
+ cairo_rectangle (cr, bx, by, w, h);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+}

audacious-plugins-3.0.tar.gz/src/skins/surface.h Added

@@ -0,0 +1,34 @@
+/*
+ * surface.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_SURFACE_H
+#define SKINS_SURFACE_H
+
+#include <glib.h>
+#include <cairo.h>
+
+cairo_surface_t * surface_new (gint w, gint h);
+cairo_surface_t * surface_new_from_file (const gchar * name);
+guint32 surface_get_pixel (cairo_surface_t * s, gint x, gint y);
+void surface_copy_rect (cairo_surface_t * a, gint ax, gint ay, gint w, gint h,
+ cairo_surface_t * b, gint bx, gint by);
+
+#endif

audacious-plugins-2.5.3.tar.gz/src/skins/ui/mainwin.ui -> audacious-plugins-3.0.tar.gz/src/skins/ui/mainwin.ui Changed

audacious-plugins-2.5.3.tar.gz/src/skins/ui_dock.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_dock.c Changed

@@ -1,383 +1,384 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2007 Audacious development team
+/*
+ * ui_dock.c
+ * Copyright 2011 John Lindgren
+ *
+ * This file is part of Audacious.
 *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP development team.
+ * 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.
 *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
+ * 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.
 *
- * 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.
+ * You should have received a copy of the GNU General Public License along with
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
 *
- * 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.
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+/*
+ * Rough outline
+ * =============
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses>.
+ * When moving a window:
+ * 1. If this is the main window, find (recursively) the windows docked to it.
+ * 2. Adjust the offsets to snap to another window (not docked) or a screen edge.
+ * 3. Move the docked windows by the same offsets.
 *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
+ * When resizing a window:
+ * 1. Find (recursively) the windows docked to the bottom edge of this one.
+ * If we are making the window shorter, exclude windows that are docked to
+ * the bottom of another window (not docked) to avoid overlap.
+ * 2. Move the docked windows by the difference in window height.
+ * 3. Repeat the process for windows docked to the right edge of this one.
 */
 
-#include "ui_dock.h"
-#include "skins_cfg.h"
-#include <gdk/gdk.h>
 #include <stdlib.h>
-#include <audacious/plugin.h>
-#include "ui_skinned_window.h"
 
-#include "platform/smartinclude.h"
-#include "util.h"
+#include "ui_dock.h"
 
 #define SNAP_DISTANCE 10
 
-static GList *dock_window_list = NULL;
-
-struct _DockedWindow {
- GtkWindow *w;
- gint offset_x, offset_y;
+enum {
+ DOCK_TYPE_LEFT = 1 << 0,
+ DOCK_TYPE_RIGHT = 1 << 1,
+ DOCK_TYPE_TOP = 1 << 2,
+ DOCK_TYPE_BOTTOM = 1 << 3
 };
 
-typedef struct _DockedWindow DockedWindow;
+#define DOCK_TYPE_ANY (DOCK_TYPE_LEFT | DOCK_TYPE_RIGHT | DOCK_TYPE_TOP | DOCK_TYPE_BOTTOM)
+
+typedef struct {
+ GtkWidget * window;
+ gint * x, * y;
+ gint w, h;
+ gboolean main;
+ gboolean docked;
+} DockWindow;
 
+static GSList * windows;
+static gint last_x, last_y;
 
-static gint
-docked_list_compare(DockedWindow * a, DockedWindow * b)
+static inline gint least_abs (gint a, gint b)
 {
- if (a->w == b->w)
- return 0;
- return 1;
+ return (abs (a) < abs (b)) ? a : b;
 }
 
-static void
-snap_edge(gint * x, gint * y, gint w, gint h, gint bx, gint by,
- gint bw, gint bh)
+static DockWindow * find_window (GSList * list, GtkWidget * window)
 {
- gint sd = SNAP_DISTANCE;
-
- if ((*x + w > bx - sd) && (*x + w < bx + sd) &&
- (*y > by - h - sd) && (*y < by + bh + sd)) {
- *x = bx - w;
- if ((*y > by - sd) && (*y < by + sd))
- *y = by;
- if ((*y + h > by + bh - sd) && (*y + h < by + bh + sd))
- *y = by + bh - h;
- }
- if ((*x > bx + bw - sd) && (*x < bx + bw + sd) &&
- (*y > by - h - sd) && (*y < by + bh + sd)) {
- *x = bx + bw;
- if ((*y > by - sd) && (*y < by + sd))
- *y = by;
- if ((*y + h > by + bh - sd) && (*y + h < by + bh + sd))
- *y = by + bh - h;
+ for (GSList * node = list; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ if (dw->window == window)
+ return dw;
 }
+
+ return NULL;
 }
 
-static void
-snap(gint * x, gint * y, gint w, gint h, gint bx, gint by, gint bw, gint bh)
+void dock_add_window (GtkWidget * window, gint * x, gint * y, gint w, gint h,
+ gboolean main)
 {
- snap_edge(x, y, w, h, bx, by, bw, bh);
- snap_edge(y, x, h, w, by, bx, bh, bw);
+ DockWindow * dw = g_slice_new0 (DockWindow);
+ dw->window = window;
+ dw->x = x;
+ dw->y = y;
+ dw->w = w;
+ dw->h = h;
+ dw->main = main;
+
+ windows = g_slist_prepend (windows, dw);
 }
 
-static void
-calc_snap_offset(GList * dlist, GList * wlist, gint x, gint y,
- gint * off_x, gint * off_y)
+void dock_remove_window (GtkWidget * window)
 {
- gint nx, ny, nw, nh, sx, sy, sw, sh;
- GtkWindow *w;
- GList *dnode, *wnode;
- DockedWindow temp, *dw;
-
- *off_x = 0;
- *off_y = 0;
-
- /*
- * FIXME: Why not break out of the loop when we find someting
- * to snap to?
- */
- for (dnode = dlist; dnode; dnode = g_list_next(dnode)) {
- dw = dnode->data;
- gtk_window_get_size(dw->w, &nw, &nh);
-
- nx = dw->offset_x + *off_x + x;
- ny = dw->offset_y + *off_y + y;
-
- /* Snap to screen edges */
- if (abs(nx) < SNAP_DISTANCE)
- *off_x -= nx;
- if (abs(ny) < SNAP_DISTANCE)
- *off_y -= ny;
- if (abs(nx + nw - gdk_screen_width()) < SNAP_DISTANCE)
- *off_x -= nx + nw - gdk_screen_width();
- if (abs(ny + nh - gdk_screen_height()) < SNAP_DISTANCE)
- *off_y -= ny + nh - gdk_screen_height();
-
- /* Snap to other windows */
- for (wnode = wlist; wnode; wnode = g_list_next(wnode)) {
- temp.w = wnode->data;
- if (g_list_find_custom
- (dlist, &temp, (GCompareFunc) docked_list_compare))
- /* These windows are already docked */
- continue;
+ DockWindow * dw = find_window (windows, window);
+ g_return_if_fail (dw);
 
- w = GTK_WINDOW(wnode->data);
- gtk_window_get_position(w, &sx, &sy);
- gtk_window_get_size(w, &sw, &sh);
-
- nx = dw->offset_x + *off_x + x;
- ny = dw->offset_y + *off_y + y;
-
- snap(&nx, &ny, nw, nh, sx, sy, sw, sh);
+ windows = g_slist_remove (windows, dw);
+ g_slice_free (DockWindow, dw);
+}
 
- *off_x += nx - (dw->offset_x + *off_x + x);
- *off_y += ny - (dw->offset_y + *off_y + y);
- }
+static void dock_sync (void)
+{
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ gtk_window_get_position ((GtkWindow *) dw->window, dw->x, dw->y);
 }
 }
 
+static void clear_docked (void)
+{
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ dw->docked = FALSE;
+ }
+}
 
-static gboolean
-is_docked(gint a_x, gint a_y, gint a_w, gint a_h,
- gint b_x, gint b_y, gint b_w, gint b_h)
+static gboolean is_docked (DockWindow * dw, DockWindow * base, gint type)
 {
- if (((a_x == b_x + b_w) || (a_x + a_w == b_x)) &&
- (b_y + b_h >= a_y) && (b_y <= a_y + a_h))
+ if ((type & DOCK_TYPE_LEFT) && * dw->x + dw->w == * base->x)
 return TRUE;
-
- if (((a_y == b_y + b_h) || (a_y + a_h == b_y)) &&
- (b_x >= a_x - b_w) && (b_x <= a_x + a_w))
+ if ((type & DOCK_TYPE_RIGHT) && * dw->x == * base->x + base->w)
+ return TRUE;
+ if ((type & DOCK_TYPE_TOP) && * dw->y + dw->h == * base->y)
+ return TRUE;
+ if ((type & DOCK_TYPE_BOTTOM) && * dw->y == * base->y + base->h)
 return TRUE;
 
 return FALSE;
 }
 
-/*
- * Builds a list of all windows that are docked to the window "w".
- * Recursively adds all windows that are docked to the windows that are
- * docked to "w" and so on...
- * FIXME: init_off_? ?
- */
-
-static GList *
-get_docked_list(GList * dlist, GList * wlist, GtkWindow * w,
- gint init_off_x, gint init_off_y)
+static void find_docked (DockWindow * base, gint type)
 {
- GList *node;
- DockedWindow *dwin, temp;
- gint w_x, w_y, w_width, w_height;
- gint t_x, t_y, t_width, t_height;
-
-
- gtk_window_get_position(w, &w_x, &w_y);
- gtk_window_get_size(w, &w_width, &w_height);
- if (!dlist) {
- dwin = g_new0(DockedWindow, 1);
- dwin->w = w;
- dlist = g_list_append(dlist, dwin);
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ if (dw->docked || dw == base)
+ continue;
+
+ dw->docked = is_docked (dw, base, type);
+ if (dw->docked)
+ find_docked (dw, type);
 }
+}
 
- for (node = wlist; node; node = g_list_next(node)) {
- temp.w = node->data;
- if (g_list_find_custom
- (dlist, &temp, (GCompareFunc) docked_list_compare))
- continue;
+static void invert_docked (void)
+{
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ dw->docked = ! dw->docked;
+ }
+}
 
- gtk_window_get_position(GTK_WINDOW(node->data), &t_x, &t_y);
- gtk_window_get_size(GTK_WINDOW(node->data), &t_width, &t_height);
- if (is_docked
- (w_x, w_y, w_width, w_height, t_x, t_y, t_width, t_height)) {
- dwin = g_new0(DockedWindow, 1);
- dwin->w = node->data;
+void dock_set_size (GtkWidget * window, gint w, gint h)
+{
+ DockWindow * base = find_window (windows, window);
+ g_return_if_fail (base);
+
+ dock_sync ();
+
+ if (h != base->h)
+ {
+ /* 1. Find the windows docked below this one. */
+
+ clear_docked ();
+ find_docked (base, DOCK_TYPE_BOTTOM);
+
+ if (h < base->h)
+ {
+ /* 2. This part is tricky. By flipping the docked flag on all the
+ windows, we consider the windows not docked to this one as a
+ docked group. We then add (recursively) any other windows
+ docked to these ones (i.e. the windows docked to these *and*
+ to the one being shortened). The one being shortened must be
+ excluded from the search. Since at this point it is marked as
+ docked, it is excluded automatically. Finally, flipping the
+ docked flag back again leaves us with only the windows docked
+ to the one being shortened and not to any others. */
+
+ invert_docked ();
+
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ if (! dw->docked || dw == base)
+ continue;
+
+ find_docked (dw, DOCK_TYPE_BOTTOM);
+ }
+
+ invert_docked ();
+ }
 
- dwin->offset_x = t_x - w_x + init_off_x;
- dwin->offset_y = t_y - w_y + init_off_y;
+ /* 3. Move the docked windows by the difference in height. */
 
- dlist = g_list_append(dlist, dwin);
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ if (! dw->docked)
+ continue;
 
- dlist =
- get_docked_list(dlist, wlist, dwin->w, dwin->offset_x,
- dwin->offset_y);
+ * dw->y += h - base->h;
+ gtk_window_move ((GtkWindow *) dw->window, * dw->x, * dw->y);
 }
 }
- return dlist;
-}
 
-static void
-free_docked_list(GList * dlist)
-{
- GList *node;
+ if (w != base->w)
+ {
+ /* 4. Repeat the process for the windows docked to the right. */
 
- for (node = dlist; node; node = g_list_next(node))
- g_free(node->data);
- g_list_free(dlist);
-}
+ clear_docked ();
+ find_docked (base, DOCK_TYPE_RIGHT);
 
-static void move_skinned_window (SkinnedWindow * window, int x, int y)
-{
- gtk_window_move (GTK_WINDOW (window), x, y);
+ if (w < base->w)
+ {
+ invert_docked ();
 
- *(window->x) = x;
- *(window->y) = y;
-}
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ if (! dw->docked || dw == base)
+ continue;
 
-static void
-docked_list_move(GList * list, gint x, gint y)
-{
- GList *node;
- DockedWindow *dw;
+ find_docked (dw, DOCK_TYPE_RIGHT);
+ }
+
+ invert_docked ();
+ }
+
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ if (! dw->docked)
+ continue;
 
- for (node = list; node; node = g_list_next(node)) {
- dw = node->data;
- move_skinned_window (SKINNED_WINDOW (dw->w), x + dw->offset_x,
- y + dw->offset_y);
+ * dw->x += w - base->w;
+ gtk_window_move ((GtkWindow *) dw->window, * dw->x, * dw->y);
+ }
 }
-}
 
-static void move_attached (GtkWindow * window, GList * * others, int offset) {
- int x, y, width, height, x2, y2;
- GList * move, * scan, * next;
- gtk_window_get_position (window, & x, & y);
- gtk_window_get_size (window, & width, & height);
- move = 0;
- for (scan = * others; scan; scan = next) {
- next = g_list_next (scan);
- gtk_window_get_position (scan->data, & x2, & y2);
- if (y2 == y + height) {
- * others = g_list_remove_link (* others, scan);
- move = g_list_concat (move, scan);
- }
- }
- for (; move; move = g_list_delete_link (move, move))
- move_attached (move->data, others, offset);
- move_skinned_window (SKINNED_WINDOW (window), x, y + offset);
+ /* 5. Set the window size. (The actual resize is done by the caller.) */
+
+ base->w = w;
+ base->h = h;
 }
 
-void dock_shade(GList *window_list, GtkWindow *window, gint new_height)
+void dock_move_start (GtkWidget * window, gint x, gint y)
 {
- gint x, y, width, height, x2, y2;
- GList *move, *others, *scan, *next;
-
- gtk_window_get_size(window, &width, &height);
-
- if (! config.show_wm_decorations) {
- gtk_window_get_position (window, & x, & y);
- others = g_list_copy (window_list);
- others = g_list_remove (others, window);
- move = 0;
- for (scan = others; scan; scan = next) {
- next = g_list_next (scan);
- gtk_window_get_position (scan->data, & x2, & y2);
- if (y2 == y + height) {
- others = g_list_remove_link (others, scan);
- move = g_list_concat (move, scan);
- }
- }
- for (; move; move = g_list_delete_link (move, move))
- move_attached (move->data, & others, new_height - height);
- g_list_free (others);
- }
-
- resize_window((GtkWidget *) window, width, new_height);
+ DockWindow * dw = find_window (windows, window);
+ g_return_if_fail (dw);
+
+ dock_sync ();
+
+ last_x = x;
+ last_y = y;
+
+ /* 1. If this is the main window, find the windows docked to it. */
+
+ clear_docked ();
+ dw->docked = TRUE;
+ if (dw->main)
+ find_docked (dw, DOCK_TYPE_ANY);
 }
 
-void
-dock_move_press(GList * window_list, GtkWindow * w,
- GdkEventButton * event, gboolean move_list)
+void dock_move (gint x, gint y)
 {
- gint mx, my;
- DockedWindow *dwin;
+ gint hori, vert;
 
- if (config.show_wm_decorations)
+ if (x == last_x && y == last_y)
 return;
 
- gtk_window_present(w);
- mx = event->x;
- my = event->y;
- g_object_set_data(G_OBJECT(w), "move_offset_x", GINT_TO_POINTER(mx));
- g_object_set_data(G_OBJECT(w), "move_offset_y", GINT_TO_POINTER(my));
- if (move_list)
- g_object_set_data(G_OBJECT(w), "docked_list",
- get_docked_list(NULL, window_list, w, 0, 0));
- else {
- dwin = g_new0(DockedWindow, 1);
- dwin->w = w;
- g_object_set_data(G_OBJECT(w), "docked_list",
- g_list_append(NULL, dwin));
+ /* 2. Nominally move all the windows in the group the requested distance,
+ and update the reference point. */
+
+ hori = x - last_x;
+ vert = y - last_y;
+
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ if (! dw->docked)
+ continue;
+
+ * dw->x += hori;
+ * dw->y += vert;
 }
- g_object_set_data(G_OBJECT(w), "window_list", window_list);
- g_object_set_data(G_OBJECT(w), "is_moving", GINT_TO_POINTER(1));
-}
 
-void
-dock_move_motion(GtkWindow * w, GdkEventMotion * event)
-{
- gint offset_x, offset_y, x, y;
- GList *dlist;
- GList *window_list;
+ last_x = x;
+ last_y = y;
 
- if (!g_object_get_data(G_OBJECT(w), "is_moving"))
- return;
 
- offset_x =
- GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "move_offset_x"));
- offset_y =
- GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "move_offset_y"));
- dlist = g_object_get_data(G_OBJECT(w), "docked_list");
- window_list = g_object_get_data(G_OBJECT(w), "window_list");
+ /* 3. Find the least snap distance we must move so that
+ (a) a window in the group is touching a screen edge or
+ (b) a window in the group is touching a window not in the group. */
 
- x = event->x_root - offset_x;
- y = event->y_root - offset_y;
+ hori = SNAP_DISTANCE + 1;
+ vert = SNAP_DISTANCE + 1;
 
- calc_snap_offset(dlist, window_list, x, y, &offset_x, &offset_y);
- x += offset_x;
- y += offset_y;
+ GdkScreen * screen = gdk_screen_get_default ();
+ gint monitors = gdk_screen_get_n_monitors (screen);
 
- docked_list_move(dlist, x, y);
-}
+ for (gint m = 0; m < monitors; m ++)
+ {
+ GdkRectangle rect;
+ gdk_screen_get_monitor_geometry (screen, m, & rect);
 
-void
-dock_move_release(GtkWindow * w)
-{
- GList *dlist;
- g_object_set_data(G_OBJECT(w), "is_moving", NULL);
- g_object_set_data(G_OBJECT(w), "move_offset_x", NULL);
- g_object_set_data(G_OBJECT(w), "move_offset_y", NULL);
- if ((dlist = g_object_get_data(G_OBJECT(w), "docked_list")) != NULL)
- free_docked_list(dlist);
- g_object_set_data(G_OBJECT(w), "docked_list", NULL);
- g_object_set_data(G_OBJECT(w), "window_list", NULL);
-}
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ if (! dw->docked)
+ continue;
 
-gboolean
-dock_is_moving(GtkWindow * w)
-{
- if (g_object_get_data(G_OBJECT(w), "is_moving"))
- return TRUE;
- return FALSE;
-}
+ /* We only test half the combinations here, as it is not very
+ helpful to have e.g. the right edge of a window touching the left
+ edge of a monitor (think about it). */
 
-void dock_window_set_decorated (GtkWidget * widget)
-{
- if (config.show_wm_decorations)
- dock_window_list = g_list_remove (dock_window_list, widget);
- else
- dock_window_list = g_list_append (dock_window_list, widget);
+ hori = least_abs (hori, rect.x - * dw->x);
+ hori = least_abs (hori, (rect.x + rect.width) - (* dw->x + dw->w));
+ vert = least_abs (vert, rect.y - * dw->y);
+ vert = least_abs (vert, (rect.y + rect.height) - (* dw->y + dw->h));
+ }
+ }
 
- gtk_window_set_decorated (GTK_WINDOW (widget), config.show_wm_decorations);
-}
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ if (! dw->docked)
+ continue;
 
-GList *
-get_dock_window_list() {
- return dock_window_list;
-}
+ for (GSList * node2 = windows; node2; node2 = node2->next)
+ {
+ DockWindow * dw2 = node2->data;
+ if (dw2->docked)
+ continue;
 
-void clear_dock_window_list (void)
-{
- g_list_free (dock_window_list);
- dock_window_list = NULL;
+ hori = least_abs (hori, * dw2->x - * dw->x);
+ hori = least_abs (hori, * dw2->x - (* dw->x + dw->w));
+ hori = least_abs (hori, (* dw2->x + dw2->w) - * dw->x);
+ hori = least_abs (hori, (* dw2->x + dw2->w) - (* dw->x + dw->w));
+ vert = least_abs (vert, * dw2->y - * dw->y);
+ vert = least_abs (vert, * dw2->y - (* dw->y + dw->h));
+ vert = least_abs (vert, (* dw2->y + dw2->h) - * dw->y);
+ vert = least_abs (vert, (* dw2->y + dw2->h) - (* dw->y + dw->h));
+ }
+ }
+
+ /* 4. If the snap distances are within range, nominally move all the windows
+ in the group, and update the reference point again. */
+
+ if (abs (hori) > SNAP_DISTANCE)
+ hori = 0;
+ if (abs (vert) > SNAP_DISTANCE)
+ vert = 0;
+
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ if (! dw->docked)
+ continue;
+
+ * dw->x += hori;
+ * dw->y += vert;
+ }
+
+ last_x += hori;
+ last_y += vert;
+
+ /* 5. Really move the windows. */
+
+ for (GSList * node = windows; node; node = node->next)
+ {
+ DockWindow * dw = node->data;
+ if (! dw->docked)
+ continue;
+
+ gtk_window_move ((GtkWindow *) dw->window, * dw->x, * dw->y);
+ }
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_dock.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_dock.h Changed

@@ -1,46 +1,36 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2007 Audacious development team
+/*
+ * ui_dock.h
+ * Copyright 2011 John Lindgren
 *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP development team.
+ * This file is part of Audacious.
 *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
+ * 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.
 *
- * 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.
+ * 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.
 *
- * 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
 *
- * 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.
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
 */
 
-#ifndef DOCK_H
-#define DOCK_H
+#ifndef SKINS_UI_DOCK_H
+#define SKINS_UI_DOCK_H
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
-void dock_set_uposition(GtkWindow * widget, gint x, gint y);
-void dock_move_press(GList * window_list, GtkWindow * w,
- GdkEventButton * event, gboolean move_list);
-void dock_move_motion(GtkWindow * w, GdkEventMotion * event);
-void dock_move_release(GtkWindow * w);
-void dock_get_widget_pos(GtkWindow * w, gint * x, gint * y);
-gboolean dock_is_moving(GtkWindow * w);
-void dock_shade(GList *window_list, GtkWindow *widget, gint new_height);
+void dock_add_window (GtkWidget * window, gint * x, gint * y, gint w, gint h,
+ gboolean main);
+void dock_remove_window (GtkWidget * window);
 
-void dock_window_set_decorated (GtkWidget * widget);
+void dock_set_size (GtkWidget * window, gint w, gint h);
 
-GList *get_dock_window_list();
-void clear_dock_window_list (void);
+void dock_move_start (GtkWidget * window, gint x, gint y);
+void dock_move (gint x, gint y);
 
 #endif

audacious-plugins-2.5.3.tar.gz/src/skins/ui_equalizer.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_equalizer.c Changed

@@ -1,5 +1,5 @@
 /* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2007 Audacious development team.
+ * Copyright (C) 2005-2011 Audacious development team.
 *
 * Based on BMP:
 * Copyright (C) 2003-2004 BMP development team.
@@ -23,51 +23,45 @@
 * Audacious or using our public API to be a derived work.
 */
 
-/*#define AUD_DEBUG*/
-
-#include "config.h"
-
-#include "ui_equalizer.h"
-
-#include <glib.h>
 #include <gtk/gtk.h>
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
-
-#include "platform/smartinclude.h"
-#include "ui_skin.h"
-#include "ui_manager.h"
-#include "actions-equalizer.h"
-#include "util.h"
-#include "ui_main.h"
-#include "ui_playlist.h"
 
 #include <audacious/audconfig.h>
 #include <audacious/drct.h>
+#include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
 #include <audacious/playlist.h>
 #include <libaudcore/hook.h>
 #include <libaudgui/libaudgui-gtk.h>
 
-#include "images/audacious_eq.xpm"
-
-#include "ui_dock.h"
-#include "ui_skinned_window.h"
+#include "actions-equalizer.h"
+#include "config.h"
+#include "skins_cfg.h"
+#include "ui_equalizer.h"
+#include "ui_main.h"
+#include "ui_manager.h"
 #include "ui_skinned_button.h"
-#include "ui_skinned_horizontal_slider.h"
-#include "ui_skinned_equalizer_slider.h"
 #include "ui_skinned_equalizer_graph.h"
-#include "skins_cfg.h"
+#include "ui_skinned_equalizer_slider.h"
+#include "ui_skinned_horizontal_slider.h"
+#include "ui_skinned_window.h"
+#include "util.h"
+
+#include "images/audacious_eq.xpm"
 
 enum PresetViewCols {
 PRESET_VIEW_COL_NAME,
 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);
+static void equalizerwin_set_band (gint band, gfloat value);
+
 GtkWidget *equalizerwin;
-GtkWidget *equalizerwin_graph;
+static GtkWidget *equalizerwin_graph;
 
 static GtkWidget *equalizerwin_load_window = NULL;
 static GtkWidget *equalizerwin_load_auto_window = NULL;
@@ -88,15 +82,7 @@
 
 static GList *equalizer_presets = NULL, *equalizer_auto_presets = NULL;
 
-EqualizerPreset *
-equalizer_preset_new(const gchar * name)
-{
- EqualizerPreset *preset = g_new0(EqualizerPreset, 1);
- preset->name = g_strdup(name);
- return preset;
-}
-
-void
+static void
 equalizer_preset_free(EqualizerPreset * preset)
 {
 if (!preset)
@@ -108,69 +94,13 @@
 
 void equalizerwin_set_shape (void)
 {
- if (config.show_wm_decorations)
- gtk_widget_shape_combine_mask (equalizerwin, 0, 0, 0);
- else
- gtk_widget_shape_combine_mask (equalizerwin, skin_get_mask
- (aud_active_skin, config.equalizer_shaded ? SKIN_MASK_EQ_SHADE :
- SKIN_MASK_EQ), 0, 0);
-}
+ gint id = config.equalizer_shaded ? SKIN_MASK_EQ_SHADE : SKIN_MASK_EQ;
 
-void
-equalizerwin_set_scaled(gboolean ds)
-{
- gint height;
- GList * list;
- SkinnedWindow * skinned;
- GtkFixed * fixed;
- GtkFixedChild * child;
-
- if (config.equalizer_shaded)
- height = 14;
- else
- height = 116;
-
- if (config.scaled)
- resize_window(equalizerwin, 275 * config.scale_factor, height *
- config.scale_factor);
- else
- resize_window(equalizerwin, 275, height);
-
- skinned = (SkinnedWindow *) equalizerwin;
- fixed = (GtkFixed *) skinned->normal;
-
- for (list = fixed->children; list; list = list->next)
- {
- child = (GtkFixedChild *) list->data;
- g_signal_emit_by_name ((GObject *) child->widget, "toggle-scaled");
- }
-
- fixed = (GtkFixed *) skinned->shaded;
-
- for (list = fixed->children; list; list = list->next)
- {
- child = (GtkFixedChild *) list->data;
- g_signal_emit_by_name ((GObject *) child->widget, "toggle-scaled");
- }
-
- equalizerwin_set_shape ();
-}
-
-void
-equalizerwin_set_shade_menu_cb(gboolean shaded)
-{
- config.equalizer_shaded = shaded;
- ui_skinned_window_set_shade(equalizerwin, shaded);
-
- if (shaded) {
- dock_shade(get_dock_window_list(), GTK_WINDOW(equalizerwin),
- 14 * EQUALIZER_SCALE_FACTOR);
- } else {
- dock_shade(get_dock_window_list(), GTK_WINDOW(equalizerwin),
- 116 * EQUALIZER_SCALE_FACTOR);
- }
-
- equalizerwin_set_shape ();
+#ifdef MASK_IS_REGION
+ gtk_widget_shape_combine_region (equalizerwin, active_skin->masks[id]);
+#else
+ gtk_widget_shape_combine_mask (equalizerwin, active_skin->masks[id], 0, 0);
+#endif
 }
 
 static void
@@ -212,39 +142,27 @@
 equalizerwin_set_band(i, preset->bands[i]);
 }
 
-static void
-equalizerwin_on_pushed(void)
-{
- equalizerwin_activate(!aud_cfg->equalizer_active);
-}
+static void eq_on_cb (GtkWidget * button, GdkEventButton * event)
+ {equalizerwin_activate (button_get_active (button)); }
+static void eq_auto_cb (GtkWidget * button, GdkEventButton * event)
+ {aud_cfg->equalizer_autoload = button_get_active (equalizerwin_auto); }
 
 static void
 update_from_config(void *unused1, void *unused2)
 {
 gint i;
 
- ui_skinned_button_set_inside(equalizerwin_on, aud_cfg->equalizer_active);
- ui_skinned_equalizer_slider_set_position(equalizerwin_preamp, aud_cfg->equalizer_preamp);
+ 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++)
- ui_skinned_equalizer_slider_set_position(equalizerwin_bands[i], aud_cfg->equalizer_bands[i]);
- ui_skinned_equalizer_graph_update(equalizerwin_graph);
+ eq_slider_set_val (equalizerwin_bands[i], aud_cfg->equalizer_bands[i]);
+ eq_graph_update (equalizerwin_graph);
 }
 
-static void
-equalizerwin_presets_pushed(void)
+static void eq_presets_cb (GtkWidget * button, GdkEventButton * event)
 {
- GdkModifierType modmask;
- gint x, y;
-
- gdk_window_get_pointer(NULL, &x, &y, &modmask);
- ui_popup_menu_show(UI_MENU_EQUALIZER_PRESET, x, y, FALSE, FALSE, 1,
- GDK_CURRENT_TIME);
-}
-
-static void
-equalizerwin_auto_pushed(void)
-{
- aud_cfg->equalizer_autoload = UI_SKINNED_BUTTON(equalizerwin_auto)->inside;
+ ui_popup_menu_show (UI_MENU_EQUALIZER_PRESET, event->x_root, event->y_root,
+ FALSE, FALSE, event->button, event->time);
 }
 
 static GtkWidget * get_eq_effects_menu (void)
@@ -257,15 +175,13 @@
 return menu;
 }
 
-gboolean
+static gboolean
 equalizerwin_press(GtkWidget * widget, GdkEventButton * event,
 gpointer callback_data)
 {
 if (event->button == 1 && event->type == GDK_2BUTTON_PRESS
 && event->y < 14) {
 equalizerwin_set_shade(!config.equalizer_shaded);
- if (dock_is_moving(GTK_WINDOW(equalizerwin)))
- dock_move_release(GTK_WINDOW(equalizerwin));
 return TRUE;
 }
 
@@ -287,189 +203,179 @@
 
 static gboolean equalizerwin_delete(GtkWidget *widget, void *data)
 {
- if (config.show_wm_decorations)
- equalizerwin_show(FALSE);
- else
- aud_drct_quit();
-
+ aud_drct_quit ();
 return TRUE;
 }
 
-gint
-equalizerwin_volume_frame_cb(gint pos)
+static void eqwin_volume_set_knob (void)
 {
- if (equalizerwin_volume) {
- gint x;
- if (pos < 32)
- x = 1;
- else if (pos < 63)
- x = 4;
- else
- x = 7;
+ gint pos = hslider_get_pos (equalizerwin_volume);
 
- UI_SKINNED_HORIZONTAL_SLIDER(equalizerwin_volume)->knob_nx = x;
- UI_SKINNED_HORIZONTAL_SLIDER(equalizerwin_volume)->knob_px = x;
- }
- return 1;
+ gint x;
+ if (pos < 32)
+ x = 1;
+ else if (pos < 63)
+ x = 4;
+ else
+ x = 7;
+
+ hslider_set_knob (equalizerwin_volume, x, 30, x, 30);
 }
 
-static void
-equalizerwin_volume_motion_cb(GtkWidget *widget, gint pos)
+void equalizerwin_set_volume_slider (gint percent)
 {
- gint v = (gint) rint(pos * 100 / 94.0);
+ hslider_set_pos (equalizerwin_volume, (percent * 94 + 50) / 100);
+ eqwin_volume_set_knob ();
+}
+
+static void eqwin_volume_motion_cb (void)
+{
+ eqwin_volume_set_knob ();
+ gint pos = hslider_get_pos (equalizerwin_volume);
+ gint v = (pos * 100 + 47) / 94;
+
 mainwin_adjust_volume_motion(v);
 mainwin_set_volume_slider(v);
 }
 
-static void
-equalizerwin_volume_release_cb(GtkWidget *widget, gint pos)
+static void eqwin_volume_release_cb (void)
 {
+ eqwin_volume_set_knob ();
 mainwin_adjust_volume_release();
 }
 
-static gint
-equalizerwin_balance_frame_cb(gint pos)
+static void eqwin_balance_set_knob (void)
 {
- if (equalizerwin_balance) {
- gint x;
- if (pos < 13)
- x = 11;
- else if (pos < 26)
- x = 14;
- else
- x = 17;
+ gint pos = hslider_get_pos (equalizerwin_balance);
 
- UI_SKINNED_HORIZONTAL_SLIDER(equalizerwin_balance)->knob_nx = x;
- UI_SKINNED_HORIZONTAL_SLIDER(equalizerwin_balance)->knob_px = x;
- }
+ gint x;
+ if (pos < 13)
+ x = 11;
+ else if (pos < 26)
+ x = 14;
+ else
+ x = 17;
 
- return 1;
+ hslider_set_knob (equalizerwin_balance, x, 30, x, 30);
 }
 
-static void
-equalizerwin_balance_motion_cb(GtkWidget *widget, gint pos)
+void equalizerwin_set_balance_slider (gint percent)
 {
- gint b;
+ if (percent > 0)
+ hslider_set_pos (equalizerwin_balance, 19 + (percent * 19 + 50) / 100);
+ else
+ hslider_set_pos (equalizerwin_balance, 19 + (percent * 19 - 50) / 100);
+
+ eqwin_balance_set_knob ();
+}
+
+static void eqwin_balance_motion_cb (void)
+{
+ eqwin_balance_set_knob ();
+ gint pos = hslider_get_pos (equalizerwin_balance);
 pos = MIN(pos, 38); /* The skin uses a even number of pixels
 for the balance-slider *sigh* */
- b = (gint) rint((pos - 19) * 100 / 19.0);
+ gint b;
+ if (pos > 19)
+ b = ((pos - 19) * 100 + 9) / 19;
+ else
+ b = ((pos - 19) * 100 - 9) / 19;
+
 mainwin_adjust_balance_motion(b);
 mainwin_set_balance_slider(b);
 }
 
-static void
-equalizerwin_balance_release_cb(GtkWidget *widget, gint pos)
+static void eqwin_balance_release_cb (void)
 {
+ eqwin_balance_set_knob ();
 mainwin_adjust_balance_release();
 }
 
-void
-equalizerwin_set_balance_slider(gint percent)
-{
- ui_skinned_horizontal_slider_set_position(equalizerwin_balance,
- (gint) rint((percent * 19 / 100.0) + 19));
-}
-
-void
-equalizerwin_set_volume_slider(gint percent)
-{
- ui_skinned_horizontal_slider_set_position(equalizerwin_volume,
- (gint) rint(percent * 94 / 100.0));
-}
-
 static void
 equalizerwin_create_widgets(void)
 {
- gint i;
+ 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_on_release (equalizerwin_on, eq_on_cb);
 
- equalizerwin_on = ui_skinned_button_new();
- ui_skinned_toggle_button_setup(equalizerwin_on, SKINNED_WINDOW(equalizerwin)->normal,
- 14, 18, 25, 12, 10, 119, 128, 119, 69, 119, 187, 119, SKIN_EQMAIN);
- g_signal_connect(equalizerwin_on, "clicked", equalizerwin_on_pushed, NULL);
- ui_skinned_button_set_inside (equalizerwin_on, aud_cfg->equalizer_active);
-
- equalizerwin_auto = ui_skinned_button_new();
- ui_skinned_toggle_button_setup(equalizerwin_auto, SKINNED_WINDOW(equalizerwin)->normal,
- 39, 18, 33, 12, 35, 119, 153, 119, 94, 119, 212, 119, SKIN_EQMAIN);
- g_signal_connect(equalizerwin_auto, "clicked", equalizerwin_auto_pushed, NULL);
- ui_skinned_button_set_inside(equalizerwin_auto, aud_cfg->equalizer_autoload);
-
- equalizerwin_presets = ui_skinned_button_new();
- ui_skinned_push_button_setup(equalizerwin_presets, SKINNED_WINDOW(equalizerwin)->normal,
- 217, 18, 44, 12, 224, 164, 224, 176, SKIN_EQMAIN);
- g_signal_connect(equalizerwin_presets, "clicked", equalizerwin_presets_pushed, NULL );
-
- equalizerwin_close = ui_skinned_button_new();
- ui_skinned_push_button_setup(equalizerwin_close, SKINNED_WINDOW(equalizerwin)->normal,
- 264, 3, 9, 9, 0, 116, 0, 125, SKIN_EQMAIN);
- g_signal_connect(equalizerwin_close, "clicked", equalizerwin_close_cb, NULL );
-
- equalizerwin_shade = ui_skinned_button_new();
- ui_skinned_push_button_setup(equalizerwin_shade, SKINNED_WINDOW(equalizerwin)->normal,
- 254, 3, 9, 9, 254, 137, 1, 38, SKIN_EQMAIN);
- ui_skinned_button_set_skin_index2(equalizerwin_shade, SKIN_EQ_EX);
- g_signal_connect(equalizerwin_shade, "clicked", equalizerwin_shade_toggle, NULL );
-
- equalizerwin_shaded_close = ui_skinned_button_new();
- ui_skinned_push_button_setup(equalizerwin_shaded_close, SKINNED_WINDOW(equalizerwin)->shaded,
- 264, 3, 9, 9, 11, 38, 11, 47, SKIN_EQ_EX);
- g_signal_connect(equalizerwin_shaded_close, "clicked", equalizerwin_close_cb, NULL );
-
- equalizerwin_shaded_shade = ui_skinned_button_new();
- ui_skinned_push_button_setup(equalizerwin_shaded_shade, SKINNED_WINDOW(equalizerwin)->shaded,
- 254, 3, 9, 9, 254, 3, 1, 47, SKIN_EQ_EX);
- g_signal_connect(equalizerwin_shaded_shade, "clicked", equalizerwin_shade_toggle, NULL );
-
- equalizerwin_graph = ui_skinned_equalizer_graph_new(SKINNED_WINDOW(equalizerwin)->normal, 86, 17);
-
- equalizerwin_preamp = ui_skinned_equalizer_slider_new(SKINNED_WINDOW(equalizerwin)->normal, 21, 38);
- ui_skinned_equalizer_slider_set_position (equalizerwin_preamp,
- aud_cfg->equalizer_preamp);
-
- for (i = 0; i < AUD_EQUALIZER_NBANDS; i++) {
- equalizerwin_bands[i] =
- ui_skinned_equalizer_slider_new(SKINNED_WINDOW(equalizerwin)->normal, 78 + (i * 18), 38);
- ui_skinned_equalizer_slider_set_position (equalizerwin_bands [i],
- aud_cfg->equalizer_bands [i]);
- }
+ 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_on_release (equalizerwin_auto, eq_auto_cb);
+
+ equalizerwin_presets = button_new (44, 12, 224, 164, 224, 176, SKIN_EQMAIN, SKIN_EQMAIN);
+ window_put_widget (equalizerwin, FALSE, equalizerwin_presets, 217, 18);
+ button_on_release (equalizerwin_presets, eq_presets_cb);
+
+ equalizerwin_close = button_new (9, 9, 0, 116, 0, 125, SKIN_EQMAIN, SKIN_EQMAIN);
+ window_put_widget (equalizerwin, FALSE, equalizerwin_close, 264, 3);
+ button_on_release (equalizerwin_close, (ButtonCB) equalizerwin_close_cb);
+
+ equalizerwin_shade = button_new (9, 9, 254, 137, 1, 38, SKIN_EQMAIN, SKIN_EQ_EX);
+ window_put_widget (equalizerwin, FALSE, equalizerwin_shade, 254, 3);
+ button_on_release (equalizerwin_shade, (ButtonCB) equalizerwin_shade_toggle);
+
+ equalizerwin_shaded_close = button_new (9, 9, 11, 38, 11, 47, SKIN_EQ_EX, SKIN_EQ_EX);
+ window_put_widget (equalizerwin, TRUE, equalizerwin_shaded_close, 264, 3);
+ button_on_release (equalizerwin_shaded_close, (ButtonCB) equalizerwin_close_cb);
 
- equalizerwin_volume =
- ui_skinned_horizontal_slider_new(SKINNED_WINDOW(equalizerwin)->shaded,
- 61, 4, 97, 8, 1, 30, 1, 30, 3, 7, 4, 61, 0, 94,
- equalizerwin_volume_frame_cb, SKIN_EQ_EX);
- g_signal_connect(equalizerwin_volume, "motion", G_CALLBACK(equalizerwin_volume_motion_cb), NULL);
- g_signal_connect(equalizerwin_volume, "release", G_CALLBACK(equalizerwin_volume_release_cb), NULL);
+ equalizerwin_shaded_shade = button_new (9, 9, 254, 3, 1, 47, SKIN_EQ_EX, SKIN_EQ_EX);
+ window_put_widget (equalizerwin, TRUE, equalizerwin_shaded_shade, 254, 3);
+ button_on_release (equalizerwin_shaded_shade, (ButtonCB) equalizerwin_shade_toggle);
 
+ equalizerwin_graph = eq_graph_new ();
+ window_put_widget (equalizerwin, FALSE, equalizerwin_graph, 86, 17);
 
- equalizerwin_balance =
- ui_skinned_horizontal_slider_new(SKINNED_WINDOW(equalizerwin)->shaded,
- 164, 4, 42, 8, 11, 30, 11, 30, 3, 7, 4, 164, 0, 39,
- equalizerwin_balance_frame_cb, SKIN_EQ_EX);
- g_signal_connect(equalizerwin_balance, "motion", G_CALLBACK(equalizerwin_balance_motion_cb), NULL);
- g_signal_connect(equalizerwin_balance, "release", G_CALLBACK(equalizerwin_balance_release_cb), NULL);
+ 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);
+
+ 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")};
+
+ 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]);
+ }
+
+ equalizerwin_volume = hslider_new (0, 94, SKIN_EQ_EX, 97, 8, 61, 4, 3, 7, 1, 30, 1, 30);
+ window_put_widget (equalizerwin, TRUE, equalizerwin_volume, 61, 4);
+ hslider_on_motion (equalizerwin_volume, eqwin_volume_motion_cb);
+ hslider_on_release (equalizerwin_volume, eqwin_volume_release_cb);
+
+ equalizerwin_balance = hslider_new (0, 39, SKIN_EQ_EX, 42, 8, 164, 4, 3, 7, 11, 30, 11, 30);
+ window_put_widget (equalizerwin, TRUE, equalizerwin_balance, 164, 4);
+ hslider_on_motion (equalizerwin_balance, eqwin_balance_motion_cb);
+ hslider_on_release (equalizerwin_balance, eqwin_balance_release_cb);
 }
 
+static void eq_win_draw (GtkWidget * window, cairo_t * cr)
+{
+ gint height = config.equalizer_shaded ? 14 : 116;
+
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 0, 0, 0, 275, height);
+
+ if (config.equalizer_shaded)
+ skin_draw_pixbuf (cr, SKIN_EQ_EX, 0, 0, 0, 0, 275, 14);
+ else
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 134, 0, 0, 275, 14);
+}
 
 static void
 equalizerwin_create_window(void)
 {
 GdkPixbuf *icon;
- gint width, height;
 
- width = 275;
- height = config.equalizer_shaded ? 14 : 116;
+ equalizerwin = window_new (& config.equalizer_x, & config.equalizer_y, 275,
+ config.equalizer_shaded ? 14 : 116, FALSE, config.equalizer_shaded,
+ eq_win_draw);
 
- equalizerwin = ui_skinned_window_new("equalizer", &config.equalizer_x, &config.equalizer_y);
 gtk_window_set_title(GTK_WINDOW(equalizerwin), _("Audacious Equalizer"));
- gtk_window_set_role(GTK_WINDOW(equalizerwin), "equalizer");
- gtk_window_set_resizable(GTK_WINDOW(equalizerwin), FALSE);
-
- if (config.scaled && config.eq_scaled_linked) {
- width *= config.scale_factor;
- height *= config.scale_factor;
- }
-
- gtk_widget_set_size_request(equalizerwin, width, height);
 
 /* this will hide only mainwin. it's annoying! yaz */
 gtk_window_set_transient_for(GTK_WINDOW(equalizerwin),
@@ -501,55 +407,33 @@
 gtk_window_add_accel_group( GTK_WINDOW(equalizerwin) , ui_manager_get_accel_group() );
 
 equalizerwin_create_widgets();
+ window_show_all (equalizerwin);
 
 hook_associate("equalizer changed", (HookFunction) update_from_config, NULL);
-
- gtk_widget_show_all (((SkinnedWindow *) equalizerwin)->normal);
- gtk_widget_show_all (((SkinnedWindow *) equalizerwin)->shaded);
 }
 
-static void equalizerwin_real_show (void)
+static void equalizerwin_real_show (gboolean show)
 {
- if (config.scaled && config.eq_scaled_linked)
- gtk_widget_set_size_request(equalizerwin, 275 * config.scale_factor,
- ((config.equalizer_shaded ? 14 : 116) * config.scale_factor));
+ if (show)
+ gtk_window_present ((GtkWindow *) equalizerwin);
 else
- gtk_widget_set_size_request(equalizerwin, 275,
- (config.equalizer_shaded ? 14 : 116));
- ui_skinned_button_set_inside(mainwin_eq, TRUE);
-
- gtk_window_present(GTK_WINDOW(equalizerwin));
-}
-
-static void equalizerwin_real_hide (void)
-{
- gtk_widget_hide(equalizerwin);
- ui_skinned_button_set_inside(mainwin_eq, FALSE);
+ gtk_widget_hide (equalizerwin);
 }
 
-void
-equalizerwin_show(gboolean show)
+void equalizerwin_show (gboolean show)
 {
- GtkAction * a;
-
- a = gtk_action_group_get_action (toggleaction_group_others, "show equalizer");
+ GtkAction * a = gtk_action_group_get_action (toggleaction_group_others,
+ "show equalizer");
 
 if (a && gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (a)) != show)
 gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (a), show);
 else
 {
- if (show != config.equalizer_visible) {
- config.equalizer_visible = show;
- config.equalizer_visible_prev = !show;
- aud_cfg->equalizer_visible = show;
- }
-
- if (show)
- equalizerwin_real_show ();
- else
- equalizerwin_real_hide ();
+ config.equalizer_visible = show;
+ button_set_active (mainwin_eq, show);
+ equalizerwin_real_show (config.player_visible && show);
 }
- }
+}
 
 static EqualizerPreset *
 equalizerwin_find_preset(GList * list, const gchar * name)
@@ -1023,14 +907,13 @@
 gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
 button_cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- g_signal_connect_swapped(button_cancel, "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(*window));
+ g_signal_connect_swapped (button_cancel, "clicked", (GCallback)
+ gtk_widget_destroy, * window);
 gtk_box_pack_start(GTK_BOX(bbox), button_cancel, TRUE, TRUE, 0);
 
 button_action = gtk_button_new_from_stock(action_name);
 g_signal_connect(button_action, "clicked", G_CALLBACK(action_func), view);
- GTK_WIDGET_SET_FLAGS(button_action, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default (button_action, TRUE);
 
 if (select_row_func)
 g_signal_connect(view, "row-activated", G_CALLBACK(select_row_func), NULL);
@@ -1046,32 +929,28 @@
 return *window;
 }
 
-void
-equalizerwin_set_preamp(gfloat preamp)
+static void equalizerwin_set_preamp (gfloat preamp)
 {
- ui_skinned_equalizer_slider_set_position(equalizerwin_preamp, preamp);
+ eq_slider_set_val (equalizerwin_preamp, preamp);
 equalizerwin_eq_changed();
 }
 
-void
-equalizerwin_set_band(gint band, gfloat value)
+static void equalizerwin_set_band (gint band, gfloat value)
 {
 g_return_if_fail(band >= 0 && band < AUD_EQUALIZER_NBANDS);
- ui_skinned_equalizer_slider_set_position(equalizerwin_bands[band], value);
+ eq_slider_set_val (equalizerwin_bands[band], value);
 equalizerwin_eq_changed();
 }
 
-gfloat
-equalizerwin_get_preamp(void)
+static gfloat equalizerwin_get_preamp (void)
 {
- return ui_skinned_equalizer_slider_get_position(equalizerwin_preamp);
+ return eq_slider_get_val (equalizerwin_preamp);
 }
 
-gfloat
-equalizerwin_get_band(gint band)
+static gfloat equalizerwin_get_band (gint band)
 {
 g_return_val_if_fail(band >= 0 && band < AUD_EQUALIZER_NBANDS, 0.0);
- return ui_skinned_equalizer_slider_get_position(equalizerwin_bands[band]);
+ return eq_slider_get_val (equalizerwin_bands[band]);
 }
 
 void
@@ -1290,7 +1169,7 @@
 equalizerwin_create_list_window(equalizer_presets,
 Q_("Delete preset"),
 &equalizerwin_delete_window,
- GTK_SELECTION_EXTENDED, NULL,
+ GTK_SELECTION_MULTIPLE, NULL,
 GTK_STOCK_DELETE,
 G_CALLBACK(equalizerwin_delete_delete),
 NULL);
@@ -1307,17 +1186,16 @@
 equalizerwin_create_list_window(equalizer_auto_presets,
 Q_("Delete auto-preset"),
 &equalizerwin_delete_auto_window,
- GTK_SELECTION_EXTENDED, NULL,
+ GTK_SELECTION_MULTIPLE, NULL,
 GTK_STOCK_DELETE,
 G_CALLBACK(equalizerwin_delete_auto_delete),
 NULL);
 }
 
-void
-equalizerwin_activate(gboolean active)
+static void equalizerwin_activate (gboolean active)
 {
 aud_cfg->equalizer_active = active;
- ui_skinned_button_set_inside(equalizerwin_on, active);
+ button_set_active (equalizerwin_on, active);
 equalizerwin_eq_changed();
 }
 
@@ -1371,7 +1249,9 @@
 || position == -1)
 return;
 
- load_auto_preset (aud_playlist_entry_get_filename (playlist, position));
+ gchar * filename = aud_playlist_entry_get_filename (playlist, position);
+ load_auto_preset (filename);
+ g_free (filename);
 }
 
 void eq_init_hooks (void)
@@ -1391,3 +1271,17 @@
 {
 hook_dissociate ("playlist position", position_cb);
 }
+
+void action_show_equalizer (GtkToggleAction * action)
+{
+ equalizerwin_show (gtk_toggle_action_get_active (action));
+}
+
+void action_roll_up_equalizer (GtkToggleAction * action)
+{
+ config.equalizer_shaded = gtk_toggle_action_get_active (action);
+
+ window_set_shaded (equalizerwin, config.equalizer_shaded);
+ window_set_size (equalizerwin, 275, config.equalizer_shaded ? 14 : 116);
+ equalizerwin_set_shape ();
+}

audacious-plugins-2.5.3.tar.gz/src/skins/ui_equalizer.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_equalizer.h Changed

@@ -23,48 +23,21 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_EQUALIZER_H
-#define AUDACIOUS_UI_EQUALIZER_H
+#ifndef SKINS_UI_EQUALIZER_H
+#define SKINS_UI_EQUALIZER_H
 
-#include <glib.h>
 #include <gtk/gtk.h>
-#include "skins_cfg.h"
-
-#define EQUALIZER_SCALED (config.scaled && config.eq_scaled_linked)
-#define EQUALIZER_SCALE_FACTOR (EQUALIZER_SCALED ? config.scale_factor : 1)
-
-#define EQUALIZER_HEIGHT ((config.equalizer_shaded ? 14 : 116) * (EQUALIZER_SCALE_FACTOR))
-#define EQUALIZER_WIDTH (275 * EQUALIZER_SCALE_FACTOR)
-
-#define EQUALIZER_DEFAULT_POS_X 20
-#define EQUALIZER_DEFAULT_POS_Y 136
-
-#define EQUALIZER_DEFAULT_DIR_PRESET "dir_default.preset"
-#define EQUALIZER_DEFAULT_PRESET_EXT "preset"
 
 void eq_init_hooks (void);
 void eq_end_hooks (void);
 
 void equalizerwin_set_shape (void);
-void equalizerwin_set_scaled(gboolean ds);
-void equalizerwin_set_shade_menu_cb(gboolean shaded);
-void draw_equalizer_window(gboolean force);
 void equalizerwin_create(void);
 void equalizerwin_show(gboolean show);
 void equalizerwin_set_volume_slider(gint percent);
 void equalizerwin_set_balance_slider(gint percent);
 void equalizerwin_eq_changed(void);
-void equalizerwin_set_preamp(gfloat preamp);
-void equalizerwin_set_band(gint band, gfloat value);
-gfloat equalizerwin_get_preamp(void);
-gfloat equalizerwin_get_band(gint band);
-
-gboolean equalizerwin_has_focus(void);
 
 extern GtkWidget *equalizerwin;
-extern GtkWidget *equalizerwin_graph;
-extern gboolean equalizerwin_focus;
-
-void equalizerwin_activate(gboolean active);
 
-#endif /* AUDACIOUS_UI_EQUALIZER_H */
+#endif /* SKINS_UI_EQUALIZER_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_hints.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_hints.c Changed

audacious-plugins-2.5.3.tar.gz/src/skins/ui_hints.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_hints.h Changed

audacious-plugins-2.5.3.tar.gz/src/skins/ui_main.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_main.c Changed

@@ -1,5 +1,5 @@
 /* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2006 Audacious development team.
+ * Copyright (C) 2005-2011 Audacious development team.
 *
 * BMP - Cross-platform multimedia player
 * Copyright (C) 2003-2004 BMP development team.
@@ -23,61 +23,42 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkmessagedialog.h>
-
 #include <math.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/time.h>
-#include <sys/types.h>
+
+#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>
-#include <audacious/playlist.h>
+#include <audacious/misc.h>
 #include <libaudcore/audstrings.h>
 #include <libaudcore/hook.h>
 #include <libaudgui/libaudgui.h>
 
-/* GDK including */
-#include "platform/smartinclude.h"
-
-#if defined(USE_REGEX_ONIGURUMA)
-#include <onigposix.h>
-#elif defined(USE_REGEX_PCRE)
-#include <pcreposix.h>
-#else
-#include <regex.h>
-#endif
-
+#include "actions-mainwin.h"
 #include "actions-playlist.h"
+#include "config.h"
+#include "dnd.h"
+#include "skins_cfg.h"
+#include "ui_equalizer.h"
+#include "ui_hints.h"
 #include "ui_main.h"
-#include "ui_dock.h"
-#include "actions-mainwin.h"
+#include "ui_main_evlisteners.h"
 #include "ui_manager.h"
-#include "ui_equalizer.h"
 #include "ui_playlist.h"
-#include "ui_hints.h"
-#include "dnd.h"
-#include "plugin.h"
-#include "ui_skinned_window.h"
 #include "ui_skinned_button.h"
-#include "ui_skinned_textbox.h"
-#include "ui_skinned_number.h"
 #include "ui_skinned_horizontal_slider.h"
 #include "ui_skinned_menurow.h"
-#include "ui_skinned_playstatus.h"
 #include "ui_skinned_monostereo.h"
+#include "ui_skinned_number.h"
 #include "ui_skinned_playlist.h"
-#include "ui_main_evlisteners.h"
-#include "skins_cfg.h"
+#include "ui_skinned_playstatus.h"
+#include "ui_skinned_textbox.h"
+#include "ui_skinned_window.h"
+#include "ui_vis.h"
 #include "util.h"
 
 #define SEEK_THRESHOLD 200 /* milliseconds */
@@ -89,8 +70,6 @@
 static gint balance;
 static gint seek_source = 0, seek_start, seek_time;
 
-static GtkWidget *mainwin_jtt = NULL;
-
 static GtkWidget *mainwin_menubtn, *mainwin_minimize, *mainwin_shade, *mainwin_close;
 static GtkWidget *mainwin_shaded_menubtn, *mainwin_shaded_minimize, *mainwin_shaded_shade, *mainwin_shaded_close;
 
@@ -130,39 +109,31 @@
 static int ab_position_a = -1;
 static int ab_position_b = -1;
 
-static void mainwin_refresh_visible(void);
-
-static void set_timer_mode_menu_cb(TimerMode mode);
-static void set_timer_mode(TimerMode mode);
 static void change_timer_mode(void);
+static void mainwin_position_motion_cb (void);
+static void mainwin_position_release_cb (void);
+static void mainwin_set_volume_diff (gint diff);
 
-static void mainwin_position_motion_cb(GtkWidget *widget, gint pos);
-static void mainwin_position_release_cb(GtkWidget *widget, gint pos);
-
-static void set_scaled(gboolean scaled);
-static void mainwin_eq_pushed(gboolean toggled);
-static void mainwin_pl_pushed(gboolean toggled);
-
-static void
-mainwin_set_title_scroll(gboolean scroll)
-{
- config.autoscroll = scroll;
- ui_skinned_textbox_set_scroll(mainwin_info, config.autoscroll);
-}
-
-void mainwin_set_sticky (gboolean sticky)
+static void format_time (gchar buf[7], gint time, gint length)
 {
- gtk_toggle_action_set_active ((GtkToggleAction *)
- gtk_action_group_get_action (toggleaction_group_others,
- "view put on all workspaces"), sticky);
-}
+ if (config.timer_mode == TIMER_REMAINING && length > 0)
+ {
+ if (length - time < 60000) /* " -0:SS" */
+ snprintf (buf, 7, " -0:%02d", (length - time) / 1000);
+ else if (length - time < 6000000) /* "-MM:SS" */
+ snprintf (buf, 7, "%3d:%02d", (time - length) / 60000, (length - time) / 1000 % 60);
+ else /* "-HH:MM" */
+ snprintf (buf, 7, "%3d:%02d", (time - length) / 3600000, (length - time) / 60000 % 60);
+ }
+ else
+ {
+ if (time < 60000000) /* MMM:SS */
+ snprintf (buf, 7, "%3d:%02d", time / 60000, time / 1000 % 60);
+ else /* HHH:MM */
+ snprintf (buf, 7, "%3d:%02d", time / 3600000, time / 60000 % 60);
+ }
 
-void
-mainwin_set_always_on_top(gboolean always)
-{
- GtkAction *action = gtk_action_group_get_action(toggleaction_group_others,
- "view always on top");
- gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(action) , always );
+ buf[3] = 0;
 }
 
 static void
@@ -175,60 +146,16 @@
 
 void mainwin_set_shape (void)
 {
- if (config.show_wm_decorations)
- gtk_widget_shape_combine_mask (mainwin, 0, 0, 0);
- else
- gtk_widget_shape_combine_mask (mainwin, skin_get_mask (aud_active_skin,
- config.player_shaded ? SKIN_MASK_MAIN_SHADE : SKIN_MASK_MAIN), 0, 0);
-}
-
-static void
-mainwin_set_shade_menu_cb(gboolean shaded)
-{
- config.player_shaded = shaded;
- ui_skinned_window_set_shade(mainwin, shaded);
-
- if (shaded) {
- dock_shade(get_dock_window_list(), GTK_WINDOW(mainwin),
- MAINWIN_SHADED_HEIGHT * MAINWIN_SCALE_FACTOR);
- } else {
- gint height = !aud_active_skin->properties.mainwin_height ? MAINWIN_HEIGHT :
- aud_active_skin->properties.mainwin_height;
-
- dock_shade(get_dock_window_list(), GTK_WINDOW(mainwin), height * MAINWIN_SCALE_FACTOR);
- }
-
- mainwin_set_shape ();
-}
-
-static void
-mainwin_vis_set_afalloff(FalloffSpeed speed)
-{
- config.analyzer_falloff = speed;
-}
-
-static void
-mainwin_vis_set_pfalloff(FalloffSpeed speed)
-{
- config.peaks_falloff = speed;
-}
-
-static void
-mainwin_vis_set_analyzer_mode(AnalyzerMode mode)
-{
- config.analyzer_mode = mode;
-}
+ gint id = config.player_shaded ? SKIN_MASK_MAIN_SHADE : SKIN_MASK_MAIN;
 
-static void
-mainwin_vis_set_analyzer_type(AnalyzerType mode)
-{
- config.analyzer_type = mode;
- ui_vis_clear_data (mainwin_vis);
- ui_svis_clear_data (mainwin_svis);
+#ifdef MASK_IS_REGION
+ gtk_widget_shape_combine_region (mainwin, active_skin->masks[id]);
+#else
+ gtk_widget_shape_combine_mask (mainwin, active_skin->masks[id], 0, 0);
+#endif
 }
 
-void
-mainwin_vis_set_type(VisType mode)
+static void mainwin_vis_set_type (VisType mode)
 {
 GtkAction *action;
 
@@ -257,27 +184,15 @@
 }
 
 static void
-mainwin_vis_set_type_menu_cb(VisType mode)
-{
- config.vis_type = mode;
- ui_vis_clear_data (mainwin_vis);
- ui_svis_clear_data (mainwin_svis);
-
- start_stop_visual (FALSE);
-}
-
-static void
 mainwin_menubtn_cb(void)
 {
 gint x, y;
 gtk_window_get_position(GTK_WINDOW(mainwin), &x, &y);
- ui_popup_menu_show(UI_MENU_MAIN, x + 6 * MAINWIN_SCALE_FACTOR, y +
- MAINWIN_SHADED_HEIGHT * MAINWIN_SCALE_FACTOR, FALSE, FALSE, 1,
- GDK_CURRENT_TIME);
+ ui_popup_menu_show (UI_MENU_MAIN, x + 6, y + MAINWIN_SHADED_HEIGHT, FALSE,
+ FALSE, 1, GDK_CURRENT_TIME);
 }
 
-void
-mainwin_minimize_cb(void)
+static void mainwin_minimize_cb (void)
 {
 if (!mainwin)
 return;
@@ -291,8 +206,7 @@
 mainwin_set_shade(!config.player_shaded);
 }
 
-gboolean
-mainwin_vis_cb(GtkWidget *widget, GdkEventButton *event)
+static gboolean mainwin_vis_cb (GtkWidget * widget, GdkEventButton * event)
 {
 if (event->button == 1) {
 config.vis_type++;
@@ -325,31 +239,30 @@
 
 static gchar *mainwin_tb_old_text = NULL;
 
-void
-mainwin_lock_info_text(const gchar * text)
+static void mainwin_lock_info_text (const gchar * text)
 {
 if (mainwin_info_text_locked != TRUE)
- mainwin_tb_old_text = g_strdup(aud_active_skin->properties.mainwin_othertext_is_status ?
- UI_SKINNED_TEXTBOX(mainwin_othertext)->text : UI_SKINNED_TEXTBOX(mainwin_info)->text);
+ mainwin_tb_old_text = g_strdup
+ (active_skin->properties.mainwin_othertext_is_status ?
+ textbox_get_text (mainwin_othertext) : textbox_get_text (mainwin_info));
 
 mainwin_info_text_locked = TRUE;
- if (aud_active_skin->properties.mainwin_othertext_is_status)
- ui_skinned_textbox_set_text(mainwin_othertext, text);
+ if (active_skin->properties.mainwin_othertext_is_status)
+ textbox_set_text (mainwin_othertext, text);
 else
- ui_skinned_textbox_set_text(mainwin_info, text);
+ textbox_set_text (mainwin_info, text);
 }
 
-void
-mainwin_release_info_text(void)
+static void mainwin_release_info_text (void)
 {
 mainwin_info_text_locked = FALSE;
 
 if (mainwin_tb_old_text != NULL)
 {
- if (aud_active_skin->properties.mainwin_othertext_is_status)
- ui_skinned_textbox_set_text(mainwin_othertext, mainwin_tb_old_text);
+ if (active_skin->properties.mainwin_othertext_is_status)
+ textbox_set_text (mainwin_othertext, mainwin_tb_old_text);
 else
- ui_skinned_textbox_set_text(mainwin_info, mainwin_tb_old_text);
+ textbox_set_text (mainwin_info, mainwin_tb_old_text);
 g_free(mainwin_tb_old_text);
 mainwin_tb_old_text = NULL;
 }
@@ -371,7 +284,7 @@
 return FALSE;
 }
 
-static void show_status_message (const gchar * message)
+void mainwin_show_status_message (const gchar * message)
 {
 if (! status_message_enabled)
 return;
@@ -400,7 +313,7 @@
 g_free(mainwin_title_text);
 
 mainwin_release_info_text ();
- ui_skinned_textbox_set_text (mainwin_info, title != NULL ? title : "");
+ textbox_set_text (mainwin_info, title != NULL ? title : "");
 }
 
 static void show_hide_widget (GtkWidget * widget, char show)
@@ -415,153 +328,89 @@
 mainwin_refresh_visible(void)
 {
 show_hide_widget (mainwin_info,
- aud_active_skin->properties.mainwin_text_visible);
+ active_skin->properties.mainwin_text_visible);
 show_hide_widget (mainwin_vis,
- aud_active_skin->properties.mainwin_vis_visible);
+ active_skin->properties.mainwin_vis_visible);
 show_hide_widget (mainwin_menurow,
- aud_active_skin->properties.mainwin_menurow_visible);
+ active_skin->properties.mainwin_menurow_visible);
 show_hide_widget (mainwin_rate_text,
- ! aud_active_skin->properties.mainwin_othertext);
+ active_skin->properties.mainwin_streaminfo_visible);
 show_hide_widget (mainwin_freq_text,
- ! aud_active_skin->properties.mainwin_othertext);
+ active_skin->properties.mainwin_streaminfo_visible);
 show_hide_widget (mainwin_monostereo,
- ! aud_active_skin->properties.mainwin_othertext);
+ active_skin->properties.mainwin_streaminfo_visible);
 show_hide_widget (mainwin_othertext,
- aud_active_skin->properties.mainwin_othertext &&
- aud_active_skin->properties.mainwin_othertext_visible);
+ active_skin->properties.mainwin_othertext_visible);
 }
 
 void
 mainwin_refresh_hints(void)
 {
- /* positioning and size attributes */
- if (aud_active_skin->properties.mainwin_vis_x && aud_active_skin->properties.mainwin_vis_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_vis), aud_active_skin->properties.mainwin_vis_x,
- aud_active_skin->properties.mainwin_vis_y);
-
- if (aud_active_skin->properties.mainwin_vis_width)
- gtk_widget_set_size_request(mainwin_vis, aud_active_skin->properties.mainwin_vis_width * MAINWIN_SCALE_FACTOR,
- UI_VIS(mainwin_vis)->height* MAINWIN_SCALE_FACTOR);
-
- if (aud_active_skin->properties.mainwin_text_x && aud_active_skin->properties.mainwin_text_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_info), aud_active_skin->properties.mainwin_text_x,
- aud_active_skin->properties.mainwin_text_y);
-
- if (aud_active_skin->properties.mainwin_text_width) {
- UI_SKINNED_TEXTBOX(mainwin_info)->width = aud_active_skin->properties.mainwin_text_width;
- gtk_widget_set_size_request (mainwin_info, aud_active_skin->properties.
- mainwin_text_width * MAINWIN_SCALE_FACTOR, -1);
- }
-
- if (aud_active_skin->properties.mainwin_infobar_x && aud_active_skin->properties.mainwin_infobar_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_othertext), aud_active_skin->properties.mainwin_infobar_x,
- aud_active_skin->properties.mainwin_infobar_y);
-
- if (aud_active_skin->properties.mainwin_number_0_x && aud_active_skin->properties.mainwin_number_0_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_minus_num), aud_active_skin->properties.mainwin_number_0_x,
- aud_active_skin->properties.mainwin_number_0_y);
-
- if (aud_active_skin->properties.mainwin_number_1_x && aud_active_skin->properties.mainwin_number_1_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_10min_num), aud_active_skin->properties.mainwin_number_1_x,
- aud_active_skin->properties.mainwin_number_1_y);
-
- if (aud_active_skin->properties.mainwin_number_2_x && aud_active_skin->properties.mainwin_number_2_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_min_num), aud_active_skin->properties.mainwin_number_2_x,
- aud_active_skin->properties.mainwin_number_2_y);
-
- if (aud_active_skin->properties.mainwin_number_3_x && aud_active_skin->properties.mainwin_number_3_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_10sec_num), aud_active_skin->properties.mainwin_number_3_x,
- aud_active_skin->properties.mainwin_number_3_y);
-
- if (aud_active_skin->properties.mainwin_number_4_x && aud_active_skin->properties.mainwin_number_4_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_sec_num), aud_active_skin->properties.mainwin_number_4_x,
- aud_active_skin->properties.mainwin_number_4_y);
-
- if (aud_active_skin->properties.mainwin_playstatus_x && aud_active_skin->properties.mainwin_playstatus_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), mainwin_playstatus, aud_active_skin->properties.mainwin_playstatus_x,
- aud_active_skin->properties.mainwin_playstatus_y);
-
- if (aud_active_skin->properties.mainwin_volume_x && aud_active_skin->properties.mainwin_volume_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_volume), aud_active_skin->properties.mainwin_volume_x,
- aud_active_skin->properties.mainwin_volume_y);
-
- if (aud_active_skin->properties.mainwin_balance_x && aud_active_skin->properties.mainwin_balance_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_balance), aud_active_skin->properties.mainwin_balance_x,
- aud_active_skin->properties.mainwin_balance_y);
-
- if (aud_active_skin->properties.mainwin_position_x && aud_active_skin->properties.mainwin_position_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_position), aud_active_skin->properties.mainwin_position_x,
- aud_active_skin->properties.mainwin_position_y);
-
- if (aud_active_skin->properties.mainwin_previous_x && aud_active_skin->properties.mainwin_previous_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), mainwin_rew, aud_active_skin->properties.mainwin_previous_x,
- aud_active_skin->properties.mainwin_previous_y);
-
- if (aud_active_skin->properties.mainwin_play_x && aud_active_skin->properties.mainwin_play_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_play), aud_active_skin->properties.mainwin_play_x,
- aud_active_skin->properties.mainwin_play_y);
-
- if (aud_active_skin->properties.mainwin_pause_x && aud_active_skin->properties.mainwin_pause_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_pause), aud_active_skin->properties.mainwin_pause_x,
- aud_active_skin->properties.mainwin_pause_y);
-
- if (aud_active_skin->properties.mainwin_stop_x && aud_active_skin->properties.mainwin_stop_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_stop), aud_active_skin->properties.mainwin_stop_x,
- aud_active_skin->properties.mainwin_stop_y);
-
- if (aud_active_skin->properties.mainwin_next_x && aud_active_skin->properties.mainwin_next_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_fwd), aud_active_skin->properties.mainwin_next_x,
- aud_active_skin->properties.mainwin_next_y);
-
- if (aud_active_skin->properties.mainwin_eject_x && aud_active_skin->properties.mainwin_eject_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_eject), aud_active_skin->properties.mainwin_eject_x,
- aud_active_skin->properties.mainwin_eject_y);
-
- if (aud_active_skin->properties.mainwin_eqbutton_x && aud_active_skin->properties.mainwin_eqbutton_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_eq), aud_active_skin->properties.mainwin_eqbutton_x,
- aud_active_skin->properties.mainwin_eqbutton_y);
-
- if (aud_active_skin->properties.mainwin_plbutton_x && aud_active_skin->properties.mainwin_plbutton_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_pl), aud_active_skin->properties.mainwin_plbutton_x,
- aud_active_skin->properties.mainwin_plbutton_y);
-
- if (aud_active_skin->properties.mainwin_shuffle_x && aud_active_skin->properties.mainwin_shuffle_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_shuffle), aud_active_skin->properties.mainwin_shuffle_x,
- aud_active_skin->properties.mainwin_shuffle_y);
-
- if (aud_active_skin->properties.mainwin_repeat_x && aud_active_skin->properties.mainwin_repeat_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_repeat), aud_active_skin->properties.mainwin_repeat_x,
- aud_active_skin->properties.mainwin_repeat_y);
-
- if (aud_active_skin->properties.mainwin_about_x && aud_active_skin->properties.mainwin_about_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_about), aud_active_skin->properties.mainwin_about_x,
- aud_active_skin->properties.mainwin_about_y);
-
- if (aud_active_skin->properties.mainwin_minimize_x && aud_active_skin->properties.mainwin_minimize_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_minimize), config.player_shaded ? 244 : aud_active_skin->properties.mainwin_minimize_x,
- config.player_shaded ? 3 : aud_active_skin->properties.mainwin_minimize_y);
-
- if (aud_active_skin->properties.mainwin_shade_x && aud_active_skin->properties.mainwin_shade_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_shade), aud_active_skin->properties.mainwin_shade_x,
- aud_active_skin->properties.mainwin_shade_y);
-
- if (aud_active_skin->properties.mainwin_close_x && aud_active_skin->properties.mainwin_close_y)
- gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->normal), GTK_WIDGET(mainwin_close), aud_active_skin->properties.mainwin_close_x,
- aud_active_skin->properties.mainwin_close_y);
+ SkinProperties * p = & active_skin->properties;
+
+ if (p->mainwin_vis_x && p->mainwin_vis_y)
+ window_move_widget (mainwin, FALSE, mainwin_vis, p->mainwin_vis_x, p->mainwin_vis_y);
+ if (p->mainwin_text_x && p->mainwin_text_y)
+ window_move_widget (mainwin, FALSE, mainwin_info, p->mainwin_text_x, p->mainwin_text_y);
+ if (p->mainwin_text_width)
+ textbox_set_width (mainwin_info, p->mainwin_text_width);
+ if (p->mainwin_infobar_x && p->mainwin_infobar_y)
+ window_move_widget (mainwin, FALSE, mainwin_othertext, p->mainwin_infobar_x, p->mainwin_infobar_y);
+ if (p->mainwin_number_0_x && p->mainwin_number_0_y)
+ window_move_widget (mainwin, FALSE, mainwin_minus_num, p->mainwin_number_0_x, p->mainwin_number_0_y);
+ if (p->mainwin_number_1_x && p->mainwin_number_1_y)
+ window_move_widget (mainwin, FALSE, mainwin_10min_num, p->mainwin_number_1_x, p->mainwin_number_1_y);
+ if (p->mainwin_number_2_x && p->mainwin_number_2_y)
+ window_move_widget (mainwin, FALSE, mainwin_min_num, p->mainwin_number_2_x, p->mainwin_number_2_y);
+ if (p->mainwin_number_3_x && p->mainwin_number_3_y)
+ window_move_widget (mainwin, FALSE, mainwin_10sec_num, p->mainwin_number_3_x, p->mainwin_number_3_y);
+ if (p->mainwin_number_4_x && p->mainwin_number_4_y)
+ window_move_widget (mainwin, FALSE, mainwin_sec_num, p->mainwin_number_4_x, p->mainwin_number_4_y);
+ if (p->mainwin_playstatus_x && p->mainwin_playstatus_y)
+ window_move_widget (mainwin, FALSE, mainwin_playstatus, p->mainwin_playstatus_x, p->mainwin_playstatus_y);
+ if (p->mainwin_volume_x && p->mainwin_volume_y)
+ window_move_widget (mainwin, FALSE, mainwin_volume, p->mainwin_volume_x, p->mainwin_volume_y);
+ if (p->mainwin_balance_x && p->mainwin_balance_y)
+ window_move_widget (mainwin, FALSE, mainwin_balance, p->mainwin_balance_x, p->mainwin_balance_y);
+ if (p->mainwin_position_x && p->mainwin_position_y)
+ window_move_widget (mainwin, FALSE, mainwin_position, p->mainwin_position_x, p->mainwin_position_y);
+ if (p->mainwin_previous_x && p->mainwin_previous_y)
+ window_move_widget (mainwin, FALSE, mainwin_rew, p->mainwin_previous_x, p->mainwin_previous_y);
+ if (p->mainwin_play_x && p->mainwin_play_y)
+ window_move_widget (mainwin, FALSE, mainwin_play, p->mainwin_play_x, p->mainwin_play_y);
+ if (p->mainwin_pause_x && p->mainwin_pause_y)
+ window_move_widget (mainwin, FALSE, mainwin_pause, p->mainwin_pause_x, p->mainwin_pause_y);
+ if (p->mainwin_stop_x && p->mainwin_stop_y)
+ window_move_widget (mainwin, FALSE, mainwin_stop, p->mainwin_stop_x, p->mainwin_stop_y);
+ if (p->mainwin_next_x && p->mainwin_next_y)
+ window_move_widget (mainwin, FALSE, mainwin_fwd, p->mainwin_next_x, p->mainwin_next_y);
+ if (p->mainwin_eject_x && p->mainwin_eject_y)
+ window_move_widget (mainwin, FALSE, mainwin_eject, p->mainwin_eject_x, p->mainwin_eject_y);
+ if (p->mainwin_eqbutton_x && p->mainwin_eqbutton_y)
+ window_move_widget (mainwin, FALSE, mainwin_eq, p->mainwin_eqbutton_x, p->mainwin_eqbutton_y);
+ if (p->mainwin_plbutton_x && p->mainwin_plbutton_y)
+ window_move_widget (mainwin, FALSE, mainwin_pl, p->mainwin_plbutton_x, p->mainwin_plbutton_y);
+ if (p->mainwin_shuffle_x && p->mainwin_shuffle_y)
+ window_move_widget (mainwin, FALSE, mainwin_shuffle, p->mainwin_shuffle_x, p->mainwin_shuffle_y);
+ if (p->mainwin_repeat_x && p->mainwin_repeat_y)
+ window_move_widget (mainwin, FALSE, mainwin_repeat, p->mainwin_repeat_x, p->mainwin_repeat_y);
+ if (p->mainwin_about_x && p->mainwin_about_y)
+ window_move_widget (mainwin, FALSE, mainwin_about, p->mainwin_about_x, p->mainwin_about_y);
+ if (p->mainwin_minimize_x && p->mainwin_minimize_y)
+ window_move_widget (mainwin, FALSE, mainwin_minimize, p->mainwin_minimize_x, p->mainwin_minimize_y);
+ if (p->mainwin_shade_x && p->mainwin_shade_y)
+ window_move_widget (mainwin, FALSE, mainwin_shade, p->mainwin_shade_x, p->mainwin_shade_y);
+ if (p->mainwin_close_x && p->mainwin_close_y)
+ window_move_widget (mainwin, FALSE, mainwin_close, p->mainwin_close_x, p->mainwin_close_y);
 
 mainwin_refresh_visible();
 
 if (config.player_shaded)
- resize_window(mainwin, MAINWIN_SHADED_WIDTH * MAINWIN_SCALE_FACTOR,
- MAINWIN_SHADED_HEIGHT * MAINWIN_SCALE_FACTOR);
- else if (aud_active_skin->properties.mainwin_height > 0 &&
- aud_active_skin->properties.mainwin_width > 0)
- resize_window(mainwin, aud_active_skin->properties.mainwin_width *
- MAINWIN_SCALE_FACTOR, aud_active_skin->properties.mainwin_height *
- MAINWIN_SCALE_FACTOR);
+ window_set_size (mainwin, MAINWIN_SHADED_WIDTH, MAINWIN_SHADED_HEIGHT);
+ else if (p->mainwin_height && p->mainwin_width)
+ window_set_size (mainwin, p->mainwin_width, p->mainwin_height);
 else
- resize_window(mainwin, MAINWIN_WIDTH * MAINWIN_SCALE_FACTOR,
- MAINWIN_HEIGHT * MAINWIN_SCALE_FACTOR);
+ window_set_size (mainwin, MAINWIN_WIDTH, MAINWIN_HEIGHT);
 }
 
 void mainwin_set_song_info (gint bitrate, gint samplerate, gint channels)
@@ -576,18 +425,18 @@
 else
 snprintf (scratch, sizeof scratch, "%2dH", bitrate / 100000);
 
- ui_skinned_textbox_set_text (mainwin_rate_text, scratch);
+ textbox_set_text (mainwin_rate_text, scratch);
 }
 else
- ui_skinned_textbox_set_text (mainwin_rate_text, "");
+ textbox_set_text (mainwin_rate_text, "");
 
 if (samplerate > 0)
 {
 snprintf (scratch, sizeof scratch, "%2d", samplerate / 1000);
- ui_skinned_textbox_set_text (mainwin_freq_text, scratch);
+ textbox_set_text (mainwin_freq_text, scratch);
 }
 else
- ui_skinned_textbox_set_text (mainwin_freq_text, "");
+ textbox_set_text (mainwin_freq_text, "");
 
 ui_skinned_monostereo_set_num_channels (mainwin_monostereo, channels);
 
@@ -611,7 +460,7 @@
 _("mono"));
 }
 
- ui_skinned_textbox_set_text (mainwin_othertext, scratch);
+ textbox_set_text (mainwin_othertext, scratch);
 }
 
 void
@@ -632,14 +481,14 @@
 gtk_widget_hide (mainwin_position);
 gtk_widget_hide (mainwin_sposition);
 
- UI_SKINNED_HORIZONTAL_SLIDER(mainwin_position)->pressed = FALSE;
- UI_SKINNED_HORIZONTAL_SLIDER(mainwin_sposition)->pressed = FALSE;
+ hslider_set_pressed (mainwin_position, FALSE);
+ hslider_set_pressed (mainwin_sposition, FALSE);
 
 /* clear sampling parameter displays */
- ui_skinned_textbox_set_text(mainwin_rate_text, " ");
- ui_skinned_textbox_set_text(mainwin_freq_text, " ");
+ textbox_set_text (mainwin_rate_text, " ");
+ textbox_set_text (mainwin_freq_text, " ");
 ui_skinned_monostereo_set_num_channels(mainwin_monostereo, 0);
- ui_skinned_textbox_set_text (mainwin_othertext, "");
+ textbox_set_text (mainwin_othertext, "");
 
 if (mainwin_playstatus != NULL)
 ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_STOP);
@@ -657,9 +506,8 @@
 gtk_widget_hide(mainwin_sposition);
 }
 
-void
-mainwin_scrolled(GtkWidget *widget, GdkEventScroll *event,
- gpointer callback_data)
+static void mainwin_scrolled (GtkWidget * widget, GdkEventScroll * event, void *
+ unused)
 {
 switch (event->direction) {
 case GDK_SCROLL_UP:
@@ -678,56 +526,32 @@
 }
 
 static gboolean
-mainwin_widget_contained(GdkEventButton *event, int x, int y, int w, int h)
-{
- gint ex = event->x / MAINWIN_SCALE_FACTOR;
- gint ey = event->y / MAINWIN_SCALE_FACTOR;
-
- return (ex > x && ey > y && ex < x + w && ey < y + h);
-}
-
-static gboolean
 mainwin_mouse_button_press(GtkWidget * widget,
 GdkEventButton * event,
 gpointer callback_data)
 {
- if (event->button == 1 && event->type == GDK_2BUTTON_PRESS && event->y /
- MAINWIN_SCALE_FACTOR < 14)
+ if (event->button == 1 && event->type == GDK_2BUTTON_PRESS && event->y < 14)
 {
 mainwin_set_shade(!config.player_shaded);
- if (dock_is_moving(GTK_WINDOW(mainwin)))
- dock_move_release(GTK_WINDOW(mainwin));
 return TRUE;
 }
 
- if (event->button == 3) {
- /* Pop up playback menu if right clicked over playback-control widgets,
- * otherwise popup general menu
- */
- if (mainwin_widget_contained(event, aud_active_skin->properties.mainwin_position_x,
- aud_active_skin->properties.mainwin_position_y, 248, 10) ||
- mainwin_widget_contained(event, aud_active_skin->properties.mainwin_previous_x,
- aud_active_skin->properties.mainwin_previous_y, 23, 18) ||
- mainwin_widget_contained(event, aud_active_skin->properties.mainwin_play_x,
- aud_active_skin->properties.mainwin_play_y, 23, 18) ||
- mainwin_widget_contained(event, aud_active_skin->properties.mainwin_pause_x,
- aud_active_skin->properties.mainwin_pause_y, 23, 18) ||
- mainwin_widget_contained(event, aud_active_skin->properties.mainwin_stop_x,
- aud_active_skin->properties.mainwin_stop_y, 23, 18) ||
- mainwin_widget_contained(event, aud_active_skin->properties.mainwin_next_x,
- aud_active_skin->properties.mainwin_next_y, 23, 18))
- ui_popup_menu_show(UI_MENU_PLAYBACK, event->x_root, event->y_root,
- FALSE, FALSE, 3, event->time);
- else
- ui_popup_menu_show(UI_MENU_MAIN, event->x_root, event->y_root,
- FALSE, FALSE, 3, event->time);
-
+ if (event->button == 3)
+ {
+ ui_popup_menu_show (UI_MENU_MAIN, event->x_root, event->y_root, FALSE,
+ FALSE, event->button, event->time);
 return TRUE;
 }
 
 return FALSE;
 }
 
+static void mainwin_playback_rpress (GtkWidget * button, GdkEventButton * event)
+{
+ ui_popup_menu_show (UI_MENU_PLAYBACK, event->x_root, event->y_root,
+ FALSE, FALSE, event->button, event->time);
+}
+
 gboolean mainwin_keypress (GtkWidget * widget, GdkEventKey * event,
 void * unused)
 {
@@ -759,7 +583,7 @@
 aud_drct_pl_next ();
 break;
 case GDK_KP_Insert:
- action_jump_to_file();
+ audgui_jump_to_track ();
 break;
 case GDK_space:
 aud_drct_pause();
@@ -781,127 +605,6 @@
 return TRUE;
 }
 
-static void
-mainwin_jump_to_time_cb(GtkWidget * widget,
- GtkWidget * entry)
-{
- guint min = 0, sec = 0, params;
- gint time;
-
- params = sscanf(gtk_entry_get_text(GTK_ENTRY(entry)), "%u:%u",
- &min, &sec);
- if (params == 2)
- time = (min * 60) + sec;
- else if (params == 1)
- time = min;
- else
- return;
-
- aud_drct_seek (time*1000);
- gtk_widget_destroy (mainwin_jtt);
-}
-
-
-void
-mainwin_jump_to_time(void)
-{
- GtkWidget *vbox, *hbox_new, *hbox_total;
- GtkWidget *time_entry, *label, *bbox, *jump, *cancel;
- GtkWidget *dialog;
- guint tindex;
- gchar time_str[10];
-
- if (!aud_drct_get_playing()) {
- dialog =
- gtk_message_dialog_new (GTK_WINDOW (mainwin),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- _("Can't jump to time when no track is being played.\n"));
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- return;
- }
-
- if (mainwin_jtt) {
- gtk_window_present(GTK_WINDOW(mainwin_jtt));
- return;
- }
-
- mainwin_jtt = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_type_hint(GTK_WINDOW(mainwin_jtt),
- GDK_WINDOW_TYPE_HINT_DIALOG);
-
- gtk_window_set_title(GTK_WINDOW(mainwin_jtt), _("Jump to Time"));
- gtk_window_set_position(GTK_WINDOW(mainwin_jtt), GTK_WIN_POS_CENTER);
- gtk_window_set_transient_for(GTK_WINDOW(mainwin_jtt),
- GTK_WINDOW(mainwin));
-
- g_signal_connect(mainwin_jtt, "destroy",
- G_CALLBACK(gtk_widget_destroyed), &mainwin_jtt);
- gtk_container_set_border_width(GTK_CONTAINER(mainwin_jtt), 10);
-
- vbox = gtk_vbox_new(FALSE, 5);
- gtk_container_add(GTK_CONTAINER(mainwin_jtt), vbox);
-
- hbox_new = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), hbox_new, TRUE, TRUE, 5);
-
- time_entry = gtk_entry_new();
- gtk_box_pack_start(GTK_BOX(hbox_new), time_entry, FALSE, FALSE, 5);
- g_signal_connect(time_entry, "activate",
- G_CALLBACK(mainwin_jump_to_time_cb), time_entry);
-
- gtk_widget_set_size_request(time_entry, 70, -1);
- label = gtk_label_new(_("minutes:seconds"));
- gtk_box_pack_start(GTK_BOX(hbox_new), label, FALSE, FALSE, 5);
-
- hbox_total = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), hbox_total, TRUE, TRUE, 5);
- gtk_widget_show(hbox_total);
-
- /* FIXME: Disable display of current track length. It's not
- updated when track changes */
-
- label = gtk_label_new(_("Track length:"));
- gtk_box_pack_start(GTK_BOX(hbox_total), label, FALSE, FALSE, 5);
-
- gint len = aud_drct_get_length () / 1000;
- g_snprintf(time_str, sizeof(time_str), "%u:%2.2u", len / 60, len % 60);
- label = gtk_label_new(time_str);
-
- gtk_box_pack_start(GTK_BOX(hbox_total), label, FALSE, FALSE, 10);
-
- bbox = gtk_hbutton_box_new();
- gtk_box_pack_start(GTK_BOX(vbox), bbox, TRUE, TRUE, 0);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_set_spacing(GTK_BOX(bbox), 5);
-
- cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
- gtk_container_add(GTK_CONTAINER(bbox), cancel);
- g_signal_connect_swapped(cancel, "clicked",
- G_CALLBACK(gtk_widget_destroy), mainwin_jtt);
-
- jump = gtk_button_new_from_stock(GTK_STOCK_JUMP_TO);
- GTK_WIDGET_SET_FLAGS(jump, GTK_CAN_DEFAULT);
- gtk_container_add(GTK_CONTAINER(bbox), jump);
- g_signal_connect(jump, "clicked",
- G_CALLBACK(mainwin_jump_to_time_cb), time_entry);
-
- tindex = aud_drct_get_time() / 1000;
- g_snprintf(time_str, sizeof(time_str), "%u:%2.2u", tindex / 60,
- tindex % 60);
- gtk_entry_set_text(GTK_ENTRY(time_entry), time_str);
-
- gtk_editable_select_region(GTK_EDITABLE(time_entry), 0, strlen(time_str));
-
- gtk_widget_show_all(mainwin_jtt);
-
- gtk_widget_grab_focus(time_entry);
- gtk_widget_grab_default(jump);
-}
-
 /*
 * Rewritten 09/13/06:
 *
@@ -922,11 +625,14 @@
 gpointer user_data)
 {
 g_return_if_fail(selection_data != NULL);
- g_return_if_fail(selection_data->data != NULL);
 
- if (str_has_prefix_nocase((gchar *) selection_data->data, "fonts:///"))
+ const gchar * data = (const gchar *) gtk_selection_data_get_data
+ (selection_data);
+ g_return_if_fail (data);
+
+ if (str_has_prefix_nocase (data, "fonts:///"))
 {
- gchar *path = (gchar *) selection_data->data;
+ const gchar * path = data;
 gchar *decoded = g_filename_from_uri(path, NULL, NULL);
 
 if (decoded == NULL)
@@ -940,146 +646,17 @@
 return;
 }
 
- /* perhaps make suffix check case-insensitive -- desowin */
- if (str_has_prefix_nocase((char*)selection_data->data, "file:///")) {
- if (str_has_suffix_nocase((char*)selection_data->data, ".wsz\r\n") ||
- str_has_suffix_nocase((char*)selection_data->data, ".zip\r\n")) {
+ if (str_has_prefix_nocase (data, "file:///"))
+ {
+ 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);
 return;
 }
 }
 
- audgui_urilist_open ((const gchar *) selection_data->data);
-}
-
-static void
-on_visibility_warning_toggle(GtkToggleButton *tbt, gpointer unused)
-{
- config.warn_about_win_visibility = !gtk_toggle_button_get_active(tbt);
-}
-
-static void
-on_visibility_warning_response(GtkDialog *dlg, gint r_id, gpointer unused)
-{
- switch (r_id)
- {
- case GTK_RESPONSE_OK:
- mainwin_show(TRUE);
- break;
- case GTK_RESPONSE_CANCEL:
- default:
- break;
- }
- gtk_widget_destroy(GTK_WIDGET(dlg));
-}
-
-void
-mainwin_show_visibility_warning(void)
-{
- if (config.warn_about_win_visibility)
- {
- GtkWidget *label, *checkbt, *vbox;
- GtkWidget *warning_dlg =
- gtk_dialog_new_with_buttons( _("Audacious - visibility warning") ,
- GTK_WINDOW(mainwin) ,
- GTK_DIALOG_DESTROY_WITH_PARENT ,
- _("Show main player window") ,
- GTK_RESPONSE_OK , _("Ignore") ,
- GTK_RESPONSE_CANCEL , NULL );
-
- vbox = gtk_vbox_new( FALSE , 4 );
- gtk_container_set_border_width( GTK_CONTAINER(vbox) , 4 );
- gtk_box_pack_start( GTK_BOX(GTK_DIALOG(warning_dlg)->vbox) , vbox , TRUE , TRUE , 0 );
- label = gtk_label_new( _("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).") );
- gtk_label_set_line_wrap( GTK_LABEL(label) , TRUE );
- gtk_misc_set_alignment( GTK_MISC(label) , 0.0 , 0.0 );
- checkbt = gtk_check_button_new_with_label( _("Always ignore, show/hide is controlled remotely") );
- gtk_box_pack_start( GTK_BOX(vbox) , label , TRUE , TRUE , 0 );
- gtk_box_pack_start( GTK_BOX(vbox) , checkbt , TRUE , TRUE , 0 );
- g_signal_connect( G_OBJECT(checkbt) , "toggled" ,
- G_CALLBACK(on_visibility_warning_toggle) , NULL );
- g_signal_connect( G_OBJECT(warning_dlg) , "response" ,
- G_CALLBACK(on_visibility_warning_response) , NULL );
- gtk_widget_show_all(warning_dlg);
- }
-}
-
-static void
-on_broken_gtk_engine_warning_toggle(GtkToggleButton *tbt, gpointer unused)
-{
- config.warn_about_broken_gtk_engines = !gtk_toggle_button_get_active(tbt);
-}
-
-void
-ui_main_check_theme_engine(void)
-{
- GtkSettings *settings;
- GtkWidget *widget;
- gchar *theme = NULL;
-
- widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_ensure_style(widget);
-
- settings = gtk_settings_get_default();
- g_object_get(G_OBJECT(settings), "gtk-theme-name", &theme, NULL);
- gtk_widget_destroy(widget);
-
- if (theme == NULL)
- return;
-
- if (g_ascii_strcasecmp(theme, "Qt"))
- {
- g_free(theme);
- return;
- }
-
- if (config.warn_about_broken_gtk_engines)
- {
- gchar *msg;
- GtkWidget *label, *checkbt, *vbox;
- GtkWidget *warning_dlg =
- gtk_dialog_new_with_buttons( _("Audacious - broken GTK engine usage warning") ,
- GTK_WINDOW(mainwin) , GTK_DIALOG_DESTROY_WITH_PARENT ,
- GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL );
- vbox = gtk_vbox_new( FALSE , 4 );
- gtk_container_set_border_width( GTK_CONTAINER(vbox) , 4 );
- gtk_box_pack_start( GTK_BOX(GTK_DIALOG(warning_dlg)->vbox) , vbox ,
- TRUE , TRUE , 0 );
-
- msg = g_strdup_printf(_("<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."), theme);
- label = gtk_label_new(msg);
- gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
- g_free(msg);
-
- gtk_label_set_line_wrap( GTK_LABEL(label) , TRUE );
- gtk_misc_set_alignment( GTK_MISC(label) , 0.0 , 0.0 );
- checkbt = gtk_check_button_new_with_label( _("Do not display this warning again") );
- gtk_box_pack_start( GTK_BOX(vbox) , label , TRUE , TRUE , 0 );
- gtk_box_pack_start( GTK_BOX(vbox) , checkbt , TRUE , TRUE , 0 );
- g_signal_connect( G_OBJECT(checkbt) , "toggled" ,
- G_CALLBACK(on_broken_gtk_engine_warning_toggle) , NULL );
- g_signal_connect( G_OBJECT(warning_dlg) , "response" ,
- G_CALLBACK(gtk_widget_destroy) , NULL );
- gtk_widget_show_all(warning_dlg);
- gtk_window_stick(GTK_WINDOW(warning_dlg));
- }
-
- config.disable_inline_gtk = TRUE;
-
- g_free(theme);
-}
-
-void
-mainwin_eject_pushed(void)
-{
- action_play_file();
+ audgui_urilist_open (data);
 }
 
 static gint time_now (void)
@@ -1115,26 +692,27 @@
 position = seek_start + held / SEEK_SPEED;
 
 position = CLAMP (position, 0, 219);
- ui_skinned_horizontal_slider_set_position (mainwin_position, position);
- mainwin_position_motion_cb (mainwin_position, position);
+ hslider_set_pos (mainwin_position, position);
+ mainwin_position_motion_cb ();
 
 return TRUE;
 }
 
 static gboolean seek_press (GtkWidget * widget, GdkEventButton * event,
- void * rewind)
+ gboolean rewind)
 {
 if (event->button != 1 || seek_source)
 return FALSE;
 
- seek_start = ui_skinned_horizontal_slider_get_position (mainwin_position);
+ seek_start = hslider_get_pos (mainwin_position);
 seek_time = time_now ();
- seek_source = g_timeout_add (SEEK_TIMEOUT, seek_timeout, rewind);
+ seek_source = g_timeout_add (SEEK_TIMEOUT, seek_timeout, GINT_TO_POINTER
+ (rewind));
 return FALSE;
 }
 
 static gboolean seek_release (GtkWidget * widget, GdkEventButton * event,
- void * rewind)
+ gboolean rewind)
 {
 if (event->button != 1 || ! seek_source)
 return FALSE;
@@ -1142,20 +720,28 @@
 if (! aud_drct_get_playing () || time_diff (seek_time, time_now ()) <
 SEEK_THRESHOLD)
 {
- if (GPOINTER_TO_INT (rewind))
+ if (rewind)
 aud_drct_pl_prev ();
 else
 aud_drct_pl_next ();
 }
 else
- mainwin_position_release_cb (mainwin_position,
- ui_skinned_horizontal_slider_get_position (mainwin_position));
+ mainwin_position_release_cb ();
 
 g_source_remove (seek_source);
 seek_source = 0;
 return FALSE;
 }
 
+static void mainwin_rew_press (GtkWidget * button, GdkEventButton * event)
+ {seek_press (button, event, TRUE); }
+static void mainwin_rew_release (GtkWidget * button, GdkEventButton * event)
+ {seek_release (button, event, TRUE); }
+static void mainwin_fwd_press (GtkWidget * button, GdkEventButton * event)
+ {seek_press (button, event, FALSE); }
+static void mainwin_fwd_release (GtkWidget * button, GdkEventButton * event)
+ {seek_release (button, event, FALSE); }
+
 void
 mainwin_play_pushed(void)
 {
@@ -1165,138 +751,75 @@
 aud_drct_play ();
 }
 
-void
-mainwin_stop_pushed(void)
-{
- aud_drct_stop();
- mainwin_clear_song_info();
- ab_position_a = ab_position_b = -1;
-}
-
-void
-mainwin_shuffle_pushed(gboolean toggled)
-{
- check_set( toggleaction_group_others , "playback shuffle" , toggled );
-}
-
-void mainwin_shuffle_pushed_cb(void) {
- mainwin_shuffle_pushed(UI_SKINNED_BUTTON(mainwin_shuffle)->inside);
-}
+static void mainwin_shuffle_cb (GtkWidget * button, GdkEventButton * event)
+ {check_set (toggleaction_group_others, "playback shuffle", button_get_active (button)); }
+static void mainwin_repeat_cb (GtkWidget * button, GdkEventButton * event)
+ {check_set (toggleaction_group_others, "playback repeat", button_get_active (button)); }
+static void mainwin_eq_cb (GtkWidget * button, GdkEventButton * event)
+ {equalizerwin_show (button_get_active (button)); }
+static void mainwin_pl_cb (GtkWidget * button, GdkEventButton * event)
+ {playlistwin_show (button_get_active (button)); }
 
-void
-mainwin_repeat_pushed(gboolean toggled)
+static void mainwin_spos_set_knob (void)
 {
- check_set( toggleaction_group_others , "playback repeat" , toggled );
-}
+ gint pos = hslider_get_pos (mainwin_sposition);
 
-void mainwin_repeat_pushed_cb(void) {
- mainwin_repeat_pushed(UI_SKINNED_BUTTON(mainwin_repeat)->inside);
-}
-
-void mainwin_equalizer_pushed_cb(void) {
- mainwin_eq_pushed(UI_SKINNED_BUTTON(mainwin_eq)->inside);
-}
+ gint x;
+ if (pos < 6)
+ x = 17;
+ else if (pos < 9)
+ x = 20;
+ else
+ x = 23;
 
-void mainwin_playlist_pushed_cb(void) {
- mainwin_pl_pushed(UI_SKINNED_BUTTON(mainwin_pl)->inside);
+ hslider_set_knob (mainwin_sposition, x, 36, x, 36);
 }
 
-void
-mainwin_eq_pushed(gboolean toggled)
+static void mainwin_spos_motion_cb (void)
 {
- equalizerwin_show(toggled);
-}
+ mainwin_spos_set_knob ();
 
-void
-mainwin_pl_pushed(gboolean toggled)
-{
- playlistwin_show (toggled);
-}
+ gint pos = hslider_get_pos (mainwin_sposition);
+ gint length = aud_drct_get_length ();
+ gint time = (pos - 1) * length / 12;
 
-gint
-mainwin_spos_frame_cb(gint pos)
-{
- if (mainwin_sposition) {
- gint x = 0;
- if (pos < 6)
- x = 17;
- else if (pos < 9)
- x = 20;
- else
- x = 23;
+ gchar buf[7];
+ format_time (buf, time, length);
 
- UI_SKINNED_HORIZONTAL_SLIDER(mainwin_sposition)->knob_nx = x;
- UI_SKINNED_HORIZONTAL_SLIDER(mainwin_sposition)->knob_px = x;
- }
- return 1;
+ textbox_set_text (mainwin_stime_min, buf);
+ textbox_set_text (mainwin_stime_sec, buf + 4);
 }
 
-void
-mainwin_spos_motion_cb(GtkWidget *widget, gint pos)
+static void mainwin_spos_release_cb (void)
 {
- gint time;
- gchar *time_msg;
-
- pos--;
-
- time = aud_drct_get_length () / 1000 * pos / 12;
-
- if (config.timer_mode == TIMER_REMAINING) {
- time = aud_drct_get_length () / 1000 - time;
- time_msg = g_strdup_printf("-%2.2d", time / 60);
- ui_skinned_textbox_set_text(mainwin_stime_min, time_msg);
- g_free(time_msg);
- }
- else {
- time_msg = g_strdup_printf(" %2.2d", time / 60);
- ui_skinned_textbox_set_text(mainwin_stime_min, time_msg);
- g_free(time_msg);
- }
-
- time_msg = g_strdup_printf("%2.2d", time % 60);
- ui_skinned_textbox_set_text(mainwin_stime_sec, time_msg);
- g_free(time_msg);
-}
+ mainwin_spos_set_knob ();
 
-void
-mainwin_spos_release_cb(GtkWidget *widget, gint pos)
-{
+ gint pos = hslider_get_pos (mainwin_sposition);
 aud_drct_seek (aud_drct_get_length () * (pos - 1) / 12);
 }
 
-void
-mainwin_position_motion_cb(GtkWidget *widget, gint pos)
+static void mainwin_position_motion_cb (void)
 {
- gint length, time;
- gchar *seek_msg;
+ gint length = aud_drct_get_length () / 1000;
+ gint pos = hslider_get_pos (mainwin_position);
+ gint time = pos * length / 219;
 
- length = aud_drct_get_length () / 1000;
- time = (length * pos) / 219;
- seek_msg = g_strdup_printf(_("Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"),
- time / 60, time % 60,
- length / 60, length % 60,
- (length != 0) ? (time * 100) / length : 0);
+ gchar * seek_msg = g_strdup_printf (_("Seek to %d:%-2.2d / %d:%-2.2d"), time
+ / 60, time % 60, length / 60, length % 60);
 mainwin_lock_info_text(seek_msg);
 g_free(seek_msg);
 }
 
-void
-mainwin_position_release_cb(GtkWidget *widget, gint pos)
+static void mainwin_position_release_cb (void)
 {
- gint length, time;
+ gint length = aud_drct_get_length ();
+ gint pos = hslider_get_pos (mainwin_position);
+ gint time = (gint64) pos * length / 219;
 
- length = aud_drct_get_length();
- time = (gint64) length * pos / 219;
 aud_drct_seek(time);
 mainwin_release_info_text();
 }
 
-gint
-mainwin_volume_frame_cb(gint pos)
-{
- return (gint) rint((pos / 52.0) * 28);
-}
-
 void
 mainwin_adjust_volume_motion(gint v)
 {
@@ -1341,56 +864,74 @@
 mainwin_release_info_text();
 }
 
-void
-mainwin_set_volume_slider(gint percent)
+static void mainwin_volume_set_frame (void)
 {
- ui_skinned_horizontal_slider_set_position(mainwin_volume, (gint) rint((percent * 51) / 100.0));
+ gint pos = hslider_get_pos (mainwin_volume);
+ gint frame = (pos * 27 + 25) / 51;
+ hslider_set_frame (mainwin_volume, 0, 15 * frame);
 }
 
-void
-mainwin_set_balance_slider(gint percent)
+void mainwin_set_volume_slider (gint percent)
 {
- ui_skinned_horizontal_slider_set_position(mainwin_balance, (gint) rint(((percent * 12) / 100.0) + 12));
+ hslider_set_pos (mainwin_volume, (percent * 51 + 50) / 100);
+ mainwin_volume_set_frame ();
 }
 
-void
-mainwin_volume_motion_cb(GtkWidget *widget, gint pos)
+static void mainwin_volume_motion_cb (void)
 {
+ mainwin_volume_set_frame ();
+ gint pos = hslider_get_pos (mainwin_volume);
+ gint vol = (pos * 100 + 25) / 51;
 
- gint vol = (pos * 100) / 51;
 mainwin_adjust_volume_motion(vol);
 equalizerwin_set_volume_slider(vol);
 }
 
-gboolean
-mainwin_volume_release_cb(GtkWidget *widget, gint pos)
+static void mainwin_volume_release_cb (void)
 {
+ mainwin_volume_set_frame ();
 mainwin_adjust_volume_release();
- return FALSE;
 }
 
-gint
-mainwin_balance_frame_cb(gint pos)
+static void mainwin_balance_set_frame (void)
 {
- return ((abs(pos - 12) * 28) / 13);
+ gint pos = hslider_get_pos (mainwin_balance);
+ gint frame = (abs (pos - 12) * 27 + 6) / 12;
+ hslider_set_frame (mainwin_balance, 9, 15 * frame);
 }
 
-void
-mainwin_balance_motion_cb(GtkWidget *widget, gint pos)
+void mainwin_set_balance_slider (gint percent)
 {
- gint bal = ((pos - 12) * 100) / 12;
+ if (percent > 0)
+ hslider_set_pos (mainwin_balance, 12 + (percent * 12 + 50) / 100);
+ else
+ hslider_set_pos (mainwin_balance, 12 + (percent * 12 - 50) / 100);
+
+ mainwin_balance_set_frame ();
+}
+
+static void mainwin_balance_motion_cb (void)
+{
+ mainwin_balance_set_frame ();
+ gint pos = hslider_get_pos (mainwin_balance);
+
+ gint bal;
+ if (pos > 12)
+ bal = ((pos - 12) * 100 + 6) / 12;
+ else
+ bal = ((pos - 12) * 100 - 6) / 12;
+
 mainwin_adjust_balance_motion(bal);
 equalizerwin_set_balance_slider(bal);
 }
 
-void
-mainwin_balance_release_cb(GtkWidget *widget, gint pos)
+static void mainwin_balance_release_cb (void)
 {
+ mainwin_balance_set_frame ();
 mainwin_adjust_volume_release();
 }
 
-void
-mainwin_set_volume_diff(gint diff)
+static void mainwin_set_volume_diff (gint diff)
 {
 gint vol;
 
@@ -1406,26 +947,14 @@
 g_timeout_add(700, (GSourceFunc)(mainwin_volume_release_cb), NULL);
 }
 
-void
-mainwin_set_balance_diff(gint diff)
-{
- gint b;
- b = CLAMP(balance + diff, -100, 100);
- mainwin_adjust_balance_motion(b);
- mainwin_set_balance_slider(b);
- equalizerwin_set_balance_slider(b);
-}
-
-static void mainwin_real_show (void)
+static void mainwin_real_show (gboolean show)
 {
 start_stop_visual (FALSE);
- gtk_window_present(GTK_WINDOW(mainwin));
-}
 
-static void mainwin_real_hide (void)
-{
- gtk_widget_hide(mainwin);
- start_stop_visual (FALSE);
+ if (show)
+ gtk_window_present ((GtkWindow *) mainwin);
+ else
+ gtk_widget_hide (mainwin);
 }
 
 void mainwin_show (gboolean show)
@@ -1438,193 +967,21 @@
 gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (a), show);
 else
 {
- if (show != config.player_visible) {
- config.player_visible = show;
- config.player_visible_prev = !show;
- aud_cfg->player_visible = show;
- }
-
- if (show)
- mainwin_real_show ();
- else
- mainwin_real_hide ();
+ config.player_visible = show;
+ playlistwin_show (config.playlist_visible);
+ equalizerwin_show (config.equalizer_visible);
+ mainwin_real_show (show);
 }
 }
 
-void
-mainwin_set_noplaylistadvance(gboolean no_advance)
-{
- aud_cfg->no_playlist_advance = no_advance;
- check_set(toggleaction_group_others, "playback no playlist advance", aud_cfg->no_playlist_advance);
-}
-
-static void
-mainwin_set_scaled(gboolean scaled)
-{
- GList * list;
- SkinnedWindow * skinned;
- GtkFixed * fixed;
- GtkFixedChild * child;
-
- skinned = (SkinnedWindow *) mainwin;
- fixed = (GtkFixed *) skinned->normal;
-
- for (list = fixed->children; list; list = list->next)
- {
- child = (GtkFixedChild *) list->data;
- g_signal_emit_by_name ((GObject *) child->widget, "toggle-scaled");
- }
-
- fixed = (GtkFixed *) skinned->shaded;
-
- for (list = fixed->children; list; list = list->next)
- {
- child = (GtkFixedChild *) list->data;
- g_signal_emit_by_name ((GObject *) child->widget, "toggle-scaled");
- }
-
- mainwin_refresh_hints();
- mainwin_set_shape ();
-}
-
-void
-set_scaled(gboolean scaled)
-{
- config.scaled = scaled;
-
- mainwin_set_scaled(scaled);
-
- if (config.eq_scaled_linked)
- equalizerwin_set_scaled(scaled);
-}
-
-
-
-void
-mainwin_general_menu_callback(gpointer data,
- guint action,
- GtkWidget * item)
-{
- switch (action) {
- case MAINWIN_GENERAL_PREFS:
- action_preferences();
- break;
- case MAINWIN_GENERAL_ABOUT:
- action_about_audacious();
- break;
- case MAINWIN_GENERAL_PLAYFILE: {
- audgui_run_filebrowser(FALSE); /* FALSE = NO_PLAY_BUTTON */
- break;
- }
- case MAINWIN_GENERAL_PLAYLOCATION:
- action_play_location();
- break;
- case MAINWIN_GENERAL_FILEINFO:
- audgui_infowin_show_current ();
- break;
- case MAINWIN_GENERAL_FOCUSPLWIN:
- gtk_window_present(GTK_WINDOW(playlistwin));
- break;
- case MAINWIN_GENERAL_SHOWMWIN:
- mainwin_show(GTK_CHECK_MENU_ITEM(item)->active);
- break;
- case MAINWIN_GENERAL_SHOWPLWIN:
- playlistwin_show (GTK_CHECK_MENU_ITEM(item) ->active);
- break;
- case MAINWIN_GENERAL_SHOWEQWIN:
- equalizerwin_show (GTK_CHECK_MENU_ITEM (item)->active);
- break;
- case MAINWIN_GENERAL_PREV:
- aud_drct_pl_prev ();
- break;
- case MAINWIN_GENERAL_PLAY:
- mainwin_play_pushed();
- break;
- case MAINWIN_GENERAL_PAUSE:
- aud_drct_pause();
- break;
- case MAINWIN_GENERAL_STOP:
- mainwin_stop_pushed();
- break;
- case MAINWIN_GENERAL_NEXT:
- aud_drct_pl_next ();
- break;
-#if 0
- case MAINWIN_GENERAL_BACK5SEC:
- if (aud_drct_get_playing()
- && aud_playlist_get_current_length(playlist) != -1)
- playback_seek_relative(-5);
- break;
- case MAINWIN_GENERAL_FWD5SEC:
- if (aud_drct_get_playing()
- && aud_playlist_get_current_length(playlist) != -1)
- playback_seek_relative(5);
- break;
-#endif
- case MAINWIN_GENERAL_START:
- aud_drct_pl_set_pos (0);
- break;
- case MAINWIN_GENERAL_JTT:
- mainwin_jump_to_time();
- break;
- case MAINWIN_GENERAL_JTF:
- action_jump_to_file();
- break;
- case MAINWIN_GENERAL_EXIT:
- aud_drct_quit ();
- break;
- case MAINWIN_GENERAL_SETAB:
- if (aud_drct_get_length () > 0)
- {
- if (ab_position_a == -1) {
- ab_position_a = aud_drct_get_time();
- ab_position_b = -1;
- mainwin_lock_info_text("'Loop-Point A Position' set.");
- } else if (ab_position_b == -1) {
- int time = aud_drct_get_time();
- if (time > ab_position_a)
- ab_position_b = time;
- mainwin_release_info_text();
- } else {
- ab_position_a = aud_drct_get_time();
- ab_position_b = -1;
- mainwin_lock_info_text("'Loop-Point A Position' reset.");
- }
- }
- break;
- case MAINWIN_GENERAL_CLEARAB:
- if (aud_drct_get_length () > 0)
- {
- ab_position_a = ab_position_b = -1;
- mainwin_release_info_text();
- }
- break;
- case MAINWIN_GENERAL_NEW_PL:
- {
- gint playlist = aud_playlist_count ();
-
- aud_playlist_insert (playlist);
- aud_playlist_set_active (playlist);
- }
- break;
- case MAINWIN_GENERAL_PREV_PL:
- aud_playlist_set_active (aud_playlist_get_active () - 1);
- break;
- case MAINWIN_GENERAL_NEXT_PL:
- aud_playlist_set_active (aud_playlist_get_active () + 1);
- break;
- }
-}
-
-static void
-mainwin_mr_change(GtkWidget *widget, MenuRowItem i)
+void mainwin_mr_change (MenuRowItem i)
 {
 switch (i) {
 case MENUROW_OPTIONS:
 mainwin_lock_info_text(_("Options Menu"));
 break;
 case MENUROW_ALWAYS:
- if (UI_SKINNED_MENUROW(mainwin_menurow)->always_selected)
+ if (config.always_on_top)
 mainwin_lock_info_text(_("Disable 'Always On Top'"));
 else
 mainwin_lock_info_text(_("Enable 'Always On Top'"));
@@ -1633,10 +990,6 @@
 mainwin_lock_info_text(_("File Info Box"));
 break;
 case MENUROW_SCALE:
- if (UI_SKINNED_MENUROW(mainwin_menurow)->scale_selected)
- mainwin_lock_info_text(_("Disable 'GUI Scaling'"));
- else
- mainwin_lock_info_text(_("Enable 'GUI Scaling'"));
 break;
 case MENUROW_VISUALIZATION:
 mainwin_lock_info_text(_("Visualization Menu"));
@@ -1646,8 +999,7 @@
 }
 }
 
-static void
-mainwin_mr_release(GtkWidget *widget, MenuRowItem i, GdkEventButton *event)
+void mainwin_mr_release (MenuRowItem i, GdkEventButton * event)
 {
 switch (i) {
 case MENUROW_OPTIONS:
@@ -1655,19 +1007,14 @@
 FALSE, FALSE, 1, event->time);
 break;
 case MENUROW_ALWAYS:
- gtk_toggle_action_set_active(
- GTK_TOGGLE_ACTION(gtk_action_group_get_action(
- toggleaction_group_others , "view always on top" )) ,
- UI_SKINNED_MENUROW(mainwin_menurow)->always_selected );
+ gtk_toggle_action_set_active ((GtkToggleAction *)
+ gtk_action_group_get_action (toggleaction_group_others,
+ "view always on top"), config.always_on_top);
 break;
 case MENUROW_FILEINFOBOX:
 audgui_infowin_show_current ();
 break;
 case MENUROW_SCALE:
- gtk_toggle_action_set_active(
- GTK_TOGGLE_ACTION(gtk_action_group_get_action(
- toggleaction_group_others , "view scaled" )) ,
- UI_SKINNED_MENUROW(mainwin_menurow)->scale_selected );
 break;
 case MENUROW_VISUALIZATION:
 ui_popup_menu_show(UI_MENU_VISUALIZATION, event->x_root,
@@ -1680,20 +1027,6 @@
 mainwin_release_info_text();
 }
 
-void
-ui_main_set_initial_volume(void)
-{
- gint b, v;
-
- aud_drct_get_volume_main (& v);
- aud_drct_get_volume_balance (& b);
-
- mainwin_set_volume_slider(v);
- equalizerwin_set_volume_slider(v);
- mainwin_set_balance_slider(b);
- equalizerwin_set_balance_slider(b);
-}
-
 static void
 set_timer_mode(TimerMode mode)
 {
@@ -1703,12 +1036,6 @@
 check_set(radioaction_group_viewtime, "view time remaining", TRUE);
 }
 
-static void
-set_timer_mode_menu_cb(TimerMode mode)
-{
- config.timer_mode = mode;
-}
-
 gboolean
 change_timer_mode_cb(GtkWidget *widget, GdkEventButton *event)
 {
@@ -1729,18 +1056,6 @@
 mainwin_update_song_info();
 }
 
-static void
-mainwin_aud_playlist_prev(void)
-{
- aud_drct_pl_prev ();
-}
-
-static void
-mainwin_aud_playlist_next(void)
-{
- aud_drct_pl_next ();
-}
-
 void
 mainwin_setup_menus(void)
 {
@@ -1753,8 +1068,6 @@
 check_set(toggleaction_group_others, "roll up player", config.player_shaded);
 check_set(toggleaction_group_others, "roll up playlist editor", config.playlist_shaded);
 check_set(toggleaction_group_others, "roll up equalizer", config.equalizer_shaded);
- check_set(toggleaction_group_others, "view easy move", config.easy_move);
- check_set(toggleaction_group_others, "view scaled", config.scaled);
 
 mainwin_enable_status_message (FALSE);
 
@@ -1897,220 +1210,216 @@
 }
 }
 
-static void mainwin_info_double_clicked_cb (void)
+static gboolean mainwin_info_button_press (GtkWidget * widget, GdkEventButton *
+ event)
 {
- audgui_infowin_show_current ();
-}
+ if (event->type == GDK_BUTTON_PRESS && event->button == 3)
+ {
+ ui_popup_menu_show (UI_MENU_SONGNAME, event->x_root, event->y_root,
+ FALSE, FALSE, event->button, event->time);
+ return TRUE;
+ }
 
-static void mainwin_info_right_clicked_cb(GtkWidget *widget, GdkEventButton
- *event)
-{
- ui_popup_menu_show(UI_MENU_SONGNAME, event->x_root, event->y_root, FALSE,
- FALSE, 3, event->time);
+ if (event->type == GDK_2BUTTON_PRESS && event->button == 1)
+ {
+ audgui_infowin_show_current ();
+ return TRUE;
+ }
+
+ return FALSE;
 }
 
 static void
 mainwin_create_widgets(void)
 {
- mainwin_menubtn = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_menubtn, SKINNED_WINDOW(mainwin)->normal,
- 6, 3, 9, 9, 0, 0, 0, 9, SKIN_TITLEBAR);
- g_signal_connect(mainwin_menubtn, "clicked", mainwin_menubtn_cb, NULL );
-
- mainwin_minimize = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_minimize, SKINNED_WINDOW(mainwin)->normal,
- 244, 3, 9, 9, 9, 0, 9, 9, SKIN_TITLEBAR);
- g_signal_connect(mainwin_minimize, "clicked", mainwin_minimize_cb, NULL );
-
- mainwin_shade = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_shade, SKINNED_WINDOW(mainwin)->normal,
- 254, 3, 9, 9, 0, 18, 9, 18, SKIN_TITLEBAR);
- g_signal_connect(mainwin_shade, "clicked", mainwin_shade_toggle, NULL );
-
- mainwin_close = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_close, SKINNED_WINDOW(mainwin)->normal,
- 264, 3, 9, 9, 18, 0, 18, 9, SKIN_TITLEBAR);
- g_signal_connect ((GObject *) mainwin_close, "clicked", aud_drct_quit,
- 0);
-
- mainwin_rew = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_rew, SKINNED_WINDOW(mainwin)->normal,
- 16, 88, 23, 18, 0, 0, 0, 18, SKIN_CBUTTONS);
- g_signal_connect (mainwin_rew, "button-press-event", (GCallback)
- seek_press, GINT_TO_POINTER (TRUE));
- g_signal_connect (mainwin_rew, "button-release-event", (GCallback)
- seek_release, GINT_TO_POINTER (TRUE));
-
- mainwin_fwd = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_fwd, SKINNED_WINDOW(mainwin)->normal,
- 108, 88, 22, 18, 92, 0, 92, 18, SKIN_CBUTTONS);
- g_signal_connect (mainwin_fwd, "button-press-event", (GCallback)
- seek_press, GINT_TO_POINTER (FALSE));
- g_signal_connect (mainwin_fwd, "button-release-event", (GCallback)
- seek_release, GINT_TO_POINTER (FALSE));
-
- mainwin_play = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_play, SKINNED_WINDOW(mainwin)->normal,
- 39, 88, 23, 18, 23, 0, 23, 18, SKIN_CBUTTONS);
- g_signal_connect(mainwin_play, "clicked", mainwin_play_pushed, NULL );
-
- mainwin_pause = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_pause, SKINNED_WINDOW(mainwin)->normal,
- 62, 88, 23, 18, 46, 0, 46, 18, SKIN_CBUTTONS);
- g_signal_connect(mainwin_pause, "clicked", aud_drct_pause, NULL );
-
- mainwin_stop = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_stop, SKINNED_WINDOW(mainwin)->normal,
- 85, 88, 23, 18, 69, 0, 69, 18, SKIN_CBUTTONS);
- g_signal_connect(mainwin_stop, "clicked", mainwin_stop_pushed, NULL );
-
- mainwin_eject = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_eject, SKINNED_WINDOW(mainwin)->normal,
- 136, 89, 22, 16, 114, 0, 114, 16, SKIN_CBUTTONS);
- g_signal_connect(mainwin_eject, "clicked", mainwin_eject_pushed, NULL);
-
- mainwin_shuffle = ui_skinned_button_new();
- ui_skinned_toggle_button_setup(mainwin_shuffle, SKINNED_WINDOW(mainwin)->normal,
- 164, 89, 46, 15, 28, 0, 28, 15, 28, 30, 28, 45, SKIN_SHUFREP);
- g_signal_connect(mainwin_shuffle, "clicked", mainwin_shuffle_pushed_cb, NULL);
-
- mainwin_repeat = ui_skinned_button_new();
- ui_skinned_toggle_button_setup(mainwin_repeat, SKINNED_WINDOW(mainwin)->normal,
- 210, 89, 28, 15, 0, 0, 0, 15, 0, 30, 0, 45, SKIN_SHUFREP);
- g_signal_connect(mainwin_repeat, "clicked", mainwin_repeat_pushed_cb, NULL);
-
- mainwin_eq = ui_skinned_button_new();
- ui_skinned_toggle_button_setup(mainwin_eq, SKINNED_WINDOW(mainwin)->normal,
- 219, 58, 23, 12, 0, 61, 46, 61, 0, 73, 46, 73, SKIN_SHUFREP);
- g_signal_connect(mainwin_eq, "clicked", mainwin_equalizer_pushed_cb, NULL);
- ui_skinned_button_set_inside(mainwin_eq, config.equalizer_visible);
-
- mainwin_pl = ui_skinned_button_new();
- ui_skinned_toggle_button_setup(mainwin_pl, SKINNED_WINDOW(mainwin)->normal,
- 242, 58, 23, 12, 23, 61, 69, 61, 23, 73, 69, 73, SKIN_SHUFREP);
- g_signal_connect(mainwin_pl, "clicked", mainwin_playlist_pushed_cb, NULL);
- ui_skinned_button_set_inside(mainwin_pl, config.playlist_visible);
-
- mainwin_info = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->normal, 112, 27, 153, 1, SKIN_TEXT);
- ui_skinned_textbox_set_scroll(mainwin_info, config.autoscroll);
- ui_skinned_textbox_set_xfont(mainwin_info, !config.mainwin_use_bitmapfont, config.mainwin_font);
- g_signal_connect(mainwin_info, "double-clicked", mainwin_info_double_clicked_cb, NULL);
- g_signal_connect(mainwin_info, "right-clicked", G_CALLBACK(mainwin_info_right_clicked_cb), NULL);
-
- mainwin_othertext = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->normal, 112, 43, 153, 1, SKIN_TEXT);
-
- mainwin_rate_text = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->normal, 111, 43, 15, 0, SKIN_TEXT);
-
- mainwin_freq_text = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->normal, 156, 43, 10, 0, SKIN_TEXT);
-
- mainwin_menurow = ui_skinned_menurow_new(SKINNED_WINDOW(mainwin)->normal, 10, 22, 304, 0, 304, 44, SKIN_TITLEBAR);
- g_signal_connect(mainwin_menurow, "change", G_CALLBACK(mainwin_mr_change), NULL);
- g_signal_connect(mainwin_menurow, "release", G_CALLBACK(mainwin_mr_release), NULL);
-
- mainwin_volume = ui_skinned_horizontal_slider_new(SKINNED_WINDOW(mainwin)->normal, 107, 57, 68,
- 13, 15, 422, 0, 422, 14, 11, 15, 0, 0, 51,
- mainwin_volume_frame_cb, SKIN_VOLUME);
- g_signal_connect(mainwin_volume, "motion", G_CALLBACK(mainwin_volume_motion_cb), NULL);
- g_signal_connect(mainwin_volume, "release", G_CALLBACK(mainwin_volume_release_cb), NULL);
-
- mainwin_balance = ui_skinned_horizontal_slider_new(SKINNED_WINDOW(mainwin)->normal, 177, 57, 38,
- 13, 15, 422, 0, 422, 14, 11, 15, 9, 0, 24,
- mainwin_balance_frame_cb, SKIN_BALANCE);
- g_signal_connect(mainwin_balance, "motion", G_CALLBACK(mainwin_balance_motion_cb), NULL);
- g_signal_connect(mainwin_balance, "release", G_CALLBACK(mainwin_balance_release_cb), NULL);
-
- mainwin_monostereo = ui_skinned_monostereo_new(SKINNED_WINDOW(mainwin)->normal, 212, 41, SKIN_MONOSTEREO);
-
- mainwin_playstatus = ui_skinned_playstatus_new(SKINNED_WINDOW(mainwin)->normal, 24, 28);
-
- mainwin_minus_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->normal, 36, 26, SKIN_NUMBERS);
+ mainwin_menubtn = button_new (9, 9, 0, 0, 0, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ window_put_widget (mainwin, FALSE, mainwin_menubtn, 6, 3);
+ button_on_release (mainwin_menubtn, (ButtonCB) mainwin_menubtn_cb);
+
+ mainwin_minimize = button_new (9, 9, 9, 0, 9, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ window_put_widget (mainwin, FALSE, mainwin_minimize, 244, 3);
+ button_on_release (mainwin_minimize, (ButtonCB) mainwin_minimize_cb);
+
+ mainwin_shade = button_new (9, 9, 0, 18, 9, 18, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ window_put_widget (mainwin, FALSE, mainwin_shade, 254, 3);
+ button_on_release (mainwin_shade, (ButtonCB) mainwin_shade_toggle);
+
+ mainwin_close = button_new (9, 9, 18, 0, 18, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ window_put_widget (mainwin, FALSE, mainwin_close, 264, 3);
+ button_on_release (mainwin_close, (ButtonCB) aud_drct_quit);
+
+ mainwin_rew = button_new (23, 18, 0, 0, 0, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ window_put_widget (mainwin, FALSE, mainwin_rew, 16, 88);
+ button_on_press (mainwin_rew, mainwin_rew_press);
+ button_on_release (mainwin_rew, mainwin_rew_release);
+ button_on_rpress (mainwin_rew, mainwin_playback_rpress);
+
+ mainwin_fwd = button_new (22, 18, 92, 0, 92, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ window_put_widget (mainwin, FALSE, mainwin_fwd, 108, 88);
+ button_on_press (mainwin_fwd, mainwin_fwd_press);
+ button_on_release (mainwin_fwd, mainwin_fwd_release);
+ button_on_rpress (mainwin_fwd, mainwin_playback_rpress);
+
+ mainwin_play = button_new (23, 18, 23, 0, 23, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ window_put_widget (mainwin, FALSE, mainwin_play, 39, 88);
+ button_on_release (mainwin_play, (ButtonCB) mainwin_play_pushed);
+ button_on_rpress (mainwin_play, mainwin_playback_rpress);
+
+ mainwin_pause = button_new (23, 18, 46, 0, 46, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ window_put_widget (mainwin, FALSE, mainwin_pause, 62, 88);
+ button_on_release (mainwin_pause, (ButtonCB) aud_drct_pause);
+ button_on_rpress (mainwin_pause, mainwin_playback_rpress);
+
+ mainwin_stop = button_new (23, 18, 69, 0, 69, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ window_put_widget (mainwin, FALSE, mainwin_stop, 85, 88);
+ button_on_release (mainwin_stop, (ButtonCB) aud_drct_stop);
+ button_on_rpress (mainwin_stop, mainwin_playback_rpress);
+
+ mainwin_eject = button_new (22, 16, 114, 0, 114, 16, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ window_put_widget (mainwin, FALSE, mainwin_eject, 136, 89);
+ button_on_release (mainwin_eject, (ButtonCB) action_play_file);
+
+ mainwin_shuffle = button_new_toggle (46, 15, 28, 0, 28, 15, 28, 30, 28, 45, SKIN_SHUFREP, SKIN_SHUFREP);
+ window_put_widget (mainwin, FALSE, mainwin_shuffle, 164, 89);
+ button_on_release (mainwin_shuffle, mainwin_shuffle_cb);
+
+ mainwin_repeat = button_new_toggle (28, 15, 0, 0, 0, 15, 0, 30, 0, 45, SKIN_SHUFREP, SKIN_SHUFREP);
+ window_put_widget (mainwin, FALSE, mainwin_repeat, 210, 89);
+ button_on_release (mainwin_repeat, mainwin_repeat_cb);
+
+ mainwin_eq = button_new_toggle (23, 12, 0, 61, 46, 61, 0, 73, 46, 73, SKIN_SHUFREP, SKIN_SHUFREP);
+ window_put_widget (mainwin, FALSE, mainwin_eq, 219, 58);
+ button_on_release (mainwin_eq, mainwin_eq_cb);
+
+ mainwin_pl = button_new_toggle (23, 12, 23, 61, 69, 61, 23, 73, 69, 73, SKIN_SHUFREP, SKIN_SHUFREP);
+ window_put_widget (mainwin, FALSE, mainwin_pl, 242, 58);
+ button_on_release (mainwin_pl, mainwin_pl_cb);
+
+ mainwin_info = textbox_new (153, "", config.mainwin_use_bitmapfont ? NULL :
+ config.mainwin_font, config.autoscroll);
+ window_put_widget (mainwin, FALSE, mainwin_info, 112, 27);
+ g_signal_connect (mainwin_info, "button-press-event", (GCallback)
+ mainwin_info_button_press, NULL);
+
+ mainwin_othertext = textbox_new (153, "", NULL, FALSE);
+ window_put_widget (mainwin, FALSE, mainwin_othertext, 112, 43);
+
+ mainwin_rate_text = textbox_new (15, "", NULL, FALSE);
+ window_put_widget (mainwin, FALSE, mainwin_rate_text, 111, 43);
+
+ mainwin_freq_text = textbox_new (10, "", NULL, FALSE);
+ window_put_widget (mainwin, FALSE, mainwin_freq_text, 156, 43);
+
+ mainwin_menurow = ui_skinned_menurow_new ();
+ window_put_widget (mainwin, FALSE, mainwin_menurow, 10, 22);
+
+ mainwin_volume = hslider_new (0, 51, SKIN_VOLUME, 68, 13, 0, 0, 14, 11, 15, 422, 0, 422);
+ window_put_widget (mainwin, FALSE, mainwin_volume, 107, 57);
+ hslider_on_motion (mainwin_volume, mainwin_volume_motion_cb);
+ hslider_on_release (mainwin_volume, mainwin_volume_release_cb);
+
+ mainwin_balance = hslider_new (0, 24, SKIN_BALANCE, 38, 13, 9, 0, 14, 11, 15, 422, 0, 422);
+ window_put_widget (mainwin, FALSE, mainwin_balance, 177, 57);
+ hslider_on_motion (mainwin_balance, mainwin_balance_motion_cb);
+ hslider_on_release (mainwin_balance, mainwin_balance_release_cb);
+
+ mainwin_monostereo = ui_skinned_monostereo_new ();
+ window_put_widget (mainwin, FALSE, mainwin_monostereo, 212, 41);
+
+ mainwin_playstatus = ui_skinned_playstatus_new ();
+ window_put_widget (mainwin, FALSE, mainwin_playstatus, 24, 28);
+
+ mainwin_minus_num = ui_skinned_number_new ();
+ window_put_widget (mainwin, FALSE, mainwin_minus_num, 36, 26);
 g_signal_connect(mainwin_minus_num, "button-press-event", G_CALLBACK(change_timer_mode_cb), NULL);
 
- mainwin_10min_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->normal, 48, 26, SKIN_NUMBERS);
+ mainwin_10min_num = ui_skinned_number_new ();
+ window_put_widget (mainwin, FALSE, mainwin_10min_num, 48, 26);
 g_signal_connect(mainwin_10min_num, "button-press-event", G_CALLBACK(change_timer_mode_cb), NULL);
 
- mainwin_min_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->normal, 60, 26, SKIN_NUMBERS);
+ mainwin_min_num = ui_skinned_number_new ();
+ window_put_widget (mainwin, FALSE, mainwin_min_num, 60, 26);
 g_signal_connect(mainwin_min_num, "button-press-event", G_CALLBACK(change_timer_mode_cb), NULL);
 
- mainwin_10sec_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->normal, 78, 26, SKIN_NUMBERS);
+ mainwin_10sec_num = ui_skinned_number_new ();
+ window_put_widget (mainwin, FALSE, mainwin_10sec_num, 78, 26);
 g_signal_connect(mainwin_10sec_num, "button-press-event", G_CALLBACK(change_timer_mode_cb), NULL);
 
- mainwin_sec_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->normal, 90, 26, SKIN_NUMBERS);
+ mainwin_sec_num = ui_skinned_number_new ();
+ window_put_widget (mainwin, FALSE, mainwin_sec_num, 90, 26);
 g_signal_connect(mainwin_sec_num, "button-press-event", G_CALLBACK(change_timer_mode_cb), NULL);
 
- mainwin_about = ui_skinned_button_new();
- ui_skinned_small_button_setup(mainwin_about, SKINNED_WINDOW(mainwin)->normal, 247, 83, 20, 25);
- g_signal_connect(mainwin_about, "clicked", G_CALLBACK(action_about_audacious), NULL);
+ mainwin_about = button_new_small (20, 25);
+ window_put_widget (mainwin, FALSE, mainwin_about, 247, 83);
+ button_on_release (mainwin_about, (ButtonCB) audgui_show_about_window);
 
- mainwin_vis = ui_vis_new(SKINNED_WINDOW(mainwin)->normal, 24, 43, 76);
+ mainwin_vis = ui_vis_new ();
+ window_put_widget (mainwin, FALSE, mainwin_vis, 24, 43);
 g_signal_connect(mainwin_vis, "button-press-event", G_CALLBACK(mainwin_vis_cb), NULL);
 
- mainwin_position = ui_skinned_horizontal_slider_new(SKINNED_WINDOW(mainwin)->normal, 16, 72, 248,
- 10, 248, 0, 278, 0, 29, 10, 10, 0, 0, 219,
- NULL, SKIN_POSBAR);
- g_signal_connect(mainwin_position, "motion", G_CALLBACK(mainwin_position_motion_cb), NULL);
- g_signal_connect(mainwin_position, "release", G_CALLBACK(mainwin_position_release_cb), NULL);
+ mainwin_position = hslider_new (0, 219, SKIN_POSBAR, 248, 10, 0, 0, 29, 10, 248, 0, 278, 0);
+ window_put_widget (mainwin, FALSE, mainwin_position, 16, 72);
+ hslider_on_motion (mainwin_position, mainwin_position_motion_cb);
+ hslider_on_release (mainwin_position, mainwin_position_release_cb);
 
 /* shaded */
 
- mainwin_shaded_menubtn = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_shaded_menubtn, SKINNED_WINDOW(mainwin)->shaded,
- 6, 3, 9, 9, 0, 0, 0, 9, SKIN_TITLEBAR);
- g_signal_connect(mainwin_shaded_menubtn, "clicked", mainwin_menubtn_cb, NULL );
+ mainwin_shaded_menubtn = button_new (9, 9, 0, 0, 0, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ window_put_widget (mainwin, TRUE, mainwin_shaded_menubtn, 6, 3);
+ button_on_release (mainwin_shaded_menubtn, (ButtonCB) mainwin_menubtn_cb);
 
- mainwin_shaded_minimize = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_shaded_minimize, SKINNED_WINDOW(mainwin)->shaded,
- 244, 3, 9, 9, 9, 0, 9, 9, SKIN_TITLEBAR);
- g_signal_connect(mainwin_shaded_minimize, "clicked", mainwin_minimize_cb, NULL );
+ mainwin_shaded_minimize = button_new (9, 9, 9, 0, 9, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ window_put_widget (mainwin, TRUE, mainwin_shaded_minimize, 244, 3);
+ button_on_release (mainwin_shaded_minimize, (ButtonCB) mainwin_minimize_cb);
 
- mainwin_shaded_shade = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_shaded_shade, SKINNED_WINDOW(mainwin)->shaded,
- 254, 3, 9, 9, 0, 27, 9, 27, SKIN_TITLEBAR);
- g_signal_connect(mainwin_shaded_shade, "clicked", mainwin_shade_toggle, NULL );
+ mainwin_shaded_shade = button_new (9, 9, 0, 27, 9, 27, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ window_put_widget (mainwin, TRUE, mainwin_shaded_shade, 254, 3);
+ button_on_release (mainwin_shaded_shade, (ButtonCB) mainwin_shade_toggle);
 
- mainwin_shaded_close = ui_skinned_button_new();
- ui_skinned_push_button_setup(mainwin_shaded_close, SKINNED_WINDOW(mainwin)->shaded,
- 264, 3, 9, 9, 18, 0, 18, 9, SKIN_TITLEBAR);
- g_signal_connect ((GObject *) mainwin_shaded_close, "clicked",
- aud_drct_quit, 0);
+ mainwin_shaded_close = button_new (9, 9, 18, 0, 18, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ window_put_widget (mainwin, TRUE, mainwin_shaded_close, 264, 3);
+ button_on_release (mainwin_shaded_close, (ButtonCB) aud_drct_quit);
 
- mainwin_srew = ui_skinned_button_new();
- ui_skinned_small_button_setup(mainwin_srew, SKINNED_WINDOW(mainwin)->shaded, 169, 4, 8, 7);
- g_signal_connect(mainwin_srew, "clicked", mainwin_aud_playlist_prev, NULL);
+ mainwin_srew = button_new_small (8, 7);
+ window_put_widget (mainwin, TRUE, mainwin_srew, 169, 4);
+ button_on_release (mainwin_srew, (ButtonCB) aud_drct_pl_prev);
 
- mainwin_splay = ui_skinned_button_new();
- ui_skinned_small_button_setup(mainwin_splay, SKINNED_WINDOW(mainwin)->shaded, 177, 4, 10, 7);
- g_signal_connect(mainwin_splay, "clicked", mainwin_play_pushed, NULL);
+ mainwin_splay = button_new_small (10, 7);
+ window_put_widget (mainwin, TRUE, mainwin_splay, 177, 4);
+ button_on_release (mainwin_splay, (ButtonCB) mainwin_play_pushed);
 
- mainwin_spause = ui_skinned_button_new();
- ui_skinned_small_button_setup(mainwin_spause, SKINNED_WINDOW(mainwin)->shaded, 187, 4, 10, 7);
- g_signal_connect(mainwin_spause, "clicked", aud_drct_pause, NULL);
+ mainwin_spause = button_new_small (10, 7);
+ window_put_widget (mainwin, TRUE, mainwin_spause, 187, 4);
+ button_on_release (mainwin_spause, (ButtonCB) aud_drct_pause);
 
- mainwin_sstop = ui_skinned_button_new();
- ui_skinned_small_button_setup(mainwin_sstop, SKINNED_WINDOW(mainwin)->shaded, 197, 4, 9, 7);
- g_signal_connect(mainwin_sstop, "clicked", mainwin_stop_pushed, NULL);
+ mainwin_sstop = button_new_small (9, 7);
+ window_put_widget (mainwin, TRUE, mainwin_sstop, 197, 4);
+ button_on_release (mainwin_sstop, (ButtonCB) aud_drct_stop);
 
- mainwin_sfwd = ui_skinned_button_new();
- ui_skinned_small_button_setup(mainwin_sfwd, SKINNED_WINDOW(mainwin)->shaded, 206, 4, 8, 7);
- g_signal_connect(mainwin_sfwd, "clicked", mainwin_aud_playlist_next, NULL);
+ mainwin_sfwd = button_new_small (8, 7);
+ window_put_widget (mainwin, TRUE, mainwin_sfwd, 206, 4);
+ button_on_release (mainwin_sfwd, (ButtonCB) aud_drct_pl_next);
 
- mainwin_seject = ui_skinned_button_new();
- ui_skinned_small_button_setup(mainwin_seject, SKINNED_WINDOW(mainwin)->shaded, 216, 4, 9, 7);
- g_signal_connect(mainwin_seject, "clicked", mainwin_eject_pushed, NULL);
+ mainwin_seject = button_new_small (9, 7);
+ window_put_widget (mainwin, TRUE, mainwin_seject, 216, 4);
+ button_on_release (mainwin_seject, (ButtonCB) action_play_file);
 
- mainwin_svis = ui_svis_new(SKINNED_WINDOW(mainwin)->shaded, 79, 5);
+ mainwin_svis = ui_svis_new ();
+ window_put_widget (mainwin, TRUE, mainwin_svis, 79, 5);
 g_signal_connect(mainwin_svis, "button-press-event", G_CALLBACK(mainwin_vis_cb), NULL);
 
- mainwin_sposition = ui_skinned_horizontal_slider_new(SKINNED_WINDOW(mainwin)->shaded, 226, 4, 17,
- 7, 17, 36, 17, 36, 3, 7, 36, 0, 1, 13,
- mainwin_spos_frame_cb, SKIN_TITLEBAR);
- g_signal_connect(mainwin_sposition, "motion", G_CALLBACK(mainwin_spos_motion_cb), NULL);
- g_signal_connect(mainwin_sposition, "release", G_CALLBACK(mainwin_spos_release_cb), NULL);
+ mainwin_sposition = hslider_new (1, 13, SKIN_TITLEBAR, 17, 7, 0, 36, 3, 7, 17, 36, 17, 36);
+ window_put_widget (mainwin, TRUE, mainwin_sposition, 226, 4);
+ hslider_on_motion (mainwin_sposition, mainwin_spos_motion_cb);
+ hslider_on_release (mainwin_sposition, mainwin_spos_release_cb);
 
- mainwin_stime_min = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->shaded, 130, 4, 15, FALSE, SKIN_TEXT);
- g_signal_connect(mainwin_stime_min, "button-press-event", G_CALLBACK(change_timer_mode_cb), NULL);
+ mainwin_stime_min = textbox_new (15, "", NULL, FALSE);
+ window_put_widget (mainwin, TRUE, mainwin_stime_min, 130, 4);
+
+ mainwin_stime_sec = textbox_new (10, "", NULL, FALSE);
+ window_put_widget (mainwin, TRUE, mainwin_stime_sec, 147, 4);
 
- mainwin_stime_sec = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->shaded, 147, 4, 10, FALSE, SKIN_TEXT);
+ g_signal_connect(mainwin_stime_min, "button-press-event", G_CALLBACK(change_timer_mode_cb), NULL);
 g_signal_connect(mainwin_stime_sec, "button-press-event", G_CALLBACK(change_timer_mode_cb), NULL);
 }
 
@@ -2134,28 +1443,33 @@
 gtk_widget_set_no_show_all (mainwin_monostereo, TRUE);
 gtk_widget_set_no_show_all (mainwin_othertext, TRUE);
 
- gtk_widget_show_all (((SkinnedWindow *) mainwin)->normal);
- gtk_widget_show_all (((SkinnedWindow *) mainwin)->shaded);
-
- ui_skinned_window_set_shade (mainwin, config.player_shaded);
+ window_set_shaded (mainwin, config.player_shaded);
+ window_show_all (mainwin);
 }
 
-#if 0 /* This can be enabled when at least two window managers send the event
- correctly. Currently, I don't know of any that do (see Debian #567607,
- #567608, and #567609. -jlindgren */
 static gboolean state_cb (GtkWidget * widget, GdkEventWindowState * event,
 void * unused)
 {
 if (event->changed_mask & GDK_WINDOW_STATE_STICKY)
- mainwin_set_sticky (event->new_window_state & GDK_WINDOW_STATE_STICKY);
+ {
+ gboolean sticky = (event->new_window_state & GDK_WINDOW_STATE_STICKY);
+ GtkToggleAction * action = (GtkToggleAction *)
+ gtk_action_group_get_action (toggleaction_group_others,
+ "view put on all workspaces");
+ gtk_toggle_action_set_active (action, sticky);
+ }
 
 if (event->changed_mask & GDK_WINDOW_STATE_ABOVE)
- mainwin_set_always_on_top (event->new_window_state &
- GDK_WINDOW_STATE_ABOVE);
+ {
+ gboolean above = (event->new_window_state & GDK_WINDOW_STATE_ABOVE);
+ GtkToggleAction * action = (GtkToggleAction *)
+ gtk_action_group_get_action (toggleaction_group_others,
+ "view always on top");
+ gtk_toggle_action_set_active (action, above);
+ }
 
 return TRUE;
 }
-#endif
 
 static gboolean delete_cb (GtkWidget * widget, GdkEvent * event, void * unused)
 {
@@ -2163,32 +1477,32 @@
 return TRUE;
 }
 
-static void
-mainwin_create_window(void)
+static void mainwin_draw (GtkWidget * window, cairo_t * cr)
 {
- gint width, height;
+ gint width = config.player_shaded ? MAINWIN_SHADED_WIDTH : active_skin->properties.mainwin_width;
+ gint height = config.player_shaded ? MAINWIN_SHADED_HEIGHT : active_skin->properties.mainwin_height;
 
- mainwin = ui_skinned_window_new("player", &config.player_x, &config.player_y);
- gtk_window_set_title(GTK_WINDOW(mainwin), _("Audacious"));
- gtk_window_set_role(GTK_WINDOW(mainwin), "player");
- gtk_window_set_resizable(GTK_WINDOW(mainwin), FALSE);
+ skin_draw_pixbuf (cr, SKIN_MAIN, 0, 0, 0, 0, width, height);
+ skin_draw_mainwin_titlebar (cr, config.player_shaded, TRUE);
+}
 
- width = config.player_shaded ? MAINWIN_SHADED_WIDTH : aud_active_skin->properties.mainwin_width;
- height = config.player_shaded ? MAINWIN_SHADED_HEIGHT : aud_active_skin->properties.mainwin_height;
+static void
+mainwin_create_window(void)
+{
+ gint width = config.player_shaded ? MAINWIN_SHADED_WIDTH : active_skin->properties.mainwin_width;
+ gint height = config.player_shaded ? MAINWIN_SHADED_HEIGHT : active_skin->properties.mainwin_height;
 
- if (config.scaled) {
- width *= config.scale_factor;
- height *= config.scale_factor;
- }
+ mainwin = window_new (& config.player_x, & config.player_y, width, height,
+ TRUE, config.player_shaded, mainwin_draw);
 
- gtk_widget_set_size_request(mainwin, width, height);
+ gtk_window_set_title(GTK_WINDOW(mainwin), _("Audacious"));
 
 g_signal_connect(mainwin, "button_press_event",
 G_CALLBACK(mainwin_mouse_button_press), NULL);
 g_signal_connect(mainwin, "scroll_event",
 G_CALLBACK(mainwin_scrolled), NULL);
 
- aud_drag_dest_set(mainwin);
+ drag_dest_set(mainwin);
 g_signal_connect ((GObject *) mainwin, "drag-data-received", (GCallback)
 mainwin_drag_data_received, 0);
 
@@ -2197,10 +1511,8 @@
 
 ui_main_evlistener_init();
 
-#if 0
 g_signal_connect ((GObject *) mainwin, "window-state-event", (GCallback)
 state_cb, NULL);
-#endif
 g_signal_connect ((GObject *) mainwin, "delete-event", (GCallback)
 delete_cb, NULL);
 }
@@ -2247,30 +1559,7 @@
 static void mainwin_update_time_display (gint time, gint length)
 {
 gchar scratch[7];
-
- if (config.timer_mode == TIMER_REMAINING && length > 0)
- {
- if (length - time < 60000) /* " -0:SS" */
- snprintf (scratch, sizeof scratch, " -0:%02d", (length - time) /
- 1000);
- else if (length - time < 6000000) /* "-MM:SS" */
- snprintf (scratch, sizeof scratch, "%3d:%02d", (time - length) /
- 60000, (length - time) / 1000 % 60);
- else /* "-HH:MM" */
- snprintf (scratch, sizeof scratch, "%3d:%02d", (time - length) /
- 3600000, (length - time) / 60000 % 60);
- }
- else
- {
- if (time < 60000000) /* MMM:SS */
- snprintf (scratch, sizeof scratch, "%3d:%02d", time / 60000, time /
- 1000 % 60);
- else /* HHH:MM */
- snprintf (scratch, sizeof scratch, "%3d:%02d", time / 3600000, time
- / 60000 % 60);
- }
-
- scratch[3] = 0;
+ format_time (scratch, time, length);
 
 ui_skinned_number_set (mainwin_minus_num, scratch[0]);
 ui_skinned_number_set (mainwin_10min_num, scratch[1]);
@@ -2278,10 +1567,10 @@
 ui_skinned_number_set (mainwin_10sec_num, scratch[4]);
 ui_skinned_number_set (mainwin_sec_num, scratch[5]);
 
- if (! ((UiSkinnedHorizontalSlider *) mainwin_sposition)->pressed)
+ if (! hslider_get_pressed (mainwin_sposition))
 {
- ui_skinned_textbox_set_text (mainwin_stime_min, scratch);
- ui_skinned_textbox_set_text (mainwin_stime_sec, scratch + 4);
+ textbox_set_text (mainwin_stime_min, scratch);
+ textbox_set_text (mainwin_stime_sec, scratch + 4);
 }
 
 playlistwin_set_time (scratch, scratch + 4);
@@ -2296,16 +1585,16 @@
 {
 if (time < length)
 {
- ui_skinned_horizontal_slider_set_position (mainwin_position, time *
- (gint64) 219 / length);
- ui_skinned_horizontal_slider_set_position (mainwin_sposition, 1 +
- time * (gint64) 12 / length);
+ hslider_set_pos (mainwin_position, time * (gint64) 219 / length);
+ hslider_set_pos (mainwin_sposition, 1 + time * (gint64) 12 / length);
 }
 else
 {
- ui_skinned_horizontal_slider_set_position (mainwin_position, 219);
- ui_skinned_horizontal_slider_set_position (mainwin_sposition, 13);
+ hslider_set_pos (mainwin_position, 219);
+ hslider_set_pos (mainwin_sposition, 13);
 }
+
+ mainwin_spos_set_knob ();
 }
 }
 
@@ -2334,42 +1623,40 @@
 
 /* toggleactionentries actions */
 
-void
-action_anamode_peaks( GtkToggleAction * action )
+void action_anamode_peaks (GtkToggleAction * action)
 {
- config.analyzer_peaks = gtk_toggle_action_get_active( action );
+ config.analyzer_peaks = gtk_toggle_action_get_active (action);
+ ui_vis_clear_data (mainwin_vis);
+ ui_svis_clear_data (mainwin_svis);
 }
 
-void
-action_autoscroll_songname( GtkToggleAction * action )
+void action_autoscroll_songname (GtkToggleAction * action)
 {
- mainwin_set_title_scroll(gtk_toggle_action_get_active(action));
- playlistwin_set_sinfo_scroll(config.autoscroll); /* propagate scroll setting to playlistwin_sinfo */
+ config.autoscroll = gtk_toggle_action_get_active (action);
+ textbox_set_scroll (mainwin_info, config.autoscroll);
+ textbox_set_scroll (playlistwin_sinfo, config.autoscroll);
 }
 
-void
-action_playback_noplaylistadvance( GtkToggleAction * action )
+void action_playback_noplaylistadvance (GtkToggleAction * action)
 {
 aud_cfg->no_playlist_advance = gtk_toggle_action_get_active( action );
 
 if (aud_cfg->no_playlist_advance)
- show_status_message (_("Single mode."));
+ mainwin_show_status_message (_("Single mode."));
 else
- show_status_message (_("Playlist mode."));
+ mainwin_show_status_message (_("Playlist mode."));
 }
 
-void
-action_playback_repeat( GtkToggleAction * action )
+void action_playback_repeat (GtkToggleAction * action)
 {
 aud_cfg->repeat = gtk_toggle_action_get_active( action );
- ui_skinned_button_set_inside(mainwin_repeat, aud_cfg->repeat);
+ button_set_active (mainwin_repeat, aud_cfg->repeat);
 }
 
-void
-action_playback_shuffle( GtkToggleAction * action )
+void action_playback_shuffle (GtkToggleAction * action)
 {
 aud_cfg->shuffle = gtk_toggle_action_get_active( action );
- ui_skinned_button_set_inside(mainwin_shuffle, aud_cfg->shuffle);
+ button_set_active (mainwin_shuffle, aud_cfg->shuffle);
 }
 
 void action_stop_after_current_song (GtkToggleAction * action)
@@ -2379,78 +1666,40 @@
 if (active != aud_cfg->stopaftersong)
 {
 if (active)
- show_status_message (_("Stopping after song."));
+ mainwin_show_status_message (_("Stopping after song."));
 else
- show_status_message (_("Not stopping after song."));
+ mainwin_show_status_message (_("Not stopping after song."));
 
 aud_cfg->stopaftersong = active;
 hook_call ("toggle stop after song", NULL);
 }
 }
 
-void
-action_view_always_on_top( GtkToggleAction * action )
-{
- UI_SKINNED_MENUROW(mainwin_menurow)->always_selected = gtk_toggle_action_get_active( action );
- ui_skinned_menurow_update (mainwin_menurow);
- config.always_on_top = UI_SKINNED_MENUROW(mainwin_menurow)->always_selected;
- hint_set_always(config.always_on_top);
-}
-
-void
-action_view_scaled( GtkToggleAction * action )
+void action_view_always_on_top (GtkToggleAction * action)
 {
- UI_SKINNED_MENUROW(mainwin_menurow)->scale_selected = gtk_toggle_action_get_active( action );
+ config.always_on_top = gtk_toggle_action_get_active (action);
 ui_skinned_menurow_update (mainwin_menurow);
- set_scaled(UI_SKINNED_MENUROW(mainwin_menurow)->scale_selected);
- gdk_flush();
-}
-
-void
-action_view_easymove( GtkToggleAction * action )
-{
- config.easy_move = gtk_toggle_action_get_active( action );
+ hint_set_always (config.always_on_top);
 }
 
-void
-action_view_on_all_workspaces( GtkToggleAction * action )
+void action_view_on_all_workspaces (GtkToggleAction * action)
 {
 config.sticky = gtk_toggle_action_get_active( action );
 hint_set_sticky(config.sticky);
 }
 
-void
-action_roll_up_equalizer( GtkToggleAction * action )
+void action_roll_up_player (GtkToggleAction * action)
 {
- equalizerwin_set_shade_menu_cb(gtk_toggle_action_get_active(action));
-}
-
-void
-action_roll_up_player( GtkToggleAction * action )
-{
- mainwin_set_shade_menu_cb(gtk_toggle_action_get_active(action));
-}
-
-void
-action_roll_up_playlist_editor( GtkToggleAction * action )
-{
- playlistwin_set_shade(gtk_toggle_action_get_active(action));
-}
-
-void
-action_show_equalizer( GtkToggleAction * action )
-{
- equalizerwin_show (gtk_toggle_action_get_active (action));
-}
+ config.player_shaded = gtk_toggle_action_get_active (action);
+ window_set_shaded (mainwin, config.player_shaded);
 
-void
-action_show_playlist_editor( GtkToggleAction * action )
-{
- playlistwin_show (gtk_toggle_action_get_active (action));
+ gint width = config.player_shaded ? MAINWIN_SHADED_WIDTH : active_skin->properties.mainwin_width;
+ gint height = config.player_shaded ? MAINWIN_SHADED_HEIGHT : active_skin->properties.mainwin_height;
+ window_set_size (mainwin, width, height);
+ mainwin_set_shape ();
 }
 
-void
-action_show_player( GtkToggleAction * action )
+void action_show_player (GtkToggleAction * action)
 {
 mainwin_show(gtk_toggle_action_get_active(action));
 }
@@ -2458,83 +1707,83 @@
 
 /* radioactionentries actions (one callback for each radio group) */
 
-void
-action_anafoff( GtkAction *action, GtkRadioAction *current )
+void action_anafoff (GtkAction * action, GtkRadioAction * current)
 {
- mainwin_vis_set_afalloff(gtk_radio_action_get_current_value(current));
+ config.analyzer_falloff = gtk_radio_action_get_current_value (current);
+ ui_vis_clear_data (mainwin_vis);
+ ui_svis_clear_data (mainwin_svis);
 }
 
-void
-action_anamode( GtkAction *action, GtkRadioAction *current )
+void action_anamode (GtkAction * action, GtkRadioAction * current)
 {
- mainwin_vis_set_analyzer_mode(gtk_radio_action_get_current_value(current));
+ config.analyzer_mode = gtk_radio_action_get_current_value (current);
+ ui_vis_clear_data (mainwin_vis);
+ ui_svis_clear_data (mainwin_svis);
 }
 
-void
-action_anatype( GtkAction *action, GtkRadioAction *current )
+void action_anatype (GtkAction * action, GtkRadioAction * current)
 {
- mainwin_vis_set_analyzer_type(gtk_radio_action_get_current_value(current));
+ config.analyzer_type = gtk_radio_action_get_current_value (current);
+ ui_vis_clear_data (mainwin_vis);
+ ui_svis_clear_data (mainwin_svis);
 }
 
-void
-action_peafoff( GtkAction *action, GtkRadioAction *current )
+void action_peafoff (GtkAction * action, GtkRadioAction * current)
 {
- mainwin_vis_set_pfalloff(gtk_radio_action_get_current_value(current));
+ config.peaks_falloff = gtk_radio_action_get_current_value (current);
+ ui_vis_clear_data (mainwin_vis);
+ ui_svis_clear_data (mainwin_svis);
 }
 
-void
-action_scomode( GtkAction *action, GtkRadioAction *current )
+void action_scomode (GtkAction * action, GtkRadioAction * current)
 {
- config.scope_mode = gtk_radio_action_get_current_value(current);
+ config.scope_mode = gtk_radio_action_get_current_value (current);
+ ui_vis_clear_data (mainwin_vis);
+ ui_svis_clear_data (mainwin_svis);
 }
 
-void
-action_vismode( GtkAction *action, GtkRadioAction *current )
+void action_vismode (GtkAction * action, GtkRadioAction * current)
 {
- mainwin_vis_set_type_menu_cb(gtk_radio_action_get_current_value(current));
+ config.vis_type = gtk_radio_action_get_current_value (current);
+ ui_vis_clear_data (mainwin_vis);
+ ui_svis_clear_data (mainwin_svis);
+
+ start_stop_visual (FALSE);
 }
 
-void
-action_vprmode( GtkAction *action, GtkRadioAction *current )
+void action_vprmode (GtkAction * action, GtkRadioAction * current)
 {
 config.voiceprint_mode = gtk_radio_action_get_current_value(current);
+ ui_vis_clear_data (mainwin_vis);
+ ui_svis_clear_data (mainwin_svis);
 }
 
-void
-action_wshmode( GtkAction *action, GtkRadioAction *current )
+void action_wshmode (GtkAction * action, GtkRadioAction * current)
 {
 config.vu_mode = gtk_radio_action_get_current_value(current);
+ ui_vis_clear_data (mainwin_vis);
+ ui_svis_clear_data (mainwin_svis);
 }
 
-void
-action_viewtime( GtkAction *action, GtkRadioAction *current )
+void action_viewtime (GtkAction * action, GtkRadioAction * current)
 {
- set_timer_mode_menu_cb(gtk_radio_action_get_current_value(current));
+ config.timer_mode = gtk_radio_action_get_current_value (current);
 }
 
 
 /* actionentries actions */
 
-void
-action_about_audacious( void )
-{
- audgui_show_about_window();
-}
-
-void
-action_play_file( void )
+void action_play_file (void)
 {
 audgui_run_filebrowser(TRUE); /* TRUE = PLAY_BUTTON */
 }
 
-void
-action_play_location( void )
+void action_play_location (void)
 {
 audgui_show_add_url_window (TRUE);
 }
 
-void
-action_ab_set( void )
+void action_ab_set (void)
 {
 if (aud_drct_get_length () > 0)
 {
@@ -2560,8 +1809,7 @@
 }
 }
 
-void
-action_ab_clear( void )
+void action_ab_clear (void)
 {
 if (aud_drct_get_length () > 0)
 {
@@ -2569,69 +1817,3 @@
 mainwin_release_info_text();
 }
 }
-
-void
-action_current_track_info( void )
-{
- audgui_infowin_show_current ();
-}
-
-void
-action_jump_to_file( void )
-{
- audgui_jump_to_track();
-}
-
-void
-action_jump_to_playlist_start( void )
-{
- aud_drct_pl_set_pos (0);
-}
-
-void
-action_jump_to_time( void )
-{
- mainwin_jump_to_time();
-}
-
-void
-action_playback_next( void )
-{
- aud_drct_pl_next ();
-}
-
-void
-action_playback_previous( void )
-{
- aud_drct_pl_prev ();
-}
-
-void
-action_playback_play( void )
-{
- mainwin_play_pushed();
-}
-
-void
-action_playback_pause( void )
-{
- aud_drct_pause();
-}
-
-void
-action_playback_stop( void )
-{
- mainwin_stop_pushed();
-}
-
-void
-action_preferences( void )
-{
- show_preferences_window(TRUE);
-}
-
-void
-action_quit( void )
-{
- aud_drct_quit ();
-}

audacious-plugins-2.5.3.tar.gz/src/skins/ui_main.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_main.h Changed

@@ -20,81 +20,24 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_MAIN_H
-#define AUDACIOUS_UI_MAIN_H
+#ifndef SKINS_UI_MAIN_H
+#define SKINS_UI_MAIN_H
 
 #include <gtk/gtk.h>
 
-#include "ui_vis.h"
-#include "ui_svis.h"
-
 /* yes, main window size is fixed */
 #define MAINWIN_WIDTH (gint)275
 #define MAINWIN_HEIGHT (gint)116
 #define MAINWIN_TITLEBAR_HEIGHT (gint)14
 #define MAINWIN_SHADED_WIDTH MAINWIN_WIDTH
 #define MAINWIN_SHADED_HEIGHT MAINWIN_TITLEBAR_HEIGHT
-#define MAINWIN_SCALE_FACTOR (config.scaled ? config.scale_factor : 1)
-
-#define MAINWIN_DEFAULT_POS_X 20
-#define MAINWIN_DEFAULT_POS_Y 20
-
-#define MAINWIN_DEFAULT_FONT "Sans Bold 9"
-
 
 typedef enum {
 TIMER_ELAPSED,
 TIMER_REMAINING
 } TimerMode;
 
-enum {
- MAINWIN_GENERAL_ABOUT,
-
- MAINWIN_GENERAL_PLAYFILE,
- MAINWIN_GENERAL_PLAYLOCATION,
-
- MAINWIN_GENERAL_FILEINFO,
- MAINWIN_GENERAL_PREFS,
-
- MAINWIN_GENERAL_SHOWMWIN,
- MAINWIN_GENERAL_SHOWPLWIN,
-
- MAINWIN_GENERAL_FOCUSMWIN,
- MAINWIN_GENERAL_FOCUSPLWIN,
-
- MAINWIN_GENERAL_SHOWEQWIN,
- MAINWIN_GENERAL_EXIT,
-
- MAINWIN_GENERAL_PREV,
- MAINWIN_GENERAL_PLAY,
- MAINWIN_GENERAL_PAUSE,
- MAINWIN_GENERAL_STOP,
- MAINWIN_GENERAL_NEXT,
- MAINWIN_GENERAL_STOPFADE,
- MAINWIN_GENERAL_BACK5SEC,
- MAINWIN_GENERAL_FWD5SEC,
- MAINWIN_GENERAL_START,
- MAINWIN_GENERAL_BACK10,
- MAINWIN_GENERAL_FWD10,
- MAINWIN_GENERAL_JTT,
- MAINWIN_GENERAL_JTF,
- MAINWIN_GENERAL_QUEUE,
- MAINWIN_GENERAL_CQUEUE,
- MAINWIN_GENERAL_VOLUP,
- MAINWIN_GENERAL_VOLDOWN,
- MAINWIN_GENERAL_SETAB,
- MAINWIN_GENERAL_CLEARAB,
-
- MAINWIN_GENERAL_NEXT_PL,
- MAINWIN_GENERAL_PREV_PL,
- MAINWIN_GENERAL_NEW_PL
-};
-
 extern GtkWidget *mainwin;
-extern GtkWidget *err;
-
-extern gboolean mainwin_moving;
-extern gboolean mainwin_focus;
 
 extern GtkWidget *mainwin_eq, *mainwin_pl;
 extern GtkWidget *mainwin_info;
@@ -113,18 +56,8 @@
 
 void mainwin_create(void);
 void mainwin_unhook (void);
-void ui_main_set_initial_volume(void);
 
-void mainwin_lock_info_text(const gchar * text);
-void mainwin_release_info_text(void);
 void mainwin_play_pushed(void);
-void mainwin_stop_pushed(void);
-void mainwin_eject_pushed(void);
-
-void mainwin_rev_pushed(void);
-void mainwin_rev_release(void);
-void mainwin_fwd_pushed(void);
-void mainwin_fwd_release(void);
 
 void mainwin_adjust_volume_motion(gint v);
 void mainwin_adjust_volume_release(void);
@@ -133,32 +66,18 @@
 void mainwin_set_volume_slider(gint percent);
 void mainwin_set_balance_slider(gint percent);
 
-void mainwin_vis_set_type(VisType mode);
-
 void mainwin_refresh_hints(void);
 void mainwin_set_song_title (const gchar * title);
 void mainwin_set_song_info(gint rate, gint freq, gint nch);
 void mainwin_clear_song_info(void);
-void mainwin_set_noplaylistadvance(gboolean no_advance);
 
-void mainwin_set_sticky (gboolean sticky);
-void mainwin_set_always_on_top(gboolean always);
 void mainwin_set_shape (void);
-void mainwin_set_volume_diff(gint diff);
-void mainwin_set_balance_diff(gint diff);
 
 void mainwin_show(gboolean);
-void mainwin_move(gint x, gint y);
-void mainwin_shuffle_pushed(gboolean toggled);
-void mainwin_repeat_pushed(gboolean toggled);
 void mainwin_disable_seekbar(void);
-void mainwin_set_title(const gchar * text);
-void mainwin_minimize_cb(void);
-void mainwin_general_menu_callback(gpointer cb_data,
- guint action,
- GtkWidget * widget);
 
 void mainwin_update_song_info (void);
+void mainwin_show_status_message (const gchar * message);
 void mainwin_enable_status_message (gboolean enable);
 
 void mainwin_drag_data_received(GtkWidget * widget,
@@ -173,17 +92,8 @@
 void mainwin_setup_menus(void);
 gboolean change_timer_mode_cb(GtkWidget *widget, GdkEventButton *event);
 
-void mainwin_jump_to_file(void);
-void mainwin_jump_to_time(void);
-
-void mainwin_ewmh_activate(void);
-
-void mainwin_show_visibility_warning(void);
-
 /* widget should be null if called manually. */
 gboolean mainwin_keypress (GtkWidget * widget, GdkEventKey * event,
 void * unused);
 
-void ui_main_check_theme_engine(void);
-
-#endif /* AUDACIOUS_UI_MAIN_H */
+#endif /* SKINS_UI_MAIN_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_main_evlisteners.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_main_evlisteners.c Changed

@@ -18,7 +18,6 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#include <glib.h>
 #include <math.h>
 
 #include <audacious/audconfig.h>
@@ -27,13 +26,12 @@
 #include <libaudcore/hook.h>
 
 #include "skins_cfg.h"
-#include "ui_equalizer.h"
 #include "ui_main.h"
+#include "ui_main_evlisteners.h"
 #include "ui_manager.h"
-#include "ui_playlist.h"
+#include "ui_skin.h"
 #include "ui_skinned_playstatus.h"
-#include "ui_skinned_textbox.h"
-#include "ui_skinned_window.h"
+#include "ui_vis.h"
 #include "util.h"
 
 static void ui_main_evlistener_title_change (void * data, void * user_data)
@@ -103,13 +101,6 @@
 ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_PLAY);
 }
 
-static void
-ui_main_evlistener_playback_play_file(gpointer hook_data, gpointer user_data)
-{
- if (config.random_skin_on_play)
- skin_set_random_skin();
-}
-
 static void vis_clear_cb (void * unused, void * another)
 {
 ui_vis_clear_data (mainwin_vis);
@@ -128,25 +119,65 @@
 mainwin_set_song_info (bitrate, samplerate, channels);
 }
 
-static void
-ui_main_evlistener_mainwin_set_always_on_top(gpointer hook_data, gpointer user_data)
+/* calculate peak dB level, where 32767 (max of 16-bit PCM range) is 0 dB */
+static gfloat calc_peak_level (gint16 pcm[512])
 {
- gboolean *ontop = (gboolean*)hook_data;
- mainwin_set_always_on_top(*ontop);
-}
+ gint peak = 0;
+ for (gint i = 0; i < 512; i ++)
+ peak = MAX (peak, pcm[i]);
 
-static void
-ui_main_evlistener_mainwin_show(gpointer hook_data, gpointer user_data)
-{
- gboolean show = GPOINTER_TO_INT(hook_data);
- mainwin_show(show);
+ return 20 * log10 (peak / 32767.0);
 }
 
-static void
-ui_main_evlistener_equalizerwin_show(gpointer hook_data, gpointer user_data)
+/* convert linear frequency graph to logarithmic one */
+static void make_log_graph (gint16 freq[256], gint bands, gint db_range, gint
+ int_range, guchar * graph)
 {
- gboolean *show = (gboolean*)hook_data;
- equalizerwin_show(*show);
+ static gint last_bands = 0;
+ static gfloat * xscale = NULL;
+
+ /* conversion table for the x-axis */
+ if (bands != last_bands)
+ {
+ xscale = g_realloc (xscale, sizeof (gfloat) * (bands + 1));
+ for (gint i = 0; i <= bands; i ++)
+ xscale[i] = powf (257, (gfloat) i / bands) - 1;
+
+ last_bands = bands;
+ }
+
+ for (gint i = 0; i < bands; i ++)
+ {
+ /* sum up values in freq array between xscale[i] and xscale[i + 1],
+ including fractional parts */
+ gint a = ceilf (xscale[i]);
+ gint b = floorf (xscale[i + 1]);
+ gint sum = 0;
+
+ if (b < a)
+ sum += freq[b] * (xscale[i + 1] - xscale[i]);
+ else
+ {
+ if (a > 0)
+ sum += freq[a - 1] * (a - xscale[i]);
+ for (; a < b; a ++)
+ sum += freq[a];
+ if (b < 256)
+ sum += freq[b] * (xscale[i + 1] - b);
+ }
+
+ /* fudge factor to make the graph have the same overall height as a
+ 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);
+
+ /* scale (-db_range, 0.0) to (0.0, int_range) */
+ val = (1.0 + val / db_range) * int_range;
+
+ graph[i] = CLAMP (val, 0, int_range);
+ }
 }
 
 static void ui_main_evlistener_visualization_timeout (const VisNode * vis,
@@ -154,160 +185,68 @@
 {
 guint8 intern_vis_data[512];
 gint16 mono_freq[2][256];
- gboolean mono_freq_calced = FALSE;
 gint16 mono_pcm[2][512], stereo_pcm[2][512];
- gboolean mono_pcm_calced = FALSE, stereo_pcm_calced = FALSE;
- gint i;
 
 if (! vis || config.vis_type == VIS_OFF)
 return;
 
- if (config.vis_type == VIS_ANALYZER)
+ switch (config.vis_type)
 {
- /* logarithmic scale - 1 */
- const gfloat xscale13[14] = {0.00, 0.53, 1.35, 2.60, 4.51, 7.45, 12.0,
- 18.8, 29.4, 45.6, 70.4, 108, 167, 256};
- const gfloat xscale19[20] = {0.00, 0.34, 0.79, 1.40, 2.22, 3.31, 4.77,
- 6.72, 9.34, 12.9, 17.6, 23.8, 32.3, 43.6, 58.7, 78.9, 106, 142, 191,
- 256};
- const gfloat xscale37[38] = {0.00, 0.16, 0.35, 0.57, 0.82, 1.12, 1.46,
- 1.86, 2.32, 2.86, 3.48, 4.21, 5.05, 6.03, 7.16, 8.48, 10.0, 11.8, 13.9,
- 16.3, 19.1, 22.3, 26.1, 30.5, 35.6, 41.5, 48.4, 56.4, 65.6, 76.4, 88.9,
- 104, 120, 140, 163, 189, 220, 256};
- const gfloat xscale75[76] = {0.00, 0.08, 0.16, 0.25, 0.34, 0.45, 0.56,
- 0.68, 0.81, 0.95, 1.10, 1.26, 1.43, 1.62, 1.82, 2.03, 2.27, 2.52, 2.79,
- 3.08, 3.39, 3.73, 4.09, 4.48, 4.90, 5.36, 5.85, 6.37, 6.94, 7.55, 8.20,
- 8.91, 9.67, 10.5, 11.4, 12.3, 13.3, 14.4, 15.6, 16.9, 18.3, 19.8, 21.4,
- 23.1, 24.9, 26.9, 29.1, 31.4, 33.9, 36.5, 39.4, 42.5, 45.9, 49.5, 53.3,
- 57.5, 62.0, 66.9, 72.0, 77.7, 83.7, 90.2, 97.2, 105, 113, 122, 131,
- 141, 152, 164, 177, 190, 205, 221, 238, 256};
-
- const gfloat * xscale;
- gint bands, i;
+ case VIS_ANALYZER:
+ aud_calc_mono_freq (mono_freq, vis->data, vis->nch);
 
 if (config.analyzer_type == ANALYZER_BARS)
 {
 if (config.player_shaded)
- {
- bands = 13;
- xscale = xscale13;
- }
+ make_log_graph (mono_freq[0], 13, 40, 8, intern_vis_data);
 else
- {
- bands = 19;
- xscale = xscale19;
- }
+ make_log_graph (mono_freq[0], 19, 40, 16, intern_vis_data);
 }
 else
 {
 if (config.player_shaded)
- {
- bands = 37;
- xscale = xscale37;
- }
+ make_log_graph (mono_freq[0], 37, 40, 8, intern_vis_data);
 else
- {
- bands = 75;
- xscale = xscale75;
- }
+ make_log_graph (mono_freq[0], 75, 40, 16, intern_vis_data);
 }
 
- aud_calc_mono_freq (mono_freq, vis->data, vis->nch);
-
- for (i = 0; i < bands; i ++)
+ break;
+ case VIS_VOICEPRINT:
+ if (config.player_shaded) /* "VU meter" */
 {
- gint a = ceil (xscale[i]);
- gint b = floor (xscale[i + 1]);
- gint n = 0;
+ aud_calc_stereo_pcm (stereo_pcm, vis->data, vis->nch);
 
- if (b < a)
- n += mono_freq[0][b] * (xscale[i + 1] - xscale[i]);
- else
- {
- if (a > 0)
- n += mono_freq[0][a - 1] * (a - xscale[i]);
- for (; a < b; a ++)
- n += mono_freq[0][a];
- if (b < 256)
- n += mono_freq[0][b] * (xscale[i + 1] - b);
- }
+ gint level = 38 + calc_peak_level (stereo_pcm[0]);
+ intern_vis_data[0] = CLAMP (level, 0, 38);
 
- /* 30 dB range, amplified 10 dB + extra for narrower bands */
- /* 0.000235 == 1 / 13 / 32767 * 10^(40/20) */
- n = 10 * log10 (n * bands * 0.000235);
- intern_vis_data[i] = CLAMP (n, 0, 15);
- }
- }
- else if(config.vis_type == VIS_VOICEPRINT){
- if (config.player_shaded) {
- /* VU */
- gint vu, val;
-
- if (!stereo_pcm_calced)
- aud_calc_stereo_pcm(stereo_pcm, vis->data, vis->nch);
- vu = 0;
- for (i = 0; i < 512; i++) {
- val = abs(stereo_pcm[0][i]);
- if (val > vu)
- vu = val;
- }
- intern_vis_data[0] = (vu * 37) >> 15;
- if (intern_vis_data[0] > 37)
- intern_vis_data[0] = 37;
- if (vis->nch == 2) {
- vu = 0;
- for (i = 0; i < 512; i++) {
- val = abs(stereo_pcm[1][i]);
- if (val > vu)
- vu = val;
- }
- intern_vis_data[1] = (vu * 37) >> 15;
- if (intern_vis_data[1] > 37)
- intern_vis_data[1] = 37;
+ if (vis->nch == 2)
+ {
+ level = 38 + calc_peak_level (stereo_pcm[1]);
+ intern_vis_data[1] = CLAMP (level, 0, 38);
 }
 else
 intern_vis_data[1] = intern_vis_data[0];
 }
- else { /*Voiceprint*/
- if (!mono_freq_calced)
- aud_calc_mono_freq(mono_freq, vis->data, vis->nch);
- memset(intern_vis_data, 0, 256);
-
- /* For the values [0-16] we use the frequency that's 3/2 as much.
- If we assume the 512 values calculated by calc_mono_freq to
- cover 0-22kHz linearly we get a range of
- [0-16] * 3/2 * 22000/512 = [0-1,031] Hz.
- Most stuff above that is harmonics and we want to utilize the
- 16 samples we have to the max[tm]
- */
- for (i = 0; i < 50 ; i+=3){
- intern_vis_data[i/3] += (mono_freq[0][i/2] >> 5);
-
- /*Boost frequencies above 257Hz a little*/
- //if(i > 4 * 3)
- // intern_vis_data[i/3] += 8;
- }
+ else
+ {
+ aud_calc_mono_freq (mono_freq, vis->data, vis->nch);
+ make_log_graph (mono_freq[0], 17, 40, 255, intern_vis_data);
 }
- }
- else { /* (config.vis_type == VIS_SCOPE) */
-
- /* Oscilloscope */
- gint pos, step;
-
- if (!mono_pcm_calced)
- aud_calc_mono_pcm(mono_pcm, vis->data, vis->nch);
-
- step = (vis->length << 8) / 74;
- for (i = 0, pos = 0; i < 75; i++, pos += step) {
- intern_vis_data[i] = ((mono_pcm[0][pos >> 8]) >> 12) + 7;
- if (intern_vis_data[i] == 255)
- intern_vis_data[i] = 0;
- else if (intern_vis_data[i] > 12)
- intern_vis_data[i] = 12;
- /* Do not see the point of that? (comparison always false) -larne.
- if (intern_vis_data[i] < 0)
- intern_vis_data[i] = 0; */
+
+ 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;
 }
+
+ break;
 }
 
 if (config.player_shaded)
@@ -325,12 +264,8 @@
 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("playback play file", ui_main_evlistener_playback_play_file, NULL);
 hook_associate ("visualization clear", vis_clear_cb, NULL);
 hook_associate ("info change", (HookFunction) info_change, NULL);
- hook_associate("mainwin set always on top", ui_main_evlistener_mainwin_set_always_on_top, NULL);
- hook_associate("mainwin show", ui_main_evlistener_mainwin_show, NULL);
- hook_associate("equalizerwin show", ui_main_evlistener_equalizerwin_show, NULL);
 
 hook_associate("playback seek", (HookFunction) mainwin_update_song_info, NULL);
 hook_associate ("toggle stop after song", stop_after_song_toggled, NULL);
@@ -345,12 +280,8 @@
 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("playback play file", ui_main_evlistener_playback_play_file);
 hook_dissociate ("visualization clear", vis_clear_cb);
 hook_dissociate ("info change", (HookFunction) info_change);
- hook_dissociate("mainwin set always on top", ui_main_evlistener_mainwin_set_always_on_top);
- hook_dissociate("mainwin show", ui_main_evlistener_mainwin_show);
- hook_dissociate("equalizerwin show", ui_main_evlistener_equalizerwin_show);
 
 hook_dissociate("playback seek", (HookFunction) mainwin_update_song_info);
 hook_dissociate ("toggle stop after song", stop_after_song_toggled);

audacious-plugins-2.5.3.tar.gz/src/skins/ui_main_evlisteners.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_main_evlisteners.h Changed

audacious-plugins-2.5.3.tar.gz/src/skins/ui_manager.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_manager.c Changed

@@ -1,5 +1,5 @@
 /* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2007 Audacious development team.
+ * Copyright (C) 2005-2011 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
@@ -17,31 +17,46 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#include <limits.h>
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "ui_manager.h"
-#include "actions-mainwin.h"
-#include "actions-playlist.h"
-#include "actions-equalizer.h"
-
-/* TODO ui_main.h is only included because ui_manager.c needs the values of
- TimerMode enum; move that enum elsewhere so we can get rid of this include */
-#include "ui_main.h"
-
-#if 0
-#include "sync-menu.h"
-#endif
-#include "plugin.h"
-
+#include <audacious/drct.h>
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
+#include "actions-equalizer.h"
+#include "actions-mainwin.h"
+#include "actions-playlist.h"
+#include "config.h"
+#include "skins_cfg.h"
+#include "ui_main.h"
+#include "ui_manager.h"
+#include "ui_vis.h"
+
+static GtkWidget * ui_manager_get_popup_menu (GtkUIManager * self, const gchar *
+ path);
+
+GtkActionGroup *toggleaction_group_others;
+GtkActionGroup *radioaction_group_anamode; /* Analyzer mode */
+GtkActionGroup *radioaction_group_anatype; /* Analyzer type */
+GtkActionGroup *radioaction_group_scomode; /* Scope mode */
+GtkActionGroup *radioaction_group_vprmode; /* Voiceprint mode */
+GtkActionGroup *radioaction_group_wshmode; /* WindowShade VU mode */
+GtkActionGroup *radioaction_group_anafoff; /* Analyzer Falloff */
+GtkActionGroup *radioaction_group_peafoff; /* Peak Falloff */
+GtkActionGroup *radioaction_group_vismode; /* Visualization mode */
+GtkActionGroup *radioaction_group_viewtime; /* View time (remaining/elapsed) */
+
+static GtkActionGroup *action_group_playback;
+static GtkActionGroup *action_group_visualization;
+static GtkActionGroup *action_group_view;
+static GtkActionGroup *action_group_others;
+static GtkActionGroup *action_group_playlist;
+static GtkActionGroup *action_group_playlist_add;
+static GtkActionGroup *action_group_playlist_select;
+static GtkActionGroup *action_group_playlist_delete;
+static GtkActionGroup *action_group_playlist_sort;
+static GtkActionGroup *action_group_equalizer;
+
 static GtkUIManager *ui_manager = NULL;
 static GList * attached_menus = NULL;
 
@@ -90,12 +105,6 @@
 
 { "roll up equalizer", NULL , N_("Roll up Equalizer"), "<Ctrl><Alt>W",
 N_("Roll up Equalizer"), G_CALLBACK(action_roll_up_equalizer) , FALSE },
-
- { "view scaled", NULL , N_("Scale"), "<Ctrl>D",
- N_("DoubleSize"), G_CALLBACK(action_view_scaled) , FALSE },
-
- { "view easy move", NULL , N_("Easy Move"), "<Ctrl>E",
- N_("Easy Move"), G_CALLBACK(action_view_easymove) , FALSE }
 };
 
 
@@ -167,19 +176,19 @@
 { "playback", NULL, N_("Playback") },
 
 { "playback play", GTK_STOCK_MEDIA_PLAY , N_("Play"), "X",
- N_("Play"), G_CALLBACK(action_playback_play) },
+ N_("Play"), G_CALLBACK(aud_drct_play) },
 
 { "playback pause", GTK_STOCK_MEDIA_PAUSE , N_("Pause"), "C",
- N_("Pause"), G_CALLBACK(action_playback_pause) },
+ N_("Pause"), G_CALLBACK(aud_drct_pause) },
 
 { "playback stop", GTK_STOCK_MEDIA_STOP , N_("Stop"), "V",
- N_("Stop"), G_CALLBACK(action_playback_stop) },
+ N_("Stop"), G_CALLBACK(aud_drct_stop) },
 
 { "playback previous", GTK_STOCK_MEDIA_PREVIOUS , N_("Previous"), "Z",
- N_("Previous"), G_CALLBACK(action_playback_previous) },
+ N_("Previous"), G_CALLBACK(aud_drct_pl_prev) },
 
 { "playback next", GTK_STOCK_MEDIA_NEXT , N_("Next"), "B",
- N_("Next"), G_CALLBACK(action_playback_next) }
+ N_("Next"), G_CALLBACK(aud_drct_pl_next) }
 };
 
 
@@ -211,10 +220,11 @@
 N_("Delete Playlist"), G_CALLBACK(action_playlist_delete) },
 
 {"playlist load", GTK_STOCK_OPEN, N_("Import Playlist"), "O",
- N_("Loads a playlist file into the selected playlist."), G_CALLBACK(action_playlist_load_list) },
+ N_("Loads a playlist file into the selected playlist."), (GCallback)
+ audgui_import_playlist},
 
 {"playlist save", GTK_STOCK_SAVE, N_("Export Playlist"), "<Shift>S",
- N_("Saves the selected playlist."), G_CALLBACK(action_playlist_save_list) },
+ 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 "
@@ -226,13 +236,14 @@
 G_CALLBACK(action_playlist_refresh_list) },
 
 { "playlist manager", AUD_STOCK_PLAYLIST , N_("List Manager"), "P",
- N_("Opens the playlist manager."),
- G_CALLBACK(action_open_list_manager) }
+ N_("Opens the playlist manager."), (GCallback) audgui_playlist_manager}
 };
 
 static GtkActionEntry action_entries_view[] = {
 {"view", NULL, N_("View")},
- {"iface menu", NULL, N_("Interface")}};
+ {"iface menu", NULL, N_("Interface")},
+ {"iface prefs", GTK_STOCK_PREFERENCES, N_("Interface Preferences ..."), NULL,
+ NULL, (GCallback) skins_configure}};
 
 static GtkActionEntry action_entries_playlist_add[] = {
 { "playlist add url", GTK_STOCK_NETWORK, N_("Add Internet Address..."), "<Ctrl>H",
@@ -379,13 +390,13 @@
 { "plugins-menu", AUD_STOCK_PLUGIN, N_("Plugin Services") },
 
 { "current track info", GTK_STOCK_INFO , N_("View Track Details"), "I",
- N_("View track details"), G_CALLBACK(action_current_track_info) },
+ N_("View track details"), G_CALLBACK(audgui_infowin_show_current) },
 
 { "playlist track info", GTK_STOCK_INFO , N_("View Track Details"), "<Alt>I",
 N_("View track details"), G_CALLBACK(action_playlist_track_info) },
 
 { "about audacious", GTK_STOCK_DIALOG_INFO , N_("About Audacious"), NULL,
- N_("About Audacious"), G_CALLBACK(action_about_audacious) },
+ N_("About Audacious"), G_CALLBACK(audgui_show_about_window) },
 
 { "play file", GTK_STOCK_OPEN , N_("Play File"), "L",
 N_("Load and play a file"), G_CALLBACK(action_play_file) },
@@ -396,10 +407,10 @@
 { "plugins", NULL , N_("Plugin services") },
 
 { "preferences", GTK_STOCK_PREFERENCES , N_("Preferences"), "<Ctrl>P",
- N_("Open preferences window"), G_CALLBACK(action_preferences) },
+ N_("Open preferences window"), G_CALLBACK(aud_show_prefs_window) },
 
 { "quit", GTK_STOCK_QUIT , N_("_Quit"), NULL,
- N_("Quit Audacious"), G_CALLBACK(action_quit) },
+ N_("Quit Audacious"), G_CALLBACK(aud_drct_quit) },
 
 { "ab set", NULL , N_("Set A-B"), "A",
 N_("Set A-B"), G_CALLBACK(action_ab_set) },
@@ -411,10 +422,10 @@
 N_("Jump to Playlist Start"), G_CALLBACK(action_jump_to_playlist_start) },
 
 { "jump to file", GTK_STOCK_JUMP_TO , N_("Jump to File"), "J",
- N_("Jump to File"), G_CALLBACK(action_jump_to_file) },
+ N_("Jump to File"), G_CALLBACK(audgui_jump_to_track) },
 
 { "jump to time", GTK_STOCK_JUMP_TO , N_("Jump to Time"), "<Ctrl>J",
- N_("Jump to Time"), G_CALLBACK(action_jump_to_time) },
+ N_("Jump to Time"), (GCallback) audgui_jump_to_time},
 
 { "queue toggle", AUD_STOCK_QUEUETOGGLE , N_("Queue Toggle"), "Q",
 N_("Enables/disables the entry in the playlist's queue."),
@@ -488,7 +499,7 @@
 ui_manager_new_action_group( const gchar * group_name )
 {
 GtkActionGroup *group = gtk_action_group_new( group_name );
- gtk_action_group_set_translation_domain( group , PACKAGE_NAME );
+ gtk_action_group_set_translation_domain (group, PACKAGE);
 return group;
 }
 
@@ -624,10 +635,6 @@
 return;
 }
 
-#ifdef GDK_WINDOWING_QUARTZ
-static GtkWidget *carbon_menubar;
-#endif
-
 void
 ui_manager_create_menus ( void )
 {
@@ -646,21 +653,6 @@
 return;
 }
 
-#ifdef GDK_WINDOWING_QUARTZ
- snprintf (path, sizeof path, "%s/ui/carbon-menubar.ui", data);
- gtk_ui_manager_add_ui_from_file (ui_manager, path, & gerr);
-
- if ( gerr != NULL )
- {
- g_critical( "Error creating UI<ui/carbon-menubar.ui>: %s" , gerr->message );
- g_error_free( gerr );
- return;
- }
-
- carbon_menubar = ui_manager_get_popup_menu( ui_manager , "/carbon-menubar/main-menu" );
- sync_menu_takeover_menu(GTK_MENU_SHELL(carbon_menubar));
-#endif
-
 snprintf (path, sizeof path, "%s/ui/playlist.ui", data);
 gtk_ui_manager_add_ui_from_file (ui_manager, path, & gerr);
 
@@ -696,24 +688,24 @@
 templates[UI_MENUS] =
 {
 {"/mainwin-menus/main-menu", "/mainwin-menus/main-menu/plugins-menu",
- AUDACIOUS_MENU_MAIN},
+ AUD_MENU_MAIN},
 {"/mainwin-menus/main-menu/playback", NULL, 0},
 {"/mainwin-menus/main-menu/playlist", NULL, 0},
 {"/mainwin-menus/songname-menu", NULL, 0},
 {"/mainwin-menus/main-menu/view", NULL, 0},
 {"/mainwin-menus/main-menu/visualization", NULL, 0},
 {"/playlist-menus/add-menu", "/playlist-menus/add-menu/plugins-menu",
- AUDACIOUS_MENU_PLAYLIST_ADD},
+ AUD_MENU_PLAYLIST_ADD},
 {"/playlist-menus/del-menu", "/playlist-menus/del-menu/plugins-menu",
- AUDACIOUS_MENU_PLAYLIST_REMOVE},
+ AUD_MENU_PLAYLIST_REMOVE},
 {"/playlist-menus/select-menu", "/playlist-menus/select-menu/"
- "plugins-menu", AUDACIOUS_MENU_PLAYLIST_SELECT},
+ "plugins-menu", AUD_MENU_PLAYLIST_SELECT},
 {"/playlist-menus/misc-menu", "/playlist-menus/misc-menu/plugins-menu",
- AUDACIOUS_MENU_PLAYLIST_MISC},
+ AUD_MENU_PLAYLIST_MISC},
 {"/playlist-menus/playlist-menu", "/playlist-menus/playlist-menu/"
- "plugins-menu", AUDACIOUS_MENU_PLAYLIST},
+ "plugins-menu", AUD_MENU_PLAYLIST},
 {"/playlist-menus/playlist-rightclick-menu", "/playlist-menus/"
- "playlist-rightclick-menu/plugins-menu", AUDACIOUS_MENU_PLAYLIST_RCLICK},
+ "playlist-rightclick-menu/plugins-menu", AUD_MENU_PLAYLIST_RCLICK},
 {"/equalizer-menus/preset-menu", NULL, 0},
 };
 
@@ -760,9 +752,8 @@
 return gtk_ui_manager_get_accel_group( ui_manager );
 }
 
-
-GtkWidget *
-ui_manager_get_popup_menu ( GtkUIManager * self , const gchar * path )
+static GtkWidget * ui_manager_get_popup_menu (GtkUIManager * self, const gchar *
+ path)
 {
 GtkWidget *menu_item = gtk_ui_manager_get_widget( self , path );
 
@@ -860,4 +851,3 @@
 g_object_unref(G_OBJECT(action_group_equalizer));
 g_object_unref(G_OBJECT(ui_manager));
 }
-

audacious-plugins-2.5.3.tar.gz/src/skins/ui_manager.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_manager.h Changed

@@ -17,14 +17,11 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_MANAGER_H
-#define AUDACIOUS_UI_MANAGER_H
+#ifndef SKINS_UI_MANAGER_H
+#define SKINS_UI_MANAGER_H
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS
-
 enum
 {
 UI_MENU_MAIN,
@@ -43,36 +40,22 @@
 UI_MENUS
 };
 
-GtkActionGroup *toggleaction_group_others;
-GtkActionGroup *radioaction_group_anamode; /* Analyzer mode */
-GtkActionGroup *radioaction_group_anatype; /* Analyzer type */
-GtkActionGroup *radioaction_group_scomode; /* Scope mode */
-GtkActionGroup *radioaction_group_vprmode; /* Voiceprint mode */
-GtkActionGroup *radioaction_group_wshmode; /* WindowShade VU mode */
-GtkActionGroup *radioaction_group_anafoff; /* Analyzer Falloff */
-GtkActionGroup *radioaction_group_peafoff; /* Peak Falloff */
-GtkActionGroup *radioaction_group_vismode; /* Visualization mode */
-GtkActionGroup *radioaction_group_viewtime; /* View time (remaining/elapsed) */
-GtkActionGroup *action_group_playback;
-GtkActionGroup *action_group_visualization;
-GtkActionGroup *action_group_view;
-GtkActionGroup *action_group_others;
-GtkActionGroup *action_group_playlist;
-GtkActionGroup *action_group_playlist_add;
-GtkActionGroup *action_group_playlist_select;
-GtkActionGroup *action_group_playlist_delete;
-GtkActionGroup *action_group_playlist_sort;
-GtkActionGroup *action_group_equalizer;
-
+extern GtkActionGroup *toggleaction_group_others;
+extern GtkActionGroup *radioaction_group_anamode; /* Analyzer mode */
+extern GtkActionGroup *radioaction_group_anatype; /* Analyzer type */
+extern GtkActionGroup *radioaction_group_scomode; /* Scope mode */
+extern GtkActionGroup *radioaction_group_vprmode; /* Voiceprint mode */
+extern GtkActionGroup *radioaction_group_wshmode; /* WindowShade VU mode */
+extern GtkActionGroup *radioaction_group_anafoff; /* Analyzer Falloff */
+extern GtkActionGroup *radioaction_group_peafoff; /* Peak Falloff */
+extern GtkActionGroup *radioaction_group_vismode; /* Visualization mode */
+extern GtkActionGroup *radioaction_group_viewtime; /* View time (remaining/elapsed) */
 
 void ui_manager_init ( void );
 void ui_manager_create_menus ( void );
 GtkAccelGroup * ui_manager_get_accel_group ( void );
-GtkWidget * ui_manager_get_popup_menu ( GtkUIManager * , const gchar * );
 void ui_popup_menu_show(gint id, gint x, gint y, gboolean leftward, gboolean
 upward, gint button, gint time);
 void ui_manager_destroy( void );
 
-G_END_DECLS
-
-#endif /* AUDACIOUS_UI_MANAGER_H */
+#endif /* SKINS_UI_MANAGER_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_playlist.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_playlist.c Changed

@@ -1,5 +1,5 @@
 /* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2009 Audacious development team.
+ * Copyright (C) 2005-2011 Audacious development team.
 *
 * BMP - Cross-platform multimedia player
 * Copyright (C) 2003-2004 BMP development team.
@@ -23,54 +23,46 @@
 * Audacious or using our public API to be a derived work.
 */
 
-/* #define AUD_DEBUG 1 */
-
-#include "ui_playlist.h"
+#include <inttypes.h>
 
-#include <glib.h>
-#include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <string.h>
-
-#include "platform/smartinclude.h"
 
-#include <inttypes.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <audacious/audconfig.h>
 #include <audacious/debug.h>
 #include <audacious/drct.h>
+#include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
 #include <audacious/playlist.h>
-#include <libaudcore/audstrings.h>
 #include <libaudcore/hook.h>
 #include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
 
-#include "actions-playlist.h"
+#include "actions-mainwin.h"
+#include "config.h"
 #include "dnd.h"
-#include "plugin.h"
-#include "ui_dock.h"
-#include "ui_equalizer.h"
+#include "drag-handle.h"
+#include "skins_cfg.h"
 #include "ui_main.h"
 #include "ui_manager.h"
-#include "ui_playlist_evlisteners.h"
-#include "util.h"
-#include "ui_skinned_window.h"
+#include "ui_playlist.h"
 #include "ui_skinned_button.h"
-#include "ui_skinned_textbox.h"
-#include "ui_skinned_playlist_slider.h"
 #include "ui_skinned_playlist.h"
+#include "ui_skinned_playlist_slider.h"
+#include "ui_skinned_textbox.h"
+#include "ui_skinned_window.h"
 
 #include "images/audacious_playlist.xpm"
 
+#define PLAYLISTWIN_MIN_WIDTH MAINWIN_WIDTH
+#define PLAYLISTWIN_MIN_HEIGHT MAINWIN_HEIGHT
+#define PLAYLISTWIN_WIDTH_SNAP 25
+#define PLAYLISTWIN_HEIGHT_SNAP 29
+#define PLAYLISTWIN_SHADED_HEIGHT MAINWIN_SHADED_HEIGHT
+
 gint active_playlist;
 gchar * active_title;
 glong active_length;
-GtkWidget * playlistwin, * playlistwin_list;
+GtkWidget * playlistwin, * playlistwin_list, * playlistwin_sinfo;
 
 static GMutex *resize_mutex = NULL;
 
@@ -79,11 +71,14 @@
 
 static GtkWidget *playlistwin_slider;
 static GtkWidget *playlistwin_time_min, *playlistwin_time_sec;
-static GtkWidget *playlistwin_info, *playlistwin_sinfo;
+static GtkWidget *playlistwin_info;
 static GtkWidget *playlistwin_srew, *playlistwin_splay;
 static GtkWidget *playlistwin_spause, *playlistwin_sstop;
 static GtkWidget *playlistwin_sfwd, *playlistwin_seject;
 static GtkWidget *playlistwin_sscroll_up, *playlistwin_sscroll_down;
+static GtkWidget * resize_handle, * sresize_handle;
+static GtkWidget * button_add, * button_sub, * button_sel, * button_misc,
+ * button_list;
 
 static void playlistwin_select_search_cbt_cb(GtkWidget *called_cbt,
 gpointer other_cbt);
@@ -91,48 +86,10 @@
 GdkEventKey *event,
 gpointer searchdlg_win);
 
-static gboolean playlistwin_resizing = FALSE;
-static gint playlistwin_resize_x, playlistwin_resize_y;
+static gint resize_base_width, resize_base_height;
 static int drop_position;
 static gboolean song_changed;
 
-gboolean
-playlistwin_is_shaded(void)
-{
- return config.playlist_shaded;
-}
-
-gint
-playlistwin_get_width(void)
-{
- config.playlist_width /= PLAYLISTWIN_WIDTH_SNAP;
- config.playlist_width *= PLAYLISTWIN_WIDTH_SNAP;
- return config.playlist_width;
-}
-
-gint
-playlistwin_get_height_unshaded(void)
-{
- config.playlist_height /= PLAYLISTWIN_HEIGHT_SNAP;
- config.playlist_height *= PLAYLISTWIN_HEIGHT_SNAP;
- return config.playlist_height;
-}
-
-gint
-playlistwin_get_height_shaded(void)
-{
- return PLAYLISTWIN_SHADED_HEIGHT;
-}
-
-gint
-playlistwin_get_height(void)
-{
- if (playlistwin_is_shaded())
- return playlistwin_get_height_shaded();
- else
- return playlistwin_get_height_unshaded();
-}
-
 static void playlistwin_update_info (void)
 {
 gchar *text, *sel_text, *tot_text;
@@ -156,7 +113,7 @@
 total / 60, total % 60);
 
 text = g_strconcat(sel_text, "/", tot_text, NULL);
- ui_skinned_textbox_set_text (playlistwin_info, text);
+ textbox_set_text (playlistwin_info, text);
 g_free(text);
 g_free(tot_text);
 g_free(sel_text);
@@ -177,15 +134,17 @@
 if (aud_cfg->show_numbers_in_pl)
 snprintf (scratch, sizeof scratch, "%d. ", 1 + entry);
 
+ gchar * title = aud_playlist_entry_get_title (playlist, entry, FALSE);
 snprintf (scratch + strlen (scratch), sizeof scratch - strlen (scratch),
- "%s", aud_playlist_entry_get_title (playlist, entry, FALSE));
+ "%s", title);
+ g_free (title);
 
 if (length > 0)
 snprintf (scratch + strlen (scratch), sizeof scratch - strlen
 (scratch), " (%d:%02d)", length / 60000, length / 1000 % 60);
 }
 
- ui_skinned_textbox_set_text (playlistwin_sinfo, scratch);
+ textbox_set_text (playlistwin_sinfo, scratch);
 }
 
 static void real_update (void)
@@ -202,85 +161,6 @@
 }
 
 static void
-playlistwin_set_geometry_hints(gboolean shaded)
-{
- GdkGeometry geometry;
-
- geometry.min_width = PLAYLISTWIN_MIN_WIDTH;
- geometry.width_inc = PLAYLISTWIN_WIDTH_SNAP;
- geometry.max_width = 65535;
-
- if (shaded)
- {
- geometry.min_height = PLAYLISTWIN_SHADED_HEIGHT;
- geometry.height_inc = 0;
- geometry.max_height = PLAYLISTWIN_SHADED_HEIGHT;
- }
- else
- {
- geometry.min_height = PLAYLISTWIN_MIN_HEIGHT;
- geometry.height_inc = PLAYLISTWIN_HEIGHT_SNAP;
- geometry.max_height = 65535;
- }
-
- gtk_window_set_geometry_hints ((GtkWindow *) playlistwin, NULL, & geometry,
- GDK_HINT_MIN_SIZE | GDK_HINT_RESIZE_INC | GDK_HINT_MAX_SIZE);
-}
-
-void
-playlistwin_set_sinfo_font(gchar *font)
-{
- gchar *tmp = NULL, *tmp2 = NULL, *tmp3 = NULL;
-
- g_return_if_fail(font);
- AUDDBG("Attempt to set font \"%s\"\n", font);
-
- tmp = g_strdup(font);
- g_return_if_fail(tmp);
-
- tmp3 = strrchr(tmp, ' ');
- if (tmp3 != NULL)
- * tmp3 = '\0';
-
- tmp2 = g_strdup_printf("%s 5", tmp);
- g_return_if_fail(tmp2);
-
- ui_skinned_textbox_set_xfont(playlistwin_sinfo, !config.mainwin_use_bitmapfont, tmp2);
-
- g_free(tmp);
- g_free(tmp2);
-}
-
-void
-playlistwin_set_sinfo_scroll(gboolean scroll)
-{
- if(playlistwin_is_shaded())
- ui_skinned_textbox_set_scroll(playlistwin_sinfo, config.autoscroll);
- else
- ui_skinned_textbox_set_scroll(playlistwin_sinfo, FALSE);
-}
-
-void
-playlistwin_set_shade(gboolean shaded)
-{
- config.playlist_shaded = shaded;
- ui_skinned_window_set_shade(playlistwin, shaded);
-
- if (shaded) {
- playlistwin_set_sinfo_font(config.playlist_font);
- playlistwin_set_sinfo_scroll(config.autoscroll);
- }
- else {
- playlistwin_set_sinfo_scroll(FALSE);
- }
-
- playlistwin_set_geometry_hints(config.playlist_shaded);
-
- dock_shade(get_dock_window_list(), GTK_WINDOW(playlistwin),
- playlistwin_get_height());
-}
-
-static void
 playlistwin_set_shade_menu(gboolean shaded)
 {
 GtkAction *action = gtk_action_group_get_action(
@@ -289,21 +169,12 @@
 playlistwin_update ();
 }
 
-void
+static void
 playlistwin_shade_toggle(void)
 {
 playlistwin_set_shade_menu(!config.playlist_shaded);
 }
 
-static gboolean
-playlistwin_release(GtkWidget * widget,
- GdkEventButton * event,
- gpointer callback_data)
-{
- playlistwin_resizing = FALSE;
- return FALSE;
-}
-
 static void playlistwin_scroll (gboolean up)
 {
 gint rows, first, focused;
@@ -347,11 +218,10 @@
 for (entry = 0; entry < entries; entry ++)
 {
 if (aud_playlist_entry_get_selected (playlist, entry))
- index_append (copy, g_strdup (aud_playlist_entry_get_filename
- (playlist, entry)));
+ index_append (copy, aud_playlist_entry_get_filename (playlist, entry));
 }
 
- aud_playlist_entry_insert_batch (new, 0, copy, NULL);
+ aud_playlist_entry_insert_batch (new, 0, copy, NULL, FALSE);
 aud_playlist_set_active (new);
 }
 
@@ -459,7 +329,8 @@
 0 , 2 , 7 , 8 , GTK_FILL | GTK_EXPAND , GTK_FILL | GTK_EXPAND , 0 , 1 );
 
 gtk_container_set_border_width( GTK_CONTAINER(searchdlg_table) , 5 );
- gtk_container_add( GTK_CONTAINER(GTK_DIALOG(searchdlg_win)->vbox) , searchdlg_table );
+ gtk_container_add ((GtkContainer *) gtk_dialog_get_content_area
+ ((GtkDialog *) searchdlg_win), searchdlg_table);
 gtk_widget_show_all( searchdlg_win );
 result = gtk_dialog_run( GTK_DIALOG(searchdlg_win) );
 
@@ -539,22 +410,21 @@
 ! aud_playlist_entry_get_selected (active_playlist, entry));
 }
 
-static void
-playlistwin_resize(gint width, gint height)
+/* note: height is ignored if the window is shaded */
+static void playlistwin_resize (gint w, gint h)
 {
 gint tx, ty;
- gint dx, dy;
 
- g_return_if_fail(width > 0 && height > 0);
+ g_return_if_fail(w > 0 && h > 0);
 
- tx = (width - PLAYLISTWIN_MIN_WIDTH) / PLAYLISTWIN_WIDTH_SNAP;
+ tx = (w - PLAYLISTWIN_MIN_WIDTH) / PLAYLISTWIN_WIDTH_SNAP;
 tx = (tx * PLAYLISTWIN_WIDTH_SNAP) + PLAYLISTWIN_MIN_WIDTH;
 if (tx < PLAYLISTWIN_MIN_WIDTH)
 tx = PLAYLISTWIN_MIN_WIDTH;
 
 if (!config.playlist_shaded)
 {
- ty = (height - PLAYLISTWIN_MIN_HEIGHT) / PLAYLISTWIN_HEIGHT_SNAP;
+ ty = (h - PLAYLISTWIN_MIN_HEIGHT) / PLAYLISTWIN_HEIGHT_SNAP;
 ty = (ty * PLAYLISTWIN_HEIGHT_SNAP) + PLAYLISTWIN_MIN_HEIGHT;
 if (ty < PLAYLISTWIN_MIN_HEIGHT)
 ty = PLAYLISTWIN_MIN_HEIGHT;
@@ -565,290 +435,56 @@
 if (tx == config.playlist_width && ty == config.playlist_height)
 return;
 
- /* difference between previous size and new size */
- dx = tx - config.playlist_width;
- dy = ty - config.playlist_height;
-
- config.playlist_width = width = tx;
- config.playlist_height = height = ty;
+ config.playlist_width = w = tx;
+ config.playlist_height = h = ty;
 
 g_mutex_lock(resize_mutex);
- ui_skinned_playlist_resize_relative(playlistwin_list, dx, dy);
-
- ui_skinned_playlist_slider_move_relative(playlistwin_slider, dx);
- ui_skinned_playlist_slider_resize_relative(playlistwin_slider, dy);
-
- ui_skinned_button_move_relative(playlistwin_shade, dx, 0);
- ui_skinned_button_move_relative(playlistwin_close, dx, 0);
- ui_skinned_button_move_relative(playlistwin_shaded_shade, dx, 0);
- ui_skinned_button_move_relative(playlistwin_shaded_close, dx, 0);
- ui_skinned_textbox_move_relative(playlistwin_time_min, dx, dy);
- ui_skinned_textbox_move_relative(playlistwin_time_sec, dx, dy);
- ui_skinned_textbox_move_relative(playlistwin_info, dx, dy);
- ui_skinned_button_move_relative(playlistwin_srew, dx, dy);
- ui_skinned_button_move_relative(playlistwin_splay, dx, dy);
- ui_skinned_button_move_relative(playlistwin_spause, dx, dy);
- ui_skinned_button_move_relative(playlistwin_sstop, dx, dy);
- ui_skinned_button_move_relative(playlistwin_sfwd, dx, dy);
- ui_skinned_button_move_relative(playlistwin_seject, dx, dy);
- ui_skinned_button_move_relative(playlistwin_sscroll_up, dx, dy);
- ui_skinned_button_move_relative(playlistwin_sscroll_down, dx, dy);
-
- gtk_widget_set_size_request(playlistwin_sinfo, playlistwin_get_width() - 35,
- aud_active_skin->properties.textbox_bitmap_font_height);
- g_mutex_unlock(resize_mutex);
-}
-
-static void
-playlistwin_motion(GtkWidget * widget,
- GdkEventMotion * event,
- gpointer callback_data)
-{
- /*
- * GDK2's resize is broken and doesn't really play nice, so we have
- * to do all of this stuff by hand.
- */
- if (playlistwin_resizing == TRUE)
- {
- if (event->x + playlistwin_resize_x != playlistwin_get_width() ||
- event->y + playlistwin_resize_y != playlistwin_get_height())
- {
- playlistwin_resize(event->x + playlistwin_resize_x,
- event->y + playlistwin_resize_y);
- resize_window(playlistwin, config.playlist_width,
- playlistwin_get_height());
- }
- }
- else if (dock_is_moving(GTK_WINDOW(playlistwin)))
- dock_move_motion(GTK_WINDOW(playlistwin), event);
-}
-
-static void
-playlistwin_fileinfo(void)
-{
- gint rows, first, focused;
-
- ui_skinned_playlist_row_info (playlistwin_list, & rows, & first, & focused);
- audgui_infowin_show (active_playlist, focused);
-}
-
-static void
-show_playlist_save_error(GtkWindow *parent,
- const gchar *filename)
-{
- GtkWidget *dialog;
 
- g_return_if_fail(GTK_IS_WINDOW(parent));
- g_return_if_fail(filename);
+ ui_skinned_playlist_resize (playlistwin_list, w - 31, h - 58);
+ window_move_widget (playlistwin, FALSE, playlistwin_slider, w - 15, 20);
+ ui_skinned_playlist_slider_resize (playlistwin_slider, h - 58);
 
- dialog = gtk_message_dialog_new(GTK_WINDOW(parent),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- _("Error writing playlist \"%s\": %s"),
- filename, strerror(errno));
+ window_move_widget (playlistwin, TRUE, playlistwin_shaded_shade, w - 21, 3);
+ window_move_widget (playlistwin, TRUE, playlistwin_shaded_close, w - 11, 3);
+ window_move_widget (playlistwin, FALSE, playlistwin_shade, w - 21, 3);
+ window_move_widget (playlistwin, FALSE, playlistwin_close, w - 11, 3);
 
- gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); /* centering */
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
-}
-
-static gboolean
-show_playlist_overwrite_prompt(GtkWindow * parent,
- const gchar * filename)
-{
- GtkWidget *dialog;
- gint result;
-
- g_return_val_if_fail(GTK_IS_WINDOW(parent), FALSE);
- g_return_val_if_fail(filename != NULL, FALSE);
-
- dialog = gtk_message_dialog_new (parent, GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("Overwrite %s?"), filename);
-
- gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); /* centering */
- result = gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ window_move_widget (playlistwin, FALSE, playlistwin_time_min, w - 82, h - 15);
+ window_move_widget (playlistwin, FALSE, playlistwin_time_sec, w - 64, h - 15);
+ window_move_widget (playlistwin, FALSE, playlistwin_info, w - 143, h - 28);
 
- return (result == GTK_RESPONSE_YES);
-}
-
-static void
-playlistwin_save_playlist(const gchar * filename)
-{
- str_replace_in(&aud_cfg->playlist_path, g_path_get_dirname(filename));
+ window_move_widget (playlistwin, FALSE, playlistwin_srew, w - 144, h - 16);
+ window_move_widget (playlistwin, FALSE, playlistwin_splay, w - 138, h - 16);
+ window_move_widget (playlistwin, FALSE, playlistwin_spause, w - 128, h - 16);
+ window_move_widget (playlistwin, FALSE, playlistwin_sstop, w - 118, h - 16);
+ window_move_widget (playlistwin, FALSE, playlistwin_sfwd, w - 109, h - 16);
+ window_move_widget (playlistwin, FALSE, playlistwin_seject, w - 100, h - 16);
+ window_move_widget (playlistwin, FALSE, playlistwin_sscroll_up, w - 14, h - 35);
+ window_move_widget (playlistwin, FALSE, playlistwin_sscroll_down, w - 14, h - 30);
 
- if (vfs_file_test (filename, G_FILE_TEST_EXISTS))
- if (!show_playlist_overwrite_prompt(GTK_WINDOW(playlistwin), filename))
- return;
+ window_move_widget (playlistwin, FALSE, resize_handle, w - 20, h - 20);
+ window_move_widget (playlistwin, TRUE, sresize_handle, w - 31, 0);
 
- if (! aud_playlist_save (active_playlist, filename))
- show_playlist_save_error(GTK_WINDOW(playlistwin), filename);
-}
+ textbox_set_width (playlistwin_sinfo, w - 35);
 
-static void
-playlistwin_load_playlist(const gchar * filename)
-{
- str_replace_in(&aud_cfg->playlist_path, g_path_get_dirname(filename));
+ window_move_widget (playlistwin, FALSE, button_add, 12, h - 29);
+ window_move_widget (playlistwin, FALSE, button_sub, 40, h - 29);
+ window_move_widget (playlistwin, FALSE, button_sel, 68, h - 29);
+ window_move_widget (playlistwin, FALSE, button_misc, 100, h - 29);
+ window_move_widget (playlistwin, FALSE, button_list, w - 46, h - 29);
 
- aud_playlist_entry_delete (active_playlist, 0, aud_playlist_entry_count
- (active_playlist));
- aud_playlist_insert_playlist (active_playlist, 0, filename);
- aud_playlist_set_filename (active_playlist, filename);
-
- if (aud_playlist_get_title (active_playlist) == NULL)
- aud_playlist_set_title (active_playlist, filename);
-}
-
-static gchar *
-playlist_file_selection_load(const gchar * title,
- const gchar * default_filename)
-{
- GtkWidget *dialog;
- gchar *filename;
-
- g_return_val_if_fail(title != NULL, NULL);
-
- dialog = make_filebrowser(title, FALSE);
-
- if (aud_cfg->playlist_path)
- gtk_file_chooser_set_current_folder_uri ((GtkFileChooser *) dialog,
- aud_cfg->playlist_path);
- if (default_filename)
- gtk_file_chooser_set_uri (GTK_FILE_CHOOSER(dialog), default_filename);
- gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); /* centering */
-
- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
- filename = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER(dialog));
- else
- filename = NULL;
-
- gtk_widget_destroy(dialog);
- return filename;
-}
-
-#if 0
-static void
-on_static_toggle(GtkToggleButton *button, gpointer data)
-{
- active_playlist->attribute =
- gtk_toggle_button_get_active(button) ?
- active_playlist->attribute | PLAYLIST_STATIC : active_playlist->attribute &
- ~PLAYLIST_STATIC;
+ g_mutex_unlock(resize_mutex);
 }
 
 static void
-on_relative_toggle(GtkToggleButton *button, gpointer data)
-{
- active_playlist->attribute =
- gtk_toggle_button_get_active(button) ?
- active_playlist->attribute | PLAYLIST_USE_RELATIVE :
- active_playlist->attribute & ~PLAYLIST_USE_RELATIVE;
-}
-#endif
-
-static gchar *
-playlist_file_selection_save(const gchar * title,
- const gchar * default_filename)
-{
- GtkWidget *dialog;
- gchar *filename;
-#if 0
- GtkWidget *hbox;
- GtkWidget *toggle, *toggle2;
-#endif
-
- g_return_val_if_fail(title != NULL, NULL);
-
- dialog = make_filebrowser(title, TRUE);
-
- if (aud_cfg->playlist_path)
- gtk_file_chooser_set_current_folder_uri ((GtkFileChooser *) dialog,
- aud_cfg->playlist_path);
-
- if (default_filename)
- gtk_file_chooser_set_uri ((GtkFileChooser *) dialog, default_filename);
-
-#if 0
- hbox = gtk_hbox_new(FALSE, 5);
-
- /* static playlist */
- toggle = gtk_check_button_new_with_label(_("Save as Static Playlist"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),
- (active_playlist->attribute & PLAYLIST_STATIC) ? 1 : 0);
- g_signal_connect(G_OBJECT(toggle), "toggled", G_CALLBACK(on_static_toggle), dialog);
- gtk_box_pack_start(GTK_BOX(hbox), toggle, FALSE, FALSE, 0);
-
- /* use relative path */
- toggle2 = gtk_check_button_new_with_label(_("Use Relative Path"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle2),
- (active_playlist->attribute & PLAYLIST_USE_RELATIVE) ? 1 : 0);
- g_signal_connect(G_OBJECT(toggle2), "toggled", G_CALLBACK(on_relative_toggle), dialog);
- gtk_box_pack_start(GTK_BOX(hbox), toggle2, FALSE, FALSE, 0);
-
- gtk_widget_show_all(hbox);
- gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), hbox);
-#endif
-
- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
- filename = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER(dialog));
- else
- filename = NULL;
-
- gtk_widget_destroy(dialog);
- return filename;
-}
-
-void
-playlistwin_select_playlist_to_load(const gchar * default_filename)
+playlistwin_fileinfo(void)
 {
- gchar *filename =
- playlist_file_selection_load(_("Load Playlist"), default_filename);
-
- if (filename) {
- playlistwin_load_playlist(filename);
- g_free(filename);
- }
-}
+ gint rows, first, focused;
 
-static void
-playlistwin_select_playlist_to_save(const gchar * default_filename)
-{
- gchar *dot = NULL, *basename = NULL;
- gchar *filename =
- playlist_file_selection_save(_("Save Playlist"), default_filename);
-
- if (filename) {
- /* Default extension */
- basename = g_path_get_basename(filename);
- dot = strrchr(basename, '.');
- if( dot == NULL || dot == basename) {
- gchar *oldname = filename;
-#ifdef HAVE_XSPF_PLAYLIST
- filename = g_strconcat(oldname, ".xspf", NULL);
-#else
- filename = g_strconcat(oldname, ".m3u", NULL);
-#endif
- g_free(oldname);
- }
- g_free(basename);
-
- playlistwin_save_playlist(filename);
- g_free(filename);
- }
+ ui_skinned_playlist_row_info (playlistwin_list, & rows, & first, & focused);
+ audgui_infowin_show (active_playlist, focused);
 }
 
-#define REGION_L(x1,x2,y1,y2) \
- (event->x >= (x1) && event->x < (x2) && \
- event->y >= config.playlist_height - (y1) && \
- event->y < config.playlist_height - (y2))
-
-#define REGION_R(x1,x2,y1,y2) \
- (event->x >= playlistwin_get_width() - (x1) && \
- event->x < playlistwin_get_width() - (x2) && \
- event->y >= config.playlist_height - (y1) && \
- event->y < config.playlist_height - (y2))
-
 static void
 playlistwin_scrolled(GtkWidget * widget,
 GdkEventScroll * event,
@@ -872,59 +508,8 @@
 GdkEventButton * event,
 gpointer callback_data)
 {
- gint xpos, ypos;
-
- gtk_window_get_position(GTK_WINDOW(playlistwin), &xpos, &ypos);
-
- if (event->button == 1 && !config.show_wm_decorations &&
- ((!config.playlist_shaded &&
- event->x > playlistwin_get_width() - 20 &&
- event->y > config.playlist_height - 20) ||
- (config.playlist_shaded &&
- event->x >= playlistwin_get_width() - 31 &&
- event->x < playlistwin_get_width() - 22))) {
-
- if (event->type != GDK_2BUTTON_PRESS &&
- event->type != GDK_3BUTTON_PRESS) {
- playlistwin_resizing = TRUE;
- playlistwin_resize_x = config.playlist_width - event->x;
- playlistwin_resize_y = config.playlist_height - event->y;
- }
- }
- else if (event->button == 1 && REGION_L(12, 37, 29, 11))
- /* ADD button menu */
- ui_popup_menu_show(UI_MENU_PLAYLIST_ADD, xpos + 12, ypos +
- playlistwin_get_height() - 8, FALSE, TRUE, event->button, event->time);
- else if (event->button == 1 && REGION_L(41, 66, 29, 11))
- /* SUB button menu */
- ui_popup_menu_show(UI_MENU_PLAYLIST_REMOVE, xpos + 40, ypos +
- playlistwin_get_height() - 8, FALSE, TRUE, event->button, event->time);
- else if (event->button == 1 && REGION_L(70, 95, 29, 11))
- /* SEL button menu */
- ui_popup_menu_show(UI_MENU_PLAYLIST_SELECT, xpos + 68, ypos +
- playlistwin_get_height() - 8, FALSE, TRUE, event->button, event->time);
- else if (event->button == 1 && REGION_L(99, 124, 29, 11))
- /* MISC button menu */
- ui_popup_menu_show(UI_MENU_PLAYLIST_SORT, xpos + 100, ypos +
- playlistwin_get_height() - 8, FALSE, TRUE, event->button, event->time);
- else if (event->button == 1 && REGION_R(46, 23, 29, 11))
- /* LIST button menu */
- ui_popup_menu_show(UI_MENU_PLAYLIST_GENERAL, xpos +
- playlistwin_get_width() - 12, ypos + playlistwin_get_height() - 8,
- TRUE, TRUE, event->button, event->time);
- else if (event->button == 1 && event->type == GDK_BUTTON_PRESS &&
- (config.easy_move || event->y < 14))
- {
- return FALSE;
- }
- else if (event->button == 1 && event->type == GDK_2BUTTON_PRESS
- && event->y < 14) {
- /* double click on title bar */
+ if (event->button == 1 && event->type == GDK_2BUTTON_PRESS && event->y < 14)
 playlistwin_shade_toggle();
- if (dock_is_moving(GTK_WINDOW(playlistwin)))
- dock_move_release(GTK_WINDOW(playlistwin));
- return TRUE;
- }
 else if (event->button == 3)
 ui_popup_menu_show(UI_MENU_PLAYLIST, event->x_root, event->y_root,
 FALSE, FALSE, 3, event->time);
@@ -934,25 +519,21 @@
 
 static gboolean playlistwin_delete(GtkWidget *widget, void *data)
 {
- if (config.show_wm_decorations)
- playlistwin_show(FALSE);
- else
- aud_drct_quit();
-
+ aud_drct_quit ();
 return TRUE;
 }
 
 void
 playlistwin_hide_timer(void)
 {
- ui_skinned_textbox_set_text(playlistwin_time_min, " ");
- ui_skinned_textbox_set_text(playlistwin_time_sec, " ");
+ textbox_set_text (playlistwin_time_min, " ");
+ textbox_set_text (playlistwin_time_sec, " ");
 }
 
 void playlistwin_set_time (const gchar * minutes, const gchar * seconds)
 {
- ui_skinned_textbox_set_text (playlistwin_time_min, minutes);
- ui_skinned_textbox_set_text (playlistwin_time_sec, seconds);
+ textbox_set_text (playlistwin_time_min, minutes);
+ textbox_set_text (playlistwin_time_sec, seconds);
 }
 
 static void drag_motion (GtkWidget * widget, GdkDragContext * context, gint x,
@@ -985,160 +566,188 @@
 gint x, gint y, GtkSelectionData * data, guint info, guint time, void * unused)
 {
 audgui_urilist_insert (active_playlist, drop_position, (const gchar *)
- data->data);
+ gtk_selection_data_get_data (data));
 drop_position = -1;
 }
 
-static void
-local_playlist_prev(void)
+static void playlistwin_hide (void)
 {
- aud_drct_pl_prev ();
+ playlistwin_show (0);
 }
 
-static void
-local_playlist_next(void)
+static void resize_press (void)
 {
- aud_drct_pl_next ();
+ resize_base_width = config.playlist_width;
+ resize_base_height = config.playlist_height;
 }
 
-static void playlistwin_hide (void)
+static void resize_drag (gint x_offset, gint y_offset)
 {
- playlistwin_show (0);
+ /* compromise between rounding and truncating; this has no real
+ * justification at all other than it "looks about right". */
+ playlistwin_resize (resize_base_width + x_offset + PLAYLISTWIN_WIDTH_SNAP /
+ 3, resize_base_height + y_offset + PLAYLISTWIN_HEIGHT_SNAP / 3);
+ window_set_size (playlistwin, config.playlist_width, config.playlist_shaded
+ ? PLAYLISTWIN_SHADED_HEIGHT : config.playlist_height);
 }
 
-static void
-playlistwin_create_widgets(void)
+static void button_add_cb (GtkWidget * button, GdkEventButton * event)
 {
- /* This function creates the custom widgets used by the playlist editor */
+ gint xpos, ypos;
+ gtk_window_get_position ((GtkWindow *) playlistwin, & xpos, & ypos);
+ ui_popup_menu_show (UI_MENU_PLAYLIST_ADD, xpos + 12, ypos +
+ config.playlist_height - 8, FALSE, TRUE, event->button, event->time);
+}
+
+static void button_sub_cb (GtkWidget * button, GdkEventButton * event)
+{
+ gint xpos, ypos;
+ gtk_window_get_position ((GtkWindow *) playlistwin, & xpos, & ypos);
+ ui_popup_menu_show (UI_MENU_PLAYLIST_REMOVE, xpos + 40, ypos +
+ config.playlist_height - 8, FALSE, TRUE, event->button, event->time);
+}
 
- /* text box for displaying song title in shaded mode */
- playlistwin_sinfo = ui_skinned_textbox_new(SKINNED_WINDOW(playlistwin)->shaded,
- 4, 4, playlistwin_get_width() - 35, TRUE, SKIN_TEXT);
+static void button_sel_cb (GtkWidget * button, GdkEventButton * event)
+{
+ gint xpos, ypos;
+ gtk_window_get_position ((GtkWindow *) playlistwin, & xpos, & ypos);
+ ui_popup_menu_show (UI_MENU_PLAYLIST_SELECT, xpos + 68, ypos +
+ config.playlist_height - 8, FALSE, TRUE, event->button, event->time);
+}
+
+static void button_misc_cb (GtkWidget * button, GdkEventButton * event)
+{
+ gint xpos, ypos;
+ gtk_window_get_position ((GtkWindow *) playlistwin, & xpos, & ypos);
+ ui_popup_menu_show (UI_MENU_PLAYLIST_SORT, xpos + 100, ypos +
+ config.playlist_height - 8, FALSE, TRUE, event->button, event->time);
+}
+
+static void button_list_cb (GtkWidget * button, GdkEventButton * event)
+{
+ gint xpos, ypos;
+ gtk_window_get_position ((GtkWindow *) playlistwin, & xpos, & ypos);
+ ui_popup_menu_show (UI_MENU_PLAYLIST_GENERAL, xpos + config.playlist_width -
+ 12, ypos + config.playlist_height - 8, TRUE, TRUE, event->button,
+ event->time);
+}
 
- playlistwin_set_sinfo_font(config.playlist_font);
+static void
+playlistwin_create_widgets(void)
+{
+ gint w = config.playlist_width, h = config.playlist_height;
 
+ playlistwin_sinfo = textbox_new (w - 35, "", NULL, config.autoscroll);
+ window_put_widget (playlistwin, TRUE, playlistwin_sinfo, 4, 4);
 
- playlistwin_shaded_shade = ui_skinned_button_new();
- ui_skinned_push_button_setup(playlistwin_shaded_shade, SKINNED_WINDOW(playlistwin)->shaded,
- playlistwin_get_width() - 21, 3,
- 9, 9, 128, 45, 150, 42, SKIN_PLEDIT);
- g_signal_connect(playlistwin_shaded_shade, "clicked", playlistwin_shade_toggle, NULL );
+ playlistwin_shaded_shade = button_new (9, 9, 128, 45, 150, 42, SKIN_PLEDIT, SKIN_PLEDIT);
+ window_put_widget (playlistwin, TRUE, playlistwin_shaded_shade, w - 21, 3);
+ button_on_release (playlistwin_shaded_shade, (ButtonCB) playlistwin_shade_toggle);
 
- playlistwin_shaded_close = ui_skinned_button_new();
- ui_skinned_push_button_setup(playlistwin_shaded_close, SKINNED_WINDOW(playlistwin)->shaded,
- playlistwin_get_width() - 11, 3, 9, 9, 138, 45, 52, 42, SKIN_PLEDIT);
- g_signal_connect(playlistwin_shaded_close, "clicked", playlistwin_hide, NULL );
+ playlistwin_shaded_close = button_new (9, 9, 138, 45, 52, 42, SKIN_PLEDIT, SKIN_PLEDIT);
+ window_put_widget (playlistwin, TRUE, playlistwin_shaded_close, w - 11, 3);
+ button_on_release (playlistwin_shaded_close, (ButtonCB) playlistwin_hide);
 
- playlistwin_shade = ui_skinned_button_new();
- ui_skinned_push_button_setup(playlistwin_shade, SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 21, 3,
- 9, 9, 157, 3, 62, 42, SKIN_PLEDIT);
- g_signal_connect(playlistwin_shade, "clicked", playlistwin_shade_toggle, NULL );
+ playlistwin_shade = button_new (9, 9, 157, 3, 62, 42, SKIN_PLEDIT, SKIN_PLEDIT);
+ window_put_widget (playlistwin, FALSE, playlistwin_shade, w - 21, 3);
+ button_on_release (playlistwin_shade, (ButtonCB) playlistwin_shade_toggle);
 
- playlistwin_close = ui_skinned_button_new();
- ui_skinned_push_button_setup(playlistwin_close, SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 11, 3, 9, 9, 167, 3, 52, 42, SKIN_PLEDIT);
- g_signal_connect(playlistwin_close, "clicked", playlistwin_hide, NULL );
+ playlistwin_close = button_new (9, 9, 167, 3, 52, 42, SKIN_PLEDIT, SKIN_PLEDIT);
+ window_put_widget (playlistwin, FALSE, playlistwin_close, w - 11, 3);
+ button_on_release (playlistwin_close, (ButtonCB) playlistwin_hide);
 
- /* playlist list box */
- playlistwin_list = ui_skinned_playlist_new(SKINNED_WINDOW(playlistwin)->normal, 12, 20,
- playlistwin_get_width() - 31,
- config.playlist_height - 58, config.playlist_font);
+ playlistwin_list = ui_skinned_playlist_new (w - 31, h - 58, config.playlist_font);
+ window_put_widget (playlistwin, FALSE, playlistwin_list, 12, 20);
 
 /* playlist list box slider */
- playlistwin_slider = ui_skinned_playlist_slider_new(SKINNED_WINDOW(playlistwin)->normal, playlistwin_get_width() - 15,
- 20, config.playlist_height - 58, playlistwin_list);
+ playlistwin_slider = ui_skinned_playlist_slider_new (playlistwin_list, h - 58);
+ window_put_widget (playlistwin, FALSE, playlistwin_slider, w - 15, 20);
 ui_skinned_playlist_set_slider (playlistwin_list, playlistwin_slider);
 
- /* track time (minute) */
- playlistwin_time_min = ui_skinned_textbox_new(SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 82,
- config.playlist_height - 15, 15, FALSE, SKIN_TEXT);
- g_signal_connect(playlistwin_time_min, "button-press-event", G_CALLBACK(change_timer_mode_cb), NULL);
+ playlistwin_time_min = textbox_new (15, "", NULL, FALSE);
+ window_put_widget (playlistwin, FALSE, playlistwin_time_min, w - 82, h - 15);
+
+ playlistwin_time_sec = textbox_new (10, "", NULL, FALSE);
+ window_put_widget (playlistwin, FALSE, playlistwin_time_sec, w - 64, h - 15);
 
- /* track time (second) */
- playlistwin_time_sec = ui_skinned_textbox_new(SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 64,
- config.playlist_height - 15, 10, FALSE, SKIN_TEXT);
+ g_signal_connect(playlistwin_time_min, "button-press-event", G_CALLBACK(change_timer_mode_cb), NULL);
 g_signal_connect(playlistwin_time_sec, "button-press-event", G_CALLBACK(change_timer_mode_cb), NULL);
 
- /* playlist information (current track length / total track length) */
- playlistwin_info = ui_skinned_textbox_new(SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 143,
- config.playlist_height - 28, 90, FALSE, SKIN_TEXT);
+ playlistwin_info = textbox_new (90, "", NULL, FALSE);
+ window_put_widget (playlistwin, FALSE, playlistwin_info, w - 143, h - 28);
 
 /* mini play control buttons at right bottom corner */
 
- /* rewind button */
- playlistwin_srew = ui_skinned_button_new();
- ui_skinned_small_button_setup(playlistwin_srew, SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 144,
- config.playlist_height - 16, 8, 7);
- g_signal_connect(playlistwin_srew, "clicked", local_playlist_prev, NULL);
-
- /* play button */
- playlistwin_splay = ui_skinned_button_new();
- ui_skinned_small_button_setup(playlistwin_splay, SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 138,
- config.playlist_height - 16, 10, 7);
- g_signal_connect(playlistwin_splay, "clicked", mainwin_play_pushed, NULL);
-
- /* pause button */
- playlistwin_spause = ui_skinned_button_new();
- ui_skinned_small_button_setup(playlistwin_spause, SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 128,
- config.playlist_height - 16, 10, 7);
- g_signal_connect(playlistwin_spause, "clicked", aud_drct_pause, NULL);
-
- /* stop button */
- playlistwin_sstop = ui_skinned_button_new();
- ui_skinned_small_button_setup(playlistwin_sstop, SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 118,
- config.playlist_height - 16, 9, 7);
- g_signal_connect(playlistwin_sstop, "clicked", mainwin_stop_pushed, NULL);
-
- /* forward button */
- playlistwin_sfwd = ui_skinned_button_new();
- ui_skinned_small_button_setup(playlistwin_sfwd, SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 109,
- config.playlist_height - 16, 8, 7);
- g_signal_connect(playlistwin_sfwd, "clicked", local_playlist_next, NULL);
-
- /* eject button */
- playlistwin_seject = ui_skinned_button_new();
- ui_skinned_small_button_setup(playlistwin_seject, SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 100,
- config.playlist_height - 16, 9, 7);
- g_signal_connect(playlistwin_seject, "clicked", mainwin_eject_pushed, NULL);
-
- playlistwin_sscroll_up = ui_skinned_button_new();
- ui_skinned_small_button_setup(playlistwin_sscroll_up, SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 14,
- config.playlist_height - 35, 8, 5);
- g_signal_connect(playlistwin_sscroll_up, "clicked", playlistwin_scroll_up_pushed, NULL);
-
- playlistwin_sscroll_down = ui_skinned_button_new();
- ui_skinned_small_button_setup(playlistwin_sscroll_down, SKINNED_WINDOW(playlistwin)->normal,
- playlistwin_get_width() - 14,
- config.playlist_height - 30, 8, 5);
- g_signal_connect(playlistwin_sscroll_down, "clicked", playlistwin_scroll_down_pushed, NULL);
-
- ui_playlist_evlistener_init();
-}
+ playlistwin_srew = button_new_small (8, 7);
+ window_put_widget (playlistwin, FALSE, playlistwin_srew, w - 144, h - 16);
+ button_on_release (playlistwin_srew, (ButtonCB) aud_drct_pl_prev);
 
-static void
-selection_received(GtkWidget * widget,
- GtkSelectionData * selection_data, gpointer data)
-{
- if (selection_data->type == GDK_SELECTION_TYPE_STRING &&
- selection_data->length > 0)
- aud_playlist_entry_insert (active_playlist, -1, g_strdup ((gchar *)
- selection_data->data), NULL);
+ playlistwin_splay = button_new_small (10, 7);
+ window_put_widget (playlistwin, FALSE, playlistwin_splay, w - 138, h - 16);
+ button_on_release (playlistwin_splay, (ButtonCB) mainwin_play_pushed);
+
+ playlistwin_spause = button_new_small (10, 7);
+ window_put_widget (playlistwin, FALSE, playlistwin_spause, w - 128, h - 16);
+ button_on_release (playlistwin_spause, (ButtonCB) aud_drct_pause);
+
+ playlistwin_sstop = button_new_small (9, 7);
+ window_put_widget (playlistwin, FALSE, playlistwin_sstop, w - 118, h - 16);
+ button_on_release (playlistwin_sstop, (ButtonCB) aud_drct_stop);
+
+ playlistwin_sfwd = button_new_small (8, 7);
+ window_put_widget (playlistwin, FALSE, playlistwin_sfwd, w - 109, h - 16);
+ button_on_release (playlistwin_sfwd, (ButtonCB) aud_drct_pl_next);
+
+ playlistwin_seject = button_new_small (9, 7);
+ window_put_widget (playlistwin, FALSE, playlistwin_seject, w - 100, h - 16);
+ button_on_release (playlistwin_seject, (ButtonCB) action_play_file);
+
+ playlistwin_sscroll_up = button_new_small (8, 5);
+ window_put_widget (playlistwin, FALSE, playlistwin_sscroll_up, w - 14, h - 35);
+ button_on_release (playlistwin_sscroll_up, (ButtonCB) playlistwin_scroll_up_pushed);
+
+ playlistwin_sscroll_down = button_new_small (8, 5);
+ window_put_widget (playlistwin, FALSE, playlistwin_sscroll_down, w - 14, h - 30);
+ button_on_release (playlistwin_sscroll_down, (ButtonCB) playlistwin_scroll_down_pushed);
+
+ /* resize handles */
+
+ resize_handle = drag_handle_new (20, 20, resize_press, resize_drag);
+ window_put_widget (playlistwin, FALSE, resize_handle, w - 20, h - 20);
+
+ sresize_handle = drag_handle_new (9, PLAYLISTWIN_SHADED_HEIGHT, resize_press, resize_drag);
+ window_put_widget (playlistwin, TRUE, sresize_handle, w - 31, 0);
+
+ /* lower button row */
+
+ button_add = button_new_small (25, 18);
+ window_put_widget (playlistwin, FALSE, button_add, 12, h - 29);
+ button_on_press (button_add, button_add_cb);
+
+ button_sub = button_new_small (25, 18);
+ window_put_widget (playlistwin, FALSE, button_sub, 40, h - 29);
+ button_on_press (button_sub, button_sub_cb);
+
+ button_sel = button_new_small (25, 18);
+ window_put_widget (playlistwin, FALSE, button_sel, 68, h - 29);
+ button_on_press (button_sel, button_sel_cb);
+
+ button_misc = button_new_small (25, 18);
+ window_put_widget (playlistwin, FALSE, button_misc, 100, h - 29);
+ button_on_press (button_misc, button_misc_cb);
+
+ button_list = button_new_small (23, 18);
+ window_put_widget (playlistwin, FALSE, button_list, w - 46, h - 29);
+ button_on_press (button_list, button_list_cb);
 }
 
-static void size_allocate (GtkWidget * widget, GtkAllocation * allocation)
+static void pl_win_draw (GtkWidget * window, cairo_t * cr)
 {
- playlistwin_resize (allocation->width, allocation->height);
+ if (config.playlist_shaded)
+ skin_draw_playlistwin_shaded (cr, config.playlist_width, TRUE);
+ else
+ skin_draw_playlistwin_frame (cr, config.playlist_width,
+ config.playlist_height, TRUE);
 }
 
 static void
@@ -1146,14 +755,11 @@
 {
 GdkPixbuf *icon;
 
- playlistwin = ui_skinned_window_new("playlist", &config.playlist_x, &config.playlist_y);
+ playlistwin = window_new (& config.playlist_x, & config.playlist_y,
+ config.playlist_width, config.playlist_shaded ? PLAYLISTWIN_SHADED_HEIGHT :
+ config.playlist_height, FALSE, config.playlist_shaded, pl_win_draw);
+
 gtk_window_set_title(GTK_WINDOW(playlistwin), _("Audacious Playlist Editor"));
- gtk_window_set_role(GTK_WINDOW(playlistwin), "playlist");
- gtk_window_set_default_size(GTK_WINDOW(playlistwin),
- playlistwin_get_width(),
- playlistwin_get_height());
- gtk_window_set_resizable(GTK_WINDOW(playlistwin), TRUE);
- playlistwin_set_geometry_hints(config.playlist_shaded);
 
 gtk_window_set_transient_for(GTK_WINDOW(playlistwin),
 GTK_WINDOW(mainwin));
@@ -1172,14 +778,10 @@
 G_CALLBACK(playlistwin_delete), NULL);
 g_signal_connect(playlistwin, "button_press_event",
 G_CALLBACK(playlistwin_press), NULL);
- g_signal_connect(playlistwin, "button_release_event",
- G_CALLBACK(playlistwin_release), NULL);
 g_signal_connect(playlistwin, "scroll_event",
 G_CALLBACK(playlistwin_scrolled), NULL);
- g_signal_connect(playlistwin, "motion_notify_event",
- G_CALLBACK(playlistwin_motion), NULL);
 
- aud_drag_dest_set(playlistwin);
+ drag_dest_set(playlistwin);
 
 drop_position = -1;
 g_signal_connect ((GObject *) playlistwin, "drag-motion", (GCallback)
@@ -1193,11 +795,6 @@
 
 g_signal_connect ((GObject *) playlistwin, "key-press-event", (GCallback)
 mainwin_keypress, 0);
- g_signal_connect(playlistwin, "selection_received",
- G_CALLBACK(selection_received), NULL);
-
- g_signal_connect (playlistwin, "size-allocate", G_CALLBACK (size_allocate),
- 0);
 }
 
 static void get_title (void)
@@ -1207,9 +804,12 @@
 g_free (active_title);
 
 if (playlists > 1)
- active_title = g_strdup_printf (_("%s (%d of %d)"),
- aud_playlist_get_title (active_playlist), 1 + active_playlist,
- playlists);
+ {
+ gchar * title = aud_playlist_get_title (active_playlist);
+ active_title = g_strdup_printf (_("%s (%d of %d)"), title, 1 +
+ active_playlist, playlists);
+ g_free (title);
+ }
 else
 active_title = NULL;
 }
@@ -1263,9 +863,7 @@
 playlistwin_create_window();
 
 playlistwin_create_widgets();
-
- gtk_widget_show_all (((SkinnedWindow *) playlistwin)->normal);
- gtk_widget_show_all (((SkinnedWindow *) playlistwin)->shaded);
+ window_show_all (playlistwin);
 
 gtk_window_add_accel_group(GTK_WINDOW(playlistwin), ui_manager_get_accel_group());
 
@@ -1279,37 +877,28 @@
 
 song_changed = FALSE;
 
- hook_associate ("playlist position", follow_cb, 0);
- hook_associate ("playlist update", update_cb, 0);
+ hook_associate ("playlist position", follow_cb, NULL);
+ hook_associate ("playlist activate", update_cb, NULL);
+ hook_associate ("playlist update", update_cb, NULL);
 }
 
 void playlistwin_unhook (void)
 {
 hook_dissociate ("playlist position", follow_cb);
+ hook_dissociate ("playlist activate", update_cb);
 hook_dissociate ("playlist update", update_cb);
- ui_playlist_evlistener_dissociate ();
 g_free (active_title);
 active_title = NULL;
 g_mutex_free (resize_mutex);
 resize_mutex = NULL;
 }
 
-static void playlistwin_real_show (void)
-{
- ui_skinned_button_set_inside(mainwin_pl, TRUE);
- gtk_window_present(GTK_WINDOW(playlistwin));
-}
-
-static void playlistwin_real_hide (void)
+static void playlistwin_real_show (gboolean show)
 {
- gtk_widget_hide(playlistwin);
- ui_skinned_button_set_inside(mainwin_pl, FALSE);
-
- if ( config.player_visible )
- {
- gtk_window_present(GTK_WINDOW(mainwin));
- gtk_widget_grab_focus(mainwin);
- }
+ if (show)
+ gtk_window_present ((GtkWindow *) playlistwin);
+ else
+ gtk_widget_hide (playlistwin);
 }
 
 void playlistwin_show (char show)
@@ -1322,17 +911,10 @@
 gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (a), show);
 else
 {
- if (show != config.playlist_visible) {
- config.playlist_visible = show;
- config.playlist_visible_prev = !show;
- aud_cfg->playlist_visible = show;
- }
-
- if (show)
- playlistwin_real_show ();
- else
- playlistwin_real_hide ();
- }
+ config.playlist_visible = show;
+ button_set_active (mainwin_pl, show);
+ playlistwin_real_show (config.player_visible && show);
+ }
 }
 
 void action_playlist_track_info(void)
@@ -1354,6 +936,11 @@
 aud_playlist_queue_delete (active_playlist, at, 1);
 }
 
+void action_jump_to_playlist_start (void)
+{
+ aud_drct_pl_set_pos (0);
+}
+
 void action_playlist_sort_by_track_number (void)
 {
 aud_playlist_sort_by_scheme (active_playlist, PLAYLIST_SORT_TRACK);
@@ -1550,23 +1137,11 @@
 audgui_confirm_playlist_delete (active_playlist);
 }
 
-void action_playlist_save_list (void)
-{
- playlistwin_select_playlist_to_save (aud_playlist_get_filename
- (active_playlist));
-}
-
 void action_playlist_save_all_playlists (void)
 {
 aud_save_playlists ();
 }
 
-void action_playlist_load_list (void)
-{
- playlistwin_select_playlist_to_load (aud_playlist_get_filename
- (active_playlist));
-}
-
 void
 action_playlist_refresh_list(void)
 {
@@ -1574,12 +1149,6 @@
 }
 
 void
-action_open_list_manager(void)
-{
- audgui_playlist_manager_ui_show(mainwin);
-}
-
-void
 action_playlist_search_and_select(void)
 {
 playlistwin_select_search();
@@ -1619,14 +1188,22 @@
 switch (event->keyval)
 {
 case GDK_Return:
- if (gtk_im_context_filter_keypress (GTK_ENTRY (entry)->im_context, event)) {
- GTK_ENTRY (entry)->need_im_reset = TRUE;
- return TRUE;
- } else {
- gtk_dialog_response(GTK_DIALOG(searchdlg_win), GTK_RESPONSE_ACCEPT);
- return TRUE;
- }
+ gtk_dialog_response(GTK_DIALOG(searchdlg_win), GTK_RESPONSE_ACCEPT);
+ return TRUE;
 default:
 return FALSE;
 }
 }
+
+void action_show_playlist_editor (GtkToggleAction * action)
+{
+ playlistwin_show (gtk_toggle_action_get_active (action));
+}
+
+void action_roll_up_playlist_editor (GtkToggleAction * action)
+{
+ config.playlist_shaded = gtk_toggle_action_get_active (action);
+ window_set_shaded (playlistwin, config.playlist_shaded);
+ window_set_size (playlistwin, config.playlist_width, config.playlist_shaded
+ ? PLAYLISTWIN_SHADED_HEIGHT : config.playlist_height);
+}

audacious-plugins-2.5.3.tar.gz/src/skins/ui_playlist.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_playlist.h Changed

@@ -20,58 +20,21 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_PLAYLIST_H
-#define AUDACIOUS_UI_PLAYLIST_H
+#ifndef SKINS_UI_PLAYLIST_H
+#define SKINS_UI_PLAYLIST_H
 
-#include <glib.h>
+#include <gtk/gtk.h>
 
-#include "ui_main.h"
-#include <audacious/plugin.h>
-#include "skins_cfg.h"
-
-#define PLAYLISTWIN_FRAME_TOP_HEIGHT 20
-#define PLAYLISTWIN_FRAME_BOTTOM_HEIGHT 38
-#define PLAYLISTWIN_FRAME_LEFT_WIDTH 12
-#define PLAYLISTWIN_FRAME_RIGHT_WIDTH 19
-
-#define PLAYLISTWIN_MIN_WIDTH MAINWIN_WIDTH
-#define PLAYLISTWIN_MIN_HEIGHT MAINWIN_HEIGHT
-#define PLAYLISTWIN_WIDTH_SNAP 25
-#define PLAYLISTWIN_HEIGHT_SNAP 29
-#define PLAYLISTWIN_SHADED_HEIGHT MAINWIN_SHADED_HEIGHT
-#define PLAYLISTWIN_WIDTH config.playlist_width
-#define PLAYLISTWIN_HEIGHT \
- (config.playlist_shaded ? PLAYLISTWIN_SHADED_HEIGHT : config.playlist_height)
-
-#define PLAYLISTWIN_DEFAULT_WIDTH 275
-#define PLAYLISTWIN_DEFAULT_HEIGHT 232
-#define PLAYLISTWIN_DEFAULT_POS_X 295
-#define PLAYLISTWIN_DEFAULT_POS_Y 20
-
-#define PLAYLISTWIN_DEFAULT_FONT "Sans Bold 8"
-
-gboolean playlistwin_is_shaded(void);
-gint playlistwin_get_width(void);
-gint playlistwin_get_height(void);
 void playlistwin_update (void);
-void playlistwin_set_toprow(gint top);
-void playlistwin_set_shade_menu_cb(gboolean shaded);
-void playlistwin_set_shade(gboolean shaded);
-void playlistwin_shade_toggle(void);
 void playlistwin_create(void);
 void playlistwin_unhook (void);
 void playlistwin_hide_timer(void);
 void playlistwin_set_time (const gchar * minutes, const gchar * seconds);
 void playlistwin_show (char show);
-void playlistwin_select_playlist_to_load(const gchar * default_filename);
-void playlistwin_set_sinfo_font(gchar *font);
-void playlistwin_set_sinfo_scroll(gboolean scroll);
-gint playlistwin_list_get_visible_count(void);
-gint playlistwin_list_get_first(void);
 
 extern gint active_playlist;
 extern gchar * active_title;
 extern glong active_length;
-extern GtkWidget * playlistwin, * playlistwin_list;
+extern GtkWidget * playlistwin, * playlistwin_list, * playlistwin_sinfo;
 
-#endif /* AUDACIOUS_UI_PLAYLIST_H */
+#endif /* SKINS_UI_PLAYLIST_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skin.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skin.c Changed

@@ -1,5 +1,5 @@
 /* Audacious
- * Copyright (C) 2005-2007 Audacious development team.
+ * Copyright (C) 2005-2011 Audacious development team.
 *
 * BMP - Cross-platform multimedia player
 * Copyright (C) 2003-2004 BMP development team.
@@ -23,43 +23,29 @@
 * Audacious or using our public API to be a derived work.
 */
 
-/*#define AUD_DEBUG*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-/* TODO: enforce default sizes! */
-
-#include <glib.h>
-
-#include <ctype.h>
-#include <libgen.h>
-#include <limits.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+
+#include <gtk/gtk.h>
 
 #include <audacious/debug.h>
+#include <audacious/gtk-compat.h>
 #include <audacious/misc.h>
-#include <audacious/plugin.h>
 
 #include "plugin.h"
-#include "ui_skin.h"
-#include "util.h"
-#include "ui_main.h"
+#include "skins_cfg.h"
+#include "surface.h"
 #include "ui_equalizer.h"
+#include "ui_main.h"
 #include "ui_playlist.h"
-#include "ui_skinselector.h"
-#include "debug.h"
-
-#include "platform/smartinclude.h"
-
-#include "ui_skinned_window.h"
-#include "ui_skinned_button.h"
+#include "ui_skin.h"
 #include "ui_skinned_number.h"
-#include "ui_skinned_horizontal_slider.h"
 #include "ui_skinned_playstatus.h"
+#include "ui_skinned_textbox.h"
+#include "ui_skinned_window.h"
+#include "ui_skinselector.h"
+#include "ui_vis.h"
+#include "util.h"
 
 #define EXTENSION_TARGETS 7
 
@@ -77,20 +63,14 @@
 gint width, height;
 gchar *inistr;
 };
-/* I know, it's not nice to copy'n'paste stuff, but I wanted it to
- be atleast parially working, before dealing with such things */
-
-typedef struct {
- const gchar *to_match;
- gchar *match;
- gboolean found;
-} FindFileContext;
 
 typedef struct _SkinPixmapIdMapping SkinPixmapIdMapping;
 typedef struct _SkinMaskInfo SkinMaskInfo;
 
+static gboolean skin_load (Skin * skin, const gchar * path);
+static void skin_parse_hints (Skin * skin, const gchar * path_p);
 
-Skin *aud_active_skin = NULL;
+Skin *active_skin = NULL;
 
 static gint skin_current_num;
 
@@ -120,102 +100,75 @@
 
 static guint skin_pixmap_id_map_size = G_N_ELEMENTS(skin_pixmap_id_map);
 
-static const guchar skin_default_viscolor[24][3] = {
- {9, 34, 53},
- {10, 18, 26},
- {0, 54, 108},
- {0, 58, 116},
- {0, 62, 124},
- {0, 66, 132},
- {0, 70, 140},
- {0, 74, 148},
- {0, 78, 156},
- {0, 82, 164},
- {0, 86, 172},
- {0, 92, 184},
- {0, 98, 196},
- {0, 104, 208},
- {0, 110, 220},
- {0, 116, 232},
- {0, 122, 244},
- {0, 128, 255},
- {0, 128, 255},
- {0, 104, 208},
- {0, 80, 160},
- {0, 56, 112},
- {0, 32, 64},
- {200, 200, 200}
+static const guint32 default_vis_colors[24] = {
+ COLOR (9, 34, 53),
+ COLOR (10, 18, 26),
+ COLOR (0, 54, 108),
+ COLOR (0, 58, 116),
+ COLOR (0, 62, 124),
+ COLOR (0, 66, 132),
+ COLOR (0, 70, 140),
+ COLOR (0, 74, 148),
+ COLOR (0, 78, 156),
+ COLOR (0, 82, 164),
+ COLOR (0, 86, 172),
+ COLOR (0, 92, 184),
+ COLOR (0, 98, 196),
+ COLOR (0, 104, 208),
+ COLOR (0, 110, 220),
+ COLOR (0, 116, 232),
+ COLOR (0, 122, 244),
+ COLOR (0, 128, 255),
+ COLOR (0, 128, 255),
+ COLOR (0, 104, 208),
+ COLOR (0, 80, 160),
+ COLOR (0, 56, 112),
+ COLOR (0, 32, 64),
+ COLOR (200, 200, 200)
 };
 
-static gchar *original_gtk_theme = NULL;
-
-static GdkBitmap *skin_create_transparent_mask(const gchar *,
- const gchar *,
- const gchar *,
- GdkWindow *,
- gint, gint, gboolean);
-
-static void skin_set_default_vis_color(Skin * skin);
-
-void
-skin_lock(Skin * skin)
-{
- g_mutex_lock(skin->lock);
-}
-
-void
-skin_unlock(Skin * skin)
-{
- g_mutex_unlock(skin->lock);
-}
-
-gboolean
-aud_active_skin_reload(void)
-{
- AUDDBG("\n");
- return aud_active_skin_load(aud_active_skin->path);
-}
+#ifdef MASK_IS_REGION
+static cairo_region_t * skin_create_transparent_mask (const gchar * path, const
+ gchar * file, const gchar * section, GdkWindow * window, gint width, gint
+ height);
+#else
+static GdkBitmap * skin_create_transparent_mask (const gchar * path, const
+ gchar * file, const gchar * section, GdkWindow * window, gint width, gint
+ height);
+#endif
 
-gboolean
-aud_active_skin_load(const gchar * path)
+gboolean active_skin_load (const gchar * path)
 {
 AUDDBG("%s\n", path);
- g_return_val_if_fail(aud_active_skin != NULL, FALSE);
+ g_return_val_if_fail(active_skin != NULL, FALSE);
 
- if (!skin_load(aud_active_skin, path)) {
+ if (!skin_load(active_skin, path)) {
 AUDDBG("loading failed\n");
 return FALSE;
 }
 
 mainwin_refresh_hints ();
+ textbox_update_all ();
 ui_vis_set_colors ();
- ui_skinned_window_draw_all(mainwin);
- ui_skinned_window_draw_all(equalizerwin);
- ui_skinned_window_draw_all(playlistwin);
-
- SkinPixmap *pixmap;
- pixmap = &aud_active_skin->pixmaps[SKIN_POSBAR];
- /* last 59 pixels of SKIN_POSBAR are knobs (normal and selected) */
- gtk_widget_set_size_request(mainwin_position, pixmap->width - 59, pixmap->height);
+ gtk_widget_queue_draw (mainwin);
+ gtk_widget_queue_draw (equalizerwin);
+ gtk_widget_queue_draw (playlistwin);
 
- return TRUE;
-}
-
-static void skin_pixmap_free (SkinPixmap * pixmap)
-{
- if (pixmap->pixbuf != NULL)
+ /* path may in fact be the same string as config.skin */
+ if (! config.skin || strcmp (path, config.skin))
 {
- g_object_unref (pixmap->pixbuf);
- pixmap->pixbuf = NULL;
+ g_free (config.skin);
+ config.skin = g_strdup (path);
 }
+
+ return TRUE;
 }
 
-Skin *
+static Skin *
 skin_new(void)
 {
 Skin *skin;
 skin = g_new0(Skin, 1);
- skin->lock = g_mutex_new();
 return skin;
 }
 
@@ -225,7 +178,7 @@
 * Does not free skin itself or lock variable so that the skin can immediately
 * populated with new skin data if needed.
 */
-void
+static void
 skin_free(Skin * skin)
 {
 gint i;
@@ -233,49 +186,38 @@
 g_return_if_fail(skin != NULL);
 
 for (i = 0; i < SKIN_PIXMAP_COUNT; i++)
- skin_pixmap_free(&skin->pixmaps[i]);
+ {
+ if (skin->pixmaps[i])
+ {
+ cairo_surface_destroy (skin->pixmaps[i]);
+ skin->pixmaps[i] = NULL;
+ }
+ }
 
 for (i = 0; i < SKIN_MASK_COUNT; i++) {
 if (skin->masks[i])
- g_object_unref(skin->masks[i]);
- if (skin->scaled_masks[i])
- g_object_unref(skin->scaled_masks[i]);
+#ifdef MASK_IS_REGION
+ cairo_region_destroy (skin->masks[i]);
+#else
+ g_object_unref (skin->masks[i]);
+#endif
 
 skin->masks[i] = NULL;
- skin->scaled_masks[i] = NULL;
- }
-
- for (i = 0; i < SKIN_COLOR_COUNT; i++) {
- if (skin->colors[i])
- g_free(skin->colors[i]);
-
- skin->colors[i] = NULL;
 }
 
 g_free(skin->path);
 skin->path = NULL;
-
- skin_set_default_vis_color(skin);
-
- if (original_gtk_theme != NULL)
- {
- gtk_settings_set_string_property (gtk_settings_get_default (),
- "gtk-theme-name", original_gtk_theme, "audacious");
- g_free (original_gtk_theme);
- original_gtk_theme = NULL;
- }
 }
 
-void
+static void
 skin_destroy(Skin * skin)
 {
 g_return_if_fail(skin != NULL);
 skin_free(skin);
- g_mutex_free(skin->lock);
 g_free(skin);
 }
 
-const SkinPixmapIdMapping *
+static const SkinPixmapIdMapping *
 skin_pixmap_id_lookup(guint id)
 {
 guint i;
@@ -289,26 +231,7 @@
 return NULL;
 }
 
-const gchar *
-skin_pixmap_id_to_name(SkinPixmapId id)
-{
- guint i;
-
- for (i = 0; i < skin_pixmap_id_map_size; i++) {
- if (id == skin_pixmap_id_map[i].id)
- return skin_pixmap_id_map[i].name;
- }
- return NULL;
-}
-
-static void
-skin_set_default_vis_color(Skin * skin)
-{
- memcpy(skin->vis_color, skin_default_viscolor,
- sizeof(skin_default_viscolor));
-}
-
-gchar * skin_pixmap_locate (const gchar * dirname, gchar * * basenames)
+static gchar * skin_pixmap_locate (const gchar * dirname, gchar * * basenames)
 {
 gchar * filename = NULL;
 gint i;
@@ -390,10 +313,10 @@
 {
 const SkinPixmapIdMapping *pixmap_id_mapping;
 gchar *filename;
- SkinPixmap *pm = NULL;
 
 g_return_val_if_fail(skin != NULL, FALSE);
 g_return_val_if_fail(id < SKIN_PIXMAP_COUNT, FALSE);
+ g_return_val_if_fail(! skin->pixmaps[id], FALSE);
 
 pixmap_id_mapping = skin_pixmap_id_lookup(id);
 g_return_val_if_fail(pixmap_id_mapping != NULL, FALSE);
@@ -403,55 +326,28 @@
 if (filename == NULL)
 return FALSE;
 
- AUDDBG("loaded %s\n", filename);
-
- pm = &skin->pixmaps[id];
- GdkPixbuf *pix = gdk_pixbuf_new_from_file(filename, NULL);
-
- if (pix == NULL)
- return FALSE;
-
- if (config.colorize_r == 255 && config.colorize_g == 255 &&
- config.colorize_b == 255)
- pm->pixbuf = pix;
- else
- {
- pm->pixbuf = audacious_create_colorized_pixbuf(pix, config.colorize_r,
- config.colorize_g, config.colorize_b);
- g_object_unref(pix);
- }
-
- pm->width = gdk_pixbuf_get_width(pm->pixbuf);
- pm->height = gdk_pixbuf_get_height(pm->pixbuf);
- pm->current_width = pm->width;
- pm->current_height = pm->height;
-
- g_free(filename);
+ skin->pixmaps[id] = surface_new_from_file (filename);
 
- return TRUE;
+ g_free (filename);
+ return skin->pixmaps[id] ? TRUE : FALSE;
 }
 
-void
-skin_mask_create(Skin * skin,
- const gchar * path,
- gint id,
- GdkWindow * window)
+static void skin_mask_create (Skin * skin, const gchar * path, gint id,
+ GdkWindow * window)
 {
- skin->masks[id] =
- skin_create_transparent_mask(path, "region.txt",
- skin_mask_info[id].inistr, window,
- skin_mask_info[id].width,
- skin_mask_info[id].height, FALSE);
-
- skin->scaled_masks[id] =
- skin_create_transparent_mask(path, "region.txt",
- skin_mask_info[id].inistr, window,
- skin_mask_info[id].width * 2,
- skin_mask_info[id].height * 2, TRUE);
+ skin->masks[id] = skin_create_transparent_mask (path, "region.txt",
+ skin_mask_info[id].inistr, window, skin_mask_info[id].width,
+ skin_mask_info[id].height);
 }
 
-static GdkBitmap *
-create_default_mask(GdkWindow * parent, gint w, gint h)
+#ifdef MASK_IS_REGION
+static cairo_region_t * create_default_mask (GdkWindow * parent, gint w, gint h)
+{
+ cairo_rectangle_int_t rect = {0, 0, w, h};
+ return cairo_region_create_rectangle (& rect);
+}
+#else
+static GdkBitmap * create_default_mask (GdkWindow * parent, gint w, gint h)
 {
 GdkBitmap *ret;
 GdkGC *gc;
@@ -466,81 +362,46 @@
 
 return ret;
 }
-
-static void
-skin_query_color(GdkColormap * cm, GdkColor * c)
-{
-#ifdef GDK_WINDOWING_X11
- XColor xc = { 0,0,0,0,0,0 };
-
- xc.pixel = c->pixel;
- XQueryColor(GDK_COLORMAP_XDISPLAY(cm), GDK_COLORMAP_XCOLORMAP(cm), &xc);
- c->red = xc.red;
- c->green = xc.green;
- c->blue = xc.blue;
-#else
- /* do nothing. see what breaks? */
 #endif
-}
 
-static glong
-skin_calc_luminance(GdkColor * c)
+static gint color_diff (guint32 a, guint32 b)
 {
- return (0.212671 * c->red + 0.715160 * c->green + 0.072169 * c->blue);
+ return abs (COLOR_R (a) - COLOR_R (b)) + abs (COLOR_G (a) - COLOR_G (b)) +
+ abs (COLOR_B (a) - COLOR_B (b));
 }
 
-static void
-skin_get_textcolors(GdkPixbuf * pix, GdkColor * bgc, GdkColor * fgc)
+static void skin_get_textcolors (Skin * skin, cairo_surface_t * s)
 {
 /*
 * Try to extract reasonable background and foreground colors
 * from the font pixmap
 */
 
- GdkImage *gi;
- GdkColormap *cm;
- gint i;
-
- g_return_if_fail(pix != NULL);
-
- GdkPixmap *text = gdk_pixmap_new(NULL, gdk_pixbuf_get_width(pix), gdk_pixbuf_get_height(pix), gdk_rgb_get_visual()->depth);
- gdk_draw_pixbuf(text, NULL, pix, 0, 0, 0, 0, gdk_pixbuf_get_width(pix), gdk_pixbuf_get_height(pix),
- GDK_RGB_DITHER_NONE, 0, 0);
- /* Get the first line of text */
- gi = gdk_drawable_get_image(text, 0, 0, 152, 6);
- cm = gdk_colormap_get_system();
+ /* Get a pixel from the middle of the space character */
+ skin->colors[SKIN_TEXTBG] = surface_get_pixel (s, 152, 3);
 
- for (i = 0; i < 6; i++) {
- GdkColor c;
- gint x;
- glong d, max_d;
-
- /* Get a pixel from the middle of the space character */
- bgc[i].pixel = gdk_image_get_pixel(gi, 151, i);
- skin_query_color(cm, &bgc[i]);
-
- max_d = 0;
- for (x = 1; x < 150; x++) {
- c.pixel = gdk_image_get_pixel(gi, x, i);
- skin_query_color(cm, &c);
-
- d = labs(skin_calc_luminance(&c) - skin_calc_luminance(&bgc[i]));
- if (d > max_d) {
- memcpy(&fgc[i], &c, sizeof(GdkColor));
+ gint max_d = -1;
+ for (gint y = 0; y < 6; y ++)
+ {
+ for (gint x = 1; x < 150; x ++)
+ {
+ gint c = surface_get_pixel (s, x, y);
+ gint d = color_diff (skin->colors[SKIN_TEXTBG], c);
+ if (d > max_d)
+ {
+ skin->colors[SKIN_TEXTFG] = c;
 max_d = d;
 }
 }
 }
- g_object_unref(gi);
- g_object_unref(text);
 }
 
 gboolean
 init_skins(const gchar * path)
 {
- aud_active_skin = skin_new();
+ active_skin = skin_new();
 
- skin_parse_hints(aud_active_skin, NULL);
+ skin_parse_hints(active_skin, NULL);
 
 /* create the windows if they haven't been created yet, needed for bootstrapping */
 if (mainwin == NULL)
@@ -550,7 +411,8 @@
 playlistwin_create();
 }
 
- if (!aud_active_skin_load(path)) {
+ if (! path || ! active_skin_load (path))
+ {
 if (path != NULL)
 AUDDBG("Unable to load skin (%s), trying default...\n", path);
 else
@@ -560,7 +422,7 @@
 gchar * def = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "Skins"
 G_DIR_SEPARATOR_S "Default", aud_get_path (AUD_PATH_DATA_DIR));
 
- if (! aud_active_skin_load (def))
+ if (! active_skin_load (def))
 {
 AUDDBG ("Unable to load default skin (%s)! Giving up.\n", def);
 g_free (def);
@@ -570,16 +432,13 @@
 g_free (def);
 }
 
- if (config.random_skin_on_play)
- skinlist_update();
-
 return TRUE;
 }
 
 void cleanup_skins()
 {
- skin_destroy(aud_active_skin);
- aud_active_skin = NULL;
+ skin_destroy(active_skin);
+ active_skin = NULL;
 
 gtk_widget_destroy (mainwin);
 mainwin = NULL;
@@ -595,18 +454,15 @@
 * Hints files are somewhat like "scripts" in Winamp3/5.
 * We'll probably add scripts to it next.
 */
-void
-skin_parse_hints(Skin * skin, gchar *path_p)
+static void skin_parse_hints (Skin * skin, const gchar * path_p)
 {
- gchar *filename, *tmp;
+ gchar *filename;
 INIFile *inifile;
 
 path_p = path_p ? path_p : skin->path;
 
- skin->properties.mainwin_othertext = FALSE;
 skin->properties.mainwin_vis_x = 24;
 skin->properties.mainwin_vis_y = 43;
- skin->properties.mainwin_vis_width = 76;
 skin->properties.mainwin_text_x = 112;
 skin->properties.mainwin_text_y = 27;
 skin->properties.mainwin_text_width = 153;
@@ -625,6 +481,7 @@
 skin->properties.mainwin_playstatus_x = 24;
 skin->properties.mainwin_playstatus_y = 28;
 skin->properties.mainwin_menurow_visible = TRUE;
+ skin->properties.mainwin_streaminfo_visible = TRUE;
 skin->properties.mainwin_volume_x = 107;
 skin->properties.mainwin_volume_y = 57;
 skin->properties.mainwin_balance_x = 177;
@@ -632,7 +489,7 @@
 skin->properties.mainwin_position_x = 16;
 skin->properties.mainwin_position_y = 72;
 skin->properties.mainwin_othertext_is_status = FALSE;
- skin->properties.mainwin_othertext_visible = skin->properties.mainwin_othertext;
+ skin->properties.mainwin_othertext_visible = FALSE;
 skin->properties.mainwin_text_visible = TRUE;
 skin->properties.mainwin_vis_visible = TRUE;
 skin->properties.mainwin_previous_x = 16;
@@ -682,748 +539,319 @@
 if (!inifile)
 return;
 
- tmp = read_ini_string(inifile, "skin", "mainwinOthertext");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_othertext = atoi(tmp);
- g_free(tmp);
+ struct {
+ const gchar * name;
+ gint * value;
+ } pairs[] = {
+ {"mainwinVisX", & skin->properties.mainwin_vis_x},
+ {"mainwinVisY", & skin->properties.mainwin_vis_y},
+ {"mainwinTextX", & skin->properties.mainwin_text_x},
+ {"mainwinTextY", & skin->properties.mainwin_text_y},
+ {"mainwinTextWidth", & skin->properties.mainwin_text_width},
+ {"mainwinInfoBarX", & skin->properties.mainwin_infobar_x},
+ {"mainwinInfoBarY", & skin->properties.mainwin_infobar_y},
+ {"mainwinNumber0X", & skin->properties.mainwin_number_0_x},
+ {"mainwinNumber0Y", & skin->properties.mainwin_number_0_y},
+ {"mainwinNumber1X", & skin->properties.mainwin_number_1_x},
+ {"mainwinNumber1Y", & skin->properties.mainwin_number_1_y},
+ {"mainwinNumber2X", & skin->properties.mainwin_number_2_x},
+ {"mainwinNumber2Y", & skin->properties.mainwin_number_2_y},
+ {"mainwinNumber3X", & skin->properties.mainwin_number_3_x},
+ {"mainwinNumber3Y", & skin->properties.mainwin_number_3_y},
+ {"mainwinNumber4X", & skin->properties.mainwin_number_4_x},
+ {"mainwinNumber4Y", & skin->properties.mainwin_number_4_y},
+ {"mainwinPlayStatusX", & skin->properties.mainwin_playstatus_x},
+ {"mainwinPlayStatusY", & skin->properties.mainwin_playstatus_y},
+ {"mainwinMenurowVisible", & skin->properties.mainwin_menurow_visible},
+ {"mainwinStreaminfoVisible", & skin->properties.mainwin_streaminfo_visible},
+ {"mainwinVolumeX", & skin->properties.mainwin_volume_x},
+ {"mainwinVolumeY", & skin->properties.mainwin_volume_y},
+ {"mainwinBalanceX", & skin->properties.mainwin_balance_x},
+ {"mainwinBalanceY", & skin->properties.mainwin_balance_y},
+ {"mainwinPositionX", & skin->properties.mainwin_position_x},
+ {"mainwinPositionY", & skin->properties.mainwin_position_y},
+ {"mainwinOthertextIsStatus", & skin->properties.mainwin_othertext_is_status},
+ {"mainwinOthertextVisible", & skin->properties.mainwin_othertext_visible},
+ {"mainwinTextVisible", & skin->properties.mainwin_text_visible},
+ {"mainwinVisVisible", & skin->properties.mainwin_vis_visible},
+ {"mainwinPreviousX", & skin->properties.mainwin_previous_x},
+ {"mainwinPreviousY", & skin->properties.mainwin_previous_y},
+ {"mainwinPlayX", & skin->properties.mainwin_play_x},
+ {"mainwinPlayY", & skin->properties.mainwin_play_y},
+ {"mainwinPauseX", & skin->properties.mainwin_pause_x},
+ {"mainwinPauseY", & skin->properties.mainwin_pause_y},
+ {"mainwinStopX", & skin->properties.mainwin_stop_x},
+ {"mainwinStopY", & skin->properties.mainwin_stop_y},
+ {"mainwinNextX", & skin->properties.mainwin_next_x},
+ {"mainwinNextY", & skin->properties.mainwin_next_y},
+ {"mainwinEjectX", & skin->properties.mainwin_eject_x},
+ {"mainwinEjectY", & skin->properties.mainwin_eject_y},
+ {"mainwinWidth", & skin->properties.mainwin_width},
+ {"mainwinHeight", & skin->properties.mainwin_height},
+ {"mainwinAboutX", & skin->properties.mainwin_about_x},
+ {"mainwinAboutY", & skin->properties.mainwin_about_y},
+ {"mainwinShuffleX", & skin->properties.mainwin_shuffle_x},
+ {"mainwinShuffleY", & skin->properties.mainwin_shuffle_y},
+ {"mainwinRepeatX", & skin->properties.mainwin_repeat_x},
+ {"mainwinRepeatY", & skin->properties.mainwin_repeat_y},
+ {"mainwinEQButtonX", & skin->properties.mainwin_eqbutton_x},
+ {"mainwinEQButtonY", & skin->properties.mainwin_eqbutton_y},
+ {"mainwinPLButtonX", & skin->properties.mainwin_plbutton_x},
+ {"mainwinPLButtonY", & skin->properties.mainwin_plbutton_y},
+ {"textboxBitmapFontWidth", & skin->properties.textbox_bitmap_font_width},
+ {"textboxBitmapFontHeight", & skin->properties.textbox_bitmap_font_height},
+ {"mainwinMinimizeX", & skin->properties.mainwin_minimize_x},
+ {"mainwinMinimizeY", & skin->properties.mainwin_minimize_y},
+ {"mainwinShadeX", & skin->properties.mainwin_shade_x},
+ {"mainwinShadeY", & skin->properties.mainwin_shade_y},
+ {"mainwinCloseX", & skin->properties.mainwin_close_x},
+ {"mainwinCloseY", & skin->properties.mainwin_close_y}};
+
+ for (gint i = 0; i < G_N_ELEMENTS (pairs); i ++)
+ {
+ gchar * s = read_ini_string (inifile, "skin", pairs[i].name);
+ if (s)
+ {
+ * pairs[i].value = atoi (s);
+ g_free (s);
+ }
 }
 
- tmp = read_ini_string(inifile, "skin", "mainwinVisX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_vis_x = atoi(tmp);
- g_free(tmp);
- }
+ skin_mask_info[0].height = skin->properties.mainwin_height;
+ skin_mask_info[0].width = skin->properties.mainwin_width;
 
- tmp = read_ini_string(inifile, "skin", "mainwinVisY");
+ if (filename != NULL)
+ g_free(filename);
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_vis_y = atoi(tmp);
- g_free(tmp);
- }
+ close_ini_file(inifile);
+}
 
- tmp = read_ini_string(inifile, "skin", "mainwinVisWidth");
+static gint hex_chars_to_int (gchar hi, gchar lo)
+{
+ /*
+ * Converts a value in the range 0x00-0xFF
+ * to a integer in the range 0-255
+ */
+ gchar str[3] = {hi, lo, 0};
+ return strtol (str, NULL, 16);
+}
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_vis_width = atoi(tmp);
- g_free(tmp);
- }
+static guint32 skin_load_color (INIFile * inifile, const gchar * section,
+ const gchar * key, const gchar * default_hex)
+{
+ gchar * value = NULL;
 
- tmp = read_ini_string(inifile, "skin", "mainwinTextX");
+ if (inifile)
+ value = read_ini_string (inifile, section, key);
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_text_x = atoi(tmp);
- g_free(tmp);
- }
+ if (! value && default_hex)
+ value = g_strdup (default_hex);
 
- tmp = read_ini_string(inifile, "skin", "mainwinTextY");
+ if (! value)
+ return 0;
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_text_y = atoi(tmp);
- g_free(tmp);
- }
+ g_strstrip (value);
+ gchar * ptr = value;
+ if (* ptr == '#')
+ ptr ++;
 
- tmp = read_ini_string(inifile, "skin", "mainwinTextWidth");
+ gint red = 0, green = 0, blue = 0;
 
- if (tmp != NULL)
+ /*
+ * The handling of incomplete values is done this way
+ * to maximize winamp compatibility
+ */
+ gint len = strlen (ptr);
+ if (len >= 6)
 {
- skin->properties.mainwin_text_width = atoi(tmp);
- g_free(tmp);
+ red = hex_chars_to_int (ptr[0], ptr[1]);
+ ptr += 2;
 }
-
- tmp = read_ini_string(inifile, "skin", "mainwinInfoBarX");
-
- if (tmp != NULL)
+ if (len >= 4)
 {
- skin->properties.mainwin_infobar_x = atoi(tmp);
- g_free(tmp);
+ green = hex_chars_to_int (ptr[0], ptr[1]);
+ ptr += 2;
 }
+ if (len >= 2)
+ blue = hex_chars_to_int (ptr[0], ptr[1]);
 
- tmp = read_ini_string(inifile, "skin", "mainwinInfoBarY");
+ g_free (value);
+ return COLOR (red, green, blue);
+}
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_infobar_y = atoi(tmp);
- g_free(tmp);
- }
+#ifdef MASK_IS_REGION
+static cairo_region_t * skin_create_transparent_mask (const gchar * path, const
+ gchar * file, const gchar * section, GdkWindow * window, gint width, gint
+ height)
+#else
+static GdkBitmap * skin_create_transparent_mask (const gchar * path, const
+ gchar * file, const gchar * section, GdkWindow * window, gint width, gint
+ height)
+#endif
+{
+ gchar *filename = NULL;
+ INIFile *inifile = NULL;
+ gboolean created_mask = FALSE;
+ GArray *num, *point;
+ guint i, j;
+ gint k;
 
- tmp = read_ini_string(inifile, "skin", "mainwinNumber0X");
+ if (path != NULL)
+ filename = find_file_case_uri (path, file);
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_number_0_x = atoi(tmp);
- g_free(tmp);
- }
+ /* filename will be null if path wasn't set */
+ if (!filename)
+ return create_default_mask(window, width, height);
 
- tmp = read_ini_string(inifile, "skin", "mainwinNumber0Y");
+ inifile = open_ini_file(filename);
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_number_0_y = atoi(tmp);
- g_free(tmp);
+ if ((num = read_ini_array(inifile, section, "NumPoints")) == NULL) {
+ g_free(filename);
+ close_ini_file(inifile);
+ return NULL;
 }
 
- tmp = read_ini_string(inifile, "skin", "mainwinNumber1X");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_number_1_x = atoi(tmp);
- g_free(tmp);
+ if ((point = read_ini_array(inifile, section, "PointList")) == NULL) {
+ g_array_free(num, TRUE);
+ g_free(filename);
+ close_ini_file(inifile);
+ return NULL;
 }
 
- tmp = read_ini_string(inifile, "skin", "mainwinNumber1Y");
+ close_ini_file(inifile);
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_number_1_y = atoi(tmp);
- g_free(tmp);
- }
+#ifdef MASK_IS_REGION
+ cairo_region_t * mask = cairo_region_create ();
+#else
+ GdkBitmap * mask = gdk_pixmap_new (window, width, height, 1);
+ GdkGC * gc = gdk_gc_new (mask);
 
- tmp = read_ini_string(inifile, "skin", "mainwinNumber2X");
+ GdkColor pattern;
+ pattern.pixel = 0;
+ gdk_gc_set_foreground(gc, &pattern);
+ gdk_draw_rectangle(mask, gc, TRUE, 0, 0, width, height);
+ pattern.pixel = 1;
+ gdk_gc_set_foreground(gc, &pattern);
+#endif
 
- if (tmp != NULL)
+ j = 0;
+ for (i = 0; i < num->len; i ++)
 {
- skin->properties.mainwin_number_2_x = atoi(tmp);
- g_free(tmp);
- }
+ gint n_points = g_array_index (num, gint, i);
+ if (n_points <= 0 || j + 2 * n_points > point->len)
+ break;
 
- tmp = read_ini_string(inifile, "skin", "mainwinNumber2Y");
+ GdkPoint gpoints[n_points];
+ for (k = 0; k < n_points; k ++)
+ {
+ gpoints[k].x = g_array_index (point, gint, j + k * 2);
+ gpoints[k].y = g_array_index (point, gint, j + k * 2 + 1);
+ }
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_number_2_y = atoi(tmp);
- g_free(tmp);
- }
+#ifdef MASK_IS_REGION
+ gint xmin = width, ymin = height, xmax = 0, ymax = 0;
+ for (k = 0; k < n_points; k ++)
+ {
+ xmin = MIN (xmin, gpoints[k].x);
+ ymin = MIN (ymin, gpoints[k].y);
+ xmax = MAX (xmax, gpoints[k].x);
+ ymax = MAX (ymax, gpoints[k].y);
+ }
 
- tmp = read_ini_string(inifile, "skin", "mainwinNumber3X");
+ if (xmax > xmin && ymax > ymin)
+ {
+ cairo_rectangle_int_t rect = {xmin, ymin, xmax - xmin, ymax - ymin};
+ cairo_region_union_rectangle (mask, & rect);
+ }
+#else
+ gdk_draw_polygon (mask, gc, TRUE, gpoints, n_points);
+#endif
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_number_3_x = atoi(tmp);
- g_free(tmp);
+ created_mask = TRUE;
+ j += n_points * 2;
 }
 
- tmp = read_ini_string(inifile, "skin", "mainwinNumber3Y");
+ g_array_free(num, TRUE);
+ g_array_free(point, TRUE);
+ g_free(filename);
 
- if (tmp != NULL)
+ if (!created_mask)
 {
- skin->properties.mainwin_number_3_y = atoi(tmp);
- g_free(tmp);
+#ifdef MASK_IS_REGION
+ cairo_rectangle_int_t rect = {0, 0, width, height};
+ cairo_region_union_rectangle (mask, & rect);
+#else
+ gdk_draw_rectangle(mask, gc, TRUE, 0, 0, width, height);
+#endif
 }
 
- tmp = read_ini_string(inifile, "skin", "mainwinNumber4X");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_number_4_x = atoi(tmp);
- g_free(tmp);
- }
+#ifndef MASK_IS_REGION
+ g_object_unref(gc);
+#endif
 
- tmp = read_ini_string(inifile, "skin", "mainwinNumber4Y");
+ return mask;
+}
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_number_4_y = atoi(tmp);
- g_free(tmp);
- }
+static void skin_load_viscolor (Skin * skin, const gchar * path, const gchar *
+ basename)
+{
+ gchar * filename, * buffer, * string, * next;
+ gint line;
 
- tmp = read_ini_string(inifile, "skin", "mainwinPlayStatusX");
+ memcpy (skin->vis_colors, default_vis_colors, sizeof skin->vis_colors);
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_playstatus_x = atoi(tmp);
- g_free(tmp);
- }
+ filename = find_file_case_uri (path, basename);
+ if (filename == NULL)
+ return;
 
- tmp = read_ini_string(inifile, "skin", "mainwinPlayStatusY");
+ buffer = load_text_file (filename);
+ g_free (filename);
+ string = buffer;
 
- if (tmp != NULL)
+ for (line = 0; string != NULL && line < 24; line ++)
 {
- skin->properties.mainwin_playstatus_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinMenurowVisible");
+ GArray * array;
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_menurow_visible = atoi(tmp);
- g_free(tmp);
- }
+ next = text_parse_line (string);
+ array = string_to_garray (string);
 
- tmp = read_ini_string(inifile, "skin", "mainwinVolumeX");
+ if (array->len >= 3)
+ skin->vis_colors[line] = COLOR (g_array_index (array, gint, 0),
+ g_array_index (array, gint, 1), g_array_index (array, gint, 2));
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_volume_x = atoi(tmp);
- g_free(tmp);
+ g_array_free (array, TRUE);
+ string = next;
 }
 
- tmp = read_ini_string(inifile, "skin", "mainwinVolumeY");
+ g_free (buffer);
+}
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_volume_y = atoi(tmp);
- g_free(tmp);
- }
+static void
+skin_numbers_generate_dash(Skin * skin)
+{
+ g_return_if_fail(skin != NULL);
 
- tmp = read_ini_string(inifile, "skin", "mainwinBalanceX");
+ cairo_surface_t * old = skin->pixmaps[SKIN_NUMBERS];
+ if (! old || cairo_image_surface_get_width (old) < 99)
+ return;
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_balance_x = atoi(tmp);
- g_free(tmp);
- }
+ gint h = cairo_image_surface_get_height (old);
+ cairo_surface_t * new = surface_new (108, h);
 
- tmp = read_ini_string(inifile, "skin", "mainwinBalanceY");
+ surface_copy_rect (old, 0, 0, 99, h, new, 0, 0);
+ surface_copy_rect (old, 90, 0, 9, h, new, 99, 0);
+ surface_copy_rect (old, 20, 6, 5, 1, new, 101, 6);
 
- if (tmp != NULL)
- {
- skin->properties.mainwin_balance_y = atoi(tmp);
- g_free(tmp);
- }
+ cairo_surface_destroy (old);
+ skin->pixmaps[SKIN_NUMBERS] = new;
+}
 
- tmp = read_ini_string(inifile, "skin", "mainwinPositionX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_position_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinPositionY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_position_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinOthertextIsStatus");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_othertext_is_status = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinOthertextVisible");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_othertext_visible = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinTextVisible");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_text_visible = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinVisVisible");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_vis_visible = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinPreviousX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_previous_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinPreviousY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_previous_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinPlayX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_play_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinPlayY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_play_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinPauseX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_pause_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinPauseY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_pause_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinStopX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_stop_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinStopY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_stop_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinNextX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_next_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinNextY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_next_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinEjectX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_eject_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinEjectY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_eject_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinWidth");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_width = atoi(tmp);
- g_free(tmp);
- }
-
- skin_mask_info[0].width = skin->properties.mainwin_width;
-
- tmp = read_ini_string(inifile, "skin", "mainwinHeight");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_height = atoi(tmp);
- g_free(tmp);
- }
-
- skin_mask_info[0].height = skin->properties.mainwin_height;
-
- tmp = read_ini_string(inifile, "skin", "mainwinAboutX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_about_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinAboutY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_about_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinShuffleX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_shuffle_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinShuffleY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_shuffle_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinRepeatX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_repeat_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinRepeatY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_repeat_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinEQButtonX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_eqbutton_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinEQButtonY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_eqbutton_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinPLButtonX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_plbutton_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinPLButtonY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_plbutton_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "textboxBitmapFontWidth");
-
- if (tmp != NULL)
- {
- skin->properties.textbox_bitmap_font_width = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "textboxBitmapFontHeight");
-
- if (tmp != NULL)
- {
- skin->properties.textbox_bitmap_font_height = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinMinimizeX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_minimize_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinMinimizeY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_minimize_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinShadeX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_shade_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinShadeY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_shade_y = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinCloseX");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_close_x = atoi(tmp);
- g_free(tmp);
- }
-
- tmp = read_ini_string(inifile, "skin", "mainwinCloseY");
-
- if (tmp != NULL)
- {
- skin->properties.mainwin_close_y = atoi(tmp);
- g_free(tmp);
- }
-
- if (filename != NULL)
- g_free(filename);
-
- close_ini_file(inifile);
-}
-
-static guint
-hex_chars_to_int(gchar hi, gchar lo)
-{
- /*
- * Converts a value in the range 0x00-0xFF
- * to a integer in the range 0-65535
- */
- gchar str[3];
-
- str[0] = hi;
- str[1] = lo;
- str[2] = 0;
-
- return (CLAMP(strtol(str, NULL, 16), 0, 0xFF) << 8);
-}
-
-static GdkColor *
-skin_load_color(INIFile *inifile,
- const gchar * section, const gchar * key,
- gchar * default_hex)
-{
- gchar *value;
- GdkColor *color = NULL;
-
- if (inifile || default_hex) {
- if (inifile) {
- value = read_ini_string(inifile, section, key);
- if (value == NULL) {
- value = g_strdup(default_hex);
- }
- } else {
- value = g_strdup(default_hex);
- }
- if (value) {
- gchar *ptr = value;
- gint len;
-
- color = g_new0(GdkColor, 1);
- g_strstrip(value);
-
- if (value[0] == '#')
- ptr++;
- len = strlen(ptr);
- /*
- * The handling of incomplete values is done this way
- * to maximize winamp compatibility
- */
- if (len >= 6) {
- color->red = hex_chars_to_int(*ptr, *(ptr + 1));
- ptr += 2;
- }
- if (len >= 4) {
- color->green = hex_chars_to_int(*ptr, *(ptr + 1));
- ptr += 2;
- }
- if (len >= 2)
- color->blue = hex_chars_to_int(*ptr, *(ptr + 1));
-
- g_free(value);
- }
- }
- return color;
-}
-
-
-
-GdkBitmap *
-skin_create_transparent_mask(const gchar * path,
- const gchar * file,
- const gchar * section,
- GdkWindow * window,
- gint width,
- gint height, gboolean scale)
-{
- GdkBitmap *mask = NULL;
- GdkGC *gc = NULL;
- GdkColor pattern;
- GdkPoint *gpoints;
-
- gchar *filename = NULL;
- INIFile *inifile = NULL;
- gboolean created_mask = FALSE;
- GArray *num, *point;
- guint i, j;
- gint k;
-
- if (path != NULL)
- filename = find_file_case_uri (path, file);
-
- /* filename will be null if path wasn't set */
- if (!filename)
- return create_default_mask(window, width, height);
-
- inifile = open_ini_file(filename);
-
- if ((num = read_ini_array(inifile, section, "NumPoints")) == NULL) {
- g_free(filename);
- close_ini_file(inifile);
- return NULL;
- }
-
- if ((point = read_ini_array(inifile, section, "PointList")) == NULL) {
- g_array_free(num, TRUE);
- g_free(filename);
- close_ini_file(inifile);
- return NULL;
- }
-
- close_ini_file(inifile);
-
- mask = gdk_pixmap_new(window, width, height, 1);
- gc = gdk_gc_new(mask);
-
- pattern.pixel = 0;
- gdk_gc_set_foreground(gc, &pattern);
- gdk_draw_rectangle(mask, gc, TRUE, 0, 0, width, height);
- pattern.pixel = 1;
- gdk_gc_set_foreground(gc, &pattern);
-
- j = 0;
- for (i = 0; i < num->len; i++) {
- if ((int)(point->len - j) >= (g_array_index(num, gint, i) * 2)) {
- created_mask = TRUE;
- gpoints = g_new(GdkPoint, g_array_index(num, gint, i));
- for (k = 0; k < g_array_index(num, gint, i); k++) {
- gpoints[k].x =
- g_array_index(point, gint, j + k * 2) * (scale ? config.scale_factor : 1 );
- gpoints[k].y =
- g_array_index(point, gint,
- j + k * 2 + 1) * (scale ? config.scale_factor : 1);
- }
- j += k * 2;
- gdk_draw_polygon(mask, gc, TRUE, gpoints,
- g_array_index(num, gint, i));
- g_free(gpoints);
- }
- }
- g_array_free(num, TRUE);
- g_array_free(point, TRUE);
- g_free(filename);
-
- if (!created_mask)
- gdk_draw_rectangle(mask, gc, TRUE, 0, 0, width, height);
-
- g_object_unref(gc);
-
- return mask;
-}
-
-static void skin_load_viscolor (Skin * skin, const gchar * path, const gchar *
- basename)
-{
- gchar * filename, * buffer, * string, * next;
- gint line;
-
- skin_set_default_vis_color (skin);
-
- filename = find_file_case_uri (path, basename);
- if (filename == NULL)
- return;
-
- buffer = load_text_file (filename);
- g_free (filename);
- string = buffer;
-
- for (line = 0; string != NULL && line < 24; line ++)
- {
- GArray * array;
- gint column;
-
- next = text_parse_line (string);
- array = string_to_garray (string);
-
- if (array->len >= 3)
- {
- for (column = 0; column < 3; column ++)
- skin->vis_color[line][column] = g_array_index (array, gint,
- column);
- }
-
- g_array_free (array, TRUE);
- string = next;
- }
-
- g_free (buffer);
-}
-
-static void
-skin_numbers_generate_dash(Skin * skin)
-{
- GdkPixbuf *pixbuf;
- SkinPixmap *numbers;
-
- g_return_if_fail(skin != NULL);
-
- numbers = &skin->pixmaps[SKIN_NUMBERS];
- if (!numbers->pixbuf || numbers->current_width < 99)
- return;
-
- pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
- 108, numbers->current_height);
-
- skin_draw_pixbuf(NULL, skin, pixbuf, SKIN_NUMBERS, 0, 0, 0, 0, 99, numbers->current_height);
- skin_draw_pixbuf(NULL, skin, pixbuf, SKIN_NUMBERS, 90, 0, 99, 0, 9, numbers->current_height);
- skin_draw_pixbuf(NULL, skin, pixbuf, SKIN_NUMBERS, 20, 6, 101, 6, 5, 1);
-
- g_object_unref(numbers->pixbuf);
-
- numbers->pixbuf = pixbuf;
- numbers->current_width = 108;
- numbers->width = 108;
-}
-
-static gboolean
-skin_load_pixmaps(Skin * skin, const gchar * path)
-{
- GdkPixbuf *text_pb;
- guint i;
- gchar *filename;
- INIFile *inifile;
+static gboolean
+skin_load_pixmaps(Skin * skin, const gchar * path)
+{
+ guint i;
+ gchar *filename;
+ INIFile *inifile;
 
 if(!skin) return FALSE;
 if(!path) return FALSE;
@@ -1431,17 +859,15 @@
 AUDDBG("Loading pixmaps in %s\n", path);
 
 for (i = 0; i < SKIN_PIXMAP_COUNT; i++)
- if (!skin_load_pixmap_id(skin, i, path) && !config.allow_broken_skins)
+ if (! skin_load_pixmap_id (skin, i, path))
 return FALSE;
 
- text_pb = skin->pixmaps[SKIN_TEXT].pixbuf;
-
- if (text_pb)
- skin_get_textcolors(text_pb, skin->textbg, skin->textfg);
+ if (skin->pixmaps[SKIN_TEXT])
+ skin_get_textcolors (skin, skin->pixmaps[SKIN_TEXT]);
 
- if (skin->pixmaps[SKIN_NUMBERS].pixbuf &&
- skin->pixmaps[SKIN_NUMBERS].width < 108 )
- skin_numbers_generate_dash(skin);
+ if (skin->pixmaps[SKIN_NUMBERS] && cairo_image_surface_get_width
+ (skin->pixmaps[SKIN_NUMBERS]) < 108)
+ skin_numbers_generate_dash (skin);
 
 filename = find_file_case_uri (path, "pledit.txt");
 inifile = (filename != NULL) ? open_ini_file (filename) : NULL;
@@ -1461,41 +887,16 @@
 if (filename)
 g_free(filename);
 
- skin_mask_create(skin, path, SKIN_MASK_MAIN, mainwin->window);
- skin_mask_create(skin, path, SKIN_MASK_MAIN_SHADE, mainwin->window);
-
- skin_mask_create(skin, path, SKIN_MASK_EQ, equalizerwin->window);
- skin_mask_create(skin, path, SKIN_MASK_EQ_SHADE, equalizerwin->window);
+ skin_mask_create (skin, path, SKIN_MASK_MAIN, gtk_widget_get_window (mainwin));
+ skin_mask_create (skin, path, SKIN_MASK_MAIN_SHADE, gtk_widget_get_window (mainwin));
+ skin_mask_create (skin, path, SKIN_MASK_EQ, gtk_widget_get_window (equalizerwin));
+ skin_mask_create (skin, path, SKIN_MASK_EQ_SHADE, gtk_widget_get_window (equalizerwin));
 
 skin_load_viscolor(skin, path, "viscolor.txt");
 
 return TRUE;
 }
 
-#ifndef _WIN32
-static void
-skin_set_gtk_theme(GtkSettings * settings, Skin * skin)
-{
- if (original_gtk_theme == NULL)
- g_object_get(settings, "gtk-theme-name", &original_gtk_theme, NULL);
-
- /* the way GTK does things can be very broken. --nenolod */
-
- gchar path[PATH_MAX];
-
- snprintf (path, sizeof path, "%s/.themes", g_get_home_dir ());
- g_mkdir_with_parents (path, 0755);
-
- snprintf (path, sizeof path, "%s/.themes/aud-%s", g_get_home_dir (), basename
- (skin->path));
- if (! g_file_test (path, G_FILE_TEST_EXISTS) && symlink (skin->path, path))
- fprintf (stderr, "Failed to create symlink %s.\n", path);
-
- gtk_settings_set_string_property (settings, "gtk-theme-name", basename
- (path), "audacious");
-}
-#endif
-
 /**
 * Checks if all pixmap files exist that skin needs.
 */
@@ -1525,7 +926,6 @@
 
 g_return_val_if_fail(skin != NULL, FALSE);
 g_return_val_if_fail(path != NULL, FALSE);
- REQUIRE_LOCK(skin->lock);
 
 if (! g_file_test (path, G_FILE_TEST_EXISTS))
 return FALSE;
@@ -1548,7 +948,7 @@
 }
 
 // Check if skin path has all necessary files.
- if (!config.allow_broken_skins && !skin_check_pixmaps(skin, skin_path)) {
+ if (!skin_check_pixmaps(skin, skin_path)) {
 if(archive) del_directory(skin_path);
 g_free(skin_path);
 AUDDBG("Skin path (%s) doesn't have all wanted pixmaps\n", skin_path);
@@ -1575,18 +975,6 @@
 return FALSE;
 }
 
-#ifndef _WIN32
- if (! config.disable_inline_gtk && ! archive)
- {
- gchar * gtkrcpath = g_strdup_printf ("%s/gtk-2.0/gtkrc", skin->path);
-
- if (g_file_test (gtkrcpath, G_FILE_TEST_IS_REGULAR))
- skin_set_gtk_theme (gtk_settings_get_default (), skin);
-
- g_free (gtkrcpath);
- }
-#endif
-
 if(archive) del_directory(skin_path);
 g_free(skin_path);
 
@@ -1612,17 +1000,7 @@
 g_free(command);
 }
 
-static SkinPixmap *
-skin_get_pixmap(Skin * skin, SkinPixmapId map_id)
-{
- g_return_val_if_fail(skin != NULL, NULL);
- g_return_val_if_fail(map_id < SKIN_PIXMAP_COUNT, NULL);
-
- return &skin->pixmaps[map_id];
-}
-
-gboolean
-skin_load(Skin * skin, const gchar * path)
+static gboolean skin_load (Skin * skin, const gchar * path)
 {
 gboolean ret;
 
@@ -1631,210 +1009,56 @@
 if (!path)
 return FALSE;
 
- skin_lock(skin);
 ret = skin_load_nolock(skin, path, FALSE);
- skin_unlock(skin);
 
 if(!ret) {
 AUDDBG("loading failed\n");
 return FALSE; /* don't try to update anything if loading failed --asphyx */
 }
 
- SkinPixmap *pixmap = NULL;
- pixmap = skin_get_pixmap(skin, SKIN_NUMBERS);
- if (pixmap) {
- ui_skinned_number_set_size(mainwin_minus_num, 9, pixmap->height);
- ui_skinned_number_set_size(mainwin_10min_num, 9, pixmap->height);
- ui_skinned_number_set_size(mainwin_min_num, 9, pixmap->height);
- ui_skinned_number_set_size(mainwin_10sec_num, 9, pixmap->height);
- ui_skinned_number_set_size(mainwin_sec_num, 9, pixmap->height);
+ if (skin->pixmaps[SKIN_NUMBERS])
+ {
+ gint h = cairo_image_surface_get_height (skin->pixmaps[SKIN_NUMBERS]);
+ ui_skinned_number_set_size (mainwin_minus_num, 9, h);
+ ui_skinned_number_set_size (mainwin_10min_num, 9, h);
+ ui_skinned_number_set_size (mainwin_min_num, 9, h);
+ ui_skinned_number_set_size (mainwin_10sec_num, 9, h);
+ ui_skinned_number_set_size (mainwin_sec_num, 9, h);
 }
 
- pixmap = skin_get_pixmap(skin, SKIN_MAIN);
- if (pixmap && skin->properties.mainwin_height > pixmap->height)
- skin->properties.mainwin_height = pixmap->height;
-
- pixmap = skin_get_pixmap(skin, SKIN_PLAYPAUSE);
- if (pixmap)
- ui_skinned_playstatus_set_size(mainwin_playstatus, 11, pixmap->height);
-
- pixmap = skin_get_pixmap(skin, SKIN_EQMAIN);
- if (pixmap->height >= 313)
- gtk_widget_show(equalizerwin_graph);
+ if (skin->pixmaps[SKIN_PLAYPAUSE])
+ ui_skinned_playstatus_set_size (mainwin_playstatus, 11,
+ cairo_image_surface_get_height (skin->pixmaps[SKIN_PLAYPAUSE]));
 
 return TRUE;
 }
 
-gboolean
-skin_reload_forced(void)
-{
- gboolean error;
- AUDDBG("\n");
-
- skin_lock(aud_active_skin);
- error = skin_load_nolock(aud_active_skin, aud_active_skin->path, TRUE);
- skin_unlock(aud_active_skin);
-
- return error;
-}
-
-void
-skin_reload(Skin * skin)
-{
- AUDDBG("\n");
- g_return_if_fail(skin != NULL);
- skin_load_nolock(skin, skin->path, TRUE);
-}
-
-GdkBitmap *
-skin_get_mask(Skin * skin, SkinMaskId mi)
-{
- GdkBitmap **masks;
-
- g_return_val_if_fail(skin != NULL, NULL);
- g_return_val_if_fail(mi < SKIN_MASK_COUNT, NULL);
-
- masks = config.scaled ? skin->scaled_masks : skin->masks;
- return masks[mi];
-}
-
-GdkColor *
-skin_get_color(Skin * skin, SkinColorId color_id)
-{
- GdkColor *ret = NULL;
-
- g_return_val_if_fail(skin != NULL, NULL);
-
- switch (color_id) {
- case SKIN_TEXTBG:
- if (skin->pixmaps[SKIN_TEXT].pixbuf)
- ret = skin->textbg;
- else
- ret = skin->def_textbg;
- break;
- case SKIN_TEXTFG:
- if (skin->pixmaps[SKIN_TEXT].pixbuf)
- ret = skin->textfg;
- else
- ret = skin->def_textfg;
- break;
- default:
- if (color_id < SKIN_COLOR_COUNT)
- ret = skin->colors[color_id];
- break;
- }
- return ret;
-}
-
-void
-skin_get_viscolor(Skin * skin, guchar vis_color[24][3])
-{
- gint i;
-
- g_return_if_fail(skin != NULL);
-
- for (i = 0; i < 24; i++) {
- vis_color[i][0] = skin->vis_color[i][0];
- vis_color[i][1] = skin->vis_color[i][1];
- vis_color[i][2] = skin->vis_color[i][2];
- }
-}
-
-gint
-skin_get_id(void)
-{
- return skin_current_num;
-}
-
-void
-skin_draw_pixbuf(GtkWidget *widget, Skin * skin, GdkPixbuf * pix,
- SkinPixmapId pixmap_id,
- gint xsrc, gint ysrc, gint xdest, gint ydest,
- gint width, gint height)
+void skin_draw_pixbuf (cairo_t * cr, SkinPixmapId id, gint xsrc, gint ysrc, gint
+ xdest, gint ydest, gint width, gint height)
 {
- SkinPixmap *pixmap;
-
- g_return_if_fail(skin != NULL);
-
- pixmap = skin_get_pixmap(skin, pixmap_id);
- g_return_if_fail(pixmap != NULL);
- g_return_if_fail(pixmap->pixbuf != NULL);
-
- /* perhaps we should use transparency or resize widget? */
- if (xsrc+width > pixmap->width || ysrc+height > pixmap->height) {
- if (widget) {
- /* it's better to hide widget using SKIN_PLAYPAUSE/SKIN_POSBAR than display mess */
- if ((pixmap_id == SKIN_PLAYPAUSE && pixmap->width != 42) || pixmap_id == SKIN_POSBAR) {
- gtk_widget_hide(widget);
- return;
- }
-
- /* Some skins include SKIN_VOLUME and/or SKIN_BALANCE without knobs */
- if (pixmap_id == SKIN_VOLUME || pixmap_id == SKIN_BALANCE) {
- if (ysrc+height > 421 && xsrc+width <= pixmap->width)
- return;
- }
-
- /* XMMS skins seems to have SKIN_MONOSTEREO with size 58x20 instead of 58x24 */
- if (pixmap_id == SKIN_MONOSTEREO)
- height = pixmap->height/2;
-
- if (gtk_widget_get_parent(widget) == SKINNED_WINDOW(equalizerwin)->normal) {
- if (!(pixmap_id == SKIN_EQMAIN && ysrc == 314)) /* equalizer preamp on equalizer graph */
- gtk_widget_hide(widget);
- }
-
- if (gtk_widget_get_parent(widget) == SKINNED_WINDOW(playlistwin)->normal) {
- /* I haven't seen any skin with substandard playlist */
- gtk_widget_hide(widget);
- }
- } else
- return;
- }
+ if (! active_skin->pixmaps[id])
+ return;
 
- width = MIN(width, pixmap->width - xsrc);
- height = MIN(height, pixmap->height - ysrc);
- gdk_pixbuf_copy_area(pixmap->pixbuf, xsrc, ysrc, width, height,
- pix, xdest, ydest);
+ cairo_set_source_surface (cr, active_skin->pixmaps[id], xdest - xsrc,
+ ydest - ysrc);
+ cairo_rectangle (cr, xdest, ydest, width, height);
+ cairo_fill (cr);
 }
 
-void
-skin_get_eq_spline_colors(Skin * skin, guint32 colors[19])
+void skin_get_eq_spline_colors (Skin * skin, guint32 colors[19])
 {
- gint i;
- GdkPixbuf *pixbuf;
- SkinPixmap *eqmainpm;
- guchar* pixels,*p;
- guint rowstride, n_channels;
- g_return_if_fail(skin != NULL);
-
- eqmainpm = &skin->pixmaps[SKIN_EQMAIN];
- if (eqmainpm->pixbuf &&
- eqmainpm->current_width >= 116 && eqmainpm->current_height >= 313)
- pixbuf = eqmainpm->pixbuf;
- else
- return;
-
- if (!GDK_IS_PIXBUF(pixbuf))
- return;
-
- pixels = gdk_pixbuf_get_pixels (pixbuf);
- rowstride = gdk_pixbuf_get_rowstride (pixbuf);
- n_channels = gdk_pixbuf_get_n_channels (pixbuf);
- for (i = 0; i < 19; i++)
+ if (! skin->pixmaps[SKIN_EQMAIN])
 {
- p = pixels + rowstride * (i + 294) + 115 * n_channels;
- colors[i] = (p[0] << 16) | (p[1] << 8) | p[2];
- /* should we really treat the Alpha channel? */
- /*if (n_channels == 4)
- colors[i] = (colors[i] << 8) | p[3];*/
+ memset (colors, 0, sizeof (guint32) * 19);
+ return;
 }
-}
 
+ for (gint i = 0; i < 19; i ++)
+ colors[i] = surface_get_pixel (skin->pixmaps[SKIN_EQMAIN], 115, i + 294);
+}
 
-static void
-skin_draw_playlistwin_frame_top(Skin * skin, GdkPixbuf * pix,
- gint width, gint height, gboolean focus)
+static void skin_draw_playlistwin_frame_top (cairo_t * cr, gint width, gint
+ height, gboolean focus)
 {
 /* The title bar skin consists of 2 sets of 4 images, 1 set
 * for focused state and the other for unfocused. The 4 images
@@ -1857,15 +1081,13 @@
 y = 21;
 
 /* left corner */
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 0, y, 0, 0, 25, 20);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 0, y, 0, 0, 25, 20);
 
 /* titlebar title */
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 26, y,
- (width - 100) / 2, 0, 100, 20);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 26, y, (width - 100) / 2, 0, 100, 20);
 
 /* titlebar right corner */
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 153, y,
- width - 25, 0, 25, 20);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 153, y, width - 25, 0, 25, 20);
 
 /* tile draw the remaining frame */
 
@@ -1874,27 +1096,25 @@
 
 for (i = 0; i < c / 2; i++) {
 /* left of title */
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 127, y,
- 25 + i * 25, 0, 25, 20);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, 25 + i * 25, 0, 25, 20);
 
 /* right of title */
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 127, y,
- (width + 100) / 2 + i * 25, 0, 25, 20);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, (width + 100) / 2 + i * 25,
+ 0, 25, 20);
 }
 
 if (c & 1) {
 /* Odd tile count, so one remaining to draw. Here we split
 * it into two and draw half on either side of the title */
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 127, y,
- ((c / 2) * 25) + 25, 0, 12, 20);
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 127, y,
- (width / 2) + ((c / 2) * 25) + 50, 0, 13, 20);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, ((c / 2) * 25) + 25, 0, 12,
+ 20);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, (width / 2) + ((c / 2) * 25)
+ + 50, 0, 13, 20);
 }
 }
 
-static void
-skin_draw_playlistwin_frame_bottom(Skin * skin, GdkPixbuf * pix,
- gint width, gint height, gboolean focus)
+static void skin_draw_playlistwin_frame_bottom (cairo_t * cr, gint width, gint
+ height, gboolean focus)
 {
 /* The bottom frame skin consists of 1 set of 4 images. The 4
 * images are:
@@ -1910,31 +1130,29 @@
 gint i, c;
 
 /* bottom left corner (menu buttons) */
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 0, 72,
- 0, height - 38, 125, 38);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 0, 72, 0, height - 38, 125, 38);
 
 c = (width - 275) / 25;
 
 /* draw visualization window, if width allows */
 if (c >= 3) {
 c -= 3;
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 205, 0,
- width - (150 + 75), height - 38, 75, 38);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 205, 0, width - (150 + 75), height -
+ 38, 75, 38);
 }
 
 /* Bottom right corner (playbuttons etc) */
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT,
- 126, 72, width - 150, height - 38, 150, 38);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 126, 72, width - 150, height - 38, 150,
+ 38);
 
 /* Tile draw the remaining undrawn portions */
 for (i = 0; i < c; i++)
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 179, 0,
- 125 + i * 25, height - 38, 25, 38);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 179, 0, 125 + i * 25, height - 38,
+ 25, 38);
 }
 
-static void
-skin_draw_playlistwin_frame_sides(Skin * skin, GdkPixbuf * pix,
- gint width, gint height, gboolean focus)
+static void skin_draw_playlistwin_frame_sides (cairo_t * cr, gint width, gint
+ height, gboolean focus)
 {
 /* The side frames consist of 2 tile images. 1 for the left, 1 for
 * the right.
@@ -1947,29 +1165,23 @@
 /* frame sides */
 for (i = 0; i < (height - (20 + 38)) / 29; i++) {
 /* left */
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 0, 42,
- 0, 20 + i * 29, 12, 29);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 0, 42, 0, 20 + i * 29, 12, 29);
 
 /* right */
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 32, 42,
- width - 19, 20 + i * 29, 19, 29);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 32, 42, width - 19, 20 + i * 29, 19,
+ 29);
 }
 }
 
-
-void
-skin_draw_playlistwin_frame(Skin * skin, GdkPixbuf * pix,
- gint width, gint height, gboolean focus)
+void skin_draw_playlistwin_frame (cairo_t * cr, gint width, gint height,
+ gboolean focus)
 {
- skin_draw_playlistwin_frame_top(skin, pix, width, height, focus);
- skin_draw_playlistwin_frame_bottom(skin, pix, width, height, focus);
- skin_draw_playlistwin_frame_sides(skin, pix, width, height, focus);
+ skin_draw_playlistwin_frame_top (cr, width, height, focus);
+ skin_draw_playlistwin_frame_bottom (cr, width, height, focus);
+ skin_draw_playlistwin_frame_sides (cr, width, height, focus);
 }
 
-
-void
-skin_draw_playlistwin_shaded(Skin * skin, GdkPixbuf * pix,
- gint width, gboolean focus)
+void skin_draw_playlistwin_shaded (cairo_t * cr, gint width, gboolean focus)
 {
 /* The shade mode titlebar skin consists of 4 images:
 * a) left corner offset (72,42) size (25,14)
@@ -1981,22 +1193,18 @@
 gint i;
 
 /* left corner */
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 72, 42, 0, 0, 25, 14);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 72, 42, 0, 0, 25, 14);
 
 /* bar tile */
 for (i = 0; i < (width - 75) / 25; i++)
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 72, 57,
- (i * 25) + 25, 0, 25, 14);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 72, 57, (i * 25) + 25, 0, 25, 14);
 
 /* right corner */
- skin_draw_pixbuf(NULL, skin, pix, SKIN_PLEDIT, 99, focus ? 42 : 57,
- width - 50, 0, 50, 14);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 99, focus ? 42 : 57, width - 50, 0, 50,
+ 14);
 }
 
-
-void
-skin_draw_mainwin_titlebar(Skin * skin, GdkPixbuf * pix,
- gboolean shaded, gboolean focus)
+void skin_draw_mainwin_titlebar (cairo_t * cr, gboolean shaded, gboolean focus)
 {
 /* The titlebar skin consists of 2 sets of 2 images, one for for
 * shaded and the other for unshaded mode, giving a total of 4.
@@ -2024,36 +1232,6 @@
 y_offset = 15;
 }
 
- skin_draw_pixbuf(NULL, skin, pix, SKIN_TITLEBAR, 27, y_offset,
- 0, 0, aud_active_skin->properties.mainwin_width, MAINWIN_TITLEBAR_HEIGHT);
-}
-
-
-void
-skin_set_random_skin(void)
-{
- SkinNode *node;
- guint32 randval;
-
- /* Get a random value to select the skin to use */
- randval = g_random_int_range(0, g_list_length(skinlist));
- node = g_list_nth(skinlist, randval)->data;
- aud_active_skin_load(node->path);
-}
-
-void ui_skinned_widget_draw_with_coordinates(GtkWidget *widget, GdkPixbuf *obj, gint width, gint height, gint destx, gint desty, gboolean scale) {
- g_return_if_fail(widget != NULL);
- g_return_if_fail(obj != NULL);
-
- if (scale) {
- GdkPixbuf *image = gdk_pixbuf_scale_simple(obj, width * config.scale_factor, height* config.scale_factor, GDK_INTERP_NEAREST);
- gdk_draw_pixbuf(widget->window, NULL, image, 0, 0, destx, desty, width * config.scale_factor , height * config.scale_factor, GDK_RGB_DITHER_NONE, 0, 0);
- g_object_unref(image);
- } else {
- gdk_draw_pixbuf(widget->window, NULL, obj, 0, 0, destx, desty, width, height, GDK_RGB_DITHER_NONE, 0, 0);
- }
-}
-
-void ui_skinned_widget_draw(GtkWidget *widget, GdkPixbuf *obj, gint width, gint height, gboolean scale) {
- ui_skinned_widget_draw_with_coordinates(widget, obj, width, height, 0, 0, scale);
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 27, y_offset, 0, 0,
+ active_skin->properties.mainwin_width, MAINWIN_TITLEBAR_HEIGHT);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skin.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skin.h Changed

@@ -1,5 +1,5 @@
 /* Audacious
- * Copyright (C) 2005-2007 Audacious development team.
+ * Copyright (C) 2005-2011 Audacious development team.
 *
 * BMP - Cross-platform multimedia player
 * Copyright (C) 2003-2004 BMP development team.
@@ -26,10 +26,17 @@
 #ifndef SKIN_H
 #define SKIN_H
 
-#include <glib.h>
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define MASK_IS_REGION
+#endif
+
+#define COLOR(r,g,b) (((guint32) (r) << 16) | ((guint32) (g) << 8) | (guint32) (b))
+#define COLOR_R(c) ((gint) (((c) & 0xff0000) >> 16))
+#define COLOR_G(c) ((gint) (((c) & 0xff00) >> 8))
+#define COLOR_B(c) ((gint) ((c) & 0xff))
+
 typedef enum {
 SKIN_MAIN = 0,
 SKIN_CBUTTONS,
@@ -66,177 +73,138 @@
 SKIN_COLOR_COUNT
 } SkinColorId;
 
-typedef struct _SkinProperties {
-	/* this enables the othertext engine, not it's visibility -nenolod */
-	gboolean mainwin_othertext;
-
-	/* Vis properties */
-	gint mainwin_vis_x;
-	gint mainwin_vis_y;
-	gint mainwin_vis_width;
-	gboolean mainwin_vis_visible;
+typedef struct {
+ /* Vis properties */
+ gint mainwin_vis_x;
+ gint mainwin_vis_y;
+ gboolean mainwin_vis_visible;
 
-	/* Text properties */
-	gint mainwin_text_x;
-	gint mainwin_text_y;
-	gint mainwin_text_width;
-	gboolean mainwin_text_visible;
+ /* Text properties */
+ gint mainwin_text_x;
+ gint mainwin_text_y;
+ gint mainwin_text_width;
+ gboolean mainwin_text_visible;
 
-	/* Infobar properties */
-	gint mainwin_infobar_x;
-	gint mainwin_infobar_y;
-	gboolean mainwin_othertext_visible;
+ /* Infobar properties */
+ gint mainwin_infobar_x;
+ gint mainwin_infobar_y;
+ gboolean mainwin_othertext_visible;
 
-	gint mainwin_number_0_x;
-	gint mainwin_number_0_y;
+ gint mainwin_number_0_x;
+ gint mainwin_number_0_y;
 
-	gint mainwin_number_1_x;
-	gint mainwin_number_1_y;
+ gint mainwin_number_1_x;
+ gint mainwin_number_1_y;
 
-	gint mainwin_number_2_x;
-	gint mainwin_number_2_y;
+ gint mainwin_number_2_x;
+ gint mainwin_number_2_y;
 
-	gint mainwin_number_3_x;
-	gint mainwin_number_3_y;
+ gint mainwin_number_3_x;
+ gint mainwin_number_3_y;
 
-	gint mainwin_number_4_x;
-	gint mainwin_number_4_y;
+ gint mainwin_number_4_x;
+ gint mainwin_number_4_y;
 
-	gint mainwin_playstatus_x;
-	gint mainwin_playstatus_y;
+ gint mainwin_playstatus_x;
+ gint mainwin_playstatus_y;
 
-	gint mainwin_volume_x;
-	gint mainwin_volume_y;
+ gint mainwin_volume_x;
+ gint mainwin_volume_y;
 
-	gint mainwin_balance_x;
-	gint mainwin_balance_y;
+ gint mainwin_balance_x;
+ gint mainwin_balance_y;
 
-	gint mainwin_position_x;
-	gint mainwin_position_y;
+ gint mainwin_position_x;
+ gint mainwin_position_y;
 
-	gint mainwin_previous_x;
-	gint mainwin_previous_y;
+ gint mainwin_previous_x;
+ gint mainwin_previous_y;
 
-	gint mainwin_play_x;
-	gint mainwin_play_y;
+ gint mainwin_play_x;
+ gint mainwin_play_y;
 
-	gint mainwin_pause_x;
-	gint mainwin_pause_y;
+ gint mainwin_pause_x;
+ gint mainwin_pause_y;
 
-	gint mainwin_stop_x;
-	gint mainwin_stop_y;
+ gint mainwin_stop_x;
+ gint mainwin_stop_y;
 
-	gint mainwin_next_x;
-	gint mainwin_next_y;
+ gint mainwin_next_x;
+ gint mainwin_next_y;
 
-	gint mainwin_eject_x;
-	gint mainwin_eject_y;
+ gint mainwin_eject_x;
+ gint mainwin_eject_y;
 
-	gint mainwin_eqbutton_x;
-	gint mainwin_eqbutton_y;
+ gint mainwin_eqbutton_x;
+ gint mainwin_eqbutton_y;
 
-	gint mainwin_plbutton_x;
-	gint mainwin_plbutton_y;
+ gint mainwin_plbutton_x;
+ gint mainwin_plbutton_y;
 
-	gint mainwin_shuffle_x;
-	gint mainwin_shuffle_y;
+ gint mainwin_shuffle_x;
+ gint mainwin_shuffle_y;
 
-	gint mainwin_repeat_x;
-	gint mainwin_repeat_y;
+ gint mainwin_repeat_x;
+ gint mainwin_repeat_y;
 
-	gint mainwin_about_x;
-	gint mainwin_about_y;
+ gint mainwin_about_x;
+ gint mainwin_about_y;
 
-	gint mainwin_minimize_x;
-	gint mainwin_minimize_y;
+ gint mainwin_minimize_x;
+ gint mainwin_minimize_y;
 
-	gint mainwin_shade_x;
-	gint mainwin_shade_y;
+ gint mainwin_shade_x;
+ gint mainwin_shade_y;
 
-	gint mainwin_close_x;
-	gint mainwin_close_y;
+ gint mainwin_close_x;
+ gint mainwin_close_y;
 
-	gint mainwin_width;
-	gint mainwin_height;
+ gint mainwin_width;
+ gint mainwin_height;
 
-	gboolean mainwin_menurow_visible;
-	gboolean mainwin_othertext_is_status;
+ gboolean mainwin_menurow_visible;
+ gboolean mainwin_streaminfo_visible;
+ gboolean mainwin_othertext_is_status;
 
-	gint textbox_bitmap_font_width;
-	gint textbox_bitmap_font_height;
+ gint textbox_bitmap_font_width;
+ gint textbox_bitmap_font_height;
 } SkinProperties;
 
-#define SKIN_PIXMAP(x) ((SkinPixmap *)(x))
-typedef struct _SkinPixmap {
- GdkPixbuf *pixbuf;
-
- /* The real size of the pixmap */
- gint width, height;
-
- /* The size of the pixmap from the current skin,
- which might be smaller */
- gint current_width, current_height;
-} SkinPixmap;
-
-
-#define SKIN(x) ((Skin *)(x))
-typedef struct _Skin {
- GMutex *lock;
+typedef struct {
 gchar *path;
- gchar *def_path;
- SkinPixmap pixmaps[SKIN_PIXMAP_COUNT];
- GdkColor textbg[6], def_textbg[6];
- GdkColor textfg[6], def_textfg[6];
- GdkColor *colors[SKIN_COLOR_COUNT];
- guchar vis_color[24][3];
- GdkBitmap *masks[SKIN_MASK_COUNT];
- GdkBitmap *scaled_masks[SKIN_MASK_COUNT];
+ cairo_surface_t * pixmaps[SKIN_PIXMAP_COUNT];
+ guint32 colors[SKIN_COLOR_COUNT];
+ guint32 vis_colors[24];
+#ifdef MASK_IS_REGION
+ cairo_region_t * masks[SKIN_MASK_COUNT];
+#else
+ GdkBitmap * masks[SKIN_MASK_COUNT];
+#endif
 SkinProperties properties;
 } Skin;
 
-extern Skin *aud_active_skin;
+extern Skin * active_skin;
 
 gboolean init_skins(const gchar * path);
 void cleanup_skins(void);
 
-gboolean aud_active_skin_load(const gchar * path);
-gboolean aud_active_skin_reload(void);
-
-Skin *skin_new(void);
-gboolean skin_load(Skin * skin, const gchar * path);
-gboolean skin_reload_forced(void);
-void skin_reload(Skin * skin);
-void skin_free(Skin * skin);
-void skin_destroy(Skin * skin);
+gboolean active_skin_load(const gchar * path);
 
-GdkBitmap *skin_get_mask(Skin * skin, SkinMaskId mi);
-GdkColor *skin_get_color(Skin * skin, SkinColorId color_id);
-
-void skin_get_viscolor(Skin * skin, guchar vis_color[24][3]);
-gint skin_get_id(void);
-void skin_draw_pixbuf(GtkWidget *widget, Skin * skin, GdkPixbuf * pix,
- SkinPixmapId pixmap_id,
- gint xsrc, gint ysrc, gint xdest, gint ydest,
- gint width, gint height);
+void skin_draw_pixbuf (cairo_t * cr, SkinPixmapId id, gint xsrc, gint ysrc,
+ gint xdest, gint ydest, gint width, gint height);
 
 void skin_get_eq_spline_colors(Skin * skin, guint32 colors[19]);
 void skin_install_skin(const gchar * path);
 
-void skin_draw_playlistwin_shaded(Skin * skin, GdkPixbuf * pix,
- gint width, gboolean focus);
-void skin_draw_playlistwin_frame(Skin * skin, GdkPixbuf * pix,
- gint width, gint height, gboolean focus);
-
-void skin_draw_mainwin_titlebar(Skin * skin, GdkPixbuf * pix,
- gboolean shaded, gboolean focus);
-
-
-void skin_parse_hints(Skin * skin, gchar *path_p);
-
-
-void skin_set_random_skin(void);
+void skin_draw_playlistwin_shaded (cairo_t * cr, gint width, gboolean focus);
+void skin_draw_playlistwin_frame (cairo_t * cr, gint width, gint height,
+ gboolean focus);
+void skin_draw_mainwin_titlebar (cairo_t * cr, gboolean shaded, gboolean focus);
 
-void ui_skinned_widget_draw_with_coordinates(GtkWidget *widget, GdkPixbuf *obj, gint width, gint height, gint destx, gint desty, gboolean scale);
-void ui_skinned_widget_draw(GtkWidget *widget, GdkPixbuf *obj, gint width, gint height, gboolean scale);
+static inline void set_cairo_color (cairo_t * cr, guint32 c)
+{
+ cairo_set_source_rgb (cr, COLOR_R(c) / 255.0, COLOR_G(c) / 255.0, COLOR_B(c)
+ / 255.0);
+}
 
 #endif

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_button.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_button.c Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 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 as published by
@@ -18,485 +19,264 @@
 * Audacious or using our public API to be a derived work.
 */
 
+#include "draw-compat.h"
 #include "ui_skinned_button.h"
-#include "skins_cfg.h"
-#include "util.h"
-
-#include <math.h>
-
-#define UI_SKINNED_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ui_skinned_button_get_type(), UiSkinnedButtonPrivate))
-typedef struct _UiSkinnedButtonPrivate UiSkinnedButtonPrivate;
-
-enum {
- PRESSED,
- RELEASED,
- CLICKED,
- DOUBLED,
- LAST_SIGNAL
-};
-
-struct _UiSkinnedButtonPrivate {
- //Skinned part
- GdkGC *gc;
- gint w;
- gint h;
- SkinPixmapId skin_index1;
- SkinPixmapId skin_index2;
- gboolean scaled;
- gint move_x, move_y;
-
- gint nx, ny, px, py;
- //Toogle button needs also those
- gint pnx, pny, ppx, ppy;
-};
-
-
-static GtkWidgetClass *parent_class = NULL;
-static void ui_skinned_button_class_init(UiSkinnedButtonClass *klass);
-static void ui_skinned_button_init(UiSkinnedButton *button);
-static void ui_skinned_button_destroy(GtkObject *object);
-static void ui_skinned_button_realize(GtkWidget *widget);
-static void ui_skinned_button_unrealize(GtkWidget *widget);
-static void ui_skinned_button_map(GtkWidget *widget);
-static void ui_skinned_button_unmap(GtkWidget *widget);
-static void ui_skinned_button_size_request(GtkWidget *widget, GtkRequisition *requisition);
-static gint ui_skinned_button_expose(GtkWidget *widget,GdkEventExpose *event);
-
-static void ui_skinned_button_size_allocate(GtkWidget *widget, GtkAllocation *allocation);
-static void ui_skinned_button_update_state(UiSkinnedButton *button);
-
-static guint button_signals[LAST_SIGNAL] = { 0 };
-static gint ui_skinned_button_button_press(GtkWidget *widget, GdkEventButton *event);
-static gint ui_skinned_button_button_release(GtkWidget *widget, GdkEventButton *event);
-static void button_pressed(UiSkinnedButton *button);
-static void button_released(UiSkinnedButton *button);
-static void ui_skinned_button_pressed(UiSkinnedButton *button);
-static void ui_skinned_button_released(UiSkinnedButton *button);
-static void ui_skinned_button_clicked(UiSkinnedButton *button);
-static void ui_skinned_button_set_pressed (UiSkinnedButton *button, gboolean pressed);
-
-static void ui_skinned_button_toggle_scaled(UiSkinnedButton *button);
-
-static gint ui_skinned_button_enter_notify(GtkWidget *widget, GdkEventCrossing *event);
-static gint ui_skinned_button_leave_notify(GtkWidget *widget, GdkEventCrossing *event);
-
-GType ui_skinned_button_get_type() {
- static GType button_type = 0;
- if (!button_type) {
- static const GTypeInfo button_info = {
- sizeof (UiSkinnedButtonClass),
- NULL,
- NULL,
- (GClassInitFunc) ui_skinned_button_class_init,
- NULL,
- NULL,
- sizeof (UiSkinnedButton),
- 0,
- (GInstanceInitFunc) ui_skinned_button_init,
- };
- button_type = g_type_register_static (GTK_TYPE_WIDGET, "UiSkinnedButton", &button_info, 0);
- }
-
- return button_type;
-}
-
-static void ui_skinned_button_class_init (UiSkinnedButtonClass *klass) {
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- gobject_class = G_OBJECT_CLASS(klass);
- object_class = (GtkObjectClass*) klass;
- widget_class = (GtkWidgetClass*) klass;
- parent_class = g_type_class_peek_parent(klass);
-
- object_class->destroy = ui_skinned_button_destroy;
-
- widget_class->realize = ui_skinned_button_realize;
- widget_class->unrealize = ui_skinned_button_unrealize;
- widget_class->map = ui_skinned_button_map;
- widget_class->unmap = ui_skinned_button_unmap;
- widget_class->expose_event = ui_skinned_button_expose;
- widget_class->size_request = ui_skinned_button_size_request;
- widget_class->size_allocate = ui_skinned_button_size_allocate;
- widget_class->button_press_event = ui_skinned_button_button_press;
- widget_class->button_release_event = ui_skinned_button_button_release;
- widget_class->enter_notify_event = ui_skinned_button_enter_notify;
- widget_class->leave_notify_event = ui_skinned_button_leave_notify;
-
- klass->pressed = button_pressed;
- klass->released = button_released;
- klass->clicked = NULL;
- klass->scaled = ui_skinned_button_toggle_scaled;
-
- button_signals[PRESSED] =
- g_signal_new ("pressed", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (UiSkinnedButtonClass, pressed), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
- button_signals[RELEASED] =
- g_signal_new ("released", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (UiSkinnedButtonClass, released), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
- button_signals[CLICKED] =
- g_signal_new ("clicked", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedButtonClass, clicked), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
- button_signals[DOUBLED] =
- g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedButtonClass, scaled), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
- g_type_class_add_private (gobject_class, sizeof (UiSkinnedButtonPrivate));
-}
-
-static void ui_skinned_button_init (UiSkinnedButton *button) {
- UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE (button);
- button->inside = FALSE;
- button->type = TYPE_NOT_SET;
- priv->move_x = 0;
- priv->move_y = 0;
- button->event_window = NULL;
-
- GTK_WIDGET_SET_FLAGS (button, GTK_NO_WINDOW);
-}
-
-static void ui_skinned_button_destroy (GtkObject *object) {
- g_return_if_fail (object != NULL);
- g_return_if_fail (UI_SKINNED_IS_BUTTON (object));
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void ui_skinned_button_realize (GtkWidget *widget) {
- g_return_if_fail (widget != NULL);
- g_return_if_fail (UI_SKINNED_IS_BUTTON(widget));
 
- if (GTK_WIDGET_CLASS (parent_class)->realize)
- (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
+enum {BUTTON_TYPE_NORMAL, BUTTON_TYPE_TOGGLE, BUTTON_TYPE_SMALL};
 
- UiSkinnedButton *button = UI_SKINNED_BUTTON (widget);
- GdkWindowAttr attributes;
- gint attributes_mask;
+typedef struct {
+ gint type;
+ gint w, h;
+ gint nx, ny, px, py;
+ gint pnx, pny, ppx, ppy;
+ SkinPixmapId si1, si2;
+ gboolean pressed, rpressed, active;
+ ButtonCB on_press, on_release, on_rpress, on_rrelease;
+} ButtonData;
 
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_ONLY;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.event_mask = gtk_widget_get_events(widget);
- attributes.event_mask |= GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK;
+DRAW_FUNC_BEGIN (button_draw)
+ ButtonData * data = g_object_get_data ((GObject *) wid, "buttondata");
+ g_return_val_if_fail (data, FALSE);
 
- attributes.wclass = GDK_INPUT_ONLY;
- attributes_mask = GDK_WA_X | GDK_WA_Y;
- button->event_window = gdk_window_new (widget->window, &attributes, attributes_mask);
-
- gdk_window_set_user_data(button->event_window, widget);
-}
-
-static void ui_skinned_button_unrealize (GtkWidget *widget) {
- UiSkinnedButton *button = UI_SKINNED_BUTTON (widget);
-
- if ( button->event_window != NULL )
+ switch (data->type)
 {
- gdk_window_set_user_data( button->event_window , NULL );
- gdk_window_destroy( button->event_window );
- button->event_window = NULL;
+ case BUTTON_TYPE_NORMAL:
+ if (data->pressed)
+ skin_draw_pixbuf (cr, data->si2, data->px, data->py, 0, 0, data->w, data->h);
+ else
+ skin_draw_pixbuf (cr, data->si1, data->nx, data->ny, 0, 0, data->w, data->h);
+ break;
+ case BUTTON_TYPE_TOGGLE:
+ if (data->active)
+ {
+ if (data->pressed)
+ skin_draw_pixbuf (cr, data->si2, data->ppx, data->ppy, 0, 0, data->w, data->h);
+ else
+ skin_draw_pixbuf (cr, data->si1, data->pnx, data->pny, 0, 0, data->w, data->h);
+ }
+ else
+ {
+ if (data->pressed)
+ skin_draw_pixbuf (cr, data->si2, data->px, data->py, 0, 0, data->w, data->h);
+ else
+ skin_draw_pixbuf (cr, data->si1, data->nx, data->ny, 0, 0, data->w, data->h);
+ }
+ break;
 }
+DRAW_FUNC_END
 
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void ui_skinned_button_map (GtkWidget *widget)
-{
- UiSkinnedButton *button = UI_SKINNED_BUTTON (widget);
-
- if (button->event_window != NULL)
- gdk_window_show (button->event_window);
-
- if (GTK_WIDGET_CLASS (parent_class)->map)
- (* GTK_WIDGET_CLASS (parent_class)->map) (widget);
-}
-
-static void ui_skinned_button_unmap (GtkWidget *widget)
+static gboolean button_press (GtkWidget * button, GdkEventButton * event)
 {
- UiSkinnedButton *button = UI_SKINNED_BUTTON (widget);
-
- if (button->event_window != NULL)
- gdk_window_hide (button->event_window);
-
- if (GTK_WIDGET_CLASS (parent_class)->unmap)
- (* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
-}
-
-static void ui_skinned_button_size_request(GtkWidget *widget, GtkRequisition *requisition) {
- UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE(widget);
- requisition->width = priv->w*(priv->scaled ? config.scale_factor : 1);
- requisition->height = priv->h*(priv->scaled ? config.scale_factor : 1);
-}
+ ButtonData * data = g_object_get_data ((GObject *) button, "buttondata");
+ g_return_val_if_fail (data, FALSE);
 
-static void ui_skinned_button_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
- UiSkinnedButton *button = UI_SKINNED_BUTTON (widget);
- UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE (button);
- widget->allocation = *allocation;
- widget->allocation.x = ceil(widget->allocation.x*(priv->scaled ? config.scale_factor : 1));
- widget->allocation.y = ceil(widget->allocation.y*(priv->scaled ? config.scale_factor : 1));
-
- if (GTK_WIDGET_REALIZED (widget))
+ /* pass events through to the parent widget only if neither the press nor
+ * release signals are connected; sending one and not the other causes
+ * problems (in particular with dragging windows around) */
+ if (event->button == 1 && (data->on_press || data->on_release))
 {
- if ( button->event_window != NULL )
- gdk_window_move_resize(button->event_window, ceil(allocation->x*(priv->scaled ? config.scale_factor : 1)), ceil(allocation->y*(priv->scaled ? config.scale_factor : 1)), allocation->width, allocation->height);
- else
- gdk_window_move_resize(widget->window, ceil(allocation->x*(priv->scaled ? config.scale_factor : 1)), ceil(allocation->y*(priv->scaled ? config.scale_factor : 1)), allocation->width, allocation->height);
+ data->pressed = TRUE;
+ if (data->on_press)
+ data->on_press (button, event);
+ }
+ else if (event->button == 3 && (data->on_rpress || data->on_rrelease))
+ {
+ data->rpressed = TRUE;
+ if (data->on_rpress)
+ data->on_rpress (button, event);
 }
+ else
+ return FALSE;
 
- if (button->x + priv->move_x == ceil(widget->allocation.x/(priv->scaled ? config.scale_factor : 1)))
- priv->move_x = 0;
- if (button->y + priv->move_y == ceil(widget->allocation.y/(priv->scaled ? config.scale_factor : 1)))
- priv->move_y = 0;
+ if (data->type != BUTTON_TYPE_SMALL)
+ gtk_widget_queue_draw (button);
 
- button->x = ceil(widget->allocation.x/(priv->scaled ? config.scale_factor : 1));
- button->y = ceil(widget->allocation.y/(priv->scaled ? config.scale_factor : 1));
+ return TRUE;
 }
 
-static gboolean ui_skinned_button_expose(GtkWidget *widget, GdkEventExpose *event) {
- UiSkinnedButton *button = UI_SKINNED_BUTTON (widget);
- UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE (button);
- g_return_val_if_fail (priv->w > 0 && priv->h > 0, FALSE);
-
- //TYPE_SMALL doesn't have its own face
- if (button->type == TYPE_SMALL || button->type == TYPE_NOT_SET)
- return FALSE;
+static gboolean button_release (GtkWidget * button, GdkEventButton * event)
+{
+ ButtonData * data = g_object_get_data ((GObject *) button, "buttondata");
+ g_return_val_if_fail (data, FALSE);
 
- GdkPixbuf *obj;
- obj = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, priv->w, priv->h);
- gdk_pixbuf_fill(obj, 0x00000000); /* fill with alpha */
-
- switch (button->type) {
- case TYPE_PUSH:
- skin_draw_pixbuf(widget, aud_active_skin, obj,
- button->pressed ? priv->skin_index2 : priv->skin_index1,
- button->pressed ? priv->px : priv->nx,
- button->pressed ? priv->py : priv->ny,
- 0, 0, priv->w, priv->h);
- break;
- case TYPE_TOGGLE:
- if (button->inside)
- skin_draw_pixbuf(widget, aud_active_skin, obj,
- button->pressed ? priv->skin_index2 : priv->skin_index1,
- button->pressed ? priv->ppx : priv->pnx,
- button->pressed ? priv->ppy : priv->pny,
- 0, 0, priv->w, priv->h);
- else
- skin_draw_pixbuf(widget, aud_active_skin, obj,
- button->pressed ? priv->skin_index2 : priv->skin_index1,
- button->pressed ? priv->px : priv->nx,
- button->pressed ? priv->py : priv->ny,
- 0, 0, priv->w, priv->h);
- break;
- default:
- break;
+ if (event->button == 1 && (data->on_press || data->on_release))
+ {
+ if (! data->pressed)
+ return TRUE;
+
+ data->pressed = FALSE;
+ if (data->type == BUTTON_TYPE_TOGGLE)
+ data->active = ! data->active;
+ if (data->on_release)
+ data->on_release (button, event);
 }
+ else if (event->button == 3 && (data->on_rpress || data->on_rrelease))
+ {
+ if (! data->rpressed)
+ return TRUE;
 
- ui_skinned_widget_draw_with_coordinates(widget, obj, priv->w, priv->h,
- widget->allocation.x,
- widget->allocation.y,
- priv->scaled);
- g_object_unref(obj);
-
- return FALSE;
-}
-
-GtkWidget* ui_skinned_button_new () {
- UiSkinnedButton *button = g_object_new (ui_skinned_button_get_type (), NULL);
-
- return GTK_WIDGET(button);
-}
+ data->rpressed = FALSE;
+ if (data->on_rrelease)
+ data->on_rrelease (button, event);
+ }
+ else
+ return FALSE;
 
-void ui_skinned_push_button_setup(GtkWidget *button, GtkWidget *fixed, gint x, gint y, gint w, gint h, gint nx, gint ny, gint px, gint py, SkinPixmapId si) {
-
- UiSkinnedButton *sbutton = UI_SKINNED_BUTTON(button);
- UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE(sbutton);
- priv->w = w;
- priv->h = h;
- sbutton->x = x;
- sbutton->y = y;
- priv->nx = nx;
- priv->ny = ny;
- priv->px = px;
- priv->py = py;
- sbutton->type = TYPE_PUSH;
- priv->skin_index1 = si;
- priv->skin_index2 = si;
- priv->scaled = FALSE;
-
- gtk_fixed_put(GTK_FIXED(fixed), GTK_WIDGET(button), sbutton->x, sbutton->y);
-}
+ if (data->type != BUTTON_TYPE_SMALL)
+ gtk_widget_queue_draw (button);
 
-void ui_skinned_toggle_button_setup(GtkWidget *button, GtkWidget *fixed, gint x, gint y, gint w, gint h, gint nx, gint ny, gint px, gint py, gint pnx, gint pny, gint ppx, gint ppy, SkinPixmapId si) {
-
- UiSkinnedButton *sbutton = UI_SKINNED_BUTTON(button);
- UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE(sbutton);
- priv->w = w;
- priv->h = h;
- sbutton->x = x;
- sbutton->y = y;
- priv->nx = nx;
- priv->ny = ny;
- priv->px = px;
- priv->py = py;
- priv->pnx = pnx;
- priv->pny = pny;
- priv->ppx = ppx;
- priv->ppy = ppy;
- sbutton->type = TYPE_TOGGLE;
- priv->skin_index1 = si;
- priv->skin_index2 = si;
- priv->scaled = FALSE;
-
- gtk_fixed_put(GTK_FIXED(fixed), GTK_WIDGET(button), sbutton->x, sbutton->y);
+ return TRUE;
 }
 
-void ui_skinned_small_button_setup(GtkWidget *button, GtkWidget *fixed, gint x, gint y, gint w, gint h) {
-
- UiSkinnedButton *sbutton = UI_SKINNED_BUTTON(button);
- UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE(sbutton);
- priv->w = w;
- priv->h = h;
- sbutton->x = x;
- sbutton->y = y;
- sbutton->type = TYPE_SMALL;
- priv->scaled = FALSE;
+static gboolean leave_notify (GtkWidget * button, GdkEventCrossing * event)
+{
+ ButtonData * data = g_object_get_data ((GObject *) button, "buttondata");
+ g_return_val_if_fail (data, FALSE);
 
- gtk_fixed_put(GTK_FIXED(fixed), GTK_WIDGET(button), sbutton->x, sbutton->y);
-}
+ if (data->pressed || data->rpressed)
+ {
+ data->pressed = FALSE;
+ data->rpressed = FALSE;
 
-static void button_pressed(UiSkinnedButton *button) {
- button->button_down = TRUE;
- ui_skinned_button_update_state(button);
-}
+ if (data->type != BUTTON_TYPE_SMALL)
+ gtk_widget_queue_draw (button);
+ }
 
-static void button_released(UiSkinnedButton *button) {
- if(button->hover && button->button_down) ui_skinned_button_clicked(button);
- button->button_down = FALSE;
- ui_skinned_button_update_state(button);
+ return TRUE;
 }
 
-static void ui_skinned_button_update_state(UiSkinnedButton *button) {
- ui_skinned_button_set_pressed(button, button->button_down);
+static void button_destroy (GtkWidget * button)
+{
+ g_free (g_object_get_data ((GObject *) button, "buttondata"));
 }
 
-static void ui_skinned_button_set_pressed (UiSkinnedButton *button, gboolean pressed) {
- if (pressed == button->pressed)
- return;
-
- button->pressed = pressed;
-
- if (widget_really_drawable ((GtkWidget *) button))
- ui_skinned_button_expose ((GtkWidget *) button, 0);
-}
+static GtkWidget * button_new_base (gint type, gint w, gint h)
+{
+ GtkWidget * button;
 
-static gboolean ui_skinned_button_button_press(GtkWidget *widget, GdkEventButton *event) {
- UiSkinnedButton * button = (UiSkinnedButton *) widget;
- UiSkinnedButtonPrivate * priv = UI_SKINNED_BUTTON_GET_PRIVATE (button);
- gint scale = priv->scaled ? config.scale_factor : 1;
-
- if (event->type == GDK_BUTTON_PRESS) {
- if (event->button == 1)
- ui_skinned_button_pressed (button);
- else if (event->button == 3) {
- event->x = event->x + button->x * scale;
- event->y = event->y + button->y * scale;
- return FALSE;
- }
+ if (type == BUTTON_TYPE_SMALL)
+ {
+ button = gtk_event_box_new ();
+ gtk_event_box_set_visible_window ((GtkEventBox *) button, FALSE);
 }
-
- return TRUE;
+ else
+ button = gtk_drawing_area_new ();
+
+ gtk_widget_set_size_request (button, w, h);
+ gtk_widget_add_events (button, GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK);
+
+ if (type != BUTTON_TYPE_SMALL)
+ DRAW_CONNECT (button, button_draw);
+
+ g_signal_connect (button, "button-press-event", (GCallback) button_press,
+ NULL);
+ g_signal_connect (button, "button-release-event", (GCallback)
+ button_release, NULL);
+ g_signal_connect (button, "leave-notify-event", (GCallback) leave_notify,
+ NULL);
+ g_signal_connect (button, "destroy", (GCallback) button_destroy, NULL);
+
+ ButtonData * data = g_malloc0 (sizeof (ButtonData));
+ data->type = type;
+ data->w = w;
+ data->h = h;
+ g_object_set_data ((GObject *) button, "buttondata", data);
+
+ return button;
 }
 
-static gboolean ui_skinned_button_button_release(GtkWidget *widget, GdkEventButton *event) {
- UiSkinnedButton *button;
- if (event->button == 1) {
- button = UI_SKINNED_BUTTON(widget);
- ui_skinned_button_released(button);
- }
- return TRUE;
+GtkWidget * button_new (gint w, gint h, gint nx, gint ny, gint px, gint py,
+ SkinPixmapId si1, SkinPixmapId si2)
+{
+ GtkWidget * button = button_new_base (BUTTON_TYPE_NORMAL, w, h);
+ ButtonData * data = g_object_get_data ((GObject *) button, "buttondata");
+ g_return_val_if_fail (data, NULL);
+
+ data->nx = nx;
+ data->ny = ny;
+ data->px = px;
+ data->py = py;
+ data->si1 = si1;
+ data->si2 = si2;
+
+ return button;
 }
 
-static void ui_skinned_button_pressed(UiSkinnedButton *button) {
- g_return_if_fail(UI_SKINNED_IS_BUTTON(button));
- g_signal_emit(button, button_signals[PRESSED], 0);
+GtkWidget * button_new_toggle (gint w, gint h, gint nx, gint ny, gint px, gint
+ py, gint pnx, gint pny, gint ppx, gint ppy, SkinPixmapId si1, SkinPixmapId si2)
+{
+ GtkWidget * button = button_new_base (BUTTON_TYPE_TOGGLE, w, h);
+ ButtonData * data = g_object_get_data ((GObject *) button, "buttondata");
+ g_return_val_if_fail (data, NULL);
+
+ data->nx = nx;
+ data->ny = ny;
+ data->px = px;
+ data->py = py;
+ data->pnx = pnx;
+ data->pny = pny;
+ data->ppx = ppx;
+ data->ppy = ppy;
+ data->si1 = si1;
+ data->si2 = si2;
+
+ return button;
 }
 
-static void ui_skinned_button_released(UiSkinnedButton *button) {
- g_return_if_fail(UI_SKINNED_IS_BUTTON(button));
- g_signal_emit(button, button_signals[RELEASED], 0);
+GtkWidget * button_new_small (gint w, gint h)
+{
+ return button_new_base (BUTTON_TYPE_SMALL, w, h);
 }
 
-static void ui_skinned_button_clicked(UiSkinnedButton *button) {
- g_return_if_fail(UI_SKINNED_IS_BUTTON(button));
- button->inside = !button->inside;
- g_signal_emit(button, button_signals[CLICKED], 0);
-}
+void button_on_press (GtkWidget * button, ButtonCB callback)
+{
+ ButtonData * data = g_object_get_data ((GObject *) button, "buttondata");
+ g_return_if_fail (data);
 
-static gboolean ui_skinned_button_enter_notify(GtkWidget *widget, GdkEventCrossing *event) {
- UiSkinnedButton *button;
+ data->on_press = callback;
+}
 
- button = UI_SKINNED_BUTTON(widget);
- button->hover = TRUE;
- if(button->button_down) ui_skinned_button_set_pressed(button, TRUE);
+void button_on_release (GtkWidget * button, ButtonCB callback)
+{
+ ButtonData * data = g_object_get_data ((GObject *) button, "buttondata");
+ g_return_if_fail (data);
 
- return FALSE;
+ data->on_release = callback;
 }
 
-static gboolean ui_skinned_button_leave_notify(GtkWidget *widget, GdkEventCrossing *event) {
- UiSkinnedButton *button;
-
- button = UI_SKINNED_BUTTON (widget);
- button->hover = FALSE;
- if(button->button_down) ui_skinned_button_set_pressed(button, FALSE);
+void button_on_rpress (GtkWidget * button, ButtonCB callback)
+{
+ ButtonData * data = g_object_get_data ((GObject *) button, "buttondata");
+ g_return_if_fail (data);
 
- return FALSE;
+ data->on_rpress = callback;
 }
 
-static void ui_skinned_button_toggle_scaled(UiSkinnedButton *button) {
- GtkWidget *widget = GTK_WIDGET (button);
- UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE (button);
- priv->scaled = !priv->scaled;
-
- gtk_widget_set_size_request(widget, priv->w*(priv->scaled ? config.scale_factor : 1), priv->h*(priv->scaled ? config.scale_factor : 1));
+void button_on_rrelease (GtkWidget * button, ButtonCB callback)
+{
+ ButtonData * data = g_object_get_data ((GObject *) button, "buttondata");
+ g_return_if_fail (data);
 
- if (widget_really_drawable (widget))
- ui_skinned_button_expose (widget, 0);
+ data->on_rrelease = callback;
 }
 
-void ui_skinned_button_set_skin_index2(GtkWidget *button, SkinPixmapId si) {
- UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE (button);
- priv->skin_index2 = si;
-}
+gboolean button_get_active (GtkWidget * button)
+{
+ ButtonData * data = g_object_get_data ((GObject *) button, "buttondata");
+ g_return_val_if_fail (data && data->type == BUTTON_TYPE_TOGGLE, FALSE);
 
-void ui_skinned_button_move_relative(GtkWidget *widget, gint x, gint y) {
- UiSkinnedButton *button = UI_SKINNED_BUTTON(widget);
- UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE(widget);
- priv->move_x += x;
- priv->move_y += y;
- gtk_fixed_move(GTK_FIXED(gtk_widget_get_parent(widget)), widget,
- button->x+priv->move_x, button->y+priv->move_y);
+ return data->active;
 }
 
-void ui_skinned_button_set_inside(GtkWidget *widget, gboolean inside) {
- UiSkinnedButton * button = (UiSkinnedButton *) widget;
+void button_set_active (GtkWidget * button, gboolean active)
+{
+ ButtonData * data = g_object_get_data ((GObject *) button, "buttondata");
+ g_return_if_fail (data && data->type == BUTTON_TYPE_TOGGLE);
 
- if (inside == button->inside)
+ if (data->active == active)
 return;
 
- button->inside = inside;
-
- if (widget_really_drawable ((GtkWidget *) button))
- ui_skinned_button_expose ((GtkWidget *) button, 0);
+ data->active = active;
+ gtk_widget_queue_draw (button);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_button.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_button.h Changed

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_equalizer_graph.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_equalizer_graph.c Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -21,128 +22,13 @@
 * along with this program; If not, see <http://www.gnu.org/licenses>.
 */
 
-#include "ui_skin.h"
-#include "ui_skinned_equalizer_graph.h"
-#include "skins_cfg.h"
-#include "util.h"
-
 #include <audacious/audconfig.h>
 
-#define UI_TYPE_SKINNED_EQUALIZER_GRAPH (ui_skinned_equalizer_graph_get_type())
-
-enum {
- DOUBLED,
- LAST_SIGNAL
-};
-
-static void ui_skinned_equalizer_graph_class_init (UiSkinnedEqualizerGraphClass *klass);
-static void ui_skinned_equalizer_graph_init (UiSkinnedEqualizerGraph *equalizer_graph);
-static void ui_skinned_equalizer_graph_destroy (GtkObject *object);
-static void ui_skinned_equalizer_graph_realize (GtkWidget *widget);
-static void ui_skinned_equalizer_graph_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void ui_skinned_equalizer_graph_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static gboolean ui_skinned_equalizer_graph_expose (GtkWidget *widget, GdkEventExpose *event);
-static void ui_skinned_equalizer_graph_toggle_scaled (UiSkinnedEqualizerGraph *equalizer_graph);
-
-static GtkWidgetClass *parent_class = NULL;
-static guint equalizer_graph_signals[LAST_SIGNAL] = { 0 };
-
-GType ui_skinned_equalizer_graph_get_type() {
- static GType equalizer_graph_type = 0;
- if (!equalizer_graph_type) {
- static const GTypeInfo equalizer_graph_info = {
- sizeof (UiSkinnedEqualizerGraphClass),
- NULL,
- NULL,
- (GClassInitFunc) ui_skinned_equalizer_graph_class_init,
- NULL,
- NULL,
- sizeof (UiSkinnedEqualizerGraph),
- 0,
- (GInstanceInitFunc) ui_skinned_equalizer_graph_init,
- };
- equalizer_graph_type = g_type_register_static (GTK_TYPE_WIDGET, "UiSkinnedEqualizerGraph", &equalizer_graph_info, 0);
- }
-
- return equalizer_graph_type;
-}
-
-static void ui_skinned_equalizer_graph_class_init(UiSkinnedEqualizerGraphClass *klass) {
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- object_class = (GtkObjectClass*) klass;
- widget_class = (GtkWidgetClass*) klass;
- parent_class = g_type_class_peek_parent(klass);
-
- object_class->destroy = ui_skinned_equalizer_graph_destroy;
-
- widget_class->realize = ui_skinned_equalizer_graph_realize;
- widget_class->expose_event = ui_skinned_equalizer_graph_expose;
- widget_class->size_request = ui_skinned_equalizer_graph_size_request;
- widget_class->size_allocate = ui_skinned_equalizer_graph_size_allocate;
-
- klass->scaled = ui_skinned_equalizer_graph_toggle_scaled;
-
- equalizer_graph_signals[DOUBLED] =
- g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedEqualizerGraphClass, scaled), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-}
-
-static void ui_skinned_equalizer_graph_init(UiSkinnedEqualizerGraph *equalizer_graph) {
- equalizer_graph->width = 113;
- equalizer_graph->height = 19;
-
- GTK_WIDGET_SET_FLAGS(equalizer_graph, GTK_NO_WINDOW);
-}
-
-GtkWidget* ui_skinned_equalizer_graph_new(GtkWidget *fixed, gint x, gint y) {
- UiSkinnedEqualizerGraph *equalizer_graph = g_object_new (ui_skinned_equalizer_graph_get_type (), NULL);
-
- equalizer_graph->x = x;
- equalizer_graph->y = y;
- equalizer_graph->skin_index = SKIN_EQMAIN;
- equalizer_graph->scaled = FALSE;
-
- gtk_fixed_put(GTK_FIXED(fixed), GTK_WIDGET(equalizer_graph), equalizer_graph->x, equalizer_graph->y);
-
- return GTK_WIDGET(equalizer_graph);
-}
-
-static void ui_skinned_equalizer_graph_destroy(GtkObject *object) {
- g_return_if_fail (object != NULL);
- g_return_if_fail (UI_SKINNED_IS_EQUALIZER_GRAPH (object));
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void ui_skinned_equalizer_graph_realize(GtkWidget *widget) {
- if (GTK_WIDGET_CLASS (parent_class)->realize)
- (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-}
-
-static void ui_skinned_equalizer_graph_size_request(GtkWidget *widget, GtkRequisition *requisition) {
- UiSkinnedEqualizerGraph *equalizer_graph = UI_SKINNED_EQUALIZER_GRAPH(widget);
-
- requisition->width = equalizer_graph->width*(equalizer_graph->scaled ? config.scale_factor : 1);
- requisition->height = equalizer_graph->height*(equalizer_graph->scaled ? config.scale_factor : 1);
-}
-
-static void ui_skinned_equalizer_graph_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
- UiSkinnedEqualizerGraph *equalizer_graph = UI_SKINNED_EQUALIZER_GRAPH (widget);
-
- widget->allocation = *allocation;
- widget->allocation.x *= (equalizer_graph->scaled ? config.scale_factor : 1);
- widget->allocation.y *= (equalizer_graph->scaled ? config.scale_factor : 1);
-
- equalizer_graph->x = widget->allocation.x/(equalizer_graph->scaled ? config.scale_factor : 1);
- equalizer_graph->y = widget->allocation.y/(equalizer_graph->scaled ? config.scale_factor : 1);
-}
+#include "draw-compat.h"
+#include "ui_skin.h"
+#include "ui_skinned_equalizer_graph.h"
 
-void
-init_spline(gfloat * x, gfloat * y, gint n, gfloat * y2)
+static void init_spline (const gfloat * x, const gfloat * y, gint n, gfloat * y2)
 {
 gint i, k;
 gfloat p, qn, sig, un, *u;
@@ -168,8 +54,8 @@
 g_free(u);
 }
 
-gfloat
-eval_spline(gfloat xa[], gfloat ya[], gfloat y2a[], gint n, gfloat x)
+gfloat eval_spline (const gfloat * xa, const gfloat * ya, const gfloat * y2a,
+ gint n, gfloat x)
 {
 gint klo, khi, k;
 gfloat h, b, a;
@@ -191,94 +77,65 @@
 (b * b * b - b) * y2a[khi]) * (h * h) / 6.0);
 }
 
-static gboolean ui_skinned_equalizer_graph_expose(GtkWidget *widget, GdkEventExpose *event) {
- UiSkinnedEqualizerGraph *equalizer_graph = UI_SKINNED_EQUALIZER_GRAPH (widget);
- g_return_val_if_fail (equalizer_graph->width > 0 && equalizer_graph->height > 0, FALSE);
+DRAW_FUNC_BEGIN (eq_graph_draw)
+ static const gfloat x[10] = {0, 11, 23, 35, 47, 59, 71, 83, 97, 109};
 
- GdkPixbuf *obj = NULL;
+ 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);
 
- obj = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, equalizer_graph->width, equalizer_graph->height);
+ guint32 cols[19];
+ skin_get_eq_spline_colors(active_skin, cols);
 
- guint32 cols[19], rowstride;
- gint i, y, ymin, ymax, py = 0;
- gfloat x[] = { 0, 11, 23, 35, 47, 59, 71, 83, 97, 109 }, yf[10];
- guchar* pixels, *p;
- gint n_channels;
- /*
- * This avoids the init_spline() function to be inlined.
- * Inlining the function caused troubles when compiling with
- * `-O' (at least on FreeBSD).
- */
- void (*__init_spline) (gfloat *, gfloat *, gint, gfloat *) = init_spline;
+ gfloat yf[10];
+ init_spline(x, aud_cfg->equalizer_bands, 10, yf);
 
- skin_draw_pixbuf(widget, aud_active_skin, obj, equalizer_graph->skin_index, 0, 294, 0, 0,
- equalizer_graph->width, equalizer_graph->height);
- skin_draw_pixbuf(widget, aud_active_skin, obj, equalizer_graph->skin_index, 0, 314,
- 0, 9 + ((aud_cfg->equalizer_preamp * 9) / 20),
- equalizer_graph->width, 1);
+ /* 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;
+ y = CLAMP (y, 0, 18);
 
- skin_get_eq_spline_colors(aud_active_skin, cols);
-
- __init_spline(x, aud_cfg->equalizer_bands, 10, yf);
- for (i = 0; i < 109; i++) {
- y = 9 -
- (gint) ((eval_spline(x, aud_cfg->equalizer_bands, yf, 10, i) *
- 9.0) / EQUALIZER_MAX_GAIN);
- if (y < 0)
- y = 0;
- if (y > 18)
- y = 18;
 if (!i)
 py = y;
- if (y < py) {
- ymin = y;
- ymax = py;
- }
- else {
- ymin = py;
+
+ gint ymin, ymax;
+
+ if (y > py)
+ {
+ ymin = py + 1;
 ymax = y;
 }
- py = y;
+ else if (y < py)
+ {
+ ymin = y;
+ ymax = py - 1;
+ }
+ else
+ ymin = ymax = y;
 
- pixels = gdk_pixbuf_get_pixels(obj);
- rowstride = gdk_pixbuf_get_rowstride(obj);
- n_channels = gdk_pixbuf_get_n_channels(obj);
+ py = y;
 
 for (y = ymin; y <= ymax; y++)
 {
- p = pixels + (y * rowstride) + (( i + 2) * n_channels);
- p[0] = (cols[y] & 0xff0000) >> 16;
- p[1] = (cols[y] & 0x00ff00) >> 8;
- p[2] = (cols[y] & 0x0000ff);
- /* do we really need to treat the alpha channel? */
- /*if (n_channels == 4)
- p[3] = cols[y] >> 24;*/
+ cairo_rectangle (cr, i + 2, y, 1, 1);
+ set_cairo_color (cr, cols[y]);
+ cairo_fill (cr);
 }
 }
+DRAW_FUNC_END
 
- ui_skinned_widget_draw_with_coordinates(widget, obj, equalizer_graph->width, equalizer_graph->height,
- widget->allocation.x,
- widget->allocation.y,
- equalizer_graph->scaled);
-
- g_object_unref(obj);
-
- return FALSE;
-}
-
-static void ui_skinned_equalizer_graph_toggle_scaled(UiSkinnedEqualizerGraph *equalizer_graph) {
- GtkWidget *widget = GTK_WIDGET (equalizer_graph);
-
- equalizer_graph->scaled = !equalizer_graph->scaled;
- gtk_widget_set_size_request(widget, equalizer_graph->width*(equalizer_graph->scaled ? config.scale_factor : 1),
- equalizer_graph->height*(equalizer_graph->scaled ? config.scale_factor : 1));
-
- if (widget_really_drawable (widget))
- ui_skinned_equalizer_graph_expose (widget, NULL);
+GtkWidget * eq_graph_new (void)
+{
+ GtkWidget * graph = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (graph, 113, 19);
+ DRAW_CONNECT (graph, eq_graph_draw);
+ return graph;
 }
 
-void ui_skinned_equalizer_graph_update (GtkWidget * graph)
+void eq_graph_update (GtkWidget * graph)
 {
- if (widget_really_drawable (graph))
- ui_skinned_equalizer_graph_expose (graph, NULL);
+ gtk_widget_queue_draw (graph);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_equalizer_graph.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_equalizer_graph.h Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,41 +25,12 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_SKINNED_EQUALIZER_GRAPH_H
-#define AUDACIOUS_UI_SKINNED_EQUALIZER_GRAPH_H
+#ifndef SKINS_UI_SKINNED_EQUALIZER_GRAPH_H
+#define SKINS_UI_SKINNED_EQUALIZER_GRAPH_H
 
 #include <gtk/gtk.h>
-#include "ui_skin.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UI_SKINNED_EQUALIZER_GRAPH(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_equalizer_graph_get_type (), UiSkinnedEqualizerGraph)
-#define UI_SKINNED_EQUALIZER_GRAPH_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_equalizer_graph_get_type (), UiSkinnedEqualizerGraphClass)
-#define UI_SKINNED_IS_EQUALIZER_GRAPH(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_equalizer_graph_get_type ())
-
-typedef struct _UiSkinnedEqualizerGraph UiSkinnedEqualizerGraph;
-typedef struct _UiSkinnedEqualizerGraphClass UiSkinnedEqualizerGraphClass;
-
-struct _UiSkinnedEqualizerGraph {
- GtkWidget widget;
+GtkWidget * eq_graph_new ();
+void eq_graph_update (GtkWidget * graph);
 
- gint x, y, width, height;
- SkinPixmapId skin_index;
- gboolean scaled;
-};
-
-struct _UiSkinnedEqualizerGraphClass {
- GtkWidgetClass parent_class;
- void (* scaled) (UiSkinnedEqualizerGraph *eq_graph);
-};
-
-GtkWidget* ui_skinned_equalizer_graph_new(GtkWidget *fixed, gint x, gint y);
-void ui_skinned_equalizer_graph_update (GtkWidget * graph);
-
-#ifdef __cplusplus
-}
 #endif
-
-#endif /* AUDACIOUS_UI_SKINNED_EQUALIZER_GRAPH_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_equalizer_slider.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_equalizer_slider.c Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -21,424 +22,171 @@
 * along with this program; If not, see <http://www.gnu.org/licenses>.
 */
 
-#include "config.h"
-
 #include <audacious/i18n.h>
+#include <audacious/types.h>
 
-#include "ui_skin.h"
+#include "config.h"
+#include "draw-compat.h"
 #include "ui_equalizer.h"
 #include "ui_main.h"
-#include "skins_cfg.h"
+#include "ui_skin.h"
 #include "ui_skinned_equalizer_slider.h"
-#include "util.h"
-
-#define UI_TYPE_SKINNED_EQUALIZER_SLIDER (ui_skinned_equalizer_slider_get_type())
-#define UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UI_TYPE_SKINNED_EQUALIZER_SLIDER, UiSkinnedEqualizerSliderPrivate))
-typedef struct _UiSkinnedEqualizerSliderPrivate UiSkinnedEqualizerSliderPrivate;
-
-enum {
- DOUBLED,
- LAST_SIGNAL
-};
-
-struct _UiSkinnedEqualizerSliderPrivate {
- SkinPixmapId skin_index;
- gboolean scaled;
- gint position;
- gint width, height;
- gboolean pressed;
- gint drag_y;
- gfloat value; /* store gain as is to prevent truncation --asphyx */
-};
-
-static void ui_skinned_equalizer_slider_class_init (UiSkinnedEqualizerSliderClass *klass);
-static void ui_skinned_equalizer_slider_init (UiSkinnedEqualizerSlider *equalizer_slider);
-static void ui_skinned_equalizer_slider_destroy (GtkObject *object);
-static void ui_skinned_equalizer_slider_realize (GtkWidget *widget);
-static void ui_skinned_equalizer_slider_unrealize (GtkWidget *widget);
-static void ui_skinned_equalizer_slider_map (GtkWidget *widget);
-static void ui_skinned_equalizer_slider_unmap (GtkWidget *widget);
-static void ui_skinned_equalizer_slider_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void ui_skinned_equalizer_slider_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static gboolean ui_skinned_equalizer_slider_expose (GtkWidget *widget, GdkEventExpose *event);
-static gboolean ui_skinned_equalizer_slider_button_press (GtkWidget *widget, GdkEventButton *event);
-static gboolean ui_skinned_equalizer_slider_button_release (GtkWidget *widget, GdkEventButton *event);
-static gboolean ui_skinned_equalizer_slider_motion_notify (GtkWidget *widget, GdkEventMotion *event);
-static gboolean ui_skinned_equalizer_slider_scroll (GtkWidget *widget, GdkEventScroll *event);
-static void ui_skinned_equalizer_slider_toggle_scaled (UiSkinnedEqualizerSlider *equalizer_slider);
-void ui_skinned_equalizer_slider_set_mainwin_text (UiSkinnedEqualizerSlider * es);
-
-static GtkWidgetClass *parent_class = NULL;
-static guint equalizer_slider_signals[LAST_SIGNAL] = { 0 };
-
-GType ui_skinned_equalizer_slider_get_type() {
- static GType equalizer_slider_type = 0;
- if (!equalizer_slider_type) {
- static const GTypeInfo equalizer_slider_info = {
- sizeof (UiSkinnedEqualizerSliderClass),
- NULL,
- NULL,
- (GClassInitFunc) ui_skinned_equalizer_slider_class_init,
- NULL,
- NULL,
- sizeof (UiSkinnedEqualizerSlider),
- 0,
- (GInstanceInitFunc) ui_skinned_equalizer_slider_init,
- };
- equalizer_slider_type = g_type_register_static (GTK_TYPE_WIDGET, "UiSkinnedEqualizerSlider", &equalizer_slider_info, 0);
- }
-
- return equalizer_slider_type;
-}
-
-static void ui_skinned_equalizer_slider_class_init(UiSkinnedEqualizerSliderClass *klass) {
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- gobject_class = G_OBJECT_CLASS(klass);
- object_class = (GtkObjectClass*) klass;
- widget_class = (GtkWidgetClass*) klass;
- parent_class = g_type_class_peek_parent(klass);
-
- object_class->destroy = ui_skinned_equalizer_slider_destroy;
-
- widget_class->realize = ui_skinned_equalizer_slider_realize;
- widget_class->unrealize = ui_skinned_equalizer_slider_unrealize;
- widget_class->map = ui_skinned_equalizer_slider_map;
- widget_class->unmap = ui_skinned_equalizer_slider_unmap;
- widget_class->expose_event = ui_skinned_equalizer_slider_expose;
- widget_class->size_request = ui_skinned_equalizer_slider_size_request;
- widget_class->size_allocate = ui_skinned_equalizer_slider_size_allocate;
- widget_class->button_press_event = ui_skinned_equalizer_slider_button_press;
- widget_class->button_release_event = ui_skinned_equalizer_slider_button_release;
- widget_class->motion_notify_event = ui_skinned_equalizer_slider_motion_notify;
- widget_class->scroll_event = ui_skinned_equalizer_slider_scroll;
-
- klass->scaled = ui_skinned_equalizer_slider_toggle_scaled;
-
- equalizer_slider_signals[DOUBLED] =
- g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedEqualizerSliderClass, scaled), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
- g_type_class_add_private (gobject_class, sizeof (UiSkinnedEqualizerSliderPrivate));
-}
-
-static void ui_skinned_equalizer_slider_init(UiSkinnedEqualizerSlider *equalizer_slider) {
- UiSkinnedEqualizerSliderPrivate *priv = UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(equalizer_slider);
- priv->pressed = FALSE;
-
- equalizer_slider->event_window = NULL;
- GTK_WIDGET_SET_FLAGS(equalizer_slider, GTK_NO_WINDOW);
-}
-
-GtkWidget* ui_skinned_equalizer_slider_new(GtkWidget *fixed, gint x, gint y) {
- UiSkinnedEqualizerSlider *es = g_object_new (ui_skinned_equalizer_slider_get_type (), NULL);
- UiSkinnedEqualizerSliderPrivate *priv = UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(es);
-
- es->x = x;
- es->y = y;
- priv->width = 14;
- priv->height = 63;
- priv->skin_index = SKIN_EQMAIN;
-
- gtk_fixed_put(GTK_FIXED(fixed), GTK_WIDGET(es), es->x, es->y);
-
- return GTK_WIDGET(es);
-}
-
-static void ui_skinned_equalizer_slider_destroy(GtkObject *object) {
- g_return_if_fail (object != NULL);
- g_return_if_fail (UI_SKINNED_IS_EQUALIZER_SLIDER (object));
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void ui_skinned_equalizer_slider_realize(GtkWidget *widget) {
- UiSkinnedEqualizerSlider *equalizer_slider;
- GdkWindowAttr attributes;
- gint attributes_mask;
 
- g_return_if_fail (widget != NULL);
- g_return_if_fail (UI_SKINNED_IS_EQUALIZER_SLIDER(widget));
+typedef struct {
+ gchar * name;
+ gint pos;
+ gfloat val;
+ gboolean pressed;
+} EqSliderData;
 
- if (GTK_WIDGET_CLASS (parent_class)->realize)
- (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
- equalizer_slider = UI_SKINNED_EQUALIZER_SLIDER(widget);
+DRAW_FUNC_BEGIN (eq_slider_draw)
+ EqSliderData * data = g_object_get_data ((GObject *) wid, "eqsliderdata");
+ g_return_val_if_fail (data, FALSE);
 
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_ONLY;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.event_mask = gtk_widget_get_events(widget);
- attributes.event_mask |= GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK;
-
- attributes_mask = GDK_WA_X | GDK_WA_Y;
- equalizer_slider->event_window = gdk_window_new(widget->parent->window, &attributes, attributes_mask);
-
- gdk_window_set_user_data(equalizer_slider->event_window, widget);
-}
-
-static void ui_skinned_equalizer_slider_unrealize(GtkWidget *widget) {
- UiSkinnedEqualizerSlider *equalizer_slider = UI_SKINNED_EQUALIZER_SLIDER(widget);
-
- if ( equalizer_slider->event_window != NULL )
- {
- gdk_window_set_user_data( equalizer_slider->event_window , NULL );
- gdk_window_destroy( equalizer_slider->event_window );
- equalizer_slider->event_window = NULL;
- }
-
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void ui_skinned_equalizer_slider_map (GtkWidget *widget)
-{
- UiSkinnedEqualizerSlider *equalizer_slider = UI_SKINNED_EQUALIZER_SLIDER(widget);
-
- if (equalizer_slider->event_window != NULL)
- gdk_window_show (equalizer_slider->event_window);
-
- if (GTK_WIDGET_CLASS (parent_class)->map)
- (* GTK_WIDGET_CLASS (parent_class)->map) (widget);
-}
-
-static void ui_skinned_equalizer_slider_unmap (GtkWidget *widget)
-{
- UiSkinnedEqualizerSlider *equalizer_slider = UI_SKINNED_EQUALIZER_SLIDER(widget);
-
- if (equalizer_slider->event_window != NULL)
- gdk_window_hide (equalizer_slider->event_window);
-
- if (GTK_WIDGET_CLASS (parent_class)->unmap)
- (* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
-}
-
-static void ui_skinned_equalizer_slider_size_request(GtkWidget *widget, GtkRequisition *requisition) {
- UiSkinnedEqualizerSliderPrivate *priv = UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(widget);
-
- requisition->width = priv->width*(priv->scaled ? config.scale_factor : 1);
- requisition->height = priv->height*(priv->scaled ? config.scale_factor : 1);
-}
-
-static void ui_skinned_equalizer_slider_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
- UiSkinnedEqualizerSlider *equalizer_slider = UI_SKINNED_EQUALIZER_SLIDER (widget);
- UiSkinnedEqualizerSliderPrivate *priv = UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(equalizer_slider);
-
- widget->allocation = *allocation;
- widget->allocation.x *= (priv->scaled ? config.scale_factor : 1);
- widget->allocation.y *= (priv->scaled ? config.scale_factor : 1);
- if (GTK_WIDGET_REALIZED (widget))
- if (equalizer_slider->event_window)
- gdk_window_move_resize(equalizer_slider->event_window, widget->allocation.x, widget->allocation.y, allocation->width, allocation->height);
-
- equalizer_slider->x = widget->allocation.x/(priv->scaled ? config.scale_factor : 1);
- equalizer_slider->y = widget->allocation.y/(priv->scaled ? config.scale_factor : 1);
-}
-
-static gboolean ui_skinned_equalizer_slider_expose(GtkWidget *widget, GdkEventExpose *event) {
- UiSkinnedEqualizerSlider *es = UI_SKINNED_EQUALIZER_SLIDER (widget);
- UiSkinnedEqualizerSliderPrivate *priv = UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(es);
- g_return_val_if_fail (priv->width > 0 && priv->height > 0, FALSE);
-
- GdkPixbuf *obj = NULL;
- obj = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, priv->width, priv->height);
-
- gint frame;
- frame = 27 - ((priv->position * 27) / 50);
+ gint frame = 27 - data->pos * 27 / 50;
 if (frame < 14)
- skin_draw_pixbuf(widget, aud_active_skin, obj, priv->skin_index, (frame * 15) + 13, 164, 0, 0, priv->width, priv->height);
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 13 + 15 * frame, 164, 0, 0, 14, 63);
 else
- skin_draw_pixbuf(widget, aud_active_skin, obj, priv->skin_index, ((frame - 14) * 15) + 13, 229, 0, 0, priv->width, priv->height);
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 13 + 15 * (frame - 14), 229, 0, 0,
+ 14, 63);
 
- if (priv->pressed)
- skin_draw_pixbuf(widget, aud_active_skin, obj, priv->skin_index, 0, 176, 1, priv->position, 11, 11);
+ if (data->pressed)
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 176, 1, data->pos, 11, 11);
 else
- skin_draw_pixbuf(widget, aud_active_skin, obj, priv->skin_index, 0, 164, 1, priv->position, 11, 11);
-
- ui_skinned_widget_draw_with_coordinates(widget, obj, priv->width, priv->height,
- widget->allocation.x,
- widget->allocation.y,
- priv->scaled);
-
- g_object_unref(obj);
-
- return FALSE;
-}
-
-static gboolean ui_skinned_equalizer_slider_button_press(GtkWidget *widget, GdkEventButton *event) {
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (UI_SKINNED_IS_EQUALIZER_SLIDER (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- UiSkinnedEqualizerSlider *es = UI_SKINNED_EQUALIZER_SLIDER (widget);
- UiSkinnedEqualizerSliderPrivate *priv = UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(es);
-
- gint y;
-
- if (event->type == GDK_BUTTON_PRESS) {
- if (event->button == 1) {
- priv->pressed = TRUE;
- y = event->y/(priv->scaled ? config.scale_factor : 1);
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 164, 1, data->pos, 11, 11);
+DRAW_FUNC_END
 
- if (y >= priv->position && y < priv->position + 11)
- priv->drag_y = y - priv->position;
- else {
- priv->position = y - 5;
- priv->drag_y = 5;
- if (priv->position < 0)
- priv->position = 0;
- if (priv->position > 50)
- priv->position = 50;
- if (priv->position >= 24 && priv->position <= 26)
- priv->position = 25;
-
- priv->value = ((gfloat) (25 - priv->position) * EQUALIZER_MAX_GAIN / 25.0 );
- equalizerwin_eq_changed();
- }
+static void eq_slider_moved (EqSliderData * data, gint pos)
+{
+ data->pos = CLAMP (pos, 0, 50);
+ if (data->pos == 24 || data->pos == 26)
+ data->pos = 25;
 
- ui_skinned_equalizer_slider_set_mainwin_text(es);
+ data->val = (gfloat) (25 - data->pos) * EQUALIZER_MAX_GAIN / 25;
 
- if (widget_really_drawable (widget))
- ui_skinned_equalizer_slider_expose (widget, 0);
- }
- }
+ equalizerwin_eq_changed ();
 
- return TRUE;
+ gchar buf[100];
+ snprintf (buf, sizeof buf, "%s: %+.1f dB", data->name, data->val);
+ mainwin_show_status_message (buf);
 }
 
-static gboolean ui_skinned_equalizer_slider_button_release(GtkWidget *widget, GdkEventButton *event) {
- UiSkinnedEqualizerSliderPrivate *priv = UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(widget);
+static gboolean eq_slider_button_press (GtkWidget * slider, GdkEventButton *
+ event)
+{
+ EqSliderData * data = g_object_get_data ((GObject *) slider, "eqsliderdata");
+ g_return_val_if_fail (data, FALSE);
+
+ if (event->button != 1)
+ return FALSE;
 
- if (event->button == 1) {
- priv->pressed = FALSE;
- mainwin_release_info_text();
+ data->pressed = TRUE;
 
- if (widget_really_drawable (widget))
- ui_skinned_equalizer_slider_expose (widget, 0);
- }
+ eq_slider_moved (data, event->y - 5);
+ gtk_widget_queue_draw (slider);
 return TRUE;
 }
 
-static gboolean ui_skinned_equalizer_slider_motion_notify(GtkWidget *widget, GdkEventMotion *event) {
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (UI_SKINNED_IS_EQUALIZER_SLIDER (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
- UiSkinnedEqualizerSlider *es = UI_SKINNED_EQUALIZER_SLIDER(widget);
- UiSkinnedEqualizerSliderPrivate *priv = UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(widget);
-
- if (priv->pressed) {
- gint y;
-
- y = event->y/(priv->scaled ? config.scale_factor : 1);
- priv->position = y - priv->drag_y;
+static gboolean eq_slider_button_release (GtkWidget * slider, GdkEventButton *
+ event)
+{
+ EqSliderData * data = g_object_get_data ((GObject *) slider, "eqsliderdata");
+ g_return_val_if_fail (data, FALSE);
 
- if (priv->position < 0)
- priv->position = 0;
- if (priv->position > 50)
- priv->position = 50;
- if (priv->position >= 24 && priv->position <= 26)
- priv->position = 25;
+ if (event->button != 1)
+ return FALSE;
 
- priv->value = ((gfloat) (25 - priv->position) * EQUALIZER_MAX_GAIN / 25.0 );
- ui_skinned_equalizer_slider_set_mainwin_text(es);
- equalizerwin_eq_changed();
+ if (! data->pressed)
+ return TRUE;
 
- if (widget_really_drawable (widget))
- ui_skinned_equalizer_slider_expose (widget, 0);
- }
+ data->pressed = FALSE;
 
+ eq_slider_moved (data, event->y - 5);
+ gtk_widget_queue_draw (slider);
 return TRUE;
 }
 
-static gboolean ui_skinned_equalizer_slider_scroll(GtkWidget *widget, GdkEventScroll *event) {
- g_return_val_if_fail (UI_SKINNED_IS_EQUALIZER_SLIDER (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
- UiSkinnedEqualizerSliderPrivate *priv = UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(widget);
-
- if (event->direction == GDK_SCROLL_UP) {
- priv->position -= 2;
-
- if (priv->position < 0)
- priv->position = 0;
- }
- else {
- priv->position += 2;
-
- if (priv->position > 50)
- priv->position = 50;
- }
-
- priv->value = ((gfloat) (25 - priv->position) * EQUALIZER_MAX_GAIN / 25.0 );
- equalizerwin_eq_changed();
+static gboolean eq_slider_motion (GtkWidget * slider, GdkEventMotion * event)
+{
+ EqSliderData * data = g_object_get_data ((GObject *) slider, "eqsliderdata");
+ g_return_val_if_fail (data, FALSE);
 
- if (widget_really_drawable (widget))
- ui_skinned_equalizer_slider_expose (widget, 0);
+ if (! data->pressed)
+ return TRUE;
 
+ eq_slider_moved (data, event->y - 5);
+ gtk_widget_queue_draw (slider);
 return TRUE;
 }
 
-static void ui_skinned_equalizer_slider_toggle_scaled(UiSkinnedEqualizerSlider *equalizer_slider) {
- GtkWidget *widget = GTK_WIDGET (equalizer_slider);
- UiSkinnedEqualizerSliderPrivate *priv = UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(equalizer_slider);
-
- priv->scaled = !priv->scaled;
+static gboolean eq_slider_scroll (GtkWidget * slider, GdkEventScroll * event)
+{
+ EqSliderData * data = g_object_get_data ((GObject *) slider, "eqsliderdata");
+ g_return_val_if_fail (data, FALSE);
 
- gtk_widget_set_size_request(widget, priv->width*(priv->scaled ? config.scale_factor : 1),
- priv->height*(priv->scaled ? config.scale_factor : 1));
+ if (event->direction == GDK_SCROLL_UP)
+ eq_slider_moved (data, data->pos - 2);
+ else
+ eq_slider_moved (data, data->pos + 2);
 
- if (widget_really_drawable (widget))
- ui_skinned_equalizer_slider_expose (widget, 0);
+ gtk_widget_queue_draw (slider);
+ return TRUE;
 }
 
-void ui_skinned_equalizer_slider_set_position(GtkWidget *widget, gfloat pos) {
- g_return_if_fail (UI_SKINNED_IS_EQUALIZER_SLIDER (widget));
- UiSkinnedEqualizerSliderPrivate *priv = UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(widget);
+void eq_slider_set_val (GtkWidget * slider, gfloat val)
+{
+ EqSliderData * data = g_object_get_data ((GObject *) slider, "eqsliderdata");
+ g_return_if_fail (data);
 
- if (priv->pressed)
+ if (data->pressed)
 return;
 
- priv->value = (pos > EQUALIZER_MAX_GAIN) ? EQUALIZER_MAX_GAIN : ((pos < -EQUALIZER_MAX_GAIN) ? -EQUALIZER_MAX_GAIN : pos);
- priv->position = 25 - (gint) ((pos * 25.0) / EQUALIZER_MAX_GAIN);
+ data->val = val;
+ data->pos = 25 - (gint) (val * 25 / EQUALIZER_MAX_GAIN);
+ data->pos = CLAMP (data->pos, 0, 50);
 
- if (priv->position < 0)
- priv->position = 0;
-
- if (priv->position > 50)
- priv->position = 50;
+ gtk_widget_queue_draw (slider);
+}
 
- if (priv->position >= 24 && priv->position <= 26)
- priv->position = 25;
+gfloat eq_slider_get_val (GtkWidget * slider)
+{
+ EqSliderData * data = g_object_get_data ((GObject *) slider, "eqsliderdata");
+ g_return_val_if_fail (data, 0);
 
- if (widget_really_drawable (widget))
- ui_skinned_equalizer_slider_expose (widget, 0);
+ return data->val;
 }
 
-gfloat ui_skinned_equalizer_slider_get_position(GtkWidget *widget) {
- g_return_val_if_fail (UI_SKINNED_IS_EQUALIZER_SLIDER (widget), -1);
- UiSkinnedEqualizerSliderPrivate *priv = UI_SKINNED_EQUALIZER_SLIDER_GET_PRIVATE(widget);
- return priv->value;
+static void eq_slider_destroy (GtkWidget * slider)
+{
+ EqSliderData * data = g_object_get_data ((GObject *) slider, "eqsliderdata");
+ g_return_if_fail (data);
+
+ g_free (data->name);
+ g_free (data);
 }
 
-void ui_skinned_equalizer_slider_set_mainwin_text(UiSkinnedEqualizerSlider * es) {
- gint band = 0;
- const gchar * const bandname[11] = {N_("Preamp"), 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")};
- gchar *tmp;
-
- if (es->x > 21)
- band = ((es->x - 78) / 18) + 1;
-
- tmp =
- g_strdup_printf("EQ: %s: %+.1f DB", _(bandname[band]),
- ui_skinned_equalizer_slider_get_position(GTK_WIDGET(es)));
- mainwin_lock_info_text(tmp);
- g_free(tmp);
+GtkWidget * eq_slider_new (const gchar * name)
+{
+ GtkWidget * slider = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (slider, 14, 63);
+ gtk_widget_add_events (slider, GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK);
+
+ DRAW_CONNECT (slider, eq_slider_draw);
+
+ g_signal_connect (slider, "button-press-event", (GCallback)
+ eq_slider_button_press, NULL);
+ g_signal_connect (slider, "button-release-event", (GCallback)
+ eq_slider_button_release, NULL);
+ g_signal_connect (slider, "motion-notify-event", (GCallback)
+ eq_slider_motion, NULL);
+ g_signal_connect (slider, "scroll-event", (GCallback) eq_slider_scroll,
+ NULL);
+ g_signal_connect (slider, "destroy", (GCallback) eq_slider_destroy, NULL);
+
+ EqSliderData * data = g_malloc0 (sizeof (EqSliderData));
+ data->name = g_strdup (name);
+ g_object_set_data ((GObject *) slider, "eqsliderdata", data);
+
+ return slider;
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_equalizer_slider.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_equalizer_slider.h Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -21,41 +22,13 @@
 * along with this program; If not, see <http://www.gnu.org/licenses>.
 */
 
-#ifndef AUDACIOUS_UI_SKINNED_EQUALIZER_SLIDER_H
-#define AUDACIOUS_UI_SKINNED_EQUALIZER_SLIDER_H
+#ifndef SKINS_UI_SKINNED_EQUALIZER_SLIDER_H
+#define SKINS_UI_SKINNED_EQUALIZER_SLIDER_H
 
 #include <gtk/gtk.h>
-#include "ui_skin.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UI_SKINNED_EQUALIZER_SLIDER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_equalizer_slider_get_type (), UiSkinnedEqualizerSlider)
-#define UI_SKINNED_EQUALIZER_SLIDER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_equalizer_slider_get_type (), UiSkinnedEqualizerSliderClass)
-#define UI_SKINNED_IS_EQUALIZER_SLIDER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_equalizer_slider_get_type ())
-
-typedef struct _UiSkinnedEqualizerSlider UiSkinnedEqualizerSlider;
-typedef struct _UiSkinnedEqualizerSliderClass UiSkinnedEqualizerSliderClass;
-
-struct _UiSkinnedEqualizerSlider {
- GtkWidget widget;
- GdkWindow *event_window;
- gint x, y;
-};
+GtkWidget * eq_slider_new (const gchar * name);
+void eq_slider_set_val (GtkWidget * widget, gfloat val);
+gfloat eq_slider_get_val (GtkWidget * widget);
 
-struct _UiSkinnedEqualizerSliderClass {
- GtkWidgetClass parent_class;
- void (* scaled) (UiSkinnedEqualizerSlider *equalizer_slider);
-};
-
-GtkWidget* ui_skinned_equalizer_slider_new(GtkWidget *fixed, gint x, gint y);
-GType ui_skinned_equalizer_slider_get_type(void);
-void ui_skinned_equalizer_slider_set_position(GtkWidget *widget, gfloat pos);
-gfloat ui_skinned_equalizer_slider_get_position(GtkWidget *widget);
-
-#ifdef __cplusplus
-}
 #endif
-
-#endif /* AUDACIOUS_UI_SKINNED_EQUALIZER_SLIDER_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_horizontal_slider.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_horizontal_slider.c Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,411 +25,214 @@
 * Audacious or using our public API to be a derived work.
 */
 
+#include "draw-compat.h"
+#include "ui_skin.h"
 #include "ui_skinned_horizontal_slider.h"
-#include "skins_cfg.h"
-#include "util.h"
-
-#include <math.h>
-
-#define UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ui_skinned_horizontal_slider_get_type(), UiSkinnedHorizontalSliderPrivate))
-typedef struct _UiSkinnedHorizontalSliderPrivate UiSkinnedHorizontalSliderPrivate;
-
-enum {
- MOTION,
- RELEASE,
- DOUBLED,
- LAST_SIGNAL
-};
-
-struct _UiSkinnedHorizontalSliderPrivate {
- SkinPixmapId skin_index;
- gboolean scaled;
- gint frame, frame_offset, frame_height, min, max;
- gint knob_width, knob_height;
- gint position;
- gint width, height;
- gint (*frame_cb) (gint);
-};
-
-static void ui_skinned_horizontal_slider_class_init (UiSkinnedHorizontalSliderClass *klass);
-static void ui_skinned_horizontal_slider_init (UiSkinnedHorizontalSlider *horizontal_slider);
-static void ui_skinned_horizontal_slider_destroy (GtkObject *object);
-static void ui_skinned_horizontal_slider_realize (GtkWidget *widget);
-static void ui_skinned_horizontal_slider_unrealize (GtkWidget *widget);
-static void ui_skinned_horizontal_slider_map (GtkWidget *widget);
-static void ui_skinned_horizontal_slider_unmap (GtkWidget *widget);
-static void ui_skinned_horizontal_slider_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void ui_skinned_horizontal_slider_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static gboolean ui_skinned_horizontal_slider_expose (GtkWidget *widget, GdkEventExpose *event);
-static gboolean ui_skinned_horizontal_slider_button_press (GtkWidget *widget, GdkEventButton *event);
-static gboolean ui_skinned_horizontal_slider_button_release (GtkWidget *widget, GdkEventButton *event);
-static gboolean ui_skinned_horizontal_slider_motion_notify (GtkWidget *widget, GdkEventMotion *event);
-static void ui_skinned_horizontal_slider_toggle_scaled (UiSkinnedHorizontalSlider *horizontal_slider);
-
-static GtkWidgetClass *parent_class = NULL;
-static guint horizontal_slider_signals[LAST_SIGNAL] = { 0 };
-
-GType ui_skinned_horizontal_slider_get_type() {
- static GType horizontal_slider_type = 0;
- if (!horizontal_slider_type) {
- static const GTypeInfo horizontal_slider_info = {
- sizeof (UiSkinnedHorizontalSliderClass),
- NULL,
- NULL,
- (GClassInitFunc) ui_skinned_horizontal_slider_class_init,
- NULL,
- NULL,
- sizeof (UiSkinnedHorizontalSlider),
- 0,
- (GInstanceInitFunc) ui_skinned_horizontal_slider_init,
- };
- horizontal_slider_type = g_type_register_static (GTK_TYPE_WIDGET, "UiSkinnedHorizontalSlider", &horizontal_slider_info, 0);
- }
-
- return horizontal_slider_type;
-}
 
-static void ui_skinned_horizontal_slider_class_init(UiSkinnedHorizontalSliderClass *klass) {
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- gobject_class = G_OBJECT_CLASS(klass);
- object_class = (GtkObjectClass*) klass;
- widget_class = (GtkWidgetClass*) klass;
- parent_class = g_type_class_peek_parent(klass);
-
- object_class->destroy = ui_skinned_horizontal_slider_destroy;
-
- widget_class->realize = ui_skinned_horizontal_slider_realize;
- widget_class->unrealize = ui_skinned_horizontal_slider_unrealize;
- widget_class->map = ui_skinned_horizontal_slider_map;
- widget_class->unmap = ui_skinned_horizontal_slider_unmap;
- widget_class->expose_event = ui_skinned_horizontal_slider_expose;
- widget_class->size_request = ui_skinned_horizontal_slider_size_request;
- widget_class->size_allocate = ui_skinned_horizontal_slider_size_allocate;
- widget_class->button_press_event = ui_skinned_horizontal_slider_button_press;
- widget_class->button_release_event = ui_skinned_horizontal_slider_button_release;
- widget_class->motion_notify_event = ui_skinned_horizontal_slider_motion_notify;
-
- klass->motion = NULL;
- klass->release = NULL;
- klass->scaled = ui_skinned_horizontal_slider_toggle_scaled;
-
- horizontal_slider_signals[MOTION] =
- g_signal_new ("motion", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedHorizontalSliderClass, motion), NULL, NULL,
- g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
-
- horizontal_slider_signals[RELEASE] =
- g_signal_new ("release", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedHorizontalSliderClass, release), NULL, NULL,
- g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
-
- horizontal_slider_signals[DOUBLED] =
- g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedHorizontalSliderClass, scaled), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
- g_type_class_add_private (gobject_class, sizeof (UiSkinnedHorizontalSliderPrivate));
-}
+typedef struct {
+ gint min, max, pos;
+ gboolean pressed;
+ SkinPixmapId si;
+ gint w, h;
+ gint fx, fy;
+ gint kw, kh;
+ gint knx, kny, kpx, kpy;
+ void (* on_motion) (void);
+ void (* on_release) (void);
+} HSliderData;
+
+DRAW_FUNC_BEGIN (hslider_draw)
+ HSliderData * data = g_object_get_data ((GObject *) wid, "hsliderdata");
+ g_return_val_if_fail (data, FALSE);
+
+ skin_draw_pixbuf (cr, data->si, data->fx, data->fy, 0, 0, data->w, data->h);
+
+ if (data->pressed)
+ skin_draw_pixbuf (cr, data->si, data->kpx, data->kpy, data->pos,
+ (data->h - data->kh) / 2, data->kw, data->kh);
+ else
+ skin_draw_pixbuf (cr, data->si, data->knx, data->kny, data->pos,
+ (data->h - data->kh) / 2, data->kw, data->kh);
+DRAW_FUNC_END
 
-static void ui_skinned_horizontal_slider_init(UiSkinnedHorizontalSlider *horizontal_slider) {
- horizontal_slider->pressed = FALSE;
+static gboolean hslider_button_press (GtkWidget * hslider, GdkEventButton *
+ event)
+{
+ HSliderData * data = g_object_get_data ((GObject *) hslider, "hsliderdata");
+ g_return_val_if_fail (data, FALSE);
 
- horizontal_slider->event_window = NULL;
- GTK_WIDGET_SET_FLAGS(horizontal_slider, GTK_NO_WINDOW);
-}
+ if (event->button != 1)
+ return FALSE;
 
-GtkWidget* ui_skinned_horizontal_slider_new(GtkWidget *fixed, gint x, gint y, gint w, gint h, gint knx, gint kny,
- gint kpx, gint kpy, gint kw, gint kh, gint fh,
- gint fo, gint min, gint max, gint(*fcb) (gint), SkinPixmapId si) {
-
- UiSkinnedHorizontalSlider *hs = g_object_new (ui_skinned_horizontal_slider_get_type (), NULL);
- UiSkinnedHorizontalSliderPrivate *priv = UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(hs);
-
- hs->x = x;
- hs->y = y;
- priv->width = w;
- priv->height = h;
- hs->knob_nx = knx;
- hs->knob_ny = kny;
- hs->knob_px = kpx;
- hs->knob_py = kpy;
- priv->knob_width = kw;
- priv->knob_height = kh;
- priv->frame_height = fh;
- priv->frame_offset = fo;
- priv->min = min;
- priv->position = min;
- priv->max = max;
- priv->frame_cb = fcb;
- if (priv->frame_cb)
- priv->frame = priv->frame_cb(0);
- priv->skin_index = si;
-
- gtk_fixed_put(GTK_FIXED(fixed), GTK_WIDGET(hs), hs->x, hs->y);
-
- return GTK_WIDGET(hs);
-}
+ data->pressed = TRUE;
+ data->pos = event->x - data->kw / 2;
+ data->pos = CLAMP (data->pos, data->min, data->max);
 
-static void ui_skinned_horizontal_slider_destroy(GtkObject *object) {
- g_return_if_fail (object != NULL);
- g_return_if_fail (UI_SKINNED_IS_HORIZONTAL_SLIDER (object));
+ if (data->on_motion)
+ data->on_motion ();
 
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ gtk_widget_queue_draw (hslider);
+ return TRUE;
 }
 
-static void ui_skinned_horizontal_slider_realize(GtkWidget *widget) {
- UiSkinnedHorizontalSlider *horizontal_slider;
- GdkWindowAttr attributes;
- gint attributes_mask;
+static gboolean hslider_button_release (GtkWidget * hslider, GdkEventButton *
+ event)
+{
+ HSliderData * data = g_object_get_data ((GObject *) hslider, "hsliderdata");
+ g_return_val_if_fail (data, FALSE);
 
- g_return_if_fail (widget != NULL);
- g_return_if_fail (UI_SKINNED_IS_HORIZONTAL_SLIDER(widget));
+ if (event->button != 1)
+ return FALSE;
 
- if (GTK_WIDGET_CLASS (parent_class)->realize)
- (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
- horizontal_slider = UI_SKINNED_HORIZONTAL_SLIDER(widget);
+ if (! data->pressed)
+ return TRUE;
 
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_ONLY;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.event_mask = gtk_widget_get_events(widget);
- attributes.event_mask |= GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK;
+ data->pressed = FALSE;
+ data->pos = event->x - data->kw / 2;
+ data->pos = CLAMP (data->pos, data->min, data->max);
 
- attributes_mask = GDK_WA_X | GDK_WA_Y;
- horizontal_slider->event_window = gdk_window_new(widget->window, &attributes, attributes_mask);
+ if (data->on_release)
+ data->on_release ();
 
- gdk_window_set_user_data(horizontal_slider->event_window, widget);
+ gtk_widget_queue_draw (hslider);
+ return TRUE;
 }
 
-static void ui_skinned_horizontal_slider_unrealize(GtkWidget *widget) {
- UiSkinnedHorizontalSlider *horizontal_slider = UI_SKINNED_HORIZONTAL_SLIDER(widget);
+static gboolean hslider_motion_notify (GtkWidget * hslider, GdkEventMotion *
+ event)
+{
+ HSliderData * data = g_object_get_data ((GObject *) hslider, "hsliderdata");
+ g_return_val_if_fail (data, FALSE);
 
- if ( horizontal_slider->event_window != NULL )
- {
- gdk_window_set_user_data( horizontal_slider->event_window , NULL );
- gdk_window_destroy( horizontal_slider->event_window );
- horizontal_slider->event_window = NULL;
- }
+ if (! data->pressed)
+ return TRUE;
 
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
+ data->pressed = TRUE;
+ data->pos = event->x - data->kw / 2;
+ data->pos = CLAMP (data->pos, data->min, data->max);
 
-static void ui_skinned_horizontal_slider_map (GtkWidget *widget)
-{
- UiSkinnedHorizontalSlider *horizontal_slider = UI_SKINNED_HORIZONTAL_SLIDER(widget);
-
- if (horizontal_slider->event_window != NULL)
- gdk_window_show (horizontal_slider->event_window);
+ if (data->on_motion)
+ data->on_motion ();
 
- if (GTK_WIDGET_CLASS (parent_class)->map)
- (* GTK_WIDGET_CLASS (parent_class)->map) (widget);
+ gtk_widget_queue_draw (hslider);
+ return TRUE;
 }
 
-static void ui_skinned_horizontal_slider_unmap (GtkWidget *widget)
+static void hslider_destroy (GtkWidget * hslider)
 {
- UiSkinnedHorizontalSlider *horizontal_slider = UI_SKINNED_HORIZONTAL_SLIDER(widget);
-
- if (horizontal_slider->event_window != NULL)
- gdk_window_hide (horizontal_slider->event_window);
-
- if (GTK_WIDGET_CLASS (parent_class)->unmap)
- (* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
+ g_free (g_object_get_data ((GObject *) hslider, "hsliderdata"));
 }
 
-static void ui_skinned_horizontal_slider_size_request(GtkWidget *widget, GtkRequisition *requisition) {
- UiSkinnedHorizontalSliderPrivate *priv = UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(widget);
+GtkWidget * hslider_new (gint min, gint max, SkinPixmapId si, gint w, gint h,
+ gint fx, gint fy, gint kw, gint kh, gint knx, gint kny, gint kpx, gint kpy)
+{
+ GtkWidget * hslider = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (hslider, w, h);
+ gtk_widget_add_events (hslider, GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK);
+
+ DRAW_CONNECT (hslider, hslider_draw);
+
+ g_signal_connect (hslider, "button-press-event", (GCallback)
+ hslider_button_press, NULL);
+ g_signal_connect (hslider, "button-release-event", (GCallback)
+ hslider_button_release, NULL);
+ g_signal_connect (hslider, "motion-notify-event", (GCallback)
+ hslider_motion_notify, NULL);
+ g_signal_connect (hslider, "destroy", (GCallback) hslider_destroy, NULL);
+
+ HSliderData * data = g_malloc0 (sizeof (HSliderData));
+ data->min = min;
+ data->max = max;
+ data->pos = min;
+ data->si = si;
+ data->w = w;
+ data->h = h;
+ data->fx = fx;
+ data->fy = fy;
+ data->kw = kw;
+ data->kh = kh;
+ data->knx = knx;
+ data->kny = kny;
+ data->kpx = kpx;
+ data->kpy = kpy;
+ g_object_set_data ((GObject *) hslider, "hsliderdata", data);
+
+ return hslider;
+}
+
+void hslider_set_frame (GtkWidget * hslider, gint fx, gint fy)
+{
+ HSliderData * data = g_object_get_data ((GObject *) hslider, "hsliderdata");
+ g_return_if_fail (data);
 
- requisition->width = priv->width*(priv->scaled ? config.scale_factor : 1);
- requisition->height = priv->height*(priv->scaled ? config.scale_factor : 1);
+ data->fx = fx;
+ data->fy = fy;
+ gtk_widget_queue_draw (hslider);
 }
 
-static void ui_skinned_horizontal_slider_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
- UiSkinnedHorizontalSlider *horizontal_slider = UI_SKINNED_HORIZONTAL_SLIDER (widget);
- UiSkinnedHorizontalSliderPrivate *priv = UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(horizontal_slider);
-
- widget->allocation = *allocation;
- widget->allocation.x = ceil(widget->allocation.x*(priv->scaled ? config.scale_factor : 1));
- widget->allocation.y = ceil(widget->allocation.y*(priv->scaled ? config.scale_factor : 1));
-
- if (priv->knob_height == priv->height)
- priv->knob_height = ceil(allocation->height/(priv->scaled ? config.scale_factor : 1));
- priv->width = ceil(allocation->width/(priv->scaled ? config.scale_factor : 1));
- priv->height = ceil(allocation->height/(priv->scaled ? config.scale_factor : 1));
-
- if (GTK_WIDGET_REALIZED (widget))
- if (horizontal_slider->event_window)
- gdk_window_move_resize(horizontal_slider->event_window, widget->allocation.x, widget->allocation.y, allocation->width, allocation->height);
+void hslider_set_knob (GtkWidget * hslider, gint knx, gint kny, gint kpx, gint
+ kpy)
+{
+ HSliderData * data = g_object_get_data ((GObject *) hslider, "hsliderdata");
+ g_return_if_fail (data);
 
- horizontal_slider->x = ceil(widget->allocation.x/(priv->scaled ? config.scale_factor : 1));
- horizontal_slider->y = ceil(widget->allocation.y/(priv->scaled ? config.scale_factor : 1));
+ data->knx = knx;
+ data->kny = kny;
+ data->kpx = kpx;
+ data->kpy = kpy;
+ gtk_widget_queue_draw (hslider);
 }
 
-static gboolean ui_skinned_horizontal_slider_expose(GtkWidget *widget, GdkEventExpose *event) {
- UiSkinnedHorizontalSlider *hs = UI_SKINNED_HORIZONTAL_SLIDER (widget);
- UiSkinnedHorizontalSliderPrivate *priv = UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(hs);
- g_return_val_if_fail (priv->width > 0 && priv->height > 0, FALSE);
-
- GdkPixbuf *obj = NULL;
-
- if (priv->position > priv->max) priv->position = priv->max;
- else if (priv->position < priv->min) priv->position = priv->min;
-
- obj = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, priv->width, priv->height);
-
- skin_draw_pixbuf(widget, aud_active_skin, obj,
- priv->skin_index, priv->frame_offset,
- priv->frame * priv->frame_height,
- 0, 0, priv->width, priv->height);
- if (hs->pressed)
- skin_draw_pixbuf(widget, aud_active_skin, obj,
- priv->skin_index, hs->knob_px,
- hs->knob_py, priv->position,
- ((priv->height - priv->knob_height) / 2),
- priv->knob_width, priv->knob_height);
- else
- skin_draw_pixbuf(widget, aud_active_skin, obj,
- priv->skin_index, hs->knob_nx,
- hs->knob_ny, priv->position,
- ((priv->height - priv->knob_height) / 2),
- priv->knob_width, priv->knob_height);
-
- ui_skinned_widget_draw_with_coordinates(widget, obj, priv->width, priv->height,
- widget->allocation.x,
- widget->allocation.y,
- priv->scaled);
-
- g_object_unref(obj);
+gint hslider_get_pos (GtkWidget * hslider)
+{
+ HSliderData * data = g_object_get_data ((GObject *) hslider, "hsliderdata");
+ g_return_val_if_fail (data, 0);
 
- return FALSE;
+ return data->pos;
 }
 
-static gboolean ui_skinned_horizontal_slider_button_press(GtkWidget *widget, GdkEventButton *event) {
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (UI_SKINNED_IS_HORIZONTAL_SLIDER (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- UiSkinnedHorizontalSlider *hs = UI_SKINNED_HORIZONTAL_SLIDER (widget);
- UiSkinnedHorizontalSliderPrivate *priv = UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(hs);
- gint scale = priv->scaled ? config.scale_factor : 1;
-
- if (event->type == GDK_BUTTON_PRESS) {
- if (event->button == 1) {
- hs->pressed = TRUE;
-
- priv->position = event->x / scale - priv->knob_width / 2;
- if (priv->position < priv->min)
- priv->position = priv->min;
- if (priv->position > priv->max)
- priv->position = priv->max;
- if (priv->frame_cb)
- priv->frame = priv->frame_cb(priv->position);
-
- g_signal_emit_by_name(widget, "motion", priv->position);
-
- if (widget_really_drawable (widget))
- ui_skinned_horizontal_slider_expose (widget, 0);
- } else if (event->button == 3) {
- if (hs->pressed) {
- hs->pressed = FALSE;
- g_signal_emit_by_name(widget, "release", priv->position);
-
- if (widget_really_drawable (widget))
- ui_skinned_horizontal_slider_expose (widget, 0);
- }
- event->x = event->x + hs->x * scale;
- event->y = event->y + hs->y * scale;
- return FALSE;
- }
- }
- return TRUE;
-}
-
-static gboolean ui_skinned_horizontal_slider_button_release(GtkWidget *widget, GdkEventButton *event) {
- UiSkinnedHorizontalSlider *hs = UI_SKINNED_HORIZONTAL_SLIDER(widget);
- UiSkinnedHorizontalSliderPrivate *priv = UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(widget);
+void hslider_set_pos (GtkWidget * hslider, gint pos)
+{
+ HSliderData * data = g_object_get_data ((GObject *) hslider, "hsliderdata");
+ g_return_if_fail (data);
 
- if (hs->pressed) {
- hs->pressed = FALSE;
- g_signal_emit_by_name(widget, "release", priv->position);
+ if (data->pressed)
+ return;
 
- if (widget_really_drawable (widget))
- ui_skinned_horizontal_slider_expose (widget, 0);
- }
- return TRUE;
+ data->pos = CLAMP (pos, data->min, data->max);
+ gtk_widget_queue_draw (hslider);
 }
 
-static gboolean ui_skinned_horizontal_slider_motion_notify(GtkWidget *widget, GdkEventMotion *event) {
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (UI_SKINNED_IS_HORIZONTAL_SLIDER (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
- UiSkinnedHorizontalSlider *hs = UI_SKINNED_HORIZONTAL_SLIDER(widget);
- UiSkinnedHorizontalSliderPrivate *priv = UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(widget);
-
- if (hs->pressed) {
- gint x = event->x - priv->knob_width * (priv->scaled ? config.scale_factor : 1) / 2;
-
- priv->position = x/(priv->scaled ? config.scale_factor : 1);
-
- if (priv->position < priv->min)
- priv->position = priv->min;
-
- if (priv->position > priv->max)
- priv->position = priv->max;
-
- if (priv->frame_cb)
- priv->frame = priv->frame_cb(priv->position);
-
- g_signal_emit_by_name(widget, "motion", priv->position);
-
- if (widget_really_drawable (widget))
- ui_skinned_horizontal_slider_expose (widget, 0);
- }
+gboolean hslider_get_pressed (GtkWidget * hslider)
+{
+ HSliderData * data = g_object_get_data ((GObject *) hslider, "hsliderdata");
+ g_return_val_if_fail (data, FALSE);
 
- return TRUE;
+ return data->pressed;
 }
 
-static void ui_skinned_horizontal_slider_toggle_scaled(UiSkinnedHorizontalSlider *horizontal_slider) {
- GtkWidget *widget = GTK_WIDGET (horizontal_slider);
- UiSkinnedHorizontalSliderPrivate *priv = UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(horizontal_slider);
-
- priv->scaled = !priv->scaled;
-
- gtk_widget_set_size_request(widget,
- priv->width*(priv->scaled ? config.scale_factor : 1),
- priv->height*(priv->scaled ? config.scale_factor : 1));
+void hslider_set_pressed (GtkWidget * hslider, gboolean pressed)
+{
+ HSliderData * data = g_object_get_data ((GObject *) hslider, "hsliderdata");
+ g_return_if_fail (data);
 
- if (widget_really_drawable (widget))
- ui_skinned_horizontal_slider_expose (widget, 0);
+ data->pressed = pressed;
+ gtk_widget_queue_draw (hslider);
 }
 
-void ui_skinned_horizontal_slider_set_position(GtkWidget *widget, gint pos) {
- g_return_if_fail (UI_SKINNED_IS_HORIZONTAL_SLIDER (widget));
- UiSkinnedHorizontalSlider *hs = UI_SKINNED_HORIZONTAL_SLIDER(widget);
- UiSkinnedHorizontalSliderPrivate *priv = UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(widget);
-
- if (pos == priv->position || hs->pressed)
- return;
-
- priv->position = pos;
-
- if (priv->frame_cb)
- priv->frame = priv->frame_cb(priv->position);
+void hslider_on_motion (GtkWidget * hslider, void (* callback) (void))
+{
+ HSliderData * data = g_object_get_data ((GObject *) hslider, "hsliderdata");
+ g_return_if_fail (data);
 
- if (widget_really_drawable (widget))
- ui_skinned_horizontal_slider_expose (widget, 0);
+ data->on_motion = callback;
 }
 
-gint ui_skinned_horizontal_slider_get_position(GtkWidget *widget) {
- g_return_val_if_fail (UI_SKINNED_IS_HORIZONTAL_SLIDER (widget), -1);
- UiSkinnedHorizontalSliderPrivate *priv = UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(widget);
- return priv->position;
+void hslider_on_release (GtkWidget * hslider, void (* callback) (void))
+{
+ HSliderData * data = g_object_get_data ((GObject *) hslider, "hsliderdata");
+ g_return_if_fail (data);
+
+ data->on_release = callback;
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_horizontal_slider.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_horizontal_slider.h Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,46 +25,21 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_SKINNED_HORIZONTAL_SLIDER_H
-#define AUDACIOUS_UI_SKINNED_HORIZONTAL_SLIDER_H
+#ifndef SKINS_UI_SKINNED_HORIZONTAL_SLIDER_H
+#define SKINS_UI_SKINNED_HORIZONTAL_SLIDER_H
 
 #include <gtk/gtk.h>
-#include "ui_skin.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UI_SKINNED_HORIZONTAL_SLIDER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_horizontal_slider_get_type (), UiSkinnedHorizontalSlider)
-#define UI_SKINNED_HORIZONTAL_SLIDER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_horizontal_slider_get_type (), UiSkinnedHorizontalSliderClass)
-#define UI_SKINNED_IS_HORIZONTAL_SLIDER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_horizontal_slider_get_type ())
-
-typedef struct _UiSkinnedHorizontalSlider UiSkinnedHorizontalSlider;
-typedef struct _UiSkinnedHorizontalSliderClass UiSkinnedHorizontalSliderClass;
+GtkWidget * hslider_new (gint min, gint max, SkinPixmapId si, gint w, gint h,
+ gint fx, gint fy, gint kw, gint kh, gint knx, gint kny, gint kpx, gint kpy);
+void hslider_set_frame (GtkWidget * hslider, gint fx, gint fy);
+void hslider_set_knob (GtkWidget * hslider, gint knx, gint kny, gint kpx, gint
+ kpy);
+gint hslider_get_pos (GtkWidget * hslider);
+void hslider_set_pos (GtkWidget * hslider, gint pos);
+gboolean hslider_get_pressed (GtkWidget * hslider);
+void hslider_set_pressed (GtkWidget * hslider, gboolean pressed);
+void hslider_on_motion (GtkWidget * hslider, void (* callback) (void));
+void hslider_on_release (GtkWidget * hslider, void (* callback) (void));
 
-struct _UiSkinnedHorizontalSlider {
- GtkWidget widget;
- GdkWindow *event_window;
- gboolean pressed;
- gint x, y;
- gint knob_nx, knob_ny, knob_px, knob_py;
-};
-
-struct _UiSkinnedHorizontalSliderClass {
- GtkWidgetClass parent_class;
- void (* motion) (UiSkinnedHorizontalSlider *horizontal_slider);
- void (* release) (UiSkinnedHorizontalSlider *horizontal_slider);
- void (* scaled) (UiSkinnedHorizontalSlider *horizontal_slider);
-};
-GtkWidget* ui_skinned_horizontal_slider_new(GtkWidget *fixed, gint x, gint y, gint w, gint h, gint knx, gint kny,
- gint kpx, gint kpy, gint kw, gint kh, gint fh,
- gint fo, gint min, gint max, gint(*fcb) (gint), SkinPixmapId si);
-GType ui_skinned_horizontal_slider_get_type(void);
-void ui_skinned_horizontal_slider_set_position(GtkWidget *widget, gint pos);
-gint ui_skinned_horizontal_slider_get_position(GtkWidget *widget);
-
-#ifdef __cplusplus
-}
 #endif
-
-#endif /* AUDACIOUS_UI_SKINNED_HORIZONTAL_SLIDER_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_menurow.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_menurow.c Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,352 +25,130 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#include <audacious/plugin.h>
-#include "plugin.h"
+#include "draw-compat.h"
+#include "skins_cfg.h"
+#include "ui_skin.h"
 #include "ui_skinned_menurow.h"
-#include "util.h"
 
-enum {
- DOUBLED,
- CHANGE,
- RELEASE,
- LAST_SIGNAL
-};
+static struct {
+ MenuRowItem selected;
+ gboolean pushed;
+} mr;
 
-static void ui_skinned_menurow_class_init (UiSkinnedMenurowClass *klass);
-static void ui_skinned_menurow_init (UiSkinnedMenurow *menurow);
-static void ui_skinned_menurow_destroy (GtkObject *object);
-static void ui_skinned_menurow_realize (GtkWidget *widget);
-static void ui_skinned_menurow_unrealize (GtkWidget *widget);
-static void ui_skinned_menurow_map (GtkWidget *widget);
-static void ui_skinned_menurow_unmap (GtkWidget *widget);
-static void ui_skinned_menurow_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void ui_skinned_menurow_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static gboolean ui_skinned_menurow_expose (GtkWidget *widget, GdkEventExpose *event);
-static MenuRowItem menurow_find_selected (UiSkinnedMenurow * mr, gint x, gint y);
-static gboolean ui_skinned_menurow_button_press (GtkWidget *widget, GdkEventButton *event);
-static gboolean ui_skinned_menurow_button_release (GtkWidget *widget, GdkEventButton *event);
-static gboolean ui_skinned_menurow_motion_notify (GtkWidget *widget, GdkEventMotion *event);
-static void ui_skinned_menurow_toggle_scaled (UiSkinnedMenurow *menurow);
-
-static GtkWidgetClass *parent_class = NULL;
-static guint menurow_signals[LAST_SIGNAL] = { 0 };
-
-GType ui_skinned_menurow_get_type() {
- static GType menurow_type = 0;
- if (!menurow_type) {
- static const GTypeInfo menurow_info = {
- sizeof (UiSkinnedMenurowClass),
- NULL,
- NULL,
- (GClassInitFunc) ui_skinned_menurow_class_init,
- NULL,
- NULL,
- sizeof (UiSkinnedMenurow),
- 0,
- (GInstanceInitFunc) ui_skinned_menurow_init,
- };
- menurow_type = g_type_register_static (GTK_TYPE_WIDGET, "UiSkinnedMenurow", &menurow_info, 0);
+DRAW_FUNC_BEGIN (menurow_draw)
+ if (mr.selected == MENUROW_NONE)
+ {
+ if (mr.pushed)
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 304, 0, 0, 0, 8, 43);
+ else
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 312, 0, 0, 0, 8, 43);
 }
+ else
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 304 + 8 * (mr.selected - 1), 44, 0,
+ 0, 8, 43);
 
- return menurow_type;
-}
-
-static void ui_skinned_menurow_class_init(UiSkinnedMenurowClass *klass) {
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- object_class = (GtkObjectClass*) klass;
- widget_class = (GtkWidgetClass*) klass;
- parent_class = g_type_class_peek_parent(klass);
-
- object_class->destroy = ui_skinned_menurow_destroy;
-
- widget_class->realize = ui_skinned_menurow_realize;
- widget_class->unrealize = ui_skinned_menurow_unrealize;
- widget_class->map = ui_skinned_menurow_map;
- widget_class->unmap = ui_skinned_menurow_unmap;
- widget_class->expose_event = ui_skinned_menurow_expose;
- widget_class->size_request = ui_skinned_menurow_size_request;
- widget_class->size_allocate = ui_skinned_menurow_size_allocate;
- widget_class->button_press_event = ui_skinned_menurow_button_press;
- widget_class->button_release_event = ui_skinned_menurow_button_release;
- widget_class->motion_notify_event = ui_skinned_menurow_motion_notify;
-
- klass->scaled = ui_skinned_menurow_toggle_scaled;
- klass->change = NULL;
- klass->release = NULL;
-
- menurow_signals[DOUBLED] =
- g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedMenurowClass, scaled), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
-
- menurow_signals[CHANGE] =
- g_signal_new ("change", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedMenurowClass, change), NULL, NULL,
- g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
-
- menurow_signals[RELEASE] =
- g_signal_new ("release", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedMenurowClass, release), NULL, NULL,
- g_cclosure_marshal_VOID__UINT_POINTER, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_POINTER);
-
-}
-
-static void ui_skinned_menurow_init(UiSkinnedMenurow *menurow) {
- menurow->scale_selected = config.scaled;
- menurow->always_selected = config.always_on_top;
-
- menurow->event_window = NULL;
- GTK_WIDGET_SET_FLAGS(menurow, GTK_NO_WINDOW);
-}
-
-GtkWidget* ui_skinned_menurow_new(GtkWidget *fixed, gint x, gint y, gint nx, gint ny, gint sx, gint sy, SkinPixmapId si) {
- UiSkinnedMenurow *menurow = g_object_new (ui_skinned_menurow_get_type (), NULL);
-
- menurow->x = x;
- menurow->y = y;
- menurow->width = 8;
- menurow->height = 43;
- menurow->nx = nx;
- menurow->ny = ny;
- menurow->sx = sx;
- menurow->sy = sy;
- menurow->selected = MENUROW_NONE;
-
- menurow->skin_index = si;
-
- menurow->scaled = FALSE;
-
- gtk_fixed_put(GTK_FIXED(fixed), GTK_WIDGET(menurow), menurow->x, menurow->y);
-
- return GTK_WIDGET(menurow);
-}
-
-static void ui_skinned_menurow_destroy(GtkObject *object) {
- g_return_if_fail (object != NULL);
- g_return_if_fail (UI_SKINNED_IS_MENUROW (object));
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void ui_skinned_menurow_realize(GtkWidget *widget) {
- UiSkinnedMenurow *menurow;
- GdkWindowAttr attributes;
- gint attributes_mask;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (UI_SKINNED_IS_MENUROW(widget));
-
- if (GTK_WIDGET_CLASS (parent_class)->realize)
- (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
- menurow = UI_SKINNED_MENUROW(widget);
-
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_ONLY;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.event_mask = gtk_widget_get_events(widget);
- attributes.event_mask |= GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK;
-
- attributes_mask = GDK_WA_X | GDK_WA_Y;
- menurow->event_window = gdk_window_new(widget->window, &attributes, attributes_mask);
-
- gdk_window_set_user_data(menurow->event_window, widget);
-}
-
-static void ui_skinned_menurow_unrealize(GtkWidget *widget) {
- UiSkinnedMenurow *menurow = UI_SKINNED_MENUROW(widget);
-
- if ( menurow->event_window != NULL )
+ if (mr.pushed)
 {
- gdk_window_set_user_data( menurow->event_window , NULL );
- gdk_window_destroy( menurow->event_window );
- menurow->event_window = NULL;
+ if (config.always_on_top)
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 312, 54, 0, 10, 8, 8);
+#if 0
+ if (config.scaled)
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 328, 70, 0, 26, 8, 8);
+#endif
 }
+DRAW_FUNC_END
 
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void ui_skinned_menurow_map (GtkWidget *widget)
+static MenuRowItem menurow_find_selected (gint x, gint y)
 {
- UiSkinnedMenurow *menurow = UI_SKINNED_MENUROW(widget);
-
- if (menurow->event_window != NULL)
- gdk_window_show (menurow->event_window);
+ if (x >= 0 && x < 8)
+ {
+ if (y >= 0 && y < 10)
+ return MENUROW_OPTIONS;
+ if (y >= 10 && y < 18)
+ return MENUROW_ALWAYS;
+ if (y >= 18 && y < 26)
+ return MENUROW_FILEINFOBOX;
+ if (y >= 26 && y < 34)
+ return MENUROW_SCALE;
+ if (y >= 34 && y < 43)
+ return MENUROW_VISUALIZATION;
+ }
 
- if (GTK_WIDGET_CLASS (parent_class)->map)
- (* GTK_WIDGET_CLASS (parent_class)->map) (widget);
+ return MENUROW_NONE;
 }
 
-static void ui_skinned_menurow_unmap (GtkWidget *widget)
+static gboolean menurow_button_press (GtkWidget * widget, GdkEventButton * event)
 {
- UiSkinnedMenurow *menurow = UI_SKINNED_MENUROW(widget);
-
- if (menurow->event_window != NULL)
- gdk_window_hide (menurow->event_window);
-
- if (GTK_WIDGET_CLASS (parent_class)->unmap)
- (* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
-}
-
-static void ui_skinned_menurow_size_request(GtkWidget *widget, GtkRequisition *requisition) {
- UiSkinnedMenurow *menurow = UI_SKINNED_MENUROW(widget);
-
- requisition->width = menurow->width*(menurow->scaled ? config.scale_factor : 1);
- requisition->height = menurow->height*(menurow->scaled ? config.scale_factor : 1);
-}
-
-static void ui_skinned_menurow_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
- UiSkinnedMenurow *menurow = UI_SKINNED_MENUROW (widget);
-
- widget->allocation = *allocation;
- widget->allocation.x *= (menurow->scaled ? config.scale_factor : 1);
- widget->allocation.y *= (menurow->scaled ? config.scale_factor : 1);
- if (GTK_WIDGET_REALIZED (widget))
- if (menurow->event_window)
- gdk_window_move_resize(menurow->event_window, widget->allocation.x, widget->allocation.y, allocation->width, allocation->height);
-
- menurow->x = widget->allocation.x/(menurow->scaled ? config.scale_factor : 1);
- menurow->y = widget->allocation.y/(menurow->scaled ? config.scale_factor : 1);
-}
-
-static gboolean ui_skinned_menurow_expose(GtkWidget *widget, GdkEventExpose *event) {
- UiSkinnedMenurow *menurow = UI_SKINNED_MENUROW (widget);
- g_return_val_if_fail (menurow->width > 0 && menurow->height > 0, FALSE);
-
- GdkPixbuf *obj = NULL;
- obj = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, menurow->width, menurow->height);
-
- if (menurow->selected == MENUROW_NONE) {
- if (config.always_show_cb || menurow->pushed)
- skin_draw_pixbuf(widget, aud_active_skin, obj, menurow->skin_index,
- menurow->nx, menurow->ny, 0, 0, 8, 43);
- else
- skin_draw_pixbuf(widget, aud_active_skin, obj, menurow->skin_index,
- menurow->nx + 8, menurow->ny, 0, 0, 8, 43);
- }
- else {
- skin_draw_pixbuf(widget, aud_active_skin, obj, menurow->skin_index,
- menurow->sx + ((menurow->selected - 1) * 8),
- menurow->sy, 0, 0, 8, 43);
- }
- if (config.always_show_cb || menurow->pushed) {
- if (menurow->always_selected)
- skin_draw_pixbuf(widget, aud_active_skin, obj, menurow->skin_index,
- menurow->sx + 8, menurow->sy + 10, 0, 10, 8, 8);
- if (menurow->scale_selected)
- skin_draw_pixbuf(widget, aud_active_skin, obj, menurow->skin_index,
- menurow->sx + 24, menurow->sy + 26, 0, 26, 8, 8);
- }
+ if (event->button != 1)
+ return FALSE;
 
- ui_skinned_widget_draw_with_coordinates(widget, obj, menurow->width, menurow->height,
- widget->allocation.x,
- widget->allocation.y,
- menurow->scaled);
+ mr.pushed = TRUE;
+ mr.selected = menurow_find_selected (event->x, event->y);
 
- g_object_unref(obj);
+ mainwin_mr_change (mr.selected);
 
- return FALSE;
+ gtk_widget_queue_draw (widget);
+ return TRUE;
 }
 
-void ui_skinned_menurow_update (GtkWidget * row)
+static gboolean menurow_button_release (GtkWidget * widget, GdkEventButton *
+ event)
 {
- if (widget_really_drawable (row))
- ui_skinned_menurow_expose (row, 0);
-}
-
-static MenuRowItem menurow_find_selected(UiSkinnedMenurow * mr, gint x, gint y) {
- MenuRowItem ret = MENUROW_NONE;
-
- x = x/(mr->scaled ? config.scale_factor : 1);
- y = y/(mr->scaled ? config.scale_factor : 1);
- if (x > 0 && x < 8) {
- if (y >= 0 && y <= 10)
- ret = MENUROW_OPTIONS;
- if (y >= 10 && y <= 17)
- ret = MENUROW_ALWAYS;
- if (y >= 18 && y <= 25)
- ret = MENUROW_FILEINFOBOX;
- if (y >= 26 && y <= 33)
- ret = MENUROW_SCALE;
- if (y >= 34 && y <= 42)
- ret = MENUROW_VISUALIZATION;
- }
- return ret;
-}
-
-static gboolean ui_skinned_menurow_button_press(GtkWidget *widget, GdkEventButton *event) {
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (UI_SKINNED_IS_MENUROW (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ if (event->button != 1)
+ return FALSE;
 
- UiSkinnedMenurow *menurow = UI_SKINNED_MENUROW (widget);
+ if (! mr.pushed)
+ return TRUE;
 
- if (event->type == GDK_BUTTON_PRESS) {
- if (event->button == 1) {
+ if (mr.selected == MENUROW_ALWAYS)
+ config.always_on_top = ! config.always_on_top;
+#if 0
+ else if (mr.selected == MENUROW_SCALE)
+ config.scaled = ! config.scaled;
+#endif
 
- menurow->pushed = TRUE;
- menurow->selected = menurow_find_selected(menurow, event->x, event->y);
+ mainwin_mr_release (mr.selected, event);
 
- ui_skinned_menurow_update (widget);
- g_signal_emit_by_name(widget, "change", menurow->selected);
- }
- }
+ mr.pushed = FALSE;
+ mr.selected = MENUROW_NONE;
 
+ gtk_widget_queue_draw (widget);
 return TRUE;
 }
 
-static gboolean ui_skinned_menurow_button_release(GtkWidget *widget, GdkEventButton *event) {
- UiSkinnedMenurow *menurow = UI_SKINNED_MENUROW(widget);
- if (menurow->pushed) {
- menurow->pushed = FALSE;
-
- if (menurow->selected == MENUROW_ALWAYS)
- menurow->always_selected = !menurow->always_selected;
-
- if (menurow->selected == MENUROW_SCALE)
- menurow->scale_selected = !menurow->scale_selected;
+static gboolean menurow_motion_notify (GtkWidget * widget, GdkEventMotion *
+ event)
+{
+ if (! mr.pushed)
+ return TRUE;
 
- if ((int)(menurow->selected) != -1)
- g_signal_emit_by_name(widget, "release", menurow->selected, event);
+ mr.selected = menurow_find_selected (event->x, event->y);
 
- menurow->selected = MENUROW_NONE;
- ui_skinned_menurow_update (widget);
- }
+ mainwin_mr_change (mr.selected);
 
+ gtk_widget_queue_draw (widget);
 return TRUE;
 }
 
-static gboolean ui_skinned_menurow_motion_notify(GtkWidget *widget, GdkEventMotion *event) {
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (UI_SKINNED_IS_MENUROW (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
- UiSkinnedMenurow *menurow = UI_SKINNED_MENUROW(widget);
-
- if (menurow->pushed) {
- menurow->selected = menurow_find_selected(menurow, event->x, event->y);
+GtkWidget * ui_skinned_menurow_new (void)
+{
+ GtkWidget * wid = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (wid, 8, 43);
+ gtk_widget_add_events (wid, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ | GDK_POINTER_MOTION_MASK);
 
- ui_skinned_menurow_update (widget);
- g_signal_emit_by_name(widget, "change", menurow->selected);
- }
+ DRAW_CONNECT (wid, menurow_draw);
+ g_signal_connect (wid, "button-press-event", (GCallback)
+ menurow_button_press, NULL);
+ g_signal_connect (wid, "button-release-event", (GCallback)
+ menurow_button_release, NULL);
+ g_signal_connect (wid, "motion-notify-event", (GCallback)
+ menurow_motion_notify, NULL);
 
- return TRUE;
+ return wid;
 }
 
-static void ui_skinned_menurow_toggle_scaled(UiSkinnedMenurow *menurow) {
- GtkWidget *widget = GTK_WIDGET (menurow);
-
- menurow->scaled = !menurow->scaled;
- gtk_widget_set_size_request(widget, menurow->width* (menurow->scaled ? config.scale_factor : 1),
- menurow->height * (menurow->scaled ? config.scale_factor : 1));
-
- ui_skinned_menurow_update (widget);
+void ui_skinned_menurow_update (GtkWidget * menurow)
+{
+ gtk_widget_queue_draw (menurow);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_menurow.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_menurow.h Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,56 +25,21 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_SKINNED_MENUROW_H
-#define AUDACIOUS_UI_SKINNED_MENUROW_H
+#ifndef SKINS_UI_SKINNED_MENUROW_H
+#define SKINS_UI_SKINNED_MENUROW_H
 
 #include <gtk/gtk.h>
-#include "ui_skin.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UI_SKINNED_MENUROW(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_menurow_get_type (), UiSkinnedMenurow)
-#define UI_SKINNED_MENUROW_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_menurow_get_type (), UiSkinnedMenurowClass)
-#define UI_SKINNED_IS_MENUROW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_menurow_get_type ())
-
-typedef struct _UiSkinnedMenurow UiSkinnedMenurow;
-typedef struct _UiSkinnedMenurowClass UiSkinnedMenurowClass;
 
 typedef enum {
 MENUROW_NONE, MENUROW_OPTIONS, MENUROW_ALWAYS, MENUROW_FILEINFOBOX,
 MENUROW_SCALE, MENUROW_VISUALIZATION
 } MenuRowItem;
 
-struct _UiSkinnedMenurow {
- GtkWidget widget;
+GtkWidget * ui_skinned_menurow_new (void);
+void ui_skinned_menurow_update (GtkWidget * menurow);
 
- GdkWindow *event_window;
- gint x, y, width, height;
- gboolean scaled;
- gint nx, ny;
- gint sx, sy;
- MenuRowItem selected;
- gboolean always_selected;
- gboolean scale_selected;
- gboolean pushed;
- SkinPixmapId skin_index;
-};
+/* callbacks in ui_main.c */
+void mainwin_mr_change (MenuRowItem i);
+void mainwin_mr_release (MenuRowItem i, GdkEventButton * event);
 
-struct _UiSkinnedMenurowClass {
- GtkWidgetClass parent_class;
- void (* scaled) (UiSkinnedMenurow *menurow);
- void (* change) (UiSkinnedMenurow *menurow);
- void (* release) (UiSkinnedMenurow *menurow);
-};
-
-GtkWidget* ui_skinned_menurow_new (GtkWidget *fixed, gint x, gint y, gint nx, gint ny, gint sx, gint sy, SkinPixmapId si);
-GType ui_skinned_menurow_get_type(void);
-void ui_skinned_menurow_update (GtkWidget * row);
-
-#ifdef __cplusplus
-}
 #endif
-
-#endif /* AUDACIOUS_UI_SKINNED_MENUROW_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_monostereo.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_monostereo.c Changed

@@ -1,6 +1,7 @@
 /*
  * Audacious - a cross-platform multimedia player
  * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
  *
  * Based on:
  * BMP - Cross-platform multimedia player
@@ -24,171 +25,41 @@
  * Audacious or using our public API to be a derived work.
  */
 
+#include "draw-compat.h"
 #include "ui_skin.h"
 #include "ui_skinned_monostereo.h"
-#include "skins_cfg.h"
-#include "util.h"
 
-enum {
-    DOUBLED,
-    LAST_SIGNAL
-};
+static gint monostereo_num_channels;
 
-static void ui_skinned_monostereo_class_init         (UiSkinnedMonoStereoClass *klass);
-static void ui_skinned_monostereo_init               (UiSkinnedMonoStereo *monostereo);
-static void ui_skinned_monostereo_destroy            (GtkObject *object);
-static void ui_skinned_monostereo_realize            (GtkWidget *widget);
-static void ui_skinned_monostereo_size_request       (GtkWidget *widget, GtkRequisition *requisition);
-static void ui_skinned_monostereo_size_allocate      (GtkWidget *widget, GtkAllocation *allocation);
-static gboolean ui_skinned_monostereo_expose         (GtkWidget *widget, GdkEventExpose *event);
-static void ui_skinned_monostereo_toggle_scaled      (UiSkinnedMonoStereo *monostereo);
-
-static GtkWidgetClass *parent_class = NULL;
-static guint monostereo_signals[LAST_SIGNAL] = { 0 };
-
-GType ui_skinned_monostereo_get_type() {
-    static GType monostereo_type = 0;
-    if (!monostereo_type) {
-        static const GTypeInfo monostereo_info = {
-            sizeof (UiSkinnedMonoStereoClass),
-            NULL,
-            NULL,
-            (GClassInitFunc) ui_skinned_monostereo_class_init,
-            NULL,
-            NULL,
-            sizeof (UiSkinnedMonoStereo),
-            0,
-            (GInstanceInitFunc) ui_skinned_monostereo_init,
-        };
-        monostereo_type = g_type_register_static (GTK_TYPE_WIDGET, "UiSkinnedMonoStereo", &monostereo_info, 0);
-    }
-
-    return monostereo_type;
-}
-
-static void ui_skinned_monostereo_class_init(UiSkinnedMonoStereoClass *klass) {
-    GtkObjectClass *object_class;
-    GtkWidgetClass *widget_class;
-
-    object_class = (GtkObjectClass*) klass;
-    widget_class = (GtkWidgetClass*) klass;
-    parent_class = g_type_class_peek_parent(klass);
-
-    object_class->destroy = ui_skinned_monostereo_destroy;
-
-    widget_class->realize = ui_skinned_monostereo_realize;
-    widget_class->expose_event = ui_skinned_monostereo_expose;
-    widget_class->size_request = ui_skinned_monostereo_size_request;
-    widget_class->size_allocate = ui_skinned_monostereo_size_allocate;
-
-    klass->scaled = ui_skinned_monostereo_toggle_scaled;
-
-    monostereo_signals[DOUBLED] =
-        g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                      G_STRUCT_OFFSET (UiSkinnedMonoStereoClass, scaled), NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-}
-
-static void ui_skinned_monostereo_init(UiSkinnedMonoStereo *monostereo) {
-    monostereo->width = 56;
-    monostereo->height = 12;
-
-    GTK_WIDGET_SET_FLAGS(monostereo, GTK_NO_WINDOW);
-}
-
-GtkWidget* ui_skinned_monostereo_new(GtkWidget *fixed, gint x, gint y, SkinPixmapId si) {
-    UiSkinnedMonoStereo *monostereo = g_object_new (ui_skinned_monostereo_get_type (), NULL);
-
-    monostereo->x = x;
-    monostereo->y = y;
-    monostereo->skin_index = si;
-    monostereo->scaled = FALSE;
-
-    gtk_fixed_put(GTK_FIXED(fixed), GTK_WIDGET(monostereo), monostereo->x, monostereo->y);
-
-    return GTK_WIDGET(monostereo);
-}
-
-static void ui_skinned_monostereo_destroy(GtkObject *object) {
-    g_return_if_fail (object != NULL);
-    g_return_if_fail (UI_SKINNED_IS_MONOSTEREO (object));
-
-    if (GTK_OBJECT_CLASS (parent_class)->destroy)
-        (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void ui_skinned_monostereo_realize(GtkWidget *widget) {
-    if (GTK_WIDGET_CLASS (parent_class)->realize)
-        (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-}
-
-static void ui_skinned_monostereo_size_request(GtkWidget *widget, GtkRequisition *requisition) {
-    UiSkinnedMonoStereo *monostereo = UI_SKINNED_MONOSTEREO(widget);
-
-    requisition->width = monostereo->width*(monostereo->scaled ? config.scale_factor : 1);
-    requisition->height = monostereo->height*(monostereo->scaled ? config.scale_factor : 1);
-}
-
-static void ui_skinned_monostereo_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
-    UiSkinnedMonoStereo *monostereo = UI_SKINNED_MONOSTEREO (widget);
-
-    widget->allocation = *allocation;
-    widget->allocation.x *= (monostereo->scaled ? config.scale_factor : 1);
-    widget->allocation.y *= (monostereo->scaled ? config.scale_factor : 1);
-
-    monostereo->x = widget->allocation.x/(monostereo->scaled ? config.scale_factor : 1);
-    monostereo->y = widget->allocation.y/(monostereo->scaled ? config.scale_factor : 1);
-}
-
-static gboolean ui_skinned_monostereo_expose(GtkWidget *widget, GdkEventExpose *event) {
-    UiSkinnedMonoStereo *monostereo = UI_SKINNED_MONOSTEREO (widget);
-    g_return_val_if_fail (monostereo->width > 0 && monostereo->height > 0, FALSE);
-
-    GdkPixbuf *obj = NULL;
-    obj = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, monostereo->width, monostereo->height);
-
-    switch (monostereo->num_channels) {
+DRAW_FUNC_BEGIN (monostereo_draw)
+    switch (monostereo_num_channels)
+    {
     case -1:
     case 0:
-        skin_draw_pixbuf(widget, aud_active_skin, obj, monostereo->skin_index, 29, 12, 0, 0, 27, 12);
-        skin_draw_pixbuf(widget, aud_active_skin, obj, monostereo->skin_index, 0, 12, 27, 0, 29, 12);
+        skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 29, 12, 0, 0, 27, 12);
+        skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 0, 12, 27, 0, 29, 12);
         break;
     case 1:
-        skin_draw_pixbuf(widget, aud_active_skin, obj, monostereo->skin_index, 29, 0, 0, 0, 27, 12);
-        skin_draw_pixbuf(widget, aud_active_skin, obj, monostereo->skin_index, 0, 12, 27, 0, 29, 12);
+        skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 29, 0, 0, 0, 27, 12);
+        skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 0, 12, 27, 0, 29, 12);
         break;
     default:
-        skin_draw_pixbuf(widget, aud_active_skin, obj, monostereo->skin_index, 29, 12, 0, 0, 27, 12);
-        skin_draw_pixbuf(widget, aud_active_skin, obj, monostereo->skin_index, 0, 0, 27, 0, 29, 12);
+        skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 29, 12, 0, 0, 27, 12);
+        skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 0, 0, 27, 0, 29, 12);
         break;
     }
-
-    ui_skinned_widget_draw_with_coordinates(widget, obj, monostereo->width, monostereo->height,
-                                            widget->allocation.x,
-                                            widget->allocation.y,
-                                            monostereo->scaled);
-
-    g_object_unref(obj);
-
-    return FALSE;
+DRAW_FUNC_END
+
+GtkWidget * ui_skinned_monostereo_new (void)
+{
+    GtkWidget * monostereo = gtk_drawing_area_new ();
+    gtk_widget_set_size_request (monostereo, 56, 12);
+    DRAW_CONNECT (monostereo, monostereo_draw);
+    return monostereo;
 }
 
-static void ui_skinned_monostereo_toggle_scaled(UiSkinnedMonoStereo *monostereo) {
-    GtkWidget *widget = GTK_WIDGET (monostereo);
-
-    monostereo->scaled = !monostereo->scaled;
-    gtk_widget_set_size_request(widget, monostereo->width*(monostereo->scaled ? config.scale_factor : 1), monostereo->height*(monostereo->scaled ? config.scale_factor : 1));
-
-    if (widget_really_drawable (widget))
-        ui_skinned_monostereo_expose (widget, 0);
-}
-
-void ui_skinned_monostereo_set_num_channels(GtkWidget *widget, gint nch) {
-    g_return_if_fail (UI_SKINNED_IS_MONOSTEREO (widget));
-    UiSkinnedMonoStereo *monostereo = UI_SKINNED_MONOSTEREO (widget);
-
-    monostereo->num_channels = nch;
-
-    if (widget_really_drawable (widget))
-        ui_skinned_monostereo_expose (widget, 0);
+void ui_skinned_monostereo_set_num_channels (GtkWidget * monostereo, gint nch)
+{
+    monostereo_num_channels = nch;
+    gtk_widget_queue_draw (monostereo);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_monostereo.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_monostereo.h Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,43 +25,12 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_SKINNED_MONOSTEREO_H
-#define AUDACIOUS_UI_SKINNED_MONOSTEREO_H
+#ifndef SKINS_UI_SKINNED_MONOSTEREO_H
+#define SKINS_UI_SKINNED_MONOSTEREO_H
 
 #include <gtk/gtk.h>
-#include "ui_skin.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UI_SKINNED_MONOSTEREO(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_monostereo_get_type (), UiSkinnedMonoStereo)
-#define UI_SKINNED_MONOSTEREO_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_monostereo_get_type (), UiSkinnedMonoStereoClass)
-#define UI_SKINNED_IS_MONOSTEREO(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_monostereo_get_type ())
-
-typedef struct _UiSkinnedMonoStereo UiSkinnedMonoStereo;
-typedef struct _UiSkinnedMonoStereoClass UiSkinnedMonoStereoClass;
-
-struct _UiSkinnedMonoStereo {
- GtkWidget widget;
-
- gint x, y, width, height;
- gint num_channels;
- SkinPixmapId skin_index;
- gboolean scaled;
-};
-
-struct _UiSkinnedMonoStereoClass {
- GtkWidgetClass parent_class;
- void (* scaled) (UiSkinnedMonoStereo *menurow);
-};
-
-GtkWidget* ui_skinned_monostereo_new (GtkWidget *fixed, gint x, gint y, SkinPixmapId si);
-GType ui_skinned_monostereo_get_type(void);
+GtkWidget * ui_skinned_monostereo_new (void);
 void ui_skinned_monostereo_set_num_channels(GtkWidget *widget, gint nch);
 
-#ifdef __cplusplus
-}
 #endif
-
-#endif /* AUDACIOUS_UI_SKINNED_MONOSTEREO_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_number.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_number.c Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,254 +25,68 @@
 * Audacious or using our public API to be a derived work.
 */
 
+#include "draw-compat.h"
+#include "ui_skin.h"
 #include "ui_skinned_number.h"
-#include "skins_cfg.h"
-#include "util.h"
 
-#include <string.h>
-#include <ctype.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmarshal.h>
+typedef struct {
+ gint w, h;
+ gint num;
+} NumberData;
 
-#define UI_TYPE_SKINNED_NUMBER (ui_skinned_number_get_type())
+DRAW_FUNC_BEGIN (number_draw)
+ NumberData * data = g_object_get_data ((GObject *) wid, "numberdata");
+ g_return_val_if_fail (data, FALSE);
 
-enum {
- DOUBLED,
- LAST_SIGNAL
-};
+ skin_draw_pixbuf (cr, SKIN_NUMBERS, data->num * 9, 0, 0, 0, data->w, data->h);
+DRAW_FUNC_END
 
-static void ui_skinned_number_class_init (UiSkinnedNumberClass *klass);
-static void ui_skinned_number_init (UiSkinnedNumber *number);
-static void ui_skinned_number_destroy (GtkObject *object);
-static void ui_skinned_number_realize (GtkWidget *widget);
-static void ui_skinned_number_unrealize (GtkWidget *widget);
-static void ui_skinned_number_map (GtkWidget *widget);
-static void ui_skinned_number_unmap (GtkWidget *widget);
-static void ui_skinned_number_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void ui_skinned_number_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static gboolean ui_skinned_number_expose (GtkWidget *widget, GdkEventExpose *event);
-static void ui_skinned_number_toggle_scaled (UiSkinnedNumber *number);
-
-static GtkWidgetClass *parent_class = NULL;
-static guint number_signals[LAST_SIGNAL] = { 0 };
-
-GType ui_skinned_number_get_type() {
- static GType number_type = 0;
- if (!number_type) {
- static const GTypeInfo number_info = {
- sizeof (UiSkinnedNumberClass),
- NULL,
- NULL,
- (GClassInitFunc) ui_skinned_number_class_init,
- NULL,
- NULL,
- sizeof (UiSkinnedNumber),
- 0,
- (GInstanceInitFunc) ui_skinned_number_init,
- };
- number_type = g_type_register_static (GTK_TYPE_WIDGET, "UiSkinnedNumber", &number_info, 0);
- }
-
- return number_type;
-}
-
-static void ui_skinned_number_class_init(UiSkinnedNumberClass *klass) {
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- object_class = (GtkObjectClass*) klass;
- widget_class = (GtkWidgetClass*) klass;
- parent_class = g_type_class_peek_parent(klass);
-
- object_class->destroy = ui_skinned_number_destroy;
-
- widget_class->realize = ui_skinned_number_realize;
- widget_class->unrealize = ui_skinned_number_unrealize;
- widget_class->map = ui_skinned_number_map;
- widget_class->unmap = ui_skinned_number_unmap;
- widget_class->expose_event = ui_skinned_number_expose;
- widget_class->size_request = ui_skinned_number_size_request;
- widget_class->size_allocate = ui_skinned_number_size_allocate;
-
- klass->scaled = ui_skinned_number_toggle_scaled;
-
- number_signals[DOUBLED] =
- g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedNumberClass, scaled), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-}
-
-static void ui_skinned_number_init(UiSkinnedNumber *number) {
- number->width = 9;
- number->height = 13;
-
- number->event_window = NULL;
- GTK_WIDGET_SET_FLAGS(number, GTK_NO_WINDOW);
-}
-
-GtkWidget* ui_skinned_number_new(GtkWidget *fixed, gint x, gint y, SkinPixmapId si) {
- UiSkinnedNumber *number = g_object_new (ui_skinned_number_get_type (), NULL);
-
- number->x = x;
- number->y = y;
- number->num = 0;
- number->skin_index = si;
-
- number->scaled = FALSE;
-
- gtk_fixed_put(GTK_FIXED(fixed), GTK_WIDGET(number), number->x, number->y);
-
- return GTK_WIDGET(number);
-}
-
-static void ui_skinned_number_destroy(GtkObject *object) {
- g_return_if_fail (object != NULL);
- g_return_if_fail (UI_SKINNED_IS_NUMBER (object));
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void ui_skinned_number_realize(GtkWidget *widget) {
- UiSkinnedNumber *number;
- GdkWindowAttr attributes;
- gint attributes_mask;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (UI_SKINNED_IS_NUMBER(widget));
-
- if (GTK_WIDGET_CLASS (parent_class)->realize)
- (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
- number = UI_SKINNED_NUMBER(widget);
-
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_ONLY;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.event_mask = gtk_widget_get_events(widget);
- attributes.event_mask |= GDK_BUTTON_PRESS_MASK;
-
- attributes_mask = GDK_WA_X | GDK_WA_Y;
- number->event_window = gdk_window_new (widget->window, &attributes, attributes_mask);
-
- gdk_window_set_user_data(number->event_window, widget);
-}
-
-static void ui_skinned_number_unrealize(GtkWidget *widget) {
- UiSkinnedNumber *number = UI_SKINNED_NUMBER(widget);
-
- if ( number->event_window != NULL )
- {
- gdk_window_set_user_data( number->event_window , NULL );
- gdk_window_destroy( number->event_window );
- number->event_window = NULL;
- }
-
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void ui_skinned_number_map (GtkWidget *widget)
+static void number_destroy (GtkWidget * number)
 {
- UiSkinnedNumber *number = UI_SKINNED_NUMBER (widget);
-
- if (number->event_window != NULL)
- gdk_window_show (number->event_window);
-
- if (GTK_WIDGET_CLASS (parent_class)->map)
- (* GTK_WIDGET_CLASS (parent_class)->map) (widget);
+ g_free (g_object_get_data ((GObject *) number, "numberdata"));
 }
 
-static void ui_skinned_number_unmap (GtkWidget *widget)
+GtkWidget * ui_skinned_number_new (void)
 {
- UiSkinnedNumber *number = UI_SKINNED_NUMBER (widget);
-
- if (number->event_window != NULL)
- gdk_window_hide (number->event_window);
-
- if (GTK_WIDGET_CLASS (parent_class)->unmap)
- (* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
-}
-
-static void ui_skinned_number_size_request(GtkWidget *widget, GtkRequisition *requisition) {
- UiSkinnedNumber *number = UI_SKINNED_NUMBER(widget);
-
- requisition->width = number->width * ( number->scaled ? config.scale_factor : 1 );
- requisition->height = number->height*( number->scaled ? config.scale_factor : 1);
-}
+ GtkWidget * number = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (number, 9, 13);
 
-static void ui_skinned_number_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
- UiSkinnedNumber *number = UI_SKINNED_NUMBER (widget);
+ gtk_widget_add_events (number, GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK);
 
- widget->allocation = *allocation;
- widget->allocation.x *= (number->scaled ? config.scale_factor: 1 );
- widget->allocation.y *= (number->scaled ? config.scale_factor: 1 );
- if (GTK_WIDGET_REALIZED (widget))
- if (number->event_window)
- gdk_window_move_resize(number->event_window, widget->allocation.x, widget->allocation.y, allocation->width, allocation->height);
+ DRAW_CONNECT (number, number_draw);
+ g_signal_connect (number, "destroy", (GCallback) number_destroy, NULL);
 
- number->x = widget->allocation.x/(number->scaled ? config.scale_factor : 1);
- number->y = widget->allocation.y/(number->scaled ? config.scale_factor : 1);
-}
-
-static gboolean ui_skinned_number_expose(GtkWidget *widget, GdkEventExpose *event) {
- UiSkinnedNumber *number = UI_SKINNED_NUMBER (widget);
- g_return_val_if_fail (number->width > 0 && number->height > 0, FALSE);
-
- GdkPixbuf *obj;
- obj = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, number->width, number->height);
-
- if (number->num > 11 || number->num < 0)
- number->num = 10;
-
- skin_draw_pixbuf(widget, aud_active_skin, obj,
- number->skin_index, number->num * 9, 0,
- 0, 0, number->width, number->height);
-
- ui_skinned_widget_draw_with_coordinates(widget, obj, number->width, number->height,
- widget->allocation.x,
- widget->allocation.y,
- number->scaled);
-
- g_object_unref(obj);
+ NumberData * data = g_malloc0 (sizeof (NumberData));
+ data->w = 9;
+ data->h = 13;
+ g_object_set_data ((GObject *) number, "numberdata", data);
 
- return FALSE;
+ return number;
 }
 
-static void ui_skinned_number_toggle_scaled(UiSkinnedNumber *number) {
- GtkWidget *widget = GTK_WIDGET (number);
- number->scaled = !number->scaled;
-
- gtk_widget_set_size_request(widget, number->width * ( number->scaled ? config.scale_factor : 1),
- number->height * ( number->scaled ? config.scale_factor : 1) );
-
- if (widget_really_drawable (widget))
- ui_skinned_number_expose (widget, 0);
-}
-
-void ui_skinned_number_set (GtkWidget * widget, gchar c)
+void ui_skinned_number_set (GtkWidget * number, gchar c)
 {
- UiSkinnedNumber * number = (UiSkinnedNumber *) widget;
+ NumberData * data = g_object_get_data ((GObject *) number, "numberdata");
+ g_return_if_fail (data);
+
 gint value = (c >= '0' && c <= '9') ? c - '0' : (c == '-') ? 11 : 10;
 
- if (number->num == value)
+ if (data->num == value)
 return;
 
- number->num = value;
-
- if (widget_really_drawable (widget))
- ui_skinned_number_expose (widget, 0);
+ data->num = value;
+ gtk_widget_queue_draw (number);
 }
 
-void ui_skinned_number_set_size(GtkWidget *widget, gint width, gint height) {
- g_return_if_fail(UI_SKINNED_IS_NUMBER(widget));
- UiSkinnedNumber *number = UI_SKINNED_NUMBER (widget);
+void ui_skinned_number_set_size (GtkWidget * number, gint width, gint height)
+{
+ NumberData * data = g_object_get_data ((GObject *) number, "numberdata");
+ g_return_if_fail (data);
 
- number->width = width;
- number->height = height;
+ data->w = width;
+ data->h = height;
 
- gtk_widget_set_size_request(widget, width*(number->scaled ? config.scale_factor : 1 ),
- height*(number->scaled ? config.scale_factor : 1 ));
+ gtk_widget_set_size_request (number, width, height);
+ gtk_widget_queue_draw (number);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_number.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_number.h Changed

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_playlist.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_playlist.c Changed

@@ -2,7 +2,7 @@
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
 * Copyright (c) 2008 William Pitcock
- * Copyright 2009 John Lindgren
+ * Copyright (c) 2009-2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -27,661 +27,451 @@
 * Audacious or using our public API to be a derived work.
 */
 
-/*
- * A note about Pango and some funky spacey fonts: Weirdly baselined
- * fonts, or fonts with weird ascents or descents _will_ display a
- * little bit weird in the playlist widget, but the display engine
- * won't make it look too bad, just a little deranged. I honestly
- * don't think it's worth fixing (around...), it doesn't have to be
- * perfectly fitting, just the general look has to be ok, which it
- * IMHO is.
- *
- * A second note: The numbers aren't perfectly aligned, but in the
- * end it looks better when using a single Pango layout for each
- * number.
- */
-
 #include <gdk/gdkkeysyms.h>
 
-#include "ui_skinned_playlist.h"
-#include "ui_skinned_playlist_slider.h"
-
-#include "debug.h"
+#include "draw-compat.h"
+#include "skins_cfg.h"
 #include "ui_playlist.h"
 #include "ui_manager.h"
 #include "ui_skin.h"
-#include "util.h"
-#include "skins_cfg.h"
+#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/playlist.h>
 #include <libaudgui/libaudgui.h>
 
-#define UI_SKINNED_PLAYLIST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ui_skinned_playlist_get_type(), UiSkinnedPlaylistPrivate))
-typedef struct _UiSkinnedPlaylistPrivate UiSkinnedPlaylistPrivate;
-
 enum {DRAG_SELECT = 1, DRAG_MOVE};
 
-struct _UiSkinnedPlaylistPrivate {
+typedef struct {
 GtkWidget * slider;
 PangoFontDescription * font;
- gint width, height, resize_width, resize_height, ascent, descent,
- letter_width, digit_width, row_height, offset, rows, first, focused,
- scroll, scroll_source, hover;
- gboolean slanted, drag;
-};
-
-static void ui_skinned_playlist_class_init (UiSkinnedPlaylistClass *klass);
-static void ui_skinned_playlist_init (UiSkinnedPlaylist *playlist);
-static void ui_skinned_playlist_destroy (GtkObject *object);
-static void ui_skinned_playlist_realize (GtkWidget *widget);
-static void ui_skinned_playlist_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void ui_skinned_playlist_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static gboolean ui_skinned_playlist_expose (GtkWidget *widget, GdkEventExpose *event);
-static gboolean ui_skinned_playlist_button_press (GtkWidget *widget, GdkEventButton *event);
-static gboolean ui_skinned_playlist_button_release (GtkWidget *widget, GdkEventButton *event);
-static gboolean ui_skinned_playlist_motion_notify (GtkWidget *widget, GdkEventMotion *event);
-static gboolean ui_skinned_playlist_leave_notify (GtkWidget *widget, GdkEventCrossing *event);
-static gboolean ui_skinned_playlist_popup_show (gpointer data);
-static void ui_skinned_playlist_popup_hide (GtkWidget *widget);
-static void ui_skinned_playlist_popup_timer_start (GtkWidget *widget);
-static void ui_skinned_playlist_popup_timer_stop (GtkWidget *widget);
-
-static GtkWidgetClass *parent_class = NULL;
-
-GType ui_skinned_playlist_get_type() {
- static GType playlist_type = 0;
- if (!playlist_type) {
- static const GTypeInfo playlist_info = {
- sizeof (UiSkinnedPlaylistClass),
- NULL,
- NULL,
- (GClassInitFunc) ui_skinned_playlist_class_init,
- NULL,
- NULL,
- sizeof (UiSkinnedPlaylist),
- 0,
- (GInstanceInitFunc) ui_skinned_playlist_init,
- };
- playlist_type = g_type_register_static (GTK_TYPE_WIDGET, "UiSkinnedPlaylist", &playlist_info, 0);
- }
-
- return playlist_type;
-}
-
-static void ui_skinned_playlist_class_init(UiSkinnedPlaylistClass *klass) {
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- gobject_class = G_OBJECT_CLASS(klass);
- object_class = (GtkObjectClass*) klass;
- widget_class = (GtkWidgetClass*) klass;
- parent_class = g_type_class_peek_parent(klass);
-
- object_class->destroy = ui_skinned_playlist_destroy;
-
- widget_class->realize = ui_skinned_playlist_realize;
- widget_class->expose_event = ui_skinned_playlist_expose;
- widget_class->size_request = ui_skinned_playlist_size_request;
- widget_class->size_allocate = ui_skinned_playlist_size_allocate;
- widget_class->button_press_event = ui_skinned_playlist_button_press;
- widget_class->button_release_event = ui_skinned_playlist_button_release;
- widget_class->motion_notify_event = ui_skinned_playlist_motion_notify;
- widget_class->leave_notify_event = ui_skinned_playlist_leave_notify;
-
- g_type_class_add_private (gobject_class, sizeof (UiSkinnedPlaylistPrivate));
-}
-
-static void ui_skinned_playlist_init(UiSkinnedPlaylist *playlist) {
- UiSkinnedPlaylistPrivate *priv = UI_SKINNED_PLAYLIST_GET_PRIVATE(playlist);
- priv->resize_width = 0;
- priv->resize_height = 0;
- priv->rows = 0;
- priv->first = 0;
- priv->focused = -1;
- priv->drag = FALSE;
- priv->scroll = 0;
- priv->hover = -1;
-
- g_object_set_data(G_OBJECT(playlist), "timer_id", GINT_TO_POINTER(0));
- g_object_set_data(G_OBJECT(playlist), "timer_active", GINT_TO_POINTER(0));
-
- g_object_set_data(G_OBJECT(playlist), "popup_active", GINT_TO_POINTER(0));
- g_object_set_data(G_OBJECT(playlist), "popup_position", GINT_TO_POINTER(-1));
-}
-
-GtkWidget * ui_skinned_playlist_new (GtkWidget * fixed, gint x, gint y, gint
- width, gint height, const gchar * font)
+ gint width, height, row_height, offset, rows, first, focused, scroll,
+ scroll_source, hover, drag;
+ gint popup_pos, popup_source;
+ gboolean popup_shown;
+} PlaylistData;
+
+static gboolean playlist_button_press (GtkWidget * list, GdkEventButton * event);
+static gboolean playlist_button_release (GtkWidget * list, GdkEventButton *
+ event);
+static gboolean playlist_motion (GtkWidget * list, GdkEventMotion * event);
+static gboolean playlist_leave (GtkWidget * list, GdkEventCrossing * event);
+
+static void popup_trigger (GtkWidget * list, PlaylistData * data, gint pos);
+static void popup_hide (GtkWidget * list, PlaylistData * data);
+
+static void calc_layout (PlaylistData * data)
 {
- UiSkinnedPlaylist *hs = g_object_new (ui_skinned_playlist_get_type (), NULL);
- UiSkinnedPlaylistPrivate *priv = UI_SKINNED_PLAYLIST_GET_PRIVATE(hs);
-
- priv->width = width;
- priv->height = height;
- priv->slider = NULL;
-
- ui_skinned_playlist_set_font ((GtkWidget *) hs, font);
+ data->rows = data->height / data->row_height;
 
- gtk_fixed_put ((GtkFixed *) fixed, (GtkWidget *) hs, x, y);
- gtk_widget_set_double_buffered(GTK_WIDGET(hs), TRUE);
-
- return GTK_WIDGET(hs);
-}
-
-void ui_skinned_playlist_set_slider (GtkWidget * list, GtkWidget * slider)
-{
- UI_SKINNED_PLAYLIST_GET_PRIVATE ((UiSkinnedPlaylist *) list)->slider =
- slider;
-}
-
-static void cancel_all (GtkWidget * widget, UiSkinnedPlaylistPrivate * private)
-{
- private->drag = FALSE;
-
- if (private->scroll)
- {
- private->scroll = 0;
- g_source_remove (private->scroll_source);
- }
-
- if (private->hover != -1)
+ if (data->rows && active_title)
 {
- private->hover = -1;
- gtk_widget_queue_draw (widget);
+ data->offset = data->row_height;
+ data->rows --;
 }
+ else
+ data->offset = 0;
 
- ui_skinned_playlist_popup_hide (widget);
- ui_skinned_playlist_popup_timer_stop (widget);
-}
-
-static void ui_skinned_playlist_destroy(GtkObject *object) {
- g_return_if_fail (object != NULL);
- g_return_if_fail (UI_SKINNED_IS_PLAYLIST (object));
-
- cancel_all ((GtkWidget *) object, UI_SKINNED_PLAYLIST_GET_PRIVATE
- ((UiSkinnedPlaylist *) object));
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ if (data->first + data->rows > active_length)
+ data->first = active_length - data->rows;
+ if (data->first < 0)
+ data->first = 0;
 }
 
-static void ui_skinned_playlist_realize(GtkWidget *widget) {
- GdkWindowAttr attributes;
- gint attributes_mask;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (UI_SKINNED_IS_PLAYLIST(widget));
-
- GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
-
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.event_mask = gtk_widget_get_events(widget);
- attributes.event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK |
- GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK;
- attributes.visual = gtk_widget_get_visual(widget);
- attributes.colormap = gtk_widget_get_colormap(widget);
-
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
- widget->window = gdk_window_new(widget->parent->window, &attributes, attributes_mask);
+static gint calc_position (PlaylistData * data, gint y)
+{
+ if (y < data->offset)
+ return -1;
 
- widget->style = gtk_style_attach(widget->style, widget->window);
- gdk_window_set_user_data(widget->window, widget);
-}
+ gint position = data->first + (y - data->offset) / data->row_height;
 
-static void ui_skinned_playlist_size_request(GtkWidget *widget, GtkRequisition *requisition) {
- UiSkinnedPlaylistPrivate *priv = UI_SKINNED_PLAYLIST_GET_PRIVATE(widget);
+ if (position >= data->first + data->rows || position >= active_length)
+ return active_length;
 
- requisition->width = priv->width;
- requisition->height = priv->height;
+ return position;
 }
 
-static void calc_layout (UiSkinnedPlaylistPrivate * private)
+static gint adjust_position (PlaylistData * data, gboolean relative, gint
+ position)
 {
- private->row_height = private->ascent - private->descent;
- private->rows = private->height / private->row_height;
+ if (active_length == 0)
+ return -1;
 
- if (private->rows && active_title != NULL)
+ if (relative)
 {
- private->offset = private->row_height;
- private->rows --;
- }
- else
- private->offset = 0;
-
- if (private->first + private->rows > active_length)
- private->first = active_length - private->rows;
- if (private->first < 0)
- private->first = 0;
-}
-
-static void scroll_to (UiSkinnedPlaylistPrivate * private, int position)
-{
- if (position < private->first || position >= private->first + private->rows)
- private->first = position - private->rows / 2;
-
- calc_layout (private);
-}
-
-static void ui_skinned_playlist_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
- UiSkinnedPlaylist *playlist = UI_SKINNED_PLAYLIST (widget);
- UiSkinnedPlaylistPrivate *priv = UI_SKINNED_PLAYLIST_GET_PRIVATE(playlist);
-
- widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
- gdk_window_move_resize(widget->window, widget->allocation.x, widget->allocation.y, allocation->width, allocation->height);
+ if (data->focused == -1)
+ return 0;
 
- if (priv->height != widget->allocation.height || priv->width != widget->allocation.width) {
- priv->width = priv->width + priv->resize_width;
- priv->height = priv->height + priv->resize_height;
- priv->resize_width = 0;
- priv->resize_height = 0;
+ position += data->focused;
 }
 
- calc_layout (priv);
- gtk_widget_queue_draw (widget);
+ if (position < 0)
+ return 0;
+ if (position >= active_length)
+ return active_length - 1;
 
- if (priv->slider != NULL)
- ui_skinned_playlist_slider_update (priv->slider);
+ return position;
 }
 
-static void
-playlist_list_draw_string(cairo_t *cr, UiSkinnedPlaylist *pl,
- PangoFontDescription * font,
- gint line,
- gint width,
- const gchar * text,
- guint ppos)
+static void cancel_all (GtkWidget * list, PlaylistData * data)
 {
- UiSkinnedPlaylistPrivate * private;
- gint plist_length_int, padding;
- PangoLayout *layout;
-
- private = UI_SKINNED_PLAYLIST_GET_PRIVATE (pl);
-
- cairo_new_path(cr);
+ data->drag = FALSE;
 
- if (aud_cfg->show_numbers_in_pl)
+ if (data->scroll)
 {
- gchar *pos_string = g_strdup_printf(config.show_separator_in_pl == TRUE ? "%d" : "%d.", ppos);
- plist_length_int =
- gint_count_digits (active_length) + ! config.show_separator_in_pl + 1;
-
- padding = private->digit_width * (plist_length_int + 1);
-
- layout = gtk_widget_create_pango_layout(playlistwin, pos_string);
- pango_layout_set_font_description (layout, private->font);
- pango_layout_set_width(layout, plist_length_int * 100);
-
- pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
-
- cairo_move_to (cr, (private->digit_width *
- (-1 + plist_length_int - strlen(pos_string))) +
- private->digit_width / 4, private->offset + private->row_height * line);
- pango_cairo_show_layout(cr, layout);
-
- g_free(pos_string);
- g_object_unref(layout);
-
- if (!config.show_separator_in_pl)
- padding -= private->digit_width * 1.5;
- } else {
- padding = 3;
+ data->scroll = 0;
+ g_source_remove (data->scroll_source);
 }
 
- width -= padding;
-
- layout = gtk_widget_create_pango_layout(playlistwin, text);
-
- pango_layout_set_font_description (layout, private->font);
- pango_layout_set_width(layout, width * PANGO_SCALE);
- pango_layout_set_single_paragraph_mode(layout, TRUE);
- pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
-
- cairo_move_to (cr, padding + private->letter_width / 4, private->offset +
- private->row_height * line);
- pango_cairo_show_layout(cr, layout);
+ if (data->hover != -1)
+ {
+ data->hover = -1;
+ gtk_widget_queue_draw (list);
+ }
 
- g_object_unref(layout);
+ popup_hide (list, data);
 }
 
-static gboolean ui_skinned_playlist_expose(GtkWidget *widget, GdkEventExpose *event) {
- UiSkinnedPlaylist *pl = UI_SKINNED_PLAYLIST (widget);
- UiSkinnedPlaylistPrivate *priv = UI_SKINNED_PLAYLIST_GET_PRIVATE(pl);
- gint active_entry = aud_playlist_get_position (active_playlist);
- PangoLayout *layout;
- gint width, height;
- gint i;
- guint padding, padding_dwidth;
- guint max_time_len = 0;
- gfloat queue_tailpadding = 0;
- gint tpadding;
- gsize tpadding_dwidth = 0;
- gint x, y;
- guint tail_width;
- guint tail_len;
-
- gchar tail[100];
- gchar queuepos[255];
- gchar length[40];
-
- gchar **frags;
- gchar *frag0;
-
- cairo_t *cr;
+DRAW_FUNC_BEGIN (playlist_draw)
+ PlaylistData * data = g_object_get_data ((GObject *) wid, "playlistdata");
+ g_return_val_if_fail (data, FALSE);
 
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (UI_SKINNED_IS_PLAYLIST (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- cr = gdk_cairo_create(widget->window);
+ gint active_entry = aud_playlist_get_position (active_playlist);
+ gint left = 3, right = 3;
+ PangoLayout * layout;
+ gint width;
 
- width = priv->width;
- height = priv->height;
+ /* background */
 
- gdk_cairo_set_source_color(cr, skin_get_color(aud_active_skin, SKIN_PLEDIT_NORMALBG));
+ set_cairo_color (cr, active_skin->colors[SKIN_PLEDIT_NORMALBG]);
+ cairo_paint (cr);
 
- cairo_rectangle(cr, 0, 0, width, height);
- cairo_paint(cr);
+ /* playlist title */
 
- if (priv->offset)
+ if (data->offset)
 {
- layout = gtk_widget_create_pango_layout (widget, active_title);
- pango_layout_set_font_description (layout, priv->font);
- pango_layout_set_width (layout, PANGO_SCALE * width);
+ layout = gtk_widget_create_pango_layout (wid, active_title);
+ pango_layout_set_font_description (layout, data->font);
+ pango_layout_set_width (layout, PANGO_SCALE * (data->width - left -
+ right));
 pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
 pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_MIDDLE);
- cairo_move_to (cr, 0, 0);
- gdk_cairo_set_source_color (cr, skin_get_color (aud_active_skin,
- SKIN_PLEDIT_NORMAL));
+
+ cairo_move_to (cr, left, 0);
+ set_cairo_color (cr, active_skin->colors[SKIN_PLEDIT_NORMAL]);
 pango_cairo_show_layout (cr, layout);
- g_object_unref(layout);
+ g_object_unref (layout);
 }
 
- for (i = priv->first; i < priv->first + priv->rows && i < active_length; i ++)
+ /* selection highlight */
+
+ for (gint i = data->first; i < data->first + data->rows && i <
+ active_length; i ++)
 {
- gint i_length = aud_playlist_entry_get_length (active_playlist, i, TRUE);
+ if (! aud_playlist_entry_get_selected (active_playlist, i))
+ continue;
 
- if (i_length > 0)
- g_snprintf (length, sizeof (length), "%d:%02d", i_length / 60000,
- i_length / 1000 % 60);
- else
- length[0] = 0;
+ cairo_rectangle (cr, 0, data->offset + data->row_height * (i -
+ data->first), data->width, data->row_height);
+ set_cairo_color (cr, active_skin->colors[SKIN_PLEDIT_SELECTEDBG]);
+ cairo_fill (cr);
+ }
 
- tpadding_dwidth = MAX (tpadding_dwidth, strlen (length));
+ /* entry numbers */
 
- if (aud_playlist_entry_get_selected (active_playlist, i))
+ if (aud_cfg->show_numbers_in_pl)
+ {
+ width = 0;
+
+ for (gint i = data->first; i < data->first + data->rows && i <
+ active_length; i ++)
 {
- gdk_cairo_set_source_color (cr, skin_get_color (aud_active_skin,
- SKIN_PLEDIT_SELECTEDBG));
- cairo_new_path (cr);
- cairo_rectangle (cr, 0, priv->offset + priv->row_height * (i -
- priv->first), width, priv->row_height);
- cairo_fill (cr);
+ gchar buf[16];
+ snprintf (buf, sizeof buf, "%d.", 1 + i);
+
+ layout = gtk_widget_create_pango_layout (wid, buf);
+ pango_layout_set_font_description (layout, data->font);
+
+ PangoRectangle rect;
+ pango_layout_get_pixel_extents (layout, NULL, & rect);
+ width = MAX (width, rect.width);
+
+ cairo_move_to (cr, left, data->offset + data->row_height * (i -
+ data->first));
+ set_cairo_color (cr, active_skin->colors[(i == active_entry) ?
+ SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL]);
+ pango_cairo_show_layout (cr, layout);
+ g_object_unref (layout);
 }
+
+ left += width + 4;
 }
 
- for (i = priv->first; i < priv->first + priv->rows && i < active_length; i ++)
- {
- const gchar * title = aud_playlist_entry_get_title (active_playlist, i,
- TRUE);
- gint i_length = aud_playlist_entry_get_length (active_playlist, i, TRUE);
- gint pos = aud_playlist_queue_find_entry (active_playlist, i);
+ /* entry lengths */
 
- tail[0] = 0;
- queuepos[0] = 0;
- length[0] = 0;
+ width = 0;
 
- if (pos != -1)
- g_snprintf(queuepos, sizeof(queuepos), "%d", pos + 1);
+ for (gint i = data->first; i < data->first + data->rows && i <
+ active_length; i ++)
+ {
+ gint len = aud_playlist_entry_get_length (active_playlist, i, TRUE);
+ gchar buf[16];
 
- if (i_length > 0)
- g_snprintf (length, sizeof (length), "%d:%02d", i_length / 60000,
- i_length / 1000 % 60);
+ if (len > 0)
+ snprintf (buf, sizeof buf, "%d:%02d", len / 60000, len / 1000 % 60);
 else
- length[0] = 0;
+ buf[0] = 0;
 
- strncat(tail, length, sizeof(tail) - 1);
- tail_len = strlen(tail);
+ layout = gtk_widget_create_pango_layout (wid, buf);
+ pango_layout_set_font_description (layout, data->font);
 
- max_time_len = MAX(max_time_len, tail_len);
+ PangoRectangle rect;
+ pango_layout_get_pixel_extents (layout, NULL, & rect);
+ width = MAX (width, rect.width);
 
- if (pos != -1 && tpadding_dwidth <= 0)
- tail_width = width - priv->digit_width * (strlen (queuepos) + 2.25);
- else if (pos != -1)
- tail_width = width - priv->digit_width * (tpadding_dwidth + strlen
- (queuepos) + 4);
- else if (tpadding_dwidth > 0)
- tail_width = width - priv->digit_width * (tpadding_dwidth + 2.5);
- else
- tail_width = width;
-
- if (i == active_entry)
- gdk_cairo_set_source_color(cr, skin_get_color(aud_active_skin, SKIN_PLEDIT_CURRENT));
- else
- gdk_cairo_set_source_color(cr, skin_get_color(aud_active_skin, SKIN_PLEDIT_NORMAL));
-
- playlist_list_draw_string (cr, pl, priv->font,
- i - priv->first, tail_width, title,
- i + 1);
+ cairo_move_to (cr, data->width - right - rect.width, data->offset +
+ data->row_height * (i - data->first));
+ set_cairo_color (cr, active_skin->colors[(i == active_entry) ?
+ SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL]);
+ pango_cairo_show_layout (cr, layout);
+ g_object_unref (layout);
+ }
 
- x = width - priv->digit_width * 2;
- y = priv->offset + (i - priv->first - 1) * priv->row_height +
- priv->ascent;
+ right += width + 6;
 
- frags = NULL;
- frag0 = NULL;
+ /* queue positions */
 
- if ((strlen(tail) > 0) && (tail != NULL)) {
- frags = g_strsplit(tail, ":", 0);
- frag0 = g_strconcat(frags[0], ":", NULL);
+ if (aud_playlist_queue_count (active_playlist))
+ {
+ width = 0;
 
- layout = gtk_widget_create_pango_layout(playlistwin, frags[1]);
- pango_layout_set_font_description (layout, priv->font);
- pango_layout_set_width(layout, tail_len * 100);
- pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
+ for (gint i = data->first; i < data->first + data->rows && i <
+ active_length; i ++)
+ {
+ gint pos = aud_playlist_queue_find_entry (active_playlist, i);
+ if (pos < 0)
+ continue;
+
+ gchar buf[16];
+ snprintf (buf, sizeof buf, "(#%d)", 1 + pos);
+
+ layout = gtk_widget_create_pango_layout (wid, buf);
+ pango_layout_set_font_description (layout, data->font);
+
+ PangoRectangle rect;
+ pango_layout_get_pixel_extents (layout, NULL, & rect);
+ width = MAX (width, rect.width);
+
+ cairo_move_to (cr, data->width - right - rect.width, data->offset +
+ data->row_height * (i - data->first));
+ set_cairo_color (cr, active_skin->colors[(i == active_entry) ?
+ SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL]);
+ pango_cairo_show_layout (cr, layout);
+ g_object_unref (layout);
+ }
 
- cairo_new_path(cr);
- cairo_move_to (cr, x - priv->digit_width * 0.5, y - priv->descent);
- pango_cairo_show_layout(cr, layout);
- g_object_unref(layout);
+ right += width + 6;
+ }
 
- layout = gtk_widget_create_pango_layout(playlistwin, frag0);
- pango_layout_set_font_description (layout, priv->font);
- pango_layout_set_width(layout, tail_len * 100);
- pango_layout_set_alignment(layout, PANGO_ALIGN_RIGHT);
+ /* titles */
 
- cairo_move_to (cr, x - priv->digit_width * 0.75, y - priv->descent);
- pango_cairo_show_layout(cr, layout);
- g_object_unref(layout);
+ for (gint i = data->first; i < data->first + data->rows && i <
+ active_length; i ++)
+ {
+ gchar * title = aud_playlist_entry_get_title (active_playlist, i, TRUE);
 
- g_free(frag0);
- g_strfreev(frags);
- }
+ layout = gtk_widget_create_pango_layout (wid, title);
+ pango_layout_set_font_description (layout, data->font);
+ pango_layout_set_width (layout, PANGO_SCALE * (data->width - left -
+ right));
+ pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
 
- if (pos != -1) {
- if (tpadding_dwidth > 0)
- queue_tailpadding = tpadding_dwidth + 1;
- else
- queue_tailpadding = -0.75;
-
- cairo_rectangle(cr,
- x -
- (((queue_tailpadding +
- strlen(queuepos)) *
- priv->digit_width) + priv->digit_width / 4), y - priv->descent,
- (strlen(queuepos)) *
- priv->digit_width + priv->digit_width / 2, priv->row_height - 2);
-
- layout =
- gtk_widget_create_pango_layout(playlistwin, queuepos);
- pango_layout_set_font_description (layout, priv->font);
- pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-
- cairo_move_to(cr,
- x -
- ((queue_tailpadding +
- strlen (queuepos)) * priv->digit_width) + priv->digit_width / 4, y
- - priv->descent);
- pango_cairo_show_layout(cr, layout);
-
- g_object_unref(layout);
- }
+ g_free (title);
 
- cairo_stroke(cr);
+ cairo_move_to (cr, left, data->offset + data->row_height * (i -
+ data->first));
+ set_cairo_color (cr, active_skin->colors[(i == active_entry) ?
+ SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL]);
+ pango_cairo_show_layout (cr, layout);
+ g_object_unref (layout);
 }
 
- if (priv->focused >= priv->first && priv->focused <= priv->first +
- priv->rows - 1)
+ /* focus rectangle */
+
+ if (data->focused >= data->first && data->focused <= data->first +
+ data->rows - 1)
 {
- cairo_set_line_width (cr, 1);
- gdk_cairo_set_source_color (cr, skin_get_color (aud_active_skin,
- SKIN_PLEDIT_NORMAL));
 cairo_new_path (cr);
- cairo_rectangle (cr, 0.5, priv->offset + priv->row_height *
- (priv->focused - priv->first) + 0.5, width - 1, priv->row_height - 1);
+ cairo_set_line_width (cr, 1);
+ cairo_rectangle (cr, 0.5, data->offset + data->row_height *
+ (data->focused - data->first) + 0.5, data->width - 1, data->row_height
+ - 1);
+ set_cairo_color (cr, active_skin->colors[SKIN_PLEDIT_NORMAL]);
 cairo_stroke (cr);
 }
 
- if (priv->hover >= priv->first && priv->hover <= priv->first + priv->rows)
- {
- cairo_set_line_width (cr, 2);
- gdk_cairo_set_source_color (cr, skin_get_color (aud_active_skin,
- SKIN_PLEDIT_NORMAL));
+ /* hover line */
 
+ if (data->hover >= data->first && data->hover <= data->first + data->rows)
+ {
 cairo_new_path (cr);
- cairo_move_to (cr, 0, priv->offset + priv->row_height * (priv->hover -
- priv->first));
- cairo_rel_line_to (cr, width, 0);
+ cairo_set_line_width (cr, 2);
+ cairo_move_to (cr, 0, data->offset + data->row_height * (data->hover -
+ data->first));
+ cairo_rel_line_to (cr, data->width, 0);
+ set_cairo_color (cr, active_skin->colors[SKIN_PLEDIT_NORMAL]);
 cairo_stroke (cr);
 }
+DRAW_FUNC_END
 
- gdk_cairo_set_source_color(cr, skin_get_color(aud_active_skin, SKIN_PLEDIT_NORMAL));
- cairo_set_line_width(cr, 1);
- cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
+static void playlist_destroy (GtkWidget * list)
+{
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_if_fail (data);
 
- if (aud_cfg->show_numbers_in_pl)
- {
- if (active_length == 0)
- padding_dwidth = 0;
- else
- padding_dwidth = gint_count_digits (active_length);
+ cancel_all (list, data);
 
- padding = (padding_dwidth + 1) * priv->digit_width;
+ pango_font_description_free (data->font);
+ g_free (data);
+}
 
- /* For italic or oblique fonts we add another half of the
- * approximate width */
- if (priv->slanted)
- padding += priv->digit_width / 2;
+GtkWidget * ui_skinned_playlist_new (gint width, gint height, const gchar * font)
+{
+ GtkWidget * list = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (list, width, height);
+ gtk_widget_add_events (list, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ | GDK_LEAVE_NOTIFY_MASK | GDK_POINTER_MOTION_MASK);
+
+ DRAW_CONNECT (list, playlist_draw);
+ g_signal_connect (list, "button-press-event", (GCallback)
+ playlist_button_press, NULL);
+ g_signal_connect (list, "button-release-event", (GCallback)
+ playlist_button_release, NULL);
+ g_signal_connect (list, "leave-notify-event", (GCallback) playlist_leave,
+ NULL);
+ g_signal_connect (list, "motion-notify-event", (GCallback) playlist_motion,
+ NULL);
+ g_signal_connect (list, "destroy", (GCallback) playlist_destroy, NULL);
+
+ PlaylistData * data = g_malloc0 (sizeof (PlaylistData));
+ data->width = width;
+ data->height = height;
+ data->focused = -1;
+ data->hover = -1;
+ data->popup_pos = -1;
+ g_object_set_data ((GObject *) list, "playlistdata", data);
+
+ ui_skinned_playlist_set_font (list, font);
+
+ return list;
+}
 
- if (config.show_separator_in_pl) {
- cairo_new_path(cr);
+void ui_skinned_playlist_set_slider (GtkWidget * list, GtkWidget * slider)
+{
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_if_fail (data);
 
- cairo_move_to(cr, padding, 0);
- cairo_rel_line_to(cr, 0, priv->height - 1);
+ data->slider = slider;
+}
 
- cairo_stroke(cr);
- }
- }
+void ui_skinned_playlist_resize (GtkWidget * list, gint width, gint height)
+{
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_if_fail (data);
 
- if (tpadding_dwidth != 0)
- {
- tpadding = priv->digit_width * (tpadding_dwidth + 1.5);
+ gtk_widget_set_size_request (list, width, height);
 
- if (priv->slanted)
- tpadding += priv->digit_width / 2;
+ data->width = width;
+ data->height = height;
 
- if (config.show_separator_in_pl) {
- cairo_new_path(cr);
+ calc_layout (data);
+ gtk_widget_queue_draw (list);
 
- cairo_move_to(cr, priv->width - tpadding, 0);
- cairo_rel_line_to(cr, 0, priv->height - 1);
+ if (data->slider)
+ ui_skinned_playlist_slider_update (data->slider);
+}
 
- cairo_stroke(cr);
- }
- }
+void ui_skinned_playlist_set_font (GtkWidget * list, const gchar * font)
+{
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_if_fail (data);
 
- cairo_destroy(cr);
+ pango_font_description_free (data->font);
+ data->font = pango_font_description_from_string (font);
 
- return FALSE;
-}
+ PangoLayout * layout = gtk_widget_create_pango_layout (list, "A");
+ pango_layout_set_font_description (layout, data->font);
 
-static gint calc_position (UiSkinnedPlaylistPrivate * private, gint y)
-{
- gint position;
+ PangoRectangle rect;
+ pango_layout_get_pixel_extents (layout, NULL, & rect);
 
- if (y < private->offset)
- return -1;
+ /* make sure row_height is non-zero; we divide by it */
+ data->row_height = MAX (rect.height, 1);
 
- position = private->first + (y - private->offset) / private->row_height;
+ g_object_unref (layout);
 
- if (position >= private->first + private->rows || position >= active_length)
- return active_length;
+ calc_layout (data);
+ gtk_widget_queue_draw (list);
 
- return position;
+ if (data->slider)
+ ui_skinned_playlist_slider_update (data->slider);
 }
 
-static gint adjust_position (UiSkinnedPlaylistPrivate * private, gboolean
- relative, gint position)
+void ui_skinned_playlist_update (GtkWidget * list)
 {
- if (active_length == 0)
- return -1;
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_if_fail (data);
 
- if (relative)
- {
- if (private->focused == -1)
- return 0;
+ calc_layout (data);
 
- position += private->focused;
- }
+ if (data->focused != -1)
+ data->focused = adjust_position (data, TRUE, 0);
 
- if (position < 0)
- return 0;
- if (position >= active_length)
- return active_length - 1;
+ gtk_widget_queue_draw (list);
 
- return position;
+ if (data->slider != NULL)
+ ui_skinned_playlist_slider_update (data->slider);
+}
+
+static void scroll_to (PlaylistData * data, gint position)
+{
+ if (position < data->first || position >= data->first + data->rows)
+ data->first = position - data->rows / 2;
+
+ calc_layout (data);
 }
 
-static void select_single (UiSkinnedPlaylistPrivate * private, gboolean
- relative, gint position)
+static void select_single (PlaylistData * data, gboolean relative, gint position)
 {
- position = adjust_position (private, relative, position);
+ position = adjust_position (data, relative, position);
 
 if (position == -1)
 return;
 
- if (private->focused != -1)
- aud_playlist_entry_set_selected (active_playlist, private->focused,
- FALSE);
+ if (data->focused != -1)
+ aud_playlist_entry_set_selected (active_playlist, data->focused, FALSE);
 
 if (aud_playlist_selected_count (active_playlist) > 0)
 aud_playlist_select_all (active_playlist, FALSE);
 
 aud_playlist_entry_set_selected (active_playlist, position, TRUE);
 
- private->focused = position;
- scroll_to (private, position);
+ data->focused = position;
+ scroll_to (data, position);
 }
 
-static void select_extend (UiSkinnedPlaylistPrivate * private, gboolean
- relative, gint position)
+static void select_extend (PlaylistData * data, gboolean relative, gint position)
 {
- gint count, sign;
+ position = adjust_position (data, relative, position);
 
- position = adjust_position (private, relative, position);
-
- if (position == -1 || position == private->focused)
+ if (position == -1 || position == data->focused)
 return;
 
- count = adjust_position (private, TRUE, 0);
- sign = (position > count) ? 1 : -1;
+ gint count = adjust_position (data, TRUE, 0);
+ gint sign = (position > count) ? 1 : -1;
 
 for (; count != position; count += sign)
 aud_playlist_entry_set_selected (active_playlist, count,
@@ -689,26 +479,24 @@
 
 aud_playlist_entry_set_selected (active_playlist, position, TRUE);
 
- private->focused = position;
- scroll_to (private, position);
+ data->focused = position;
+ scroll_to (data, position);
 }
 
-static void select_slide (UiSkinnedPlaylistPrivate * private, gboolean relative,
- gint position)
+static void select_slide (PlaylistData * data, gboolean relative, gint position)
 {
- position = adjust_position (private, relative, position);
+ position = adjust_position (data, relative, position);
 
 if (position == -1)
 return;
 
- private->focused = position;
- scroll_to (private, position);
+ data->focused = position;
+ scroll_to (data, position);
 }
 
-static void select_toggle (UiSkinnedPlaylistPrivate * private, gboolean
- relative, gint position)
+static void select_toggle (PlaylistData * data, gboolean relative, gint position)
 {
- position = adjust_position (private, relative, position);
+ position = adjust_position (data, relative, position);
 
 if (position == -1)
 return;
@@ -716,29 +504,28 @@
 aud_playlist_entry_set_selected (active_playlist, position,
 ! aud_playlist_entry_get_selected (active_playlist, position));
 
- private->focused = position;
- scroll_to (private, position);
+ data->focused = position;
+ scroll_to (data, position);
 }
 
-static void select_move (UiSkinnedPlaylistPrivate * private, gboolean relative,
- gint position)
+static void select_move (PlaylistData * data, gboolean relative, gint position)
 {
- position = adjust_position (private, relative, position);
+ position = adjust_position (data, relative, position);
 
- if (private->focused == -1 || position == -1 || position == private->focused)
+ if (data->focused == -1 || position == -1 || position == data->focused)
 return;
 
- private->focused += aud_playlist_shift (active_playlist, private->focused,
- position - private->focused);
+ data->focused += aud_playlist_shift (active_playlist, data->focused,
+ position - data->focused);
 
- scroll_to (private, private->focused);
+ scroll_to (data, data->focused);
 }
 
-static void delete_selected (UiSkinnedPlaylistPrivate * private)
+static void delete_selected (PlaylistData * data)
 {
 gint shift = 0, count;
 
- for (count = 0; count < private->focused; count ++)
+ for (count = 0; count < data->focused; count ++)
 {
 if (aud_playlist_entry_get_selected (active_playlist, count))
 shift --;
@@ -746,34 +533,18 @@
 
 aud_playlist_delete_selected (active_playlist);
 active_length = aud_playlist_entry_count (active_playlist);
- calc_layout (private);
-
- private->focused = adjust_position (private, TRUE, shift);
- select_single (private, TRUE, 0);
-}
-
-void ui_skinned_playlist_update (GtkWidget * widget)
-{
- UiSkinnedPlaylistPrivate * private = UI_SKINNED_PLAYLIST_GET_PRIVATE
- ((UiSkinnedPlaylist *) widget);
-
- calc_layout (private);
+ calc_layout (data);
 
- if (private->focused != -1)
- private->focused = adjust_position (private, TRUE, 0);
-
- gtk_widget_queue_draw (widget);
-
- if (private->slider != NULL)
- ui_skinned_playlist_slider_update (private->slider);
+ data->focused = adjust_position (data, TRUE, shift);
+ select_single (data, TRUE, 0);
 }
 
-gboolean ui_skinned_playlist_key (GtkWidget * widget, GdkEventKey * event)
+gboolean ui_skinned_playlist_key (GtkWidget * list, GdkEventKey * event)
 {
- UiSkinnedPlaylistPrivate * private = UI_SKINNED_PLAYLIST_GET_PRIVATE
- ((UiSkinnedPlaylist *) widget);
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_val_if_fail (data, FALSE);
 
- cancel_all (widget, private);
+ cancel_all (list, data);
 
 switch (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK))
 {
@@ -781,35 +552,35 @@
 switch (event->keyval)
 {
 case GDK_Up:
- select_single (private, TRUE, -1);
+ select_single (data, TRUE, -1);
 break;
 case GDK_Down:
- select_single (private, TRUE, 1);
+ select_single (data, TRUE, 1);
 break;
 case GDK_Page_Up:
- select_single (private, TRUE, - private->rows);
+ select_single (data, TRUE, - data->rows);
 break;
 case GDK_Page_Down:
- select_single (private, TRUE, private->rows);
+ select_single (data, TRUE, data->rows);
 break;
 case GDK_Home:
- select_single (private, FALSE, 0);
+ select_single (data, FALSE, 0);
 break;
 case GDK_End:
- select_single (private, FALSE, active_length - 1);
+ select_single (data, FALSE, active_length - 1);
 break;
 case GDK_Return:
- select_single (private, TRUE, 0);
+ select_single (data, TRUE, 0);
 aud_playlist_set_playing (active_playlist);
- aud_playlist_set_position (active_playlist, private->focused);
+ aud_playlist_set_position (active_playlist, data->focused);
 aud_drct_play ();
 break;
 case GDK_Escape:
- select_single (private, FALSE, aud_playlist_get_position
+ select_single (data, FALSE, aud_playlist_get_position
 (active_playlist));
 break;
 case GDK_Delete:
- delete_selected (private);
+ delete_selected (data);
 break;
 default:
 return FALSE;
@@ -819,22 +590,22 @@
 switch (event->keyval)
 {
 case GDK_Up:
- select_extend (private, TRUE, -1);
+ select_extend (data, TRUE, -1);
 break;
 case GDK_Down:
- select_extend (private, TRUE, 1);
+ select_extend (data, TRUE, 1);
 break;
 case GDK_Page_Up:
- select_extend (private, TRUE, -private->rows);
+ select_extend (data, TRUE, -data->rows);
 break;
 case GDK_Page_Down:
- select_extend (private, TRUE, private->rows);
+ select_extend (data, TRUE, data->rows);
 break;
 case GDK_Home:
- select_extend (private, FALSE, 0);
+ select_extend (data, FALSE, 0);
 break;
 case GDK_End:
- select_extend (private, FALSE, active_length - 1);
+ select_extend (data, FALSE, active_length - 1);
 break;
 default:
 return FALSE;
@@ -844,25 +615,25 @@
 switch (event->keyval)
 {
 case GDK_space:
- select_toggle (private, TRUE, 0);
+ select_toggle (data, TRUE, 0);
 break;
 case GDK_Up:
- select_slide (private, TRUE, -1);
+ select_slide (data, TRUE, -1);
 break;
 case GDK_Down:
- select_slide (private, TRUE, 1);
+ select_slide (data, TRUE, 1);
 break;
 case GDK_Page_Up:
- select_slide (private, TRUE, -private->rows);
+ select_slide (data, TRUE, -data->rows);
 break;
 case GDK_Page_Down:
- select_slide (private, TRUE, private->rows);
+ select_slide (data, TRUE, data->rows);
 break;
 case GDK_Home:
- select_slide (private, FALSE, 0);
+ select_slide (data, FALSE, 0);
 break;
 case GDK_End:
- select_slide (private, FALSE, active_length - 1);
+ select_slide (data, FALSE, active_length - 1);
 break;
 default:
 return FALSE;
@@ -872,22 +643,22 @@
 switch (event->keyval)
 {
 case GDK_Up:
- select_move (private, TRUE, -1);
+ select_move (data, TRUE, -1);
 break;
 case GDK_Down:
- select_move (private, TRUE, 1);
+ select_move (data, TRUE, 1);
 break;
 case GDK_Page_Up:
- select_move (private, TRUE, -private->rows);
+ select_move (data, TRUE, -data->rows);
 break;
 case GDK_Page_Down:
- select_move (private, TRUE, private->rows);
+ select_move (data, TRUE, data->rows);
 break;
 case GDK_Home:
- select_move (private, FALSE, 0);
+ select_move (data, FALSE, 0);
 break;
 case GDK_End:
- select_move (private, FALSE, active_length - 1);
+ select_move (data, FALSE, active_length - 1);
 break;
 default:
 return FALSE;
@@ -901,90 +672,91 @@
 return TRUE;
 }
 
-void ui_skinned_playlist_row_info (GtkWidget * widget, gint * rows, gint *
- first, gint * focused)
+void ui_skinned_playlist_row_info (GtkWidget * list, gint * rows, gint * first,
+ gint * focused)
 {
- UiSkinnedPlaylistPrivate * private = UI_SKINNED_PLAYLIST_GET_PRIVATE
- ((UiSkinnedPlaylist *) widget);
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_if_fail (data);
 
- * rows = private->rows;
- * first = private->first;
- * focused = private->focused;
+ * rows = data->rows;
+ * first = data->first;
+ * focused = data->focused;
 }
 
-void ui_skinned_playlist_scroll_to (GtkWidget * widget, gint row)
+void ui_skinned_playlist_scroll_to (GtkWidget * list, gint row)
 {
- UiSkinnedPlaylistPrivate * private = UI_SKINNED_PLAYLIST_GET_PRIVATE
- ((UiSkinnedPlaylist *) widget);
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_if_fail (data);
 
- cancel_all (widget, private);
- private->first = row;
- calc_layout (private);
+ cancel_all (list, data);
+ data->first = row;
+ calc_layout (data);
 
- gtk_widget_queue_draw (widget);
+ gtk_widget_queue_draw (list);
 
- if (private->slider != NULL)
- ui_skinned_playlist_slider_update (private->slider);
+ if (data->slider)
+ ui_skinned_playlist_slider_update (data->slider);
 }
 
-void ui_skinned_playlist_set_focused (GtkWidget * widget, gint row)
+void ui_skinned_playlist_set_focused (GtkWidget * list, gint row)
 {
- UiSkinnedPlaylistPrivate * private = UI_SKINNED_PLAYLIST_GET_PRIVATE
- ((UiSkinnedPlaylist *) widget);
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_if_fail (data);
 
- cancel_all (widget, private);
- private->focused = row;
- scroll_to (private, row);
+ cancel_all (list, data);
+ data->focused = row;
+ scroll_to (data, row);
 
- gtk_widget_queue_draw (widget);
+ gtk_widget_queue_draw (list);
 }
 
-void ui_skinned_playlist_hover (GtkWidget * widget, gint x, gint y)
+void ui_skinned_playlist_hover (GtkWidget * list, gint x, gint y)
 {
- UiSkinnedPlaylistPrivate * private = UI_SKINNED_PLAYLIST_GET_PRIVATE
- ((UiSkinnedPlaylist *) widget);
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_if_fail (data);
+
 gint new;
 
- if (y < private->offset)
- new = private->first;
- else if (y > private->offset + private->row_height * private->rows)
- new = private->first + private->rows;
+ if (y < data->offset)
+ new = data->first;
+ else if (y > data->offset + data->row_height * data->rows)
+ new = data->first + data->rows;
 else
- new = private->first + (y - private->offset + private->row_height / 2) /
- private->row_height;
+ new = data->first + (y - data->offset + data->row_height / 2) /
+ data->row_height;
 
 if (new > active_length)
 new = active_length;
 
- if (new != private->hover)
+ if (new != data->hover)
 {
- private->hover = new;
- gtk_widget_queue_draw (widget);
+ data->hover = new;
+ gtk_widget_queue_draw (list);
 }
 }
 
-gint ui_skinned_playlist_hover_end (GtkWidget * widget)
+gint ui_skinned_playlist_hover_end (GtkWidget * list)
 {
- UiSkinnedPlaylistPrivate * private = UI_SKINNED_PLAYLIST_GET_PRIVATE
- ((UiSkinnedPlaylist *) widget);
- gint temp = private->hover;
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_val_if_fail (data, -1);
 
- private->hover = -1;
+ gint temp = data->hover;
+ data->hover = -1;
 
- gtk_widget_queue_draw (widget);
+ gtk_widget_queue_draw (list);
 return temp;
 }
 
-static gboolean ui_skinned_playlist_button_press (GtkWidget * widget,
- GdkEventButton * event)
+static gboolean playlist_button_press (GtkWidget * list, GdkEventButton * event)
 {
- UiSkinnedPlaylistPrivate * private = UI_SKINNED_PLAYLIST_GET_PRIVATE
- ((UiSkinnedPlaylist *) widget);
- gint position = calc_position (private, event->y);
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_val_if_fail (data, FALSE);
+
+ gint position = calc_position (data, event->y);
 gint state = event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK |
 GDK_MOD1_MASK);
 
- cancel_all (widget, private);
+ cancel_all (list, data);
 
 switch (event->type)
 {
@@ -999,19 +771,19 @@
 {
 case 0:
 if (aud_playlist_entry_get_selected (active_playlist, position))
- select_slide (private, FALSE, position);
+ select_slide (data, FALSE, position);
 else
- select_single (private, FALSE, position);
+ select_single (data, FALSE, position);
 
- private->drag = DRAG_MOVE;
+ data->drag = DRAG_MOVE;
 break;
 case GDK_SHIFT_MASK:
- select_extend (private, FALSE, position);
- private->drag = DRAG_SELECT;
+ select_extend (data, FALSE, position);
+ data->drag = DRAG_SELECT;
 break;
 case GDK_CONTROL_MASK:
- select_toggle (private, FALSE, position);
- private->drag = DRAG_SELECT;
+ select_toggle (data, FALSE, position);
+ data->drag = DRAG_SELECT;
 break;
 default:
 return TRUE;
@@ -1025,9 +797,9 @@
 if (position != -1 && position != active_length)
 {
 if (aud_playlist_entry_get_selected (active_playlist, position))
- select_slide (private, FALSE, position);
+ select_slide (data, FALSE, position);
 else
- select_single (private, FALSE, position);
+ select_single (data, FALSE, position);
 }
 
 ui_popup_menu_show ((position == -1) ? UI_MENU_PLAYLIST :
@@ -1056,29 +828,30 @@
 return TRUE;
 }
 
-static gboolean ui_skinned_playlist_button_release (GtkWidget * widget,
- GdkEventButton * event)
+static gboolean playlist_button_release (GtkWidget * list, GdkEventButton *
+ event)
 {
- cancel_all (widget, UI_SKINNED_PLAYLIST_GET_PRIVATE ((UiSkinnedPlaylist *)
- widget));
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_val_if_fail (data, FALSE);
+
+ cancel_all (list, data);
 return TRUE;
 }
 
-static gboolean scroll_cb (void * data)
+static gboolean scroll_cb (PlaylistData * data)
 {
- UiSkinnedPlaylistPrivate * private = data;
- gint position = adjust_position (private, TRUE, private->scroll);
+ gint position = adjust_position (data, TRUE, data->scroll);
 
 if (position == -1)
 return TRUE;
 
- switch (private->drag)
+ switch (data->drag)
 {
 case DRAG_SELECT:
- select_extend (private, FALSE, position);
+ select_extend (data, FALSE, position);
 break;
 case DRAG_MOVE:
- select_move (private, FALSE, position);
+ select_move (data, FALSE, position);
 break;
 }
 
@@ -1086,44 +859,45 @@
 return TRUE;
 }
 
-static gboolean ui_skinned_playlist_motion_notify (GtkWidget * widget,
- GdkEventMotion * event)
+static gboolean playlist_motion (GtkWidget * list, GdkEventMotion * event)
 {
- UiSkinnedPlaylistPrivate * private = UI_SKINNED_PLAYLIST_GET_PRIVATE
- ((UiSkinnedPlaylist *) widget);
- gint position = calc_position (private, event->y);
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_val_if_fail (data, FALSE);
+
+ gint position = calc_position (data, event->y);
 gint new_scroll;
 
- if (private->drag)
+ if (data->drag)
 {
 if (position == -1 || position == active_length)
 {
 new_scroll = (position == -1 ? -1 : 1);
 
- if (private->scroll != new_scroll)
+ if (data->scroll != new_scroll)
 {
- if (private->scroll)
- g_source_remove (private->scroll_source);
+ if (data->scroll)
+ g_source_remove (data->scroll_source);
 
- private->scroll = new_scroll;
- private->scroll_source = g_timeout_add (100, scroll_cb, private);
+ data->scroll = new_scroll;
+ data->scroll_source = g_timeout_add (100, (GSourceFunc)
+ scroll_cb, data);
 }
 }
 else
 {
- if (private->scroll)
+ if (data->scroll)
 {
- private->scroll = 0;
- g_source_remove (private->scroll_source);
+ data->scroll = 0;
+ g_source_remove (data->scroll_source);
 }
 
- switch (private->drag)
+ switch (data->drag)
 {
 case DRAG_SELECT:
- select_extend (private, FALSE, position);
+ select_extend (data, FALSE, position);
 break;
 case DRAG_MOVE:
- select_move (private, FALSE, position);
+ select_move (data, FALSE, position);
 break;
 }
 
@@ -1133,106 +907,64 @@
 else
 {
 if (position == -1 || position == active_length)
- cancel_all (widget, private);
- else if (aud_cfg->show_filepopup_for_tuple && (! GPOINTER_TO_INT
- (g_object_get_data ((GObject *) widget, "popup_active")) || position
- != GPOINTER_TO_INT (g_object_get_data ((GObject *) widget,
- "popup_position"))))
+ cancel_all (list, data);
+ else if (aud_cfg->show_filepopup_for_tuple && data->popup_pos !=
+ position)
 {
- cancel_all (widget, private);
- g_object_set_data ((GObject *) widget, "popup_position",
- GINT_TO_POINTER (position));
- ui_skinned_playlist_popup_timer_start (widget);
+ cancel_all (list, data);
+ popup_trigger (list, data, position);
 }
 }
 
 return TRUE;
 }
 
-static gboolean ui_skinned_playlist_leave_notify (GtkWidget * widget,
- GdkEventCrossing * event)
+static gboolean playlist_leave (GtkWidget * list, GdkEventCrossing * event)
 {
- UiSkinnedPlaylistPrivate * private = UI_SKINNED_PLAYLIST_GET_PRIVATE
- ((UiSkinnedPlaylist *) widget);
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_val_if_fail (data, FALSE);
 
- if (! private->drag)
- cancel_all (widget, private);
+ if (! data->drag)
+ cancel_all (list, data);
 
 return TRUE;
 }
 
-void ui_skinned_playlist_set_font (GtkWidget * list, const gchar * font)
+static gboolean popup_show (GtkWidget * list)
 {
- UiSkinnedPlaylistPrivate * private = UI_SKINNED_PLAYLIST_GET_PRIVATE
- ((UiSkinnedPlaylist *) list);
- gchar *font_lower;
-
- private->font = pango_font_description_from_string (font);
-
- text_get_extents(font,
- "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz ",
- & private->letter_width, 0, & private->ascent, & private->descent);
- private->letter_width /= 53;
-
- text_get_extents (font, "0123456789", & private->digit_width, 0, 0, 0);
- private->digit_width /= 10;
+ PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
+ g_return_val_if_fail (data, FALSE);
 
- font_lower = g_utf8_strdown(font, strlen(font));
- /* This doesn't take any i18n into account, but i think there is none with TTF fonts
- * FIXME: This can probably be retrieved trough Pango too
- */
- private->slanted = strstr (font_lower, "oblique") != NULL || strstr
- (font_lower, "italic") != NULL;
+ audgui_infopopup_show (active_playlist, data->popup_pos);
+ data->popup_shown = TRUE;
 
- g_free(font_lower);
-
- calc_layout (private);
- gtk_widget_queue_draw (list);
-
- if (private->slider != NULL)
- ui_skinned_playlist_slider_update (private->slider);
+ g_source_remove (data->popup_source);
+ data->popup_source = 0;
+ return FALSE;
 }
 
-void ui_skinned_playlist_resize_relative(GtkWidget *widget, gint w, gint h) {
- UiSkinnedPlaylistPrivate *priv = UI_SKINNED_PLAYLIST_GET_PRIVATE(widget);
- priv->resize_width += w;
- priv->resize_height += h;
- gtk_widget_set_size_request(widget, priv->width+priv->resize_width, priv->height+priv->resize_height);
-}
+static void popup_trigger (GtkWidget * list, PlaylistData * data, gint pos)
+{
+ popup_hide (list, data);
 
-static gboolean ui_skinned_playlist_popup_show(gpointer data) {
- GtkWidget *widget = data;
- gint pos = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "popup_position"));
+ data->popup_pos = pos;
+ data->popup_source = g_timeout_add (aud_cfg->filepopup_delay * 100,
+ (GSourceFunc) popup_show, list);
+}
 
- if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "timer_active")) == 1 && pos != -1) {
- audgui_infopopup_show (active_playlist, pos);
- g_object_set_data(G_OBJECT(widget), "popup_active" , GINT_TO_POINTER(1));
+static void popup_hide (GtkWidget * list, PlaylistData * data)
+{
+ if (data->popup_source)
+ {
+ g_source_remove (data->popup_source);
+ data->popup_source = 0;
 }
 
- ui_skinned_playlist_popup_timer_stop(widget);
- return FALSE;
-}
-
-static void ui_skinned_playlist_popup_hide(GtkWidget *widget) {
- if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "popup_active")) == 1) {
- g_object_set_data(G_OBJECT(widget), "popup_active", GINT_TO_POINTER(0));
+ if (data->popup_shown)
+ {
 audgui_infopopup_hide ();
+ data->popup_shown = FALSE;
 }
-}
-
-static void ui_skinned_playlist_popup_timer_start(GtkWidget *widget) {
- int timer_id;
-
- timer_id = g_timeout_add (aud_cfg->filepopup_delay * 100,
- ui_skinned_playlist_popup_show, widget);
- g_object_set_data(G_OBJECT(widget), "timer_id", GINT_TO_POINTER(timer_id));
- g_object_set_data(G_OBJECT(widget), "timer_active", GINT_TO_POINTER(1));
-}
-
-static void ui_skinned_playlist_popup_timer_stop(GtkWidget *widget) {
- if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "timer_active")) == 1)
- g_source_remove(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "timer_id")));
 
- g_object_set_data(G_OBJECT(widget), "timer_id", GINT_TO_POINTER(0));
- g_object_set_data(G_OBJECT(widget), "timer_active", GINT_TO_POINTER(0));
+ data->popup_pos = -1;
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_playlist.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_playlist.h Changed

@@ -1,7 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2009 John Lindgren
+ * Copyright (c) 2009-2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -25,52 +25,22 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_SKINNED_PLAYLIST_H
-#define AUDACIOUS_UI_SKINNED_PLAYLIST_H
+#ifndef SKINS_UI_SKINNED_PLAYLIST_H
+#define SKINS_UI_SKINNED_PLAYLIST_H
 
 #include <gtk/gtk.h>
 
-#include <cairo.h>
-#include <pango/pangocairo.h>
-
-#include "ui_skin.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UI_SKINNED_PLAYLIST(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_playlist_get_type (), UiSkinnedPlaylist)
-#define UI_SKINNED_PLAYLIST_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_playlist_get_type (), UiSkinnedPlaylistClass)
-#define UI_SKINNED_IS_PLAYLIST(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_playlist_get_type ())
-
-typedef struct _UiSkinnedPlaylist UiSkinnedPlaylist;
-typedef struct _UiSkinnedPlaylistClass UiSkinnedPlaylistClass;
-
-struct _UiSkinnedPlaylist {
- GtkWidget widget;
-};
-
-struct _UiSkinnedPlaylistClass {
- GtkWidgetClass parent_class;
-};
-
-GtkWidget * ui_skinned_playlist_new (GtkWidget * fixed, gint x, gint y, gint
- width, gint height, const gchar * font);
+GtkWidget * ui_skinned_playlist_new (gint width, gint height, const gchar * font);
 void ui_skinned_playlist_set_slider (GtkWidget * list, GtkWidget * slider);
-GType ui_skinned_playlist_get_type(void);
-void ui_skinned_playlist_resize_relative(GtkWidget *widget, gint w, gint h);
+void ui_skinned_playlist_resize (GtkWidget * list, gint w, gint h);
 void ui_skinned_playlist_set_font (GtkWidget * list, const gchar * font);
-void ui_skinned_playlist_update (GtkWidget * widget);
-gboolean ui_skinned_playlist_key (GtkWidget * widget, GdkEventKey * event);
-void ui_skinned_playlist_row_info (GtkWidget * widget, gint * rows, gint *
- first, gint * focused);
-void ui_skinned_playlist_scroll_to (GtkWidget * widget, gint row);
-void ui_skinned_playlist_set_focused (GtkWidget * widget, gint row);
-void ui_skinned_playlist_hover (GtkWidget * widget, gint x, gint y);
-int ui_skinned_playlist_hover_end (GtkWidget * widget);
+void ui_skinned_playlist_update (GtkWidget * list);
+gboolean ui_skinned_playlist_key (GtkWidget * list, GdkEventKey * event);
+void ui_skinned_playlist_row_info (GtkWidget * list, gint * rows, gint * first,
+ gint * focused);
+void ui_skinned_playlist_scroll_to (GtkWidget * list, gint row);
+void ui_skinned_playlist_set_focused (GtkWidget * list, gint row);
+void ui_skinned_playlist_hover (GtkWidget * list, gint x, gint y);
+gint ui_skinned_playlist_hover_end (GtkWidget * list);
 
-#ifdef __cplusplus
-}
 #endif
-
-#endif /* AUDACIOUS_UI_SKINNED_PLAYLIST_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_playlist_slider.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_playlist_slider.c Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,295 +25,117 @@
 * Audacious or using our public API to be a derived work.
 */
 
+#include "draw-compat.h"
+#include "ui_playlist.h"
 #include "ui_skin.h"
 #include "ui_skinned_playlist.h"
 #include "ui_skinned_playlist_slider.h"
-#include "ui_playlist.h"
-#include "util.h"
-
-#define UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ui_skinned_playlist_slider_get_type(), UiSkinnedPlaylistSliderPrivate))
-typedef struct _UiSkinnedPlaylistSliderPrivate UiSkinnedPlaylistSliderPrivate;
-
-struct _UiSkinnedPlaylistSliderPrivate {
- GtkWidget * list;
- SkinPixmapId skin_index;
- gint width, height;
-
- gint resize_height;
- gint move_x;
- gint prev_y;
- gint drag_y;
-};
-
-static void ui_skinned_playlist_slider_class_init (UiSkinnedPlaylistSliderClass *klass);
-static void ui_skinned_playlist_slider_init (UiSkinnedPlaylistSlider *playlist_slider);
-static void ui_skinned_playlist_slider_destroy (GtkObject *object);
-static void ui_skinned_playlist_slider_realize (GtkWidget *widget);
-static void ui_skinned_playlist_slider_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void ui_skinned_playlist_slider_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static gboolean ui_skinned_playlist_slider_expose (GtkWidget *widget, GdkEventExpose *event);
-static void ui_skinned_playlist_slider_set_position (GtkWidget *widget, gint y);
-static gboolean ui_skinned_playlist_slider_button_press (GtkWidget *widget, GdkEventButton *event);
-static gboolean ui_skinned_playlist_slider_button_release (GtkWidget *widget, GdkEventButton *event);
-static gboolean ui_skinned_playlist_slider_motion_notify (GtkWidget *widget, GdkEventMotion *event);
-
-static GtkWidgetClass *parent_class = NULL;
-
-GType ui_skinned_playlist_slider_get_type() {
- static GType playlist_slider_type = 0;
- if (!playlist_slider_type) {
- static const GTypeInfo playlist_slider_info = {
- sizeof (UiSkinnedPlaylistSliderClass),
- NULL,
- NULL,
- (GClassInitFunc) ui_skinned_playlist_slider_class_init,
- NULL,
- NULL,
- sizeof (UiSkinnedPlaylistSlider),
- 0,
- (GInstanceInitFunc) ui_skinned_playlist_slider_init,
- };
- playlist_slider_type = g_type_register_static (GTK_TYPE_WIDGET, "UiSkinnedPlaylistSlider", &playlist_slider_info, 0);
- }
-
- return playlist_slider_type;
-}
-
-static void ui_skinned_playlist_slider_class_init(UiSkinnedPlaylistSliderClass *klass) {
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- gobject_class = G_OBJECT_CLASS(klass);
- object_class = (GtkObjectClass*) klass;
- widget_class = (GtkWidgetClass*) klass;
- parent_class = g_type_class_peek_parent(klass);
-
- object_class->destroy = ui_skinned_playlist_slider_destroy;
-
- widget_class->realize = ui_skinned_playlist_slider_realize;
- widget_class->expose_event = ui_skinned_playlist_slider_expose;
- widget_class->size_request = ui_skinned_playlist_slider_size_request;
- widget_class->size_allocate = ui_skinned_playlist_slider_size_allocate;
- widget_class->button_press_event = ui_skinned_playlist_slider_button_press;
- widget_class->button_release_event = ui_skinned_playlist_slider_button_release;
- widget_class->motion_notify_event = ui_skinned_playlist_slider_motion_notify;
-
- g_type_class_add_private (gobject_class, sizeof (UiSkinnedPlaylistSliderPrivate));
-}
-
-static void ui_skinned_playlist_slider_init(UiSkinnedPlaylistSlider *playlist_slider) {
- UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(playlist_slider);
- playlist_slider->pressed = FALSE;
- priv->resize_height = 0;
- priv->move_x = 0;
- priv->drag_y = 0;
- priv->prev_y = 0;
-}
-
-GtkWidget * ui_skinned_playlist_slider_new (GtkWidget * fixed, gint x, gint y,
- gint h, GtkWidget * list)
-{
-
- UiSkinnedPlaylistSlider *hs = g_object_new (ui_skinned_playlist_slider_get_type (), NULL);
- UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(hs);
-
- hs->x = x;
- hs->y = y;
- priv->width = 8;
- priv->height = h;
- priv->list = list;
- priv->skin_index = SKIN_PLEDIT;
-
- gtk_fixed_put(GTK_FIXED(fixed), GTK_WIDGET(hs), hs->x, hs->y);
-
- return GTK_WIDGET(hs);
-}
-
-static void ui_skinned_playlist_slider_destroy(GtkObject *object) {
- g_return_if_fail (object != NULL);
- g_return_if_fail (UI_SKINNED_IS_PLAYLIST_SLIDER (object));
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void ui_skinned_playlist_slider_realize(GtkWidget *widget) {
- GdkWindowAttr attributes;
- gint attributes_mask;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (UI_SKINNED_IS_PLAYLIST_SLIDER(widget));
-
- GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
-
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.event_mask = gtk_widget_get_events(widget);
- attributes.event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK;
- attributes.visual = gtk_widget_get_visual(widget);
- attributes.colormap = gtk_widget_get_colormap(widget);
 
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
- widget->window = gdk_window_new(widget->parent->window, &attributes, attributes_mask);
+static GtkWidget * pl_slider_list;
+static gint pl_slider_height;
+static gboolean pl_slider_pressed;
 
- widget->style = gtk_style_attach(widget->style, widget->window);
- gdk_window_set_user_data(widget->window, widget);
-}
-
-static void ui_skinned_playlist_slider_size_request(GtkWidget *widget, GtkRequisition *requisition) {
- UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(widget);
-
- requisition->width = priv->width;
- requisition->height = priv->height;
-}
-
-static void ui_skinned_playlist_slider_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
- UiSkinnedPlaylistSlider *playlist_slider = UI_SKINNED_PLAYLIST_SLIDER (widget);
- UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(playlist_slider);
-
- widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
- gdk_window_move_resize(widget->window, widget->allocation.x, widget->allocation.y, allocation->width, allocation->height);
-
- if (playlist_slider->x + priv->move_x == widget->allocation.x)
- priv->move_x = 0;
- playlist_slider->x = widget->allocation.x;
- playlist_slider->y = widget->allocation.y;
-
- if (priv->height != widget->allocation.height) {
- priv->height = priv->height + priv->resize_height;
- priv->resize_height = 0;
- ui_skinned_playlist_slider_update (widget);
- }
-}
-
-static gboolean ui_skinned_playlist_slider_expose(GtkWidget *widget, GdkEventExpose *event) {
- gint rows, first, focused, y;
-
- UiSkinnedPlaylistSlider *ps = UI_SKINNED_PLAYLIST_SLIDER (widget);
- UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(ps);
- g_return_val_if_fail (priv->width > 0 && priv->height > 0, FALSE);
-
- GdkPixbuf *obj = NULL;
- obj = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, priv->width, priv->height);
+DRAW_FUNC_BEGIN (pl_slider_draw)
+ gint rows, first, focused;
+ ui_skinned_playlist_row_info (pl_slider_list, & rows, & first, & focused);
 
- ui_skinned_playlist_row_info (priv->list, & rows, & first, & focused);
+ gint range = active_length - rows;
 
+ gint y;
 if (active_length > rows)
- y = first * (priv->height - 19) / (active_length - rows);
+ y = (first * (pl_slider_height - 19) + range / 2) / range;
 else
 y = 0;
 
- if (y < 0) y=0;
- if (y > priv->height - 19) y = priv->height - 19;
-
- priv->prev_y = y;
+ for (gint i = 0; i < pl_slider_height / 29; i ++)
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 36, 42, 0, 29 * i, 8, 29);
 
- /* FIXME: uses aud_active_skin->pixmaps directly and may need calibration */
- /* drawing background */
- gint c;
- for (c = 0; c < priv->height / 29; c++) {
- gdk_pixbuf_copy_area(aud_active_skin->pixmaps[SKIN_PLEDIT].pixbuf,
- 36, 42, priv->width, 29, obj, 0, c*29);
- }
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, pl_slider_pressed ? 61 : 52, 53, 0, y, 8,
+ 18);
+DRAW_FUNC_END
 
- /* drawing knob */
- skin_draw_pixbuf(widget, aud_active_skin, obj, priv->skin_index, ps->pressed ? 61 : 52, 53, 0, y, priv->width, 18);
+static void pl_slider_set_pos (gint y)
+{
+ y = CLAMP (y, 0, pl_slider_height - 19);
 
- ui_skinned_widget_draw(widget, obj, priv->width, priv->height, FALSE);
+ gint rows, first, focused;
+ ui_skinned_playlist_row_info (pl_slider_list, & rows, & first, & focused);
 
- g_object_unref(obj);
+ gint range = pl_slider_height - 19;
 
- return FALSE;
+ ui_skinned_playlist_scroll_to (pl_slider_list, (y * (active_length - rows) +
+ range / 2) / range);
 }
 
-void ui_skinned_playlist_slider_update (GtkWidget * widget)
+static gboolean pl_slider_button_press (GtkWidget * slider, GdkEventButton *
+ event)
 {
- if (widget_really_drawable (widget))
- ui_skinned_playlist_slider_expose (widget, 0);
-}
-
-static void ui_skinned_playlist_slider_set_position(GtkWidget *widget, gint y) {
- gint rows, first, focused;
- UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(widget);
+ if (event->button != 1)
+ return FALSE;
 
- y = CLAMP(y, 0, priv->height - 19);
+ pl_slider_pressed = TRUE;
+ pl_slider_set_pos (event->y - 9);
 
- ui_skinned_playlist_row_info (priv->list, & rows, & first, & focused);
- ui_skinned_playlist_scroll_to (priv->list, y * (active_length - rows)
- / (priv->height - 19));
+ gtk_widget_queue_draw (slider);
+ return TRUE;
 }
 
-static gboolean ui_skinned_playlist_slider_button_press(GtkWidget *widget, GdkEventButton *event) {
- UiSkinnedPlaylistSlider *ps = UI_SKINNED_PLAYLIST_SLIDER (widget);
- UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(widget);
- gint rows, first, focused, n;
+static gboolean pl_slider_button_release (GtkWidget * slider, GdkEventButton *
+ event)
+{
+ if (event->button != 1)
+ return FALSE;
 
- if (event->button != 1 && event->button != 2)
+ if (! pl_slider_pressed)
 return TRUE;
 
- ui_skinned_playlist_row_info (priv->list, & rows, & first, & focused);
+ pl_slider_pressed = FALSE;
+ pl_slider_set_pos (event->y - 9);
 
- gint y = event->y;
- if (event->type == GDK_BUTTON_PRESS) {
- ps->pressed = TRUE;
- if ((y >= priv->prev_y && y < priv->prev_y + 18)) {
- priv->drag_y = y - priv->prev_y;
- } else if (event->button == 2) {
- ui_skinned_playlist_slider_set_position(widget, y);
- priv->drag_y = 0;
- } else {
- n = rows / 2;
+ gtk_widget_queue_draw (slider);
+ return TRUE;
+}
 
- if (y < priv->prev_y)
- n *= -1;
+static gboolean pl_slider_motion (GtkWidget * slider, GdkEventMotion * event)
+{
+ if (! pl_slider_pressed)
+ return TRUE;
 
- ui_skinned_playlist_scroll_to (priv->list, first + n);
- }
+ pl_slider_set_pos (event->y - 9);
 
- ui_skinned_playlist_slider_update (widget);
- }
+ gtk_widget_queue_draw (slider);
 return TRUE;
 }
 
-static gboolean ui_skinned_playlist_slider_button_release(GtkWidget *widget, GdkEventButton *event) {
- UiSkinnedPlaylistSlider *ps = UI_SKINNED_PLAYLIST_SLIDER(widget);
+GtkWidget * ui_skinned_playlist_slider_new (GtkWidget * list, gint height)
+{
+ GtkWidget * slider = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (slider, 8, height);
+ gtk_widget_add_events (slider, GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK);
 
- if (event->button == 1 || event->button == 2) {
- ps->pressed = FALSE;
- ui_skinned_playlist_slider_update (widget);
- }
- return TRUE;
-}
+ pl_slider_list = list;
+ pl_slider_height = height;
 
-static gboolean ui_skinned_playlist_slider_motion_notify(GtkWidget *widget, GdkEventMotion *event) {
- UiSkinnedPlaylistSlider *ps = UI_SKINNED_PLAYLIST_SLIDER(widget);
- UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(widget);
+ DRAW_CONNECT (slider, pl_slider_draw);
+ g_signal_connect (slider, "button-press-event", (GCallback)
+ pl_slider_button_press, NULL);
+ g_signal_connect (slider, "button-release-event", (GCallback)
+ pl_slider_button_release, NULL);
+ g_signal_connect (slider, "motion-notify-event", (GCallback)
+ pl_slider_motion, NULL);
 
- if (ps->pressed) {
- gint y = event->y - priv->drag_y;
- ui_skinned_playlist_slider_set_position(widget, y);
- }
- return TRUE;
+ return slider;
 }
 
-void ui_skinned_playlist_slider_move_relative(GtkWidget *widget, gint x) {
- UiSkinnedPlaylistSlider *playlist_slider = UI_SKINNED_PLAYLIST_SLIDER(widget);
- UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(widget);
- priv->move_x += x;
- gtk_fixed_move(GTK_FIXED(gtk_widget_get_parent(widget)), widget,
- playlist_slider->x+priv->move_x, playlist_slider->y);
+void ui_skinned_playlist_slider_resize (GtkWidget * slider, gint height)
+{
+ pl_slider_height = height;
+ gtk_widget_set_size_request (slider, 8, height);
+ gtk_widget_queue_draw (slider);
 }
 
-void ui_skinned_playlist_slider_resize_relative(GtkWidget *widget, gint h) {
- UiSkinnedPlaylistSlider *playlist_slider = UI_SKINNED_PLAYLIST_SLIDER(widget);
- UiSkinnedPlaylistSliderPrivate *priv = UI_SKINNED_PLAYLIST_SLIDER_GET_PRIVATE(widget);
- priv->resize_height += h;
- gtk_widget_set_size_request(GTK_WIDGET(playlist_slider), priv->width, priv->height+priv->resize_height);
+void ui_skinned_playlist_slider_update (GtkWidget * slider)
+{
+ gtk_widget_queue_draw (slider);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_playlist_slider.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_playlist_slider.h Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,41 +25,13 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_SKINNED_PLAYLIST_SLIDER_H
-#define AUDACIOUS_UI_SKINNED_PLAYLIST_SLIDER_H
+#ifndef SKINS_UI_SKINNED_PLAYLIST_SLIDER_H
+#define SKINS_UI_SKINNED_PLAYLIST_SLIDER_H
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UI_SKINNED_PLAYLIST_SLIDER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_playlist_slider_get_type (), UiSkinnedPlaylistSlider)
-#define UI_SKINNED_PLAYLIST_SLIDER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_playlist_slider_get_type (), UiSkinnedPlaylistSliderClass)
-#define UI_SKINNED_IS_PLAYLIST_SLIDER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_playlist_slider_get_type ())
-
-typedef struct _UiSkinnedPlaylistSlider UiSkinnedPlaylistSlider;
-typedef struct _UiSkinnedPlaylistSliderClass UiSkinnedPlaylistSliderClass;
-
-struct _UiSkinnedPlaylistSlider {
- GtkWidget widget;
- gboolean pressed;
- gint x, y;
-};
+GtkWidget * ui_skinned_playlist_slider_new (GtkWidget * list, gint height);
+void ui_skinned_playlist_slider_resize (GtkWidget * slider, gint height);
+void ui_skinned_playlist_slider_update (GtkWidget * slider);
 
-struct _UiSkinnedPlaylistSliderClass {
- GtkWidgetClass parent_class;
-};
-
-GtkWidget * ui_skinned_playlist_slider_new (GtkWidget * fixed, gint x, gint y,
- gint h, GtkWidget * list);
-GType ui_skinned_playlist_slider_get_type(void);
-void ui_skinned_playlist_slider_move_relative(GtkWidget *widget, gint x);
-void ui_skinned_playlist_slider_resize_relative(GtkWidget *widget, gint h);
-void ui_skinned_playlist_slider_update (GtkWidget * widget);
-
-#ifdef __cplusplus
-}
 #endif
-
-#endif /* AUDACIOUS_UI_SKINNED_PLAYLIST_SLIDER_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_playstatus.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_playstatus.c Changed

@@ -1,6 +1,7 @@
 /*
  * Audacious - a cross-platform multimedia player
  * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
  *
  * Based on:
  * BMP - Cross-platform multimedia player
@@ -24,197 +25,57 @@
  * Audacious or using our public API to be a derived work.
  */
 
+#include "draw-compat.h"
 #include "ui_skin.h"
 #include "ui_skinned_playstatus.h"
-#include "skins_cfg.h"
-#include "util.h"
 
-#define UI_TYPE_SKINNED_PLAYSTATUS           (ui_skinned_playstatus_get_type())
+static gint playstatus_width, playstatus_height;
+static PStatus playstatus_status;
 
-enum {
-    DOUBLED,
-    LAST_SIGNAL
-};
+DRAW_FUNC_BEGIN (playstatus_draw)
+    if (! playstatus_width || ! playstatus_height)
+        goto DONE;
 
-static void ui_skinned_playstatus_class_init         (UiSkinnedPlaystatusClass *klass);
-static void ui_skinned_playstatus_init               (UiSkinnedPlaystatus *playstatus);
-static void ui_skinned_playstatus_destroy            (GtkObject *object);
-static void ui_skinned_playstatus_realize            (GtkWidget *widget);
-static void ui_skinned_playstatus_size_request       (GtkWidget *widget, GtkRequisition *requisition);
-static void ui_skinned_playstatus_size_allocate      (GtkWidget *widget, GtkAllocation *allocation);
-static gboolean ui_skinned_playstatus_expose         (GtkWidget *widget, GdkEventExpose *event);
-static void ui_skinned_playstatus_toggle_scaled      (UiSkinnedPlaystatus *playstatus);
-
-static GtkWidgetClass *parent_class = NULL;
-static guint playstatus_signals[LAST_SIGNAL] = { 0 };
-
-GType ui_skinned_playstatus_get_type() {
-    static GType playstatus_type = 0;
-    if (!playstatus_type) {
-        static const GTypeInfo playstatus_info = {
-            sizeof (UiSkinnedPlaystatusClass),
-            NULL,
-            NULL,
-            (GClassInitFunc) ui_skinned_playstatus_class_init,
-            NULL,
-            NULL,
-            sizeof (UiSkinnedPlaystatus),
-            0,
-            (GInstanceInitFunc) ui_skinned_playstatus_init,
-        };
-        playstatus_type = g_type_register_static (GTK_TYPE_WIDGET, "UiSkinnedPlaystatus", &playstatus_info, 0);
-    }
-
-    return playstatus_type;
-}
-
-static void ui_skinned_playstatus_class_init(UiSkinnedPlaystatusClass *klass) {
-    GtkObjectClass *object_class;
-    GtkWidgetClass *widget_class;
-
-    object_class = (GtkObjectClass*) klass;
-    widget_class = (GtkWidgetClass*) klass;
-    parent_class = g_type_class_peek_parent(klass);
-
-    object_class->destroy = ui_skinned_playstatus_destroy;
-
-    widget_class->realize = ui_skinned_playstatus_realize;
-    widget_class->expose_event = ui_skinned_playstatus_expose;
-    widget_class->size_request = ui_skinned_playstatus_size_request;
-    widget_class->size_allocate = ui_skinned_playstatus_size_allocate;
-
-    klass->scaled = ui_skinned_playstatus_toggle_scaled;
-
-    playstatus_signals[DOUBLED] =
-        g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                      G_STRUCT_OFFSET (UiSkinnedPlaystatusClass, scaled), NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-}
-
-static void ui_skinned_playstatus_init(UiSkinnedPlaystatus *playstatus) {
-    playstatus->width = 11;
-    playstatus->height = 9;
-
-    GTK_WIDGET_SET_FLAGS(playstatus, GTK_NO_WINDOW);
-}
-
-GtkWidget* ui_skinned_playstatus_new(GtkWidget *fixed, gint x, gint y) {
-    UiSkinnedPlaystatus *playstatus = g_object_new (ui_skinned_playstatus_get_type (), NULL);
-
-    playstatus->x = x;
-    playstatus->y = y;
-
-    playstatus->scaled = FALSE;
-
-    gtk_fixed_put(GTK_FIXED(fixed), GTK_WIDGET(playstatus), playstatus->x, playstatus->y);
-
-    return GTK_WIDGET(playstatus);
-}
-
-static void ui_skinned_playstatus_destroy(GtkObject *object) {
-    g_return_if_fail (object != NULL);
-    g_return_if_fail (UI_SKINNED_IS_PLAYSTATUS (object));
-
-    if (GTK_OBJECT_CLASS (parent_class)->destroy)
-        (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void ui_skinned_playstatus_realize(GtkWidget *widget) {
-    if (GTK_WIDGET_CLASS (parent_class)->realize)
-        (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-}
-
-static void ui_skinned_playstatus_size_request(GtkWidget *widget, GtkRequisition *requisition) {
-    UiSkinnedPlaystatus *playstatus = UI_SKINNED_PLAYSTATUS(widget);
-
-    requisition->width = playstatus->width*(playstatus->scaled ? config.scale_factor : 1);
-    requisition->height = playstatus->height*(playstatus->scaled ? config.scale_factor : 1);
-}
-
-static void ui_skinned_playstatus_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
-    UiSkinnedPlaystatus *playstatus = UI_SKINNED_PLAYSTATUS (widget);
-
-    widget->allocation = *allocation;
-    widget->allocation.x *= (playstatus->scaled ? config.scale_factor : 1);
-    widget->allocation.y *= (playstatus->scaled ? config.scale_factor : 1);
-
-    playstatus->x = widget->allocation.x/(playstatus->scaled ? config.scale_factor : 1);
-    playstatus->y = widget->allocation.y/(playstatus->scaled ? config.scale_factor : 1);
-}
-
-static gboolean ui_skinned_playstatus_expose(GtkWidget *widget, GdkEventExpose *event) {
-    UiSkinnedPlaystatus *playstatus = UI_SKINNED_PLAYSTATUS (widget);
-    g_return_val_if_fail (playstatus->width > 0 && playstatus->height > 0, FALSE);
-
-    GdkPixbuf *obj = NULL;
-    obj = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, playstatus->width, playstatus->height);
-
-    if (playstatus->status == STATUS_STOP && playstatus->buffering == TRUE)
-        playstatus->buffering = FALSE;
-    if (playstatus->status == STATUS_PLAY && playstatus->buffering == TRUE)
-        skin_draw_pixbuf(widget, aud_active_skin, obj, SKIN_PLAYPAUSE, 39, 0, 0, 0, 3, playstatus->height);
-    else if (playstatus->status == STATUS_PLAY)
-        skin_draw_pixbuf(widget, aud_active_skin, obj, SKIN_PLAYPAUSE, 36, 0, 0, 0, 3, playstatus->height);
+    if (playstatus_status == STATUS_PLAY)
+        skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 36, 0, 0, 0, 3, playstatus_height);
     else
-        skin_draw_pixbuf(widget, aud_active_skin, obj, SKIN_PLAYPAUSE, 27, 0, 0, 0, 2, playstatus->height);
-    switch (playstatus->status) {
+        skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 27, 0, 0, 0, 2, playstatus_height);
+
+    switch (playstatus_status)
+    {
     case STATUS_STOP:
-        skin_draw_pixbuf(widget, aud_active_skin, obj, SKIN_PLAYPAUSE, 18, 0, 2, 0, 9, playstatus->height);
+        skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 18, 0, 2, 0, 9, playstatus_height);
         break;
     case STATUS_PAUSE:
-        skin_draw_pixbuf(widget, aud_active_skin, obj, SKIN_PLAYPAUSE, 9, 0, 2, 0, 9, playstatus->height);
+        skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 9, 0, 2, 0, 9, playstatus_height);
         break;
     case STATUS_PLAY:
-        skin_draw_pixbuf(widget, aud_active_skin, obj, SKIN_PLAYPAUSE, 1, 0, 3, 0, 8, playstatus->height);
+        skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 1, 0, 3, 0, 8, playstatus_height);
         break;
     }
 
-    ui_skinned_widget_draw_with_coordinates(widget, obj, playstatus->width, playstatus->height,
-                                            widget->allocation.x,
-                                            widget->allocation.y,
-                                            playstatus->scaled);
+DONE:
+DRAW_FUNC_END
 
-    g_object_unref(obj);
-
-    return FALSE;
-}
-
-static void ui_skinned_playstatus_toggle_scaled(UiSkinnedPlaystatus *playstatus) {
-    GtkWidget *widget = GTK_WIDGET (playstatus);
-
-    playstatus->scaled = !playstatus->scaled;
-    gtk_widget_set_size_request(widget, playstatus->width*(playstatus->scaled ? config.scale_factor : 1), playstatus->height*(playstatus->scaled ? config.scale_factor : 1));
-
-    if (widget_really_drawable (widget))
-        ui_skinned_playstatus_expose (widget, 0);
-}
-
-void ui_skinned_playstatus_set_status(GtkWidget *widget, PStatus status) {
-    g_return_if_fail (UI_SKINNED_IS_PLAYSTATUS (widget));
-    UiSkinnedPlaystatus *playstatus = UI_SKINNED_PLAYSTATUS (widget);
-
-    playstatus->status = status;
-
-    if (widget_really_drawable (widget))
-        ui_skinned_playstatus_expose (widget, 0);
+GtkWidget * ui_skinned_playstatus_new (void)
+{
+    GtkWidget * playstatus = gtk_drawing_area_new ();
+    DRAW_CONNECT (playstatus, playstatus_draw);
+    return playstatus;
 }
 
-void ui_skinned_playstatus_set_buffering(GtkWidget *widget, gboolean status) {
-    g_return_if_fail (UI_SKINNED_IS_PLAYSTATUS (widget));
-    UiSkinnedPlaystatus *playstatus = UI_SKINNED_PLAYSTATUS (widget);
-
-    playstatus->buffering = status;
-
-    if (widget_really_drawable (widget))
-        ui_skinned_playstatus_expose (widget, 0);
+void ui_skinned_playstatus_set_status (GtkWidget * playstatus, PStatus status)
+{
+    playstatus_status = status;
+    gtk_widget_queue_draw (playstatus);
 }
 
-void ui_skinned_playstatus_set_size(GtkWidget *widget, gint width, gint height) {
-    g_return_if_fail (UI_SKINNED_IS_PLAYSTATUS (widget));
-    UiSkinnedPlaystatus *playstatus = UI_SKINNED_PLAYSTATUS (widget);
-
-    playstatus->width = width;
-    playstatus->height = height;
+void ui_skinned_playstatus_set_size (GtkWidget * playstatus, gint width, gint
+ height)
+{
+    playstatus_width = width;
+    playstatus_height = height;
 
-    gtk_widget_set_size_request(widget, width*(playstatus->scaled ? config.scale_factor : 1), height*(playstatus->scaled ? config.scale_factor : 1));
+    gtk_widget_set_size_request (playstatus, width, height);
+    gtk_widget_queue_draw (playstatus);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_playstatus.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_playstatus.h Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,48 +25,17 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_SKINNED_PLAYSTATUS_H
-#define AUDACIOUS_UI_SKINNED_PLAYSTATUS_H
+#ifndef SKINS_UI_SKINNED_PLAYSTATUS_H
+#define SKINS_UI_SKINNED_PLAYSTATUS_H
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UI_SKINNED_PLAYSTATUS(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_playstatus_get_type (), UiSkinnedPlaystatus)
-#define UI_SKINNED_PLAYSTATUS_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_playstatus_get_type (), UiSkinnedPlaystatusClass)
-#define UI_SKINNED_IS_PLAYSTATUS(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_playstatus_get_type ())
-
-typedef struct _UiSkinnedPlaystatus UiSkinnedPlaystatus;
-typedef struct _UiSkinnedPlaystatusClass UiSkinnedPlaystatusClass;
-
 typedef enum {
 STATUS_STOP, STATUS_PAUSE, STATUS_PLAY
 } PStatus;
 
-struct _UiSkinnedPlaystatus {
- GtkWidget widget;
-
- gint x, y, width, height;
- gboolean scaled;
- PStatus status;
- gboolean buffering;
-};
-
-struct _UiSkinnedPlaystatusClass {
- GtkWidgetClass parent_class;
- void (* scaled) (UiSkinnedPlaystatus *menurow);
-};
-
-GtkWidget* ui_skinned_playstatus_new (GtkWidget *fixed, gint x, gint y);
-GType ui_skinned_playstatus_get_type(void);
+GtkWidget * ui_skinned_playstatus_new (void);
 void ui_skinned_playstatus_set_status(GtkWidget *widget, PStatus status);
-void ui_skinned_playstatus_set_buffering(GtkWidget *widget, gboolean status);
 void ui_skinned_playstatus_set_size(GtkWidget *widget, gint width, gint height);
 
-#ifdef __cplusplus
-}
 #endif
-
-#endif /* AUDACIOUS_UI_SKINNED_PLAYSTATUS_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_textbox.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_textbox.c Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -26,897 +27,380 @@
 
 #include <string.h>
 
-#include <libaudcore/audstrings.h>
-
-#include "ui_skinned_textbox.h"
+#include "draw-compat.h"
 #include "skins_cfg.h"
-#include "plugin.h"
-#include "util.h"
-
-#define UI_SKINNED_TEXTBOX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ui_skinned_textbox_get_type(), UiSkinnedTextboxPrivate))
-typedef struct _UiSkinnedTextboxPrivate UiSkinnedTextboxPrivate;
-
-#define TEXTBOX_SCROLL_SMOOTH_TIMEOUT 30
-#define TEXTBOX_SCROLL_WAIT 80
-
-enum {
- CLICKED,
- DOUBLE_CLICKED,
- RIGHT_CLICKED,
- DOUBLED,
- LAST_SIGNAL
-};
-
-struct _UiSkinnedTextboxPrivate {
- SkinPixmapId skin_index;
- gboolean scaled;
- gboolean scroll_back;
- gint nominal_y, nominal_height;
- gint scroll_timeout;
- gint crop;
- PangoFontDescription *font;
- gchar *fontname;
- gchar *pixbuf_text;
- gint skin_id;
- gint drag_x, drag_off, offset;
- gboolean is_scrollable, is_dragging;
- gint pixbuf_width;
- GdkPixbuf *pixbuf;
- gboolean scroll_allowed, scroll_enabled;
- gint scroll_dummy;
- gint move_x, move_y;
-};
-
-static void ui_skinned_textbox_class_init (UiSkinnedTextboxClass *klass);
-static void ui_skinned_textbox_init (UiSkinnedTextbox *textbox);
-static void ui_skinned_textbox_destroy (GtkObject *object);
-static void ui_skinned_textbox_realize (GtkWidget *widget);
-static void ui_skinned_textbox_unrealize (GtkWidget *widget);
-static void ui_skinned_textbox_map (GtkWidget *widget);
-static void ui_skinned_textbox_unmap (GtkWidget *widget);
-static void ui_skinned_textbox_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void ui_skinned_textbox_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static gboolean ui_skinned_textbox_expose (GtkWidget *widget, GdkEventExpose *event);
-static gboolean ui_skinned_textbox_button_press (GtkWidget *widget, GdkEventButton *event);
-static gboolean ui_skinned_textbox_button_release (GtkWidget *widget, GdkEventButton *event);
-static gboolean ui_skinned_textbox_motion_notify (GtkWidget *widget, GdkEventMotion *event);
-static void ui_skinned_textbox_toggle_scaled (UiSkinnedTextbox *textbox);
-static gboolean ui_skinned_textbox_should_scroll (UiSkinnedTextbox *textbox);
-static void textbox_generate_xfont_pixmap (UiSkinnedTextbox *textbox, const gchar *pixmaptext);
-static gboolean textbox_scroll (gpointer data);
-static void textbox_generate_pixmap (UiSkinnedTextbox *textbox);
-static void textbox_handle_special_char (gchar *c, gint * x, gint * y);
-
-static GtkWidgetClass *parent_class = NULL;
-static guint textbox_signals[LAST_SIGNAL] = { 0 };
-
-GType ui_skinned_textbox_get_type() {
- static GType textbox_type = 0;
- if (!textbox_type) {
- static const GTypeInfo textbox_info = {
- sizeof (UiSkinnedTextboxClass),
- NULL,
- NULL,
- (GClassInitFunc) ui_skinned_textbox_class_init,
- NULL,
- NULL,
- sizeof (UiSkinnedTextbox),
- 0,
- (GInstanceInitFunc) ui_skinned_textbox_init,
- };
- textbox_type = g_type_register_static (GTK_TYPE_WIDGET, "UiSkinnedTextbox", &textbox_info, 0);
- }
-
- return textbox_type;
-}
-
-static void ui_skinned_textbox_class_init(UiSkinnedTextboxClass *klass) {
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- gobject_class = G_OBJECT_CLASS(klass);
- object_class = (GtkObjectClass*) klass;
- widget_class = (GtkWidgetClass*) klass;
- parent_class = g_type_class_peek_parent(klass);
-
- object_class->destroy = ui_skinned_textbox_destroy;
-
- widget_class->realize = ui_skinned_textbox_realize;
- widget_class->unrealize = ui_skinned_textbox_unrealize;
- widget_class->map = ui_skinned_textbox_map;
- widget_class->unmap = ui_skinned_textbox_unmap;
- widget_class->expose_event = ui_skinned_textbox_expose;
- widget_class->size_request = ui_skinned_textbox_size_request;
- widget_class->size_allocate = ui_skinned_textbox_size_allocate;
- widget_class->button_press_event = ui_skinned_textbox_button_press;
- widget_class->button_release_event = ui_skinned_textbox_button_release;
- widget_class->motion_notify_event = ui_skinned_textbox_motion_notify;
-
- klass->clicked = NULL;
- klass->double_clicked = NULL;
- klass->right_clicked = NULL;
- klass->scaled = ui_skinned_textbox_toggle_scaled;
-
- textbox_signals[CLICKED] =
- g_signal_new ("clicked", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedTextboxClass, clicked), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
- textbox_signals[DOUBLE_CLICKED] =
- g_signal_new ("double-clicked", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedTextboxClass, double_clicked), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
- textbox_signals[RIGHT_CLICKED] =
- g_signal_new ("right-clicked", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedTextboxClass, right_clicked), NULL, NULL,
- g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-
- textbox_signals[DOUBLED] =
- g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSkinnedTextboxClass, scaled), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
- g_type_class_add_private (gobject_class, sizeof (UiSkinnedTextboxPrivate));
-}
-
-static void ui_skinned_textbox_init(UiSkinnedTextbox *textbox) {
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
- priv->move_x = 0;
- priv->move_y = 0;
-
- textbox->event_window = NULL;
- GTK_WIDGET_SET_FLAGS (textbox, GTK_NO_WINDOW);
-}
-
-GtkWidget* ui_skinned_textbox_new(GtkWidget *fixed, gint x, gint y, gint w, gboolean allow_scroll, SkinPixmapId si) {
- UiSkinnedTextbox *textbox = g_object_new (ui_skinned_textbox_get_type (), NULL);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
-
- textbox->height = aud_active_skin->properties.textbox_bitmap_font_height;
- textbox->x = x;
- textbox->y = y;
- textbox->text = g_strdup("");
- textbox->width = w;
- priv->scroll_allowed = allow_scroll;
- priv->scroll_enabled = TRUE;
- priv->skin_index = si;
- priv->nominal_y = y;
- priv->nominal_height = textbox->height;
- priv->scroll_timeout = 0;
- priv->scroll_dummy = 0;
-
- priv->scaled = FALSE;
+#include "ui_skin.h"
+#include "ui_skinned_textbox.h"
 
- gtk_fixed_put(GTK_FIXED(fixed), GTK_WIDGET(textbox), textbox->x, textbox->y);
+#define TIMEOUT 30
+#define DELAY 50
 
- return GTK_WIDGET(textbox);
-}
+typedef struct {
+ gint width;
+ gchar * text;
+ PangoFontDescription * font;
+ cairo_surface_t * buf;
+ gint buf_width;
+ gboolean may_scroll, scrolling, backward;
+ gint scroll_source;
+ gint offset, delay;
+} TextboxData;
+
+static GList * textboxes;
+
+DRAW_FUNC_BEGIN (textbox_draw)
+ TextboxData * data = g_object_get_data ((GObject *) wid, "textboxdata");
+ g_return_val_if_fail (data && data->buf, FALSE);
+
+ if (data->scrolling)
+ {
+ cairo_set_source_surface (cr, data->buf, -data->offset, 0);
+ cairo_paint (cr);
+
+ if (-data->offset + data->buf_width < data->width)
+ {
+ cairo_set_source_surface (cr, data->buf, -data->offset +
+ data->buf_width, 0);
+ cairo_paint (cr);
+ }
+ }
+ else
+ {
+ cairo_set_source_surface (cr, data->buf, 0, 0);
+ cairo_paint (cr);
+ }
+DRAW_FUNC_END
 
-static void ui_skinned_textbox_destroy(GtkObject *object) {
- UiSkinnedTextbox *textbox;
- UiSkinnedTextboxPrivate *priv;
+static gboolean textbox_scroll (GtkWidget * textbox)
+{
+ TextboxData * data = g_object_get_data ((GObject *) textbox, "textboxdata");
+ g_return_val_if_fail (data, FALSE);
 
- g_return_if_fail (object != NULL);
- g_return_if_fail (UI_SKINNED_IS_TEXTBOX (object));
+ if (data->delay < DELAY)
+ {
+ data->delay ++;
+ return TRUE;
+ }
 
- textbox = UI_SKINNED_TEXTBOX (object);
- priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(object);
+ if (config.twoway_scroll && data->backward)
+ data->offset --;
+ else
+ data->offset ++;
 
- if (priv->scroll_timeout) {
- g_source_remove(priv->scroll_timeout);
- priv->scroll_timeout = 0;
+ if (config.twoway_scroll && (data->backward ? (data->offset <= 0) :
+ (data->offset + data->width >= data->buf_width)))
+ {
+ data->backward = ! data->backward;
+ data->delay = 0;
 }
 
- g_free (textbox->text);
- textbox->text = NULL;
- g_free (priv->pixbuf_text);
- priv->pixbuf_text = NULL;
- g_free (priv->fontname);
- priv->fontname = NULL;
+ if (! config.twoway_scroll && data->offset >= data->buf_width)
+ data->offset = 0;
 
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ gtk_widget_queue_draw (textbox);
+ return TRUE;
 }
 
-static void ui_skinned_textbox_realize(GtkWidget *widget) {
- UiSkinnedTextbox *textbox;
- GdkWindowAttr attributes;
- gint attributes_mask;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (UI_SKINNED_IS_TEXTBOX(widget));
+static void textbox_render_vector (GtkWidget * textbox, TextboxData * data,
+ const gchar * text)
+{
+ g_return_if_fail (data->font && ! data->buf && text);
 
- if (GTK_WIDGET_CLASS (parent_class)->realize)
- (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
+ PangoLayout * layout = gtk_widget_create_pango_layout (textbox, text);
+ pango_layout_set_font_description (layout, data->font);
 
- textbox = UI_SKINNED_TEXTBOX(widget);
+ PangoRectangle rect;
+ pango_layout_get_pixel_extents (layout, NULL, & rect);
+ gint crop = (rect.height + 2) / 5;
 
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_ONLY;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.event_mask = gtk_widget_get_events(widget);
- attributes.event_mask |= GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK |
- GDK_POINTER_MOTION_HINT_MASK;
+ gtk_widget_set_size_request (textbox, data->width, rect.height - crop);
 
- attributes_mask = GDK_WA_X | GDK_WA_Y;
- textbox->event_window = gdk_window_new (widget->window, &attributes, attributes_mask);
+ data->buf_width = MAX (rect.width, data->width);
+ data->buf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+ data->buf_width, rect.height - crop);
 
- widget->style = gtk_style_attach(widget->style, widget->window);
+ cairo_t * cr = cairo_create (data->buf);
 
- gdk_window_set_user_data(textbox->event_window, widget);
-}
+ set_cairo_color (cr, active_skin->colors[SKIN_TEXTBG]);
+ cairo_paint (cr);
 
-static void ui_skinned_textbox_unrealize(GtkWidget *widget) {
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX(widget);
+ cairo_move_to (cr, 0, -crop);
+ set_cairo_color (cr, active_skin->colors[SKIN_TEXTFG]);
+ pango_cairo_show_layout (cr, layout);
 
- if ( textbox->event_window != NULL )
- {
- gdk_window_set_user_data( textbox->event_window , NULL );
- gdk_window_destroy( textbox->event_window );
- textbox->event_window = NULL;
- }
-
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+ cairo_destroy (cr);
+ g_object_unref (layout);
 }
 
-static void ui_skinned_textbox_map (GtkWidget *widget)
+static void lookup_char (const gchar c, gint * x, gint * y)
 {
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget);
+ gint tx, ty;
 
- if (textbox->event_window != NULL)
- gdk_window_show (textbox->event_window);
+ switch (c)
+ {
+ case '"': tx = 26; ty = 0; break;
+ case '@': tx = 27; ty = 0; break;
+ case ' ': tx = 29; ty = 0; break;
+ case ':':
+ case ';':
+ case '|': tx = 12; ty = 1; break;
+ case '(':
+ case '{': tx = 13; ty = 1; break;
+ case ')':
+ case '}': tx = 14; ty = 1; break;
+ case '-':
+ case '~': tx = 15; ty = 1; break;
+ case '`':
+ case '\'': tx = 16; ty = 1; break;
+ case '!': tx = 17; ty = 1; break;
+ case '_': tx = 18; ty = 1; break;
+ case '+': tx = 19; ty = 1; break;
+ case '\\': tx = 20; ty = 1; break;
+ case '/': tx = 21; ty = 1; break;
+ case '[': tx = 22; ty = 1; break;
+ case ']': tx = 23; ty = 1; break;
+ case '^': tx = 24; ty = 1; break;
+ case '&': tx = 25; ty = 1; break;
+ case '%': tx = 26; ty = 1; break;
+ case '.':
+ case ',': tx = 27; ty = 1; break;
+ case '=': tx = 28; ty = 1; break;
+ case '$': tx = 29; ty = 1; break;
+ case '#': tx = 30; ty = 1; break;
+ case '?': tx = 3; ty = 2; break;
+ case '*': tx = 4; ty = 2; break;
+ default: tx = 3; ty = 2; break; /* '?' */
+ }
 
- if (GTK_WIDGET_CLASS (parent_class)->map)
- (* GTK_WIDGET_CLASS (parent_class)->map) (widget);
+ * x = tx * active_skin->properties.textbox_bitmap_font_width;
+ * y = ty * active_skin->properties.textbox_bitmap_font_height;
 }
 
-static void ui_skinned_textbox_unmap (GtkWidget *widget)
+static void textbox_render_bitmap (GtkWidget * textbox, TextboxData * data,
+ const gchar * text)
 {
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget);
-
- if (textbox->event_window != NULL)
- gdk_window_hide (textbox->event_window);
+ g_return_if_fail (! data->font && ! data->buf && text);
 
- if (GTK_WIDGET_CLASS (parent_class)->unmap)
- (* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
-}
-
-static void ui_skinned_textbox_size_request(GtkWidget *widget, GtkRequisition *requisition) {
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX(widget);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
+ gint cw = active_skin->properties.textbox_bitmap_font_width;
+ gint ch = active_skin->properties.textbox_bitmap_font_height;
 
- requisition->width = textbox->width*(priv->scaled ? config.scale_factor : 1);
- requisition->height = textbox->height*(priv->scaled ? config.scale_factor : 1 );
-}
+ gtk_widget_set_size_request (textbox, data->width, ch);
 
-static void ui_skinned_textbox_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
-
- widget->allocation = *allocation;
- widget->allocation.x *= (priv->scaled ? config.scale_factor : 1);
- widget->allocation.y *= (priv->scaled ? config.scale_factor : 1);
- if (GTK_WIDGET_REALIZED (widget))
- if (textbox->event_window)
- gdk_window_move_resize(textbox->event_window, widget->allocation.x, widget->allocation.y, allocation->width, allocation->height);
-
- if (textbox->x + priv->move_x - widget->allocation.x/(priv->scaled ? config.scale_factor : 1) <3);
- priv->move_x = 0;
- if (textbox->y + priv->move_y - widget->allocation.y/(priv->scaled ? config.scale_factor : 1) <3);
- priv->move_y = 0;
- textbox->x = widget->allocation.x/(priv->scaled ? config.scale_factor : 1);
- textbox->y = widget->allocation.y/(priv->scaled ? config.scale_factor : 1);
-
- if (textbox->width - (guint) (widget->allocation.width / (priv->scaled ? config.scale_factor : 1)) > 2) {
- textbox->width = (guint) (widget->allocation.width / (priv->scaled ? config.scale_factor : 1));
- if (priv->pixbuf_text) g_free(priv->pixbuf_text);
- priv->pixbuf_text = NULL;
- priv->offset = 0;
- gtk_widget_set_size_request(widget, textbox->width, textbox->height);
-
- if (widget_really_drawable (widget))
- ui_skinned_textbox_expose (widget, 0);
- }
-}
+ glong len;
+ gunichar * utf32 = g_utf8_to_ucs4 (text, -1, NULL, & len, NULL);
+ g_return_if_fail (utf32);
 
-static gboolean ui_skinned_textbox_expose(GtkWidget *widget, GdkEventExpose *event) {
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
- g_return_val_if_fail (textbox->width > 0 && textbox->height > 0, FALSE);
+ data->buf_width = MAX (cw * len, data->width);
+ data->buf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+ data->buf_width, ch);
 
- GdkPixbuf *obj = NULL;
- gint cw;
+ cairo_t * cr = cairo_create (data->buf);
 
- if (textbox->text && (!priv->pixbuf_text || strcmp(textbox->text, priv->pixbuf_text)))
- textbox_generate_pixmap(textbox);
-
- if (priv->pixbuf) {
- if (skin_get_id() != priv->skin_id) {
- priv->skin_id = skin_get_id();
- textbox_generate_pixmap(textbox);
- }
- obj = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, textbox->width, textbox->height);
-
- if (config.twoway_scroll) { // twoway scroll
- cw = priv->pixbuf_width - priv->offset;
- if (cw > textbox->width)
- cw = textbox->width;
- gdk_pixbuf_copy_area(priv->pixbuf, priv->offset, 0, cw, textbox->height, obj, 0, 0);
- if (cw < textbox->width)
- gdk_pixbuf_copy_area(priv->pixbuf, 0, 0, textbox->width - cw, textbox->height,
- obj, textbox->width - cw, textbox->height);
- } else { // oneway scroll
- int cw1, cw2;
-
- if (priv->offset >= priv->pixbuf_width)
- priv->offset = 0;
-
- if (priv->pixbuf_width - priv->offset > textbox->width) { // case1
- cw1 = textbox->width;
- gdk_pixbuf_copy_area(priv->pixbuf, priv->offset, 0, cw1, textbox->height,
- obj, 0, 0);
- } else { // case 2
- cw1 = priv->pixbuf_width - priv->offset;
- gdk_pixbuf_copy_area(priv->pixbuf, priv->offset, 0, cw1, textbox->height, obj, 0, 0);
- cw2 = textbox->width - cw1;
- gdk_pixbuf_copy_area(priv->pixbuf, 0, 0, cw2, textbox->height, obj, cw1, 0);
- }
+ gunichar * s = utf32;
+ for (gint x = 0; x < data->buf_width; x += cw)
+ {
+ gunichar c = * s ? * s ++ : ' ';
+ gint cx = 0, cy = 0;
+
+ if (c >= 'A' && c <= 'Z')
+ cx = cw * (c - 'A');
+ else if (c >= 'a' && c <= 'z')
+ cx = cw * (c - 'a');
+ else if (c >= '0' && c <= '9')
+ {
+ cx = cw * (c - '0');
+ cy = ch;
 }
+ else
+ lookup_char (c, & cx, & cy);
 
- ui_skinned_widget_draw_with_coordinates(widget, obj, textbox->width, textbox->height,
- widget->allocation.x,
- widget->allocation.y,
- priv->scaled);
-
- g_object_unref(obj);
- }
-
- return FALSE;
-}
-
-static gboolean ui_skinned_textbox_button_press(GtkWidget *widget, GdkEventButton *event) {
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (UI_SKINNED_IS_TEXTBOX (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
-
- if (event->type == GDK_BUTTON_PRESS) {
- textbox = UI_SKINNED_TEXTBOX(widget);
- if (event->button == 3 && !g_signal_has_handler_pending(widget, textbox_signals[RIGHT_CLICKED], 0, TRUE))
- return FALSE;
- else if (event->button == 1) {
- if (priv->scroll_allowed) {
- if ((priv->pixbuf_width > textbox->width) && priv->is_scrollable) {
- priv->is_dragging = TRUE;
- priv->drag_off = priv->offset;
- priv->drag_x = event->x;
- }
- } else
- g_signal_emit(widget, textbox_signals[CLICKED], 0);
-
- } else if (event->button == 3) {
- g_signal_emit(widget, textbox_signals[RIGHT_CLICKED], 0, event);
- } else
- priv->is_dragging = FALSE;
- } else if (event->type == GDK_2BUTTON_PRESS) {
- if (event->button == 1) {
- if (g_signal_has_handler_pending(widget, textbox_signals[DOUBLE_CLICKED], 0, TRUE))
- g_signal_emit(widget, textbox_signals[DOUBLE_CLICKED], 0);
- else
- return FALSE;
- }
+ skin_draw_pixbuf (cr, SKIN_TEXT, cx, cy, x, 0, cw, ch);
 }
 
- return TRUE;
+ cairo_destroy (cr);
+ g_free (utf32);
 }
 
-static gboolean ui_skinned_textbox_button_release(GtkWidget *widget, GdkEventButton *event) {
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(widget);
+static void textbox_render (GtkWidget * textbox, TextboxData * data)
+{
+ g_return_if_fail (data->text);
 
- if (event->button == 1) {
- priv->is_dragging = FALSE;
+ if (data->buf)
+ {
+ cairo_surface_destroy (data->buf);
+ data->buf = NULL;
 }
 
- return TRUE;
-}
+ data->scrolling = FALSE;
+ data->backward = FALSE;
+ data->offset = 0;
+ data->delay = 0;
 
-static gboolean ui_skinned_textbox_motion_notify(GtkWidget *widget, GdkEventMotion *event) {
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (UI_SKINNED_IS_TEXTBOX (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX(widget);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(widget);
+ if (data->font)
+ textbox_render_vector (textbox, data, data->text);
+ else
+ textbox_render_bitmap (textbox, data, data->text);
 
- if (priv->is_dragging) {
- if (priv->scroll_allowed &&
- priv->pixbuf_width > textbox->width) {
- priv->offset = priv->drag_off - (event->x - priv->drag_x);
+ if (data->may_scroll && data->buf_width > data->width)
+ {
+ data->scrolling = TRUE;
+
+ if (! config.twoway_scroll)
+ {
+ if (data->buf)
+ {
+ cairo_surface_destroy (data->buf);
+ data->buf = NULL;
+ }
 
- while (priv->offset < 0)
- priv->offset = 0;
+ gchar * temp = g_strdup_printf ("%s --- ", data->text);
 
- while (priv->offset > (priv->pixbuf_width - textbox->width))
- priv->offset = (priv->pixbuf_width - textbox->width);
+ if (data->font)
+ textbox_render_vector (textbox, data, temp);
+ else
+ textbox_render_bitmap (textbox, data, temp);
 
- if (widget_really_drawable (widget))
- ui_skinned_textbox_expose (widget, 0);
+ g_free (temp);
 }
 }
 
- return TRUE;
-}
-
-static void ui_skinned_textbox_toggle_scaled(UiSkinnedTextbox *textbox) {
- GtkWidget *widget = GTK_WIDGET (textbox);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
-
- priv->scaled = !priv->scaled;
-
- gtk_widget_set_size_request(widget, textbox->width*(priv->scaled ? config.scale_factor : 1 ),
- textbox->height*(priv->scaled ? config.scale_factor : 1 ));
-
- if (widget_really_drawable (widget))
- ui_skinned_textbox_expose (widget, 0);
-}
-
-static gboolean ui_skinned_textbox_should_scroll(UiSkinnedTextbox *textbox) {
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
-
- if (!priv->scroll_allowed)
- return FALSE;
-
- if (priv->font) {
- gint width;
- text_get_extents(priv->fontname, textbox->text, &width, NULL, NULL, NULL);
-
- if (width <= textbox->width)
- return FALSE;
- else
- return TRUE;
- }
-
- if (g_utf8_strlen(textbox->text, -1) * aud_active_skin->properties.textbox_bitmap_font_width > textbox->width)
- return TRUE;
-
- return FALSE;
-}
-
-void ui_skinned_textbox_set_xfont(GtkWidget *widget, gboolean use_xfont, const gchar * fontname) {
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
-
- gint ascent, descent;
+ gtk_widget_queue_draw (textbox);
 
- g_return_if_fail(textbox != NULL);
- gtk_widget_queue_resize (widget);
-
- if (priv->font) {
- pango_font_description_free(priv->font);
- priv->font = NULL;
+ if (data->scrolling)
+ {
+ if (! data->scroll_source)
+ data->scroll_source = g_timeout_add (TIMEOUT, (GSourceFunc)
+ textbox_scroll, textbox);
 }
-
- textbox->y = priv->nominal_y;
- textbox->height = priv->nominal_height;
-
- /* Make sure the pixmap is regenerated */
- if (priv->pixbuf_text) {
- g_free(priv->pixbuf_text);
- priv->pixbuf_text = NULL;
+ else
+ {
+ if (data->scroll_source)
+ {
+ g_source_remove (data->scroll_source);
+ data->scroll_source = 0;
+ }
 }
+}
 
- if (!use_xfont || strlen(fontname) == 0)
- return;
-
- priv->font = pango_font_description_from_string(fontname);
- g_free (priv->fontname);
- priv->fontname = g_strdup(fontname);
-
- text_get_extents(fontname,
- "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz ",
- NULL, NULL, &ascent, &descent);
+void textbox_set_width (GtkWidget * textbox, gint width)
+{
+ TextboxData * data = g_object_get_data ((GObject *) textbox, "textboxdata");
+ g_return_if_fail (data);
 
- if (priv->font == NULL)
+ if (data->width == width)
 return;
 
- textbox->height = ascent - descent;
- priv->crop = textbox->height / 5;
- textbox->height -= priv->crop;
+ data->width = width;
+ textbox_render (textbox, data);
 }
 
-void ui_skinned_textbox_set_text(GtkWidget *widget, const gchar *text) {
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
-
- if (!strcmp(textbox->text, text))
- return;
- if (textbox->text)
- g_free(textbox->text);
-
- textbox->text = str_to_utf8(text);
- priv->scroll_back = FALSE;
+const gchar * textbox_get_text (GtkWidget * textbox)
+{
+ TextboxData * data = g_object_get_data ((GObject *) textbox, "textboxdata");
+ g_return_val_if_fail (data, NULL);
 
- if (widget_really_drawable (widget))
- ui_skinned_textbox_expose (widget, 0);
+ return data->text;
 }
 
-static void textbox_generate_xfont_pixmap(UiSkinnedTextbox *textbox, const gchar *pixmaptext) {
- /* FIXME: should operate directly on priv->pixbuf, it shouldn't use pixmap */
- gint i;
- GdkGC *gc, *maskgc;
- GdkColor *c, pattern;
- GdkBitmap *mask;
- PangoLayout *layout;
- gint width;
- GdkPixmap *pixmap;
-
- g_return_if_fail(textbox != NULL);
- g_return_if_fail(pixmaptext != NULL);
- g_return_if_fail(textbox->height > 0);
-
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
-
- text_get_extents(priv->fontname, pixmaptext, &width, NULL, NULL, NULL);
-
- priv->pixbuf_width = MAX(width, textbox->width);
- pixmap = gdk_pixmap_new(mainwin->window, priv->pixbuf_width,
- textbox->height,
- gdk_rgb_get_visual()->depth);
- gc = gdk_gc_new(pixmap);
- c = skin_get_color(aud_active_skin, SKIN_TEXTBG);
- for (i = 0; i < textbox->height; i++) {
- gdk_gc_set_foreground(gc, &c[6 * i / textbox->height]);
- gdk_draw_line(pixmap, gc, 0, i, priv->pixbuf_width, i);
- }
-
- mask = gdk_pixmap_new(mainwin->window, priv->pixbuf_width, textbox->height, 1);
- maskgc = gdk_gc_new(mask);
- pattern.pixel = 0;
- gdk_gc_set_foreground(maskgc, &pattern);
-
- gdk_draw_rectangle(mask, maskgc, TRUE, 0, 0, priv->pixbuf_width, textbox->height);
- pattern.pixel = 1;
- gdk_gc_set_foreground(maskgc, &pattern);
+void textbox_set_text (GtkWidget * textbox, const gchar * text)
+{
+ TextboxData * data = g_object_get_data ((GObject *) textbox, "textboxdata");
+ g_return_if_fail (data);
 
- gdk_gc_set_foreground(gc, skin_get_color(aud_active_skin, SKIN_TEXTFG));
+ if (! text)
+ text = "";
 
- layout = gtk_widget_create_pango_layout(mainwin, pixmaptext);
- pango_layout_set_font_description(layout, priv->font);
+ if (data->text && ! strcmp (data->text, text))
+ return;
 
- gdk_draw_layout (pixmap, gc, 0, - priv->crop, layout);
- g_object_unref(layout);
+ g_free (data->text);
+ data->text = g_strdup (text);
+ textbox_render (textbox, data);
+}
 
- g_object_unref(maskgc);
+void textbox_set_font (GtkWidget * textbox, const gchar * font)
+{
+ TextboxData * data = g_object_get_data ((GObject *) textbox, "textboxdata");
+ g_return_if_fail (data);
 
- gdk_gc_set_clip_mask(gc, mask);
- c = skin_get_color(aud_active_skin, SKIN_TEXTFG);
- for (i = 0; i < textbox->height; i++) {
- gdk_gc_set_foreground(gc, &c[6 * i / textbox->height]);
- gdk_draw_line(pixmap, gc, 0, i, priv->pixbuf_width, i);
+ if (data->font)
+ {
+ pango_font_description_free (data->font);
+ data->font = NULL;
 }
- priv->pixbuf = gdk_pixbuf_get_from_drawable(NULL, pixmap, gdk_colormap_get_system(), 0, 0, 0, 0, priv->pixbuf_width, textbox->height);
- g_object_unref(mask);
- g_object_unref(gc);
-}
 
-static gboolean textbox_scroll(gpointer data) {
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX(data);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
-
- if (!priv->is_dragging) {
- if (priv->scroll_dummy < TEXTBOX_SCROLL_WAIT)
- priv->scroll_dummy++;
- else {
- if(config.twoway_scroll) {
- if (priv->scroll_back)
- priv->offset -= 1;
- else
- priv->offset += 1;
-
- if (priv->offset >= (priv->pixbuf_width - textbox->width)) {
- priv->scroll_back = TRUE;
- priv->scroll_dummy = 0;
- priv->offset = priv->pixbuf_width - textbox->width;
- }
- if (priv->offset <= 0) {
- priv->scroll_back = FALSE;
- priv->scroll_dummy = 0;
- priv->offset = 0;
- }
- }
- else { // oneway scroll
- priv->scroll_back = FALSE;
- priv->offset += 1;
- }
+ if (font)
+ data->font = pango_font_description_from_string (font);
 
- if (widget_really_drawable (data))
- ui_skinned_textbox_expose (data, 0);
- }
- }
- return TRUE;
+ textbox_render (textbox, data);
 }
 
-static void textbox_generate_pixmap(UiSkinnedTextbox *textbox) {
- gint length, i, x, y, wl;
- gchar *pixmaptext;
- gchar *tmp, *stxt;
+void textbox_set_scroll (GtkWidget * textbox, gboolean scroll)
+{
+ TextboxData * data = g_object_get_data ((GObject *) textbox, "textboxdata");
+ g_return_if_fail (data);
 
- g_return_if_fail(textbox != NULL);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
+ if (data->may_scroll == scroll)
+ return;
 
- if (priv->pixbuf) {
- g_object_unref(priv->pixbuf);
- priv->pixbuf = NULL;
- }
+ data->may_scroll = scroll;
+ textbox_render (textbox, data);
+}
 
- /*
- * Don't reset the offset if only text after the last '(' has
- * changed. This is a hack to avoid visual noice on vbr files
- * where we guess the length.
- */
- if (!(priv->pixbuf_text && strrchr(textbox->text, '(') &&
- !strncmp(priv->pixbuf_text, textbox->text,
- strrchr(textbox->text, '(') - textbox->text)))
- priv->offset = 0;
-
- g_free(priv->pixbuf_text);
- priv->pixbuf_text = g_strdup(textbox->text);
-
- /*
- * wl is the number of (partial) letters visible. Only makes
- * sense when using skinned font.
- */
- wl = textbox->width / 5;
- if (wl * 5 != textbox->width)
- wl++;
-
- length = g_utf8_strlen(textbox->text, -1);
-
- priv->is_scrollable = FALSE;
-
- priv->is_scrollable = ui_skinned_textbox_should_scroll(textbox);
-
- if (priv->is_scrollable) {
- if(!config.twoway_scroll) {
- pixmaptext = g_strdup_printf("%s *** ", priv->pixbuf_text);
- length += 5;
- } else
- pixmaptext = g_strdup(priv->pixbuf_text);
- } else
- if (!priv->font && length <= wl) {
- gint pad = wl - length;
- gchar *padchars = g_strnfill(pad, ' ');
-
- pixmaptext = g_strconcat(priv->pixbuf_text, padchars, NULL);
- g_free(padchars);
- length += pad;
- } else
- pixmaptext = g_strdup(priv->pixbuf_text);
-
- if (priv->is_scrollable) {
- if (priv->scroll_enabled && !priv->scroll_timeout) {
- gint tag;
- tag = TEXTBOX_SCROLL_SMOOTH_TIMEOUT;
- priv->scroll_timeout = g_timeout_add(tag, textbox_scroll, textbox);
- }
- } else {
- if (priv->scroll_timeout) {
- g_source_remove(priv->scroll_timeout);
- priv->scroll_timeout = 0;
- }
- priv->offset = 0;
- }
+static void textbox_destroy (GtkWidget * textbox)
+{
+ TextboxData * data = g_object_get_data ((GObject *) textbox, "textboxdata");
+ g_return_if_fail (data);
 
- if (priv->font) {
- textbox_generate_xfont_pixmap(textbox, pixmaptext);
- g_free(pixmaptext);
- return;
- }
+ if (data->font)
+ pango_font_description_free (data->font);
+ if (data->buf)
+ cairo_surface_destroy (data->buf);
+ if (data->scroll_source)
+ g_source_remove (data->scroll_source);
 
- priv->pixbuf_width = length * aud_active_skin->properties.textbox_bitmap_font_width;
- priv->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
- priv->pixbuf_width, aud_active_skin->properties.textbox_bitmap_font_height);
-
- for (tmp = stxt = g_utf8_strup(pixmaptext, -1), i = 0;
- tmp != NULL && i < length; i++, tmp = g_utf8_next_char(tmp)) {
- gchar c = *tmp;
- x = y = -1;
- if (c >= 'A' && c <= 'Z') {
- x = aud_active_skin->properties.textbox_bitmap_font_width * (c - 'A');
- y = 0;
- }
- else if (c >= '0' && c <= '9') {
- x = aud_active_skin->properties.textbox_bitmap_font_width * (c - '0');
- y = aud_active_skin->properties.textbox_bitmap_font_height;
- }
- else
- textbox_handle_special_char(tmp, &x, &y);
+ g_free (data->text);
+ g_free (data);
 
- skin_draw_pixbuf(GTK_WIDGET(textbox), aud_active_skin,
- priv->pixbuf, priv->skin_index,
- x, y, i * aud_active_skin->properties.textbox_bitmap_font_width, 0,
- aud_active_skin->properties.textbox_bitmap_font_width,
- aud_active_skin->properties.textbox_bitmap_font_height);
- }
- g_free(stxt);
- g_free(pixmaptext);
+ textboxes = g_list_remove (textboxes, textbox);
 }
 
-void ui_skinned_textbox_set_scroll(GtkWidget *widget, gboolean scroll) {
- g_return_if_fail(widget != NULL);
- g_return_if_fail(UI_SKINNED_IS_TEXTBOX(widget));
-
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX(widget);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
+GtkWidget * textbox_new (gint width, const gchar * text, const gchar * font,
+ gboolean scroll)
+{
+ GtkWidget * textbox = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (textbox, width, 0);
+ gtk_widget_add_events (textbox, GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK);
 
- priv->scroll_enabled = scroll;
- if (priv->scroll_enabled && priv->is_scrollable && priv->scroll_allowed) {
- gint tag;
- tag = TEXTBOX_SCROLL_SMOOTH_TIMEOUT;
- if (priv->scroll_timeout) {
- g_source_remove(priv->scroll_timeout);
- priv->scroll_timeout = 0;
- }
- priv->scroll_timeout = g_timeout_add(tag, textbox_scroll, textbox);
+ DRAW_CONNECT (textbox, textbox_draw);
+ g_signal_connect (textbox, "destroy", (GCallback) textbox_destroy, NULL);
 
- } else {
+ TextboxData * data = g_malloc0 (sizeof (TextboxData));
+ data->width = width;
+ data->text = g_strdup (text);
+ data->may_scroll = scroll;
+ g_object_set_data ((GObject *) textbox, "textboxdata", data);
 
- if (priv->scroll_timeout) {
- g_source_remove(priv->scroll_timeout);
- priv->scroll_timeout = 0;
- }
+ if (font)
+ data->font = pango_font_description_from_string (font);
 
- priv->offset = 0;
+ textboxes = g_list_prepend (textboxes, textbox);
 
- if (widget_really_drawable (widget))
- ui_skinned_textbox_expose (widget, 0);
- }
+ textbox_render (textbox, data);
+ return textbox;
 }
 
-static void textbox_handle_special_char(gchar *c, gint * x, gint * y) {
- gint tx, ty;
-
- switch (*c) {
- case '"':
- tx = 26;
- ty = 0;
- break;
- case '\r':
- tx = 10;
- ty = 1;
- break;
- case ':':
- case ';':
- tx = 12;
- ty = 1;
- break;
- case '(':
- tx = 13;
- ty = 1;
- break;
- case ')':
- tx = 14;
- ty = 1;
- break;
- case '-':
- tx = 15;
- ty = 1;
- break;
- case '`':
- case '\'':
- tx = 16;
- ty = 1;
- break;
- case '!':
- tx = 17;
- ty = 1;
- break;
- case '_':
- tx = 18;
- ty = 1;
- break;
- case '+':
- tx = 19;
- ty = 1;
- break;
- case '\\':
- tx = 20;
- ty = 1;
- break;
- case '/':
- tx = 21;
- ty = 1;
- break;
- case '[':
- tx = 22;
- ty = 1;
- break;
- case ']':
- tx = 23;
- ty = 1;
- break;
- case '^':
- tx = 24;
- ty = 1;
- break;
- case '&':
- tx = 25;
- ty = 1;
- break;
- case '%':
- tx = 26;
- ty = 1;
- break;
- case '.':
- case ',':
- tx = 27;
- ty = 1;
- break;
- case '=':
- tx = 28;
- ty = 1;
- break;
- case '$':
- tx = 29;
- ty = 1;
- break;
- case '#':
- tx = 30;
- ty = 1;
- break;
- case '?':
- tx = 3;
- ty = 2;
- break;
- case '*':
- tx = 4;
- ty = 2;
- break;
- default:
- tx = 29;
- ty = 0;
- break;
- }
-
- const gchar *change[] = {"Ą", "A", "Ę", "E", "Ć", "C", "Ł", "L", "Ó", "O", "Ś", "S", "Ż", "Z", "Ź", "Z",
- "Ń", "N", "Ü", "U", NULL};
- int i;
- for (i = 0; change[i]; i+=2) {
- if (!strncmp(c, change[i], strlen(change[i]))) {
- tx = (*change[i+1] - 'A');
- break;
- }
- }
+void textbox_update_all (void)
+{
+ for (GList * node = textboxes; node; node = node->next)
+ {
+ GtkWidget * textbox = node->data;
+ g_return_if_fail (textbox);
+ TextboxData * data = g_object_get_data ((GObject *) textbox,
+ "textboxdata");
+ g_return_if_fail (data);
 
- /* those are commonly included into skins */
- if (!strncmp(c, "Å", strlen("Å"))) {
- tx = 0;
- ty = 2;
- } else if (!strncmp(c, "Ö", strlen("Ö"))) {
- tx = 1;
- ty = 2;
- } else if (!strncmp(c, "Ä", strlen("Ä"))) {
- tx = 2;
- ty = 2;
+ textbox_render (textbox, data);
 }
-
- *x = tx * aud_active_skin->properties.textbox_bitmap_font_width;
- *y = ty * aud_active_skin->properties.textbox_bitmap_font_height;
-}
-
-void ui_skinned_textbox_move_relative(GtkWidget *widget, gint x, gint y) {
- UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX(widget);
- UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(widget);
- priv->move_x += x;
- priv->move_y += y;
- gtk_fixed_move(GTK_FIXED(gtk_widget_get_parent(widget)), widget,
- textbox->x+priv->move_x, textbox->y+priv->move_y);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_textbox.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_textbox.h Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - a cross-platform multimedia player
 * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,48 +25,19 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_SKINNED_TEXTBOX_H
-#define AUDACIOUS_UI_SKINNED_TEXTBOX_H
+#ifndef SKINS_UI_SKINNED_TEXTBOX_H
+#define SKINS_UI_SKINNED_TEXTBOX_H
 
 #include <gtk/gtk.h>
-#include "ui_skin.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UI_SKINNED_TEXTBOX(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_textbox_get_type (), UiSkinnedTextbox)
-#define UI_SKINNED_TEXTBOX_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_textbox_get_type (), UiSkinnedTextboxClass)
-#define UI_SKINNED_IS_TEXTBOX(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_textbox_get_type ())
-
-typedef struct _UiSkinnedTextbox UiSkinnedTextbox;
-typedef struct _UiSkinnedTextboxClass UiSkinnedTextboxClass;
-
-struct _UiSkinnedTextbox {
- GtkWidget widget;
+GtkWidget * textbox_new (gint width, const gchar * text, const gchar * font,
+ gboolean scroll);
+void textbox_set_width (GtkWidget * textbox, gint width);
+const gchar * textbox_get_text (GtkWidget * textbox);
+void textbox_set_text (GtkWidget * textbox, const gchar * text);
+void textbox_set_font (GtkWidget * textbox, const gchar * font);
+void textbox_set_scroll (GtkWidget * textbox, gboolean scroll);
 
- GdkWindow *event_window;
- gint x, y, width, height;
- gchar *text;
-};
+void textbox_update_all (void);
 
-struct _UiSkinnedTextboxClass {
- GtkWidgetClass parent_class;
- void (* clicked) (UiSkinnedTextbox *textbox);
- void (* double_clicked) (UiSkinnedTextbox *textbox);
- void (* right_clicked) (UiSkinnedTextbox *textbox);
- void (* scaled) (UiSkinnedTextbox *textbox);
-};
-
-GtkWidget* ui_skinned_textbox_new (GtkWidget *fixed, gint x, gint y, gint w, gboolean allow_scroll, SkinPixmapId si);
-GType ui_skinned_textbox_get_type(void);
-void ui_skinned_textbox_set_xfont(GtkWidget *widget, gboolean use_xfont, const gchar * fontname);
-void ui_skinned_textbox_set_text(GtkWidget *widget, const gchar *text);
-void ui_skinned_textbox_set_scroll(GtkWidget *widget, gboolean scroll);
-void ui_skinned_textbox_move_relative(GtkWidget *widget, gint x, gint y);
-
-#ifdef __cplusplus
-}
 #endif
-
-#endif /* AUDACIOUS_UI_SKINNED_TEXTBOX_H */

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_window.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_window.c Changed

@@ -1,304 +1,195 @@
 /*
- * Audacious: A cross-platform multimedia player
- * Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
+ * ui_skinned_window.c
+ * Copyright 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 as published by
- * the Free Software Foundation; under version 3 of the License.
+ * This file is part of Audacious.
 *
- * 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.
+ * 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.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses>.
+ * 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.
 *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
+ * 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 <gtk/gtkmain.h>
-#include <glib-object.h>
-#include <glib/gmacros.h>
-#include <gtk/gtkmarshal.h>
-#include <gtk/gtkwindow.h>
-#include <string.h>
-#include <audacious/plugin.h>
-#include "platform/smartinclude.h"
-#include "ui_skin.h"
-#include "skins_cfg.h"
+#include "draw-compat.h"
 #include "ui_dock.h"
 #include "ui_skinned_window.h"
-#include "ui_main.h"
-#include "ui_playlist.h"
 
-static void ui_skinned_window_class_init(SkinnedWindowClass *klass);
-static void ui_skinned_window_init(GtkWidget *widget);
-static void ui_skinned_window_show(GtkWidget *widget);
-static void ui_skinned_window_hide(GtkWidget *widget);
-static GtkWindowClass *parent = NULL;
+typedef struct {
+ void (* draw) (GtkWidget * window, cairo_t * cr);
+ GtkWidget * normal, * shaded;
+ gboolean is_shaded, is_moving;
+} WindowData;
 
-GType
-ui_skinned_window_get_type(void)
-{
- static GType window_type = 0;
+DRAW_FUNC_BEGIN (window_draw)
+ WindowData * data = g_object_get_data ((GObject *) wid, "windowdata");
+ g_return_val_if_fail (data, FALSE);
 
- if (!window_type)
- {
- static const GTypeInfo window_info =
- {
- sizeof (SkinnedWindowClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) ui_skinned_window_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (SkinnedWindow),
- 0, /* n_preallocs */
- (GInstanceInitFunc) ui_skinned_window_init
- };
-
- window_type =
- g_type_register_static (GTK_TYPE_WINDOW, "SkinnedWindow",
- &window_info, 0);
- }
+ if (data->draw)
+ data->draw (wid, cr);
+DRAW_FUNC_END
 
- return window_type;
-}
-
-static void
-ui_skinned_window_map(GtkWidget *widget)
+static gboolean window_button_press (GtkWidget * window, GdkEventButton * event)
 {
- gdk_window_set_back_pixmap (widget->window, 0, 0);
- (* GTK_WIDGET_CLASS (parent)->map) (widget);
- gtk_window_set_keep_above(GTK_WINDOW(widget), config.always_on_top);
-}
-
-static gboolean
-ui_skinned_window_motion_notify_event(GtkWidget *widget,
- GdkEventMotion *event)
-{
- if (dock_is_moving(GTK_WINDOW(widget)))
- dock_move_motion(GTK_WINDOW(widget), event);
-
- return FALSE;
-}
-
-static gboolean ui_skinned_window_focus_in(GtkWidget *widget, GdkEventFocus *focus) {
- gboolean val = GTK_WIDGET_CLASS (parent)->focus_in_event (widget, focus);
- gtk_widget_queue_draw(widget);
- return val;
-}
+ WindowData * data = g_object_get_data ((GObject *) window, "windowdata");
+ g_return_val_if_fail (data, FALSE);
 
-static gboolean ui_skinned_window_focus_out(GtkWidget *widget, GdkEventFocus *focus) {
- gboolean val = GTK_WIDGET_CLASS (parent)->focus_out_event (widget, focus);
- gtk_widget_queue_draw(widget);
- return val;
-}
+ /* pass double clicks through; they are handled elsewhere */
+ if (event->button != 1 || event->type == GDK_2BUTTON_PRESS)
+ return FALSE;
 
-static gboolean ui_skinned_window_button_press(GtkWidget *widget, GdkEventButton *event) {
- if (event->button == 1 && event->type == GDK_BUTTON_PRESS &&
- (config.easy_move || config.equalizer_shaded || (event->y / config.scale_factor) < 14)) {
- dock_move_press(get_dock_window_list(), GTK_WINDOW(widget),
- event, SKINNED_WINDOW(widget)->type == WINDOW_MAIN ? TRUE : FALSE);
- }
+ if (data->is_moving)
+ return TRUE;
 
+ dock_move_start (window, event->x_root, event->y_root);
+ data->is_moving = TRUE;
 return TRUE;
 }
 
-static gboolean ui_skinned_window_button_release(GtkWidget *widget, GdkEventButton *event) {
- if (dock_is_moving(GTK_WINDOW(widget)))
- dock_move_release(GTK_WINDOW(widget));
-
- return TRUE;
-}
-
-static gboolean ui_skinned_window_expose(GtkWidget *widget, GdkEventExpose *event) {
- SkinnedWindow *window = SKINNED_WINDOW(gtk_widget_get_parent(widget));
-
- GdkPixbuf *obj = NULL;
-
- gint width = 0, height = 0;
-
- switch (window->type) {
- case WINDOW_MAIN:
- width = aud_active_skin->properties.mainwin_width;
- height = aud_active_skin->properties.mainwin_height;
- break;
- case WINDOW_EQ:
- width = 275 * (config.scaled ? config.scale_factor : 1);
- height = 116 * (config.scaled ? config.scale_factor : 1) ;
- break;
- case WINDOW_PLAYLIST:
- width = playlistwin_get_width();
- height = config.playlist_height;
- break;
- default:
- return FALSE;
- }
- obj = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-
- gboolean focus = gtk_window_has_toplevel_focus(GTK_WINDOW(window));
-
- switch (window->type) {
- case WINDOW_MAIN:
- skin_draw_pixbuf(widget, aud_active_skin, obj,SKIN_MAIN, 0, 0, 0, 0, width, height);
- skin_draw_mainwin_titlebar(aud_active_skin, obj, config.player_shaded, focus || !config.dim_titlebar);
- break;
- case WINDOW_EQ:
- skin_draw_pixbuf(widget, aud_active_skin, obj, SKIN_EQMAIN, 0, 0, 0, 0, width, height);
- if (focus || !config.dim_titlebar) {
- if (!config.equalizer_shaded)
- skin_draw_pixbuf(widget, aud_active_skin, obj, SKIN_EQMAIN, 0, 134, 0, 0, width, 14);
- else
- skin_draw_pixbuf(widget, aud_active_skin, obj, SKIN_EQ_EX, 0, 0, 0, 0, width, 14);
- } else {
- if (!config.equalizer_shaded)
- skin_draw_pixbuf(widget, aud_active_skin, obj, SKIN_EQMAIN, 0, 149, 0, 0, width, 14);
- else
- skin_draw_pixbuf(widget, aud_active_skin, obj, SKIN_EQ_EX, 0, 15, 0, 0, width, 14);
- }
- break;
- case WINDOW_PLAYLIST:
- focus |= !config.dim_titlebar;
- if (config.playlist_shaded) {
- skin_draw_playlistwin_shaded(aud_active_skin, obj, width, focus);
- } else {
- skin_draw_playlistwin_frame(aud_active_skin, obj, width, config.playlist_height, focus);
- }
- break;
- }
-
- ui_skinned_widget_draw(widget, obj, width, height,
- window->type != WINDOW_PLAYLIST && config.scaled);
-
- g_object_unref(obj);
-
- return FALSE;
-}
-
-static void
-ui_skinned_window_class_init(SkinnedWindowClass *klass)
+static gboolean window_button_release (GtkWidget * window, GdkEventButton *
+ event)
 {
- GtkWidgetClass *widget_class;
+ WindowData * data = g_object_get_data ((GObject *) window, "windowdata");
+ g_return_val_if_fail (data, FALSE);
 
- widget_class = (GtkWidgetClass*) klass;
+ if (event->button != 1)
+ return FALSE;
 
- parent = g_type_class_peek_parent(klass);
-
- widget_class->show = ui_skinned_window_show;
- widget_class->hide = ui_skinned_window_hide;
- widget_class->motion_notify_event = ui_skinned_window_motion_notify_event;
- widget_class->focus_in_event = ui_skinned_window_focus_in;
- widget_class->focus_out_event = ui_skinned_window_focus_out;
- widget_class->button_press_event = ui_skinned_window_button_press;
- widget_class->button_release_event = ui_skinned_window_button_release;
- widget_class->map = ui_skinned_window_map;
+ data->is_moving = FALSE;
+ return TRUE;
 }
 
-static void
-ui_skinned_window_hide(GtkWidget *widget)
+static gboolean window_motion (GtkWidget * window, GdkEventMotion * event)
 {
- SkinnedWindow *window;
+ WindowData * data = g_object_get_data ((GObject *) window, "windowdata");
+ g_return_val_if_fail (data, FALSE);
 
- g_return_if_fail(SKINNED_CHECK_WINDOW(widget));
+ if (! data->is_moving)
+ return TRUE;
 
- window = SKINNED_WINDOW(widget);
-
- if (window->x != NULL && window->y != NULL)
- gtk_window_get_position(GTK_WINDOW(window), window->x, window->y);
- GTK_WIDGET_CLASS(parent)->hide(widget);
+ dock_move (event->x_root, event->y_root);
+ return TRUE;
 }
 
-static void
-ui_skinned_window_show(GtkWidget *widget)
+static void window_destroy (GtkWidget * window)
 {
- SkinnedWindow *window;
+ WindowData * data = g_object_get_data ((GObject *) window, "windowdata");
+ g_return_if_fail (data);
 
- g_return_if_fail(SKINNED_CHECK_WINDOW(widget));
+ dock_remove_window (window);
 
- window = SKINNED_WINDOW(widget);
+ if (data->is_shaded)
+ gtk_container_remove ((GtkContainer *) window, data->shaded);
+ else
+ gtk_container_remove ((GtkContainer *) window, data->normal);
 
- if (window->x != NULL && window->y != NULL)
- gtk_window_move(GTK_WINDOW(window), *(window->x), *(window->y));
- GTK_WIDGET_CLASS(parent)->show(widget);
+ g_object_unref (data->normal);
+ g_object_unref (data->shaded);
+ g_free (data);
 }
 
-static void
-ui_skinned_window_init(GtkWidget *widget)
+GtkWidget * window_new (gint * x, gint * y, gint w, gint h, gboolean main,
+ gboolean shaded, void (* draw) (GtkWidget * window, cairo_t * cr))
 {
- SkinnedWindow *window;
- window = SKINNED_WINDOW(widget);
- window->x = NULL;
- window->y = NULL;
-}
+ GtkWidget * window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_decorated ((GtkWindow *) window, FALSE);
+ gtk_window_set_resizable ((GtkWindow *) window, FALSE);
+ gtk_window_move ((GtkWindow *) window, * x, * y);
+ gtk_widget_set_size_request (window, w, h);
+ gtk_window_resize ((GtkWindow *) window, w, h);
 
-GtkWidget *
-ui_skinned_window_new(const gchar *wmclass_name, gint *x, gint *y)
-{
- GtkWidget *widget = g_object_new(ui_skinned_window_get_type(), NULL);
- GtkWindow *window = GTK_WINDOW(widget);
+ gtk_widget_add_events (window, GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK);
 
- window->type = SKINNED_WINDOW_TYPE;
+ DRAW_CONNECT (window, window_draw);
+ g_signal_connect (window, "button-press-event", (GCallback) window_button_press, NULL);
+ g_signal_connect (window, "button-release-event", (GCallback) window_button_release, NULL);
+ g_signal_connect (window, "motion-notify-event", (GCallback) window_motion, NULL);
+ g_signal_connect (window, "destroy", (GCallback) window_destroy, NULL);
 
- if (wmclass_name)
- gtk_window_set_wmclass(GTK_WINDOW(widget), wmclass_name, "Audacious");
+ WindowData * data = g_malloc0 (sizeof (WindowData));
+ g_object_set_data ((GObject *) window, "windowdata", data);
 
- gtk_widget_add_events(GTK_WIDGET(widget),
- GDK_FOCUS_CHANGE_MASK | GDK_BUTTON_MOTION_MASK |
- GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_SCROLL_MASK | GDK_KEY_PRESS_MASK |
- GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK);
+ data->normal = gtk_fixed_new ();
+ g_object_ref (data->normal);
 
- dock_window_set_decorated (widget);
- gtk_widget_set_app_paintable(GTK_WIDGET(widget), TRUE);
+ data->shaded = gtk_fixed_new ();
+ g_object_ref (data->shaded);
 
- if (!strcmp(wmclass_name, "player"))
- SKINNED_WINDOW(widget)->type = WINDOW_MAIN;
- if (!strcmp(wmclass_name, "equalizer"))
- SKINNED_WINDOW(widget)->type = WINDOW_EQ;
- if (!strcmp(wmclass_name, "playlist"))
- SKINNED_WINDOW(widget)->type = WINDOW_PLAYLIST;
-
- SKINNED_WINDOW(widget)->x = x;
- SKINNED_WINDOW(widget)->y = y;
- SKINNED_WINDOW(widget)->normal = gtk_fixed_new();
- SKINNED_WINDOW(widget)->shaded = gtk_fixed_new();
- g_object_ref(SKINNED_WINDOW(widget)->normal);
- g_object_ref(SKINNED_WINDOW(widget)->shaded);
-
- gtk_container_add(GTK_CONTAINER(widget), GTK_WIDGET(SKINNED_WINDOW(widget)->normal));
+ if (shaded)
+ gtk_container_add ((GtkContainer *) window, data->shaded);
+ else
+ gtk_container_add ((GtkContainer *) window, data->normal);
 
- g_signal_connect(SKINNED_WINDOW(widget)->normal, "expose-event", G_CALLBACK(ui_skinned_window_expose), NULL);
- g_signal_connect(SKINNED_WINDOW(widget)->shaded, "expose-event", G_CALLBACK(ui_skinned_window_expose), NULL);
+ data->is_shaded = shaded;
+ data->draw = draw;
 
- return widget;
+ dock_add_window (window, x, y, w, h, main);
+ return window;
 }
 
-void ui_skinned_window_draw_all(GtkWidget *widget) {
- gtk_widget_queue_draw (widget);
+void window_set_size (GtkWidget * window, gint w, gint h)
+{
+ gtk_widget_set_size_request (window, w, h);
+ gtk_window_resize ((GtkWindow *) window, w, h);
+ dock_set_size (window, w, h);
 }
 
-void ui_skinned_window_set_shade (GtkWidget * widget, gboolean shaded)
+void window_set_shaded (GtkWidget * window, gboolean shaded)
 {
- SkinnedWindow * skinned = (SkinnedWindow *) widget;
- GtkWidget * old, * new;
+ WindowData * data = g_object_get_data ((GObject *) window, "windowdata");
+ g_return_if_fail (data);
+
+ if (data->is_shaded == shaded)
+ return;
 
 if (shaded)
 {
- old = skinned->normal;
- new = skinned->shaded;
+ gtk_container_remove ((GtkContainer *) window, data->normal);
+ gtk_container_add ((GtkContainer *) window, data->shaded);
 }
 else
 {
- old = skinned->shaded;
- new = skinned->normal;
+ gtk_container_remove ((GtkContainer *) window, data->shaded);
+ gtk_container_add ((GtkContainer *) window, data->normal);
 }
 
- if (gtk_widget_get_parent (old) == NULL)
- return;
+ data->is_shaded = shaded;
+}
+
+void window_put_widget (GtkWidget * window, gboolean shaded, GtkWidget * widget,
+ gint x, gint y)
+{
+ WindowData * data = g_object_get_data ((GObject *) window, "windowdata");
+ g_return_if_fail (data);
+
+ GtkWidget * fixed = shaded ? data->shaded : data->normal;
+ gtk_fixed_put ((GtkFixed *) fixed, widget, x, y);
+}
+
+void window_move_widget (GtkWidget * window, gboolean shaded, GtkWidget *
+ widget, gint x, gint y)
+{
+ WindowData * data = g_object_get_data ((GObject *) window, "windowdata");
+ g_return_if_fail (data);
+
+ GtkWidget * fixed = shaded ? data->shaded : data->normal;
+ gtk_fixed_move ((GtkFixed *) fixed, widget, x, y);
+}
+
+void window_show_all (GtkWidget * window)
+{
+ WindowData * data = g_object_get_data ((GObject *) window, "windowdata");
+ g_return_if_fail (data);
 
- gtk_container_remove ((GtkContainer *) skinned, old);
- gtk_container_add ((GtkContainer *) skinned, new);
+ gtk_widget_show_all (data->normal);
+ gtk_widget_show_all (data->shaded);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinned_window.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinned_window.h Changed

@@ -1,64 +1,37 @@
 /*
- * Audacious: A cross-platform multimedia player
- * Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
+ * ui_skinned_window.h
+ * Copyright 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 as published by
- * the Free Software Foundation; under version 3 of the License.
+ * This file is part of Audacious.
 *
- * 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.
+ * 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.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses>.
+ * 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.
 *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
+ * 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 UI_SKINNED_WINDOW_H
-#define UI_SKINNED_WINDOW_H
-
-#define SKINNED_WINDOW(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_skinned_window_get_type (), SkinnedWindow)
-#define SKINNED_WINDOW_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_skinned_window_get_type (), SkinnedWindowClass)
-#define SKINNED_CHECK_WINDOW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_skinned_window_get_type ())
-#define SKINNED_TYPE_WINDOW (ui_skinned_window_get_type())
-
-#ifdef GDK_WINDOWING_QUARTZ
-# define SKINNED_WINDOW_TYPE		GTK_WINDOW_POPUP
-#else
-# define SKINNED_WINDOW_TYPE		GTK_WINDOW_TOPLEVEL
-#endif
-
-enum {
- WINDOW_MAIN,
- WINDOW_EQ,
- WINDOW_PLAYLIST
-};
-
-typedef struct _SkinnedWindow SkinnedWindow;
-typedef struct _SkinnedWindowClass SkinnedWindowClass;
-
-struct _SkinnedWindow
-{
- GtkWindow window;
-
- gint *x, *y;
- gint type;
- GtkWidget *normal;
- GtkWidget *shaded;
-};
+#ifndef SKINS_UI_SKINNED_WINDOW_H
+#define SKINS_UI_SKINNED_WINDOW_H
 
-struct _SkinnedWindowClass
-{
- GtkWindowClass parent_class;
-};
+#include <gtk/gtk.h>
 
-GType ui_skinned_window_get_type(void);
-GtkWidget *ui_skinned_window_new(const gchar *wmclass_name, gint *x, gint *y);
-void ui_skinned_window_draw_all(GtkWidget *widget);
-void ui_skinned_window_set_shade(GtkWidget *widget, gboolean shaded);
+GtkWidget * window_new (gint * x, gint * y, gint w, gint h, gboolean main,
+ gboolean shaded, void (* draw) (GtkWidget * window, cairo_t * cr));
+void window_set_size (GtkWidget * window, gint w, gint h);
+void window_set_shaded (GtkWidget * window, gboolean shaded);
+void window_put_widget (GtkWidget * window, gboolean shaded, GtkWidget * widget,
+ gint x, gint y);
+void window_move_widget (GtkWidget * window, gboolean shaded, GtkWidget *
+ widget, gint x, gint y);
+void window_show_all (GtkWidget * window);
 
 #endif

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinselector.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinselector.c Changed

@@ -1,44 +1,37 @@
-/* BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
+/*
+ * ui_skinselector.c
+ * Copyright 1998-2003 XMMS Development Team
+ * Copyright 2003-2004 BMP Development Team
+ * Copyright 2011 John Lindgren
 *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
+ * This file is part of Audacious.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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 this program. If not, see <http://www.gnu.org/licenses>.
+ * 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.
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "ui_skinselector.h"
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include "platform/smartinclude.h"
-
 #include <stdlib.h>
 #include <string.h>
 
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
+#include <libaudgui/libaudgui-gtk.h>
 
+#include "config.h"
 #include "plugin.h"
 #include "ui_skin.h"
+#include "ui_skinselector.h"
 #include "util.h"
 
 #define EXTENSION_TARGETS 7
@@ -46,10 +39,6 @@
 static gchar *ext_targets[EXTENSION_TARGETS] = { "bmp", "xpm", "png", "svg",
 "gif", "jpg", "jpeg" };
 
-#define THUMBNAIL_WIDTH 90
-#define THUMBNAIL_HEIGHT 40
-
-
 enum SkinViewCols {
 SKIN_VIEW_COL_PREVIEW,
 SKIN_VIEW_COL_FORMATTEDNAME,
@@ -57,10 +46,14 @@
 SKIN_VIEW_N_COLS
 };
 
+typedef struct {
+ gchar *name;
+ gchar *desc;
+ gchar *path;
+ GTime *time;
+} SkinNode;
 
-GList *skinlist = NULL;
-
-
+static GList *skinlist = NULL;
 
 static gchar *
 get_thumbnail_filename(const gchar * path)
@@ -125,41 +118,30 @@
 return preview;
 }
 
-
-static GdkPixbuf *
-skin_get_thumbnail(const gchar * path)
+static GdkPixbuf * skin_get_thumbnail (const gchar * path)
 {
- GdkPixbuf *scaled = NULL;
- GdkPixbuf *preview;
- gchar *thumbname;
-
- g_return_val_if_fail(path != NULL, NULL);
+ gchar * thumbname = get_thumbnail_filename (path);
+ GdkPixbuf * thumb = NULL;
 
- if (g_str_has_suffix(path, "thumbs"))
- return NULL;
-
- thumbname = get_thumbnail_filename(path);
-
- if (g_file_test(thumbname, G_FILE_TEST_EXISTS)) {
- scaled = gdk_pixbuf_new_from_file(thumbname, NULL);
- g_free(thumbname);
- return scaled;
+ if (g_file_test (thumbname, G_FILE_TEST_EXISTS))
+ {
+ thumb = gdk_pixbuf_new_from_file (thumbname, NULL);
+ if (thumb)
+ goto DONE;
 }
 
- if (!(preview = skin_get_preview(path))) {
- g_free(thumbname);
- return NULL;
- }
+ thumb = skin_get_preview (path);
+ if (! thumb)
+ goto DONE;
 
- scaled = gdk_pixbuf_scale_simple(preview,
- THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT,
- GDK_INTERP_BILINEAR);
- g_object_unref(preview);
+ audgui_pixbuf_scale_within (& thumb, 128);
 
- gdk_pixbuf_save(scaled, thumbname, "png", NULL, NULL);
- g_free(thumbname);
+ if (thumb)
+ gdk_pixbuf_save (thumb, thumbname, "png", NULL, NULL);
 
- return scaled;
+DONE:
+ g_free (thumbname);
+ return thumb;
 }
 
 static void
@@ -220,20 +202,20 @@
 }
 }
 
-static gint
-skinlist_compare_func(gconstpointer a, gconstpointer b)
+static gint skinlist_compare_func (const void * _a, const void * _b)
 {
- g_return_val_if_fail(a != NULL && SKIN_NODE(a)->name != NULL, 1);
- g_return_val_if_fail(b != NULL && SKIN_NODE(b)->name != NULL, 1);
- return strcasecmp(SKIN_NODE(a)->name, SKIN_NODE(b)->name);
+ const SkinNode * a = _a, * b = _b;
+ g_return_val_if_fail (a && a->name, 1);
+ g_return_val_if_fail (b && b->name, 1);
+ return strcasecmp (a->name, b->name);
 }
 
-static void
-skin_free_func(gpointer data)
+static void skin_free_func (void * _data)
 {
+ SkinNode * data = _data;
 g_return_if_fail(data != NULL);
- g_free(SKIN_NODE(data)->name);
- g_free(SKIN_NODE(data)->path);
+ g_free (data->name);
+ g_free (data->path);
 g_slice_free(SkinNode, data);
 }
 
@@ -249,7 +231,7 @@
 skinlist = NULL;
 }
 
-void
+static void
 skinlist_update(void)
 {
 gchar *skinsdir;
@@ -299,12 +281,14 @@
 
 skinlist_update();
 
- for (entry = skinlist; entry; entry = g_list_next(entry)) {
- thumbnail = skin_get_thumbnail(SKIN_NODE(entry->data)->path);
+ for (entry = skinlist; entry; entry = entry->next)
+ {
+ SkinNode * node = entry->data;
 
- formattedname = g_strdup_printf("<big>%s</big>\n%s",
-		SKIN_NODE(entry->data)->name, SKIN_NODE(entry->data)->desc);
- name = SKIN_NODE(entry->data)->name;
+ thumbnail = skin_get_thumbnail (node->path);
+ formattedname = g_strdup_printf ("<big>%s</big>\n%s",
+ node->name, node->desc);
+ name = node->name;
 
 gtk_list_store_append(store, &iter);
 gtk_list_store_set(store, &iter,
@@ -315,8 +299,8 @@
 g_object_unref(thumbnail);
 g_free(formattedname);
 
- if (g_strstr_len(aud_active_skin->path,
- strlen(aud_active_skin->path), name) ) {
+ if (g_strstr_len(active_skin->path,
+ strlen(active_skin->path), name) ) {
 iter_current_skin = iter;
 have_current_skin = TRUE;
 }
@@ -355,14 +339,14 @@
 gtk_tree_model_get(model, &iter, SKIN_VIEW_COL_NAME, &name, -1);
 
 for (node = skinlist; node; node = g_list_next(node)) {
- comp = SKIN_NODE(node->data)->path;
+ comp = ((SkinNode *) node->data)->path;
 if (g_strrstr(comp, name))
 break;
 }
 
 g_free(name);
 
- aud_active_skin_load(comp);
+ active_skin_load (comp);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_skinselector.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_skinselector.h Changed

audacious-plugins-2.5.3.tar.gz/src/skins/ui_svis.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_svis.c Changed

@@ -1,6 +1,6 @@
 /*
 * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Audacious development team.
+ * Copyright (c) 2007-2011 Audacious development team.
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,544 +24,182 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#include "ui_skin.h"
-#include "ui_svis.h"
-#include "ui_vis.h"
-#include "util.h"
-#include "skins_cfg.h"
-
 #include <string.h>
-#include <ctype.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmarshal.h>
-#include <gtk/gtkimage.h>
-
-#include <audacious/drct.h>
-#include <audacious/plugin.h>
-
-#define UI_TYPE_SVIS (ui_svis_get_type())
-
-/* FIXME: Are the svis_scope_colors correct? */
-static guint8 svis_scope_colors[] = { 20, 19, 18, 19, 20 };
-static guint8 svis_vu_normal_colors[] = { 17, 17, 17, 12, 12, 12, 2, 2 };
-
-#define SVIS_HEIGHT 5
-#define SVIS_WIDTH 38
-
-enum
-{
- DOUBLED,
- LAST_SIGNAL
-};
-
-static void ui_svis_class_init (UiSVisClass * klass);
-static void ui_svis_init (UiSVis * svis);
-static void ui_svis_destroy (GtkObject * object);
-static void ui_svis_realize (GtkWidget * widget);
-static void ui_svis_unrealize (GtkWidget * widget);
-static void ui_svis_map (GtkWidget * widget);
-static void ui_svis_unmap (GtkWidget * widget);
-static void ui_svis_size_request (GtkWidget * widget,
- GtkRequisition * requisition);
-static void ui_svis_size_allocate (GtkWidget * widget,
- GtkAllocation * allocation);
-static gboolean ui_svis_expose (GtkWidget * widget, GdkEventExpose * event);
-static void ui_svis_toggle_scaled (UiSVis * svis);
-
-static GtkWidgetClass *parent_class = NULL;
-static guint vis_signals[LAST_SIGNAL] = { 0 };
-
-GType ui_svis_get_type ()
-{
- static GType vis_type = 0;
- if (!vis_type)
- {
- static const GTypeInfo vis_info = {
- sizeof (UiSVisClass),
- NULL,
- NULL,
- (GClassInitFunc) ui_svis_class_init,
- NULL,
- NULL,
- sizeof (UiSVis),
- 0,
- (GInstanceInitFunc) ui_svis_init,
- };
- vis_type =
- g_type_register_static (GTK_TYPE_WIDGET, "UiSVis", &vis_info, 0);
- }
-
- return vis_type;
-}
-
-static void ui_svis_class_init (UiSVisClass * klass)
-{
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- object_class = (GtkObjectClass *) klass;
- widget_class = (GtkWidgetClass *) klass;
- parent_class = g_type_class_peek_parent (klass);
-
- object_class->destroy = ui_svis_destroy;
-
- widget_class->realize = ui_svis_realize;
- widget_class->unrealize = ui_svis_unrealize;
- widget_class->map = ui_svis_map;
- widget_class->unmap = ui_svis_unmap;
- widget_class->expose_event = ui_svis_expose;
- widget_class->size_request = ui_svis_size_request;
- widget_class->size_allocate = ui_svis_size_allocate;
-
- klass->scaled = ui_svis_toggle_scaled;
 
- vis_signals[DOUBLED] =
- g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiSVisClass, scaled), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-}
-
-static void ui_svis_init (UiSVis * svis)
-{
-
-}
-
-GtkWidget *ui_svis_new (GtkWidget * fixed, gint x, gint y)
-{
- UiSVis *svis = g_object_new (ui_svis_get_type (), NULL);
-
- svis->x = x;
- svis->y = y;
-
- svis->width = SVIS_WIDTH;
- svis->height = SVIS_HEIGHT;
-
- svis->fixed = fixed;
- svis->scaled = FALSE;
-
- svis->visible_window = TRUE;
- svis->event_window = NULL;
-
- gtk_fixed_put (GTK_FIXED (svis->fixed), GTK_WIDGET (svis), svis->x,
- svis->y);
-
- return GTK_WIDGET (svis);
-}
-
-static void ui_svis_destroy (GtkObject * object)
-{
- g_return_if_fail (object != NULL);
- g_return_if_fail (UI_IS_SVIS (object));
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void ui_svis_realize (GtkWidget * widget)
-{
- UiSVis *svis;
- GdkWindowAttr attributes;
- gint attributes_mask;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (UI_IS_SVIS (widget));
-
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
- svis = UI_SVIS (widget);
+#include "draw-compat.h"
+#include "skins_cfg.h"
+#include "surface.h"
+#include "ui_skin.h"
+#include "ui_vis.h"
 
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.event_mask = gtk_widget_get_events (widget);
- attributes.event_mask |=
- GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK;
+static gint svis_analyzer_colors[] = {14, 11, 8, 5, 2};
+static gint svis_scope_colors[] = {20, 19, 18, 19, 20};
+static gint svis_vu_normal_colors[] = {16, 14, 12, 10, 8, 6, 4, 2};
 
- if (svis->visible_window)
- {
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
- widget->window =
- gdk_window_new (widget->parent->window, &attributes,
- attributes_mask);
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_NO_WINDOW);
- gdk_window_set_user_data (widget->window, widget);
- }
- else
- {
- widget->window = gtk_widget_get_parent_window (widget);
- g_object_ref (widget->window);
+static struct {
+ gboolean active;
+ gint data[75];
+} svis;
 
- attributes.wclass = GDK_INPUT_ONLY;
- attributes_mask = GDK_WA_X | GDK_WA_Y;
- svis->event_window =
- gdk_window_new (widget->window, &attributes, attributes_mask);
- GTK_WIDGET_SET_FLAGS (widget, GTK_NO_WINDOW);
- gdk_window_set_user_data (svis->event_window, widget);
- }
+#define RGB_SEEK(x,y) (set = rgb + 38 * (y) + (x))
+#define RGB_SET(c) (* set ++ = (c))
+#define RGB_SET_Y(c) do {* set = (c); set += 38;} while (0)
+#define RGB_SET_INDEX(c) RGB_SET (active_skin->vis_colors[c])
+#define RGB_SET_INDEX_Y(c) RGB_SET_Y (active_skin->vis_colors[c])
 
- widget->style = gtk_style_attach (widget->style, widget->window);
-}
+DRAW_FUNC_BEGIN (ui_svis_draw)
+ guint32 rgb[38 * 5];
+ guint32 * set;
 
-static void ui_svis_unrealize (GtkWidget * widget)
-{
- UiSVis *svis;
- svis = UI_SVIS (widget);
+ RGB_SEEK (0, 0);
+ for (gint x = 0; x < 38 * 5; x ++)
+ RGB_SET_INDEX (0);
 
- if (svis->event_window != NULL)
+ switch (config.vis_type)
 {
- gdk_window_set_user_data (svis->event_window, NULL);
- gdk_window_destroy (svis->event_window);
- svis->event_window = NULL;
- }
-
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void ui_svis_map (GtkWidget * widget)
-{
- UiSVis *svis;
- svis = UI_SVIS (widget);
-
- if (svis->event_window != NULL)
- gdk_window_show (svis->event_window);
-
- if (GTK_WIDGET_CLASS (parent_class)->map)
- (*GTK_WIDGET_CLASS (parent_class)->map) (widget);
-}
-
-static void ui_svis_unmap (GtkWidget * widget)
-{
- UiSVis *svis;
- svis = UI_SVIS (widget);
-
- if (svis->event_window != NULL)
- gdk_window_hide (svis->event_window);
-
- if (GTK_WIDGET_CLASS (parent_class)->unmap)
- (*GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
-}
-
-static void ui_svis_size_request (GtkWidget * widget,
- GtkRequisition * requisition)
-{
- UiSVis *svis = UI_SVIS (widget);
-
- requisition->width = svis->width * (svis->scaled ? config.scale_factor : 1);
- requisition->height =
- svis->height * (svis->scaled ? config.scale_factor : 1);
-}
-
-static void ui_svis_size_allocate (GtkWidget * widget,
- GtkAllocation * allocation)
-{
- UiSVis *svis = UI_SVIS (widget);
+ case VIS_ANALYZER:;
+ gboolean bars = (config.analyzer_type == ANALYZER_BARS);
 
- widget->allocation = *allocation;
- widget->allocation.x *= (svis->scaled ? config.scale_factor : 1);
- widget->allocation.y *= (svis->scaled ? config.scale_factor : 1);
- if (GTK_WIDGET_REALIZED (widget))
- {
- if (svis->event_window != NULL)
- gdk_window_move_resize (svis->event_window, widget->allocation.x,
- widget->allocation.y, allocation->width,
- allocation->height);
- else
- gdk_window_move_resize (widget->window, widget->allocation.x,
- widget->allocation.y, allocation->width,
- allocation->height);
- }
-
- svis->x = widget->allocation.x / (svis->scaled ? config.scale_factor : 1);
- svis->y = widget->allocation.y / (svis->scaled ? config.scale_factor : 1);
-}
-
-#define OFFSET_NORMAL(p, x, y) ((p) + SVIS_WIDTH * (y) + (x))
-#define OFFSET_SCALED(p, x, y) ((p) + 4 * SVIS_WIDTH * (y) + 2 * (x))
-
-static inline void DRAW_SCALED (guchar * p, guchar value)
-{
- p[0] = value;
- p[1] = value;
- p[2 * SVIS_WIDTH] = value;
- p[2 * SVIS_WIDTH + 1] = value;
-}
-
-#define DRAW_DS_PIXEL DRAW_SCALED
-
-static gboolean ui_svis_expose (GtkWidget * widget, GdkEventExpose * event)
-{
- UiSVis *svis = UI_SVIS (widget);
-
- gint x, y, h;
- guchar svis_color[24][3];
- guchar rgb_data[SVIS_WIDTH * 2 * SVIS_HEIGHT * 2], *ptr, c;
- guint32 colors[24];
- GdkRgbCmap *cmap;
-
- if (!GTK_WIDGET_VISIBLE (widget))
- return FALSE;
+ for (gint x = 0; x < 38; x ++)
+ {
+ if (bars && (x % 3) == 2)
+ continue;
 
- if (!svis->visible_window)
- return FALSE;
+ gint h = svis.data[bars ? (x / 3) : x];
+ h = CLAMP (h, 0, 5);
+ RGB_SEEK (x, 5 - h);
 
- skin_get_viscolor (aud_active_skin, svis_color);
- for (y = 0; y < 24; y++)
- {
- colors[y] =
- svis_color[y][0] << 16 | svis_color[y][1] << 8 | svis_color[y][2];
- }
- cmap = gdk_rgb_cmap_new (colors, 24);
+ for (gint y = 0; y < h; y ++)
+ RGB_SET_INDEX_Y (svis_analyzer_colors[h - 1 - y]);
+ }
 
- if (!config.scaled)
- {
- memset (rgb_data, 0, SVIS_WIDTH * SVIS_HEIGHT);
- if (config.vis_type == VIS_ANALYZER && !aud_drct_get_paused ()
- && aud_drct_get_playing ())
+ break;
+ case VIS_VOICEPRINT:
+ switch (config.vu_mode)
 {
- for (y = 0; y < SVIS_HEIGHT; y++)
+ case VU_NORMAL:
+ for (gint y = 0; y < 5; y ++)
 {
- ptr = OFFSET_NORMAL (rgb_data, 0, SVIS_HEIGHT - 1 - y);
+ if (y == 2)
+ continue;
 
- if (config.analyzer_type == ANALYZER_BARS)
- {
- for (x = 0; x < (SVIS_WIDTH + 1) / 3; x ++)
- {
- if (svis->data[x] > y << 1)
- {
- ptr[3 * x] = 23;
- ptr[3 * x + 1] = 23;
- }
- }
- }
- else
- {
- for (x = 0; x < SVIS_WIDTH; x++)
- {
- if (svis->data[x] > y << 1)
- ptr[x] = 23;
- }
- }
- }
- }
- else if (config.vis_type == VIS_VOICEPRINT)
- {
- switch (config.vu_mode)
- {
- case VU_NORMAL:
- for (y = 0; y < 2; y++)
- {
- ptr = rgb_data + ((y * 3) * 38);
- h = (svis->data[y] * 7) / 37;
- for (x = 0; x < h; x++, ptr += 5)
- {
- c = svis_vu_normal_colors[x];
- *(ptr) = c;
- *(ptr + 1) = c;
- *(ptr + 2) = c;
- *(ptr + 38) = c;
- *(ptr + 39) = c;
- *(ptr + 40) = c;
- }
- }
- break;
- case VU_SMOOTH:
- for (y = 0; y < 2; y++)
+ gint h = (svis.data[y / 3] * 8 + 19) / 38;
+ h = CLAMP (h, 0, 8);
+ RGB_SEEK (0, y);
+
+ for (gint x = 0; x < h; x ++)
 {
- ptr = rgb_data + ((y * 3) * SVIS_WIDTH);
- for (x = 0; x < svis->data[y]; x++, ptr++)
- {
- c = 17 - ((x * 15) / 37);
- *(ptr) = c;
- *(ptr + 38) = c;
- }
+ RGB_SET_INDEX (svis_vu_normal_colors[x]);
+ RGB_SET_INDEX (svis_vu_normal_colors[x]);
+ RGB_SET_INDEX (svis_vu_normal_colors[x]);
+ set += 2;
 }
- break;
 }
- }
- else if (config.vis_type == VIS_SCOPE)
- {
- for (x = 0; x < 38; x++)
+ break;
+ default: /* VU_SMOOTH */
+ for (gint y = 0; y < 5; y ++)
 {
- h = svis->data[x << 1] / 3;
- ptr = rgb_data + ((4 - h) * 38) + x;
- *ptr = svis_scope_colors[h];
- }
- }
+ if (y == 2)
+ continue;
 
- }
- else
- { /*svis scaling, this needs some work, since a lot of stuff is hardcoded --majeru */
-
- memset (rgb_data, 0,
- SVIS_WIDTH * config.scale_factor * SVIS_HEIGHT *
- config.scale_factor);
- if (config.vis_type == VIS_ANALYZER && !aud_drct_get_paused ()
- && aud_drct_get_playing ())
- {
- for (y = 0; y < SVIS_HEIGHT; y++)
- {
- ptr = OFFSET_SCALED (rgb_data, 0, SVIS_HEIGHT - 1 - y);
+ gint h = svis.data[y / 3];
+ h = CLAMP (h, 0, 38);
+ RGB_SEEK (0, y);
 
- if (config.analyzer_type == ANALYZER_BARS)
- {
- for (x = 0; x < (SVIS_WIDTH + 1) / 3; x ++)
- {
- if (svis->data[x] > y << 1)
- {
- DRAW_SCALED (OFFSET_SCALED (ptr, x * 3, 0), 23);
- DRAW_SCALED (OFFSET_SCALED (ptr, x * 3 + 1, 0), 23);
- }
- }
- }
- else
- {
- for (x = 0; x < SVIS_WIDTH; x++)
- {
- if (svis->data[x] > y << 1)
- DRAW_SCALED (OFFSET_SCALED (ptr, x, 0), 23);
- }
- }
+ for (gint x = 0; x < h; x ++)
+ RGB_SET_INDEX (17 - (x * 16) / 38);
 }
+ break;
 }
- else if (config.vis_type == VIS_VOICEPRINT)
+ break;
+ case VIS_SCOPE:;
+ static const gint scale[17] = {0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 3, 4,
+ 4, 4, 4, 4, 4};
+
+ if (! svis.active)
+ goto DRAW;
+
+ switch (config.scope_mode)
 {
- switch (config.vu_mode)
+ case SCOPE_DOT:
+ for (gint x = 0; x < 38; x ++)
 {
- case VU_NORMAL:
- for (y = 0; y < 2; y++)
- {
- ptr = rgb_data + ((y * 3) * 152);
- h = (svis->data[y] * 8) / 37;
- for (x = 0; x < h; x++, ptr += 10)
- {
- c = svis_vu_normal_colors[x];
- DRAW_DS_PIXEL (ptr, c);
- DRAW_DS_PIXEL (ptr + 2, c);
- DRAW_DS_PIXEL (ptr + 4, c);
- DRAW_DS_PIXEL (ptr + 152, c);
- DRAW_DS_PIXEL (ptr + 154, c);
- DRAW_DS_PIXEL (ptr + 156, c);
- }
- }
- break;
- case VU_SMOOTH:
- for (y = 0; y < 2; y++)
- {
- ptr = rgb_data + ((y * 3) * 152);
- for (x = 0; x < svis->data[y]; x++, ptr += 2)
- {
- c = 17 - ((x * 15) / 37);
- DRAW_DS_PIXEL (ptr, c);
- DRAW_DS_PIXEL (ptr + 152, c);
- }
- }
- break;
+ gint h = scale[CLAMP (svis.data[2 * x], 0, 16)];
+ RGB_SEEK (x, h);
+ RGB_SET_INDEX (svis_scope_colors[h]);
 }
- }
- else if (config.vis_type == VIS_SCOPE)
- {
- for (x = 0; x < 38; x++)
+ case SCOPE_LINE:
+ for (gint x = 0; x < 37; x++)
 {
- h = svis->data[x << 1] / 3;
- ptr = rgb_data + ((4 - h) * 152) + (x << 1);
- *ptr = svis_scope_colors[h];
- *(ptr + 1) = svis_scope_colors[h];
- *(ptr + 76) = svis_scope_colors[h];
- *(ptr + 77) = svis_scope_colors[h];
- }
- }
+ gint h = scale[CLAMP (svis.data[2 * x], 0, 16)];
+ gint h2 = scale[CLAMP (svis.data[2 * (x + 1)], 0, 16)];
 
+ if (h < h2) h2 --;
+ else if (h > h2) {gint temp = h; h = h2 + 1; h2 = temp;}
 
- }
+ RGB_SEEK (x, h);
+ for (gint y = h; y <= h2; y ++)
+ RGB_SET_INDEX_Y (svis_scope_colors[y]);
+ }
 
- GdkPixmap *obj = NULL;
- GdkGC *gc;
- obj =
- gdk_pixmap_new (NULL,
- svis->width * (svis->scaled ? config.scale_factor : 1),
- svis->height * (svis->scaled ? config.scale_factor : 1),
- gdk_rgb_get_visual ()->depth);
- gc = gdk_gc_new (obj);
+ gint h = scale[CLAMP (svis.data[74], 0, 16)];
+ RGB_SEEK (37, h);
+ RGB_SET_INDEX (svis_scope_colors[h]);
+ break;
+ default: /* SCOPE_SOLID */
+ for (gint x = 0; x < 38; x++)
+ {
+ gint h = scale[CLAMP (svis.data[2 * x], 0, 16)];
+ gint h2;
 
- if (!svis->scaled)
- {
- gdk_draw_indexed_image (obj, gc, 0, 0, svis->width, svis->height,
- GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data,
- 38, cmap);
- }
- else
- {
- gdk_draw_indexed_image (obj, gc,
- 0 << 1, 0 << 1,
- svis->width << 1, svis->height << 1,
- GDK_RGB_DITHER_NONE, (guchar *) rgb_data,
- 76, cmap);
- }
+ if (h < 2) h2 = 2;
+ else {h2 = h; h = 2;}
 
- gdk_rgb_cmap_free (cmap);
- gdk_draw_drawable (widget->window, gc, obj, 0, 0, 0, 0,
- svis->width * (svis->scaled ? config.scale_factor : 1),
- svis->height * (svis->scaled ? config.scale_factor : 1));
- g_object_unref (obj);
- g_object_unref (gc);
+ RGB_SEEK (x, h);
+ for (gint y = h; y <= h2; y ++)
+ RGB_SET_INDEX_Y (svis_scope_colors[y]);
+ }
+ break;
+ }
+ break;
+ }
 
- return FALSE;
-}
+DRAW:;
+ cairo_surface_t * surf = cairo_image_surface_create_for_data ((void *) rgb,
+ CAIRO_FORMAT_RGB24, 38, 5, 4 * 38);
+ cairo_set_source_surface (cr, surf, 0, 0);
+ cairo_paint (cr);
+ cairo_surface_destroy (surf);
+DRAW_FUNC_END
 
-static void ui_svis_toggle_scaled (UiSVis * svis)
+GtkWidget * ui_svis_new (void)
 {
- GtkWidget *widget = GTK_WIDGET (svis);
- svis->scaled = !svis->scaled;
-
- gtk_widget_set_size_request (widget, svis->width * config.scale_factor,
- svis->height * config.scale_factor);
-
- if (widget_really_drawable (widget))
- ui_svis_expose (widget, 0);
+ GtkWidget * wid = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (wid, 38, 5);
+ gtk_widget_add_events (wid, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
+ DRAW_CONNECT (wid, ui_svis_draw);
+ return wid;
 }
 
 void ui_svis_clear_data (GtkWidget * widget)
 {
- g_return_if_fail (UI_IS_SVIS (widget));
-
- gint i;
- UiSVis *svis = UI_SVIS (widget);
-
- for (i = 0; i < 75; i++)
- {
- svis->data[i] = (config.vis_type == VIS_SCOPE) ? 6 : 0;
- }
-
- svis->refresh_delay = 0;
-
- if (widget_really_drawable (widget))
- ui_svis_expose (widget, 0);
+ memset (& svis, 0, sizeof svis);
+ gtk_widget_queue_draw (widget);
 }
 
 void ui_svis_timeout_func (GtkWidget * widget, guchar * data)
 {
- g_return_if_fail (UI_IS_SVIS (widget));
-
- UiSVis *svis = UI_SVIS (widget);
- gint i;
-
 if (config.vis_type == VIS_VOICEPRINT)
 {
- for (i = 0; i < 2; i++)
- svis->data[i] = data[i];
+ for (gint i = 0; i < 2; i ++)
+ svis.data[i] = data[i];
 }
 else
 {
- for (i = 0; i < 75; i++)
- svis->data[i] = data[i];
+ for (gint i = 0; i < 75; i ++)
+ svis.data[i] = data[i];
 }
 
- if (widget_really_drawable (widget))
- ui_svis_expose (widget, 0);
+ svis.active = TRUE;
+ gtk_widget_queue_draw (widget);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_vis.c -> audacious-plugins-3.0.tar.gz/src/skins/ui_vis.c Changed

@@ -1,6 +1,6 @@
 /*
 * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007-2010 Audacious development team.
+ * Copyright (c) 2007-2011 Audacious development team.
 *
 * Based on:
 * BMP - Cross-platform multimedia player
@@ -24,282 +24,52 @@
 * Audacious or using our public API to be a derived work.
 */
 
+#include <string.h>
+
+#include "draw-compat.h"
+#include "skins_cfg.h"
+#include "surface.h"
 #include "ui_skin.h"
 #include "ui_vis.h"
-#include "util.h"
-#include "skins_cfg.h"
-#include <audacious/plugin.h>
 
-static const gfloat vis_afalloff_speeds[] = { 0.34, 0.5, 1.0, 1.3, 1.6 };
-static const gfloat vis_pfalloff_speeds[] = { 1.2, 1.3, 1.4, 1.5, 1.6 };
-static const gint vis_scope_colors[16] = {22, 21, 21, 20, 20, 19, 19, 18, 18,
+static const gfloat vis_afalloff_speeds[] = {0.34, 0.5, 1.0, 1.3, 1.6};
+static const gfloat vis_pfalloff_speeds[] = {1.2, 1.3, 1.4, 1.5, 1.6};
+static const gint vis_scope_colors[16] = {22, 22, 21, 21, 20, 10, 19, 19, 18,
 19, 19, 20, 20, 21, 21, 22};
-static guchar voiceprint_data[76 * 16];
-
-enum
-{
- DOUBLED,
- LAST_SIGNAL
-};
-
-static void ui_vis_class_init (UiVisClass * klass);
-static void ui_vis_init (UiVis * vis);
-static void ui_vis_destroy (GtkObject * object);
-static void ui_vis_realize (GtkWidget * widget);
-static void ui_vis_unrealize (GtkWidget * widget);
-static void ui_vis_map (GtkWidget * widget);
-static void ui_vis_unmap (GtkWidget * widget);
-static void ui_vis_size_request (GtkWidget * widget,
- GtkRequisition * requisition);
-static void ui_vis_size_allocate (GtkWidget * widget,
- GtkAllocation * allocation);
-static gboolean ui_vis_expose (GtkWidget * widget, GdkEventExpose * event);
-static void ui_vis_toggle_scaled (UiVis * vis);
-
-static GtkWidgetClass *parent_class = NULL;
-static guint vis_signals[LAST_SIGNAL] = { 0 };
-
-GType ui_vis_get_type ()
-{
- static GType vis_type = 0;
- if (!vis_type)
- {
- static const GTypeInfo vis_info = {
- sizeof (UiVisClass),
- NULL,
- NULL,
- (GClassInitFunc) ui_vis_class_init,
- NULL,
- NULL,
- sizeof (UiVis),
- 0,
- (GInstanceInitFunc) ui_vis_init,
- };
- vis_type =
- g_type_register_static (GTK_TYPE_WIDGET, "UiVis", &vis_info, 0);
- }
-
- return vis_type;
-}
-
-static void ui_vis_class_init (UiVisClass * klass)
-{
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- object_class = (GtkObjectClass *) klass;
- widget_class = (GtkWidgetClass *) klass;
- parent_class = g_type_class_peek_parent (klass);
-
- object_class->destroy = ui_vis_destroy;
-
- widget_class->realize = ui_vis_realize;
- widget_class->unrealize = ui_vis_unrealize;
- widget_class->map = ui_vis_map;
- widget_class->unmap = ui_vis_unmap;
- widget_class->expose_event = ui_vis_expose;
- widget_class->size_request = ui_vis_size_request;
- widget_class->size_allocate = ui_vis_size_allocate;
-
- klass->doubled = ui_vis_toggle_scaled;
-
- vis_signals[DOUBLED] =
- g_signal_new ("toggle-scaled", G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (UiVisClass, doubled), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-}
-
-static void ui_vis_init (UiVis * vis)
-{
- memset (voiceprint_data, 0, sizeof voiceprint_data);
-}
-
-GtkWidget *ui_vis_new (GtkWidget * fixed, gint x, gint y, gint width)
-{
- UiVis *vis = g_object_new (ui_vis_get_type (), NULL);
-
- vis->x = x;
- vis->y = y;
-
- vis->width = width;
- vis->height = 16;
-
- vis->fixed = fixed;
- vis->scaled = FALSE;
-
- vis->visible_window = TRUE;
- vis->event_window = NULL;
-
- gtk_fixed_put (GTK_FIXED (vis->fixed), GTK_WIDGET (vis), vis->x, vis->y);
-
- return GTK_WIDGET (vis);
-}
-
-static void ui_vis_destroy (GtkObject * object)
-{
- g_return_if_fail (object != NULL);
- g_return_if_fail (UI_IS_VIS (object));
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void ui_vis_realize (GtkWidget * widget)
-{
- UiVis *vis;
- GdkWindowAttr attributes;
- gint attributes_mask;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (UI_IS_VIS (widget));
-
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
- vis = UI_VIS (widget);
-
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.event_mask = gtk_widget_get_events (widget);
- attributes.event_mask |=
- GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK;
-
- if (vis->visible_window)
- {
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
- widget->window =
- gdk_window_new (widget->parent->window, &attributes,
- attributes_mask);
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_NO_WINDOW);
- gdk_window_set_user_data (widget->window, widget);
- }
- else
- {
- widget->window = gtk_widget_get_parent_window (widget);
- g_object_ref (widget->window);
-
- attributes.wclass = GDK_INPUT_ONLY;
- attributes_mask = GDK_WA_X | GDK_WA_Y;
- vis->event_window =
- gdk_window_new (widget->window, &attributes, attributes_mask);
- GTK_WIDGET_SET_FLAGS (widget, GTK_NO_WINDOW);
- gdk_window_set_user_data (vis->event_window, widget);
- }
-
- widget->style = gtk_style_attach (widget->style, widget->window);
-}
-
-static void ui_vis_unrealize (GtkWidget * widget)
-{
- UiVis *vis;
- vis = UI_VIS (widget);
-
- if (vis->event_window != NULL)
- {
- gdk_window_set_user_data (vis->event_window, NULL);
- gdk_window_destroy (vis->event_window);
- vis->event_window = NULL;
- }
-
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void ui_vis_map (GtkWidget * widget)
-{
- UiVis *vis;
- vis = UI_VIS (widget);
-
- if (vis->event_window != NULL)
- gdk_window_show (vis->event_window);
-
- if (GTK_WIDGET_CLASS (parent_class)->map)
- (*GTK_WIDGET_CLASS (parent_class)->map) (widget);
-}
-
-static void ui_vis_unmap (GtkWidget * widget)
-{
- UiVis *vis;
- vis = UI_VIS (widget);
-
- if (vis->event_window != NULL)
- gdk_window_hide (vis->event_window);
-
- if (GTK_WIDGET_CLASS (parent_class)->unmap)
- (*GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
-}
 
-static void ui_vis_size_request (GtkWidget * widget,
- GtkRequisition * requisition)
-{
- UiVis *vis = UI_VIS (widget);
-
- requisition->width = vis->width * (vis->scaled ? config.scale_factor : 1);
- requisition->height = vis->height * (vis->scaled ? config.scale_factor : 1);
-}
-
-static void ui_vis_size_allocate (GtkWidget * widget,
- GtkAllocation * allocation)
-{
- UiVis *vis = UI_VIS (widget);
-
- widget->allocation = *allocation;
- widget->allocation.x *= (vis->scaled ? config.scale_factor : 1);
- widget->allocation.y *= (vis->scaled ? config.scale_factor : 1);
- if (GTK_WIDGET_REALIZED (widget))
- {
- if (vis->event_window != NULL)
- gdk_window_move_resize (vis->event_window, widget->allocation.x,
- widget->allocation.y, allocation->width,
- allocation->height);
- else
- gdk_window_move_resize (widget->window, widget->allocation.x,
- widget->allocation.y, allocation->width,
- allocation->height);
- }
+static guint32 vis_voice_color[256];
+static guint32 vis_voice_color_fire[256];
+static guint32 vis_voice_color_ice[256];
+static guint32 pattern_fill[76 * 2];
 
- vis->x = widget->allocation.x / (vis->scaled ? config.scale_factor : 1);
- vis->y = widget->allocation.y / (vis->scaled ? config.scale_factor : 1);
-}
+static struct {
+ gboolean active;
+ gfloat data[75], peak[75], peak_speed[75];
+ guchar voiceprint_data[76 * 16];
+ gboolean voiceprint_advance;
+} vis;
 
-#define MAKE_RGB(r,g,b) (((r) << 16) | ((g) << 8) | (b))
 #define RGB_SEEK(x,y) (set = rgb + 76 * (y) + (x))
 #define RGB_SET(c) (* set ++ = (c))
 #define RGB_SET_Y(c) do {* set = (c); set += 76;} while (0)
-#define RGB_SET_INDEX(c) RGB_SET (vis_color[c])
-#define RGB_SET_INDEX_Y(c) RGB_SET_Y (vis_color[c])
-
-static guint32 vis_color[24];
-static guint32 vis_voice_color[256];
-static guint32 vis_voice_color_fire[256];
-static guint32 vis_voice_color_ice[256];
-static guint32 pattern_fill[76 * 2];
+#define RGB_SET_INDEX(c) RGB_SET (active_skin->vis_colors[c])
+#define RGB_SET_INDEX_Y(c) RGB_SET_Y (active_skin->vis_colors[c])
 
 void ui_vis_set_colors (void)
 {
- g_return_if_fail (aud_active_skin != NULL);
-
- for (gint i = 0; i < 24; i ++)
- vis_color[i] = (aud_active_skin->vis_color[i][0] << 16) |
- (aud_active_skin->vis_color[i][1] << 8) |
- aud_active_skin->vis_color[i][2];
+ g_return_if_fail (active_skin != NULL);
 
- GdkColor * fgc = skin_get_color (aud_active_skin, SKIN_TEXTFG);
- GdkColor * bgc = skin_get_color (aud_active_skin, SKIN_TEXTBG);
- gint fg[3] = {fgc->red >> 8, fgc->green >> 8, fgc->blue >> 8};
- gint bg[3] = {bgc->red >> 8, bgc->green >> 8, bgc->blue >> 8};
+ guint32 fgc = active_skin->colors[SKIN_TEXTFG];
+ guint32 bgc = active_skin->colors[SKIN_TEXTBG];
+ gint fg[3] = {COLOR_R (fgc), COLOR_G (fgc), COLOR_B (fgc)};
+ gint bg[3] = {COLOR_R (bgc), COLOR_G (bgc), COLOR_B (bgc)};
 
 for (gint x = 0; x < 256; x ++)
 {
 guchar c[3];
 for (gint n = 0; n < 3; n ++)
 c[n] = bg[n] + (fg[n] - bg[n]) * x / 255;
- vis_voice_color[x] = MAKE_RGB (c[0], c[1], c[2]);
+ vis_voice_color[x] = COLOR (c[0], c[1], c[2]);
 }
 
 for (gint x = 0; x < 256; x ++)
@@ -307,15 +77,11 @@
 guchar r = MIN (x, 127) * 2;
 guchar g = CLAMP (x - 64, 0, 127) * 2;
 guchar b = MAX (x - 128, 0) * 2;
- vis_voice_color_fire[x] = MAKE_RGB (r, g, b);
+ vis_voice_color_fire[x] = COLOR (r, g, b);
 }
 
 for (gint x = 0; x < 256; x ++)
- {
- guchar g = MIN (x, 127) * 2;
- guchar b = MIN (x, 63) * 4;
- vis_voice_color_ice[x] = MAKE_RGB (x, g, b);
- }
+ vis_voice_color_ice[x] = COLOR (x / 2, x, MIN (x * 2, 255));
 
 guint32 * set = pattern_fill;
 guint32 * end = set + 76;
@@ -332,11 +98,8 @@
 }
 }
 
-static gboolean ui_vis_expose (GtkWidget * widget, GdkEventExpose * event)
-{
- UiVis * vis = (UiVis *) widget;
+DRAW_FUNC_BEGIN (ui_vis_draw)
 guint32 rgb[76 * 16];
- guint32 rgb2[76 * 2 * 16 * 2];
 guint32 * set;
 
 if (config.vis_type != VIS_VOICEPRINT)
@@ -355,7 +118,7 @@
 if (bars && (x & 3) == 3)
 continue;
 
- gint h = vis->data[bars ? (x >> 2) : x];
+ gint h = vis.data[bars ? (x >> 2) : x];
 h = CLAMP (h, 0, 16);
 RGB_SEEK (x, 16 - h);
 
@@ -377,7 +140,7 @@
 
 if (config.analyzer_peaks)
 {
- gint h = vis->peak[bars ? (x >> 2) : x];
+ gint h = vis.peak[bars ? (x >> 2) : x];
 h = CLAMP (h, 0, 16);
 
 if (h)
@@ -390,18 +153,17 @@
 
 break;
 case VIS_VOICEPRINT:
- /* Move the ribbon only if we are called directly, not on an actual
- * expose. */
- if (event == NULL)
+ if (vis.voiceprint_advance)
 {
- memmove (voiceprint_data, voiceprint_data + 1, sizeof
- voiceprint_data - 1);
+ vis.voiceprint_advance = FALSE;
+ memmove (vis.voiceprint_data, vis.voiceprint_data + 1, sizeof
+ vis.voiceprint_data - 1);
 
 for (gint y = 0; y < 16; y ++)
- voiceprint_data[76 * y + 75] = vis->data[y];
+ vis.voiceprint_data[76 * y + 75] = vis.data[y];
 }
 
- guchar * get = voiceprint_data;
+ guchar * get = vis.voiceprint_data;
 guint32 * colors = (config.voiceprint_mode == VOICEPRINT_NORMAL) ?
 vis_voice_color : (config.voiceprint_mode == VOICEPRINT_FIRE) ?
 vis_voice_color_fire : /* VOICEPRINT_ICE */ vis_voice_color_ice;
@@ -412,12 +174,15 @@
 RGB_SET (colors[* get ++]);
 break;
 case VIS_SCOPE:
+ if (! vis.active)
+ goto DRAW;
+
 switch (config.scope_mode)
 {
 case SCOPE_DOT:
 for (gint x = 0; x < 75; x ++)
 {
- gint h = CLAMP (1 + vis->data[x], 0, 15);
+ gint h = CLAMP (vis.data[x], 0, 15);
 RGB_SEEK (x, h);
 RGB_SET_INDEX (vis_scope_colors[h]);
 }
@@ -425,8 +190,8 @@
 case SCOPE_LINE:
 for (gint x = 0; x < 74; x++)
 {
- gint h = CLAMP (1 + vis->data[x], 0, 15);
- gint h2 = CLAMP (1 + vis->data[x + 1], 0, 15);
+ gint h = CLAMP (vis.data[x], 0, 15);
+ gint h2 = CLAMP (vis.data[x + 1], 0, 15);
 
 if (h < h2) h2 --;
 else if (h > h2) {gint temp = h; h = h2 + 1; h2 = temp;}
@@ -437,17 +202,17 @@
 RGB_SET_INDEX_Y (vis_scope_colors[y]);
 }
 
- gint h = CLAMP (1 + vis->data[74], 0, 15);
+ gint h = CLAMP (vis.data[74], 0, 15);
 RGB_SEEK (74, h);
 RGB_SET_INDEX (vis_scope_colors[h]);
 break;
 default: /* SCOPE_SOLID */
 for (gint x = 0; x < 75; x++)
 {
- gint h = CLAMP (1 + vis->data[x], 0, 15);
+ gint h = CLAMP (vis.data[x], 0, 15);
 gint h2;
 
- if (h < 8) h2 = 7;
+ if (h < 8) h2 = 8;
 else {h2 = h; h = 8;}
 
 RGB_SEEK (x, h);
@@ -460,140 +225,92 @@
 break;
 }
 
- if (vis->scaled)
- {
- guint32 * to = rgb2;
-
- for (gint y = 0; y < 16 * 2; y ++)
- {
- guint32 * from = rgb + 76 * (y >> 1);
- guint32 * end = from + 76;
-
- while (from < end)
- {
- * to ++ = * from;
- * to ++ = * from ++;
- }
- }
- }
-
- cairo_t * cr = gdk_cairo_create (widget->window);
- cairo_surface_t * surf;
-
- if (vis->scaled)
- surf = cairo_image_surface_create_for_data ((void *) rgb2,
- CAIRO_FORMAT_RGB24, 76 * 2, 16 * 2, 4 * 76 * 2);
- else
- surf = cairo_image_surface_create_for_data ((void *) rgb,
- CAIRO_FORMAT_RGB24, 76, 16, 4 * 76);
-
+DRAW:;
+ cairo_surface_t * surf = cairo_image_surface_create_for_data ((void *) rgb,
+ CAIRO_FORMAT_RGB24, 76, 16, 4 * 76);
 cairo_set_source_surface (cr, surf, 0, 0);
 cairo_paint (cr);
 cairo_surface_destroy (surf);
- cairo_destroy (cr);
+DRAW_FUNC_END
 
- return FALSE;
-}
-
-static void ui_vis_toggle_scaled (UiVis * vis)
+GtkWidget * ui_vis_new (void)
 {
- GtkWidget *widget = GTK_WIDGET (vis);
- vis->scaled = !vis->scaled;
-
- gtk_widget_set_size_request (widget,
- vis->width *
- (vis->scaled ? config.scale_factor : 1),
- vis->height *
- (vis->scaled ? config.scale_factor : 1));
-
- if (widget_really_drawable (widget))
- ui_vis_expose (widget, 0);
+ GtkWidget * wid = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (wid, 76, 16);
+ gtk_widget_add_events (wid, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
+ DRAW_CONNECT (wid, ui_vis_draw);
+ return wid;
 }
 
-void ui_vis_clear_data (GtkWidget * widget)
+void ui_vis_clear_data (GtkWidget * wid)
 {
- g_return_if_fail (UI_IS_VIS (widget));
-
- gint i;
- UiVis *vis = UI_VIS (widget);
-
- memset (voiceprint_data, 0, 16 * 76);
- for (i = 0; i < 75; i++)
- {
- vis->data[i] = (config.vis_type == VIS_SCOPE) ? 6 : 0;
- vis->peak[i] = 0;
- }
-
- if (widget_really_drawable (widget))
- ui_vis_expose (widget, 0);
+ memset (& vis, 0, sizeof vis);
+ gtk_widget_queue_draw (wid);
 }
 
 void ui_vis_timeout_func (GtkWidget * widget, guchar * data)
 {
- g_return_if_fail (UI_IS_VIS (widget));
-
- UiVis *vis = UI_VIS (widget);
- gint i;
-
 if (config.vis_type == VIS_ANALYZER)
 {
 const gint n = (config.analyzer_type == ANALYZER_BARS) ? 19 : 75;
 
- for (i = 0; i < n; i++)
+ for (gint i = 0; i < n; i++)
 {
- if (data[i] > vis->data[i])
+ if (data[i] > vis.data[i])
 {
- vis->data[i] = data[i];
- if (vis->data[i] > vis->peak[i])
+ vis.data[i] = data[i];
+ if (vis.data[i] > vis.peak[i])
 {
- vis->peak[i] = vis->data[i];
- vis->peak_speed[i] = 0.01;
+ vis.peak[i] = vis.data[i];
+ vis.peak_speed[i] = 0.01;
 
 }
- else if (vis->peak[i] > 0.0)
+ else if (vis.peak[i] > 0.0)
 {
- vis->peak[i] -= vis->peak_speed[i];
- vis->peak_speed[i] *=
+ vis.peak[i] -= vis.peak_speed[i];
+ vis.peak_speed[i] *=
 vis_pfalloff_speeds[config.peaks_falloff];
- if (vis->peak[i] < vis->data[i])
- vis->peak[i] = vis->data[i];
- if (vis->peak[i] < 0.0)
- vis->peak[i] = 0.0;
+ if (vis.peak[i] < vis.data[i])
+ vis.peak[i] = vis.data[i];
+ if (vis.peak[i] < 0.0)
+ vis.peak[i] = 0.0;
 }
 }
 else
 {
- if (vis->data[i] > 0.0)
+ if (vis.data[i] > 0.0)
 {
- vis->data[i] -=
+ vis.data[i] -=
 vis_afalloff_speeds[config.analyzer_falloff];
- if (vis->data[i] < 0.0)
- vis->data[i] = 0.0;
+ if (vis.data[i] < 0.0)
+ vis.data[i] = 0.0;
 }
- if (vis->peak[i] > 0.0)
+ if (vis.peak[i] > 0.0)
 {
- vis->peak[i] -= vis->peak_speed[i];
- vis->peak_speed[i] *=
+ vis.peak[i] -= vis.peak_speed[i];
+ vis.peak_speed[i] *=
 vis_pfalloff_speeds[config.peaks_falloff];
- if (vis->peak[i] < vis->data[i])
- vis->peak[i] = vis->data[i];
- if (vis->peak[i] < 0.0)
- vis->peak[i] = 0.0;
+ if (vis.peak[i] < vis.data[i])
+ vis.peak[i] = vis.data[i];
+ if (vis.peak[i] < 0.0)
+ vis.peak[i] = 0.0;
 }
 }
 }
 }
 else if (config.vis_type == VIS_VOICEPRINT)
 {
- for (i = 0; i < 16; i++)
- vis->data[i] = data[15 - i];
+ for (gint i = 0; i < 16; i++)
+ vis.data[i] = data[15 - i];
+
+ vis.voiceprint_advance = TRUE;
 }
 else
 {
- for (i = 0; i < 75; i++)
- vis->data[i] = data[i];
+ for (gint i = 0; i < 75; i++)
+ vis.data[i] = data[i];
 }
 
- if (widget_really_drawable (widget))
- ui_vis_expose (widget, NULL);
+ vis.active = TRUE;
+ gtk_widget_queue_draw (widget);
 }

audacious-plugins-2.5.3.tar.gz/src/skins/ui_vis.h -> audacious-plugins-3.0.tar.gz/src/skins/ui_vis.h Changed

@@ -1,6 +1,6 @@
 /*
 * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Audacious development team.
+ * Copyright (c) 2007-2011 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
@@ -18,19 +18,11 @@
 * Audacious or using our public API to be a derived work.
 */
 
-#ifndef UIVIS_H
-#define UIVIS_H
+#ifndef SKINS_UI_VIS_H
+#define SKINS_UI_VIS_H
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UI_VIS(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, ui_vis_get_type (), UiVis)
-#define UI_VIS_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, ui_vis_get_type (), UiVisClass)
-#define UI_IS_VIS(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, ui_vis_get_type ())
-
 typedef enum {
 VIS_ANALYZER, VIS_SCOPE, VIS_VOICEPRINT, VIS_OFF
 } VisType;
@@ -46,51 +38,26 @@
 typedef enum {
 SCOPE_DOT, SCOPE_LINE, SCOPE_SOLID
 } ScopeMode;
+
 typedef enum {
- VOICEPRINT_NORMAL, VOICEPRINT_FIRE, VOICEPRINT_ICE
+ VOICEPRINT_NORMAL, VOICEPRINT_FIRE, VOICEPRINT_ICE
 } VoiceprintMode;
 
-
 typedef enum {
 VU_NORMAL, VU_SMOOTH
 } VUMode;
 
 typedef enum {
- REFRESH_FULL, REFRESH_HALF, REFRESH_QUARTER, REFRESH_EIGTH
-} RefreshRate;
-
-typedef enum {
- FALLOFF_SLOWEST, FALLOFF_SLOW, FALLOFF_MEDIUM, FALLOFF_FAST,
- FALLOFF_FASTEST
+ FALLOFF_SLOWEST, FALLOFF_SLOW, FALLOFF_MEDIUM, FALLOFF_FAST, FALLOFF_FASTEST
 } FalloffSpeed;
 
-typedef struct _UiVis UiVis;
-typedef struct _UiVisClass UiVisClass;
-
-struct _UiVis {
- GtkWidget widget;
-
- gint x, y, width, height;
- gfloat data[75], peak[75], peak_speed[75];
- gboolean scaled;
- GtkWidget *fixed;
- gboolean visible_window;
- GdkWindow *event_window;
-};
-
-struct _UiVisClass {
- GtkWidgetClass parent_class;
- void (* doubled) (UiVis *vis);
-};
-
-GtkWidget* ui_vis_new (GtkWidget *fixed, gint x, gint y, gint width);
-GType ui_vis_get_type(void);
+GtkWidget * ui_vis_new (void);
 void ui_vis_set_colors (void);
-void ui_vis_clear_data(GtkWidget *widget);
-void ui_vis_timeout_func(GtkWidget *widget, guchar * data);
+void ui_vis_clear_data (GtkWidget * widget);
+void ui_vis_timeout_func (GtkWidget * widget, guchar * data);
 
-#ifdef __cplusplus
-}
-#endif
+GtkWidget * ui_svis_new (void);
+void ui_svis_clear_data (GtkWidget * widget);
+void ui_svis_timeout_func (GtkWidget * widget, guchar * data);
 
 #endif

audacious-plugins-2.5.3.tar.gz/src/skins/util.c -> audacious-plugins-3.0.tar.gz/src/skins/util.c Changed

@@ -23,31 +23,25 @@
 * Audacious or using our public API to be a derived work.
 */
 
-/*#define AUD_DEBUG*/
-
-#include "config.h"
-
-#include "util.h"
-
+#include <ctype.h>
+#include <errno.h>
 #include <dirent.h>
-#include <gdk/gdkkeysyms.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
-#ifdef HAVE_FTS_H
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <fts.h>
-#endif
+#include <gtk/gtk.h>
 
 #include <audacious/debug.h>
+#include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
 #include <libaudcore/audstrings.h>
 #include <libaudcore/hook.h>
+#include <libaudcore/vfs.h>
 
-#include "plugin.h"
+#include "config.h"
+#include "ui_main.h"
+#include "util.h"
 
 typedef struct
 {
@@ -82,7 +76,7 @@
 while ((entry = readdir (handle)) != NULL)
 list = g_list_prepend (list, g_strdup (entry->d_name));
 
- g_hash_table_insert (cache, (char *) folder, list);
+ g_hash_table_insert (cache, g_strdup (folder), list);
 closedir (handle);
 }
 
@@ -392,38 +386,6 @@
 return tmpdir;
 }
 
-
-#ifdef HAVE_FTS_H
-
-void del_directory(const gchar *dirname)
-{
- gchar *const argv[2] = { (gchar *)dirname, NULL };
- FTS *fts;
- FTSENT *p;
-
- fts = fts_open(argv, FTS_PHYSICAL, (gint (*)())NULL);
- while ((p = fts_read(fts)))
- {
- switch (p->fts_info)
- {
- case FTS_D:
- break;
- case FTS_DNR:
- case FTS_ERR:
- break;
- case FTS_DP:
- rmdir(p->fts_accpath);
- break;
- default:
- unlink(p->fts_accpath);
- break;
- }
- }
- fts_close(fts);
-}
-
-#else /* !HAVE_FTS */
-
 static gboolean del_directory_func(const gchar *path, const gchar *basename,
 void *params)
 {
@@ -448,8 +410,6 @@
 rmdir(path);
 }
 
-#endif /* ifdef HAVE_FTS */
-
 static void strip_string(GString *string)
 {
 while (string->len > 0 && string->str[0] == ' ')
@@ -710,7 +670,8 @@
 gchar *temp;
 GArray *a;
 
- g_return_val_if_fail((temp = read_ini_string(inifile, section, key)), NULL);
+ if (! (temp = read_ini_string (inifile, section, key)))
+ return NULL;
 
 a = string_to_garray(temp);
 g_free(temp);
@@ -740,69 +701,6 @@
 return (array);
 }
 
-/* text_get_extents() taken from The GIMP (C) Spencer Kimball, Peter
- * Mattis et al */
-gboolean text_get_extents(const gchar *fontname, const gchar *text, gint *width,
- gint *height, gint *ascent, gint *descent)
-{
- PangoFontDescription *font_desc;
- PangoLayout *layout;
- PangoRectangle rect;
-
- g_return_val_if_fail(fontname != NULL, FALSE);
- g_return_val_if_fail(text != NULL, FALSE);
-
- /* FIXME: resolution */
- layout = gtk_widget_create_pango_layout(GTK_WIDGET(mainwin), text);
-
- font_desc = pango_font_description_from_string(fontname);
- pango_layout_set_font_description(layout, font_desc);
- pango_font_description_free(font_desc);
- pango_layout_get_pixel_extents(layout, NULL, &rect);
-
- if (width)
- *width = rect.width;
- if (height)
- *height = rect.height;
-
- if (ascent || descent)
- {
- PangoLayoutIter *iter;
- PangoLayoutLine *line;
-
- iter = pango_layout_get_iter(layout);
- line = pango_layout_iter_get_line(iter);
- pango_layout_iter_free(iter);
-
- pango_layout_line_get_pixel_extents(line, NULL, &rect);
-
- if (ascent)
- *ascent = PANGO_ASCENT(rect);
- if (descent)
- *descent = -PANGO_DESCENT(rect);
- }
-
- g_object_unref(layout);
-
- return TRUE;
-}
-
-/* counts number of digits in a gint */
-guint gint_count_digits(gint n)
-{
- guint count = 0;
-
- n = ABS(n);
- do
- {
- count++;
- n /= 10;
- }
- while (n > 0);
-
- return count;
-}
-
 gboolean dir_foreach(const gchar *path, DirForeachFunc function,
 gpointer user_data, GError **error)
 {
@@ -852,7 +750,7 @@
 GTK_RESPONSE_REJECT);
 
 gtk_button_set_use_stock(GTK_BUTTON(button), TRUE);
- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default (button, TRUE);
 
 button =
 gtk_dialog_add_button(GTK_DIALOG(dialog),
@@ -877,31 +775,6 @@
 }
 #endif
 
-void resize_window(GtkWidget *window, gint width, gint height)
-{
- /* As of GTK+ 2.16, gtk_window_resize is broken on fixed size windows and
- * needs this workaround. */
- if (!gtk_window_get_resizable((GtkWindow *)window))
- {
- GdkGeometry hints;
-
- hints.min_width = width;
- hints.min_height = height;
- hints.max_width = width;
- hints.max_height = height;
- gtk_window_set_geometry_hints((GtkWindow *)window, NULL, &hints,
- GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
- }
-
- gtk_window_resize((GtkWindow *)window, width, height);
-}
-
-gboolean widget_really_drawable (GtkWidget * widget)
-{
- return GTK_WIDGET_DRAWABLE (widget) && widget->allocation.x >= 0 &&
- widget->allocation.y >= 0;
-}
-
 void check_set (GtkActionGroup * action_group, const gchar * action_name,
 gboolean is_on)
 {

audacious-plugins-2.5.3.tar.gz/src/skins/util.h -> audacious-plugins-3.0.tar.gz/src/skins/util.h Changed

@@ -26,11 +26,8 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS
-#include "audacious/plugin.h"
 typedef gboolean(*DirForeachFunc) (const gchar *path, const gchar *basename,
 gpointer user_data);
 
@@ -56,28 +53,13 @@
 
 GArray *string_to_garray(const gchar *str);
 
-gboolean text_get_extents(const gchar *fontname, const gchar *text, gint *width,
- gint *height, gint *ascent, gint *descent);
-
 gboolean file_is_archive(const gchar *filename);
 gchar *archive_decompress(const gchar *path);
 gchar *archive_basename(const gchar *path);
 
-guint gint_count_digits(gint n);
-
-
 GtkWidget *make_filebrowser(const gchar *title, gboolean save);
 
-GdkPixbuf *audacious_create_colorized_pixbuf(GdkPixbuf *src, gint red,
- gint green, gint blue);
-
-void resize_window(GtkWidget *window, gint width, gint height);
-gboolean widget_really_drawable (GtkWidget * widget);
-void widget_destroy_on_escape (GtkWidget * widget);
-
 void check_set (GtkActionGroup * action_group, const gchar * action_name,
 gboolean is_on);
-void check_button_toggled (GtkToggleButton * button, void * data);
 
-G_END_DECLS
 #endif

audacious-plugins-2.5.3.tar.gz/src/smb/smb.c -> audacious-plugins-3.0.tar.gz/src/smb/smb.c Changed

@@ -1,5 +1,6 @@
 /* Audacious
 * Copyright (c) 2007 Daniel Bradshaw
+ * Copyright (c) 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 as published by
@@ -37,7 +38,7 @@
 
 typedef struct _SMBFile {
 	int fd;
-	long length;
+	gint64 length;
 } SMBFile;
 
 /* TODO: make writing work. */
@@ -53,7 +54,7 @@
 file = g_new0(VFSFile, 1);
 handle = g_new0(SMBFile, 1);
 handle->fd = smbc_open(path, O_RDONLY, 0);
-		
+
 if (handle->fd < 0) {
 g_free(file);
 file = NULL;
@@ -62,7 +63,7 @@
 handle->length = st.st_size;
 file->handle = (void *)handle;
 }
-		
+
 return file;
 }
 
@@ -73,7 +74,7 @@
 
 if (file == NULL)
 return -1;
-	
+
 if (file->handle)
 {
 handle = (SMBFile *)file->handle;
@@ -85,7 +86,7 @@
 return ret;
 }
 
-size_t smb_vfs_fread_impl(gpointer ptr, size_t size, size_t nmemb, VFSFile * file)
+static gint64 smb_vfs_fread_impl (void * ptr, gint64 size, gint64 nmemb, VFSFile * file)
 {
 SMBFile *handle;
 if (file == NULL)
@@ -94,7 +95,7 @@
 return smbc_read(handle->fd, ptr, size * nmemb);
 }
 
-size_t smb_vfs_fwrite_impl(gconstpointer ptr, size_t size, size_t nmemb, VFSFile * file)
+static gint64 smb_vfs_fwrite_impl (const void * ptr, gint64 size, gint64 nmemb, VFSFile * file)
 {
 return 0;
 }
@@ -108,16 +109,16 @@
 return (gint) temp;
 }
 
-gint smb_vfs_fseek_impl(VFSFile * file, glong offset, gint whence)
+static gint smb_vfs_fseek_impl(VFSFile * file, gint64 offset, gint whence)
 {
 SMBFile *handle;
- glong roffset = offset;
+ gint64 roffset = offset;
 gint ret = 0;
 if (file == NULL)
 return 0;
-	
+
 handle = (SMBFile *)file->handle;
-	
+
 if (whence == SEEK_END)
 {
 roffset = handle->length + offset;
@@ -134,7 +135,7 @@
 ret = smbc_lseek(handle->fd, roffset, whence);
 //printf("%ld %d = %d\n",roffset, whence, ret);
 }
-	
+
 return ret;
 }
 
@@ -149,8 +150,7 @@
 smb_vfs_fseek_impl(file, 0, SEEK_SET);
 }
 
-glong
-smb_vfs_ftell_impl(VFSFile * file)
+static gint64 smb_vfs_ftell_impl(VFSFile * file)
 {
 SMBFile *handle;
 handle = (SMBFile *)file->handle;
@@ -160,23 +160,20 @@
 gboolean
 smb_vfs_feof_impl(VFSFile * file)
 {
- SMBFile *handle;
- off_t at;
+ SMBFile * handle = file->handle;
+ gint64 at;
 
 at = smb_vfs_ftell_impl(file);
 
- //printf("%d %d %ld %ld\n",sizeof(int), sizeof(off_t), at, handle->length);
 return (gboolean) (at == handle->length) ? TRUE : FALSE;
 }
 
-gint
-smb_vfs_truncate_impl(VFSFile * file, glong size)
+static gint smb_vfs_truncate_impl (VFSFile * file, gint64 size)
 {
 return -1;
 }
 
-off_t
-smb_vfs_fsize_impl(VFSFile * file)
+static gint64 smb_vfs_fsize_impl (VFSFile * file)
 {
 SMBFile *handle = (SMBFile *)file->handle;
 
@@ -184,7 +181,6 @@
 }
 
 VFSConstructor smb_const = {
-	"smb://",
 	smb_vfs_fopen_impl,
 	smb_vfs_fclose_impl,
 	smb_vfs_fread_impl,
@@ -199,7 +195,7 @@
 	smb_vfs_fsize_impl
 };
 
-static void init(void)
+static gboolean init (void)
 {
 	int err;
 
@@ -207,29 +203,18 @@
 	if (err < 0)
 	{
 		g_message("[smb] not starting samba support due to error code %d", err);
-		return;
+		return FALSE;
 	}
 
-	vfs_register_transport(&smb_const);
+	return TRUE;
 }
 
-static void cleanup(void)
-{
-#if 0
-	vfs_unregister_transport(&smb_const);
-#endif
-}
-
-LowlevelPlugin llp_smb = {
-	NULL,
-	NULL,
-	"smb:// URI Transport",
-	init,
-	cleanup,
-};
-
-LowlevelPlugin *get_lplugin_info(void)
-{
- return &llp_smb;
-}
+static const gchar * const smb_schemes[] = {"smb", NULL};
 
+AUD_TRANSPORT_PLUGIN
+(
+ .name = "SMB transport",
+ .init = init,
+ .schemes = smb_schemes,
+ .vtable = & smb_const
+)

audacious-plugins-2.5.3.tar.gz/src/sndfile/plugin.c -> audacious-plugins-3.0.tar.gz/src/sndfile/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/sndstretch/sndstretch.c -> audacious-plugins-3.0.tar.gz/src/sndstretch/sndstretch.c Changed

@@ -178,7 +178,7 @@
 /*void ringget ( s16 * ringbuff, int ring_size, int pos, s16 *buffer, int size )
 {
 int i;
- 
+
 if( pos+size > ring_size ){
 for( i=pos; i<ring_size; i++ ) buffer[i]=ringbuff[i];
 for( i=0; i<size-ring_size+pos; i++ ) buffer[i]=ringbuff[i];
@@ -215,7 +215,7 @@
 
 int snr;
 double snr_d;
- 
+
 int i,p1,p2;
 double fade_in, fade_out;
 double outd;
@@ -225,25 +225,25 @@
 /* reset */
 if( !is_initialized || initialize ||
 snr_i!=snr_i_act || snr_o!=snr_o_act ){
- 
+
 snr_rest = 0.0;
 snr_o_prod = 0;
 snr_i_act = snr_i;
 snr_o_act = snr_o;
 dsnr = snr_o_act-snr_i_act;
 pos_act = pos_init;
- 
+
 is_initialized = 1;
 
 }
- 
+
 /* fprintf(stderr,"pos_act=%d\n",pos_act);
 */
 snr_d = (double)snr_proc*(double)snr_o_act/(double)snr_i_act
 + snr_rest;
 snr = (int) (snr_d) / 2 * 2;
 snr_rest = snr_d - (double)snr;
- 
+
 /* fprintf(stderr,"snr=%d\n",snr);
 */
 /* outbuff=malloc(snr*sizeof(s16));
@@ -329,23 +329,23 @@
 /* reset */
 if( !is_initialized || initialize ||
 snr_i!=snr_i_act || snr_o!=snr_o_act ){
- 
+
 snr_rest = 0.0;
 snr_o_prod = 0;
 snr_i_act = snr_i;
 snr_o_act = snr_o;
 dsnr = snr_o_act-snr_i_act;
 pos_act = pos_init;
- 
+
 is_initialized = 1;
 
 }
- 
+
 snr_d = (double)snr_proc*(double)snr_o_act/(double)snr_i_act
 + snr_rest;
 snr = (int) (snr_d) / 2 * 2;
 snr_rest = snr_d - (double)snr;
- 
+
 /* produce snr samples */
 i=0;
 do {
@@ -431,23 +431,23 @@
 /* reset */
 if( !is_initialized || initialize ||
 snr_i!=snr_i_act || snr_o!=snr_o_act ){
- 
+
 snr_rest = 0.0;
 snr_o_prod = 0;
 snr_i_act = snr_i;
 snr_o_act = snr_o;
 dsnr = snr_o_act-snr_i_act;
 pos_act = pos_init;
- 
+
 is_initialized = 1;
 
 }
- 
+
 snr_d = (double)snr_proc*(double)snr_o_act/(double)snr_i_act
 + snr_rest;
 snr = (int) (snr_d) / 2 * 2;
 snr_rest = snr_d - (double)snr;
- 
+
 /* produce snr samples */
 i=0;
 do {
@@ -514,7 +514,7 @@
 {
 static s16 last_samp[10]; /* 10 channels maximum ;) */
 static double pos_d = 0.0;
- 
+
 int snr;
 int pos1, pos2;
 s16 samp1, samp2;
@@ -523,7 +523,7 @@
 double ds;
 double ratio1, ratio2, outd;
 
- 
+
 if ( initialize ){
 for( ch=0; ch<chnr; ch++ ){
 last_samp[ch] = 0;
@@ -535,15 +535,15 @@
 
 /* fprintf(stderr,"ds=%f\n",ds); */
 /* fprintf(stderr,"pos_d =%f\n",pos_d);*/
- 
+
 /* produce proper amount of samples */
 for( snr=0 ; pos_d < snr_proc/chnr-1 ; pos_d+=ds ){
- 
+
 pos1 = (int)floor(pos_d);
 pos2 = pos1+1;
 ratio1 = 1-pos_d+floor(pos_d);
 ratio2 = pos_d-floor(pos_d);
- 
+
 for( ch=0; ch<chnr; ch++ ){
 
 index1 = pos1*chnr+ch;
@@ -562,19 +562,19 @@
 snr+=chnr;
 
 }
- 
+
 pos_d -= (double)(snr_proc/chnr);
- 
+
 for( ch=0; ch<chnr; ch++ ){
 last_samp[ch] = buffer[snr_proc-chnr+ch];
 }
- 
+
 *out_prod = snr;
- 
+
 /* fprintf(stderr,"snr = %d\n",snr);*/
- 
+
 /* last_samp = buffer[snr_proc-1]; */
- 
+
 return( snr );
 }
 
@@ -596,7 +596,7 @@
 {
 static s16 last_samp[10]; /* 10 channels maximum ;) */
 static int pos_rest;
- 
+
 static int snr;
 static int pos1, pos2;
 static int ch;
@@ -604,7 +604,7 @@
 static int ds_li, ds_li_c, ds_rest;
 static int snr_proc_m_chnr;
 
- 
+
 if ( initialize ){
 for( ch=0; ch<chnr; ch++ ){
 last_samp[ch] = 0;
@@ -615,13 +615,13 @@
 ds_li = snr_i/snr_o;
 ds_li_c = ds_li*chnr;
 ds_rest = snr_i%snr_o;
- 
+
 snr_proc_m_chnr = snr_proc-chnr;
 for( snr=0 ; pos1 < snr_proc_m_chnr ; pos1+=ds_li_c ){
- 
+
 pos2 = pos1+chnr;
 ratio1_i = snr_o-pos_rest;
- 
+
 if (pos1<0){
 for( ch=0; ch<chnr; ch++ ){
 outbuff[snr+ch] = (s16)
@@ -643,11 +643,11 @@
 }
 
 pos1 -= snr_proc;
- 
+
 for( ch=0; ch<chnr; ch++ ){
 last_samp[ch] = buffer[snr_proc-chnr+ch];
 }
- 
+
 *out_prod = snr;
 
 return( snr );
@@ -672,7 +672,7 @@
 {
 /* static s16 * last_samp;
 static int pos_rest;
- 
+
 static int snr;
 static int pos1, pos2;
 static int ch;
@@ -702,13 +702,13 @@
 ds_li = snr_i/snr_o;
 ds_li_c = ds_li*chnr;
 ds_rest = snr_i%snr_o;
- 
+
 snr_proc_m_chnr = snr_proc-chnr;
 for( snr=0 ; pos1 < snr_proc_m_chnr ; pos1+=ds_li_c ){
- 
+
 pos2 = pos1+chnr;
 ratio1_i = snr_o-pos_rest;
- 
+
 if (pos1<0){
 for( ch=0; ch<chnr; ch++ ){
 outbuff[snr+ch] = (s16)
@@ -730,25 +730,25 @@
 }
 
 pos1 -= snr_proc;
- 
+
 for( ch=0; ch<chnr; ch++ ){
 last_samp[ch] = buffer[snr_proc-chnr+ch];
 }
- 
+
 *out_prod = snr;
 
 return( snr );
 
-#undef last_samp 
-#undef pos_rest 
-#undef snr 
-#undef pos1 
-#undef pos2 
-#undef ch 
-#undef ratio1_i 
-#undef ds_li 
-#undef ds_li_c 
-#undef ds_rest 
+#undef last_samp
+#undef pos_rest
+#undef snr
+#undef pos1
+#undef pos2
+#undef ch
+#undef ratio1_i
+#undef ds_li
+#undef ds_li_c
+#undef ds_rest
 #undef snr_proc_m_chnr
 }
 
@@ -781,7 +781,7 @@
 static double speed_act = 0;
 static double pitch_act = 0;
 static double fade_shift_act = 0;
- 
+
 int snr_prod;
 double speed_eff;
 double pitch_eff;
@@ -797,16 +797,16 @@
 
 scaling_first=0;
 // if( pitch > 1.0 ) scaling_first=0; else scaling_first=1;
- 
+
 if ( !is_init || initialize || speed!=speed_act || pitch!=pitch_act ||
 fade_shift!=fade_shift_act ){
 
 if( !is_init || initialize ) init_me=1; else init_me=0;
- 
+
 #ifdef DEBUG
 fprintf(stderr,"snd_stretch_scale - init - pitch:%f, speed:%f\n",pitch,speed);
 #endif
- 
+
 speed_act = speed;
 pitch_act = pitch;
 fade_shift_act = fade_shift;
@@ -815,7 +815,7 @@
 // if (buff_help!=0) free(buff_help);
 
 if (initialize != -1){
- 
+
 dsnr = fade_shift;
 // dsnr = 1764; // 25Hz
 // dsnr = 1536; // 30Hz
@@ -877,7 +877,7 @@
 ring_pos_w = (ring_pos_w+(channels-1))/channels*channels;
 
 ring_size_old = ring_size;
- 
+
 is_init = 1;
 
 } else { /* initialize == -1 */
@@ -886,9 +886,9 @@
 /* buffers are released -> leave the function */
 return 0; /* !!! sloppy */
 }
- 
+
 }
- 
+
 if ( fabs(speed_eff-1.0)>0.001 ){ /*
 0.001 ?!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -925,20 +925,20 @@
 }
 
 if( 0/*scaling_first*/ ){
- 
+
 snr_proc_scale = snr_proc;
 sndscale ( buff_i,
 snr_scale_i, snr_scale_o, channels,
 buff_help, &snr_prod, snr_proc_scale, init_me );
 /* buff_o, &snr_prod, snr_proc_scale, 0 ); */
- 
+
 if( speed_eff!=1.0 ){ /* add echo only when really stretching */
 ringload_IIR_1_div_e_echo_i( ring_buff, ring_size, ring_pos_w, buff_help, snr_prod, dsnr*channels );
 } else {
 ringload( ring_buff, ring_size, ring_pos_w, buff_help, snr_prod );
 }
 ring_pos_w = ringpos( ring_pos_w+snr_prod, ring_size );
- 
+
 snr_proc_stretch = snr_prod;
 sndstretch ( ring_buff, ring_size, ring_pos_r,
 snr_stretch_i*channels, snr_stretch_o*channels, channels,
@@ -957,12 +957,12 @@
 ringload( ring_buff, ring_size, ring_pos_w, buff_i, snr_proc );
 }
 ring_pos_w = ringpos( ring_pos_w+snr_proc, ring_size );
- 
+
 snr_proc_stretch = snr_proc;
 sndstretch ( ring_buff, ring_size, ring_pos_r,
 snr_stretch_i*channels, snr_stretch_o*channels, channels,
 buff_help, &snr_prod, snr_proc_stretch, init_me );
- 
+
 ring_pos_r = ringpos( ring_pos_r+snr_prod, ring_size );
 
 snr_proc_scale = snr_prod;
@@ -972,9 +972,9 @@
 buff_o, &snr_prod, snr_proc_scale, init_me );
 
 }
- 
+
 *snr_produced = snr_prod;
- 
+
 return snr_prod;
 }
 
@@ -1035,34 +1035,36 @@
 #define speed_act job->speed_act
 #define pitch_act job->pitch_act
 #define fade_shift_act job->fade_shift_act
- 
+
 speed_eff = speed/pitch;
 pitch_eff = pitch;
 
 scaling_first=0;
 // if( pitch > 1.0 ) scaling_first=0; else scaling_first=1;
- 
+
 if ( !is_init || initialize || speed!=speed_act || pitch!=pitch_act ||
 fade_shift != fade_shift_act ){
 
 if( !is_init || initialize ) init_me=1; else init_me=0;
- 
+
 #ifdef DEBUG
 fprintf(stderr,"snd_stretch_scale - init - pitch:%f, speed:%f\n",pitch,speed);
 #endif
- 
+
 speed_act = speed;
 pitch_act = pitch;
+#ifdef DEBUG
 if ( fade_shift != fade_shift_act ){
 fprintf(stderr,"changed fade_shift_act\n");
 }
+#endif
 fade_shift_act = fade_shift;
 
 // if (ring_buff!=0) free(ring_buff);
 // if (buff_help!=0) free(buff_help);
 
 if (initialize != -1){
- 
+
 dsnr = fade_shift;
 // dsnr = 1764; // 25Hz
 // dsnr = 1536; // 30Hz
@@ -1124,7 +1126,7 @@
 ring_pos_w = (ring_pos_w+(channels-1))/channels*channels;
 
 ring_size_old = ring_size;
- 
+
 is_init = 1;
 
 } else { /* initialize == -1 */
@@ -1133,9 +1135,9 @@
 /* buffers are released -> leave the function */
 return 0; /* !!! sloppy */
 }
- 
+
 }
- 
+
 if ( fabs(speed_eff-1.0)>0.001 ){ /*
 0.001 ?!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1172,14 +1174,14 @@
 }
 
 if( 0/*scaling_first*/ ){
- 
+
 snr_proc_scale = snr_proc;
 sndscale_job ( buff_i,
 snr_scale_i, snr_scale_o, channels,
 buff_help, &snr_prod, snr_proc_scale, init_me,
 &(job->scale_job) );
 /* buff_o, &snr_prod, snr_proc_scale, 0 ); */
- 
+
 if( speed_eff!=1.0 ){ /* add echo only when really stretching */
 if( !vol_corr ){
 ringload_IIR_1_div_e_echo_i( ring_buff, ring_size, ring_pos_w, buff_help, snr_prod, dsnr*channels );
@@ -1190,7 +1192,7 @@
 ringload( ring_buff, ring_size, ring_pos_w, buff_help, snr_prod );
 }
 ring_pos_w = ringpos( ring_pos_w+snr_prod, ring_size );
- 
+
 snr_proc_stretch = snr_prod;
 sndstretch_job ( ring_buff, ring_size, ring_pos_r,
 snr_stretch_i*channels, snr_stretch_o*channels, channels,
@@ -1215,14 +1217,14 @@
 ringload( ring_buff, ring_size, ring_pos_w, buff_i, snr_proc );
 }
 ring_pos_w = ringpos( ring_pos_w+snr_proc, ring_size );
- 
+
 snr_proc_stretch = snr_proc;
 sndstretch_job ( ring_buff, ring_size, ring_pos_r,
 snr_stretch_i*channels, snr_stretch_o*channels, channels,
 buff_help, &snr_prod, snr_proc_stretch, init_me,
 &(job->stretch_job)
 );
- 
+
 ring_pos_r = ringpos( ring_pos_r+snr_prod, ring_size );
 
 snr_proc_scale = snr_prod;
@@ -1234,9 +1236,9 @@
 );
 
 }
- 
+
 *snr_produced = snr_prod;
- 
+
 return snr_prod;
 #undef ring_buff
 #undef ring_buff_old

audacious-plugins-2.5.3.tar.gz/src/sndstretch/sndstretch_xmms.c -> audacious-plugins-3.0.tar.gz/src/sndstretch/sndstretch_xmms.c Changed

audacious-plugins-2.5.3.tar.gz/src/song_change/song_change.c -> audacious-plugins-3.0.tar.gz/src/song_change/song_change.c Changed

@@ -51,16 +51,13 @@
 
 static GtkWidget *cmd_warn_label, *cmd_warn_img;
 
-GeneralPlugin sc_gp =
-{
-	.description = "Song Change " PACKAGE_VERSION,
+AUD_GENERAL_PLUGIN
+(
+	.name = "Song Change",
 	.init = init,
 	.cleanup = cleanup,
 	.settings = &preferences,
-};
-
-GeneralPlugin *songchange_gplist[] = { &sc_gp, NULL };
-SIMPLE_GENERAL_PLUGIN(songchange, songchange_gplist);
+)
 
 /**
  * Escapes characters that are special to the shell inside double quotes.
@@ -195,7 +192,8 @@
 			formatter_associate (formatter, 'c', numbuf);
 		}
 
-		const void *tuple = aud_playlist_entry_get_tuple(aud_playlist_get_active(), pos, 0);
+		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)
@@ -215,6 +213,9 @@
 		else
 			formatter_associate(formatter, 'T', "");
 
+		if (tuple)
+			tuple_free (tuple);
+
 		shstring = formatter_format(formatter, cmd);
 		formatter_destroy(formatter);
 
@@ -550,6 +551,7 @@
 }
 
 static PluginPreferences preferences = {
+    .domain = PACKAGE,
     .title = N_("Song Change"),
 /*    .imgurl = DATA_DIR "/images/plugins.png", */
     .prefs = settings,

audacious-plugins-2.5.3.tar.gz/src/statusicon/statusicon.c -> audacious-plugins-3.0.tar.gz/src/statusicon/statusicon.c Changed

audacious-plugins-2.5.3.tar.gz/src/stereo_plugin/stereo.c -> audacious-plugins-3.0.tar.gz/src/stereo_plugin/stereo.c Changed

@@ -23,12 +23,12 @@
 static gint stereo_decoder_to_output_time (gint time);
 static gint stereo_output_to_decoder_time (gint time);
 
-EffectPlugin stereo_ep =
-{
-	.description = "Extra Stereo Plugin", /* Description */
-	.init = init,
-	.about = about,
-	.configure = configure,
+AUD_EFFECT_PLUGIN
+(
+    .name = "Extra Stereo",
+    .init = init,
+    .about = about,
+    .configure = configure,
     .start = stereo_start,
     .process = stereo_process,
     .flush = stereo_flush,
@@ -36,7 +36,7 @@
     .decoder_to_output_time = stereo_decoder_to_output_time,
     .output_to_decoder_time = stereo_output_to_decoder_time,
     .preserves_format = TRUE,
-};
+)
 
 static const char *about_text = N_("Extra Stereo Plugin\n\n"
                                    "By Johan Levin 1999.");
@@ -44,10 +44,6 @@
 static GtkWidget *conf_dialog = NULL;
 static gdouble value;
 
-EffectPlugin *stereo_eplist[] = { &stereo_ep, NULL };
-
-DECLARE_PLUGIN(stereo, NULL, NULL, NULL, NULL, stereo_eplist, NULL, NULL, NULL);
-
 static gboolean init (void)
 {
 	value = 2.5;

audacious-plugins-2.5.3.tar.gz/src/tonegen/tonegen.c -> audacious-plugins-3.0.tar.gz/src/tonegen/tonegen.c Changed

audacious-plugins-2.5.3.tar.gz/src/unix-io/unix-io.c -> audacious-plugins-3.0.tar.gz/src/unix-io/unix-io.c Changed

audacious-plugins-2.5.3.tar.gz/src/usf/usf.c -> audacious-plugins-3.0.tar.gz/src/usf/usf.c Changed

@@ -176,7 +176,7 @@
 			else //no path
 				pathlength = 7;
 
-			strcpy(title, &fn[pathlength]);			
+			strcpy(title, &fn[pathlength]);
 
 		}
 
@@ -190,7 +190,7 @@
 
 	vfs_fseek(fil, reservestart, SEEK_SET);
 	vfs_fread(&temp, 4, 1, fil);
-		
+
 	if(temp == 0x34365253) { //there is a rom section
 		int len = 0, start = 0;
 		vfs_fread(&len, 4, 1, fil);
@@ -218,7 +218,7 @@
 
 	}
 
-	
+
 
 	vfs_fread(&temp, 4, 1, fil);
 	if(temp == 0x34365253) {
@@ -234,8 +234,8 @@
 		}
 	}
 
- // Detect the Ramsize before the memory allocation 
-	
+ // Detect the Ramsize before the memory allocation
+
 	if(*(uint32_t*)(savestatespace + 4) == 0x400000) {
 		RdramSize = 0x400000;
 		savestatespace = realloc(savestatespace, 0x40275c);
@@ -270,22 +270,22 @@
 {
 	if(millisecond < play_time) {
 		is_paused = 0;
-				
+
 		fake_seek_stopping = 1;
 		CloseCpu();
-					
+
 		while(!cpu_stopped)
 			usleep(1);
-		
+
 		is_seeking = 1;
 		seek_time = (double)millisecond;
-		
-		fake_seek_stopping = 2;	
+
+		fake_seek_stopping = 2;
 	} else {
 		is_seeking = 1;
-		seek_time = (double)millisecond;		
+		seek_time = (double)millisecond;
 	}
-				
+
 	context->output->flush(millisecond/1000);
 }
 
@@ -313,9 +313,9 @@
 
 
 	pcontext = context;
- 	
+
 // Allocate main memory after usf loads (to determine ram size)
-	
+
 	PreAllocate_Memory();
 
 if(!LoadUSF(filename, file)) {
@@ -323,17 +323,17 @@
 	vfs_fclose(file);
 	return;
 }
-	
+
 	context->set_pb_ready(context);
 
 	Allocate_Memory();
 
-	usf_playing = TRUE;	
-	while(usf_playing) {		
+	usf_playing = TRUE;
+	while(usf_playing) {
 		is_fading = 0;
 		play_time = 0;
 
-		StartEmulationFromSave(savestatespace);		
+		StartEmulationFromSave(savestatespace);
 		if(!fake_seek_stopping) break;
 		while(fake_seek_stopping != 2)
 			usleep(1);
@@ -468,7 +468,7 @@
 
 		tuple_associate_string(tuple, FIELD_CODEC, NULL, "Nintendo 64 Audio");
 		tuple_associate_string(tuple, -1, "console", "Nintendo 64");
-		
+
 		free(tagbuffer);
 		free(buffer2);
 	}
@@ -490,24 +490,18 @@
 		tuple_associate_int(tuple, FIELD_LENGTH, NULL, (180 * 1000));
 		tuple_associate_string(tuple, FIELD_TITLE, NULL, title);
 	}
-	
+
 	return tuple;
 }
 
-InputPlugin usf_ip = {
- .description = "USF Plugin",
+AUD_INPUT_PLUGIN
+(
+ .name = "USF Audio",
 .init = usf_init,
 .play = usf_play,
 .stop = usf_stop,
 .pause = usf_pause,
 .mseek = usf_mseek,
- .vfs_extensions = (gchar **)usf_exts,
+ .extensions = usf_exts,
 .probe_for_tuple = usf_get_song_tuple,
-};
-
-
-
-static InputPlugin *usf_iplist[] = { &usf_ip, NULL };
-
-DECLARE_PLUGIN(usf_iplist, NULL, NULL, usf_iplist, NULL, NULL, NULL, NULL, NULL);
-
+)

audacious-plugins-2.5.3.tar.gz/src/voice_removal/voice_removal.c -> audacious-plugins-3.0.tar.gz/src/voice_removal/voice_removal.c Changed

audacious-plugins-2.5.3.tar.gz/src/vorbis/Makefile -> audacious-plugins-3.0.tar.gz/src/vorbis/Makefile Changed

audacious-plugins-3.0.tar.gz/src/vorbis/base64.c Added

@@ -0,0 +1,112 @@
+/*
+ * 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-2.5.3.tar.gz/src/vorbis/configure.c -> audacious-plugins-3.0.tar.gz/src/vorbis/configure.c Changed

audacious-plugins-2.5.3.tar.gz/src/vorbis/vorbis.c -> audacious-plugins-3.0.tar.gz/src/vorbis/vorbis.c Changed

@@ -4,7 +4,7 @@
 * Copyright (C) 2007 William Pitcock <nenolod@sacredspiral.co.uk>
 * Copyright (C) 2008 Cristi Măgherușan <majeru@gentoo.ro>
 * Copyright (C) 2008 Eugene Zagidullin <e.asphyx@gmail.com>
- * Copyright (C) 2009 Audacious Developers
+ * Copyright (C) 2009-2011 Audacious Developers
 *
 * ReplayGain processing Copyright (C) 2002 Gian-Carlo Pascutto <gcp@sjeng.org>
 *
@@ -48,6 +48,8 @@
 
 #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);
@@ -518,6 +520,59 @@
 return tuple;
 }
 
+static gboolean get_song_image (const gchar * filename, VFSFile * file,
+ void * * data, gint * size)
+{
+ OggVorbis_File vfile;
+
+ if (ov_open_callbacks (file, & vfile, NULL, 0, vfs_is_streaming (file) ?
+ vorbis_callbacks_stream : vorbis_callbacks) < 0)
+ return FALSE;
+
+ vorbis_comment * comment = ov_comment (& vfile, -1);
+ if (! comment)
+ goto ERR;
+
+ const gchar * s = vorbis_comment_query (comment, "METADATA_BLOCK_PICTURE", 0);
+ if (! s)
+ goto ERR;
+
+ void * data2;
+ gint length2;
+ if (! base64_decode (s, & data2, & length2))
+ goto ERR;
+
+ if (length2 < 8)
+ goto PARSE_ERR;
+
+ gint mime_length = GUINT32_FROM_BE (* (guint32 *) (data2 + 4));
+ if (length2 < 8 + mime_length + 4)
+ goto PARSE_ERR;
+
+ gint desc_length = GUINT32_FROM_BE (* (guint32 *) (data2 + 8 + mime_length));
+ if (length2 < 8 + mime_length + 4 + desc_length + 20)
+ goto PARSE_ERR;
+
+ * size = GUINT32_FROM_BE (* (guint32 *) (data2 + 8 + mime_length + 4 + desc_length + 16));
+ if (length2 < 8 + mime_length + 4 + desc_length + 20 + * size)
+ goto PARSE_ERR;
+
+ * data = g_malloc (* size);
+ memcpy (* data, data2 + 8 + mime_length + 4 + desc_length + 20, * size);
+
+ g_free (data2);
+ ov_clear (& vfile);
+ return TRUE;
+
+PARSE_ERR:
+ fprintf (stderr, "vorbis: Error parsing METADATA_BLOCK_PICTURE in %s.\n", filename);
+ g_free (data2);
+
+ERR:
+ ov_clear (& vfile);
+ return FALSE;
+}
+
 static void vorbis_aboutbox (void)
 {
 static GtkWidget * about_window = NULL;
@@ -593,8 +648,6 @@
 seek_mutex = g_mutex_new();
 seek_cond = g_cond_new();
 
- aud_mime_set_plugin("application/ogg", &vorbis_ip);
-
 return TRUE;
 }
 
@@ -639,9 +692,11 @@
 extern PluginPreferences preferences;
 
 static const gchar *vorbis_fmts[] = { "ogg", "ogm", "oga", NULL };
+static const gchar * const mimes[] = {"application/ogg", NULL};
 
-static InputPlugin vorbis_ip = {
- .description = "Ogg Vorbis Audio Plugin",
+AUD_INPUT_PLUGIN
+(
+ .name = "Ogg Vorbis",
 .init = vorbis_init,
 .about = vorbis_aboutbox,
 .settings = &preferences,
@@ -651,14 +706,12 @@
 .mseek = vorbis_mseek,
 .cleanup = vorbis_cleanup,
 .probe_for_tuple = get_song_tuple,
- .is_our_file_from_vfs = vorbis_check_fd,
- .vfs_extensions = vorbis_fmts,
+ .get_song_image = get_song_image,
 .update_song_tuple = vorbis_update_song_tuple,
+ .is_our_file_from_vfs = vorbis_check_fd,
+ .extensions = vorbis_fmts,
+ .mimes = mimes,
 
 /* Vorbis probing is a bit slow; check for MP3 and AAC first. -jlindgren */
 .priority = 2,
-};
-
-static InputPlugin *vorbis_iplist[] = { &vorbis_ip, NULL };
-
-SIMPLE_INPUT_PLUGIN (vorbis, vorbis_iplist)
+)

audacious-plugins-2.5.3.tar.gz/src/vtx/vtx.c -> audacious-plugins-3.0.tar.gz/src/vtx/vtx.c Changed

audacious-plugins-2.5.3.tar.gz/src/wavpack/wavpack.c -> audacious-plugins-3.0.tar.gz/src/wavpack/wavpack.c Changed

audacious-plugins-2.5.3.tar.gz/src/winmm/waveout.c -> audacious-plugins-3.0.tar.gz/src/winmm/waveout.c Changed

audacious-plugins-2.5.3.tar.gz/src/xsf/plugin.c -> audacious-plugins-3.0.tar.gz/src/xsf/plugin.c Changed

audacious-plugins-2.5.3.tar.gz/src/xspf/xspf.c -> audacious-plugins-3.0.tar.gz/src/xspf/xspf.c Changed

@@ -3,6 +3,7 @@
 * Copyright (c) 2006 William Pitcock, Tony Vroon, George Averill,
 * Giacomo Lozito, Derek Pomery, Yoshiki Yazawa
 * and Matti Hämäläinen.
+ * Copyright (c) 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 as published by
@@ -19,19 +20,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-/* #define AUD_DEBUG 1 */
-
-#include <config.h>
-
-#include <glib.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xmlreader.h>
@@ -40,9 +28,6 @@
 #include <libxml/xpathInternals.h>
 #include <libxml/uri.h>
 
-#include <audacious/debug.h>
-#include <audacious/misc.h>
-#include <audacious/playlist.h>
 #include <audacious/plugin.h>
 
 #define XSPF_ROOT_NODE_NAME "playlist"
@@ -181,13 +166,6 @@
 static void xspf_find_track (xmlNode * tracklist, const gchar * filename, const
 gchar * base, struct index * filenames, struct index * tuples)
 {
- /* Preallocate space to avoid reallocs. */
-#if 0 /* Fix me: Find out what version of libxml2 this was added in. */
- gint count = xmlChildElementCount (tracklist);
- index_allocate (filenames, count);
- index_allocate (tuples, count);
-#endif
-
 xmlNode *nptr;
 
 for (nptr = tracklist->children; nptr != NULL; nptr = nptr->next) {
@@ -209,15 +187,12 @@
 
 static gint close_cb (void * file)
 {
- return vfs_fclose (file);
+ return 0;
 }
 
-static gboolean xspf_playlist_load (const gchar * filename, gint list, gint pos)
+static gboolean xspf_playlist_load (const gchar * filename, VFSFile * file,
+ gchar * * title, struct index * filenames, struct index * tuples)
 {
- VFSFile * file = vfs_fopen (filename, "r");
- if (! file)
- return FALSE;
-
 xmlDoc * doc = xmlReadIO (read_cb, close_cb, file, filename, NULL,
 XML_PARSE_RECOVER);
 if (! doc)
@@ -230,11 +205,9 @@
 xmlMemGet (& xmlFree, & xmlMalloc, & xmlRealloc, NULL);
 #endif
 
- xmlNode *nptr, *nptr2;
- struct index * filenames, * tuples;
+ * title = NULL;
 
- filenames = index_new ();
- tuples = index_new ();
+ xmlNode *nptr, *nptr2;
 
 // find trackList
 for (nptr = doc->children; nptr != NULL; nptr = nptr->next) {
@@ -244,28 +217,30 @@
 
 base = (gchar *)xmlNodeGetBase(doc, nptr);
 
- for (nptr2 = nptr->children; nptr2 != NULL; nptr2 = nptr2->next) {
- if (nptr2->type == XML_ELEMENT_NODE &&
- !xmlStrcmp(nptr2->name, (xmlChar *)"title")) {
- xmlChar *title = xmlNodeGetContent(nptr2);
-
- if (title && title[0] && ! aud_playlist_entry_count (list))
- aud_playlist_set_title (list, (const gchar *) title);
+ for (nptr2 = nptr->children; nptr2; nptr2 = nptr2->next)
+ {
+ if (nptr2->type != XML_ELEMENT_NODE)
+ continue;
 
- xmlFree(title);
- } else
- if (nptr2->type == XML_ELEMENT_NODE &&
- !xmlStrcmp(nptr2->name, (xmlChar *)"trackList")) {
- xspf_find_track (nptr2, filename, base, filenames, tuples);
+ if (! xmlStrcmp (nptr2->name, (xmlChar *) "title"))
+ {
+ xmlChar * xml_title = xmlNodeGetContent (nptr2);
+ if (xml_title && xml_title[0])
+ {
+ g_free (* title);
+ * title = g_strdup ((gchar *) xml_title);
+ }
+ xmlFree (xml_title);
 }
+ else if (! xmlStrcmp (nptr2->name, (xmlChar *) "trackList"))
+ xspf_find_track (nptr2, filename, base, filenames, tuples);
 }
 
 xmlFree (base);
 }
 }
- xmlFreeDoc(doc);
 
- aud_playlist_entry_insert_batch (list, pos, filenames, tuples);
+ xmlFreeDoc(doc);
 return TRUE;
 }
 
@@ -301,10 +276,10 @@
 }
 
 
-static gboolean xspf_playlist_save (const gchar * filename, gint playlist)
+static gboolean xspf_playlist_save (const gchar * filename, VFSFile * file,
+ const gchar * title, struct index * filenames, struct index * tuples)
 {
- const gchar * title = aud_playlist_get_title (playlist);
- gint entries = aud_playlist_entry_count (playlist);
+ gint entries = index_count (filenames);
 xmlDocPtr doc;
 xmlNodePtr rootnode, tracklist;
 gint count;
@@ -319,9 +294,8 @@
 
 /* common */
 xmlDocSetRootElement(doc, rootnode);
- xspf_add_node(rootnode, TUPLE_STRING, FALSE, "creator", PACKAGE "-" VERSION, 0);
 
- if (title != NULL)
+ if (title)
 xspf_add_node (rootnode, TUPLE_STRING, FALSE, "title", title, 0);
 
 tracklist = xmlNewNode(NULL, (xmlChar *)"trackList");
@@ -329,10 +303,8 @@
 
 for (count = 0; count < entries; count ++)
 {
- const gchar * filename = aud_playlist_entry_get_filename (playlist,
- count);
- const Tuple * tuple = aud_playlist_entry_get_tuple (playlist, count,
- FALSE);
+ const gchar * filename = index_get (filenames, count);
+ const Tuple * tuple = index_get (tuples, count);
 xmlNodePtr track, location;
 const gchar *scratch = NULL;
 gint scratchi = 0;
@@ -369,10 +341,6 @@
 }
 }
 
- VFSFile * file = vfs_fopen (filename, "w");
- if (! file)
- goto ERR;
-
 xmlSaveCtxt * save = xmlSaveToIO (write_cb, close_cb, file, NULL,
 XML_SAVE_FORMAT);
 if (! save)
@@ -391,13 +359,10 @@
 
 static const gchar * const xspf_exts[] = {"xspf", NULL};
 
-static PlaylistPlugin xspf_plugin = {
- .description = "XML Shareable Playlist Format",
+AUD_PLAYLIST_PLUGIN
+(
+ .name = "XML Shareable Playlist Format",
 .extensions = xspf_exts,
 .load = xspf_playlist_load,
 .save = xspf_playlist_save
-};
-
-static PlaylistPlugin * const xspf_plugins[] = {& xspf_plugin, NULL};
-
-SIMPLE_PLAYLIST_PLUGIN (xspf, xspf_plugins)
+)

audacious-plugins-rpmlintrc Added