Packman Build Service PMBS

Changes of Revision 43

audacious-plugins.changes Changed

audacious-plugins.spec Changed

@@ -3,7 +3,7 @@
 %define		grp		Productivity/Multimedia/Sound/Players
 
 Name: audacious-plugins
-Version: 3.1.1
+Version: 3.2.4
 Release: 1
 
 Summary: Plugins for Audacious
@@ -18,14 +18,19 @@
 BuildRequires: audacious-devel = %{version}
 BuildRequires: bluez-devel libbs2b-devel esound-devel flac-devel gtkglext-devel
 BuildRequires: libbinio-devel libcddb-devel libcdio-devel libcue-devel
-BuildRequires: libcurl-devel libfaad-devel libffmpeg_oldabi-devel
+BuildRequires: libcurl-devel libfaad-devel libffmpeg-devel
 BuildRequires: libfluidsynth-devel libmad-devel libmms-devel libmodplug-devel
 BuildRequires: libmp3lame-devel libmpcdec-devel libmtp-devel libnotify-devel
 BuildRequires: projectM-devel libshout-devel libsmbclient-devel libusb-devel
 BuildRequires: wavpack-devel neon-devel SDL-devel libsndfile-devel libtag-devel
+BuildRequires: dbus-1-glib-devel
 %if 0%{?suse_version} >= 1210
 BuildRequires: libjack-devel
 %endif
+%if 0%{?suse_version} >= 1220
+# cdaudio plugin is disabled for now anyway, but it would need this :-)
+BuildRequires: libcdio-paranoia-devel
+%endif
 BuildRequires: update-desktop-files libmpg123-devel
 
 %if %suse_version >= 1120
@@ -100,10 +105,6 @@
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export CXXFLAGS="$CFLAGS"
-#
-# this is an ugly hack to fix build on > 12.1, but it saves
-# me from patching the makefiles etc... :-) --seife
-export LIBS=-lgmodule-2.0
 
 %__sed -i -e "s|_mm_setzero_pd|ssegehtnichtaufathlonxp|g" configure
 
@@ -119,6 +120,9 @@
 %if %suse_version <= 1110
 --disable-pulse \
 %endif
+%if 0%{?suse_version} >= 1220
+ --disable-cdaudio \
+%endif
 %ifarch %ix86
 --disable-sse2
 %endif
@@ -138,6 +142,7 @@
 %dir %{_libdir}/audacious
 %dir %{_libdir}/audacious/Container
 %{_libdir}/audacious/Container/asx.so
+%{_libdir}/audacious/Container/audpl.so
 %{_libdir}/audacious/Container/cue.so
 %{_libdir}/audacious/Container/m3u.so
 %{_libdir}/audacious/Container/pls.so
@@ -159,14 +164,22 @@
 %{_libdir}/audacious/General/alarm.so
 %{_libdir}/audacious/General/albumart.so
 %{_libdir}/audacious/General/aosd.so
+%if 0%{?suse_version} < 1220
+# disabled cdaudio-ng
 %{_libdir}/audacious/General/cd-menu-items.so
+%endif
 %{_libdir}/audacious/General/gnomeshortcuts.so
 %{_libdir}/audacious/General/gtkui.so
 %{_libdir}/audacious/General/hotkey.so
 %{_libdir}/audacious/General/lyricwiki.so
 %{_libdir}/audacious/General/mtp_up.so
+%if 0%{?suse_version} > 1140
+# only with glib2 >= 2.30
+%{_libdir}/audacious/General/mpris2.so
+%endif
 %{_libdir}/audacious/General/notify.so
 %{_libdir}/audacious/General/scrobbler.so
+%{_libdir}/audacious/General/search-tool.so
 %{_libdir}/audacious/General/song_change.so
 %if %suse_version >= 1120
 %{_libdir}/audacious/General/statusicon.so
@@ -176,7 +189,10 @@
 %{_libdir}/audacious/Input/amidi-plug.so
 %dir %{_libdir}/audacious/Input/amidi-plug
 %{_libdir}/audacious/Input/amidi-plug/ap-alsa.so
+%if 0%{?suse_version} < 1220
+# disabled cdaudio-ng
 %{_libdir}/audacious/Input/cdaudio-ng.so
+%endif
 %{_libdir}/audacious/Input/console.so
 %{_libdir}/audacious/Input/ffaudio.so
 %{_libdir}/audacious/Input/flacng.so

audacious-plugins-3.1.1.tar.bz2/GIT-Access Deleted

audacious-plugins-3.1.1.tar.bz2/mkinstalldirs Deleted

@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage" 1>&2
- exit 0
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-case $dirmode in
- '')
- if mkdir -p -- . 2>/dev/null; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- fi
- ;;
-esac
-
-for file
-do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
-
- pathcomp=
- for d
- do
- pathcomp="$pathcomp$d"
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- 	errstatus=$lasterr
- else
- 	if test ! -z "$dirmode"; then
-	 echo "chmod $dirmode $pathcomp"
- 	 lasterr=""
- 	 chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- 	 if test ! -z "$lasterr"; then
- 	 errstatus=$lasterr
- 	 fi
- 	fi
- fi
- fi
-
- pathcomp="$pathcomp/"
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here

audacious-plugins-3.1.1.tar.bz2/src/CoreAudio Deleted

audacious-plugins-3.1.1.tar.bz2/src/CoreAudio/Makefile Deleted

audacious-plugins-3.1.1.tar.bz2/src/CoreAudio/about.c Deleted

@@ -1,44 +0,0 @@
-/* XMMS - Cross-platform multimedia player
- * Copyright (C) 1998-2000 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 "coreaudio.h"
-
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-void osx_about(void)
-{
-	static GtkWidget *dialog = NULL;
-
-	audgui_simple_message(&dialog, GTK_MESSAGE_INFO,
-							 "About CoreAudio Plugin",
-							 "Audacious CoreAudio Plugin\n\n "
-							 "This program is free software; you can redistribute it and/or modify\n"
-							 "it under the terms of the GNU General Public License as published by\n"
-							 "the Free Software Foundation; either version 2 of the License, or\n"
-							 "(at your option) any later version.\n"
-							 "\n"
-							 "This program is distributed in the hope that it will be useful,\n"
-							 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-							 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-							 "GNU General Public License for more details.\n"
-							 "\n"
-							 "You should have received a copy of the GNU General Public License\n"
-							 "along with this program; if not, write to the Free Software\n"
-							 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-							 "USA.");
-}

audacious-plugins-3.1.1.tar.bz2/src/CoreAudio/audio.c Deleted

@@ -1,678 +0,0 @@
-/* XMMS - Cross-platform multimedia player
- * Copyright (C) 1998-2001 Peter Alm, Mikael Alm, Olle Hallnas,
- * Thomas Nilsson and 4Front Technologies
- * Copyright (C) 1999-2001 Haavard Kvaalen
- *
- * 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 "coreaudio.h"
-#include <errno.h>
-#include <CoreAudio/CoreAudio.h>
-
-AudioDeviceID device_id;
-AudioStreamBasicDescription device_format;
-AudioStreamBasicDescription streamDesc;
-
-//static gint fd = 0;
-static float *buffer;
-gboolean playing_flag;
-static gboolean prebuffer, unpause, do_pause, remove_prebuffer;
-static gint device_buffer_size;
-static gint buffer_size, prebuffer_size;//, blk_size;
-static gint buffer_index = 0;
-static gint output_time_offset = 0;
-static guint64 written = 0, output_total = 0;
-static gint flush;
-static gchar *device_name;
-
-gint sample_multiplier, sample_size;
-
-gboolean paused;
-
-static int (*osx_convert_func) (void **data, int length);
-
-float left_volume, right_volume;
-float base_pitch = 0.0;
-float user_pitch = 0.0;
-int output_buf_length; // length of data in output buffer
-short output_buf[OUTPUT_BUFSIZE]; /* buffer used to hold main output to dbfsd */
-short cue_buf[OUTPUT_BUFSIZE]; /* buffer used to hold cue output to dbfsd */
-short conv_buf[OUTPUT_BUFSIZE]; /* buffer used to hold format converted input */
-
-/*
- * The format of the data from the input plugin
- * This will never change during a song.
- */
-struct format_info input;
-
-
-/*
- * The format we get from the effect plugin.
- * This will be different from input if the effect plugin does
- * some kind of format conversion.
- */
-struct format_info effect;
-
-
-/*
- * The format of the data we actually send to the soundcard.
- * This might be different from effect if we need to resample or do
- * some other format conversion.
- */
-struct format_info output;
-
-
-static int osx_calc_bitrate(int osx_fmt, int rate, int channels)
-{
-	int bitrate = rate * channels;
-
-	// for now we know output is stereo
-	// fix this later
-
-	if (osx_fmt == FMT_U16_BE || osx_fmt == FMT_U16_LE ||
-	 osx_fmt == FMT_S16_BE || osx_fmt == FMT_S16_LE)
-	{
-		bitrate *= 2;
-	}
-
-	return bitrate;
-}
-
-static gboolean osx_format_is_neutral(gint fmt)
-{
-	gboolean ret = FALSE;
-
-	switch (fmt)
-	{
-		case FMT_U16_NE:
-		case FMT_S16_NE:
-		case FMT_U8:
-		case FMT_S8:
-			ret = TRUE;
-			break;
-		default:
-			break;
-	}
-
-	return ret;
-}
-
-static int osx_get_format(gint fmt)
-{
-	int format = 0;
-
-	switch (fmt)
-	{
-		case FMT_U16_NE:
-#ifdef WORDS_BIGENDIAN
-			format = FMT_U16_BE;
-#else
-			format = FMT_U16_LE;
-#endif
-			break;
-		case FMT_S16_NE:
-#ifdef WORDS_BIGENDIAN
-			format = FMT_S16_BE;
-#else
-			format = FMT_S16_LE;
-#endif
-			break;
-		default:
-			format = fmt;
-			break;
-	}
-
-	return format;
-}
-
-static int osx_get_conv_format(gint fmt)
-{
-	int format = 0;
-
-	switch (fmt)
-	{
-		case FMT_U16_LE:
-#ifdef WORDS_BIGENDIAN
-			format = FMT_U16_BE;
-#else
-			format = FMT_U16_LE;
-#endif
-			break;
-		case FMT_U16_BE:
-#ifdef WORDS_BIGENDIAN
-			format = FMT_U16_LE;
-#else
-			format = FMT_U16_BE;
-#endif
-			break;
-		case FMT_S16_LE:
-#ifdef WORDS_BIGENDIAN
-			format = FMT_S16_BE;
-#else
-			format = FMT_S16_LE;
-#endif
-			break;
-		case FMT_S16_BE:
-#ifdef WORDS_BIGENDIAN
-			format = FMT_S16_LE;
-#else
-			format = FMT_S16_BE;
-#endif
-			break;
-		case FMT_U16_NE:
-#ifdef WORDS_BIGENDIAN
-			format = FMT_U16_BE;
-#else
-			format = FMT_U16_LE;
-#endif
-			break;
-		case FMT_S16_NE:
-#ifdef WORDS_BIGENDIAN
-			format = FMT_S16_BE;
-#else
-			format = FMT_S16_LE;
-#endif
-			break;
-		default:
-			format = fmt;
-			break;
-	}
-
-	return format;
-}
-
-
-OSStatus play_callback(AudioDeviceID inDevice, const AudioTimeStamp * inNow, const AudioBufferList * inInputData, const AudioTimeStamp * inInputTime, AudioBufferList * outOutputData, const AudioTimeStamp * inOutputTime, void * inClientData)
-{
-	int i;
-	long m, n, o;
-	float * dest, tempfloat;
-	float * src;
-	int src_size_bytes;
-	int src_size_float;
-	int num_output_samples;
-	int used_samples;
-
-	src_size_bytes = outOutputData->mBuffers[0].mDataByteSize;
-	src_size_float = src_size_bytes / sizeof(float);
-
-	num_output_samples = MIN(buffer_index,src_size_float);
-
-	//printf("play_callback(): num_output_samples %d, index %d\n",num_output_samples,buffer_index);
-
-	// if we are prebuffering, zero the buffer
-	if (prebuffer && (buffer_index < prebuffer_size))
-	{
-		//printf("prebuffering... %d samples left\n",prebuffer_size-buffer_index);
-		num_output_samples = 0;
-	}
-	else
-	{
-		prebuffer = FALSE;
-	}
-
-	src = buffer;
-	dest = outOutputData->mBuffers[0].mData;
-
-	// copy available data to buffer and apply volume to each channel
-	for (i = 0; i < num_output_samples/2; i++)
-	{
-		//tempfloat = *src;
-		*dest = (*src) * left_volume;
-		src++;
-		dest++;
-
-		*dest = (*src) * right_volume;
-		src++;
-		dest++;
-	}
-
-	// if less than a buffer's worth of data is ready, zero remainder of output buffer
-	if (num_output_samples != src_size_float)
-	{
-		//printf("zeroing %d samples",(src_size_float - num_output_samples));
-
-		dest = (float*)outOutputData->mBuffers[0].mData + num_output_samples;
-
-		memset(dest,0,(src_size_float - num_output_samples) * sizeof(float));
-	}
-
-	// move unwritten data to beginning of buffer
-	{
-		dest = buffer;
-
-		for (i = num_output_samples; i < buffer_index; i++)
-		{
-			*dest = *src;
-			dest++;
-			src++;
-		}
-
-		output_total += num_output_samples;
-		buffer_index -= num_output_samples;
-	}
-
-
-	if (flush != -1)
-	{
-		osx_set_audio_params();
-		output_time_offset = flush;
-		written = ((guint64)flush * input.bps) / (1000 * sample_size);
-		buffer_index = 0;
-		output_total = 0;
-
-		flush = -1;
-		prebuffer = TRUE;
-	}
-
-	//printf("\n");
-
-	return 0;
-}
-
-
-static void osx_setup_format(gint fmt, int rate, int nch)
-{
-	//printf("osx_setup_format(): fmt %d, rate %d, nch %d\n",fmt,rate,nch);
-
-	effect.format.xmms = osx_get_format(fmt);
-	effect.frequency = rate;
-	effect.channels = nch;
-	effect.bps = osx_calc_bitrate(fmt, rate, nch);
-
-	output.format.osx = osx_get_format(fmt);
-	output.frequency = rate;
-	output.channels = nch;
-
-	osx_set_audio_params();
-
-	output.bps = osx_calc_bitrate(output.format.osx, output.frequency,output.channels);
-}
-
-
-gint osx_get_written_time(void)
-{
-	gint retval;
-
-	if (!playing_flag)
-	{
-		retval = 0;
-	}
-	else
-	{
-		retval = (written * sample_size * 1000) / effect.bps;
-		retval = (int)((float)retval / user_pitch);
-	}
-
-	//printf("osx_get_written_time(): written time is %d\n",retval);
-
-	return retval;
-}
-
-
-gint osx_get_output_time(void)
-{
-	gint retval;
-
-	retval = output_time_offset + ((output_total * sample_size * 1000) / output.bps);
-	retval = (int)((float)retval / user_pitch);
-
-	//printf("osx_get_output_time(): time is %d\n",retval);
-
-	return retval;
-}
-
-
-gint osx_playing(void)
-{
-	gint retval;
-
-	retval = 0;
-
-	if (!playing_flag)
-	{
-		retval = 0;
-	}
-	else
-	{
-		if (buffer_index == 0)
-		{
-			retval = FALSE;
-		}
-		else
-		{
-			retval = TRUE;
-		}
-	}
-
-	//printf("osx_playing(): playing is now %d\n",playing_flag);
-
-	return retval;
-}
-
-
-gint osx_free(void)
-{
-	gint bytes_free;
-
-	if (remove_prebuffer && prebuffer)
-	{
-		prebuffer = FALSE;
-		remove_prebuffer = FALSE;
-	}
-
-	if (prebuffer)
-	{
-		remove_prebuffer = TRUE;
-	}
-
-	// get number of free samples
-	bytes_free = buffer_size - buffer_index;
-
-	// adjust for mono
-	if (input.channels == 1)
-	{
-		bytes_free /= 2;
-	}
-
-	// adjust by pitch conversion;
-	bytes_free = (int)((float)bytes_free * base_pitch * user_pitch);
-
-	// convert from number of samples to number of bytes
-	bytes_free *= sample_size;
-
-	return bytes_free;
-}
-
-
-void osx_write(gpointer ptr, int length)
-{
-	int count, offset = 0;
-	int error;
-	float tempfloat;
-	float * dest;
-	short * src, * tempbuf;
-	int i;
-	int num_samples;
-
-	//printf("oss_write(): lenght: %d \n",length);
-
-	remove_prebuffer = FALSE;
-
-	//	//printf("written is now %d\n",(gint)written);
-
-	// get number of samples
-	num_samples = length / sample_size;
-
-	// update amount of samples received
-	written += num_samples;
-
- if (osx_convert_func != NULL)
- osx_convert_func(&ptr, length);
-
-	// step through audio
-	while (num_samples > 0)
-	{
-		// get # of samples to write to the buffer
-		count = MIN(num_samples, osx_free()/sample_size);
-
-		src = ptr+offset;
-
-		if (dbconvert((char*)src,count * sample_size) == -1)
-		{
-			//printf("dbconvert error %d\n",errno);
-		}
-		else
-		{
-			src = output_buf;
-			dest = (float*)(buffer + buffer_index);
-
-			//printf("output_buf_length is %d\n",output_buf_length);
-
-			for (i = 0; i < output_buf_length; i++)
-			{
-				tempfloat = ((float)*src)/32768.0;
-				*dest = tempfloat;
-				dest++;
-				src++;
-			}
-
-			buffer_index += output_buf_length;
-		}
-
-		if (buffer_index > buffer_size)
-		{
-			//printf("BUFFER_INDEX > BUFFER_SIZE!!!!\n");
-			exit(0);
-		}
-
-		num_samples -= count;
-		offset += count;
-	}
-
-	//printf("buffer_index is now %d\n\n",buffer_index);
-}
-
-
-void osx_close(void)
-{
-	//printf("osx_close(): playing_flag is %d\n",playing_flag);
-
-	if (!playing_flag)
-	{
-		return;
-	}
-
-	playing_flag = 0;
-
-	// close audio device
-	AudioDeviceStop(device_id, play_callback);
-	AudioDeviceRemoveIOProc(device_id, play_callback);
-
-	g_free(device_name);
-
-	//printf("osx_close(): playing_flag is now %d\n",playing_flag);
-
-	/* Free audio buffer */
-	g_free(buffer);
-}
-
-void osx_flush(gint time)
-{
-	//printf("osx_flush(): %d\n",time);
-
-	flush = time;
-
-	while (flush != -1)
-	{
-		g_usleep(10000);
-	}
-}
-
-
-void osx_pause(short p)
-{
-	if (p == TRUE)
-		AudioDeviceStop(device_id, play_callback);
-	else
-		AudioDeviceStart(device_id, play_callback);
-
-	paused = p;
-}
-
-
-void osx_set_audio_params(void)
-{
-	int stereo_multiplier, format_multiplier;
-	int frag, stereo, ret;
-	struct timeval tv;
-	fd_set set;
-
-	//printf("osx_set_audio_params(): fmt %d, freq %d, nch %d\n",output.format.osx,output.frequency,output.channels);
-
-	// set audio format
-
-	// set num channels
-
-	switch (input.channels)
-	{
-		case 1: stereo_multiplier = 2; break;
-		case 2: stereo_multiplier = 1; break;
-		default: stereo_multiplier = 1; break;
-	}
-
-	switch (input.format.xmms)
-	{
-		case FMT_U8:
-		case FMT_S8:
-			format_multiplier = 2;
-			sample_size = 1;
-			break;
-		case FMT_S16_LE:
-		case FMT_S16_BE:
-		case FMT_S16_NE:
-			format_multiplier = 1;
-			sample_size = 2;
-			break;
-		default: format_multiplier = 1; break;
-	}
-
-	sample_multiplier = stereo_multiplier * format_multiplier;
-
-	base_pitch = input.frequency / device_format.mSampleRate;
-
-	//printf("sample multiplier is now %d, base pitch %.2f\n",sample_multiplier,base_pitch);
-}
-
-
-gint osx_open(gint fmt, gint rate, gint nch)
-{
-	char s[32];
-	long m;
-	long size;
-	char device_name[128];
-
-	//printf("\nosx_open(): fmt %d, rate %d, nch %d\n",fmt,rate,nch);
-
-	// init conversion variables
-	base_pitch = 1.0;
-	user_pitch = 1.0;
-
-	// open audio device
-
-	size = sizeof(device_id);
-
-	if (AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, &size, &device_id))
-	{
-		//printf("failed to open default audio device");
-		return -1;
-	}
-
-	//printf("opened audio device\n");
-
-	size = 128;
-
-	if (AudioDeviceGetProperty(device_id,1,0,kAudioDevicePropertyDeviceName,&size,device_name))
-	{
-		//printf("could not get device name\n");
-		return -1;
-	}
-
-	//printf("device name is: \"%s\"\n",device_name);
-
-	size = sizeof(device_format);
-
-	if (AudioDeviceGetProperty(device_id, 0, 0, kAudioDevicePropertyStreamFormat, &size, &device_format))
-	{
-		//printf("failed to get audio format!\n");
-		return -1;
-	}
-
-	//fprintf(stderr, "got format: sample rate %f, %ld channels and %ld-bit sample\n",
-	//		device_format.mSampleRate,device_format.mChannelsPerFrame,device_format.mBitsPerChannel);
-
-	if (device_format.mFormatID != kAudioFormatLinearPCM)
-	{
-		//printf("audio format isn't PCM\n");
-		return -1;
-	}
-
-	//printf("format is PCM\n");
-
-	if (osx_format_is_neutral(fmt) == FALSE)
-	 osx_convert_func = osx_get_convert_func(fmt, osx_get_conv_format(fmt));
-	else
-		osx_convert_func = NULL;
-
-	input.format.xmms = fmt;
-	input.frequency = rate;
-	input.channels = nch;
-	input.bps = osx_calc_bitrate(osx_get_format(fmt),rate,nch);
-
-	osx_setup_format(osx_get_format(fmt),device_format.mSampleRate,device_format.mChannelsPerFrame);
-
-	//set audio buffer size
-	{
-		device_buffer_size = 4096 * sizeof(float);
-		size = sizeof(gint);
-
-		if (AudioDeviceSetProperty(device_id,0,0,0,kAudioDevicePropertyBufferSize,size,&device_buffer_size))
-		{
-			//printf("failed to set device buffer size\n");
-		}
-
-		//printf("buffer size set to %d\n",device_buffer_size);
-	}
-
-	buffer_size = 11 * 4096;
-	prebuffer_size = 4096;
-
-	buffer = (float *) g_malloc0(buffer_size*sizeof(float));
-
-	//printf("created buffer of size %d, prebuffer is %d\n",buffer_size,prebuffer_size);
-
-	flush = -1;
-	prebuffer = TRUE;
-
-	buffer_index = output_time_offset = written = output_total = 0;
-
-	paused = FALSE;
-
-	do_pause = FALSE;
-	unpause = FALSE;
-	remove_prebuffer = FALSE;
-
-	playing_flag = 1;
-
-	if (AudioDeviceAddIOProc(device_id, play_callback, NULL))
-	{
-		//printf("failed to add IO Proc callback\n");
-		osx_close();
-		return -1;
-	}
-
-	//printf("added callback\n");
-
-	if (AudioDeviceStart(device_id,play_callback))
-	{
-		osx_close();
-		//printf("failed to start audio device.\n");
-		exit(0);
-	}
-
-	//printf("started audio device\n");
-
-	return 1;
-}

audacious-plugins-3.1.1.tar.bz2/src/CoreAudio/configure.c Deleted

@@ -1,279 +0,0 @@
-/* XMMS - Cross-platform multimedia player
- * Copyright (C) 1998-2001 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
- * Copyright (C) 1999-2001 Håvard Kvålen
- *
- * 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 "coreaudio.h"
-#include <CoreAudio/CoreAudio.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
-
-static GtkWidget *configure_win = NULL;
-static GtkWidget *mixer_usemaster_check, *buffer_size_spin, *buffer_pre_spin;
-static GtkWidget *adevice_use_alt_check, *audio_alt_device_entry;
-static GtkWidget *mdevice_use_alt_check, *mixer_alt_device_entry;
-static gint audio_device, mixer_device;
-
-static void configure_win_ok_cb(GtkWidget * w, gpointer data)
-{
-	mcs_handle_t *cfgfile;
-
-	osx_cfg.audio_device = audio_device;
-	osx_cfg.mixer_device = mixer_device;
-	osx_cfg.buffer_size =
-		gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffer_size_spin));
-	osx_cfg.prebuffer =
-		gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffer_pre_spin));
-	osx_cfg.use_master =
-		gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mixer_usemaster_check));
-	osx_cfg.use_alt_audio_device =
-		gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adevice_use_alt_check));
-	osx_cfg.use_alt_mixer_device =
-		gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mdevice_use_alt_check));
-	g_free(osx_cfg.alt_audio_device);
-	osx_cfg.alt_audio_device =
-		gtk_editable_get_chars(GTK_EDITABLE(audio_alt_device_entry), 0, -1);
-	g_strstrip(osx_cfg.alt_audio_device);
-	g_free(osx_cfg.alt_mixer_device);
-	osx_cfg.alt_mixer_device =
-		gtk_editable_get_chars(GTK_EDITABLE(mixer_alt_device_entry), 0, -1);
-	g_strstrip(osx_cfg.alt_mixer_device);
-
-	if (osx_cfg.use_alt_audio_device)
-		/* do a minimum of sanity checking */
-		if (osx_cfg.alt_audio_device[0] != '/') 
-			osx_cfg.use_alt_audio_device = FALSE;
-	if (osx_cfg.use_alt_mixer_device)
-		if (osx_cfg.alt_mixer_device[0] != '/') 
-			osx_cfg.use_alt_mixer_device = FALSE;
-	
-	cfgfile = aud_cfg_db_open();
-
-	aud_cfg_db_set_int(cfgfile, "OSX", "audio_device", osx_cfg.audio_device);
-	aud_cfg_db_set_int(cfgfile, "OSX", "mixer_device", osx_cfg.mixer_device);
-	aud_cfg_db_set_int(cfgfile, "OSX", "buffer_size", osx_cfg.buffer_size);
-	aud_cfg_db_set_int(cfgfile, "OSX", "prebuffer", osx_cfg.prebuffer);
-	aud_cfg_db_set_bool(cfgfile,"OSX","use_master",osx_cfg.use_master);
-	aud_cfg_db_set_bool(cfgfile, "OSX", "use_alt_audio_device", osx_cfg.use_alt_audio_device);
-	aud_cfg_db_set_string(cfgfile, "OSX", "alt_audio_device", osx_cfg.alt_audio_device);
-	aud_cfg_db_set_bool(cfgfile, "OSX", "use_alt_mixer_device", osx_cfg.use_alt_mixer_device);
-	aud_cfg_db_set_string(cfgfile, "OSX", "alt_mixer_device", osx_cfg.alt_mixer_device);
-	aud_cfg_db_close(cfgfile);
-
-	gtk_widget_destroy(configure_win);
-}
-
-static void configure_win_audio_dev_cb(GtkWidget * widget, gint device)
-{
-	audio_device = device;
-}
-
-static void configure_win_mixer_dev_cb(GtkWidget * widget, gint device)
-{
-	mixer_device = device;
-}
-
-static void audio_device_toggled(GtkToggleButton * widget, gpointer data)
-{
-	gboolean use_alt_audio_device = gtk_toggle_button_get_active(widget);
-	gtk_widget_set_sensitive(GTK_WIDGET(data), !use_alt_audio_device);
-	gtk_widget_set_sensitive(audio_alt_device_entry, use_alt_audio_device);
-}
-
-static void mixer_device_toggled(GtkToggleButton * widget, gpointer data)
-{
-	gboolean use_alt_device = gtk_toggle_button_get_active(widget);
-	gtk_widget_set_sensitive(GTK_WIDGET(data), !use_alt_device);
-	gtk_widget_set_sensitive(mixer_alt_device_entry, use_alt_device);
-}
-
-static void scan_devices(gchar * type, GtkWidget * option_menu, GtkSignalFunc sigfunc)
-{
-	GtkWidget *menu, *item;
-	FILE *file;
-	UInt32 size,len,i;
-	AudioDeviceID * devicelist;
-	char device_name[128];
-
-	menu = gtk_menu_new();
-
-	if (AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices,&size,NULL))
-	{
-		item = gtk_menu_item_new_with_label("Default");
-		gtk_signal_connect(GTK_OBJECT(item), "activate", sigfunc, (gpointer) 0);
-		gtk_widget_show(item);
-		gtk_menu_append(GTK_MENU(menu), item);
-	}
-	else
-	{
-		devicelist = (AudioDeviceID*) malloc(size);
-		
-		if (AudioHardwareGetProperty(kAudioHardwarePropertyDevices,&size,devicelist))
-			return;
-		
-		for (i = 0; i < size/sizeof(AudioDeviceID); i++)
-		{
-			len = 128;
-			AudioDeviceGetProperty(devicelist[i],1,0,kAudioDevicePropertyDeviceName,&len,device_name);
-			
-			item = gtk_menu_item_new_with_label(device_name);
-			gtk_signal_connect(GTK_OBJECT(item), "activate", sigfunc, (gpointer) 0);
-			gtk_widget_show(item);
-			gtk_menu_append(GTK_MENU(menu), item);
-			
-		}
-	}
-
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
-}
-
-void osx_configure(void)
-{
-	GtkWidget *vbox, *notebook;
-	GtkWidget *dev_vbox, *adevice_frame, *adevice_box, *adevice;
-	GtkWidget *mdevice_frame, *mdevice_box, *mdevice;
-	GtkWidget *buffer_frame, *buffer_vbox, *buffer_table;
-	GtkWidget *buffer_size_box, *buffer_size_label;
-	GtkObject *buffer_size_adj, *buffer_pre_adj;
-	GtkWidget *buffer_pre_box, *buffer_pre_label;
-	GtkWidget *audio_alt_box, *mixer_alt_box;
-	GtkWidget *bbox, *ok, *cancel;
-	GtkWidget *mixer_table, *mixer_frame;
-	
-	if (configure_win)
-	{
- gtk_window_present(GTK_WINDOW(configure_win));
-		return;
-	}
-
-	configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_signal_connect(GTK_OBJECT(configure_win), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &configure_win);
-	gtk_window_set_title(GTK_WINDOW(configure_win), "CoreAudio Plugin Configuration");
-	gtk_window_set_policy(GTK_WINDOW(configure_win), FALSE, FALSE, FALSE);
-	gtk_window_set_position(GTK_WINDOW(configure_win), GTK_WIN_POS_MOUSE);
-	gtk_container_border_width(GTK_CONTAINER(configure_win), 10);
-	
-
-	vbox = gtk_vbox_new(FALSE, 10);
-	gtk_container_add(GTK_CONTAINER(configure_win), vbox);
-	
-	notebook = gtk_notebook_new();
-	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
-	
-	dev_vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(dev_vbox), 5);
-
-	adevice_frame = gtk_frame_new("Audio device:");
-	gtk_box_pack_start(GTK_BOX(dev_vbox), adevice_frame, FALSE, FALSE, 0);
-	
-	adevice_box = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(adevice_box), 5);
-	gtk_container_add(GTK_CONTAINER(adevice_frame), adevice_box);
-
-	adevice = gtk_option_menu_new();
-	gtk_box_pack_start(GTK_BOX(adevice_box), adevice, TRUE, TRUE, 0);
-
-	scan_devices("Audio devices:", adevice, configure_win_audio_dev_cb);
-
-	audio_device = osx_cfg.audio_device;
-	gtk_option_menu_set_history(GTK_OPTION_MENU(adevice), osx_cfg.audio_device);
-
-	gtk_box_pack_start(GTK_BOX(dev_vbox), mdevice_frame, FALSE, FALSE, 0);
-	
-	mdevice_box = gtk_vbox_new(FALSE, 0);
-	gtk_container_set_border_width(GTK_CONTAINER(mdevice_box), 5);
-	gtk_container_add(GTK_CONTAINER(mdevice_frame), mdevice_box);
-
-	mdevice = gtk_option_menu_new();
-	gtk_box_pack_start(GTK_BOX(mdevice_box), mdevice, TRUE, TRUE, 0);
-
-	scan_devices("Mixers:", mdevice, configure_win_mixer_dev_cb);
-
-	mixer_device = osx_cfg.mixer_device;
-	gtk_option_menu_set_history(GTK_OPTION_MENU(mdevice), osx_cfg.mixer_device);
-	mixer_alt_box = gtk_hbox_new(FALSE, 0);
-	gtk_box_pack_start_defaults(GTK_BOX(mdevice_box), mixer_alt_box);
-	mdevice_use_alt_check = gtk_check_button_new_with_label("Use alternate device:");
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mdevice_use_alt_check), osx_cfg.use_alt_mixer_device);
-	gtk_signal_connect(GTK_OBJECT(mdevice_use_alt_check), "toggled", mixer_device_toggled, mdevice);
-	gtk_box_pack_start(GTK_BOX(mixer_alt_box), mdevice_use_alt_check, FALSE, FALSE, 0);
-	mixer_alt_device_entry = gtk_entry_new();
-
-	if (osx_cfg.alt_mixer_device != NULL)
-		gtk_entry_set_text(GTK_ENTRY(mixer_alt_device_entry), osx_cfg.alt_mixer_device);
-	else
-		gtk_entry_set_text(GTK_ENTRY(mixer_alt_device_entry), "/dev/mixer");
-
-	gtk_box_pack_start_defaults(GTK_BOX(mixer_alt_box), mixer_alt_device_entry);
-
-	if (osx_cfg.use_alt_mixer_device)
-		gtk_widget_set_sensitive(mdevice, FALSE);
-	else
-		gtk_widget_set_sensitive(mixer_alt_device_entry, FALSE);
-
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dev_vbox, gtk_label_new("Devices"));
-
-
-	buffer_frame = gtk_frame_new("Buffering:");
-	gtk_container_set_border_width(GTK_CONTAINER(buffer_frame), 5);
-
-	buffer_vbox = gtk_vbox_new(FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(buffer_frame), buffer_vbox);
-
-	buffer_table = gtk_table_new(2, 1, TRUE);
-	gtk_container_set_border_width(GTK_CONTAINER(buffer_table), 5);
-	gtk_box_pack_start(GTK_BOX(buffer_vbox), buffer_table, FALSE, FALSE, 0);
-
-	buffer_size_box = gtk_hbox_new(FALSE, 5);
-	gtk_table_attach_defaults(GTK_TABLE(buffer_table), buffer_size_box, 0, 1, 0, 1);
-	buffer_size_label = gtk_label_new("Buffer size (ms):");
-	gtk_box_pack_start(GTK_BOX(buffer_size_box), buffer_size_label, FALSE, FALSE, 0);
-	buffer_size_adj = gtk_adjustment_new(osx_cfg.buffer_size, 200, 10000, 100, 100, 100);
-	buffer_size_spin = gtk_spin_button_new(GTK_ADJUSTMENT(buffer_size_adj), 8, 0);
-	gtk_widget_set_usize(buffer_size_spin, 60, -1);
-	gtk_box_pack_start(GTK_BOX(buffer_size_box), buffer_size_spin, FALSE, FALSE, 0);
-
-	buffer_pre_box = gtk_hbox_new(FALSE, 5);
-	gtk_table_attach_defaults(GTK_TABLE(buffer_table), buffer_pre_box, 1, 2, 0, 1);
-	buffer_pre_label = gtk_label_new("Pre-buffer (percent):");
-	gtk_box_pack_start(GTK_BOX(buffer_pre_box), buffer_pre_label, FALSE, FALSE, 0);
-	buffer_pre_adj = gtk_adjustment_new(osx_cfg.prebuffer, 0, 90, 1, 1, 1);
-	buffer_pre_spin = gtk_spin_button_new(GTK_ADJUSTMENT(buffer_pre_adj), 1, 0);
-	gtk_widget_set_usize(buffer_pre_spin, 60, -1);
-	gtk_box_pack_start(GTK_BOX(buffer_pre_box), buffer_pre_spin, FALSE, FALSE, 0);
-
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), buffer_frame, gtk_label_new("Buffering"));
-
-
-	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(vbox), bbox, FALSE, FALSE, 0);
-
-	ok = gtk_button_new_with_label("Ok");
-	gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(configure_win_ok_cb), NULL);
-	GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT);
-	gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 0);
-	gtk_widget_grab_default(ok);
-
-	cancel = gtk_button_new_with_label("Cancel");
-	gtk_signal_connect_object(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(configure_win));
-	GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
-	gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
-
-	gtk_widget_show_all(configure_win);
-}

audacious-plugins-3.1.1.tar.bz2/src/CoreAudio/convert.c Deleted

@@ -1,286 +0,0 @@
-/*
- * Copyright (C) 2001 Haavard Kvaalen
- *
- * 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 "coreaudio.h"
-
-void* osx_get_convert_buffer(size_t size)
-{
-	static size_t length;
-	static void *buffer;
-
-	if (size > 0 && size <= length)
-		return buffer;
-
-	length = size;
-	buffer = g_realloc(buffer, size);
-	return buffer;
-}
-
-static int convert_swap_endian(void **data, int length)
-{
-	guint16 *ptr = *data;
-	int i;
-	for (i = 0; i < length; i += 2, ptr++)
-		*ptr = GUINT16_SWAP_LE_BE(*ptr);
-
-	return i;
-}
-
-static int convert_swap_sign_and_endian_to_native(void **data, int length)
-{
-	guint16 *ptr = *data;
-	int i;
-	for (i = 0; i < length; i += 2, ptr++)
-		*ptr = GUINT16_SWAP_LE_BE(*ptr) ^ 1 << 15;
-
-	return i;
-}
-
-static int convert_swap_sign_and_endian_to_alien(void **data, int length)
-{
-	guint16 *ptr = *data;
-	int i;
-	for (i = 0; i < length; i += 2, ptr++)
-		*ptr = GUINT16_SWAP_LE_BE(*ptr ^ 1 << 15);
-
-	return i;
-}
-
-static int convert_swap_sign16(void **data, int length)
-{
-	gint16 *ptr = *data;
-	int i;
-	for (i = 0; i < length; i += 2, ptr++)
-		*ptr ^= 1 << 15;
-
-	return i;
-}
-
-static int convert_swap_sign8(void **data, int length)
-{
-	gint8 *ptr = *data;
-	int i;
-	for (i = 0; i < length; i++)
-		*ptr++ ^= 1 << 7;
-
-	return i;
-}
-
-static int convert_to_8_native_endian(void **data, int length)
-{
-	gint8 *output = *data;
-	gint16 *input = *data;
-	int i;
-	for (i = 0; i < length / 2; i++)
-		*output++ = *input++ >> 8;
-
-	return i;
-}
-
-static int convert_to_8_native_endian_swap_sign(void **data, int length)
-{
-	gint8 *output = *data;
-	gint16 *input = *data;
-	int i;
-	for (i = 0; i < length / 2; i++)
-		*output++ = (*input++ >> 8) ^ (1 << 7);
-
-	return i;
-}
-
-
-static int convert_to_8_alien_endian(void **data, int length)
-{
-	gint8 *output = *data;
-	gint16 *input = *data;
-	int i;
-	for (i = 0; i < length / 2; i++)
-		*output++ = *input++ & 0xff;
-
-	return i;
-}
-
-static int convert_to_8_alien_endian_swap_sign(void **data, int length)
-{
-	gint8 *output = *data;
-	gint16 *input = *data;
-	int i;
-	for (i = 0; i < length / 2; i++)
-		*output++ = (*input++ & 0xff) ^ (1 << 7);
-
-	return i;
-}
-
-static int convert_to_16_native_endian(void **data, int length)
-{
-	guint8 *input = *data;
-	guint16 *output;
-	int i;
-	*data = osx_get_convert_buffer(length * 2);
-	output = *data;
-	for (i = 0; i < length; i++)
-		*output++ = *input++ << 8;
-
-	return i * 2;
-}
-
-static int convert_to_16_native_endian_swap_sign(void **data, int length)
-{
-	guint8 *input = *data;
-	guint16 *output;
-	int i;
-	*data = osx_get_convert_buffer(length * 2);
-	output = *data;
-	for (i = 0; i < length; i++)
-		*output++ = (*input++ << 8) ^ (1 << 15);
-
-	return i * 2;
-}
-
-
-static int convert_to_16_alien_endian(void **data, int length)
-{
-	guint8 *input = *data;
-	guint16 *output;
-	int i;
-	*data = osx_get_convert_buffer(length * 2);
-	output = *data;
-	for (i = 0; i < length; i++)
-		*output++ = *input++;
-
-	return i * 2;
-}
-
-static int convert_to_16_alien_endian_swap_sign(void **data, int length)
-{
-	guint8 *input = *data;
-	guint16 *output;
-	int i;
-	*data = osx_get_convert_buffer(length * 2);
-	output = *data;
-	for (i = 0; i < length; i++)
-		*output++ = *input++ ^ (1 << 7);
-
-	return i * 2;
-}
-
-int (*osx_get_convert_func(int output, int input))(void **, int)
-{
-	if (output == input)
-		return NULL;
-
-	if ((output == FMT_U16_BE && input == FMT_U16_LE) ||
-	 (output == FMT_U16_LE && input == FMT_U16_BE) ||
-	 (output == FMT_S16_BE && input == FMT_S16_LE) ||
-	 (output == FMT_S16_LE && input == FMT_S16_BE))
-		return convert_swap_endian;
-
-	if ((output == FMT_U16_BE && input == FMT_S16_BE) ||
-	 (output == FMT_U16_LE && input == FMT_S16_LE) ||
-	 (output == FMT_S16_BE && input == FMT_U16_BE) ||
-	 (output == FMT_S16_LE && input == FMT_U16_LE))
-		return convert_swap_sign16;
-
-	if ((IS_BIG_ENDIAN &&
-	 ((output == FMT_U16_BE && input == FMT_S16_LE) ||
-	 (output == FMT_S16_BE && input == FMT_U16_LE))) ||
-	 (!IS_BIG_ENDIAN &&
-	 ((output == FMT_U16_LE && input == FMT_S16_BE) ||
-	 (output == FMT_S16_LE && input == FMT_U16_BE))))
-		return convert_swap_sign_and_endian_to_native;
-
-	if ((!IS_BIG_ENDIAN &&
-	 ((output == FMT_U16_BE && input == FMT_S16_LE) ||
-	 (output == FMT_S16_BE && input == FMT_U16_LE))) ||
-	 (IS_BIG_ENDIAN &&
-	 ((output == FMT_U16_LE && input == FMT_S16_BE) ||
-	 (output == FMT_S16_LE && input == FMT_U16_BE))))
-		return convert_swap_sign_and_endian_to_alien;
-
-	if ((IS_BIG_ENDIAN &&
-	 ((output == FMT_U8 && input == FMT_U16_BE) ||
-	 (output == FMT_S8 && input == FMT_S16_BE))) ||
-	 (!IS_BIG_ENDIAN &&
-	 ((output == FMT_U8 && input == FMT_U16_LE) ||
-	 (output == FMT_S8 && input == FMT_S16_LE))))
-		return convert_to_8_native_endian;
-
-	if ((IS_BIG_ENDIAN &&
-	 ((output == FMT_U8 && input == FMT_S16_BE) ||
-	 (output == FMT_S8 && input == FMT_U16_BE))) ||
-	 (!IS_BIG_ENDIAN &&
-	 ((output == FMT_U8 && input == FMT_S16_LE) ||
-	 (output == FMT_S8 && input == FMT_U16_LE))))
-		return convert_to_8_native_endian_swap_sign;
-
-	if ((!IS_BIG_ENDIAN &&
-	 ((output == FMT_U8 && input == FMT_U16_BE) ||
-	 (output == FMT_S8 && input == FMT_S16_BE))) ||
-	 (IS_BIG_ENDIAN &&
-	 ((output == FMT_U8 && input == FMT_U16_LE) ||
-	 (output == FMT_S8 && input == FMT_S16_LE))))
-		return convert_to_8_alien_endian;
-
-	if ((!IS_BIG_ENDIAN &&
-	 ((output == FMT_U8 && input == FMT_S16_BE) ||
-	 (output == FMT_S8 && input == FMT_U16_BE))) ||
-	 (IS_BIG_ENDIAN &&
-	 ((output == FMT_U8 && input == FMT_S16_LE) ||
-	 (output == FMT_S8 && input == FMT_U16_LE))))
-		return convert_to_8_alien_endian_swap_sign;
-
-	if ((output == FMT_U8 && input == FMT_S8) ||
-	 (output == FMT_S8 && input == FMT_U8))
-		return convert_swap_sign8;
-
-	if ((IS_BIG_ENDIAN &&
-	 ((output == FMT_U16_BE && input == FMT_U8) ||
-	 (output == FMT_S16_BE && input == FMT_S8))) ||
-	 (!IS_BIG_ENDIAN &&
-	 ((output == FMT_U16_LE && input == FMT_U8) ||
-	 (output == FMT_S16_LE && input == FMT_S8))))
-		return convert_to_16_native_endian;
-
-	if ((IS_BIG_ENDIAN &&
-	 ((output == FMT_U16_BE && input == FMT_S8) ||
-	 (output == FMT_S16_BE && input == FMT_U8))) ||
-	 (!IS_BIG_ENDIAN &&
-	 ((output == FMT_U16_LE && input == FMT_S8) ||
-	 (output == FMT_S16_LE && input == FMT_U8))))
-		return convert_to_16_native_endian_swap_sign;
-
-	if ((!IS_BIG_ENDIAN &&
-	 ((output == FMT_U16_BE && input == FMT_U8) ||
-	 (output == FMT_S16_BE && input == FMT_S8))) ||
-	 (IS_BIG_ENDIAN &&
-	 ((output == FMT_U16_LE && input == FMT_U8) ||
-	 (output == FMT_S16_LE && input == FMT_S8))))
-		return convert_to_16_alien_endian;
-
-	if ((!IS_BIG_ENDIAN &&
-	 ((output == FMT_U16_BE && input == FMT_S8) ||
-	 (output == FMT_S16_BE && input == FMT_U8))) ||
-	 (IS_BIG_ENDIAN &&
-	 ((output == FMT_U16_LE && input == FMT_S8) ||
-	 (output == FMT_S16_LE && input == FMT_U8))))
-		return convert_to_16_alien_endian_swap_sign;
-
-	g_warning("Translation needed, but not available.\n"
-			 "Input: %d; Output %d.", input, output);
-	return NULL;
-}

audacious-plugins-3.1.1.tar.bz2/src/CoreAudio/coreaudio.c Deleted

@@ -1,43 +0,0 @@
-/* XMMS - Cross-platform multimedia player
- * Copyright (C) 1998-2000 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 <glib.h>
-
-#include "coreaudio.h"
-
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
-
-AUD_OUTPUT_PLUGIN
-(
-	.name = "CoreAudio Output",
-	.init = osx_init,
-	.about = osx_about,
-	.configure = osx_configure,
-	.get_volume = osx_get_volume,
-	.set_volume = osx_set_volume,
-	.open_audio = osx_open,
-	.write_audio = osx_write,
-	.close_audio = osx_close,
-	.flush = osx_flush,
-	.pause = osx_pause,
-	.buffer_free = osx_free,
-	.buffer_playing = osx_playing,
-	.output_time = osx_get_output_time,
-	.written_time = osx_get_written_time,
-	.probe_priority = 1,
-)

audacious-plugins-3.1.1.tar.bz2/src/CoreAudio/coreaudio.h Deleted

@@ -1,106 +0,0 @@
-/* XMMS - Cross-platform multimedia player
- * Copyright (C) 1998-2000 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.
- */
-#ifndef OSX_H
-#define OSX_H
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#ifdef HAVE_SYS_SOUNDCARD_H
-#include <sys/soundcard.h>
-#elif defined(HAVE_MACHINE_SOUNDCARD_H)
-#include <machine/soundcard.h>
-#endif
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <pthread.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <audacious/plugin.h>
-
-#ifdef WORDS_BIGENDIAN
-# define IS_BIG_ENDIAN TRUE
-#else
-# define IS_BIG_ENDIAN FALSE
-#endif
-
-#define OUTPUT_BUFSIZE (4096 * 8)
-
-extern OutputPlugin op;
-
-
-struct format_info
-{
-	union
-	{
-		gint xmms;
-		int osx;
-	} format;
-
-
-	int frequency;
-	int channels;
-	int bps;
-};
-
-
-typedef struct
-{
-	gint audio_device;
-	gint mixer_device;
-	gint buffer_size;
-	gint prebuffer;
-	gboolean use_master;
-	gboolean use_alt_audio_device, use_alt_mixer_device;
-	gchar *alt_audio_device, *alt_mixer_device;
-}
-OSXConfig;
-
-extern OSXConfig osx_cfg;
-
-OutputPluginInitStatus osx_init(void);
-void osx_about(void);
-void osx_configure(void);
-
-void osx_get_volume(int *l, int *r);
-void osx_set_volume(int l, int r);
-
-int osx_playing(void);
-int osx_free(void);
-void osx_write(void *ptr, int length);
-void osx_close(void);
-void osx_flush(int time);
-void osx_pause(short p);
-int osx_open(gint fmt, int rate, int nch);
-int osx_get_output_time(void);
-int osx_get_written_time(void);
-void osx_set_audio_params(void);
-
-void* osx_get_convert_buffer(size_t size);
-int (*osx_get_convert_func(int output, int input))(void **, int);
-
-#endif

audacious-plugins-3.1.1.tar.bz2/src/CoreAudio/dbaudiolib.h Deleted

@@ -1,231 +0,0 @@
-/*
-
- Definitions for dbaudiolib.c
-
- Author: Bob Dean
- Copyright (c) 1999
-
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public Licensse 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 __DB_AUDIOLIB_H_
-#define __DB_AUDIOLIB_H_
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-	
-#include <glib.h>
-/* #include <dbchannel.h> */
-	
-#define DBAUDIOLIB_VERSION "0.9.8";
-	
-	
-	/* DBAudioLib Error Codes */
-	/* when possible the actual system error code is left in errno, since it
-	 more specifically describes the error */
-
-	enum {
-		ERROR_BASE = 50000,
-		ERROR_NOT_IMPLEMENTED, /* user tried to access functionality that has not yet been implemented. */
-		ERROR_BAD_CHANNEL, /* unknown channel type */
-		ERROR_BAD_PARAM, /* function recieved a bad parameter*/
-		ERROR_NO_FREE_CHANNELS, /* all channels are in use */
-		ERROR_TOO_MUCH_DATA, /* the client gave too muxh data to dbaudiolib, conversion would overrun the internal buffers */
-		ERROR_BAD_SAMPLERATE, /* the samplerate provided is not supported */
-		ERROR_BAD_CHANNELTYPE, /* the channeltype provided is not supported */
-		ERROR_BAD_NUMCH, /* the number of audio channels (stereo or mono) is not supported */
-		ERROR_BAD_FORMAT, /* the input audio format is not supported */
-		ERROR_CHANNEL_IN_USE, /* the requested channel index passed to DBAudio_Init is already in use */
-		ERROR_BAD_CHANNEL_ID, /* the requested channel index passed to DBAudio_Init is out of range */
-		ERROR_TOO_LITTLE_DATA, /* the client gave too little data to dbaudiolib - depreciated */
-		ERROR_NOT_INITIALIZED, /* attempted to use dbaudiolib without a call to DBAudio_Init first */
-		ERROR_INIT_FAILURE /* some part of the init process not related to dbmix failed */
-	};
-
-
-	/* enumeration of sampler state */
-	enum sampler_state_e {SAMPLER_OFF,
-						 SAMPLER_RECORD,
-						 SAMPLER_PLAY_SINGLE,
-						 SAMPLER_PLAY_LOOP,
-						 SAMPLER_READY};
-	
-	typedef enum sampler_state_e sampler_state;
-
-#define DBAUDIO_MAX_VOLUME 100
-#define DBAUDIO_INTERNAL_MAX_VOLUME 128
-#define DBAUDIO_MIN_VOLUME 0
-
-#define DBMIX_COPYRIGHT "Copyright (c) 2002 by Robert Michael S Dean"
-#define DBMIX_VERSION "v0.9.8"
-
-#define SUCCESS 0
-#define FAILURE -1
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#define MONO 1
-#define STEREO 2
-
-
-	/*
-	 * Message structure used to communicate within dbmix channels
-	 */
-
-#define DBMSG_NONE 0x00000000
-#define DBMSG_ALL (0xFFFFFFFF & ~DBMSG_SAMPLERLOAD & ~DBMSG_SAMPLERSAVE)
-#define DBMSG_PAUSE 0x00000001
-#define DBMSG_UNPAUSE 0x00000002
-#define DBMSG_PLAY 0x00000004
-#define DBMSG_STOP 0x00000008
-#define DBMSG_EJECT 0x00000010
-#define DBMSG_REWIND 0x00000020
-#define DBMSG_FFORWARD 0x00000040
-#define DBMSG_NEXT 0x00000080
-#define DBMSG_PREV 0x00000100
-#define DBMSG_MUTE 0x00000200
-#define DBMSG_UNMUTE 0x00000400
-#define DBMSG_SAMPLERSIZE 0x00000800
-#define DBMSG_SAMPLERSAVE 0x00001000
-#define DBMSG_SAMPLERLOAD 0x00002000
-#define DBMSG_SAMPLERREC 0x00004000
-#define DBMSG_SAMPLERSTOP 0x00008000
-#define DBMSG_SAMPLERLOOP 0x00010000
-#define DBMSG_SAMPLERONCE 0x00020000
-
-	typedef struct dbfsd_msg_s
-	{
-		long int msg_type;
-		float data;
-		char * datastr;
-	} dbfsd_msg;
-
-	/* enumeration of the different channels types */
-	enum channel_type_e {PIPE_CHANNEL, SOCKET_CHANNEL};
-
-	/* DBAudioLib Prototypes for statically linked libraries */
-	int DBAudio_Init(char * name, int fmt, int rte, int numch,
-						enum channel_type_e type, int chindex);
-	int DBAudio_Ready();
-	int DBAudio_Write(char* buf, int len);
-	int DBAudio_Read(char * buf, int count);
-	int DBAudio_Close();
-	int DBAudio_Set_Volume(int left, int right);
-	int DBAudio_Get_Volume(int *left, int *right);
-	int DBAudio_Pause(int value);
-	char * DBAudio_Get_Version();
-	char * DBAudio_Get_Channel_Name(char * name);
-	int DBAudio_Set_Channel_Name(char * name);
-	enum channel_type_e DBAudio_Get_Channel_Type();
-	int DBAudio_Set_Channel_Type(enum channel_type_e type);
-	int DBAudio_Cue_Enabled();
-	int DBAudio_Set_Cue(int flag);
-	int DBAudio_Get_Cue();
-	int DBAudio_Set_Rate(int rte);
-	int DBAudio_Get_Rate();
-	int DBAudio_Set_Channels(int numch);
-	int DBAudio_Get_Channels();
-	int DBAudio_Set_Format(int fmt);
-	int DBAudio_Get_Format();
-	int DBAudio_Get_Bufsize(int input_bufsize);
-	void DBAudio_perror(char *str);
-	int DBAudio_Set_Message_Handler(void(*message_handler)(dbfsd_msg msg), int msg_flags);
-	int DBAudio_Handle_Message_Queue();
-	int DBAudio_Set_Channel_Flag(unsigned int flag);
-	int DBAudio_Clear_Channel_Flag(unsigned int flag);
-	unsigned int DBAudio_Get_Channel_Flags();
-	int DBAudio_Set_Mute(int value);
-	int DBAudio_Get_Mute();
-	int DBAudio_Sampler_Record();
-	int DBAudio_Sampler_Stop();
-	int DBAudio_Sampler_Loop();
-	int DBAudio_Sampler_Single();
-	int DBAudio_Sampler_Get_Offsets(int * start_offset, int * end_offset);
-	int DBAudio_Sampler_Set_Offsets(int start_offset, int end_offset);
-	int DBAudio_Sampler_Get_Size(int * size);
-	int DBAudio_Sampler_Save(char * filename);
-	int DBAudio_Sampler_Load(char * filename);
-	sampler_state DBAudio_Sampler_Get_State();
-
-/* structure to hold audiolib functions plugin style for dynamically linked
- libraries... 
-	As functions are added, they are placed at the end of the struct so as
- not to break clients using older versions of the library
-*/
-	typedef struct
-	{ 
-		int (*DBAudio_Init)(char * name, int fmt, int rte, int numch,
-							 enum channel_type_e type, int chindex);
-		int (*DBAudio_Ready)();
-		int (*DBAudio_Write)(char* buf, int len);
-		int (*DBAudio_Read)(char * buf, int count);
-		int (*DBAudio_Close)();
-		int (*DBAudio_Set_Volume)(int left, int right);
-		int (*DBAudio_Get_Volume)(int *left, int *right);
-		int (*DBAudio_Pause)(int value);
-		char * (*DBAudio_Get_Version)();
-		char * (*DBAudio_Get_Channel_Name)(char * name);
-		int (*DBAudio_Set_Channel_Name)(char * name);
-		enum channel_type_e (*DBAudio_Get_Channel_Type)();
-		int (*DBAudio_Set_Channel_Type)(enum channel_type_e type);
-		int (*DBAudio_Cue_Enabled)();
-		int (*DBAudio_Set_Rate)(int rte);
-		int (*DBAudio_Get_Rate)();
-		int (*DBAudio_Set_Channels)(int numch);
-		int (*DBAudio_Get_Channels)();
-		int (*DBAudio_Set_Format)(int fmt);
-		int (*DBAudio_Get_Format)();
-		int (*DBAudio_Set_Cue)(int flag);
-		int (*DBAudio_Get_Cue)();
-		int (*DBAudio_Get_Bufsize)(int input_bufsize);	
-		void (*DBAudio_perror)(char *str);
-		int (*DBAudio_Set_Message_Handler)(void(*message_handler)(dbfsd_msg msg),int msg_flags);
-		int (*DBAudio_Handle_Message_Queue)();
-		int (*DBAudio_Set_Channel_Flag)(unsigned int flag);
-		int (*DBAudio_Clear_Channel_Flag)(unsigned int flag);
-		unsigned int (* DBAudio_Get_Channel_Flags)();
-		int (*DBAudio_Set_Mute)(int value);
-		int (*DBAudio_Get_Mute)();
-		int (*DBAudio_Sampler_Record)();
-		int (*DBAudio_Sampler_Stop)();
-		int (*DBAudio_Sampler_Loop)();
-		int (*DBAudio_Sampler_Single)();
-		int (*DBAudio_Sampler_Get_Offsets)(int * start_offset, int * end_offset);
-		int (*DBAudio_Sampler_Set_Offsets)(int start_offset, int end_offset);
-		int (*DBAudio_Sampler_Get_Size)(int * size);
-		int (*DBAudio_Sampler_Save)(char * filename);
-		int (*DBAudio_Sampler_Load)(char * filename);
-		sampler_state (*DBAudio_Sampler_Get_State)();
-	} DBAudioLibFunctions;
-	
-	DBAudioLibFunctions * DBAudio_Get_Functions();
-	
-	
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __DB_AUDIOLIB_H_ */

audacious-plugins-3.1.1.tar.bz2/src/CoreAudio/dbconvert.c Deleted

@@ -1,524 +0,0 @@
-/*
-
- Author: Bob Dean
- Copyright (c) 1999 - 2004
-
- The functionality in this file is modified from DBAudio_Write.c. 
- part of the DBMix project which is also released under the GPL.
- It is used here both as licensed under the GPL and additionally 
- by permission of the original author (which is me).
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public Licensse 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.
-
- */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <limits.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <sys/shm.h>
-#include <glib.h>
-#include <math.h>
-#include <string.h>
-	
-#include "coreaudio.h"
-#include "dbaudiolib.h"
-
-	extern int errno;
-	
-	extern gboolean paused;
-	extern float left_volume, right_volume;
-
-	extern float base_pitch;
-	extern float user_pitch;
-	
-
-	float local_pitch;
-	float sample1, sample2;
-	float float_index;
-	
-	extern signed short output_buf[]; /* buffer used to hold main output to dbfsd */
-	extern signed short cue_buf[]; /* buffer used to hold cue output to dbfsd */
-	extern signed short conv_buf[]; /* buffer used to hold format converted input */
-	extern int output_buf_length;
-	
-	int outlen;
-	int sampleindex;
-	int num_channels;
-	int format;
-
-
-	extern struct format_info input;
-
-	
-	/*
-	 dbconvert - given a buf of length len, write the data to the
-	 channel associated with this instance.
-
-	 On success, the number of bytes written is returned. Otherwise
-	 -1, or FAILURE, is returned, and errno is set accordingly.
-
-	 Hopefully this function returns values in the same fashion
-	 as other basic I/O functions such as read() and write()
-
-	 Variables: 
-	 count is the number of bytes written during a loop iteration
-	 totalcount is the total number of bytes written
-	 left_gain and right_gain are percentages used to adjust the 
-	 output signal volume
-	 tempbuf is a temporary pointer used in the volume operation
-	 temp_chbuf is a pointer to the buffer to be written to during
-	 shared memory mode.
-	*/
-
-	int dbconvert(char* buf, int len)
-	{
-		int left_gain,right_gain;
-		int left_cue_gain, right_cue_gain;
-		signed short * tempbuf, *tempbuf2, * tempoutbuf;
-		char * tempcharbuf;
-		int incr_flag, count;
-		int intindex;
-		float buflen, gain1, gain2;
-		int index1,index2, output_sample;
-		int i;
-		int stereo_multiplier,format_multiplier;
-		int tempsize;
-		int sampler_flag;
-		//enum sampler_state_e local_sampler_state;
-
-		/* check parameters */
-		if (buf == NULL) {errno = ERROR_BAD_PARAM; return FAILURE;}
-		//if (ch == NULL) {errno = ERROR_NOT_INITIALIZED; return FAILURE;}
-		if (len < 0) {errno = ERROR_BAD_PARAM; return FAILURE;}
-	
-		//DBAudio_Handle_Message_Queue();
-		
-		/* remember sampler state as it may change during
-		 the course of the function */
-#ifdef COMPILE_SAMPLER
-		local_sampler_state = ch->sampler_state;
-#endif
-
-		if (paused)
-		{
-			//printf("convert: pauseed\n");
-			return 0;
-		}
-
-		/* get pitch */
-		local_pitch = base_pitch * user_pitch;
-
-		//printf("convert: local pitch is %.2f, base %.2f user %.2f\n",local_pitch,base_pitch,user_pitch);
-		buflen = len / 2.0;
-	
-		//printf("convert: buflen %.2f len is %d\n",buflen,len);
-
-		/* calculate buffer space needed to convert the data to 
-		 44.1kHz 16bit stereo*/
-		switch (input.channels)
-		{
-			case 1: stereo_multiplier = 2; break;
-			case 2: stereo_multiplier = 1; break;
-			default: errno = ERROR_BAD_NUMCH; return FAILURE;
-		}
-		
-		//printf("convert: format %d, %d %d %d %d\n",input.format.xmms,FMT_U8,FMT_S8,FMT_S16_LE,FMT_S16_BE);
-
-		switch (input.format.xmms)
-		{
-			case FMT_U8: format_multiplier = 2; break;
-			case FMT_S8: format_multiplier = 2; break;
-			case FMT_S16_LE: format_multiplier = 1; break;
-			case FMT_S16_BE: format_multiplier = 1; break;
-			case FMT_S16_NE: format_multiplier = 1; break;
-			default: errno = ERROR_BAD_FORMAT; return FAILURE;
-		}
-		
-		/* return error if the needed output space is greater than the
-		 output buffer */
-		if (ceil((buflen * (float)stereo_multiplier * 
-				 (float)format_multiplier) / local_pitch) > (float)(OUTPUT_BUFSIZE))
-		{
-			errno = ERROR_TOO_MUCH_DATA; 
-			return FAILURE;
-		}
-		
-		/* init local variables */
-		intindex = 0;
-		incr_flag = 0;
-		sampleindex = 0;
-		gain1 = gain2 = 0.0;
-		sample1 = sample2 = 0.0;
-		sampler_flag = 0;
-
-		left_gain = (int)(128.0 * left_volume);
-		right_gain = (int)(128.0 * right_volume);
-
-	
-#ifdef COMPILE_CUE
-		left_cue_gain = ch->cue_left_gain;
-		right_cue_gain = ch->cue_right_gain;
-
-		/* calculate gain percentages */
-		if (ch->mute == TRUE)
-		{
-			left_gain = right_gain = 0;
-		}
-		else
-		{
-			left_gain = ch->left_gain * sysdata->left_balance;
-			right_gain = ch->right_gain * sysdata->right_balance;
-	
-			/* cut volume if mic is being used */
-			if (sysdata->talkover_enabled && !(MIC_ENABLED))
-			{
-				left_gain = left_gain >> DB_TALKOVER_DIVISOR_POWER;
-				right_gain = right_gain >> DB_TALKOVER_DIVISOR_POWER;
-			}
-		}
-#endif
-
-#ifdef COMPILE_SAMPLER
-		switch (local_sampler_state)
-		{
-			case SAMPLER_PLAY_SINGLE:
-			case SAMPLER_PLAY_LOOP:				
-
-				if (ch->sampler_size == 0)
-				{
-					ch->sampler_state = SAMPLER_OFF;
-					len = 0;
-					goto done;
-				}
-				
-				/* tempsize - amount of data available in buffer to read */
-				tempsize = (ch->sampler_endoffset - ch->sampler_readoffset);
-
-				sampler_flag = 1;
-
-				/* if we are in loop mode and loop over end of buffer, 
- get data from start of buffer */
-				if ((tempsize < len) && (local_sampler_state == SAMPLER_PLAY_LOOP))
-				{
-					/* copy portion at end of buffer */
-					memcpy(conv_buf,(ch->sampler_buf + ch->sampler_readoffset),tempsize);
-					/* copy portion at beginning of buffer */
-					memcpy(conv_buf+tempsize,ch->sampler_buf+ch->sampler_startoffset,(len - tempsize));
-					/* update variables */
-					/* read offset is now amount to write, minus the overflow, plus the startoffset */
-					ch->sampler_readoffset = len - tempsize + ch->sampler_startoffset;
-					tempsize = len;
-				}
-				else
-				{
-					/* if we are in simgle play mode and out of data, reset state
- and exit */
-					if ((tempsize <= 0) && (local_sampler_state == SAMPLER_PLAY_SINGLE))
-					{
-						ch->sampler_state = SAMPLER_READY;
-						goto done;
-					}
-
-					/* get full buffers worth of data from somewhere in middle of 
- sampler buffer */
-					if (tempsize > len) tempsize = len;
-
-					memcpy(conv_buf,(ch->sampler_buf + ch->sampler_readoffset),tempsize);
-
-					ch->sampler_readoffset += tempsize;
-				}
-
-
-				/* update function state variables */
-				buflen = (tempsize / 2);
-				tempbuf = conv_buf;
-
-				break;
-			default:
-#endif
-				{
-					/* convert input data into 44.1 KHz 16 bit stereo */
-					tempbuf = (signed short *) buf;
-					
-					/* convert mono input to stereo */
-					if (input.channels == 1)
-					{
-						//printf("convert: data is mono\n");
-
-						tempbuf2 = conv_buf;
-						
-						if ((input.format.xmms == FMT_U8) || (input.format.xmms == FMT_S8))
-						{
-							tempcharbuf = buf;
-							
-							for (i = 0; i < buflen*2.0; i++)
-							{
-								*tempbuf2 = *tempcharbuf; tempbuf2++;
-								*tempbuf2 = *tempcharbuf; tempbuf2++; tempcharbuf++;
-							}
-						} 
-						else 
-						{
-							for (i = 0; i < buflen; i++)
-							{
-								*tempbuf2 = *tempbuf; tempbuf2++;
-								*tempbuf2 = *tempbuf; tempbuf2++; tempbuf++;
-							}
-						}
-						
-						buflen *=2.0;
-						tempbuf = conv_buf;
-					}
-					else
-					{
-						//printf("convet: data is stereo\n");
-					}
-					
-		//printf("convert: buflen %.2f\n",buflen);
-
-
-					/* convert 8 bit input to 16 bit input */
-					if ((input.format.xmms != FMT_S16_LE) && (input.format.xmms != FMT_S16_BE) 
-						&& (input.format.xmms != FMT_S16_NE))
-					{
-						switch (input.format.xmms)
-						{
-							case FMT_U8:
-							{
-								//printf("convert: converting unsigned 8 bit\n");
-								
-								tempbuf2 = conv_buf;
-								buflen *= 2.0;
-								
-								/* if data was mono, then it is already in conv_buf */
-								if (input.channels == 1)
-								{
-									for (i = 0; i < buflen; i++)
-									{
-										*tempbuf = (*tempbuf2 - 127) << 8;
-										tempbuf++; tempbuf2++;
-									}
-								}
-								else
-								{ /* data is 8 bit stereo, and is in buf not conv_buf*/
-									tempcharbuf = buf;
-									for (i = 0; i < len; i++)
-									{
-										*tempbuf = (*tempcharbuf - 127) << 8;
-										tempbuf++; tempcharbuf++;
-									}			
-								}
-								
-								tempbuf = conv_buf;
-								break;
-							}
-							case FMT_S8:
-							{
-								//printf("convert: converting signed 8 bit\n");
-
-								tempbuf2 = conv_buf;
-								buflen *= 2.0;
-								
-								/* if data was mono, then it is already in conv_buf */
-								if (input.channels == 1)
-								{
-									for (i = 0; i < buflen; i++)
-									{
-										*tempbuf = *tempbuf2 << 8;
-										tempbuf++; tempbuf2++;
-									}
-								}
-								else
-								{ /* data is 8 bit stereo, and is in buf not conv_buf*/
-									tempcharbuf = buf;
-									for (i = 0; i < len; i++)
-									{
-										*tempbuf = *tempcharbuf << 8;
-										tempbuf++; tempcharbuf++;
-									}			
-								}
-								
-								tempbuf = conv_buf;
-								break;
-							}
-							default: 
-							{
-								errno = ERROR_BAD_FORMAT; 
-								//ch->writing = 0;
-								return FAILURE;
-							}
-						}
-					}	
-				} /* end default case*/
-
-		//printf("convert: buflen %.2f\n",buflen);
-
-
-
-#ifdef COMPILE_SAMPLER
-		} /* end switch sampler_state */
-
-		/* copy buffer to sample buffer if sampler state is record */
-		if (local_sampler_state == SAMPLER_RECORD)
-		{
-			tempsize = 0;
-
-			/* get amount of data to copy */
-			if ((ch->sampler_size + (buflen * 2)) > ch->sampler_bufsize)
-			{
-				tempsize = ch->sampler_bufsize - ch->sampler_size;
-			}
-			else
-			{
-				tempsize = (buflen * 2);
-			}
-
-			/* change state if buffer is full */
-			if (tempsize == 0)
-			{
-				ch->sampler_state = SAMPLER_READY;
-			}
-			
-			/* copy data */
-			memcpy(((ch->sampler_buf) + (ch->sampler_size)),tempbuf,tempsize);
-
-			/* update sampler state variables */
-			ch->sampler_size += tempsize;
-			ch->sampler_endoffset = ch->sampler_size;
-		}
-#endif
-
-		if (local_pitch == 1.0)
-		{
-			//printf("convert: pitch optimization buflen %.2f *2 %.2f\n",buflen,buflen*2);
-			//printf("tempbuf is 0x%x, output_buf is 0x%x\n",tempbuf,output_buf);
-			memcpy(output_buf,tempbuf,buflen*2);
-			
-			outlen = buflen*2;
-			tempbuf = output_buf;
-			output_buf_length = buflen;
-			
-			goto done;
-		}
-
-		/* calculate pitch shifted signal using basic linear interpolation
-		 the theory is this:
-		 you have two known samples, and want to calculate the value of a new sample
-		 in between them. The new sample will contain a percentage of the first sample
-		 and a percentage of the second sample. These percentages are porportional
-		 to the distance between the new sample and each of the knwon samples.
-		 The "position" of the new sample is determined by the float index */
-
-		tempoutbuf = output_buf;
-
-		while (intindex < buflen)
-		{
-			/* calculate sample percentages (amplitude) */
-			intindex = floor(float_index);
-			gain2 = float_index - intindex;
-			gain1 = 1.0 - gain2;
-
-			/* get index of first sample pair */
-			intindex = intindex << 1;
-			
-			/* check incr_flag to see if we should be operatiing 
-			 on the left or right channel sample */
-			if (incr_flag) 
-			{ 
-				float_index += local_pitch; 
-				incr_flag = 0; 
-				intindex++;
-			}
-			else
-			{
-				incr_flag = 1;
-			}
-			
-			index1 = intindex;
-			
-			/* get the first "known" sample*/
-			sample1 = tempbuf[index1];
-			index2 = index1 + 2; 
-			
-			/* get the second "known" sample */
-			if (index2 < (buflen))
-			{
-				sample2 = tempbuf[index2];
-			}
-			else
-				/* if index2 is beyond the length of the input buffer,
- then cheat to prevent audio pops/snaps/etc */
-			{
-				*tempoutbuf = sample1;
-				sampleindex++;
-				break;
-			}
-			
-			/* create the new sample */
-			output_sample = (((float)sample1 * gain1) + ((float)sample2 * gain2));
-			
-			if (output_sample > 32767) {output_sample = 32767;}
-			if (output_sample < -32767)	{output_sample = -32767;}
-			
-			*tempoutbuf = output_sample;
-			tempoutbuf++;
-			
-			sampleindex++;
-		}
-
-		/* update global variables */
-		outlen = (sampleindex-1) << 1;
-		
-		float_index = float_index - floor(float_index);
-		
-		tempbuf = output_buf;
-
-		output_buf_length = sampleindex - 1;
-		
-		/* 	if (outlen < PIPE_BUF)
-			{errno = ERROR_TOO_LITTLE_DATA; return FAILURE;} */
-
-	apply_gain:
-
-	
-	done:
-
-		//ch->writing = 0;
-
-		if (sampler_flag)
-		{
-			return 0;
-		}
-		else
-		{
-			return len;
-		}
-	}
-
-#ifdef __cplusplus
-}
-#endif
-

audacious-plugins-3.1.1.tar.bz2/src/CoreAudio/init.c Deleted

@@ -1,57 +0,0 @@
-/* XMMS - Cross-platform multimedia player
- * Copyright (C) 1998-2000 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 "coreaudio.h"
-#include <audacious/plugin.h>
-
-OSXConfig osx_cfg;
-
-extern float left_volume, right_volume;
-
-OutputPluginInitStatus osx_init(void)
-{
-	mcs_handle_t *cfgfile;
-
-	left_volume = 1.0;
-	right_volume = 1.0;
-
-	memset(&osx_cfg, 0, sizeof (OSXConfig));
-
-	osx_cfg.audio_device = 0;
-	osx_cfg.mixer_device = 0;
-	osx_cfg.buffer_size = 3000;
-	osx_cfg.prebuffer = 25;
-	osx_cfg.use_alt_audio_device = FALSE;
-	osx_cfg.alt_audio_device = NULL;
-	osx_cfg.use_master=0;
-	
-	if ((cfgfile = aud_cfg_db_open()))
-	{
-		aud_cfg_db_get_int(cfgfile, "OSX", "audio_device", &osx_cfg.audio_device);
-		aud_cfg_db_get_int(cfgfile, "OSX", "mixer_device", &osx_cfg.mixer_device);
-		aud_cfg_db_get_int(cfgfile, "OSX", "buffer_size", &osx_cfg.buffer_size);
-		aud_cfg_db_get_int(cfgfile, "OSX", "prebuffer", &osx_cfg.prebuffer);
-		aud_cfg_db_get_bool(cfgfile, "OSX", "use_master", &osx_cfg.use_master);
-		aud_cfg_db_get_bool(cfgfile, "OSX", "use_alt_audio_device", &osx_cfg.use_alt_audio_device);
-		aud_cfg_db_get_string(cfgfile, "OSX", "alt_audio_device", &osx_cfg.alt_audio_device);
-		aud_cfg_db_get_bool(cfgfile, "OSX", "use_alt_mixer_device", &osx_cfg.use_alt_mixer_device);
-		aud_cfg_db_get_string(cfgfile, "OSX", "alt_mixer_device", &osx_cfg.alt_mixer_device);
-		aud_cfg_db_close(cfgfile);
-	}
-
-	return OUTPUT_PLUGIN_INIT_FOUND_DEVICES;
-}

audacious-plugins-3.1.1.tar.bz2/src/CoreAudio/mixer.c Deleted

@@ -1,81 +0,0 @@
-/* XMMS - Cross-platform multimedia player
- * Copyright (C) 1998-2000 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 "coreaudio.h"
-#include <errno.h>
-#include <CoreAudio/CoreAudio.h>
-
-extern AudioDeviceID device_id;
-extern gboolean playing_flag;
-extern float left_volume, right_volume;
-
-void osx_get_volume(int *l, int *r)
-{
-	*l = left_volume * 100;
-	*r = right_volume * 100;
-
-#if 0
-	float volume;
-	UInt32 size;
-	AudioDeviceID temp_device_id;
-
-	size = sizeof(float);
-
-	AudioDeviceGetProperty(device_id,1,0,kAudioDevicePropertyVolumeScalar,&size,&volume);
-
-	volume = volume * 100;
-
-	*r = volume;
-	*l = volume;
-#endif
-}
-
-
-void osx_set_volume(int l, int r)
-{
-	left_volume = (float)l / 100.0;
-	right_volume = (float) r / 100.0;
-
-
-#if 0
-	int fd, v, cmd, devs;
-	gchar *devname;
-
-	Boolean writeable_flag; 
-
-	if (AudioDeviceGetPropertyInfo(device_id,1,false,kAudioDevicePropertyVolumeScalar,NULL,&writeable_flag))
-	{
-		printf("could not get property info for volume write\n");
-	}
-	else 
-	{
-		if (writeable_flag)
-		{
-			float volume;
-
-			volume = l / 100.0;
-			AudioDeviceSetProperty(device_id,NULL,1,0,kAudioDevicePropertyVolumeScalar,sizeof(float),&volume);
-		}
-		else
-		{
-			printf("volume property is not writeable\n");
-		}
-	}
-#endif
-}
-
-

audacious-plugins-3.1.1.tar.bz2/src/aosd/aosd_ui.c.old Deleted

@@ -1,159 +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 "aosd_ui.h"
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-
-gint
-aosd_display_osd ( void )
-{
- GtkWidget *osd_win;
- GtkWidget *osd_darea;
- PangoLayout *osd_layout;
- PangoFontDescription *osd_fontdesc;
- GdkPixmap *osd_darea_pixmap, *osd_darea_bitmap;
- GdkGC *osd_darea_gc;
- GdkColor fg_color, bg_color, bitmap_color;
- GdkColormap *bitmap_colormap;
- gint max_width = 0, border_width = 1;
- gint width = 0, height = 0;
- gint off_x = 0, off_y = 0;
- PangoAlignment osd_alignment = PANGO_ALIGN_CENTER;
- gboolean translucent_bg = TRUE;
-
- osd_win = gtk_window_new( GTK_WINDOW_POPUP );
- gtk_widget_add_events( osd_win , GDK_ENTER_NOTIFY_MASK );
- gtk_widget_realize( osd_win );
-
- osd_darea = gtk_drawing_area_new();
- gtk_container_add( GTK_CONTAINER(osd_win) , osd_darea );
- gtk_widget_show( osd_darea );
-
- osd_fontdesc = pango_font_description_from_string("Courier,Mono 28");
-
- osd_layout = gtk_widget_create_pango_layout( osd_darea , "AUDACIOUS OSD 0.1 by Giacomo" );
- pango_layout_set_ellipsize( osd_layout , PANGO_ELLIPSIZE_NONE );
- pango_layout_set_justify( osd_layout , FALSE );
- pango_layout_set_alignment( osd_layout , osd_alignment );
- pango_layout_set_font_description( osd_layout , osd_fontdesc );
-
- max_width = gdk_screen_get_width( gdk_screen_get_default() ) - 8;
- pango_layout_set_width( osd_layout , PANGO_SCALE * max_width );
- pango_layout_get_pixel_size( osd_layout , &width , &height );
-
- off_x = border_width * 2;
- off_y = border_width * 2;
-
- if ( osd_alignment == PANGO_ALIGN_CENTER )
- off_x -= max_width/2 - width/2;
- else if ( osd_alignment == PANGO_ALIGN_RIGHT )
- off_x -= max_width - width;
-
- width += border_width * 4;
- height += border_width * 4;
-
- gtk_widget_set_size_request( osd_darea , width , height );
- gtk_widget_realize( osd_darea );
-
- osd_darea_pixmap = gdk_pixmap_new( GDK_DRAWABLE(osd_darea->window) , width , height , -1 );
-
- osd_darea_gc = gdk_gc_new( GDK_DRAWABLE(osd_darea_pixmap) );
- gdk_gc_copy( osd_darea_gc , osd_darea->style->fg_gc[GTK_STATE_NORMAL] );
-
- gdk_color_parse( "Blue" , &fg_color ); /* TODO pass color as function param */
- gdk_color_parse( "White" , &bg_color ); /* TODO pass color as function param */
-
- gdk_gc_set_rgb_fg_color( osd_darea_gc , &bg_color );
- gdk_draw_rectangle( GDK_DRAWABLE(osd_darea_pixmap) , osd_darea_gc , TRUE ,
- 0 , 0 , width , height );
- gdk_gc_set_rgb_fg_color( osd_darea_gc , &fg_color );
- gdk_draw_layout( GDK_DRAWABLE(osd_darea_pixmap) , osd_darea_gc , off_x , off_y , osd_layout );
- g_object_unref( osd_darea_gc );
-
- osd_darea_bitmap = gdk_pixmap_new( GDK_DRAWABLE(osd_darea->window) , width , height , 1 );
- osd_darea_gc = gdk_gc_new( GDK_DRAWABLE(osd_darea_bitmap) );
-
- /* gdk will complain if we don't pass a colormap to osd_darea_gc */
- gdk_gc_set_colormap( osd_darea_gc , gdk_colormap_get_system() );
-
- bitmap_color.pixel = 0;
- gdk_gc_set_foreground( osd_darea_gc , &bitmap_color );
-
- if ( translucent_bg == TRUE )
- {
- gint w = 2, h = 2;
- GdkPixmap *stipple_bitmap;
-
- stipple_bitmap = gdk_pixmap_new( NULL , w , h , 1 );
- bitmap_color.pixel = 0; gdk_gc_set_foreground( osd_darea_gc , &bitmap_color );
- gdk_draw_rectangle( GDK_DRAWABLE(stipple_bitmap) , osd_darea_gc , TRUE , 0 , 0 , w , h );
- bitmap_color.pixel = 1; gdk_gc_set_foreground( osd_darea_gc , &bitmap_color );
- gdk_draw_point( GDK_DRAWABLE(stipple_bitmap) , osd_darea_gc , 0 , 0 );
- gdk_draw_point( GDK_DRAWABLE(stipple_bitmap) , osd_darea_gc , 1 , 1 );
- bitmap_color.pixel = 0; gdk_gc_set_foreground( osd_darea_gc , &bitmap_color );
- gdk_draw_rectangle( GDK_DRAWABLE(osd_darea_bitmap) , osd_darea_gc , TRUE ,
- 0 , 0 , width , height );
- gdk_gc_set_stipple( osd_darea_gc , stipple_bitmap );
- gdk_gc_set_fill( osd_darea_gc , GDK_STIPPLED );
- bitmap_color.pixel = 1; gdk_gc_set_foreground( osd_darea_gc , &bitmap_color );
- gdk_draw_rectangle( GDK_DRAWABLE(osd_darea_bitmap) , osd_darea_gc , TRUE ,
- 0 , 0 , width , height );
- gdk_gc_set_fill( osd_darea_gc , GDK_SOLID );
- }
- else
- gdk_draw_rectangle( GDK_DRAWABLE(osd_darea_bitmap) , osd_darea_gc , TRUE ,
- 0 , 0 , width , height );
-
- bitmap_color.pixel = 1;
- gdk_gc_set_foreground( osd_darea_gc , &bitmap_color );
-
- gdk_draw_layout( GDK_DRAWABLE(osd_darea_bitmap) , osd_darea_gc ,
- off_x , off_y , osd_layout );
- gdk_draw_layout( GDK_DRAWABLE(osd_darea_bitmap) , osd_darea_gc ,
- off_x + border_width , off_y , osd_layout );
- gdk_draw_layout( GDK_DRAWABLE(osd_darea_bitmap) , osd_darea_gc ,
- off_x + border_width , off_y + border_width , osd_layout );
- gdk_draw_layout( GDK_DRAWABLE(osd_darea_bitmap) , osd_darea_gc ,
- off_x , off_y + border_width , osd_layout );
- gdk_draw_layout( GDK_DRAWABLE(osd_darea_bitmap) , osd_darea_gc ,
- off_x - border_width , off_y + border_width , osd_layout );
- gdk_draw_layout( GDK_DRAWABLE(osd_darea_bitmap) , osd_darea_gc ,
- off_x - border_width , off_y , osd_layout );
- gdk_draw_layout( GDK_DRAWABLE(osd_darea_bitmap) , osd_darea_gc ,
- off_x - border_width , off_y - border_width , osd_layout );
- gdk_draw_layout( GDK_DRAWABLE(osd_darea_bitmap) , osd_darea_gc ,
- off_x , off_y - border_width , osd_layout );
- gdk_draw_layout( GDK_DRAWABLE(osd_darea_bitmap) , osd_darea_gc ,
- off_x + border_width , off_y - border_width , osd_layout );
-
- g_object_unref( osd_darea_gc );
-
- gdk_window_set_back_pixmap( GDK_WINDOW(osd_darea->window) , osd_darea_pixmap , FALSE );
- gdk_window_shape_combine_mask( GDK_WINDOW(osd_win->window) , osd_darea_bitmap , 0 , 0 );
-
- gtk_widget_show( osd_win );
-
- pango_font_description_free( osd_fontdesc );
- g_object_unref( osd_layout );
- return 0;
-}

audacious-plugins-3.1.1.tar.bz2/src/dockalbumart Deleted

audacious-plugins-3.1.1.tar.bz2/src/dockalbumart/Makefile Deleted

audacious-plugins-3.1.1.tar.bz2/src/dockalbumart/audacious_player.xpm Deleted

@@ -1,176 +0,0 @@
-/* XPM */
-static char * audacious_player_xpm[] = {
-"48 48 125 2",
-" 	c None",
-". 	c #000000",
-"+ 	c #090909",
-"@ 	c #313131",
-"# 	c #505050",
-"$ 	c #5A5A5A",
-"% 	c #4F4F4F",
-"& 	c #0D0D0D",
-"* 	c #5C5C5C",
-"= 	c #A8A8A8",
-"- 	c #D6D6D6",
-"; 	c #D9D9D9",
-"> 	c #D5D5D5",
-", 	c #A5A5A5",
-"' 	c #595959",
-") 	c #0B0B0B",
-"! 	c #060606",
-"~ 	c #6A6A6A",
-"{ 	c #CCCCCC",
-"] 	c #CBCBCB",
-"^ 	c #696969",
-"/ 	c #2B2B2B",
-"( 	c #BABABA",
-"_ 	c #B8B8B8",
-": 	c #2A2A2A",
-"< 	c #484848",
-"[ 	c #D4D4D4",
-"} 	c #D3D3D3",
-"| 	c #474747",
-"1 	c #494949",
-"2 	c #D7D7D7",
-"3 	c #2D2D2D",
-"4 	c #2E2E2E",
-"5 	c #080808",
-"6 	c #BBBBBB",
-"7 	c #C5C5C5",
-"8 	c #A3A3A3",
-"9 	c #949494",
-"0 	c #6E6E6E",
-"a 	c #4D4D4D",
-"b 	c #858585",
-"c 	c #C6C6C6",
-"d 	c #BEBEBE",
-"e 	c #6C6C6C",
-"f 	c #777777",
-"g 	c #030303",
-"h 	c #515151",
-"i 	c #6B6B6B",
-"j 	c #CDCDCD",
-"k 	c #A7A7A7",
-"l 	c #141414",
-"m 	c #0E0E0E",
-"n 	c #5E5E5E",
-"o 	c #9A9A9A",
-"p 	c #393939",
-"q 	c #626262",
-"r 	c #ACACAC",
-"s 	c #717171",
-"t 	c #3E3E3E",
-"u 	c #5F5F5F",
-"v 	c #040404",
-"w 	c #BCBCBC",
-"x 	c #AFAFAF",
-"y 	c #121212",
-"z 	c #D8D8D8",
-"A 	c #333333",
-"B 	c #8C8C8C",
-"C 	c #3D3D3D",
-"D 	c #ABABAB",
-"E 	c #7B7B7B",
-"F 	c #373737",
-"G 	c #111111",
-"H 	c #606060",
-"I 	c #3B3B3B",
-"J 	c #919191",
-"K 	c #424242",
-"L 	c #585858",
-"M 	c #656565",
-"N 	c #7C7C7C",
-"O 	c #676767",
-"P 	c #020202",
-"Q 	c #6D6D6D",
-"R 	c #5D5D5D",
-"S 	c #353535",
-"T 	c #2C2C2C",
-"U 	c #1F1F1F",
-"V 	c #878787",
-"W 	c #5B5B5B",
-"X 	c #525252",
-"Y 	c #272727",
-"Z 	c #A2A2A2",
-"` 	c #404040",
-" .	c #1A1A1A",
-"..	c #303030",
-"+.	c #343434",
-"@.	c #A9A9A9",
-"#.	c #B9B9B9",
-"$.	c #666666",
-"%.	c #808080",
-"&.	c #7E7E7E",
-"*.	c #181818",
-"=.	c #969696",
-"-.	c #212121",
-";.	c #1B1B1B",
-">.	c #C9C9C9",
-",.	c #7F7F7F",
-"'.	c #464646",
-").	c #070707",
-"!.	c #3F3F3F",
-"~.	c #959595",
-"{.	c #D0D0D0",
-"].	c #CACACA",
-"^.	c #757575",
-"/.	c #444444",
-"(.	c #636363",
-"_.	c #C8C8C8",
-":.	c #7D7D7D",
-"<.	c #C4C4C4",
-"[.	c #0F0F0F",
-"}.	c #868686",
-"|.	c #848484",
-"1.	c #1E1E1E",
-"2.	c #C2C2C2",
-"3.	c #BFBFBF",
-"4.	c #747474",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . + @ # $ $ % @ + . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . & * = - ; ; ; ; ; ; > , ' ) . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . ! ~ { ; ; ; ; ; ; ; ; ; ; ; ; ] ^ ! . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . / ( ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; _ : . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . < [ ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; } | . . . . . . . . . . . . . ",
-". . . . . . . . . . . . 1 2 ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; 2 | . . . . . . . . . . . . ",
-". . . . . . . . . . . 3 [ ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; } 4 . . . . . . . . . . . ",
-". . . . . . . . . . 5 6 ; ; ; ; ; ; ; 7 8 9 0 a | $ b c ; ; ; ; ; ; ; ; d 5 . . . . . . . . . . ",
-". . . . . . . . . . e ; ; ; ; ; ; ; f g . . . . . . . g h 7 ; ; ; ; ; ; ; i . . . . . . . . . . ",
-". . . . . . . . . & j ; ; ; ; ; ; k . . . . . . . . . . . l ( ; ; ; ; ; ; j m . . . . . . . . . ",
-". . . . . . . . . n ; ; ; ; ; ; ; o . . . . . . . . . . . . p ; ; ; ; ; ; ; q . . . . . . . . . ",
-". . . . . . . . . r ; ; ; ; ; ; ; ; s t $ u u # v . . . . . . w ; ; ; ; ; ; x . . . . . . . . . ",
-". . . . . . . . y z ; ; ; ; ; ; ; ; ; ; ; ; ; z A . . . . . . B ; ; ; ; ; ; z y . . . . . . . . ",
-". . . . . . . . C ; ; ; ; ; ; ; ; ; ; - D E F G . . . . . . . H ; ; ; ; ; ; ; I . . . . . . . . ",
-". . . . . . . . $ ; ; ; ; ; ; ; ; ; J y . . . . . . . . . . . K ; ; ; ; ; ; ; L . . . . . . . . ",
-". . . . . . . . M ; ; ; ; ; ; ; ; N . . . . . . . . . . . . . C ; ; ; ; ; ; ; O . . . . . . . . ",
-". . . . . . . . O ; ; ; ; ; ; ; , P . . . . . . . . . . . . . Q ; ; ; ; ; ; ; ^ . . . . . . . . ",
-". . . . . . . . R ; ; ; ; ; ; ; S . . . . . T ( ( U . . . . . V ; ; ; ; ; ; ; W . . . . . . . . ",
-". . . . . . . . K ; ; ; ; ; ; ; / . . . . . X ; 2 Y . . . . . Z ; ; ; ; ; ; ; ` . . . . . . . . ",
-". . . . . . . . .; ; ; ; ; ; ; ... . . . . g p +.. . . . . . @.; ; ; ; ; ; ; .. . . . . . . . ",
-". . . . . . . . . #.; ; ; ; ; ; $.. . . . . . . . . . . . . . %.; ; ; ; ; ; w . . . . . . . . . ",
-". . . . . . . . . Q ; ; ; ; ; ; 6 ! . . . . . . . . . . . . . &.; ; ; ; ; ; s . . . . . . . . . ",
-". . . . . . . . . *.[ ; ; ; ; ; ; =.) . . . . . g -.+ . . . ;.>.; ; ; ; ; [ .. . . . . . . . . ",
-". . . . . . . . . . ,.; ; ; ; ; ; ; ( '.).. !.~.{.; ].^./.(._.; ; ; ; ; ; :.. . . . . . . . . . ",
-". . . . . . . . . . m c ; ; ; ; ; ; ; ; {.<.; ; ; ; ; ; ; ; ; ; ; ; ; ; _.[.. . . . . . . . . . ",
-". . . . . . . . . . . t z ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; z t . . . . . . . . . . . ",
-". . . . . . . . . . . . H ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; n . . . . . . . . . . . . ",
-". . . . . . . . . . . . . q z ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; z u . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . K >.; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; _.` . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . y }.- ; ; ; ; ; ; ; ; ; ; ; ; - |.G . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . 1.f 2.; ; ; ; ; ; ; ; 3.4.;.. . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . -.1 M 4.4.M 1 U . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "};

audacious-plugins-3.1.1.tar.bz2/src/dockalbumart/dockalbumart.c Deleted

@@ -1,163 +0,0 @@
-/*
- * dockalbumart: An audacious plugin to change the MacOS dock tile to the
- * album art.
- * dockalbumart.c: Plugin implementation
- *
- * Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice is present in all copies.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <glib.h>
-#include <audacious/i18n.h>
-
-#include <Carbon/Carbon.h>
-
-#include <audacious/plugin.h>
-
-#include "audacious_player.xpm"
-
-extern gchar *fileinfo_recursive_get_image(const gchar* path, const gchar* file_name, gint depth);
-
-/* utility functions */
-static void
-dock_set_icon_from_pixbuf(const GdkPixbuf *in)
-{
- GdkPixbuf *pixbuf;
- CGColorSpaceRef colorspace;
- CGDataProviderRef data_provider;
- CGImageRef image;
- gpointer data;
- gint rowstride, pixbuf_width, pixbuf_height;
- gboolean has_alpha;
- 
- pixbuf = gdk_pixbuf_scale_simple(in, 128, 128, GDK_INTERP_BILINEAR);
- 
- data = gdk_pixbuf_get_pixels(pixbuf);
- pixbuf_width = gdk_pixbuf_get_width(pixbuf);
- pixbuf_height = gdk_pixbuf_get_height(pixbuf);
- rowstride = gdk_pixbuf_get_rowstride(pixbuf);
- has_alpha = gdk_pixbuf_get_has_alpha(pixbuf);
- 
- /* create the colourspace for the CGImage. */
- colorspace = CGColorSpaceCreateDeviceRGB();
- data_provider = CGDataProviderCreateWithData(NULL, data, pixbuf_height * rowstride, NULL);
- image = CGImageCreate(pixbuf_width, pixbuf_height, 8,
- has_alpha ? 32 : 24, rowstride, colorspace,
- has_alpha ? kCGImageAlphaLast : 0,
- data_provider, NULL, FALSE, 
- kCGRenderingIntentDefault);
- 
- /* release the colourspace and data provider, we have what we want. */
- CGDataProviderRelease(data_provider);
- CGColorSpaceRelease(colorspace);
-
- /* set the dock tile images */
- SetApplicationDockTileImage(image);
-
- /* and release */
- CGImageRelease(image);
- g_object_unref(pixbuf);
-}
-
-static void
-pixbuf_find_and_load(Tuple *tuple)
-{
- GdkPixbuf *out;
- gchar *tmp;
- const gchar *file_path, *file_name;
-
- file_name = tuple_get_string(tuple, FIELD_FILE_NAME, NULL);
- file_path = tuple_get_string(tuple, FIELD_FILE_PATH, NULL);
-
- if (file_name != NULL && file_path != NULL)
- {
- tmp = fileinfo_recursive_get_image(file_path, file_name, 0);
- if (tmp)
- {
- GdkPixbuf *new = gdk_pixbuf_new_from_file(tmp, NULL);
- dock_set_icon_from_pixbuf(new);
- g_object_unref(new); 
- }
- else
- {
- GdkPixbuf *new = gdk_pixbuf_new_from_xpm_data((const gchar **) audacious_player_xpm);
- dock_set_icon_from_pixbuf(new);
- g_object_unref(new);
- }
- }
-}
-
-/* trigger functions */
-
-static void
-dockart_trigger_func_pb_start_cb(gpointer plentry_p, gpointer unused)
-{
- PlaylistEntry *entry = (PlaylistEntry *) plentry_p;
- Tuple *tuple;
-
- if (entry == NULL)
- return;
-
- tuple = entry->tuple;
-
- if (tuple == NULL)
- return;
-
- pixbuf_find_and_load(tuple);
-}
-
-static void
-dockart_trigger_func_pb_end_cb(gpointer plentry_p, gpointer unused)
-{
- GdkPixbuf *new;
-
- new = gdk_pixbuf_new_from_xpm_data((const gchar **) audacious_player_xpm);
- dock_set_icon_from_pixbuf(new);
- g_object_unref(new);
-}
-
-static void
-dockart_init(void)
-{
- hook_associate("playback begin", dockart_trigger_func_pb_start_cb, NULL);
- hook_associate("playback end", dockart_trigger_func_pb_end_cb, NULL);
-}
-
-static void
-dockart_cleanup(void)
-{
- GdkPixbuf *new;
-
- hook_dissociate("playback begin", dockart_trigger_func_pb_start_cb);
- hook_dissociate("playback end", dockart_trigger_func_pb_end_cb);
-
- /* reset dock tile */
- new = gdk_pixbuf_new_from_xpm_data((const gchar **) audacious_player_xpm);
- dock_set_icon_from_pixbuf(new);
- g_object_unref(new);
-}
-
-GeneralPlugin dockart_gp =
-{
- .description = "Dock Album Art",
- .init = dockart_init,
- .cleanup = dockart_cleanup
-};
-
-GeneralPlugin *dockart_gplist[] = { &dockart_gp, NULL };
-SIMPLE_GENERAL_PLUGIN(dockart, dockart_gplist);

audacious-plugins-3.1.1.tar.bz2/src/flacng/AUTHORS Deleted

@@ -1,28 +0,0 @@
-/*
- * A FLAC decoder plugin for the Audacious Media Player
- * Copyright (C) 2005 Ralf Ertzinger
- *
- * 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.
- */
-
-Ralf Ertzinger <ralf@skytale.net>
-
-Thanks to Hendrik Scholz <http://www.wormulon.net> for testing the FreeBSD
-side
-
-William Pitcock <nenolod@sacredspiral.co.uk>
- - tuple builder
- - full transition to InputPlayback API
- - full vorbiscomment support

audacious-plugins-3.1.1.tar.bz2/src/flacng/README Deleted

@@ -1,109 +0,0 @@
-/*
- * A FLAC decoder plugin for the Audacious Media Player
- * Copyright (C) 2005 Ralf Ertzinger
- *
- * 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.
- */
-
-INTRODUCTION
-============
-
-This is an input plugin for the Audacious Media Player enabling the playback
-of FLAC compressed audio files.
-
-The Audacious Media Player (http://www.audacious-media-player.org) is a port of
-the XMMS audio player to GTK2.
-
-FLAC (http://flac.sourceforge.net/) is an Open Source lossless audio
-codec developed by Josh Coalson.
-
-
-
-STATUS
-======
-
-This plugin is to be considered of alpha quality. Use at your own risk.
-
-
-OK, let's be brief with this and first list the things that do _not_ work
-at the current time.
-
-- No display of bitrate
-- Visualizer plugins do not work with FLAC streams (*)
-- No OGGFlac streams (*)
-- Maximum of 2 channels (Stereo) (*)
-- No configuration options at all (*)
-
-Still interested? Good.
-The items marked with a (*) above can be fixed, this just takes some code
-that has not been written yet (har har).
-The FLAC decoder does not emit the current bitrate, so you'll have to
-settle for "VBR", which is true enough.
-As for configuration options, so far I have not found anything worth
-configuring, maybe you can think of something.
-
-Nonetheless.
-
-Given all the restrictions above, when presented with a 8/16/24 bit, stereo
-not-packed-in-ogg FLAC stream, this plugin will do it's best to produce
-some sound out of it. This may even work. It may, on the other hand, crash
-your machine and eat your data.
-
-Did I mention that the code is alpha quality?
-
-
-
-HOW TO BUILD
-============
-
-You will need the following to compile the code:
-
-1) A working compiler environment (if you do not know what this means
- you probably do not want to use this code now, anyway)
-
-2) The Audacious media player, including development header files
-
-3) The FLAC libraries, including development header files
-
-If you have all this the rest is easy.
-Unpack the tar ball, change into the directory created and
-issue "configure" (without the quotes). This will try and find the
-necessary stuff on your system. When it finishes successfully, type
-"make". This will build the plugin library.
-To enable debugging messages (and you probably want those at this
-point) use "configure --debug"
-
-To install the plugin in your home directory (no special permissions
-needed, ideal for testing) use "make localinstall" (you can use
-"make localremove" to remove the plugin again). To install the plugin
-for all users use "make install" instead.
-
-
-
-TESTING
-=======
-
-After successful installation start Audacious (preferrably from the command
-line so you can see error or debug messages) and look in the configuration
-panel under plugins. The FLAC plugin ought to appear there, looking
-like "FLAC audio plugin". Now add a FLAC file to
-the playlist and try it.
-
-
-
-BUGS
-====
-
-Sure. Tons of 'em. Report to <ralf@skytale.net> for the time being.

audacious-plugins-3.1.1.tar.bz2/src/gntui Deleted

audacious-plugins-3.1.1.tar.bz2/src/gntui/Makefile Deleted

audacious-plugins-3.1.1.tar.bz2/src/gntui/README Deleted

audacious-plugins-3.1.1.tar.bz2/src/gntui/fileselector.c Deleted

@@ -1,109 +0,0 @@
-/* Audacious GNT interface
- * Copyright (C) 2009 Tomasz Moń <desowin@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 <audacious/plugin.h>
-#include <glib/gi18n.h>
-#include <gnt/gntfilesel.h>
-#include <gnt/gntbox.h>
-#include "fileselector.h"
-
-static GntWidget * window = NULL;
-
-static void
-file_add_cb(GntWidget *widget, GntFileSel **selector)
-{
- gchar *file = gnt_file_sel_get_selected_file(*selector);
- gchar *uri = g_filename_to_uri((const gchar *) file, NULL, NULL);
- gchar *path = g_path_get_dirname(file);
- gint playlist = aud_playlist_get_active();
-
- g_free(file);
-
- g_free(aud_cfg->filesel_path);
- aud_cfg->filesel_path = path;
-
- if (uri == NULL)
- return;
-
- aud_drct_pl_add_url_string (uri);
-
- gnt_widget_destroy(GNT_WIDGET(*selector));
- *selector = NULL;
-}
-
-static void
-file_open_cb(GntWidget *widget, GntFileSel **selector)
-{
- gint playlist = aud_playlist_get_active();
-
- aud_playlist_entry_delete(playlist, 0, aud_playlist_entry_count(playlist));
- aud_playlist_set_playing(playlist);
-
- file_add_cb(widget, selector);
-}
-
-static void
-cancel_cb(GntWidget *widget, GntFileSel **selector)
-{
- gnt_widget_destroy(GNT_WIDGET(*selector));
- *selector = NULL;
-}
-
-void
-run_fileselector(gboolean play_button)
-{
- if (window != NULL) {
- gnt_window_present(window);
- return;
- }
-
- window = gnt_file_sel_new();
- gnt_box_set_title(GNT_BOX(window),
- play_button ? _("Open Files") : _("Add Files"));
-
- if (aud_cfg->filesel_path)
- gnt_file_sel_set_current_location(GNT_FILE_SEL(window),
- aud_cfg->filesel_path);
-
- gnt_file_sel_set_must_exist(GNT_FILE_SEL(window), TRUE);
-
- g_signal_connect(G_OBJECT(GNT_FILE_SEL(window)->select), "activate",
- G_CALLBACK(play_button ? file_open_cb : file_add_cb),
- &window);
- g_signal_connect(G_OBJECT(GNT_FILE_SEL(window)->cancel), "activate",
- G_CALLBACK(cancel_cb), &window);
-
- gnt_widget_show(window);
-}
-
-void
-open_files()
-{
- run_fileselector(TRUE);
-}
-
-void
-add_files()
-{
- run_fileselector(FALSE);
-}
-
-void
-hide_fileselector()
-{
- gnt_widget_destroy(window);
- window = NULL;
-}

audacious-plugins-3.1.1.tar.bz2/src/gntui/fileselector.h Deleted

audacious-plugins-3.1.1.tar.bz2/src/gntui/gntui.c Deleted

@@ -1,316 +0,0 @@
-/* Audacious GNT interface
- * Copyright (C) 2009 Tomasz Moń <desowin@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/gi18n.h>
-#include <glib.h>
-#include <audacious/plugin.h>
-#include <gnt/gnt.h>
-#include <gnt/gntbox.h>
-#include <gnt/gntwindow.h>
-#include <gnt/gntlabel.h>
-#include <gnt/gntbutton.h>
-#include "fileselector.h"
-
-static GntWidget *window = NULL;
-static GntWidget *playback_hbox = NULL;
-static GntWidget *status_widget = NULL;
-static GntWidget *time_widget = NULL;
-static GntWidget *title_widget = NULL;
-static GntWidget *playlist_widget = NULL;
-
-static gint update_song_timeout_source = 0;
-
-static gchar *playing_status()
-{
- if (aud_drct_get_playing())
- {
- if (!aud_drct_get_paused())
- {
- return ("|>");
- }
- else
- {
- return ("||");
- }
- }
- else
- {
- return ("[]");
- }
-}
-
-static void fill_playlist()
-{
- gint playlist = aud_playlist_get_active();
- gint pos = aud_playlist_get_position(playlist);
- gint i, count;
-
- count = aud_playlist_entry_count(playlist);
-
- gnt_tree_remove_all(GNT_TREE(playlist_widget));
-
- g_object_set_data(G_OBJECT(playlist_widget), "playlist", GINT_TO_POINTER(playlist));
- for (i = 0; i < count; i++) {
- GntTreeRow * row;
- 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),
- title, len, NULL);
- g_free (title);
-
- gnt_tree_add_row_after(GNT_TREE(playlist_widget),
- GINT_TO_POINTER(i+1),
- row,
- NULL,
- GINT_TO_POINTER(i));
-
- g_free(len);
- }
-
- gnt_tree_set_selected(GNT_TREE(playlist_widget), GINT_TO_POINTER(pos+1));
-}
-
-static gboolean update_song_time(gpointer data)
-{
- gint time = aud_drct_get_output_time() / 1000;
- gchar *text;
-
- text = g_strdup_printf("[%02i:%02i]", time / 60, time % 60);
- gnt_label_set_text(GNT_LABEL(time_widget), text);
- g_free(text);
-
- return TRUE;
-}
-
-static void update_playback_status()
-{
- const gchar *text = playing_status();
-
- gnt_label_set_text(GNT_LABEL(status_widget), text);
-}
-
-static void update_playback_title()
-{
- gint playlist = aud_playlist_get_active();
- gint pos = aud_playlist_get_position(playlist);
- 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)
-{
- update_song_time(NULL);
- update_playback_title();
-}
-
-static gboolean mainwin_keypress_cb(GntWidget *widget, const char *text, gpointer data)
-{
- g_return_val_if_fail(text != NULL, FALSE);
-
- switch (text[0]) {
- case 'z':
- aud_drct_pl_prev();
- update_playback_title();
- break;
- case 'x':
- aud_drct_play();
- break;
- case 'c':
- aud_drct_pause();
- break;
- case 'v':
- aud_drct_stop();
- break;
- case 'b':
- aud_drct_pl_next();
- update_playback_title();
- break;
- default:
- return FALSE;
- }
- return TRUE;
-}
-
-static gboolean playlist_keypress_cb(GntTree *widget, const gchar * text, gpointer data)
-{
- if (text != NULL && text[0] == ' ' && text[1] == 0) {
- gint playlist = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "playlist"));
- gint pos = GPOINTER_TO_INT(gnt_tree_get_selection_data(widget)) - 1;
-
- aud_playlist_set_position(playlist, pos);
-
- if (!aud_drct_get_playing())
- aud_drct_play();
-
- return TRUE;
- }
- return FALSE;
-}
-
-static void gntui_mainwin_show()
-{
- if (window) {
- gnt_window_present(window);
- return;
- }
-
- window = gnt_window_box_new(FALSE, TRUE);
- gnt_box_set_title(GNT_BOX(window), "Audacious2");
- gnt_box_set_fill(GNT_BOX(window), TRUE);
- gnt_box_set_alignment(GNT_BOX(window), GNT_ALIGN_TOP);
-
- playback_hbox = gnt_hbox_new(FALSE);
- gnt_box_add_widget(GNT_BOX(window), playback_hbox);
-
- status_widget = gnt_label_new("[]");
- gnt_box_add_widget(GNT_BOX(playback_hbox), status_widget);
- GNT_WIDGET_UNSET_FLAGS(status_widget, GNT_WIDGET_GROW_X);
-
- time_widget = gnt_label_new("[00:00]");
- gnt_box_add_widget(GNT_BOX(playback_hbox), time_widget);
- GNT_WIDGET_UNSET_FLAGS(time_widget, GNT_WIDGET_GROW_X);
-
- title_widget = gnt_label_new("");
- gnt_box_add_widget(GNT_BOX(playback_hbox), title_widget);
-
- playlist_widget = gnt_tree_new();
- g_object_set(G_OBJECT(playlist_widget), "columns", 2, NULL);
- gnt_tree_set_search_column(GNT_TREE(playlist_widget), 0);
- //TODO: gnt_tree_set_search_function
- gnt_tree_set_show_title(GNT_TREE(playlist_widget), FALSE);
- fill_playlist();
- gnt_tree_adjust_columns(GNT_TREE(playlist_widget));
- gnt_box_add_widget(GNT_BOX(window), playlist_widget);
-
- g_signal_connect(G_OBJECT(playlist_widget), "key_pressed",
- G_CALLBACK(playlist_keypress_cb), NULL);
- g_signal_connect(G_OBJECT(window), "key_pressed",
- G_CALLBACK(mainwin_keypress_cb), NULL);
-
- set_song_info(NULL, NULL);
-
- gnt_widget_show(window);
- gnt_window_present(window);
-}
-
-static void ui_playback_begin(gpointer hook_data, gpointer user_data)
-{
- update_playback_status();
- set_song_info(NULL, NULL);
-
- /* update song info 4 times a second */
- update_song_timeout_source = g_timeout_add(250, update_song_time, NULL);
-}
-
-static void ui_playback_stop(gpointer hook_data, gpointer user_data)
-{
- if (update_song_timeout_source)
- {
- g_source_remove(update_song_timeout_source);
- update_song_timeout_source = 0;
- }
-
- update_playback_status();
- set_song_info(NULL, NULL);
-}
-
-static void ui_playback_end(gpointer hook_data, gpointer user_data)
-{
- set_song_info(NULL, NULL);
-}
-
-static void ui_playlist_update(gpointer hook_data, gpointer user_data)
-{
- gnt_tree_remove_all(GNT_TREE(playlist_widget));
- fill_playlist();
-}
-
-static void show_error_message(const gchar * markup)
-{
- GntWidget *win;
- GntWidget *button;
-
- /* TODO: strip markup */
- win = gnt_vwindow_new(FALSE);
- gnt_box_add_widget(GNT_BOX(win), gnt_label_new(markup));
- gnt_box_set_title(GNT_BOX(win), "Error");
- gnt_box_set_alignment(GNT_BOX(win), GNT_ALIGN_MID);
-
- button = gnt_button_new("Close");
- g_signal_connect_swapped(G_OBJECT(button), "activate",
- G_CALLBACK(gnt_widget_destroy), win);
- gnt_box_add_widget(GNT_BOX(win), button);
-
- gnt_widget_show(win);
- gnt_window_present(win);
-}
-
-static gboolean ui_initialize(InterfaceCbs * cbs)
-{
- gnt_init();
-
- gntui_mainwin_show();
-
- gnt_register_action(_("Audacious2"), gntui_mainwin_show);
- gnt_register_action(_("Add Files"), add_files);
- gnt_register_action(_("Open Files"), open_files);
-
- hook_associate("title change", set_song_info, NULL);
- hook_associate("playback begin", ui_playback_begin, NULL);
- hook_associate("playback stop", ui_playback_stop, NULL);
- hook_associate("playback end", ui_playback_end, NULL);
- hook_associate("playlist update", ui_playlist_update, NULL);
-
- cbs->run_filebrowser = run_fileselector;
- cbs->hide_filebrowser = hide_fileselector;
- cbs->show_error = show_error_message;
-
- gnt_main();
-
- return TRUE;
-}
-
-
-static gboolean ui_finalize(void)
-{
- hook_dissociate("title change", set_song_info);
- hook_dissociate("playback begin", ui_playback_begin);
- hook_dissociate("playback stop", ui_playback_stop);
- hook_dissociate("playback end", ui_playback_end);
- hook_dissociate("playlist update", ui_playlist_update);
-
- if (update_song_timeout_source)
- {
- g_source_remove(update_song_timeout_source);
- update_song_timeout_source = 0;
- }
-
- gnt_quit();
-
- return TRUE;
-}
-
-Interface gntui_interface = {
- .id = "gntui",
- .desc = N_("gnt interface"),
- .init = ui_initialize,
- .fini = ui_finalize,
-};
-
-SIMPLE_INTERFACE_PLUGIN("gntui", &gntui_interface);

audacious-plugins-3.1.1.tar.bz2/src/gsf Deleted

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA Deleted

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/GBA.h Deleted

@@ -1,147 +0,0 @@
-// -*- C++ -*-
-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
-// Copyright (C) 1999-2003 Forgotten
-// Copyright (C) 2004 Forgotten and the VBA 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; either version 2, 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.
-
-#ifndef VBA_GBA_H
-#define VBA_GBA_H
-
-#include "System.h"
-
-#define SAVE_GAME_VERSION_1 1
-#define SAVE_GAME_VERSION_2 2
-#define SAVE_GAME_VERSION_3 3
-#define SAVE_GAME_VERSION_4 4
-#define SAVE_GAME_VERSION_5 5
-#define SAVE_GAME_VERSION_6 6
-#define SAVE_GAME_VERSION_7 7
-#define SAVE_GAME_VERSION_8 8
-#define SAVE_GAME_VERSION  SAVE_GAME_VERSION_8
-
-typedef struct {
-  u8 *address;
-  u32 mask;
-} memoryMap;
-
-typedef union {
-  struct {
-#ifdef WORDS_BIGENDIAN
-    u8 B3;
-    u8 B2;
-    u8 B1;
-    u8 B0;
-#else
-    u8 B0;
-    u8 B1;
-    u8 B2;
-    u8 B3;
-#endif
-  } B;
-  struct {
-#ifdef WORDS_BIGENDIAN
-    u16 W1;
-    u16 W0;
-#else
-    u16 W0;
-    u16 W1;
-#endif
-  } W;
-#ifdef WORDS_BIGENDIAN
-  volatile u32 I;
-#else
-	u32 I;
-#endif
-} reg_pair;
-
-#ifndef NO_GBA_MAP
-extern memoryMap map[256];
-#endif
-
-extern reg_pair reg[45];
-extern u8 biosProtected[4];
-
-extern bool N_FLAG;
-extern bool Z_FLAG;
-extern bool C_FLAG;
-extern bool V_FLAG;
-extern bool armIrqEnable;
-extern bool armState;
-extern int armMode;
-//extern void (*cpuSaveGameFunc)(u32,u8);
-
-extern bool freezeWorkRAM[0x40000];
-extern bool freezeInternalRAM[0x8000];
-//extern bool CPUReadGSASnapshot(const char *);
-//extern bool CPUWriteGSASnapshot(const char *, const char *, const char *, const char *);
-//extern bool CPUWriteBatteryFile(const char *);
-//extern bool CPUReadBatteryFile(const char *);
-//extern bool CPUExportEepromFile(const char *);
-//extern bool CPUImportEepromFile(const char *);
-//extern bool CPUWritePNGFile(const char *);
-//extern bool CPUWriteBMPFile(const char *);
-extern void CPUCleanUp();
-//extern void CPUUpdateRender();
-//extern bool CPUReadMemState(char *, int);
-extern bool CPUReadState(const char *);
-extern bool CPUWriteMemState(char *, int);
-extern bool CPUWriteState(const char *);
-extern int CPULoadRom(const char *);
-extern void CPUUpdateRegister(u32, u16);
-extern void CPUWriteHalfWord(u32, u16);
-extern void CPUWriteByte(u32, u8);
-extern void CPUInit(const char *,bool);
-extern void CPUReset();
-extern void CPULoop(int);
-extern void CPUCheckDMA(int,int);
-extern bool CPUIsGBAImage(const char *);
-extern bool CPUIsZipFile(const char *);
-#ifdef PROFILING
-extern void cpuProfil(char *buffer, int, u32, int);
-extern void cpuEnableProfiling(int hz);
-#endif
-
-extern struct EmulatedSystem GBASystem;
-
-#define R13_IRQ  18
-#define R14_IRQ  19
-#define SPSR_IRQ 20
-#define R13_USR  26
-#define R14_USR  27
-#define R13_SVC  28
-#define R14_SVC  29
-#define SPSR_SVC 30
-#define R13_ABT  31
-#define R14_ABT  32
-#define SPSR_ABT 33
-#define R13_UND  34
-#define R14_UND  35
-#define SPSR_UND 36
-#define R8_FIQ   37
-#define R9_FIQ   38
-#define R10_FIQ  39
-#define R11_FIQ  40
-#define R12_FIQ  41
-#define R13_FIQ  42
-#define R14_FIQ  43
-#define SPSR_FIQ 44
-
-//#include "Cheats.h"
-#include "Globals.h"
-//#include "EEprom.h"
-//#include "Flash.h"
-
-#endif //VBA_GBA_H

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/GBAinline.h Deleted

@@ -1,431 +0,0 @@
-// -*- C++ -*-
-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
-// Copyright (C) 1999-2003 Forgotten
-// Copyright (C) 2004 Forgotten and the VBA 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; either version 2, 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.
-
-extern int loadedsize;
-
-#ifndef VBA_GBAinline_H
-#define VBA_GBAinline_H
-
-#include "System.h"
-#include "Port.h"
-//#include "RTC.h"
-
-//extern bool cpuSramEnabled;
-//extern bool cpuFlashEnabled;
-//extern bool cpuEEPROMEnabled;
-//extern bool cpuEEPROMSensorEnabled;
-
-#define CPUReadByteQuick(addr) \
- map[(addr)>>24].address[(addr) & map[(addr)>>24].mask]
-
-#define CPUReadHalfWordQuick(addr) \
- READ16LE(((u16*)&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask]))
-
-#define CPUReadMemoryQuick(addr) \
- READ32LE(((u32*)&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask]))
-
-static inline u32 CPUReadMemory(u32 address)
-{
-
-#ifdef DEV_VERSION
- if(address & 3) { 
- if(systemVerbose & VERBOSE_UNALIGNED_MEMORY) {
- log("Unaligned word read: %08x at %08x\n", address, armMode ?
- armNextPC - 4 : armNextPC - 2);
- }
- }
-#endif
- 
- u32 value;
- switch(address >> 24) {
- case 0:
- if(reg[15].I >> 24) {
- if(address < 0x4000) {
-#ifdef DEV_VERSION
- if(systemVerbose & VERBOSE_ILLEGAL_READ) {
- log("Illegal word read: %08x at %08x\n", address, armMode ?
- armNextPC - 4 : armNextPC - 2);
- }
-#endif
- 
- value = READ32LE(((u32 *)&biosProtected));
- }
- else goto unreadable;
- } else
- value = READ32LE(((u32 *)&bios[address & 0x3FFC]));
- break;
- case 2:
- value = READ32LE(((u32 *)&workRAM[address & 0x3FFFC]));
- break;
- case 3:
- value = READ32LE(((u32 *)&internalRAM[address & 0x7ffC]));
- break;
- case 4:
- if((address < 0x4000400) && ioReadable[address & 0x3fc]) {
- if(ioReadable[(address & 0x3fc) + 2])
- value = READ32LE(((u32 *)&ioMem[address & 0x3fC]));
- else
- value = READ16LE(((u16 *)&ioMem[address & 0x3fc]));
- } else goto unreadable;
- break;
- case 5:
- value = READ32LE(((u32 *)&paletteRAM[address & 0x3fC]));
- break;
- case 6:
- value = READ32LE(((u32 *)&vram[address & 0x1fffc]));
- break;
- case 7:
- value = READ32LE(((u32 *)&oam[address & 0x3FC]));
- break;
- case 8:
- case 9:
- case 10:
- case 11:
- case 12:
- if((address & 0x1FFFFFC) > loadedsize)
-		 value = 0xFFFFFFFF;
-	else
- value = READ32LE(((u32 *)&rom[address&0x1FFFFFC]));
- break; 
- case 13:
-// if(cpuEEPROMEnabled)
- // no need to swap this
-// return eepromRead(address);
- goto unreadable;
- // case 14:
- // if(cpuFlashEnabled | cpuSramEnabled)
- // no need to swap this
- //return flashRead(address);
- // default
- default:
- unreadable:
-#ifdef DEV_VERSION
- if(systemVerbose & VERBOSE_ILLEGAL_READ) {
- log("Illegal word read: %08x at %08x\n", address, armMode ?
- armNextPC - 4 : armNextPC - 2);
- }
-#endif
- 
- // if(ioMem[0x205] & 0x40) {
- if(armState) {
- value = CPUReadMemoryQuick(reg[15].I);
- } else {
- value = CPUReadHalfWordQuick(reg[15].I) |
- CPUReadHalfWordQuick(reg[15].I) << 16;
- }
- // } else {
- // value = *((u32 *)&bios[address & 0x3ffc]);
- // }
- // return 0xFFFFFFFF;
- }
-
- if(address & 3) {
-#ifdef C_CORE
- int shift = (address & 3) << 3;
- value = (value >> shift) | (value << (32 - shift));
-#else 
-#ifdef __GNUC__
- asm("and $3, %%ecx;"
- "shl $3 ,%%ecx;"
- "ror %%cl, %0"
- : "=r" (value)
- : "r" (value), "c" (address));
-#else
- __asm {
- mov ecx, address;
- and ecx, 3;
- shl ecx, 3;
- ror [dword ptr value], cl;
- }
-#endif
-#endif
- }
- return value;
-}
-
-extern u32 myROM[];
-
-static inline u32 CPUReadHalfWord(u32 address)
-{
-#ifdef DEV_VERSION 
- if(address & 1) {
- if(systemVerbose & VERBOSE_UNALIGNED_MEMORY) {
- log("Unaligned halfword read: %08x at %08x\n", address, armMode ?
- armNextPC - 4 : armNextPC - 2);
- }
- }
-#endif
- 
- u32 value;
- 
- switch(address >> 24) {
- case 0:
- if (reg[15].I >> 24) {
- if(address < 0x4000) {
-#ifdef DEV_VERSION
- if(systemVerbose & VERBOSE_ILLEGAL_READ) {
- log("Illegal halfword read: %08x at %08x\n", address, armMode ?
- armNextPC - 4 : armNextPC - 2);
- }
-#endif
- value = READ16LE(((u16 *)&biosProtected[address&2]));
- } else goto unreadable;
- } else
- value = READ16LE(((u16 *)&bios[address & 0x3FFE]));
- break;
- case 2:
- value = READ16LE(((u16 *)&workRAM[address & 0x3FFFE]));
- break;
- case 3:
- value = READ16LE(((u16 *)&internalRAM[address & 0x7ffe]));
- break;
- case 4:
- if((address < 0x4000400) && ioReadable[address & 0x3fe])
- value = READ16LE(((u16 *)&ioMem[address & 0x3fe]));
- else goto unreadable;
- break;
- case 5:
- value = READ16LE(((u16 *)&paletteRAM[address & 0x3fe]));
- break;
- case 6:
- value = READ16LE(((u16 *)&vram[address & 0x1fffe]));
- break;
- case 7:
- value = READ16LE(((u16 *)&oam[address & 0x3fe]));
- break;
- case 8:
- case 9:
- case 10:
- case 11:
- case 12:
- //if(address == 0x80000c4 || address == 0x80000c6 || address == 0x80000c8)
- // value = rtcRead(address);
- //else
-	 if((address & 0x1FFFFFE) > loadedsize)
-		 value = 0xFFFF;
-	 else
-		 value = READ16LE(((u16 *)&rom[address & 0x1FFFFFE]));
- break; 
- case 13:
-// if(cpuEEPROMEnabled)
- // no need to swap this
-// return eepromRead(address);
- goto unreadable;
- // case 14:
- // if(cpuFlashEnabled | cpuSramEnabled)
- // no need to swap this
- //return flashRead(address);
- // default
- default:
- unreadable:
-#ifdef DEV_VERSION
- if(systemVerbose & VERBOSE_ILLEGAL_READ) {
- log("Illegal halfword read: %08x at %08x\n", address, armMode ?
- armNextPC - 4 : armNextPC - 2);
- }
-#endif
- extern bool cpuDmaHack;
- extern u32 cpuDmaLast;
- extern int cpuDmaCount;
- if(cpuDmaHack && cpuDmaCount) {
- value = (u16)cpuDmaLast;
- } else {
- if(armState) {
- value = CPUReadHalfWordQuick(reg[15].I + (address & 2));
- } else {
- value = CPUReadHalfWordQuick(reg[15].I);
- }
- }
- // return value;
- // if(address & 1)
- // value = (value >> 8) | ((value & 0xFF) << 24);
- // return 0xFFFF;
- break;
- }
-
- if(address & 1) {
- value = (value >> 8) | (value << 24);
- }
- 
- return value;
-}
-
-static inline u16 CPUReadHalfWordSigned(u32 address)
-{
- u16 value = CPUReadHalfWord(address);
- if((address & 1))
- value = (s8)value;
- return value;
-}
-
-static inline u8 CPUReadByte(u32 address)
-{
- switch(address >> 24) {
- case 0:
- if (reg[15].I >> 24) {
- if(address < 0x4000) {
-#ifdef DEV_VERSION
- if(systemVerbose & VERBOSE_ILLEGAL_READ) {
- log("Illegal byte read: %08x at %08x\n", address, armMode ?
- armNextPC - 4 : armNextPC - 2);
- }
-#endif
- return biosProtected[address & 3];
- } else goto unreadable;
- }
- return bios[address & 0x3FFF];
- case 2:
- return workRAM[address & 0x3FFFF];
- case 3:
- return internalRAM[address & 0x7fff];
- case 4:
- if((address < 0x4000400) && ioReadable[address & 0x3ff])
- return ioMem[address & 0x3ff];
- else goto unreadable;
- case 5:
- return paletteRAM[address & 0x3ff];
- case 6:
- return vram[address & 0x1ffff];
- case 7:
- return oam[address & 0x3ff];
- case 8:
- case 9:
- case 10:
- case 11:
- case 12:
- if((address & 0x1FFFFFF) > loadedsize)
-		 return 0xFF;
-	 else
- return rom[address & 0x1FFFFFF]; 
- case 13:
-// if(cpuEEPROMEnabled)
-// return eepromRead(address);
- goto unreadable;
- case 14:
- // if(cpuSramEnabled | cpuFlashEnabled)
- // return flashRead(address);
- /* if(cpuEEPROMSensorEnabled) {
- switch(address & 0x00008f00) {
- case 0x8200:
- return systemGetSensorX() & 255;
- case 0x8300:
- return (systemGetSensorX() >> 8)|0x80;
- case 0x8400:
- return systemGetSensorY() & 255;
- case 0x8500:
- return systemGetSensorY() >> 8;
- }
- }*/
- // default
- default:
- unreadable:
-#ifdef DEV_VERSION
- if(systemVerbose & VERBOSE_ILLEGAL_READ) {
- log("Illegal byte read: %08x at %08x\n", address, armMode ?
- armNextPC - 4 : armNextPC - 2);
- }
-#endif
- 
- if(armState) {
- return CPUReadByteQuick(reg[15].I+(address & 3));
- } else {
- return CPUReadByteQuick(reg[15].I+(address & 1));
- }
- // return 0xFF;
- break;
- }
-}
-
-static inline void CPUWriteMemory(u32 address, u32 value)
-{
-#ifdef DEV_VERSION
- if(address & 3) {
- if(systemVerbose & VERBOSE_UNALIGNED_MEMORY) {
- log("Unaliagned word write: %08x to %08x from %08x\n",
- value,
- address,
- armMode ? armNextPC - 4 : armNextPC - 2);
- }
- }
-#endif
- 
- switch(address >> 24) {
- case 0x02:
-#ifdef SDL
- if(*((u32 *)&freezeWorkRAM[address & 0x3FFFC]))
- cheatsWriteMemory((u32 *)&workRAM[address & 0x3FFFC],
- value,
- *((u32 *)&freezeWorkRAM[address & 0x3FFFC]));
- else
-#endif
- WRITE32LE(((u32 *)&workRAM[address & 0x3FFFC]), value);
- break;
- case 0x03:
-#ifdef SDL
- if(*((u32 *)&freezeInternalRAM[address & 0x7ffc]))
- cheatsWriteMemory((u32 *)&internalRAM[address & 0x7FFC],
- value,
- *((u32 *)&freezeInternalRAM[address & 0x7ffc]));
- else
-#endif
- WRITE32LE(((u32 *)&internalRAM[address & 0x7ffC]), value);
- break;
- case 0x04:
- CPUUpdateRegister((address & 0x3FC), value & 0xFFFF);
- CPUUpdateRegister((address & 0x3FC) + 2, (value >> 16));
- break;
- case 0x05:
- WRITE32LE(((u32 *)&paletteRAM[address & 0x3FC]), value);
- break;
- case 0x06:
- if(address & 0x10000)
- WRITE32LE(((u32 *)&vram[address & 0x17ffc]), value);
- else
- WRITE32LE(((u32 *)&vram[address & 0x1fffc]), value);
- break;
- case 0x07:
- WRITE32LE(((u32 *)&oam[address & 0x3fc]), value);
- break;
- case 0x0D:
-// if(cpuEEPROMEnabled) {
-// eepromWrite(address, value);
-// break;
-// }
- goto unwritable;
- //case 0x0E:
- //if(!eepromInUse | cpuSramEnabled | cpuFlashEnabled) {
- // (*cpuSaveGameFunc)(address, (u8)value);
- // break;
- // }
- // default
- default:
- unwritable:
-#ifdef DEV_VERSION
- if(systemVerbose & VERBOSE_ILLEGAL_WRITE) {
- log("Illegal word write: %08x to %08x from %08x\n",
- value,
- address,
- armMode ? armNextPC - 4 : armNextPC - 2);
- }
-#endif
- break;
- }
-}
-
-#endif //VBA_GBAinline_H

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/Globals.h Deleted

@@ -1,149 +0,0 @@
-// -*- C++ -*-
-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
-// Copyright (C) 1999-2003 Forgotten
-// Copyright (C) 2004 Forgotten and the VBA 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; either version 2, 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.
-
-#ifndef VBA_GLOBALS_H
-#define VBA_GLOBALS_H
-
-#define VERBOSE_SWI                  1
-#define VERBOSE_UNALIGNED_MEMORY     2
-#define VERBOSE_ILLEGAL_WRITE        4
-#define VERBOSE_ILLEGAL_READ         8
-#define VERBOSE_DMA0                16
-#define VERBOSE_DMA1                32
-#define VERBOSE_DMA2                64
-#define VERBOSE_DMA3               128
-#define VERBOSE_UNDEFINED          256
-#define VERBOSE_AGBPRINT           512
-
-extern reg_pair reg[45];
-extern bool ioReadable[0x400];
-extern bool N_FLAG;
-extern bool C_FLAG;
-extern bool Z_FLAG;
-extern bool V_FLAG;
-extern bool armState;
-extern bool armIrqEnable;
-extern u32 armNextPC;
-extern int armMode;
-extern u32 stop;
-extern int saveType;
-extern bool useBios;
-extern bool skipBios;
-extern int frameSkip;
-extern bool speedup;
-extern bool synchronize;
-extern bool cpuDisableSfx;
-extern bool cpuIsMultiBoot;
-extern bool parseDebug;
-extern int layerSettings;
-extern int layerEnable;
-extern bool speedHack;
-extern int cpuSaveType;
-extern bool cpuEnhancedDetection;
-extern bool cheatsEnabled;
-
-extern u8 *bios;
-extern u8 *rom;
-extern u8 *internalRAM;
-extern u8 *workRAM;
-extern u8 *paletteRAM;
-extern u8 *vram;
-//extern u8 *pix;
-extern u8 *oam;
-extern u8 *ioMem;
-
-extern u16 DISPCNT;
-extern u16 DISPSTAT;
-extern u16 VCOUNT;
-extern u16 BG0CNT;
-extern u16 BG1CNT;
-extern u16 BG2CNT;
-extern u16 BG3CNT;
-extern u16 BG0HOFS;
-extern u16 BG0VOFS;
-extern u16 BG1HOFS;
-extern u16 BG1VOFS;
-extern u16 BG2HOFS;
-extern u16 BG2VOFS;
-extern u16 BG3HOFS;
-extern u16 BG3VOFS;
-extern u16 BG2PA;
-extern u16 BG2PB;
-extern u16 BG2PC;
-extern u16 BG2PD;
-extern u16 BG2X_L;
-extern u16 BG2X_H;
-extern u16 BG2Y_L;
-extern u16 BG2Y_H;
-extern u16 BG3PA;
-extern u16 BG3PB;
-extern u16 BG3PC;
-extern u16 BG3PD;
-extern u16 BG3X_L;
-extern u16 BG3X_H;
-extern u16 BG3Y_L;
-extern u16 BG3Y_H;
-extern u16 WIN0H;
-extern u16 WIN1H;
-extern u16 WIN0V;
-extern u16 WIN1V;
-extern u16 WININ;
-extern u16 WINOUT;
-extern u16 MOSAIC;
-extern u16 BLDMOD;
-extern u16 COLEV;
-extern u16 COLY;
-extern u16 DM0SAD_L;
-extern u16 DM0SAD_H;
-extern u16 DM0DAD_L;
-extern u16 DM0DAD_H;
-extern u16 DM0CNT_L;
-extern u16 DM0CNT_H;
-extern u16 DM1SAD_L;
-extern u16 DM1SAD_H;
-extern u16 DM1DAD_L;
-extern u16 DM1DAD_H;
-extern u16 DM1CNT_L;
-extern u16 DM1CNT_H;
-extern u16 DM2SAD_L;
-extern u16 DM2SAD_H;
-extern u16 DM2DAD_L;
-extern u16 DM2DAD_H;
-extern u16 DM2CNT_L;
-extern u16 DM2CNT_H;
-extern u16 DM3SAD_L;
-extern u16 DM3SAD_H;
-extern u16 DM3DAD_L;
-extern u16 DM3DAD_H;
-extern u16 DM3CNT_L;
-extern u16 DM3CNT_H;
-extern u16 TM0D;
-extern u16 TM0CNT;
-extern u16 TM1D;
-extern u16 TM1CNT;
-extern u16 TM2D;
-extern u16 TM2CNT;
-extern u16 TM3D;
-extern u16 TM3CNT;
-extern u16 P1;
-extern u16 IE;
-extern u16 IF;
-extern u16 IME;
-
-#endif // VBA_GLOBALS_H

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/NLS.h Deleted

@@ -1,62 +0,0 @@
-// -*- C++ -*-
-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
-// Copyright (C) 1999-2003 Forgotten
-// Copyright (C) 2004 Forgotten and the VBA 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; either version 2, 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.
-
-#define N_(String) (String)
-
-#define MSG_UNSUPPORTED_VBA_SGM             1
-#define MSG_CANNOT_LOAD_SGM                 2
-#define MSG_SAVE_GAME_NOT_USING_BIOS        3
-#define MSG_SAVE_GAME_USING_BIOS            4
-#define MSG_UNSUPPORTED_SAVE_TYPE           5
-#define MSG_CANNOT_OPEN_FILE                6
-#define MSG_BAD_ZIP_FILE                    7
-#define MSG_NO_IMAGE_ON_ZIP                 8
-#define MSG_ERROR_OPENING_IMAGE             9
-#define MSG_ERROR_READING_IMAGE            10
-#define MSG_UNSUPPORTED_BIOS_FUNCTION      11
-#define MSG_INVALID_BIOS_FILE_SIZE         12
-#define MSG_INVALID_CHEAT_CODE             13
-#define MSG_UNKNOWN_ARM_OPCODE             14
-#define MSG_UNKNOWN_THUMB_OPCODE           15
-#define MSG_ERROR_CREATING_FILE            16
-#define MSG_FAILED_TO_READ_SGM             17
-#define MSG_FAILED_TO_READ_RTC             18
-#define MSG_UNSUPPORTED_VB_SGM             19
-#define MSG_CANNOT_LOAD_SGM_FOR            20
-#define MSG_ERROR_OPENING_IMAGE_FROM       21
-#define MSG_ERROR_READING_IMAGE_FROM       22
-#define MSG_UNSUPPORTED_ROM_SIZE           23
-#define MSG_UNSUPPORTED_RAM_SIZE           24
-#define MSG_UNKNOWN_CARTRIDGE_TYPE         25
-#define MSG_MAXIMUM_NUMBER_OF_CHEATS       26
-#define MSG_INVALID_GAMESHARK_CODE         27
-#define MSG_INVALID_GAMEGENIE_CODE         28
-#define MSG_INVALID_CHEAT_TO_REMOVE        29
-#define MSG_INVALID_CHEAT_CODE_ADDRESS     30
-#define MSG_UNSUPPORTED_CHEAT_LIST_VERSION 31
-#define MSG_UNSUPPORTED_CHEAT_LIST_TYPE    32
-#define MSG_INVALID_GSA_CODE               33
-#define MSG_CANNOT_IMPORT_SNAPSHOT_FOR     34
-#define MSG_UNSUPPORTED_SNAPSHOT_FILE      35
-#define MSG_UNSUPPORTED_ARM_MODE           36
-#define MSG_UNSUPPORTED_CODE_FILE          37
-#define MSG_GBA_CODE_WARNING               38
-#define MSG_INVALID_CBA_CODE               39
-#define MSG_CBA_CODE_WARNING               40
-#define MSG_OUT_OF_MEMORY                  41

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/Port.h Deleted

@@ -1,75 +0,0 @@
-// -*- C++ -*-
-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
-// Copyright (C) 1999-2003 Forgotten
-// Copyright (C) 2004 Forgotten and the VBA 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; either version 2, 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.
-
-#ifndef VBA_PORT_H
-#define VBA_PORT_H
-
-// swaps a 16-bit value
-static inline u16 swap16(u16 v)
-{
- return (v<<8)|(v>>8);
-}
-
-// swaps a 32-bit value
-static inline u32 swap32(u32 v)
-{
- return (v<<24)|((v<<8)&0xff0000)|((v>>8)&0xff00)|(v>>24);
-}
-
-#ifdef WORDS_BIGENDIAN
-#if defined(__GNUC__) && defined(__ppc__)
-
-#define READ16LE(base) \
- ({ unsigned short lhbrxResult; \
- __asm__ ("lhbrx %0, 0, %1" : "=r" (lhbrxResult) : "r" (base) : "memory"); \
- lhbrxResult; })
-
-#define READ32LE(base) \
- ({ unsigned long lwbrxResult; \
- __asm__ ("lwbrx %0, 0, %1" : "=r" (lwbrxResult) : "r" (base) : "memory"); \
- lwbrxResult; })
-
-#define WRITE16LE(base, value) \
- __asm__ ("sthbrx %0, 0, %1" : : "r" (value), "r" (base) : "memory")
- 
-#define WRITE32LE(base, value) \
- __asm__ ("stwbrx %0, 0, %1" : : "r" (value), "r" (base) : "memory")
- 
-#else
-#define READ16LE(x) \
- swap16(*((u16 *)(x)))
-#define READ32LE(x) \
- swap32(*((u32 *)(x)))
-#define WRITE16LE(x,v) \
- *((u16 *)x) = swap16((v))
-#define WRITE32LE(x,v) \
- *((u32 *)x) = swap32((v))
-#endif
-#else
-#define READ16LE(x) \
- *((u16 *)x)
-#define READ32LE(x) \
- *((u32 *)x)
-#define WRITE16LE(x,v) \
- *((u16 *)x) = (v)
-#define WRITE32LE(x,v) \
- *((u32 *)x) = (v)
-#endif
-
-#endif

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/Sound.h Deleted

@@ -1,88 +0,0 @@
-// -*- C++ -*-
-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
-// Copyright (C) 1999-2003 Forgotten
-// Copyright (C) 2004 Forgotten and the VBA 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; either version 2, 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.
-
-#ifndef VBA_SOUND_H
-#define VBA_SOUND_H
-
-#define NR10 0x60
-#define NR11 0x62
-#define NR12 0x63
-#define NR13 0x64
-#define NR14 0x65
-#define NR21 0x68
-#define NR22 0x69
-#define NR23 0x6c
-#define NR24 0x6d
-#define NR30 0x70
-#define NR31 0x72
-#define NR32 0x73
-#define NR33 0x74
-#define NR34 0x75
-#define NR41 0x78
-#define NR42 0x79
-#define NR43 0x7c
-#define NR44 0x7d
-#define NR50 0x80
-#define NR51 0x81
-#define NR52 0x84
-#define SGCNT0_H 0x82
-#define FIFOA_L 0xa0
-#define FIFOA_H 0xa2
-#define FIFOB_L 0xa4
-#define FIFOB_H 0xa6
-
-extern void soundTick();
-extern void soundShutdown();
-extern bool soundInit();
-extern void soundPause();
-extern void soundResume();
-extern void soundEnable(int);
-extern void soundDisable(int);
-extern int  soundGetEnable();
-extern void soundReset();
-extern void soundSaveGame(gzFile);
-extern void soundReadGame(gzFile, int);
-extern void soundEvent(u32, u8);
-extern void soundEvent(u32, u16);
-extern void soundTimerOverflow(int);
-extern void soundSetQuality(int);
-
-
-//extern int SOUND_TICKS;
-extern "C"
-{
-extern int SOUND_CLOCK_TICKS;
-extern int soundTicks;
-extern int soundPaused;
-extern bool soundOffFlag;
-extern int soundQuality;
-extern int soundInterpolation;
-extern int soundBufferLen;
-extern int soundBufferTotalLen;
-extern u32 soundNextPosition;
-extern u16 soundFinalWave[2304];
-extern int soundVolume;
-
-extern char soundEcho;
-extern char soundLowPass;
-extern char soundReverse;
-
-}
-
-#endif // VBA_SOUND_H

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/System.h Deleted

@@ -1,126 +0,0 @@
-// -*- C++ -*-
-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
-// Copyright (C) 1999-2003 Forgotten
-// Copyright (C) 2004 Forgotten and the VBA 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; either version 2, 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.
-
-#ifndef VBA_SYSTEM_H
-#define VBA_SYSTEM_H
-
-#include "unzip.h"
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-
-#ifdef _MSC_VER
-typedef unsigned __int64 u64;
-#else
-typedef unsigned long long u64;
-#endif
-
-typedef signed char s8;
-typedef signed short s16;
-typedef signed int s32;
-
-#ifdef _MSC_VER
-typedef signed __int64 s64;
-#else
-typedef signed long long s64;
-#endif
-
-struct EmulatedSystem {
-  // main emulation function
-  void (*emuMain)(int);
-  // reset emulator
-  void (*emuReset)();
-  // clean up memory
-  void (*emuCleanUp)();
-  // load battery file
-  //bool (*emuReadBattery)(const char *);
-  // write battery file
-  //bool (*emuWriteBattery)(const char *);
-  // load state
-  //bool (*emuReadState)(const char *);  
-  // save state
-  //bool (*emuWriteState)(const char *);
-  // load memory state (rewind)
-  //bool (*emuReadMemState)(char *, int);
-  // write memory state (rewind)
-  //bool (*emuWriteMemState)(char *, int);
-  // write PNG file
-  //bool (*emuWritePNG)(const char *);
-  // write BMP file
-  //bool (*emuWriteBMP)(const char *);
-  // emulator update CPSR (ARM only)
-  void (*emuUpdateCPSR)();
-  // emulator has debugger
-  //bool emuHasDebugger;
-  // clock ticks to emulate
-  int emuCount;
-};
-
-//extern void log(const char *,...);
-
-//extern bool systemPauseOnFrame();
-//extern void systemGbPrint(u8 *,int,int,int,int);
-//extern void systemScreenCapture(int);
-//extern void systemDrawScreen();
-// updates the joystick data
-//extern bool systemReadJoypads();
-// return information about the given joystick, -1 for default joystick
-//extern u32 systemReadJoypad(int);
-//extern u32 systemGetClock();
-//extern void systemMessage(int, const char *, ...);
-//extern void systemSetTitle(const char *);
-extern void systemWriteDataToSoundBuffer();
-extern void systemSoundShutdown();
-extern void systemSoundPause();
-extern void systemSoundResume();
-extern void systemSoundReset();
-extern bool systemSoundInit();
-extern void systemScreenMessage(const char *);
-//extern void systemUpdateMotionSensor();
-//extern int  systemGetSensorX();
-//extern int  systemGetSensorY();
-extern bool systemCanChangeSoundQuality();
-//extern void systemShowSpeed(int);
-//extern void system10Frames(int);
-//extern void systemFrame();
-//extern void systemGbBorderOn();
-
-extern bool systemSoundOn;
-
-//extern u16 systemColorMap16[0x10000];
-//extern u32 systemColorMap32[0x10000];
-//extern u16 systemGbPalette[24];
-//extern int systemRedShift;
-//extern int systemGreenShift;
-//extern int systemBlueShift;
-//extern int systemColorDepth;
-//extern int systemDebug;
-//extern int systemVerbose;
-//extern int systemFrameSkip;
-//extern int systemSaveUpdateCounter;
-
-#define SYSTEM_SAVE_UPDATED 30
-#define SYSTEM_SAVE_NOT_UPDATED 0
-
-#endif //VBA_SYSTEM_H

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/Util.h Deleted

@@ -1,66 +0,0 @@
-// -*- C++ -*-
-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
-// Copyright (C) 1999-2003 Forgotten
-// Copyright (C) 2004 Forgotten and the VBA 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; either version 2, 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.
-
-#ifndef VBA_UTIL_H
-#define VBA_UTIL_H
-enum IMAGE_TYPE {
-  IMAGE_UNKNOWN = -1,
-  IMAGE_GBA     = 0,
-  IMAGE_GB      = 1
-};
-
-// save game
-
-typedef struct {
-  void *address;
-  int size;
-} variable_desc;
-
-
-//extern bool utilWritePNGFile(const char *, int, int, u8 *);
-//extern bool utilWriteBMPFile(const char *, int, int, u8 *);
-//extern void utilApplyIPS(const char *ips, u8 **rom, int *size);
-//extern void utilWriteBMP(char *, int, int, u8 *);
-extern bool utilIsGBAImage(const char *);
-//extern bool utilIsGBImage(const char *);
-//extern bool utilIsZipFile(const char *);
-//extern bool utilIsGzipFile(const char *);
-//extern bool utilIsRarFile(const char *);
-extern void utilGetBaseName(const char *, char *);
-extern void utilGetBasePath(const char *file, char *buffer);
-extern IMAGE_TYPE utilFindType(const char *);
-extern u8 *utilLoad(const char *,
-                    bool (*)(const char*),
-                    u8 *,
-                    int &);
-
-extern void utilPutDword(u8 *, u32);
-extern void utilPutWord(u8 *, u16);
-extern void utilWriteData(gzFile, variable_desc *);
-extern void utilReadData(gzFile, variable_desc *);
-extern int utilReadInt(gzFile);
-extern void utilWriteInt(gzFile, int);
-extern gzFile utilGzOpen(const char *file, const char *mode);
-extern gzFile utilMemGzOpen(char *memory, int available, char *mode);
-extern int utilGzWrite(gzFile file, const voidp buffer, unsigned int len);
-extern int utilGzRead(gzFile file, voidp buffer, unsigned int len);
-extern int utilGzClose(gzFile file);
-extern long utilGzMemTell(gzFile file);
-extern void utilGBAFindSave(const u8 *, const int);
-#endif

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/arm-new.h Deleted

@@ -1,7164 +0,0 @@
-// -*- C++ -*-
-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
-// Copyright (C) 1999-2003 Forgotten
-// Copyright (C) 2004 Forgotten and the VBA 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; either version 2, 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.
-
-#ifdef BKPT_SUPPORT
-#define CONSOLE_OUTPUT(a,b) \
- extern void (*dbgOutput)(char *, u32);\
- if((opcode == 0xe0000000) && (reg[0].I == 0xC0DED00D)) {\
- dbgOutput((a), (b));\
- }
-#else
-#define CONSOLE_OUTPUT(a,b)
-#endif
-
-#define OP_AND \
- reg[dest].I = reg[(opcode>>16)&15].I & value;\
- CONSOLE_OUTPUT(NULL,reg[2].I);
-
-#define OP_ANDS \
- reg[dest].I = reg[(opcode>>16)&15].I & value;\
- \
- N_FLAG = (reg[dest].I & 0x80000000) ? true : false;\
- Z_FLAG = (reg[dest].I) ? false : true;\
- C_FLAG = C_OUT;
-
-#define OP_EOR \
- reg[dest].I = reg[(opcode>>16)&15].I ^ value;
-
-#define OP_EORS \
- reg[dest].I = reg[(opcode>>16)&15].I ^ value;\
- \
- N_FLAG = (reg[dest].I & 0x80000000) ? true : false;\
- Z_FLAG = (reg[dest].I) ? false : true;\
- C_FLAG = C_OUT;
-#ifdef C_CORE
-#define NEG(i) ((i) >> 31)
-#define POS(i) ((~(i)) >> 31)
-#define ADDCARRY(a, b, c) \
- C_FLAG = ((NEG(a) & NEG(b)) |\
- (NEG(a) & POS(c)) |\
- (NEG(b) & POS(c))) ? true : false;
-#define ADDOVERFLOW(a, b, c) \
- V_FLAG = ((NEG(a) & NEG(b) & POS(c)) |\
- (POS(a) & POS(b) & NEG(c))) ? true : false;
-#define SUBCARRY(a, b, c) \
- C_FLAG = ((NEG(a) & POS(b)) |\
- (NEG(a) & POS(c)) |\
- (POS(b) & POS(c))) ? true : false;
-#define SUBOVERFLOW(a, b, c)\
- V_FLAG = ((NEG(a) & POS(b) & POS(c)) |\
- (POS(a) & NEG(b) & NEG(c))) ? true : false;
-#define OP_SUB \
- {\
- reg[dest].I = reg[base].I - value;\
- }
-#define OP_SUBS \
- {\
- u32 lhs = reg[base].I;\
- u32 rhs = value;\
- u32 res = lhs - rhs;\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- SUBCARRY(lhs, rhs, res);\
- SUBOVERFLOW(lhs, rhs, res);\
- }
-#define OP_RSB \
- {\
- reg[dest].I = value - reg[base].I;\
- }
-#define OP_RSBS \
- {\
- u32 lhs = reg[base].I;\
- u32 rhs = value;\
- u32 res = rhs - lhs;\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- SUBCARRY(rhs, lhs, res);\
- SUBOVERFLOW(rhs, lhs, res);\
- }
-#define OP_ADD \
- {\
- reg[dest].I = reg[base].I + value;\
- }
-#define OP_ADDS \
- {\
- u32 lhs = reg[base].I;\
- u32 rhs = value;\
- u32 res = lhs + rhs;\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- ADDCARRY(lhs, rhs, res);\
- ADDOVERFLOW(lhs, rhs, res);\
- }
-#define OP_ADC \
- {\
- reg[dest].I = reg[base].I + value + (u32)C_FLAG;\
- }
-#define OP_ADCS \
- {\
- u32 lhs = reg[base].I;\
- u32 rhs = value;\
- u32 res = lhs + rhs + (u32)C_FLAG;\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- ADDCARRY(lhs, rhs, res);\
- ADDOVERFLOW(lhs, rhs, res);\
- }
-#define OP_SBC \
- {\
- reg[dest].I = reg[base].I - value - !((u32)C_FLAG);\
- }
-#define OP_SBCS \
- {\
- u32 lhs = reg[base].I;\
- u32 rhs = value;\
- u32 res = lhs - rhs - !((u32)C_FLAG);\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- SUBCARRY(lhs, rhs, res);\
- SUBOVERFLOW(lhs, rhs, res);\
- }
-#define OP_RSC \
- {\
- reg[dest].I = value - reg[base].I - !((u32)C_FLAG);\
- }
-#define OP_RSCS \
- {\
- u32 lhs = reg[base].I;\
- u32 rhs = value;\
- u32 res = rhs - lhs - !((u32)C_FLAG);\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- SUBCARRY(rhs, lhs, res);\
- SUBOVERFLOW(rhs, lhs, res);\
- }
-#define OP_CMP \
- {\
- u32 lhs = reg[base].I;\
- u32 rhs = value;\
- u32 res = lhs - rhs;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- SUBCARRY(lhs, rhs, res);\
- SUBOVERFLOW(lhs, rhs, res);\
- }
-#define OP_CMN \
- {\
- u32 lhs = reg[base].I;\
- u32 rhs = value;\
- u32 res = lhs + rhs;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- ADDCARRY(lhs, rhs, res);\
- ADDOVERFLOW(lhs, rhs, res);\
- }
-
-#define LOGICAL_LSL_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- C_OUT = (v >> (32 - shift)) & 1 ? true : false;\
- value = v << shift;\
- }
-#define LOGICAL_LSR_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- C_OUT = (v >> (shift - 1)) & 1 ? true : false;\
- value = v >> shift;\
- }
-#define LOGICAL_ASR_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- C_OUT = ((s32)v >> (int)(shift - 1)) & 1 ? true : false;\
- value = (s32)v >> (int)shift;\
- }
-#define LOGICAL_ROR_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- C_OUT = (v >> (shift - 1)) & 1 ? true : false;\
- value = ((v << (32 - shift)) |\
- (v >> shift));\
- }
-#define LOGICAL_RRX_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- shift = (int)C_FLAG;\
- C_OUT = (v & 1) ? true : false;\
- value = ((v >> 1) |\
- (shift << 31));\
- }
-#define LOGICAL_ROR_IMM \
- {\
- u32 v = opcode & 0xff;\
- C_OUT = (v >> (shift - 1)) & 1 ? true : false;\
- value = ((v << (32 - shift)) |\
- (v >> shift));\
- }
-#define ARITHMETIC_LSL_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- value = v << shift;\
- }
-#define ARITHMETIC_LSR_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- value = v >> shift;\
- }
-#define ARITHMETIC_ASR_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- value = (s32)v >> (int)shift;\
- }
-#define ARITHMETIC_ROR_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- value = ((v << (32 - shift)) |\
- (v >> shift));\
- }
-#define ARITHMETIC_RRX_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- shift = (int)C_FLAG;\
- value = ((v >> 1) |\
- (shift << 31));\
- }
-#define ARITHMETIC_ROR_IMM \
- {\
- u32 v = opcode & 0xff;\
- value = ((v << (32 - shift)) |\
- (v >> shift));\
- }
-#define ROR_IMM_MSR \
- {\
- u32 v = opcode & 0xff;\
- value = ((v << (32 - shift)) |\
- (v >> shift));\
- }
-#define ROR_VALUE \
- {\
- value = ((value << (32 - shift)) |\
- (value >> shift));\
- }
-#define RCR_VALUE \
- {\
- shift = (int)C_FLAG;\
- value = ((value >> 1) |\
- (shift << 31));\
- }
-#else
-#ifdef __GNUC__
- #ifdef __POWERPC__
- #define OP_SUB \
- {\
- reg[dest].I = reg[base].I - value;\
- }
- #define OP_SUBS \
- {\
- register int Flags; \
- register int Result; \
- asm volatile("subco. %0, %2, %3\n" \
- "mcrxr cr1\n" \
- "mfcr %1\n" \
- : "=r" (Result), \
- "=r" (Flags) \
- : "r" (reg[base].I), \
- "r" (value) \
- ); \
- reg[dest].I = Result; \
- Z_FLAG = (Flags >> 29) & 1; \
- N_FLAG = (Flags >> 31) & 1; \
- C_FLAG = (Flags >> 25) & 1; \
- V_FLAG = (Flags >> 26) & 1; \
- }
- #define OP_RSB \
- {\
- reg[dest].I = value - reg[base].I;\
- }
- #define OP_RSBS \
- {\
- register int Flags; \
- register int Result; \
- asm volatile("subfco. %0, %2, %3\n" \
- "mcrxr cr1\n" \
- "mfcr %1\n" \
- : "=r" (Result), \
- "=r" (Flags) \
- : "r" (reg[base].I), \
- "r" (value) \
- ); \
- reg[dest].I = Result; \
- Z_FLAG = (Flags >> 29) & 1; \
- N_FLAG = (Flags >> 31) & 1; \
- C_FLAG = (Flags >> 25) & 1; \
- V_FLAG = (Flags >> 26) & 1; \
- }
- #define OP_ADD \
- {\
- reg[dest].I = reg[base].I + value;\
- }
-
- #define OP_ADDS \
- {\
- register int Flags; \
- register int Result; \
- asm volatile("addco. %0, %2, %3\n" \
- "mcrxr cr1\n" \
- "mfcr %1\n" \
- : "=r" (Result), \
- "=r" (Flags) \
- : "r" (reg[base].I), \
- "r" (value) \
- ); \
- reg[dest].I = Result; \
- Z_FLAG = (Flags >> 29) & 1; \
- N_FLAG = (Flags >> 31) & 1; \
- C_FLAG = (Flags >> 25) & 1; \
- V_FLAG = (Flags >> 26) & 1; \
- }
- #define OP_ADC \
- {\
- reg[dest].I = reg[base].I + value + (u32)C_FLAG;\
- }
- #define OP_ADCS \
- {\
- register int Flags; \
- register int Result; \
- asm volatile("mtspr xer, %4\n" \
- "addeo. %0, %2, %3\n" \
- "mcrxr cr1\n" \
- "mfcr %1\n" \
- : "=r" (Result), \
- "=r" (Flags) \
- : "r" (reg[base].I), \
- "r" (value), \
- "r" (C_FLAG << 29) \
- ); \
- reg[dest].I = Result; \
- Z_FLAG = (Flags >> 29) & 1; \
- N_FLAG = (Flags >> 31) & 1; \
- C_FLAG = (Flags >> 25) & 1; \
- V_FLAG = (Flags >> 26) & 1; \
- }
- #define OP_SBC \
- {\
- reg[dest].I = reg[base].I - value - (C_FLAG^1);\
- }
- #define OP_SBCS \
- {\
- register int Flags; \
- register int Result; \
- asm volatile("mtspr xer, %4\n" \
- "subfeo. %0, %3, %2\n" \
- "mcrxr cr1\n" \
- "mfcr %1\n" \
- : "=r" (Result), \
- "=r" (Flags) \
- : "r" (reg[base].I), \
- "r" (value), \
- "r" (C_FLAG << 29) \
- ); \
- reg[dest].I = Result; \
- Z_FLAG = (Flags >> 29) & 1; \
- N_FLAG = (Flags >> 31) & 1; \
- C_FLAG = (Flags >> 25) & 1; \
- V_FLAG = (Flags >> 26) & 1; \
- }
- #define OP_RSC \
- {\
- reg[dest].I = value - reg[base].I - (C_FLAG^1);\
- }
- #define OP_RSCS \
- {\
- register int Flags; \
- register int Result; \
- asm volatile("mtspr xer, %4\n" \
- "subfeo. %0, %2, %3\n" \
- "mcrxr cr1\n" \
- "mfcr %1\n" \
- : "=r" (Result), \
- "=r" (Flags) \
- : "r" (reg[base].I), \
- "r" (value), \
- "r" (C_FLAG << 29) \
- ); \
- reg[dest].I = Result; \
- Z_FLAG = (Flags >> 29) & 1; \
- N_FLAG = (Flags >> 31) & 1; \
- C_FLAG = (Flags >> 25) & 1; \
- V_FLAG = (Flags >> 26) & 1; \
- }
- #define OP_CMP \
- {\
- register int Flags; \
- register int Result; \
- asm volatile("subco. %0, %2, %3\n" \
- "mcrxr cr1\n" \
- "mfcr %1\n" \
- : "=r" (Result), \
- "=r" (Flags) \
- : "r" (reg[base].I), \
- "r" (value) \
- ); \
- Z_FLAG = (Flags >> 29) & 1; \
- N_FLAG = (Flags >> 31) & 1; \
- C_FLAG = (Flags >> 25) & 1; \
- V_FLAG = (Flags >> 26) & 1; \
- }
- #define OP_CMN \
- {\
- register int Flags; \
- register int Result; \
- asm volatile("addco. %0, %2, %3\n" \
- "mcrxr cr1\n" \
- "mfcr %1\n" \
- : "=r" (Result), \
- "=r" (Flags) \
- : "r" (reg[base].I), \
- "r" (value) \
- ); \
- Z_FLAG = (Flags >> 29) & 1; \
- N_FLAG = (Flags >> 31) & 1; \
- C_FLAG = (Flags >> 25) & 1; \
- V_FLAG = (Flags >> 26) & 1; \
- }
- 
- #define LOGICAL_LSL_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- C_OUT = (v >> (32 - shift)) & 1 ? true : false;\
- value = v << shift;\
- }
- #define LOGICAL_LSR_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- C_OUT = (v >> (shift - 1)) & 1 ? true : false;\
- value = v >> shift;\
- }
- #define LOGICAL_ASR_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- C_OUT = ((s32)v >> (int)(shift - 1)) & 1 ? true : false;\
- value = (s32)v >> (int)shift;\
- }
- #define LOGICAL_ROR_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- C_OUT = (v >> (shift - 1)) & 1 ? true : false;\
- value = ((v << (32 - shift)) |\
- (v >> shift));\
- }
- #define LOGICAL_RRX_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- shift = (int)C_FLAG;\
- C_OUT = (v & 1) ? true : false;\
- value = ((v >> 1) |\
- (shift << 31));\
- }
- #define LOGICAL_ROR_IMM \
- {\
- u32 v = opcode & 0xff;\
- C_OUT = (v >> (shift - 1)) & 1 ? true : false;\
- value = ((v << (32 - shift)) |\
- (v >> shift));\
- }
- #define ARITHMETIC_LSL_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- value = v << shift;\
- }
- #define ARITHMETIC_LSR_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- value = v >> shift;\
- }
- #define ARITHMETIC_ASR_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- value = (s32)v >> (int)shift;\
- }
- #define ARITHMETIC_ROR_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- value = ((v << (32 - shift)) |\
- (v >> shift));\
- }
- #define ARITHMETIC_RRX_REG \
- {\
- u32 v = reg[opcode & 0x0f].I;\
- shift = (int)C_FLAG;\
- value = ((v >> 1) |\
- (shift << 31));\
- }
- #define ARITHMETIC_ROR_IMM \
- {\
- u32 v = opcode & 0xff;\
- value = ((v << (32 - shift)) |\
- (v >> shift));\
- }
- #define ROR_IMM_MSR \
- {\
- u32 v = opcode & 0xff;\
- value = ((v << (32 - shift)) |\
- (v >> shift));\
- }
- #define ROR_VALUE \
- {\
- value = ((value << (32 - shift)) |\
- (value >> shift));\
- }
- #define RCR_VALUE \
- {\
- shift = (int)C_FLAG;\
- value = ((value >> 1) |\
- (shift << 31));\
- }
-#else
-#define OP_SUB \
- asm ("sub %1, %%ebx;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[base].I));
-
-#define OP_SUBS \
- asm ("sub %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setncb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[base].I));
-
-#define OP_RSB \
- asm ("sub %1, %%ebx;"\
- : "=b" (reg[dest].I)\
- : "r" (reg[base].I), "b" (value));
-
-#define OP_RSBS \
- asm ("sub %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setncb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "r" (reg[base].I), "b" (value));
-
-#define OP_ADD \
- asm ("add %1, %%ebx;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[base].I));
-
-#define OP_ADDS \
- asm ("add %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setcb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[base].I));
-
-#define OP_ADC \
- asm ("bt $0, C_FLAG;"\
- "adc %1, %%ebx;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[base].I));
-
-#define OP_ADCS \
- asm ("bt $0, C_FLAG;"\
- "adc %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setcb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[base].I));
-
-#define OP_SBC \
- asm ("bt $0, C_FLAG;"\
- "cmc;"\
- "sbb %1, %%ebx;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[base].I));
-
-#define OP_SBCS \
- asm ("bt $0, C_FLAG;"\
- "cmc;"\
- "sbb %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setncb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[base].I));
-#define OP_RSC \
- asm ("bt $0, C_FLAG;"\
- "cmc;"\
- "sbb %1, %%ebx;"\
- : "=b" (reg[dest].I)\
- : "r" (reg[base].I), "b" (value));
-
-#define OP_RSCS \
- asm ("bt $0, C_FLAG;"\
- "cmc;"\
- "sbb %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setncb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "r" (reg[base].I), "b" (value));
-#define OP_CMP \
- asm ("sub %0, %1;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setncb C_FLAG;"\
- "setob V_FLAG;"\
- :\
- : "r" (value), "r" (reg[base].I));
-
-#define OP_CMN \
- asm ("add %0, %1;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setcb C_FLAG;"\
- "setob V_FLAG;"\
- : \
- : "r" (value), "r" (reg[base].I));
-#define LOGICAL_LSL_REG \
- asm("shl %%cl, %%eax;"\
- "setcb %%cl;"\
- : "=a" (value), "=c" (C_OUT)\
- : "a" (reg[opcode & 0x0f].I), "c" (shift));
-
-#define LOGICAL_LSR_REG \
- asm("shr %%cl, %%eax;"\
- "setcb %%cl;"\
- : "=a" (value), "=c" (C_OUT)\
- : "a" (reg[opcode & 0x0f].I), "c" (shift));
-
-#define LOGICAL_ASR_REG \
- asm("sar %%cl, %%eax;"\
- "setcb %%cl;"\
- : "=a" (value), "=c" (C_OUT)\
- : "a" (reg[opcode & 0x0f].I), "c" (shift));
-
-#define LOGICAL_ROR_REG \
- asm("ror %%cl, %%eax;"\
- "setcb %%cl;"\
- : "=a" (value), "=c" (C_OUT)\
- : "a" (reg[opcode & 0x0f].I), "c" (shift)); 
-
-#define LOGICAL_RRX_REG \
- asm("bt $0, C_FLAG;"\
- "rcr $1, %%eax;"\
- "setcb %%cl;"\
- : "=a" (value), "=c" (C_OUT)\
- : "a" (reg[opcode & 0x0f].I)); 
-
-#define LOGICAL_ROR_IMM \
- asm("ror %%cl, %%eax;"\
- "setcb %%cl;"\
- : "=a" (value), "=c" (C_OUT)\
- : "a" (opcode & 0xff), "c" (shift));
-#define ARITHMETIC_LSL_REG \
- asm("\
- shl %%cl, %%eax;"\
- : "=a" (value)\
- : "a" (reg[opcode & 0x0f].I), "c" (shift));
-
-#define ARITHMETIC_LSR_REG \
- asm("\
- shr %%cl, %%eax;"\
- : "=a" (value)\
- : "a" (reg[opcode & 0x0f].I), "c" (shift));
-
-#define ARITHMETIC_ASR_REG \
- asm("\
- sar %%cl, %%eax;"\
- : "=a" (value)\
- : "a" (reg[opcode & 0x0f].I), "c" (shift));
-
-#define ARITHMETIC_ROR_REG \
- asm("\
- ror %%cl, %%eax;"\
- : "=a" (value)\
- : "a" (reg[opcode & 0x0f].I), "c" (shift)); 
-
-#define ARITHMETIC_RRX_REG \
- asm("\
- bt $0, C_FLAG;\
- rcr $1, %%eax;"\
- : "=a" (value)\
- : "a" (reg[opcode & 0x0f].I)); 
-
-#define ARITHMETIC_ROR_IMM \
- asm("\
- ror %%cl, %%eax;"\
- : "=a" (value)\
- : "a" (opcode & 0xff), "c" (shift));
-#define ROR_IMM_MSR \
- asm ("ror %%cl, %%eax;"\
- : "=a" (value)\
- : "a" (opcode & 0xFF), "c" (shift));
-#define ROR_VALUE \
- asm("ror %%cl, %0"\
- : "=r" (value)\
- : "r" (value), "c" (shift));
-#define RCR_VALUE \
- asm("bt $0, C_FLAG;"\
- "rcr $1, %0"\
- : "=r" (value)\
- : "r" (value));
-#endif
-#else
-#define OP_SUB \
- {\
- __asm mov ebx, base\
- __asm mov ebx, dword ptr [OFFSET reg+4*ebx]\
- __asm sub ebx, value\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg+4*eax], ebx\
- }
-
-#define OP_SUBS \
- {\
- __asm mov ebx, base\
- __asm mov ebx, dword ptr [OFFSET reg+4*ebx]\
- __asm sub ebx, value\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg+4*eax], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setnc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-
-#define OP_RSB \
- {\
- __asm mov ebx, base\
- __asm mov ebx, dword ptr [OFFSET reg+4*ebx]\
- __asm mov eax, value\
- __asm sub eax, ebx\
- __asm mov ebx, dest\
- __asm mov dword ptr [OFFSET reg+4*ebx], eax\
- }
-
-#define OP_RSBS \
- {\
- __asm mov ebx, base\
- __asm mov ebx, dword ptr [OFFSET reg+4*ebx]\
- __asm mov eax, value\
- __asm sub eax, ebx\
- __asm mov ebx, dest\
- __asm mov dword ptr [OFFSET reg+4*ebx], eax\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setnc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-
-#define OP_ADD \
- {\
- __asm mov ebx, base\
- __asm mov ebx, dword ptr [OFFSET reg+4*ebx]\
- __asm add ebx, value\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg+4*eax], ebx\
- }
-
-#define OP_ADDS \
- {\
- __asm mov ebx, base\
- __asm mov ebx, dword ptr [OFFSET reg+4*ebx]\
- __asm add ebx, value\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg+4*eax], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-
-#define OP_ADC \
- {\
- __asm mov ebx, base\
- __asm mov ebx, dword ptr [OFFSET reg+4*ebx]\
- __asm bt word ptr C_FLAG, 0\
- __asm adc ebx, value\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg+4*eax], ebx\
- }
-
-#define OP_ADCS \
- {\
- __asm mov ebx, base\
- __asm mov ebx, dword ptr [OFFSET reg+4*ebx]\
- __asm bt word ptr C_FLAG, 0\
- __asm adc ebx, value\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg+4*eax], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-
-#define OP_SBC \
- {\
- __asm mov ebx, base\
- __asm mov ebx, dword ptr [OFFSET reg + 4*ebx]\
- __asm mov eax, value\
- __asm bt word ptr C_FLAG, 0\
- __asm cmc\
- __asm sbb ebx, eax\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg + 4*eax], ebx\
- }
-
-#define OP_SBCS \
- {\
- __asm mov ebx, base\
- __asm mov ebx, dword ptr [OFFSET reg + 4*ebx]\
- __asm mov eax, value\
- __asm bt word ptr C_FLAG, 0\
- __asm cmc\
- __asm sbb ebx, eax\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg + 4*eax], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setnc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define OP_RSC \
- {\
- __asm mov ebx, value\
- __asm mov eax, base\
- __asm mov eax, dword ptr[OFFSET reg + 4*eax]\
- __asm bt word ptr C_FLAG, 0\
- __asm cmc\
- __asm sbb ebx, eax\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg + 4*eax], ebx\
- }
-
-#define OP_RSCS \
- {\
- __asm mov ebx, value\
- __asm mov eax, base\
- __asm mov eax, dword ptr[OFFSET reg + 4*eax]\
- __asm bt word ptr C_FLAG, 0\
- __asm cmc\
- __asm sbb ebx, eax\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg + 4*eax], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setnc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define OP_CMP \
- {\
- __asm mov eax, base\
- __asm mov ebx, dword ptr [OFFSET reg+4*eax]\
- __asm sub ebx, value\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setnc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-
-#define OP_CMN \
- {\
- __asm mov eax, base\
- __asm mov ebx, dword ptr [OFFSET reg+4*eax]\
- __asm add ebx, value\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define LOGICAL_LSL_REG \
- __asm mov eax, opcode\
- __asm and eax, 0x0f\
- __asm mov eax, dword ptr [OFFSET reg + 4 * eax]\
- __asm mov cl, byte ptr shift\
- __asm shl eax, cl\
- __asm mov value, eax\
- __asm setc byte ptr C_OUT
-
-#define LOGICAL_LSR_REG \
- __asm mov eax, opcode\
- __asm and eax, 0x0f\
- __asm mov eax, dword ptr [OFFSET reg + 4 * eax]\
- __asm mov cl, byte ptr shift\
- __asm shr eax, cl\
- __asm mov value, eax\
- __asm setc byte ptr C_OUT
-
-#define LOGICAL_ASR_REG \
- __asm mov eax, opcode\
- __asm and eax, 0x0f\
- __asm mov eax, dword ptr [OFFSET reg + 4 * eax]\
- __asm mov cl, byte ptr shift\
- __asm sar eax, cl\
- __asm mov value, eax\
- __asm setc byte ptr C_OUT
-
-#define LOGICAL_ROR_REG \
- __asm mov eax, opcode\
- __asm and eax, 0x0F\
- __asm mov eax, dword ptr [OFFSET reg + 4*eax]\
- __asm mov cl, byte ptr shift\
- __asm ror eax, cl\
- __asm mov value, eax\
- __asm setc byte ptr C_OUT
-
-#define LOGICAL_RRX_REG \
- __asm mov eax, opcode\
- __asm and eax, 0x0F\
- __asm mov eax, dword ptr [OFFSET reg + 4*eax]\
- __asm bt word ptr C_OUT, 0\
- __asm rcr eax, 1\
- __asm mov value, eax\
- __asm setc byte ptr C_OUT
-
-#define LOGICAL_ROR_IMM \
- __asm mov eax, opcode\
- __asm and eax, 0xff\
- __asm mov cl, byte ptr shift\
- __asm ror eax, cl\
- __asm mov value, eax\
- __asm setc byte ptr C_OUT
-#define ARITHMETIC_LSL_REG \
- __asm mov eax, opcode\
- __asm and eax, 0x0f\
- __asm mov eax, dword ptr [OFFSET reg + 4 * eax]\
- __asm mov cl, byte ptr shift\
- __asm shl eax, cl\
- __asm mov value, eax
-
-#define ARITHMETIC_LSR_REG \
- __asm mov eax, opcode\
- __asm and eax, 0x0f\
- __asm mov eax, dword ptr [OFFSET reg + 4 * eax]\
- __asm mov cl, byte ptr shift\
- __asm shr eax, cl\
- __asm mov value, eax
-
-#define ARITHMETIC_ASR_REG \
- __asm mov eax, opcode\
- __asm and eax, 0x0f\
- __asm mov eax, dword ptr [OFFSET reg + 4 * eax]\
- __asm mov cl, byte ptr shift\
- __asm sar eax, cl\
- __asm mov value, eax
-
-#define ARITHMETIC_ROR_REG \
- __asm mov eax, opcode\
- __asm and eax, 0x0F\
- __asm mov eax, dword ptr [OFFSET reg + 4*eax]\
- __asm mov cl, byte ptr shift\
- __asm ror eax, cl\
- __asm mov value, eax
-
-#define ARITHMETIC_RRX_REG \
- __asm mov eax, opcode\
- __asm and eax, 0x0F\
- __asm mov eax, dword ptr [OFFSET reg + 4*eax]\
- __asm bt word ptr C_FLAG, 0\
- __asm rcr eax, 1\
- __asm mov value, eax
-
-#define ARITHMETIC_ROR_IMM \
- __asm mov eax, opcode\
- __asm and eax, 0xff\
- __asm mov cl, byte ptr shift\
- __asm ror eax, cl\
- __asm mov value, eax
-#define ROR_IMM_MSR \
- {\
- __asm mov eax, opcode\
- __asm and eax, 0xff\
- __asm mov cl, byte ptr shift\
- __asm ror eax, CL\
- __asm mov value, eax\
- }
-#define ROR_VALUE \
- {\
- __asm mov cl, byte ptr shift\
- __asm ror dword ptr value, cl\
- }
-#define RCR_VALUE \
- {\
- __asm mov cl, byte ptr shift\
- __asm bt word ptr C_FLAG, 0\
- __asm rcr dword ptr value, 1\
- }
-#endif
-#endif
-
-#define OP_TST \
- u32 res = reg[base].I & value;\
- N_FLAG = (res & 0x80000000) ? true : false;\
- Z_FLAG = (res) ? false : true;\
- C_FLAG = C_OUT;
-
-#define OP_TEQ \
- u32 res = reg[base].I ^ value;\
- N_FLAG = (res & 0x80000000) ? true : false;\
- Z_FLAG = (res) ? false : true;\
- C_FLAG = C_OUT;
-
-#define OP_ORR \
- reg[dest].I = reg[base].I | value;
-
-#define OP_ORRS \
- reg[dest].I = reg[base].I | value;\
- N_FLAG = (reg[dest].I & 0x80000000) ? true : false;\
- Z_FLAG = (reg[dest].I) ? false : true;\
- C_FLAG = C_OUT;
-
-#define OP_MOV \
- reg[dest].I = value;
-
-#define OP_MOVS \
- reg[dest].I = value;\
- N_FLAG = (reg[dest].I & 0x80000000) ? true : false;\
- Z_FLAG = (reg[dest].I) ? false : true;\
- C_FLAG = C_OUT;
-
-#define OP_BIC \
- reg[dest].I = reg[base].I & (~value);
-
-#define OP_BICS \
- reg[dest].I = reg[base].I & (~value);\
- N_FLAG = (reg[dest].I & 0x80000000) ? true : false;\
- Z_FLAG = (reg[dest].I) ? false : true;\
- C_FLAG = C_OUT;
-
-#define OP_MVN \
- reg[dest].I = ~value;
-
-#define OP_MVNS \
- reg[dest].I = ~value; \
- N_FLAG = (reg[dest].I & 0x80000000) ? true : false;\
- Z_FLAG = (reg[dest].I) ? false : true;\
- C_FLAG = C_OUT;
-
-#define CASE_16(BASE) \
- case BASE:\
- case BASE+1:\
- case BASE+2:\
- case BASE+3:\
- case BASE+4:\
- case BASE+5:\
- case BASE+6:\
- case BASE+7:\
- case BASE+8:\
- case BASE+9:\
- case BASE+10:\
- case BASE+11:\
- case BASE+12:\
- case BASE+13:\
- case BASE+14:\
- case BASE+15:
-
-#define CASE_256(BASE) \
- CASE_16(BASE)\
- CASE_16(BASE+0x10)\
- CASE_16(BASE+0x20)\
- CASE_16(BASE+0x30)\
- CASE_16(BASE+0x40)\
- CASE_16(BASE+0x50)\
- CASE_16(BASE+0x60)\
- CASE_16(BASE+0x70)\
- CASE_16(BASE+0x80)\
- CASE_16(BASE+0x90)\
- CASE_16(BASE+0xa0)\
- CASE_16(BASE+0xb0)\
- CASE_16(BASE+0xc0)\
- CASE_16(BASE+0xd0)\
- CASE_16(BASE+0xe0)\
- CASE_16(BASE+0xf0)
-
-#define LOGICAL_DATA_OPCODE(OPCODE, OPCODE2, BASE) \
- case BASE: \
- case BASE+8:\
- {\
- /* OP Rd,Rb,Rm LSL # */ \
- int base = (opcode >> 16) & 0x0F;\
- int shift = (opcode >> 7) & 0x1F;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- \
- if(shift) {\
- LOGICAL_LSL_REG\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+2:\
- case BASE+10:\
- {\
- /* OP Rd,Rb,Rm LSR # */ \
- int base = (opcode >> 16) & 0x0F;\
- int shift = (opcode >> 7) & 0x1F;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- LOGICAL_LSR_REG\
- } else {\
- value = 0;\
- C_OUT = (reg[opcode & 0x0F].I & 0x80000000) ? true : false;\
- }\
- \
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+4:\
- case BASE+12:\
- {\
- /* OP Rd,Rb,Rm ASR # */\
- int base = (opcode >> 16) & 0x0F;\
- int shift = (opcode >> 7) & 0x1F;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- LOGICAL_ASR_REG\
- } else {\
- if(reg[opcode & 0x0F].I & 0x80000000){\
- value = 0xFFFFFFFF;\
- C_OUT = true;\
- } else {\
- value = 0;\
- C_OUT = false;\
- } \
- }\
- \
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+6:\
- case BASE+14:\
- {\
- /* OP Rd,Rb,Rm ROR # */\
- int base = (opcode >> 16) & 0x0F;\
- int shift = (opcode >> 7) & 0x1F;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- LOGICAL_ROR_REG\
- } else {\
- LOGICAL_RRX_REG\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+1:\
- {\
- /* OP Rd,Rb,Rm LSL Rs */\
- clockTicks++;\
- int base = (opcode >> 16) & 0x0F;\
- int shift = reg[(opcode >> 8)&15].B.B0;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- if(shift == 32) {\
- value = 0;\
- C_OUT = (reg[opcode & 0x0F].I & 1 ? true : false);\
- } else if(shift < 32) {\
- LOGICAL_LSL_REG\
- } else {\
- value = 0;\
- C_OUT = false;\
- }\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+3:\
- {\
- /* OP Rd,Rb,Rm LSR Rs */ \
- clockTicks++;\
- int base = (opcode >> 16) & 0x0F;\
- int shift = reg[(opcode >> 8)&15].B.B0;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- if(shift == 32) {\
- value = 0;\
- C_OUT = (reg[opcode & 0x0F].I & 0x80000000 ? true : false);\
- } else if(shift < 32) {\
- LOGICAL_LSR_REG\
- } else {\
- value = 0;\
- C_OUT = false;\
- }\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+5:\
- {\
- /* OP Rd,Rb,Rm ASR Rs */ \
- clockTicks++;\
- int base = (opcode >> 16) & 0x0F;\
- int shift = reg[(opcode >> 8)&15].B.B0;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift < 32) {\
- if(shift) {\
- LOGICAL_ASR_REG\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- } else {\
- if(reg[opcode & 0x0F].I & 0x80000000){\
- value = 0xFFFFFFFF;\
- C_OUT = true;\
- } else {\
- value = 0;\
- C_OUT = false;\
- }\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+7:\
- {\
- /* OP Rd,Rb,Rm ROR Rs */\
- clockTicks++;\
- int base = (opcode >> 16) & 0x0F;\
- int shift = reg[(opcode >> 8)&15].B.B0;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- shift &= 0x1f;\
- if(shift) {\
- LOGICAL_ROR_REG\
- } else {\
- value = reg[opcode & 0x0F].I;\
- C_OUT = (value & 0x80000000 ? true : false);\
- }\
- } else {\
- value = reg[opcode & 0x0F].I;\
- C_OUT = (value & 0x80000000 ? true : false);\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+0x200:\
- case BASE+0x201:\
- case BASE+0x202:\
- case BASE+0x203:\
- case BASE+0x204:\
- case BASE+0x205:\
- case BASE+0x206:\
- case BASE+0x207:\
- case BASE+0x208:\
- case BASE+0x209:\
- case BASE+0x20a:\
- case BASE+0x20b:\
- case BASE+0x20c:\
- case BASE+0x20d:\
- case BASE+0x20e:\
- case BASE+0x20f:\
- {\
- int shift = (opcode & 0xF00) >> 7;\
- int base = (opcode >> 16) & 0x0F;\
- int dest = (opcode >> 12) & 0x0F;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- LOGICAL_ROR_IMM\
- } else {\
- value = opcode & 0xff;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;
-
-#define LOGICAL_DATA_OPCODE_WITHOUT_base(OPCODE, OPCODE2, BASE) \
- case BASE: \
- case BASE+8:\
- {\
- /* OP Rd,Rb,Rm LSL # */ \
- int shift = (opcode >> 7) & 0x1F;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- \
- if(shift) {\
- LOGICAL_LSL_REG\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+2:\
- case BASE+10:\
- {\
- /* OP Rd,Rb,Rm LSR # */ \
- int shift = (opcode >> 7) & 0x1F;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- LOGICAL_LSR_REG\
- } else {\
- value = 0;\
- C_OUT = (reg[opcode & 0x0F].I & 0x80000000) ? true : false;\
- }\
- \
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+4:\
- case BASE+12:\
- {\
- /* OP Rd,Rb,Rm ASR # */\
- int shift = (opcode >> 7) & 0x1F;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- LOGICAL_ASR_REG\
- } else {\
- if(reg[opcode & 0x0F].I & 0x80000000){\
- value = 0xFFFFFFFF;\
- C_OUT = true;\
- } else {\
- value = 0;\
- C_OUT = false;\
- } \
- }\
- \
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+6:\
- case BASE+14:\
- {\
- /* OP Rd,Rb,Rm ROR # */\
- int shift = (opcode >> 7) & 0x1F;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- LOGICAL_ROR_REG\
- } else {\
- LOGICAL_RRX_REG\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+1:\
- {\
- /* OP Rd,Rb,Rm LSL Rs */\
- clockTicks++;\
- int shift = reg[(opcode >> 8)&15].B.B0;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- if(shift == 32) {\
- value = 0;\
- C_OUT = (reg[opcode & 0x0F].I & 1 ? true : false);\
- } else if(shift < 32) {\
- LOGICAL_LSL_REG\
- } else {\
- value = 0;\
- C_OUT = false;\
- }\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+3:\
- {\
- /* OP Rd,Rb,Rm LSR Rs */ \
- clockTicks++;\
- int shift = reg[(opcode >> 8)&15].B.B0;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- if(shift == 32) {\
- value = 0;\
- C_OUT = (reg[opcode & 0x0F].I & 0x80000000 ? true : false);\
- } else if(shift < 32) {\
- LOGICAL_LSR_REG\
- } else {\
- value = 0;\
- C_OUT = false;\
- }\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+5:\
- {\
- /* OP Rd,Rb,Rm ASR Rs */ \
- clockTicks++;\
- int shift = reg[(opcode >> 8)&15].B.B0;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift < 32) {\
- if(shift) {\
- LOGICAL_ASR_REG\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- } else {\
- if(reg[opcode & 0x0F].I & 0x80000000){\
- value = 0xFFFFFFFF;\
- C_OUT = true;\
- } else {\
- value = 0;\
- C_OUT = false;\
- }\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+7:\
- {\
- /* OP Rd,Rb,Rm ROR Rs */\
- clockTicks++;\
- int shift = reg[(opcode >> 8)&15].B.B0;\
- int dest = (opcode>>12) & 15;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- shift &= 0x1f;\
- if(shift) {\
- LOGICAL_ROR_REG\
- } else {\
- value = reg[opcode & 0x0F].I;\
- C_OUT = (value & 0x80000000 ? true : false);\
- }\
- } else {\
- value = reg[opcode & 0x0F].I;\
- C_OUT = (value & 0x80000000 ? true : false);\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+0x200:\
- case BASE+0x201:\
- case BASE+0x202:\
- case BASE+0x203:\
- case BASE+0x204:\
- case BASE+0x205:\
- case BASE+0x206:\
- case BASE+0x207:\
- case BASE+0x208:\
- case BASE+0x209:\
- case BASE+0x20a:\
- case BASE+0x20b:\
- case BASE+0x20c:\
- case BASE+0x20d:\
- case BASE+0x20e:\
- case BASE+0x20f:\
- {\
- int shift = (opcode & 0xF00) >> 7;\
- int dest = (opcode >> 12) & 0x0F;\
- bool C_OUT = C_FLAG;\
- u32 value;\
- if(shift) {\
- LOGICAL_ROR_IMM\
- } else {\
- value = opcode & 0xff;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;
-
-#define ARITHMETIC_DATA_OPCODE(OPCODE, OPCODE2, BASE) \
- case BASE:\
- case BASE+8:\
- {\
- /* OP Rd,Rb,Rm LSL # */\
- int base = (opcode >> 16) & 0x0F;\
- int shift = (opcode >> 7) & 0x1F;\
- int dest = (opcode>>12) & 15;\
- u32 value;\
- if(shift) {\
- ARITHMETIC_LSL_REG\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+2:\
- case BASE+10:\
- {\
- /* OP Rd,Rb,Rm LSR # */\
- int base = (opcode >> 16) & 0x0F;\
- int shift = (opcode >> 7) & 0x1F;\
- int dest = (opcode>>12) & 15;\
- u32 value;\
- if(shift) {\
- ARITHMETIC_LSR_REG\
- } else {\
- value = 0;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+4:\
- case BASE+12:\
- {\
- /* OP Rd,Rb,Rm ASR # */\
- int base = (opcode >> 16) & 0x0F;\
- int shift = (opcode >> 7) & 0x1F;\
- int dest = (opcode>>12) & 15;\
- u32 value;\
- if(shift) {\
- ARITHMETIC_ASR_REG\
- } else {\
- if(reg[opcode & 0x0F].I & 0x80000000){\
- value = 0xFFFFFFFF;\
- } else value = 0;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+6:\
- case BASE+14:\
- {\
- /* OP Rd,Rb,Rm ROR # */\
- int base = (opcode >> 16) & 0x0F;\
- int shift = (opcode >> 7) & 0x1F;\
- int dest = (opcode>>12) & 15;\
- u32 value;\
- if(shift) {\
- ARITHMETIC_ROR_REG\
- } else {\
- ARITHMETIC_RRX_REG\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+1:\
- {\
- /* OP Rd,Rb,Rm LSL Rs */\
- clockTicks++;\
- int base = (opcode >> 16) & 0x0F;\
- int shift = reg[(opcode >> 8)&15].B.B0;\
- int dest = (opcode>>12) & 15;\
- u32 value;\
- if(shift) {\
- if(shift == 32) {\
- value = 0;\
- } else if(shift < 32) {\
- ARITHMETIC_LSL_REG\
- } else value = 0;\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+3:\
- {\
- /* OP Rd,Rb,Rm LSR Rs */\
- clockTicks++;\
- int base = (opcode >> 16) & 0x0F;\
- int shift = reg[(opcode >> 8)&15].B.B0;\
- int dest = (opcode>>12) & 15;\
- u32 value;\
- if(shift) {\
- if(shift == 32) {\
- value = 0;\
- } else if(shift < 32) {\
- ARITHMETIC_LSR_REG\
- } else value = 0;\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+5:\
- {\
- /* OP Rd,Rb,Rm ASR Rs */\
- clockTicks++;\
- int base = (opcode >> 16) & 0x0F;\
- int shift = reg[(opcode >> 8)&15].B.B0;\
- int dest = (opcode>>12) & 15;\
- u32 value;\
- if(shift < 32) {\
- if(shift) {\
- ARITHMETIC_ASR_REG\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- } else {\
- if(reg[opcode & 0x0F].I & 0x80000000){\
- value = 0xFFFFFFFF;\
- } else value = 0;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+7:\
- {\
- /* OP Rd,Rb,Rm ROR Rs */\
- clockTicks++;\
- int base = (opcode >> 16) & 0x0F;\
- int shift = reg[(opcode >> 8)&15].B.B0;\
- int dest = (opcode>>12) & 15;\
- u32 value;\
- if(shift) {\
- shift &= 0x1f;\
- if(shift) {\
- ARITHMETIC_ROR_REG\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- } else {\
- value = reg[opcode & 0x0F].I;\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;\
- case BASE+0x200:\
- case BASE+0x201:\
- case BASE+0x202:\
- case BASE+0x203:\
- case BASE+0x204:\
- case BASE+0x205:\
- case BASE+0x206:\
- case BASE+0x207:\
- case BASE+0x208:\
- case BASE+0x209:\
- case BASE+0x20a:\
- case BASE+0x20b:\
- case BASE+0x20c:\
- case BASE+0x20d:\
- case BASE+0x20e:\
- case BASE+0x20f:\
- {\
- int shift = (opcode & 0xF00) >> 7;\
- int base = (opcode >> 16) & 0x0F;\
- int dest = (opcode >> 12) & 0x0F;\
- u32 value;\
- {\
- ARITHMETIC_ROR_IMM\
- }\
- if(dest == 15) {\
- OPCODE2\
- /* todo */\
- if(opcode & 0x00100000) {\
- clockTicks++;\
- CPUSwitchMode(reg[17].I & 0x1f, false);\
- }\
- if(armState) {\
- reg[15].I &= 0xFFFFFFFC;\
- armNextPC = reg[15].I;\
- reg[15].I += 4;\
- } else {\
- reg[15].I &= 0xFFFFFFFE;\
- armNextPC = reg[15].I;\
- reg[15].I += 2;\
- }\
- } else {\
- OPCODE \
- }\
- }\
- break;
-
- u32 opcode = CPUReadMemoryQuick(armNextPC);
-
- clockTicks = memoryWaitFetch32[(armNextPC >> 24) & 15];
-
-#ifndef FINAL_VERSION
- if(armNextPC == stop) {
- armNextPC++;
- }
-#endif
-
- armNextPC = reg[15].I;
- reg[15].I += 4;
- int cond = opcode >> 28;
- // suggested optimization for frequent cases
- bool cond_res;
- if(cond == 0x0e) {
- cond_res = true;
- } else {
- switch(cond) { 
- case 0x00: // EQ 
- cond_res = Z_FLAG;
- break;
- case 0x01: // NE
- cond_res = !Z_FLAG;
- break; 
- case 0x02: // CS
- cond_res = C_FLAG;
- break;
- case 0x03: // CC
- cond_res = !C_FLAG;
- break;
- case 0x04: // MI
- cond_res = N_FLAG;
- break;
- case 0x05: // PL
- cond_res = !N_FLAG;
- break;
- case 0x06: // VS
- cond_res = V_FLAG;
- break;
- case 0x07: // VC
- cond_res = !V_FLAG;
- break;
- case 0x08: // HI
- cond_res = C_FLAG && !Z_FLAG;
- break;
- case 0x09: // LS
- cond_res = !C_FLAG || Z_FLAG;
- break;
- case 0x0A: // GE
- cond_res = N_FLAG == V_FLAG;
- break;
- case 0x0B: // LT
- cond_res = N_FLAG != V_FLAG;
- break;
- case 0x0C: // GT
- cond_res = !Z_FLAG &&(N_FLAG == V_FLAG);
- break; 
- case 0x0D: // LE
- cond_res = Z_FLAG || (N_FLAG != V_FLAG);
- break; 
- case 0x0E: 
- cond_res = true; 
- break;
- case 0x0F:
- default:
- // ???
- cond_res = false;
- break;
- }
- }
- 
-if(cond_res) {
- switch(((opcode>>16)&0xFF0) | ((opcode>>4)&0x0F)) {
- LOGICAL_DATA_OPCODE_WITHOUT_base(OP_AND, OP_AND, 0x000);
- LOGICAL_DATA_OPCODE_WITHOUT_base(OP_ANDS, OP_AND, 0x010);
- case 0x009:
- {
- // MUL Rd, Rm, Rs
- int dest = (opcode >> 16) & 0x0F;
- int mult = (opcode & 0x0F);
- u32 rs = reg[(opcode >> 8) & 0x0F].I;
- reg[dest].I = reg[mult].I * rs;
- if(((s32)rs)<0)
- rs = ~rs;
- if((rs & 0xFFFFFF00) == 0)
- clockTicks += 2;
- else if ((rs & 0xFFFF0000) == 0)
- clockTicks += 3;
- else if ((rs & 0xFF000000) == 0)
- clockTicks += 4;
- else
- clockTicks += 5;
- }
- break;
- case 0x019:
- {
- // MULS Rd, Rm, Rs
- int dest = (opcode >> 16) & 0x0F;
- int mult = (opcode & 0x0F);
- u32 rs = reg[(opcode >> 8) & 0x0F].I;
- reg[dest].I = reg[mult].I * rs;
- N_FLAG = (reg[dest].I & 0x80000000) ? true : false;
- Z_FLAG = (reg[dest].I) ? false : true;
- if(((s32)rs)<0)
- rs = ~rs;
- if((rs & 0xFFFFFF00) == 0)
- clockTicks += 2;
- else if ((rs & 0xFFFF0000) == 0)
- clockTicks += 3;
- else if ((rs & 0xFF000000) == 0)
- clockTicks += 4;
- else
- clockTicks += 5;
- }
- break;
- case 0x00b:
- case 0x02b:
- {
- // STRH Rd, [Rn], -Rm
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = reg[opcode & 0x0F].I;
- clockTicks += 4 + CPUUpdateTicksAccess16(address);
- CPUWriteHalfWord(address, reg[dest].W.W0);
- address -= offset;
- reg[base].I = address;
- }
- break;
- case 0x04b:
- case 0x06b:
- {
- // STRH Rd, [Rn], #-offset
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = (opcode & 0x0F) | ((opcode >> 4) & 0xF0);
- clockTicks += 4 + CPUUpdateTicksAccess16(address);
- CPUWriteHalfWord(address, reg[dest].W.W0);
- address -= offset;
- reg[base].I = address;
- }
- break;
- case 0x08b:
- case 0x0ab:
- {
- // STRH Rd, [Rn], Rm
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = reg[opcode & 0x0F].I;
- clockTicks += 4 + CPUUpdateTicksAccess16(address);
- CPUWriteHalfWord(address, reg[dest].W.W0);
- address += offset;
- reg[base].I = address;
- }
- break;
- case 0x0cb:
- case 0x0eb:
- {
- // STRH Rd, [Rn], #offset
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = (opcode & 0x0F) | ((opcode >> 4) & 0xF0);
- clockTicks += 4 + CPUUpdateTicksAccess16(address);
- CPUWriteHalfWord(address, reg[dest].W.W0);
- address += offset;
- reg[base].I = address;
- }
- break;
- case 0x10b:
- {
- // STRH Rd, [Rn, -Rm]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - reg[opcode & 0x0F].I;
- clockTicks += 4 + CPUUpdateTicksAccess16(address);
- CPUWriteHalfWord(address, reg[dest].W.W0);
- }
- break;
- case 0x12b:
- {
- // STRH Rd, [Rn, -Rm]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - reg[opcode & 0x0F].I;
- clockTicks += 4 + CPUUpdateTicksAccess16(address);
- CPUWriteHalfWord(address, reg[dest].W.W0);
- reg[base].I = address;
- }
- break;
- case 0x14b:
- {
- // STRH Rd, [Rn, -#offset]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 4 + CPUUpdateTicksAccess16(address);
- CPUWriteHalfWord(address, reg[dest].W.W0);
- }
- break;
- case 0x16b:
- {
- // STRH Rd, [Rn, -#offset]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 4 + CPUUpdateTicksAccess16(address);
- CPUWriteHalfWord(address, reg[dest].W.W0);
- reg[base].I = address;
- }
- break;
- case 0x18b:
- {
- // STRH Rd, [Rn, Rm]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + reg[opcode & 0x0F].I;
- clockTicks += 4 + CPUUpdateTicksAccess16(address);
- CPUWriteHalfWord(address, reg[dest].W.W0);
- }
- break;
- case 0x1ab:
- {
- // STRH Rd, [Rn, Rm]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + reg[opcode & 0x0F].I;
- clockTicks += 4 + CPUUpdateTicksAccess16(address);
- CPUWriteHalfWord(address, reg[dest].W.W0);
- reg[base].I = address;
- }
- break;
- case 0x1cb:
- {
- // STRH Rd, [Rn, #offset]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 4 + CPUUpdateTicksAccess16(address);
- CPUWriteHalfWord(address, reg[dest].W.W0);
- }
- break;
- case 0x1eb:
- {
- // STRH Rd, [Rn, #offset]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 4 + CPUUpdateTicksAccess16(address);
- CPUWriteHalfWord(address, reg[dest].W.W0);
- reg[base].I = address;
- }
- break;
- case 0x01b:
- case 0x03b:
- {
- // LDRH Rd, [Rn], -Rm
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = CPUReadHalfWord(address);
- if(dest != base) {
- address -= offset;
- reg[base].I = address;
- }
- }
- break;
- case 0x05b:
- case 0x07b:
- {
- // LDRH Rd, [Rn], #-offset
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = (opcode & 0x0F) | ((opcode >> 4) & 0xF0);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = CPUReadHalfWord(address);
- if(dest != base) {
- address -= offset;
- reg[base].I = address;
- }
- }
- break;
- case 0x09b:
- case 0x0bb:
- {
- // LDRH Rd, [Rn], Rm
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = CPUReadHalfWord(address);
- if(dest != base) {
- address += offset;
- reg[base].I = address;
- }
- }
- break;
- case 0x0db:
- case 0x0fb:
- {
- // LDRH Rd, [Rn], #offset
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = (opcode & 0x0F) | ((opcode >> 4) & 0xF0);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = CPUReadHalfWord(address);
- if(dest != base) {
- address += offset;
- reg[base].I = address;
- }
- }
- break;
- case 0x11b:
- {
- // LDRH Rd, [Rn, -Rm]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = CPUReadHalfWord(address);
- }
- break;
- case 0x13b:
- {
- // LDRH Rd, [Rn, -Rm]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = CPUReadHalfWord(address);
- if(dest != base)
- reg[base].I = address;
- }
- break;
- case 0x15b:
- {
- // LDRH Rd, [Rn, -#offset]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = CPUReadHalfWord(address);
- }
- break;
- case 0x17b:
- {
- // LDRH Rd, [Rn, -#offset]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = CPUReadHalfWord(address);
- if(dest != base)
- reg[base].I = address;
- }
- break;
- case 0x19b:
- {
- // LDRH Rd, [Rn, Rm]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = CPUReadHalfWord(address);
- }
- break;
- case 0x1bb:
- {
- // LDRH Rd, [Rn, Rm]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = CPUReadHalfWord(address);
- if(dest != base)
- reg[base].I = address;
- }
- break;
- case 0x1db:
- {
- // LDRH Rd, [Rn, #offset]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = CPUReadHalfWord(address);
- }
- break;
- case 0x1fb:
- {
- // LDRH Rd, [Rn, #offset]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = CPUReadHalfWord(address);
- if(dest != base)
- reg[base].I = address;
- }
- break;
- case 0x01d:
- case 0x03d:
- {
- // LDRSB Rd, [Rn], -Rm
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s8)CPUReadByte(address);
- if(dest != base) {
- address -= offset;
- reg[base].I = address;
- }
- }
- break;
- case 0x05d:
- case 0x07d:
- {
- // LDRSB Rd, [Rn], #-offset
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = (opcode & 0x0F) | ((opcode >> 4) & 0xF0);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s8)CPUReadByte(address);
- if(dest != base) {
- address -= offset;
- reg[base].I = address;
- }
- }
- break;
- case 0x09d:
- case 0x0bd:
- {
- // LDRSB Rd, [Rn], Rm
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s8)CPUReadByte(address);
- if(dest != base) {
- address += offset;
- reg[base].I = address;
- }
- }
- break;
- case 0x0dd:
- case 0x0fd:
- {
- // LDRSB Rd, [Rn], #offset
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = (opcode & 0x0F) | ((opcode >> 4) & 0xF0);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s8)CPUReadByte(address);
- if(dest != base) {
- address += offset;
- reg[base].I = address;
- }
- }
- break;
- case 0x11d:
- {
- // LDRSB Rd, [Rn, -Rm]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s8)CPUReadByte(address);
- }
- break;
- case 0x13d:
- {
- // LDRSB Rd, [Rn, -Rm]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s8)CPUReadByte(address);
- if(dest != base)
- reg[base].I = address;
- }
- break;
- case 0x15d:
- {
- // LDRSB Rd, [Rn, -#offset]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s8)CPUReadByte(address);
- }
- break;
- case 0x17d:
- {
- // LDRSB Rd, [Rn, -#offset]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s8)CPUReadByte(address);
- if(dest != base)
- reg[base].I = address;
- }
- break;
- case 0x19d:
- {
- // LDRSB Rd, [Rn, Rm]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s8)CPUReadByte(address);
- }
- break;
- case 0x1bd:
- {
- // LDRSB Rd, [Rn, Rm]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s8)CPUReadByte(address);
- if(dest != base)
- reg[base].I = address;
- }
- break;
- case 0x1dd:
- {
- // LDRSB Rd, [Rn, #offset]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s8)CPUReadByte(address);
- }
- break;
- case 0x1fd:
- {
- // LDRSB Rd, [Rn, #offset]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s8)CPUReadByte(address);
- if(dest != base)
- reg[base].I = address;
- }
- break;
- case 0x01f:
- case 0x03f:
- {
- // LDRSH Rd, [Rn], -Rm
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s16)CPUReadHalfWordSigned(address);
- if(dest != base) {
- address -= offset;
- reg[base].I = address;
- }
- }
- break;
- case 0x05f:
- case 0x07f:
- {
- // LDRSH Rd, [Rn], #-offset
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = (opcode & 0x0F) | ((opcode >> 4) & 0xF0);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s16)CPUReadHalfWordSigned(address);
- if(dest != base) {
- address -= offset;
- reg[base].I = address;
- }
- }
- break;
- case 0x09f:
- case 0x0bf:
- {
- // LDRSH Rd, [Rn], Rm
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s16)CPUReadHalfWordSigned(address);
- if(dest != base) {
- address += offset;
- reg[base].I = address;
- }
- }
- break;
- case 0x0df:
- case 0x0ff:
- {
- // LDRSH Rd, [Rn], #offset
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I;
- int offset = (opcode & 0x0F) | ((opcode >> 4) & 0xF0);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s16)CPUReadHalfWordSigned(address);
- if(dest != base) {
- address += offset;
- reg[base].I = address;
- }
- }
- break;
- case 0x11f:
- {
- // LDRSH Rd, [Rn, -Rm]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s16)CPUReadHalfWordSigned(address);
- }
- break;
- case 0x13f:
- {
- // LDRSH Rd, [Rn, -Rm]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s16)CPUReadHalfWordSigned(address);
- if(dest != base)
- reg[base].I = address;
- }
- break;
- case 0x15f:
- {
- // LDRSH Rd, [Rn, -#offset]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s16)CPUReadHalfWordSigned(address);
- }
- break;
- case 0x17f:
- {
- // LDRSH Rd, [Rn, -#offset]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I - ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s16)CPUReadHalfWordSigned(address);
- if(dest != base)
- reg[base].I = address;
- }
- break;
- case 0x19f:
- {
- // LDRSH Rd, [Rn, Rm]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s16)CPUReadHalfWordSigned(address);
- }
- break;
- case 0x1bf:
- {
- // LDRSH Rd, [Rn, Rm]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + reg[opcode & 0x0F].I;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s16)CPUReadHalfWordSigned(address);
- if(dest != base)
- reg[base].I = address;
- }
- break;
- case 0x1df:
- {
- // LDRSH Rd, [Rn, #offset]
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s16)CPUReadHalfWordSigned(address);
- }
- break;
- case 0x1ff:
- {
- // LDRSH Rd, [Rn, #offset]!
- int base = (opcode >> 16) & 0x0F;
- int dest = (opcode >> 12) & 0x0F;
- u32 address = reg[base].I + ((opcode & 0x0F)|((opcode>>4)&0xF0));
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- reg[dest].I = (s16)CPUReadHalfWordSigned(address);
- if(dest != base)
- reg[base].I = address;
- }
- break;
- LOGICAL_DATA_OPCODE_WITHOUT_base(OP_EOR, OP_EOR, 0x020);
- LOGICAL_DATA_OPCODE_WITHOUT_base(OP_EORS, OP_EOR, 0x030);
- case 0x029:
- {
- // MLA Rd, Rm, Rs, Rn
- int dest = (opcode >> 16) & 0x0F;
- int mult = (opcode & 0x0F);
- u32 rs = reg[(opcode >> 8) & 0x0F].I;
- reg[dest].I = reg[mult].I * rs + reg[(opcode>>12)&0x0f].I;
- if(((s32)rs)<0)
- rs = ~rs;
- if((rs & 0xFFFFFF00) == 0)
- clockTicks += 3;
- else if ((rs & 0xFFFF0000) == 0)
- clockTicks += 4;
- else if ((rs & 0xFF000000) == 0)
- clockTicks += 5;
- else
- clockTicks += 6;
- }
- break;
- case 0x039:
- {
- // MLAS Rd, Rm, Rs, Rn
- int dest = (opcode >> 16) & 0x0F;
- int mult = (opcode & 0x0F);
- u32 rs = reg[(opcode >> 8) & 0x0F].I;
- reg[dest].I = reg[mult].I * rs + reg[(opcode>>12)&0x0f].I;
- N_FLAG = (reg[dest].I & 0x80000000) ? true : false;
- Z_FLAG = (reg[dest].I) ? false : true;
- if(((s32)rs)<0)
- rs = ~rs;
- if((rs & 0xFFFFFF00) == 0)
- clockTicks += 3;
- else if ((rs & 0xFFFF0000) == 0)
- clockTicks += 4;
- else if ((rs & 0xFF000000) == 0)
- clockTicks += 5;
- else
- clockTicks += 6;
- }
- break;
- ARITHMETIC_DATA_OPCODE(OP_SUB, OP_SUB, 0x040);
- ARITHMETIC_DATA_OPCODE(OP_SUBS, OP_SUB, 0x050);
- ARITHMETIC_DATA_OPCODE(OP_RSB, OP_RSB, 0x060);
- ARITHMETIC_DATA_OPCODE(OP_RSBS, OP_RSB, 0x070);
- ARITHMETIC_DATA_OPCODE(OP_ADD, OP_ADD, 0x080);
- ARITHMETIC_DATA_OPCODE(OP_ADDS, OP_ADD, 0x090);
- case 0x089:
- {
- // UMULL RdLo, RdHi, Rn, Rs
- u32 umult = reg[(opcode & 0x0F)].I;
- u32 usource = reg[(opcode >> 8) & 0x0F].I;
- int destLo = (opcode >> 12) & 0x0F; 
- int destHi = (opcode >> 16) & 0x0F;
- u64 uTemp = ((u64)umult)*((u64)usource);
- reg[destLo].I = (u32)uTemp;
- reg[destHi].I = (u32)(uTemp >> 32);
- if ((usource & 0xFFFFFF00) == 0)
- clockTicks += 2;
- else if ((usource & 0xFFFF0000) == 0)
- clockTicks += 3;
- else if ((usource & 0xFF000000) == 0)
- clockTicks += 4;
- else
- clockTicks += 5;
- }
- break;
- case 0x099:
- {
- // UMULLS RdLo, RdHi, Rn, Rs
- u32 umult = reg[(opcode & 0x0F)].I;
- u32 usource = reg[(opcode >> 8) & 0x0F].I;
- int destLo = (opcode >> 12) & 0x0F; 
- int destHi = (opcode >> 16) & 0x0F;
- u64 uTemp = ((u64)umult)*((u64)usource);
- reg[destLo].I = (u32)uTemp;
- reg[destHi].I = (u32)(uTemp >> 32);
- Z_FLAG = (uTemp) ? false : true;
- N_FLAG = (reg[destHi].I & 0x80000000) ? true : false;
- if ((usource & 0xFFFFFF00) == 0)
- clockTicks += 2;
- else if ((usource & 0xFFFF0000) == 0)
- clockTicks += 3;
- else if ((usource & 0xFF000000) == 0)
- clockTicks += 4;
- else
- clockTicks += 5;
- }
- break;
- ARITHMETIC_DATA_OPCODE(OP_ADC, OP_ADC, 0x0a0);
- ARITHMETIC_DATA_OPCODE(OP_ADCS, OP_ADC, 0x0b0);
- case 0x0a9:
- {
- // UMLAL RdLo, RdHi, Rn, Rs
- u32 umult = reg[(opcode & 0x0F)].I;
- u32 usource = reg[(opcode >> 8) & 0x0F].I;
- int destLo = (opcode >> 12) & 0x0F; 
- int destHi = (opcode >> 16) & 0x0F;
- u64 uTemp = (u64)reg[destHi].I;
- uTemp <<= 32;
- uTemp |= (u64)reg[destLo].I;
- uTemp += ((u64)umult)*((u64)usource);
- reg[destLo].I = (u32)uTemp;
- reg[destHi].I = (u32)(uTemp >> 32);
- if ((usource & 0xFFFFFF00) == 0)
- clockTicks += 3;
- else if ((usource & 0xFFFF0000) == 0)
- clockTicks += 4;
- else if ((usource & 0xFF000000) == 0)
- clockTicks += 5;
- else
- clockTicks += 6;
- }
- break;
- case 0x0b9:
- {
- // UMLALS RdLo, RdHi, Rn, Rs
- u32 umult = reg[(opcode & 0x0F)].I;
- u32 usource = reg[(opcode >> 8) & 0x0F].I;
- int destLo = (opcode >> 12) & 0x0F; 
- int destHi = (opcode >> 16) & 0x0F;
- u64 uTemp = (u64)reg[destHi].I;
- uTemp <<= 32;
- uTemp |= (u64)reg[destLo].I;
- uTemp += ((u64)umult)*((u64)usource);
- reg[destLo].I = (u32)uTemp;
- reg[destHi].I = (u32)(uTemp >> 32);
- Z_FLAG = (uTemp) ? false : true;
- N_FLAG = (reg[destHi].I & 0x80000000) ? true : false;
- if ((usource & 0xFFFFFF00) == 0)
- clockTicks += 3;
- else if ((usource & 0xFFFF0000) == 0)
- clockTicks += 4;
- else if ((usource & 0xFF000000) == 0)
- clockTicks += 5;
- else
- clockTicks += 6;
- }
- break;
- ARITHMETIC_DATA_OPCODE(OP_SBC, OP_SBC, 0x0c0);
- ARITHMETIC_DATA_OPCODE(OP_SBCS, OP_SBC, 0x0d0);
- case 0x0c9:
- {
- // SMULL RdLo, RdHi, Rm, Rs
- int destLo = (opcode >> 12) & 0x0F; 
- int destHi = (opcode >> 16) & 0x0F;
- u32 rs = reg[(opcode >> 8) & 0x0F].I;
- s64 m = (s32)reg[(opcode & 0x0F)].I;
- s64 s = (s32)rs;
- s64 sTemp = m*s;
- reg[destLo].I = (u32)sTemp;
- reg[destHi].I = (u32)(sTemp >> 32);
- if(((s32)rs) < 0)
- rs = ~rs;
- if((rs & 0xFFFFFF00) == 0)
- clockTicks += 2;
- else if((rs & 0xFFFF0000) == 0)
- clockTicks += 3;
- else if((rs & 0xFF000000) == 0)
- clockTicks += 4;
- else
- clockTicks += 5;
- }
- break;
- case 0x0d9:
- {
- // SMULLS RdLo, RdHi, Rm, Rs
- int destLo = (opcode >> 12) & 0x0F; 
- int destHi = (opcode >> 16) & 0x0F;
- u32 rs = reg[(opcode >> 8) & 0x0F].I;
- s64 m = (s32)reg[(opcode & 0x0F)].I;
- s64 s = (s32)rs;
- s64 sTemp = m*s;
- reg[destLo].I = (u32)sTemp;
- reg[destHi].I = (u32)(sTemp >> 32);
- Z_FLAG = (sTemp) ? false : true;
- N_FLAG = (sTemp < 0) ? true : false;
- if(((s32)rs) < 0)
- rs = ~rs;
- if((rs & 0xFFFFFF00) == 0)
- clockTicks += 2;
- else if((rs & 0xFFFF0000) == 0)
- clockTicks += 3;
- else if((rs & 0xFF000000) == 0)
- clockTicks += 4;
- else
- clockTicks += 5;
- }
- break;
- ARITHMETIC_DATA_OPCODE(OP_RSC, OP_RSC, 0x0e0);
- ARITHMETIC_DATA_OPCODE(OP_RSCS, OP_RSC, 0x0f0);
- case 0x0e9:
- {
- // SMLAL RdLo, RdHi, Rm, Rs
- int destLo = (opcode >> 12) & 0x0F; 
- int destHi = (opcode >> 16) & 0x0F;
- u32 rs = reg[(opcode >> 8) & 0x0F].I;
- s64 m = (s32)reg[(opcode & 0x0F)].I;
- s64 s = (s32)rs;
- s64 sTemp = (u64)reg[destHi].I;
- sTemp <<= 32;
- sTemp |= (u64)reg[destLo].I;
- sTemp += m*s;
- reg[destLo].I = (u32)sTemp;
- reg[destHi].I = (u32)(sTemp >> 32);
- if(((s32)rs) < 0)
- rs = ~rs;
- if((rs & 0xFFFFFF00) == 0)
- clockTicks += 3;
- else if((rs & 0xFFFF0000) == 0)
- clockTicks += 4;
- else if((rs & 0xFF000000) == 0)
- clockTicks += 5;
- else
- clockTicks += 6;
- }
- break;
- case 0x0f9:
- {
- // SMLALS RdLo, RdHi, Rm, Rs
- int destLo = (opcode >> 12) & 0x0F; 
- int destHi = (opcode >> 16) & 0x0F;
- u32 rs = reg[(opcode >> 8) & 0x0F].I;
- s64 m = (s32)reg[(opcode & 0x0F)].I;
- s64 s = (s32)rs;
- s64 sTemp = (u64)reg[destHi].I;
- sTemp <<= 32;
- sTemp |= (u64)reg[destLo].I;
- sTemp += m*s;
- reg[destLo].I = (u32)sTemp;
- reg[destHi].I = (u32)(sTemp >> 32);
- Z_FLAG = (sTemp) ? false : true;
- N_FLAG = (sTemp < 0) ? true : false;
- if(((s32)rs) < 0)
- rs = ~rs;
- if((rs & 0xFFFFFF00) == 0)
- clockTicks += 3;
- else if((rs & 0xFFFF0000) == 0)
- clockTicks += 4;
- else if((rs & 0xFF000000) == 0)
- clockTicks += 5;
- else
- clockTicks += 6;
- }
- break;
- LOGICAL_DATA_OPCODE(OP_TST, OP_TST, 0x110);
- case 0x100:
- // MRS Rd, CPSR
- // TODO: check if right instruction....
- CPUUpdateCPSR();
- reg[(opcode >> 12) & 0x0F].I = reg[16].I;
- break;
- case 0x109:
- {
- // SWP Rd, Rm, [Rn]
- u32 address = reg[(opcode >> 16) & 15].I;
- u32 temp = CPUReadMemory(address);
- CPUWriteMemory(address, reg[opcode&15].I);
- reg[(opcode >> 12) & 15].I = temp;
- }
- break;
- LOGICAL_DATA_OPCODE(OP_TEQ, OP_TEQ, 0x130);
- case 0x120:
- {
- // MSR CPSR_fields, Rm
- CPUUpdateCPSR();
- u32 value = reg[opcode & 15].I;
- u32 newValue = reg[16].I;
- if(armMode > 0x10) {
- if(opcode & 0x00010000)
- newValue = (newValue & 0xFFFFFF00) | (value & 0x000000FF);
- if(opcode & 0x00020000)
- newValue = (newValue & 0xFFFF00FF) | (value & 0x0000FF00);
- if(opcode & 0x00040000)
- newValue = (newValue & 0xFF00FFFF) | (value & 0x00FF0000);
- }
- if(opcode & 0x00080000)
- newValue = (newValue & 0x00FFFFFF) | (value & 0xFF000000);
- newValue |= 0x10;
- CPUSwitchMode(newValue & 0x1f, false);
- reg[16].I = newValue;
- CPUUpdateFlags();
- }
- break;
- case 0x121:
- {
- // BX Rm
- // TODO: check if right instruction...
- clockTicks += 3;
- int base = opcode & 0x0F;
- armState = reg[base].I & 1 ? false : true;
- if(armState) {
- reg[15].I = reg[base].I & 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- } else {
- reg[15].I = reg[base].I & 0xFFFFFFFE;
- armNextPC = reg[15].I;
- reg[15].I += 2;
- }
- }
- break;
- ARITHMETIC_DATA_OPCODE(OP_CMP, OP_CMP, 0x150);
- case 0x140:
- // MRS Rd, SPSR
- // TODO: check if right instruction...
- reg[(opcode >> 12) & 0x0F].I = reg[17].I;
- break;
- case 0x149:
- {
- // SWPB Rd, Rm, [Rn]
- u32 address = reg[(opcode >> 16) & 15].I;
- u32 temp = CPUReadByte(address);
- CPUWriteByte(address, reg[opcode&15].B.B0);
- reg[(opcode>>12)&15].I = temp;
- }
- break;
- ARITHMETIC_DATA_OPCODE(OP_CMN, OP_CMN, 0x170);
- case 0x160:
- {
- // MSR SPSR_fields, Rm
- u32 value = reg[opcode & 15].I;
- if(armMode > 0x10 && armMode < 0x1f) {
- if(opcode & 0x00010000)
- reg[17].I = (reg[17].I & 0xFFFFFF00) | (value & 0x000000FF);
- if(opcode & 0x00020000)
- reg[17].I = (reg[17].I & 0xFFFF00FF) | (value & 0x0000FF00);
- if(opcode & 0x00040000)
- reg[17].I = (reg[17].I & 0xFF00FFFF) | (value & 0x00FF0000);
- if(opcode & 0x00080000)
- reg[17].I = (reg[17].I & 0x00FFFFFF) | (value & 0xFF000000);
- }
- }
- break;
- LOGICAL_DATA_OPCODE (OP_ORR, OP_ORR, 0x180);
- LOGICAL_DATA_OPCODE (OP_ORRS, OP_ORR, 0x190);
- LOGICAL_DATA_OPCODE_WITHOUT_base(OP_MOV, OP_MOV, 0x1a0);
- LOGICAL_DATA_OPCODE_WITHOUT_base(OP_MOVS, OP_MOV, 0x1b0);
- LOGICAL_DATA_OPCODE (OP_BIC, OP_BIC, 0x1c0);
- LOGICAL_DATA_OPCODE (OP_BICS, OP_BIC, 0x1d0);
- LOGICAL_DATA_OPCODE_WITHOUT_base(OP_MVN, OP_MVN, 0x1e0);
- LOGICAL_DATA_OPCODE_WITHOUT_base(OP_MVNS, OP_MVN, 0x1f0);
-#ifdef BKPT_SUPPORT
- case 0x127:
- case 0x7ff: // for GDB support
- extern void (*dbgSignal)(int,int);
- reg[15].I -= 4;
- armNextPC -= 4;
- dbgSignal(5, (opcode & 0x0f)|((opcode>>4) & 0xfff0));
- return;
-#endif
- case 0x320:
- case 0x321:
- case 0x322:
- case 0x323:
- case 0x324:
- case 0x325:
- case 0x326:
- case 0x327:
- case 0x328:
- case 0x329:
- case 0x32a:
- case 0x32b:
- case 0x32c:
- case 0x32d:
- case 0x32e:
- case 0x32f:
- {
- // MSR CPSR_fields, #
- CPUUpdateCPSR();
- u32 value = opcode & 0xFF;
- int shift = (opcode & 0xF00) >> 7;
- if(shift) {
- ROR_IMM_MSR;
- }
- u32 newValue = reg[16].I;
- if(armMode > 0x10) {
- if(opcode & 0x00010000)
- newValue = (newValue & 0xFFFFFF00) | (value & 0x000000FF);
- if(opcode & 0x00020000)
- newValue = (newValue & 0xFFFF00FF) | (value & 0x0000FF00);
- if(opcode & 0x00040000)
- newValue = (newValue & 0xFF00FFFF) | (value & 0x00FF0000);
- }
- if(opcode & 0x00080000)
- newValue = (newValue & 0x00FFFFFF) | (value & 0xFF000000);
-
- newValue |= 0x10;
-
- CPUSwitchMode(newValue & 0x1f, false);
- reg[16].I = newValue;
- CPUUpdateFlags();
- }
- break;
- case 0x360:
- case 0x361:
- case 0x362:
- case 0x363:
- case 0x364:
- case 0x365:
- case 0x366:
- case 0x367:
- case 0x368:
- case 0x369:
- case 0x36a:
- case 0x36b:
- case 0x36c:
- case 0x36d:
- case 0x36e:
- case 0x36f:
- {
- // MSR SPSR_fields, #
- if(armMode > 0x10 && armMode < 0x1f) {
- u32 value = opcode & 0xFF;
- int shift = (opcode & 0xF00) >> 7;
- if(shift) {
- ROR_IMM_MSR;
- }
- if(opcode & 0x00010000)
- reg[17].I = (reg[17].I & 0xFFFFFF00) | (value & 0x000000FF);
- if(opcode & 0x00020000)
- reg[17].I = (reg[17].I & 0xFFFF00FF) | (value & 0x0000FF00);
- if(opcode & 0x00040000)
- reg[17].I = (reg[17].I & 0xFF00FFFF) | (value & 0x00FF0000);
- if(opcode & 0x00080000)
- reg[17].I = (reg[17].I & 0x00FFFFFF) | (value & 0xFF000000);
- }
- }
- break;
- CASE_16(0x400)
- // T versions shouldn't be different on GBA 
- CASE_16(0x420)
- {
- // STR Rd, [Rn], -#
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteMemory(address, reg[dest].I);
- reg[base].I = address - offset;
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- CASE_16(0x480)
- // T versions shouldn't be different on GBA
- CASE_16(0x4a0)
- {
- // STR Rd, [Rn], #
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteMemory(address, reg[dest].I);
- reg[base].I = address + offset;
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- CASE_16(0x500)
- {
- // STR Rd, [Rn, -#]
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- CASE_16(0x520)
- {
- // STR Rd, [Rn, -#]!
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[base].I = address;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- CASE_16(0x580)
- {
- // STR Rd, [Rn, #]
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- CASE_16(0x5a0)
- {
- // STR Rd, [Rn, #]!
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[base].I = address;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- CASE_16(0x410)
- {
- // LDR Rd, [Rn], -#
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I -= offset;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- CASE_16(0x430)
- {
- // LDRT Rd, [Rn], -#
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I -= offset;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- }
- break;
- CASE_16(0x490)
- {
- // LDR Rd, [Rn], #
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I += offset;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- CASE_16(0x4b0)
- {
- // LDRT Rd, [Rn], #
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I += offset;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- }
- break;
- CASE_16(0x510)
- {
- // LDR Rd, [Rn, -#]
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadMemory(address);
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- CASE_16(0x530)
- {
- // LDR Rd, [Rn, -#]!
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- CASE_16(0x590)
- {
- // LDR Rd, [Rn, #]
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadMemory(address);
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- CASE_16(0x5b0)
- {
- // LDR Rd, [Rn, #]!
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- CASE_16(0x440)
- // T versions shouldn't be different on GBA 
- CASE_16(0x460)
- {
- // STRB Rd, [Rn], -#
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteByte(address, reg[dest].B.B0);
- reg[base].I = address - offset;
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- CASE_16(0x4c0)
- // T versions shouldn't be different on GBA
- CASE_16(0x4e0)
- // STRB Rd, [Rn], #
- {
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteByte(address, reg[dest].B.B0);
- reg[base].I = address + offset;
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- CASE_16(0x540)
- {
- // STRB Rd, [Rn, -#]
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- CASE_16(0x560)
- {
- // STRB Rd, [Rn, -#]!
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[base].I = address;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- CASE_16(0x5c0)
- {
- // STRB Rd, [Rn, #]
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- CASE_16(0x5e0)
- {
- // STRB Rd, [Rn, #]!
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[base].I = address;
- CPUWriteByte(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- CASE_16(0x450)
- // T versions shouldn't be different
- CASE_16(0x470)
- {
- // LDRB Rd, [Rn], -#
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I -= offset;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- CASE_16(0x4d0)
- CASE_16(0x4f0) // T versions should not be different
- {
- // LDRB Rd, [Rn], #
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I += offset;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- CASE_16(0x550)
- {
- // LDRB Rd, [Rn, -#]
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadByte(address);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- CASE_16(0x570)
- {
- // LDRB Rd, [Rn, -#]!
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- CASE_16(0x5d0)
- {
- // LDRB Rd, [Rn, #]
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadByte(address);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- CASE_16(0x5f0)
- {
- // LDRB Rd, [Rn, #]!
- int offset = opcode & 0xFFF;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x600:
- case 0x608:
- // T versions are the same
- case 0x620:
- case 0x628:
- {
- // STR Rd, [Rn], -Rm, LSL #
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteMemory(address, reg[dest].I);
- reg[base].I = address - offset;
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x602:
- case 0x60a:
- // T versions are the same
- case 0x622:
- case 0x62a:
- {
- // STR Rd, [Rn], -Rm, LSR #
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteMemory(address, reg[dest].I);
- reg[base].I = address - offset;
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x604:
- case 0x60c:
- // T versions are the same
- case 0x624:
- case 0x62c:
- {
- // STR Rd, [Rn], -Rm, ASR #
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteMemory(address, reg[dest].I);
- reg[base].I = address - offset;
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x606:
- case 0x60e:
- // T versions are the same
- case 0x626:
- case 0x62e:
- {
- // STR Rd, [Rn], -Rm, ROR #
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteMemory(address, reg[dest].I);
- reg[base].I = address - value;
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x680:
- case 0x688:
- // T versions are the same
- case 0x6a0:
- case 0x6a8:
- {
- // STR Rd, [Rn], Rm, LSL #
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteMemory(address, reg[dest].I);
- reg[base].I = address + offset;
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x682:
- case 0x68a:
- // T versions are the same
- case 0x6a2:
- case 0x6aa:
- {
- // STR Rd, [Rn], Rm, LSR #
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteMemory(address, reg[dest].I);
- reg[base].I = address + offset;
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x684:
- case 0x68c:
- // T versions are the same
- case 0x6a4:
- case 0x6ac:
- {
- // STR Rd, [Rn], Rm, ASR #
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteMemory(address, reg[dest].I);
- reg[base].I = address + offset;
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x686:
- case 0x68e:
- // T versions are the same
- case 0x6a6:
- case 0x6ae:
- {
- // STR Rd, [Rn], Rm, ROR #
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteMemory(address, reg[dest].I);
- reg[base].I = address + value;
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x700:
- case 0x708:
- {
- // STR Rd, [Rn, -Rm, LSL #]
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x702:
- case 0x70a:
- {
- // STR Rd, [Rn, -Rm, LSR #]
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x704:
- case 0x70c:
- {
- // STR Rd, [Rn, -Rm, ASR #]
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x706:
- case 0x70e:
- {
- // STR Rd, [Rn, -Rm, ROR #]
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - value;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x720:
- case 0x728:
- {
- // STR Rd, [Rn, -Rm, LSL #]!
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[base].I = address;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x722:
- case 0x72a:
- {
- // STR Rd, [Rn, -Rm, LSR #]!
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[base].I = address; 
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x724:
- case 0x72c:
- {
- // STR Rd, [Rn, -Rm, ASR #]!
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[base].I = address;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x726:
- case 0x72e:
- {
- // STR Rd, [Rn, -Rm, ROR #]!
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - value;
- reg[base].I = address; 
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x780:
- case 0x788:
- {
- // STR Rd, [Rn, Rm, LSL #]
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x782:
- case 0x78a:
- {
- // STR Rd, [Rn, Rm, LSR #]
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x784:
- case 0x78c:
- {
- // STR Rd, [Rn, Rm, ASR #]
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x786:
- case 0x78e:
- {
- // STR Rd, [Rn, Rm, ROR #]
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + value;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x7a0:
- case 0x7a8:
- {
- // STR Rd, [Rn, Rm, LSL #]!
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[base].I = address;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x7a2:
- case 0x7aa:
- {
- // STR Rd, [Rn, Rm, LSR #]!
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[base].I = address; 
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x7a4:
- case 0x7ac:
- {
- // STR Rd, [Rn, Rm, ASR #]!
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[base].I = address;
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x7a6:
- case 0x7ae:
- {
- // STR Rd, [Rn, Rm, ROR #]!
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + value;
- reg[base].I = address; 
- CPUWriteMemory(address, reg[dest].I);
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x610:
- case 0x618:
- // T versions are the same
- case 0x630:
- case 0x638:
- {
- // LDR Rd, [Rn], -Rm, LSL #
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address - offset;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x612:
- case 0x61a:
- // T versions are the same
- case 0x632:
- case 0x63a:
- {
- // LDR Rd, [Rn], -Rm, LSR #
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address - offset;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x614:
- case 0x61c:
- // T versions are the same
- case 0x634:
- case 0x63c:
- {
- // LDR Rd, [Rn], -Rm, ASR #
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address - offset;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x616:
- case 0x61e:
- // T versions are the same
- case 0x636:
- case 0x63e:
- {
- // LDR Rd, [Rn], -Rm, ROR #
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address - value;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x690:
- case 0x698:
- // T versions are the same
- case 0x6b0:
- case 0x6b8:
- {
- // LDR Rd, [Rn], Rm, LSL #
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address + offset;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x692:
- case 0x69a:
- // T versions are the same
- case 0x6b2:
- case 0x6ba:
- {
- // LDR Rd, [Rn], Rm, LSR #
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address + offset;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x694:
- case 0x69c:
- // T versions are the same
- case 0x6b4:
- case 0x6bc:
- {
- // LDR Rd, [Rn], Rm, ASR #
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address + offset;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x696:
- case 0x69e:
- // T versions are the same
- case 0x6b6:
- case 0x6be:
- {
- // LDR Rd, [Rn], Rm, ROR #
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address + value;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x710:
- case 0x718:
- {
- // LDR Rd, [Rn, -Rm, LSL #]
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadMemory(address);
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x712:
- case 0x71a:
- {
- // LDR Rd, [Rn, -Rm, LSR #]
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadMemory(address);
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x714:
- case 0x71c:
- {
- // LDR Rd, [Rn, -Rm, ASR #]
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadMemory(address);
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x716:
- case 0x71e:
- {
- // LDR Rd, [Rn, -Rm, ROR #]
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - value;
- reg[dest].I = CPUReadMemory(address);
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x730:
- case 0x738:
- {
- // LDR Rd, [Rn, -Rm, LSL #]!
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x732:
- case 0x73a:
- {
- // LDR Rd, [Rn, -Rm, LSR #]!
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address; 
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x734:
- case 0x73c:
- {
- // LDR Rd, [Rn, -Rm, ASR #]!
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x736:
- case 0x73e:
- {
- // LDR Rd, [Rn, -Rm, ROR #]!
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - value;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address; 
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x790:
- case 0x798:
- {
- // LDR Rd, [Rn, Rm, LSL #]
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadMemory(address);
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x792:
- case 0x79a:
- {
- // LDR Rd, [Rn, Rm, LSR #]
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadMemory(address);
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x794:
- case 0x79c:
- {
- // LDR Rd, [Rn, Rm, ASR #]
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadMemory(address);
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x796:
- case 0x79e:
- {
- // LDR Rd, [Rn, Rm, ROR #]
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + value;
- reg[dest].I = CPUReadMemory(address);
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x7b0:
- case 0x7b8:
- {
- // LDR Rd, [Rn, Rm, LSL #]!
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x7b2:
- case 0x7ba:
- {
- // LDR Rd, [Rn, Rm, LSR #]!
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address; 
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x7b4:
- case 0x7bc:
- {
- // LDR Rd, [Rn, Rm, ASR #]!
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x7b6:
- case 0x7be:
- {
- // LDR Rd, [Rn, Rm, ROR #]!
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + value;
- reg[dest].I = CPUReadMemory(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess32(address);
- if(dest == 15) {
- clockTicks += 2;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- case 0x640:
- case 0x648:
- // T versions are the same
- case 0x660:
- case 0x668:
- {
- // STRB Rd, [Rn], -Rm, LSL #
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteByte(address, reg[dest].B.B0);
- reg[base].I = address - offset;
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x642:
- case 0x64a:
- // T versions are the same
- case 0x662:
- case 0x66a:
- {
- // STRB Rd, [Rn], -Rm, LSR #
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteByte(address, reg[dest].B.B0);
- reg[base].I = address - offset;
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x644:
- case 0x64c:
- // T versions are the same
- case 0x664:
- case 0x66c:
- {
- // STRB Rd, [Rn], -Rm, ASR #
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteByte(address, reg[dest].B.B0);
- reg[base].I = address - offset;
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x646:
- case 0x64e:
- // T versions are the same
- case 0x666:
- case 0x66e:
- {
- // STRB Rd, [Rn], -Rm, ROR #
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteByte(address, reg[dest].B.B0);
- reg[base].I = address - value;
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x6c0:
- case 0x6c8:
- // T versions are the same
- case 0x6e0:
- case 0x6e8:
- {
- // STRB Rd, [Rn], Rm, LSL #
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteByte(address, reg[dest].B.B0);
- reg[base].I = address + offset;
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x6c2:
- case 0x6ca:
- // T versions are the same
- case 0x6e2:
- case 0x6ea:
- {
- // STRB Rd, [Rn], Rm, LSR #
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteByte(address, reg[dest].B.B0);
- reg[base].I = address + offset;
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x6c4:
- case 0x6cc:
- // T versions are the same
- case 0x6e4:
- case 0x6ec:
- {
- // STR Rd, [Rn], Rm, ASR #
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteByte(address, reg[dest].B.B0);
- reg[base].I = address + offset;
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x6c6:
- case 0x6ce:
- // T versions are the same
- case 0x6e6:
- case 0x6ee:
- {
- // STRB Rd, [Rn], Rm, ROR #
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- CPUWriteByte(address, reg[dest].B.B0);
- reg[base].I = address + value;
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x740:
- case 0x748:
- {
- // STRB Rd, [Rn, -Rm, LSL #]
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x742:
- case 0x74a:
- {
- // STRB Rd, [Rn, -Rm, LSR #]
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x744:
- case 0x74c:
- {
- // STRB Rd, [Rn, -Rm, ASR #]
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x746:
- case 0x74e:
- {
- // STRB Rd, [Rn, -Rm, ROR #]
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - value;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x760:
- case 0x768:
- {
- // STRB Rd, [Rn, -Rm, LSL #]!
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[base].I = address;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x762:
- case 0x76a:
- {
- // STRB Rd, [Rn, -Rm, LSR #]!
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[base].I = address; 
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x764:
- case 0x76c:
- {
- // STRB Rd, [Rn, -Rm, ASR #]!
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[base].I = address;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x766:
- case 0x76e:
- {
- // STRB Rd, [Rn, -Rm, ROR #]!
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - value;
- reg[base].I = address; 
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7c0:
- case 0x7c8:
- {
- // STRB Rd, [Rn, Rm, LSL #]
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7c2:
- case 0x7ca:
- {
- // STRB Rd, [Rn, Rm, LSR #]
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7c4:
- case 0x7cc:
- {
- // STRB Rd, [Rn, Rm, ASR #]
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7c6:
- case 0x7ce:
- {
- // STRB Rd, [Rn, Rm, ROR #]
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + value;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7e0:
- case 0x7e8:
- {
- // STRB Rd, [Rn, Rm, LSL #]!
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[base].I = address;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7e2:
- case 0x7ea:
- {
- // STRB Rd, [Rn, Rm, LSR #]!
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[base].I = address; 
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7e4:
- case 0x7ec:
- {
- // STRB Rd, [Rn, Rm, ASR #]!
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[base].I = address;
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7e6:
- case 0x7ee:
- {
- // STRB Rd, [Rn, Rm, ROR #]!
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + value;
- reg[base].I = address; 
- CPUWriteByte(address, reg[dest].B.B0);
- clockTicks += 2 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x650:
- case 0x658:
- // T versions are the same
- case 0x670:
- case 0x678:
- {
- // LDRB Rd, [Rn], -Rm, LSL #
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address - offset;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x652:
- case 0x65a:
- // T versions are the same
- case 0x672:
- case 0x67a:
- {
- // LDRB Rd, [Rn], -Rm, LSR #
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address - offset;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x654:
- case 0x65c:
- // T versions are the same
- case 0x674:
- case 0x67c:
- {
- // LDRB Rd, [Rn], -Rm, ASR #
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address - offset;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x656:
- case 0x65e:
- // T versions are the same
- case 0x676:
- case 0x67e:
- {
- // LDRB Rd, [Rn], -Rm, ROR #
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address - value;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x6d0:
- case 0x6d8:
- // T versions are the same
- case 0x6f0:
- case 0x6f8:
- {
- // LDRB Rd, [Rn], Rm, LSL #
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address + offset;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x6d2:
- case 0x6da:
- // T versions are the same
- case 0x6f2:
- case 0x6fa:
- {
- // LDRB Rd, [Rn], Rm, LSR #
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address + offset;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x6d4:
- case 0x6dc:
- // T versions are the same
- case 0x6f4:
- case 0x6fc:
- {
- // LDRB Rd, [Rn], Rm, ASR #
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address + offset;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x6d6:
- case 0x6de:
- // T versions are the same
- case 0x6f6:
- case 0x6fe:
- {
- // LDRB Rd, [Rn], Rm, ROR #
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address + value;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x750:
- case 0x758:
- {
- // LDRB Rd, [Rn, -Rm, LSL #]
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadByte(address);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x752:
- case 0x75a:
- {
- // LDRB Rd, [Rn, -Rm, LSR #]
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadByte(address);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x754:
- case 0x75c:
- {
- // LDRB Rd, [Rn, -Rm, ASR #]
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadByte(address);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x756:
- case 0x75e:
- {
- // LDRB Rd, [Rn, -Rm, ROR #]
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - value;
- reg[dest].I = CPUReadByte(address);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x770:
- case 0x778:
- {
- // LDRB Rd, [Rn, -Rm, LSL #]!
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x772:
- case 0x77a:
- {
- // LDRB Rd, [Rn, -Rm, LSR #]!
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address; 
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x774:
- case 0x77c:
- {
- // LDRB Rd, [Rn, -Rm, ASR #]!
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - offset;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x776:
- case 0x77e:
- {
- // LDRB Rd, [Rn, -Rm, ROR #]!
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I - value;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address; 
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7d0:
- case 0x7d8:
- {
- // LDRB Rd, [Rn, Rm, LSL #]
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadByte(address);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7d2:
- case 0x7da:
- {
- // LDRB Rd, [Rn, Rm, LSR #]
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadByte(address);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7d4:
- case 0x7dc:
- {
- // LDRB Rd, [Rn, Rm, ASR #]
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadByte(address);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7d6:
- case 0x7de:
- {
- // LDRB Rd, [Rn, Rm, ROR #]
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + value;
- reg[dest].I = CPUReadByte(address);
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7f0:
- case 0x7f8:
- {
- // LDRB Rd, [Rn, Rm, LSL #]!
- int offset = reg[opcode & 15].I << ((opcode>>7)& 31);
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7f2:
- case 0x7fa:
- {
- // LDRB Rd, [Rn, Rm, LSR #]!
- int shift = (opcode >> 7) & 31;
- int offset = shift ? reg[opcode & 15].I >> shift : 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address; 
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7f4:
- case 0x7fc:
- {
- // LDRB Rd, [Rn, Rm, ASR #]!
- int shift = (opcode >> 7) & 31;
- int offset;
- if(shift)
- offset = (int)((s32)reg[opcode & 15].I >> shift);
- else if(reg[opcode & 15].I & 0x80000000)
- offset = 0xFFFFFFFF;
- else
- offset = 0;
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + offset;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address;
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x7f6:
- case 0x7fe:
- {
- // LDRB Rd, [Rn, Rm, ROR #]!
- int shift = (opcode >> 7) & 31;
- u32 value = reg[opcode & 15].I;
- if(shift) {
- ROR_VALUE;
- } else {
- RCR_VALUE;
- }
- int dest = (opcode >> 12) & 15;
- int base = (opcode >> 16) & 15;
- u32 address = reg[base].I + value;
- reg[dest].I = CPUReadByte(address);
- if(dest != base)
- reg[base].I = address; 
- clockTicks += 3 + CPUUpdateTicksAccess16(address);
- }
- break;
-#define STMW_REG(val,num) \
- if(opcode & (val)) {\
- CPUWriteMemory(address, reg[(num)].I);\
- if(!offset) {\
- reg[base].I = temp;\
- clockTicks += 1 + CPUUpdateTicksAccess32(address);\
- offset = 1;\
- } else {\
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);\
- }\
- address += 4;\
- }
-#define STM_REG(val,num) \
- if(opcode & (val)) {\
- CPUWriteMemory(address, reg[(num)].I);\
- if(!offset) {\
- clockTicks += 1 + CPUUpdateTicksAccess32(address);\
- offset = 1;\
- } else {\
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);\
- }\
- address += 4;\
- }
- 
- CASE_16(0x800)
- // STMDA Rn, {Rlist}
- {
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = (temp + 4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- STM_REG(1, 0);
- STM_REG(2, 1);
- STM_REG(4, 2);
- STM_REG(8, 3);
- STM_REG(16, 4);
- STM_REG(32, 5);
- STM_REG(64, 6);
- STM_REG(128, 7);
- STM_REG(256, 8);
- STM_REG(512, 9);
- STM_REG(1024, 10);
- STM_REG(2048, 11);
- STM_REG(4096, 12);
- STM_REG(8192, 13);
- STM_REG(16384, 14);
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset)
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- }
- }
- break;
- CASE_16(0x820)
- {
- // STMDA Rn!, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = (temp+4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
-
- STMW_REG(1, 0);
- STMW_REG(2, 1);
- STMW_REG(4, 2);
- STMW_REG(8, 3);
- STMW_REG(16, 4);
- STMW_REG(32, 5);
- STMW_REG(64, 6);
- STMW_REG(128, 7);
- STMW_REG(256, 8);
- STMW_REG(512, 9);
- STMW_REG(1024, 10);
- STMW_REG(2048, 11);
- STMW_REG(4096, 12);
- STMW_REG(8192, 13);
- STMW_REG(16384, 14);
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset)
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- reg[base].I = temp;
- }
- }
- break;
- CASE_16(0x840)
- {
- // STMDA Rn, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = (temp+4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
-
- STM_REG(1, 0);
- STM_REG(2, 1);
- STM_REG(4, 2);
- STM_REG(8, 3);
- STM_REG(16, 4);
- STM_REG(32, 5);
- STM_REG(64, 6);
- STM_REG(128, 7);
-
- if(armMode == 0x11) {
- STM_REG(256, R8_FIQ);
- STM_REG(512, R9_FIQ);
- STM_REG(1024, R10_FIQ);
- STM_REG(2048, R11_FIQ);
- STM_REG(4096, R12_FIQ);
- } else {
- STM_REG(256, 8);
- STM_REG(512, 9);
- STM_REG(1024, 10);
- STM_REG(2048, 11);
- STM_REG(4096, 12);
- }
-
- if(armMode != 0x10 && armMode != 0x1f) {
- STM_REG(8192, R13_USR);
- STM_REG(16384, R14_USR);
- } else {
- STM_REG(8192, 13);
- STM_REG(16384, 14);
- }
-
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset)
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- }
- }
- break;
- CASE_16(0x860)
- {
- // STMDA Rn!, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = (temp+4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
-
- STMW_REG(1, 0);
- STMW_REG(2, 1);
- STMW_REG(4, 2);
- STMW_REG(8, 3);
- STMW_REG(16, 4);
- STMW_REG(32, 5);
- STMW_REG(64, 6);
- STMW_REG(128, 7);
-
- if(armMode == 0x11) {
- STMW_REG(256, R8_FIQ);
- STMW_REG(512, R9_FIQ);
- STMW_REG(1024, R10_FIQ);
- STMW_REG(2048, R11_FIQ);
- STMW_REG(4096, R12_FIQ);
- } else {
- STMW_REG(256, 8);
- STMW_REG(512, 9);
- STMW_REG(1024, 10);
- STMW_REG(2048, 11);
- STMW_REG(4096, 12);
- }
-
- if(armMode != 0x10 && armMode != 0x1f) {
- STMW_REG(8192, R13_USR);
- STMW_REG(16384, R14_USR);
- } else {
- STMW_REG(8192, 13);
- STMW_REG(16384, 14);
- }
-
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset)
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- reg[base].I = temp;
- }
- }
- break;
- 
- CASE_16(0x880)
- {
- // STMIA Rn, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 address = reg[base].I & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- STM_REG(1, 0);
- STM_REG(2, 1);
- STM_REG(4, 2);
- STM_REG(8, 3);
- STM_REG(16, 4);
- STM_REG(32, 5);
- STM_REG(64, 6);
- STM_REG(128, 7);
- STM_REG(256, 8);
- STM_REG(512, 9);
- STM_REG(1024, 10);
- STM_REG(2048, 11);
- STM_REG(4096, 12);
- STM_REG(8192, 13);
- STM_REG(16384, 14);
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset)
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- }
- }
- break;
- CASE_16(0x8a0)
- {
- // STMIA Rn!, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 address = reg[base].I & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- u32 temp = reg[base].I + 4*(cpuBitsSet[opcode & 0xFF] +
- cpuBitsSet[(opcode >> 8) & 255]);
- STMW_REG(1, 0);
- STMW_REG(2, 1);
- STMW_REG(4, 2);
- STMW_REG(8, 3);
- STMW_REG(16, 4);
- STMW_REG(32, 5);
- STMW_REG(64, 6);
- STMW_REG(128, 7);
- STMW_REG(256, 8);
- STMW_REG(512, 9);
- STMW_REG(1024, 10);
- STMW_REG(2048, 11);
- STMW_REG(4096, 12);
- STMW_REG(8192, 13);
- STMW_REG(16384, 14);
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset) {
- reg[base].I = temp;
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- } else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- }
- }
- break;
- CASE_16(0x8c0)
- {
- // STMIA Rn, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 address = reg[base].I & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- STM_REG(1, 0);
- STM_REG(2, 1);
- STM_REG(4, 2);
- STM_REG(8, 3);
- STM_REG(16, 4);
- STM_REG(32, 5);
- STM_REG(64, 6);
- STM_REG(128, 7);
- if(armMode == 0x11) {
- STM_REG(256, R8_FIQ);
- STM_REG(512, R9_FIQ);
- STM_REG(1024, R10_FIQ);
- STM_REG(2048, R11_FIQ);
- STM_REG(4096, R12_FIQ);
- } else {
- STM_REG(256, 8);
- STM_REG(512, 9);
- STM_REG(1024, 10);
- STM_REG(2048, 11);
- STM_REG(4096, 12); 
- }
- if(armMode != 0x10 && armMode != 0x1f) {
- STM_REG(8192, R13_USR);
- STM_REG(16384, R14_USR);
- } else {
- STM_REG(8192, 13);
- STM_REG(16384, 14);
- }
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset)
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- }
- }
- break;
- CASE_16(0x8e0)
- {
- // STMIA Rn!, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 address = reg[base].I & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- u32 temp = reg[base].I + 4*(cpuBitsSet[opcode & 0xFF] +
- cpuBitsSet[(opcode >> 8) & 255]); 
- STMW_REG(1, 0);
- STMW_REG(2, 1);
- STMW_REG(4, 2);
- STMW_REG(8, 3);
- STMW_REG(16, 4);
- STMW_REG(32, 5);
- STMW_REG(64, 6);
- STMW_REG(128, 7);
- if(armMode == 0x11) {
- STMW_REG(256, R8_FIQ);
- STMW_REG(512, R9_FIQ);
- STMW_REG(1024, R10_FIQ);
- STMW_REG(2048, R11_FIQ);
- STMW_REG(4096, R12_FIQ);
- } else {
- STMW_REG(256, 8);
- STMW_REG(512, 9);
- STMW_REG(1024, 10);
- STMW_REG(2048, 11);
- STMW_REG(4096, 12); 
- }
- if(armMode != 0x10 && armMode != 0x1f) {
- STMW_REG(8192, R13_USR);
- STMW_REG(16384, R14_USR);
- } else {
- STMW_REG(8192, 13);
- STMW_REG(16384, 14);
- }
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset) {
- reg[base].I = temp;
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- } else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- }
- }
- break;
- 
- CASE_16(0x900)
- {
- // STMDB Rn, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = temp & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- STM_REG(1, 0);
- STM_REG(2, 1);
- STM_REG(4, 2);
- STM_REG(8, 3);
- STM_REG(16, 4);
- STM_REG(32, 5);
- STM_REG(64, 6);
- STM_REG(128, 7);
- STM_REG(256, 8);
- STM_REG(512, 9);
- STM_REG(1024, 10);
- STM_REG(2048, 11);
- STM_REG(4096, 12);
- STM_REG(8192, 13);
- STM_REG(16384, 14);
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset)
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- }
- }
- break;
- CASE_16(0x920)
- {
- // STMDB Rn!, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = temp & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
-
- STMW_REG(1, 0);
- STMW_REG(2, 1);
- STMW_REG(4, 2);
- STMW_REG(8, 3);
- STMW_REG(16, 4);
- STMW_REG(32, 5);
- STMW_REG(64, 6);
- STMW_REG(128, 7);
- STMW_REG(256, 8);
- STMW_REG(512, 9);
- STMW_REG(1024, 10);
- STMW_REG(2048, 11);
- STMW_REG(4096, 12);
- STMW_REG(8192, 13);
- STMW_REG(16384, 14);
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset)
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- reg[base].I = temp;
- }
- }
- break;
- CASE_16(0x940)
- {
- // STMDB Rn, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = temp & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
-
- STM_REG(1, 0);
- STM_REG(2, 1);
- STM_REG(4, 2);
- STM_REG(8, 3);
- STM_REG(16, 4);
- STM_REG(32, 5);
- STM_REG(64, 6);
- STM_REG(128, 7);
-
- if(armMode == 0x11) {
- STM_REG(256, R8_FIQ);
- STM_REG(512, R9_FIQ);
- STM_REG(1024, R10_FIQ);
- STM_REG(2048, R11_FIQ);
- STM_REG(4096, R12_FIQ);
- } else {
- STM_REG(256, 8);
- STM_REG(512, 9);
- STM_REG(1024, 10);
- STM_REG(2048, 11);
- STM_REG(4096, 12);
- }
-
- if(armMode != 0x10 && armMode != 0x1f) {
- STM_REG(8192, R13_USR);
- STM_REG(16384, R14_USR);
- } else {
- STM_REG(8192, 13);
- STM_REG(16384, 14);
- }
-
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset)
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- }
- }
- break;
- CASE_16(0x960)
- {
- // STMDB Rn!, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = temp & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
-
- STMW_REG(1, 0);
- STMW_REG(2, 1);
- STMW_REG(4, 2);
- STMW_REG(8, 3);
- STMW_REG(16, 4);
- STMW_REG(32, 5);
- STMW_REG(64, 6);
- STMW_REG(128, 7);
-
- if(armMode == 0x11) {
- STMW_REG(256, R8_FIQ);
- STMW_REG(512, R9_FIQ);
- STMW_REG(1024, R10_FIQ);
- STMW_REG(2048, R11_FIQ);
- STMW_REG(4096, R12_FIQ);
- } else {
- STMW_REG(256, 8);
- STMW_REG(512, 9);
- STMW_REG(1024, 10);
- STMW_REG(2048, 11);
- STMW_REG(4096, 12);
- }
-
- if(armMode != 0x10 && armMode != 0x1f) {
- STMW_REG(8192, R13_USR);
- STMW_REG(16384, R14_USR);
- } else {
- STMW_REG(8192, 13);
- STMW_REG(16384, 14);
- }
-
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset)
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- reg[base].I = temp;
- }
- }
- break;
-
- CASE_16(0x980)
- // STMIB Rn, {Rlist}
- {
- int base = (opcode & 0x000F0000) >> 16;
- u32 address = (reg[base].I+4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- STM_REG(1, 0);
- STM_REG(2, 1);
- STM_REG(4, 2);
- STM_REG(8, 3);
- STM_REG(16, 4);
- STM_REG(32, 5);
- STM_REG(64, 6);
- STM_REG(128, 7);
- STM_REG(256, 8);
- STM_REG(512, 9);
- STM_REG(1024, 10);
- STM_REG(2048, 11);
- STM_REG(4096, 12);
- STM_REG(8192, 13);
- STM_REG(16384, 14);
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset)
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- }
- }
- break;
- CASE_16(0x9a0)
- {
- // STMIB Rn!, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 address = (reg[base].I+4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- u32 temp = reg[base].I + 4*(cpuBitsSet[opcode & 0xFF] +
- cpuBitsSet[(opcode >> 8) & 255]);
- STMW_REG(1, 0);
- STMW_REG(2, 1);
- STMW_REG(4, 2);
- STMW_REG(8, 3);
- STMW_REG(16, 4);
- STMW_REG(32, 5);
- STMW_REG(64, 6);
- STMW_REG(128, 7);
- STMW_REG(256, 8);
- STMW_REG(512, 9);
- STMW_REG(1024, 10);
- STMW_REG(2048, 11);
- STMW_REG(4096, 12);
- STMW_REG(8192, 13);
- STMW_REG(16384, 14);
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset) {
- reg[base].I = temp;
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- } else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- }
- }
- break;
- CASE_16(0x9c0)
- {
- // STMIB Rn, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 address = (reg[base].I+4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- STM_REG(1, 0);
- STM_REG(2, 1);
- STM_REG(4, 2);
- STM_REG(8, 3);
- STM_REG(16, 4);
- STM_REG(32, 5);
- STM_REG(64, 6);
- STM_REG(128, 7);
- if(armMode == 0x11) {
- STM_REG(256, R8_FIQ);
- STM_REG(512, R9_FIQ);
- STM_REG(1024, R10_FIQ);
- STM_REG(2048, R11_FIQ);
- STM_REG(4096, R12_FIQ);
- } else {
- STM_REG(256, 8);
- STM_REG(512, 9);
- STM_REG(1024, 10);
- STM_REG(2048, 11);
- STM_REG(4096, 12); 
- }
- if(armMode != 0x10 && armMode != 0x1f) {
- STM_REG(8192, R13_USR);
- STM_REG(16384, R14_USR);
- } else {
- STM_REG(8192, 13);
- STM_REG(16384, 14);
- }
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset)
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- }
- }
- break;
- CASE_16(0x9e0)
- {
- // STMIB Rn!, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 address = (reg[base].I+4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- u32 temp = reg[base].I + 4*(cpuBitsSet[opcode & 0xFF] +
- cpuBitsSet[(opcode >> 8) & 255]); 
- STMW_REG(1, 0);
- STMW_REG(2, 1);
- STMW_REG(4, 2);
- STMW_REG(8, 3);
- STMW_REG(16, 4);
- STMW_REG(32, 5);
- STMW_REG(64, 6);
- STMW_REG(128, 7);
- if(armMode == 0x11) {
- STMW_REG(256, R8_FIQ);
- STMW_REG(512, R9_FIQ);
- STMW_REG(1024, R10_FIQ);
- STMW_REG(2048, R11_FIQ);
- STMW_REG(4096, R12_FIQ);
- } else {
- STMW_REG(256, 8);
- STMW_REG(512, 9);
- STMW_REG(1024, 10);
- STMW_REG(2048, 11);
- STMW_REG(4096, 12); 
- }
- if(armMode != 0x10 && armMode != 0x1f) {
- STMW_REG(8192, R13_USR);
- STMW_REG(16384, R14_USR);
- } else {
- STMW_REG(8192, 13);
- STMW_REG(16384, 14);
- }
- if(opcode & 32768) {
- CPUWriteMemory(address, reg[15].I+4);
- if(!offset) {
- reg[base].I = temp;
- clockTicks += 1 + CPUUpdateTicksAccess32(address);
- } else
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);
- }
- }
- break;
- 
-#define LDM_REG(val,num) \
- if(opcode & (val)) {\
- reg[(num)].I = CPUReadMemory(address);\
- if(offset)\
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);\
- else {\
- clockTicks += 1 + CPUUpdateTicksAccess32(address);\
- offset = 1;\
- }\
- address += 4;\
- }
-
- CASE_16(0x810)
- {
- // LDMDA Rn, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = (temp + 4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- if(opcode & 32768) {
- reg[15].I = CPUReadMemory(address);
- if (!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- CASE_16(0x830)
- {
- // LDMDA Rn!, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = (temp + 4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- if(opcode & 32768) {
- reg[15].I = CPUReadMemory(address);
- if (!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- if(!(opcode & (1 << base)))
- reg[base].I = temp;
- }
- break;
- CASE_16(0x850)
- {
- // LDMDA Rn, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = (temp + 4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- if(opcode & 0x8000) {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
-
- reg[15].I = CPUReadMemory(address);
- if (!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
-
- CPUSwitchMode(reg[17].I & 0x1f, false);
- if(armState) {
- armNextPC = reg[15].I & 0xFFFFFFFC;
- reg[15].I = armNextPC + 4;
- } else {
- armNextPC = reg[15].I & 0xFFFFFFFE;
- reg[15].I = armNextPC + 2;
- }
- } else {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
-
- if(armMode == 0x11) {
- LDM_REG(256, R8_FIQ);
- LDM_REG(512, R9_FIQ);
- LDM_REG(1024, R10_FIQ);
- LDM_REG(2048, R11_FIQ);
- LDM_REG(4096, R12_FIQ);
- } else {
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- }
-
- if(armMode != 0x10 && armMode != 0x1f) {
- LDM_REG(8192, R13_USR);
- LDM_REG(16384, R14_USR);
- } else {
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- }
- }
- }
- break;
- CASE_16(0x870)
- {
- // LDMDA Rn!, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = (temp + 4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- if(opcode & 0x8000) {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
-
- reg[15].I = CPUReadMemory(address);
- if(!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address); 
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
-
- if(!(opcode & (1 << base))) 
- reg[base].I = temp;
-
- CPUSwitchMode(reg[17].I & 0x1f, false);
- if(armState) {
- armNextPC = reg[15].I & 0xFFFFFFFC;
- reg[15].I = armNextPC + 4;
- } else {
- armNextPC = reg[15].I & 0xFFFFFFFE;
- reg[15].I = armNextPC + 2;
- }
- } else {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
-
- if(armMode == 0x11) {
- LDM_REG(256, R8_FIQ);
- LDM_REG(512, R9_FIQ);
- LDM_REG(1024, R10_FIQ);
- LDM_REG(2048, R11_FIQ);
- LDM_REG(4096, R12_FIQ);
- } else {
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- }
-
- if(armMode != 0x10 && armMode != 0x1f) {
- LDM_REG(8192, R13_USR);
- LDM_REG(16384, R14_USR);
- } else {
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- }
-
- if(!(opcode & (1 << base))) 
- reg[base].I = temp;
- }
- }
- break;
- 
- CASE_16(0x890)
- {
- // LDMIA Rn, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 address = reg[base].I & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- if(opcode & 32768) {
- reg[15].I = CPUReadMemory(address);
- if (!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- CASE_16(0x8b0)
- {
- // LDMIA Rn!, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I + 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = reg[base].I & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- if(opcode & 32768) {
- reg[15].I = CPUReadMemory(address);
- if (!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- if(!(opcode & (1 << base)))
- reg[base].I = temp;
- }
- break;
- CASE_16(0x8d0)
- {
- // LDMIA Rn, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 address = reg[base].I & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- if(opcode & 0x8000) {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
-
- reg[15].I = CPUReadMemory(address);
- if (!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
-
- CPUSwitchMode(reg[17].I & 0x1f, false);
- if(armState) {
- armNextPC = reg[15].I & 0xFFFFFFFC;
- reg[15].I = armNextPC + 4;
- } else {
- armNextPC = reg[15].I & 0xFFFFFFFE;
- reg[15].I = armNextPC + 2;
- }
- } else {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
-
- if(armMode == 0x11) {
- LDM_REG(256, R8_FIQ);
- LDM_REG(512, R9_FIQ);
- LDM_REG(1024, R10_FIQ);
- LDM_REG(2048, R11_FIQ);
- LDM_REG(4096, R12_FIQ);
- } else {
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- }
-
- if(armMode != 0x10 && armMode != 0x1f) {
- LDM_REG(8192, R13_USR);
- LDM_REG(16384, R14_USR);
- } else {
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- }
- }
- }
- break;
- CASE_16(0x8f0)
- {
- // LDMIA Rn!, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I +
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = reg[base].I & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- if(opcode & 0x8000) {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
-
- reg[15].I = CPUReadMemory(address);
- if(!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address); 
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
-
- if(!(opcode & (1 << base))) 
- reg[base].I = temp;
-
- CPUSwitchMode(reg[17].I & 0x1f, false);
- if(armState) {
- armNextPC = reg[15].I & 0xFFFFFFFC;
- reg[15].I = armNextPC + 4;
- } else {
- armNextPC = reg[15].I & 0xFFFFFFFE;
- reg[15].I = armNextPC + 2;
- }
- } else {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
-
- if(armMode == 0x11) {
- LDM_REG(256, R8_FIQ);
- LDM_REG(512, R9_FIQ);
- LDM_REG(1024, R10_FIQ);
- LDM_REG(2048, R11_FIQ);
- LDM_REG(4096, R12_FIQ);
- } else {
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- }
-
- if(armMode != 0x10 && armMode != 0x1f) {
- LDM_REG(8192, R13_USR);
- LDM_REG(16384, R14_USR);
- } else {
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- }
-
- if(!(opcode & (1 << base))) 
- reg[base].I = temp;
- }
- }
- break;
- 
- CASE_16(0x910)
- {
- // LDMDB Rn, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = temp & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- if(opcode & 32768) {
- reg[15].I = CPUReadMemory(address);
- if (!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- CASE_16(0x930)
- {
- // LDMDB Rn!, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = temp & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- if(opcode & 32768) {
- reg[15].I = CPUReadMemory(address);
- if (!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- if(!(opcode & (1 << base)))
- reg[base].I = temp;
- }
- break;
- CASE_16(0x950)
- {
- // LDMDB Rn, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = temp & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- if(opcode & 0x8000) {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
-
- reg[15].I = CPUReadMemory(address);
- if (!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
-
- CPUSwitchMode(reg[17].I & 0x1f, false);
- if(armState) {
- armNextPC = reg[15].I & 0xFFFFFFFC;
- reg[15].I = armNextPC + 4;
- } else {
- armNextPC = reg[15].I & 0xFFFFFFFE;
- reg[15].I = armNextPC + 2;
- }
- } else {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
-
- if(armMode == 0x11) {
- LDM_REG(256, R8_FIQ);
- LDM_REG(512, R9_FIQ);
- LDM_REG(1024, R10_FIQ);
- LDM_REG(2048, R11_FIQ);
- LDM_REG(4096, R12_FIQ);
- } else {
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- }
-
- if(armMode != 0x10 && armMode != 0x1f) {
- LDM_REG(8192, R13_USR);
- LDM_REG(16384, R14_USR);
- } else {
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- }
- }
- }
- break;
- CASE_16(0x970)
- {
- // LDMDB Rn!, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I - 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = temp & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- if(opcode & 0x8000) {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
-
- reg[15].I = CPUReadMemory(address);
- if(!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address); 
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
-
- if(!(opcode & (1 << base))) 
- reg[base].I = temp;
-
- CPUSwitchMode(reg[17].I & 0x1f, false);
- if(armState) {
- armNextPC = reg[15].I & 0xFFFFFFFC;
- reg[15].I = armNextPC + 4;
- } else {
- armNextPC = reg[15].I & 0xFFFFFFFE;
- reg[15].I = armNextPC + 2;
- }
- } else {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
-
- if(armMode == 0x11) {
- LDM_REG(256, R8_FIQ);
- LDM_REG(512, R9_FIQ);
- LDM_REG(1024, R10_FIQ);
- LDM_REG(2048, R11_FIQ);
- LDM_REG(4096, R12_FIQ);
- } else {
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- }
-
- if(armMode != 0x10 && armMode != 0x1f) {
- LDM_REG(8192, R13_USR);
- LDM_REG(16384, R14_USR);
- } else {
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- }
-
- if(!(opcode & (1 << base))) 
- reg[base].I = temp;
- }
- }
- break;
- 
- CASE_16(0x990)
- {
- // LDMIB Rn, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 address = (reg[base].I+4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- if(opcode & 32768) {
- reg[15].I = CPUReadMemory(address);
- if (!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- }
- break;
- CASE_16(0x9b0)
- {
- // LDMIB Rn!, {Rlist}
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I + 
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = (reg[base].I+4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- if(opcode & 32768) {
- reg[15].I = CPUReadMemory(address);
- if (!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- if(!(opcode & (1 << base)))
- reg[base].I = temp;
- }
- break; 
- CASE_16(0x9d0)
- {
- // LDMIB Rn, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 address = (reg[base].I+4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- if(opcode & 0x8000) {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
-
- reg[15].I = CPUReadMemory(address);
- if (!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address);
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
-
- CPUSwitchMode(reg[17].I & 0x1f, false);
- if(armState) {
- armNextPC = reg[15].I & 0xFFFFFFFC;
- reg[15].I = armNextPC + 4;
- } else {
- armNextPC = reg[15].I & 0xFFFFFFFE;
- reg[15].I = armNextPC + 2;
- }
- } else {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
-
- if(armMode == 0x11) {
- LDM_REG(256, R8_FIQ);
- LDM_REG(512, R9_FIQ);
- LDM_REG(1024, R10_FIQ);
- LDM_REG(2048, R11_FIQ);
- LDM_REG(4096, R12_FIQ);
- } else {
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- }
-
- if(armMode != 0x10 && armMode != 0x1f) {
- LDM_REG(8192, R13_USR);
- LDM_REG(16384, R14_USR);
- } else {
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- }
- }
- }
- break;
- CASE_16(0x9f0)
- {
- // LDMIB Rn!, {Rlist}^
- int base = (opcode & 0x000F0000) >> 16;
- u32 temp = reg[base].I +
- 4 * (cpuBitsSet[opcode & 255] + cpuBitsSet[(opcode >> 8) & 255]);
- u32 address = (reg[base].I+4) & 0xFFFFFFFC;
- clockTicks += 2;
- int offset = 0;
- if(opcode & 0x8000) {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
-
- reg[15].I = CPUReadMemory(address);
- if(!offset)
- clockTicks += 2 + CPUUpdateTicksAccess32(address); 
- else
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);
-
- if(!(opcode & (1 << base))) 
- reg[base].I = temp;
-
- CPUSwitchMode(reg[17].I & 0x1f, false);
- if(armState) {
- armNextPC = reg[15].I & 0xFFFFFFFC;
- reg[15].I = armNextPC + 4;
- } else {
- armNextPC = reg[15].I & 0xFFFFFFFE;
- reg[15].I = armNextPC + 2;
- }
- } else {
- LDM_REG(1, 0);
- LDM_REG(2, 1);
- LDM_REG(4, 2);
- LDM_REG(8, 3);
- LDM_REG(16, 4);
- LDM_REG(32, 5);
- LDM_REG(64, 6);
- LDM_REG(128, 7);
-
- if(armMode == 0x11) {
- LDM_REG(256, R8_FIQ);
- LDM_REG(512, R9_FIQ);
- LDM_REG(1024, R10_FIQ);
- LDM_REG(2048, R11_FIQ);
- LDM_REG(4096, R12_FIQ);
- } else {
- LDM_REG(256, 8);
- LDM_REG(512, 9);
- LDM_REG(1024, 10);
- LDM_REG(2048, 11);
- LDM_REG(4096, 12);
- }
-
- if(armMode != 0x10 && armMode != 0x1f) {
- LDM_REG(8192, R13_USR);
- LDM_REG(16384, R14_USR);
- } else {
- LDM_REG(8192, 13);
- LDM_REG(16384, 14);
- }
-
- if(!(opcode & (1 << base))) 
- reg[base].I = temp;
- }
- }
- break; 
- CASE_256(0xa00)
- {
- // B <offset>
- clockTicks += 3;
- int offset = opcode & 0x00FFFFFF;
- if(offset & 0x00800000) {
- offset |= 0xFF000000;
- }
- offset <<= 2;
- reg[15].I += offset;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- break;
- CASE_256(0xb00)
- {
- // BL <offset>
- clockTicks += 3;
- int offset = opcode & 0x00FFFFFF;
- if(offset & 0x00800000) {
- offset |= 0xFF000000;
- }
- offset <<= 2;
- reg[14].I = reg[15].I - 4;
- reg[15].I += offset;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- break;
- CASE_256(0xf00)
- // SWI <comment>
- clockTicks += 3;
- CPUSoftwareInterrupt(opcode & 0x00FFFFFF); 
- break;
-#ifdef GP_SUPPORT
- case 0xe11:
- case 0xe13:
- case 0xe15:
- case 0xe17:
- case 0xe19:
- case 0xe1b:
- case 0xe1d:
- case 0xe1f:
- // MRC
- break;
- case 0xe01:
- case 0xe03:
- case 0xe05:
- case 0xe07:
- case 0xe09:
- case 0xe0b:
- case 0xe0d:
- case 0xe0f:
- // MRC
- break; 
-#endif
- default:
-#ifdef DEV_VERSION
- if(systemVerbose & VERBOSE_UNDEFINED)
- log("Undefined ARM instruction %08x at %08x\n", opcode,
- armNextPC-4);
-#endif
- CPUUndefinedException();
- break;
- // END
- }
-}

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/bios.h Deleted

@@ -1,46 +0,0 @@
-// -*- C++ -*-
-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
-// Copyright (C) 1999-2003 Forgotten
-// Copyright (C) 2004 Forgotten and the VBA 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; either version 2, 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.
-
-#ifndef VBA_BIOS_H
-#define VBA_BIOS_H
-
-extern void BIOS_ArcTan();
-extern void BIOS_ArcTan2();
-extern void BIOS_BitUnPack();
-extern void BIOS_BgAffineSet();
-extern void BIOS_CpuSet();
-extern void BIOS_CpuFastSet();
-extern void BIOS_Diff8bitUnFilterWram();
-extern void BIOS_Diff8bitUnFilterVram();
-extern void BIOS_Diff16bitUnFilter();
-extern void BIOS_Div();
-extern void BIOS_DivARM();
-extern void BIOS_HuffUnComp();
-//extern void BIOS_LZ77UnCompVram();
-extern void BIOS_LZ77UnCompWram();
-extern void BIOS_ObjAffineSet();
-extern void BIOS_RegisterRamReset();
-extern void BIOS_RegisterRamReset(u32);
-//extern void BIOS_RLUnCompVram();
-extern void BIOS_RLUnCompWram();
-extern void BIOS_SoftReset();
-extern void BIOS_Sqrt();
-extern void BIOS_MidiKey2Freq();
-extern void BIOS_SndDriverJmpTableCopy();
-#endif // VBA_BIOS_H

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/getopt1.c Deleted

@@ -1,190 +0,0 @@
-/* getopt_long and getopt_long_only entry points for GNU getopt.
- Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
- Free Software Foundation, Inc.
-
- NOTE: This source is derived from an old version taken from the GNU C
- Library (glibc).
-
- 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, 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. */
-&#xc;
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "getopt.h"
-
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
-#ifndef const
-#define const
-#endif
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
- Library, but also included in many other GNU distributions. Compiling
- and linking in this code is a waste when using the GNU C library
- (especially if it is a shared library). Rather than having every GNU
- program understand `configure --with-gnu-libc' and omit the object files,
- it is simpler to just do this in the source for each such file. */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
-#include <gnu-versions.h>
-#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-#define ELIDE_CODE
-#endif
-#endif
-
-#ifndef ELIDE_CODE
-
-
-/* This needs to come after some library #include
- to get __GNU_LIBRARY__ defined. */
-#ifdef __GNU_LIBRARY__
-#include <stdlib.h>
-#endif
-
-#ifndef	NULL
-#define NULL 0
-#endif
-
-int
-getopt_long (argc, argv, options, long_options, opt_index)
- int argc;
- char *const *argv;
- const char *options;
- const struct option *long_options;
- int *opt_index;
-{
- return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
-}
-
-/* Like getopt_long, but '-' as well as '--' can indicate a long option.
- If an option that starts with '-' (not '--') doesn't match a long option,
- but does match a short option, it is parsed as a short option
- instead. */
-
-int
-getopt_long_only (argc, argv, options, long_options, opt_index)
- int argc;
- char *const *argv;
- const char *options;
- const struct option *long_options;
- int *opt_index;
-{
- return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
-}
-
-
-#endif	/* Not ELIDE_CODE. */
-&#xc;
-#ifdef TEST
-
-#include <stdio.h>
-
-int
-main (argc, argv)
- int argc;
- char **argv;
-{
- int c;
- int digit_optind = 0;
-
- while (1)
- {
- int this_option_optind = optind ? optind : 1;
- int option_index = 0;
- static struct option long_options[] =
- {
-	{"add", 1, 0, 0},
-	{"append", 0, 0, 0},
-	{"delete", 1, 0, 0},
-	{"verbose", 0, 0, 0},
-	{"create", 0, 0, 0},
-	{"file", 1, 0, 0},
-	{0, 0, 0, 0}
- };
-
- c = getopt_long (argc, argv, "abc:d:0123456789",
-		 long_options, &option_index);
- if (c == -1)
-	break;
-
- switch (c)
-	{
-	case 0:
-	 printf ("option %s", long_options[option_index].name);
-	 if (optarg)
-	 printf (" with arg %s", optarg);
-	 printf ("\n");
-	 break;
-
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	 if (digit_optind != 0 && digit_optind != this_option_optind)
-	 printf ("digits occur in two different argv-elements.\n");
-	 digit_optind = this_option_optind;
-	 printf ("option %c\n", c);
-	 break;
-
-	case 'a':
-	 printf ("option a\n");
-	 break;
-
-	case 'b':
-	 printf ("option b\n");
-	 break;
-
-	case 'c':
-	 printf ("option c with value `%s'\n", optarg);
-	 break;
-
-	case 'd':
-	 printf ("option d with value `%s'\n", optarg);
-	 break;
-
-	case '?':
-	 break;
-
-	default:
-	 printf ("?? getopt returned character code 0%o ??\n", c);
-	}
- }
-
- if (optind < argc)
- {
- printf ("non-option ARGV-elements: ");
- while (optind < argc)
-	printf ("%s ", argv[optind++]);
- printf ("\n");
- }
-
- exit (0);
-}
-
-#endif /* TEST */

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/interp.h Deleted

@@ -1,294 +0,0 @@
-/*
- * This file is part of the Advance project.
- *
- * Copyright (C) 2003 Andrea Mazzoleni
- *
- * 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.
- *
- * In addition, as a special exception, Andrea Mazzoleni
- * gives permission to link the code of this program with
- * the MAME library (or with modified versions of MAME that use the
- * same license as MAME), and distribute linked combinations including
- * the two. You must obey the GNU General Public License in all
- * respects for all of the code used other than MAME. If you modify
- * this file, you may extend this exception to your version of the
- * file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
- */
-
-#ifndef __INTERP_H
-#define __INTERP_H
-
-/***************************************************************************/
-/* Basic types */
-
-/***************************************************************************/
-/* interpolation */
-
-static unsigned interp_mask[2];
-static unsigned interp_bits_per_pixel;
-
-#define INTERP_16_MASK_1(v) (v & interp_mask[0])
-#define INTERP_16_MASK_2(v) (v & interp_mask[1])
-
-static inline u16 interp_16_521(u16 p1, u16 p2, u16 p3)
-{
- return INTERP_16_MASK_1((INTERP_16_MASK_1(p1)*5 + INTERP_16_MASK_1(p2)*2 + INTERP_16_MASK_1(p3)*1) / 8)
- | INTERP_16_MASK_2((INTERP_16_MASK_2(p1)*5 + INTERP_16_MASK_2(p2)*2 + INTERP_16_MASK_2(p3)*1) / 8);
-}
-
-static inline u16 interp_16_332(u16 p1, u16 p2, u16 p3)
-{
- return INTERP_16_MASK_1((INTERP_16_MASK_1(p1)*3 + INTERP_16_MASK_1(p2)*3 + INTERP_16_MASK_1(p3)*2) / 8)
- | INTERP_16_MASK_2((INTERP_16_MASK_2(p1)*3 + INTERP_16_MASK_2(p2)*3 + INTERP_16_MASK_2(p3)*2) / 8);
-}
-
-static inline u16 interp_16_611(u16 p1, u16 p2, u16 p3)
-{
- return INTERP_16_MASK_1((INTERP_16_MASK_1(p1)*6 + INTERP_16_MASK_1(p2) + INTERP_16_MASK_1(p3)) / 8)
- | INTERP_16_MASK_2((INTERP_16_MASK_2(p1)*6 + INTERP_16_MASK_2(p2) + INTERP_16_MASK_2(p3)) / 8);
-}
-
-static inline u16 interp_16_71(u16 p1, u16 p2)
-{
- return INTERP_16_MASK_1((INTERP_16_MASK_1(p1)*7 + INTERP_16_MASK_1(p2)) / 8)
- | INTERP_16_MASK_2((INTERP_16_MASK_2(p1)*7 + INTERP_16_MASK_2(p2)) / 8);
-}
-
-static inline u16 interp_16_211(u16 p1, u16 p2, u16 p3)
-{
- return INTERP_16_MASK_1((INTERP_16_MASK_1(p1)*2 + INTERP_16_MASK_1(p2) + INTERP_16_MASK_1(p3)) / 4)
- | INTERP_16_MASK_2((INTERP_16_MASK_2(p1)*2 + INTERP_16_MASK_2(p2) + INTERP_16_MASK_2(p3)) / 4);
-}
-
-static inline u16 interp_16_772(u16 p1, u16 p2, u16 p3)
-{
- return INTERP_16_MASK_1(((INTERP_16_MASK_1(p1) + INTERP_16_MASK_1(p2))*7 + INTERP_16_MASK_1(p3)*2) / 16)
- | INTERP_16_MASK_2(((INTERP_16_MASK_2(p1) + INTERP_16_MASK_2(p2))*7 + INTERP_16_MASK_2(p3)*2) / 16);
-}
-
-static inline u16 interp_16_11(u16 p1, u16 p2)
-{
- return INTERP_16_MASK_1((INTERP_16_MASK_1(p1) + INTERP_16_MASK_1(p2)) / 2)
- | INTERP_16_MASK_2((INTERP_16_MASK_2(p1) + INTERP_16_MASK_2(p2)) / 2);
-}
-
-static inline u16 interp_16_31(u16 p1, u16 p2)
-{
- return INTERP_16_MASK_1((INTERP_16_MASK_1(p1)*3 + INTERP_16_MASK_1(p2)) / 4)
- | INTERP_16_MASK_2((INTERP_16_MASK_2(p1)*3 + INTERP_16_MASK_2(p2)) / 4);
-}
-
-static inline u16 interp_16_1411(u16 p1, u16 p2, u16 p3)
-{
- return INTERP_16_MASK_1((INTERP_16_MASK_1(p1)*14 + INTERP_16_MASK_1(p2) + INTERP_16_MASK_1(p3)) / 16)
- | INTERP_16_MASK_2((INTERP_16_MASK_2(p1)*14 + INTERP_16_MASK_2(p2) + INTERP_16_MASK_2(p3)) / 16);
-}
-
-static inline u16 interp_16_431(u16 p1, u16 p2, u16 p3)
-{
- return INTERP_16_MASK_1((INTERP_16_MASK_1(p1)*4 + INTERP_16_MASK_1(p2)*3 + INTERP_16_MASK_1(p3)) / 8)
- | INTERP_16_MASK_2((INTERP_16_MASK_2(p1)*4 + INTERP_16_MASK_2(p2)*3 + INTERP_16_MASK_2(p3)) / 8);
-}
-
-static inline u16 interp_16_53(u16 p1, u16 p2)
-{
- return INTERP_16_MASK_1((INTERP_16_MASK_1(p1)*5 + INTERP_16_MASK_1(p2)*3) / 8)
- | INTERP_16_MASK_2((INTERP_16_MASK_2(p1)*5 + INTERP_16_MASK_2(p2)*3) / 8);
-}
-
-static inline u16 interp_16_151(u16 p1, u16 p2)
-{
- return INTERP_16_MASK_1((INTERP_16_MASK_1(p1)*15 + INTERP_16_MASK_1(p2)) / 16)
- | INTERP_16_MASK_2((INTERP_16_MASK_2(p1)*15 + INTERP_16_MASK_2(p2)) / 16);
-}
-
-static inline u16 interp_16_97(u16 p1, u16 p2)
-{
- return INTERP_16_MASK_1((INTERP_16_MASK_1(p1)*9 + INTERP_16_MASK_1(p2)*7) / 16)
- | INTERP_16_MASK_2((INTERP_16_MASK_2(p1)*9 + INTERP_16_MASK_2(p2)*7) / 16);
-}
-
-#define INTERP_32_MASK_1(v) (v & 0xFF00FF)
-#define INTERP_32_MASK_2(v) (v & 0x00FF00)
-
-static inline u32 interp_32_521(u32 p1, u32 p2, u32 p3)
-{
- return INTERP_32_MASK_1((INTERP_32_MASK_1(p1)*5 + INTERP_32_MASK_1(p2)*2 + INTERP_32_MASK_1(p3)*1) / 8)
- | INTERP_32_MASK_2((INTERP_32_MASK_2(p1)*5 + INTERP_32_MASK_2(p2)*2 + INTERP_32_MASK_2(p3)*1) / 8);
-}
-
-static inline u32 interp_32_332(u32 p1, u32 p2, u32 p3)
-{
- return INTERP_32_MASK_1((INTERP_32_MASK_1(p1)*3 + INTERP_32_MASK_1(p2)*3 + INTERP_32_MASK_1(p3)*2) / 8)
- | INTERP_32_MASK_2((INTERP_32_MASK_2(p1)*3 + INTERP_32_MASK_2(p2)*3 + INTERP_32_MASK_2(p3)*2) / 8);
-}
-
-static inline u32 interp_32_211(u32 p1, u32 p2, u32 p3)
-{
- return INTERP_32_MASK_1((INTERP_32_MASK_1(p1)*2 + INTERP_32_MASK_1(p2) + INTERP_32_MASK_1(p3)) / 4)
- | INTERP_32_MASK_2((INTERP_32_MASK_2(p1)*2 + INTERP_32_MASK_2(p2) + INTERP_32_MASK_2(p3)) / 4);
-}
-
-static inline u32 interp_32_611(u32 p1, u32 p2, u32 p3)
-{
- return INTERP_32_MASK_1((INTERP_32_MASK_1(p1)*6 + INTERP_32_MASK_1(p2) + INTERP_32_MASK_1(p3)) / 8)
- | INTERP_32_MASK_2((INTERP_32_MASK_2(p1)*6 + INTERP_32_MASK_2(p2) + INTERP_32_MASK_2(p3)) / 8);
-}
-
-static inline u32 interp_32_71(u32 p1, u32 p2)
-{
- return INTERP_32_MASK_1((INTERP_32_MASK_1(p1)*7 + INTERP_32_MASK_1(p2)) / 8)
- | INTERP_32_MASK_2((INTERP_32_MASK_2(p1)*7 + INTERP_32_MASK_2(p2)) / 8);
-}
-
-static inline u32 interp_32_772(u32 p1, u32 p2, u32 p3)
-{
- return INTERP_32_MASK_1(((INTERP_32_MASK_1(p1) + INTERP_32_MASK_1(p2))*7 + INTERP_32_MASK_1(p3)*2) / 16)
- | INTERP_32_MASK_2(((INTERP_32_MASK_2(p1) + INTERP_32_MASK_2(p2))*7 + INTERP_32_MASK_2(p3)*2) / 16);
-}
-
-static inline u32 interp_32_11(u32 p1, u32 p2)
-{
- return INTERP_32_MASK_1((INTERP_32_MASK_1(p1) + INTERP_32_MASK_1(p2)) / 2)
- | INTERP_32_MASK_2((INTERP_32_MASK_2(p1) + INTERP_32_MASK_2(p2)) / 2);
-}
-
-static inline u32 interp_32_31(u32 p1, u32 p2)
-{
- return INTERP_32_MASK_1((INTERP_32_MASK_1(p1)*3 + INTERP_32_MASK_1(p2)) / 4)
- | INTERP_32_MASK_2((INTERP_32_MASK_2(p1)*3 + INTERP_32_MASK_2(p2)) / 4);
-}
-
-static inline u32 interp_32_1411(u32 p1, u32 p2, u32 p3)
-{
- return INTERP_32_MASK_1((INTERP_32_MASK_1(p1)*14 + INTERP_32_MASK_1(p2) + INTERP_32_MASK_1(p3)) / 16)
- | INTERP_32_MASK_2((INTERP_32_MASK_2(p1)*14 + INTERP_32_MASK_2(p2) + INTERP_32_MASK_2(p3)) / 16);
-}
-
-static inline u32 interp_32_431(u32 p1, u32 p2, u32 p3)
-{
- return INTERP_32_MASK_1((INTERP_32_MASK_1(p1)*4 + INTERP_32_MASK_1(p2)*3 + INTERP_32_MASK_1(p3)) / 8)
- | INTERP_32_MASK_2((INTERP_32_MASK_2(p1)*4 + INTERP_32_MASK_2(p2)*3 + INTERP_32_MASK_2(p3)) / 8);
-}
-
-static inline u32 interp_32_53(u32 p1, u32 p2)
-{
- return INTERP_32_MASK_1((INTERP_32_MASK_1(p1)*5 + INTERP_32_MASK_1(p2)*3) / 8)
- | INTERP_32_MASK_2((INTERP_32_MASK_2(p1)*5 + INTERP_32_MASK_2(p2)*3) / 8);
-}
-
-static inline u32 interp_32_151(u32 p1, u32 p2)
-{
- return INTERP_32_MASK_1((INTERP_32_MASK_1(p1)*15 + INTERP_32_MASK_1(p2)) / 16)
- | INTERP_32_MASK_2((INTERP_32_MASK_2(p1)*15 + INTERP_32_MASK_2(p2)) / 16);
-}
-
-static inline u32 interp_32_97(u32 p1, u32 p2)
-{
- return INTERP_32_MASK_1((INTERP_32_MASK_1(p1)*9 + INTERP_32_MASK_1(p2)*7) / 16)
- | INTERP_32_MASK_2((INTERP_32_MASK_2(p1)*9 + INTERP_32_MASK_2(p2)*7) / 16);
-}
-
-/***************************************************************************/
-/* diff */
-
-#define INTERP_Y_LIMIT (0x30*4)
-#define INTERP_U_LIMIT (0x07*4)
-#define INTERP_V_LIMIT (0x06*8)
-
-static int interp_16_diff(u16 p1, u16 p2)
-{
- int r, g, b;
- int y, u, v;
-
- if (p1 == p2)
- return 0;
-
- if (interp_bits_per_pixel == 16) {
- b = (int)((p1 & 0x1F) - (p2 & 0x1F)) << 3;
- g = (int)((p1 & 0x7E0) - (p2 & 0x7E0)) >> 3;
- r = (int)((p1 & 0xF800) - (p2 & 0xF800)) >> 8;
- } else {
- b = (int)((p1 & 0x1F) - (p2 & 0x1F)) << 3;
- g = (int)((p1 & 0x3E0) - (p2 & 0x3E0)) >> 2;
- r = (int)((p1 & 0x7C00) - (p2 & 0x7C00)) >> 7;
- }
-
- y = r + g + b;
- u = r - b;
- v = -r + 2*g - b;
-
- if (y < -INTERP_Y_LIMIT || y > INTERP_Y_LIMIT)
- return 1;
-
- if (u < -INTERP_U_LIMIT || u > INTERP_U_LIMIT)
- return 1;
-
- if (v < -INTERP_V_LIMIT || v > INTERP_V_LIMIT)
- return 1;
-
- return 0;
-}
-
-static int interp_32_diff(u32 p1, u32 p2)
-{
- int r, g, b;
- int y, u, v;
-
- if ((p1 & 0xF8F8F8) == (p2 & 0xF8F8F8))
- return 0;
-
- b = (int)((p1 & 0xFF) - (p2 & 0xFF));
- g = (int)((p1 & 0xFF00) - (p2 & 0xFF00)) >> 8;
- r = (int)((p1 & 0xFF0000) - (p2 & 0xFF0000)) >> 16;
-
- y = r + g + b;
- u = r - b;
- v = -r + 2*g - b;
-
- if (y < -INTERP_Y_LIMIT || y > INTERP_Y_LIMIT)
- return 1;
-
- if (u < -INTERP_U_LIMIT || u > INTERP_U_LIMIT)
- return 1;
-
- if (v < -INTERP_V_LIMIT || v > INTERP_V_LIMIT)
- return 1;
-
- return 0;
-}
-
-static void interp_set(unsigned bits_per_pixel)
-{
- interp_bits_per_pixel = bits_per_pixel;
-
- switch (bits_per_pixel) {
- case 15 :
- interp_mask[0] = 0x7C1F;
- interp_mask[1] = 0x03E0;
- break;
- case 16 :
- interp_mask[0] = 0xF81F;
- interp_mask[1] = 0x07E0;
- break;
- case 32 :
- interp_mask[0] = 0xFF00FF;
- interp_mask[1] = 0x00FF00;
- break;
- }
-}
-
-#endif

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/libresample.h Deleted

@@ -1,44 +0,0 @@
-/**********************************************************************
-
-  resample.h
-
-  Real-time library interface by Dominic Mazzoni
-
-  Based on resample-1.7:
-    http://www-ccrma.stanford.edu/~jos/resample/
-
-  License: LGPL - see the file LICENSE.txt for more information
-
-**********************************************************************/
-
-#ifndef LIBRESAMPLE_INCLUDED
-#define LIBRESAMPLE_INCLUDED
-
-#ifdef __cplusplus
-extern "C" {
-#endif	/* __cplusplus */
-
-void *resample_open(int      highQuality,
-                    double   minFactor,
-                    double   maxFactor);
-
-void *resample_dup(const void *handle);
-
-int resample_get_filter_width(const void *handle);
-
-int resample_process(void   *handle,
-                     double  factor,
-                     float  *inBuffer,
-                     int     inBufferLen,
-                     int     lastFlag,
-                     int    *inBufferUsed,
-                     float  *outBuffer,
-                     int     outBufferLen);
-
-void resample_close(void *handle);
-
-#ifdef __cplusplus
-}		/* extern "C" */
-#endif	/* __cplusplus */
-
-#endif /* LIBRESAMPLE_INCLUDED */

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/memgzio.c Deleted

@@ -1,681 +0,0 @@
-/* gzio.c -- IO on .gz files
- * Copyright (C) 1995-2002 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Compile this file with -DNO_DEFLATE to avoid the compression code.
- */
-
-/* memgzio.c - IO on .gz files in memory
- * Adapted from original gzio.c from zlib library by Forgotten
- */
-
-/* @(#) $Id: memgzio.c,v 1.1.1.1 2005/03/15 20:33:11 raph Exp $ */
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
-#include "memgzio.h"
-
-/*struct internal_state {int dummy;};*/ /* for buggy compilers */
-
-#ifndef Z_BUFSIZE
-# ifdef MAXSEG_64K
-# define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
-# else
-# define Z_BUFSIZE 16384
-# endif
-#endif
-#ifndef Z_PRINTF_BUFSIZE
-# define Z_PRINTF_BUFSIZE 4096
-#endif
-
-#define ALLOC(size) malloc(size)
-#define TRYFREE(p) {if (p) free(p);}
-
-static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
-
-/* gzip flag byte */
-#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */
-#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */
-#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
-#define ORIG_NAME 0x08 /* bit 3 set: original file name present */
-#define COMMENT 0x10 /* bit 4 set: file comment present */
-#define RESERVED 0xE0 /* bits 5..7: reserved */
-
-typedef struct _MemFile {
- char *memory;
- char *next;
- int available;
- int error;
- char mode;
-} MEMFILE;
-
-typedef struct mem_stream {
- z_stream stream;
- int z_err; /* error code for last stream operation */
- int z_eof; /* set if end of input file */
- MEMFILE *file; /* memoru file */
- Byte *inbuf; /* input buffer */
- Byte *outbuf; /* output buffer */
- uLong crc; /* crc32 of uncompressed data */
- char *msg; /* error message */
- int transparent; /* 1 if input file is not a .gz file */
- char mode; /* 'w' or 'r' */
- long startpos; /* start of compressed data in file (header skipped) */
-} mem_stream;
-
-
-local gzFile gz_open OF((char *memory, const int available, const char *mode));
-local int do_flush OF((gzFile file, int flush));
-local int get_byte OF((mem_stream *s));
-local void check_header OF((mem_stream *s));
-local int destroy OF((mem_stream *s));
-local void putLong OF((MEMFILE *file, uLong x));
-local uLong getLong OF((mem_stream *s));
-
-local MEMFILE *memOpen(char *memory, int available, char mode)
-{
- MEMFILE *f;
-
- if(available <= 8)
- return NULL;
-
- if(mode != 'w' && mode != 'r')
- return NULL;
-
- f = (MEMFILE *)malloc(sizeof(MEMFILE));
-
- f->memory = memory;
- f->mode = mode;
- f->error = 0;
-
- if(mode == 'w') {
- f->available = available - 8;
- f->next = memory + 8;
- memory[0] = 'V';
- memory[1] = 'B';
- memory[2] = 'A';
- memory[3] = ' ';
- *((int *)(memory+4)) = 0;
- } else {
- if(memory[0] != 'V' || memory[1] != 'B' || memory[2] != 'A' || 
- memory[3] != ' ') {
- free(f);
- return NULL;
- }
- f->available = *((int *)(memory+4));
- f->next = memory+8;
- }
-
- return f;
-}
-
-local size_t memWrite(const void *buffer, size_t size, size_t count, 
- MEMFILE *file)
-{
- size_t total = size*count;
- 
- if(file->mode != 'w') {
- file->error = 1;
- return 0;
- }
-
- if(total > (size_t)file->available) {
- total = file->available;
- }
- memcpy(file->next, buffer, total);
- file->available -= total;
- file->next += total;
- return total;
-}
-
-local size_t memRead(void *buffer, size_t size, size_t count, 
- MEMFILE *file)
-{
- size_t total = size*count;
- 
- if(file->mode != 'r') {
- file->error = 1;
- return 0;
- }
-
- if(file->available == 0)
- return -1;
-
- if(total > (size_t)file->available) {
- total = file->available;
- }
- memcpy(buffer, file->next, total);
- file->available -= total;
- file->next += total;
- return total;
-}
-
-local int memPutc(int c, MEMFILE *file)
-{
- if(file->mode != 'w') {
- file->error = 1;
- return -1;
- }
-
- if(file->available >= 1) {
- *file->next++ = c;
- file->available--;
- } else
- return -1;
-
- return c;
-}
-
-local long memTell(MEMFILE *f)
-{
- return (f->next - f->memory) - 8;
-}
-
-local int memError(MEMFILE *f)
-{
- return f->error;
-}
-
-local int memClose(MEMFILE *f)
-{
- if(f->mode == 'w') {
- *((int *)(f->memory+4)) = memTell(f);
- }
- free(f);
- return 0;
-}
-
-local int memPrintf(MEMFILE *f, const char *format, ...)
-{
- char buffer[80];
- va_list list;
- int len;
- 
- va_start(list, format);
- len = vsprintf(buffer, format, list);
- va_end(list);
-
- return memWrite(buffer, 1, len, f);
-}
-
-/* ===========================================================================
- Opens a gzip (.gz) file for reading or writing. The mode parameter
- is as in fopen ("rb" or "wb"). The file is given either by file descriptor
- or path name (if fd == -1).
- gz_open return NULL if the file could not be opened or if there was
- insufficient memory to allocate the (de)compression state; errno
- can be checked to distinguish the two cases (if errno is zero, the
- zlib error is Z_MEM_ERROR).
-*/
-local gzFile gz_open (memory, available, mode)
- char *memory;
- const int available;
- const char *mode;
-{
- int err;
- int level = Z_DEFAULT_COMPRESSION; /* compression level */
- int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
- char *p = (char*)mode;
- mem_stream *s;
- char fmode[80]; /* copy of mode, without the compression level */
- char *m = fmode;
-
- s = (mem_stream *)ALLOC(sizeof(mem_stream));
- if (!s) return Z_NULL;
-
- s->stream.zalloc = (alloc_func)0;
- s->stream.zfree = (free_func)0;
- s->stream.opaque = (voidpf)0;
- s->stream.next_in = s->inbuf = Z_NULL;
- s->stream.next_out = s->outbuf = Z_NULL;
- s->stream.avail_in = s->stream.avail_out = 0;
- s->z_err = Z_OK;
- s->z_eof = 0;
- s->crc = crc32(0L, Z_NULL, 0);
- s->msg = NULL;
- s->transparent = 0;
- s->file = NULL;
-
- s->mode = '\0';
- do {
- if (*p == 'r') s->mode = 'r';
- if (*p == 'w' || *p == 'a') s->mode = 'w';
- if (*p >= '0' && *p <= '9') {
-	 level = *p - '0';
-	} else if (*p == 'f') {
-	 strategy = Z_FILTERED;
-	} else if (*p == 'h') {
-	 strategy = Z_HUFFMAN_ONLY;
-	} else {
-	 *m++ = *p; /* copy the mode */
-	}
- } while (*p++ && m != fmode + sizeof(fmode));
- if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
- 
- if (s->mode == 'w') {
-#ifdef NO_DEFLATE
- err = Z_STREAM_ERROR;
-#else
- err = deflateInit2(&(s->stream), level,
- Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
- /* windowBits is passed < 0 to suppress zlib header */
-
- s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-#endif
- if (err != Z_OK || s->outbuf == Z_NULL) {
- return destroy(s), (gzFile)Z_NULL;
- }
- } else {
- s->stream.next_in = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
-
- err = inflateInit2(&(s->stream), -MAX_WBITS);
- /* windowBits is passed < 0 to tell that there is no zlib header.
- * Note that in this case inflate *requires* an extra "dummy" byte
- * after the compressed stream in order to complete decompression and
- * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
- * present after the compressed stream.
- */
- if (err != Z_OK || s->inbuf == Z_NULL) {
- return destroy(s), (gzFile)Z_NULL;
- }
- }
- s->stream.avail_out = Z_BUFSIZE;
-
- errno = 0;
- s->file = memOpen(memory, available, s->mode);
-
- if (s->file == NULL) {
- return destroy(s), (gzFile)Z_NULL;
- }
-
- if (s->mode == 'w') {
- /* Write a very simple .gz header:
- */
- memPrintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
- Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
-	s->startpos = 10L;
-	/* We use 10L instead of ftell(s->file) to because ftell causes an
- * fflush on some systems. This version of the library doesn't use
- * startpos anyway in write mode, so this initialization is not
- * necessary.
- */
- } else {
-	check_header(s); /* skip the .gz header */
-	s->startpos = (memTell(s->file) - s->stream.avail_in);
- }
- 
- return (gzFile)s;
-}
-
-/* ===========================================================================
- Opens a gzip (.gz) file for reading or writing.
-*/
-gzFile ZEXPORT memgzopen (memory, available, mode)
- char *memory;
- int available;
- const char *mode;
-{
- return gz_open (memory, available, mode);
-}
-
-/* ===========================================================================
- Read a byte from a mem_stream; update next_in and avail_in. Return EOF
- for end of file.
- IN assertion: the stream s has been sucessfully opened for reading.
-*/
-local int get_byte(s)
- mem_stream *s;
-{
- if (s->z_eof) return EOF;
- if (s->stream.avail_in == 0) {
-	errno = 0;
-	s->stream.avail_in = memRead(s->inbuf, 1, Z_BUFSIZE, s->file);
-	if (s->stream.avail_in == 0) {
-	 s->z_eof = 1;
-	 if (memError(s->file)) s->z_err = Z_ERRNO;
-	 return EOF;
-	}
-	s->stream.next_in = s->inbuf;
- }
- s->stream.avail_in--;
- return *(s->stream.next_in)++;
-}
-
-/* ===========================================================================
- Check the gzip header of a mem_stream opened for reading. Set the stream
- mode to transparent if the gzip magic header is not present; set s->err
- to Z_DATA_ERROR if the magic header is present but the rest of the header
- is incorrect.
- IN assertion: the stream s has already been created sucessfully;
- s->stream.avail_in is zero for the first time, but may be non-zero
- for concatenated .gz files.
-*/
-local void check_header(s)
- mem_stream *s;
-{
- int method; /* method byte */
- int flags; /* flags byte */
- uInt len;
- int c;
-
- /* Check the gzip magic header */
- for (len = 0; len < 2; len++) {
-	c = get_byte(s);
-	if (c != gz_magic[len]) {
-	 if (len != 0) s->stream.avail_in++, s->stream.next_in--;
-	 if (c != EOF) {
-		s->stream.avail_in++, s->stream.next_in--;
-		s->transparent = 1;
-	 }
-	 s->z_err = s->stream.avail_in != 0 ? Z_OK : Z_STREAM_END;
-	 return;
-	}
- }
- method = get_byte(s);
- flags = get_byte(s);
- if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
-	s->z_err = Z_DATA_ERROR;
-	return;
- }
-
- /* Discard time, xflags and OS code: */
- for (len = 0; len < 6; len++) (void)get_byte(s);
-
- if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
-	len = (uInt)get_byte(s);
-	len += ((uInt)get_byte(s))<<8;
-	/* len is garbage if EOF but the loop below will quit anyway */
-	while (len-- != 0 && get_byte(s) != EOF) ;
- }
- if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
-	while ((c = get_byte(s)) != 0 && c != EOF) ;
- }
- if ((flags & COMMENT) != 0) { /* skip the .gz file comment */
-	while ((c = get_byte(s)) != 0 && c != EOF) ;
- }
- if ((flags & HEAD_CRC) != 0) { /* skip the header crc */
-	for (len = 0; len < 2; len++) (void)get_byte(s);
- }
- s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
-}
-
- /* ===========================================================================
- * Cleanup then free the given mem_stream. Return a zlib error code.
- Try freeing in the reverse order of allocations.
- */
-local int destroy (s)
- mem_stream *s;
-{
- int err = Z_OK;
-
- if (!s) return Z_STREAM_ERROR;
-
- TRYFREE(s->msg);
-
- if (s->stream.state != NULL) {
-	if (s->mode == 'w') {
-#ifdef NO_DEFLATE
-	 err = Z_STREAM_ERROR;
-#else
-	 err = deflateEnd(&(s->stream));
-#endif
-	} else if (s->mode == 'r') {
-	 err = inflateEnd(&(s->stream));
-	}
- }
- if (s->file != NULL && memClose(s->file)) {
-#ifdef ESPIPE
-	if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
-#endif
-	 err = Z_ERRNO;
- }
- if (s->z_err < 0) err = s->z_err;
-
- TRYFREE(s->inbuf);
- TRYFREE(s->outbuf);
- TRYFREE(s);
- return err;
-}
-
-/* ===========================================================================
- Reads the given number of uncompressed bytes from the compressed file.
- gzread returns the number of bytes actually read (0 for end of file).
-*/
-int ZEXPORT memgzread (file, buf, len)
- gzFile file;
- voidp buf;
- unsigned len;
-{
- mem_stream *s = (mem_stream*)file;
- Bytef *start = (Bytef*)buf; /* starting point for crc computation */
- Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */
-
- if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
-
- if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
- if (s->z_err == Z_STREAM_END) return 0; /* EOF */
-
- next_out = (Byte*)buf;
- s->stream.next_out = (Bytef*)buf;
- s->stream.avail_out = len;
-
- while (s->stream.avail_out != 0) {
-
-	if (s->transparent) {
-	 /* Copy first the lookahead bytes: */
-	 uInt n = s->stream.avail_in;
-	 if (n > s->stream.avail_out) n = s->stream.avail_out;
-	 if (n > 0) {
-		zmemcpy(s->stream.next_out, s->stream.next_in, n);
-		next_out += n;
-		s->stream.next_out = next_out;
-		s->stream.next_in += n;
-		s->stream.avail_out -= n;
-		s->stream.avail_in -= n;
-	 }
-	 if (s->stream.avail_out > 0) {
-		s->stream.avail_out -= memRead(next_out, 1, s->stream.avail_out,
-					 s->file);
-	 }
-	 len -= s->stream.avail_out;
-	 s->stream.total_in += (uLong)len;
-	 s->stream.total_out += (uLong)len;
- if (len == 0) s->z_eof = 1;
-	 return (int)len;
-	}
- if (s->stream.avail_in == 0 && !s->z_eof) {
-
- errno = 0;
- s->stream.avail_in = memRead(s->inbuf, 1, Z_BUFSIZE, s->file);
- if (s->stream.avail_in == 0) {
- s->z_eof = 1;
-		if (memError(s->file)) {
-		 s->z_err = Z_ERRNO;
-		 break;
-		}
- }
- s->stream.next_in = s->inbuf;
- }
- s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
-
-	if (s->z_err == Z_STREAM_END) {
-	 /* Check CRC and original size */
-	 s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-	 start = s->stream.next_out;
-
-	 if (getLong(s) != s->crc) {
-		s->z_err = Z_DATA_ERROR;
-	 } else {
-	 (void)getLong(s);
- /* The uncompressed length returned by above getlong() may
- * be different from s->stream.total_out) in case of
-		 * concatenated .gz files. Check for such files:
-		 */
-		check_header(s);
-		if (s->z_err == Z_OK) {
-		 uLong total_in = s->stream.total_in;
-		 uLong total_out = s->stream.total_out;
-
-		 inflateReset(&(s->stream));
-		 s->stream.total_in = total_in;
-		 s->stream.total_out = total_out;
-		 s->crc = crc32(0L, Z_NULL, 0);
-		}
-	 }
-	}
-	if (s->z_err != Z_OK || s->z_eof) break;
- }
- s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-
- return (int)(len - s->stream.avail_out);
-}
-
-
-#ifndef NO_DEFLATE
-/* ===========================================================================
- Writes the given number of uncompressed bytes into the compressed file.
- gzwrite returns the number of bytes actually written (0 in case of error).
-*/
-int ZEXPORT memgzwrite (file, buf, len)
- gzFile file;
- const voidp buf;
- unsigned len;
-{
- mem_stream *s = (mem_stream*)file;
-
- if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
- s->stream.next_in = (Bytef*)buf;
- s->stream.avail_in = len;
-
- while (s->stream.avail_in != 0) {
-
- if (s->stream.avail_out == 0) {
-
- s->stream.next_out = s->outbuf;
- if (memWrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
- s->z_err = Z_ERRNO;
- break;
- }
- s->stream.avail_out = Z_BUFSIZE;
- }
- s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
- if (s->z_err != Z_OK) break;
- }
- s->crc = crc32(s->crc, (const Bytef *)buf, len);
-
- return (int)(len - s->stream.avail_in);
-}
-#endif
-/* ===========================================================================
- Flushes all pending output into the compressed file. The parameter
- flush is as in the deflate() function.
-*/
-local int do_flush (file, flush)
- gzFile file;
- int flush;
-{
- uInt len;
- int done = 0;
- mem_stream *s = (mem_stream*)file;
-
- if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
- s->stream.avail_in = 0; /* should be zero already anyway */
-
- for (;;) {
- len = Z_BUFSIZE - s->stream.avail_out;
-
- if (len != 0) {
- if ((uInt)memWrite(s->outbuf, 1, len, s->file) != len) {
- s->z_err = Z_ERRNO;
- return Z_ERRNO;
- }
- s->stream.next_out = s->outbuf;
- s->stream.avail_out = Z_BUFSIZE;
- }
- if (done) break;
- s->z_err = deflate(&(s->stream), flush);
-
-	/* Ignore the second of two consecutive flushes: */
-	if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
-
- /* deflate has finished flushing only when it hasn't used up
- * all the available space in the output buffer: 
- */
- done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
- 
- if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
- }
- return s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-
-/* ===========================================================================
- Outputs a long in LSB order to the given file
-*/
-local void putLong (file, x)
- MEMFILE *file;
- uLong x;
-{
- int n;
- for (n = 0; n < 4; n++) {
- memPutc((int)(x & 0xff), file);
- x >>= 8;
- }
-}
-
-/* ===========================================================================
- Reads a long in LSB order from the given mem_stream. Sets z_err in case
- of error.
-*/
-local uLong getLong (s)
- mem_stream *s;
-{
- uLong x = (uLong)get_byte(s);
- int c;
-
- x += ((uLong)get_byte(s))<<8;
- x += ((uLong)get_byte(s))<<16;
- c = get_byte(s);
- if (c == EOF) s->z_err = Z_DATA_ERROR;
- x += ((uLong)c)<<24;
- return x;
-}
-
-/* ===========================================================================
- Flushes all pending output if necessary, closes the compressed file
- and deallocates all the (de)compression state.
-*/
-int ZEXPORT memgzclose (file)
- gzFile file;
-{
- int err;
- mem_stream *s = (mem_stream*)file;
-
- if (s == NULL) return Z_STREAM_ERROR;
-
- if (s->mode == 'w') {
-#ifdef NO_DEFLATE
-	return Z_STREAM_ERROR;
-#else
- err = do_flush (file, Z_FINISH);
- if (err != Z_OK) return destroy((mem_stream*)file);
-
- putLong (s->file, s->crc);
- putLong (s->file, s->stream.total_in);
-#endif
- }
- return destroy((mem_stream*)file);
-}
-
-long ZEXPORT memtell(file)
- gzFile file;
-{
- mem_stream *s = (mem_stream*)file;
-
- if (s == NULL) return Z_STREAM_ERROR;
- 
- return memTell(s->file);
-}

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/memgzio.h Deleted

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/psftag.c Deleted

@@ -1,555 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// tag handling
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "psftag.h"
-
-/////////////////////////////////////////////////////////////////////////////
-
-//#if defined(__WIN32__)
-
-#ifdef LINUX
-#include "../gsf.h"
-#else
-#include <windows.h>
-#endif
-/*
-void DisplayError (char * Message, ...) {
-	char Msg[400];
-	va_list ap;
-
-	va_start( ap, Message );
-	vsprintf( Msg, Message, ap );
-	va_end( ap );
-	MessageBox(NULL,Msg,"Error",MB_OK|MB_ICONERROR|MB_SETFOREGROUND);
-	//SetActiveWindow(hMainWindow);
-}
-*/
-
-#if 0
-static void truncate(const char *filename, long size) {
-	/*
- HANDLE f = CreateFile(
- filename,
- GENERIC_WRITE,
- FILE_SHARE_READ,
- NULL,
- OPEN_EXISTING,
- FILE_ATTRIBUTE_NORMAL,
- NULL
- );
- if(f == INVALID_HANDLE_VALUE) return;
-
- SetFilePointer(f, size, NULL, FILE_BEGIN);
- if(GetLastError() == NO_ERROR) SetEndOfFile(f);
- CloseHandle(f);*/
-}
-#endif
-
-//#else
-//
-//#include <unistd.h>
-//
-//#endif
-
-/////////////////////////////////////////////////////////////////////////////
-/*
-** Returns index, or -1 if not found
-** Returns the index starting at the first non-whitespace character of
-** the actual variable name
-*/
-static int find_tag_var_start(const char *tagbuffer, const char *varname) {
- int i, j;
- if(!tagbuffer || !varname) return -1;
- for(i = 0;;) {
- /*
- ** Find first non-whitespace
- ** (this is the variable name on the current line)
- */
- for(;; i++) {
- unsigned u = ((unsigned)(tagbuffer[i])) & 0xFF;
- /* If the tag ends here, we wouldn't have had any data anyway */
- if(!u) return -1;
- if(u <= 0x20) continue;
- break;
- }
- /*
- ** Compare case-insensitively to the var name
- */
- for(j = 0;; j++) {
- unsigned ucmp = ((unsigned)(varname [ j])) & 0xFF;
- unsigned u = ((unsigned)(tagbuffer[i + j])) & 0xFF;
- /* if the varname ends, we'll break here and do the equals check */
- if(!ucmp) break;
- /* If the tag ends here, we wouldn't have had any data anyway */
- if(!u) return -1;
- /* lowercase */
- if(ucmp >= 'A' && ucmp <= 'Z') { ucmp -= 'A'; ucmp += 'a'; }
- if(u >= 'A' && u <= 'Z') { u -= 'A'; u += 'a'; }
- /* if they're unequal, break... */
- if(u != ucmp) break;
- }
- /*
- ** Only if we exhausted the varname will we do the equals check
- */
- if(!varname[j]) {
- /*
- ** Ensure that the next non-whitespace character in [i+j] is an '='
- */
- for(;; j++) {
- unsigned u = ((unsigned)(tagbuffer[i + j])) & 0xFF;
- /* If the tag ends here, we wouldn't have had any data anyway */
- if(!u) return -1;
- /* quit at the first '=' - success! */
- if(u == '=') return i;
- /* shouldn't be a newline here! */
- if(u == 0x0A) break;
- /* ignore whitespace */
- if(u <= 0x20) continue;
- /* any other character is an error */
- break;
- }
- }
- i += j + 1;
- /*
- ** Find newline or end-of-tag
- */
- for(;; i++) {
- unsigned u = ((unsigned)(tagbuffer[i])) & 0xFF;
- /* If the tag ends here, we wouldn't have had any data anyway */
- if(!u) return -1;
- if(u == 0x0A) break;
- }
- }
- return -1;
-}
-
-/*
-** Returns the index at which the current variable ends
-** (Includes any ending newline and possibly whitespace after that)
-**
-** Buffer points to the first non-whitespace character of the variable name
-*/
-static int find_tag_var_end(const char *tagbuffer) {
- int i, j;
- if(!tagbuffer) return 0;
- for(i = 0;;) {
- /*
- ** Find first non-whitespace
- ** (this is the variable name on the current line)
- */
- for(;; i++) {
- unsigned u = ((unsigned)(tagbuffer[i])) & 0xFF;
- if(!u) return i;
- if(u <= 0x20) continue;
- break;
- }
- /*
- ** Compare case-insensitively to the original var name
- */
- for(j = 0;; j++) {
- unsigned ucmp = ((unsigned)(tagbuffer[ j])) & 0xFF;
- unsigned u = ((unsigned)(tagbuffer[i + j])) & 0xFF;
- /* If the tag ends here, we wouldn't have had any data anyway */
- if(!u) return i;
- /* lowercase */
- if(ucmp >= 'A' && ucmp <= 'Z') { ucmp -= 'A'; ucmp += 'a'; }
- if(u >= 'A' && u <= 'Z') { u -= 'A'; u += 'a'; }
- /* if they're both whitespace or '=', we win */
- if((u <= 0x20 || u == '=') && (ucmp <= 0x20 || ucmp == '=')) break;
- /* if they're unequal, we lose */
- if(u != ucmp) return i;
- /* otherwise, keep trying */
- }
- /*
- ** Ensure that the next non-whitespace character in [i+j] is an '='
- */
- for(;; j++) {
- unsigned u = ((unsigned)(tagbuffer[i + j])) & 0xFF;
- if(!u) return i;
- /* quit at the first '=' */
- if(u == '=') break;
- /* shouldn't be a newline here! */
- if(u == 0x0A) return i;
- /* ignore whitespace */
- if(u <= 0x20) continue;
- /* any other character is an error */
- break;
- }
- i += j + 1;
- /*
- ** Find newline or end-of-tag
- */
- for(;; i++) {
- unsigned u = ((unsigned)(tagbuffer[i])) & 0xFF;
- if(!u) return i;
- if(u == 0x0A) break;
- }
- }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-/*
-** Get tag variable
-** The destination value buffer must be as big as the entire tag
-*/
-int psftag_raw_getvar(
- const char *tag,
- const char *variable,
- char *value_out,
- int value_out_size
-) {
- char *v = value_out;
- char *vmax = v + value_out_size;
- char *v_linebegin;
- int i, i_end;
- //
- // Safety check
- //
- if(value_out_size < 1) return -1;
- /*
- ** Default to empty string
- */
- *v = 0;
- /*
- ** Find the variable start/end index
- */
- i = find_tag_var_start(tag, variable);
- if(i < 0) return -1;
- i_end = i + find_tag_var_end(tag + i);
- /*
- ** Extract the variable data
- */
- while(i < i_end) {
- /*
- ** Skip to first '='
- */
- while((tag[i] != '=') && (i < i_end)) { i++; }
- if(i >= i_end) break;
- /*
- ** If this is not the first line, add a newline
- */
- if(v > value_out) { 
- if(v < vmax) { *v++ = 0x0A; }
- }
- /*
- ** Now that we're at a '=', skip past it
- */
- i++;
- if(i >= i_end) break;
- /*
- ** Skip past any whitespace except newlines
- */
- for(; i < i_end; i++) {
- unsigned u = ((unsigned)(tag[i])) & 0xFF;
- if(u == 0x0A) break;
- if(u <= 0x20) continue;
- break;
- }
- if(i >= i_end) break;
- /*
- ** Consume line data
- */
- v_linebegin = v;
- while(i < i_end) {
- unsigned u = ((unsigned)(tag[i++])) & 0xFF;
- if(u == 0x0A) break;
- if(v < vmax) { *v++ = u; }
- }
- /*
- ** Eat end-of-line whitespace
- */
- while(v > v_linebegin && (((unsigned)(v[-1]))&0xFF) <= 0x20) {
- v--;
- }
- }
- /*
- ** Set variable end
- */
- if(v >= vmax) { v = vmax - 1; }
- *v = 0;
- return 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-void psftag_raw_setvar(
- char *tag,
- int tag_max_size,
- const char *variable,
- const char *value
-) {
- int tag_l = strlen(tag);
- int i, i_end, z;
- int insert_i;
- int insert_l;
- int value_exists = 0;
- int tag_max_usable_size = tag_max_size - 1;
- //
- // Safety check
- //
- if(tag_max_size < 1) return;
- //
- // We will assume we can at least use what's there
- //
- if(tag_max_usable_size < tag_l) {
- tag_max_usable_size = tag_l;
- tag_max_size = tag_l + 1;
- }
- /*
- ** Determine the insertion length of the new variable
- */
- { const char *v;
- int nl = strlen(variable);
- insert_l = nl + 2;
- for(v = value; *v; v++) {
- insert_l++;
- if(*v == 0x0A) {
- /* Value exists if it's multi-line */
- value_exists = 1;
- insert_l += nl + 1;
- } else if((((unsigned)(*v))&0xFF) > 0x20) {
- /* Value exists if there are non-whitespace characters */
- value_exists = 1;
- }
- }
- }
- /*
- ** If the value is blank, force the insert length to zero
- */
- if(!value_exists) insert_l = 0;
- /*
- ** Find the variable start index
- */
- i = find_tag_var_start(tag, variable);
- /*
- ** If not found, add a new variable
- */
- if(i < 0) {
- /* Insert position is at the end */
- insert_i = tag_l;
- /* Eat trailing whitespace in the file */
- while(insert_i && (((unsigned)(tag[insert_i - 1]))&0xFF) <= 0x20) { insert_i--; }
- /* Insert a newline if there's room and if there's stuff before */
- if(insert_i && (insert_i < tag_max_usable_size)) { tag[insert_i++] = 0x0A; }
- /* Clamp insert length */
- if((insert_i + insert_l) > tag_max_usable_size) { insert_l = tag_max_usable_size - insert_i; }
- z = insert_i + insert_l;
- /*
- ** Otherwise, find the variable end index
- */
- } else {
- int movel;
- insert_i = i;
- /* Clamp insert length */
- if((insert_i + insert_l) > tag_max_usable_size) { insert_l = tag_max_usable_size - insert_i; }
- i_end = i + find_tag_var_end(tag + i);
- /* Move remaining file data */
- movel = tag_l - i_end;
- if(movel > (tag_max_usable_size-(insert_i+insert_l))) { movel = tag_max_usable_size - (insert_i+insert_l); }
- /* perform the move */
- if(movel && ((insert_i+insert_l) != i_end)) {
- memmove(tag+insert_i+insert_l, tag+i_end, movel);
- }
- z = insert_i+insert_l+movel;
- }
- /* Add terminating null ahead of time */
- if(z > tag_max_usable_size) z = tag_max_usable_size;
- tag[z] = 0;
- /*
- ** Write the variable to index insert_i, max length insert_l
- */
- insert_l += insert_i;
- while(insert_i < insert_l) {
- const char *v;
- for(v = variable; (*v) && (insert_i < insert_l); v++) {
- tag[insert_i++] = *v;
- }
- if(insert_i >= insert_l) break;
- tag[insert_i++] = '=';
- if(insert_i >= insert_l) break;
- for(; (*value) && ((*value) != 0x0A) && (insert_i < insert_l); value++) {
- tag[insert_i++] = *value;
- }
- if(insert_i >= insert_l) break;
- tag[insert_i++] = 0x0A;
- if(insert_i >= insert_l) break;
- if(!(*value)) break;
- if((*value) == 0x0A) value++;
- }
-
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-#define TAGMAX (50000)
-#define ERRORMAX (256)
-
-struct PSFTAG {
- char str[TAGMAX + 1];
-};
-
-/*void *psftag_create(void) {
- struct PSFTAG *p = malloc(sizeof(struct PSFTAG));
- if(!p) return NULL;
- p->str[0] = 0;
- //p->errorstring[0] = 0;
- return p;
-}
-
-void psftag_delete(void *psftag) {
- free(psftag);
-}*/
-
-/////////////////////////////////////////////////////////////////////////////
-
-/*const char *psftag_getlasterror(void *psftag) {
- return ((struct PSFTAG*)psftag)->errorstring;
-}*/
-
-/////////////////////////////////////////////////////////////////////////////
-
-void psftag_getraw(void *psftag, char *raw_out, int raw_out_size) {
- if(raw_out_size < 1) return;
- strncpy(raw_out, ((struct PSFTAG*)psftag)->str, raw_out_size);
- raw_out[raw_out_size - 1] = 0;
-}
-
-void psftag_setraw(void *psftag, const char *raw_in) {
- strncpy(((struct PSFTAG*)psftag)->str, raw_in, TAGMAX + 1);
- ((struct PSFTAG*)psftag)->str[TAGMAX] = 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-int psftag_getvar(void *psftag, const char *variable, char *value_out, int value_out_size) {
- return psftag_raw_getvar(((struct PSFTAG*)psftag)->str, variable, value_out, value_out_size);
-}
-
-void psftag_setvar(void *psftag, const char *variable, const char *value) {
- psftag_raw_setvar(((struct PSFTAG*)psftag)->str, TAGMAX + 1, variable, value);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-int psftag_readfromfile(void *psftag, const char *path) {
- struct PSFTAG *t = (struct PSFTAG*)psftag;
- FILE *f = NULL;
- int l;
- int rsize, exesize, tagstart;
- char hdr[12];
-
- f = fopen(path, "rb");
- if(!f) {
- //strncpy(t->errorstring, strerror(errno), ERRORMAX);
- //t->errorstring[ERRORMAX-1] = 0;
- return -1;
- }
-
- if(fread(hdr, 1, 12, f) != 12) goto invalidformat;
- if(memcmp(hdr, "PSF", 3)) goto invalidformat;
-
- rsize =
- ((((unsigned)(hdr[ 4])) & 0xFF) << 0) |
- ((((unsigned)(hdr[ 5])) & 0xFF) << 8) |
- ((((unsigned)(hdr[ 6])) & 0xFF) << 16) |
- ((((unsigned)(hdr[ 7])) & 0xFF) << 24);
- exesize =
- ((((unsigned)(hdr[ 8])) & 0xFF) << 0) |
- ((((unsigned)(hdr[ 9])) & 0xFF) << 8) |
- ((((unsigned)(hdr[10])) & 0xFF) << 16) |
- ((((unsigned)(hdr[11])) & 0xFF) << 24);
-
- tagstart = 16 + rsize + exesize;
-
- fseek(f, tagstart, SEEK_SET);
-
- if(fread(hdr, 1, 5, f) != 5) goto notpresent;
- if(memcmp(hdr, "[TAG]", 5)) goto invalidformat;
-
- tagstart += 5;
- fseek(f, 0, SEEK_END);
- l = ftell(f);
- fseek(f, tagstart, SEEK_SET);
- l -= tagstart;
- if(l < 0) l = 0;
- if(l > TAGMAX) l = TAGMAX;
-
- memset(t->str, 0, TAGMAX + 1);
- fread(t->str, 1, l, f);
-
- fclose(f);
- return 0;
-
-invalidformat:
-// strcpy(t->errorstring, "Invalid file format");
- goto error;
-notpresent:
-// strcpy(t->errorstring, "Tag not present");
- goto error;
-error:
- if(f) fclose(f);
- return -1;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-int psftag_writetofile(void *psftag, const char *path) {
- struct PSFTAG *t = (struct PSFTAG*)psftag;
- FILE *f = NULL;
- int l;
- int rsize, exesize, tagstart;
- char hdr[12];
-
- f = fopen(path, "r+b");
- if(!f) {
- //strncpy(t->errorstring, strerror(errno), ERRORMAX);
- //t->errorstring[ERRORMAX-1] = 0;
- return -1;
- }
-
- if(fread(hdr, 1, 12, f) != 12) goto invalidformat;
- if(memcmp(hdr, "PSF", 3)) goto invalidformat;
-
- rsize =
- ((((unsigned)(hdr[ 4])) & 0xFF) << 0) |
- ((((unsigned)(hdr[ 5])) & 0xFF) << 8) |
- ((((unsigned)(hdr[ 6])) & 0xFF) << 16) |
- ((((unsigned)(hdr[ 7])) & 0xFF) << 24);
- exesize =
- ((((unsigned)(hdr[ 8])) & 0xFF) << 0) |
- ((((unsigned)(hdr[ 9])) & 0xFF) << 8) |
- ((((unsigned)(hdr[10])) & 0xFF) << 16) |
- ((((unsigned)(hdr[11])) & 0xFF) << 24);
-
- tagstart = 16 + rsize + exesize;
-
- fseek(f, tagstart, SEEK_SET);
-
- l = strlen(t->str);
-
- fwrite("[TAG]", 1, 5, f);
- fwrite(t->str, 1, l, f);
- fputc(0,f);
- fclose(f);
-
- truncate(path, tagstart + 5 + l);
-
- return 0;
-
-invalidformat:
-// strcpy(t->errorstring, "Invalid file format");
- goto error;
-error:
- if(f) fclose(f);
- return -1;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/psftag.h Deleted

@@ -1,58 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// tag handling
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __PSF_PSFTAG_H__
-#define __PSF_PSFTAG_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *psftag_create(void);
-void  psftag_delete(void *psftag);
-
-int psftag_readfromfile(void *psftag, const char *path);
-int psftag_writetofile(void *psftag, const char *path);
-const char *psftag_getlasterror(void *psftag);
-
-//
-// Retrieve a tag variable.
-// Guarantees null termination of output.
-// Returns 0 if the variable was found
-// Otherwise, returns -1 and sets the output to an empty terminated string
-//
-int psftag_getvar(void *psftag, const char *variable, char *value_out, int value_out_size);
-
-//
-// Set a tag variable.
-//
-void psftag_setvar(void *psftag, const char *variable, const char *value);
-
-void psftag_getraw(void *psftag, char *raw_out, int raw_out_size);
-void psftag_setraw(void *psftag, const char *raw_in);
-
-//
-// Retrieve a tag variable. The input tag data must be null-terminated.
-// Guarantees null termination of output.
-// Returns 0 if the variable was found
-// Otherwise, returns -1 and sets the output to an empty terminated string
-//
-int psftag_raw_getvar(const char *tag, const char *variable, char *value_out, int value_out_size);
-
-//
-// Set a tag variable.
-// Provide the maximum growable tag size _including_ space for the null terminator.
-// Note that this function assumes it can overwrite *tag up to the length of the
-// existing string, regardless of tag_max_size.
-//
-void psftag_raw_setvar(char *tag, int tag_max_size, const char *variable, const char *value);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/snd_interp.h Deleted

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/thumb.h Deleted

@@ -1,2474 +0,0 @@
-// -*- C++ -*-
-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
-// Copyright (C) 1999-2003 Forgotten
-// Copyright (C) 2004 Forgotten and the VBA 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; either version 2, 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.
-
-#ifdef C_CORE
-#define NEG(i) ((i) >> 31)
-#define POS(i) ((~(i)) >> 31)
-#define ADDCARRY(a, b, c) \
- C_FLAG = ((NEG(a) & NEG(b)) |\
- (NEG(a) & POS(c)) |\
- (NEG(b) & POS(c))) ? true : false;
-#define ADDOVERFLOW(a, b, c) \
- V_FLAG = ((NEG(a) & NEG(b) & POS(c)) |\
- (POS(a) & POS(b) & NEG(c))) ? true : false;
-#define SUBCARRY(a, b, c) \
- C_FLAG = ((NEG(a) & POS(b)) |\
- (NEG(a) & POS(c)) |\
- (POS(b) & POS(c))) ? true : false;
-#define SUBOVERFLOW(a, b, c)\
- V_FLAG = ((NEG(a) & POS(b) & POS(c)) |\
- (POS(a) & NEG(b) & NEG(c))) ? true : false;
-#define ADD_RD_RS_RN \
- {\
- u32 lhs = reg[source].I;\
- u32 rhs = value;\
- u32 res = lhs + rhs;\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- ADDCARRY(lhs, rhs, res);\
- ADDOVERFLOW(lhs, rhs, res);\
- }
-#define ADD_RD_RS_O3 \
- {\
- u32 lhs = reg[source].I;\
- u32 rhs = value;\
- u32 res = lhs + rhs;\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- ADDCARRY(lhs, rhs, res);\
- ADDOVERFLOW(lhs, rhs, res);\
- }
-#define ADD_RN_O8(d) \
- {\
- u32 lhs = reg[(d)].I;\
- u32 rhs = (opcode & 255);\
- u32 res = lhs + rhs;\
- reg[(d)].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- ADDCARRY(lhs, rhs, res);\
- ADDOVERFLOW(lhs, rhs, res);\
- }
-#define CMN_RD_RS \
- {\
- u32 lhs = reg[dest].I;\
- u32 rhs = value;\
- u32 res = lhs + rhs;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- ADDCARRY(lhs, rhs, res);\
- ADDOVERFLOW(lhs, rhs, res);\
- }
-#define ADC_RD_RS \
- {\
- u32 lhs = reg[dest].I;\
- u32 rhs = value;\
- u32 res = lhs + rhs + (u32)C_FLAG;\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- ADDCARRY(lhs, rhs, res);\
- ADDOVERFLOW(lhs, rhs, res);\
- }
-#define SUB_RD_RS_RN \
- {\
- u32 lhs = reg[source].I;\
- u32 rhs = value;\
- u32 res = lhs - rhs;\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- SUBCARRY(lhs, rhs, res);\
- SUBOVERFLOW(lhs, rhs, res);\
- }
-#define SUB_RD_RS_O3 \
- {\
- u32 lhs = reg[source].I;\
- u32 rhs = value;\
- u32 res = lhs - rhs;\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- SUBCARRY(lhs, rhs, res);\
- SUBOVERFLOW(lhs, rhs, res);\
- }
-#define SUB_RN_O8(d) \
- {\
- u32 lhs = reg[(d)].I;\
- u32 rhs = (opcode & 255);\
- u32 res = lhs - rhs;\
- reg[(d)].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- SUBCARRY(lhs, rhs, res);\
- SUBOVERFLOW(lhs, rhs, res);\
- }
-#define CMP_RN_O8(d) \
- {\
- u32 lhs = reg[(d)].I;\
- u32 rhs = (opcode & 255);\
- u32 res = lhs - rhs;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- SUBCARRY(lhs, rhs, res);\
- SUBOVERFLOW(lhs, rhs, res);\
- }
-#define SBC_RD_RS \
- {\
- u32 lhs = reg[dest].I;\
- u32 rhs = value;\
- u32 res = lhs - rhs - !((u32)C_FLAG);\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- SUBCARRY(lhs, rhs, res);\
- SUBOVERFLOW(lhs, rhs, res);\
- }
-#define LSL_RD_RM_I5 \
- {\
- C_FLAG = (reg[source].I >> (32 - shift)) & 1 ? true : false;\
- value = reg[source].I << shift;\
- }
-#define LSL_RD_RS \
- {\
- C_FLAG = (reg[dest].I >> (32 - value)) & 1 ? true : false;\
- value = reg[dest].I << value;\
- }
-#define LSR_RD_RM_I5 \
- {\
- C_FLAG = (reg[source].I >> (shift - 1)) & 1 ? true : false;\
- value = reg[source].I >> shift;\
- }
-#define LSR_RD_RS \
- {\
- C_FLAG = (reg[dest].I >> (value - 1)) & 1 ? true : false;\
- value = reg[dest].I >> value;\
- }
-#define ASR_RD_RM_I5 \
- {\
- C_FLAG = ((s32)reg[source].I >> (int)(shift - 1)) & 1 ? true : false;\
- value = (s32)reg[source].I >> (int)shift;\
- }
-#define ASR_RD_RS \
- {\
- C_FLAG = ((s32)reg[dest].I >> (int)(value - 1)) & 1 ? true : false;\
- value = (s32)reg[dest].I >> (int)value;\
- }
-#define ROR_RD_RS \
- {\
- C_FLAG = (reg[dest].I >> (value - 1)) & 1 ? true : false;\
- value = ((reg[dest].I << (32 - value)) |\
- (reg[dest].I >> value));\
- }
-#define NEG_RD_RS \
- {\
- u32 lhs = reg[source].I;\
- u32 rhs = 0;\
- u32 res = rhs - lhs;\
- reg[dest].I = res;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- SUBCARRY(rhs, lhs, res);\
- SUBOVERFLOW(rhs, lhs, res);\
- }
-#define CMP_RD_RS \
- {\
- u32 lhs = reg[dest].I;\
- u32 rhs = value;\
- u32 res = lhs - rhs;\
- Z_FLAG = (res == 0) ? true : false;\
- N_FLAG = NEG(res) ? true : false;\
- SUBCARRY(lhs, rhs, res);\
- SUBOVERFLOW(lhs, rhs, res);\
- }
-#else
-#ifdef __GNUC__
-#ifdef __POWERPC__
- #define ADD_RD_RS_RN \
- {										\
- register int Flags;					\
- register int Result;				\
- asm volatile("addco. %0, %2, %3\n"	\
- "mcrxr cr1\n"			\
- "mfcr %1\n"				\
- : "=r" (Result), 		\
- "=r" (Flags)			\
- : "r" (reg[source].I), 	\
- "r" (value)			\
- );						\
- reg[dest].I = Result;				\
- Z_FLAG = (Flags >> 29) & 1;			\
- N_FLAG = (Flags >> 31) & 1;			\
- C_FLAG = (Flags >> 25) & 1;			\
- V_FLAG = (Flags >> 26) & 1;			\
- }
- #define ADD_RD_RS_O3 ADD_RD_RS_RN
- #define ADD_RN_O8(d) \
- {\
- register int Flags;					\
- register int Result;				\
- asm volatile("addco. %0, %2, %3\n"	\
- "mcrxr cr1\n"			\
- "mfcr %1\n"				\
- : "=r" (Result), 		\
- "=r" (Flags)			\
- : "r" (reg[(d)].I), 	\
- "r" (opcode & 255)	\
- );						\
- reg[(d)].I = Result;				\
- Z_FLAG = (Flags >> 29) & 1;			\
- N_FLAG = (Flags >> 31) & 1;			\
- C_FLAG = (Flags >> 25) & 1;			\
- V_FLAG = (Flags >> 26) & 1;			\
- }
- #define CMN_RD_RS \
- {\
- register int Flags;					\
- register int Result;				\
- asm volatile("addco. %0, %2, %3\n"	\
- "mcrxr cr1\n"			\
- "mfcr %1\n"				\
- : "=r" (Result), 		\
- "=r" (Flags)			\
- : "r" (reg[dest].I), 	\
- "r" (value)			\
- );						\
- Z_FLAG = (Flags >> 29) & 1;			\
- N_FLAG = (Flags >> 31) & 1;			\
- C_FLAG = (Flags >> 25) & 1;			\
- V_FLAG = (Flags >> 26) & 1;			\
- }
- #define ADC_RD_RS \
- {\
- register int Flags;					\
- register int Result;				\
- asm volatile("mtspr xer, %4\n"		\
- "addeo. %0, %2, %3\n"	\
- "mcrxr cr1\n"			\
- "mfcr	%1\n"			\
- : "=r" (Result),		\
- "=r" (Flags)			\
- : "r" (reg[dest].I),	\
- "r" (value),			\
- "r" (C_FLAG << 29)	\
- );						\
- reg[dest].I = Result;				\
- Z_FLAG = (Flags >> 29) & 1;			\
- N_FLAG = (Flags >> 31) & 1;			\
- C_FLAG = (Flags >> 25) & 1;			\
- V_FLAG = (Flags >> 26) & 1;			\
- }
- #define SUB_RD_RS_RN \
- {\
- register int Flags;					\
- register int Result;				\
- asm volatile("subco. %0, %2, %3\n"	\
- "mcrxr cr1\n"			\
- "mfcr %1\n"				\
- : "=r" (Result), 		\
- "=r" (Flags)			\
- : "r" (reg[source].I), 	\
- "r" (value)			\
- );						\
- reg[dest].I = Result;				\
- Z_FLAG = (Flags >> 29) & 1;			\
- N_FLAG = (Flags >> 31) & 1;			\
- C_FLAG = (Flags >> 25) & 1;			\
- V_FLAG = (Flags >> 26) & 1;			\
- }
- #define SUB_RD_RS_O3 SUB_RD_RS_RN
- #define SUB_RN_O8(d) \
- {\
- register int Flags;					\
- register int Result;				\
- asm volatile("subco. %0, %2, %3\n"	\
- "mcrxr cr1\n"			\
- "mfcr %1\n"				\
- : "=r" (Result), 		\
- "=r" (Flags)			\
- : "r" (reg[(d)].I), 	\
- "r" (opcode & 255)	\
- );						\
- reg[(d)].I = Result;				\
- Z_FLAG = (Flags >> 29) & 1;			\
- N_FLAG = (Flags >> 31) & 1;			\
- C_FLAG = (Flags >> 25) & 1;			\
- V_FLAG = (Flags >> 26) & 1;			\
- }
- #define CMP_RN_O8(d) \
- {\
- register int Flags;					\
- register int Result;				\
- asm volatile("subco. %0, %2, %3\n"	\
- "mcrxr cr1\n"			\
- "mfcr %1\n"				\
- : "=r" (Result), 		\
- "=r" (Flags)			\
- : "r" (reg[(d)].I), 	\
- "r" (opcode & 255)	\
- );						\
- Z_FLAG = (Flags >> 29) & 1;			\
- N_FLAG = (Flags >> 31) & 1;			\
- C_FLAG = (Flags >> 25) & 1;			\
- V_FLAG = (Flags >> 26) & 1;			\
- }
- #define SBC_RD_RS \
- {\
- register int Flags;					\
- register int Result;				\
- asm volatile("mtspr xer, %4\n"		\
- "subfeo. %0, %3, %2\n"	\
- "mcrxr cr1\n"			\
- "mfcr	%1\n"			\
- : "=r" (Result),		\
- "=r" (Flags)			\
- : "r" (reg[dest].I),	\
- "r" (value),			\
- "r" (C_FLAG << 29) 	\
- );						\
- reg[dest].I = Result;				\
- Z_FLAG = (Flags >> 29) & 1;			\
- N_FLAG = (Flags >> 31) & 1;			\
- C_FLAG = (Flags >> 25) & 1;			\
- V_FLAG = (Flags >> 26) & 1;			\
- }
- #define LSL_RD_RM_I5 \
- {\
- C_FLAG = (reg[source].I >> (32 - shift)) & 1 ? true : false;\
- value = reg[source].I << shift;\
- }
- #define LSL_RD_RS \
- {\
- C_FLAG = (reg[dest].I >> (32 - value)) & 1 ? true : false;\
- value = reg[dest].I << value;\
- }
- #define LSR_RD_RM_I5 \
- {\
- C_FLAG = (reg[source].I >> (shift - 1)) & 1 ? true : false;\
- value = reg[source].I >> shift;\
- }
- #define LSR_RD_RS \
- {\
- C_FLAG = (reg[dest].I >> (value - 1)) & 1 ? true : false;\
- value = reg[dest].I >> value;\
- }
- #define ASR_RD_RM_I5 \
- {\
- C_FLAG = ((s32)reg[source].I >> (int)(shift - 1)) & 1 ? true : false;\
- value = (s32)reg[source].I >> (int)shift;\
- }
- #define ASR_RD_RS \
- {\
- C_FLAG = ((s32)reg[dest].I >> (int)(value - 1)) & 1 ? true : false;\
- value = (s32)reg[dest].I >> (int)value;\
- }
- #define ROR_RD_RS \
- {\
- C_FLAG = (reg[dest].I >> (value - 1)) & 1 ? true : false;\
- value = ((reg[dest].I << (32 - value)) |\
- (reg[dest].I >> value));\
- }
- #define NEG_RD_RS \
- {\
- register int Flags;					\
- register int Result;				\
- asm volatile("subfco. %0, %2, %3\n"	\
- "mcrxr cr1\n"			\
- "mfcr %1\n"				\
- : "=r" (Result), 		\
- "=r" (Flags)			\
- : "r" (reg[source].I), 	\
- "r" (0)				\
- );						\
- reg[dest].I = Result;				\
- Z_FLAG = (Flags >> 29) & 1;			\
- N_FLAG = (Flags >> 31) & 1;			\
- C_FLAG = (Flags >> 25) & 1;			\
- V_FLAG = (Flags >> 26) & 1;			\
- }
- #define CMP_RD_RS \
- {\
- register int Flags;					\
- register int Result;				\
- asm volatile("subco. %0, %2, %3\n"	\
- "mcrxr cr1\n"			\
- "mfcr %1\n"				\
- : "=r" (Result), 		\
- "=r" (Flags)			\
- : "r" (reg[dest].I), 	\
- "r" (value)			\
- );						\
- Z_FLAG = (Flags >> 29) & 1;			\
- N_FLAG = (Flags >> 31) & 1;			\
- C_FLAG = (Flags >> 25) & 1;			\
- V_FLAG = (Flags >> 26) & 1;			\
- }
-#else
-#define ADD_RD_RS_RN \
- asm ("add %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setcb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[source].I));
-#define ADD_RD_RS_O3 \
- asm ("add %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setcb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[source].I));
-#define ADD_RN_O8(d) \
- asm ("add %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setcb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[(d)].I)\
- : "r" (opcode & 255), "b" (reg[(d)].I));
-#define CMN_RD_RS \
- asm ("add %0, %1;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setcb C_FLAG;"\
- "setob V_FLAG;"\
- : \
- : "r" (value), "r" (reg[dest].I):"1");
-#define ADC_RD_RS \
- asm ("bt $0, C_FLAG;"\
- "adc %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setcb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[dest].I));
-#define SUB_RD_RS_RN \
- asm ("sub %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setncb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[source].I));
-#define SUB_RD_RS_O3 \
- asm ("sub %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setncb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[source].I));
-#define SUB_RN_O8(d) \
- asm ("sub %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setncb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[(d)].I)\
- : "r" (opcode & 255), "b" (reg[(d)].I));
-#define CMP_RN_O8(d) \
- asm ("sub %0, %1;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setncb C_FLAG;"\
- "setob V_FLAG;"\
- : \
- : "r" (opcode & 255), "r" (reg[(d)].I) : "1");
-#define SBC_RD_RS \
- asm volatile ("bt $0, C_FLAG;"\
- "cmc;"\
- "sbb %1, %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setncb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "r" (value), "b" (reg[dest].I) : "cc", "memory");
-#define LSL_RD_RM_I5 \
- asm ("shl %%cl, %%eax;"\
- "setcb C_FLAG;"\
- : "=a" (value)\
- : "a" (reg[source].I), "c" (shift));
-#define LSL_RD_RS \
- asm ("shl %%cl, %%eax;"\
- "setcb C_FLAG;"\
- : "=a" (value)\
- : "a" (reg[dest].I), "c" (value));
-#define LSR_RD_RM_I5 \
- asm ("shr %%cl, %%eax;"\
- "setcb C_FLAG;"\
- : "=a" (value)\
- : "a" (reg[source].I), "c" (shift));
-#define LSR_RD_RS \
- asm ("shr %%cl, %%eax;"\
- "setcb C_FLAG;"\
- : "=a" (value)\
- : "a" (reg[dest].I), "c" (value));
-#define ASR_RD_RM_I5 \
- asm ("sar %%cl, %%eax;"\
- "setcb C_FLAG;"\
- : "=a" (value)\
- : "a" (reg[source].I), "c" (shift));
-#define ASR_RD_RS \
- asm ("sar %%cl, %%eax;"\
- "setcb C_FLAG;"\
- : "=a" (value)\
- : "a" (reg[dest].I), "c" (value));
-#define ROR_RD_RS \
- asm ("ror %%cl, %%eax;"\
- "setcb C_FLAG;"\
- : "=a" (value)\
- : "a" (reg[dest].I), "c" (value));
-#define NEG_RD_RS \
- asm ("neg %%ebx;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setncb C_FLAG;"\
- "setob V_FLAG;"\
- : "=b" (reg[dest].I)\
- : "b" (reg[source].I));
-#define CMP_RD_RS \
- asm ("sub %0, %1;"\
- "setsb N_FLAG;"\
- "setzb Z_FLAG;"\
- "setncb C_FLAG;"\
- "setob V_FLAG;"\
- : \
- : "r" (value), "r" (reg[dest].I):"1");
-#endif
-#else
-#define ADD_RD_RS_RN \
- {\
- __asm mov eax, source\
- __asm mov ebx, dword ptr [OFFSET reg+4*eax]\
- __asm add ebx, value\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg+4*eax], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define ADD_RD_RS_O3 \
- {\
- __asm mov eax, source\
- __asm mov ebx, dword ptr [OFFSET reg+4*eax]\
- __asm add ebx, value\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg+4*eax], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define ADD_RN_O8(d) \
- {\
- __asm mov ebx, opcode\
- __asm and ebx, 255\
- __asm add dword ptr [OFFSET reg+4*(d)], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define CMN_RD_RS \
- {\
- __asm mov eax, dest\
- __asm mov ebx, dword ptr [OFFSET reg+4*eax]\
- __asm add ebx, value\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define ADC_RD_RS \
- {\
- __asm mov ebx, dest\
- __asm mov ebx, dword ptr [OFFSET reg+4*ebx]\
- __asm bt word ptr C_FLAG, 0\
- __asm adc ebx, value\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg+4*eax], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define SUB_RD_RS_RN \
- {\
- __asm mov eax, source\
- __asm mov ebx, dword ptr [OFFSET reg+4*eax]\
- __asm sub ebx, value\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg+4*eax], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setnc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define SUB_RD_RS_O3 \
- {\
- __asm mov eax, source\
- __asm mov ebx, dword ptr [OFFSET reg+4*eax]\
- __asm sub ebx, value\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg+4*eax], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setnc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define SUB_RN_O8(d) \
- {\
- __asm mov ebx, opcode\
- __asm and ebx, 255\
- __asm sub dword ptr [OFFSET reg + 4*(d)], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setnc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define CMP_RN_O8(d) \
- {\
- __asm mov eax, dword ptr [OFFSET reg+4*(d)]\
- __asm mov ebx, opcode\
- __asm and ebx, 255\
- __asm sub eax, ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setnc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define SBC_RD_RS \
- {\
- __asm mov ebx, dest\
- __asm mov ebx, dword ptr [OFFSET reg + 4*ebx]\
- __asm mov eax, value\
- __asm bt word ptr C_FLAG, 0\
- __asm cmc\
- __asm sbb ebx, eax\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg + 4*eax], ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setnc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define LSL_RD_RM_I5 \
- {\
- __asm mov eax, source\
- __asm mov eax, dword ptr [OFFSET reg + 4 * eax]\
- __asm mov cl, byte ptr shift\
- __asm shl eax, cl\
- __asm mov value, eax\
- __asm setc byte ptr C_FLAG\
- }
-#define LSL_RD_RS \
- {\
- __asm mov eax, dest\
- __asm mov eax, dword ptr [OFFSET reg + 4 * eax]\
- __asm mov cl, byte ptr value\
- __asm shl eax, cl\
- __asm mov value, eax\
- __asm setc byte ptr C_FLAG\
- }
-#define LSR_RD_RM_I5 \
- {\
- __asm mov eax, source\
- __asm mov eax, dword ptr [OFFSET reg + 4 * eax]\
- __asm mov cl, byte ptr shift\
- __asm shr eax, cl\
- __asm mov value, eax\
- __asm setc byte ptr C_FLAG\
- }
-#define LSR_RD_RS \
- {\
- __asm mov eax, dest\
- __asm mov eax, dword ptr [OFFSET reg + 4 * eax]\
- __asm mov cl, byte ptr value\
- __asm shr eax, cl\
- __asm mov value, eax\
- __asm setc byte ptr C_FLAG\
- }
-#define ASR_RD_RM_I5 \
- {\
- __asm mov eax, source\
- __asm mov eax, dword ptr [OFFSET reg + 4*eax]\
- __asm mov cl, byte ptr shift\
- __asm sar eax, cl\
- __asm mov value, eax\
- __asm setc byte ptr C_FLAG\
- }
-#define ASR_RD_RS \
- {\
- __asm mov eax, dest\
- __asm mov eax, dword ptr [OFFSET reg + 4*eax]\
- __asm mov cl, byte ptr value\
- __asm sar eax, cl\
- __asm mov value, eax\
- __asm setc byte ptr C_FLAG\
- }
-#define ROR_RD_RS \
- {\
- __asm mov eax, dest\
- __asm mov eax, dword ptr [OFFSET reg + 4*eax]\
- __asm mov cl, byte ptr value\
- __asm ror eax, cl\
- __asm mov value, eax\
- __asm setc byte ptr C_FLAG\
- }
-#define NEG_RD_RS \
- {\
- __asm mov ebx, source\
- __asm mov ebx, dword ptr [OFFSET reg+4*ebx]\
- __asm neg ebx\
- __asm mov eax, dest\
- __asm mov dword ptr [OFFSET reg+4*eax],ebx\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setnc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#define CMP_RD_RS \
- {\
- __asm mov eax, dest\
- __asm mov ebx, dword ptr [OFFSET reg+4*eax]\
- __asm sub ebx, value\
- __asm sets byte ptr N_FLAG\
- __asm setz byte ptr Z_FLAG\
- __asm setnc byte ptr C_FLAG\
- __asm seto byte ptr V_FLAG\
- }
-#endif
-#endif
-
-u32 opcode = CPUReadHalfWordQuick(armNextPC);
-clockTicks = thumbCycles[opcode >> 8] + memoryWaitFetch[(armNextPC >> 24) & 15];
-#ifndef FINAL_VERSION
-if(armNextPC == stop) {
- armNextPC = armNextPC++;
-}
-#endif
-
-armNextPC = reg[15].I;
-reg[15].I += 2;
-
-switch(opcode >> 8) {
- case 0x00:
- case 0x01:
- case 0x02:
- case 0x03:
- case 0x04:
- case 0x05:
- case 0x06:
- case 0x07:
- {
- // LSL Rd, Rm, #Imm 5
- int dest = opcode & 0x07;
- int source = (opcode >> 3) & 0x07;
- int shift = (opcode >> 6) & 0x1f;
- u32 value;
- 
- if(shift) {
- LSL_RD_RM_I5;
- } else {
- value = reg[source].I;
- }
- reg[dest].I = value;
- // C_FLAG set above
- N_FLAG = (value & 0x80000000 ? true : false);
- Z_FLAG = (value ? false : true);
- }
- break;
- case 0x08:
- case 0x09:
- case 0x0a:
- case 0x0b:
- case 0x0c:
- case 0x0d:
- case 0x0e:
- case 0x0f:
- {
- // LSR Rd, Rm, #Imm 5
- int dest = opcode & 0x07;
- int source = (opcode >> 3) & 0x07;
- int shift = (opcode >> 6) & 0x1f;
- u32 value;
- 
- if(shift) {
- LSR_RD_RM_I5;
- } else {
- C_FLAG = reg[source].I & 0x80000000 ? true : false;
- value = 0;
- }
- reg[dest].I = value;
- // C_FLAG set above
- N_FLAG = (value & 0x80000000 ? true : false);
- Z_FLAG = (value ? false : true);
- }
- break;
- case 0x10:
- case 0x11:
- case 0x12:
- case 0x13:
- case 0x14:
- case 0x15:
- case 0x16:
- case 0x17:
- { 
- // ASR Rd, Rm, #Imm 5
- int dest = opcode & 0x07;
- int source = (opcode >> 3) & 0x07;
- int shift = (opcode >> 6) & 0x1f;
- u32 value;
- 
- if(shift) {
- ASR_RD_RM_I5;
- } else {
- if(reg[source].I & 0x80000000) {
- value = 0xFFFFFFFF;
- C_FLAG = true;
- } else {
- value = 0;
- C_FLAG = false;
- }
- }
- reg[dest].I = value;
- // C_FLAG set above
- N_FLAG = (value & 0x80000000 ? true : false);
- Z_FLAG = (value ? false :true);
- }
- break;
- case 0x18:
- case 0x19:
- {
- // ADD Rd, Rs, Rn
- int dest = opcode & 0x07;
- int source = (opcode >> 3) & 0x07;
- u32 value = reg[(opcode>>6)& 0x07].I;
- ADD_RD_RS_RN;
- }
- break;
- case 0x1a:
- case 0x1b:
- {
- // SUB Rd, Rs, Rn
- int dest = opcode & 0x07;
- int source = (opcode >> 3) & 0x07;
- u32 value = reg[(opcode>>6)& 0x07].I;
- SUB_RD_RS_RN;
- }
- break;
- case 0x1c:
- case 0x1d:
- {
- // ADD Rd, Rs, #Offset3
- int dest = opcode & 0x07;
- int source = (opcode >> 3) & 0x07;
- u32 value = (opcode >> 6) & 7;
- ADD_RD_RS_O3;
- }
- break;
- case 0x1e:
- case 0x1f:
- {
- // SUB Rd, Rs, #Offset3
- int dest = opcode & 0x07;
- int source = (opcode >> 3) & 0x07;
- u32 value = (opcode >> 6) & 7;
- SUB_RD_RS_O3;
- }
- break;
- case 0x20:
- // MOV R0, #Offset8
- reg[0].I = opcode & 255;
- N_FLAG = false;
- Z_FLAG = (reg[0].I ? false : true);
- break;
- case 0x21:
- // MOV R1, #Offset8
- reg[1].I = opcode & 255;
- N_FLAG = false;
- Z_FLAG = (reg[1].I ? false : true);
- break; 
- case 0x22:
- // MOV R2, #Offset8
- reg[2].I = opcode & 255;
- N_FLAG = false;
- Z_FLAG = (reg[2].I ? false : true);
- break; 
- case 0x23:
- // MOV R3, #Offset8
- reg[3].I = opcode & 255;
- N_FLAG = false;
- Z_FLAG = (reg[3].I ? false : true);
- break; 
- case 0x24:
- // MOV R4, #Offset8
- reg[4].I = opcode & 255;
- N_FLAG = false;
- Z_FLAG = (reg[4].I ? false : true);
- break; 
- case 0x25:
- // MOV R5, #Offset8
- reg[5].I = opcode & 255;
- N_FLAG = false;
- Z_FLAG = (reg[5].I ? false : true);
- break; 
- case 0x26:
- // MOV R6, #Offset8
- reg[6].I = opcode & 255;
- N_FLAG = false;
- Z_FLAG = (reg[6].I ? false : true);
- break; 
- case 0x27:
- // MOV R7, #Offset8
- reg[7].I = opcode & 255;
- N_FLAG = false;
- Z_FLAG = (reg[7].I ? false : true);
- break;
- case 0x28:
- // CMP R0, #Offset8
- CMP_RN_O8(0);
- break;
- case 0x29:
- // CMP R1, #Offset8
- CMP_RN_O8(1);
- break;
- case 0x2a:
- // CMP R2, #Offset8
- CMP_RN_O8(2);
- break;
- case 0x2b:
- // CMP R3, #Offset8
- CMP_RN_O8(3);
- break;
- case 0x2c:
- // CMP R4, #Offset8
- CMP_RN_O8(4);
- break;
- case 0x2d:
- // CMP R5, #Offset8
- CMP_RN_O8(5);
- break;
- case 0x2e:
- // CMP R6, #Offset8
- CMP_RN_O8(6);
- break;
- case 0x2f:
- // CMP R7, #Offset8
- CMP_RN_O8(7);
- break;
- case 0x30:
- // ADD R0,#Offset8
- ADD_RN_O8(0);
- break; 
- case 0x31:
- // ADD R1,#Offset8
- ADD_RN_O8(1);
- break; 
- case 0x32:
- // ADD R2,#Offset8
- ADD_RN_O8(2);
- break; 
- case 0x33:
- // ADD R3,#Offset8
- ADD_RN_O8(3);
- break; 
- case 0x34:
- // ADD R4,#Offset8
- ADD_RN_O8(4);
- break; 
- case 0x35:
- // ADD R5,#Offset8
- ADD_RN_O8(5);
- break; 
- case 0x36:
- // ADD R6,#Offset8
- ADD_RN_O8(6);
- break; 
- case 0x37:
- // ADD R7,#Offset8
- ADD_RN_O8(7);
- break;
- case 0x38:
- // SUB R0,#Offset8
- SUB_RN_O8(0);
- break;
- case 0x39:
- // SUB R1,#Offset8
- SUB_RN_O8(1);
- break;
- case 0x3a:
- // SUB R2,#Offset8
- SUB_RN_O8(2);
- break;
- case 0x3b:
- // SUB R3,#Offset8
- SUB_RN_O8(3);
- break;
- case 0x3c:
- // SUB R4,#Offset8
- SUB_RN_O8(4);
- break;
- case 0x3d:
- // SUB R5,#Offset8
- SUB_RN_O8(5);
- break;
- case 0x3e:
- // SUB R6,#Offset8
- SUB_RN_O8(6);
- break;
- case 0x3f:
- // SUB R7,#Offset8
- SUB_RN_O8(7);
- break;
- case 0x40:
- switch((opcode >> 6) & 3) {
- case 0x00:
- {
- // AND Rd, Rs
- int dest = opcode & 7;
- reg[dest].I &= reg[(opcode >> 3)&7].I;
- N_FLAG = reg[dest].I & 0x80000000 ? true : false;
- Z_FLAG = reg[dest].I ? false : true;
-#ifdef BKPT_SUPPORT 
-#define THUMB_CONSOLE_OUTPUT(a,b) \
- if((opcode == 0x4000) && (reg[0].I == 0xC0DED00D)) {\
- extern void (*dbgOutput)(char *, u32);\
- dbgOutput((a), (b));\
- }
-#else
-#define THUMB_CONSOLE_OUTPUT(a,b)
-#endif
- THUMB_CONSOLE_OUTPUT(NULL, reg[2].I);
- }
- break;
- case 0x01:
- // EOR Rd, Rs
- {
- int dest = opcode & 7;
- reg[dest].I ^= reg[(opcode >> 3)&7].I;
- N_FLAG = reg[dest].I & 0x80000000 ? true : false;
- Z_FLAG = reg[dest].I ? false : true;
- }
- break;
- case 0x02:
- // LSL Rd, Rs
- {
- int dest = opcode & 7;
- u32 value = reg[(opcode >> 3)&7].B.B0;
- if(value) {
- if(value == 32) {
- value = 0;
- C_FLAG = (reg[dest].I & 1 ? true : false);
- } else if(value < 32) {
- LSL_RD_RS;
- } else {
- value = 0;
- C_FLAG = false;
- }
- reg[dest].I = value; 
- }
- N_FLAG = reg[dest].I & 0x80000000 ? true : false;
- Z_FLAG = reg[dest].I ? false : true;
- clockTicks++;
- }
- break;
- case 0x03:
- {
- // LSR Rd, Rs
- int dest = opcode & 7;
- u32 value = reg[(opcode >> 3)&7].B.B0;
- if(value) {
- if(value == 32) {
- value = 0;
- C_FLAG = (reg[dest].I & 0x80000000 ? true : false);
- } else if(value < 32) {
- LSR_RD_RS;
- } else {
- value = 0;
- C_FLAG = false;
- }
- reg[dest].I = value; 
- }
- N_FLAG = reg[dest].I & 0x80000000 ? true : false;
- Z_FLAG = reg[dest].I ? false : true;
- clockTicks++;
- }
- break;
- }
- break;
- case 0x41:
- switch((opcode >> 6) & 3) {
- case 0x00:
- {
- // ASR Rd, Rs
- int dest = opcode & 7;
- u32 value = reg[(opcode >> 3)&7].B.B0;
- // ASR
- if(value) {
- if(value < 32) {
- ASR_RD_RS;
- reg[dest].I = value; 
- } else {
- if(reg[dest].I & 0x80000000){
- reg[dest].I = 0xFFFFFFFF;
- C_FLAG = true;
- } else {
- reg[dest].I = 0x00000000;
- C_FLAG = false;
- }
- }
- }
- N_FLAG = reg[dest].I & 0x80000000 ? true : false;
- Z_FLAG = reg[dest].I ? false : true;
- clockTicks++;
- }
- break;
- case 0x01:
- {
- // ADC Rd, Rs
- int dest = opcode & 0x07;
- u32 value = reg[(opcode >> 3)&7].I;
- // ADC
- ADC_RD_RS;
- }
- break;
- case 0x02:
- {
- // SBC Rd, Rs
- int dest = opcode & 0x07;
- u32 value = reg[(opcode >> 3)&7].I;
- 
- // SBC
- SBC_RD_RS;
- }
- break;
- case 0x03:
- // ROR Rd, Rs
- {
- int dest = opcode & 7;
- u32 value = reg[(opcode >> 3)&7].B.B0;
- 
- if(value) {
- value = value & 0x1f;
- if(value == 0) {
- C_FLAG = (reg[dest].I & 0x80000000 ? true : false);
- } else {
- ROR_RD_RS;
- reg[dest].I = value;
- }
- }
- clockTicks++;
- N_FLAG = reg[dest].I & 0x80000000 ? true : false;
- Z_FLAG = reg[dest].I ? false : true;
- }
- break;
- }
- break;
- case 0x42:
- switch((opcode >> 6) & 3) {
- case 0x00:
- {
- // TST Rd, Rs
- u32 value = reg[opcode & 7].I & reg[(opcode >> 3) & 7].I;
- N_FLAG = value & 0x80000000 ? true : false;
- Z_FLAG = value ? false : true;
- }
- break;
- case 0x01:
- {
- // NEG Rd, Rs
- int dest = opcode & 7;
- int source = (opcode >> 3) & 7;
- NEG_RD_RS;
- }
- break;
- case 0x02:
- {
- // CMP Rd, Rs
- int dest = opcode & 7;
- u32 value = reg[(opcode >> 3)&7].I;
- CMP_RD_RS;
- }
- break;
- case 0x03:
- {
- // CMN Rd, Rs
- int dest = opcode & 7;
- u32 value = reg[(opcode >> 3)&7].I;
- // CMN
- CMN_RD_RS;
- }
- break;
- }
- break;
- case 0x43:
- switch((opcode >> 6) & 3) {
- case 0x00:
- {
- // ORR Rd, Rs 
- int dest = opcode & 7;
- reg[dest].I |= reg[(opcode >> 3) & 7].I;
- Z_FLAG = reg[dest].I ? false : true;
- N_FLAG = reg[dest].I & 0x80000000 ? true : false;
- }
- break;
- case 0x01:
- {
- // MUL Rd, Rs
- int dest = opcode & 7;
- u32 rm = reg[(opcode >> 3) & 7].I;
- reg[dest].I = reg[dest].I * rm;
- if (((s32)rm) < 0)
- rm = ~rm;
- if ((rm & 0xFFFFFF00) == 0)
- clockTicks += 1;
- else if ((rm & 0xFFFF0000) == 0)
- clockTicks += 2;
- else if ((rm & 0xFF000000) == 0)
- clockTicks += 3;
- else
- clockTicks += 4;
- Z_FLAG = reg[dest].I ? false : true;
- N_FLAG = reg[dest].I & 0x80000000 ? true : false;
- }
- break;
- case 0x02:
- {
- // BIC Rd, Rs
- int dest = opcode & 7;
- reg[dest].I &= (~reg[(opcode >> 3) & 7].I);
- Z_FLAG = reg[dest].I ? false : true;
- N_FLAG = reg[dest].I & 0x80000000 ? true : false;
- }
- break;
- case 0x03:
- {
- // MVN Rd, Rs
- int dest = opcode & 7;
- reg[dest].I = ~reg[(opcode >> 3) & 7].I;
- Z_FLAG = reg[dest].I ? false : true;
- N_FLAG = reg[dest].I & 0x80000000 ? true : false;
- }
- break;
- }
- break;
- case 0x44:
- {
- int dest = opcode & 7;
- int base = (opcode >> 3) & 7;
- switch((opcode >> 6)& 3) {
- default:
- goto unknown_thumb;
- case 1:
- // ADD Rd, Hs
- reg[dest].I += reg[base+8].I;
- break;
- case 2:
- // ADD Hd, Rs
- reg[dest+8].I += reg[base].I;
- if(dest == 7) {
- reg[15].I &= 0xFFFFFFFE;
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks++;
- } 
- break;
- case 3:
- // ADD Hd, Hs
- reg[dest+8].I += reg[base+8].I;
- if(dest == 7) {
- reg[15].I &= 0xFFFFFFFE;
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks++; 
- }
- break;
- }
- }
- break;
- case 0x45:
- {
- int dest = opcode & 7;
- int base = (opcode >> 3) & 7;
- u32 value;
- switch((opcode >> 6) & 3) {
- case 0:
- // CMP Rd, Hs
- value = reg[base].I;
- CMP_RD_RS;
- break;
- case 1:
- // CMP Rd, Hs
- value = reg[base+8].I;
- CMP_RD_RS;
- break;
- case 2:
- // CMP Hd, Rs
- value = reg[base].I;
- dest += 8;
- CMP_RD_RS;
- break;
- case 3:
- // CMP Hd, Hs
- value = reg[base+8].I;
- dest += 8;
- CMP_RD_RS;
- break;
- }
- }
- break;
- case 0x46:
- {
- int dest = opcode & 7;
- int base = (opcode >> 3) & 7;
- switch((opcode >> 6) & 3) {
- case 0:
- // this form should not be used...
- // MOV Rd, Rs
- reg[dest].I = reg[base].I;
- break;
- case 1:
- // MOV Rd, Hs
- reg[dest].I = reg[base+8].I;
- break;
- case 2:
- // MOV Hd, Rs
- reg[dest+8].I = reg[base].I;
- if(dest == 7) {
- reg[15].I &= 0xFFFFFFFE;
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks++;
- }
- break;
- case 3:
- // MOV Hd, Hs
- reg[dest+8].I = reg[base+8].I;
- if(dest == 7) {
- reg[15].I &= 0xFFFFFFFE;
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks++;
- } 
- break;
- }
- }
- break;
- case 0x47:
- {
- int base = (opcode >> 3) & 7;
- switch((opcode >>6) & 3) {
- case 0:
- // BX Rs
- reg[15].I = (reg[base].I) & 0xFFFFFFFE;
- if(reg[base].I & 1) {
- armState = false;
- armNextPC = reg[15].I;
- reg[15].I += 2;
- } else {
- armState = true;
- reg[15].I &= 0xFFFFFFFC;
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- break;
- case 1:
- // BX Hs
- reg[15].I = (reg[8+base].I) & 0xFFFFFFFE;
- if(reg[8+base].I & 1) {
- armState = false;
- armNextPC = reg[15].I;
- reg[15].I += 2;
- } else {
- armState = true;
- reg[15].I &= 0xFFFFFFFC; 
- armNextPC = reg[15].I;
- reg[15].I += 4;
- }
- break;
- default:
- goto unknown_thumb;
- }
- }
- break;
- case 0x48:
- // LDR R0,[PC, #Imm]
- {
- u32 address = (reg[15].I & 0xFFFFFFFC) + ((opcode & 0xFF) << 2);
- reg[0].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x49:
- // LDR R1,[PC, #Imm]
- {
- u32 address = (reg[15].I & 0xFFFFFFFC) + ((opcode & 0xFF) << 2); 
- reg[1].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x4a:
- // LDR R2,[PC, #Imm]
- {
- u32 address = (reg[15].I & 0xFFFFFFFC) + ((opcode & 0xFF) << 2); 
- reg[2].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x4b:
- // LDR R3,[PC, #Imm]
- {
- u32 address = (reg[15].I & 0xFFFFFFFC) + ((opcode & 0xFF) << 2); 
- reg[3].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x4c:
- // LDR R4,[PC, #Imm]
- {
- u32 address = (reg[15].I & 0xFFFFFFFC) + ((opcode & 0xFF) << 2); 
- reg[4].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x4d:
- // LDR R5,[PC, #Imm]
- {
- u32 address = (reg[15].I & 0xFFFFFFFC) + ((opcode & 0xFF) << 2); 
- reg[5].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x4e:
- // LDR R6,[PC, #Imm]
- {
- u32 address = (reg[15].I & 0xFFFFFFFC) + ((opcode & 0xFF) << 2); 
- reg[6].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x4f:
- // LDR R7,[PC, #Imm]
- {
- u32 address = (reg[15].I & 0xFFFFFFFC) + ((opcode & 0xFF) << 2); 
- reg[7].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x50:
- case 0x51:
- // STR Rd, [Rs, Rn]
- {
- u32 
- address = reg[(opcode>>3)&7].I + reg[(opcode>>6)&7].I;
- CPUWriteMemory(address,
- reg[opcode & 7].I);
- clockTicks += CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x52:
- case 0x53:
- // STRH Rd, [Rs, Rn]
- {
- u32 address = reg[(opcode>>3)&7].I + reg[(opcode>>6)&7].I;
- CPUWriteHalfWord(address,
- reg[opcode&7].W.W0);
- clockTicks += CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x54:
- case 0x55:
- // STRB Rd, [Rs, Rn]
- {
- u32 address = reg[(opcode>>3)&7].I + reg[(opcode >>6)&7].I;
- CPUWriteByte(address,
- reg[opcode & 7].B.B0);
- clockTicks += CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x56:
- case 0x57:
- // LDSB Rd, [Rs, Rn]
- {
- u32 address = reg[(opcode>>3)&7].I + reg[(opcode>>6)&7].I;
- reg[opcode&7].I = (s8)CPUReadByte(address);
- clockTicks += CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x58:
- case 0x59:
- // LDR Rd, [Rs, Rn]
- {
- u32 address = reg[(opcode>>3)&7].I + reg[(opcode>>6)&7].I;
- reg[opcode&7].I = CPUReadMemory(address);
- clockTicks += CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x5a:
- case 0x5b:
- // LDRH Rd, [Rs, Rn]
- {
- u32 address = reg[(opcode>>3)&7].I + reg[(opcode>>6)&7].I;
- reg[opcode&7].I = CPUReadHalfWord(address);
- clockTicks += CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x5c:
- case 0x5d:
- // LDRB Rd, [Rs, Rn]
- {
- u32 address = reg[(opcode>>3)&7].I + reg[(opcode>>6)&7].I;
- reg[opcode&7].I = CPUReadByte(address);
- clockTicks += CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x5e:
- case 0x5f:
- // LDSH Rd, [Rs, Rn]
- {
- u32 address = reg[(opcode>>3)&7].I + reg[(opcode>>6)&7].I;
- reg[opcode&7].I = (s16)CPUReadHalfWordSigned(address);
- clockTicks += CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x60:
- case 0x61:
- case 0x62:
- case 0x63:
- case 0x64:
- case 0x65:
- case 0x66:
- case 0x67:
- // STR Rd, [Rs, #Imm]
- {
- u32 address = reg[(opcode>>3)&7].I + (((opcode>>6)&31)<<2);
- CPUWriteMemory(address,
- reg[opcode&7].I);
- clockTicks += CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x68:
- case 0x69:
- case 0x6a:
- case 0x6b:
- case 0x6c:
- case 0x6d:
- case 0x6e:
- case 0x6f:
- // LDR Rd, [Rs, #Imm]
- {
- u32 address = reg[(opcode>>3)&7].I + (((opcode>>6)&31)<<2);
- reg[opcode&7].I = CPUReadMemory(address);
- clockTicks += CPUUpdateTicksAccess32(address);
- }
- break;
- case 0x70:
- case 0x71:
- case 0x72:
- case 0x73:
- case 0x74:
- case 0x75:
- case 0x76:
- case 0x77:
- // STRB Rd, [Rs, #Imm]
- {
- u32 address = reg[(opcode>>3)&7].I + (((opcode>>6)&31));
- CPUWriteByte(address,
- reg[opcode&7].B.B0);
- clockTicks += CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x78:
- case 0x79:
- case 0x7a:
- case 0x7b:
- case 0x7c:
- case 0x7d:
- case 0x7e:
- case 0x7f:
- // LDRB Rd, [Rs, #Imm]
- {
- u32 address = reg[(opcode>>3)&7].I + (((opcode>>6)&31));
- reg[opcode&7].I = CPUReadByte(address);
- clockTicks += CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x80:
- case 0x81:
- case 0x82:
- case 0x83:
- case 0x84:
- case 0x85:
- case 0x86:
- case 0x87:
- // STRH Rd, [Rs, #Imm]
- {
- u32 address = reg[(opcode>>3)&7].I + (((opcode>>6)&31)<<1);
- CPUWriteHalfWord(address,
- reg[opcode&7].W.W0);
- clockTicks += CPUUpdateTicksAccess16(address);
- }
- break; 
- case 0x88:
- case 0x89:
- case 0x8a:
- case 0x8b:
- case 0x8c:
- case 0x8d:
- case 0x8e:
- case 0x8f:
- // LDRH Rd, [Rs, #Imm]
- {
- u32 address = reg[(opcode>>3)&7].I + (((opcode>>6)&31)<<1);
- reg[opcode&7].I = CPUReadHalfWord(address);
- clockTicks += CPUUpdateTicksAccess16(address);
- }
- break;
- case 0x90:
- // STR R0, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2);
- CPUWriteMemory(address, reg[0].I);
- clockTicks += CPUUpdateTicksAccess32(address);
- }
- break; 
- case 0x91:
- // STR R1, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- CPUWriteMemory(address, reg[1].I);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break; 
- case 0x92:
- // STR R2, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- CPUWriteMemory(address, reg[2].I);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break; 
- case 0x93:
- // STR R3, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- CPUWriteMemory(address, reg[3].I);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break; 
- case 0x94:
- // STR R4, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- CPUWriteMemory(address, reg[4].I);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break; 
- case 0x95:
- // STR R5, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- CPUWriteMemory(address, reg[5].I);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break; 
- case 0x96:
- // STR R6, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- CPUWriteMemory(address, reg[6].I);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break; 
- case 0x97:
- // STR R7, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- CPUWriteMemory(address, reg[7].I);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break; 
- case 0x98:
- // LDR R0, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- reg[0].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x99:
- // LDR R1, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- reg[1].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x9a:
- // LDR R2, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- reg[2].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x9b:
- // LDR R3, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- reg[3].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x9c:
- // LDR R4, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- reg[4].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x9d:
- // LDR R5, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- reg[5].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x9e:
- // LDR R6, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- reg[6].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0x9f:
- // LDR R7, [SP, #Imm]
- {
- u32 address = reg[13].I + ((opcode&255)<<2); 
- reg[7].I = CPUReadMemoryQuick(address);
- clockTicks += CPUUpdateTicksAccess32(address); 
- }
- break;
- case 0xa0:
- // ADD R0, PC, Imm
- reg[0].I = (reg[15].I & 0xFFFFFFFC) + ((opcode&255)<<2);
- break; 
- case 0xa1:
- // ADD R1, PC, Imm
- reg[1].I = (reg[15].I & 0xFFFFFFFC) + ((opcode&255)<<2);
- break; 
- case 0xa2:
- // ADD R2, PC, Imm
- reg[2].I = (reg[15].I & 0xFFFFFFFC) + ((opcode&255)<<2);
- break; 
- case 0xa3:
- // ADD R3, PC, Imm
- reg[3].I = (reg[15].I & 0xFFFFFFFC) + ((opcode&255)<<2);
- break; 
- case 0xa4:
- // ADD R4, PC, Imm
- reg[4].I = (reg[15].I & 0xFFFFFFFC) + ((opcode&255)<<2);
- break; 
- case 0xa5:
- // ADD R5, PC, Imm
- reg[5].I = (reg[15].I & 0xFFFFFFFC) + ((opcode&255)<<2);
- break; 
- case 0xa6:
- // ADD R6, PC, Imm
- reg[6].I = (reg[15].I & 0xFFFFFFFC) + ((opcode&255)<<2);
- break; 
- case 0xa7:
- // ADD R7, PC, Imm
- reg[7].I = (reg[15].I & 0xFFFFFFFC) + ((opcode&255)<<2);
- break; 
- case 0xa8:
- // ADD R0, SP, Imm
- reg[0].I = reg[13].I + ((opcode&255)<<2);
- break; 
- case 0xa9:
- // ADD R1, SP, Imm
- reg[1].I = reg[13].I + ((opcode&255)<<2);
- break; 
- case 0xaa:
- // ADD R2, SP, Imm
- reg[2].I = reg[13].I + ((opcode&255)<<2);
- break; 
- case 0xab:
- // ADD R3, SP, Imm
- reg[3].I = reg[13].I + ((opcode&255)<<2);
- break; 
- case 0xac:
- // ADD R4, SP, Imm
- reg[4].I = reg[13].I + ((opcode&255)<<2);
- break; 
- case 0xad:
- // ADD R5, SP, Imm
- reg[5].I = reg[13].I + ((opcode&255)<<2);
- break; 
- case 0xae:
- // ADD R6, SP, Imm
- reg[6].I = reg[13].I + ((opcode&255)<<2);
- break; 
- case 0xaf:
- // ADD R7, SP, Imm
- reg[7].I = reg[13].I + ((opcode&255)<<2);
- break; 
- case 0xb0:
- {
- // ADD SP, Imm
- int offset = (opcode & 127) << 2;
- if(opcode & 0x80)
- offset = -offset;
- reg[13].I += offset;
- }
- break;
-#define PUSH_REG(val, r) \
- if(opcode & (val)) {\
- CPUWriteMemory(address, reg[(r)].I);\
- if(offset)\
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);\
- else\
- clockTicks += 1 + CPUUpdateTicksAccess32(address);\
- offset = 1;\
- address += 4;\
- }
- case 0xb4:
- // PUSH {Rlist}
- {
- int offset = 0;
- u32 temp = reg[13].I - 4 * cpuBitsSet[opcode & 0xff];
- u32 address = temp & 0xFFFFFFFC;
- PUSH_REG(1, 0);
- PUSH_REG(2, 1);
- PUSH_REG(4, 2);
- PUSH_REG(8, 3);
- PUSH_REG(16, 4);
- PUSH_REG(32, 5);
- PUSH_REG(64, 6);
- PUSH_REG(128, 7);
- reg[13].I = temp;
- }
- break;
- case 0xb5:
- // PUSH {Rlist, LR}
- {
- int offset = 0;
- u32 temp = reg[13].I - 4 - 4 * cpuBitsSet[opcode & 0xff];
- u32 address = temp & 0xFFFFFFFC;
- PUSH_REG(1, 0);
- PUSH_REG(2, 1);
- PUSH_REG(4, 2);
- PUSH_REG(8, 3);
- PUSH_REG(16, 4);
- PUSH_REG(32, 5);
- PUSH_REG(64, 6);
- PUSH_REG(128, 7);
- PUSH_REG(256, 14);
- reg[13].I = temp;
- }
- break;
-#define POP_REG(val, r) \
- if(opcode & (val)) {\
- reg[(r)].I = CPUReadMemory(address);\
- if(offset)\
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);\
- else\
- clockTicks += 2 + CPUUpdateTicksAccess32(address);\
- offset = 1;\
- address += 4;\
- }
- case 0xbc:
- // POP {Rlist}
- {
- int offset = 0;
- u32 address = reg[13].I & 0xFFFFFFFC;
- u32 temp = reg[13].I + 4*cpuBitsSet[opcode & 0xFF];
- POP_REG(1, 0);
- POP_REG(2, 1);
- POP_REG(4, 2);
- POP_REG(8, 3);
- POP_REG(16, 4);
- POP_REG(32, 5);
- POP_REG(64, 6);
- POP_REG(128, 7);
- reg[13].I = temp;
- }
- break; 
- case 0xbd:
- // POP {Rlist, PC}
- {
- int offset = 0;
- u32 address = reg[13].I & 0xFFFFFFFC;
- u32 temp = reg[13].I + 4 + 4*cpuBitsSet[opcode & 0xFF];
- POP_REG(1, 0);
- POP_REG(2, 1);
- POP_REG(4, 2);
- POP_REG(8, 3);
- POP_REG(16, 4);
- POP_REG(32, 5);
- POP_REG(64, 6);
- POP_REG(128, 7);
- reg[15].I = (CPUReadMemory(address) & 0xFFFFFFFE);
- if(offset)
- clockTicks += CPUUpdateTicksAccessSeq32(address);
- else
- clockTicks += CPUUpdateTicksAccess32(address);
- armNextPC = reg[15].I;
- reg[15].I += 2;
- reg[13].I = temp;
- }
- break; 
-#define THUMB_STM_REG(val,r,b) \
- if(opcode & (val)) {\
- CPUWriteMemory(address, reg[(r)].I);\
- if(!offset) {\
- reg[(b)].I = temp;\
- clockTicks += 1 + CPUUpdateTicksAccess32(address);\
- } else \
- clockTicks += 1 + CPUUpdateTicksAccessSeq32(address);\
- offset = 1;\
- address += 4;\
- }
- case 0xc0:
- {
- // STM R0!, {Rlist}
- u32 address = reg[0].I & 0xFFFFFFFC;
- u32 temp = reg[0].I + 4*cpuBitsSet[opcode & 0xff];
- int offset = 0;
- // store
- THUMB_STM_REG(1, 0, 0);
- THUMB_STM_REG(2, 1, 0);
- THUMB_STM_REG(4, 2, 0);
- THUMB_STM_REG(8, 3, 0);
- THUMB_STM_REG(16, 4, 0);
- THUMB_STM_REG(32, 5, 0);
- THUMB_STM_REG(64, 6, 0);
- THUMB_STM_REG(128, 7, 0);
- }
- break; 
- case 0xc1:
- {
- // STM R1!, {Rlist}
- u32 address = reg[1].I & 0xFFFFFFFC;
- u32 temp = reg[1].I + 4*cpuBitsSet[opcode & 0xff];
- int offset = 0;
- // store
- THUMB_STM_REG(1, 0, 1);
- THUMB_STM_REG(2, 1, 1);
- THUMB_STM_REG(4, 2, 1);
- THUMB_STM_REG(8, 3, 1);
- THUMB_STM_REG(16, 4, 1);
- THUMB_STM_REG(32, 5, 1);
- THUMB_STM_REG(64, 6, 1);
- THUMB_STM_REG(128, 7, 1);
- }
- break; 
- case 0xc2:
- {
- // STM R2!, {Rlist}
- u32 address = reg[2].I & 0xFFFFFFFC;
- u32 temp = reg[2].I + 4*cpuBitsSet[opcode & 0xff];
- int offset = 0;
- // store
- THUMB_STM_REG(1, 0, 2);
- THUMB_STM_REG(2, 1, 2);
- THUMB_STM_REG(4, 2, 2);
- THUMB_STM_REG(8, 3, 2);
- THUMB_STM_REG(16, 4, 2);
- THUMB_STM_REG(32, 5, 2);
- THUMB_STM_REG(64, 6, 2);
- THUMB_STM_REG(128, 7, 2);
- }
- break; 
- case 0xc3:
- {
- // STM R3!, {Rlist}
- u32 address = reg[3].I & 0xFFFFFFFC;
- u32 temp = reg[3].I + 4*cpuBitsSet[opcode & 0xff];
- int offset = 0;
- // store
- THUMB_STM_REG(1, 0, 3);
- THUMB_STM_REG(2, 1, 3);
- THUMB_STM_REG(4, 2, 3);
- THUMB_STM_REG(8, 3, 3);
- THUMB_STM_REG(16, 4, 3);
- THUMB_STM_REG(32, 5, 3);
- THUMB_STM_REG(64, 6, 3);
- THUMB_STM_REG(128, 7, 3);
- }
- break; 
- case 0xc4:
- {
- // STM R4!, {Rlist}
- u32 address = reg[4].I & 0xFFFFFFFC;
- u32 temp = reg[4].I + 4*cpuBitsSet[opcode & 0xff];
- int offset = 0;
- // store
- THUMB_STM_REG(1, 0, 4);
- THUMB_STM_REG(2, 1, 4);
- THUMB_STM_REG(4, 2, 4);
- THUMB_STM_REG(8, 3, 4);
- THUMB_STM_REG(16, 4, 4);
- THUMB_STM_REG(32, 5, 4);
- THUMB_STM_REG(64, 6, 4);
- THUMB_STM_REG(128, 7, 4);
- }
- break; 
- case 0xc5:
- {
- // STM R5!, {Rlist}
- u32 address = reg[5].I & 0xFFFFFFFC;
- u32 temp = reg[5].I + 4*cpuBitsSet[opcode & 0xff];
- int offset = 0;
- // store
- THUMB_STM_REG(1, 0, 5);
- THUMB_STM_REG(2, 1, 5);
- THUMB_STM_REG(4, 2, 5);
- THUMB_STM_REG(8, 3, 5);
- THUMB_STM_REG(16, 4, 5);
- THUMB_STM_REG(32, 5, 5);
- THUMB_STM_REG(64, 6, 5);
- THUMB_STM_REG(128, 7, 5);
- }
- break; 
- case 0xc6:
- {
- // STM R6!, {Rlist}
- u32 address = reg[6].I & 0xFFFFFFFC;
- u32 temp = reg[6].I + 4*cpuBitsSet[opcode & 0xff];
- int offset = 0;
- // store
- THUMB_STM_REG(1, 0, 6);
- THUMB_STM_REG(2, 1, 6);
- THUMB_STM_REG(4, 2, 6);
- THUMB_STM_REG(8, 3, 6);
- THUMB_STM_REG(16, 4, 6);
- THUMB_STM_REG(32, 5, 6);
- THUMB_STM_REG(64, 6, 6);
- THUMB_STM_REG(128, 7, 6);
- }
- break; 
- case 0xc7:
- {
- // STM R7!, {Rlist}
- u32 address = reg[7].I & 0xFFFFFFFC;
- u32 temp = reg[7].I + 4*cpuBitsSet[opcode & 0xff];
- int offset = 0;
- // store
- THUMB_STM_REG(1, 0, 7);
- THUMB_STM_REG(2, 1, 7);
- THUMB_STM_REG(4, 2, 7);
- THUMB_STM_REG(8, 3, 7);
- THUMB_STM_REG(16, 4, 7);
- THUMB_STM_REG(32, 5, 7);
- THUMB_STM_REG(64, 6, 7);
- THUMB_STM_REG(128, 7, 7);
- }
- break;
-#define THUMB_LDM_REG(val,r) \
- if(opcode & (val)) {\
- reg[(r)].I = CPUReadMemory(address);\
- if(offset)\
- clockTicks += 2 + CPUUpdateTicksAccessSeq32(address);\
- else\
- clockTicks += 2 + CPUUpdateTicksAccess32(address);\
- offset = 1;\
- address += 4;\
- }
- case 0xc8:
- {
- // LDM R0!, {Rlist}
- u32 address = reg[0].I & 0xFFFFFFFC;
- u32 temp = reg[0].I + 4*cpuBitsSet[opcode & 0xFF];
- int offset = 0;
- // load
- THUMB_LDM_REG(1, 0);
- THUMB_LDM_REG(2, 1);
- THUMB_LDM_REG(4, 2);
- THUMB_LDM_REG(8, 3);
- THUMB_LDM_REG(16, 4);
- THUMB_LDM_REG(32, 5);
- THUMB_LDM_REG(64, 6);
- THUMB_LDM_REG(128, 7);
- if(!(opcode & 1))
- reg[0].I = temp;
- }
- break;
- case 0xc9:
- {
- // LDM R1!, {Rlist}
- u32 address = reg[1].I & 0xFFFFFFFC;
- u32 temp = reg[1].I + 4*cpuBitsSet[opcode & 0xFF];
- int offset = 0;
- // load
- THUMB_LDM_REG(1, 0);
- THUMB_LDM_REG(2, 1);
- THUMB_LDM_REG(4, 2);
- THUMB_LDM_REG(8, 3);
- THUMB_LDM_REG(16, 4);
- THUMB_LDM_REG(32, 5);
- THUMB_LDM_REG(64, 6);
- THUMB_LDM_REG(128, 7);
- if(!(opcode & 2))
- reg[1].I = temp;
- }
- break;
- case 0xca:
- {
- // LDM R2!, {Rlist}
- u32 address = reg[2].I & 0xFFFFFFFC;
- u32 temp = reg[2].I + 4*cpuBitsSet[opcode & 0xFF];
- int offset = 0;
- // load
- THUMB_LDM_REG(1, 0);
- THUMB_LDM_REG(2, 1);
- THUMB_LDM_REG(4, 2);
- THUMB_LDM_REG(8, 3);
- THUMB_LDM_REG(16, 4);
- THUMB_LDM_REG(32, 5);
- THUMB_LDM_REG(64, 6);
- THUMB_LDM_REG(128, 7);
- if(!(opcode & 4))
- reg[2].I = temp;
- }
- break;
- case 0xcb:
- {
- // LDM R3!, {Rlist}
- u32 address = reg[3].I & 0xFFFFFFFC;
- u32 temp = reg[3].I + 4*cpuBitsSet[opcode & 0xFF];
- int offset = 0;
- // load
- THUMB_LDM_REG(1, 0);
- THUMB_LDM_REG(2, 1);
- THUMB_LDM_REG(4, 2);
- THUMB_LDM_REG(8, 3);
- THUMB_LDM_REG(16, 4);
- THUMB_LDM_REG(32, 5);
- THUMB_LDM_REG(64, 6);
- THUMB_LDM_REG(128, 7);
- if(!(opcode & 8))
- reg[3].I = temp;
- }
- break;
- case 0xcc:
- {
- // LDM R4!, {Rlist}
- u32 address = reg[4].I & 0xFFFFFFFC;
- u32 temp = reg[4].I + 4*cpuBitsSet[opcode & 0xFF];
- int offset = 0;
- // load
- THUMB_LDM_REG(1, 0);
- THUMB_LDM_REG(2, 1);
- THUMB_LDM_REG(4, 2);
- THUMB_LDM_REG(8, 3);
- THUMB_LDM_REG(16, 4);
- THUMB_LDM_REG(32, 5);
- THUMB_LDM_REG(64, 6);
- THUMB_LDM_REG(128, 7); 
- if(!(opcode & 16))
- reg[4].I = temp;
- }
- break;
- case 0xcd:
- {
- // LDM R5!, {Rlist}
- u32 address = reg[5].I & 0xFFFFFFFC;
- u32 temp = reg[5].I + 4*cpuBitsSet[opcode & 0xFF];
- int offset = 0;
- // load
- THUMB_LDM_REG(1, 0);
- THUMB_LDM_REG(2, 1);
- THUMB_LDM_REG(4, 2);
- THUMB_LDM_REG(8, 3);
- THUMB_LDM_REG(16, 4);
- THUMB_LDM_REG(32, 5);
- THUMB_LDM_REG(64, 6);
- THUMB_LDM_REG(128, 7); 
- if(!(opcode & 32))
- reg[5].I = temp;
- }
- break;
- case 0xce:
- {
- // LDM R6!, {Rlist}
- u32 address = reg[6].I & 0xFFFFFFFC;
- u32 temp = reg[6].I + 4*cpuBitsSet[opcode & 0xFF];
- int offset = 0;
- // load
- THUMB_LDM_REG(1, 0);
- THUMB_LDM_REG(2, 1);
- THUMB_LDM_REG(4, 2);
- THUMB_LDM_REG(8, 3);
- THUMB_LDM_REG(16, 4);
- THUMB_LDM_REG(32, 5);
- THUMB_LDM_REG(64, 6);
- THUMB_LDM_REG(128, 7); 
- if(!(opcode & 64))
- reg[6].I = temp;
- }
- break;
- case 0xcf:
- {
- // LDM R7!, {Rlist}
- u32 address = reg[7].I & 0xFFFFFFFC;
- u32 temp = reg[7].I + 4*cpuBitsSet[opcode & 0xFF];
- int offset = 0;
- // load
- THUMB_LDM_REG(1, 0);
- THUMB_LDM_REG(2, 1);
- THUMB_LDM_REG(4, 2);
- THUMB_LDM_REG(8, 3);
- THUMB_LDM_REG(16, 4);
- THUMB_LDM_REG(32, 5);
- THUMB_LDM_REG(64, 6);
- THUMB_LDM_REG(128, 7); 
- if(!(opcode & 128))
- reg[7].I = temp;
- }
- break;
- case 0xd0:
- // BEQ offset
- if(Z_FLAG) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1;
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3;
- }
- break; 
- case 0xd1:
- // BNE offset
- if(!Z_FLAG) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xd2:
- // BCS offset
- if(C_FLAG) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xd3:
- // BCC offset
- if(!C_FLAG) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xd4:
- // BMI offset
- if(N_FLAG) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xd5:
- // BPL offset
- if(!N_FLAG) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xd6:
- // BVS offset
- if(V_FLAG) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xd7:
- // BVC offset
- if(!V_FLAG) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xd8:
- // BHI offset
- if(C_FLAG && !Z_FLAG) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xd9:
- // BLS offset
- if(!C_FLAG || Z_FLAG) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xda:
- // BGE offset
- if(N_FLAG == V_FLAG) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xdb:
- // BLT offset
- if(N_FLAG != V_FLAG) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xdc:
- // BGT offset
- if(!Z_FLAG && (N_FLAG == V_FLAG)) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xdd:
- // BLE offset
- if(Z_FLAG || (N_FLAG != V_FLAG)) {
- reg[15].I += ((s8)(opcode & 0xFF)) << 1; 
- armNextPC = reg[15].I;
- reg[15].I += 2;
- clockTicks = 3; 
- }
- break; 
- case 0xdf:
- // SWI #comment
- CPUSoftwareInterrupt(opcode & 0xFF);
- break;
- case 0xe0:
- case 0xe1:
- case 0xe2:
- case 0xe3:
- case 0xe4:
- case 0xe5:
- case 0xe6:
- case 0xe7:
- {
- // B offset
- int offset = (opcode & 0x3FF) << 1;
- if(opcode & 0x0400)
- offset |= 0xFFFFF800;
- reg[15].I += offset;
- armNextPC = reg[15].I;
- reg[15].I += 2;
- }
- break;
- case 0xf0:
- case 0xf1:
- case 0xf2:
- case 0xf3:
- {
- // BLL #offset
- int offset = (opcode & 0x7FF);
- reg[14].I = reg[15].I + (offset << 12);
- }
- break; 
- case 0xf4:
- case 0xf5:
- case 0xf6:
- case 0xf7:
- {
- // BLL #offset
- int offset = (opcode & 0x7FF);
- reg[14].I = reg[15].I + ((offset << 12) | 0xFF800000);
- }
- break; 
- case 0xf8:
- case 0xf9:
- case 0xfa:
- case 0xfb:
- case 0xfc:
- case 0xfd:
- case 0xfe:
- case 0xff:
- {
- // BLH #offset
- int offset = (opcode & 0x7FF);
- u32 temp = reg[15].I-2;
- reg[15].I = (reg[14].I + (offset<<1))&0xFFFFFFFE;
- armNextPC = reg[15].I;
- reg[15].I += 2;
- reg[14].I = temp|1;
- }
- break;
-#ifdef BKPT_SUPPORT
- case 0xbe:
- // BKPT #comment
- extern void (*dbgSignal)(int,int);
- reg[15].I -= 2;
- armNextPC -= 2; 
- dbgSignal(5, opcode & 255);
- return;
-#endif
- case 0xb1:
- case 0xb2:
- case 0xb3:
- case 0xb6:
- case 0xb7:
- case 0xb8:
- case 0xb9:
- case 0xba:
- case 0xbb:
-#ifndef BKPT_SUPPORT
- case 0xbe:
-#endif
- case 0xbf:
- case 0xde:
- default:
- unknown_thumb:
-#ifdef DEV_VERSION
- if(systemVerbose & VERBOSE_UNDEFINED)
- log("Undefined THUMB instruction %04x at %08x\n", opcode, armNextPC-2);
-#endif
- CPUUndefinedException();
- break;
-}

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/unzip.h Deleted

@@ -1,294 +0,0 @@
-// -*- C++ -*-
-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
-// Copyright (C) 1999-2003 Forgotten
-// Copyright (C) 2004 Forgotten and the VBA 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; either version 2, 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.
-
-/* unzip.h -- IO for uncompress .zip files using zlib 
- Version 0.15 beta, Mar 19th, 1998,
-
- Copyright (C) 1998 Gilles Vollant
-
- This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
- WinZip, InfoZip tools and compatible.
- Encryption and multi volume ZipFile (span) are not supported.
- Old compressions used by old PKZip 1.x are not supported
-
- THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE
- CAN CHANGE IN FUTURE VERSION !!
- I WAIT FEEDBACK at mail info@winimage.com
- Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-
- Condition of use and distribution are the same than zlib :
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
-
-*/
-/* for more info about .ZIP format, see 
- ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip
- PkWare has also a specification at :
- ftp://ftp.pkware.com/probdesc.zip */
-
-#ifndef _unz_H
-#define _unz_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
- from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__; 
-typedef unzFile__ *unzFile;
-#else
-typedef voidp unzFile;
-#endif
-
-
-#define UNZ_OK (0)
-#define UNZ_END_OF_LIST_OF_FILE (-100)
-#define UNZ_ERRNO (Z_ERRNO)
-#define UNZ_EOF (0)
-#define UNZ_PARAMERROR (-102)
-#define UNZ_BADZIPFILE (-103)
-#define UNZ_INTERNALERROR (-104)
-#define UNZ_CRCERROR (-105)
-
-/* tm_unz contain date/time info */
-typedef struct tm_unz_s 
-{
- uInt tm_sec; /* seconds after the minute - [0,59] */
- uInt tm_min; /* minutes after the hour - [0,59] */
- uInt tm_hour; /* hours since midnight - [0,23] */
- uInt tm_mday; /* day of the month - [1,31] */
- uInt tm_mon; /* months since January - [0,11] */
- uInt tm_year; /* years - [1980..2044] */
-} tm_unz;
-
-/* unz_global_info structure contain global data about the ZIPfile
- These data comes from the end of central dir */
-typedef struct unz_global_info_s
-{
- uLong number_entry; /* total number of entries in
- the central dir on this disk */
- uLong size_comment; /* size of the global comment of the zipfile */
-} unz_global_info;
-
-
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_info_s
-{
- uLong version; /* version made by 2 bytes */
- uLong version_needed; /* version needed to extract 2 bytes */
- uLong flag; /* general purpose bit flag 2 bytes */
- uLong compression_method; /* compression method 2 bytes */
- uLong dosDate; /* last mod file date in Dos fmt 4 bytes */
- uLong crc; /* crc-32 4 bytes */
- uLong compressed_size; /* compressed size 4 bytes */ 
- uLong uncompressed_size; /* uncompressed size 4 bytes */ 
- uLong size_filename; /* filename length 2 bytes */
- uLong size_file_extra; /* extra field length 2 bytes */
- uLong size_file_comment; /* file comment length 2 bytes */
-
- uLong disk_num_start; /* disk number start 2 bytes */
- uLong internal_fa; /* internal file attributes 2 bytes */
- uLong external_fa; /* external file attributes 4 bytes */
-
- tm_unz tmu_date;
-} unz_file_info;
-
-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
- const char* fileName2,
- int iCaseSensitivity));
-/*
- Compare two filename (fileName1,fileName2).
- If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
- If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
- or strcasecmp)
- If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
- (like 1 on Unix, 2 on Windows)
-*/
-
-
-extern unzFile ZEXPORT unzOpen OF((const char *path));
-/*
- Open a Zip file. path contain the full pathname (by example,
- on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
- "zlib/zlib111.zip".
- If the zipfile cannot be opened (file don't exist or in not valid), the
- return value is NULL.
- Else, the return value is a unzFile Handle, usable with other function
- of this unzip package.
-*/
-
-extern int ZEXPORT unzClose OF((unzFile file));
-/*
- Close a ZipFile opened with unzipOpen.
- If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
- these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
- return UNZ_OK if there is no problem. */
-
-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
- unz_global_info *pglobal_info));
-/*
- Write info about the ZipFile in the *pglobal_info structure.
- No preparation of the structure is needed
- return UNZ_OK if there is no problem. */
-
-
-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
- char *szComment,
- uLong uSizeBuf));
-/*
- Get the global comment string of the ZipFile, in the szComment buffer.
- uSizeBuf is the size of the szComment buffer.
- return the number of byte copied or an error code <0
-*/
-
-
-/***************************************************************************/
-/* Unzip package allow you browse the directory of the zipfile */
-
-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-/*
- Set the current file of the zipfile to the first file.
- return UNZ_OK if there is no problem
-*/
-
-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-/*
- Set the current file of the zipfile to the next file.
- return UNZ_OK if there is no problem
- return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-
-extern int ZEXPORT unzLocateFile OF((unzFile file, 
- const char *szFileName,
- int iCaseSensitivity));
-/*
- Try locate the file szFileName in the zipfile.
- For the iCaseSensitivity signification, see unzStringFileNameCompare
-
- return value :
- UNZ_OK if the file is found. It becomes the current file.
- UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-
-
-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
- unz_file_info *pfile_info,
- char *szFileName,
- uLong fileNameBufferSize,
- void *extraField,
- uLong extraFieldBufferSize,
- char *szComment,
- uLong commentBufferSize));
-/*
- Get Info about the current file
- if pfile_info!=NULL, the *pfile_info structure will contain somes info about
- the current file
- if szFileName!=NULL, the filemane string will be copied in szFileName
- (fileNameBufferSize is the size of the buffer)
- if extraField!=NULL, the extra field information will be copied in extraField
- (extraFieldBufferSize is the size of the buffer).
- This is the Central-header version of the extra field
- if szComment!=NULL, the comment string of the file will be copied in szComment
- (commentBufferSize is the size of the buffer)
-*/
-
-/***************************************************************************/
-/* for reading the content of the current zipfile, you can open it, read data
- from it, and close it (you can close it before reading all the file)
- */
-
-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-/*
- Open for reading data the current file in the zipfile.
- If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-/*
- Close the file in zip opened with unzOpenCurrentFile
- Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-
- 
-extern int ZEXPORT unzReadCurrentFile OF((unzFile file, 
- voidp buf,
- unsigned len));
-/*
- Read bytes from the current file (opened by unzOpenCurrentFile)
- buf contain buffer where data must be copied
- len the size of buf.
-
- return the number of byte copied if somes bytes are copied
- return 0 if the end of file was reached
- return <0 with error code if there is an error
- (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-
-extern z_off_t ZEXPORT unztell OF((unzFile file));
-/*
- Give the current position in uncompressed data
-*/
-
-extern int ZEXPORT unzeof OF((unzFile file));
-/*
- return 1 if the end of file was reached, 0 elsewhere 
-*/
-
-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
- voidp buf,
- unsigned len));
-/*
- Read extra field from the current file (opened by unzOpenCurrentFile)
- This is the local-header version of the extra field (sometimes, there is
- more info in the local-header version than in the central-header)
-
- if buf==NULL, it return the size of the local extra field
-
- if buf!=NULL, len is the size of the buffer, the extra header is copied in
- buf.
- the return value is the number of bytes copied in buf, or (if <0) 
- the error code
-*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _unz_H */

audacious-plugins-3.1.1.tar.bz2/src/gsf/VBA/zutil.h Deleted

@@ -1,269 +0,0 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the compression library and is
- subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZUTIL_H
-#define ZUTIL_H
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-#ifdef STDC
-# ifndef _WIN32_WCE
-# include <stddef.h>
-# endif
-# include <string.h>
-# include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-# ifdef _WIN32_WCE
- /* The Microsoft C Run-Time Library for Windows CE doesn't have
- * errno. We define it as a global variable to simplify porting.
- * Its value is always 0 and should not be used. We rename it to
- * avoid conflict with other libraries that use the same workaround.
- */
-# define errno z_errno
-# endif
- extern int errno;
-#else
-# ifndef _WIN32_WCE
-# include <errno.h>
-# endif
-#endif
-
-#ifndef local
-# define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-typedef unsigned char uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long ulg;
-
-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
- return (strm->msg = (char*)ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
- /* common constants */
-
-#ifndef DEF_WBITS
-# define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-# define DEF_MEM_LEVEL 8
-#else
-# define DEF_MEM_LEVEL MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES 2
-/* The three kinds of block type */
-
-#define MIN_MATCH 3
-#define MAX_MATCH 258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
- /* target dependencies */
-
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
-# define OS_CODE 0x00
-# if defined(__TURBOC__) || defined(__BORLANDC__)
-# if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
- /* Allow compilation with ANSI keywords only enabled */
- void _Cdecl farfree( void *block );
- void *_Cdecl farmalloc( unsigned long nbytes );
-# else
-# include <alloc.h>
-# endif
-# else /* MSC or DJGPP */
-# include <malloc.h>
-# endif
-#endif
-
-#ifdef AMIGA
-# define OS_CODE 0x01
-#endif
-
-#if defined(VAXC) || defined(VMS)
-# define OS_CODE 0x02
-# define F_OPEN(name, mode) \
- fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#if defined(ATARI) || defined(atarist)
-# define OS_CODE 0x05
-#endif
-
-#ifdef OS2
-# define OS_CODE 0x06
-# ifdef M_I86
- #include <malloc.h>
-# endif
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-# define OS_CODE 0x07
-# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-# include <unix.h> /* for fdopen */
-# else
-# ifndef fdopen
-# define fdopen(fd,mode) NULL /* No fdopen() */
-# endif
-# endif
-#endif
-
-#ifdef TOPS20
-# define OS_CODE 0x0a
-#endif
-
-#ifdef WIN32
-# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */
-# define OS_CODE 0x0b
-# endif
-#endif
-
-#ifdef __50SERIES /* Prime/PRIMOS */
-# define OS_CODE 0x0f
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-# define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600))
-# if defined(_WIN32_WCE)
-# define fdopen(fd,mode) NULL /* No fdopen() */
-# ifndef _PTRDIFF_T_DEFINED
- typedef int ptrdiff_t;
-# define _PTRDIFF_T_DEFINED
-# endif
-# else
-# define fdopen(fd,type) _fdopen(fd,type)
-# endif
-#endif
-
- /* common defaults */
-
-#ifndef OS_CODE
-# define OS_CODE 0x03 /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-# define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
- /* functions */
-
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-# ifndef HAVE_VSNPRINTF
-# define HAVE_VSNPRINTF
-# endif
-#endif
-#if defined(__CYGWIN__)
-# ifndef HAVE_VSNPRINTF
-# define HAVE_VSNPRINTF
-# endif
-#endif
-#ifndef HAVE_VSNPRINTF
-# ifdef MSDOS
- /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
- but for now we just assume it doesn't. */
-# define NO_vsnprintf
-# endif
-# ifdef __TURBOC__
-# define NO_vsnprintf
-# endif
-# ifdef WIN32
- /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-# if !defined(vsnprintf) && !defined(NO_vsnprintf)
-# define vsnprintf _vsnprintf
-# endif
-# endif
-# ifdef __SASC
-# define NO_vsnprintf
-# endif
-#endif
-#ifdef VMS
-# define NO_vsnprintf
-#endif
-
-#if defined(pyr)
-# define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
- * You may have to use the same strategy for Borland C (untested).
- * The __SC__ check is for Symantec.
- */
-# define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-# define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-# ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-# define zmemcpy _fmemcpy
-# define zmemcmp _fmemcmp
-# define zmemzero(dest, len) _fmemset(dest, 0, len)
-# else
-# define zmemcpy memcpy
-# define zmemcmp memcmp
-# define zmemzero(dest, len) memset(dest, 0, len)
-# endif
-#else
- extern void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
- extern int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
- extern void zmemzero OF((Bytef* dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef DEBUG
-# include <stdio.h>
- extern int z_verbose;
- extern void z_error OF((char *m));
-# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-# define Trace(x) {if (z_verbose>=0) fprintf x ;}
-# define Tracev(x) {if (z_verbose>0) fprintf x ;}
-# define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
-#else
-# define Assert(cond,msg)
-# define Trace(x)
-# define Tracev(x)
-# define Tracevv(x)
-# define Tracec(c,x)
-# define Tracecv(c,x)
-#endif
-
-
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void zcfree OF((voidpf opaque, voidpf ptr));
-
-#define ZALLOC(strm, items, size) \
- (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-#endif /* ZUTIL_H */

audacious-plugins-3.1.1.tar.bz2/src/gsf/filterkit.h Deleted

audacious-plugins-3.1.1.tar.bz2/src/gsf/gsf.h Deleted

audacious-plugins-3.1.1.tar.bz2/src/gsf/plugin.c Deleted

@@ -1,310 +0,0 @@
-/*
- * highlyadvanced for audacious: GBA (GSF) chiptune plugin
- * Copyright (c) 2005-2007 William Pitcock <nenolod@sacredspiral.co.uk>
- *
- * highlyadvanced engine:
- * Copyright (c) 2005-2007 CaitSith2
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <libgen.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-#include <glib.h>
-
-#include <gtk/gtk.h>
-
-#include <audacious/plugin.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-#include "VBA/psftag.h"
-#include "gsf.h"
-
-int defvolume=1000;
-int relvolume=1000;
-int TrackLength=0;
-int FadeLength=0;
-int IgnoreTrackLength, DefaultLength=150000;
-int playforever=0;
-int fileoutput=0;
-int TrailingSilence=1000;
-int DetectSilence=0, silencedetected=0, silencelength=5;
-
-int cpupercent=0, sndSamplesPerSec, sndNumChannels;
-int sndBitsPerSample=16;
-int didseek = 0;
-double playtime = 0;
-
-int deflen=120,deffade=4;
-
-extern unsigned short soundFinalWave[1470];
-extern int soundBufferLen;
-
-extern char soundEcho;
-extern char soundLowPass;
-extern char soundReverse;
-extern char soundQuality;
-
-double decode_pos_ms; // current decoding position, in milliseconds
-int seek_needed; // if != -1, it is the point that the decode thread should seek to, in ms.
-
-extern InputPlugin gsf_ip;
-
-static gchar *lastfn;
-static gboolean stop_flag = FALSE;
-
-GThread *gsf_emulthread;
-
-int LengthFromString(const char * timestring);
-int VolumeFromString(const char * volumestring);
-
-static int gsf_is_our_fd(const gchar *filename, VFSFile *file)
-{
- gchar magic[4];
-	const gchar *tmps;
-
- // Filter out gsflib [we use them, but we can't play them]
- static const gchar *teststr = "gsflib";
- if (strlen(teststr) < strlen(filename))
-	{
- tmps = filename + strlen(filename);
- tmps -= strlen(teststr);
- if (!strcasecmp(tmps, teststr))
- return 0;
- }
-
-	vfs_fread(magic,1,4,file);
-
-	if (!memcmp(magic,"PSF\"",4))
-		return 1;
-
- return 0;
-}
-
-static gboolean gsf_play(InputPlayback *playback, const gchar * filename,
- VFSFile * file, gint start_time, gint stop_time, gboolean pause);
-
-static void gsf_stop(InputPlayback *playback)
-{
-	stop_flag = TRUE;
-
-	g_thread_join(gsf_emulthread);
-
-	playback->output->close_audio();
-
-	if (lastfn != NULL)
-	{
-		g_free(lastfn);
-		lastfn = NULL;
-	}
-}
-
-static Tuple *gsf_get_song_tuple(const gchar *filename, VFSFile *fd)
-{
-	char tag[50001];
-	char tmp_str[256];
-	gchar *f;
-	const gchar *fn;
-
-	f = g_filename_from_uri(filename, NULL, NULL);
-	fn = f ? f : filename;
-
-	Tuple *ti;
-
-	ti = tuple_new_from_filename(fn);
-
-	psftag_readfromfile((void*)tag, fn);
-
-	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);
-	}
-
-	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);
-	}
-
-	if (!psftag_getvar(tag, "comment", tmp_str, sizeof(tmp_str)-1)) {
-		tuple_associate_string(ti, FIELD_COMMENT, NULL, tmp_str);
-	}
-
-	tuple_associate_string(ti, FIELD_CODEC, NULL, "GameBoy Advanced Audio (GSF)");
-	tuple_associate_string(ti, FIELD_QUALITY, NULL, "sequenced");
-
-	g_free(f);
-
-	return ti;
-}
-
-static void gsf_pause(InputPlayback *playback, gboolean p)
-{
-	playback->output->pause(p);
-}
-
-static void gsf_mseek(InputPlayback *playback, gint time)
-{
-	seek_needed = time;
-}
-
-static void gsf_about(void)
-{
-#if 0
-	static GtkWidget *widget = NULL;
-
-	audgui_simple_message(&widget, GTK_MESSAGE_INFO, "About Highly Advanced for Audacious",
-			"Highly Advanced for Audacious\nversion: " PACKAGE_VERSION "\n\nAudacious plugin: (C) 2006-2010 William Pitcock <nenolod -at- atheme.org>\n\n"
-			"Built from the Highly Advanced emulation core, version " HA_VERSION_STR);
-#endif
-}
-
-static const gchar *gsf_fmts[] = { "gsf", "minigsf", NULL };
-
-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;
-
-void end_of_track(void)
-{
-	stop_flag = TRUE;
-}
-
-void writeSound(void)
-{
-	int tmp;
-	int ret = soundBufferLen;
-	static int countdown = 20;
-
-	decode_pos_ms += (ret/(2*sndNumChannels) * 1000) / (float)sndSamplesPerSec;
-
-	_playback->output->write_audio(soundFinalWave, soundBufferLen);
-
-	if (--countdown == 0)
-	{
-		_playback->set_params(_playback, cpupercent * 1000, 44100, 2);
-		countdown = 20;
-	}
-
-	/* is seek request complete? (-2) */
-	if (seek_needed == -2)
-	{
-		_playback->output->flush(decode_pos_ms);
-		seek_needed = -1;
-	}
-
-	if (lastfn != NULL && (seek_needed != -1))	//if a seek is initiated
-	{
-	 if (seek_needed < decode_pos_ms)	//if we are asked to seek backwards. we have to start from the beginning
-		{
-			GSFClose();
-			GSFRun(lastfn);
-			decode_pos_ms = 0;
-		}
-	}
-}
-
-static gboolean gsf_play(InputPlayback *playback, const gchar * filename,
-	VFSFile * file, gint start_time, gint stop_time, gboolean pause)
-{
-	int r, tmp, fi, random=0;
-	char Buffer[1024];
-	char length_str[256], fade_str[256], volume[256], title_str[256];
-	char tmp_str[256];
-	gchar *f, *fn;
-
-	soundLowPass = 0;
-	soundEcho = 0;
-	soundQuality = 0;
-
-	DetectSilence=1;
-	silencelength=5;
-	IgnoreTrackLength=0;
-	DefaultLength=150000;
-	TrailingSilence=1000;
-	playforever=0;
-
-	stop_flag = FALSE;
-
-	_playback = playback;
-	gsf_emulthread = g_thread_self();
-	playback->set_pb_ready(playback);
-
-	f = g_filename_from_uri(filename, NULL, NULL);
-	fn = f ? f : filename;
-
-	Tuple *ti = gsf_get_song_tuple(fn, file);
-
-	r = GSFRun(fn);
-	if (!r)
-		return FALSE;
-
-	lastfn = g_strdup(fn);
-
-	int i = playback->output->open_audio(FMT_S16_LE, sndSamplesPerSec, sndNumChannels);
-
-	gint length = tuple_get_int(ti, FIELD_LENGTH, NULL);
-
-	playback->set_params(playback, 0, 44100, 2);
-
-	decode_pos_ms = 0;
-	seek_needed = -1;
-	TrailingSilence=1000;
-
-	while(!stop_flag)
-		EmulationLoop();
-
-	GSFClose();
-
-	while (playback->output->buffer_playing())
-		g_usleep(10000);
-
-	playback->output->close_audio();
-
-	g_free(lastfn);
-	lastfn = NULL;
-
-	g_free(f);
-
-	return TRUE;
-}

audacious-plugins-3.1.1.tar.bz2/src/gsf/resample_defs.h Deleted

@@ -1,86 +0,0 @@
-/**********************************************************************
-
- resample_defs.h
-
- Real-time library interface by Dominic Mazzoni
-
- Based on resample-1.7:
- http://www-ccrma.stanford.edu/~jos/resample/
-
- License: LGPL - see the file LICENSE.txt for more information
-
-**********************************************************************/
-
-#ifndef __RESAMPLE_DEFS__
-#define __RESAMPLE_DEFS__
-
-#if !defined(WIN32) && !defined(__CYGWIN__)
-#include "config.h"
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef PI
-#define PI (3.14159265358979232846)
-#endif
-
-#ifndef PI2
-#define PI2 (6.28318530717958465692)
-#endif
-
-#define D2R (0.01745329348) /* (2*pi)/360 */
-#define R2D (57.29577951) /* 360/(2*pi) */
-
-#ifndef MAX
-#define MAX(x,y) ((x)>(y) ?(x):(y))
-#endif
-#ifndef MIN
-#define MIN(x,y) ((x)<(y) ?(x):(y))
-#endif
-
-#ifndef ABS
-#define ABS(x) ((x)<0 ?(-(x)):(x))
-#endif
-
-#ifndef SGN
-#define SGN(x) ((x)<0 ?(-1):((x)==0?(0):(1)))
-#endif
-
-#if HAVE_INTTYPES_H
- #include <inttypes.h>
- typedef char BOOL;
- typedef int32_t WORD;
- typedef uint32_t UWORD;
-#else
- typedef char BOOL;
- typedef int WORD;
- typedef unsigned int UWORD;
-#endif
-
-#ifdef DEBUG
-#define INLINE
-#else
-#define INLINE inline
-#endif
-
-/* Accuracy */
-
-#define Npc 4096
-
-/* Function prototypes */
-
-int lrsSrcUp(float X[], float Y[], double factor, double *Time,
- UWORD Nx, UWORD Nwing, float LpScl,
- float Imp[], float ImpD[], BOOL Interp);
-
-int lrsSrcUD(float X[], float Y[], double factor, double *Time,
- UWORD Nx, UWORD Nwing, float LpScl,
- float Imp[], float ImpD[], BOOL Interp);
-
-#endif

audacious-plugins-3.1.1.tar.bz2/src/openal Deleted

audacious-plugins-3.1.1.tar.bz2/src/openal/Makefile Deleted

audacious-plugins-3.1.1.tar.bz2/src/openal/openal.c Deleted

@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2011 William Pitcock <nenolod@dereferenced.org>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice is present in all copies.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
-#include <audacious/debug.h>
-
-#include <AL/al.h>
-#include <AL/alc.h>
-
-#define NUM_BUFFERS		100
-
-gboolean
-openal_init(void)
-{
-	ALCdevice *device;
-
-	device = alcOpenDevice(NULL);
-	if (device == NULL)
-		return FALSE;
-
-	alcCloseDevice(device);
-	return TRUE;
-}
-
-static struct {
-	ALCdevice *device;
-	ALCcontext *context;
-
-	ALuint source;
-	ALuint buffers[NUM_BUFFERS];
-
-	ALenum format;
-	ALuint rate;
-
-	ALint basetime;
-	ALint bits;
-	ALint nch;
-
-	gboolean preroll;
-	gint bufid;
-} state;
-
-gint
-openal_open(gint fmt, int rate, int nch)
-{
-	state.rate = rate;
-	state.nch = nch;
-
-	if (fmt == FMT_S16_NE)
-	{
-		state.format = nch == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16;
-		state.bits = 16;
-	}
-	else if (fmt == FMT_S8)
-	{
-		state.format = nch == 1 ? AL_FORMAT_MONO8 : AL_FORMAT_STEREO8;
-		state.bits = 8;
-	}
-
-	if (state.device)
-	{
-		AUDDBG("WTF: device is already running\n");
-		return FALSE;
-	}
-
-	state.device = alcOpenDevice(NULL);
-	if (state.device == NULL)
-	{
-		AUDDBG("failed to open device\n");
-		return FALSE;
-	}
-
-	state.context = alcCreateContext(state.device, NULL);
-	if (state.context == NULL)
-	{
-		if (state.device)
-		{
-			alcCloseDevice(state.device);
-			state.device = NULL;
-		}
-
-		AUDDBG("failed to create context\n");
-		return FALSE;
-	}
-
-	alcMakeContextCurrent(state.context);
-
-	alGenBuffers(NUM_BUFFERS, state.buffers);
-	alGenSources(1, &state.source);
-
-	/* disable EAX effects */
-	alSourcei(state.source, AL_SOURCE_RELATIVE, AL_TRUE);
-	alSourcei(state.source, AL_ROLLOFF_FACTOR, 0);
-
-	state.bufid = 0;
-	state.preroll = TRUE;
-
-	return TRUE;
-}
-
-void
-openal_close(void)
-{
-	alDeleteSources(1, &state.source);
-	alDeleteBuffers(NUM_BUFFERS, state.buffers);
-
-	alcDestroyContext(state.context);
-	state.context = NULL;
-
-	alcCloseDevice(state.device);
-	state.device = NULL;
-}
-
-void
-openal_write(void *ptr, int length)
-{
-	ALuint buf = 0;
-
-	g_return_if_fail(state.device != NULL);
-
-	/* wait for a buffer to become available */
-	if (state.preroll == TRUE)
-	{
-		ALint st;
-
-		alSourceUnqueueBuffers(state.source, 1, &state.buffers[state.bufid]);
-
-		alBufferData(state.buffers[state.bufid], state.format, ptr, length, state.rate);
-		alSourceQueueBuffers(state.source, 1, &state.buffers[state.bufid]);
-
-		alGetSourcei(state.source, AL_BUFFERS_PROCESSED, &st);
-
-		if (state.bufid >= (NUM_BUFFERS - 1))
-		{
-			alSourcePlay(state.source);
-			state.preroll = FALSE;
-		}
-
-		state.bufid++;
-
-		return;
-	}
-
-	ALint processed = 0;
-	alGetSourcei(state.source, AL_BUFFERS_PROCESSED, &processed);
-
-	if(processed < (NUM_BUFFERS / 2))
-	{
-		ALint st;
-
-		alGetSourcei(state.source, AL_SOURCE_STATE, &st);
-		if (st != AL_PLAYING)
-			alSourcePlay(state.source);
-		else
-			g_usleep(10000);
-	}
-
-	alSourceUnqueueBuffers(state.source, 1, &buf);
-	alBufferData(buf, state.format, ptr, length, state.rate);
-	alSourceQueueBuffers(state.source, 1, &buf);
-
-	state.basetime += length;
-}
-
-int
-openal_written_time(void)
-{
-	ALint offset;
-
-	if (state.device == NULL)
-		return 0;
-
-	alGetSourcei(state.source, AL_SAMPLE_OFFSET, &offset);
-	offset += (state.basetime / (state.nch * 8) / state.bits);
-
-	return offset;
-}
-
-int
-openal_buffer_size(void)
-{
-	return 19000;
-}
-
-void
-openal_flush(gint time)
-{
-	if (state.device == NULL)
-		return;
-
-	alSourceRewind(state.source);
-	alSourcei(state.source, AL_BUFFER, 0);
-}
-
-AUD_OUTPUT_PLUGIN
-(
-	.name = "OpenAL",
-	.probe_priority = 3,
-	.init = openal_init,
-	.open_audio = openal_open,
-	.close_audio = openal_close,
-	.write_audio = openal_write,
-	.output_time = openal_written_time,
-	.written_time = openal_written_time,
-	.buffer_free = openal_buffer_size,
-	.flush = openal_flush,
-)

audacious-plugins-3.1.1.tar.bz2/src/roaraudio Deleted

audacious-plugins-3.1.1.tar.bz2/src/roaraudio-vio Deleted

audacious-plugins-3.1.1.tar.bz2/src/roaraudio-vio/Makefile Deleted

audacious-plugins-3.1.1.tar.bz2/src/roaraudio-vio/roaraudio-vio.c Deleted

@@ -1,233 +0,0 @@
-/*
- * UNIX Transport Plugin for Audacious
- * Copyright 2009 John Lindgren
- * Copyright 2011 Philipp Schafft
- *
- * 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 <roaraudio.h>
-
-#include <glib.h>
-
-#include <audacious/debug.h>
-#include <audacious/plugin.h>
-#include <libaudcore/audstrings.h>
-
-#define error(...) fprintf (stderr, "roaraudio-vio: " __VA_ARGS__)
-
-static VFSFile * roar_fopen (const gchar * uri, const gchar * mode)
-{
- struct roar_vio_defaults def;
- VFSFile * file = NULL;
- gboolean update;
- int mode_flag;
-
- AUDDBG ("fopen %s, mode = %s\n", uri, mode);
-
- update = (strchr (mode, '+') != NULL);
-
- switch (mode[0])
- {
- case 'r':
- mode_flag = update ? O_RDWR : O_RDONLY;
- break;
- case 'w':
- mode_flag = (update ? O_RDWR : O_WRONLY) | O_CREAT | O_TRUNC;
- break;
- case 'a':
- mode_flag = (update ? O_RDWR : O_WRONLY) | O_CREAT | O_APPEND;
- break;
- default:
- return NULL;
- }
-
-#ifdef S_IRGRP
- if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, mode_flag, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) == -1 )
-#else
- if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, mode_flag, S_IRUSR | S_IWUSR) == -1 )
-#endif
- return NULL;
-
- file = g_malloc (sizeof * file);
- file->handle = g_malloc (sizeof(struct roar_vio_calls));
-
- if ( roar_vio_open_dstr(file->handle, (char*)uri, &def, 1) == -1 )
- return NULL;
-
- return file;
-}
-
-static gint roar_fclose (VFSFile * file)
-{
- gint ret;
- roar_vio_sync(file->handle);
- ret = roar_vio_close(file->handle);
- g_free(file->handle);
- return ret;
-}
-
-static gint64 roar_fread (void * ptr, gint64 size, gint64 nitems, VFSFile * file)
-{
- gint64 goal = size * nitems;
- gint64 total = 0;
-
-/* AUDDBG ("[%d] fread %d x %d\n", handle, (gint) size, (gint) nitems); */
-
- while (total < goal)
- {
- gint64 readed = roar_vio_read (file->handle, (gchar *) ptr + total, goal - total);
-
- if (readed < 0)
- {
- break;
- }
-
- if (! readed)
- break;
-
- total += readed;
- }
-
-/* AUDDBG (" = %d\n", (gint) total); */
-
- return (size > 0) ? total / size : 0;
-}
-
-static gint64 roar_fwrite (const void * ptr, gint64 size, gint64 nitems,
- VFSFile * file)
-{
- gint64 goal = size * nitems;
- gint64 total = 0;
-
- AUDDBG ("[%p] fwrite %d x %d\n", file->handle, (gint) size, (gint) nitems);
-
- while (total < goal)
- {
- gint64 written = roar_vio_write (file->handle, (gchar *) ptr + total, goal - total);
-
- if (written < 0)
- {
- break;
- }
-
- total += written;
- }
-
- AUDDBG (" = %d\n", (gint) total);
-
- return (size > 0) ? total / size : 0;
-}
-
-static gint roar_fseek (VFSFile * file, gint64 offset, gint whence)
-{
-
- AUDDBG ("[%p] fseek %d, whence = %d\n", file->handle, (gint) offset, whence);
-
- if (roar_vio_lseek (file->handle, offset, whence) < 0)
- {
- return -1;
- }
-
- return 0;
-}
-
-static gint64 roar_ftell (VFSFile * file)
-{
- gint64 result = roar_vio_lseek (file->handle, 0, SEEK_CUR);
-
-
- return result;
-}
-
-static gint roar_getc (VFSFile * file)
-{
- guchar c;
-
- return (roar_fread (& c, 1, 1, file) == 1) ? c : -1;
-}
-
-static gint roar_ungetc (gint c, VFSFile * file)
-{
- return (! roar_fseek (file, -1, SEEK_CUR)) ? c : -1;
-}
-
-static void roar_rewind (VFSFile * file)
-{
- roar_fseek (file, 0, SEEK_SET);
-}
-
-static gboolean roar_feof (VFSFile * file)
-{
- gint test = roar_getc (file);
-
- if (test < 0)
- return TRUE;
-
- roar_ungetc (test, file);
- return FALSE;
-}
-
-static gint roar_ftruncate (VFSFile * file, gint64 length)
-{
- return -1;
-}
-
-static gint64 roar_fsize (VFSFile * file)
-{
- return -1;
-}
-
-gchar *roar_metadata(VFSFile* file, const gchar* field) {
- char * ret = NULL;
-
-#ifdef ROAR_VIO_CTL_GET_MIMETYPE
- if ( !strcmp(field, "content-type") ) {
- if ( roar_vio_ctl(file->handle, ROAR_VIO_CTL_GET_MIMETYPE, &ret) == -1 )
- ret = NULL;
- }
-#endif
-
- if ( ret == NULL )
- return NULL;
-
- return g_strdup(ret);
-}
-
-static VFSConstructor constructor =
-{
- .vfs_fopen_impl = roar_fopen,
- .vfs_fclose_impl = roar_fclose,
- .vfs_fread_impl = roar_fread,
- .vfs_fwrite_impl = roar_fwrite,
- .vfs_getc_impl = roar_getc,
- .vfs_ungetc_impl = roar_ungetc,
- .vfs_fseek_impl = roar_fseek,
- .vfs_rewind_impl = roar_rewind,
- .vfs_ftell_impl = roar_ftell,
- .vfs_feof_impl = roar_feof,
- .vfs_ftruncate_impl = roar_ftruncate,
- .vfs_fsize_impl = roar_fsize,
- .vfs_get_metadata_impl = roar_metadata,
-};
-
-static const gchar * const roar_schemes[] = {"tantalos", "gopher", NULL};
-
-AUD_TRANSPORT_PLUGIN
-(
- .name = "RoarAudio Virtual I/O (VIO/DSTR)",
- .schemes = roar_schemes,
- .vtable = & constructor
-)

audacious-plugins-3.1.1.tar.bz2/src/roaraudio/KNOWN-ISSUES Deleted

audacious-plugins-3.1.1.tar.bz2/src/roaraudio/Makefile Deleted

audacious-plugins-3.1.1.tar.bz2/src/roaraudio/all.h Deleted

@@ -1,102 +0,0 @@
-//all.h:
-
-/*
- * Copyright (C) Philipp 'ph3-der-loewe' Schafft - 2008,
- * Daniel Duntemann <dauxx@dauxx.org> - 2009
- *
- * This file is part of the XMMS RoarAudio output plugin a part of RoarAudio,
- * a cross-platform sound system for both, home and professional use.
- * See README for details.
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3
- * as published by the Free Software Foundation.
- *
- * RoarAudio 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 software; see the file COPYING. If not, write to
- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef _ALL_H_
-#define _ALL_H_
-
-#include <config.h>
-
-#include <roaraudio.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <audacious/debug.h>
-#include <audacious/configdb.h>
-#include <audacious/playlist.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
-
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-gboolean aud_roar_init(void);
-
-void aud_roar_get_volume(int *l, int *r);
-void aud_roar_set_volume(int l, int r);
-void aud_roar_mixer_init(void);
-void aud_roar_mixer_init_vol(int l, int r);
-
-void aud_roar_drain(void);
-void aud_roar_write(void *ptr, int length);
-void aud_roar_close(void);
-void aud_roar_flush(int time);
-void aud_roar_pause(gboolean p);
-int aud_roar_open(gint fmt, int rate, int nch);
-int aud_roar_get_output_time(void);
-int aud_roar_get_written_time(void);
-gint aud_roar_buffer_get_size(void);
-void aud_roar_period_wait(void);
-
-int aud_roar_update_metadata(void);
-int aud_roar_chk_metadata(void);
-
-#define STATE_CONNECTED 1
-#define STATE_PLAYING 2
-#define STATE_NORECONNECT 4
-
-struct xmms_aud_roar_out
-{
-	int state;
-	char *server;
-	struct roar_vio_calls vio;
-	struct roar_connection con;
-	struct roar_stream stream;
-	long unsigned int written;
-	long unsigned int bps;
-	int pause;
-	int rate;
-	int nch;
-	int bits;
-	int codec;
-	int mixer[2];
-	gsize block_size;
-	gint64 sampleoff;
-	struct
-	{
-		int server_type;
-		int port;
-		int *proxy_type;
-		char *proxy;
-		char *player_name;
-	} cfg;
-} g_inst;
-
-#endif
-
-//ll

audacious-plugins-3.1.1.tar.bz2/src/roaraudio/roar.c Deleted

@@ -1,443 +0,0 @@
-/*
- * Copyright (C) Philipp 'ph3-der-loewe' Schafft - 2008-2010,
- * Daniel Duntemann <dauxx@dauxx.org> - 2009,
- * William Pitcock <nenolod@atheme.org> - 2010.
- *
- * This file is part of the Audacious RoarAudio output plugin a part of RoarAudio,
- * a cross-platform sound system for both, home and professional use.
- * See README for details.
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3
- * as published by the Free Software Foundation.
- *
- * RoarAudio 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 software; see the file COPYING. If not, write to
- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-/*
- * NOTE: Do not spam with requests. You WILL get kicked out on Linux.
- */
-
-#include "all.h"
-
-AUD_OUTPUT_PLUGIN
-(
-	.name = "RoarAudio Output",
-	.init = aud_roar_init,
-	.cleanup = NULL,
-	.get_volume = aud_roar_get_volume,
-	.set_volume = aud_roar_set_volume,
-	.open_audio = aud_roar_open,
-	.write_audio = aud_roar_write,
-	.close_audio = aud_roar_close,
-	.flush = aud_roar_flush,
-	.pause = aud_roar_pause,
-	.output_time = aud_roar_get_output_time,
-	.written_time = aud_roar_get_written_time,
-	.drain = aud_roar_drain,
-	.buffer_free = aud_roar_buffer_get_size,
-//	.period_wait = aud_roar_period_wait,
-)
-
-gboolean aud_roar_init(void)
-{
-	mcs_handle_t *cfgfile;
-
-	cfgfile = aud_cfg_db_open();
-
-	g_inst.state = 0;
-	g_inst.server = NULL;
-	g_inst.mixer[0] = g_inst.mixer[1] = 100;
-
-	aud_cfg_db_close(cfgfile);
-
-	if (!(g_inst.state & STATE_CONNECTED))
-	{
-		if (roar_simple_connect(&(g_inst.con), NULL, "Audacious") == -1)
-			return FALSE;
-
-		g_inst.state |= STATE_CONNECTED;
-	}
-
-	return TRUE;
-}
-
-void aud_roar_write(void *ptr, int length)
-{
-	int r;
-
-	while (length)
-	{
-		if ((r = roar_vio_write(&(g_inst.vio), ptr, length >= g_inst.block_size ? g_inst.block_size : length)) != -1)
-		{
-			g_inst.written += r;
-			ptr += r;
-			length -= r;
-		}
-		else
-		{
-			return;
-		}
-	}
-}
-
-gboolean aud_roar_initialize_stream(struct roar_vio_calls *calls, struct roar_connection *con, struct roar_stream *stream, int rate, int nch, int bits, int codec, int dir)
-{
-	struct roar_stream_info info;
-
-	if (roar_vio_simple_new_stream_obj(&(g_inst.vio), &(g_inst.con), &(g_inst.stream), rate, nch, bits, codec, ROAR_DIR_PLAY) == -1)
-		return FALSE;
-
-	g_inst.bits = bits;
-	g_inst.nch = nch;
-	g_inst.rate = rate;
-	g_inst.codec = codec;
-	g_inst.written = 0;
-	g_inst.pause = 0;
-	g_inst.sampleoff = 0;
-	g_inst.state |= STATE_PLAYING;
-	g_inst.block_size = 0;
-
-	if (roar_stream_get_info(&(g_inst.con), &(g_inst.stream), &info) != -1)
-	{
-		/* XXX: this is wrong. */
-		g_inst.block_size = info.block_size * 2;
-		AUDDBG("setting block size to %d\n", g_inst.block_size);
-	}
-
-	roar_stream_set_role(&(g_inst.con), &(g_inst.stream), ROAR_ROLE_MUSIC);
-	aud_roar_set_volume(g_inst.mixer[0], g_inst.mixer[1]);
-
-	return TRUE;
-}
-
-int aud_roar_open(gint fmt, int rate, int nch)
-{
-	int codec = ROAR_CODEC_DEFAULT;
-	int bits;
-
-	bits = 16;
-	switch (fmt)
-	{
-	 case FMT_S8:
-		 bits = 8;
-		 codec = ROAR_CODEC_DEFAULT;
-		 break;
-	 case FMT_U8:
-		 bits = 8;
-		 codec = ROAR_CODEC_PCM_U_LE;	// _LE, _BE, _PDP,... all the same for 8 bit output
-		 break;
-	 case FMT_U16_LE:
-		 codec = ROAR_CODEC_PCM_U_LE;
-		 break;
-	 case FMT_U16_BE:
-		 codec = ROAR_CODEC_PCM_U_BE;
-		 break;
-	 case FMT_S16_LE:
-		 codec = ROAR_CODEC_PCM_S_LE;
-		 break;
-	 case FMT_S16_BE:
-		 codec = ROAR_CODEC_PCM_S_BE;
-		 break;
-#if 0
-/* RoarAudio don't use this stupid 24bit-in-lower-part-of-32bit-int format */
-	 case FMT_U24_LE:	/* stored in lower 3 bytes of 32-bit value, highest byte must be 0 */
-		 codec = ROAR_CODEC_PCM_U_LE;
-		 bits = 24;
-		 break;
-	 case FMT_U24_BE:
-		 codec = ROAR_CODEC_PCM_U_BE;
-		 bits = 24;
-		 break;
-	 case FMT_S24_LE:
-		 bits = 24;
-		 codec = ROAR_CODEC_PCM_S_LE;
-		 break;
-	 case FMT_S24_BE:
-		 bits = 24;
-		 codec = ROAR_CODEC_PCM_S_BE;
-		 break;
-#endif
-	 case FMT_U32_LE:	/* highest byte must be 0 */
-		 codec = ROAR_CODEC_PCM_U_LE;
-		 bits = 32;
-		 break;
-	 case FMT_U32_BE:
-		 codec = ROAR_CODEC_PCM_U_BE;
-		 bits = 32;
-		 break;
-	 case FMT_S32_LE:
-		 bits = 32;
-		 codec = ROAR_CODEC_PCM_S_LE;
-		 break;
-	 case FMT_S32_BE:
-		 bits = 32;
-		 codec = ROAR_CODEC_PCM_S_BE;
-		 break;
-	 case FMT_FLOAT:
-	 default:
-		 return FALSE;
-		 break;
-	}
-
-	g_inst.bps = nch * rate * bits / 8;
-
-	if (!aud_roar_initialize_stream(&(g_inst.vio), &(g_inst.con), &(g_inst.stream), rate, nch, bits, codec, ROAR_DIR_PLAY))
-		return FALSE;
-
-	aud_roar_update_metadata();
-
-	return TRUE;
-}
-
-void aud_roar_close(void)
-{
-	gint id;
-
-	id = roar_stream_get_id(&(g_inst.stream));
-	roar_kick(&(g_inst.con), ROAR_OT_STREAM, id);
-	roar_vio_close(&(g_inst.vio));
-
-	g_inst.state &= ~STATE_PLAYING;
-	g_inst.written = 0;
-}
-
-void aud_roar_pause(gboolean p)
-{
-	if (p)
-		roar_stream_set_flags(&(g_inst.con), &(g_inst.stream), ROAR_FLAG_PAUSE, ROAR_SET_FLAG);
-	else
-		roar_stream_set_flags(&(g_inst.con), &(g_inst.stream), ROAR_FLAG_PAUSE, ROAR_RESET_FLAG);
-
-	g_inst.pause = p;
-}
-
-void aud_roar_flush(int time)
-{
-	gint64 r = time;
-
-	r *= g_inst.bps;
-	r /= 1000;
-
-	aud_roar_close();
-	if (!aud_roar_initialize_stream(&(g_inst.vio), &(g_inst.con), &(g_inst.stream),
-	 g_inst.rate, g_inst.nch, g_inst.bits, g_inst.codec, ROAR_DIR_PLAY))
-		return;
-
-	g_inst.written = r;
-	g_inst.sampleoff = ((time / 1000) * g_inst.rate) * g_inst.nch;
-}
-
-gint64 aud_roar_get_adjusted_sample_count(void)
-{
-	gint id;
-	gint64 samples;
-
-	/* first update our stream record. */
-	id = roar_stream_get_id(&(g_inst.stream));
-	roar_get_stream(&(g_inst.con), &(g_inst.stream), id);
-
-	/* calculate the time, given our sample count. */
-	samples = g_inst.stream.pos;
-	samples += g_inst.sampleoff;
-
-	return samples;
-}
-
-int aud_roar_get_output_time(void)
-{
-	gint64 samples;
-
-	samples = aud_roar_get_adjusted_sample_count();
-
-	return (samples * 1000) / (g_inst.rate * g_inst.nch);
-}
-
-int aud_roar_get_written_time(void)
-{
-	gint64 r;
-
-	if (!g_inst.bps)
-		return 0;
-
-	r = g_inst.written;
-	r *= 1000;		// sec -> msec
-	r /= g_inst.bps;
-
-	return r;
-}
-
-// META DATA:
-int aud_roar_update_metadata(void)
-{
-	struct roar_meta meta;
-	char empty = 0;
-	const gchar *info = NULL;
-	gint pos, playlist;
-	gint i;
-	static struct { int ac_metatype, ra_metatype; } metamap[] = {
-		{FIELD_ARTIST,		ROAR_META_TYPE_ARTIST},
-		{FIELD_TITLE,		ROAR_META_TYPE_TITLE},
-		{FIELD_ALBUM,		ROAR_META_TYPE_ALBUM},
-		{FIELD_COMMENT,		ROAR_META_TYPE_COMMENT},
-		{FIELD_GENRE,		ROAR_META_TYPE_GENRE},
-		{FIELD_PERFORMER,	ROAR_META_TYPE_PERFORMER},
-		{FIELD_COPYRIGHT,	ROAR_META_TYPE_COPYRIGHT},
-		{FIELD_DATE,		ROAR_META_TYPE_DATE},
-	};
-
-	playlist = aud_playlist_get_active();
-	pos = aud_playlist_get_position(playlist);
-
-	meta.value = &empty;
-	meta.key[0] = 0;
-	meta.type = ROAR_META_TYPE_NONE;
-
-	roar_stream_meta_set(&(g_inst.con), &(g_inst.stream), ROAR_META_MODE_CLEAR, &meta);
-
-	gchar * filename = aud_playlist_entry_get_filename (playlist, pos);
-	if (filename)
-	{
-		if (! strncmp (filename, "http://", 7))
-			meta.type = ROAR_META_TYPE_FILEURL;
-		else
-			meta.type = ROAR_META_TYPE_FILENAME;
-
-		meta.value = filename;
-		roar_stream_meta_set(&(g_inst.con), &(g_inst.stream), ROAR_META_MODE_SET, &meta);
-
-		g_free (filename);
-	}
-
-	Tuple * songtuple = aud_playlist_entry_get_tuple (playlist, pos, TRUE);
-	if (songtuple)
-	{
-		for (i = 0; i < sizeof(metamap)/sizeof(*metamap); i++)
-		{
-			if ((info = tuple_get_string(songtuple, metamap[i].ac_metatype, NULL)))
-			{
-				meta.type = metamap[i].ra_metatype;
-				meta.value = g_strdup(info);
-
-				roar_stream_meta_set(&(g_inst.con), &(g_inst.stream), ROAR_META_MODE_SET, &meta);
-
-				free(meta.value);
-			}
-		}
-
-		tuple_free (songtuple);
-	}
-
-	meta.value = &empty;
-	meta.type = ROAR_META_TYPE_NONE;
-	roar_stream_meta_set(&(g_inst.con), &(g_inst.stream), ROAR_META_MODE_FINALIZE, &meta);
-
-	return 0;
-}
-
-// MIXER:
-void aud_roar_get_volume(int *l, int *r)
-{
-	struct roar_mixer_settings mixer;
-	int channels;
-	float fs;
-
-	if (!(g_inst.state & STATE_CONNECTED))
-		return;
-
-#ifdef NOTYET
-	if (roar_get_vol(&(g_inst.con), g_inst.stream.id, &mixer, &channels) == -1)
-		return;
-
-	if (channels == 1)
-		mixer.mixer[1] = mixer.mixer[0];
-
-	fs = (float)mixer.scale/100.;
-
-	*l = g_inst.mixer[0] = mixer.mixer[0] / fs;
-	*r = g_inst.mixer[1] = mixer.mixer[1] / fs;
-#else
-	*l = g_inst.mixer[0];
-	*r = g_inst.mixer[1];
-#endif
-}
-
-void aud_roar_set_volume(int l, int r)
-{
-	struct roar_mixer_settings mixer;
-
-	if (!(g_inst.state & STATE_CONNECTED))
-		return;
-
-	mixer.mixer[0] = g_inst.mixer[0] = l;
-	mixer.mixer[1] = g_inst.mixer[1] = r;
-
-	mixer.scale = 100;
-
-	roar_set_vol(&(g_inst.con), g_inst.stream.id, &mixer, 2);
-}
-
-/* this really sucks. */
-gboolean aud_roar_vio_is_writable(struct roar_vio_calls *vio)
-{
-	struct roar_vio_select vios[1];
-
-	ROAR_VIO_SELECT_SETVIO(&vios[0], vio, ROAR_VIO_SELECT_WRITE);
-
-	return roar_vio_select(vios, 1, &(struct roar_vio_selecttv){ .nsec = 1 }, NULL);
-}
-
-gint aud_roar_buffer_get_size(void)
-{
-	if (!(g_inst.state & STATE_CONNECTED))
-		return 0;
-
-	if (!(g_inst.state & STATE_PLAYING))
-		return 0;
-
-	if (!aud_roar_vio_is_writable(&(g_inst.vio)))
-		return 0;
-
-	if (g_inst.block_size != 0)
-		return g_inst.block_size;
-
-	return 0;
-}
-
-void aud_roar_period_wait(void)
-{
-	struct roar_vio_select vios[1];
-
-	if (!(g_inst.state & STATE_PLAYING))
-		return;
-
-	ROAR_VIO_SELECT_SETVIO(&vios[0], &(g_inst.vio), ROAR_VIO_SELECT_WRITE);
-
-	roar_vio_select(vios, 1, NULL, NULL);
-}
-
-void aud_roar_drain (void) {
-	struct roar_event waits, triggered;
-
-	memset(&waits, 0, sizeof(waits));
-	waits.event = ROAR_OE_STREAM_XRUN;
-	waits.emitter = -1;
-	waits.target = roar_stream_get_id(&(g_inst.stream));
-	waits.target_type = ROAR_OT_STREAM;
-
-	// ignore errors as we are in void context anyway.
-
-	roar_vio_sync(&(g_inst.vio));
-
-	roar_wait(&(g_inst.con), &triggered, &waits, 1);
-}
-

audacious-plugins-3.1.1.tar.bz2/src/streambrowser Deleted

audacious-plugins-3.1.1.tar.bz2/src/streambrowser/Makefile Deleted

audacious-plugins-3.1.1.tar.bz2/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-3.1.1.tar.bz2/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-3.1.1.tar.bz2/src/streambrowser/gui Deleted

audacious-plugins-3.1.1.tar.bz2/src/streambrowser/gui/streambrowser_win.c Deleted

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

audacious-plugins-3.1.1.tar.bz2/src/streambrowser/gui/streambrowser_win.h Deleted

audacious-plugins-3.1.1.tar.bz2/src/streambrowser/images Deleted

audacious-plugins-3.1.1.tar.bz2/src/streambrowser/images/bookmarks.png Deleted

audacious-plugins-3.1.1.tar.bz2/src/streambrowser/images/shoutcast.png Deleted

audacious-plugins-3.1.1.tar.bz2/src/streambrowser/images/streambrowser-16x16.png Deleted

audacious-plugins-3.1.1.tar.bz2/src/streambrowser/images/streambrowser-64x64.png Deleted

audacious-plugins-3.1.1.tar.bz2/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-3.1.1.tar.bz2/src/streambrowser/images/xiph.png Deleted

audacious-plugins-3.1.1.tar.bz2/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' successfully downloaded to '%s'\n",
- url, temp_pathname);
-
- xmlDoc *doc = xmlReadFile (temp_pathname, NULL, 0);
- if (doc == NULL)
- {
- failure ("shoutcast: failed to read '%s' category file\n",
- category->name);
- free (temp_filename);
- return FALSE;
- }
-
- /* free/remove any existing streaminfos in this category */
- while (streaminfo_get_count (category) > 0)
- streaminfo_remove (category, streaminfo_get_by_index (category, 0));
-
- xmlNode *root_node = xmlDocGetRootElement (doc);
- xmlNode *node;
-
- root_node = root_node->children;
-
- for (node = root_node; node != NULL; node = node->next)
- {
- if (node->type == XML_ELEMENT_NODE
- && !strcmp ((char *) node->name, "station"))
- {
- gchar *streaminfo_name =
- (gchar *) xmlGetProp (node, (xmlChar *) "name");
- gchar *streaminfo_id =
- (gchar *) xmlGetProp (node, (xmlChar *) "id");
- gchar streaminfo_playlist_url[DEF_STRING_LEN];
- gchar *streaminfo_current_track =
- (gchar *) xmlGetProp (node, (xmlChar *) "ct");
-
- g_snprintf (streaminfo_playlist_url, DEF_STRING_LEN,
- SHOUTCAST_STREAMINFO_URL, streaminfo_id);
-
- AUDDBG("shoutcast: adding stream info for '%s/%s' from '%s'\n",
- streaminfo_name, streaminfo_id, url);
-
- streaminfo_t *streaminfo =
- streaminfo_new (streaminfo_name, streaminfo_playlist_url, "",
- streaminfo_current_track);
- streaminfo_add (category, streaminfo);
-
- xmlFree (streaminfo_name);
- xmlFree (streaminfo_id);
- xmlFree (streaminfo_current_track);
-
- AUDDBG("shoutcast: stream info added\n");
- }
- }
-
- xmlFreeDoc (doc);
-
- if (remove (temp_filename) != 0)
- {
- failure ("shoutcast: cannot remove the temporary file: %s\n",
- strerror (errno));
- }
- free (temp_filename);
-
- return TRUE;
-}
-
-
-streamdir_t *shoutcast_streamdir_fetch ()
-{
- streamdir_t *streamdir = streamdir_new (SHOUTCAST_NAME);
-
- /* generate a valid, temporary filename */
- char *temp_filename = tempnam (NULL, "aud_sb");
- if (temp_filename == NULL)
- {
- failure ("shoutcast: failed to create a temporary file\n");
- return NULL;
- }
-
- char temp_pathname[DEF_STRING_LEN];
- sprintf (temp_pathname, "file://%s", temp_filename);
-
- AUDDBG("shoutcast: fetching streaming directory file '%s'\n",
- SHOUTCAST_STREAMDIR_URL);
- if (!fetch_remote_to_local_file (SHOUTCAST_STREAMDIR_URL, temp_pathname))
- {
- failure
- ("shoutcast: stream directory file '%s' could not be downloaded to '%s'\n",
- SHOUTCAST_STREAMDIR_URL, temp_pathname);
- free (temp_filename);
- return NULL;
- }
- AUDDBG
- ("shoutcast: stream directory file '%s' successfuly downloaded to '%s'\n",
- SHOUTCAST_STREAMDIR_URL, temp_pathname);
-
- xmlDoc *doc = xmlReadFile (temp_pathname, NULL, 0);
- if (doc == NULL)
- {
- failure ("shoutcast: failed to read stream directory file\n");
- free (temp_filename);
- return NULL;
- }
-
- xmlNode *root_node = xmlDocGetRootElement (doc);
- xmlNode *node;
-
- root_node = root_node->children;
-
- for (node = root_node; node != NULL; node = node->next)
- {
- if (node->type == XML_ELEMENT_NODE)
- {
- gchar *category_name =
- (gchar *) xmlGetProp (node, (xmlChar *) "name");
-
- AUDDBG("shoutcast: fetching category '%s'\n", category_name);
-
- category_t *category = category_new (category_name);
- category_add (streamdir, category);
-
- xmlFree (category_name);
-
- AUDDBG("shoutcast: category added: %s.\n", category_name);
- }
- }
-
- xmlFreeDoc (doc);
-
- if (remove (temp_filename) != 0)
- {
- failure ("shoutcast: cannot remove the temporary file: %s\n",
- strerror (errno));
- }
- free (temp_filename);
-
- AUDDBG("shoutcast: streaming directory successfuly loaded\n");
-
- return streamdir;
-}

audacious-plugins-3.1.1.tar.bz2/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://yp.shoutcast.com/sbin/newxml.phtml"
-#define SHOUTCAST_CATEGORY_URL		"http://yp.shoutcast.com/sbin/newxml.phtml?genre=%s"
-#define SHOUTCAST_STREAMINFO_URL	"http://yp.shoutcast.com/sbin/shoutcast-playlist.pls?rn=%s&file=filename.pls"
-
-
-gboolean shoutcast_streaminfo_fetch (category_t * category,
- streaminfo_t * streaminfo);
-gboolean shoutcast_category_fetch (streamdir_t * streamdir,
- category_t * category);
-streamdir_t *shoutcast_streamdir_fetch ();
-
-
-#endif // SHOUTCAST_H

audacious-plugins-3.1.1.tar.bz2/src/streambrowser/streambrowser.c Deleted

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

audacious-plugins-3.1.1.tar.bz2/src/streambrowser/streambrowser.h Deleted

@@ -1,49 +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);
-
-extern GMutex *update_streamdir_mutex; /* used to synchronize the access to streamdirs */
-
-#endif // STREAMBROWSER_H
-

audacious-plugins-3.1.1.tar.bz2/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-3.1.1.tar.bz2/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-3.1.1.tar.bz2/src/streambrowser/xiph.c Deleted

@@ -1,305 +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&B/Soul", "r&b funk soul urban"},
- {"Spiritual", "spiritual gospel christian muslim jewish religio"},
- {"Spoken", "spoken talk comedy"},
- {"World", "world reggae island african european east asia"},
- {"Other", "various mixed misc eclectic film show instrumental"}
-};
-
-
-static void refresh_streamdir (void);
- /* returns true if any of the words in string1 is present in string2 */
-static gboolean genre_match (gchar * string1, gchar * string2);
-
-gboolean xiph_streaminfo_fetch (category_t * category,
- streaminfo_t * streaminfo)
-{
- gint entryno;
-
- refresh_streamdir ();
-
- /* find the corresponding xiph entry */
- for (entryno = 0; entryno < xiph_entry_count; entryno++)
- {
- if (strcmp (xiph_entries[entryno].name, streaminfo->name) == 0)
- {
- strcpy (streaminfo->name, xiph_entries[entryno].name);
- strcpy (streaminfo->url, xiph_entries[entryno].url);
- strcpy (streaminfo->current_track,
- xiph_entries[entryno].current_song);
-
- break;
- }
- }
-
- return TRUE;
-}
-
-gboolean xiph_category_fetch (streamdir_t * streamdir, category_t * category)
-{
- refresh_streamdir ();
- 
- gint entryno, categoryno;
- gint xiph_category_count =
- sizeof (xiph_categories) / sizeof (xiph_category_t);
- xiph_category_t *xiph_category = NULL;
-
- for (categoryno = 0; categoryno < xiph_category_count; categoryno++) {
- if (strcmp (xiph_categories[categoryno].name, category->name) == 0)
- {
- xiph_category = xiph_categories + categoryno;
- break;
- }
- }
-
- /* somehow we've got an invalid/unrecognized category */
- if (xiph_category == NULL)
- {
- failure ("xiph: got an unrecognized category: '%s'\n", category->name);
- return FALSE;
- }
-
- /* free/remove any existing streaminfos in this category */
- while (streaminfo_get_count (category) > 0)
- streaminfo_remove (category, streaminfo_get_by_index (category, 0));
-
- /* see what entries match this category */
- for (entryno = 0; entryno < xiph_entry_count; entryno++)
- {
- if (genre_match
- (xiph_category->match_string, xiph_entries[entryno].genre))
- {
- streaminfo_t *streaminfo =
- streaminfo_new (xiph_entries[entryno].name, "",
- xiph_entries[entryno].url,
- xiph_entries[entryno].current_song);
- streaminfo_add (category, streaminfo);
- }
- }
-
- /* if the requested category is the last one in the list ("other"),
- we fill it with all the entries that don't match the rest of categories */
- if (xiph_category == &xiph_categories[xiph_category_count - 1])
- {
- for (entryno = 0; entryno < xiph_entry_count; entryno++)
- {
- gboolean matched = FALSE;
-
- for (categoryno = 0; categoryno < xiph_category_count; categoryno++)
- if (genre_match
- (xiph_entries[entryno].genre,
- xiph_categories[categoryno].match_string))
- {
- matched = TRUE;
- break;
- }
-
- if (!matched)
- {
- streaminfo_t *streaminfo =
- streaminfo_new (xiph_entries[entryno].name, "",
- xiph_entries[entryno].url,
- xiph_entries[entryno].current_song);
- streaminfo_add (category, streaminfo);
- }
- }
- }
-
- return TRUE;
-}
-
-
-streamdir_t *xiph_streamdir_fetch (void)
-{
- streamdir_t *streamdir = streamdir_new (XIPH_NAME);
- gint categno;
-
- refresh_streamdir ();
- 
- for (categno = 0;
- categno < sizeof (xiph_categories) / sizeof (xiph_category_t);
- categno++)
- {
- category_t *category = category_new (xiph_categories[categno].name);
- category_add (streamdir, category);
- }
-
- return streamdir;
-}
-
-static void refresh_streamdir (void)
-{
- gchar * unix_name = g_build_filename (aud_util_get_localdir (),
- XIPH_TEMP_FILENAME, NULL);
- gchar * uri_name = g_filename_to_uri (unix_name, NULL, NULL);
-
- /* free any previously fetched streamdir data */
- if (xiph_entries != NULL)
- {
- free (xiph_entries);
- xiph_entries = NULL;
- }
- xiph_entry_count = 0;
-
- AUDDBG("xiph: fetching streaming directory file '%s'\n",
- XIPH_STREAMDIR_URL);
-
- if (! fetch_remote_to_local_file (XIPH_STREAMDIR_URL, uri_name))
- {
- failure ("xiph: stream directory file '%s' could not be downloaded to "
- "'%s'\n", XIPH_STREAMDIR_URL, uri_name);
- goto DONE;
- }
-
- AUDDBG("xiph: stream directory file '%s' successfuly downloaded to '%s'\n",
- XIPH_STREAMDIR_URL, uri_name);
-
- xmlDoc * doc = xmlReadFile (uri_name, NULL, 0);
-
- if (doc == NULL)
- {
- failure ("xiph: failed to read stream directory file\n");
- goto DONE;
- }
-
- xmlNode *root_node = xmlDocGetRootElement (doc);
- xmlNode *node, *child;
- gchar *content;
-
- root_node = root_node->children;
-
- for (node = root_node; node != NULL; node = node->next)
- {
- if (node->type == XML_ELEMENT_NODE)
- {
- xiph_entries =
- realloc (xiph_entries,
- sizeof (xiph_entry_t) * (xiph_entry_count + 1));
-
- for (child = node->children; child != NULL; child = child->next)
- {
- if (strcmp ((gchar *) child->name, "server_name") == 0)
- {
- content = (gchar *) xmlNodeGetContent (child);
- strcpy (xiph_entries[xiph_entry_count].name, content);
- xmlFree (content);
- }
- else if (strcmp ((gchar *) child->name, "listen_url") == 0)
- {
- content = (gchar *) xmlNodeGetContent (child);
- strcpy (xiph_entries[xiph_entry_count].url, content);
- xmlFree (content);
- }
- else if (strcmp ((gchar *) child->name, "current_song") == 0)
- {
- content = (gchar *) xmlNodeGetContent (child);
- strcpy (xiph_entries[xiph_entry_count].current_song,
- content);
- xmlFree (content);
- }
- else if (strcmp ((gchar *) child->name, "genre") == 0)
- {
- content = (gchar *) xmlNodeGetContent (child);
- strcpy (xiph_entries[xiph_entry_count].genre, content);
- xmlFree (content);
- }
- }
-
- xiph_entry_count++;
- }
- }
-
- xmlFreeDoc (doc);
-
- AUDDBG("xiph: streaming directory successfuly loaded\n");
-
-DONE:
- g_free (unix_name);
- g_free (uri_name);
-}
-
-static gboolean genre_match (gchar * string1, gchar * string2)
-{
- gchar **genres = g_strsplit (string1, " ", -1);
- gboolean matched = FALSE;
- gint n;
-
- if (genres != NULL)
- {
- for (n = 0; genres[n] != NULL; n++)
- {
- if (mystrcasestr (string2, genres[n]))
- {
- matched = TRUE;
- break;
- }
- }
- g_strfreev (genres);
- }
-
- return matched;
-}

audacious-plugins-3.1.1.tar.bz2/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-3.1.1.tar.bz2/src/usf Deleted

audacious-plugins-3.1.1.tar.bz2/src/usf/Makefile Deleted

@@ -1,47 +0,0 @@
-PLUGIN = usf${PLUGIN_SUFFIX}
-
-SRCS = audio.c \
-       audio_hle_main.c \
-       audio_ucode1.c \
-       audio_ucode2.c \
-       audio_ucode3.c \
-       audio_ucode3mp3.c \
-       cpu.c \
-       dma.c \
-       exception.c \
-       interpreter_cpu.c \
-       interpreter_ops.c \
-       main.c \
-       memory.c \
-       pif.c \
-       psftag.c \
-       recompiler_cpu.c \
-       recompiler_fpu_ops.c \
-       recompiler_ops.c \
-       registers.c \
-       rsp.c \
-       rsp_interpreter_cpu.c \
-       rsp_mmx.c \
-       rsp_recompiler_analysis.c \
-       rsp_recompiler_cpu.c \
-       rsp_recompiler_ops.c \
-       rsp_sse.c \
-       rsp_x86.c \
-       tlb.c \
-       usf.c \
-       x86.c \
-       x86_fpu.c
-
-include ../../buildsys.mk
-include ../../extra.mk
-
-plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
-
-CFLAGS += ${PLUGIN_CFLAGS} -O0
-CXXFLAGS += ${PLUGIN_CFLAGS} -O0
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../.. -Ispu/ -I.
-LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS} -lz -lm
-
-# USF produces tons of warnings; disable the less important ones.
-CFLAGS += -Wno-pointer-sign -Wno-parentheses -Wno-unused-variable \
- -Wno-unused-but-set-variable -Wno-unused-result -Wno-unused-value

audacious-plugins-3.1.1.tar.bz2/src/usf/audio.c Deleted

@@ -1,112 +0,0 @@
-#include "usf.h"
-#include "audio_hle.h"
-#include "memory.h"
-#include "audio.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <linux/soundcard.h>
-
-#include <audacious/plugin.h>
-
-#include <unistd.h>
-#include <pthread.h>
-#include <stdlib.h>
-
-extern InputPlayback * pcontext;
-extern gboolean usf_playing;
-int32_t SampleRate = 0;
-static int16_t samplebuf[16384];
-
-void OpenSound(void)
-{
-	if (pcontext->output->open_audio(FMT_S16_NE, SampleRate, 2) == 0) {
-		cpu_running = 0;
-		printf("Fail Starting audio\n");
-		g_thread_exit(NULL);
-	} else {
-	}
-}
-
-void AddBuffer(unsigned char *buf, unsigned int length) {
-	int32_t i = 0, out = 0;
-	double vol = 1.0;	
-	
-	if(!cpu_running)
-		return;
-		
-	if(is_seeking) {		
-		play_time += (((double)(length >> 2) / (double)SampleRate) * 1000.0);
-		if(play_time > (double)seek_time) {
-			is_seeking = 0;
-		}
-		return;
-	}
-	
-	if(play_time > track_time) {
-		vol = 1.0f - (((double)play_time - (double)track_time) / (double)fade_time);
-	} 
-			
-	for(out = i = 0; i < (length >> 1); i+=2)
-	{
-		samplebuf[out++] = (int16_t)(vol * (double)((int16_t*)buf)[i+1]);
-		samplebuf[out++] = (int16_t)(vol * (double)((int16_t*)buf)[i]);
-	}
-	
-	play_time += (((double)(length >> 2) / (double)SampleRate) * 1000.0);
-
-	usf_playing = play_time < (track_time + fade_time);
-
-	pcontext->output->write_audio (samplebuf, length);
-	
-	if(play_time > (track_time + fade_time))
-	{
-		cpu_running = 0;
-	}
-
-}
-
-void AiLenChanged(void) {
-	int32_t length = 0;
-	uint32_t address = (AI_DRAM_ADDR_REG & 0x00FFFFF8);
-
-	length = AI_LEN_REG & 0x3FFF8;
-
-	while(is_paused && !is_seeking && cpu_running)
-		g_usleep(10000);
-		
-	
-	AddBuffer(RDRAM+address, length);
-
-	if(length && !(AI_STATUS_REG&0x80000000)) {
-		const float VSyncTiming = 789000.0f;
-		double BytesPerSecond = 48681812.0 / (AI_DACRATE_REG + 1) * 4;
-		double CountsPerSecond = (double)((((double)VSyncTiming) * (double)60.0)) * 2.0;
-		double CountsPerByte = (double)CountsPerSecond / (double)BytesPerSecond;
-		unsigned int IntScheduled = (unsigned int)((double)AI_LEN_REG * CountsPerByte);
-
-		ChangeTimer(AiTimer,IntScheduled);
-	}
-
-	if(enableFIFOfull) {
-		if(AI_STATUS_REG&0x40000000)
-			AI_STATUS_REG|=0x80000000;
-	}
-
-	AI_STATUS_REG|=0x40000000;
-
-}
-
-unsigned int AiReadLength(void) {
-	AI_LEN_REG = 0;
-	return AI_LEN_REG;
-}
-
-void AiDacrateChanged(unsigned int value) {
-	AI_DACRATE_REG = value;
-	SampleRate = 48681812 / (AI_DACRATE_REG + 1);
-
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/audio.h Deleted

audacious-plugins-3.1.1.tar.bz2/src/usf/audio_hle.h Deleted

@@ -1,140 +0,0 @@
-/**
- * Mupen64 hle rsp - hle.c
- * Copyright (C) 2002 Hacktarux
- *
- * Mupen64 homepage: http://mupen64.emulation64.com
- * email address: hacktarux@yahoo.fr
- *
- * If you want to contribute to the project please contact
- * me first (maybe someone is already making what you are
- * planning to do).
- *
- *
- * This program is free software; you can redistribute it and/
- * or modify it under the terms of the GNU General Public Li-
- * cence as published by the Free Software Foundation; either
- * version 2 of the Licence, or any later version.
- *
- * This program is distributed in the hope that it will be use-
- * ful, but WITHOUT ANY WARRANTY; without even the implied war-
- * ranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public Licence for more details.
- *
- * You should have received a copy of the GNU General Public
- * Licence along with this program; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
- * USA.
- *
-**/
-
-#ifndef HLE_H
-#define HLE_H
-
-#ifndef _BIG_ENDIAN
-#define S 0
-#define S8 0
-#else
-#define S 1
-#define S8 3
-#endif
-
-// types
-typedef unsigned char		u8;
-typedef unsigned short		u16;
-typedef unsigned int		u32;
-typedef unsigned long long	u64;
-
-typedef signed char			s8;
-typedef signed short		s16;
-typedef signed int			s32;
-typedef signed long long	s64;
-
-/*
- * Audio flags
- */
-
-#define A_INIT			0x01
-#define A_CONTINUE		0x00
-#define A_LOOP          0x02
-#define A_OUT           0x02
-#define A_LEFT			0x02
-#define	A_RIGHT			0x00
-#define A_VOL			0x04
-#define A_RATE			0x00
-#define A_AUX			0x08
-#define A_NOAUX			0x00
-#define A_MAIN			0x00
-#define A_MIX			0x10
-
-typedef struct
-{
-   unsigned int type;
-   unsigned int flags;
-
-   unsigned int ucode_boot;
-   unsigned int ucode_boot_size;
-
-   unsigned int ucode;
-   unsigned int ucode_size;
-
-   unsigned int ucode_data;
-   unsigned int ucode_data_size;
-
-   unsigned int dram_stack;
-   unsigned int dram_stack_size;
-
-   unsigned int output_buff;
-   unsigned int output_buff_size;
-
-   unsigned int data_ptr;
-   unsigned int data_size;
-
-   unsigned int yield_data_ptr;
-   unsigned int yield_data_size;
-} OSTask_t;
-
-extern u32 inst1, inst2;
-//extern u16 AudioInBuffer, AudioOutBuffer, AudioCount;
-//extern u16 AudioAuxA, AudioAuxC, AudioAuxE;
-extern u32 loopval; // Value set by A_SETLOOP : Possible conflict with SETVOLUME???
-//extern u32 UCData, UDataLen;
-
-extern u32 SEGMENTS[0x10];		// 0x0320
-// T8 = 0x360
-extern u16 AudioInBuffer;		// 0x0000(T8)
-extern u16 AudioOutBuffer;		// 0x0002(T8)
-extern u16 AudioCount;			// 0x0004(T8)
-extern s16 Vol_Left;		// 0x0006(T8)
-extern s16 Vol_Right;		// 0x0008(T8)
-extern u16 AudioAuxA;			// 0x000A(T8)
-extern u16 AudioAuxC;			// 0x000C(T8)
-extern u16 AudioAuxE;			// 0x000E(T8)
-extern u32 loopval;			// 0x0010(T8) // Value set by A_SETLOOP : Possible conflict with SETVOLUME???
-extern s16 VolTrg_Left;	// 0x0010(T8)
-extern s32 VolRamp_Left;	// m_LeftVolTarget
-//u16 VolRate_Left;	// m_LeftVolRate
-extern s16 VolTrg_Right;	// m_RightVol
-extern s32 VolRamp_Right;	// m_RightVolTarget
-//u16 VolRate_Right;	// m_RightVolRate
-extern s16 Env_Dry;		// 0x001C(T8)
-extern s16 Env_Wet;		// 0x001E(T8)
-
-
-extern u8 BufferSpace[0x10000];
-
-extern short hleMixerWorkArea[256];
-extern u16 adpcmtable[0x88];
-extern int firstHLE, goldeneye;
-
-
-extern int audio_ucode(OSTask_t *task);
-//extern unsigned char *RDRAM,*DMEM, *IMEM, *ROM;
-//extern unsigned int N64MEM_Pages[0x80];
-#include "usf.h"
-#include "memory.h"
-#include "cpu.h"
-
-
-
-
-#endif

audacious-plugins-3.1.1.tar.bz2/src/usf/audio_hle_main.c Deleted

@@ -1,83 +0,0 @@
-
-#include "usf.h"
-#include "audio_hle.h"
-#include "memory.h"
-#include "audio.h"
-// "Mupen64 HLE RSP plugin v0.2 with Azimers code by Hacktarux"
-
-
-static int audio_ucode_detect ( OSTask_t *task )
-{
-
-	if ( (*(uint8_t*) ( N64MEM + task->ucode_data )) != 0x1 )
-	{
-		if ( (*(uint8_t*) ( N64MEM + task->ucode_data )) == 0xF )
-			return 4;
-		else
-			return 3;
-	}
-	else
-	{
-		if ( (*(uint32_t*) (N64MEM + task->ucode_data + 0x30 )) == 0xF0000F00 ) {
-			if ((*(uint32_t*) (N64MEM + task->ucode_data + 0x28 )) == 0x1dc8138c)
-				return 5; //goldeneye
-			else
-				return 1;
-
-		}
-		else
-			return 2;
-	}
-}
-
-extern void ( *ABI1[0x20] ) ();
-extern void ( *ABI2[0x20] ) ();
-extern void ( *ABI3[0x20] ) ();
-
-void ( *ABI[0x20] ) ();
-
-u32 inst1, inst2;
-
-int audio_ucode ( OSTask_t *task )
-{
-
-	unsigned int i;
-
-	goldeneye = 0;
-
-	switch ( audio_ucode_detect ( task ) )
-	{
-		case 1: // mario ucode
-			memcpy ( ABI, ABI1, sizeof ( ABI[0] ) *0x20 );
-			//cprintf("Ucode1\n");
-			break;
-		case 2: // banjo kazooie ucode
-			memcpy ( ABI, ABI2, sizeof ( ABI[0] ) *0x20 );
-			//cprintf("Ucode2\n");
-			break;
-		case 3: // zelda ucode
-			memcpy ( ABI, ABI3, sizeof ( ABI[0] ) *0x20 );
-			//cprintf("Ucode3\n");
-			break;
-		case 5:
-			goldeneye = 1;
-			memcpy ( ABI, ABI1, sizeof ( ABI[0] ) *0x20 );
-			break;
-		default:
-		{
-
-			return -1;
-		}
-	}
-
-	for ( i = 0; i < ( task->data_size/4 ); i += 2 )
-	{
-		inst1 = (*(uint32_t*) ( N64MEM + task->data_ptr + ( i*4 ) ));
-		inst2 = (*(uint32_t*) ( N64MEM + task->data_ptr + ( ( i+1 ) *4 ) ));
-		//printf("%x\t%x\n",inst1 >> 24,inst1);
-		ABI[inst1 >> 24]();
-
-	}
-
-	return 0;
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/audio_ucode1.c Deleted

@@ -1,755 +0,0 @@
-#include "usf.h"
-#include "audio_hle.h"
-
-
-static void SPNOOP () {
-	//MessageBox (NULL, "Unknown Audio Command in ABI 1", "Audio HLE Error", MB_OK);
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-u32 SEGMENTS[0x10];		// 0x0320
-// T8 = 0x360
-u16 AudioInBuffer;		// 0x0000(T8)
-u16 AudioOutBuffer;		// 0x0002(T8)
-u16 AudioCount;			// 0x0004(T8)
-s16 Vol_Left;		// 0x0006(T8)
-s16 Vol_Right;		// 0x0008(T8)
-u16 AudioAuxA;			// 0x000A(T8)
-u16 AudioAuxC;			// 0x000C(T8)
-u16 AudioAuxE;			// 0x000E(T8)
-u32 loopval;			// 0x0010(T8) // Value set by A_SETLOOP : Possible conflict with SETVOLUME???
-s16 VolTrg_Left;	// 0x0010(T8)
-s32 VolRamp_Left;	// m_LeftVolTarget
-//u16 VolRate_Left;	// m_LeftVolRate
-s16 VolTrg_Right;	// m_RightVol
-s32 VolRamp_Right;	// m_RightVolTarget
-//u16 VolRate_Right;	// m_RightVolRate
-s16 Env_Dry;		// 0x001C(T8)
-s16 Env_Wet;		// 0x001E(T8)
-int firstHLE = 0, goldeneye = 0;
-
-u8 BufferSpace[0x10000];
-
-short hleMixerWorkArea[256];
-u16 adpcmtable[0x88];
-
-
-u16 ResampleLUT [0x200] = {
-	0x0C39, 0x66AD, 0x0D46, 0xFFDF, 0x0B39, 0x6696, 0x0E5F, 0xFFD8,
-	0x0A44, 0x6669, 0x0F83, 0xFFD0, 0x095A, 0x6626, 0x10B4, 0xFFC8,
-	0x087D, 0x65CD, 0x11F0, 0xFFBF, 0x07AB, 0x655E, 0x1338, 0xFFB6,
-	0x06E4, 0x64D9, 0x148C, 0xFFAC, 0x0628, 0x643F, 0x15EB, 0xFFA1,
-	0x0577, 0x638F, 0x1756, 0xFF96, 0x04D1, 0x62CB, 0x18CB, 0xFF8A,
-	0x0435, 0x61F3, 0x1A4C, 0xFF7E, 0x03A4, 0x6106, 0x1BD7, 0xFF71,
-	0x031C, 0x6007, 0x1D6C, 0xFF64, 0x029F, 0x5EF5, 0x1F0B, 0xFF56,
-	0x022A, 0x5DD0, 0x20B3, 0xFF48, 0x01BE, 0x5C9A, 0x2264, 0xFF3A,
-	0x015B, 0x5B53, 0x241E, 0xFF2C, 0x0101, 0x59FC, 0x25E0, 0xFF1E,
-	0x00AE, 0x5896, 0x27A9, 0xFF10, 0x0063, 0x5720, 0x297A, 0xFF02,
-	0x001F, 0x559D, 0x2B50, 0xFEF4, 0xFFE2, 0x540D, 0x2D2C, 0xFEE8,
-	0xFFAC, 0x5270, 0x2F0D, 0xFEDB, 0xFF7C, 0x50C7, 0x30F3, 0xFED0,
-	0xFF53, 0x4F14, 0x32DC, 0xFEC6, 0xFF2E, 0x4D57, 0x34C8, 0xFEBD,
-	0xFF0F, 0x4B91, 0x36B6, 0xFEB6, 0xFEF5, 0x49C2, 0x38A5, 0xFEB0,
-	0xFEDF, 0x47ED, 0x3A95, 0xFEAC, 0xFECE, 0x4611, 0x3C85, 0xFEAB,
-	0xFEC0, 0x4430, 0x3E74, 0xFEAC, 0xFEB6, 0x424A, 0x4060, 0xFEAF,
-	0xFEAF, 0x4060, 0x424A, 0xFEB6, 0xFEAC, 0x3E74, 0x4430, 0xFEC0,
-	0xFEAB, 0x3C85, 0x4611, 0xFECE, 0xFEAC, 0x3A95, 0x47ED, 0xFEDF,
-	0xFEB0, 0x38A5, 0x49C2, 0xFEF5, 0xFEB6, 0x36B6, 0x4B91, 0xFF0F,
-	0xFEBD, 0x34C8, 0x4D57, 0xFF2E, 0xFEC6, 0x32DC, 0x4F14, 0xFF53,
-	0xFED0, 0x30F3, 0x50C7, 0xFF7C, 0xFEDB, 0x2F0D, 0x5270, 0xFFAC,
-	0xFEE8, 0x2D2C, 0x540D, 0xFFE2, 0xFEF4, 0x2B50, 0x559D, 0x001F,
-	0xFF02, 0x297A, 0x5720, 0x0063, 0xFF10, 0x27A9, 0x5896, 0x00AE,
-	0xFF1E, 0x25E0, 0x59FC, 0x0101, 0xFF2C, 0x241E, 0x5B53, 0x015B,
-	0xFF3A, 0x2264, 0x5C9A, 0x01BE, 0xFF48, 0x20B3, 0x5DD0, 0x022A,
-	0xFF56, 0x1F0B, 0x5EF5, 0x029F, 0xFF64, 0x1D6C, 0x6007, 0x031C,
-	0xFF71, 0x1BD7, 0x6106, 0x03A4, 0xFF7E, 0x1A4C, 0x61F3, 0x0435,
-	0xFF8A, 0x18CB, 0x62CB, 0x04D1, 0xFF96, 0x1756, 0x638F, 0x0577,
-	0xFFA1, 0x15EB, 0x643F, 0x0628, 0xFFAC, 0x148C, 0x64D9, 0x06E4,
-	0xFFB6, 0x1338, 0x655E, 0x07AB, 0xFFBF, 0x11F0, 0x65CD, 0x087D,
-	0xFFC8, 0x10B4, 0x6626, 0x095A, 0xFFD0, 0x0F83, 0x6669, 0x0A44,
-	0xFFD8, 0x0E5F, 0x6696, 0x0B39, 0xFFDF, 0x0D46, 0x66AD, 0x0C39
-};
-#ifdef __cplusplus
-}
-#endif
-
-
-static void CLEARBUFF () {
-	u32 addr = (u32)(inst1 & 0xffff);
-	u32 count = (u32)(inst2 & 0xffff);
-	addr &= 0xFFFC;
-	memset(BufferSpace+addr, 0, (count+3)&0xFFFC);
-}
-
-
-static void ENVMIXER () {
-
-	u8 flags = (u8)((inst1 >> 16) & 0xff);
-	u32 addy = (inst2 & 0xFFFFFF);
-	short *inp=(short *)(BufferSpace+AudioInBuffer);
-	short *out=(short *)(BufferSpace+AudioOutBuffer);
-	short *aux1=(short *)(BufferSpace+AudioAuxA);
-	short *aux2=(short *)(BufferSpace+AudioAuxC);
-	short *aux3=(short *)(BufferSpace+AudioAuxE);
-	s32 MainR;
-	s32 MainL;
-	s32 AuxR;
-	s32 AuxL;
-	int i1,o1,a1,a2=0,a3=0;
-	unsigned short AuxIncRate=1;
-	short zero[8];
-	s32 LVol, RVol;
-	s32 LAcc, RAcc;
-	s32 LTrg, RTrg;
-	s16 Wet, Dry;
-	u32 ptr = 0;
-	s32 RRamp, LRamp;
-	s32 LAdderStart, RAdderStart, LAdderEnd, RAdderEnd;
-	s32 oMainR, oMainL, oAuxR, oAuxL;
-	int x = 0, y = 0;
-
-	memset(zero,0,16);
-
-	if (flags & A_INIT) {
-
- 	if(goldeneye) {
- 		//Vol_Left = Vol_Right;
- 		// VolTrg_Left = VolTrg_Right;
- 		Vol_Left = (Vol_Right >> 8) << 8;
- 		VolTrg_Left = (VolTrg_Right >> 8) << 8;
- 		//Vol_Right = (Vol_Right & 0xff) << 8;
- 		//VolTrg_Right = (VolTrg_Right & 0xff) << 8;
- 	}
-
-		LVol = ((Vol_Left * (s32)VolRamp_Left));
-		RVol = ((Vol_Right * (s32)VolRamp_Right));
-
-		Wet = (s16)Env_Wet;
-		Dry = (s16)Env_Dry; // Save Wet/Dry values
-		LTrg = (VolTrg_Left << 16);
-		RTrg = (VolTrg_Right << 16); // Save Current Left/Right Targets
-		LAdderStart = Vol_Left << 16;
-		RAdderStart = Vol_Right << 16;
-		LAdderEnd = LVol ;
-		RAdderEnd = RVol ;
-		RRamp = VolRamp_Right;
-		LRamp = VolRamp_Left;
-	} else {
-		// Load LVol, RVol, LAcc, and RAcc (all 32bit)
-		// Load Wet, Dry, LTrg, RTrg
-		memcpy((u8*)hleMixerWorkArea, (u8*)RDRAM+addy, 80);
-		Wet = *(s16 *)(hleMixerWorkArea + 0); // 0-1
-		Dry = *(s16 *)(hleMixerWorkArea + 2); // 2-3
-		LTrg = *(s32 *)(hleMixerWorkArea + 4); // 4-5
-		RTrg = *(s32 *)(hleMixerWorkArea + 6); // 6-7
-		LRamp= *(s32 *)(hleMixerWorkArea + 8); // 8-9 (hleMixerWorkArea is a 16bit pointer)
-		RRamp= *(s32 *)(hleMixerWorkArea + 10); // 10-11
-		LAdderEnd = *(s32 *)(hleMixerWorkArea + 12); // 12-13
-		RAdderEnd = *(s32 *)(hleMixerWorkArea + 14); // 14-15
-		LAdderStart = *(s32 *)(hleMixerWorkArea + 16); // 12-13
-		RAdderStart = *(s32 *)(hleMixerWorkArea + 18); // 14-15
-	}
-
-	if(!(flags&A_AUX)) {
-		AuxIncRate=0;
-		aux2=aux3=zero;
-	}
-
-	oMainL = (Dry * (LTrg>>16) + 0x4000) >> 15;
-	oAuxL = (Wet * (LTrg>>16) + 0x4000) >> 15;
-	oMainR = (Dry * (RTrg>>16) + 0x4000) >> 15;
-	oAuxR = (Wet * (RTrg>>16) + 0x4000) >> 15;
-
-	for (y = 0; y < AudioCount; y += 0x10) {
-
-		if (LAdderStart != LTrg) {
-			LAcc = LAdderStart;
-			LVol = (LAdderEnd - LAdderStart) >> 3;
-			LAdderEnd = ((s64)LAdderEnd * (s64)LRamp) >> 16;
-			LAdderStart = ((s64)LAcc * (s64)LRamp) >> 16;
-		} else {
-			LAcc = LTrg;
-			LVol = 0;
-		}
-
-		if (RAdderStart != RTrg) {
-			RAcc = RAdderStart;
-			RVol = (RAdderEnd - RAdderStart) >> 3;
-			RAdderEnd = ((s64)RAdderEnd * (s64)RRamp) >> 16;
-			RAdderStart = ((s64)RAcc * (s64)RRamp) >> 16;
-		} else {
-			RAcc = RTrg;
-			RVol = 0;
-		}
-
-	for (x = 0; x < 8; x++) {
-		i1=(int)inp[ptr^1];
-		o1=(int)out[ptr^1];
-		a1=(int)aux1[ptr^1];
-		if (AuxIncRate) {
-			a2=(int)aux2[ptr^1];
-			a3=(int)aux3[ptr^1];
-		}
-
-		LAcc += LVol;
-		RAcc += RVol;
-
-		if (LVol <= 0) { // Decrementing
-			if (LAcc < LTrg) {
-				LAcc = LTrg;
-				LAdderStart = LTrg;
-				MainL = oMainL;
-				AuxL = oAuxL;
-			} else {
-				MainL = (Dry * ((s32)LAcc>>16) + 0x4000) >> 15;
-				AuxL = (Wet * ((s32)LAcc>>16) + 0x4000) >> 15;
-			}
-		} else {
-			if (LAcc > LTrg) {
-				LAcc = LTrg;
-				LAdderStart = LTrg;
-				MainL = oMainL;
-				AuxL = oAuxL;
-			} else {
-				MainL = (Dry * ((s32)LAcc>>16) + 0x4000) >> 15;
-				AuxL = (Wet * ((s32)LAcc>>16) + 0x4000) >> 15;
-			}
-		}
-
-		if (RVol <= 0) { // Decrementing
-			if (RAcc < RTrg) {
-				RAcc = RTrg;
-				RAdderStart = RTrg;
-				MainR = oMainR;
-				AuxR = oAuxR;
-			} else {
-				MainR = (Dry * ((s32)RAcc>>16) + 0x4000) >> 15;
-				AuxR = (Wet * ((s32)RAcc>>16) + 0x4000) >> 15;
-			}
-		} else {
-			if (RAcc > RTrg) {
-				RAcc = RTrg;
-				RAdderStart = RTrg;
-				MainR = oMainR;
-				AuxR = oAuxR;
-			} else {
-				MainR = (Dry * ((s32)RAcc>>16) + 0x4000) >> 15;
-				AuxR = (Wet * ((s32)RAcc>>16) + 0x4000) >> 15;
-			}
-		}
-
-		o1+=((i1*MainR)+0x4000)>>15;
-		a1+=((i1*MainL)+0x4000)>>15;
-
-		if(o1>32767) o1=32767;
-		else if(o1<-32768) o1=-32768;
-
-		if(a1>32767) a1=32767;
-		else if(a1<-32768) a1=-32768;
-
-		out[ptr^1]=o1;
-		aux1[ptr^1]=a1;
-		if (AuxIncRate) {
-			a2+=((i1*AuxR)+0x4000)>>15;
-			a3+=((i1*AuxL)+0x4000)>>15;
-
-			if(a2>32767) a2=32767;
-			else if(a2<-32768) a2=-32768;
-
-			if(a3>32767) a3=32767;
-			else if(a3<-32768) a3=-32768;
-
-			aux2[ptr^1]=a2;
-			aux3[ptr^1]=a3;
-		}
-		ptr++;
-	}
-	}
-
-	*(s16 *)(hleMixerWorkArea + 0) = Wet; // 0-1
-	*(s16 *)(hleMixerWorkArea + 2) = Dry; // 2-3
-	*(s32 *)(hleMixerWorkArea + 4) = LTrg; // 4-5
-	*(s32 *)(hleMixerWorkArea + 6) = RTrg; // 6-7
-	*(s32 *)(hleMixerWorkArea + 8) = LRamp; // 8-9 (hleMixerWorkArea is a 16bit pointer)
-	*(s32 *)(hleMixerWorkArea + 10) = RRamp; // 10-11
-	*(s32 *)(hleMixerWorkArea + 12) = LAdderEnd; // 12-13
-	*(s32 *)(hleMixerWorkArea + 14) = RAdderEnd; // 14-15
-	*(s32 *)(hleMixerWorkArea + 16) = LAdderStart; // 12-13
-	*(s32 *)(hleMixerWorkArea + 18) = RAdderStart; // 14-15
-
-	memcpy((u8*)RDRAM+addy,(u8*)hleMixerWorkArea,80);
-}
-
-static void RESAMPLE () {
-	unsigned int Accum=0;
-	unsigned int location;
-	s16 *lut/*, *lut2*/;
-	short *dst;
-	s16 *src;
-	s32 temp;
-	s32 accum,addy;
-	u32 srcPtr, dstPtr;
-	unsigned char Flags;
-	unsigned int Pitch;
-	int x = 0, i = 0;
-
-	dst=(short *)(BufferSpace);
-	src=(s16 *)(BufferSpace);
-	srcPtr=(AudioInBuffer/2);
-	dstPtr=(AudioOutBuffer/2);
-
-
-	addy = (inst2 & 0xffffff);// + SEGMENTS[(inst2>>24)&0xf];
-	Flags=(u8)((inst1>>16)&0xff);
-	Pitch=((inst1&0xffff))<<1;
-
-	srcPtr -= 4;
-
-	if ((Flags & 0x1) == 0) {
-		for (x=0; x < 4; x++)
-			src[(srcPtr+x)^1] = *(u16 *)(N64MEM+(addy+(x*2)));
-
-		Accum = *(u16 *)(N64MEM+addy+10);
-	} else {
-		for (x=0; x < 4; x++)
-			src[(srcPtr+x)^1] = 0;
-	}
-
-
-	for(i = 0; i < ((AudioCount+0xf)&0xFFF0)/2;i++)	{
-
-		location = (Accum >> 0xa) << 0x3;
-		lut = (s16 *)(((u8 *)ResampleLUT) + location);
-
-		temp = ((s32)*(s16*)(src+((srcPtr+0)^1))*((s32)((s16)lut[0])));
-		accum = (s32)(temp >> 15);
-
-		temp = ((s32)*(s16*)(src+((srcPtr+1)^1))*((s32)((s16)lut[1])));
-		accum += (s32)(temp >> 15);
-
-		temp = ((s32)*(s16*)(src+((srcPtr+2)^1))*((s32)((s16)lut[2])));
-		accum += (s32)(temp >> 15);
-
-		temp = ((s32)*(s16*)(src+((srcPtr+3)^1))*((s32)((s16)lut[3])));
-		accum += (s32)(temp >> 15);
-
-		if (accum > 32767) accum = 32767;
-		if (accum < -32768) accum = -32768;
-
-		dst[dstPtr^1] = (accum);
-		dstPtr++;
-		Accum += Pitch;
-		srcPtr += (Accum>>16);
-		Accum&=0xffff;
-	}
-	for (x = 0; x < 4; x++)
-		*(u16 *)(N64MEM+(addy+(x*2))) = src[(srcPtr+x)^1];
-
-	*(u16 *)(N64MEM+addy+10) = Accum;
-}
-static void SETVOL () {
-// Might be better to unpack these depending on the flags...
-	u8 flags = (u8)((inst1 >> 16) & 0xff);
-	u16 vol = (s16)(inst1 & 0xffff);
-	u16 voltarg =(u16)((inst2 >> 16)&0xffff);
-	u16 volrate = (u16)((inst2 & 0xffff));
-
-	if (flags & A_AUX) {
-		Env_Dry = (s16)vol;			// m_MainVol
-		Env_Wet = (s16)volrate;		// m_AuxVol
-		return;
-	}
-
-	if(flags & A_VOL) { // Set the Source(start) Volumes
-		if(flags & A_LEFT) {
-			Vol_Left = (s16)vol;	// m_LeftVolume
-		} else { // A_RIGHT
-			Vol_Right = (s16)vol;	// m_RightVolume
-		}
-		return;
-	}
-
-	if(flags & A_LEFT) { // Set the Ramping values Target, Ramp
-		VolTrg_Left = *(s16 *)&inst1;		// m_LeftVol
-		if(goldeneye)
-			VolRamp_Left = voltarg;
-		else
-			VolRamp_Left = (s32)volrate;//*(s32 *)&inst2;//(u16)(inst2) | (s32)(s16)(inst2 << 0x10);
-	} else { // A_RIGHT
-		VolTrg_Right = *(s16 *)&inst1;		// m_RightVol
-		if(goldeneye)
-			VolRamp_Right = voltarg;
-		else
-			VolRamp_Right = (s32)volrate;//*(s32 *)&inst2;//(u16)(inst2 >> 0x10) | (s32)(s16)(inst2 << 0x10);
-	}
-}
-
-static void UNKNOWN () {}
-
-static void SETLOOP () {
-	loopval = (inst2 & 0xffffff);
-}
-
-static void ADPCM () { // Work in progress! :)
-	unsigned short inPtr=0;
-	unsigned char icode;
-	unsigned char code;
-	int vscale;
-	unsigned short index;
-	unsigned short j;
-	int a[8];
-	short *book1,*book2;
-	int l1,l2;
-	int inp1[8];
-	int inp2[8];
-	short *out, count;
-
-	unsigned char Flags=(u8)(inst1>>16)&0xff;
-	unsigned int Address=(inst2 & 0xffffff);
-
-	out=(short *)(BufferSpace+AudioOutBuffer);
-	count=(short)AudioCount;
-
-	memset(out,0,32);
-
-	if(!(Flags&0x1))
-	{
-		if(Flags&0x2) {
-			memcpy((u8*)out,(u8*)RDRAM+Address,32);
-		} else {
-			memcpy((u8*)out,(u8*)RDRAM+Address,32);
-		}
-	}
-
-	l1=out[15];
-	l2=out[14];
-	out+=16;
-	while(count>0)
-	{
-													// the first interation through, these values are
-													// either 0 in the case of A_INIT, from a special
-													// area of memory in the case of A_LOOP or just
-													// the values we calculated the last time
-
-		code=BufferSpace[(AudioInBuffer+inPtr)^3];
-		index=code&0xf;
-		index<<=4;									// index into the adpcm code table
-		book1=(short *)&adpcmtable[index];
-		book2=book1+8;
-		code>>=4;									// upper nibble is scale
-		vscale=(0x8000>>((12-code)-1));			// very strange. 0x8000 would be .5 in 16:16 format
-													// so this appears to be a fractional scale based
-													// on the 12 based inverse of the scale value. note
-													// that this could be negative, in which case we do
-													// not use the calculated vscale value... see the
-													// if(code>12) check below
-
-		inPtr++;									// coded adpcm data lies next
-		j=0;
-		while(j<8)									// loop of 8, for 8 coded nibbles from 4 bytes
-													// which yields 8 short pcm values
-		{
-			icode=BufferSpace[(AudioInBuffer+inPtr)^3];
-			inPtr++;
-
-			inp1[j]=(s16)((icode&0xf0)<<8);			// this will in effect be signed
-			if(code<12)
-				inp1[j]=((int)((int)inp1[j]*(int)vscale)>>16);
-			j++;
-
-			inp1[j]=(s16)((icode&0xf)<<12);
-			if(code<12)
-				inp1[j]=((int)((int)inp1[j]*(int)vscale)>>16);
-			j++;
-		}
-		j=0;
-		while(j<8)
-		{
-			icode=BufferSpace[(AudioInBuffer+inPtr)^3];
-			inPtr++;
-
-			inp2[j]=(short)((icode&0xf0)<<8);			// this will in effect be signed
-			if(code<12)
-				inp2[j]=((int)((int)inp2[j]*(int)vscale)>>16);
-			j++;
-
-			inp2[j]=(short)((icode&0xf)<<12);
-			if(code<12)
-				inp2[j]=((int)((int)inp2[j]*(int)vscale)>>16);
-			j++;
-		}
-
-		a[0]= (int)book1[0]*(int)l1;
-		a[0]+=(int)book2[0]*(int)l2;
-		a[0]+=(int)inp1[0]*(int)2048;
-
-		a[1] =(int)book1[1]*(int)l1;
-		a[1]+=(int)book2[1]*(int)l2;
-		a[1]+=(int)book2[0]*inp1[0];
-		a[1]+=(int)inp1[1]*(int)2048;
-
-		a[2] =(int)book1[2]*(int)l1;
-		a[2]+=(int)book2[2]*(int)l2;
-		a[2]+=(int)book2[1]*inp1[0];
-		a[2]+=(int)book2[0]*inp1[1];
-		a[2]+=(int)inp1[2]*(int)2048;
-
-		a[3] =(int)book1[3]*(int)l1;
-		a[3]+=(int)book2[3]*(int)l2;
-		a[3]+=(int)book2[2]*inp1[0];
-		a[3]+=(int)book2[1]*inp1[1];
-		a[3]+=(int)book2[0]*inp1[2];
-		a[3]+=(int)inp1[3]*(int)2048;
-
-		a[4] =(int)book1[4]*(int)l1;
-		a[4]+=(int)book2[4]*(int)l2;
-		a[4]+=(int)book2[3]*inp1[0];
-		a[4]+=(int)book2[2]*inp1[1];
-		a[4]+=(int)book2[1]*inp1[2];
-		a[4]+=(int)book2[0]*inp1[3];
-		a[4]+=(int)inp1[4]*(int)2048;
-
-		a[5] =(int)book1[5]*(int)l1;
-		a[5]+=(int)book2[5]*(int)l2;
-		a[5]+=(int)book2[4]*inp1[0];
-		a[5]+=(int)book2[3]*inp1[1];
-		a[5]+=(int)book2[2]*inp1[2];
-		a[5]+=(int)book2[1]*inp1[3];
-		a[5]+=(int)book2[0]*inp1[4];
-		a[5]+=(int)inp1[5]*(int)2048;
-
-		a[6] =(int)book1[6]*(int)l1;
-		a[6]+=(int)book2[6]*(int)l2;
-		a[6]+=(int)book2[5]*inp1[0];
-		a[6]+=(int)book2[4]*inp1[1];
-		a[6]+=(int)book2[3]*inp1[2];
-		a[6]+=(int)book2[2]*inp1[3];
-		a[6]+=(int)book2[1]*inp1[4];
-		a[6]+=(int)book2[0]*inp1[5];
-		a[6]+=(int)inp1[6]*(int)2048;
-
-		a[7] =(int)book1[7]*(int)l1;
-		a[7]+=(int)book2[7]*(int)l2;
-		a[7]+=(int)book2[6]*inp1[0];
-		a[7]+=(int)book2[5]*inp1[1];
-		a[7]+=(int)book2[4]*inp1[2];
-		a[7]+=(int)book2[3]*inp1[3];
-		a[7]+=(int)book2[2]*inp1[4];
-		a[7]+=(int)book2[1]*inp1[5];
-		a[7]+=(int)book2[0]*inp1[6];
-		a[7]+=(int)inp1[7]*(int)2048;
-
-		for(j=0;j<8;j++)
-		{
-			a[j^1]>>=11;
-			if(a[j^1]>32767) a[j^1]=32767;
-			else if(a[j^1]<-32768) a[j^1]=-32768;
-			*(out++)=a[j^1];
-		}
-		l1=a[6];
-		l2=a[7];
-
-		a[0]= (int)book1[0]*(int)l1;
-		a[0]+=(int)book2[0]*(int)l2;
-		a[0]+=(int)inp2[0]*(int)2048;
-
-		a[1] =(int)book1[1]*(int)l1;
-		a[1]+=(int)book2[1]*(int)l2;
-		a[1]+=(int)book2[0]*inp2[0];
-		a[1]+=(int)inp2[1]*(int)2048;
-
-		a[2] =(int)book1[2]*(int)l1;
-		a[2]+=(int)book2[2]*(int)l2;
-		a[2]+=(int)book2[1]*inp2[0];
-		a[2]+=(int)book2[0]*inp2[1];
-		a[2]+=(int)inp2[2]*(int)2048;
-
-		a[3] =(int)book1[3]*(int)l1;
-		a[3]+=(int)book2[3]*(int)l2;
-		a[3]+=(int)book2[2]*inp2[0];
-		a[3]+=(int)book2[1]*inp2[1];
-		a[3]+=(int)book2[0]*inp2[2];
-		a[3]+=(int)inp2[3]*(int)2048;
-
-		a[4] =(int)book1[4]*(int)l1;
-		a[4]+=(int)book2[4]*(int)l2;
-		a[4]+=(int)book2[3]*inp2[0];
-		a[4]+=(int)book2[2]*inp2[1];
-		a[4]+=(int)book2[1]*inp2[2];
-		a[4]+=(int)book2[0]*inp2[3];
-		a[4]+=(int)inp2[4]*(int)2048;
-
-		a[5] =(int)book1[5]*(int)l1;
-		a[5]+=(int)book2[5]*(int)l2;
-		a[5]+=(int)book2[4]*inp2[0];
-		a[5]+=(int)book2[3]*inp2[1];
-		a[5]+=(int)book2[2]*inp2[2];
-		a[5]+=(int)book2[1]*inp2[3];
-		a[5]+=(int)book2[0]*inp2[4];
-		a[5]+=(int)inp2[5]*(int)2048;
-
-		a[6] =(int)book1[6]*(int)l1;
-		a[6]+=(int)book2[6]*(int)l2;
-		a[6]+=(int)book2[5]*inp2[0];
-		a[6]+=(int)book2[4]*inp2[1];
-		a[6]+=(int)book2[3]*inp2[2];
-		a[6]+=(int)book2[2]*inp2[3];
-		a[6]+=(int)book2[1]*inp2[4];
-		a[6]+=(int)book2[0]*inp2[5];
-		a[6]+=(int)inp2[6]*(int)2048;
-
-		a[7] =(int)book1[7]*(int)l1;
-		a[7]+=(int)book2[7]*(int)l2;
-		a[7]+=(int)book2[6]*inp2[0];
-		a[7]+=(int)book2[5]*inp2[1];
-		a[7]+=(int)book2[4]*inp2[2];
-		a[7]+=(int)book2[3]*inp2[3];
-		a[7]+=(int)book2[2]*inp2[4];
-		a[7]+=(int)book2[1]*inp2[5];
-		a[7]+=(int)book2[0]*inp2[6];
-		a[7]+=(int)inp2[7]*(int)2048;
-
-		for(j=0;j<8;j++)
-		{
-			a[j^1]>>=11;
-			if(a[j^1]>32767) a[j^1]=32767;
-			else if(a[j^1]<-32768) a[j^1]=-32768;
-			*(out++)=a[j^1];
-		}
-		l1=a[6];
-		l2=a[7];
-
-		count-=32;
-	}
-	out-=16;
-
-	memcpy((u8*)RDRAM+Address,(u8*) out, 32);
-}
-
-static void LOADBUFF () { // memcpy causes static... endianess issue :(
-	u32 v0;
-	if (AudioCount == 0)
- 		return;
-	v0 = (inst2 & 0xfffffc);
-
- memcpy(BufferSpace+(AudioInBuffer&0xFFFC), (u8*)RDRAM+v0, (AudioCount+3)&0xFFFC);
-
-}
-
-static void SAVEBUFF () { // memcpy causes static... endianess issue :(
-	u32 v0;
-	if (AudioCount == 0)
-		return;
-	v0 = (inst2 & 0xfffffc);
-
-	memcpy((unsigned char*)RDRAM+v0, BufferSpace+(AudioOutBuffer&0xFFFC), (AudioCount+3)&0xFFFC);
-}
-
-static void SETBUFF () { // Should work ;-)
-	if ((inst1 >> 0x10) & 0x8) { // A_AUX - Auxillary Sound Buffer Settings
-		AudioAuxA		= (u16)(inst1);
-		AudioAuxC		= (u16)((inst2 >> 0x10));
-		AudioAuxE		= (u16)(inst2);
-	} else {		// A_MAIN - Main Sound Buffer Settings
-		AudioInBuffer = (u16)(inst1); // 0x00
-		AudioOutBuffer	= (u16)((inst2 >> 0x10)); // 0x02
-		AudioCount		= (u16)(inst2); // 0x04
-	}
-}
-
-static void DMEMMOVE () { // Doesn't sound just right?... will fix when HLE is ready - 03-11-01
-	u32 v0, v1;
-	u32 cnt;
-	u32 count = ((inst2+3) & 0xfffc);
-	if ((inst2 & 0xffff)==0)
-		return;
-	v0 = (inst1 & 0xFFFF);
-	v1 = (inst2 >> 0x10);
-
-	for (cnt = 0; cnt < count; cnt++) {
-		*(u8 *)(BufferSpace+((cnt+v1)^3)) = *(u8 *)(BufferSpace+((cnt+v0)^3));
-	}
-}
-
-static void LOADADPCM () { // Loads an ADPCM table - Works 100% Now 03-13-01
-	u32 v0, x;
-	v0 = (inst2 & 0xffffff);
-
-	for (x = 0; x < ((inst1 & 0xffff) >> 0x4); x++) {
-
-		u16 *table = (u16 *)(N64MEM+v0+(x<<4));
-
-		adpcmtable[0x1+(x<<3)] = table[0];
-		adpcmtable[0x0+(x<<3)] = table[1];
-
-		adpcmtable[0x3+(x<<3)] = table[2];
-		adpcmtable[0x2+(x<<3)] = table[3];
-
-		adpcmtable[0x5+(x<<3)] = table[4];
-		adpcmtable[0x4+(x<<3)] = table[5];
-
-		adpcmtable[0x7+(x<<3)] = table[6];
-		adpcmtable[0x6+(x<<3)] = table[7];
-
-	}
-}
-
-
-static void INTERLEAVE () { // Works... - 3-11-01
-	u32 inL, inR;
-	u16 *inSrcR;
-	u16 *inSrcL;
-	u16 Left, Right;
-	u16 *outbuff = (u16 *)(AudioOutBuffer+BufferSpace);
-	int x;
-
-	inL = inst2 & 0xFFFF;
-	inR = (inst2 >> 16) & 0xFFFF;
-
-	inSrcR = (u16 *)(BufferSpace+inR);
-	inSrcL = (u16 *)(BufferSpace+inL);
-
-	for (x = 0; x < (AudioCount/4); x++) {
-		Left=*(inSrcL++);
-		Right=*(inSrcR++);
-
-		*(outbuff++)=*(inSrcR++);
-		*(outbuff++)=*(inSrcL++);
-		*(outbuff++)=(u16)Right;
-		*(outbuff++)=(u16)Left;
-	}
-}
-
-
-static void MIXER () { // Fixed a sign issue... 03-14-01
-	u32 dmemin = (u16)(inst2 >> 0x10);
-	u32 dmemout = (u16)(inst2 & 0xFFFF);
-	s32 gain = (s16)(inst1 & 0xFFFF);
-	s32 temp;
-	int x;
-
-	if (AudioCount == 0)
-		return;
-
-	for (x = 0; x < AudioCount; x+=2) { // I think I can do this a lot easier
-		temp = (*(s16 *)(BufferSpace+dmemin+x) * gain) >> 15;
-		temp += *(s16 *)(BufferSpace+dmemout+x);
-
-		if ((s32)temp > 32767)
-			temp = 32767;
-		if ((s32)temp < -32768)
-			temp = -32768;
-
-		*(u16 *)(BufferSpace+dmemout+x) = (u16)(temp & 0xFFFF);
-	}
-}
-
-
-void (*ABI1[0x20])() = { // TOP Performace Hogs: MIXER, RESAMPLE, ENVMIXER
- SPNOOP , ADPCM , CLEARBUFF,	ENVMIXER , LOADBUFF, RESAMPLE , SAVEBUFF, UNKNOWN,
-	SETBUFF, SETVOL, DMEMMOVE , LOADADPCM , MIXER , INTERLEAVE, UNKNOWN , SETLOOP,
- SPNOOP , SPNOOP, SPNOOP , SPNOOP , SPNOOP , SPNOOP , SPNOOP , SPNOOP,
- SPNOOP , SPNOOP, SPNOOP , SPNOOP , SPNOOP , SPNOOP , SPNOOP , SPNOOP
-};

audacious-plugins-3.1.1.tar.bz2/src/usf/audio_ucode2.c Deleted

@@ -1,904 +0,0 @@
-#include <stdbool.h>
-#include <stdio.h>
-#include "usf.h"
-#include "audio_hle.h"
-#include "memory.h"
-
-
-
-
-extern u8 BufferSpace[0x10000];
-
-static void SPNOOP () {
-	char buff[0x100];
-}
-
-extern u16 AudioInBuffer;		// 0x0000(T8)
-extern u16 AudioOutBuffer;		// 0x0002(T8)
-extern u16 AudioCount;			// 0x0004(T8)
-extern u32 loopval;			// 0x0010(T8)
-extern u32 SEGMENTS[0x10];
-extern u16 adpcmtable[0x88];
-extern u16 ResampleLUT [0x200];
-
-bool isMKABI = false;
-bool isZeldaABI = false;
-
-#define PageRAM2(x)	((uintptr_t) (RDRAM + (x)))
-#define memcpyfn64(a,b,c)	memcpy((a),(void*)((uintptr_t)RDRAM + (uintptr_t)(b)),(c))
-#define memcpy2n64(a,b,c)	memcpy((void*)((uintptr_t)RDRAM + (uintptr_t)(a)),(b),(c))
-
-static void LOADADPCM2 () { // Loads an ADPCM table - Works 100% Now 03-13-01
-	u32 v0;
-	v0 = (inst2 & 0xffffff);// + SEGMENTS[(inst2>>24)&0xf];
-	u32 x;
-
-	for (x = 0; x < ((inst1&0xffff)>>0x4); x++) {
-		u16 *table = (u16*)PageRAM2(v0+(x*16));
-
-
-		adpcmtable[0x1+(x<<3)] = table[0];
-		adpcmtable[0x0+(x<<3)] = table[1];
-
-		adpcmtable[0x3+(x<<3)] = table[2];
-		adpcmtable[0x2+(x<<3)] = table[3];
-
-		adpcmtable[0x5+(x<<3)] = table[4];
-		adpcmtable[0x4+(x<<3)] = table[5];
-
-		adpcmtable[0x7+(x<<3)] = table[6];
-		adpcmtable[0x6+(x<<3)] = table[7];
-	//	table += 8;
-	}
-}
-
-static void SETLOOP2 () {
-	loopval = inst2 & 0xffffff; // No segment?
-}
-
-static void SETBUFF2 () {
-	AudioInBuffer = (u16)(inst1);			 // 0x00
-	AudioOutBuffer	= (u16)((inst2 >> 0x10)); // 0x02
-	AudioCount		= (u16)(inst2);			 // 0x04
-}
-
-static void ADPCM2 () { // Verified to be 100% Accurate...
-	unsigned char Flags=(u8)(inst1>>16)&0xff;
-	//WORD Gain=(u16)(inst1&0xffff);
-	unsigned int Address=(inst2 & 0xffffff);// + SEGMENTS[(inst2>>24)&0xf];
-	unsigned short inPtr=0;
-	//short *out=(s16 *)(testbuff+(AudioOutBuffer>>2));
-	short *out=(short *)(BufferSpace+AudioOutBuffer);
-	//BYTE *in=(unsigned char *)(BufferSpace+AudioInBuffer);
-	short count=(short)AudioCount;
-	unsigned char icode;
-	unsigned char code;
-	int vscale;
-	unsigned short index;
-	unsigned short j;
-	int a[8];
-	short *book1,*book2;
-
-	u8 srange;
-	u8 inpinc;
-	u8 mask1;
-	u8 mask2;
-	u8 shifter;
-
-	memset(out,0,32);
-
-	if (Flags & 0x4) { // Tricky lil Zelda MM and ABI2!!! hahaha I know your secrets! :DDD
-		srange = 0xE;
-		inpinc = 0x5;
-		mask1 = 0xC0;
-		mask2 = 0x30;
-		shifter = 10;
-	} else {
-		srange = 0xC;
-		inpinc = 0x9;
-		mask1 = 0xf0;
-		mask2 = 0x0f;
-		shifter = 12;
-	}
-
-	if(!(Flags&0x1))
-	{
-		if(Flags&0x2)
-		{/*
-			for(int i=0;i<16;i++)
-			{
-				out[i]=*(short *)&rsp.RDRAM[(loopval+i*2)^2];
-			}*/
-			memcpyfn64((u8 *)out,(u8 *)loopval,32);
-		}
-		else
-		{/*
-			for(int i=0;i<16;i++)
-			{
-				out[i]=*(short *)&rsp.RDRAM[(Address+i*2)^2];
-			}*/
-
-			memcpyfn64((u8 *)out,(u8 *)Address,32);
-		}
-	}
-
-	int l1=out[15];
-	int l2=out[14];
-	int inp1[8];
-	int inp2[8];
-	out+=16;
-	while(count>0) {
-		code=BufferSpace[(AudioInBuffer+inPtr)^3];
-		index=code&0xf;
-		index<<=4;
-		book1=(short *)&adpcmtable[index];
-		book2=book1+8;
-		code>>=4;
-		vscale=(0x8000>>((srange-code)-1));
-
-		inPtr++;
-		j=0;
-
-		while(j<8) {
-			icode=BufferSpace[(AudioInBuffer+inPtr)^3];
-			inPtr++;
-
-			inp1[j]=(s16)((icode&mask1) << 8);			// this will in effect be signed
-			if(code<srange) inp1[j]=((int)((int)inp1[j]*(int)vscale)>>16);
-			//else int catchme=1;
-			j++;
-
-			inp1[j]=(s16)((icode&mask2)<<shifter);
-			if(code<srange)	inp1[j]=((int)((int)inp1[j]*(int)vscale)>>16);
-			//else int catchme=1;
-			j++;
-
-			if (Flags & 4) {
-				inp1[j]=(s16)((icode&0xC) << 12);			// this will in effect be signed
-				if(code < 0xE) inp1[j]=((int)((int)inp1[j]*(int)vscale)>>16);
-				//else int catchme=1;
-				j++;
-
-				inp1[j]=(s16)((icode&0x3) << 14);
-				if(code < 0xE) inp1[j]=((int)((int)inp1[j]*(int)vscale)>>16);
-				//else int catchme=1;
-				j++;
-			} // end flags
-		} // end while
-
-
-
-		j=0;
-		while(j<8) {
-			icode=BufferSpace[(AudioInBuffer+inPtr)^3];
-			inPtr++;
-
-			inp2[j]=(s16)((icode&mask1) << 8);
-			if(code<srange) inp2[j]=((int)((int)inp2[j]*(int)vscale)>>16);
-			//else int catchme=1;
-			j++;
-
-			inp2[j]=(s16)((icode&mask2)<<shifter);
-			if(code<srange)	inp2[j]=((int)((int)inp2[j]*(int)vscale)>>16);
-			//else int catchme=1;
-			j++;
-
-			if (Flags & 4) {
-				inp2[j]=(s16)((icode&0xC) << 12);
-				if(code < 0xE) inp2[j]=((int)((int)inp2[j]*(int)vscale)>>16);
-				//else int catchme=1;
-				j++;
-
-				inp2[j]=(s16)((icode&0x3) << 14);
-				if(code < 0xE) inp2[j]=((int)((int)inp2[j]*(int)vscale)>>16);
-				//else int catchme=1;
-				j++;
-			} // end flags
-		}
-
-		a[0]= (int)book1[0]*(int)l1;
-		a[0]+=(int)book2[0]*(int)l2;
-		a[0]+=(int)inp1[0]*(int)2048;
-
-		a[1] =(int)book1[1]*(int)l1;
-		a[1]+=(int)book2[1]*(int)l2;
-		a[1]+=(int)book2[0]*inp1[0];
-		a[1]+=(int)inp1[1]*(int)2048;
-
-		a[2] =(int)book1[2]*(int)l1;
-		a[2]+=(int)book2[2]*(int)l2;
-		a[2]+=(int)book2[1]*inp1[0];
-		a[2]+=(int)book2[0]*inp1[1];
-		a[2]+=(int)inp1[2]*(int)2048;
-
-		a[3] =(int)book1[3]*(int)l1;
-		a[3]+=(int)book2[3]*(int)l2;
-		a[3]+=(int)book2[2]*inp1[0];
-		a[3]+=(int)book2[1]*inp1[1];
-		a[3]+=(int)book2[0]*inp1[2];
-		a[3]+=(int)inp1[3]*(int)2048;
-
-		a[4] =(int)book1[4]*(int)l1;
-		a[4]+=(int)book2[4]*(int)l2;
-		a[4]+=(int)book2[3]*inp1[0];
-		a[4]+=(int)book2[2]*inp1[1];
-		a[4]+=(int)book2[1]*inp1[2];
-		a[4]+=(int)book2[0]*inp1[3];
-		a[4]+=(int)inp1[4]*(int)2048;
-
-		a[5] =(int)book1[5]*(int)l1;
-		a[5]+=(int)book2[5]*(int)l2;
-		a[5]+=(int)book2[4]*inp1[0];
-		a[5]+=(int)book2[3]*inp1[1];
-		a[5]+=(int)book2[2]*inp1[2];
-		a[5]+=(int)book2[1]*inp1[3];
-		a[5]+=(int)book2[0]*inp1[4];
-		a[5]+=(int)inp1[5]*(int)2048;
-
-		a[6] =(int)book1[6]*(int)l1;
-		a[6]+=(int)book2[6]*(int)l2;
-		a[6]+=(int)book2[5]*inp1[0];
-		a[6]+=(int)book2[4]*inp1[1];
-		a[6]+=(int)book2[3]*inp1[2];
-		a[6]+=(int)book2[2]*inp1[3];
-		a[6]+=(int)book2[1]*inp1[4];
-		a[6]+=(int)book2[0]*inp1[5];
-		a[6]+=(int)inp1[6]*(int)2048;
-
-		a[7] =(int)book1[7]*(int)l1;
-		a[7]+=(int)book2[7]*(int)l2;
-		a[7]+=(int)book2[6]*inp1[0];
-		a[7]+=(int)book2[5]*inp1[1];
-		a[7]+=(int)book2[4]*inp1[2];
-		a[7]+=(int)book2[3]*inp1[3];
-		a[7]+=(int)book2[2]*inp1[4];
-		a[7]+=(int)book2[1]*inp1[5];
-		a[7]+=(int)book2[0]*inp1[6];
-		a[7]+=(int)inp1[7]*(int)2048;
-
-		for(j=0;j<8;j++)
-		{
-			a[j^1]>>=11;
-			if(a[j^1]>32767) a[j^1]=32767;
-			else if(a[j^1]<-32768) a[j^1]=-32768;
-			*(out++)=a[j^1];
-		}
-		l1=a[6];
-		l2=a[7];
-
-		a[0]= (int)book1[0]*(int)l1;
-		a[0]+=(int)book2[0]*(int)l2;
-		a[0]+=(int)inp2[0]*(int)2048;
-
-		a[1] =(int)book1[1]*(int)l1;
-		a[1]+=(int)book2[1]*(int)l2;
-		a[1]+=(int)book2[0]*inp2[0];
-		a[1]+=(int)inp2[1]*(int)2048;
-
-		a[2] =(int)book1[2]*(int)l1;
-		a[2]+=(int)book2[2]*(int)l2;
-		a[2]+=(int)book2[1]*inp2[0];
-		a[2]+=(int)book2[0]*inp2[1];
-		a[2]+=(int)inp2[2]*(int)2048;
-
-		a[3] =(int)book1[3]*(int)l1;
-		a[3]+=(int)book2[3]*(int)l2;
-		a[3]+=(int)book2[2]*inp2[0];
-		a[3]+=(int)book2[1]*inp2[1];
-		a[3]+=(int)book2[0]*inp2[2];
-		a[3]+=(int)inp2[3]*(int)2048;
-
-		a[4] =(int)book1[4]*(int)l1;
-		a[4]+=(int)book2[4]*(int)l2;
-		a[4]+=(int)book2[3]*inp2[0];
-		a[4]+=(int)book2[2]*inp2[1];
-		a[4]+=(int)book2[1]*inp2[2];
-		a[4]+=(int)book2[0]*inp2[3];
-		a[4]+=(int)inp2[4]*(int)2048;
-
-		a[5] =(int)book1[5]*(int)l1;
-		a[5]+=(int)book2[5]*(int)l2;
-		a[5]+=(int)book2[4]*inp2[0];
-		a[5]+=(int)book2[3]*inp2[1];
-		a[5]+=(int)book2[2]*inp2[2];
-		a[5]+=(int)book2[1]*inp2[3];
-		a[5]+=(int)book2[0]*inp2[4];
-		a[5]+=(int)inp2[5]*(int)2048;
-
-		a[6] =(int)book1[6]*(int)l1;
-		a[6]+=(int)book2[6]*(int)l2;
-		a[6]+=(int)book2[5]*inp2[0];
-		a[6]+=(int)book2[4]*inp2[1];
-		a[6]+=(int)book2[3]*inp2[2];
-		a[6]+=(int)book2[2]*inp2[3];
-		a[6]+=(int)book2[1]*inp2[4];
-		a[6]+=(int)book2[0]*inp2[5];
-		a[6]+=(int)inp2[6]*(int)2048;
-
-		a[7] =(int)book1[7]*(int)l1;
-		a[7]+=(int)book2[7]*(int)l2;
-		a[7]+=(int)book2[6]*inp2[0];
-		a[7]+=(int)book2[5]*inp2[1];
-		a[7]+=(int)book2[4]*inp2[2];
-		a[7]+=(int)book2[3]*inp2[3];
-		a[7]+=(int)book2[2]*inp2[4];
-		a[7]+=(int)book2[1]*inp2[5];
-		a[7]+=(int)book2[0]*inp2[6];
-		a[7]+=(int)inp2[7]*(int)2048;
-
-		for(j=0;j<8;j++)
-		{
-			a[j^1]>>=11;
-			if(a[j^1]>32767) a[j^1]=32767;
-			else if(a[j^1]<-32768) a[j^1]=-32768;
-			*(out++)=a[j^1];
-		}
-		l1=a[6];
-		l2=a[7];
-
-		count-=32;
-	}
-	out-=16;
-	memcpy2n64((u8 *)Address,(u8 *)out,32);
-}
-
-static void CLEARBUFF2 () {
-	u16 addr = (u16)(inst1 & 0xffff);
-	u16 count = (u16)(inst2 & 0xffff);
-	if (count > 0)
-		memset(BufferSpace+addr, 0, count);
-}
-
-static void LOADBUFF2 () { // Needs accuracy verification...
-	u32 v0;
-	u32 cnt = (((inst1 >> 0xC)+3)&0xFFC);
-	v0 = (inst2 & 0xfffffc);// + SEGMENTS[(inst2>>24)&0xf];
-
-	memcpyfn64 ((u8 *)BufferSpace+(inst1&0xfffc), (u8 *)v0, (cnt+3)&0xFFFC);
-}
-
-static void SAVEBUFF2 () { // Needs accuracy verification...
-	u32 v0;
-	u32 cnt = (((inst1 >> 0xC)+3)&0xFFC);
-	v0 = (inst2 & 0xfffffc);// + SEGMENTS[(inst2>>24)&0xf];
-	memcpy2n64 ((u8 *)v0, (u8 *)BufferSpace+(inst1&0xfffc), (cnt+3)&0xFFFC);
-}
-
-
-static void MIXER2 () { // Needs accuracy verification...
-	u16 dmemin = (u16)(inst2 >> 0x10);
-	u16 dmemout = (u16)(inst2 & 0xFFFF);
-	u32 count = ((inst1 >> 12) & 0xFF0);
-	s32 gain = (s16)(inst1 & 0xFFFF)*2;
-	s32 temp;
-	unsigned int x;
-
-	for (x=0; x < count; x+=2) { // I think I can do this a lot easier
-
-		temp = (*(s16 *)(BufferSpace+dmemin+x) * gain) >> 16;
-		temp += *(s16 *)(BufferSpace+dmemout+x);
-
-		if ((s32)temp > 32767)
-			temp = 32767;
-		if ((s32)temp < -32768)
-			temp = -32768;
-
-		*(u16 *)(BufferSpace+dmemout+x) = (u16)(temp & 0xFFFF);
-	}
-}
-
-
-
-static void RESAMPLE2 () {
-	unsigned char Flags=(u8)((inst1>>16)&0xff);
-	unsigned int Pitch=((inst1&0xffff))<<1;
-	u32 addy = (inst2 & 0xffffff);// + SEGMENTS[(inst2>>24)&0xf];
-	unsigned int Accum=0;
-	unsigned int location;
-	s16 *lut;
-	short *dst;
-	s16 *src;
-	dst=(short *)(BufferSpace);
-	src=(s16 *)(BufferSpace);
-	u32 srcPtr=(AudioInBuffer/2);
-	u32 dstPtr=(AudioOutBuffer/2);
-	s32 temp;
-	s32 accum;
-	int x, i;
-
-	if (addy > (1024*1024*8))
-		addy = (inst2 & 0xffffff);
-
-	srcPtr -= 4;
-
-	if ((Flags & 0x1) == 0) {
-		for (x=0; x < 4; x++)
-			src[(srcPtr+x)^1] = *(u16*)(PageRAM2(addy+(x^1)));
-		Accum = *(u16 *)(PageRAM2(addy+10));
-	} else {
-		for (x=0; x < 4; x++)
-			src[(srcPtr+x)^1] = 0;//*(u16 *)(rsp.RDRAM+((addy+x)^2));
-	}
-
-	for(i=0;i < ((AudioCount+0xf)&0xFFF0)/2;i++)	{
-		location = (((Accum * 0x40) >> 0x10) * 8);
-		//location = (Accum >> 0xa) << 0x3;
-		lut = (s16 *)(((u8 *)ResampleLUT) + location);
-
-		temp = ((s32)*(s16*)(src+((srcPtr+0)^1))*((s32)((s16)lut[0])));
-		accum = (s32)(temp >> 15);
-
-		temp = ((s32)*(s16*)(src+((srcPtr+1)^1))*((s32)((s16)lut[1])));
-		accum += (s32)(temp >> 15);
-
-		temp = ((s32)*(s16*)(src+((srcPtr+2)^1))*((s32)((s16)lut[2])));
-		accum += (s32)(temp >> 15);
-
-		temp = ((s32)*(s16*)(src+((srcPtr+3)^1))*((s32)((s16)lut[3])));
-		accum += (s32)(temp >> 15);
-
-		if (accum > 32767) accum = 32767;
-		if (accum < -32768) accum = -32768;
-
-		dst[dstPtr^1] = (s16)(accum);
-		dstPtr++;
-		Accum += Pitch;
-		srcPtr += (Accum>>16);
-		Accum&=0xffff;
-	}
-	for (x=0; x < 4; x++)
-		*(u16*)(PageRAM2(addy+(x^1))) = src[(srcPtr+x)^1];
-
-	*(u16 *)(PageRAM2(addy+10)) = Accum;
-
-}
-
-static void DMEMMOVE2 () { // Needs accuracy verification...
-	u32 v0, v1;
-	u32 cnt;
-	if ((inst2 & 0xffff)==0)
-		return;
-	v0 = (inst1 & 0xFFFF);
-	v1 = (inst2 >> 0x10);
-	//assert ((v1 & 0x3) == 0);
-	//assert ((v0 & 0x3) == 0);
-	u32 count = ((inst2+3) & 0xfffc);
-	//v0 = (v0) & 0xfffc;
-	//v1 = (v1) & 0xfffc;
-
-	//memcpy (dmem+v1, dmem+v0, count-1);
-	for (cnt = 0; cnt < count; cnt++) {
-		*(u8 *)(BufferSpace+((cnt+v1)^3)) = *(u8 *)(BufferSpace+((cnt+v0)^3));
-	}
-}
-
-u32 t3, s5, s6;
-u16 env[8];
-
-static void ENVSETUP1 () {
-	u32 tmp;
-
-	//fprintf (dfile, "ENVSETUP1: inst1 = %08X, inst2 = %08X\n", inst1, inst2);
-	t3 = inst1 & 0xFFFF;
-	tmp	= (inst1 >> 0x8) & 0xFF00;
-	env[4] = (u16)tmp;
-	tmp += t3;
-	env[5] = (u16)tmp;
-	s5 = inst2 >> 0x10;
-	s6 = inst2 & 0xFFFF;
-	//fprintf (dfile, "	t3 = %X / s5 = %X / s6 = %X / env[4] = %X / env[5] = %X\n", t3, s5, s6, env[4], env[5]);
-}
-
-static void ENVSETUP2 () {
-	u32 tmp;
-
-	//fprintf (dfile, "ENVSETUP2: inst1 = %08X, inst2 = %08X\n", inst1, inst2);
-	tmp = (inst2 >> 0x10);
-	env[0] = (u16)tmp;
-	tmp += s5;
-	env[1] = (u16)tmp;
-	tmp = inst2 & 0xffff;
-	env[2] = (u16)tmp;
-	tmp += s6;
-	env[3] = (u16)tmp;
-	//fprintf (dfile, "	env[0] = %X / env[1] = %X / env[2] = %X / env[3] = %X\n", env[0], env[1], env[2], env[3]);
-}
-
-static void ENVMIXER2 () {
-	//fprintf (dfile, "ENVMIXER: inst1 = %08X, inst2 = %08X\n", inst1, inst2);
-
-	s16 *bufft6, *bufft7, *buffs0, *buffs1;
-	s16 *buffs3;
-	s32 count;
-	u32 adder;
-
-	s16 vec9, vec10;
-
-	s16 v2[8];
-
-	//__asm int 3;
-
-	buffs3 = (s16 *)(BufferSpace + ((inst1 >> 0x0c)&0x0ff0));
-	bufft6 = (s16 *)(BufferSpace + ((inst2 >> 0x14)&0x0ff0));
-	bufft7 = (s16 *)(BufferSpace + ((inst2 >> 0x0c)&0x0ff0));
-	buffs0 = (s16 *)(BufferSpace + ((inst2 >> 0x04)&0x0ff0));
-	buffs1 = (s16 *)(BufferSpace + ((inst2 << 0x04)&0x0ff0));
-
-	v2[0] = 0 - (s16)((inst1 & 0x2) >> 1);
-	v2[1] = 0 - (s16)((inst1 & 0x1));
-	v2[2] = 0 - (s16)((inst1 & 0x8) >> 1);
-	v2[3] = 0 - (s16)((inst1 & 0x4) >> 1);
-
-	count = (inst1 >> 8) & 0xff;
-
-	if (!isMKABI) {
-		s5 *= 2; s6 *= 2; t3 *= 2;
-		adder = 0x10;
-	} else {
-		inst1 = 0;
-		adder = 0x8;
-		t3 = 0;
-	}
-
-
-	while (count > 0) {
-		int temp, x;
-		for (x=0; x < 0x8; x++) {
-			vec9 = (s16)(((s32)buffs3[x^1] * (u32)env[0]) >> 0x10) ^ v2[0];
-			vec10 = (s16)(((s32)buffs3[x^1] * (u32)env[2]) >> 0x10) ^ v2[1];
-			temp = bufft6[x^1] + vec9;
-			if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-			bufft6[x^1] = temp;
-			temp = bufft7[x^1] + vec10;
-			if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-			bufft7[x^1] = temp;
-			vec9 = (s16)(((s32)vec9 * (u32)env[4]) >> 0x10) ^ v2[2];
-			vec10 = (s16)(((s32)vec10 * (u32)env[4]) >> 0x10) ^ v2[3];
-			if (inst1 & 0x10) {
-				temp = buffs0[x^1] + vec10;
-				if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-				buffs0[x^1] = temp;
-				temp = buffs1[x^1] + vec9;
-				if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-				buffs1[x^1] = temp;
-			} else {
-				temp = buffs0[x^1] + vec9;
-				if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-				buffs0[x^1] = temp;
-				temp = buffs1[x^1] + vec10;
-				if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-				buffs1[x^1] = temp;
-			}
-		}
-
-		if (!isMKABI)
-		for (x=0x8; x < 0x10; x++) {
-			vec9 = (s16)(((s32)buffs3[x^1] * (u32)env[1]) >> 0x10) ^ v2[0];
-			vec10 = (s16)(((s32)buffs3[x^1] * (u32)env[3]) >> 0x10) ^ v2[1];
-			temp = bufft6[x^1] + vec9;
-			if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-			bufft6[x^1] = temp;
-			temp = bufft7[x^1] + vec10;
-			if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-			bufft7[x^1] = temp;
-			vec9 = (s16)(((s32)vec9 * (u32)env[5]) >> 0x10) ^ v2[2];
-			vec10 = (s16)(((s32)vec10 * (u32)env[5]) >> 0x10) ^ v2[3];
-			if (inst1 & 0x10) {
-				temp = buffs0[x^1] + vec10;
-				if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-				buffs0[x^1] = temp;
-				temp = buffs1[x^1] + vec9;
-				if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-				buffs1[x^1] = temp;
-			} else {
-				temp = buffs0[x^1] + vec9;
-				if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-				buffs0[x^1] = temp;
-				temp = buffs1[x^1] + vec10;
-				if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-				buffs1[x^1] = temp;
-			}
-		}
-		bufft6 += adder; bufft7 += adder;
-		buffs0 += adder; buffs1 += adder;
-		buffs3 += adder; count -= adder;
-		env[0] += (u16)s5; env[1] += (u16)s5;
-		env[2] += (u16)s6; env[3] += (u16)s6;
-		env[4] += (u16)t3; env[5] += (u16)t3;
-	}
-}
-
-static void DUPLICATE2() {
-	unsigned short Count = (inst1 >> 16) & 0xff;
-	unsigned short In = inst1&0xffff;
-	unsigned short Out = (inst2>>16);
-
-	unsigned short buff[64];
-
-	memcpy(buff,BufferSpace+In,128);
-
-	while(Count) {
-		memcpy(BufferSpace+Out,buff,128);
-		Out+=128;
-		Count--;
-	}
-}
-/*
-static void INTERL2 () { // Make your own...
-	short Count = inst1 & 0xffff;
-	unsigned short Out = inst2 & 0xffff;
-	unsigned short In = (inst2 >> 16);
-
-	short *src,*dst,tmp;
-	src=(short *)&BufferSpace[In];
-	dst=(short *)&BufferSpace[Out];
-	while(Count)
-	{
-		*(dst++)=*(src++);
-		src++;
-		*(dst++)=*(src++);
-		src++;
-		*(dst++)=*(src++);
-		src++;
-		*(dst++)=*(src++);
-		src++;
-		*(dst++)=*(src++);
-		src++;
-		*(dst++)=*(src++);
-		src++;
-		*(dst++)=*(src++);
-		src++;
-		*(dst++)=*(src++);
-		src++;
-		Count-=8;
-	}
-}
-*/
-
-static void INTERL2 () {
-	short Count = inst1 & 0xffff;
-	unsigned short Out = inst2 & 0xffff;
-	unsigned short In = (inst2 >> 16);
-
-	unsigned char *src,*dst/*,tmp*/;
-	src=(unsigned char *)(BufferSpace);//[In];
-	dst=(unsigned char *)(BufferSpace);//[Out];
-	while(Count) {
-		*(short *)(dst+(Out^3)) = *(short *)(src+(In^3));
-		Out += 2;
-		In += 4;
-		Count--;
-	}
-}
-
-static void INTERLEAVE2 () { // Needs accuracy verification...
-	u32 inL, inR;
-	u16 *outbuff;
-	u16 *inSrcR;
-	u16 *inSrcL;
-	u16 Left, Right;
-	u32 count;
-	u32 x;
-	count = ((inst1 >> 12) & 0xFF0);
-	if (count == 0) {
-		outbuff = (u16 *)(AudioOutBuffer+BufferSpace);
-		count = AudioCount;
-	} else {
-		outbuff = (u16 *)((inst1&0xFFFF)+BufferSpace);
-	}
-
-	inR = inst2 & 0xFFFF;
-	inL = (inst2 >> 16) & 0xFFFF;
-
-	inSrcR = (u16 *)(BufferSpace+inR);
-	inSrcL = (u16 *)(BufferSpace+inL);
-
-	for (x = 0; x < (count/4); x++) {
-		Left=*(inSrcL++);
-		Right=*(inSrcR++);
-
-		*(outbuff++)=*(inSrcR++);
-		*(outbuff++)=*(inSrcL++);
-		*(outbuff++)=(u16)Right;
-		*(outbuff++)=(u16)Left;
-	}
-}
-
-static void ADDMIXER () {
-	short Count = (inst1 >> 12)	 & 0x00ff0;
-	u16 InBuffer = (inst2 >> 16);
-	u16 OutBuffer = inst2 & 0xffff;
-	int cntr;
-
-	s16 *inp, *outp;
-	s32 temp;
-	inp = (s16 *)(BufferSpace + InBuffer);
-	outp = (s16 *)(BufferSpace + OutBuffer);
-	for (cntr = 0; cntr < Count; cntr+=2) {
-		temp = *outp + *inp;
-		if (temp > 32767) temp = 32767; if (temp < -32768) temp = -32768;
-		outp++;	inp++;
-	}
-}
-
-static void HILOGAIN () {
-	u16 cnt = inst1 & 0xffff;
-	u16 out = (inst2 >> 16) & 0xffff;
-	s16 hi = (s16)((inst1 >> 4) & 0xf000);
-	u16 lo = (inst1 >> 20) & 0xf;
-	s16 *src;
-
-	src = (s16 *)(BufferSpace+out);
-	s32 tmp, val;
-
-	while(cnt) {
-		val = (s32)*src;
-		//tmp = ((val * (s32)hi) + ((u64)(val * lo) << 16) >> 16);
-		tmp = ((val * (s32)hi) >> 16) + (u32)(val * lo);
-		if ((s32)tmp > 32767) tmp = 32767;
-		else if ((s32)tmp < -32768) tmp = -32768;
-		*src = tmp;
-		src++;
-		cnt -= 2;
-	}
-}
-
-static void FILTER2 () {
-			static int cnt = 0;
-			static s16 *lutt6;
-			static s16 *lutt5;
-
-			u32 addy = inst2&0xFFFFFF;
-
-			u8 *save = (u8*)PageRAM2(addy&0xFFFFFF); //+RDRAM
-			u8 t4 = (u8)((inst1 >> 0x10) & 0xFF);
-			int x;
-
-			if (t4 > 1) { // Then set the cnt variable
-				cnt = (inst1 & 0xFFFF);
-				lutt6 = (s16 *)PageRAM2(addy&0xFFFFFF);
-//				memcpy (dmem+0xFE0, rsp.RDRAM+(inst2&0xFFFFFF), 0x10);
-				return;
-			}
-
-			if (t4 == 0) {
-//				memcpy (dmem+0xFB0, rsp.RDRAM+(inst2&0xFFFFFF), 0x20);
-				lutt5 = (short *)PageRAM2((addy+0x10)&0xFFFFFF);
-			}
-
-			lutt5 = (short *)PageRAM2((addy+0x10)&0xFFFFFF);
-
-//			lutt5 = (short *)(dmem + 0xFC0);
-//			lutt6 = (short *)(dmem + 0xFE0);
-			for (x = 0; x < 8; x++) {
-				s32 a;
-				a = (lutt5[x] + lutt6[x]) >> 1;
-				lutt5[x] = lutt6[x] = (short)a;
-			}
-			short *inp1, *inp2;
-			s32 out1[8];
-			s16 outbuff[0x3c0], *outp;
-			u32 inPtr = (u32)(inst1&0xffff);
-			outp = outbuff;
-			inp1 = (short *)(save);
-			inp2 = (short *)(BufferSpace+inPtr);
-
-			for (x = 0; x < cnt; x+=0x10) {
-				out1[1] = inp1[0]*lutt6[6];
-				out1[1] += inp1[3]*lutt6[7];
-				out1[1] += inp1[2]*lutt6[4];
-				out1[1] += inp1[5]*lutt6[5];
-				out1[1] += inp1[4]*lutt6[2];
-				out1[1] += inp1[7]*lutt6[3];
-				out1[1] += inp1[6]*lutt6[0];
-				out1[1] += inp2[1]*lutt6[1]; // 1
-
-				out1[0] = inp1[3]*lutt6[6];
-				out1[0] += inp1[2]*lutt6[7];
-				out1[0] += inp1[5]*lutt6[4];
-				out1[0] += inp1[4]*lutt6[5];
-				out1[0] += inp1[7]*lutt6[2];
-				out1[0] += inp1[6]*lutt6[3];
-				out1[0] += inp2[1]*lutt6[0];
-				out1[0] += inp2[0]*lutt6[1];
-
-				out1[3] = inp1[2]*lutt6[6];
-				out1[3] += inp1[5]*lutt6[7];
-				out1[3] += inp1[4]*lutt6[4];
-				out1[3] += inp1[7]*lutt6[5];
-				out1[3] += inp1[6]*lutt6[2];
-				out1[3] += inp2[1]*lutt6[3];
-				out1[3] += inp2[0]*lutt6[0];
-				out1[3] += inp2[3]*lutt6[1];
-
-				out1[2] = inp1[5]*lutt6[6];
-				out1[2] += inp1[4]*lutt6[7];
-				out1[2] += inp1[7]*lutt6[4];
-				out1[2] += inp1[6]*lutt6[5];
-				out1[2] += inp2[1]*lutt6[2];
-				out1[2] += inp2[0]*lutt6[3];
-				out1[2] += inp2[3]*lutt6[0];
-				out1[2] += inp2[2]*lutt6[1];
-
-				out1[5] = inp1[4]*lutt6[6];
-				out1[5] += inp1[7]*lutt6[7];
-				out1[5] += inp1[6]*lutt6[4];
-				out1[5] += inp2[1]*lutt6[5];
-				out1[5] += inp2[0]*lutt6[2];
-				out1[5] += inp2[3]*lutt6[3];
-				out1[5] += inp2[2]*lutt6[0];
-				out1[5] += inp2[5]*lutt6[1];
-
-				out1[4] = inp1[7]*lutt6[6];
-				out1[4] += inp1[6]*lutt6[7];
-				out1[4] += inp2[1]*lutt6[4];
-				out1[4] += inp2[0]*lutt6[5];
-				out1[4] += inp2[3]*lutt6[2];
-				out1[4] += inp2[2]*lutt6[3];
-				out1[4] += inp2[5]*lutt6[0];
-				out1[4] += inp2[4]*lutt6[1];
-
-				out1[7] = inp1[6]*lutt6[6];
-				out1[7] += inp2[1]*lutt6[7];
-				out1[7] += inp2[0]*lutt6[4];
-				out1[7] += inp2[3]*lutt6[5];
-				out1[7] += inp2[2]*lutt6[2];
-				out1[7] += inp2[5]*lutt6[3];
-				out1[7] += inp2[4]*lutt6[0];
-				out1[7] += inp2[7]*lutt6[1];
-
-				out1[6] = inp2[1]*lutt6[6];
-				out1[6] += inp2[0]*lutt6[7];
-				out1[6] += inp2[3]*lutt6[4];
-				out1[6] += inp2[2]*lutt6[5];
-				out1[6] += inp2[5]*lutt6[2];
-				out1[6] += inp2[4]*lutt6[3];
-				out1[6] += inp2[7]*lutt6[0];
-				out1[6] += inp2[6]*lutt6[1];
-				outp[1] = /*CLAMP*/((out1[1]+0x4000) >> 0xF);
-				outp[0] = /*CLAMP*/((out1[0]+0x4000) >> 0xF);
-				outp[3] = /*CLAMP*/((out1[3]+0x4000) >> 0xF);
-				outp[2] = /*CLAMP*/((out1[2]+0x4000) >> 0xF);
-				outp[5] = /*CLAMP*/((out1[5]+0x4000) >> 0xF);
-				outp[4] = /*CLAMP*/((out1[4]+0x4000) >> 0xF);
-				outp[7] = /*CLAMP*/((out1[7]+0x4000) >> 0xF);
-				outp[6] = /*CLAMP*/((out1[6]+0x4000) >> 0xF);
-				inp1 = inp2;
-				inp2 += 8;
-				outp += 8;
-			}
-//			memcpy (rsp.RDRAM+(inst2&0xFFFFFF), dmem+0xFB0, 0x20);
-			memcpy (save, inp2-8, 0x10);
-			memcpy (BufferSpace+(inst1&0xffff), outbuff, cnt);
-}
-
-static void SEGMENT2 () {
-	if (isZeldaABI) {
-		FILTER2 ();
-		return;
-	}
-	if ((inst1 & 0xffffff) == 0) {
-		isMKABI = true;
-		//SEGMENTS[(inst2>>24)&0xf] = (inst2 & 0xffffff);
-	} else {
-		isMKABI = false;
-		isZeldaABI = true;
-		FILTER2 ();
-	}
-}
-
-static void UNKNOWN () {
-}
-
-void (*ABI2[0x20])() = {
- SPNOOP , ADPCM2, CLEARBUFF2, UNKNOWN, ADDMIXER, RESAMPLE2, UNKNOWN, SEGMENT2,
- SETBUFF2 , DUPLICATE2, DMEMMOVE2, LOADADPCM2, MIXER2, INTERLEAVE2, HILOGAIN, SETLOOP2,
- SPNOOP, INTERL2 , ENVSETUP1, ENVMIXER2, LOADBUFF2, SAVEBUFF2, ENVSETUP2, SPNOOP,
- HILOGAIN , SPNOOP, DUPLICATE2 , UNKNOWN , SPNOOP , SPNOOP , SPNOOP , SPNOOP
-};
-
-/* NOTES:
-
- FILTER/SEGMENT - Still needs to be finished up... add FILTER?
- UNKNOWWN #27	 - Is this worth doing? Looks like a pain in the ass just for WaveRace64
-*/

audacious-plugins-3.1.1.tar.bz2/src/usf/audio_ucode3.c Deleted

@@ -1,666 +0,0 @@
-#include <stdio.h>
-#include <stdbool.h>
-#include "usf.h"
-#include "audio_hle.h"
-#include "memory.h"
-
-
-static void SPNOOP () {
-	//char buff[0x100];
-	//sprintf (buff, "Unknown/Unimplemented Audio Command %i in ABI 3", (int)(inst1 >> 24));
-	//printf( "Audio HLE Error: %s\n", buff );
-}
-
-extern u16 ResampleLUT [0x200];
-
-extern u32 loopval;
-
-extern s16 Env_Dry;
-extern s16 Env_Wet;
-extern s16 Vol_Left;
-extern s16 Vol_Right;
-extern s16 VolTrg_Left;
-extern s32 VolRamp_Left;
-//extern u16 VolRate_Left;
-extern s16 VolTrg_Right;
-extern s32 VolRamp_Right;
-//extern u16 VolRate_Right;
-
-
-extern short hleMixerWorkArea[256];
-extern u16 adpcmtable[0x88];
-
-extern u8 BufferSpace[0x10000];
-
-/*
-static void SETVOL3 () { // Swapped Rate_Left and Vol
-	u8 Flags = (u8)(inst1 >> 0x10);
-	if (Flags & 0x4) { // 288
-		if (Flags & 0x2) { // 290
-			VolTrg_Left = *(s16*)&inst1;
-			VolRamp_Left = *(s32*)&inst2;
-		} else {
-			VolTrg_Right = *(s16*)&inst1;
-			VolRamp_Right = *(s32*)&inst2;
-		}
-	} else {
-		Vol_Left	= *(s16*)&inst1;
-		Env_Dry		= (s16)(*(s32*)&inst2 >> 0x10);
-		Env_Wet		= *(s16*)&inst2;
-	}
-}
-*/
-static void SETVOL3 () {
-	u8 Flags = (u8)(inst1 >> 0x10);
-	if (Flags & 0x4) { // 288
-		if (Flags & 0x2) { // 290
-			Vol_Left = *(s16*)&inst1; // 0x50
-			Env_Dry		= (s16)(*(s32*)&inst2 >> 0x10); // 0x4E
-			Env_Wet		= *(s16*)&inst2; // 0x4C
-		} else {
-			VolTrg_Right = *(s16*)&inst1; // 0x46
-			//VolRamp_Right = (u16)(inst2 >> 0x10) | (s32)(s16)(inst2 << 0x10);
-			VolRamp_Right = *(s32*)&inst2; // 0x48/0x4A
-		}
-	} else {
-		VolTrg_Left = *(s16*)&inst1; // 0x40
-		VolRamp_Left = *(s32*)&inst2; // 0x42/0x44
-	}
-}
-
-static void ENVMIXER3 () {
-	u8 flags;
-	u32 addy;
-
- 	short *inp=(short *)(BufferSpace+0x4F0);
-	short *out=(short *)(BufferSpace+0x9D0);
-	short *aux1=(short *)(BufferSpace+0xB40);
-	short *aux2=(short *)(BufferSpace+0xCB0);
-	short *aux3=(short *)(BufferSpace+0xE20);
-	s32 MainR;
-	s32 MainL;
-	s32 AuxR;
-	s32 AuxL;
-
-	int i1,o1,a1,a2,a3,y;
-	//WORD AuxIncRate=1;
-	short zero[8];
-	memset(zero,0,16);
-
-	flags = (u8)((inst1 >> 16) & 0xff);
-	addy = (inst2 & 0xFFFFFF);
-
-	s32 LAdder, LAcc, LVol;
-	s32 RAdder, RAcc, RVol;
-	s16 RSig, LSig; // Most significant part of the Ramp Value
-	s16 Wet, Dry;
-	s16 LTrg, RTrg;
-
-
-	Vol_Right = (*(s16 *)&inst1);
-
-	if (flags & A_INIT) {
-		LAdder = VolRamp_Left / 8;
-		LAcc = 0;
-		LVol = Vol_Left;
-		LSig = (s16)(VolRamp_Left >> 16);
-
-		RAdder = VolRamp_Right / 8;
-		RAcc = 0;
-		RVol = Vol_Right;
-		RSig = (s16)(VolRamp_Right >> 16);
-
-		Wet = (s16)Env_Wet; Dry = (s16)Env_Dry; // Save Wet/Dry values
-		LTrg = VolTrg_Left; RTrg = VolTrg_Right; // Save Current Left/Right Targets
-	} else {
-		memcpy((u8 *)hleMixerWorkArea, N64MEM+addy, 80);
-		Wet = *(s16 *)(hleMixerWorkArea + 0); // 0-1
-		Dry = *(s16 *)(hleMixerWorkArea + 2); // 2-3
-		LTrg = *(s16 *)(hleMixerWorkArea + 4); // 4-5
-		RTrg = *(s16 *)(hleMixerWorkArea + 6); // 6-7
-		LAdder = *(s32 *)(hleMixerWorkArea + 8); // 8-9 (hleMixerWorkArea is a 16bit pointer)
-		RAdder = *(s32 *)(hleMixerWorkArea + 10); // 10-11
-		LAcc = *(s32 *)(hleMixerWorkArea + 12); // 12-13
-		RAcc = *(s32 *)(hleMixerWorkArea + 14); // 14-15
-		LVol = *(s32 *)(hleMixerWorkArea + 16); // 16-17
-		RVol = *(s32 *)(hleMixerWorkArea + 18); // 18-19
-		LSig = *(s16 *)(hleMixerWorkArea + 20); // 20-21
-		RSig = *(s16 *)(hleMixerWorkArea + 22); // 22-23
-		//u32 test = *(s32 *)(hleMixerWorkArea + 24); // 22-23
-		//if (test != 0x13371337)
-		//	__asm int 3;
-	}
-
-
-	//if(!(flags&A_AUX)) {
-	//	AuxIncRate=0;
-	//	aux2=aux3=zero;
-	//}
-
-	for (y = 0; y < (0x170/2); y++) {
-
-		// Left
-		LAcc += LAdder;
-		LVol += (LAcc >> 16);
-		LAcc &= 0xFFFF;
-
-		// Right
-		RAcc += RAdder;
-		RVol += (RAcc >> 16);
-		RAcc &= 0xFFFF;
-// ****************************************************************
-		// Clamp Left
-		if (LSig >= 0) { // VLT
-			if (LVol > LTrg) {
-				LVol = LTrg;
-			}
-		} else { // VGE
-			if (LVol < LTrg) {
-				LVol = LTrg;
-			}
-		}
-
-		// Clamp Right
-		if (RSig >= 0) { // VLT
-			if (RVol > RTrg) {
-				RVol = RTrg;
-			}
-		} else { // VGE
-			if (RVol < RTrg) {
-				RVol = RTrg;
-			}
-		}
-// ****************************************************************
-		MainL = ((Dry * LVol) + 0x4000) >> 15;
-		MainR = ((Dry * RVol) + 0x4000) >> 15;
-
-		o1 = out [y^1];
-		a1 = aux1[y^1];
-		i1 = inp [y^1];
-
-		o1+=((i1*MainL)+0x4000)>>15;
-		a1+=((i1*MainR)+0x4000)>>15;
-
-// ****************************************************************
-
-		if(o1>32767) o1=32767;
-		else if(o1<-32768) o1=-32768;
-
-		if(a1>32767) a1=32767;
-		else if(a1<-32768) a1=-32768;
-
-// ****************************************************************
-
-		out[y^1]=o1;
-		aux1[y^1]=a1;
-
-// ****************************************************************
-		//if (!(flags&A_AUX)) {
-			a2 = aux2[y^1];
-			a3 = aux3[y^1];
-
-			AuxL = ((Wet * LVol) + 0x4000) >> 15;
-			AuxR = ((Wet * RVol) + 0x4000) >> 15;
-
-			a2+=((i1*AuxL)+0x4000)>>15;
-			a3+=((i1*AuxR)+0x4000)>>15;
-
-			if(a2>32767) a2=32767;
-			else if(a2<-32768) a2=-32768;
-
-			if(a3>32767) a3=32767;
-			else if(a3<-32768) a3=-32768;
-
-			aux2[y^1]=a2;
-			aux3[y^1]=a3;
-		}
-	//}
-
-	*(s16 *)(hleMixerWorkArea + 0) = Wet; // 0-1
-	*(s16 *)(hleMixerWorkArea + 2) = Dry; // 2-3
-	*(s16 *)(hleMixerWorkArea + 4) = LTrg; // 4-5
-	*(s16 *)(hleMixerWorkArea + 6) = RTrg; // 6-7
-	*(s32 *)(hleMixerWorkArea + 8) = LAdder; // 8-9 (hleMixerWorkArea is a 16bit pointer)
-	*(s32 *)(hleMixerWorkArea + 10) = RAdder; // 10-11
-	*(s32 *)(hleMixerWorkArea + 12) = LAcc; // 12-13
-	*(s32 *)(hleMixerWorkArea + 14) = RAcc; // 14-15
-	*(s32 *)(hleMixerWorkArea + 16) = LVol; // 16-17
-	*(s32 *)(hleMixerWorkArea + 18) = RVol; // 18-19
-	*(s16 *)(hleMixerWorkArea + 20) = LSig; // 20-21
-	*(s16 *)(hleMixerWorkArea + 22) = RSig; // 22-23
-	//*(u32 *)(hleMixerWorkArea + 24) = 0x13371337; // 22-23
-	memcpy(N64MEM+addy, (u8 *)hleMixerWorkArea,80);
-}
-
-static void CLEARBUFF3 () {
-	u16 addr = (u16)(inst1 & 0xffff);
-	u16 count = (u16)(inst2 & 0xffff);
-	memset(BufferSpace+addr+0x4f0, 0, count);
-}
-
-static void MIXER3 () { // Needs accuracy verification...
-	u16 dmemin = (u16)(inst2 >> 0x10) + 0x4f0;
-	u16 dmemout = (u16)(inst2 & 0xFFFF) + 0x4f0;
-	s32 gain = (s16)(inst1 & 0xFFFF)*2;
-	s32 temp;
-	int x;
-
-	for (x = 0; x < 0x170; x+=2) { // I think I can do this a lot easier
-		temp = (*(s16 *)(BufferSpace+dmemin+x) * gain) >> 16;
-		temp += *(s16 *)(BufferSpace+dmemout+x);
-
-		if ((s32)temp > 32767)
-			temp = 32767;
-		if ((s32)temp < -32768)
-			temp = -32768;
-
-		*(u16 *)(BufferSpace+dmemout+x) = (u16)(temp & 0xFFFF);
-	}
-}
-
-static void LOADBUFF3 () {
-	u32 v0;
-	u32 cnt = (((inst1 >> 0xC)+3)&0xFFC);
-	v0 = (inst2 & 0xfffffc);
-	u32 src = (inst1&0xffc)+0x4f0;
-	memcpy (BufferSpace+src, (u8 *)N64MEM+v0, cnt);
-}
-
-static void SAVEBUFF3 () {
-	u32 v0;
-	u32 cnt = (((inst1 >> 0xC)+3)&0xFFC);
-	v0 = (inst2 & 0xfffffc);
-	u32 src = (inst1&0xffc)+0x4f0;
-	memcpy (N64MEM+v0, (u8 *)BufferSpace+src, cnt);
-}
-
-static void LOADADPCM3 () { // Loads an ADPCM table - Works 100% Now 03-13-01
-	u32 v0, x;
-	v0 = (inst2 & 0xffffff);
-
-	u16 *table = (u16 *)(RDRAM+v0);
-	for (x = 0; x < ((inst1&0xffff)>>0x4); x++) {
-		adpcmtable[0x1+(x<<3)] = table[0];
-		adpcmtable[0x0+(x<<3)] = table[1];
-
-		adpcmtable[0x3+(x<<3)] = table[2];
-		adpcmtable[0x2+(x<<3)] = table[3];
-
-		adpcmtable[0x5+(x<<3)] = table[4];
-		adpcmtable[0x4+(x<<3)] = table[5];
-
-		adpcmtable[0x7+(x<<3)] = table[6];
-		adpcmtable[0x6+(x<<3)] = table[7];
-		table += 8;
-	}
-}
-
-static void DMEMMOVE3 () { // Needs accuracy verification...
-	u32 v0, v1;
-	u32 cnt;
-	v0 = (inst1 & 0xFFFF) + 0x4f0;
-	v1 = (inst2 >> 0x10) + 0x4f0;
-	u32 count = ((inst2+3) & 0xfffc);
-
-	for (cnt = 0; cnt < count; cnt++) {
-		*(u8 *)(BufferSpace+((cnt+v1)^3)) = *(u8 *)(BufferSpace+((cnt+v0)^3));
-	}
-}
-
-static void SETLOOP3 () {
-	loopval = (inst2 & 0xffffff);
-}
-
-static void ADPCM3 () { // Verified to be 100% Accurate...
-	short count = 0;
-	unsigned char icode, code, Flags;
-	int vscale, a[8];
-	unsigned short index, j, inPtr;
-	short *book1,*book2,*out;
-	unsigned int Address;
-
-	Flags=(u8)(inst2>>0x1c)&0xff;
-	Address=(inst1 & 0xffffff);
-	inPtr=(inst2>>12)&0xf;
-
-	out=(short *)(BufferSpace+(inst2&0xfff)+0x4f0);
-	count=(short)((inst2 >> 16)&0xfff);
-
-
-	memset(out,0,32);
-
-	if(!(Flags&0x1))
-	{
-		if(Flags&0x2)
-		{
-			memcpy(out,&RDRAM[loopval],32);
-		}
-		else
-		{
-			memcpy(out,&RDRAM[Address],32);
-		}
-	}
-
-	int l1=out[15];
-	int l2=out[14];
-	int inp1[8];
-	int inp2[8];
-	out+=16;
-	while(count>0)
-	{
-													// the first interation through, these values are
-													// either 0 in the case of A_INIT, from a special
-													// area of memory in the case of A_LOOP or just
-													// the values we calculated the last time
-
-		code=BufferSpace[(0x4f0+inPtr)^3];
-		index=code&0xf;
-		index<<=4;									// index into the adpcm code table
-		book1=(short *)&adpcmtable[index];
-		book2=book1+8;
-		code>>=4;									// upper nibble is scale
-		vscale=(0x8000>>((12-code)-1));			// very strange. 0x8000 would be .5 in 16:16 format
-													// so this appears to be a fractional scale based
-													// on the 12 based inverse of the scale value. note
-													// that this could be negative, in which case we do
-													// not use the calculated vscale value... see the
-													// if(code>12) check below
-
-		inPtr++;									// coded adpcm data lies next
-		j=0;
-		while(j<8)									// loop of 8, for 8 coded nibbles from 4 bytes
-													// which yields 8 short pcm values
-		{
-			icode=BufferSpace[(0x4f0+inPtr)^3];
-			inPtr++;
-
-			inp1[j]=(s16)((icode&0xf0)<<8);			// this will in effect be signed
-			if(code<12)
-				inp1[j]=((int)((int)inp1[j]*(int)vscale)>>16);
-			j++;
-
-			inp1[j]=(s16)((icode&0xf)<<12);
-			if(code<12)
-				inp1[j]=((int)((int)inp1[j]*(int)vscale)>>16);
-			j++;
-		}
-		j=0;
-		while(j<8)
-		{
-			icode=BufferSpace[(0x4f0+inPtr)^3];
-			inPtr++;
-
-			inp2[j]=(short)((icode&0xf0)<<8);			// this will in effect be signed
-			if(code<12)
-				inp2[j]=((int)((int)inp2[j]*(int)vscale)>>16);
-			j++;
-
-			inp2[j]=(short)((icode&0xf)<<12);
-			if(code<12)
-				inp2[j]=((int)((int)inp2[j]*(int)vscale)>>16);
-			j++;
-		}
-
-		a[0]= (int)book1[0]*(int)l1;
-		a[0]+=(int)book2[0]*(int)l2;
-		a[0]+=(int)inp1[0]*(int)2048;
-
-		a[1] =(int)book1[1]*(int)l1;
-		a[1]+=(int)book2[1]*(int)l2;
-		a[1]+=(int)book2[0]*inp1[0];
-		a[1]+=(int)inp1[1]*(int)2048;
-
-		a[2] =(int)book1[2]*(int)l1;
-		a[2]+=(int)book2[2]*(int)l2;
-		a[2]+=(int)book2[1]*inp1[0];
-		a[2]+=(int)book2[0]*inp1[1];
-		a[2]+=(int)inp1[2]*(int)2048;
-
-		a[3] =(int)book1[3]*(int)l1;
-		a[3]+=(int)book2[3]*(int)l2;
-		a[3]+=(int)book2[2]*inp1[0];
-		a[3]+=(int)book2[1]*inp1[1];
-		a[3]+=(int)book2[0]*inp1[2];
-		a[3]+=(int)inp1[3]*(int)2048;
-
-		a[4] =(int)book1[4]*(int)l1;
-		a[4]+=(int)book2[4]*(int)l2;
-		a[4]+=(int)book2[3]*inp1[0];
-		a[4]+=(int)book2[2]*inp1[1];
-		a[4]+=(int)book2[1]*inp1[2];
-		a[4]+=(int)book2[0]*inp1[3];
-		a[4]+=(int)inp1[4]*(int)2048;
-
-		a[5] =(int)book1[5]*(int)l1;
-		a[5]+=(int)book2[5]*(int)l2;
-		a[5]+=(int)book2[4]*inp1[0];
-		a[5]+=(int)book2[3]*inp1[1];
-		a[5]+=(int)book2[2]*inp1[2];
-		a[5]+=(int)book2[1]*inp1[3];
-		a[5]+=(int)book2[0]*inp1[4];
-		a[5]+=(int)inp1[5]*(int)2048;
-
-		a[6] =(int)book1[6]*(int)l1;
-		a[6]+=(int)book2[6]*(int)l2;
-		a[6]+=(int)book2[5]*inp1[0];
-		a[6]+=(int)book2[4]*inp1[1];
-		a[6]+=(int)book2[3]*inp1[2];
-		a[6]+=(int)book2[2]*inp1[3];
-		a[6]+=(int)book2[1]*inp1[4];
-		a[6]+=(int)book2[0]*inp1[5];
-		a[6]+=(int)inp1[6]*(int)2048;
-
-		a[7] =(int)book1[7]*(int)l1;
-		a[7]+=(int)book2[7]*(int)l2;
-		a[7]+=(int)book2[6]*inp1[0];
-		a[7]+=(int)book2[5]*inp1[1];
-		a[7]+=(int)book2[4]*inp1[2];
-		a[7]+=(int)book2[3]*inp1[3];
-		a[7]+=(int)book2[2]*inp1[4];
-		a[7]+=(int)book2[1]*inp1[5];
-		a[7]+=(int)book2[0]*inp1[6];
-		a[7]+=(int)inp1[7]*(int)2048;
-
-		for(j=0;j<8;j++)
-		{
-			a[j^1]>>=11;
-			if(a[j^1]>32767) a[j^1]=32767;
-			else if(a[j^1]<-32768) a[j^1]=-32768;
-			*(out++)=a[j^1];
-		}
-
-		l1=a[6];
-		l2=a[7];
-
-		a[0]= (int)book1[0]*(int)l1;
-		a[0]+=(int)book2[0]*(int)l2;
-		a[0]+=(int)inp2[0]*(int)2048;
-
-		a[1] =(int)book1[1]*(int)l1;
-		a[1]+=(int)book2[1]*(int)l2;
-		a[1]+=(int)book2[0]*inp2[0];
-		a[1]+=(int)inp2[1]*(int)2048;
-
-		a[2] =(int)book1[2]*(int)l1;
-		a[2]+=(int)book2[2]*(int)l2;
-		a[2]+=(int)book2[1]*inp2[0];
-		a[2]+=(int)book2[0]*inp2[1];
-		a[2]+=(int)inp2[2]*(int)2048;
-
-		a[3] =(int)book1[3]*(int)l1;
-		a[3]+=(int)book2[3]*(int)l2;
-		a[3]+=(int)book2[2]*inp2[0];
-		a[3]+=(int)book2[1]*inp2[1];
-		a[3]+=(int)book2[0]*inp2[2];
-		a[3]+=(int)inp2[3]*(int)2048;
-
-		a[4] =(int)book1[4]*(int)l1;
-		a[4]+=(int)book2[4]*(int)l2;
-		a[4]+=(int)book2[3]*inp2[0];
-		a[4]+=(int)book2[2]*inp2[1];
-		a[4]+=(int)book2[1]*inp2[2];
-		a[4]+=(int)book2[0]*inp2[3];
-		a[4]+=(int)inp2[4]*(int)2048;
-
-		a[5] =(int)book1[5]*(int)l1;
-		a[5]+=(int)book2[5]*(int)l2;
-		a[5]+=(int)book2[4]*inp2[0];
-		a[5]+=(int)book2[3]*inp2[1];
-		a[5]+=(int)book2[2]*inp2[2];
-		a[5]+=(int)book2[1]*inp2[3];
-		a[5]+=(int)book2[0]*inp2[4];
-		a[5]+=(int)inp2[5]*(int)2048;
-
-		a[6] =(int)book1[6]*(int)l1;
-		a[6]+=(int)book2[6]*(int)l2;
-		a[6]+=(int)book2[5]*inp2[0];
-		a[6]+=(int)book2[4]*inp2[1];
-		a[6]+=(int)book2[3]*inp2[2];
-		a[6]+=(int)book2[2]*inp2[3];
-		a[6]+=(int)book2[1]*inp2[4];
-		a[6]+=(int)book2[0]*inp2[5];
-		a[6]+=(int)inp2[6]*(int)2048;
-
-		a[7] =(int)book1[7]*(int)l1;
-		a[7]+=(int)book2[7]*(int)l2;
-		a[7]+=(int)book2[6]*inp2[0];
-		a[7]+=(int)book2[5]*inp2[1];
-		a[7]+=(int)book2[4]*inp2[2];
-		a[7]+=(int)book2[3]*inp2[3];
-		a[7]+=(int)book2[2]*inp2[4];
-		a[7]+=(int)book2[1]*inp2[5];
-		a[7]+=(int)book2[0]*inp2[6];
-		a[7]+=(int)inp2[7]*(int)2048;
-
-		for(j=0;j<8;j++)
-		{
-			a[j^1]>>=11;
-			if(a[j^1]>32767) a[j^1]=32767;
-			else if(a[j^1]<-32768) a[j^1]=-32768;
-			*(out++)=a[j^1];
-		}
-		l1=a[6];
-		l2=a[7];
-
-		count-=32;
-	}
-	out-=16;
-	memcpy(&RDRAM[Address],out,32);
-}
-
-static void RESAMPLE3 () {
-	s32 temp;
-	s32 accum;
-	s16 *lut;
-	short *dst;
-	s16 *src;
-	unsigned char Flags;
-	u32 dstPtr, srcPtr, x, addy, Pitch, location, Accum, i;
-	Flags=(u8)((inst2>>0x1e));
-	Pitch=((inst2>>0xe)&0xffff)<<1;
-	addy = (inst1 & 0xffffff);
-	Accum=0;
-	dst=(short *)(BufferSpace);
-	src=(s16 *)(BufferSpace);
-	srcPtr=((((inst2>>2)&0xfff)+0x4f0)/2);
-
-	srcPtr -= 4;
-
-	if (inst2 & 0x3) {
-		dstPtr = 0x660/2;
-	} else {
-		dstPtr = 0x4f0/2;
-	}
-
-	if ((Flags & 0x1) == 0) {
-		for (x=0; x < 4; x++) //memcpy (src+srcPtr, rsp.RDRAM+addy, 0x8);
-			src[(srcPtr+x)^1] = ((u16 *)RDRAM)[((addy/2)+x)^1];
-		Accum = *(u16 *)(RDRAM+addy+10);
-	} else {
-		for (x=0; x < 4; x++)
-			src[(srcPtr+x)^1] = 0;//*(u16 *)(rsp.RDRAM+((addy+x)^2));
-	}
-
-	//if ((Flags & 0x2))
-	//	__asm int 3;
-
-	for(i=0;i < 0x170/2;i++)	{
-		location = (((Accum * 0x40) >> 0x10) * 8);
-		//location = (Accum >> 0xa) << 0x3;
-		lut = (s16 *)(((u8 *)ResampleLUT) + location);
-
-		temp = ((s32)*(s16*)(src+((srcPtr+0)^1))*((s32)((s16)lut[0])));
-		accum = (s32)(temp >> 15);
-
-		temp = ((s32)*(s16*)(src+((srcPtr+1)^1))*((s32)((s16)lut[1])));
-		accum += (s32)(temp >> 15);
-
-		temp = ((s32)*(s16*)(src+((srcPtr+2)^1))*((s32)((s16)lut[2])));
-		accum += (s32)(temp >> 15);
-
-		temp = ((s32)*(s16*)(src+((srcPtr+3)^1))*((s32)((s16)lut[3])));
-		accum += (s32)(temp >> 15);
-
-		if (accum > 32767) accum = 32767;
-		if (accum < -32768) accum = -32768;
-
-		dst[dstPtr^1] = (accum);
-		dstPtr++;
-		Accum += Pitch;
-		srcPtr += (Accum>>16);
-		Accum&=0xffff;
-	}
-	for (x=0; x < 4; x++)
-		((u16 *)RDRAM)[((addy/2)+x)^1] = src[(srcPtr+x)^1];
-	*(u16 *)(RDRAM+addy+10) = Accum;
-}
-
-static void INTERLEAVE3 () { // Needs accuracy verification...
-	//u32 inL, inR;
-	int x = 0;
-	u16 *inSrcR;
-	u16 *inSrcL;
-	u16 Left, Right;
-
-	u16 *outbuff = (u16 *)(BufferSpace + 0x4f0);//(u16 *)(AudioOutBuffer+dmem);
-
-	inSrcR = (u16 *)(BufferSpace+0xb40);
-	inSrcL = (u16 *)(BufferSpace+0x9d0);
-
-	for (x = 0; x < (0x170/4); x++) {
-		Left=*(inSrcL++);
-		Right=*(inSrcR++);
-
-		*(outbuff++)=*(inSrcR++);
-		*(outbuff++)=*(inSrcL++);
-		*(outbuff++)=(u16)Right;
-		*(outbuff++)=(u16)Left;
-	}
-}
-
-static void WHATISTHIS () {
-}
-
-u32 setaddr;
-static void MP3ADDY () {
-	setaddr = (inst2 & 0xffffff);
-}
-
-void rsp_run();
-void mp3setup (unsigned int inst1, unsigned int inst2, unsigned int t8);
-
-extern u32 base, dmembase;
-extern char *pDMEM;
-
-void MP3 ();
-
-static void DISABLE () {
-}
-
-
-void (*ABI3[0x20])() = {
- DISABLE , ADPCM3 , CLEARBUFF3,	ENVMIXER3 , LOADBUFF3, RESAMPLE3 , SAVEBUFF3, MP3,
-	MP3ADDY, SETVOL3, DMEMMOVE3 , LOADADPCM3 , MIXER3 , INTERLEAVE3, WHATISTHIS , SETLOOP3,
- SPNOOP , SPNOOP, SPNOOP , SPNOOP , SPNOOP , SPNOOP , SPNOOP , SPNOOP,
- SPNOOP , SPNOOP, SPNOOP , SPNOOP , SPNOOP , SPNOOP , SPNOOP , SPNOOP
-};

audacious-plugins-3.1.1.tar.bz2/src/usf/audio_ucode3mp3.c Deleted

@@ -1,588 +0,0 @@
-#include <stdio.h>
-#include "usf.h"
-#include "audio_hle.h"
-#include "memory.h"
-
-
-
-static u16 DeWindowLUT [0x420] = {
-	0x0000, 0xFFF3, 0x005D, 0xFF38, 0x037A, 0xF736, 0x0B37, 0xC00E,
-	0x7FFF, 0x3FF2, 0x0B37, 0x08CA, 0x037A, 0x00C8, 0x005D, 0x000D,
-	0x0000, 0xFFF3, 0x005D, 0xFF38, 0x037A, 0xF736, 0x0B37, 0xC00E,
-	0x7FFF, 0x3FF2, 0x0B37, 0x08CA, 0x037A, 0x00C8, 0x005D, 0x000D,
-	0x0000, 0xFFF2, 0x005F, 0xFF1D, 0x0369, 0xF697, 0x0A2A, 0xBCE7,
-	0x7FEB, 0x3CCB, 0x0C2B, 0x082B, 0x0385, 0x00AF, 0x005B, 0x000B,
-	0x0000, 0xFFF2, 0x005F, 0xFF1D, 0x0369, 0xF697, 0x0A2A, 0xBCE7,
-	0x7FEB, 0x3CCB, 0x0C2B, 0x082B, 0x0385, 0x00AF, 0x005B, 0x000B,
-	0x0000, 0xFFF1, 0x0061, 0xFF02, 0x0354, 0xF5F9, 0x0905, 0xB9C4,
-	0x7FB0, 0x39A4, 0x0D08, 0x078C, 0x038C, 0x0098, 0x0058, 0x000A,
-	0x0000, 0xFFF1, 0x0061, 0xFF02, 0x0354, 0xF5F9, 0x0905, 0xB9C4,
-	0x7FB0, 0x39A4, 0x0D08, 0x078C, 0x038C, 0x0098, 0x0058, 0x000A,
-	0x0000, 0xFFEF, 0x0062, 0xFEE6, 0x033B, 0xF55C, 0x07C8, 0xB6A4,
-	0x7F4D, 0x367E, 0x0DCE, 0x06EE, 0x038F, 0x0080, 0x0056, 0x0009,
-	0x0000, 0xFFEF, 0x0062, 0xFEE6, 0x033B, 0xF55C, 0x07C8, 0xB6A4,
-	0x7F4D, 0x367E, 0x0DCE, 0x06EE, 0x038F, 0x0080, 0x0056, 0x0009,
-	0x0000, 0xFFEE, 0x0063, 0xFECA, 0x031C, 0xF4C3, 0x0671, 0xB38C,
-	0x7EC2, 0x335D, 0x0E7C, 0x0652, 0x038E, 0x006B, 0x0053, 0x0008,
-	0x0000, 0xFFEE, 0x0063, 0xFECA, 0x031C, 0xF4C3, 0x0671, 0xB38C,
-	0x7EC2, 0x335D, 0x0E7C, 0x0652, 0x038E, 0x006B, 0x0053, 0x0008,
-	0x0000, 0xFFEC, 0x0064, 0xFEAC, 0x02F7, 0xF42C, 0x0502, 0xB07C,
-	0x7E12, 0x3041, 0x0F14, 0x05B7, 0x038A, 0x0056, 0x0050, 0x0007,
-	0x0000, 0xFFEC, 0x0064, 0xFEAC, 0x02F7, 0xF42C, 0x0502, 0xB07C,
-	0x7E12, 0x3041, 0x0F14, 0x05B7, 0x038A, 0x0056, 0x0050, 0x0007,
-	0x0000, 0xFFEB, 0x0064, 0xFE8E, 0x02CE, 0xF399, 0x037A, 0xAD75,
-	0x7D3A, 0x2D2C, 0x0F97, 0x0520, 0x0382, 0x0043, 0x004D, 0x0007,
-	0x0000, 0xFFEB, 0x0064, 0xFE8E, 0x02CE, 0xF399, 0x037A, 0xAD75,
-	0x7D3A, 0x2D2C, 0x0F97, 0x0520, 0x0382, 0x0043, 0x004D, 0x0007,
-	0xFFFF, 0xFFE9, 0x0063, 0xFE6F, 0x029E, 0xF30B, 0x01D8, 0xAA7B,
-	0x7C3D, 0x2A1F, 0x1004, 0x048B, 0x0377, 0x0030, 0x004A, 0x0006,
-	0xFFFF, 0xFFE9, 0x0063, 0xFE6F, 0x029E, 0xF30B, 0x01D8, 0xAA7B,
-	0x7C3D, 0x2A1F, 0x1004, 0x048B, 0x0377, 0x0030, 0x004A, 0x0006,
-	0xFFFF, 0xFFE7, 0x0062, 0xFE4F, 0x0269, 0xF282, 0x001F, 0xA78D,
-	0x7B1A, 0x271C, 0x105D, 0x03F9, 0x036A, 0x001F, 0x0046, 0x0006,
-	0xFFFF, 0xFFE7, 0x0062, 0xFE4F, 0x0269, 0xF282, 0x001F, 0xA78D,
-	0x7B1A, 0x271C, 0x105D, 0x03F9, 0x036A, 0x001F, 0x0046, 0x0006,
-	0xFFFF, 0xFFE4, 0x0061, 0xFE2F, 0x022F, 0xF1FF, 0xFE4C, 0xA4AF,
-	0x79D3, 0x2425, 0x10A2, 0x036C, 0x0359, 0x0010, 0x0043, 0x0005,
-	0xFFFF, 0xFFE4, 0x0061, 0xFE2F, 0x022F, 0xF1FF, 0xFE4C, 0xA4AF,
-	0x79D3, 0x2425, 0x10A2, 0x036C, 0x0359, 0x0010, 0x0043, 0x0005,
-	0xFFFF, 0xFFE2, 0x005E, 0xFE10, 0x01EE, 0xF184, 0xFC61, 0xA1E1,
-	0x7869, 0x2139, 0x10D3, 0x02E3, 0x0346, 0x0001, 0x0040, 0x0004,
-	0xFFFF, 0xFFE2, 0x005E, 0xFE10, 0x01EE, 0xF184, 0xFC61, 0xA1E1,
-	0x7869, 0x2139, 0x10D3, 0x02E3, 0x0346, 0x0001, 0x0040, 0x0004,
-	0xFFFF, 0xFFE0, 0x005B, 0xFDF0, 0x01A8, 0xF111, 0xFA5F, 0x9F27,
-	0x76DB, 0x1E5C, 0x10F2, 0x025E, 0x0331, 0xFFF3, 0x003D, 0x0004,
-	0xFFFF, 0xFFE0, 0x005B, 0xFDF0, 0x01A8, 0xF111, 0xFA5F, 0x9F27,
-	0x76DB, 0x1E5C, 0x10F2, 0x025E, 0x0331, 0xFFF3, 0x003D, 0x0004,
-	0xFFFF, 0xFFDE, 0x0057, 0xFDD0, 0x015B, 0xF0A7, 0xF845, 0x9C80,
-	0x752C, 0x1B8E, 0x1100, 0x01DE, 0x0319, 0xFFE7, 0x003A, 0x0003,
-	0xFFFF, 0xFFDE, 0x0057, 0xFDD0, 0x015B, 0xF0A7, 0xF845, 0x9C80,
-	0x752C, 0x1B8E, 0x1100, 0x01DE, 0x0319, 0xFFE7, 0x003A, 0x0003,
-	0xFFFE, 0xFFDB, 0x0053, 0xFDB0, 0x0108, 0xF046, 0xF613, 0x99EE,
-	0x735C, 0x18D1, 0x10FD, 0x0163, 0x0300, 0xFFDC, 0x0037, 0x0003,
-	0xFFFE, 0xFFDB, 0x0053, 0xFDB0, 0x0108, 0xF046, 0xF613, 0x99EE,
-	0x735C, 0x18D1, 0x10FD, 0x0163, 0x0300, 0xFFDC, 0x0037, 0x0003,
-	0xFFFE, 0xFFD8, 0x004D, 0xFD90, 0x00B0, 0xEFF0, 0xF3CC, 0x9775,
-	0x716C, 0x1624, 0x10EA, 0x00EE, 0x02E5, 0xFFD2, 0x0033, 0x0003,
-	0xFFFE, 0xFFD8, 0x004D, 0xFD90, 0x00B0, 0xEFF0, 0xF3CC, 0x9775,
-	0x716C, 0x1624, 0x10EA, 0x00EE, 0x02E5, 0xFFD2, 0x0033, 0x0003,
-	0xFFFE, 0xFFD6, 0x0047, 0xFD72, 0x0051, 0xEFA6, 0xF16F, 0x9514,
-	0x6F5E, 0x138A, 0x10C8, 0x007E, 0x02CA, 0xFFC9, 0x0030, 0x0003,
-	0xFFFE, 0xFFD6, 0x0047, 0xFD72, 0x0051, 0xEFA6, 0xF16F, 0x9514,
-	0x6F5E, 0x138A, 0x10C8, 0x007E, 0x02CA, 0xFFC9, 0x0030, 0x0003,
-	0xFFFE, 0xFFD3, 0x0040, 0xFD54, 0xFFEC, 0xEF68, 0xEEFC, 0x92CD,
-	0x6D33, 0x1104, 0x1098, 0x0014, 0x02AC, 0xFFC0, 0x002D, 0x0002,
-	0xFFFE, 0xFFD3, 0x0040, 0xFD54, 0xFFEC, 0xEF68, 0xEEFC, 0x92CD,
-	0x6D33, 0x1104, 0x1098, 0x0014, 0x02AC, 0xFFC0, 0x002D, 0x0002,
-	0x0030, 0xFFC9, 0x02CA, 0x007E, 0x10C8, 0x138A, 0x6F5E, 0x9514,
-	0xF16F, 0xEFA6, 0x0051, 0xFD72, 0x0047, 0xFFD6, 0xFFFE, 0x0003,
-	0x0030, 0xFFC9, 0x02CA, 0x007E, 0x10C8, 0x138A, 0x6F5E, 0x9514,
-	0xF16F, 0xEFA6, 0x0051, 0xFD72, 0x0047, 0xFFD6, 0xFFFE, 0x0003,
-	0x0033, 0xFFD2, 0x02E5, 0x00EE, 0x10EA, 0x1624, 0x716C, 0x9775,
-	0xF3CC, 0xEFF0, 0x00B0, 0xFD90, 0x004D, 0xFFD8, 0xFFFE, 0x0003,
-	0x0033, 0xFFD2, 0x02E5, 0x00EE, 0x10EA, 0x1624, 0x716C, 0x9775,
-	0xF3CC, 0xEFF0, 0x00B0, 0xFD90, 0x004D, 0xFFD8, 0xFFFE, 0x0003,
-	0x0037, 0xFFDC, 0x0300, 0x0163, 0x10FD, 0x18D1, 0x735C, 0x99EE,
-	0xF613, 0xF046, 0x0108, 0xFDB0, 0x0053, 0xFFDB, 0xFFFE, 0x0003,
-	0x0037, 0xFFDC, 0x0300, 0x0163, 0x10FD, 0x18D1, 0x735C, 0x99EE,
-	0xF613, 0xF046, 0x0108, 0xFDB0, 0x0053, 0xFFDB, 0xFFFE, 0x0003,
-	0x003A, 0xFFE7, 0x0319, 0x01DE, 0x1100, 0x1B8E, 0x752C, 0x9C80,
-	0xF845, 0xF0A7, 0x015B, 0xFDD0, 0x0057, 0xFFDE, 0xFFFF, 0x0003,
-	0x003A, 0xFFE7, 0x0319, 0x01DE, 0x1100, 0x1B8E, 0x752C, 0x9C80,
-	0xF845, 0xF0A7, 0x015B, 0xFDD0, 0x0057, 0xFFDE, 0xFFFF, 0x0004,
-	0x003D, 0xFFF3, 0x0331, 0x025E, 0x10F2, 0x1E5C, 0x76DB, 0x9F27,
-	0xFA5F, 0xF111, 0x01A8, 0xFDF0, 0x005B, 0xFFE0, 0xFFFF, 0x0004,
-	0x003D, 0xFFF3, 0x0331, 0x025E, 0x10F2, 0x1E5C, 0x76DB, 0x9F27,
-	0xFA5F, 0xF111, 0x01A8, 0xFDF0, 0x005B, 0xFFE0, 0xFFFF, 0x0004,
-	0x0040, 0x0001, 0x0346, 0x02E3, 0x10D3, 0x2139, 0x7869, 0xA1E1,
-	0xFC61, 0xF184, 0x01EE, 0xFE10, 0x005E, 0xFFE2, 0xFFFF, 0x0004,
-	0x0040, 0x0001, 0x0346, 0x02E3, 0x10D3, 0x2139, 0x7869, 0xA1E1,
-	0xFC61, 0xF184, 0x01EE, 0xFE10, 0x005E, 0xFFE2, 0xFFFF, 0x0005,
-	0x0043, 0x0010, 0x0359, 0x036C, 0x10A2, 0x2425, 0x79D3, 0xA4AF,
-	0xFE4C, 0xF1FF, 0x022F, 0xFE2F, 0x0061, 0xFFE4, 0xFFFF, 0x0005,
-	0x0043, 0x0010, 0x0359, 0x036C, 0x10A2, 0x2425, 0x79D3, 0xA4AF,
-	0xFE4C, 0xF1FF, 0x022F, 0xFE2F, 0x0061, 0xFFE4, 0xFFFF, 0x0006,
-	0x0046, 0x001F, 0x036A, 0x03F9, 0x105D, 0x271C, 0x7B1A, 0xA78D,
-	0x001F, 0xF282, 0x0269, 0xFE4F, 0x0062, 0xFFE7, 0xFFFF, 0x0006,
-	0x0046, 0x001F, 0x036A, 0x03F9, 0x105D, 0x271C, 0x7B1A, 0xA78D,
-	0x001F, 0xF282, 0x0269, 0xFE4F, 0x0062, 0xFFE7, 0xFFFF, 0x0006,
-	0x004A, 0x0030, 0x0377, 0x048B, 0x1004, 0x2A1F, 0x7C3D, 0xAA7B,
-	0x01D8, 0xF30B, 0x029E, 0xFE6F, 0x0063, 0xFFE9, 0xFFFF, 0x0006,
-	0x004A, 0x0030, 0x0377, 0x048B, 0x1004, 0x2A1F, 0x7C3D, 0xAA7B,
-	0x01D8, 0xF30B, 0x029E, 0xFE6F, 0x0063, 0xFFE9, 0xFFFF, 0x0007,
-	0x004D, 0x0043, 0x0382, 0x0520, 0x0F97, 0x2D2C, 0x7D3A, 0xAD75,
-	0x037A, 0xF399, 0x02CE, 0xFE8E, 0x0064, 0xFFEB, 0x0000, 0x0007,
-	0x004D, 0x0043, 0x0382, 0x0520, 0x0F97, 0x2D2C, 0x7D3A, 0xAD75,
-	0x037A, 0xF399, 0x02CE, 0xFE8E, 0x0064, 0xFFEB, 0x0000, 0x0007,
-	0x0050, 0x0056, 0x038A, 0x05B7, 0x0F14, 0x3041, 0x7E12, 0xB07C,
-	0x0502, 0xF42C, 0x02F7, 0xFEAC, 0x0064, 0xFFEC, 0x0000, 0x0007,
-	0x0050, 0x0056, 0x038A, 0x05B7, 0x0F14, 0x3041, 0x7E12, 0xB07C,
-	0x0502, 0xF42C, 0x02F7, 0xFEAC, 0x0064, 0xFFEC, 0x0000, 0x0008,
-	0x0053, 0x006B, 0x038E, 0x0652, 0x0E7C, 0x335D, 0x7EC2, 0xB38C,
-	0x0671, 0xF4C3, 0x031C, 0xFECA, 0x0063, 0xFFEE, 0x0000, 0x0008,
-	0x0053, 0x006B, 0x038E, 0x0652, 0x0E7C, 0x335D, 0x7EC2, 0xB38C,
-	0x0671, 0xF4C3, 0x031C, 0xFECA, 0x0063, 0xFFEE, 0x0000, 0x0009,
-	0x0056, 0x0080, 0x038F, 0x06EE, 0x0DCE, 0x367E, 0x7F4D, 0xB6A4,
-	0x07C8, 0xF55C, 0x033B, 0xFEE6, 0x0062, 0xFFEF, 0x0000, 0x0009,
-	0x0056, 0x0080, 0x038F, 0x06EE, 0x0DCE, 0x367E, 0x7F4D, 0xB6A4,
-	0x07C8, 0xF55C, 0x033B, 0xFEE6, 0x0062, 0xFFEF, 0x0000, 0x000A,
-	0x0058, 0x0098, 0x038C, 0x078C, 0x0D08, 0x39A4, 0x7FB0, 0xB9C4,
-	0x0905, 0xF5F9, 0x0354, 0xFF02, 0x0061, 0xFFF1, 0x0000, 0x000A,
-	0x0058, 0x0098, 0x038C, 0x078C, 0x0D08, 0x39A4, 0x7FB0, 0xB9C4,
-	0x0905, 0xF5F9, 0x0354, 0xFF02, 0x0061, 0xFFF1, 0x0000, 0x000B,
-	0x005B, 0x00AF, 0x0385, 0x082B, 0x0C2B, 0x3CCB, 0x7FEB, 0xBCE7,
-	0x0A2A, 0xF697, 0x0369, 0xFF1D, 0x005F, 0xFFF2, 0x0000, 0x000B,
-	0x005B, 0x00AF, 0x0385, 0x082B, 0x0C2B, 0x3CCB, 0x7FEB, 0xBCE7,
-	0x0A2A, 0xF697, 0x0369, 0xFF1D, 0x005F, 0xFFF2, 0x0000, 0x000D,
-	0x005D, 0x00C8, 0x037A, 0x08CA, 0x0B37, 0x3FF2, 0x7FFF, 0xC00E,
-	0x0B37, 0xF736, 0x037A, 0xFF38, 0x005D, 0xFFF3, 0x0000, 0x000D,
-	0x005D, 0x00C8, 0x037A, 0x08CA, 0x0B37, 0x3FF2, 0x7FFF, 0xC00E,
-	0x0B37, 0xF736, 0x037A, 0xFF38, 0x005D, 0xFFF3, 0x0000, 0x0000
-};
-
-//static u16 myVector[32][8];
-
-static u8 mp3data[0x1000];
-
-static s32 v[32];
-
-static void MP3AB0 () {
-	// Part 2 - 100% Accurate
-	const u16 LUT2[8] = { 0xFEC4, 0xF4FA, 0xC5E4, 0xE1C4,
-						 0x1916, 0x4A50, 0xA268, 0x78AE };
-	const u16 LUT3[4] = { 0xFB14, 0xD4DC, 0x31F2, 0x8E3A };
-	int i;
-
-	for (i = 0; i < 8; i++) {
-		v[16+i] = v[0+i] + v[8+i];
-		v[24+i] = ((v[0+i] - v[8+i]) * LUT2[i]) >> 0x10;
-	}
-
-	// Part 3: 4-wide butterflies
-
-	for (i=0; i < 4; i++) {
-		v[0+i] = v[16+i] + v[20+i];
-		v[4+i] = ((v[16+i] - v[20+i]) * LUT3[i]) >> 0x10;
-
-		v[8+i] = v[24+i] + v[28+i];
-		v[12+i] = ((v[24+i] - v[28+i]) * LUT3[i]) >> 0x10;
-	}
-
-	// Part 4: 2-wide butterflies - 100% Accurate
-
-	for (i = 0; i < 16; i+=4) {
-		v[16+i] = v[0+i] + v[2+i];
-		v[18+i] = ((v[0+i] - v[2+i]) * 0xEC84) >> 0x10;
-
-		v[17+i] = v[1+i] + v[3+i];
-		v[19+i] = ((v[1+i] - v[3+i]) * 0x61F8) >> 0x10;
-	}
-}
-
-static void InnerLoop ();
-
-	u32 inPtr, outPtr;
-
-	u32 t6;// = 0x08A0; // I think these are temporary storage buffers
-	u32 t5;// = 0x0AC0;
-	u32 t4;// = (inst1 & 0x1E);
-
-void MP3 () {
-	// Initialization Code
-	u32 readPtr; // s5
-	u32 writePtr; // s6
-	//u32 Count = 0x0480; // s4
-	u32 tmp;
-	//u32 inPtr, outPtr;
-	int cnt, cnt2;
-
-	t6 = 0x08A0; // I think these are temporary storage buffers
-	t5 = 0x0AC0;
-	t4 = (inst1 & 0x1E);
-
-	writePtr = inst2 & 0xFFFFFF;
-	readPtr = writePtr;
-	memcpy (mp3data+0xCE8, N64MEM+(readPtr), 8); // Just do that for efficiency... may remove and use directly later anyway
-	readPtr += 8; // This must be a header byte or whatnot
-
-	for (cnt = 0; cnt < 0x480; cnt += 0x180) {
-		memcpy (mp3data+0xCF0, N64MEM+(readPtr), 0x180); // DMA: 0xCF0 <- RDRAM[s5] : 0x180
-		inPtr = 0xCF0; // s7
-		outPtr = 0xE70; // s3
-// --------------- Inner Loop Start --------------------
-		for (cnt2 = 0; cnt2 < 0x180; cnt2 += 0x40) {
-			t6 &= 0xFFE0;
-			t5 &= 0xFFE0;
-			t6 |= t4;
-			t5 |= t4;
-			InnerLoop ();
-			t4 = (t4-2)&0x1E;
-			tmp = t6;
-			t6 = t5;
-			t5 = tmp;
-			//outPtr += 0x40;
-			inPtr += 0x40;
-		}
-// --------------- Inner Loop End --------------------
-		memcpy ((u8*)N64MEM+writePtr, mp3data+0xe70, 0x180);
-		writePtr += 0x180;
-		readPtr += 0x180;
-	}
-}
-
-
-
-static void InnerLoop () {
-				// Part 1: 100% Accurate
-
-				int i;
-				v[0] = *(s16 *)(mp3data+inPtr+(0x00^2)); v[31] = *(s16 *)(mp3data+inPtr+(0x3E^2)); v[0] += v[31];
-				v[1] = *(s16 *)(mp3data+inPtr+(0x02^2)); v[30] = *(s16 *)(mp3data+inPtr+(0x3C^2)); v[1] += v[30];
-				v[2] = *(s16 *)(mp3data+inPtr+(0x06^2)); v[28] = *(s16 *)(mp3data+inPtr+(0x38^2)); v[2] += v[28];
-				v[3] = *(s16 *)(mp3data+inPtr+(0x04^2)); v[29] = *(s16 *)(mp3data+inPtr+(0x3A^2)); v[3] += v[29];
-
-				v[4] = *(s16 *)(mp3data+inPtr+(0x0E^2)); v[24] = *(s16 *)(mp3data+inPtr+(0x30^2)); v[4] += v[24];
-				v[5] = *(s16 *)(mp3data+inPtr+(0x0C^2)); v[25] = *(s16 *)(mp3data+inPtr+(0x32^2)); v[5] += v[25];
-				v[6] = *(s16 *)(mp3data+inPtr+(0x08^2)); v[27] = *(s16 *)(mp3data+inPtr+(0x36^2)); v[6] += v[27];
-				v[7] = *(s16 *)(mp3data+inPtr+(0x0A^2)); v[26] = *(s16 *)(mp3data+inPtr+(0x34^2)); v[7] += v[26];
-
-				v[8] = *(s16 *)(mp3data+inPtr+(0x1E^2)); v[16] = *(s16 *)(mp3data+inPtr+(0x20^2)); v[8] += v[16];
-				v[9] = *(s16 *)(mp3data+inPtr+(0x1C^2)); v[17] = *(s16 *)(mp3data+inPtr+(0x22^2)); v[9] += v[17];
-				v[10]= *(s16 *)(mp3data+inPtr+(0x18^2)); v[19] = *(s16 *)(mp3data+inPtr+(0x26^2)); v[10]+= v[19];
-				v[11]= *(s16 *)(mp3data+inPtr+(0x1A^2)); v[18] = *(s16 *)(mp3data+inPtr+(0x24^2)); v[11]+= v[18];
-
-				v[12]= *(s16 *)(mp3data+inPtr+(0x10^2)); v[23] = *(s16 *)(mp3data+inPtr+(0x2E^2)); v[12]+= v[23];
-				v[13]= *(s16 *)(mp3data+inPtr+(0x12^2)); v[22] = *(s16 *)(mp3data+inPtr+(0x2C^2)); v[13]+= v[22];
-				v[14]= *(s16 *)(mp3data+inPtr+(0x16^2)); v[20] = *(s16 *)(mp3data+inPtr+(0x28^2)); v[14]+= v[20];
-				v[15]= *(s16 *)(mp3data+inPtr+(0x14^2)); v[21] = *(s16 *)(mp3data+inPtr+(0x2A^2)); v[15]+= v[21];
-
-				// Part 2-4
-
-				MP3AB0 ();
-
-				// Part 5 - 1-Wide Butterflies - 100% Accurate but need SSVs!!!
-
-				u32 t0 = t6 + 0x100;
-				u32 t1 = t6 + 0x200;
-				u32 t2 = t5 + 0x100;
-				u32 t3 = t5 + 0x200;
-				/*RSP_GPR[0x8].W = t0;
-				RSP_GPR[0x9].W = t1;
-				RSP_GPR[0xA].W = t2;
-				RSP_GPR[0xB].W = t3;
-
-				RSP_Vect[0].DW[1] = 0xB504A57E00016A09;
-				RSP_Vect[0].DW[0] = 0x0002D4130005A827;
-*/
-				if ((t1 | t2 | t3 | t5 | t6) & 0x1)
-//					__asm int 3;
-					do {} while (0);
-
-				// 0x13A8
-				v[1] = 0;
-				v[11] = ((v[16] - v[17]) * 0xB504) >> 0x10;
-
-				v[16] = -v[16] -v[17];
-				v[2] = v[18] + v[19];
-				// ** Store v[11] -> (T6 + 0)**
-				*(s16 *)(mp3data+((t6+(short)0x0))) = (short)v[11];
-
-
-				v[11] = -v[11];
-				// ** Store v[16] -> (T3 + 0)**
-				*(s16 *)(mp3data+((t3+(short)0x0))) = (short)v[16];
-				// ** Store v[11] -> (T5 + 0)**
-				*(s16 *)(mp3data+((t5+(short)0x0))) = (short)v[11];
-				// 0x13E8 - Verified....
-				v[2] = -v[2];
-				// ** Store v[2] -> (T2 + 0)**
-				*(s16 *)(mp3data+((t2+(short)0x0))) = (short)v[2];
-				v[3] = (((v[18] - v[19]) * 0x16A09) >> 0x10) + v[2];
-				// ** Store v[3] -> (T0 + 0)**
-				*(s16 *)(mp3data+((t0+(short)0x0))) = (short)v[3];
-				// 0x1400 - Verified
-				v[4] = -v[20] -v[21];
-				v[6] = v[22] + v[23];
-				v[5] = ((v[20] - v[21]) * 0x16A09) >> 0x10;
-				// ** Store v[4] -> (T3 + 0xFF80)
-				*(s16 *)(mp3data+((t3+(short)0xFF80))) = (short)v[4];
-				v[7] = ((v[22] - v[23]) * 0x2D413) >> 0x10;
-				v[5] = v[5] - v[4];
-				v[7] = v[7] - v[5];
-				v[6] = v[6] + v[6];
-				v[5] = v[5] - v[6];
-				v[4] = -v[4] - v[6];
-				// *** Store v[7] -> (T1 + 0xFF80)
-				*(s16 *)(mp3data+((t1+(short)0xFF80))) = (short)v[7];
-				// *** Store v[4] -> (T2 + 0xFF80)
-				*(s16 *)(mp3data+((t2+(short)0xFF80))) = (short)v[4];
-				// *** Store v[5] -> (T0 + 0xFF80)
-				*(s16 *)(mp3data+((t0+(short)0xFF80))) = (short)v[5];
-				v[8] = v[24] + v[25];
-
-
-				v[9] = ((v[24] - v[25]) * 0x16A09) >> 0x10;
-				v[2] = v[8] + v[9];
-				v[11] = ((v[26] - v[27]) * 0x2D413) >> 0x10;
-				v[13] = ((v[28] - v[29]) * 0x2D413) >> 0x10;
-
-				v[10] = v[26] + v[27]; v[10] = v[10] + v[10];
-				v[12] = v[28] + v[29]; v[12] = v[12] + v[12];
-				v[14] = v[30] + v[31];
-				v[3] = v[8] + v[10];
-				v[14] = v[14] + v[14];
-				v[13] = (v[13] - v[2]) + v[12];
-				v[15] = (((v[30] - v[31]) * 0x5A827) >> 0x10) - (v[11] + v[2]);
-				v[14] = -(v[14] + v[14]) + v[3];
-				v[17] = v[13] - v[10];
-				v[9] = v[9] + v[14];
-				// ** Store v[9] -> (T6 + 0x40)
-				*(s16 *)(mp3data+((t6+(short)0x40))) = (short)v[9];
-				v[11] = v[11] - v[13];
-				// ** Store v[17] -> (T0 + 0xFFC0)
-				*(s16 *)(mp3data+((t0+(short)0xFFC0))) = (short)v[17];
-				v[12] = v[8] - v[12];
-				// ** Store v[11] -> (T0 + 0x40)
-				*(s16 *)(mp3data+((t0+(short)0x40))) = (short)v[11];
-				v[8] = -v[8];
-				// ** Store v[15] -> (T1 + 0xFFC0)
-				*(s16 *)(mp3data+((t1+(short)0xFFC0))) = (short)v[15];
-				v[10] = -v[10] -v[12];
-				// ** Store v[12] -> (T2 + 0x40)
-				*(s16 *)(mp3data+((t2+(short)0x40))) = (short)v[12];
-				// ** Store v[8] -> (T3 + 0xFFC0)
-				*(s16 *)(mp3data+((t3+(short)0xFFC0))) = (short)v[8];
-				// ** Store v[14] -> (T5 + 0x40)
-				*(s16 *)(mp3data+((t5+(short)0x40))) = (short)v[14];
-				// ** Store v[10] -> (T2 + 0xFFC0)
-				*(s16 *)(mp3data+((t2+(short)0xFFC0))) = (short)v[10];
-				// 0x14FC - Verified...
-
-				// Part 6 - 100% Accurate
-
-				v[0] = *(s16 *)(mp3data+inPtr+(0x00^2)); v[31] = *(s16 *)(mp3data+inPtr+(0x3E^2)); v[0] -= v[31];
-				v[1] = *(s16 *)(mp3data+inPtr+(0x02^2)); v[30] = *(s16 *)(mp3data+inPtr+(0x3C^2)); v[1] -= v[30];
-				v[2] = *(s16 *)(mp3data+inPtr+(0x06^2)); v[28] = *(s16 *)(mp3data+inPtr+(0x38^2)); v[2] -= v[28];
-				v[3] = *(s16 *)(mp3data+inPtr+(0x04^2)); v[29] = *(s16 *)(mp3data+inPtr+(0x3A^2)); v[3] -= v[29];
-
-				v[4] = *(s16 *)(mp3data+inPtr+(0x0E^2)); v[24] = *(s16 *)(mp3data+inPtr+(0x30^2)); v[4] -= v[24];
-				v[5] = *(s16 *)(mp3data+inPtr+(0x0C^2)); v[25] = *(s16 *)(mp3data+inPtr+(0x32^2)); v[5] -= v[25];
-				v[6] = *(s16 *)(mp3data+inPtr+(0x08^2)); v[27] = *(s16 *)(mp3data+inPtr+(0x36^2)); v[6] -= v[27];
-				v[7] = *(s16 *)(mp3data+inPtr+(0x0A^2)); v[26] = *(s16 *)(mp3data+inPtr+(0x34^2)); v[7] -= v[26];
-
-				v[8] = *(s16 *)(mp3data+inPtr+(0x1E^2)); v[16] = *(s16 *)(mp3data+inPtr+(0x20^2)); v[8] -= v[16];
-				v[9] = *(s16 *)(mp3data+inPtr+(0x1C^2)); v[17] = *(s16 *)(mp3data+inPtr+(0x22^2)); v[9] -= v[17];
-				v[10]= *(s16 *)(mp3data+inPtr+(0x18^2)); v[19] = *(s16 *)(mp3data+inPtr+(0x26^2)); v[10]-= v[19];
-				v[11]= *(s16 *)(mp3data+inPtr+(0x1A^2)); v[18] = *(s16 *)(mp3data+inPtr+(0x24^2)); v[11]-= v[18];
-
-				v[12]= *(s16 *)(mp3data+inPtr+(0x10^2)); v[23] = *(s16 *)(mp3data+inPtr+(0x2E^2)); v[12]-= v[23];
-				v[13]= *(s16 *)(mp3data+inPtr+(0x12^2)); v[22] = *(s16 *)(mp3data+inPtr+(0x2C^2)); v[13]-= v[22];
-				v[14]= *(s16 *)(mp3data+inPtr+(0x16^2)); v[20] = *(s16 *)(mp3data+inPtr+(0x28^2)); v[14]-= v[20];
-				v[15]= *(s16 *)(mp3data+inPtr+(0x14^2)); v[21] = *(s16 *)(mp3data+inPtr+(0x2A^2)); v[15]-= v[21];
-
-				//0, 1, 3, 2, 7, 6, 4, 5, 7, 6, 4, 5, 0, 1, 3, 2
-				const u16 LUT6[16] = { 0xFFB2, 0xFD3A, 0xF10A, 0xF854,
-									 0xBDAE, 0xCDA0, 0xE76C, 0xDB94,
-									 0x1920, 0x4B20, 0xAC7C, 0x7C68,
-									 0xABEC, 0x9880, 0xDAE8, 0x839C };
-				for (i = 0; i < 16; i++) {
-					v[0+i] = (v[0+i] * LUT6[i]) >> 0x10;
-				}
-				v[0] = v[0] + v[0];	v[1] = v[1] + v[1];
-				v[2] = v[2] + v[2]; v[3] = v[3] + v[3];	v[4] = v[4] + v[4];
-				v[5] = v[5] + v[5]; v[6] = v[6] + v[6]; v[7] = v[7] + v[7];
-				v[12] = v[12] + v[12]; v[13] = v[13] + v[13]; v[15] = v[15] + v[15];
-
-				MP3AB0 ();
-
-				// Part 7: - 100% Accurate + SSV - Unoptimized
-
-				v[0] = ( v[17] + v[16] ) >> 1;
-				v[1] = ((v[17] * (int)((short)0xA57E * 2)) + (v[16] * 0xB504)) >> 0x10;
-				v[2] = -v[18] -v[19];
-				v[3] = ((v[18] - v[19]) * 0x16A09) >> 0x10;
-				v[4] = v[20] + v[21] + v[0];
-				v[5] = (((v[20] - v[21]) * 0x16A09) >> 0x10) + v[1];
-				v[6] = (((v[22] + v[23]) << 1) + v[0]) - v[2];
-				v[7] = (((v[22] - v[23]) * 0x2D413) >> 0x10) + v[0] + v[1] + v[3];
-				// 0x16A8
-				// Save v[0] -> (T3 + 0xFFE0)
-				*(s16 *)(mp3data+((t3+(short)0xFFE0))) = (short)-v[0];
-				v[8] = v[24] + v[25];
-				v[9] = ((v[24] - v[25]) * 0x16A09) >> 0x10;
-				v[10] = ((v[26] + v[27]) << 1) + v[8];
-				v[11] = (((v[26] - v[27]) * 0x2D413) >> 0x10) + v[8] + v[9];
-				v[12] = v[4] - ((v[28] + v[29]) << 1);
-				// ** Store v12 -> (T2 + 0x20)
-				*(s16 *)(mp3data+((t2+(short)0x20))) = (short)v[12];
-				v[13] = (((v[28] - v[29]) * 0x2D413) >> 0x10) - v[12] - v[5];
-				v[14] = v[30] + v[31];
-				v[14] = v[14] + v[14];
-				v[14] = v[14] + v[14];
-				v[14] = v[6] - v[14];
-				v[15] = (((v[30] - v[31]) * 0x5A827) >> 0x10) - v[7];
-				// Store v14 -> (T5 + 0x20)
-				*(s16 *)(mp3data+((t5+(short)0x20))) = (short)v[14];
-				v[14] = v[14] + v[1];
-				// Store v[14] -> (T6 + 0x20)
-				*(s16 *)(mp3data+((t6+(short)0x20))) = (short)v[14];
-				// Store v[15] -> (T1 + 0xFFE0)
-				*(s16 *)(mp3data+((t1+(short)0xFFE0))) = (short)v[15];
-				v[9] = v[9] + v[10];
-				v[1] = v[1] + v[6];
-				v[6] = v[10] - v[6];
-				v[1] = v[9] - v[1];
-				// Store v[6] -> (T5 + 0x60)
-				*(s16 *)(mp3data+((t5+(short)0x60))) = (short)v[6];
-				v[10] = v[10] + v[2];
-				v[10] = v[4] - v[10];
-				// Store v[10] -> (T2 + 0xFFA0)
-				*(s16 *)(mp3data+((t2+(short)0xFFA0))) = (short)v[10];
-				v[12] = v[2] - v[12];
-				// Store v[12] -> (T2 + 0xFFE0)
-				*(s16 *)(mp3data+((t2+(short)0xFFE0))) = (short)v[12];
-				v[5] = v[4] + v[5];
-				v[4] = v[8] - v[4];
-				// Store v[4] -> (T2 + 0x60)
-				*(s16 *)(mp3data+((t2+(short)0x60))) = (short)v[4];
-				v[0] = v[0] - v[8];
-				// Store v[0] -> (T3 + 0xFFA0)
-				*(s16 *)(mp3data+((t3+(short)0xFFA0))) = (short)v[0];
-				v[7] = v[7] - v[11];
-				// Store v[7] -> (T1 + 0xFFA0)
-				*(s16 *)(mp3data+((t1+(short)0xFFA0))) = (short)v[7];
-				v[11] = v[11] - v[3];
-				// Store v[1] -> (T6 + 0x60)
-				*(s16 *)(mp3data+((t6+(short)0x60))) = (short)v[1];
-				v[11] = v[11] - v[5];
-				// Store v[11] -> (T0 + 0x60)
-				*(s16 *)(mp3data+((t0+(short)0x60))) = (short)v[11];
-				v[3] = v[3] - v[13];
-				// Store v[3] -> (T0 + 0x20)
-				*(s16 *)(mp3data+((t0+(short)0x20))) = (short)v[3];
-				v[13] = v[13] + v[2];
-				// Store v[13] -> (T0 + 0xFFE0)
-				*(s16 *)(mp3data+((t0+(short)0xFFE0))) = (short)v[13];
-				//v[2] = ;
-				v[2] = (v[5] - v[2]) - v[9];
-				// Store v[2] -> (T0 + 0xFFA0)
-				*(s16 *)(mp3data+((t0+(short)0xFFA0))) = (short)v[2];
-				// 0x7A8 - Verified...
-
-				// Step 8 - Dewindowing
-
-				//u64 *DW = (u64 *)&DeWindowLUT[0x10-(t4>>1)];
-				u32 offset = 0x10-(t4>>1);
-
-				u32 addptr = t6 & 0xFFE0;
-				offset = 0x10-(t4>>1);
-
-				s32 v2=0, v4=0, v6=0, v8=0;
-				//s32 z2=0, z4=0, z6=0, z8=0;
-
-				offset = 0x10-(t4>>1);// + x*0x40;
-				int x;
-				for (x = 0; x < 8; x++) {
-					v2 = v4 = v6 = v8 = 0;
-
-					//addptr = t1;
-
-					for (i = 7; i >= 0; i--) {
-						v2 += ((int)*(s16 *)(mp3data+(addptr)+0x00) * (short)DeWindowLUT[offset+0x00] + 0x4000) >> 0xF;
-						v4 += ((int)*(s16 *)(mp3data+(addptr)+0x10) * (short)DeWindowLUT[offset+0x08] + 0x4000) >> 0xF;
-						v6 += ((int)*(s16 *)(mp3data+(addptr)+0x20) * (short)DeWindowLUT[offset+0x20] + 0x4000) >> 0xF;
-						v8 += ((int)*(s16 *)(mp3data+(addptr)+0x30) * (short)DeWindowLUT[offset+0x28] + 0x4000) >> 0xF;
-						addptr+=2; offset++;
-					}
-					s32 v0 = v2 + v4;
-					s32 v18 = v6 + v8;
-					//Clamp(v0);
-					//Clamp(v18);
-					// clamp???
-					*(s16 *)(mp3data+(outPtr^2)) = v0;
-					*(s16 *)(mp3data+((outPtr+2)^2)) = v18;
-					outPtr+=4;
-					addptr += 0x30;
-					offset += 0x38;
-				}
-
-				offset = 0x10-(t4>>1) + 8*0x40;
-				v2 = v4 = 0;
-				for (i = 0; i < 4; i++) {
-					v2 += ((int)*(s16 *)(mp3data+(addptr)+0x00) * (short)DeWindowLUT[offset+0x00] + 0x4000) >> 0xF;
-					v2 += ((int)*(s16 *)(mp3data+(addptr)+0x10) * (short)DeWindowLUT[offset+0x08] + 0x4000) >> 0xF;
-					addptr+=2; offset++;
-					v4 += ((int)*(s16 *)(mp3data+(addptr)+0x00) * (short)DeWindowLUT[offset+0x00] + 0x4000) >> 0xF;
-					v4 += ((int)*(s16 *)(mp3data+(addptr)+0x10) * (short)DeWindowLUT[offset+0x08] + 0x4000) >> 0xF;
-					addptr+=2; offset++;
-				}
-				s32 mult6 = *(s32 *)(mp3data+0xCE8);
-				s32 mult4 = *(s32 *)(mp3data+0xCEC);
-				if (t4 & 0x2) {
-					v2 = (v2 * *(u32 *)(mp3data+0xCE8)) >> 0x10;
-					*(s16 *)(mp3data+(outPtr^2)) = v2;
-				} else {
-					v4 = (v4 * *(u32 *)(mp3data+0xCE8)) >> 0x10;
-					*(s16 *)(mp3data+(outPtr^2)) = v4;
-					mult4 = *(u32 *)(mp3data+0xCE8);
-				}
-				addptr -= 0x50;
-
-				for (x = 0; x < 8; x++) {
-					v2 = v4 = v6 = v8 = 0;
-
-					offset = (0x22F-(t4>>1) + x*0x40);
-
-					for (i = 0; i < 4; i++) {
-						v2 += ((int)*(s16 *)(mp3data+(addptr )+0x20) * (short)DeWindowLUT[offset+0x00] + 0x4000) >> 0xF;
-						v2 -= ((int)*(s16 *)(mp3data+((addptr+2))+0x20) * (short)DeWindowLUT[offset+0x01] + 0x4000) >> 0xF;
-						v4 += ((int)*(s16 *)(mp3data+(addptr )+0x30) * (short)DeWindowLUT[offset+0x08] + 0x4000) >> 0xF;
-						v4 -= ((int)*(s16 *)(mp3data+((addptr+2))+0x30) * (short)DeWindowLUT[offset+0x09] + 0x4000) >> 0xF;
-						v6 += ((int)*(s16 *)(mp3data+(addptr )+0x00) * (short)DeWindowLUT[offset+0x20] + 0x4000) >> 0xF;
-						v6 -= ((int)*(s16 *)(mp3data+((addptr+2))+0x00) * (short)DeWindowLUT[offset+0x21] + 0x4000) >> 0xF;
-						v8 += ((int)*(s16 *)(mp3data+(addptr )+0x10) * (short)DeWindowLUT[offset+0x28] + 0x4000) >> 0xF;
-						v8 -= ((int)*(s16 *)(mp3data+((addptr+2))+0x10) * (short)DeWindowLUT[offset+0x29] + 0x4000) >> 0xF;
-						addptr+=4; offset+=2;
-					}
-					s32 v0 = v2 + v4;
-					s32 v18 = v6 + v8;
-					//Clamp(v0);
-					//Clamp(v18);
-					// clamp???
-					*(s16 *)(mp3data+((outPtr+2)^2)) = v0;
-					*(s16 *)(mp3data+((outPtr+4)^2)) = v18;
-					outPtr+=4;
-					addptr -= 0x50;
-				}
-
-				int tmp = outPtr;
-				s32 hi0 = mult6;
-				s32 hi1 = mult4;
-				s32 v;
-				/*
-				if (hi0 & 0xffff)
-					__asm int 3;
-				if (hi1 & 0xffff)
-					__asm int 3;*/
-				hi0 = (int)hi0 >> 0x10;
-				hi1 = (int)hi1 >> 0x10;
-				for (i = 0; i < 8; i++) {
-					// v0
-					v = (*(s16 *)(mp3data+((tmp-0x40)^2)) * hi0);
-					if (v > 32767) v = 32767; else if (v < -32767) v = -32767;
-					*(s16 *)((u8 *)mp3data+((tmp-0x40)^2)) = (s16)v;
-					// v17
-					v = (*(s16 *)(mp3data+((tmp-0x30)^2)) * hi0);
-					if (v > 32767) v = 32767; else if (v < -32767) v = -32767;
-					*(s16 *)((u8 *)mp3data+((tmp-0x30)^2)) = v;
-					// v2
-					v = (*(s16 *)(mp3data+((tmp-0x1E)^2)) * hi1);
-					if (v > 32767) v = 32767; else if (v < -32767) v = -32767;
-					*(s16 *)((u8 *)mp3data+((tmp-0x1E)^2)) = v;
-					// v4
-					v = (*(s16 *)(mp3data+((tmp-0xE)^2)) * hi1);
-					if (v > 32767) v = 32767; else if (v < -32767) v = -32767;
-					*(s16 *)((u8 *)mp3data+((tmp-0xE)^2)) = v;
-					tmp += 2;
-				}
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/config.h Deleted

@@ -1,63 +0,0 @@
-/* config.h. Generated from config.h.in by configure. */
-/* config.h.in. Generated from configure.in by autoheader. */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "lazyusf"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "lazyusf"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "lazyusf 1.0.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "lazyusf"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.0"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "1.0.0"
-
-/* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */

audacious-plugins-3.1.1.tar.bz2/src/usf/cpu.c Deleted

@@ -1,640 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include <stdint.h>
-#include "main.h"
-#include "cpu.h"
-#include "usf.h"
-#include "audio.h"
-#include "audio_hle.h"
-#include "recompiler_cpu.h"
-#include "x86.h"
-#include "registers.h"
-#include "rsp.h"
-
-#include <audacious/plugin.h>
-
-#include <unistd.h>
-#include <pthread.h>
-#include <stdlib.h>
-extern InputPlayback * pcontext;
-extern GThread * decode_thread;
-
-uint32_t NextInstruction = 0, JumpToLocation = 0, AudioIntrReg = 0;
-CPU_ACTION * CPU_Action = 0;
-SYSTEM_TIMERS * Timers = 0;
-OPCODE Opcode;
-uint32_t CPURunning = 0, SPHack = 0;
-uint32_t * WaitMode = 0, CPU_Type = CPU_Recompiler;
-
-
-void ChangeCompareTimer(void) {
-	uint32_t NextCompare = COMPARE_REGISTER - COUNT_REGISTER;
-	if ((NextCompare & 0x80000000) != 0) { NextCompare = 0x7FFFFFFF; }
-	if (NextCompare == 0) { NextCompare = 0x1; }
-	ChangeTimer(CompareTimer,NextCompare);
-}
-
-void ChangeTimer(int32_t Type, int32_t Value) {
-	if (Value == 0) {
-		Timers->NextTimer[Type] = 0;
-		Timers->Active[Type] = 0;
-		return;
-	}
-	Timers->NextTimer[Type] = Value - Timers->Timer;
-	Timers->Active[Type] = 1;
-	CheckTimer();
-}
-
-void CheckTimer (void) {
-	int32_t count;
-
-	for (count = 0; count < MaxTimers; count++) {
-		if (!Timers->Active[count]) { continue; }
-		if (!(count == CompareTimer && Timers->NextTimer[count] == 0x7FFFFFFF)) {
-			Timers->NextTimer[count] += Timers->Timer;
-		}
-	}
-	Timers->CurrentTimerType = -1;
-	Timers->Timer = 0x7FFFFFFF;
-	for (count = 0; count < MaxTimers; count++) {
-		if (!Timers->Active[count]) { continue; }
-		if (Timers->NextTimer[count] >= Timers->Timer) { continue; }
-		Timers->Timer = Timers->NextTimer[count];
-		Timers->CurrentTimerType = count;
-	}
-	if (Timers->CurrentTimerType == -1) {
-		DisplayError("No active timers ???\nEmulation Stoped");
-		StopEmulation();
-	}
-	for (count = 0; count < MaxTimers; count++) {
-		if (!Timers->Active[count]) { continue; }
-		if (!(count == CompareTimer && Timers->NextTimer[count] == 0x7FFFFFFF)) {
-			Timers->NextTimer[count] -= Timers->Timer;
-		}
-	}
-
-	if (Timers->NextTimer[CompareTimer] == 0x7FFFFFFF) {
-		uint32_t NextCompare = COMPARE_REGISTER - COUNT_REGISTER;
-		if ((NextCompare & 0x80000000) == 0 && NextCompare != 0x7FFFFFFF) {
-			ChangeCompareTimer();
-		}
-	}
-}
-
-
-
-void CloseCpu (void) {
-	uint32_t count = 0;
-
-	if(!MemChunk) return;
-	if (!cpu_running) { return; }
-
-	cpu_running = 0;
-	g_print("cpu_running = %d\n", cpu_running);
-
-	for (count = 0; count < 3; count ++ ) {
-		CPU_Action->CloseCPU = 1;
-		CPU_Action->DoSomething = 1;
-	}
-
-	CPURunning = 0;
-}
-
-int32_t DelaySlotEffectsCompare (uint32_t PC, uint32_t Reg1, uint32_t Reg2) {
-	OPCODE Command;
-
-	if (!r4300i_LW_VAddr(PC + 4, (uint32_t*)&Command.Hex)) {
-		return 1;
-	}
-
-	switch (Command.op) {
-	case R4300i_SPECIAL:
-		switch (Command.funct) {
-		case R4300i_SPECIAL_SLL:
-		case R4300i_SPECIAL_SRL:
-		case R4300i_SPECIAL_SRA:
-		case R4300i_SPECIAL_SLLV:
-		case R4300i_SPECIAL_SRLV:
-		case R4300i_SPECIAL_SRAV:
-		case R4300i_SPECIAL_MFHI:
-		case R4300i_SPECIAL_MTHI:
-		case R4300i_SPECIAL_MFLO:
-		case R4300i_SPECIAL_MTLO:
-		case R4300i_SPECIAL_DSLLV:
-		case R4300i_SPECIAL_DSRLV:
-		case R4300i_SPECIAL_DSRAV:
-		case R4300i_SPECIAL_ADD:
-		case R4300i_SPECIAL_ADDU:
-		case R4300i_SPECIAL_SUB:
-		case R4300i_SPECIAL_SUBU:
-		case R4300i_SPECIAL_AND:
-		case R4300i_SPECIAL_OR:
-		case R4300i_SPECIAL_XOR:
-		case R4300i_SPECIAL_NOR:
-		case R4300i_SPECIAL_SLT:
-		case R4300i_SPECIAL_SLTU:
-		case R4300i_SPECIAL_DADD:
-		case R4300i_SPECIAL_DADDU:
-		case R4300i_SPECIAL_DSUB:
-		case R4300i_SPECIAL_DSUBU:
-		case R4300i_SPECIAL_DSLL:
-		case R4300i_SPECIAL_DSRL:
-		case R4300i_SPECIAL_DSRA:
-		case R4300i_SPECIAL_DSLL32:
-		case R4300i_SPECIAL_DSRL32:
-		case R4300i_SPECIAL_DSRA32:
-			if (Command.rd == 0) { return 0; }
-			if (Command.rd == Reg1) { return 1; }
-			if (Command.rd == Reg2) { return 1; }
-			break;
-		case R4300i_SPECIAL_MULT:
-		case R4300i_SPECIAL_MULTU:
-		case R4300i_SPECIAL_DIV:
-		case R4300i_SPECIAL_DIVU:
-		case R4300i_SPECIAL_DMULT:
-		case R4300i_SPECIAL_DMULTU:
-		case R4300i_SPECIAL_DDIV:
-		case R4300i_SPECIAL_DDIVU:
-			break;
-		default:
-			return 1;
-		}
-		break;
-	case R4300i_CP0:
-		switch (Command.rs) {
-		case R4300i_COP0_MT: break;
-		case R4300i_COP0_MF:
-			if (Command.rt == 0) { return 0; }
-			if (Command.rt == Reg1) { return 1; }
-			if (Command.rt == Reg2) { return 1; }
-			break;
-		default:
-			if ( (Command.rs & 0x10 ) != 0 ) {
-				switch( Opcode.funct ) {
-				case R4300i_COP0_CO_TLBR: break;
-				case R4300i_COP0_CO_TLBWI: break;
-				case R4300i_COP0_CO_TLBWR: break;
-				case R4300i_COP0_CO_TLBP: break;
-				default:
-					return 1;
-				}
-				return 1;
-			}
-		}
-		break;
-	case R4300i_CP1:
-		switch (Command.fmt) {
-		case R4300i_COP1_MF:
-			if (Command.rt == 0) { return 0; }
-			if (Command.rt == Reg1) { return 1; }
-			if (Command.rt == Reg2) { return 1; }
-			break;
-		case R4300i_COP1_CF: break;
-		case R4300i_COP1_MT: break;
-		case R4300i_COP1_CT: break;
-		case R4300i_COP1_S: break;
-		case R4300i_COP1_D: break;
-		case R4300i_COP1_W: break;
-		case R4300i_COP1_L: break;
-			return 1;
-		}
-		break;
-	case R4300i_ANDI:
-	case R4300i_ORI:
-	case R4300i_XORI:
-	case R4300i_LUI:
-	case R4300i_ADDI:
-	case R4300i_ADDIU:
-	case R4300i_SLTI:
-	case R4300i_SLTIU:
-	case R4300i_DADDI:
-	case R4300i_DADDIU:
-	case R4300i_LB:
-	case R4300i_LH:
-	case R4300i_LW:
-	case R4300i_LWL:
-	case R4300i_LWR:
-	case R4300i_LDL:
-	case R4300i_LDR:
-	case R4300i_LBU:
-	case R4300i_LHU:
-	case R4300i_LD:
-	case R4300i_LWC1:
-	case R4300i_LDC1:
-		if (Command.rt == 0) { return 0; }
-		if (Command.rt == Reg1) { return 1; }
-		if (Command.rt == Reg2) { return 1; }
-		break;
-	case R4300i_CACHE: break;
-	case R4300i_SB: break;
-	case R4300i_SH: break;
-	case R4300i_SW: break;
-	case R4300i_SWR: break;
-	case R4300i_SWL: break;
-	case R4300i_SWC1: break;
-	case R4300i_SDC1: break;
-	case R4300i_SD: break;
-	default:
-
-		return 1;
-	}
-	return 0;
-}
-
-int32_t DelaySlotEffectsJump (uint32_t JumpPC) {
-	OPCODE Command;
-
-	if (!r4300i_LW_VAddr(JumpPC, &Command.Hex)) { return 1; }
-
-	switch (Command.op) {
-	case R4300i_SPECIAL:
-		switch (Command.funct) {
-		case R4300i_SPECIAL_JR:	return DelaySlotEffectsCompare(JumpPC,Command.rs,0);
-		case R4300i_SPECIAL_JALR: return DelaySlotEffectsCompare(JumpPC,Command.rs,31);
-		}
-		break;
-	case R4300i_REGIMM:
-		switch (Command.rt) {
-		case R4300i_REGIMM_BLTZ:
-		case R4300i_REGIMM_BGEZ:
-		case R4300i_REGIMM_BLTZL:
-		case R4300i_REGIMM_BGEZL:
-		case R4300i_REGIMM_BLTZAL:
-		case R4300i_REGIMM_BGEZAL:
-			return DelaySlotEffectsCompare(JumpPC,Command.rs,0);
-		}
-		break;
-	case R4300i_JAL:
-	case R4300i_SPECIAL_JALR: return DelaySlotEffectsCompare(JumpPC,31,0); break;
-	case R4300i_J: return 0;
-	case R4300i_BEQ:
-	case R4300i_BNE:
-	case R4300i_BLEZ:
-	case R4300i_BGTZ:
-		return DelaySlotEffectsCompare(JumpPC,Command.rs,Command.rt);
-	case R4300i_CP1:
-		switch (Command.fmt) {
-		case R4300i_COP1_BC:
-			switch (Command.ft) {
-			case R4300i_COP1_BC_BCF:
-			case R4300i_COP1_BC_BCT:
-			case R4300i_COP1_BC_BCFL:
-			case R4300i_COP1_BC_BCTL:
-				{
-					int32_t EffectDelaySlot;
-					OPCODE NewCommand;
-
-					if (!r4300i_LW_VAddr(JumpPC + 4, &NewCommand.Hex)) { return 1; }
-
-					EffectDelaySlot = 0;
-					if (NewCommand.op == R4300i_CP1) {
-						if (NewCommand.fmt == R4300i_COP1_S && (NewCommand.funct & 0x30) == 0x30 ) {
-							EffectDelaySlot = 1;
-						}
-						if (NewCommand.fmt == R4300i_COP1_D && (NewCommand.funct & 0x30) == 0x30 ) {
-							EffectDelaySlot = 1;
-						}
-					}
-					return EffectDelaySlot;
-				}
-				break;
-			}
-			break;
-		}
-		break;
-	case R4300i_BEQL:
-	case R4300i_BNEL:
-	case R4300i_BLEZL:
-	case R4300i_BGTZL:
-		return DelaySlotEffectsCompare(JumpPC,Command.rs,Command.rt);
-	}
-	return 1;
-}
-
-void DoSomething ( void ) {
-	if (CPU_Action->CloseCPU) {
-		//StopEmulation();
-		cpu_running = 0;
-		//printf("Stopping?\n");
-		if(!(fake_seek_stopping&3))
-			g_thread_exit(NULL);
-	}
-	if (CPU_Action->CheckInterrupts) {
-		CPU_Action->CheckInterrupts = 0;
-		CheckInterrupts();
-	}
-	if (CPU_Action->DoInterrupt) {
-		CPU_Action->DoInterrupt = 0;
-		DoIntrException(0);
-	}
-
-
-	CPU_Action->DoSomething = 0;
-
-	if (CPU_Action->DoInterrupt) { CPU_Action->DoSomething = 1; }
-}
-
-void InPermLoop (void) {
-	// *** Changed ***/
-	if (CPU_Action->DoInterrupt) { return; }
-
-	/* Interrupts enabled */
-	if (( STATUS_REGISTER & STATUS_IE ) == 0 ) { goto InterruptsDisabled; }
-	if (( STATUS_REGISTER & STATUS_EXL ) != 0 ) { goto InterruptsDisabled; }
-	if (( STATUS_REGISTER & STATUS_ERL ) != 0 ) { goto InterruptsDisabled; }
-	if (( STATUS_REGISTER & 0xFF00) == 0) { goto InterruptsDisabled; }
-
-	/* check sound playing */
-
-	/* check RSP running */
-	/* check RDP running */
-	if (Timers->Timer >= 0) {
-		COUNT_REGISTER += Timers->Timer + 1;
-		Timers->Timer = -1;
-	}
-	return;
-
-InterruptsDisabled:
-	DisplayError("Stuck in Permanent Loop");
-	StopEmulation();
-}
-
-void ReadFromMem(const void * source, void * target, uint32_t length, uint32_t *offset) {
-	memcpy((uint8_t*)target,((uint8_t*)source)+*offset,length);
-	*offset+=length;
-}
-
-
-uint32_t Machine_LoadStateFromRAM(void * savestatespace) {
-	uint8_t LoadHeader[0x40];
-	uint32_t Value, count, SaveRDRAMSize, offset=0;
-
-	ReadFromMem( savestatespace,&Value,sizeof(Value),&offset);
-	if (Value != 0x23D8A6C8) { return 0; }
-	ReadFromMem( savestatespace,&SaveRDRAMSize,sizeof(SaveRDRAMSize),&offset);
-	ReadFromMem( savestatespace,&LoadHeader,0x40,&offset);
-
-	if (CPU_Type != CPU_Interpreter) {
-		ResetRecompCode();
-	}
-
-	Timers->CurrentTimerType = -1;
-	Timers->Timer = 0;
-	for (count = 0; count < MaxTimers; count ++) { Timers->Active[count] = 0; }
-
-	//fix rdram size
-	if (SaveRDRAMSize != RdramSize) {
-		// dothis :)
-	}		
-
-	RdramSize = SaveRDRAMSize;
-
-	ReadFromMem( savestatespace,&Value,sizeof(Value),&offset);
-	ChangeTimer(ViTimer,Value);
-	ReadFromMem( savestatespace,&PROGRAM_COUNTER,sizeof(PROGRAM_COUNTER),&offset);
-	ReadFromMem( savestatespace,GPR,sizeof(int64_t)*32,&offset);
-	ReadFromMem( savestatespace,FPR,sizeof(int64_t)*32,&offset);
-	ReadFromMem( savestatespace,CP0,sizeof(uint32_t)*32,&offset);
-	ReadFromMem( savestatespace,FPCR,sizeof(uint32_t)*32,&offset);
-	ReadFromMem( savestatespace,&HI,sizeof(int64_t),&offset);
-	ReadFromMem( savestatespace,&LO,sizeof(int64_t),&offset);
-	ReadFromMem( savestatespace,RegRDRAM,sizeof(uint32_t)*10,&offset);
-	ReadFromMem( savestatespace,RegSP,sizeof(uint32_t)*10,&offset);
-	ReadFromMem( savestatespace,RegDPC,sizeof(uint32_t)*10,&offset);
-	ReadFromMem( savestatespace,RegMI,sizeof(uint32_t)*4,&offset);
-	ReadFromMem( savestatespace,RegVI,sizeof(uint32_t)*14,&offset);
-	ReadFromMem( savestatespace,RegAI,sizeof(uint32_t)*6,&offset);
-	ReadFromMem( savestatespace,RegPI,sizeof(uint32_t)*13,&offset);
-	ReadFromMem( savestatespace,RegRI,sizeof(uint32_t)*8,&offset);
-	ReadFromMem( savestatespace,RegSI,sizeof(uint32_t)*4,&offset);
-	ReadFromMem( savestatespace,tlb,sizeof(TLB)*32,&offset);
-	ReadFromMem( savestatespace,(uint8_t*)PIF_Ram,0x40,&offset);
-	ReadFromMem( savestatespace,RDRAM,SaveRDRAMSize,&offset);
-	ReadFromMem( savestatespace,DMEM,0x1000,&offset);
-	ReadFromMem( savestatespace,IMEM,0x1000,&offset);
-
-	CP0[32] = 0;
-
-	SetupTLB();
-	ChangeCompareTimer();
-	AI_STATUS_REG = 0;
-	AiDacrateChanged(AI_DACRATE_REG);
-
-//	StartAiInterrupt();
-
-	SetFpuLocations(); // important if FR=1
-
-	return 1;
-}
-extern int32_t RSP_Cpu;
-extern int32_t SampleRate;
-void StartEmulationFromSave ( void * savestate ) {
-	uint32_t count = 0;
-	if(use_interpreter)
-		CPU_Type = CPU_Interpreter;
-	
-	//printf("Starting generic Cpu\n");
-
-	//CloseCpu();
-	memset(N64MEM, 0, RdramSize);	
-	
-	memset(DMEM, 0, 0x1000);
-	memset(IMEM, 0, 0x1000);
-	memset(TLB_Map, 0, 0x100000 * sizeof(uintptr_t) + 0x10000);
-	if(!use_interpreter) {
-		memset(JumpTable, 0, 0x200000 * sizeof(uintptr_t));
-		memset(RecompCode, 0xcc, NormalCompileBufferSize);	// fill with Breakpoints
-		memset(DelaySlotTable, 0, ((0x1000000) >> 0xA));
-	}
-
-	memset(CPU_Action,0,sizeof(CPU_Action));
-	WrittenToRom = 0;
-
-	InitilizeTLB();
-
-	SetupRegisters(Registers);
-
-	BuildInterpreter();
-	RecompPos = RecompCode;
-
-	Timers->CurrentTimerType = -1;
-	Timers->Timer = 0;
-
-	for (count = 0; count < MaxTimers; count ++) { Timers->Active[count] = 0; }
-	ChangeTimer(ViTimer,5000);
-	ChangeCompareTimer();
-	ViFieldNumber = 0;
-	CPURunning = 1;
-	*WaitMode = 0;
-
-	init_rsp();
-
-	Machine_LoadStateFromRAM(savestate);
-
-	SampleRate = 48681812 / (AI_DACRATE_REG + 1);
-
-	OpenSound();
-	
-	pcontext->set_params(pcontext, SampleRate * 4, SampleRate, 2);	
-
-	if(enableFIFOfull) {
-		const float VSyncTiming = 789000.0f;
-		double BytesPerSecond = 48681812.0 / (AI_DACRATE_REG + 1) * 4;
-		double CountsPerSecond = (double)(((double)VSyncTiming) * (double)60.0);
-		double CountsPerByte = (double)CountsPerSecond / (double)BytesPerSecond;
-		uint32_t IntScheduled = (uint32_t)((double)AI_LEN_REG * CountsPerByte);
-
-		ChangeTimer(AiTimer,IntScheduled);
-		AI_STATUS_REG|=0x40000000;
-	}
-
- cpu_stopped = 0;
-	cpu_running = 1;
-	fake_seek_stopping = 0;
-
-	switch (CPU_Type) {
-		case CPU_Interpreter: StartInterpreterCPU(); break;
-		case CPU_Recompiler: StartRecompilerCPU(); break;
-	default:
-		DisplayError("Unhandled CPU %d",CPU_Type);
-	}
-
-}
-
-
-void RefreshScreen (void ){
-	ChangeTimer(ViTimer, 300000);
-
-}
-
-void RunRsp (void) {
-	if ( ( SP_STATUS_REG & SP_STATUS_HALT ) == 0) {
-		if ( ( SP_STATUS_REG & SP_STATUS_BROKE ) == 0 ) {
-
-			uint32_t Task = *( uint32_t *)(DMEM + 0xFC0);
-
-			switch (Task) {
-			case 1:	{
-					MI_INTR_REG |= 0x20;
-
-					SP_STATUS_REG |= (0x0203 );
-					if ((SP_STATUS_REG & SP_STATUS_INTR_BREAK) != 0 )
-						MI_INTR_REG |= 1;
-
-					CheckInterrupts();
-
-					DPC_STATUS_REG &= ~0x0002;
-					return;
-
-				}
-				break;
-			case 2: {
-
-					if(use_audiohle && !is_seeking) {
-						OSTask_t *task = (OSTask_t*)(DMEM + 0xFC0);
-						if(audio_ucode(task))
-							break;
-
-					} else
-						break;
-
-					SP_STATUS_REG |= (0x0203 );
-					if ((SP_STATUS_REG & SP_STATUS_INTR_BREAK) != 0 ) {
-						MI_INTR_REG |= 1;
-						CheckInterrupts();
-					}
-
- return;
-
-				}
-				break;
-			default:
-
-				break;
-			}
-
-			if(!is_seeking)
-				real_run_rsp(100);
-			SP_STATUS_REG |= (0x0203 );
-			if ((SP_STATUS_REG & SP_STATUS_INTR_BREAK) != 0 ) {
-				MI_INTR_REG |= 1;
-				CheckInterrupts();
-			}
-
-		}
-	}
-}
-
-void TimerDone (void) {
-	switch (Timers->CurrentTimerType) {
-	case CompareTimer:
-		if(enablecompare)
-			FAKE_CAUSE_REGISTER |= CAUSE_IP7;
-		//CheckInterrupts();
-		ChangeCompareTimer();
-		break;
-	case ViTimer:
-		RefreshScreen();
-		MI_INTR_REG |= MI_INTR_VI;
-		CheckInterrupts();
-		//CompileCheckInterrupts();
-		*WaitMode=0;
-		break;
-	case AiTimer:
-		ChangeTimer(AiTimer,0);
-		AI_STATUS_REG=0;
- AudioIntrReg|=4;
-		//CheckInterrupts();
-		break;
-	}
-	CheckTimer();
-}
-
-void Int3() {
-	asm("int $3");
-}
-
-void _Emms() {
-	asm("emms");
-}
-
-
-
-#include <fpu_control.h>
-
-void controlfp(uint32_t control) {
-	uint32_t OldControl = 0;
-
-	_FPU_GETCW(OldControl);
-	OldControl &= ~(_FPU_RC_ZERO | _FPU_RC_UP | _FPU_RC_DOWN | _FPU_RC_NEAREST);
-
-	OldControl |= control;
-
-	_FPU_SETCW(OldControl);
-
-}
-

audacious-plugins-3.1.1.tar.bz2/src/usf/cpu.h Deleted

@@ -1,108 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#ifndef _CPU_H_
-#define _CPU_H_
-
-#include "interpreter_cpu.h"
-#include "interpreter_ops.h"
-#include "recompiler_cpu.h"
-#include "registers.h"
-#include "recompiler_ops.h"
-#include "tlb.h"
-#include "memory.h"
-#include "dma.h"
-#include "exception.h"
-#include "pif.h"
-#include "opcode.h"
-#include "usf.h"
-
-#ifdef __LP64__
-#define USEX86
-#define EXTREGS
-#endif
-
-typedef struct {
-	int32_t DoSomething;
-	int32_t CloseCPU;
-	int32_t CheckInterrupts;
-	int32_t DoInterrupt;
-} CPU_ACTION;
-
-#define MaxTimers				3
-#define CompareTimer			0
-#define ViTimer					1
-#define AiTimer					2
-
-typedef struct {
-	int32_t NextTimer[MaxTimers];
-	int32_t Active[MaxTimers];
-	int32_t CurrentTimerType;
-	int32_t Timer;
-} SYSTEM_TIMERS;
-
-void ChangeCompareTimer ( void );
-void ChangeTimer        ( int32_t Type, int32_t Value );
-void CheckTimer         ( void );
-void CloseCpu           ( void );
-int32_t  DelaySlotEffectsCompare ( uint32_t PC, uint32_t Reg1, uint32_t Reg2 );
-int32_t  DelaySlotEffectsJump (uint32_t JumpPC);
-void DoSomething        ( void );
-void InPermLoop         ( void );
-void InitiliazeCPUFlags ( void );
-void RefreshScreen      ( void );
-void RunRsp             ( void );
-void StartEmulation     ( void );
-void TimerDone          ( void );
-void RecompileTimerDone ( void );
-void controlfp			(uint32_t mask);
-void StartEmulationFromSave ( void * savestate );
-
-#define NORMAL					0
-#define DO_DELAY_SLOT			1
-#define DO_END_DELAY_SLOT		2
-#define DELAY_SLOT				3
-#define END_DELAY_SLOT			4
-#define LIKELY_DELAY_SLOT		5
-#define JUMP	 				6
-#define DELAY_SLOT_DONE			7
-#define LIKELY_DELAY_SLOT_DONE	8
-#define END_BLOCK 				9
-
-enum SaveType {
-	Auto,
-	Eeprom_4K,
-	Eeprom_16K,
-	Sram,
-	FlashRam
-};
-
-
-extern uint32_t NextInstruction, JumpToLocation, ManualPaused, CPU_Paused, CountPerOp, AudioIntrReg, * WaitMode, CPU_Type;
-extern CPU_ACTION * CPU_Action;
-extern SYSTEM_TIMERS * Timers;
-extern OPCODE Opcode;
-extern uint32_t CPURunning;
-#endif

audacious-plugins-3.1.1.tar.bz2/src/usf/dma.c Deleted

@@ -1,177 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#include "main.h"
-#include "cpu.h"
-
-void PI_DMA_READ (void) {
-
-	PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
-	MI_INTR_REG |= MI_INTR_PI;
-	CheckInterrupts();
-	return;
-}
-
-#include <stdio.h>
-extern FILE *fil;
-void PI_DMA_WRITE (void) {
-	uint32_t i;
-	PI_STATUS_REG |= PI_STATUS_DMA_BUSY;
-	//fprintf(fil,"PI DMA from %08x to %08x len %08x\n", PI_CART_ADDR_REG, PI_DRAM_ADDR_REG, PI_WR_LEN_REG);
-	if ( PI_DRAM_ADDR_REG + PI_WR_LEN_REG + 1 > RdramSize) {
-		PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
-		MI_INTR_REG |= MI_INTR_PI;
-		CheckInterrupts();
-		return;
-	}
-
-	if ( PI_CART_ADDR_REG >= 0x08000000 && PI_CART_ADDR_REG <= 0x08010000) {
-		return;
-	}
-
-	if ( PI_CART_ADDR_REG >= 0x10000000 && PI_CART_ADDR_REG <= 0x1FBFFFFF) {
-		PI_CART_ADDR_REG -= 0x10000000;
-		for (i = 0; i < PI_WR_LEN_REG + 1; i ++) {
-			*(N64MEM+((PI_DRAM_ADDR_REG + i) ^ 3)) = *PageROM((PI_CART_ADDR_REG + i) ^ 3);
-		}
-		PI_CART_ADDR_REG += 0x10000000;
-
-		PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
-		MI_INTR_REG |= MI_INTR_PI;
-		CheckInterrupts();
-		CheckTimer();
-		return;
-	}
-
-	PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
-	MI_INTR_REG |= MI_INTR_PI;
-	CheckInterrupts();
-}
-
-
-void SI_DMA_READ (void) {
-
-	if ((int32_t)SI_DRAM_ADDR_REG > (int32_t)RdramSize) {
-		return;
-	}
-
-	PifRamRead();
-	SI_DRAM_ADDR_REG &= 0xFFFFFFF8;
-	if ((int32_t)SI_DRAM_ADDR_REG < 0) {
-		int32_t count, RdramPos;
-
-		RdramPos = (int32_t)SI_DRAM_ADDR_REG;
-		for (count = 0; count < 0x40; count++, RdramPos++) {
-			if (RdramPos < 0) { continue; }
-			N64MEM[RdramPos ^3] = PIF_Ram[count];
-		}
-	} else {
-		int32_t count, RdramPos;
-
-		RdramPos = (uint32_t)SI_DRAM_ADDR_REG;
-		for (count = 0; count < 0x40; count++, RdramPos++) {
-			if (RdramPos < 0) { continue; }
-			N64MEM[RdramPos ^3] = PIF_Ram[count];
-		}
-	}
-
-	MI_INTR_REG |= MI_INTR_SI;
-	SI_STATUS_REG |= SI_STATUS_INTERRUPT;
-	CheckInterrupts();
-}
-
-
-void SI_DMA_WRITE (void) {
-
-	if ((int32_t)SI_DRAM_ADDR_REG > (int32_t)RdramSize) {
-		return;
-	}
-
-	SI_DRAM_ADDR_REG &= 0xFFFFFFF8;
-	if ((int32_t)SI_DRAM_ADDR_REG < 0) {
-		int32_t count, RdramPos;
-
-		RdramPos = (int32_t)SI_DRAM_ADDR_REG;
-		for (count = 0; count < 0x40; count++, RdramPos++) {
-			if (RdramPos < 0) { PIF_Ram[count] = 0; continue; }
-			PIF_Ram[count] = N64MEM[RdramPos ^3];
-		}
-	} else {
-		int32_t count, RdramPos;
-
-		RdramPos = (int32_t)SI_DRAM_ADDR_REG;
-		for (count = 0; count < 0x40; count++, RdramPos++) {
-			if (RdramPos < 0) { PIF_Ram[count] = 0; continue; }
-			PIF_Ram[count] = N64MEM[RdramPos ^3];
-		}
-	}
-
-	PifRamWrite();
-
-	MI_INTR_REG |= MI_INTR_SI;
-	SI_STATUS_REG |= SI_STATUS_INTERRUPT;
-	CheckInterrupts();
-
-}
-
-void SP_DMA_READ (void) {
-	SP_DRAM_ADDR_REG &= 0x1FFFFFFF;
-
-	if (SP_DRAM_ADDR_REG > RdramSize) {
-		SP_DMA_BUSY_REG = 0;
-		SP_STATUS_REG &= ~SP_STATUS_DMA_BUSY;
-		return;
-	}
-
-	if (SP_RD_LEN_REG + 1 + (SP_MEM_ADDR_REG & 0xFFF) > 0x1000) {
-		return;
-	}
-
-	memcpy( DMEM + (SP_MEM_ADDR_REG & 0x1FFF), N64MEM + SP_DRAM_ADDR_REG,
-		SP_RD_LEN_REG + 1 );
-
-	SP_DMA_BUSY_REG = 0;
-	SP_STATUS_REG &= ~SP_STATUS_DMA_BUSY;
-	MI_INTR_REG &= ~MI_INTR_SP;
-	CheckInterrupts();
-	CheckTimer();
-}
-
-void SP_DMA_WRITE (void) {
-	if (SP_DRAM_ADDR_REG > RdramSize) {
-		return;
-	}
-
-	if (SP_WR_LEN_REG + 1 + (SP_MEM_ADDR_REG & 0xFFF) > 0x1000) {
-		return;
-	}
-
-	memcpy( N64MEM + SP_DRAM_ADDR_REG, DMEM + (SP_MEM_ADDR_REG & 0x1FFF),
-		SP_WR_LEN_REG + 1);
-
-	SP_DMA_BUSY_REG = 0;
-	SP_STATUS_REG &= ~SP_STATUS_DMA_BUSY;
-}
-

audacious-plugins-3.1.1.tar.bz2/src/usf/dma.h Deleted

@@ -1,34 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-void PI_DMA_READ  ( void );
-void PI_DMA_WRITE ( void );
-void SI_DMA_READ  ( void );
-void SI_DMA_WRITE ( void );
-void SP_DMA_READ  ( void );
-void SP_DMA_WRITE ( void );
-
-
-

audacious-plugins-3.1.1.tar.bz2/src/usf/exception.c Deleted

@@ -1,228 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include "main.h"
-#include "cpu.h"
-#include "recompiler_cpu.h"
-#include "x86.h"
-
-void CheckInterrupts ( void ) {
-
-	MI_INTR_REG &= ~MI_INTR_AI;
-	MI_INTR_REG |= (AudioIntrReg & MI_INTR_AI);
-	if ((MI_INTR_MASK_REG & MI_INTR_REG) != 0) {
-		FAKE_CAUSE_REGISTER |= CAUSE_IP2;
-	} else  {
-		FAKE_CAUSE_REGISTER &= ~CAUSE_IP2;
-	}
-
-	if (( STATUS_REGISTER & STATUS_IE   ) == 0 ) { return; }
-	if (( STATUS_REGISTER & STATUS_EXL  ) != 0 ) { return; }
-	if (( STATUS_REGISTER & STATUS_ERL  ) != 0 ) { return; }
-
-	if (( STATUS_REGISTER & FAKE_CAUSE_REGISTER & 0xFF00) != 0) {
-		if (!CPU_Action->DoInterrupt) {
-			CPU_Action->DoSomething = 1;
-			CPU_Action->DoInterrupt = 1;
-		}
-	}
-}
-
-void DoAddressError ( uint32_t DelaySlot, uint32_t BadVaddr, uint32_t FromRead) {
-	if (FromRead) {
-		CAUSE_REGISTER = EXC_RADE;
-	} else {
-		CAUSE_REGISTER = EXC_WADE;
-	}
-	BAD_VADDR_REGISTER = BadVaddr;
-	if (DelaySlot) {
-		CAUSE_REGISTER |= CAUSE_BD;
-		EPC_REGISTER = PROGRAM_COUNTER - 4;
-	} else {
-		EPC_REGISTER = PROGRAM_COUNTER;
-	}
-	STATUS_REGISTER |= STATUS_EXL;
-	PROGRAM_COUNTER = 0x80000180;
-}
-
-void DoBreakException ( uint32_t DelaySlot) {
-	CAUSE_REGISTER = EXC_BREAK;
-	if (DelaySlot) {
-		CAUSE_REGISTER |= CAUSE_BD;
-		EPC_REGISTER = PROGRAM_COUNTER - 4;
-	} else {
-		EPC_REGISTER = PROGRAM_COUNTER;
-	}
-	STATUS_REGISTER |= STATUS_EXL;
-	PROGRAM_COUNTER = 0x80000180;
-}
-
-void DoCopUnusableException ( uint32_t DelaySlot, uint32_t Coprocessor ) {
-	CAUSE_REGISTER = EXC_CPU;
-	if (Coprocessor == 1) { CAUSE_REGISTER |= 0x10000000; }
-	if (DelaySlot) {
-		CAUSE_REGISTER |= CAUSE_BD;
-		EPC_REGISTER = PROGRAM_COUNTER - 4;
-	} else {
-		EPC_REGISTER = PROGRAM_COUNTER;
-	}
-	STATUS_REGISTER |= STATUS_EXL;
-	PROGRAM_COUNTER = 0x80000180;
-}
-
-void DoIntrException ( uint32_t DelaySlot ) {
-
-	if (( STATUS_REGISTER & STATUS_IE   ) == 0 ) { return; }
-	if (( STATUS_REGISTER & STATUS_EXL  ) != 0 ) { return; }
-	if (( STATUS_REGISTER & STATUS_ERL  ) != 0 ) { return; }
-	CAUSE_REGISTER = FAKE_CAUSE_REGISTER;
-	CAUSE_REGISTER |= EXC_INT;
-	EPC_REGISTER = PROGRAM_COUNTER;
-	if (DelaySlot) {
-		CAUSE_REGISTER |= CAUSE_BD;
-		EPC_REGISTER -= 4;
-	}
-	STATUS_REGISTER |= STATUS_EXL;
-	PROGRAM_COUNTER = 0x80000180;
-}
-
-/*
-#ifdef USEX64
-void CompileDoIntrException(void) {
-	uint8_t * Jump, * Jump2;
-
-	MoveVariableToX86reg(&STATUS_REGISTER, x86_TEMPD);
-	AndConstToX86Reg(x86_TEMPD,7);
-	CompConstToX86reg(x86_TEMPD,1);
-	JneLabel8(0);
-	Jump = RecompPos - 1;
-	Push(x86_RAX);
-
-	MoveVariableToX86reg(&FAKE_CAUSE_REGISTER, x86_EAX);
-	OrConstToX86Reg(EXC_INT, x86_EAX);
-
-	CompConstToX86reg(x86_ECX,0);
-	MoveVariableToX86reg(&PROGRAM_COUNTER, x86_ECX);
-	JeLabel8(0);
-	Jump2 = RecompPos - 1;
-	OrConstToX86Reg(CAUSE_BD, x86_EAX);
-	SubConstFromX86Reg(x86_ECX,4);
-
-	SetJump8(Jump2, RecompPos);
-
-	MoveX86regToVariable(x86_ECX, &EPC_REGISTER);
-	MoveX86regToVariable(x86_EAX, &CAUSE_REGISTER);
-
-	OrConstToVariable(STATUS_EXL, &STATUS_REGISTER);
-	MoveConstToVariable(0x80000180, &PROGRAM_COUNTER);
-    Pop(x86_RAX);
-    SetJump8(Jump, RecompPos);
-
-}
-#endif
-
-#ifdef USEX64
-void CompileCheckInterrupts(void) {
-	uint8_t * Jump, * Jump2, * Jump3;
-
-	BreakPoint();
-	Push(x86_EAX);
-	Push(x86_EDX);
-
-	MoveVariableToX86reg(&MI_INTR_REG, x86_EAX);
-	MoveVariableToX86reg(&FAKE_CAUSE_REGISTER, x86_EDX);
-	AndConstToX86Reg(x86_EAX, ~MI_INTR_AI);
-	OrConstToX86Reg(CAUSE_IP2, x86_EDX);
-	TestVariableToX86Reg(x86_EAX, &MI_INTR_MASK_REG);
-	JnzLabel8(0);
-	Jump = RecompPos - 1;
-	AndConstToX86Reg(x86_EDX, ~CAUSE_IP2);
-    SetJump8(Jump, RecompPos);
-
-   	MoveVariableToX86reg(&STATUS_REGISTER, x86_TEMPD);
-	AndConstToX86Reg(x86_TEMPD,7);
-	CompConstToX86reg(x86_TEMPD,1);
-	JneLabel8(0);
-	Jump2 = RecompPos - 1;
-
-	MoveVariableToX86reg(&STATUS_REGISTER, x86_TEMPD);
-	AddX86RegToX86Reg(x86_TEMPD, x86_EDX);
-	AndConstToX86Reg(x86_TEMPD,0xFF00);
-
-	CompConstToVariable(0, &CPU_Action->DoInterrupt);
-	JneLabel8(0);
-	Jump = RecompPos - 1;
-
-	MoveConstToVariable(1, &CPU_Action->DoInterrupt);
-	MoveConstToVariable(1, &CPU_Action->DoSomething);
-
-	SetJump8(Jump, RecompPos);
-	SetJump8(Jump2, RecompPos);
-
-	MoveX86regToVariable(x86_EAX, &MI_INTR_REG);
-	MoveX86regToVariable(x86_EDX, &FAKE_CAUSE_REGISTER);
-	Pop(x86_EDX);
-	Pop(x86_EAX);
-}
-#endif
-*/
-
-void DoTLBMiss ( uint32_t DelaySlot, uint32_t BadVaddr ) {
-
-	CAUSE_REGISTER = EXC_RMISS;
-	BAD_VADDR_REGISTER = BadVaddr;
-	CONTEXT_REGISTER &= 0xFF80000F;
-	CONTEXT_REGISTER |= (BadVaddr >> 9) & 0x007FFFF0;
-	ENTRYHI_REGISTER = (BadVaddr & 0xFFFFE000);
-	if ((STATUS_REGISTER & STATUS_EXL) == 0) {
-		if (DelaySlot) {
-			CAUSE_REGISTER |= CAUSE_BD;
-			EPC_REGISTER = PROGRAM_COUNTER - 4;
-		} else {
-			EPC_REGISTER = PROGRAM_COUNTER;
-		}
-		if (AddressDefined(BadVaddr)) {
-			PROGRAM_COUNTER = 0x80000180;
-		} else {
-			PROGRAM_COUNTER = 0x80000000;
-		}
-		STATUS_REGISTER |= STATUS_EXL;
-	} else {
-		PROGRAM_COUNTER = 0x80000180;
-	}
-}
-
-void DoSysCallException ( uint32_t DelaySlot) {
-	CAUSE_REGISTER = EXC_SYSCALL;
-	if (DelaySlot) {
-		CAUSE_REGISTER |= CAUSE_BD;
-		EPC_REGISTER = PROGRAM_COUNTER - 4;
-	} else {
-		EPC_REGISTER = PROGRAM_COUNTER;
-	}
-	STATUS_REGISTER |= STATUS_EXL;
-	PROGRAM_COUNTER = 0x80000180;
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/exception.h Deleted

@@ -1,75 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#define	EXC_CODE(x)	((x)<<2)
-#define	EXC_INT					EXC_CODE(0)	/* interrupt */
-#define	EXC_MOD					EXC_CODE(1)	/* TLB mod */
-#define	EXC_RMISS				EXC_CODE(2)	/* Read TLB Miss */
-#define	EXC_WMISS				EXC_CODE(3)	/* Write TLB Miss */
-#define	EXC_RADE				EXC_CODE(4)	/* Read Address Error */
-#define	EXC_WADE				EXC_CODE(5)	/* Write Address Error */
-#define	EXC_IBE					EXC_CODE(6)	/* Instruction Bus Error */
-#define	EXC_DBE					EXC_CODE(7)	/* Data Bus Error */
-#define	EXC_SYSCALL				EXC_CODE(8)	/* SYSCALL */
-#define	EXC_BREAK				EXC_CODE(9)	/* BREAKpoint */
-#define	EXC_II					EXC_CODE(10)/* Illegal Instruction */
-#define	EXC_CPU					EXC_CODE(11)/* CoProcessor Unusable */
-#define	EXC_OV					EXC_CODE(12)/* OVerflow */
-#define	EXC_TRAP				EXC_CODE(13)/* Trap exception */
-#define	EXC_VCEI				EXC_CODE(14)/* Virt. Coherency on Inst. fetch */
-#define	EXC_FPE					EXC_CODE(15)/* Floating Point Exception */
-#define	EXC_WATCH				EXC_CODE(23)/* Watchpoint reference */
-#define	EXC_VCED				EXC_CODE(31)/* Virt. Coherency on data read */
-
-#define Exception_Name(Except)\
-	(Except) == EXC_INT ? "interrupt" :\
-	(Except) == EXC_MOD ? "TLB mod" :\
-	(Except) == EXC_RMISS ? "Read TLB Miss" :\
-	(Except) == EXC_WMISS ? "Write TLB Miss" :\
-	(Except) == EXC_RADE ? "Read Address Error" :\
-	(Except) == EXC_WADE ? "Write Address Error" :\
-	(Except) == EXC_IBE ? "Instruction Bus Error" :\
-	(Except) == EXC_DBE ? "Data Bus Error" :\
-	(Except) == EXC_SYSCALL ? "SYSCALL" :\
-	(Except) == EXC_BREAK ? "Break" :\
-	(Except) == EXC_II ? "Illegal Instruction" :\
-	(Except) == EXC_CPU ? "CoProcessor Unusable" :\
-	(Except) == EXC_OV ? "OVerflow" :\
-	(Except) == EXC_TRAP ? "Trap exception" :\
-	(Except) == EXC_VCEI ? "Virt. Coherency on Inst. fetch" :\
-	(Except) == EXC_FPE ? "Floating Point Exception" :\
-	(Except) == EXC_WATCH ? "Watchpoint reference" :\
-	(Except) == EXC_VCED ? "Virt. Coherency on data read" :\
-	"Unkown"
-
-void AiCheckInterrupts ( void );
-void CheckInterrupts ( void );
-void DoAddressError ( uint32_t DelaySlot, uint32_t BadVaddr, uint32_t FromRead );
-void DoBreakException ( uint32_t DelaySlot );
-void DoCopUnusableException ( uint32_t DelaySlot, uint32_t Coprocessor );
-void DoIntrException ( uint32_t DelaySlot );
-void DoTLBMiss ( uint32_t DelaySlot, uint32_t BadVaddr );
-void DoSysCallException ( uint32_t DelaySlot);
-

audacious-plugins-3.1.1.tar.bz2/src/usf/interpreter_cpu.c Deleted

@@ -1,738 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#include <float.h>
-#include <fpu_control.h>
-#include "main.h"
-#include "cpu.h"
-#include "usf.h"
-#include "memory.h"
-
-#include <stdio.h>
-
-void (* R4300i_Opcode[64])();
-void (* R4300i_Special[64])();
-void (* R4300i_Regimm[32])();
-void (* R4300i_CoP0[32])();
-void (* R4300i_CoP0_Function[64])();
-void (* R4300i_CoP1[32])();
-void (* R4300i_CoP1_BC[32])();
-void (* R4300i_CoP1_S[64])();
-void (* R4300i_CoP1_D[64])();
-void (* R4300i_CoP1_W[64])();
-void (* R4300i_CoP1_L[64])();
-
-void R4300i_opcode_SPECIAL (void) {
-	((void (*)()) R4300i_Special[ Opcode.funct ])();
-}
-
-void R4300i_opcode_REGIMM (void) {
-	((void (*)()) R4300i_Regimm[ Opcode.rt ])();
-}
-
-void R4300i_opcode_COP0 (void) {
-	((void (*)()) R4300i_CoP0[ Opcode.rs ])();
-}
-
-void R4300i_opcode_COP0_CO (void) {
-	((void (*)()) R4300i_CoP0_Function[ Opcode.funct ])();
-}
-
-void R4300i_opcode_COP1 (void) {
-	((void (*)()) R4300i_CoP1[ Opcode.fmt ])();
-}
-
-void R4300i_opcode_COP1_BC (void) {
-	((void (*)()) R4300i_CoP1_BC[ Opcode.ft ])();
-}
-
-void R4300i_opcode_COP1_S (void) {
-	 controlfp(RoundingModel);
-	((void (*)()) R4300i_CoP1_S[ Opcode.funct ])();
-}
-
-void R4300i_opcode_COP1_D (void) {
-	 controlfp(RoundingModel);
-	((void (*)()) R4300i_CoP1_D[ Opcode.funct ])();
-}
-
-void R4300i_opcode_COP1_W (void) {
-	((void (*)()) R4300i_CoP1_W[ Opcode.funct ])();
-}
-
-void R4300i_opcode_COP1_L (void) {
-	((void (*)()) R4300i_CoP1_L[ Opcode.funct ])();
-}
-
-
-void BuildInterpreter (void ) {
-	R4300i_Opcode[ 0] = R4300i_opcode_SPECIAL;
-	R4300i_Opcode[ 1] = R4300i_opcode_REGIMM;
-	R4300i_Opcode[ 2] = r4300i_J;
-	R4300i_Opcode[ 3] = r4300i_JAL;
-	R4300i_Opcode[ 4] = r4300i_BEQ;
-	R4300i_Opcode[ 5] = r4300i_BNE;
-	R4300i_Opcode[ 6] = r4300i_BLEZ;
-	R4300i_Opcode[ 7] = r4300i_BGTZ;
-	R4300i_Opcode[ 8] = r4300i_ADDI;
-	R4300i_Opcode[ 9] = r4300i_ADDIU;
-	R4300i_Opcode[10] = r4300i_SLTI;
-	R4300i_Opcode[11] = r4300i_SLTIU;
-	R4300i_Opcode[12] = r4300i_ANDI;
-	R4300i_Opcode[13] = r4300i_ORI;
-	R4300i_Opcode[14] = r4300i_XORI;
-	R4300i_Opcode[15] = r4300i_LUI;
-	R4300i_Opcode[16] = R4300i_opcode_COP0;
-	R4300i_Opcode[17] = R4300i_opcode_COP1;
-	R4300i_Opcode[18] = R4300i_UnknownOpcode;
-	R4300i_Opcode[19] = R4300i_UnknownOpcode;
-	R4300i_Opcode[20] = r4300i_BEQL;
-	R4300i_Opcode[21] = r4300i_BNEL;
-	R4300i_Opcode[22] = r4300i_BLEZL;
-	R4300i_Opcode[23] = r4300i_BGTZL;
-	R4300i_Opcode[24] = R4300i_UnknownOpcode;
-	R4300i_Opcode[25] = r4300i_DADDIU;
-	R4300i_Opcode[26] = r4300i_LDL;
-	R4300i_Opcode[27] = r4300i_LDR;
-	R4300i_Opcode[28] = R4300i_UnknownOpcode;
-	R4300i_Opcode[29] = R4300i_UnknownOpcode;
-	R4300i_Opcode[30] = R4300i_UnknownOpcode;
-	R4300i_Opcode[31] = R4300i_UnknownOpcode;
-	R4300i_Opcode[32] = r4300i_LB;
-	R4300i_Opcode[33] = r4300i_LH;
-	R4300i_Opcode[34] = r4300i_LWL;
-	R4300i_Opcode[35] = r4300i_LW;
-	R4300i_Opcode[36] = r4300i_LBU;
-	R4300i_Opcode[37] = r4300i_LHU;
-	R4300i_Opcode[38] = r4300i_LWR;
-	R4300i_Opcode[39] = r4300i_LWU;
-	R4300i_Opcode[40] = r4300i_SB;
-	R4300i_Opcode[41] = r4300i_SH;
-	R4300i_Opcode[42] = r4300i_SWL;
-	R4300i_Opcode[43] = r4300i_SW;
-	R4300i_Opcode[44] = r4300i_SDL;
-	R4300i_Opcode[45] = r4300i_SDR;
-	R4300i_Opcode[46] = r4300i_SWR;
-	R4300i_Opcode[47] = r4300i_CACHE;
-	R4300i_Opcode[48] = r4300i_LL;
-	R4300i_Opcode[49] = r4300i_LWC1;
-	R4300i_Opcode[50] = R4300i_UnknownOpcode;
-	R4300i_Opcode[51] = R4300i_UnknownOpcode;
-	R4300i_Opcode[52] = R4300i_UnknownOpcode;
-	R4300i_Opcode[53] = r4300i_LDC1;
-	R4300i_Opcode[54] = R4300i_UnknownOpcode;
-	R4300i_Opcode[55] = r4300i_LD;
-	R4300i_Opcode[56] = r4300i_SC;
-	R4300i_Opcode[57] = r4300i_SWC1;
-	R4300i_Opcode[58] = R4300i_UnknownOpcode;
-	R4300i_Opcode[59] = R4300i_UnknownOpcode;
-	R4300i_Opcode[60] = R4300i_UnknownOpcode;
-	R4300i_Opcode[61] = r4300i_SDC1;
-	R4300i_Opcode[62] = R4300i_UnknownOpcode;
-	R4300i_Opcode[63] = r4300i_SD;
-
-	R4300i_Special[ 0] = r4300i_SPECIAL_SLL;
-	R4300i_Special[ 1] = R4300i_UnknownOpcode;
-	R4300i_Special[ 2] = r4300i_SPECIAL_SRL;
-	R4300i_Special[ 3] = r4300i_SPECIAL_SRA;
-	R4300i_Special[ 4] = r4300i_SPECIAL_SLLV;
-	R4300i_Special[ 5] = R4300i_UnknownOpcode;
-	R4300i_Special[ 6] = r4300i_SPECIAL_SRLV;
-	R4300i_Special[ 7] = r4300i_SPECIAL_SRAV;
-	R4300i_Special[ 8] = r4300i_SPECIAL_JR;
-	R4300i_Special[ 9] = r4300i_SPECIAL_JALR;
-	R4300i_Special[10] = R4300i_UnknownOpcode;
-	R4300i_Special[11] = R4300i_UnknownOpcode;
-	R4300i_Special[12] = r4300i_SPECIAL_SYSCALL;
-	R4300i_Special[13] = r4300i_SPECIAL_BREAK;
-	R4300i_Special[14] = R4300i_UnknownOpcode;
-	R4300i_Special[15] = r4300i_SPECIAL_SYNC;
-	R4300i_Special[16] = r4300i_SPECIAL_MFHI;
-	R4300i_Special[17] = r4300i_SPECIAL_MTHI;
-	R4300i_Special[18] = r4300i_SPECIAL_MFLO;
-	R4300i_Special[19] = r4300i_SPECIAL_MTLO;
-	R4300i_Special[20] = r4300i_SPECIAL_DSLLV;
-	R4300i_Special[21] = R4300i_UnknownOpcode;
-	R4300i_Special[22] = r4300i_SPECIAL_DSRLV;
-	R4300i_Special[23] = r4300i_SPECIAL_DSRAV;
-	R4300i_Special[24] = r4300i_SPECIAL_MULT;
-	R4300i_Special[25] = r4300i_SPECIAL_MULTU;
-	R4300i_Special[26] = r4300i_SPECIAL_DIV;
-	R4300i_Special[27] = r4300i_SPECIAL_DIVU;
-	R4300i_Special[28] = r4300i_SPECIAL_DMULT;
-	R4300i_Special[29] = r4300i_SPECIAL_DMULTU;
-	R4300i_Special[30] = r4300i_SPECIAL_DDIV;
-	R4300i_Special[31] = r4300i_SPECIAL_DDIVU;
-	R4300i_Special[32] = r4300i_SPECIAL_ADD;
-	R4300i_Special[33] = r4300i_SPECIAL_ADDU;
-	R4300i_Special[34] = r4300i_SPECIAL_SUB;
-	R4300i_Special[35] = r4300i_SPECIAL_SUBU;
-	R4300i_Special[36] = r4300i_SPECIAL_AND;
-	R4300i_Special[37] = r4300i_SPECIAL_OR;
-	R4300i_Special[38] = r4300i_SPECIAL_XOR;
-	R4300i_Special[39] = r4300i_SPECIAL_NOR;
-	R4300i_Special[40] = R4300i_UnknownOpcode;
-	R4300i_Special[41] = R4300i_UnknownOpcode;
-	R4300i_Special[42] = r4300i_SPECIAL_SLT;
-	R4300i_Special[43] = r4300i_SPECIAL_SLTU;
-	R4300i_Special[44] = r4300i_SPECIAL_DADD;
-	R4300i_Special[45] = r4300i_SPECIAL_DADDU;
-	R4300i_Special[46] = r4300i_SPECIAL_DSUB;
-	R4300i_Special[47] = r4300i_SPECIAL_DSUBU;
-	R4300i_Special[48] = R4300i_UnknownOpcode;
-	R4300i_Special[49] = R4300i_UnknownOpcode;
-	R4300i_Special[50] = R4300i_UnknownOpcode;
-	R4300i_Special[51] = R4300i_UnknownOpcode;
-	R4300i_Special[52] = r4300i_SPECIAL_TEQ;
-	R4300i_Special[53] = R4300i_UnknownOpcode;
-	R4300i_Special[54] = R4300i_UnknownOpcode;
-	R4300i_Special[55] = R4300i_UnknownOpcode;
-	R4300i_Special[56] = r4300i_SPECIAL_DSLL;
-	R4300i_Special[57] = R4300i_UnknownOpcode;
-	R4300i_Special[58] = r4300i_SPECIAL_DSRL;
-	R4300i_Special[59] = r4300i_SPECIAL_DSRA;
-	R4300i_Special[60] = r4300i_SPECIAL_DSLL32;
-	R4300i_Special[61] = R4300i_UnknownOpcode;
-	R4300i_Special[62] = r4300i_SPECIAL_DSRL32;
-	R4300i_Special[63] = r4300i_SPECIAL_DSRA32;
-
-	R4300i_Regimm[ 0] = r4300i_REGIMM_BLTZ;
-	R4300i_Regimm[ 1] = r4300i_REGIMM_BGEZ;
-	R4300i_Regimm[ 2] = r4300i_REGIMM_BLTZL;
-	R4300i_Regimm[ 3] = r4300i_REGIMM_BGEZL;
-	R4300i_Regimm[ 4] = R4300i_UnknownOpcode;
-	R4300i_Regimm[ 5] = R4300i_UnknownOpcode;
-	R4300i_Regimm[ 6] = R4300i_UnknownOpcode;
-	R4300i_Regimm[ 7] = R4300i_UnknownOpcode;
-	R4300i_Regimm[ 8] = R4300i_UnknownOpcode;
-	R4300i_Regimm[ 9] = R4300i_UnknownOpcode;
-	R4300i_Regimm[10] = R4300i_UnknownOpcode;
-	R4300i_Regimm[11] = R4300i_UnknownOpcode;
-	R4300i_Regimm[12] = R4300i_UnknownOpcode;
-	R4300i_Regimm[13] = R4300i_UnknownOpcode;
-	R4300i_Regimm[14] = R4300i_UnknownOpcode;
-	R4300i_Regimm[15] = R4300i_UnknownOpcode;
-	R4300i_Regimm[16] = r4300i_REGIMM_BLTZAL;
-	R4300i_Regimm[17] = r4300i_REGIMM_BGEZAL;
-	R4300i_Regimm[18] = R4300i_UnknownOpcode;
-	R4300i_Regimm[19] = R4300i_UnknownOpcode;
-	R4300i_Regimm[20] = R4300i_UnknownOpcode;
-	R4300i_Regimm[21] = R4300i_UnknownOpcode;
-	R4300i_Regimm[22] = R4300i_UnknownOpcode;
-	R4300i_Regimm[23] = R4300i_UnknownOpcode;
-	R4300i_Regimm[24] = R4300i_UnknownOpcode;
-	R4300i_Regimm[25] = R4300i_UnknownOpcode;
-	R4300i_Regimm[26] = R4300i_UnknownOpcode;
-	R4300i_Regimm[27] = R4300i_UnknownOpcode;
-	R4300i_Regimm[28] = R4300i_UnknownOpcode;
-	R4300i_Regimm[29] = R4300i_UnknownOpcode;
-	R4300i_Regimm[30] = R4300i_UnknownOpcode;
-	R4300i_Regimm[31] = R4300i_UnknownOpcode;
-
-	R4300i_CoP0[ 0] = r4300i_COP0_MF;
-	R4300i_CoP0[ 1] = R4300i_UnknownOpcode;
-	R4300i_CoP0[ 2] = R4300i_UnknownOpcode;
-	R4300i_CoP0[ 3] = R4300i_UnknownOpcode;
-	R4300i_CoP0[ 4] = r4300i_COP0_MT;
-	R4300i_CoP0[ 5] = R4300i_UnknownOpcode;
-	R4300i_CoP0[ 6] = R4300i_UnknownOpcode;
-	R4300i_CoP0[ 7] = R4300i_UnknownOpcode;
-	R4300i_CoP0[ 8] = R4300i_UnknownOpcode;
-	R4300i_CoP0[ 9] = R4300i_UnknownOpcode;
-	R4300i_CoP0[10] = R4300i_UnknownOpcode;
-	R4300i_CoP0[11] = R4300i_UnknownOpcode;
-	R4300i_CoP0[12] = R4300i_UnknownOpcode;
-	R4300i_CoP0[13] = R4300i_UnknownOpcode;
-	R4300i_CoP0[14] = R4300i_UnknownOpcode;
-	R4300i_CoP0[15] = R4300i_UnknownOpcode;
-	R4300i_CoP0[16] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[17] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[18] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[19] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[20] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[21] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[22] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[23] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[24] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[25] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[26] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[27] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[28] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[29] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[30] = R4300i_opcode_COP0_CO;
-	R4300i_CoP0[31] = R4300i_opcode_COP0_CO;
-
-	R4300i_CoP0_Function[ 0] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[ 1] = r4300i_COP0_CO_TLBR;
-	R4300i_CoP0_Function[ 2] = r4300i_COP0_CO_TLBWI;
-	R4300i_CoP0_Function[ 3] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[ 4] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[ 5] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[ 6] = r4300i_COP0_CO_TLBWR;
-	R4300i_CoP0_Function[ 7] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[ 8] = r4300i_COP0_CO_TLBP;
-	R4300i_CoP0_Function[ 9] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[10] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[11] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[12] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[13] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[14] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[15] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[16] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[17] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[18] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[19] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[20] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[21] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[22] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[23] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[24] = r4300i_COP0_CO_ERET;
-	R4300i_CoP0_Function[25] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[26] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[27] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[28] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[29] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[30] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[31] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[32] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[33] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[34] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[35] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[36] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[37] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[38] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[39] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[40] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[41] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[42] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[43] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[44] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[45] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[46] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[47] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[48] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[49] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[50] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[51] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[52] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[53] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[54] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[55] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[56] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[57] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[58] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[59] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[60] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[61] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[62] = R4300i_UnknownOpcode;
-	R4300i_CoP0_Function[63] = R4300i_UnknownOpcode;
-
-	R4300i_CoP1[ 0] = r4300i_COP1_MF;
-	R4300i_CoP1[ 1] = r4300i_COP1_DMF;
-	R4300i_CoP1[ 2] = r4300i_COP1_CF;
-	R4300i_CoP1[ 3] = R4300i_UnknownOpcode;
-	R4300i_CoP1[ 4] = r4300i_COP1_MT;
-	R4300i_CoP1[ 5] = r4300i_COP1_DMT;
-	R4300i_CoP1[ 6] = r4300i_COP1_CT;
-	R4300i_CoP1[ 7] = R4300i_UnknownOpcode;
-	R4300i_CoP1[ 8] = R4300i_opcode_COP1_BC;
-	R4300i_CoP1[ 9] = R4300i_UnknownOpcode;
-	R4300i_CoP1[10] = R4300i_UnknownOpcode;
-	R4300i_CoP1[11] = R4300i_UnknownOpcode;
-	R4300i_CoP1[12] = R4300i_UnknownOpcode;
-	R4300i_CoP1[13] = R4300i_UnknownOpcode;
-	R4300i_CoP1[14] = R4300i_UnknownOpcode;
-	R4300i_CoP1[15] = R4300i_UnknownOpcode;
-	R4300i_CoP1[16] = R4300i_opcode_COP1_S;
-	R4300i_CoP1[17] = R4300i_opcode_COP1_D;
-	R4300i_CoP1[18] = R4300i_UnknownOpcode;
-	R4300i_CoP1[19] = R4300i_UnknownOpcode;
-	R4300i_CoP1[20] = R4300i_opcode_COP1_W;
-	R4300i_CoP1[21] = R4300i_opcode_COP1_L;
-	R4300i_CoP1[22] = R4300i_UnknownOpcode;
-	R4300i_CoP1[23] = R4300i_UnknownOpcode;
-	R4300i_CoP1[24] = R4300i_UnknownOpcode;
-	R4300i_CoP1[25] = R4300i_UnknownOpcode;
-	R4300i_CoP1[26] = R4300i_UnknownOpcode;
-	R4300i_CoP1[27] = R4300i_UnknownOpcode;
-	R4300i_CoP1[28] = R4300i_UnknownOpcode;
-	R4300i_CoP1[29] = R4300i_UnknownOpcode;
-	R4300i_CoP1[30] = R4300i_UnknownOpcode;
-	R4300i_CoP1[31] = R4300i_UnknownOpcode;
-
-	R4300i_CoP1_BC[ 0] = r4300i_COP1_BCF;
-	R4300i_CoP1_BC[ 1] = r4300i_COP1_BCT;
-	R4300i_CoP1_BC[ 2] = r4300i_COP1_BCFL;
-	R4300i_CoP1_BC[ 3] = r4300i_COP1_BCTL;
-	R4300i_CoP1_BC[ 4] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[ 5] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[ 6] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[ 7] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[ 8] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[ 9] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[10] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[11] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[12] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[13] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[14] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[15] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[16] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[17] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[18] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[19] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[20] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[21] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[22] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[23] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[24] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[25] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[26] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[27] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[28] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[29] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[30] = R4300i_UnknownOpcode;
-	R4300i_CoP1_BC[31] = R4300i_UnknownOpcode;
-
-	R4300i_CoP1_S[ 0] = r4300i_COP1_S_ADD;
-	R4300i_CoP1_S[ 1] = r4300i_COP1_S_SUB;
-	R4300i_CoP1_S[ 2] = r4300i_COP1_S_MUL;
-	R4300i_CoP1_S[ 3] = r4300i_COP1_S_DIV;
-	R4300i_CoP1_S[ 4] = r4300i_COP1_S_SQRT;
-	R4300i_CoP1_S[ 5] = r4300i_COP1_S_ABS;
-	R4300i_CoP1_S[ 6] = r4300i_COP1_S_MOV;
-	R4300i_CoP1_S[ 7] = r4300i_COP1_S_NEG;
-	R4300i_CoP1_S[ 8] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[ 9] = r4300i_COP1_S_TRUNC_L;
-	R4300i_CoP1_S[10] = r4300i_COP1_S_CEIL_L;		//added by Witten
-	R4300i_CoP1_S[11] = r4300i_COP1_S_FLOOR_L;		//added by Witten
-	R4300i_CoP1_S[12] = r4300i_COP1_S_ROUND_W;
-	R4300i_CoP1_S[13] = r4300i_COP1_S_TRUNC_W;
-	R4300i_CoP1_S[14] = r4300i_COP1_S_CEIL_W;		//added by Witten
-	R4300i_CoP1_S[15] = r4300i_COP1_S_FLOOR_W;
-	R4300i_CoP1_S[16] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[17] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[18] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[19] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[20] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[21] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[22] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[23] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[24] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[25] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[26] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[27] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[28] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[29] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[30] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[31] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[32] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[33] = r4300i_COP1_S_CVT_D;
-	R4300i_CoP1_S[34] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[35] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[36] = r4300i_COP1_S_CVT_W;
-	R4300i_CoP1_S[37] = r4300i_COP1_S_CVT_L;
-	R4300i_CoP1_S[38] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[39] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[40] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[41] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[42] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[43] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[44] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[45] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[46] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[47] = R4300i_UnknownOpcode;
-	R4300i_CoP1_S[48] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[49] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[50] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[51] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[52] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[53] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[54] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[55] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[56] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[57] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[58] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[59] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[60] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[61] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[62] = r4300i_COP1_S_CMP;
-	R4300i_CoP1_S[63] = r4300i_COP1_S_CMP;
-
-	R4300i_CoP1_D[ 0] = r4300i_COP1_D_ADD;
-	R4300i_CoP1_D[ 1] = r4300i_COP1_D_SUB;
-	R4300i_CoP1_D[ 2] = r4300i_COP1_D_MUL;
-	R4300i_CoP1_D[ 3] = r4300i_COP1_D_DIV;
-	R4300i_CoP1_D[ 4] = r4300i_COP1_D_SQRT;
-	R4300i_CoP1_D[ 5] = r4300i_COP1_D_ABS;
-	R4300i_CoP1_D[ 6] = r4300i_COP1_D_MOV;
-	R4300i_CoP1_D[ 7] = r4300i_COP1_D_NEG;
-	R4300i_CoP1_D[ 8] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[ 9] = r4300i_COP1_D_TRUNC_L;		//added by Witten
-	R4300i_CoP1_D[10] = r4300i_COP1_D_CEIL_L;		//added by Witten
-	R4300i_CoP1_D[11] = r4300i_COP1_D_FLOOR_L;		//added by Witten
-	R4300i_CoP1_D[12] = r4300i_COP1_D_ROUND_W;
-	R4300i_CoP1_D[13] = r4300i_COP1_D_TRUNC_W;
-	R4300i_CoP1_D[14] = r4300i_COP1_D_CEIL_W;		//added by Witten
-	R4300i_CoP1_D[15] = r4300i_COP1_D_FLOOR_W;		//added by Witten
-	R4300i_CoP1_D[16] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[17] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[18] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[19] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[20] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[21] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[22] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[23] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[24] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[25] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[26] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[27] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[28] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[29] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[30] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[31] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[32] = r4300i_COP1_D_CVT_S;
-	R4300i_CoP1_D[33] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[34] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[35] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[36] = r4300i_COP1_D_CVT_W;
-	R4300i_CoP1_D[37] = r4300i_COP1_D_CVT_L;
-	R4300i_CoP1_D[38] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[39] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[40] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[41] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[42] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[43] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[44] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[45] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[46] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[47] = R4300i_UnknownOpcode;
-	R4300i_CoP1_D[48] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[49] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[50] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[51] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[52] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[53] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[54] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[55] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[56] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[57] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[58] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[59] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[60] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[61] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[62] = r4300i_COP1_D_CMP;
-	R4300i_CoP1_D[63] = r4300i_COP1_D_CMP;
-
-	R4300i_CoP1_W[ 0] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[ 1] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[ 2] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[ 3] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[ 4] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[ 5] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[ 6] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[ 7] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[ 8] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[ 9] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[10] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[11] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[12] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[13] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[14] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[15] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[16] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[17] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[18] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[19] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[20] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[21] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[22] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[23] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[24] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[25] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[26] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[27] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[28] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[29] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[30] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[31] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[32] = r4300i_COP1_W_CVT_S;
-	R4300i_CoP1_W[33] = r4300i_COP1_W_CVT_D;
-	R4300i_CoP1_W[34] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[35] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[36] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[37] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[38] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[39] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[40] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[41] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[42] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[43] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[44] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[45] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[46] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[47] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[48] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[49] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[50] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[51] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[52] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[53] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[54] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[55] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[56] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[57] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[58] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[59] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[60] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[61] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[62] = R4300i_UnknownOpcode;
-	R4300i_CoP1_W[63] = R4300i_UnknownOpcode;
-
-	R4300i_CoP1_L[ 0] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[ 1] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[ 2] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[ 3] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[ 4] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[ 5] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[ 6] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[ 7] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[ 8] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[ 9] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[10] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[11] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[12] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[13] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[14] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[15] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[16] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[17] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[18] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[19] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[20] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[21] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[22] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[23] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[24] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[25] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[26] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[27] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[28] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[29] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[30] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[31] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[32] = r4300i_COP1_L_CVT_S;
-	R4300i_CoP1_L[33] = r4300i_COP1_L_CVT_D;
-	R4300i_CoP1_L[34] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[35] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[36] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[37] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[38] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[39] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[40] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[41] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[42] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[43] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[44] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[45] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[46] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[47] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[48] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[49] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[50] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[51] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[52] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[53] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[54] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[55] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[56] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[57] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[58] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[59] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[60] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[61] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[62] = R4300i_UnknownOpcode;
-	R4300i_CoP1_L[63] = R4300i_UnknownOpcode;
-}
-
-
-void ExecuteInterpreterOpCode (void) {
-
-
-	if (*WaitMode) Timers->Timer = -1;
-
-	if (!r4300i_LW_VAddr(PROGRAM_COUNTER, &Opcode.Hex)) {
-		DoTLBMiss(NextInstruction == JUMP,PROGRAM_COUNTER);
-		NextInstruction = NORMAL;
-		return;
-	}
-
-	COUNT_REGISTER += 2;
-	Timers->Timer -= 2;
-
-	RANDOM_REGISTER -= 1;
-	if ((int32_t)RANDOM_REGISTER < (int32_t)WIRED_REGISTER) {
-		RANDOM_REGISTER = 31;
-	}
-
-	R4300i_Opcode[ Opcode.op ]();
-
-	if (GPR[0].DW != 0) {
-		GPR[0].DW = 0;
-	}
-
-	switch (NextInstruction) {
-	case NORMAL:
-		PROGRAM_COUNTER += 4;
-		break;
-	case DELAY_SLOT:
-		NextInstruction = JUMP;
-		PROGRAM_COUNTER += 4;
-		break;
-	case JUMP:
-		PROGRAM_COUNTER = JumpToLocation;
-		NextInstruction = NORMAL;
-		if ((int32_t)Timers->Timer < 0) { TimerDone(); }
-		if (CPU_Action->DoSomething) { DoSomething(); }
-
-	}
-}
-
-void StartInterpreterCPU (void ) {
-	NextInstruction = NORMAL;
-
-	while(cpu_running) {
-		ExecuteInterpreterOpCode();
-	}
-
-	cpu_stopped = 1;
-
-}
-
-void TestInterpreterJump (uint32_t PC, uint32_t TargetPC, int32_t Reg1, int32_t Reg2) {
-	if (PC != TargetPC) { return; }
-	if (DelaySlotEffectsCompare(PC,Reg1,Reg2)) { return; }
-	if (CPU_Type != CPU_Interpreter) { return; }
-	InPermLoop();
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/interpreter_cpu.h Deleted

@@ -1,37 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#include <stdint.h>
-
-void BuildInterpreter ( void );
-void ExecuteInterpreterOpCode ( void );
-void StartInterpreterCPU ( void );
-void TestInterpreterJump ( uint32_t PC, uint32_t TargetPC, int32_t Reg1, int32_t Reg2 );
-
-
-
-
-
-extern void (* R4300i_Opcode[64])();

audacious-plugins-3.1.1.tar.bz2/src/usf/interpreter_ops.c Deleted

@@ -1,1362 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#include <stdio.h>
-#include <math.h>
-#include <float.h>
-#include <fpu_control.h>
-#include "main.h"
-#include "cpu.h"
-
-int32_t RoundingModel = _FPU_RC_NEAREST;
-
-#define ADDRESS_ERROR_EXCEPTION(Address,FromRead) \
-	DoAddressError(NextInstruction == JUMP,Address,FromRead);\
-	NextInstruction = JUMP;\
-	JumpToLocation = PROGRAM_COUNTER;\
-	return;
-
-//#define TEST_COP1_USABLE_EXCEPTION
-#define TEST_COP1_USABLE_EXCEPTION \
-	if ((STATUS_REGISTER & STATUS_CU1) == 0) {\
-		DoCopUnusableException(NextInstruction == JUMP,1);\
-		NextInstruction = JUMP;\
-		JumpToLocation = PROGRAM_COUNTER;\
-		return;\
-	}
-
-#define TLB_READ_EXCEPTION(Address) \
-	DoTLBMiss(NextInstruction == JUMP,Address);\
-	NextInstruction = JUMP;\
-	JumpToLocation = PROGRAM_COUNTER;\
-	return;
-
-/************************* OpCode functions *************************/
-void r4300i_J (void) {
-	NextInstruction = DELAY_SLOT;
-	JumpToLocation = (PROGRAM_COUNTER & 0xF0000000) + (Opcode.target << 2);
-	TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,0,0);
-}
-
-void r4300i_JAL (void) {
-	NextInstruction = DELAY_SLOT;
-	JumpToLocation = (PROGRAM_COUNTER & 0xF0000000) + (Opcode.target << 2);
-	TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,0,0);
-	GPR[31].DW= (int32_t)(PROGRAM_COUNTER + 8);
-}
-
-void r4300i_BEQ (void) {
-	NextInstruction = DELAY_SLOT;
-	if (GPR[Opcode.rs].DW == GPR[Opcode.rt].DW) {
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,Opcode.rt);
-	} else {
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_BNE (void) {
-	NextInstruction = DELAY_SLOT;
-	if (GPR[Opcode.rs].DW != GPR[Opcode.rt].DW) {
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,Opcode.rt);
-	} else {
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_BLEZ (void) {
-	NextInstruction = DELAY_SLOT;
-	if (GPR[Opcode.rs].DW <= 0) {
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,0);
-	} else {
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_BGTZ (void) {
-	NextInstruction = DELAY_SLOT;
-	if (GPR[Opcode.rs].DW > 0) {
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,0);
-	} else {
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_ADDI (void) {
-	if (Opcode.rt == 0) { return; }
-	GPR[Opcode.rt].DW = (GPR[Opcode.rs].W[0] + ((int16_t)Opcode.immediate));
-}
-
-void r4300i_ADDIU (void) {
-	GPR[Opcode.rt].DW = (GPR[Opcode.rs].W[0] + ((int16_t)Opcode.immediate));
-}
-
-void r4300i_SLTI (void) {
-	if (GPR[Opcode.rs].DW < (int64_t)((int16_t)Opcode.immediate)) {
-		GPR[Opcode.rt].DW = 1;
-	} else {
-		GPR[Opcode.rt].DW = 0;
-	}
-}
-
-void r4300i_SLTIU (void) {
-	int32_t imm32 = (int16_t)Opcode.immediate;
-	int64_t imm64;
-
-	imm64 = imm32;
-	GPR[Opcode.rt].DW = GPR[Opcode.rs].UDW < (uint64_t)imm64?1:0;
-}
-
-void r4300i_ANDI (void) {
-	GPR[Opcode.rt].DW = GPR[Opcode.rs].DW & Opcode.immediate;
-}
-
-void r4300i_ORI (void) {
-	GPR[Opcode.rt].DW = GPR[Opcode.rs].DW | Opcode.immediate;
-}
-
-void r4300i_XORI (void) {
-	GPR[Opcode.rt].DW = GPR[Opcode.rs].DW ^ Opcode.immediate;
-}
-
-void r4300i_LUI (void) {
-	if (Opcode.rt == 0) { return; }
-	GPR[Opcode.rt].DW = (int32_t)((int16_t)Opcode.offset << 16);
-}
-
-void r4300i_BEQL (void) {
-	if (GPR[Opcode.rs].DW == GPR[Opcode.rt].DW) {
-		NextInstruction = DELAY_SLOT;
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,Opcode.rt);
-	} else {
-		NextInstruction = JUMP;
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_BNEL (void) {
-	if (GPR[Opcode.rs].DW != GPR[Opcode.rt].DW) {
-		NextInstruction = DELAY_SLOT;
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,Opcode.rt);
-	} else {
-		NextInstruction = JUMP;
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_BLEZL (void) {
-	if (GPR[Opcode.rs].DW <= 0) {
-		NextInstruction = DELAY_SLOT;
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,0);
-	} else {
-		NextInstruction = JUMP;
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_BGTZL (void) {
-	if (GPR[Opcode.rs].DW > 0) {
-		NextInstruction = DELAY_SLOT;
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,0);
-	} else {
-		NextInstruction = JUMP;
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_DADDIU (void) {
-	GPR[Opcode.rt].DW = GPR[Opcode.rs].DW + (int64_t)((int16_t)Opcode.immediate);
-}
-
-uint64_t LDL_MASK[8] = { 0ULL,0xFFULL,0xFFFFULL,0xFFFFFFULL,0xFFFFFFFFULL,0xFFFFFFFFFFULL, 0xFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFULL };
-int32_t LDL_SHIFT[8] = { 0, 8, 16, 24, 32, 40, 48, 56 };
-
-void r4300i_LDL (void) {
-	uint32_t Offset, Address;
-	uint64_t Value;
-
-	Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	Offset = Address & 7;
-
-	if (!r4300i_LD_VAddr((Address & ~7),&Value)) {
-		return;
-	}
-	GPR[Opcode.rt].DW = GPR[Opcode.rt].DW & LDL_MASK[Offset];
-	GPR[Opcode.rt].DW += Value << LDL_SHIFT[Offset];
-}
-
-uint64_t LDR_MASK[8] = { 0xFFFFFFFFFFFFFF00ULL, 0xFFFFFFFFFFFF0000ULL,
- 0xFFFFFFFFFF000000ULL, 0xFFFFFFFF00000000ULL,
- 0xFFFFFF0000000000ULL, 0xFFFF000000000000ULL,
- 0xFF00000000000000ULL, 0 };
-int32_t LDR_SHIFT[8] = { 56, 48, 40, 32, 24, 16, 8, 0 };
-
-void r4300i_LDR (void) {
-	uint32_t Offset, Address;
-	uint64_t Value;
-
-	Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	Offset = Address & 7;
-
-	if (!r4300i_LD_VAddr((Address & ~7),&Value)) {
-		return;
-	}
-
-	GPR[Opcode.rt].DW = GPR[Opcode.rt].DW & LDR_MASK[Offset];
-	GPR[Opcode.rt].DW += Value >> LDR_SHIFT[Offset];
-
-}
-
-void r4300i_LB (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	if (Opcode.rt == 0) { return; }
-	if (!r4300i_LB_VAddr(Address,&GPR[Opcode.rt].UB[0])) {
-		TLB_READ_EXCEPTION(Address);
-	} else {
-		GPR[Opcode.rt].DW = GPR[Opcode.rt].B[0];
-	}
-}
-
-void r4300i_LH (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	if ((Address & 1) != 0) { ADDRESS_ERROR_EXCEPTION(Address,1); }
-	if (!r4300i_LH_VAddr(Address,&GPR[Opcode.rt].UHW[0])) {
-		//if (ShowTLBMisses) {
-			DisplayError("LH TLB: %X",Address);
-		//}
-		TLB_READ_EXCEPTION(Address);
-	} else {
-		GPR[Opcode.rt].DW = GPR[Opcode.rt].HW[0];
-	}
-}
-
-uint32_t LWL_MASK[4] = { 0,0xFF,0xFFFF,0xFFFFFF };
-int32_t LWL_SHIFT[4] = { 0, 8, 16, 24};
-
-void r4300i_LWL (void) {
-	uint32_t Offset, Address, Value;
-
-	Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	Offset = Address & 3;
-
-	if (!r4300i_LW_VAddr((Address & ~3),&Value)) {
-		return;
-	}
-
-	GPR[Opcode.rt].DW = (int32_t)(GPR[Opcode.rt].W[0] & LWL_MASK[Offset]);
-	GPR[Opcode.rt].DW += (int32_t)(Value << LWL_SHIFT[Offset]);
-}
-
-void r4300i_LW (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-
-
-//	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,1); }
-
-	if (Opcode.rt == 0) { return; }
-
-
-	if (!r4300i_LW_VAddr(Address,&GPR[Opcode.rt].UW[0])) {
-		//if (ShowTLBMisses) {
-			printf("LW TLB: %X",Address);
-		//}
-		TLB_READ_EXCEPTION(Address);
-	} else {
-		GPR[Opcode.rt].DW = GPR[Opcode.rt].W[0];
-	}
-}
-
-void r4300i_LBU (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	if (!r4300i_LB_VAddr(Address,&GPR[Opcode.rt].UB[0])) {
-		//if (ShowTLBMisses) {
-			DisplayError("LBU TLB: %X",Address);
-		//}
-		TLB_READ_EXCEPTION(Address);
-	} else {
-		GPR[Opcode.rt].UDW = GPR[Opcode.rt].UB[0];
-	}
-}
-
-void r4300i_LHU (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	if ((Address & 1) != 0) { ADDRESS_ERROR_EXCEPTION(Address,1); }
-	if (!r4300i_LH_VAddr(Address,&GPR[Opcode.rt].UHW[0])) {
-		//if (ShowTLBMisses) {
-			DisplayError("LHU TLB: %X",Address);
-		//}
-		TLB_READ_EXCEPTION(Address);
-	} else {
-		GPR[Opcode.rt].UDW = GPR[Opcode.rt].UHW[0];
-	}
-}
-
-uint32_t LWR_MASK[4] = { 0xFFFFFF00, 0xFFFF0000, 0xFF000000, 0 };
-int32_t LWR_SHIFT[4] = { 24, 16 ,8, 0 };
-
-void r4300i_LWR (void) {
-	uint32_t Offset, Address, Value;
-
-	Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	Offset = Address & 3;
-
-	if (!r4300i_LW_VAddr((Address & ~3),&Value)) {
-		return;
-	}
-
-	GPR[Opcode.rt].DW = (int32_t)(GPR[Opcode.rt].W[0] & LWR_MASK[Offset]);
-	GPR[Opcode.rt].DW += (int32_t)(Value >> LWR_SHIFT[Offset]);
-}
-
-void r4300i_LWU (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,1); }
-	if (Opcode.rt == 0) { return; }
-
-	if (!r4300i_LW_VAddr(Address,&GPR[Opcode.rt].UW[0])) {
-		//if (ShowTLBMisses) {
-			DisplayError("LWU TLB: %X",Address);
-		//}
-		TLB_READ_EXCEPTION(Address);
-	} else {
-		GPR[Opcode.rt].UDW = GPR[Opcode.rt].UW[0];
-	}
-}
-
-void r4300i_SB (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	if (!r4300i_SB_VAddr(Address,GPR[Opcode.rt].UB[0])) {
-	}
-}
-
-void r4300i_SH (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	if ((Address & 1) != 0) { ADDRESS_ERROR_EXCEPTION(Address,0); }
-	if (!r4300i_SH_VAddr(Address,GPR[Opcode.rt].UHW[0])) {
-	}
-}
-
-uint32_t SWL_MASK[4] = { 0,0xFF000000,0xFFFF0000,0xFFFFFF00 };
-int32_t SWL_SHIFT[4] = { 0, 8, 16, 24 };
-
-void r4300i_SWL (void) {
-	uint32_t Offset, Address, Value;
-
-	Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	Offset = Address & 3;
-
-	if (!r4300i_LW_VAddr((Address & ~3),&Value)) {
-		return;
-	}
-
-	Value &= SWL_MASK[Offset];
-	Value += GPR[Opcode.rt].UW[0] >> SWL_SHIFT[Offset];
-
-	if (!r4300i_SW_VAddr((Address & ~0x03),Value)) {
-	}
-}
-
-
-void r4300i_SW (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,0); }
-	if (!r4300i_SW_VAddr(Address,GPR[Opcode.rt].UW[0])) {
-	}
-	//TranslateVaddr(&Address);
-	//if (Address == 0x00090AA0) {
-	//	LogMessage("%X: Write %X to %X",PROGRAM_COUNTER,GPR[Opcode.rt].UW[0],GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset);
-	//}
-}
-
-uint64_t SDL_MASK[8] = { 0,0xFF00000000000000ULL,
-						0xFFFF000000000000ULL,
-						0xFFFFFF0000000000ULL,
-						0xFFFFFFFF00000000ULL,
-					 0xFFFFFFFFFF000000ULL,
-						0xFFFFFFFFFFFF0000ULL,
-						0xFFFFFFFFFFFFFF00ULL
-					};
-int32_t SDL_SHIFT[8] = { 0, 8, 16, 24, 32, 40, 48, 56 };
-
-void r4300i_SDL (void) {
-	uint32_t Offset, Address;
-	uint64_t Value;
-
-	Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	Offset = Address & 7;
-
-	if (!r4300i_LD_VAddr((Address & ~7),&Value)) {
-		return;
-	}
-
-	Value &= SDL_MASK[Offset];
-	Value += GPR[Opcode.rt].UDW >> SDL_SHIFT[Offset];
-
-	if (!r4300i_SD_VAddr((Address & ~7),Value)) {
-	}
-}
-
-uint64_t SDR_MASK[8] = { 0x00FFFFFFFFFFFFFFULL,
-					 0x0000FFFFFFFFFFFFULL,
-					 0x000000FFFFFFFFFFULL,
-					 0x00000000FFFFFFFFULL,
-					 0x0000000000FFFFFFULL,
-					 0x000000000000FFFFULL,
-					 0x00000000000000FFULL,
-					 0x0000000000000000ULL
-					};
-int32_t SDR_SHIFT[8] = { 56,48,40,32,24,16,8,0 };
-
-void r4300i_SDR (void) {
-	uint32_t Offset, Address;
-	uint64_t Value;
-
-	Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	Offset = Address & 7;
-
-	if (!r4300i_LD_VAddr((Address & ~7),&Value)) {
-		return;
-	}
-
-	Value &= SDR_MASK[Offset];
-	Value += GPR[Opcode.rt].UDW << SDR_SHIFT[Offset];
-
-	if (!r4300i_SD_VAddr((Address & ~7),Value)) {
-	}
-}
-
-uint32_t SWR_MASK[4] = { 0x00FFFFFF,0x0000FFFF,0x000000FF,0x00000000 };
-int32_t SWR_SHIFT[4] = { 24, 16 , 8, 0 };
-
-void r4300i_SWR (void) {
-	uint32_t Offset, Address, Value;
-
-	Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	Offset = Address & 3;
-
-	if (!r4300i_LW_VAddr((Address & ~3),&Value)) {
-		return;
-	}
-
-	Value &= SWR_MASK[Offset];
-	Value += GPR[Opcode.rt].UW[0] << SWR_SHIFT[Offset];
-
-	if (!r4300i_SW_VAddr((Address & ~0x03),Value)) {
-	}
-}
-
-void r4300i_CACHE (void) {
-}
-
-void r4300i_LL (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	uintptr_t ll = 0;
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,1); }
-
-	if (Opcode.rt == 0) { return; }
-
-	if (!r4300i_LW_VAddr(Address,&GPR[Opcode.rt].UW[0])) {
-		//if (ShowTLBMisses) {
-			DisplayError("LW TLB: %X",Address);
-		//}
-		TLB_READ_EXCEPTION(Address);
-	} else {
-		GPR[Opcode.rt].DW = GPR[Opcode.rt].W[0];
-	}
-	LLBit = 1;
-	LLAddr = Address;
-	ll = LLAddr;
-	TranslateVaddr(&ll);
-	LLAddr = ll;
-
-}
-
-void r4300i_LWC1 (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (uint32_t)((int16_t)Opcode.offset);
-	TEST_COP1_USABLE_EXCEPTION
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,1); }
-	if (!r4300i_LW_VAddr(Address,&*(uint32_t *)FPRFloatLocation[Opcode.ft])) {
-		//if (ShowTLBMisses) {
-			DisplayError("LWC1 TLB: %X",Address);
-		//}
-		TLB_READ_EXCEPTION(Address);
-	}
-}
-
-void r4300i_SC (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,0); }
-	if (LLBit == 1) {
-		if (!r4300i_SW_VAddr(Address,GPR[Opcode.rt].UW[0])) {
-			DisplayError("SW TLB: %X",Address);
-		}
-	}
-	GPR[Opcode.rt].UW[0] = LLBit;
-}
-
-void r4300i_LD (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	if ((Address & 7) != 0) { ADDRESS_ERROR_EXCEPTION(Address,1); }
-	if (!r4300i_LD_VAddr(Address,&GPR[Opcode.rt].UDW)) {
-	}
-}
-
-
-void r4300i_LDC1 (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-
-	TEST_COP1_USABLE_EXCEPTION
-	if ((Address & 7) != 0) { ADDRESS_ERROR_EXCEPTION(Address,1); }
-	if (!r4300i_LD_VAddr(Address,&*(uint64_t *)FPRDoubleLocation[Opcode.ft])) {
-	}
-}
-
-void r4300i_SWC1 (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	TEST_COP1_USABLE_EXCEPTION
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,0); }
-
-	if (!r4300i_SW_VAddr(Address,*(uint32_t *)FPRFloatLocation[Opcode.ft])) {
-	}
-}
-
-void r4300i_SDC1 (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-
-	TEST_COP1_USABLE_EXCEPTION
-	if ((Address & 7) != 0) { ADDRESS_ERROR_EXCEPTION(Address,0); }
-	if (!r4300i_SD_VAddr(Address,*(int64_t *)FPRDoubleLocation[Opcode.ft])) {
-	}
-}
-
-void r4300i_SD (void) {
-	uint32_t Address = GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset;
-	if ((Address & 7) != 0) { ADDRESS_ERROR_EXCEPTION(Address,0); }
-	if (!r4300i_SD_VAddr(Address,GPR[Opcode.rt].UDW)) {
-	}
-}
-/********************** R4300i OpCodes: Special **********************/
-void r4300i_SPECIAL_SLL (void) {
-	GPR[Opcode.rd].DW = (GPR[Opcode.rt].W[0] << Opcode.sa);
-}
-
-void r4300i_SPECIAL_SRL (void) {
-	GPR[Opcode.rd].DW = (int32_t)(GPR[Opcode.rt].UW[0] >> Opcode.sa);
-}
-
-void r4300i_SPECIAL_SRA (void) {
-	GPR[Opcode.rd].DW = (GPR[Opcode.rt].W[0] >> Opcode.sa);
-}
-
-void r4300i_SPECIAL_SLLV (void) {
-	if (Opcode.rd == 0) { return; }
-	GPR[Opcode.rd].DW = (GPR[Opcode.rt].W[0] << (GPR[Opcode.rs].UW[0] & 0x1F));
-}
-
-void r4300i_SPECIAL_SRLV (void) {
-	GPR[Opcode.rd].DW = (int32_t)(GPR[Opcode.rt].UW[0] >> (GPR[Opcode.rs].UW[0] & 0x1F));
-}
-
-void r4300i_SPECIAL_SRAV (void) {
-	GPR[Opcode.rd].DW = (GPR[Opcode.rt].W[0] >> (GPR[Opcode.rs].UW[0] & 0x1F));
-}
-
-void r4300i_SPECIAL_JR (void) {
-	NextInstruction = DELAY_SLOT;
-	JumpToLocation = GPR[Opcode.rs].UW[0];
-}
-
-void r4300i_SPECIAL_JALR (void) {
-	NextInstruction = DELAY_SLOT;
-	JumpToLocation = GPR[Opcode.rs].UW[0];
-	GPR[Opcode.rd].DW = (int32_t)(PROGRAM_COUNTER + 8);
-}
-
-void r4300i_SPECIAL_SYSCALL (void) {
-	DoSysCallException(NextInstruction == JUMP);
-	NextInstruction = JUMP;
-	JumpToLocation = PROGRAM_COUNTER;
-}
-
-void r4300i_SPECIAL_BREAK (void) {
-	*WaitMode=1;
-}
-
-void r4300i_SPECIAL_SYNC (void) {
-}
-
-void r4300i_SPECIAL_MFHI (void) {
-	GPR[Opcode.rd].DW = HI.DW;
-}
-
-void r4300i_SPECIAL_MTHI (void) {
-	HI.DW = GPR[Opcode.rs].DW;
-}
-
-void r4300i_SPECIAL_MFLO (void) {
-	GPR[Opcode.rd].DW = LO.DW;
-}
-
-void r4300i_SPECIAL_MTLO (void) {
-	LO.DW = GPR[Opcode.rs].DW;
-}
-
-void r4300i_SPECIAL_DSLLV (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rt].DW << (GPR[Opcode.rs].UW[0] & 0x3F);
-}
-
-void r4300i_SPECIAL_DSRLV (void) {
-	GPR[Opcode.rd].UDW = GPR[Opcode.rt].UDW >> (GPR[Opcode.rs].UW[0] & 0x3F);
-}
-
-void r4300i_SPECIAL_DSRAV (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rt].DW >> (GPR[Opcode.rs].UW[0] & 0x3F);
-}
-
-void r4300i_SPECIAL_MULT (void) {
-	HI.DW = (int64_t)(GPR[Opcode.rs].W[0]) * (int64_t)(GPR[Opcode.rt].W[0]);
-	LO.DW = HI.W[0];
-	HI.DW = HI.W[1];
-}
-
-void r4300i_SPECIAL_MULTU (void) {
-	HI.DW = (uint64_t)(GPR[Opcode.rs].UW[0]) * (uint64_t)(GPR[Opcode.rt].UW[0]);
-	LO.DW = HI.W[0];
-	HI.DW = HI.W[1];
-}
-
-void r4300i_SPECIAL_DIV (void) {
-	if ( GPR[Opcode.rt].UDW != 0 ) {
-		LO.DW = GPR[Opcode.rs].W[0] / GPR[Opcode.rt].W[0];
-		HI.DW = GPR[Opcode.rs].W[0] % GPR[Opcode.rt].W[0];
-	} else {
-	}
-}
-
-void r4300i_SPECIAL_DIVU (void) {
-	if ( GPR[Opcode.rt].UDW != 0 ) {
-		LO.DW = (int32_t)(GPR[Opcode.rs].UW[0] / GPR[Opcode.rt].UW[0]);
-		HI.DW = (int32_t)(GPR[Opcode.rs].UW[0] % GPR[Opcode.rt].UW[0]);
-	} else {
-	}
-}
-
-void r4300i_SPECIAL_DMULT (void) {
-	MIPS_DWORD Tmp[3];
-
-	LO.UDW = (uint64_t)GPR[Opcode.rs].UW[0] * (uint64_t)GPR[Opcode.rt].UW[0];
-	Tmp[0].UDW = (int64_t)GPR[Opcode.rs].W[1] * (int64_t)(uint64_t)GPR[Opcode.rt].UW[0];
-	Tmp[1].UDW = (int64_t)(uint64_t)GPR[Opcode.rs].UW[0] * (int64_t)GPR[Opcode.rt].W[1];
-	HI.UDW = (int64_t)GPR[Opcode.rs].W[1] * (int64_t)GPR[Opcode.rt].W[1];
-
-	Tmp[2].UDW = (uint64_t)LO.UW[1] + (uint64_t)Tmp[0].UW[0] + (uint64_t)Tmp[1].UW[0];
-	LO.UDW += ((uint64_t)Tmp[0].UW[0] + (uint64_t)Tmp[1].UW[0]) << 32;
-	HI.UDW += (uint64_t)Tmp[0].W[1] + (uint64_t)Tmp[1].W[1] + Tmp[2].UW[1];
-}
-
-void r4300i_SPECIAL_DMULTU (void) {
-	MIPS_DWORD Tmp[3];
-
-	LO.UDW = (uint64_t)GPR[Opcode.rs].UW[0] * (uint64_t)GPR[Opcode.rt].UW[0];
-	Tmp[0].UDW = (uint64_t)GPR[Opcode.rs].UW[1] * (uint64_t)GPR[Opcode.rt].UW[0];
-	Tmp[1].UDW = (uint64_t)GPR[Opcode.rs].UW[0] * (uint64_t)GPR[Opcode.rt].UW[1];
-	HI.UDW = (uint64_t)GPR[Opcode.rs].UW[1] * (uint64_t)GPR[Opcode.rt].UW[1];
-
-	Tmp[2].UDW = (uint64_t)LO.UW[1] + (uint64_t)Tmp[0].UW[0] + (uint64_t)Tmp[1].UW[0];
-	LO.UDW += ((uint64_t)Tmp[0].UW[0] + (uint64_t)Tmp[1].UW[0]) << 32;
-	HI.UDW += (uint64_t)Tmp[0].UW[1] + (uint64_t)Tmp[1].UW[1] + Tmp[2].UW[1];
-}
-
-void r4300i_SPECIAL_DDIV (void) {
-	if ( GPR[Opcode.rt].UDW != 0 ) {
-		LO.DW = GPR[Opcode.rs].DW / GPR[Opcode.rt].DW;
-		HI.DW = GPR[Opcode.rs].DW % GPR[Opcode.rt].DW;
-	} else {
-	}
-}
-
-void r4300i_SPECIAL_DDIVU (void) {
-	if ( GPR[Opcode.rt].UDW != 0 ) {
-		LO.UDW = GPR[Opcode.rs].UDW / GPR[Opcode.rt].UDW;
-		HI.UDW = GPR[Opcode.rs].UDW % GPR[Opcode.rt].UDW;
-	} else {
-	}
-}
-
-void r4300i_SPECIAL_ADD (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rs].W[0] + GPR[Opcode.rt].W[0];
-}
-
-void r4300i_SPECIAL_ADDU (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rs].W[0] + GPR[Opcode.rt].W[0];
-}
-
-void r4300i_SPECIAL_SUB (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rs].W[0] - GPR[Opcode.rt].W[0];
-}
-
-void r4300i_SPECIAL_SUBU (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rs].W[0] - GPR[Opcode.rt].W[0];
-}
-
-void r4300i_SPECIAL_AND (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rs].DW & GPR[Opcode.rt].DW;
-}
-
-void r4300i_SPECIAL_OR (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rs].DW | GPR[Opcode.rt].DW;
-}
-
-void r4300i_SPECIAL_XOR (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rs].DW ^ GPR[Opcode.rt].DW;
-}
-
-void r4300i_SPECIAL_NOR (void) {
-	GPR[Opcode.rd].DW = ~(GPR[Opcode.rs].DW | GPR[Opcode.rt].DW);
-}
-
-void r4300i_SPECIAL_SLT (void) {
-	if (GPR[Opcode.rs].DW < GPR[Opcode.rt].DW) {
-		GPR[Opcode.rd].DW = 1;
-	} else {
-		GPR[Opcode.rd].DW = 0;
-	}
-}
-
-void r4300i_SPECIAL_SLTU (void) {
-	if (GPR[Opcode.rs].UDW < GPR[Opcode.rt].UDW) {
-		GPR[Opcode.rd].DW = 1;
-	} else {
-		GPR[Opcode.rd].DW = 0;
-	}
-}
-
-void r4300i_SPECIAL_DADD (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rs].DW + GPR[Opcode.rt].DW;
-}
-
-void r4300i_SPECIAL_DADDU (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rs].DW + GPR[Opcode.rt].DW;
-}
-
-void r4300i_SPECIAL_DSUB (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rs].DW - GPR[Opcode.rt].DW;
-}
-
-void r4300i_SPECIAL_DSUBU (void) {
-	GPR[Opcode.rd].DW = GPR[Opcode.rs].DW - GPR[Opcode.rt].DW;
-}
-
-void r4300i_SPECIAL_TEQ (void) {
-	if (GPR[Opcode.rs].DW == GPR[Opcode.rt].DW) {
-	}
-}
-
-void r4300i_SPECIAL_DSLL (void) {
-	GPR[Opcode.rd].DW = (GPR[Opcode.rt].DW << Opcode.sa);
-}
-
-void r4300i_SPECIAL_DSRL (void) {
-	GPR[Opcode.rd].UDW = (GPR[Opcode.rt].UDW >> Opcode.sa);
-}
-
-void r4300i_SPECIAL_DSRA (void) {
-	GPR[Opcode.rd].DW = (GPR[Opcode.rt].DW >> Opcode.sa);
-}
-
-void r4300i_SPECIAL_DSLL32 (void) {
-	GPR[Opcode.rd].DW = (GPR[Opcode.rt].DW << (Opcode.sa + 32));
-}
-
-void r4300i_SPECIAL_DSRL32 (void) {
- GPR[Opcode.rd].UDW = (GPR[Opcode.rt].UDW >> (Opcode.sa + 32));
-}
-
-void r4300i_SPECIAL_DSRA32 (void) {
-	GPR[Opcode.rd].DW = (GPR[Opcode.rt].DW >> (Opcode.sa + 32));
-}
-
-/********************** R4300i OpCodes: RegImm **********************/
-void r4300i_REGIMM_BLTZ (void) {
-	NextInstruction = DELAY_SLOT;
-	if (GPR[Opcode.rs].DW < 0) {
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,0);
-	} else {
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_REGIMM_BGEZ (void) {
-	NextInstruction = DELAY_SLOT;
-	if (GPR[Opcode.rs].DW >= 0) {
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,0);
-	} else {
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_REGIMM_BLTZL (void) {
-	if (GPR[Opcode.rs].DW < 0) {
-		NextInstruction = DELAY_SLOT;
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,0);
-	} else {
-		NextInstruction = JUMP;
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_REGIMM_BGEZL (void) {
-	if (GPR[Opcode.rs].DW >= 0) {
-		NextInstruction = DELAY_SLOT;
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,0);
-	} else {
-		NextInstruction = JUMP;
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_REGIMM_BLTZAL (void) {
-	NextInstruction = DELAY_SLOT;
-	if (GPR[Opcode.rs].DW < 0) {
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,0);
-	} else {
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-	GPR[31].DW= (int32_t)(PROGRAM_COUNTER + 8);
-}
-
-void r4300i_REGIMM_BGEZAL (void) {
-	NextInstruction = DELAY_SLOT;
-	if (GPR[Opcode.rs].DW >= 0) {
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-		TestInterpreterJump(PROGRAM_COUNTER,JumpToLocation,Opcode.rs,0);
-	} else {
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-	GPR[31].DW = (int32_t)(PROGRAM_COUNTER + 8);
-}
-/************************** COP0 functions **************************/
-void r4300i_COP0_MF (void) {
-	GPR[Opcode.rt].DW = (int32_t)CP0[Opcode.rd];
-}
-
-void r4300i_COP0_MT (void) {
-	switch (Opcode.rd) {
-	case 0: //Index
-	case 2: //EntryLo0
-	case 3: //EntryLo1
-	case 5: //PageMask
-	case 6: //Wired
-	case 10: //Entry Hi
-	case 14: //EPC
-	case 16: //Config
-	case 18: //WatchLo
-	case 19: //WatchHi
-	case 28: //Tag lo
-	case 29: //Tag Hi
-	case 30: //ErrEPC
-		CP0[Opcode.rd] = GPR[Opcode.rt].UW[0];
-		break;
-	case 4: //Context
-		CP0[Opcode.rd] = GPR[Opcode.rt].UW[0] & 0xFF800000;
-		break;
-	case 9: //Count
-		CP0[Opcode.rd]= GPR[Opcode.rt].UW[0];
-		ChangeCompareTimer();
-		break;
-	case 11: //Compare
-		CP0[Opcode.rd] = GPR[Opcode.rt].UW[0];
-		FAKE_CAUSE_REGISTER &= ~CAUSE_IP7;
-		ChangeCompareTimer();
-		break;
-	case 12: //Status
-		if ((CP0[Opcode.rd] ^ GPR[Opcode.rt].UW[0]) != 0) {
-			CP0[Opcode.rd] = GPR[Opcode.rt].UW[0];
-			SetFpuLocations();
-		} else {
-			CP0[Opcode.rd] = GPR[Opcode.rt].UW[0];
-		}
-		if ((CP0[Opcode.rd] & 0x18) != 0) {
-		}
-		CheckInterrupts();
-		break;
-	case 13: //cause
-		CP0[Opcode.rd] &= 0xFFFFCFF;
-		break;
-	default:
-		R4300i_UnknownOpcode();
-	}
-
-}
-
-/************************** COP0 CO functions ***********************/
-void r4300i_COP0_CO_TLBR (void) {
-	TLB_Read();
-}
-
-void r4300i_COP0_CO_TLBWI (void) {
-	WriteTLBEntry(INDEX_REGISTER & 0x1F);
-}
-
-void r4300i_COP0_CO_TLBWR (void) {
-	WriteTLBEntry(RANDOM_REGISTER & 0x1F);
-}
-
-void r4300i_COP0_CO_TLBP (void) {
-	TLB_Probe();
-}
-
-void r4300i_COP0_CO_ERET (void) {
-	NextInstruction = JUMP;
-	if ((STATUS_REGISTER & STATUS_ERL) != 0) {
-		JumpToLocation = ERROREPC_REGISTER;
-		STATUS_REGISTER &= ~STATUS_ERL;
-	} else {
-		JumpToLocation = EPC_REGISTER;
-		STATUS_REGISTER &= ~STATUS_EXL;
-	}
-	LLBit = 0;
-	CheckInterrupts();
-}
-
-/************************** COP1 functions **************************/
-void r4300i_COP1_MF (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	GPR[Opcode.rt].DW = *(int32_t *)FPRFloatLocation[Opcode.fs];
-}
-
-void r4300i_COP1_DMF (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	GPR[Opcode.rt].DW = *(int64_t *)FPRDoubleLocation[Opcode.fs];
-}
-
-void r4300i_COP1_CF (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	if (Opcode.fs != 31 && Opcode.fs != 0) {
-		return;
-	}
-	GPR[Opcode.rt].DW = (int32_t)FPCR[Opcode.fs];
-}
-
-void r4300i_COP1_MT (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	*(int32_t *)FPRFloatLocation[Opcode.fs] = GPR[Opcode.rt].W[0];
-}
-
-void r4300i_COP1_DMT (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	*(int64_t *)FPRDoubleLocation[Opcode.fs] = GPR[Opcode.rt].DW;
-}
-
-void r4300i_COP1_CT (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	if (Opcode.fs == 31) {
-		FPCR[Opcode.fs] = GPR[Opcode.rt].W[0];
-		switch((FPCR[Opcode.fs] & 3)) {
-		case 0: RoundingModel = _FPU_RC_NEAREST; break;
-		case 1: RoundingModel = _FPU_RC_ZERO; break;
-		case 2: RoundingModel = _FPU_RC_UP; break;
-		case 3: RoundingModel = _FPU_RC_DOWN; break;
-		}
-		return;
-	}
-}
-
-/************************* COP1: BC1 functions ***********************/
-void r4300i_COP1_BCF (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	NextInstruction = DELAY_SLOT;
-	if ((FPCR[31] & FPCSR_C) == 0) {
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-	} else {
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_COP1_BCT (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	NextInstruction = DELAY_SLOT;
-	if ((FPCR[31] & FPCSR_C) != 0) {
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-	} else {
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_COP1_BCFL (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	if ((FPCR[31] & FPCSR_C) == 0) {
-		NextInstruction = DELAY_SLOT;
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-	} else {
-		NextInstruction = JUMP;
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-
-void r4300i_COP1_BCTL (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	if ((FPCR[31] & FPCSR_C) != 0) {
-		NextInstruction = DELAY_SLOT;
-		JumpToLocation = PROGRAM_COUNTER + ((int16_t)Opcode.offset << 2) + 4;
-	} else {
-		NextInstruction = JUMP;
-		JumpToLocation = PROGRAM_COUNTER + 8;
-	}
-}
-/************************** COP1: S functions ************************/
-__inline void Float_RoundToInteger32( int32_t * Dest, float * Source ) {
-	*Dest = (int32_t)*Source;
-}
-
-__inline void Float_RoundToInteger64( int64_t * Dest, float * Source ) {
-	*Dest = (int64_t)*Source;
-}
-
-void r4300i_COP1_S_ADD (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(float *)FPRFloatLocation[Opcode.fd] = (*(float *)FPRFloatLocation[Opcode.fs] + *(float *)FPRFloatLocation[Opcode.ft]);
-}
-
-void r4300i_COP1_S_SUB (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(float *)FPRFloatLocation[Opcode.fd] = (*(float *)FPRFloatLocation[Opcode.fs] - *(float *)FPRFloatLocation[Opcode.ft]);
-}
-
-void r4300i_COP1_S_MUL (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(float *)FPRFloatLocation[Opcode.fd] = (*(float *)FPRFloatLocation[Opcode.fs] * *(float *)FPRFloatLocation[Opcode.ft]);
-}
-
-void r4300i_COP1_S_DIV (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(float *)FPRFloatLocation[Opcode.fd] = (*(float *)FPRFloatLocation[Opcode.fs] / *(float *)FPRFloatLocation[Opcode.ft]);
-}
-
-void r4300i_COP1_S_SQRT (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(float *)FPRFloatLocation[Opcode.fd] = (float)sqrt(*(float *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_S_ABS (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(float *)FPRFloatLocation[Opcode.fd] = (float)fabs(*(float *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_S_MOV (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(float *)FPRFloatLocation[Opcode.fd] = *(float *)FPRFloatLocation[Opcode.fs];
-}
-
-void r4300i_COP1_S_NEG (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(float *)FPRFloatLocation[Opcode.fd] = (*(float *)FPRFloatLocation[Opcode.fs] * -1.0f);
-}
-
-void r4300i_COP1_S_TRUNC_L (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	//_controlfp(_RC_CHOP,_MCW_RC);
-	Float_RoundToInteger64(&*(int64_t *)FPRDoubleLocation[Opcode.fd],&*(float *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_S_CEIL_L (void) {	//added by Witten
-	TEST_COP1_USABLE_EXCEPTION
-	//_controlfp(_RC_UP,_MCW_RC);
-	Float_RoundToInteger64(&*(int64_t *)FPRDoubleLocation[Opcode.fd],&*(float *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_S_FLOOR_L (void) {	//added by Witten
-	TEST_COP1_USABLE_EXCEPTION
-	//_controlfp(_FPU_RC_DOWN,_MCW_RC);
-	Float_RoundToInteger64(&*(int64_t *)FPRDoubleLocation[Opcode.fd],&*(float *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_S_ROUND_W (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	//_controlfp(_FPU_RC_NEAREST,_MCW_RC);
-	Float_RoundToInteger32(&*(int32_t *)FPRFloatLocation[Opcode.fd],&*(float *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_S_TRUNC_W (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	//_controlfp(_RC_CHOP,_MCW_RC);
-	Float_RoundToInteger32(&*(int32_t *)FPRFloatLocation[Opcode.fd],&*(float *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_S_CEIL_W (void) {	//added by Witten
-	TEST_COP1_USABLE_EXCEPTION
-	//_controlfp(_RC_UP,_MCW_RC);
-	Float_RoundToInteger32(&*(int32_t *)FPRFloatLocation[Opcode.fd],&*(float *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_S_FLOOR_W (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	//_controlfp(_FPU_RC_DOWN,_MCW_RC);
-	Float_RoundToInteger32(&*(int32_t *)FPRFloatLocation[Opcode.fd],&*(float *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_S_CVT_D (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(double *)FPRDoubleLocation[Opcode.fd] = (double)(*(float *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_S_CVT_W (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	Float_RoundToInteger32(&*(int32_t *)FPRFloatLocation[Opcode.fd],&*(float *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_S_CVT_L (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	Float_RoundToInteger64(&*(int64_t *)FPRDoubleLocation[Opcode.fd],&*(float *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_S_CMP (void) {
-	int32_t less, equal, unorded, condition;
-	float Temp0, Temp1;
-
-	TEST_COP1_USABLE_EXCEPTION
-
-	Temp0 = *(float *)FPRFloatLocation[Opcode.fs];
-	Temp1 = *(float *)FPRFloatLocation[Opcode.ft];
-
-	if(0) {
-	//if (_isnan(Temp0) || _isnan(Temp1)) {
-		less = 0;
-		equal = 0;
-		unorded = 1;
-		if ((Opcode.funct & 8) != 0) {
-		}
-	} else {
-		less = Temp0 < Temp1;
-		equal = Temp0 == Temp1;
-		unorded = 0;
-	}
-
-	condition = ((Opcode.funct & 4) && less) | ((Opcode.funct & 2) && equal) |
-		((Opcode.funct & 1) && unorded);
-
-	if (condition) {
-		FPCR[31] |= FPCSR_C;
-	} else {
-		FPCR[31] &= ~FPCSR_C;
-	}
-
-}
-
-/************************** COP1: D functions ************************/
-__inline void Double_RoundToInteger32( int32_t * Dest, double * Source ) {
-	*Dest = (int32_t)*Source;
-}
-
-__inline void Double_RoundToInteger64( int64_t * Dest, double * Source ) {
-	*Dest = (int64_t)*Source;
-}
-
-void r4300i_COP1_D_ADD (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	*(double *)FPRDoubleLocation[Opcode.fd] = *(double *)FPRDoubleLocation[Opcode.fs] + *(double *)FPRDoubleLocation[Opcode.ft];
-}
-
-void r4300i_COP1_D_SUB (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	*(double *)FPRDoubleLocation[Opcode.fd] = *(double *)FPRDoubleLocation[Opcode.fs] - *(double *)FPRDoubleLocation[Opcode.ft];
-}
-
-void r4300i_COP1_D_MUL (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	*(double *)FPRDoubleLocation[Opcode.fd] = *(double *)FPRDoubleLocation[Opcode.fs] * *(double *)FPRDoubleLocation[Opcode.ft];
-}
-
-void r4300i_COP1_D_DIV (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	*(double *)FPRDoubleLocation[Opcode.fd] = *(double *)FPRDoubleLocation[Opcode.fs] / *(double *)FPRDoubleLocation[Opcode.ft];
-}
-
-void r4300i_COP1_D_SQRT (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	*(double *)FPRDoubleLocation[Opcode.fd] = (double)sqrt(*(double *)FPRDoubleLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_D_ABS (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	*(double *)FPRDoubleLocation[Opcode.fd] = fabs(*(double *)FPRDoubleLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_D_MOV (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	*(int64_t *)FPRDoubleLocation[Opcode.fd] = *(int64_t *)FPRDoubleLocation[Opcode.fs];
-}
-
-void r4300i_COP1_D_NEG (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	*(double *)FPRDoubleLocation[Opcode.fd] = (*(double *)FPRDoubleLocation[Opcode.fs] * -1.0);
-}
-
-void r4300i_COP1_D_TRUNC_L (void) {	//added by Witten
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(_FPU_RC_ZERO);
-	Double_RoundToInteger64(&*(int64_t *)FPRFloatLocation[Opcode.fd],&*(double *)FPRDoubleLocation[Opcode.fs] );
-}
-
-void r4300i_COP1_D_CEIL_L (void) {	//added by Witten
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(_FPU_RC_UP);
-	Double_RoundToInteger64(&*(int64_t *)FPRFloatLocation[Opcode.fd],&*(double *)FPRDoubleLocation[Opcode.fs] );
-}
-
-void r4300i_COP1_D_FLOOR_L (void) {	//added by Witten
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(_FPU_RC_DOWN);
-	Double_RoundToInteger64(&*(int64_t *)FPRDoubleLocation[Opcode.fd],&*(double *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_D_ROUND_W (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(_FPU_RC_NEAREST);
-	Double_RoundToInteger32(&*(int32_t *)FPRFloatLocation[Opcode.fd],&*(double *)FPRDoubleLocation[Opcode.fs] );
-}
-
-void r4300i_COP1_D_TRUNC_W (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(_FPU_RC_ZERO);
-	Double_RoundToInteger32(&*(int32_t *)FPRFloatLocation[Opcode.fd],&*(double *)FPRDoubleLocation[Opcode.fs] );
-}
-
-void r4300i_COP1_D_CEIL_W (void) {	//added by Witten
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(_FPU_RC_UP);
-	Double_RoundToInteger32(&*(int32_t *)FPRFloatLocation[Opcode.fd],&*(double *)FPRDoubleLocation[Opcode.fs] );
-}
-
-void r4300i_COP1_D_FLOOR_W (void) {	//added by Witten
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(_FPU_RC_DOWN);
-	Double_RoundToInteger32(&*(int32_t *)FPRDoubleLocation[Opcode.fd],&*(double *)FPRFloatLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_D_CVT_S (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(float *)FPRFloatLocation[Opcode.fd] = (float)*(double *)FPRDoubleLocation[Opcode.fs];
-}
-
-void r4300i_COP1_D_CVT_W (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	Double_RoundToInteger32(&*(int32_t *)FPRFloatLocation[Opcode.fd],&*(double *)FPRDoubleLocation[Opcode.fs] );
-}
-
-void r4300i_COP1_D_CVT_L (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	Double_RoundToInteger64(&*(int64_t *)FPRDoubleLocation[Opcode.fd],&*(double *)FPRDoubleLocation[Opcode.fs]);
-}
-
-void r4300i_COP1_D_CMP (void) {
-	int32_t less, equal, unorded, condition;
-	MIPS_DWORD Temp0, Temp1;
-
-	TEST_COP1_USABLE_EXCEPTION
-
-	Temp0.DW = *(int64_t *)FPRDoubleLocation[Opcode.fs];
-	Temp1.DW = *(int64_t *)FPRDoubleLocation[Opcode.ft];
-
-	if(0) {
-	//if (_isnan(Temp0.D) || _isnan(Temp1.D)) {
-		less = 0;
-		equal = 0;
-		unorded = 1;
-		if ((Opcode.funct & 8) != 0) {
-		}
-	} else {
-		less = Temp0.D < Temp1.D;
-		equal = Temp0.D == Temp1.D;
-		unorded = 0;
-	}
-
-	condition = ((Opcode.funct & 4) && less) | ((Opcode.funct & 2) && equal) |
-		((Opcode.funct & 1) && unorded);
-
-	if (condition) {
-		FPCR[31] |= FPCSR_C;
-	} else {
-		FPCR[31] &= ~FPCSR_C;
-	}
-}
-
-/************************** COP1: W functions ************************/
-void r4300i_COP1_W_CVT_S (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(float *)FPRFloatLocation[Opcode.fd] = (float)*(int32_t *)FPRFloatLocation[Opcode.fs];
-}
-
-void r4300i_COP1_W_CVT_D (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(double *)FPRDoubleLocation[Opcode.fd] = (double)*(int32_t *)FPRFloatLocation[Opcode.fs];
-}
-
-/************************** COP1: L functions ************************/
-void r4300i_COP1_L_CVT_S (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(float *)FPRFloatLocation[Opcode.fd] = (float)*(int64_t *)FPRDoubleLocation[Opcode.fs];
-}
-
-void r4300i_COP1_L_CVT_D (void) {
-	TEST_COP1_USABLE_EXCEPTION
-	controlfp(RoundingModel);
-	*(double *)FPRDoubleLocation[Opcode.fd] = (double)*(int64_t *)FPRDoubleLocation[Opcode.fs];
-}
-
-/************************** Other functions **************************/
-void R4300i_UnknownOpcode (void) {
-	DisplayError("Unkniown X86 Opcode.\tPC:%08x\tOp:%08x\n", PROGRAM_COUNTER,Opcode.Hex);
-	StopEmulation();
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/interpreter_ops.h Deleted

@@ -1,210 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-/************************* OpCode functions *************************/
-void  r4300i_J              ( void );
-void  r4300i_JAL            ( void );
-void  r4300i_BNE            ( void );
-void  r4300i_BEQ            ( void );
-void  r4300i_BLEZ           ( void );
-void  r4300i_BGTZ           ( void );
-void  r4300i_ADDI           ( void );
-void  r4300i_ADDIU          ( void );
-void  r4300i_SLTI           ( void );
-void  r4300i_SLTIU          ( void );
-void  r4300i_ANDI           ( void );
-void  r4300i_ORI            ( void );
-void  r4300i_XORI           ( void );
-void  r4300i_LUI            ( void );
-void  r4300i_BEQL           ( void );
-void  r4300i_BNEL           ( void );
-void  r4300i_BLEZL          ( void );
-void  r4300i_BGTZL          ( void );
-void  r4300i_DADDIU         ( void );
-void  r4300i_LDL            ( void );
-void  r4300i_LDR            ( void );
-void  r4300i_LB             ( void );
-void  r4300i_LH             ( void );
-void  r4300i_LWL            ( void );
-void  r4300i_LW             ( void );
-void  r4300i_LBU            ( void );
-void  r4300i_LHU            ( void );
-void  r4300i_LWR            ( void );
-void  r4300i_LWU            ( void );
-void  r4300i_SB             ( void );
-void  r4300i_SH             ( void );
-void  r4300i_SWL            ( void );
-void  r4300i_SW             ( void );
-void  r4300i_SDL            ( void );
-void  r4300i_SDR            ( void );
-void  r4300i_SWR            ( void );
-void  r4300i_CACHE          ( void );
-void  r4300i_LL             ( void );
-void  r4300i_LWC1           ( void );
-void  r4300i_LDC1           ( void );
-void  r4300i_LD             ( void );
-void  r4300i_SC             ( void );
-void  r4300i_SWC1           ( void );
-void  r4300i_SDC1           ( void );
-void  r4300i_SD             ( void );
-
-/********************** R4300i OpCodes: Special **********************/
-void  r4300i_SPECIAL_SLL    ( void );
-void  r4300i_SPECIAL_SRL    ( void );
-void  r4300i_SPECIAL_SRA    ( void );
-void  r4300i_SPECIAL_SLLV   ( void );
-void  r4300i_SPECIAL_SRLV   ( void );
-void  r4300i_SPECIAL_SRAV   ( void );
-void  r4300i_SPECIAL_JR     ( void );
-void  r4300i_SPECIAL_JALR   ( void );
-void  r4300i_SPECIAL_SYSCALL ( void );
-void  r4300i_SPECIAL_BREAK   ( void );
-void  r4300i_SPECIAL_SYNC    ( void );
-void  r4300i_SPECIAL_MFHI    ( void );
-void  r4300i_SPECIAL_MTHI    ( void );
-void  r4300i_SPECIAL_MFLO   ( void );
-void  r4300i_SPECIAL_MTLO   ( void );
-void  r4300i_SPECIAL_DSLLV  ( void );
-void  r4300i_SPECIAL_DSRLV  ( void );
-void  r4300i_SPECIAL_DSRAV  ( void );
-void  r4300i_SPECIAL_MULT   ( void );
-void  r4300i_SPECIAL_MULTU  ( void );
-void  r4300i_SPECIAL_DIV    ( void );
-void  r4300i_SPECIAL_DIVU   ( void );
-void  r4300i_SPECIAL_DMULT  ( void );
-void  r4300i_SPECIAL_DMULTU ( void );
-void  r4300i_SPECIAL_DDIV   ( void );
-void  r4300i_SPECIAL_DDIVU  ( void );
-void  r4300i_SPECIAL_ADD    ( void );
-void  r4300i_SPECIAL_ADDU   ( void );
-void  r4300i_SPECIAL_SUB    ( void );
-void  r4300i_SPECIAL_SUBU   ( void );
-void  r4300i_SPECIAL_AND    ( void );
-void  r4300i_SPECIAL_OR     ( void );
-void  r4300i_SPECIAL_XOR    ( void );
-void  r4300i_SPECIAL_NOR    ( void );
-void  r4300i_SPECIAL_SLT    ( void );
-void  r4300i_SPECIAL_SLTU   ( void );
-void  r4300i_SPECIAL_DADD   ( void );
-void  r4300i_SPECIAL_DADDU  ( void );
-void  r4300i_SPECIAL_DSUB   ( void );
-void  r4300i_SPECIAL_DSUBU  ( void );
-void  r4300i_SPECIAL_TEQ    ( void );
-void  r4300i_SPECIAL_DSLL   ( void );
-void  r4300i_SPECIAL_DSRL   ( void );
-void  r4300i_SPECIAL_DSRA   ( void );
-void  r4300i_SPECIAL_DSLL32 ( void );
-void  r4300i_SPECIAL_DSRL32 ( void );
-void  r4300i_SPECIAL_DSRA32 ( void );
-
-/********************** R4300i OpCodes: RegImm **********************/
-void  r4300i_REGIMM_BLTZ    ( void );
-void  r4300i_REGIMM_BGEZ    ( void );
-void  r4300i_REGIMM_BLTZL   ( void );
-void  r4300i_REGIMM_BGEZL   ( void );
-void  r4300i_REGIMM_BLTZAL  ( void );
-void  r4300i_REGIMM_BGEZAL  ( void );
-
-/************************** COP0 functions **************************/
-void  r4300i_COP0_MF        ( void );
-void  r4300i_COP0_MT        ( void );
-
-/************************** COP0 CO functions ***********************/
-void  r4300i_COP0_CO_TLBR   ( void );
-void  r4300i_COP0_CO_TLBWI  ( void );
-void  r4300i_COP0_CO_TLBWR  ( void );
-void  r4300i_COP0_CO_TLBP   ( void );
-void  r4300i_COP0_CO_ERET   ( void );
-
-/************************** COP1 functions **************************/
-void  r4300i_COP1_MF        ( void );
-void  r4300i_COP1_DMF       ( void );
-void  r4300i_COP1_CF        ( void );
-void  r4300i_COP1_MT        ( void );
-void  r4300i_COP1_DMT       ( void );
-void  r4300i_COP1_CT        ( void );
-
-/************************* COP1: BC1 functions ***********************/
-void  r4300i_COP1_BCF       ( void );
-void  r4300i_COP1_BCT       ( void );
-void  r4300i_COP1_BCFL      ( void );
-void  r4300i_COP1_BCTL      ( void );
-
-/************************** COP1: S functions ************************/
-void  r4300i_COP1_S_ADD     ( void );
-void  r4300i_COP1_S_SUB     ( void );
-void  r4300i_COP1_S_MUL     ( void );
-void  r4300i_COP1_S_DIV     ( void );
-void  r4300i_COP1_S_SQRT    ( void );
-void  r4300i_COP1_S_ABS     ( void );
-void  r4300i_COP1_S_MOV     ( void );
-void  r4300i_COP1_S_NEG     ( void );
-void  r4300i_COP1_S_TRUNC_L ( void );
-void  r4300i_COP1_S_CEIL_L  ( void );	//added by Witten
-void  r4300i_COP1_S_FLOOR_L ( void );	//added by Witten
-void  r4300i_COP1_S_ROUND_W ( void );
-void  r4300i_COP1_S_TRUNC_W ( void );
-void  r4300i_COP1_S_CEIL_W  ( void );	//added by Witten
-void  r4300i_COP1_S_FLOOR_W ( void );
-void  r4300i_COP1_S_CVT_D   ( void );
-void  r4300i_COP1_S_CVT_W   ( void );
-void  r4300i_COP1_S_CVT_L   ( void );
-void  r4300i_COP1_S_CMP     ( void );
-
-/************************** COP1: D functions ************************/
-void  r4300i_COP1_D_ADD     ( void );
-void  r4300i_COP1_D_SUB     ( void );
-void  r4300i_COP1_D_MUL     ( void );
-void  r4300i_COP1_D_DIV     ( void );
-void  r4300i_COP1_D_SQRT    ( void );
-void  r4300i_COP1_D_ABS     ( void );
-void  r4300i_COP1_D_MOV     ( void );
-void  r4300i_COP1_D_NEG     ( void );
-void  r4300i_COP1_D_TRUNC_L ( void );	//added by Witten
-void  r4300i_COP1_D_CEIL_L  ( void );	//added by Witten
-void  r4300i_COP1_D_FLOOR_L ( void );	//added by Witten
-void  r4300i_COP1_D_ROUND_W ( void );
-void  r4300i_COP1_D_TRUNC_W ( void );
-void  r4300i_COP1_D_CEIL_W  ( void );	//added by Witten
-void  r4300i_COP1_D_FLOOR_W ( void );	//added by Witten
-void  r4300i_COP1_D_CVT_S   ( void );
-void  r4300i_COP1_D_CVT_W   ( void );
-void  r4300i_COP1_D_CVT_L   ( void );
-void  r4300i_COP1_D_CMP     ( void );
-
-/************************** COP1: W functions ************************/
-void  r4300i_COP1_W_CVT_S   ( void );
-void  r4300i_COP1_W_CVT_D   ( void );
-
-/************************** COP1: L functions ************************/
-void  r4300i_COP1_L_CVT_S   ( void );
-void  r4300i_COP1_L_CVT_D   ( void );
-
-/************************** Other functions **************************/
-void   R4300i_UnknownOpcode ( void );
-
-extern uint32_t SWL_MASK[4], SWR_MASK[4], LWL_MASK[4], LWR_MASK[4];
-extern int32_t SWL_SHIFT[4], SWR_SHIFT[4], LWL_SHIFT[4], LWR_SHIFT[4];
-extern int32_t RoundingModel;

audacious-plugins-3.1.1.tar.bz2/src/usf/main.c Deleted

audacious-plugins-3.1.1.tar.bz2/src/usf/main.h Deleted

audacious-plugins-3.1.1.tar.bz2/src/usf/memory.c Deleted

@@ -1,1896 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#include <stdint.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <malloc.h>
-#include <memory.h>
-#include <sys/mman.h>
-
-/* grumble. */
-#define __USE_GNU
-#include <sys/ucontext.h>
-
-#include <signal.h>
-
-
-#include "main.h"
-#include "cpu.h"
-#include "x86.h"
-#include "audio.h"
-#include "rsp.h"
-#include "usf.h"
-
-uintptr_t *TLB_Map = 0;
-uint8_t * MemChunk = 0;
-uint32_t RdramSize = 0x800000, SystemRdramSize = 0x800000, RomFileSize = 0x4000000;
-uint8_t * N64MEM = 0, * RDRAM = 0, * DMEM = 0, * IMEM = 0, * ROMPages[0x400], * savestatespace = 0, * NOMEM = 0;
-void ** JumpTable = 0, ** DelaySlotTable = 0;
-uint8_t * RecompCode = 0, * RecompPos = 0;
-
-uint32_t WrittenToRom = 0;
-uint32_t WroteToRom = 0;
-uint32_t TempValue = 0;
-uint32_t MemoryState = 0;
-
-uint8_t EmptySpace = 0;
-
-uint8_t * PageROM(uint32_t addr) {
-	return (ROMPages[addr/0x10000])?ROMPages[addr/0x10000]+(addr%0x10000):&EmptySpace;
-}
-
-/* MAP_32BIT is needed to make this work on amd64. --nenolod. */
-#ifndef MAP_32BIT
-# define MAP_32BIT	(0)
-#endif
-
-#define PAGE_SIZE	4096
-void *malloc_exec(uint32_t bytes)
-{
-	void *ptr = NULL;
-
-	ptr = mmap(0,bytes,PROT_EXEC|PROT_READ|PROT_WRITE,MAP_PRIVATE | MAP_ANONYMOUS | MAP_32BIT, 0, 0);
-
-	return ptr;
-
-}
-
-
-int32_t Allocate_Memory ( void ) {
-	//RdramSize = 0x800000;
-
-	// Allocate the N64MEM and TLB_Map so that they are in each others 4GB range
-	// Also put the registers there :)
-
-
-	// the mmap technique works craptacular when the regions don't overlay
-
-	MemChunk = mmap(NULL, 0x100000 * sizeof(uintptr_t) + 0x1D000 + RdramSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-
-	TLB_Map = (uintptr_t*)MemChunk;
-	if (TLB_Map == NULL) {
-		return 0;
-	}
-
-	memset(TLB_Map, 0, 0x100000 * sizeof(uintptr_t) + 0x10000);
-
-	N64MEM = mmap((uintptr_t)MemChunk + 0x100000 * sizeof(uintptr_t) + 0x10000, 0xD000 + RdramSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, 0, 0);
-	if(N64MEM == NULL) {
-		DisplayError("Failed to allocate N64MEM");
-		return 0;
-	}
-
-	memset(N64MEM, 0, RdramSize);
-
-	NOMEM = mmap((uintptr_t)N64MEM + RdramSize, 0xD000, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, 0, 0);
-
-	if(RdramSize == 0x400000)
-	{
-	//	munmap(N64MEM + 0x400000, 0x400000);
-	}
-
-	Registers = (N64_REGISTERS *)((uintptr_t)MemChunk + 0x100000 * sizeof(uintptr_t));
-	TLBLoadAddress = (uint32_t *)((uintptr_t)Registers + 0x500);
-	Timers = (SYSTEM_TIMERS*)(TLBLoadAddress + 4);
-	WaitMode = (uint32_t *)(Timers + sizeof(SYSTEM_TIMERS));
-	CPU_Action = (CPU_ACTION *)(WaitMode + 4);
-	RSP_GPR = (REGISTER32 *)(CPU_Action + sizeof(CPU_ACTION));
-	DMEM = (uint8_t *)(RSP_GPR + (32 * 8));
-	RSP_ACCUM = (REGISTER *)(DMEM + 0x2000);
-	RSP_Vect = (VECTOR *)((char*)RSP_ACCUM + (sizeof(REGISTER)*32));
-
-
-	if(!use_interpreter) {
-		JumpTable = (void **)malloc(0x200000 * sizeof(uintptr_t));
-
-		if( JumpTable == NULL )
-			return 0;
-
-		memset(JumpTable, 0, 0x200000 * sizeof(uintptr_t));
-
-		RecompCode = malloc_exec(NormalCompileBufferSize);
-
-		memset(RecompCode, 0xcc, NormalCompileBufferSize);	// fill with Breakpoints
-
-		DelaySlotTable = (void **) malloc((0x1000000) >> 0xA);
-		if( DelaySlotTable == NULL )
-			return 0;
-
-		memset(DelaySlotTable, 0, ((0x1000000) >> 0xA));
-
-	} else {
-		JumpTable = NULL;
-		RecompCode = NULL;
-		DelaySlotTable = NULL;
-	}
-	RDRAM = (uint8_t *)(N64MEM);
-	IMEM = DMEM + 0x1000;
-
-	MemoryState = 1;
-
-	return 1;
-}
-
-int PreAllocate_Memory(void) {
-	int i = 0;
-
-	// Moved the savestate allocation here :) (for better management later)
-	savestatespace = malloc(0x80275C);
-
-	if(savestatespace == 0)
-		return 0;
-
-	memset(savestatespace, 0, 0x80275C);
-
-	for (i = 0; i < 0x400; i++) {
-		ROMPages[i] = 0;
-	}
-
-	return 1;
-}
-
-void Release_Memory ( void ) {
-	uint32_t i;
-
-	for (i = 0; i < 0x400; i++) {
-		if (ROMPages[i]) {
-			free(ROMPages[i]); ROMPages[i] = 0;
-		}
-	}
-	printf("Freeing memory\n");
-
-	MemoryState = 0;
-
-	if (MemChunk != 0) {munmap(MemChunk, 0x100000 * sizeof(uintptr_t)) + 0x1D000 + RdramSize; MemChunk=0;}
-	if (N64MEM != 0) {munmap(N64MEM, RdramSize); N64MEM=0;}
-	if (NOMEM != 0) {munmap(NOMEM, 0xD000); NOMEM=0;}
-
-	if (DelaySlotTable != NULL) {free( DelaySlotTable); DelaySlotTable=NULL;}
-	if (JumpTable != NULL) {free( JumpTable); JumpTable=NULL;}
-	if (RecompCode != NULL){munmap( RecompCode, NormalCompileBufferSize); RecompCode=NULL;}
-	if (RSPRecompCode != NULL){munmap( RSPRecompCode, RSP_RECOMPMEM_SIZE + RSP_SECRECOMPMEM_SIZE); RSPRecompCode=NULL;}
-
-	if (RSPJumpTables != NULL) {free( RSPJumpTables); RSPJumpTables=NULL;}
-	if (JumpTable != NULL) {free( JumpTable); JumpTable=NULL;}
-
-
-	if(savestatespace)
-		free(savestatespace);
-	savestatespace = NULL;
-
-}
-
-
-
-void Compile_LB ( int32_t Reg, uint32_t addr, uint32_t SignExtend ) {
-	uintptr_t Addr = addr;
-	if (!TranslateVaddr(&Addr)) {
-		MoveConstToX86reg(0,Reg);
-		return;
-	}
-
-	switch (Addr & 0xFFF00000) {
-	case 0x00000000:
-	case 0x00100000:
-	case 0x00200000:
-	case 0x00300000:
-	case 0x00400000:
-	case 0x00500000:
-	case 0x00600000:
-	case 0x00700000:
-	case 0x10000000:
-
-		if (SignExtend) {
-			MoveSxVariableToX86regByte(Addr + N64MEM,Reg);
-		} else {
-			MoveZxVariableToX86regByte(Addr + N64MEM,Reg);
-		}
-		break;
-	default:
-		MoveConstToX86reg(0,Reg);
-	}
-}
-
-void Compile_LH ( int32_t Reg, uint32_t addr, uint32_t SignExtend) {
-	uintptr_t Addr = addr;
-	if (!TranslateVaddr(&Addr)) {
-		MoveConstToX86reg(0,Reg);
-		return;
-	}
-
-	switch (Addr & 0xFFF00000) {
-	case 0x00000000:
-	case 0x00100000:
-	case 0x00200000:
-	case 0x00300000:
-	case 0x00400000:
-	case 0x00500000:
-	case 0x00600000:
-	case 0x00700000:
-	case 0x10000000:
-
-		if (SignExtend) {
-			MoveSxVariableToX86regHalf(Addr + N64MEM,Reg);
-		} else {
-			MoveZxVariableToX86regHalf(Addr + N64MEM,Reg);
-		}
-		break;
-	default:
-		MoveConstToX86reg(0,Reg);
-	}
-}
-
-void Compile_LW ( int32_t Reg, uint32_t addr ) {
-	uintptr_t Addr = addr;
-	if (!TranslateVaddr(&Addr)) {
-		MoveConstToX86reg(0,Reg);
-	}
-
-	switch (Addr & 0xFFF00000) {
-	case 0x00000000:
-	case 0x00100000:
-	case 0x00200000:
-	case 0x00300000:
-	case 0x00400000:
-	case 0x00500000:
-	case 0x00600000:
-	case 0x00700000:
-	case 0x10000000:
-		MoveVariableToX86reg(Addr + N64MEM,Reg);
-		break;
-	case 0x04000000:
-		if (Addr < 0x04002000) {
-			MoveVariableToX86reg(Addr + N64MEM,Reg);
-			break;
-		}
-		switch (Addr) {
-		case 0x04040010: MoveVariableToX86reg(&SP_STATUS_REG,Reg); break;
-		case 0x04040014: MoveVariableToX86reg(&SP_DMA_FULL_REG,Reg); break;
-		case 0x04040018: MoveVariableToX86reg(&SP_DMA_BUSY_REG,Reg); break;
-		case 0x04080000: MoveVariableToX86reg(&SP_PC_REG,Reg); break;
-		default: MoveConstToX86reg(0,Reg); break;
-		}
-		break;
-	case 0x04100000: MoveVariableToX86reg(Addr + N64MEM,Reg); break;
-	case 0x04300000:
-		switch (Addr) {
-		case 0x04300000: MoveVariableToX86reg(&MI_MODE_REG,Reg); break;
-		case 0x04300004: MoveVariableToX86reg(&MI_VERSION_REG,Reg); break;
-		case 0x04300008: MoveVariableToX86reg(&MI_INTR_REG,Reg); break;
-		case 0x0430000C: MoveVariableToX86reg(&MI_INTR_MASK_REG,Reg); break;
-		default: MoveConstToX86reg(0,Reg); break;
-		}
-		break;
-	case 0x04400000:
-		switch (Addr) {
-		case 0x04400010:
-			Pushad();
-			Call_Direct(&UpdateCurrentHalfLine);
-			Popad();
-			MoveVariableToX86reg(&HalfLine,Reg);
-			break;
-		default: MoveConstToX86reg(0,Reg); break;
-		}
-		break;
-	case 0x04500000: /* AI registers */
-		switch (Addr) {
-		case 0x04500004:
-			Pushad();
-			Call_Direct(AiReadLength);
-			MoveX86regToVariable(x86_EAX,&TempValue);
-			Popad();
-			MoveVariableToX86reg(&TempValue,Reg);
-			break;
-		case 0x0450000C: MoveVariableToX86reg(&AI_STATUS_REG,Reg); break;
-		case 0x04500010: MoveVariableToX86reg(&AI_DACRATE_REG,Reg); break;
-		default: MoveConstToX86reg(0,Reg); break;
-		}
-		break;
-	case 0x04600000:
-		switch (Addr) {
-		case 0x04600010: MoveVariableToX86reg(&PI_STATUS_REG,Reg); break;
-		case 0x04600014: MoveVariableToX86reg(&PI_DOMAIN1_REG,Reg); break;
-		case 0x04600018: MoveVariableToX86reg(&PI_BSD_DOM1_PWD_REG,Reg); break;
-		case 0x0460001C: MoveVariableToX86reg(&PI_BSD_DOM1_PGS_REG,Reg); break;
-		case 0x04600020: MoveVariableToX86reg(&PI_BSD_DOM1_RLS_REG,Reg); break;
-		case 0x04600024: MoveVariableToX86reg(&PI_DOMAIN2_REG,Reg); break;
-		case 0x04600028: MoveVariableToX86reg(&PI_BSD_DOM2_PWD_REG,Reg); break;
-		case 0x0460002C: MoveVariableToX86reg(&PI_BSD_DOM2_PGS_REG,Reg); break;
-		case 0x04600030: MoveVariableToX86reg(&PI_BSD_DOM2_RLS_REG,Reg); break;
-		default: MoveConstToX86reg(0,Reg); break;
-		}
-		break;
-	case 0x04700000:
-		switch (Addr) {
-		case 0x0470000C: MoveVariableToX86reg(&RI_SELECT_REG,Reg); break;
-		case 0x04700010: MoveVariableToX86reg(&RI_REFRESH_REG,Reg); break;
-		default: MoveConstToX86reg(0,Reg); break;
-		}
-		break;
-	case 0x04800000:
-		switch (Addr) {
-		case 0x04800018: MoveVariableToX86reg(&SI_STATUS_REG,Reg); break;
-		default: MoveConstToX86reg(0,Reg); break;
-		}
-		break;
-	case 0x1FC00000: MoveVariableToX86reg(Addr + N64MEM,Reg); break;
-	default: MoveConstToX86reg(((Addr & 0xFFFF) << 16) | (Addr & 0xFFFF),Reg);
-	}
-}
-
-void Compile_SB_Const ( uint8_t Value, uint32_t addr ) {
-	uintptr_t Addr = addr;
-	if (!TranslateVaddr(&Addr)) {
-		return;
-	}
-
-	switch (Addr & 0xFFF00000) {
-	case 0x00000000:
-	case 0x00100000:
-	case 0x00200000:
-	case 0x00300000:
-	case 0x00400000:
-	case 0x00500000:
-	case 0x00600000:
-	case 0x00700000:
-		MoveConstByteToVariable(Value,Addr + N64MEM);
-		break;
-	}
-}
-
-void Compile_SB_Register ( int32_t x86Reg, uint32_t addr ) {
-	uintptr_t Addr = addr;
-	if (!TranslateVaddr(&Addr)) {
-		return;
-	}
-
-	switch (Addr & 0xFFF00000) {
-	case 0x00000000:
-	case 0x00100000:
-	case 0x00200000:
-	case 0x00300000:
-	case 0x00400000:
-	case 0x00500000:
-	case 0x00600000:
-	case 0x00700000:
-		MoveX86regByteToVariable(x86Reg,Addr + N64MEM);
-		break;
-	}
-}
-
-void Compile_SH_Const ( uint16_t Value, uint32_t addr ) {
-	uintptr_t Addr = addr;
-	if (!TranslateVaddr(&Addr)) {
-		return;
-	}
-
-	switch (Addr & 0xFFF00000) {
-	case 0x00000000:
-	case 0x00100000:
-	case 0x00200000:
-	case 0x00300000:
-	case 0x00400000:
-	case 0x00500000:
-	case 0x00600000:
-	case 0x00700000:
-		MoveConstHalfToVariable(Value,Addr + N64MEM);
-		break;
-	}
-}
-
-void Compile_SH_Register ( int32_t x86Reg, uint32_t addr ) {
-	uintptr_t Addr = addr;
-	if (!TranslateVaddr(&Addr)) {
-		return;
-	}
-
-	switch (Addr & 0xFFF00000) {
-	case 0x00000000:
-	case 0x00100000:
-	case 0x00200000:
-	case 0x00300000:
-	case 0x00400000:
-	case 0x00500000:
-	case 0x00600000:
-	case 0x00700000:
-		MoveX86regHalfToVariable(x86Reg,Addr + N64MEM);
-		break;
-	}
-}
-
-void Compile_SW_Const ( uint32_t Value, uint32_t addr ) {
-	uintptr_t Addr = addr;
-	if (!TranslateVaddr(&Addr)) {
-		return;
-	}
-
-	switch (Addr & 0xFFF00000) {
-	case 0x00000000:
-	case 0x00100000:
-	case 0x00200000:
-	case 0x00300000:
-	case 0x00400000:
-	case 0x00500000:
-	case 0x00600000:
-	case 0x00700000:
-		MoveConstToVariable(Value,Addr + N64MEM);
-		break;
-	case 0x03F00000:
-		switch (Addr) {
-		case 0x03F00000: MoveConstToVariable(Value,&RDRAM_CONFIG_REG); break;
-		case 0x03F00004: MoveConstToVariable(Value,&RDRAM_DEVICE_ID_REG); break;
-		case 0x03F00008: MoveConstToVariable(Value,&RDRAM_DELAY_REG); break;
-		case 0x03F0000C: MoveConstToVariable(Value,&RDRAM_MODE_REG); break;
-		case 0x03F00010: MoveConstToVariable(Value,&RDRAM_REF_INTERVAL_REG); break;
-		case 0x03F00014: MoveConstToVariable(Value,&RDRAM_REF_ROW_REG); break;
-		case 0x03F00018: MoveConstToVariable(Value,&RDRAM_RAS_INTERVAL_REG); break;
-		case 0x03F0001C: MoveConstToVariable(Value,&RDRAM_MIN_INTERVAL_REG); break;
-		case 0x03F00020: MoveConstToVariable(Value,&RDRAM_ADDR_SELECT_REG); break;
-		case 0x03F00024: MoveConstToVariable(Value,&RDRAM_DEVICE_MANUF_REG); break;
-		case 0x03F04004: break;
-		case 0x03F08004: break;
-		case 0x03F80004: break;
-		case 0x03F80008: break;
-		case 0x03F8000C: break;
-		case 0x03F80014: break;
-		}
-		break;
-	case 0x04000000:
-		if (Addr < 0x04002000) {
-			MoveConstToVariable(Value,Addr + N64MEM);
-			break;
-		}
-		switch (Addr) {
-		case 0x04040000: MoveConstToVariable(Value,&SP_MEM_ADDR_REG); break;
-		case 0x04040004: MoveConstToVariable(Value,&SP_DRAM_ADDR_REG); break;
-		case 0x04040008:
-			MoveConstToVariable(Value,&SP_RD_LEN_REG);
-			Pushad();
-			Call_Direct(&SP_DMA_READ);
-			Popad();
-			break;
-		case 0x04040010:
-			{
-				uint32_t ModValue = 0;
-				if ( ( Value & SP_CLR_HALT ) != 0 ) { ModValue |= SP_STATUS_HALT; }
-				if ( ( Value & SP_CLR_BROKE ) != 0 ) { ModValue |= SP_STATUS_BROKE; }
-				if ( ( Value & SP_CLR_SSTEP ) != 0 ) { ModValue |= SP_STATUS_SSTEP; }
-				if ( ( Value & SP_CLR_INTR_BREAK ) != 0 ) { ModValue |= SP_STATUS_INTR_BREAK; }
-				if ( ( Value & SP_CLR_SIG0 ) != 0 ) { ModValue |= SP_STATUS_SIG0; }
-				if ( ( Value & SP_CLR_SIG1 ) != 0 ) { ModValue |= SP_STATUS_SIG1; }
-				if ( ( Value & SP_CLR_SIG2 ) != 0 ) { ModValue |= SP_STATUS_SIG2; }
-				if ( ( Value & SP_CLR_SIG3 ) != 0 ) { ModValue |= SP_STATUS_SIG3; }
-				if ( ( Value & SP_CLR_SIG4 ) != 0 ) { ModValue |= SP_STATUS_SIG4; }
-				if ( ( Value & SP_CLR_SIG5 ) != 0 ) { ModValue |= SP_STATUS_SIG5; }
-				if ( ( Value & SP_CLR_SIG6 ) != 0 ) { ModValue |= SP_STATUS_SIG6; }
-				if ( ( Value & SP_CLR_SIG7 ) != 0 ) { ModValue |= SP_STATUS_SIG7; }
-
-				if (ModValue != 0) {
-					AndConstToVariable(~ModValue,&SP_STATUS_REG);
-				}
-
-				ModValue = 0;
-				if ( ( Value & SP_SET_HALT ) != 0 ) { ModValue |= SP_STATUS_HALT; }
-				if ( ( Value & SP_SET_SSTEP ) != 0 ) { ModValue |= SP_STATUS_SSTEP; }
-				if ( ( Value & SP_SET_INTR_BREAK ) != 0) { ModValue |= SP_STATUS_INTR_BREAK; }
-				if ( ( Value & SP_SET_SIG0 ) != 0 ) { ModValue |= SP_STATUS_SIG0; }
-				if ( ( Value & SP_SET_SIG1 ) != 0 ) { ModValue |= SP_STATUS_SIG1; }
-				if ( ( Value & SP_SET_SIG2 ) != 0 ) { ModValue |= SP_STATUS_SIG2; }
-				if ( ( Value & SP_SET_SIG3 ) != 0 ) { ModValue |= SP_STATUS_SIG3; }
-				if ( ( Value & SP_SET_SIG4 ) != 0 ) { ModValue |= SP_STATUS_SIG4; }
-				if ( ( Value & SP_SET_SIG5 ) != 0 ) { ModValue |= SP_STATUS_SIG5; }
-				if ( ( Value & SP_SET_SIG6 ) != 0 ) { ModValue |= SP_STATUS_SIG6; }
-				if ( ( Value & SP_SET_SIG7 ) != 0 ) { ModValue |= SP_STATUS_SIG7; }
-				if (ModValue != 0) {
-					OrConstToVariable(ModValue,&SP_STATUS_REG);
-				}
-
-				if ( ( Value & SP_CLR_INTR ) != 0) {
-					AndConstToVariable(~MI_INTR_SP,&MI_INTR_REG);
-					Pushad();
-					Call_Direct(RunRsp);
-					Call_Direct(CheckInterrupts);
-					Popad();
-				} else {
-					Pushad();
-					Call_Direct(RunRsp);
-					Popad();
-				}
-			}
-			break;
-		case 0x0404001C: MoveConstToVariable(0,&SP_SEMAPHORE_REG); break;
-		case 0x04080000: MoveConstToVariable(Value & 0xFFC,&SP_PC_REG); break;
-		}
-		break;
-	case 0x04300000:
-		switch (Addr) {
-		case 0x04300000:
-			{
-				uint32_t ModValue = 0x7F;
-				if ( ( Value & MI_CLR_INIT ) != 0 ) { ModValue |= MI_MODE_INIT; }
-				if ( ( Value & MI_CLR_EBUS ) != 0 ) { ModValue |= MI_MODE_EBUS; }
-				if ( ( Value & MI_CLR_RDRAM ) != 0 ) { ModValue |= MI_MODE_RDRAM; }
-				if (ModValue != 0) {
-					AndConstToVariable(~ModValue,&MI_MODE_REG);
-				}
-
-				ModValue = (Value & 0x7F);
-				if ( ( Value & MI_SET_INIT ) != 0 ) { ModValue |= MI_MODE_INIT; }
-				if ( ( Value & MI_SET_EBUS ) != 0 ) { ModValue |= MI_MODE_EBUS; }
-				if ( ( Value & MI_SET_RDRAM ) != 0 ) { ModValue |= MI_MODE_RDRAM; }
-				if (ModValue != 0) {
-					OrConstToVariable(ModValue,&MI_MODE_REG);
-				}
-				if ( ( Value & MI_CLR_DP_INTR ) != 0 ) {
-					AndConstToVariable(~MI_INTR_DP,&MI_INTR_REG);
-				}
-			}
-			break;
-		case 0x0430000C:
-			{
-				uint32_t ModValue;
-				ModValue = 0;
-				if ( ( Value & MI_INTR_MASK_CLR_SP ) != 0 ) { ModValue |= MI_INTR_MASK_SP; }
-				if ( ( Value & MI_INTR_MASK_CLR_SI ) != 0 ) { ModValue |= MI_INTR_MASK_SI; }
-				if ( ( Value & MI_INTR_MASK_CLR_AI ) != 0 ) { ModValue |= MI_INTR_MASK_AI; }
-				if ( ( Value & MI_INTR_MASK_CLR_VI ) != 0 ) { ModValue |= MI_INTR_MASK_VI; }
-				if ( ( Value & MI_INTR_MASK_CLR_PI ) != 0 ) { ModValue |= MI_INTR_MASK_PI; }
-				if ( ( Value & MI_INTR_MASK_CLR_DP ) != 0 ) { ModValue |= MI_INTR_MASK_DP; }
-				if (ModValue != 0) {
-					AndConstToVariable(~ModValue,&MI_INTR_MASK_REG);
-				}
-
-				ModValue = 0;
-				if ( ( Value & MI_INTR_MASK_SET_SP ) != 0 ) { ModValue |= MI_INTR_MASK_SP; }
-				if ( ( Value & MI_INTR_MASK_SET_SI ) != 0 ) { ModValue |= MI_INTR_MASK_SI; }
-				if ( ( Value & MI_INTR_MASK_SET_AI ) != 0 ) { ModValue |= MI_INTR_MASK_AI; }
-				if ( ( Value & MI_INTR_MASK_SET_VI ) != 0 ) { ModValue |= MI_INTR_MASK_VI; }
-				if ( ( Value & MI_INTR_MASK_SET_PI ) != 0 ) { ModValue |= MI_INTR_MASK_PI; }
-				if ( ( Value & MI_INTR_MASK_SET_DP ) != 0 ) { ModValue |= MI_INTR_MASK_DP; }
-				if (ModValue != 0) {
-					OrConstToVariable(ModValue,&MI_INTR_MASK_REG);
-				}
-			}
-			break;
-		}
-		break;
-	case 0x04400000:
-		switch (Addr) {
-		case 0x04400000:
-			MoveConstToVariable(Value,&VI_STATUS_REG);
-			break;
-		case 0x04400004: MoveConstToVariable((Value & 0xFFFFFF),&VI_ORIGIN_REG); break;
-		case 0x04400008:
-			MoveConstToVariable(Value,&VI_WIDTH_REG);
-			break;
-		case 0x0440000C: MoveConstToVariable(Value,&VI_INTR_REG); break;
-		case 0x04400010:
-			AndConstToVariable(~MI_INTR_VI,&MI_INTR_REG);
-			Pushad();
-			Call_Direct(CheckInterrupts);
-			Popad();
-			break;
-		case 0x04400014: MoveConstToVariable(Value,&VI_BURST_REG); break;
-		case 0x04400018: MoveConstToVariable(Value,&VI_V_SYNC_REG); break;
-		case 0x0440001C: MoveConstToVariable(Value,&VI_H_SYNC_REG); break;
-		case 0x04400020: MoveConstToVariable(Value,&VI_LEAP_REG); break;
-		case 0x04400024: MoveConstToVariable(Value,&VI_H_START_REG); break;
-		case 0x04400028: MoveConstToVariable(Value,&VI_V_START_REG); break;
-		case 0x0440002C: MoveConstToVariable(Value,&VI_V_BURST_REG); break;
-		case 0x04400030: MoveConstToVariable(Value,&VI_X_SCALE_REG); break;
-		case 0x04400034: MoveConstToVariable(Value,&VI_Y_SCALE_REG); break;
-		}
-		break;
-	case 0x04500000: /* AI registers */
-		switch (Addr) {
-		case 0x04500000: MoveConstToVariable(Value,&AI_DRAM_ADDR_REG); break;
-		case 0x04500004:
-			MoveConstToVariable(Value,&AI_LEN_REG);
-			Pushad();
-			//Pushad();
-			//PushImm32(Value);
-			Call_Direct(AiLenChanged);
-			//AddConstToX86Reg(x86_ESP,8);
-
-			Popad();
-			break;
-		case 0x04500008: MoveConstToVariable((Value & 1),&AI_CONTROL_REG); break;
-		case 0x0450000C:
-			/* Clear Interrupt */;
-			AndConstToVariable(~MI_INTR_AI,&MI_INTR_REG);
-			AndConstToVariable(~MI_INTR_AI,&AudioIntrReg);
-			Pushad();
-			Call_Direct(CheckInterrupts);
-			Popad();
-			break;
-		case 0x04500010:
-			Addr|=0xa0000000;
-			MoveConstToVariable(Value,Addr + N64MEM);
-			break;
-		case 0x04500014: MoveConstToVariable(Value,&AI_BITRATE_REG); break;
-		}
-		break;
-	case 0x04600000:
-		switch (Addr) {
-		case 0x04600000: MoveConstToVariable(Value,&PI_DRAM_ADDR_REG); break;
-		case 0x04600004: MoveConstToVariable(Value,&PI_CART_ADDR_REG); break;
-		case 0x04600008:
-			MoveConstToVariable(Value,&PI_RD_LEN_REG);
-			Pushad();
-			Call_Direct(&PI_DMA_READ);
-			Popad();
-			break;
-		case 0x0460000C:
-			MoveConstToVariable(Value,&PI_WR_LEN_REG);
-			Pushad();
-			Call_Direct(&PI_DMA_WRITE);
-			Popad();
-			break;
-		case 0x04600010:
-			if ((Value & PI_CLR_INTR) != 0 ) {
-				AndConstToVariable(~MI_INTR_PI,&MI_INTR_REG);
-				Pushad();
-				Call_Direct(CheckInterrupts);
-				Popad();
-			}
-			break;
-		case 0x04600014: MoveConstToVariable((Value & 0xFF),&PI_DOMAIN1_REG); break;
-		case 0x04600018: MoveConstToVariable((Value & 0xFF),&PI_BSD_DOM1_PWD_REG); break;
-		case 0x0460001C: MoveConstToVariable((Value & 0xFF),&PI_BSD_DOM1_PGS_REG); break;
-		case 0x04600020: MoveConstToVariable((Value & 0xFF),&PI_BSD_DOM1_RLS_REG); break;
-		}
-		break;
-	case 0x04700000:
-		switch (Addr) {
-		case 0x04700000: MoveConstToVariable(Value,&RI_MODE_REG); break;
-		case 0x04700004: MoveConstToVariable(Value,&RI_CONFIG_REG); break;
-		case 0x04700008: MoveConstToVariable(Value,&RI_CURRENT_LOAD_REG); break;
-		case 0x0470000C: MoveConstToVariable(Value,&RI_SELECT_REG); break;
-		}
-		break;
-	case 0x04800000:
-		switch (Addr) {
-		case 0x04800000: MoveConstToVariable(Value,&SI_DRAM_ADDR_REG); break;
-		case 0x04800004:
-			MoveConstToVariable(Value,&SI_PIF_ADDR_RD64B_REG);
-			Pushad();
-			Call_Direct(&SI_DMA_READ);
-			Popad();
-			break;
-		case 0x04800010:
-			MoveConstToVariable(Value,&SI_PIF_ADDR_WR64B_REG);
-			Pushad();
-			Call_Direct(&SI_DMA_WRITE);
-			Popad();
-			break;
-		case 0x04800018:
-			AndConstToVariable(~MI_INTR_SI,&MI_INTR_REG);
-			AndConstToVariable(~SI_STATUS_INTERRUPT,&SI_STATUS_REG);
-			Pushad();
-			Call_Direct(CheckInterrupts);
-			Popad();
-			break;
-		}
-		break;
-	}
-}
-
-void Compile_SW_Register ( int32_t x86Reg, uint32_t addr ) {
-	uintptr_t Addr = addr;
-
-
-	if (!TranslateVaddr(&Addr)) {
-		return;
-	}
-
-	switch (Addr & 0xFFF00000) {
-	case 0x00000000:
-	case 0x00100000:
-	case 0x00200000:
-	case 0x00300000:
-	case 0x00400000:
-	case 0x00500000:
-	case 0x00600000:
-	case 0x00700000:
-		MoveX86regToVariable(x86Reg,Addr + N64MEM);
-		break;
-	case 0x04000000:
-		switch (Addr) {
-		case 0x04040000: MoveX86regToVariable(x86Reg,&SP_MEM_ADDR_REG); break;
-		case 0x04040004: MoveX86regToVariable(x86Reg,&SP_DRAM_ADDR_REG); break;
-		case 0x04040008:
-			MoveX86regToVariable(x86Reg,&SP_RD_LEN_REG);
-			Pushad();
-			Call_Direct(&SP_DMA_READ);
-			Popad();
-			break;
-		case 0x0404000C:
-			MoveX86regToVariable(x86Reg,&SP_WR_LEN_REG);
-			Pushad();
-			Call_Direct(&SP_DMA_WRITE);
-			Popad();
-			break;
-		case 0x04040010:
-			MoveX86regToVariable(x86Reg,&RegModValue);
-			Pushad();
-			Call_Direct(ChangeSpStatus);
-			Popad();
-			break;
-		case 0x0404001C: MoveConstToVariable(0,&SP_SEMAPHORE_REG); break;
-		case 0x04080000:
-			MoveX86regToVariable(x86Reg,&SP_PC_REG);
-			AndConstToVariable(0xFFC,&SP_PC_REG);
-			break;
-		default:
-			if (Addr < 0x04002000)
-				MoveX86regToVariable(x86Reg,Addr + N64MEM);
-		}
-		break;
-	case 0x04100000:
-		break;
-		//MoveX86regToVariable(x86Reg,Addr + N64MEM);
-	case 0x04300000:
-		switch (Addr) {
-		case 0x04300000:
-			MoveX86regToVariable(x86Reg,&RegModValue);
-			Pushad();
-			Call_Direct(ChangeMiIntrMask);
-			Popad();
-			break;
-		case 0x0430000C:
-			MoveX86regToVariable(x86Reg,&RegModValue);
-			Pushad();
-			Call_Direct(ChangeMiIntrMask);
-			Popad();
-			break;
-		}
-		break;
-
-	case 0x04400000:
-		switch (Addr) {
-		case 0x04400000:
-			// inserted in place of compiled stuff
-			MoveX86regToVariable(x86Reg,&VI_STATUS_REG);
-			break;
-		case 0x04400004:
-			MoveX86regToVariable(x86Reg,&VI_ORIGIN_REG);
-			AndConstToVariable(0xFFFFFF,&VI_ORIGIN_REG);
-			break;
-		case 0x04400008:
-			// inserted in place of compiled stuff
-			MoveX86regToVariable(x86Reg,&VI_WIDTH_REG);
-			break;
-		case 0x0440000C: MoveX86regToVariable(x86Reg,&VI_INTR_REG); break;
-		case 0x04400010:
-			AndConstToVariable(~MI_INTR_VI,&MI_INTR_REG);
-			Pushad();
-			Call_Direct(CheckInterrupts);
-			Popad();
-			break;
-		case 0x04400014: MoveX86regToVariable(x86Reg,&VI_BURST_REG); break;
-		case 0x04400018: MoveX86regToVariable(x86Reg,&VI_V_SYNC_REG); break;
-		case 0x0440001C: MoveX86regToVariable(x86Reg,&VI_H_SYNC_REG); break;
-		case 0x04400020: MoveX86regToVariable(x86Reg,&VI_LEAP_REG); break;
-		case 0x04400024: MoveX86regToVariable(x86Reg,&VI_H_START_REG); break;
-		case 0x04400028: MoveX86regToVariable(x86Reg,&VI_V_START_REG); break;
-		case 0x0440002C: MoveX86regToVariable(x86Reg,&VI_V_BURST_REG); break;
-		case 0x04400030: MoveX86regToVariable(x86Reg,&VI_X_SCALE_REG); break;
-		case 0x04400034: MoveX86regToVariable(x86Reg,&VI_Y_SCALE_REG); break;
-		}
-		break;
-	case 0x04500000: /* AI registers */
-		switch (Addr) {
-		case 0x04500000: MoveX86regToVariable(x86Reg,&AI_DRAM_ADDR_REG); break;
-		case 0x04500004:
-			MoveX86regToVariable(x86Reg,&AI_LEN_REG);
-			Pushad();
-			//MoveX86RegToX86Reg(x86_ESP, x86_EAX);
-			//AndConstToX86Reg(x86_EAX, 8);
-			//SubX86RegToX86Reg(x86_ESP,x86_EAX);
-			//Push(x86_EAX);
-			Call_Direct(AiLenChanged);
-			//Pop(x86_EAX);
-			//AddX86RegToX86Reg(x86_ESP,x86_EAX);
-			Popad();
-			break;
-		case 0x04500008:
-			MoveX86regToVariable(x86Reg,&AI_CONTROL_REG);
-			AndConstToVariable(1,&AI_CONTROL_REG);
-		case 0x0450000C:
-			/* Clear Interrupt */;
-			AndConstToVariable(~MI_INTR_AI,&MI_INTR_REG);
-			AndConstToVariable(~MI_INTR_AI,&AudioIntrReg);
-			Pushad();
-			Call_Direct(CheckInterrupts);
-			Popad();
-			break;
-		case 0x04500010:
-			MoveX86regToVariable(x86Reg,Addr + N64MEM);
-			break;
-		default:
-			MoveX86regToVariable(x86Reg,Addr + N64MEM);
-		}
-		break;
-	case 0x04600000:
-		switch (Addr) {
-		case 0x04600000: MoveX86regToVariable(x86Reg,&PI_DRAM_ADDR_REG); break;
-		case 0x04600004: MoveX86regToVariable(x86Reg,&PI_CART_ADDR_REG); break;
-		case 0x04600008:
-			MoveX86regToVariable(x86Reg,&PI_RD_LEN_REG);
-			Pushad();
-			Call_Direct(&PI_DMA_READ);
-			Popad();
-			break;
-		case 0x0460000C:
-			MoveX86regToVariable(x86Reg,&PI_WR_LEN_REG);
-			Pushad();
-			Call_Direct(&PI_DMA_WRITE);
-			Popad();
-			break;
-		case 0x04600010:
-			AndConstToVariable(~MI_INTR_PI,&MI_INTR_REG);
-			Pushad();
-			Call_Direct(CheckInterrupts);
-			Popad();
-			break;
-			MoveX86regToVariable(x86Reg,&VI_ORIGIN_REG);
-			AndConstToVariable(0xFFFFFF,&VI_ORIGIN_REG);
-		case 0x04600014:
-			MoveX86regToVariable(x86Reg,&PI_DOMAIN1_REG);
-			AndConstToVariable(0xFF,&PI_DOMAIN1_REG);
-			break;
-		case 0x04600018:
-			MoveX86regToVariable(x86Reg,&PI_BSD_DOM1_PWD_REG);
-			AndConstToVariable(0xFF,&PI_BSD_DOM1_PWD_REG);
-			break;
-		case 0x0460001C:
-			MoveX86regToVariable(x86Reg,&PI_BSD_DOM1_PGS_REG);
-			AndConstToVariable(0xFF,&PI_BSD_DOM1_PGS_REG);
-			break;
-		case 0x04600020:
-			MoveX86regToVariable(x86Reg,&PI_BSD_DOM1_RLS_REG);
-			AndConstToVariable(0xFF,&PI_BSD_DOM1_RLS_REG);
-			break;
-		}
-		break;
-	case 0x04700000:
-		switch (Addr) {
-		case 0x04700010: MoveX86regToVariable(x86Reg,&RI_REFRESH_REG); break;
-		}
-		break;
-	case 0x04800000:
-		switch (Addr) {
-		case 0x04800000: MoveX86regToVariable(x86Reg,&SI_DRAM_ADDR_REG); break;
-		case 0x04800004:
-			MoveX86regToVariable(x86Reg,&SI_PIF_ADDR_RD64B_REG);
-			Pushad();
-			Call_Direct(&SI_DMA_READ);
-			Popad();
-			break;
-		case 0x04800010:
-			MoveX86regToVariable(x86Reg,&SI_PIF_ADDR_WR64B_REG);
-			Pushad();
-			Call_Direct(&SI_DMA_WRITE);
-			Popad();
-			break;
-		case 0x04800018:
-			AndConstToVariable(~MI_INTR_SI,&MI_INTR_REG);
-			AndConstToVariable(~SI_STATUS_INTERRUPT,&SI_STATUS_REG);
-			Pushad();
-			Call_Direct(CheckInterrupts);
-			Popad();
-			break;
-		}
-		break;
-	case 0x1FC00000:
-		MoveX86regToVariable(x86Reg,Addr + N64MEM);
-		break;
-	}
-}
-
-int32_t r4300i_LB_NonMemory ( uint32_t PAddr, uint32_t * Value, uint32_t SignExtend ) {
-	if (PAddr >= 0x10000000 && PAddr < 0x16000000) {
-		if (WrittenToRom) { return 0; }
-		if ((PAddr & 2) == 0) { PAddr = (PAddr + 4) ^ 2; }
-		if ((PAddr - 0x10000000) < RomFileSize) {
-			if (SignExtend) {
-				*Value = (char)*PageROM((PAddr - 0x10000000)^3);
-
-			} else {
-				*Value = *PageROM((PAddr - 0x10000000)^3);
-			}
-			return 1;
-		} else {
-			*Value = 0;
-			return 0;
-		}
-	}
-
-	switch (PAddr & 0xFFF00000) {
-	default:
-		* Value = 0;
-		return 0;
-		break;
-	}
-	return 1;
-}
-
-uint32_t r4300i_LB_VAddr ( uint32_t VAddr, uint8_t * Value ) {
-	if (TLB_Map[VAddr >> 12] == 0) { return 0; }
-	*Value = *(uint8_t *)(TLB_Map[VAddr >> 12] + (VAddr ^ 3));
-	return 1;
-}
-
-uint32_t r4300i_LD_VAddr ( uint32_t VAddr, uint64_t * Value ) {
-	if (TLB_Map[VAddr >> 12] == 0) { return 0; }
-	*((uint32_t *)(Value) + 1) = *(uint32_t *)(TLB_Map[VAddr >> 12] + VAddr);
-	*((uint32_t *)(Value)) = *(uint32_t *)(TLB_Map[VAddr >> 12] + VAddr + 4);
-	return 1;
-}
-
-int32_t r4300i_LH_NonMemory ( uint32_t PAddr, uint32_t * Value, int32_t SignExtend ) {
-	switch (PAddr & 0xFFF00000) {
-	default:
-		* Value = 0;
-		return 0;
-		break;
-	}
-	return 1;
-}
-
-uint32_t r4300i_LH_VAddr ( uint32_t VAddr, uint16_t * Value ) {
-	if (TLB_Map[VAddr >> 12] == 0) { return 0; }
-	*Value = *(uint16_t *)(TLB_Map[VAddr >> 12] + (VAddr ^ 2));
-	return 1;
-}
-
-int32_t r4300i_LW_NonMemory ( uint32_t PAddr, uint32_t * Value ) {
-	if (PAddr >= 0x10000000 && PAddr < 0x16000000) {
-		if (WrittenToRom) {
-			*Value = WroteToRom;
-			//LogMessage("%X: Read crap from Rom %X from %X",PROGRAM_COUNTER,*Value,PAddr);
-			WrittenToRom = 0;
-			return 1;
-		}
-		if ((PAddr - 0x10000000) < RomFileSize) {
-			*Value = *(uint32_t *)PageROM((PAddr - 0x10000000));
-			return 1;
-		} else {
-			*Value = PAddr & 0xFFFF;
-			*Value = (*Value << 16) | *Value;
-			return 0;
-		}
-	}
-
-	switch (PAddr & 0xFFF00000) {
-	case 0x03F00000:
-		switch (PAddr) {
-		case 0x03F00000: * Value = RDRAM_CONFIG_REG; break;
-		case 0x03F00004: * Value = RDRAM_DEVICE_ID_REG; break;
-		case 0x03F00008: * Value = RDRAM_DELAY_REG; break;
-		case 0x03F0000C: * Value = RDRAM_MODE_REG; break;
-		case 0x03F00010: * Value = RDRAM_REF_INTERVAL_REG; break;
-		case 0x03F00014: * Value = RDRAM_REF_ROW_REG; break;
-		case 0x03F00018: * Value = RDRAM_RAS_INTERVAL_REG; break;
-		case 0x03F0001C: * Value = RDRAM_MIN_INTERVAL_REG; break;
-		case 0x03F00020: * Value = RDRAM_ADDR_SELECT_REG; break;
-		case 0x03F00024: * Value = RDRAM_DEVICE_MANUF_REG; break;
-		default:
-			* Value = 0;
-			return 0;
-		}
-		break;
-	case 0x04000000:
-		switch (PAddr) {
-		case 0x04040010: *Value = SP_STATUS_REG; break;
-		case 0x04040014: *Value = SP_DMA_FULL_REG; break;
-		case 0x04040018: *Value = SP_DMA_BUSY_REG; break;
-		case 0x04080000: *Value = SP_PC_REG; break;
-		default:
-			* Value = 0;
-			return 0;
-		}
-		break;
-	case 0x04100000:
-		switch (PAddr) {
-		case 0x0410000C: *Value = DPC_STATUS_REG; break;
-		case 0x04100010: *Value = DPC_CLOCK_REG; break;
-		case 0x04100014: *Value = DPC_BUFBUSY_REG; break;
-		case 0x04100018: *Value = DPC_PIPEBUSY_REG; break;
-		case 0x0410001C: *Value = DPC_TMEM_REG; break;
-		default:
-			* Value = 0;
-			return 0;
-		}
-		break;
-	case 0x04300000:
-		switch (PAddr) {
-		case 0x04300000: * Value = MI_MODE_REG; break;
-		case 0x04300004: * Value = MI_VERSION_REG; break;
-		case 0x04300008: * Value = MI_INTR_REG; break;
-		case 0x0430000C: * Value = MI_INTR_MASK_REG; break;
-		default:
-			* Value = 0;
-			return 0;
-		}
-		break;
-	case 0x04400000:
-		switch (PAddr) {
-		case 0x04400000: *Value = VI_STATUS_REG; break;
-		case 0x04400004: *Value = VI_ORIGIN_REG; break;
-		case 0x04400008: *Value = VI_WIDTH_REG; break;
-		case 0x0440000C: *Value = VI_INTR_REG; break;
-		case 0x04400010:
-			*Value = 0;
-			break;
-		case 0x04400014: *Value = VI_BURST_REG; break;
-		case 0x04400018: *Value = VI_V_SYNC_REG; break;
-		case 0x0440001C: *Value = VI_H_SYNC_REG; break;
-		case 0x04400020: *Value = VI_LEAP_REG; break;
-		case 0x04400024: *Value = VI_H_START_REG; break;
-		case 0x04400028: *Value = VI_V_START_REG ; break;
-		case 0x0440002C: *Value = VI_V_BURST_REG; break;
-		case 0x04400030: *Value = VI_X_SCALE_REG; break;
-		case 0x04400034: *Value = VI_Y_SCALE_REG; break;
-		default:
-			* Value = 0;
-			return 0;
-		}
-		break;
-	case 0x04500000:
-		switch (PAddr) {
-		case 0x04500004: *Value = AiReadLength(); break;
-		case 0x0450000C: *Value = AI_STATUS_REG; break;
-		default:
-			* Value = 0;
-			return 0;
-		}
-		break;
-	case 0x04600000:
-		switch (PAddr) {
-		case 0x04600010: *Value = PI_STATUS_REG; break;
-		case 0x04600014: *Value = PI_DOMAIN1_REG; break;
-		case 0x04600018: *Value = PI_BSD_DOM1_PWD_REG; break;
-		case 0x0460001C: *Value = PI_BSD_DOM1_PGS_REG; break;
-		case 0x04600020: *Value = PI_BSD_DOM1_RLS_REG; break;
-		case 0x04600024: *Value = PI_DOMAIN2_REG; break;
-		case 0x04600028: *Value = PI_BSD_DOM2_PWD_REG; break;
-		case 0x0460002C: *Value = PI_BSD_DOM2_PGS_REG; break;
-		case 0x04600030: *Value = PI_BSD_DOM2_RLS_REG; break;
-		default:
-			* Value = 0;
-			return 0;
-		}
-		break;
-	case 0x04700000:
-		switch (PAddr) {
-		case 0x04700000: * Value = RI_MODE_REG; break;
-		case 0x04700004: * Value = RI_CONFIG_REG; break;
-		case 0x04700008: * Value = RI_CURRENT_LOAD_REG; break;
-		case 0x0470000C: * Value = RI_SELECT_REG; break;
-		case 0x04700010: * Value = RI_REFRESH_REG; break;
-		case 0x04700014: * Value = RI_LATENCY_REG; break;
-		case 0x04700018: * Value = RI_RERROR_REG; break;
-		case 0x0470001C: * Value = RI_WERROR_REG; break;
-		default:
-			* Value = 0;
-			return 0;
-		}
-		break;
-	case 0x04800000:
-		switch (PAddr) {
-		case 0x04800018: *Value = SI_STATUS_REG; break;
-		default:
-			*Value = 0;
-			return 0;
-		}
-		break;
-	case 0x05000000:
-		*Value = PAddr & 0xFFFF;
-		*Value = (*Value << 16) | *Value;
-		return 0;
-	case 0x08000000:
-		*Value = 0;
-		break;
-	default:
-		*Value = PAddr & 0xFFFF;
-		*Value = (*Value << 16) | *Value;
-		return 0;
-		break;
-	}
-	return 1;
-}
-
-void r4300i_LW_PAddr ( uint32_t PAddr, uint32_t * Value ) {
-	*Value = *(uint32_t *)(N64MEM+PAddr);
-}
-
-uint32_t r4300i_LW_VAddr ( uint32_t VAddr, uint32_t * Value ) {
-	uintptr_t address = (TLB_Map[VAddr >> 12] + VAddr);
-
-	if (TLB_Map[VAddr >> 12] == 0) { return 0; }
-
-	if((address - (uintptr_t)RDRAM) > RdramSize) {
-		address = address - (uintptr_t)RDRAM;
-		return r4300i_LW_NonMemory(address, Value);
-	}
-	*Value = *(uint32_t *)address;
-	return 1;
-}
-
-int32_t r4300i_SB_NonMemory ( uint32_t PAddr, uint8_t Value ) {
-	switch (PAddr & 0xFFF00000) {
-	case 0x00000000:
-	case 0x00100000:
-	case 0x00200000:
-	case 0x00300000:
-	case 0x00400000:
-	case 0x00500000:
-	case 0x00600000:
-	case 0x00700000:
-		if (PAddr < RdramSize) {
-
-			*(uint8_t *)(N64MEM+PAddr) = Value;
-			if (N64_Blocks.NoOfRDRamBlocks[(PAddr & 0x00FFFFF0) >> 12] == 0) { break; }
-			N64_Blocks.NoOfRDRamBlocks[(PAddr & 0x00FFFFF0) >> 12] = 0;
-			memset(JumpTable+((PAddr & 0xFFFFF000) >> 2),0,0x1000);
-			*(DelaySlotTable + ((PAddr & 0xFFFFF000) >> 12)) = NULL;
-		}
-		break;
-	default:
-		return 0;
-		break;
-	}
-	return 1;
-}
-
-uint32_t r4300i_SB_VAddr ( uint32_t VAddr, uint8_t Value ) {
-	if (TLB_Map[VAddr >> 12] == 0) { return 0; }
-	*(uint8_t *)(TLB_Map[VAddr >> 12] + (VAddr ^ 3)) = Value;
-
-	return 1;
-}
-
-int32_t r4300i_SH_NonMemory ( uint32_t PAddr, uint16_t Value ) {
-	switch (PAddr & 0xFFF00000) {
-	case 0x00000000:
-	case 0x00100000:
-	case 0x00200000:
-	case 0x00300000:
-	case 0x00400000:
-	case 0x00500000:
-	case 0x00600000:
-	case 0x00700000:
-		if (PAddr < RdramSize) {
-			*(uint16_t *)(N64MEM+PAddr) = Value;
-			if (N64_Blocks.NoOfRDRamBlocks[(PAddr & 0x00FFFFF0) >> 12] == 0) { break; }
-			N64_Blocks.NoOfRDRamBlocks[(PAddr & 0x00FFFFF0) >> 12] = 0;
-			memset(JumpTable+((PAddr & 0xFFFFF000) >> 2),0,0x1000);
-			*(DelaySlotTable + ((PAddr & 0xFFFFF000) >> 12)) = NULL;
-		}
-		break;
-	default:
-		return 0;
-		break;
-	}
-	return 1;
-}
-
-uint32_t r4300i_SD_VAddr ( uint32_t VAddr, uint64_t Value ) {
-	if (TLB_Map[VAddr >> 12] == 0) { return 0; }
-	*(uint32_t *)(TLB_Map[VAddr >> 12] + VAddr) = *((uint32_t *)(&Value) + 1);
-	*(uint32_t *)(TLB_Map[VAddr >> 12] + VAddr + 4) = *((uint32_t *)(&Value));
-	return 1;
-}
-
-uint32_t r4300i_SH_VAddr ( uint32_t VAddr, uint16_t Value ) {
-	if (TLB_Map[VAddr >> 12] == 0) { return 0; }
-	*(uint16_t *)(TLB_Map[VAddr >> 12] + (VAddr ^ 2)) = Value;
-	return 1;
-}
-
-int32_t r4300i_SW_NonMemory ( uint32_t PAddr, uint32_t Value ) {
-	if (PAddr >= 0x10000000 && PAddr < 0x16000000) {
-		if ((PAddr - 0x10000000) < RomFileSize) {
-			WrittenToRom = 1;
-			WroteToRom = Value;
-		} else {
-			return 0;
-		}
-	}
-
-	switch (PAddr & 0xFFF00000) {
-	case 0x00000000:
-	case 0x00100000:
-	case 0x00200000:
-	case 0x00300000:
-	case 0x00400000:
-	case 0x00500000:
-	case 0x00600000:
-	case 0x00700000:
-		if (PAddr < RdramSize) {
-			*(uint32_t *)(N64MEM+PAddr) = Value;
-			if (N64_Blocks.NoOfRDRamBlocks[(PAddr & 0x00FFFFF0) >> 12] == 0) { break; }
-			N64_Blocks.NoOfRDRamBlocks[(PAddr & 0x00FFFFF0) >> 12] = 0;
-			memset(JumpTable+((PAddr & 0xFFFFF000) >> 2),0,0x1000);
-			*(DelaySlotTable + ((PAddr & 0xFFFFF000) >> 12)) = NULL;
-		}
-		break;
-	case 0x03F00000:
-		switch (PAddr) {
-		case 0x03F00000: RDRAM_CONFIG_REG = Value; break;
-		case 0x03F00004: RDRAM_DEVICE_ID_REG = Value; break;
-		case 0x03F00008: RDRAM_DELAY_REG = Value; break;
-		case 0x03F0000C: RDRAM_MODE_REG = Value; break;
-		case 0x03F00010: RDRAM_REF_INTERVAL_REG = Value; break;
-		case 0x03F00014: RDRAM_REF_ROW_REG = Value; break;
-		case 0x03F00018: RDRAM_RAS_INTERVAL_REG = Value; break;
-		case 0x03F0001C: RDRAM_MIN_INTERVAL_REG = Value; break;
-		case 0x03F00020: RDRAM_ADDR_SELECT_REG = Value; break;
-		case 0x03F00024: RDRAM_DEVICE_MANUF_REG = Value; break;
-		case 0x03F04004: break;
-		case 0x03F08004: break;
-		case 0x03F80004: break;
-		case 0x03F80008: break;
-		case 0x03F8000C: break;
-		case 0x03F80014: break;
-		default:
-			return 0;
-		}
-		break;
-	case 0x04000000:
-		if (PAddr < 0x04002000) {
-			*(uint32_t *)(N64MEM+PAddr) = Value;
-			if (PAddr < 0x04001000) {
-				if (N64_Blocks.NoOfDMEMBlocks == 0) { break; }
-				N64_Blocks.NoOfDMEMBlocks = 0;
-			} else {
-				if (N64_Blocks.NoOfIMEMBlocks == 0) { break; }
-				N64_Blocks.NoOfIMEMBlocks = 0;
-			}
-			memset(JumpTable+((PAddr & 0xFFFFF000) >> 2),0,0x1000);
-			*(DelaySlotTable + ((PAddr & 0xFFFFF000) >> 12)) = NULL;
-			return 1;
-		}
-		switch (PAddr) {
-		case 0x04040000: SP_MEM_ADDR_REG = Value; break;
-		case 0x04040004: SP_DRAM_ADDR_REG = Value; break;
-		case 0x04040008:
-			SP_RD_LEN_REG = Value;
-			SP_DMA_READ();
-			break;
-		case 0x0404000C:
-			SP_WR_LEN_REG = Value;
-			SP_DMA_WRITE();
-			break;
-		case 0x04040010:
-			if ( ( Value & SP_CLR_HALT ) != 0) { SP_STATUS_REG &= ~SP_STATUS_HALT; }
-			if ( ( Value & SP_SET_HALT ) != 0) { SP_STATUS_REG |= SP_STATUS_HALT; }
-			if ( ( Value & SP_CLR_BROKE ) != 0) { SP_STATUS_REG &= ~SP_STATUS_BROKE; }
-			if ( ( Value & SP_CLR_INTR ) != 0) {
-				MI_INTR_REG &= ~MI_INTR_SP;
-				CheckInterrupts();
-			}
-			if ( ( Value & SP_CLR_SSTEP ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SSTEP; }
-			if ( ( Value & SP_SET_SSTEP ) != 0) { SP_STATUS_REG |= SP_STATUS_SSTEP; }
-			if ( ( Value & SP_CLR_INTR_BREAK ) != 0) { SP_STATUS_REG &= ~SP_STATUS_INTR_BREAK; }
-			if ( ( Value & SP_SET_INTR_BREAK ) != 0) { SP_STATUS_REG |= SP_STATUS_INTR_BREAK; }
-			if ( ( Value & SP_CLR_SIG0 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG0; }
-			if ( ( Value & SP_SET_SIG0 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG0; }
-			if ( ( Value & SP_CLR_SIG1 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG1; }
-			if ( ( Value & SP_SET_SIG1 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG1; }
-			if ( ( Value & SP_CLR_SIG2 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG2; }
-			if ( ( Value & SP_SET_SIG2 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG2; }
-			if ( ( Value & SP_CLR_SIG3 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG3; }
-			if ( ( Value & SP_SET_SIG3 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG3; }
-			if ( ( Value & SP_CLR_SIG4 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG4; }
-			if ( ( Value & SP_SET_SIG4 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG4; }
-			if ( ( Value & SP_CLR_SIG5 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG5; }
-			if ( ( Value & SP_SET_SIG5 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG5; }
-			if ( ( Value & SP_CLR_SIG6 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG6; }
-			if ( ( Value & SP_SET_SIG6 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG6; }
-			if ( ( Value & SP_CLR_SIG7 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG7; }
-			if ( ( Value & SP_SET_SIG7 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG7; }
-
-			RunRsp();
-
-			break;
-		case 0x0404001C: SP_SEMAPHORE_REG = 0; break;
-		case 0x04080000: SP_PC_REG = Value & 0xFFC; break;
-		default:
-			return 0;
-		}
-		break;
-	case 0x04100000:
-		switch (PAddr) {
-		case 0x04100000:
-			DPC_START_REG = Value;
-			DPC_CURRENT_REG = Value;
-			break;
-		case 0x04100004:
-			DPC_END_REG = Value;
-			//if (ProcessRDPList) { ProcessRDPList(); }
-			break;
-		case 0x04100008: DPC_CURRENT_REG = Value; break;
-		case 0x0410000C:
-			if ( ( Value & DPC_CLR_XBUS_DMEM_DMA ) != 0) { DPC_STATUS_REG &= ~DPC_STATUS_XBUS_DMEM_DMA; }
-			if ( ( Value & DPC_SET_XBUS_DMEM_DMA ) != 0) { DPC_STATUS_REG |= DPC_STATUS_XBUS_DMEM_DMA; }
-			if ( ( Value & DPC_CLR_FREEZE ) != 0) { DPC_STATUS_REG &= ~DPC_STATUS_FREEZE; }
-			if ( ( Value & DPC_SET_FREEZE ) != 0) { DPC_STATUS_REG |= DPC_STATUS_FREEZE; }
-			if ( ( Value & DPC_CLR_FLUSH ) != 0) { DPC_STATUS_REG &= ~DPC_STATUS_FLUSH; }
-			if ( ( Value & DPC_SET_FLUSH ) != 0) { DPC_STATUS_REG |= DPC_STATUS_FLUSH; }
-			if ( ( Value & DPC_CLR_FREEZE ) != 0)
-			{
-				if ( ( SP_STATUS_REG & SP_STATUS_HALT ) == 0)
-				{
-					if ( ( SP_STATUS_REG & SP_STATUS_BROKE ) == 0 )
-					{
-						RunRsp();
-					}
-				}
-			}
-			break;
-		default:
-			return 0;
-		}
-		break;
-	case 0x04300000:
-		switch (PAddr) {
-		case 0x04300000:
-			MI_MODE_REG &= ~0x7F;
-			MI_MODE_REG |= (Value & 0x7F);
-			if ( ( Value & MI_CLR_INIT ) != 0 ) { MI_MODE_REG &= ~MI_MODE_INIT; }
-			if ( ( Value & MI_SET_INIT ) != 0 ) { MI_MODE_REG |= MI_MODE_INIT; }
-			if ( ( Value & MI_CLR_EBUS ) != 0 ) { MI_MODE_REG &= ~MI_MODE_EBUS; }
-			if ( ( Value & MI_SET_EBUS ) != 0 ) { MI_MODE_REG |= MI_MODE_EBUS; }
-			if ( ( Value & MI_CLR_DP_INTR ) != 0 ) {
-				MI_INTR_REG &= ~MI_INTR_DP;
-				CheckInterrupts();
-			}
-			if ( ( Value & MI_CLR_RDRAM ) != 0 ) { MI_MODE_REG &= ~MI_MODE_RDRAM; }
-			if ( ( Value & MI_SET_RDRAM ) != 0 ) { MI_MODE_REG |= MI_MODE_RDRAM; }
-			break;
-		case 0x0430000C:
-			if ( ( Value & MI_INTR_MASK_CLR_SP ) != 0 ) { MI_INTR_MASK_REG &= ~MI_INTR_MASK_SP; }
-			if ( ( Value & MI_INTR_MASK_SET_SP ) != 0 ) { MI_INTR_MASK_REG |= MI_INTR_MASK_SP; }
-			if ( ( Value & MI_INTR_MASK_CLR_SI ) != 0 ) { MI_INTR_MASK_REG &= ~MI_INTR_MASK_SI; }
-			if ( ( Value & MI_INTR_MASK_SET_SI ) != 0 ) { MI_INTR_MASK_REG |= MI_INTR_MASK_SI; }
-			if ( ( Value & MI_INTR_MASK_CLR_AI ) != 0 ) { MI_INTR_MASK_REG &= ~MI_INTR_MASK_AI; }
-			if ( ( Value & MI_INTR_MASK_SET_AI ) != 0 ) { MI_INTR_MASK_REG |= MI_INTR_MASK_AI; }
-			if ( ( Value & MI_INTR_MASK_CLR_VI ) != 0 ) { MI_INTR_MASK_REG &= ~MI_INTR_MASK_VI; }
-			if ( ( Value & MI_INTR_MASK_SET_VI ) != 0 ) { MI_INTR_MASK_REG |= MI_INTR_MASK_VI; }
-			if ( ( Value & MI_INTR_MASK_CLR_PI ) != 0 ) { MI_INTR_MASK_REG &= ~MI_INTR_MASK_PI; }
-			if ( ( Value & MI_INTR_MASK_SET_PI ) != 0 ) { MI_INTR_MASK_REG |= MI_INTR_MASK_PI; }
-			if ( ( Value & MI_INTR_MASK_CLR_DP ) != 0 ) { MI_INTR_MASK_REG &= ~MI_INTR_MASK_DP; }
-			if ( ( Value & MI_INTR_MASK_SET_DP ) != 0 ) { MI_INTR_MASK_REG |= MI_INTR_MASK_DP; }
-			break;
-		default:
-			return 0;
-		}
-		break;
-	case 0x04400000:
-		switch (PAddr) {
-		case 0x04400000:
-			//if (VI_STATUS_REG != Value) {
-				VI_STATUS_REG = Value;
-			//	if (ViStatusChanged != NULL ) { ViStatusChanged(); }
-			//}
-			break;
-		case 0x04400004:
-
-			VI_ORIGIN_REG = (Value & 0xFFFFFF);
-			//if (UpdateScreen != NULL ) { UpdateScreen(); }
-			break;
-		case 0x04400008:
-			//if (VI_WIDTH_REG != Value) {
-				VI_WIDTH_REG = Value;
-			//	if (ViWidthChanged != NULL ) { ViWidthChanged(); }
-			//}
-			break;
-		case 0x0440000C: VI_INTR_REG = Value; break;
-		case 0x04400010:
-			MI_INTR_REG &= ~MI_INTR_VI;
-			CheckInterrupts();
-			break;
-		case 0x04400014: VI_BURST_REG = Value; break;
-		case 0x04400018: VI_V_SYNC_REG = Value; break;
-		case 0x0440001C: VI_H_SYNC_REG = Value; break;
-		case 0x04400020: VI_LEAP_REG = Value; break;
-		case 0x04400024: VI_H_START_REG = Value; break;
-		case 0x04400028: VI_V_START_REG = Value; break;
-		case 0x0440002C: VI_V_BURST_REG = Value; break;
-		case 0x04400030: VI_X_SCALE_REG = Value; break;
-		case 0x04400034: VI_Y_SCALE_REG = Value; break;
-		default:
-			return 0;
-		}
-		break;
-	case 0x04500000:
-		switch (PAddr) {
-		case 0x04500000: AI_DRAM_ADDR_REG = Value; break;
-		case 0x04500004:
-			AI_LEN_REG = Value;
-			if (AiLenChanged != NULL) { AiLenChanged(); }
-			break;
-		case 0x04500008: AI_CONTROL_REG = (Value & 0x1); break;
-		case 0x0450000C:
-			/* Clear Interrupt */;
-			MI_INTR_REG &= ~MI_INTR_AI;
-			AudioIntrReg &= ~MI_INTR_AI;
-			CheckInterrupts();
-			break;
-		case 0x04500010:
-			AI_DACRATE_REG = Value;
-			//if (AiDacrateChanged != NULL) { AiDacrateChanged(SYSTEM_NTSC); }
-			break;
-		case 0x04500014: AI_BITRATE_REG = Value; break;
-		default:
-			return 0;
-		}
-		break;
-	case 0x04600000:
-		switch (PAddr) {
-		case 0x04600000: PI_DRAM_ADDR_REG = Value; break;
-		case 0x04600004: PI_CART_ADDR_REG = Value; break;
-		case 0x04600008:
-			PI_RD_LEN_REG = Value;
-			PI_DMA_READ();
-			break;
-		case 0x0460000C:
-			PI_WR_LEN_REG = Value;
-			PI_DMA_WRITE();
-			break;
-		case 0x04600010:
-			//if ((Value & PI_SET_RESET) != 0 ) { DisplayError("reset Controller"); }
-			if ((Value & PI_CLR_INTR) != 0 ) {
-				MI_INTR_REG &= ~MI_INTR_PI;
-				CheckInterrupts();
-			}
-			break;
-		case 0x04600014: PI_DOMAIN1_REG = (Value & 0xFF); break;
-		case 0x04600018: PI_BSD_DOM1_PWD_REG = (Value & 0xFF); break;
-		case 0x0460001C: PI_BSD_DOM1_PGS_REG = (Value & 0xFF); break;
-		case 0x04600020: PI_BSD_DOM1_RLS_REG = (Value & 0xFF); break;
-		default:
-			return 0;
-		}
-		break;
-	case 0x04700000:
-		switch (PAddr) {
-		case 0x04700000: RI_MODE_REG = Value; break;
-		case 0x04700004: RI_CONFIG_REG = Value; break;
-		case 0x04700008: RI_CURRENT_LOAD_REG = Value; break;
-		case 0x0470000C: RI_SELECT_REG = Value; break;
-		case 0x04700010: RI_REFRESH_REG = Value; break;
-		case 0x04700014: RI_LATENCY_REG = Value; break;
-		case 0x04700018: RI_RERROR_REG = Value; break;
-		case 0x0470001C: RI_WERROR_REG = Value; break;
-		default:
-			return 0;
-		}
-		break;
-	case 0x04800000:
-		switch (PAddr) {
-		case 0x04800000: SI_DRAM_ADDR_REG = Value; break;
-		case 0x04800004:
-			SI_PIF_ADDR_RD64B_REG = Value;
-			SI_DMA_READ ();
-			break;
-		case 0x04800010:
-			SI_PIF_ADDR_WR64B_REG = Value;
-			SI_DMA_WRITE();
-			break;
-		case 0x04800018:
-			MI_INTR_REG &= ~MI_INTR_SI;
-			SI_STATUS_REG &= ~SI_STATUS_INTERRUPT;
-			CheckInterrupts();
-			break;
-		default:
-			return 0;
-		}
-		break;
-	case 0x08000000:
-		if (PAddr != 0x08010000) { return 0; }
-		//WriteToFlashCommand(Value);
-		break;
-	case 0x1FC00000:
-		if (PAddr < 0x1FC007C0) {
-			return 0;
-		} else if (PAddr < 0x1FC00800) {
-
-			if (PAddr == 0x1FC007FC) {
-				PifRamWrite();
-			}
-			return 1;
-		}
-		return 0;
-		break;
-	default:
-		return 0;
-		break;
-	}
-	return 1;
-}
-
-uint32_t r4300i_SW_VAddr ( uint32_t VAddr, uint32_t Value ) {
-	uintptr_t address = (TLB_Map[VAddr >> 12] + VAddr);
-
-	if (TLB_Map[VAddr >> 12] == 0) { return 0; }
-
-	if((address - (uintptr_t)RDRAM) > RdramSize) {
-		address = address - (uintptr_t)RDRAM;
-		return r4300i_SW_NonMemory(address, Value);
-	}
-	*(uint32_t *)address = Value;
-	return 1;
-}
-
-void ResetRecompCode (void) {
-	uint32_t count;
-	RecompPos = RecompCode;
-	TargetIndex = 0;
-
-	//Jump Table
-	for (count = 0; count < (RdramSize >> 12); count ++ ) {
-		if (N64_Blocks.NoOfRDRamBlocks[count] > 0) {
-			N64_Blocks.NoOfRDRamBlocks[count] = 0;
-			memset(JumpTable + (count << 10),0,0x1000);
-			*(DelaySlotTable + count) = NULL;
-
-		}
-	}
-
-	if (N64_Blocks.NoOfDMEMBlocks > 0) {
-		N64_Blocks.NoOfDMEMBlocks = 0;
-		memset(JumpTable + (0x04000000 >> 2),0,0x1000);
-		*(DelaySlotTable + (0x04000000 >> 12)) = NULL;
-	}
-	if (N64_Blocks.NoOfIMEMBlocks > 0) {
-		N64_Blocks.NoOfIMEMBlocks = 0;
-		memset(JumpTable + (0x04001000 >> 2),0,0x1000);
-		*(DelaySlotTable + (0x04001000 >> 12)) = NULL;
-	}
-}
-
-#ifndef __USE_GNU
-#define __USE_GNU
-#endif
-#include <sys/ucontext.h>
-
-static struct sigaction act;
-static struct sigaction oact;
-static sigset_t sset;
-void sig_handler(int signo, siginfo_t * info, ucontext_t * context);
-
-void InitExceptionHandler() {
-
-	sigset_t blockset;
-
- sigemptyset(&blockset);
- sigaddset(&blockset, SIGSEGV);
-
- pthread_sigmask(SIG_UNBLOCK, &blockset, NULL);
-
-	sigemptyset(&sset);
-	sigaddset(&sset, SIGSEGV);
-
- 	act.sa_flags = SA_SIGINFO ;
- 	act.sa_mask = sset;
- 	act.sa_sigaction = (void (*)(int, siginfo_t*, void*)) sig_handler;
-
- 	if(sigaction(SIGSEGV, (const struct sigaction *) &act, &oact))
- 		printf("error setting up exception handler\n");
-}
-
-int r4300i_CPU_MemoryFilter64_2( uintptr_t MemAddress, ucontext_t * context);
-
-void sig_handler(int signo, siginfo_t * info, ucontext_t * context)
-{
-	int i = 0;
-
-	if(signo==SIGSEGV) {
-		uintptr_t MemAddress = ((char *)info->si_addr - (char *)N64MEM);
-
-		/*
-		 A Hack to fix some crappy GCC thing when R15 gets overwritten.
-		 R15 should _never_ be overwritten. >:(
-		*/
-#ifdef USEX64
-		if(context->uc_mcontext.gregs[REG_R15] != (uintptr_t)TLB_Map) {
-			context->uc_mcontext.gregs[REG_R15] = (uintptr_t)TLB_Map;
-			return;
-		}
-#endif
-		i = r4300i_CPU_MemoryFilter64_2(MemAddress,context);
-		if(i==0)
-			return;
-	}
-
-	return;
-}
-
-static int32_t CONV_REG64(int32_t dest_reg) {
-	switch(dest_reg) {
-		case 0: return 13; break;
-		case 1: return 14; break;
-		case 2: return 12; break;
-		case 3: return 11; break;
-		case 6: return 9; break;
-		case 7: return 8; break;
-		case 8: return 0; break;
-		case 9: return 1; break;
-		case 10: return 2; break;
-		case 11: return 3; break;
-		case 12: return 4; break;
-		case 13: return 5; break;
-		case 14: return 6; break;
-		case 15: return 7; break;
-		default:
-			 asm("int $3");
-
-			 break;
-	}
-
-	return -1; /* ??? */
-}
-
-
-#ifdef __LP64__
-int r4300i_CPU_MemoryFilter64_2( uintptr_t MemAddress, ucontext_t * context) {
-	uint8_t * ip = context->uc_mcontext.gregs[REG_RIP];
-
-	if(MemAddress == 0) {
-		return 1;
-	}
-
-	if((*ip & 0x40) && (*(ip+1) == 0xf) && (*(ip+2) == 0xb7)) {
-		uint8_t dest_reg = (*(ip+3) % 0x40) / 8;
-		int32_t half = 0;
-		if(*ip & 4) dest_reg += 8;
-		r4300i_LH_NonMemory(MemAddress, &half, 1);
-
-		context->uc_mcontext.gregs[CONV_REG64(dest_reg)] = (int32_t)half;
-
-
-		context->uc_mcontext.gregs[REG_RIP]+=4;
-
-		if((*(ip+3) & 0x7)==4)
-			context->uc_mcontext.gregs[REG_RIP]++;
-
-		if((*(ip+3) & 0xC0) == 0x80)
-			context->uc_mcontext.gregs[REG_RIP]+=4;
-		else if((*(ip+3) & 0xC0) == 0x40)
-			context->uc_mcontext.gregs[REG_RIP]+=1;
-
-		return 0;
-
-	} else if((*ip & 0x40) && (*(ip+1) ==0x89)) { // MOV [Rxx + Rxx], Exx
-		uint8_t dest_reg = (*(ip+2) % 0x40) / 8;
-		uint64_t dest = 0;
-
-		if(*ip & 4) dest_reg += 8;
-
-		dest = context->uc_mcontext.gregs[CONV_REG64(dest_reg)];
-
-		r4300i_SW_NonMemory(MemAddress, dest);
-
-		if((*(ip+2) & 0x7)==4)
-			context->uc_mcontext.gregs[REG_RIP]+=4;
-		else
-			context->uc_mcontext.gregs[REG_RIP]+=3;
-
-		if((*(ip+2) & 0xC0) == 0x80)
-			context->uc_mcontext.gregs[REG_RIP]+=4;
-		else if((*(ip+2) & 0xC0) == 0x40)
-			context->uc_mcontext.gregs[REG_RIP]+=1;
-
-		return 0;
-
-	} else if((*ip & 0x40) && (*(ip+1) ==0xC7)) { // MOV [Rxx + Rxx], Imm32
-		uint32_t imm32 = *(uint32_t*)(ip+4);
-		r4300i_SW_NonMemory(MemAddress, imm32);
-		context->uc_mcontext.gregs[REG_RIP]+=7;
-
-		// 40 C7 04 07 0F 00 00 00
-
-		//if(*(ip+2)&0x4)
-		if((*(ip+2) & 0x7)==4)
-			context->uc_mcontext.gregs[REG_RIP]++;
-		if((*(ip+2) & 0xC0) == 0x80)
-			context->uc_mcontext.gregs[REG_RIP]+=4;
-		else if((*(ip+2) & 0xC0) == 0x40)
-			context->uc_mcontext.gregs[REG_RIP]+=1;
-
-		return 0;
-	} else if ((*ip & 0x40) && (*(ip + 1) == 0x8B )) {
-		uint8_t dest_reg = (*(ip+2) % 0x40) / 8;
-		uint32_t word = 0;
-
-		//41 8B BF 30 D0 00 01
-
-		if(*ip & 4) dest_reg += 8;
-
-
-		r4300i_LW_NonMemory(MemAddress, &word);
-		context->uc_mcontext.gregs[CONV_REG64(dest_reg)] = word;
-
-		//if(*(ip+2) & 0x4)
-		if((*(ip+2) & 0x7)==4)
-			context->uc_mcontext.gregs[REG_RIP]+=4;
-		else
-			context->uc_mcontext.gregs[REG_RIP]+=3;
-
-		if((*(ip+2) & 0xC0) == 0x80)
-			context->uc_mcontext.gregs[REG_RIP]+=4;
-		else if((*(ip+2) & 0xC0) == 0x40)
-			context->uc_mcontext.gregs[REG_RIP]+=1;
-
-
-		return 0;
-
-	}
-
-	//asm("int $3");
-	return 1;
-}
-
-#else
-
-static int32_t CONV_REG(int32_t dest_reg) {
-	switch(dest_reg) {
-		case 0: return 5; break;
-		case 1: return 4; break;
-		case 2: return 3; break;
-		case 3: return 2; break;
-		case 6: return 1; break;
-		case 7: return 0; break;
-		default:
-			 asm volatile("int $3");
-			 break;
-	}
-}
-
-int r4300i_CPU_MemoryFilter64_2( uintptr_t MemAddress, ucontext_t * context) {
-	uint8_t * ip = context->uc_mcontext.gregs[REG_EIP];
-
-	if(MemAddress == 0) {
-		return 1;
-	}
-
-	if((*(ip) == 0xf) && (*(ip+1) == 0xb7)) {
-		uint8_t dest_reg = (*(ip+2) % 0x40) / 8;
-		int32_t half = 0;
-		r4300i_LH_NonMemory(MemAddress, &half, 1);
-
-		//((uint32_t*)(&lpEP->ContextRecord->Edi))[CONV_REG(dest_reg)] = (int32_t)half;
-		context->uc_mcontext.gregs[CONV_REG64(dest_reg)] = (int32_t)half;
-
-		context->uc_mcontext.gregs[REG_EIP]+=3;
-
-		if((*(ip+2) & 0x7)==4)
-			context->uc_mcontext.gregs[REG_EIP]++;
-		else if((*(ip+1) & 0x7)==5)
-			context->uc_mcontext.gregs[REG_EIP]+=4;
-
-
-		if((*(ip+2) & 0xC0) == 0x80)
-			context->uc_mcontext.gregs[REG_EIP]+=4;
-		else if((*(ip+2) & 0xC0) == 0x40)
-			context->uc_mcontext.gregs[REG_EIP]+=1;
-
-		return 0;
-
-	} else if((*(ip) ==0x89)) { // MOV [Rxx + Rxx], Exx
-		uint8_t dest_reg = (*(ip+1) % 0x40) / 8;
-		uint32_t dest = 0;
-
-		dest = context->uc_mcontext.gregs[CONV_REG64(dest_reg)];
-
-		r4300i_SW_NonMemory(MemAddress, dest);
-
-		if((*(ip+1) & 0x7)==4)
-			context->uc_mcontext.gregs[REG_EIP]+=3;
-		else
-			context->uc_mcontext.gregs[REG_EIP]+=2;
-
-		if((*(ip+1) & 0xC0) == 0x80)
-			context->uc_mcontext.gregs[REG_EIP]+=4;
-		else if((*(ip+1) & 0xC0) == 0x40)
-			context->uc_mcontext.gregs[REG_EIP]+=1;
-
-		return 0;
-
-	} else if((*(ip) ==0xC7)) { // MOV [Rxx + Rxx], Imm32
-		uint32_t imm32 = *(uint32_t*)(ip+2);
-		r4300i_SW_NonMemory(MemAddress, imm32);
-		context->uc_mcontext.gregs[REG_EIP]+=6;
-
-
-		// 40 C7 04 07 0F 00 00 00
-
-		//if(*(ip+2)&0x4)
-		if((*(ip+1) & 0x7)==4)
-			context->uc_mcontext.gregs[REG_EIP]++;
-		if((*(ip+1) & 0xC0) == 0x80)
-			context->uc_mcontext.gregs[REG_EIP]+=4;
-		else if((*(ip+1) & 0xC0) == 0x40)
-			context->uc_mcontext.gregs[REG_EIP]+=1;
-
-		return 0;
-	} else if (*ip == 0x8B ) {
-		uint8_t dest_reg = CONV_REG((*(ip+1) % 0x40) / 8);
-		uint32_t word = 0;
-		uint32_t *dest = 0;
-
-		dest = context->uc_mcontext.gregs[CONV_REG64(dest_reg)];
-		r4300i_LW_NonMemory(MemAddress, &word);
-		*dest = word;
-		//*dest = 0;
-		//if(*(ip+2) & 0x4)
-		if((*(ip+1) & 0x7)==4)
-			context->uc_mcontext.gregs[REG_EIP]+=3;
-		else if((*(ip+1) & 0x7)==5)
-			context->uc_mcontext.gregs[REG_EIP]+=6;
-		else
-			context->uc_mcontext.gregs[REG_EIP]+=2;
-
-		if((*(ip+1) & 0xC0) == 0x80)
-			context->uc_mcontext.gregs[REG_EIP]+=4;
-		else if((*(ip+1) & 0xC0) == 0x40)
-			context->uc_mcontext.gregs[REG_EIP]+=1;
-
-
-		return 0;
-
-	}
-
-	return 1;
-
-}
-
-
-#endif

audacious-plugins-3.1.1.tar.bz2/src/usf/memory.h Deleted

@@ -1,84 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#define LargeCompileBufferSize	0x03200000
-#define NormalCompileBufferSize	0x01500000
-
-#define RSP_RECOMPMEM_SIZE		0x400000
-#define RSP_SECRECOMPMEM_SIZE	0x200000
-
-#define ROM_IN_MAPSPACE
-
-extern uint32_t RdramSize, SystemRdramSize, RomFileSize;
-extern uintptr_t *TLB_Map;
-extern uint8_t * MemChunk;
-
-extern uint8_t *N64MEM, *RDRAM, *DMEM, *IMEM, * ROMPages[0x400], *savestatespace, * NOMEM;
-extern void ** JumpTable, ** DelaySlotTable;
-extern uint8_t *RecompCode, *RecompPos;
-extern uint32_t WrittenToRom, MemoryState;
-
-/* Memory Control */
-int  Allocate_ROM                ( void );
-int  Allocate_Memory             ( void );
-void Release_Memory              ( void );
-int PreAllocate_Memory(void);
-
-void *malloc_exec(uint32_t bytes);
-void *jmalloc(uint32_t bytes);
-
-/* CPU memory functions */
-//int  r4300i_Command_MemoryFilter ( uint32_t dwExptCode, LPEXCEPTION_POINTERS lpEP );
-//int  r4300i_CPU_MemoryFilter     ( uint32_t dwExptCode, LPEXCEPTION_POINTERS lpEP );
-int32_t  r4300i_LB_NonMemory         ( uint32_t PAddr, uint32_t * Value, uint32_t SignExtend );
-uint32_t r4300i_LB_VAddr             ( uint32_t VAddr, uint8_t * Value );
-uint32_t r4300i_LD_VAddr             ( uint32_t VAddr, uint64_t * Value );
-int32_t  r4300i_LH_NonMemory         ( uint32_t PAddr, uint32_t * Value, int32_t SignExtend );
-uint32_t r4300i_LH_VAddr             ( uint32_t VAddr, uint16_t * Value );
-int32_t  r4300i_LW_NonMemory         ( uint32_t PAddr, uint32_t * Value );
-void r4300i_LW_PAddr             ( uint32_t PAddr, uint32_t * Value );
-uint32_t r4300i_LW_VAddr             ( uint32_t VAddr, uint32_t * Value );
-int32_t  r4300i_SB_NonMemory         ( uint32_t PAddr, uint8_t Value );
-uint32_t r4300i_SB_VAddr             ( uint32_t VAddr, uint8_t Value );
-uint32_t r4300i_SD_VAddr            ( uint32_t VAddr, uint64_t Value );
-int32_t  r4300i_SH_NonMemory         ( uint32_t PAddr, uint16_t Value );
-uint32_t r4300i_SH_VAddr             ( uint32_t VAddr, uint16_t Value );
-int32_t  r4300i_SW_NonMemory         ( uint32_t PAddr, uint32_t Value );
-uint32_t r4300i_SW_VAddr             ( uint32_t VAddr, uint32_t Value );
-
-/* Recompiler Memory Functions */
-void Compile_LB                  ( int32_t Reg, uint32_t Addr, uint32_t SignExtend );
-void Compile_LH                  ( int32_t Reg, uint32_t Addr, uint32_t SignExtend );
-void Compile_LW                  ( int32_t Reg, uint32_t Addr );
-void Compile_SB_Const            ( uint8_t Value, uint32_t Addr );
-void Compile_SB_Register         ( int32_t x86Reg, uint32_t Addr );
-void Compile_SH_Const            ( uint16_t Value, uint32_t Addr );
-void Compile_SH_Register         ( int32_t x86Reg, uint32_t Addr );
-void Compile_SW_Const            ( uint32_t Value, uint32_t Addr );
-void Compile_SW_Register         ( int32_t x86Reg, uint32_t Addr );
-void ResetRecompCode             ( void );
-void InitExceptionHandler        ();
-
-uint8_t * PageROM(uint32_t addr);

audacious-plugins-3.1.1.tar.bz2/src/usf/opcode.h Deleted

@@ -1,274 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#ifndef __OpCode
-#define __OpCode
-
-#include "types.h"
-
-typedef struct {
-	union {
-
-		uint32_t Hex;
-		uint8_t Ascii[4];
-
-		struct {
-			unsigned offset : 16;
-			unsigned rt : 5;
-			unsigned rs : 5;
-			unsigned op : 6;
-		};
-
-		struct {
-			unsigned immediate : 16;
-			unsigned : 5;
-			unsigned base : 5;
-			unsigned : 6;
-		};
-
-		struct {
-			unsigned target : 26;
-			unsigned : 6;
-		};
-
-		struct {
-			unsigned funct : 6;
-			unsigned sa : 5;
-			unsigned rd : 5;
-			unsigned : 5;
-			unsigned : 5;
-			unsigned : 6;
-		};
-
-		struct {
-			unsigned : 6;
-			unsigned fd : 5;
-			unsigned fs : 5;
-			unsigned ft : 5;
-			unsigned fmt : 5;
-			unsigned : 6;
-		};
-	};
-
-} OPCODE;
-
-//R4300i OpCodes
-#define	R4300i_SPECIAL				 0
-#define	R4300i_REGIMM				 1
-#define R4300i_J					 2
-#define R4300i_JAL					 3
-#define R4300i_BEQ					 4
-#define R4300i_BNE					 5
-#define R4300i_BLEZ					 6
-#define R4300i_BGTZ					 7
-#define R4300i_ADDI					 8
-#define R4300i_ADDIU				 9
-#define R4300i_SLTI					10
-#define R4300i_SLTIU				11
-#define R4300i_ANDI					12
-#define R4300i_ORI					13
-#define R4300i_XORI					14
-#define R4300i_LUI					15
-#define	R4300i_CP0					16
-#define	R4300i_CP1					17
-#define R4300i_BEQL					20
-#define R4300i_BNEL					21
-#define R4300i_BLEZL				22
-#define R4300i_BGTZL				23
-#define R4300i_DADDI				24
-#define R4300i_DADDIU				25
-#define R4300i_LDL					26
-#define R4300i_LDR					27
-#define R4300i_LB					32
-#define R4300i_LH					33
-#define R4300i_LWL					34
-#define R4300i_LW					35
-#define R4300i_LBU					36
-#define R4300i_LHU					37
-#define R4300i_LWR					38
-#define R4300i_LWU					39
-#define R4300i_SB					40
-#define R4300i_SH					41
-#define R4300i_SWL					42
-#define R4300i_SW					43
-#define R4300i_SDL					44
-#define R4300i_SDR					45
-#define R4300i_SWR					46
-#define R4300i_CACHE				47
-#define R4300i_LL					48
-#define R4300i_LWC1					49
-#define R4300i_LWC2					0x32
-#define R4300i_LLD					0x34
-#define R4300i_LDC1					53
-#define R4300i_LDC2					0x36
-#define R4300i_LD					55
-#define R4300i_SC					0x38
-#define R4300i_SWC1					57
-#define R4300i_SWC2					0x3A
-#define R4300i_SCD					0x3C
-#define R4300i_SDC1					61
-#define R4300i_SDC2					62
-#define R4300i_SD					63
-
-/* R4300i Special opcodes */
-#define R4300i_SPECIAL_SLL			 0
-#define R4300i_SPECIAL_SRL			 2
-#define R4300i_SPECIAL_SRA			 3
-#define R4300i_SPECIAL_SLLV			 4
-#define R4300i_SPECIAL_SRLV			 6
-#define R4300i_SPECIAL_SRAV			 7
-#define R4300i_SPECIAL_JR			 8
-#define R4300i_SPECIAL_JALR			 9
-#define R4300i_SPECIAL_SYSCALL		12
-#define R4300i_SPECIAL_BREAK		13
-#define R4300i_SPECIAL_SYNC			15
-#define R4300i_SPECIAL_MFHI			16
-#define R4300i_SPECIAL_MTHI			17
-#define R4300i_SPECIAL_MFLO			18
-#define R4300i_SPECIAL_MTLO			19
-#define R4300i_SPECIAL_DSLLV		20
-#define R4300i_SPECIAL_DSRLV		22
-#define R4300i_SPECIAL_DSRAV		23
-#define R4300i_SPECIAL_MULT			24
-#define R4300i_SPECIAL_MULTU		25
-#define R4300i_SPECIAL_DIV			26
-#define R4300i_SPECIAL_DIVU			27
-#define R4300i_SPECIAL_DMULT		28
-#define R4300i_SPECIAL_DMULTU		29
-#define R4300i_SPECIAL_DDIV			30
-#define R4300i_SPECIAL_DDIVU		31
-#define R4300i_SPECIAL_ADD			32
-#define R4300i_SPECIAL_ADDU			33
-#define R4300i_SPECIAL_SUB			34
-#define R4300i_SPECIAL_SUBU			35
-#define R4300i_SPECIAL_AND			36
-#define R4300i_SPECIAL_OR			37
-#define R4300i_SPECIAL_XOR			38
-#define R4300i_SPECIAL_NOR			39
-#define R4300i_SPECIAL_SLT			42
-#define R4300i_SPECIAL_SLTU			43
-#define R4300i_SPECIAL_DADD			44
-#define R4300i_SPECIAL_DADDU		45
-#define R4300i_SPECIAL_DSUB			46
-#define R4300i_SPECIAL_DSUBU		47
-#define R4300i_SPECIAL_TGE			48
-#define R4300i_SPECIAL_TGEU			49
-#define R4300i_SPECIAL_TLT			50
-#define R4300i_SPECIAL_TLTU			51
-#define R4300i_SPECIAL_TEQ			52
-#define R4300i_SPECIAL_TNE			54
-#define R4300i_SPECIAL_DSLL			56
-#define R4300i_SPECIAL_DSRL			58
-#define R4300i_SPECIAL_DSRA			59
-#define R4300i_SPECIAL_DSLL32		60
-#define R4300i_SPECIAL_DSRL32		62
-#define R4300i_SPECIAL_DSRA32		63
-
-/* R4300i RegImm opcodes */
-#define R4300i_REGIMM_BLTZ			0
-#define R4300i_REGIMM_BGEZ			1
-#define R4300i_REGIMM_BLTZL			2
-#define R4300i_REGIMM_BGEZL			3
-#define R4300i_REGIMM_TGEI			0x08
-#define R4300i_REGIMM_TGEIU			0x09
-#define R4300i_REGIMM_TLTI			0x0A
-#define R4300i_REGIMM_TLTIU			0x0B
-#define R4300i_REGIMM_TEQI			0x0C
-#define R4300i_REGIMM_TNEI			0x0E
-#define R4300i_REGIMM_BLTZAL		0x10
-#define R4300i_REGIMM_BGEZAL		17
-#define R4300i_REGIMM_BLTZALL		0x12
-#define R4300i_REGIMM_BGEZALL		0x13
-
-/* R4300i COP0 opcodes */
-#define	R4300i_COP0_MF				 0
-#define	R4300i_COP0_MT				 4
-
-/* R4300i COP0 CO opcodes */
-#define R4300i_COP0_CO_TLBR			1
-#define R4300i_COP0_CO_TLBWI		2
-#define R4300i_COP0_CO_TLBWR		6
-#define R4300i_COP0_CO_TLBP			8
-#define R4300i_COP0_CO_ERET			24
-
-/* R4300i COP1 opcodes */
-#define	R4300i_COP1_MF				0
-#define	R4300i_COP1_DMF				1
-#define	R4300i_COP1_CF				2
-#define	R4300i_COP1_MT				4
-#define	R4300i_COP1_DMT				5
-#define	R4300i_COP1_CT				6
-#define	R4300i_COP1_BC				8
-#define R4300i_COP1_S				16
-#define R4300i_COP1_D				17
-#define R4300i_COP1_W				20
-#define R4300i_COP1_L				21
-
-/* R4300i COP1 BC opcodes */
-#define	R4300i_COP1_BC_BCF			0
-#define	R4300i_COP1_BC_BCT			1
-#define	R4300i_COP1_BC_BCFL			2
-#define	R4300i_COP1_BC_BCTL			3
-
-#define R4300i_COP1_FUNCT_ADD		 0
-#define R4300i_COP1_FUNCT_SUB		 1
-#define R4300i_COP1_FUNCT_MUL		 2
-#define R4300i_COP1_FUNCT_DIV		 3
-#define R4300i_COP1_FUNCT_SQRT		 4
-#define R4300i_COP1_FUNCT_ABS		 5
-#define R4300i_COP1_FUNCT_MOV		 6
-#define R4300i_COP1_FUNCT_NEG		 7
-#define R4300i_COP1_FUNCT_ROUND_L	 8
-#define R4300i_COP1_FUNCT_TRUNC_L	 9
-#define R4300i_COP1_FUNCT_CEIL_L	10
-#define R4300i_COP1_FUNCT_FLOOR_L	11
-#define R4300i_COP1_FUNCT_ROUND_W	12
-#define R4300i_COP1_FUNCT_TRUNC_W	13
-#define R4300i_COP1_FUNCT_CEIL_W	14
-#define R4300i_COP1_FUNCT_FLOOR_W	15
-#define R4300i_COP1_FUNCT_CVT_S		32
-#define R4300i_COP1_FUNCT_CVT_D		33
-#define R4300i_COP1_FUNCT_CVT_W		36
-#define R4300i_COP1_FUNCT_CVT_L		37
-#define R4300i_COP1_FUNCT_C_F		48
-#define R4300i_COP1_FUNCT_C_UN		49
-#define R4300i_COP1_FUNCT_C_EQ		50
-#define R4300i_COP1_FUNCT_C_UEQ		51
-#define R4300i_COP1_FUNCT_C_OLT		52
-#define R4300i_COP1_FUNCT_C_ULT		53
-#define R4300i_COP1_FUNCT_C_OLE		54
-#define R4300i_COP1_FUNCT_C_ULE		55
-#define R4300i_COP1_FUNCT_C_SF		56
-#define R4300i_COP1_FUNCT_C_NGLE	57
-#define R4300i_COP1_FUNCT_C_SEQ		58
-#define R4300i_COP1_FUNCT_C_NGL		59
-#define R4300i_COP1_FUNCT_C_LT		60
-#define R4300i_COP1_FUNCT_C_NGE		61
-#define R4300i_COP1_FUNCT_C_LE		62
-#define R4300i_COP1_FUNCT_C_NGT		63
-
-#endif
-
-

audacious-plugins-3.1.1.tar.bz2/src/usf/pif.c Deleted

@@ -1,97 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#include "main.h"
-#include "cpu.h"
-
-// Skeletal support so USFs that read the controller won't fail (bad practice, though)
-
-void ProcessControllerCommand ( int32_t Control, uint8_t * Command);
-
-uint8_t *PIF_Ram = 0;
-
-void PifRamRead (void) {
-	int32_t Channel, CurPos;
-
-	Channel = 0;
-	CurPos = 0;
-
-	do {
-		switch(PIF_Ram[CurPos]) {
-		case 0x00:
-			Channel += 1;
-			if (Channel > 6) { CurPos = 0x40; }
-			break;
-		case 0xFE: CurPos = 0x40; break;
-		case 0xFF: break;
-		case 0xB4: case 0x56: case 0xB8: break; /* ??? */
-		default:
-			if ((PIF_Ram[CurPos] & 0xC0) == 0) {
-				CurPos += PIF_Ram[CurPos] + (PIF_Ram[CurPos + 1] & 0x3F) + 1;
-				Channel += 1;
-			} else {
-				CurPos = 0x40;
-			}
-			break;
-		}
-		CurPos += 1;
-	} while( CurPos < 0x40 );
-}
-
-void PifRamWrite (void) {
-	int Channel, CurPos;
-
-	Channel = 0;
-
-	for (CurPos = 0; CurPos < 0x40; CurPos++){
-		switch(PIF_Ram[CurPos]) {
-		case 0x00:
-			Channel += 1;
-			if (Channel > 6) { CurPos = 0x40; }
-			break;
-		case 0xFE: CurPos = 0x40; break;
-		case 0xFF: break;
-		case 0xB4: case 0x56: case 0xB8: break; /* ??? */
-		default:
-			if ((PIF_Ram[CurPos] & 0xC0) == 0) {
-				if (Channel < 4) {
-					ProcessControllerCommand(Channel,&PIF_Ram[CurPos]);
-				}
-				CurPos += PIF_Ram[CurPos] + (PIF_Ram[CurPos + 1] & 0x3F) + 1;
-				Channel += 1;
-			} else
-				CurPos = 0x40;
-
-			break;
-		}
-	}
-	PIF_Ram[0x3F] = 0;
-}
-
-// always return failure
-void ProcessControllerCommand ( int32_t Control, uint8_t * Command) {
-	Command[1] |= 0x80;
-}
-

audacious-plugins-3.1.1.tar.bz2/src/usf/pif.h Deleted

@@ -1,31 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-extern uint8_t *PIF_Ram;
-
-int32_t  GetCicChipID ( int8_t * RomData );
-int32_t  LoadPifRom   ( int32_t country );
-void PifRamWrite  ( void );
-void PifRamRead   ( void );

audacious-plugins-3.1.1.tar.bz2/src/usf/psftag.c Deleted

@@ -1,528 +0,0 @@
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// tag handling
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "psftag.h"
-
-#if !defined(__WIN32__) && !defined(_MSC_VER)
-#include <unistd.h>
-#else
-#include <windows.h>
-static void truncate(const char *filename, int size) {
-
- HANDLE f = CreateFile(
- filename,
- GENERIC_WRITE,
- 0,
- NULL,
- OPEN_EXISTING,
- FILE_ATTRIBUTE_NORMAL,
- NULL
- );
- if(f == INVALID_HANDLE_VALUE) return;
- SetFilePointer(f, size, NULL, FILE_BEGIN);
- if(GetLastError() == NO_ERROR) SetEndOfFile(f);
- CloseHandle(f);
-}
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-/*
-** Returns index, or -1 if not found
-** Returns the index starting at the first non-whitespace character of
-** the actual variable name
-*/
-static int find_tag_var_start(const char *tagbuffer, const char *varname) {
- int i, j;
- if(!tagbuffer || !varname) return -1;
- for(i = 0;;) {
- /*
- ** Find first non-whitespace
- ** (this is the variable name on the current line)
- */
- for(;; i++) {
- unsigned u = ((unsigned)(tagbuffer[i])) & 0xFF;
- /* If the tag ends here, we wouldn't have had any data anyway */
- if(!u) return -1;
- if(u <= 0x20) continue;
- break;
- }
- /*
- ** Compare case-insensitively to the var name
- */
- for(j = 0;; j++) {
- unsigned ucmp = ((unsigned)(varname [ j])) & 0xFF;
- unsigned u = ((unsigned)(tagbuffer[i + j])) & 0xFF;
- /* if the varname ends, we'll break here and do the equals check */
- if(!ucmp) break;
- /* If the tag ends here, we wouldn't have had any data anyway */
- if(!u) return -1;
- /* lowercase */
- if(ucmp >= 'A' && ucmp <= 'Z') { ucmp -= 'A'; ucmp += 'a'; }
- if(u >= 'A' && u <= 'Z') { u -= 'A'; u += 'a'; }
- /* if they're unequal, break... */
- if(u != ucmp) break;
- }
- /*
- ** Only if we exhausted the varname will we do the equals check
- */
- if(!varname[j]) {
- /*
- ** Ensure that the next non-whitespace character in [i+j] is an '='
- */
- for(;; j++) {
- unsigned u = ((unsigned)(tagbuffer[i + j])) & 0xFF;
- /* If the tag ends here, we wouldn't have had any data anyway */
- if(!u) return -1;
- /* quit at the first '=' - success! */
- if(u == '=') return i;
- /* shouldn't be a newline here! */
- if(u == 0x0A) break;
- /* ignore whitespace */
- if(u <= 0x20) continue;
- /* any other character is an error */
- break;
- }
- }
- i += j + 1;
- /*
- ** Find newline or end-of-tag
- */
- for(;; i++) {
- unsigned u = ((unsigned)(tagbuffer[i])) & 0xFF;
- /* If the tag ends here, we wouldn't have had any data anyway */
- if(!u) return -1;
- if(u == 0x0A) break;
- }
- }
- return -1;
-}
-
-/*
-** Returns the index at which the current variable ends
-** (Includes any ending newline and possibly whitespace after that)
-**
-** Buffer points to the first non-whitespace character of the variable name
-*/
-static int find_tag_var_end(const char *tagbuffer) {
- int i, j;
- if(!tagbuffer) return 0;
- for(i = 0;;) {
- /*
- ** Find first non-whitespace
- ** (this is the variable name on the current line)
- */
- for(;; i++) {
- unsigned u = ((unsigned)(tagbuffer[i])) & 0xFF;
- if(!u) return i;
- if(u <= 0x20) continue;
- break;
- }
- /*
- ** Compare case-insensitively to the original var name
- */
- for(j = 0;; j++) {
- unsigned ucmp = ((unsigned)(tagbuffer[ j])) & 0xFF;
- unsigned u = ((unsigned)(tagbuffer[i + j])) & 0xFF;
- /* If the tag ends here, we wouldn't have had any data anyway */
- if(!u) return i;
- /* lowercase */
- if(ucmp >= 'A' && ucmp <= 'Z') { ucmp -= 'A'; ucmp += 'a'; }
- if(u >= 'A' && u <= 'Z') { u -= 'A'; u += 'a'; }
- /* if they're both whitespace or '=', we win */
- if((u <= 0x20 || u == '=') && (ucmp <= 0x20 || ucmp == '=')) break;
- /* if they're unequal, we lose */
- if(u != ucmp) return i;
- /* otherwise, keep trying */
- }
- /*
- ** Ensure that the next non-whitespace character in [i+j] is an '='
- */
- for(;; j++) {
- unsigned u = ((unsigned)(tagbuffer[i + j])) & 0xFF;
- if(!u) return i;
- /* quit at the first '=' */
- if(u == '=') break;
- /* shouldn't be a newline here! */
- if(u == 0x0A) return i;
- /* ignore whitespace */
- if(u <= 0x20) continue;
- /* any other character is an error */
- break;
- }
- i += j + 1;
- /*
- ** Find newline or end-of-tag
- */
- for(;; i++) {
- unsigned u = ((unsigned)(tagbuffer[i])) & 0xFF;
- if(!u) return i;
- if(u == 0x0A) break;
- }
- }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-/*
-** Get tag variable
-** The destination value buffer must be as big as the entire tag
-*/
-int psftag_raw_getvar(
- const char *tag,
- const char *variable,
- char *value_out,
- int value_out_size
-) {
- char *v = value_out;
- char *vmax = v + value_out_size;
- char *v_linebegin;
- int i, i_end;
- //
- // Safety check
- //
- if(value_out_size < 1) return -1;
- /*
- ** Default to empty string
- */
- *v = 0;
- /*
- ** Find the variable start/end index
- */
- i = find_tag_var_start(tag, variable);
- if(i < 0) return -1;
- i_end = i + find_tag_var_end(tag + i);
- /*
- ** Extract the variable data
- */
- while(i < i_end) {
- /*
- ** Skip to first '='
- */
- while((tag[i] != '=') && (i < i_end)) { i++; }
- if(i >= i_end) break;
- /*
- ** If this is not the first line, add a newline
- */
- if(v > value_out) {
- if(v < vmax) { *v++ = 0x0A; }
- }
- /*
- ** Now that we're at a '=', skip past it
- */
- i++;
- if(i >= i_end) break;
- /*
- ** Skip past any whitespace except newlines
- */
- for(; i < i_end; i++) {
- unsigned u = ((unsigned)(tag[i])) & 0xFF;
- if(u == 0x0A) break;
- if(u <= 0x20) continue;
- break;
- }
- if(i >= i_end) break;
- /*
- ** Consume line data
- */
- v_linebegin = v;
- while(i < i_end) {
- unsigned u = ((unsigned)(tag[i++])) & 0xFF;
- if(u == 0x0A) break;
- if(v < vmax) { *v++ = u; }
- }
- /*
- ** Eat end-of-line whitespace
- */
- while(v > v_linebegin && (((unsigned)(v[-1]))&0xFF) <= 0x20) {
- v--;
- }
- }
- /*
- ** Set variable end
- */
- if(v >= vmax) { v = vmax - 1; }
- *v = 0;
- return 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-void psftag_raw_setvar(
- char *tag,
- int tag_max_size,
- const char *variable,
- const char *value
-) {
- int tag_l = strlen(tag);
- int i, i_end, z;
- int insert_i;
- int insert_l;
- int value_exists = 0;
- int tag_max_usable_size = tag_max_size - 1;
- //
- // Safety check
- //
- if(tag_max_size < 1) return;
- //
- // We will assume we can at least use what's there
- //
- if(tag_max_usable_size < tag_l) {
- tag_max_usable_size = tag_l;
- tag_max_size = tag_l + 1;
- }
- /*
- ** Determine the insertion length of the new variable
- */
- { const char *v;
- int nl = strlen(variable);
- insert_l = nl + 2;
- for(v = value; *v; v++) {
- insert_l++;
- if(*v == 0x0A) {
- /* Value exists if it's multi-line */
- value_exists = 1;
- insert_l += nl + 1;
- } else if((((unsigned)(*v))&0xFF) > 0x20) {
- /* Value exists if there are non-whitespace characters */
- value_exists = 1;
- }
- }
- }
- /*
- ** If the value is blank, force the insert length to zero
- */
- if(!value_exists) insert_l = 0;
- /*
- ** Find the variable start index
- */
- i = find_tag_var_start(tag, variable);
- /*
- ** If not found, add a new variable
- */
- if(i < 0) {
- /* Insert position is at the end */
- insert_i = tag_l;
- /* Eat trailing whitespace in the file */
- while(insert_i && (((unsigned)(tag[insert_i - 1]))&0xFF) <= 0x20) { insert_i--; }
- /* Insert a newline if there's room and if there's stuff before */
- if(insert_i && (insert_i < tag_max_usable_size)) { tag[insert_i++] = 0x0A; }
- /* Clamp insert length */
- if((insert_i + insert_l) > tag_max_usable_size) { insert_l = tag_max_usable_size - insert_i; }
- z = insert_i + insert_l;
- /*
- ** Otherwise, find the variable end index
- */
- } else {
- int movel;
- insert_i = i;
- /* Clamp insert length */
- if((insert_i + insert_l) > tag_max_usable_size) { insert_l = tag_max_usable_size - insert_i; }
- i_end = i + find_tag_var_end(tag + i);
- /* Move remaining file data */
- movel = tag_l - i_end;
- if(movel > (tag_max_usable_size-(insert_i+insert_l))) { movel = tag_max_usable_size - (insert_i+insert_l); }
- /* perform the move */
- if(movel && ((insert_i+insert_l) != i_end)) {
- memmove(tag+insert_i+insert_l, tag+i_end, movel);
- }
- z = insert_i+insert_l+movel;
- }
- /* Add terminating null ahead of time */
- if(z > tag_max_usable_size) z = tag_max_usable_size;
- tag[z] = 0;
- /*
- ** Write the variable to index insert_i, max length insert_l
- */
- insert_l += insert_i;
- while(insert_i < insert_l) {
- const char *v;
- for(v = variable; (*v) && (insert_i < insert_l); v++) {
- tag[insert_i++] = *v;
- }
- if(insert_i >= insert_l) break;
- tag[insert_i++] = '=';
- if(insert_i >= insert_l) break;
- for(; (*value) && ((*value) != 0x0A) && (insert_i < insert_l); value++) {
- tag[insert_i++] = *value;
- }
- if(insert_i >= insert_l) break;
- tag[insert_i++] = 0x0A;
- if(insert_i >= insert_l) break;
- if(!(*value)) break;
- if((*value) == 0x0A) value++;
- }
-
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-#define TAGMAX (50000)
-#define ERRORMAX (256)
-
-struct PSFTAG {
- char str[TAGMAX + 1];
-};
-
-/*void *psftag_create(void) {
- struct PSFTAG *p = malloc(sizeof(struct PSFTAG));
- if(!p) return NULL;
- p->str[0] = 0;
- //p->errorstring[0] = 0;
- return p;
-}
-
-void psftag_delete(void *psftag) {
- free(psftag);
-}*/
-
-/////////////////////////////////////////////////////////////////////////////
-
-/*const char *psftag_getlasterror(void *psftag) {
- return ((struct PSFTAG*)psftag)->errorstring;
-}*/
-
-/////////////////////////////////////////////////////////////////////////////
-
-void psftag_getraw(void *psftag, char *raw_out, int raw_out_size) {
- if(raw_out_size < 1) return;
- strncpy(raw_out, ((struct PSFTAG*)psftag)->str, raw_out_size);
- raw_out[raw_out_size - 1] = 0;
-}
-
-void psftag_setraw(void *psftag, const char *raw_in) {
- strncpy(((struct PSFTAG*)psftag)->str, raw_in, TAGMAX + 1);
- ((struct PSFTAG*)psftag)->str[TAGMAX] = 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-int psftag_getvar(void *psftag, const char *variable, char *value_out, int value_out_size) {
- return psftag_raw_getvar(((struct PSFTAG*)psftag)->str, variable, value_out, value_out_size);
-}
-
-void psftag_setvar(void *psftag, const char *variable, const char *value) {
- psftag_raw_setvar(((struct PSFTAG*)psftag)->str, TAGMAX + 1, variable, value);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-int psftag_readfromfile(void *psftag, const char *path) {
- struct PSFTAG *t = (struct PSFTAG*)psftag;
- FILE *f = NULL;
- int l;
- int rsize, exesize, tagstart;
- char hdr[12];
-
- f = fopen(path, "rb");
- if(!f) {
- //strncpy(t->errorstring, strerror(errno), ERRORMAX);
- //t->errorstring[ERRORMAX-1] = 0;
- return -1;
- }
-
- if(fread(hdr, 1, 12, f) != 12) goto invalidformat;
- if(memcmp(hdr, "PSF", 3)) goto invalidformat;
-
- rsize =
- ((((unsigned)(hdr[ 4])) & 0xFF) << 0) |
- ((((unsigned)(hdr[ 5])) & 0xFF) << 8) |
- ((((unsigned)(hdr[ 6])) & 0xFF) << 16) |
- ((((unsigned)(hdr[ 7])) & 0xFF) << 24);
- exesize =
- ((((unsigned)(hdr[ 8])) & 0xFF) << 0) |
- ((((unsigned)(hdr[ 9])) & 0xFF) << 8) |
- ((((unsigned)(hdr[10])) & 0xFF) << 16) |
- ((((unsigned)(hdr[11])) & 0xFF) << 24);
-
- tagstart = 16 + rsize + exesize;
-
- fseek(f, tagstart, SEEK_SET);
-
- if(fread(hdr, 1, 5, f) != 5) goto notpresent;
- if(memcmp(hdr, "[TAG]", 5)) goto invalidformat;
-
- tagstart += 5;
- fseek(f, 0, SEEK_END);
- l = ftell(f);
- fseek(f, tagstart, SEEK_SET);
- l -= tagstart;
- if(l < 0) l = 0;
- if(l > TAGMAX) l = TAGMAX;
-
- memset(t->str, 0, TAGMAX + 1);
- fread(t->str, 1, l, f);
-
- fclose(f);
- return 0;
-
-invalidformat:
-// strcpy(t->errorstring, "Invalid file format");
- goto error;
-notpresent:
-// strcpy(t->errorstring, "Tag not present");
- goto error;
-error:
- if(f) fclose(f);
- return -1;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-int psftag_writetofile(void *psftag, const char *path) {
- struct PSFTAG *t = (struct PSFTAG*)psftag;
- FILE *f = NULL;
- int l;
- int rsize, exesize, tagstart;
- char hdr[12];
-
- f = fopen(path, "r+b");
- if(!f) {
- //strncpy(t->errorstring, strerror(errno), ERRORMAX);
- //t->errorstring[ERRORMAX-1] = 0;
- return -1;
- }
-
- if(fread(hdr, 1, 12, f) != 12) goto invalidformat;
- if(memcmp(hdr, "PSF", 3)) goto invalidformat;
-
- rsize =
- ((((unsigned)(hdr[ 4])) & 0xFF) << 0) |
- ((((unsigned)(hdr[ 5])) & 0xFF) << 8) |
- ((((unsigned)(hdr[ 6])) & 0xFF) << 16) |
- ((((unsigned)(hdr[ 7])) & 0xFF) << 24);
- exesize =
- ((((unsigned)(hdr[ 8])) & 0xFF) << 0) |
- ((((unsigned)(hdr[ 9])) & 0xFF) << 8) |
- ((((unsigned)(hdr[10])) & 0xFF) << 16) |
- ((((unsigned)(hdr[11])) & 0xFF) << 24);
-
- tagstart = 16 + rsize + exesize;
-
- fseek(f, tagstart, SEEK_SET);
-
- l = strlen(t->str);
-
- fwrite("[TAG]", 1, 5, f);
- fwrite(t->str, 1, l, f);
- fclose(f);
-
- truncate(path, tagstart + 5 + l);
-
- return 0;
-
-invalidformat:
-// strcpy(t->errorstring, "Invalid file format");
- goto error;
-error:
- if(f) fclose(f);
- return -1;
-}
-
-/////////////////////////////////////////////////////////////////////////////

audacious-plugins-3.1.1.tar.bz2/src/usf/psftag.h Deleted

@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// tag handling
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __PSF_PSFTAG_H__
-#define __PSF_PSFTAG_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *psftag_create(void);
-void  psftag_delete(void *psftag);
-
-int psftag_readfromfile(void *psftag, const char *path);
-int psftag_writetofile(void *psftag, const char *path);
-const char *psftag_getlasterror(void *psftag);
-
-//
-// Retrieve a tag variable.
-// Guarantees null termination of output.
-// Returns 0 if the variable was found
-// Otherwise, returns -1 and sets the output to an empty terminated string
-//
-int psftag_getvar(void *psftag, const char *variable, char *value_out, int value_out_size);
-
-//
-// Set a tag variable.
-//
-void psftag_setvar(void *psftag, const char *variable, const char *value);
-
-void psftag_getraw(void *psftag, char *raw_out, int raw_out_size);
-void psftag_setraw(void *psftag, const char *raw_in);
-
-//
-// Retrieve a tag variable. The input tag data must be null-terminated.
-// Guarantees null termination of output.
-// Returns 0 if the variable was found
-// Otherwise, returns -1 and sets the output to an empty terminated string
-//
-int psftag_raw_getvar(const char *tag, const char *variable, char *value_out, int value_out_size);
-
-//
-// Set a tag variable.
-// Provide the maximum growable tag size _including_ space for the null terminator.
-// Note that this function assumes it can overwrite *tag up to the length of the
-// existing string, regardless of tag_max_size.
-//
-void psftag_raw_setvar(char *tag, int tag_max_size, const char *variable, const char *value);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

audacious-plugins-3.1.1.tar.bz2/src/usf/recompiler_cpu.c Deleted

@@ -1,2780 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#include <stdlib.h>
-#include <stdio.h>
-#include "main.h"
-#include "cpu.h"
-#include "x86.h"
-#include "usf.h"
-#include "types.h"
-
-
-void CreateSectionLinkage (BLOCK_SECTION * Section);
-void DetermineLoop(BLOCK_SECTION * Section, uint32_t Test, uint32_t Test2, uint32_t TestID);
-uint32_t DisplaySectionInformation (BLOCK_SECTION * Section, uint32_t ID, uint32_t Test);
-BLOCK_SECTION * ExistingSection(BLOCK_SECTION * StartSection, uint32_t Addr, uint32_t Test);
-void FillSectionInfo(BLOCK_SECTION * Section);
-void FixConstants ( BLOCK_SECTION * Section, uint32_t Test,int * Changed );
-uint32_t GenerateX86Code (BLOCK_SECTION * Section, uint32_t Test );
-uint32_t GetNewTestValue( void );
-void InheritConstants(BLOCK_SECTION * Section);
-uint32_t InheritParentInfo (BLOCK_SECTION * Section);
-void InitilzeSection(BLOCK_SECTION * Section, BLOCK_SECTION * Parent, uint32_t StartAddr, uint32_t ID);
-void InitilizeRegSet(REG_INFO * RegSet);
-uint32_t IsAllParentLoops(BLOCK_SECTION * Section, BLOCK_SECTION * Parent, uint32_t IgnoreIfCompiled, uint32_t Test);
-void MarkCodeBlock (uint32_t PAddr);
-void SyncRegState (BLOCK_SECTION * Section, REG_INFO * SyncTo);
-
-N64_Blocks_t N64_Blocks;
-uint32_t * TLBLoadAddress = 0, TargetIndex;
-TARGET_INFO * TargetInfo = NULL;
-BLOCK_INFO BlockInfo;
-
-void InitilizeInitialCompilerVariable ( void)
-{
-	memset(&BlockInfo,0,sizeof(BlockInfo));
-}
-
-void AddParent(BLOCK_SECTION * Section, BLOCK_SECTION * Parent){
-	int NoOfParents, count;
-
-
-	if (Section == NULL) { return; }
-	if (Parent == NULL) {
-		InitilizeRegSet(&Section->RegStart);
-		memcpy(&Section->RegWorking,&Section->RegStart,sizeof(REG_INFO));
-		return;
-	}
-
-	if (Section->ParentSection != NULL) {
-		for (NoOfParents = 0;Section->ParentSection[NoOfParents] != NULL;NoOfParents++) {
-			if (Section->ParentSection[NoOfParents] == Parent) {
-				return;
-			}
-		}
-		for (NoOfParents = 0;Section->ParentSection[NoOfParents] != NULL;NoOfParents++);
-		NoOfParents += 1;
-	} else {
-		NoOfParents = 1;
-	}
-
-	if (NoOfParents == 1) {
-		Section->ParentSection = malloc((NoOfParents + 1)*sizeof(void *));
-	} else {
-		Section->ParentSection = realloc(Section->ParentSection,(NoOfParents + 1)*sizeof(void *));
-	}
-	Section->ParentSection[NoOfParents - 1] = Parent;
-	Section->ParentSection[NoOfParents] = NULL;
-
-	if (NoOfParents == 1) {
-		if (Parent->ContinueSection == Section) {
-			memcpy(&Section->RegStart,&Parent->Cont.RegSet,sizeof(REG_INFO));
-		} else if (Parent->JumpSection == Section) {
-			memcpy(&Section->RegStart,&Parent->Jump.RegSet,sizeof(REG_INFO));
-		} else {
-		}
-		memcpy(&Section->RegWorking,&Section->RegStart,sizeof(REG_INFO));
-	} else {
-		if (Parent->ContinueSection == Section) {
-			for (count = 0; count < 32; count++) {
-				if (Section->RegStart.MIPS_RegState[count] != Parent->Cont.RegSet.MIPS_RegState[count]) {
-					Section->RegStart.MIPS_RegState[count] = STATE_UNKNOWN;
-				}
-			}
-		}
-		if (Parent->JumpSection == Section) {
-			for (count = 0; count < 32; count++) {
-				if (Section->RegStart.MIPS_RegState[count] != Parent->Jump.RegSet.MIPS_RegState[count]) {
-					Section->RegStart.MIPS_RegState[count] = STATE_UNKNOWN;
-				}
-			}
-		}
-		memcpy(&Section->RegWorking,&Section->RegStart,sizeof(REG_INFO));
-	}
-}
-
-void AnalyseBlock (void) {
-	int Changed;
-
-	BLOCK_SECTION * Section = &BlockInfo.BlockInfo;
-
-	BlockInfo.NoOfSections = 1;
-	InitilzeSection (Section, NULL, BlockInfo.StartVAddr, BlockInfo.NoOfSections);
-	CreateSectionLinkage (Section);
-	DetermineLoop(Section,GetNewTestValue(),GetNewTestValue(), Section->SectionID);
-	do {
-		Changed = 0;
-		FixConstants(Section,GetNewTestValue(),&Changed);
-	} while (Changed == 1);
-
-}
-
-int ConstantsType (int64_t Value) {
-	if (((Value >> 32) == -1) && ((Value & 0x80000000) != 0)) { return STATE_CONST_32; }
-	if (((Value >> 32) == 0) && ((Value & 0x80000000) == 0)) { return STATE_CONST_32; }
-	return STATE_CONST_64;
-}
-
-
-uint8_t * Compiler4300iBlock(void) {
-	uintptr_t StartAddress;
-	int count;
-
-	//reset BlockInfo
-	if (BlockInfo.ExitInfo)
-	{
-		for (count = 0; count < BlockInfo.ExitCount; count ++) {
-			free(BlockInfo.ExitInfo[count]);
-			BlockInfo.ExitInfo[count] = NULL;
-		}
-		if (BlockInfo.ExitInfo) { free(BlockInfo.ExitInfo); }
-		BlockInfo.ExitInfo = NULL;
-	}
-
-	memset(&BlockInfo,0,sizeof(BlockInfo));
-	BlockInfo.CompiledLocation = RecompPos;
-	BlockInfo.StartVAddr = PROGRAM_COUNTER;
-
-	AnalyseBlock();
-
-	StartAddress = BlockInfo.StartVAddr;
-	TranslateVaddr(&StartAddress);
-
-	//BreakPoint();
-	//MoveConstQwordToX86reg(Registers, x64_R14);
-
-	MarkCodeBlock(StartAddress);
-
-	while (GenerateX86Code(&BlockInfo.BlockInfo,GetNewTestValue()));
-	for (count = 0; count < BlockInfo.ExitCount; count ++) {
-		SetJump32(BlockInfo.ExitInfo[count]->JumpLoc,RecompPos);
-		NextInstruction = BlockInfo.ExitInfo[count]->NextInstruction;
-		CompileExit(BlockInfo.ExitInfo[count]->TargetPC,&BlockInfo.ExitInfo[count]->ExitRegSet,
-			BlockInfo.ExitInfo[count]->reason,1,NULL);
-	}
-	FreeSection (BlockInfo.BlockInfo.ContinueSection,&BlockInfo.BlockInfo);
-	FreeSection (BlockInfo.BlockInfo.JumpSection,&BlockInfo.BlockInfo);
-	for (count = 0; count < BlockInfo.ExitCount; count ++) {
-		free(BlockInfo.ExitInfo[count]);
-		BlockInfo.ExitInfo[count] = NULL;
-	}
-	if (BlockInfo.ExitInfo) { free(BlockInfo.ExitInfo); }
-	BlockInfo.ExitInfo = NULL;
-	BlockInfo.ExitCount = 0;
-
-	return BlockInfo.CompiledLocation;
-}
-
-
-uint8_t * CompileDelaySlot(void) {
-	uintptr_t StartAddress = PROGRAM_COUNTER;
-	BLOCK_SECTION *Section, DelaySection;
-	uint8_t * Block = RecompPos;
-	int count, x86Reg;
-
-	Section = &DelaySection;
-
-	if ((StartAddress & 0xFFC) != 0) {
-		StopEmulation();
-	}
-	if (!r4300i_LW_VAddr(StartAddress, &Opcode.Hex)) {
-		StopEmulation();
-	}
-
-	TranslateVaddr(&StartAddress);
-
-	MarkCodeBlock(StartAddress);
-
-	InitilzeSection (Section, NULL, PROGRAM_COUNTER, 0);
-	InitilizeRegSet(&Section->RegStart);
-	memcpy(&Section->RegWorking,&Section->RegStart,sizeof(REG_INFO));
-
-	BlockCycleCount += 2;
-	BlockRandomModifier += 1;
-
-	switch (Opcode.op) {
-	case R4300i_SPECIAL:
-		switch (Opcode.funct) {
-		case R4300i_SPECIAL_BREAK: Compile_R4300i_SPECIAL_BREAK(Section); break;
-		case R4300i_SPECIAL_SLL: Compile_R4300i_SPECIAL_SLL(Section); break;
-		case R4300i_SPECIAL_SRL: Compile_R4300i_SPECIAL_SRL(Section); break;
-		case R4300i_SPECIAL_SRA: Compile_R4300i_SPECIAL_SRA(Section); break;
-		case R4300i_SPECIAL_SLLV: Compile_R4300i_SPECIAL_SLLV(Section); break;
-		case R4300i_SPECIAL_SRLV: Compile_R4300i_SPECIAL_SRLV(Section); break;
-		case R4300i_SPECIAL_SRAV: Compile_R4300i_SPECIAL_SRAV(Section); break;
-		case R4300i_SPECIAL_MFLO: Compile_R4300i_SPECIAL_MFLO(Section); break;
-		case R4300i_SPECIAL_MTLO: Compile_R4300i_SPECIAL_MTLO(Section); break;
-		case R4300i_SPECIAL_MFHI: Compile_R4300i_SPECIAL_MFHI(Section); break;
-		case R4300i_SPECIAL_MTHI: Compile_R4300i_SPECIAL_MTHI(Section); break;
-		case R4300i_SPECIAL_MULT: Compile_R4300i_SPECIAL_MULT(Section); break;
-		case R4300i_SPECIAL_DIV: Compile_R4300i_SPECIAL_DIV(Section); break;
-		case R4300i_SPECIAL_DIVU: Compile_R4300i_SPECIAL_DIVU(Section); break;
-		case R4300i_SPECIAL_MULTU: Compile_R4300i_SPECIAL_MULTU(Section); break;
-		case R4300i_SPECIAL_DMULTU: Compile_R4300i_SPECIAL_DMULTU(Section); break;
-		case R4300i_SPECIAL_DDIVU: Compile_R4300i_SPECIAL_DDIVU(Section); break;
-		case R4300i_SPECIAL_ADD: Compile_R4300i_SPECIAL_ADD(Section); break;
-		case R4300i_SPECIAL_ADDU: Compile_R4300i_SPECIAL_ADDU(Section); break;
-		case R4300i_SPECIAL_SUB: Compile_R4300i_SPECIAL_SUB(Section); break;
-		case R4300i_SPECIAL_SUBU: Compile_R4300i_SPECIAL_SUBU(Section); break;
-		case R4300i_SPECIAL_AND: Compile_R4300i_SPECIAL_AND(Section); break;
-		case R4300i_SPECIAL_OR: Compile_R4300i_SPECIAL_OR(Section); break;
-		case R4300i_SPECIAL_XOR: Compile_R4300i_SPECIAL_XOR(Section); break;
-		case R4300i_SPECIAL_SLT: Compile_R4300i_SPECIAL_SLT(Section); break;
-		case R4300i_SPECIAL_SLTU: Compile_R4300i_SPECIAL_SLTU(Section); break;
-		case R4300i_SPECIAL_DADD: Compile_R4300i_SPECIAL_DADD(Section); break;
-		case R4300i_SPECIAL_DADDU: Compile_R4300i_SPECIAL_DADDU(Section); break;
-		case R4300i_SPECIAL_DSLL32: Compile_R4300i_SPECIAL_DSLL32(Section); break;
-		case R4300i_SPECIAL_DSRA32: Compile_R4300i_SPECIAL_DSRA32(Section); break;
-		default:
-			Compile_R4300i_UnknownOpcode(Section); break;
-		}
-		break;
-	case R4300i_ADDI: Compile_R4300i_ADDI(Section); break;
-	case R4300i_ADDIU: Compile_R4300i_ADDIU(Section); break;
-	case R4300i_SLTI: Compile_R4300i_SLTI(Section); break;
-	case R4300i_SLTIU: Compile_R4300i_SLTIU(Section); break;
-	case R4300i_ANDI: Compile_R4300i_ANDI(Section); break;
-	case R4300i_ORI: Compile_R4300i_ORI(Section); break;
-	case R4300i_XORI: Compile_R4300i_XORI(Section); break;
-	case R4300i_LUI: Compile_R4300i_LUI(Section); break;
-	case R4300i_CP1:
-		switch (Opcode.rs) {
-		case R4300i_COP1_CF: Compile_R4300i_COP1_CF(Section); break;
-		case R4300i_COP1_MT: Compile_R4300i_COP1_MT(Section); break;
-		case R4300i_COP1_CT: Compile_R4300i_COP1_CT(Section); break;
-		case R4300i_COP1_MF: Compile_R4300i_COP1_MF(Section); break;
-		case R4300i_COP1_S:
-			switch (Opcode.funct) {
-			case R4300i_COP1_FUNCT_ADD: Compile_R4300i_COP1_S_ADD(Section); break;
-			case R4300i_COP1_FUNCT_SUB: Compile_R4300i_COP1_S_SUB(Section); break;
-			case R4300i_COP1_FUNCT_MUL: Compile_R4300i_COP1_S_MUL(Section); break;
-			case R4300i_COP1_FUNCT_DIV: Compile_R4300i_COP1_S_DIV(Section); break;
-			case R4300i_COP1_FUNCT_ABS: Compile_R4300i_COP1_S_ABS(Section); break;
-			case R4300i_COP1_FUNCT_NEG: Compile_R4300i_COP1_S_NEG(Section); break;
-			case R4300i_COP1_FUNCT_SQRT: Compile_R4300i_COP1_S_SQRT(Section); break;
-			case R4300i_COP1_FUNCT_MOV: Compile_R4300i_COP1_S_MOV(Section); break;
-			case R4300i_COP1_FUNCT_CVT_D: Compile_R4300i_COP1_S_CVT_D(Section); break;
-			case R4300i_COP1_FUNCT_ROUND_W: Compile_R4300i_COP1_S_ROUND_W(Section); break;
-			case R4300i_COP1_FUNCT_TRUNC_W: Compile_R4300i_COP1_S_TRUNC_W(Section); break;
-			case R4300i_COP1_FUNCT_FLOOR_W: Compile_R4300i_COP1_S_FLOOR_W(Section); break;
-			case R4300i_COP1_FUNCT_C_F: case R4300i_COP1_FUNCT_C_UN:
-			case R4300i_COP1_FUNCT_C_EQ: case R4300i_COP1_FUNCT_C_UEQ:
-			case R4300i_COP1_FUNCT_C_OLT: case R4300i_COP1_FUNCT_C_ULT:
-			case R4300i_COP1_FUNCT_C_OLE: case R4300i_COP1_FUNCT_C_ULE:
-			case R4300i_COP1_FUNCT_C_SF: case R4300i_COP1_FUNCT_C_NGLE:
-			case R4300i_COP1_FUNCT_C_SEQ: case R4300i_COP1_FUNCT_C_NGL:
-			case R4300i_COP1_FUNCT_C_LT: case R4300i_COP1_FUNCT_C_NGE:
-			case R4300i_COP1_FUNCT_C_LE: case R4300i_COP1_FUNCT_C_NGT:
-				Compile_R4300i_COP1_S_CMP(Section); break;
-			default:
-				Compile_R4300i_UnknownOpcode(Section); break;
-			}
-			break;
-		case R4300i_COP1_D:
-			switch (Opcode.funct) {
-			case R4300i_COP1_FUNCT_ADD: Compile_R4300i_COP1_D_ADD(Section); break;
-			case R4300i_COP1_FUNCT_SUB: Compile_R4300i_COP1_D_SUB(Section); break;
-			case R4300i_COP1_FUNCT_MUL: Compile_R4300i_COP1_D_MUL(Section); break;
-			case R4300i_COP1_FUNCT_DIV: Compile_R4300i_COP1_D_DIV(Section); break;
-			case R4300i_COP1_FUNCT_ABS: Compile_R4300i_COP1_D_ABS(Section); break;
-			case R4300i_COP1_FUNCT_NEG: Compile_R4300i_COP1_D_NEG(Section); break;
-			case R4300i_COP1_FUNCT_SQRT: Compile_R4300i_COP1_D_SQRT(Section); break;
-			case R4300i_COP1_FUNCT_MOV: Compile_R4300i_COP1_D_MOV(Section); break;
-			case R4300i_COP1_FUNCT_TRUNC_W: Compile_R4300i_COP1_D_TRUNC_W(Section); break;
-			case R4300i_COP1_FUNCT_CVT_S: Compile_R4300i_COP1_D_CVT_S(Section); break;
-			case R4300i_COP1_FUNCT_CVT_W: Compile_R4300i_COP1_D_CVT_W(Section); break;
-			case R4300i_COP1_FUNCT_C_F: case R4300i_COP1_FUNCT_C_UN:
-			case R4300i_COP1_FUNCT_C_EQ: case R4300i_COP1_FUNCT_C_UEQ:
-			case R4300i_COP1_FUNCT_C_OLT: case R4300i_COP1_FUNCT_C_ULT:
-			case R4300i_COP1_FUNCT_C_OLE: case R4300i_COP1_FUNCT_C_ULE:
-			case R4300i_COP1_FUNCT_C_SF: case R4300i_COP1_FUNCT_C_NGLE:
-			case R4300i_COP1_FUNCT_C_SEQ: case R4300i_COP1_FUNCT_C_NGL:
-			case R4300i_COP1_FUNCT_C_LT: case R4300i_COP1_FUNCT_C_NGE:
-			case R4300i_COP1_FUNCT_C_LE: case R4300i_COP1_FUNCT_C_NGT:
-				Compile_R4300i_COP1_D_CMP(Section); break;
-			default:
-				Compile_R4300i_UnknownOpcode(Section); break;
-			}
-			break;
-		case R4300i_COP1_W:
-			switch (Opcode.funct) {
-			case R4300i_COP1_FUNCT_CVT_S: Compile_R4300i_COP1_W_CVT_S(Section); break;
-			case R4300i_COP1_FUNCT_CVT_D: Compile_R4300i_COP1_W_CVT_D(Section); break;
-			default:
-				Compile_R4300i_UnknownOpcode(Section); break;
-			}
-			break;
-		default:
-			Compile_R4300i_UnknownOpcode(Section); break;
-		}
-		break;
-	case R4300i_LB: Compile_R4300i_LB(Section); break;
-	case R4300i_LH: Compile_R4300i_LH(Section); break;
-	case R4300i_LW: Compile_R4300i_LW(Section); break;
-	case R4300i_LBU: Compile_R4300i_LBU(Section); break;
-	case R4300i_LHU: Compile_R4300i_LHU(Section); break;
-	case R4300i_SB: Compile_R4300i_SB(Section); break;
-	case R4300i_SH: Compile_R4300i_SH(Section); break;
-	case R4300i_SW: Compile_R4300i_SW(Section); break;
-	case R4300i_SWR: Compile_R4300i_SWR(Section); break;
-	case R4300i_CACHE: Compile_R4300i_CACHE(Section); break;
-	case R4300i_LWC1: Compile_R4300i_LWC1(Section); break;
-	case R4300i_LDC1: Compile_R4300i_LDC1(Section); break;
-	case R4300i_LD: Compile_R4300i_LD(Section); break;
-	case R4300i_SWC1: Compile_R4300i_SWC1(Section); break;
-	case R4300i_SDC1: Compile_R4300i_SDC1(Section); break;
-	case R4300i_SD: Compile_R4300i_SD(Section); break;
-	default:
-		Compile_R4300i_UnknownOpcode(Section); break;
-	}
-
-	for (count = 1; count < 64; count ++) { x86Protected(count) = 0; }
-
-	WriteBackRegisters(Section);
-	if (BlockCycleCount != 0) {
-		AddConstToVariable(BlockCycleCount,&CP0[9]);
-		SubConstFromVariable(BlockCycleCount,&Timers->Timer);
-	}
-	if (BlockRandomModifier != 0) { SubConstFromVariable(BlockRandomModifier,&CP0[1]); }
-	x86Reg = Map_TempReg(Section,x86_Any,-1,0);
-	MoveVariableToX86reg(&JumpToLocation,x86Reg);
-	MoveX86regToVariable(x86Reg,&PROGRAM_COUNTER);
-	MoveConstToVariable(NORMAL,&NextInstruction);
-	Ret();
-	return Block;
-}
-
-void CompileExit (uint32_t TargetPC, REG_INFO * ExitRegSet, int reason, int CompileNow, void (*x86Jmp)(uintptr_t Value)) {
-	BLOCK_SECTION Section;
-	uint8_t * Jump, * Jump2;
-
-	if (!CompileNow) {
-		if (BlockInfo.ExitCount == 0) {
-			BlockInfo.ExitInfo = malloc(sizeof(void *));
-		} else {
-			BlockInfo.ExitInfo = realloc(BlockInfo.ExitInfo,(BlockInfo.ExitCount + 1) * sizeof(void *));
-		}
-		if (x86Jmp == NULL) {
-			StopEmulation();
-		}
-		x86Jmp(0);
-		BlockInfo.ExitInfo[BlockInfo.ExitCount] = malloc(sizeof(EXIT_INFO));
-		BlockInfo.ExitInfo[BlockInfo.ExitCount]->TargetPC = TargetPC;
-		BlockInfo.ExitInfo[BlockInfo.ExitCount]->ExitRegSet = *ExitRegSet;
-		BlockInfo.ExitInfo[BlockInfo.ExitCount]->reason = reason;
-		BlockInfo.ExitInfo[BlockInfo.ExitCount]->NextInstruction = NextInstruction;
-		BlockInfo.ExitInfo[BlockInfo.ExitCount]->JumpLoc = RecompPos - 4;
-		BlockInfo.ExitCount += 1;
-		return;
-	}
-
-	InitilzeSection (&Section, NULL, (uint32_t)-1, 0);
-	memcpy(&Section.RegWorking, ExitRegSet, sizeof(REG_INFO));
-
-
-	//if(TargetPC > 0x90000000)
-		//BreakPoint();
-
-	if (TargetPC != (uint32_t)-1) { MoveConstToVariable(TargetPC,&PROGRAM_COUNTER); }
-	if (ExitRegSet->CycleCount != 0) {
-		AddConstToVariable(ExitRegSet->CycleCount,&CP0[9]);
-		SubConstFromVariable(ExitRegSet->CycleCount,&Timers->Timer);
-	}
-	if (ExitRegSet->RandomModifier != 0) { SubConstFromVariable(ExitRegSet->RandomModifier,&CP0[1]); }
-	WriteBackRegisters(&Section);
-
-	switch (reason) {
-	case Normal: case Normal_NoSysCheck:
-		Section.RegWorking.RandomModifier = 0;
-		Section.RegWorking.CycleCount = 0;
-		if (reason == Normal) { CompileSystemCheck(0,(uint32_t)-1,Section.RegWorking);	}
-
-			if (TargetPC >= 0x80000000 && TargetPC < 0x90000000) {
-				uint32_t pAddr = TargetPC & 0x1FFFFFFF;
-				MoveConstToX86reg(pAddr,x86_ECX);
-				ShiftRightDoubleImmed(x86_ECX,x86_ECX,2);
-#ifdef USEX64
-				MoveVariableDispToX86Reg(JumpTable,x86_RCX,x86_RCX,8);
-#else
-				MoveVariableDispToX86Reg(JumpTable,x86_ECX,x86_ECX,4);
-#endif
-				Jump2 = NULL;
-			} else if (TargetPC >= 0x90000000 && TargetPC < 0xC0000000) {
-			} else {
-#ifdef USEX64
-				MoveConstToX86reg((TargetPC >> 12),x86_RCX);
-				MoveConstToX86reg(TargetPC,x86_EBX);
-				//MoveVariableDispToX86Reg(TLB_Map,x86_RCX,x86_RCX,8);
-				MoveX86RegDispToX86Reg(x86_RCX, x86_R15, x86_RCX, 8);
-				TestX86RegToX86Reg(x86_RCX,x86_RCX);
-				JeLabel8(0);
-				Jump2 = RecompPos - 1;
-				AddX86RegToX86Reg(x86_RCX,x86_EBX);
-				MoveConstQwordToX86reg((uintptr_t)N64MEM, x86_RBX);
-				SubX86RegToX86Reg(x86_RCX,x86_RBX);
-				ShiftRightDoubleImmed(x86_RCX,x86_RCX,2);
-				ShiftLeftDoubleImmed(x86_RCX,x86_RCX,3);
-				MoveConstQwordToX86reg((uintptr_t)JumpTable, x86_RBX);
-				AddX86RegToX86Reg(x86_RCX,x86_RBX);
-				MoveX86PointerToX86reg(x86_RCX,x86_RCX);
-#else
-				MoveConstToX86reg((TargetPC >> 12),x86_ECX);
-				MoveConstToX86reg(TargetPC,x86_EBX);
-				MoveVariableDispToX86Reg(TLB_Map,x86_ECX,x86_ECX,4);
-				TestX86RegToX86Reg(x86_ECX,x86_ECX);
-				JeLabel8(0);
-				Jump2 = RecompPos - 1;
-				AddConstToX86Reg(x86_ECX,(int32_t)JumpTable - (int32_t)N64MEM);
-				MoveX86regPointerToX86reg(x86_ECX, x86_EBX,x86_ECX);
-#endif
-			}
-			if (TargetPC < 0x90000000 || TargetPC >= 0xC0000000)
-			{
-					JecxzLabel8(0);
-				Jump = RecompPos - 1;
-				//	printf("TargetPC %08x\n", TargetPC);
-
-
-				JmpDirectReg(x86_ECX);
-				*((uint8_t *)(Jump))=(uint8_t)(RecompPos - Jump - 1);
-				if (Jump2 != NULL) {
-					*((uint8_t *)(Jump2))=(uint8_t)(RecompPos - Jump2 - 1);
-				}
-			}
-
-		Ret();
-		break;
-	case DoCPU_Action:
-		Pushad();
-		//BreakPoint();
-		Call_Direct(DoSomething);
-		//RecompileDoSomething();
-		Popad();
-		Ret();
-		break;
-	case DoBreak:
-		Ret();
-		break;
-	case DoSysCall:
-		MoveConstToX86reg(NextInstruction == JUMP || NextInstruction == DELAY_SLOT,x86_EDI);
-		printf("extinjg 1\n");
-		exit(0);
-		Pushad();
-		Call_Direct(DoSysCallException);
-		Popad();
-		Ret();
-		break;
-	case COP1_Unuseable:
-		Pushad();
-		MoveConstToX86reg(NextInstruction == JUMP || NextInstruction == DELAY_SLOT,x86_EDI);
-		MoveConstToX86reg(1,x86_ESI);
-		Call_Direct(DoCopUnusableException);
-		Popad();
-		Ret();
-		break;
-	case ExitResetRecompCode:
-		if (NextInstruction == JUMP || NextInstruction == DELAY_SLOT) {
-			BreakPoint();
-		}
-		Pushad();
-		BreakPoint();
-		Call_Direct(ResetRecompCode);
-		Popad();
-		Ret();
-		break;
-	case TLBReadMiss:
-		MoveConstToX86reg(NextInstruction == JUMP || NextInstruction == DELAY_SLOT,x86_EDI);
-		MoveVariableToX86reg(TLBLoadAddress,x86_ESI);
-		Pushad();
-#ifdef USEX64
-		Call_Direct(DoTLBMiss);
-#else
-		Push(x86_EDX);
-		Push(x86_ECX);
-		Call_Direct(DoTLBMiss);
-		AddConstToX86Reg(x86_ESP, 0x8);
-#endif
-		Popad();
-		Ret();
-		break;
-	}
-}
-
-void CompileSystemCheck (uint32_t TimerModifier, uint32_t TargetPC, REG_INFO RegSet) {
-	BLOCK_SECTION Section;
-	uint8_t *Jump, *Jump2;
-
-	CompConstToVariable(0,WaitMode);
-	JeLabel8(0);
-	Jump = RecompPos - 1;
-	MoveConstToVariable(-1, &Timers->Timer);
-
- SetJump8(Jump, RecompPos);
-
-	// Timer
-	if (TimerModifier != 0) {
-		SubConstFromVariable(TimerModifier,&Timers->Timer);
-	} else {
-		CompConstToVariable(0,&Timers->Timer);
-	}
-	JnsLabel32(0);
-	Jump = RecompPos - 4;
-	Pushad();
-	if (TargetPC != (uint32_t)-1) { MoveConstToVariable(TargetPC,&PROGRAM_COUNTER); }
-	InitilzeSection (&Section, NULL, (uint32_t)-1, 0);
-	memcpy(&Section.RegWorking, &RegSet, sizeof(REG_INFO));
-	WriteBackRegisters(&Section);
-	Call_Direct(TimerDone);
-	//Call_Direct(RecompileTimerDone);
-	//RecompileTimerDone();
-	//RecompileTimerDone();
-
-	Popad();
-
-	//Interrupt
-	CompConstToVariable(0,&CPU_Action->DoSomething);
-	JeLabel32(0);
-	Jump2 = RecompPos - 4;
-	CompileExit(-1,&Section.RegWorking,DoCPU_Action,1,NULL);
-
-	SetJump32(Jump2,RecompPos);
-	Ret();
-
-	SetJump32(Jump,RecompPos);
-
-	//Interrupt 2
-	CompConstToVariable(0,&CPU_Action->DoSomething);
-	JeLabel32(0);
-	Jump = RecompPos - 4;
-	if (TargetPC != (uint32_t)-1) { MoveConstToVariable(TargetPC,&PROGRAM_COUNTER); }
-	InitilzeSection (&Section, NULL, (uint32_t)-1, 0);
-	memcpy(&Section.RegWorking, &RegSet, sizeof(REG_INFO));
-	WriteBackRegisters(&Section);
-	CompileExit(-1,&Section.RegWorking,DoCPU_Action,1,NULL);
-	SetJump32(Jump,RecompPos);
-	return;
-}
-
-void CreateSectionLinkage (BLOCK_SECTION * Section) {
-	BLOCK_SECTION ** TargetSection[2];
-	uint32_t * TargetPC[2], count;
-
-	InheritConstants(Section);
-	//__try {
-		FillSectionInfo(Section);
-/*	} __except( r4300i_CPU_MemoryFilter( GetExceptionCode(), GetExceptionInformation()) ) {
-		DisplayError(GS(MSG_UNKNOWN_MEM_ACTION));
-		ExitThread(0);
-	}*/
-
-	if (Section->Jump.TargetPC < Section->Cont.TargetPC) {
-		TargetSection[0] = (BLOCK_SECTION **)&Section->JumpSection;
-		TargetSection[1] = (BLOCK_SECTION **)&Section->ContinueSection;
-		TargetPC[0] = &Section->Jump.TargetPC;
-		TargetPC[1] = &Section->Cont.TargetPC;
-	} else {
-		TargetSection[0] = (BLOCK_SECTION **)&Section->ContinueSection;
-		TargetSection[1] = (BLOCK_SECTION **)&Section->JumpSection;
-		TargetPC[0] = &Section->Cont.TargetPC;
-		TargetPC[1] = &Section->Jump.TargetPC;
-	}
-
-	for (count = 0; count < 2; count ++) {
-		if (*TargetPC[count] != (uint32_t)-1 && *TargetSection[count] == NULL) {
-			*TargetSection[count] = ExistingSection(BlockInfo.BlockInfo.ContinueSection,*TargetPC[count],GetNewTestValue());
-			if (*TargetSection[count] == NULL) {
-				*TargetSection[count] = ExistingSection(BlockInfo.BlockInfo.JumpSection,*TargetPC[count],GetNewTestValue());
-			}
-			if (*TargetSection[count] == NULL) {
-				BlockInfo.NoOfSections += 1;
-				*TargetSection[count] = malloc(sizeof(BLOCK_SECTION));
-				InitilzeSection (*TargetSection[count], Section, *TargetPC[count], BlockInfo.NoOfSections);
-				CreateSectionLinkage(*TargetSection[count]);
-			} else {
-				AddParent(*TargetSection[count],Section);
-			}
-		}
-	}
-}
-
-void DetermineLoop(BLOCK_SECTION * Section, uint32_t Test, uint32_t Test2, uint32_t TestID) {
-	if (Section == NULL) { return; }
-	if (Section->SectionID != TestID) {
-		if (Section->Test2 == Test2) {
-			return;
-		}
-		Section->Test2 = Test2;
-		DetermineLoop(Section->ContinueSection,Test,Test2,TestID);
-		DetermineLoop(Section->JumpSection,Test,Test2,TestID);
-		return;
-	}
-	if (Section->Test2 == Test2) {
-		Section->InLoop = 1;
-		return;
-	}
-	Section->Test2 = Test2;
-	DetermineLoop(Section->ContinueSection,Test,Test2,TestID);
-	DetermineLoop(Section->JumpSection,Test,Test2,TestID);
-	if (Section->Test == Test) { return; }
-	Section->Test = Test;
-	if (Section->ContinueSection != NULL) {
-		DetermineLoop(Section->ContinueSection,Test,GetNewTestValue(),((BLOCK_SECTION *)Section->ContinueSection)->SectionID);
-	}
-	if (Section->JumpSection != NULL) {
-		DetermineLoop(Section->JumpSection,Test,GetNewTestValue(),((BLOCK_SECTION *)Section->JumpSection)->SectionID);
-	}
-}
-
-uint32_t DisplaySectionInformation (BLOCK_SECTION * Section, uint32_t ID, uint32_t Test) {
-	return 1;
-}
-
-BLOCK_SECTION * ExistingSection(BLOCK_SECTION * StartSection, uint32_t Addr, uint32_t Test) {
-	BLOCK_SECTION * Section;
-
-	if (StartSection == NULL) { return NULL; }
-	if (StartSection->StartPC == Addr) { return StartSection; }
-	if (StartSection->Test == Test) { return NULL; }
-	StartSection->Test = Test;
-	Section = ExistingSection(StartSection->JumpSection,Addr,Test);
-	if (Section != NULL) { return Section; }
-	Section = ExistingSection(StartSection->ContinueSection,Addr,Test);
-	if (Section != NULL) { return Section; }
-	return NULL;
-}
-
-void FillSectionInfo(BLOCK_SECTION * Section) {
-	OPCODE Command;
-
-	if (Section->CompiledLocation != NULL) { return; }
-	Section->CompilePC = Section->StartPC;
-	memcpy(&Section->RegWorking,&Section->RegStart,sizeof(REG_INFO));
-	NextInstruction = NORMAL;
-	do {
-		if (!r4300i_LW_VAddr(Section->CompilePC, &Command.Hex)) {
-			//DisplayError(GS(MSG_FAIL_LOAD_WORD));
-			StopEmulation();
-		}
-
-		switch (Command.op) {
-		case R4300i_SPECIAL:
-			switch (Command.funct) {
-			case R4300i_SPECIAL_SLL:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && Command.rt == Command.rd) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt)) {
-					MipsRegState(Command.rd) = STATE_CONST_32;
-					MipsRegLo(Command.rd) = MipsRegLo(Command.rt) << Command.sa;
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_SRL:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && Command.rt == Command.rd) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt)) {
-					MipsRegState(Command.rd) = STATE_CONST_32;
-					MipsRegLo(Command.rd) = MipsRegLo(Command.rt) >> Command.sa;
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_SRA:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && Command.rt == Command.rd) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt)) {
-					MipsRegState(Command.rd) = STATE_CONST_32;
-					MipsRegLo(Command.rd) = MipsRegLo_S(Command.rt) >> Command.sa;
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_SLLV:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					MipsRegState(Command.rd) = STATE_CONST_32;
-					MipsRegLo(Command.rd) = MipsRegLo(Command.rt) << (MipsRegLo(Command.rs) & 0x1F);
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_SRLV:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					MipsRegState(Command.rd) = STATE_CONST_32;
-					MipsRegLo(Command.rd) = MipsRegLo(Command.rt) >> (MipsRegLo(Command.rs) & 0x1F);
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_SRAV:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					MipsRegState(Command.rd) = STATE_CONST_32;
-					MipsRegLo(Command.rd) = MipsRegLo_S(Command.rt) >> (MipsRegLo(Command.rs) & 0x1F);
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_JR:
-				if (IsConst(Command.rs)) {
-					Section->Jump.TargetPC = MipsRegLo(Command.rs);
-				} else {
-					Section->Jump.TargetPC = (uint32_t)-1;
-				}
-				NextInstruction = DELAY_SLOT;
-				break;
-			case R4300i_SPECIAL_JALR:
-				MipsRegLo(Opcode.rd) = Section->CompilePC + 8;
-				MipsRegState(Opcode.rd) = STATE_CONST_32;
-				if (IsConst(Command.rs)) {
-					Section->Jump.TargetPC = MipsRegLo(Command.rs);
-				} else {
-					Section->Jump.TargetPC = (uint32_t)-1;
-				}
-				NextInstruction = DELAY_SLOT;
-				break;
-			case R4300i_SPECIAL_BREAK: break;
-			case R4300i_SPECIAL_SYSCALL:
-			//case R4300i_SPECIAL_BREAK:
-				NextInstruction = END_BLOCK;
-				Section->CompilePC -= 4;
-				break;
-			case R4300i_SPECIAL_MFHI: MipsRegState(Command.rd) = STATE_UNKNOWN; break;
-			case R4300i_SPECIAL_MTHI: break;
-			case R4300i_SPECIAL_MFLO: MipsRegState(Command.rd) = STATE_UNKNOWN; break;
-			case R4300i_SPECIAL_MTLO: break;
-			case R4300i_SPECIAL_DSLLV:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					MipsRegState(Command.rd) = STATE_CONST_64;
-					MipsReg(Command.rd) = Is64Bit(Command.rt)?MipsReg(Command.rt):(QWORD)MipsRegLo_S(Command.rt) << (MipsRegLo(Command.rs) & 0x3F);
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_DSRLV:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					MipsRegState(Command.rd) = STATE_CONST_64;
-					MipsReg(Command.rd) = Is64Bit(Command.rt)?MipsReg(Command.rt):(QWORD)MipsRegLo_S(Command.rt) >> (MipsRegLo(Command.rs) & 0x3F);
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_DSRAV:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					MipsRegState(Command.rd) = STATE_CONST_64;
-					MipsReg(Command.rd) = Is64Bit(Command.rt)?MipsReg_S(Command.rt):(int64_t)MipsRegLo_S(Command.rt) >> (MipsRegLo(Command.rs) & 0x3F);
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_MULT: break;
-			case R4300i_SPECIAL_MULTU: break;
-			case R4300i_SPECIAL_DIV: break;
-			case R4300i_SPECIAL_DIVU: break;
-			case R4300i_SPECIAL_DMULT: break;
-			case R4300i_SPECIAL_DMULTU: break;
-			case R4300i_SPECIAL_DDIV: break;
-			case R4300i_SPECIAL_DDIVU: break;
-			case R4300i_SPECIAL_ADD:
-			case R4300i_SPECIAL_ADDU:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					MipsRegLo(Command.rd) = MipsRegLo(Command.rs) + MipsRegLo(Command.rt);
-					MipsRegState(Command.rd) = STATE_CONST_32;
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_SUB:
-			case R4300i_SPECIAL_SUBU:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					MipsRegLo(Command.rd) = MipsRegLo(Command.rs) - MipsRegLo(Command.rt);
-					MipsRegState(Command.rd) = STATE_CONST_32;
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_AND:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					if (Is64Bit(Command.rt) && Is64Bit(Command.rs)) {
-						MipsReg(Command.rd) = MipsReg(Command.rt) & MipsReg(Command.rs);
-						MipsRegState(Command.rd) = STATE_CONST_64;
-					} else if (Is64Bit(Command.rt) || Is64Bit(Command.rs)) {
-						if (Is64Bit(Command.rt)) {
-							MipsReg(Command.rd) = MipsReg(Command.rt) & MipsRegLo(Command.rs);
-						} else {
-							MipsReg(Command.rd) = MipsRegLo(Command.rt) & MipsReg(Command.rs);
-						}
-						MipsRegState(Command.rd) = ConstantsType(MipsReg(Command.rd));
-					} else {
-						MipsRegLo(Command.rd) = MipsRegLo(Command.rt) & MipsRegLo(Command.rs);
-						MipsRegState(Command.rd) = STATE_CONST_32;
-					}
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_OR:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					if (Is64Bit(Command.rt) && Is64Bit(Command.rs)) {
-						MipsReg(Command.rd) = MipsReg(Command.rt) | MipsReg(Command.rs);
-						MipsRegState(Command.rd) = STATE_CONST_64;
-					} else if (Is64Bit(Command.rt) || Is64Bit(Command.rs)) {
-						if (Is64Bit(Command.rt)) {
-							MipsReg(Command.rd) = MipsReg(Command.rt) | MipsRegLo(Command.rs);
-						} else {
-							MipsReg(Command.rd) = MipsRegLo(Command.rt) | MipsReg(Command.rs);
-						}
-						MipsRegState(Command.rd) = STATE_CONST_64;
-					} else {
-						MipsRegLo(Command.rd) = MipsRegLo(Command.rt) | MipsRegLo(Command.rs);
-						MipsRegState(Command.rd) = STATE_CONST_32;
-					}
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_XOR:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					if (Is64Bit(Command.rt) && Is64Bit(Command.rs)) {
-						MipsReg(Command.rd) = MipsReg(Command.rt) ^ MipsReg(Command.rs);
-						MipsRegState(Command.rd) = STATE_CONST_64;
-					} else if (Is64Bit(Command.rt) || Is64Bit(Command.rs)) {
-						if (Is64Bit(Command.rt)) {
-							MipsReg(Command.rd) = MipsReg(Command.rt) ^ MipsRegLo(Command.rs);
-						} else {
-							MipsReg(Command.rd) = MipsRegLo(Command.rt) ^ MipsReg(Command.rs);
-						}
-						MipsRegState(Command.rd) = STATE_CONST_64;
-					} else {
-						MipsRegLo(Command.rd) = MipsRegLo(Command.rt) ^ MipsRegLo(Command.rs);
-						MipsRegState(Command.rd) = STATE_CONST_32;
-					}
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_NOR:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					if (Is64Bit(Command.rt) && Is64Bit(Command.rs)) {
-						MipsReg(Command.rd) = ~(MipsReg(Command.rt) | MipsReg(Command.rs));
-						MipsRegState(Command.rd) = STATE_CONST_64;
-					} else if (Is64Bit(Command.rt) || Is64Bit(Command.rs)) {
-						if (Is64Bit(Command.rt)) {
-							MipsReg(Command.rd) = ~(MipsReg(Command.rt) | MipsRegLo(Command.rs));
-						} else {
-							MipsReg(Command.rd) = ~(MipsRegLo(Command.rt) | MipsReg(Command.rs));
-						}
-						MipsRegState(Command.rd) = STATE_CONST_64;
-					} else {
-						MipsRegLo(Command.rd) = ~(MipsRegLo(Command.rt) | MipsRegLo(Command.rs));
-						MipsRegState(Command.rd) = STATE_CONST_32;
-					}
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_SLT:
-				if (Command.rd == 0) { break; }
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					if (Is64Bit(Command.rt) || Is64Bit(Command.rs)) {
-						if (Is64Bit(Command.rt)) {
-							MipsRegLo(Command.rd) = (MipsRegLo_S(Command.rs) < MipsReg_S(Command.rt))?1:0;
-						} else {
-							MipsRegLo(Command.rd) = (MipsReg_S(Command.rs) < MipsRegLo_S(Command.rt))?1:0;
-						}
-					} else {
-						MipsRegLo(Command.rd) = (MipsRegLo_S(Command.rs) < MipsRegLo_S(Command.rt))?1:0;
-					}
-					MipsRegState(Command.rd) = STATE_CONST_32;
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_SLTU:
-				if (Command.rd == 0) { break; }
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					if (Is64Bit(Command.rt) || Is64Bit(Command.rs)) {
-						if (Is64Bit(Command.rt)) {
-							MipsRegLo(Command.rd) = (MipsRegLo(Command.rs) < MipsReg(Command.rt))?1:0;
-						} else {
-							MipsRegLo(Command.rd) = (MipsReg(Command.rs) < MipsRegLo(Command.rt))?1:0;
-						}
-					} else {
-						MipsRegLo(Command.rd) = (MipsRegLo(Command.rs) < MipsRegLo(Command.rt))?1:0;
-					}
-					MipsRegState(Command.rd) = STATE_CONST_32;
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_DADD:
-			case R4300i_SPECIAL_DADDU:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					MipsReg(Command.rd) =
-						Is64Bit(Command.rs)?MipsReg(Command.rs):(int64_t)MipsRegLo_S(Command.rs) +
-						Is64Bit(Command.rt)?MipsReg(Command.rt):(int64_t)MipsRegLo_S(Command.rt);
-					MipsRegState(Command.rd) = STATE_CONST_64;
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_DSUB:
-			case R4300i_SPECIAL_DSUBU:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && (Command.rt == Command.rd || Command.rs == Command.rd)) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt) && IsConst(Command.rs)) {
-					MipsReg(Command.rd) =
-						Is64Bit(Command.rs)?MipsReg(Command.rs):(int64_t)MipsRegLo_S(Command.rs) -
-						Is64Bit(Command.rt)?MipsReg(Command.rt):(int64_t)MipsRegLo_S(Command.rt);
-					MipsRegState(Command.rd) = STATE_CONST_64;
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_DSLL:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && Command.rt == Command.rd) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt)) {
-					MipsRegState(Command.rd) = STATE_CONST_64;
-					MipsReg(Command.rd) = Is64Bit(Command.rt)?MipsReg(Command.rt):(int64_t)MipsRegLo_S(Command.rt) << Command.sa;
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_DSRL:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && Command.rt == Command.rd) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt)) {
-					MipsRegState(Command.rd) = STATE_CONST_64;
-					MipsReg(Command.rd) = Is64Bit(Command.rt)?MipsReg(Command.rt):(QWORD)MipsRegLo_S(Command.rt) >> Command.sa;
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_DSRA:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && Command.rt == Command.rd) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt)) {
-					MipsRegState(Command.rd) = STATE_CONST_64;
-					MipsReg_S(Command.rd) = Is64Bit(Command.rt)?MipsReg_S(Command.rt):(int64_t)MipsRegLo_S(Command.rt) >> Command.sa;
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_DSLL32:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && Command.rt == Command.rd) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt)) {
-					MipsRegState(Command.rd) = STATE_CONST_64;
-					MipsReg(Command.rd) = MipsRegLo(Command.rt) << (Command.sa + 32);
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_DSRL32:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && Command.rt == Command.rd) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt)) {
-					MipsRegState(Command.rd) = STATE_CONST_32;
-					MipsRegLo(Command.rd) = (uint32_t)(MipsReg(Command.rt) >> (Command.sa + 32));
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			case R4300i_SPECIAL_DSRA32:
-				if (Command.rd == 0) { break; }
-				if (Section->InLoop && Command.rt == Command.rd) {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				if (IsConst(Command.rt)) {
-					MipsRegState(Command.rd) = STATE_CONST_32;
-					MipsRegLo(Command.rd) = (uint32_t)(MipsReg_S(Command.rt) >> (Command.sa + 32));
-				} else {
-					MipsRegState(Command.rd) = STATE_UNKNOWN;
-				}
-				break;
-			default:
-				NextInstruction = END_BLOCK;
-				Section->CompilePC -= 4;
-			}
-			break;
-		case R4300i_REGIMM:
-			switch (Command.rt) {
-			case R4300i_REGIMM_BLTZ:
-			case R4300i_REGIMM_BGEZ:
-				NextInstruction = DELAY_SLOT;
-				Section->Cont.TargetPC = Section->CompilePC + 8;
-				Section->Jump.TargetPC = Section->CompilePC + ((short)Command.offset << 2) + 4;
-				if (Section->CompilePC == Section->Jump.TargetPC) {
-					if (!DelaySlotEffectsCompare(Section->CompilePC,Command.rs,0)) {
-						Section->Jump.PermLoop = 1;
-					}
-				}
-				break;
-			case R4300i_REGIMM_BLTZL:
-			case R4300i_REGIMM_BGEZL:
-				NextInstruction = LIKELY_DELAY_SLOT;
-				Section->Cont.TargetPC = Section->CompilePC + 8;
-				Section->Jump.TargetPC = Section->CompilePC + ((short)Command.offset << 2) + 4;
-				if (Section->CompilePC == Section->Jump.TargetPC) {
-					if (!DelaySlotEffectsCompare(Section->CompilePC,Command.rs,0)) {
-						Section->Jump.PermLoop = 1;
-					}
-				}
-				break;
-			case R4300i_REGIMM_BLTZAL:
-			case R4300i_REGIMM_BGEZAL:
-				NextInstruction = DELAY_SLOT;
-				MipsRegLo(31) = Section->CompilePC + 8;
-				MipsRegState(31) = STATE_CONST_32;
-				Section->Cont.TargetPC = Section->CompilePC + 8;
-				Section->Jump.TargetPC = Section->CompilePC + ((short)Command.offset << 2) + 4;
-				if (Section->CompilePC == Section->Jump.TargetPC) {
-					if (!DelaySlotEffectsCompare(Section->CompilePC,Command.rs,0)) {
-						Section->Jump.PermLoop = 1;
-					}
-				}
-				break;
-			default:
-				NextInstruction = END_BLOCK;
-				Section->CompilePC -= 4;
-			}
-			break;
-		case R4300i_JAL:
-			NextInstruction = DELAY_SLOT;
-			MipsRegLo(31) = Section->CompilePC + 8;
-			MipsRegState(31) = STATE_CONST_32;
-			Section->Jump.TargetPC = (Section->CompilePC & 0xF0000000) + (Command.target << 2);
-			if (Section->CompilePC == Section->Jump.TargetPC) {
-				if (!DelaySlotEffectsCompare(Section->CompilePC,31,0)) {
-					Section->Jump.PermLoop = 1;
-				}
-			}
-			break;
-		case R4300i_J:
-			NextInstruction = DELAY_SLOT;
-			Section->Jump.TargetPC = (Section->CompilePC & 0xF0000000) + (Command.target << 2);
-			if (Section->CompilePC == Section->Jump.TargetPC) { Section->Jump.PermLoop = 1; }
-			break;
-		case R4300i_BEQ:
-		case R4300i_BNE:
-		case R4300i_BLEZ:
-		case R4300i_BGTZ:
-			NextInstruction = DELAY_SLOT;
-			Section->Cont.TargetPC = Section->CompilePC + 8;
-			Section->Jump.TargetPC = Section->CompilePC + ((short)Command.offset << 2) + 4;
-			if (Section->CompilePC == Section->Jump.TargetPC) {
-				if (!DelaySlotEffectsCompare(Section->CompilePC,Command.rs,Command.rt)) {
-					Section->Jump.PermLoop = 1;
-				}
-			}
-			break;
-		case R4300i_ADDI:
-		case R4300i_ADDIU:
-			if (Command.rt == 0) { break; }
-			if (Section->InLoop && Command.rs == Command.rt) {
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-			}
-			if (IsConst(Command.rs)) {
-				MipsRegLo(Command.rt) = MipsRegLo(Command.rs) + (short)Command.immediate;
-				MipsRegState(Command.rt) = STATE_CONST_32;
-			} else {
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-			}
-			break;
-		case R4300i_SLTI:
-			if (Command.rt == 0) { break; }
-			if (IsConst(Command.rs)) {
-				if (Is64Bit(Command.rs)) {
-					MipsRegLo(Command.rt) = (MipsReg_S(Command.rs) < (int64_t)((short)Command.immediate))?1:0;
-				} else {
-					MipsRegLo(Command.rt) = (MipsRegLo_S(Command.rs) < (int)((short)Command.immediate))?1:0;
-				}
-				MipsRegState(Command.rt) = STATE_CONST_32;
-			} else {
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-			}
-			break;
-		case R4300i_SLTIU:
-			if (Command.rt == 0) { break; }
-			if (IsConst(Command.rs)) {
-				if (Is64Bit(Command.rs)) {
-					MipsRegLo(Command.rt) = (MipsReg(Command.rs) < (int64_t)((short)Command.immediate))?1:0;
-				} else {
-					MipsRegLo(Command.rt) = (MipsRegLo(Command.rs) < (uint32_t)((short)Command.immediate))?1:0;
-				}
-				MipsRegState(Command.rt) = STATE_CONST_32;
-			} else {
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-			}
-			break;
-		case R4300i_LUI:
-			if (Command.rt == 0) { break; }
-			MipsRegLo(Command.rt) = ((short)Command.offset << 16);
-			MipsRegState(Command.rt) = STATE_CONST_32;
-			break;
-		case R4300i_ANDI:
-			if (Command.rt == 0) { break; }
-			if (Section->InLoop && Command.rs == Command.rt) {
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-			}
-			if (IsConst(Command.rs)) {
-				MipsRegState(Command.rt) = STATE_CONST_32;
-				MipsRegLo(Command.rt) = MipsRegLo(Command.rs) & Command.immediate;
-			} else {
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-			}
-			break;
-		case R4300i_ORI:
-			if (Command.rt == 0) { break; }
-			if (Section->InLoop && Command.rs == Command.rt) {
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-			}
-			if (IsConst(Command.rs)) {
-				MipsRegState(Command.rt) = STATE_CONST_32;
-				MipsRegLo(Command.rt) = MipsRegLo(Command.rs) | Command.immediate;
-			} else {
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-			}
-			break;
-		case R4300i_XORI:
-			if (Command.rt == 0) { break; }
-			if (Section->InLoop && Command.rs == Command.rt) {
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-			}
-			if (IsConst(Command.rs)) {
-				MipsRegState(Command.rt) = STATE_CONST_32;
-				MipsRegLo(Command.rt) = MipsRegLo(Command.rs) ^ Command.immediate;
-			} else {
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-			}
-			break;
-		case R4300i_CP0:
-			switch (Command.rs) {
-			case R4300i_COP0_MF:
-				if (Command.rt == 0) { break; }
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-				break;
-			case R4300i_COP0_MT: break;
-			default:
-				if ( (Command.rs & 0x10 ) != 0 ) {
-					switch( Command.funct ) {
-					case R4300i_COP0_CO_TLBR: break;
-					case R4300i_COP0_CO_TLBWI: break;
-					case R4300i_COP0_CO_TLBWR: break;
-					case R4300i_COP0_CO_TLBP: break;
-					case R4300i_COP0_CO_ERET: NextInstruction = END_BLOCK; break;
-					default:
-						NextInstruction = END_BLOCK;
-						Section->CompilePC -= 4;
-					}
-				} else {
-					NextInstruction = END_BLOCK;
-					Section->CompilePC -= 4;
-				}
-			}
-			break;
-		case R4300i_CP1:
-			switch (Command.fmt) {
-			case R4300i_COP1_CF:
-			case R4300i_COP1_MF:
-			case R4300i_COP1_DMF:
-				if (Command.rt == 0) { break; }
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-				break;
-			case R4300i_COP1_BC:
-				switch (Command.ft) {
-				case R4300i_COP1_BC_BCF:
-				case R4300i_COP1_BC_BCT:
-				case R4300i_COP1_BC_BCFL:
-				case R4300i_COP1_BC_BCTL:
-					NextInstruction = DELAY_SLOT;
-					Section->Cont.TargetPC = Section->CompilePC + 8;
-					Section->Jump.TargetPC = Section->CompilePC + ((short)Command.offset << 2) + 4;
-					if (Section->CompilePC == Section->Jump.TargetPC) {
-						int EffectDelaySlot;
-						OPCODE NewCommand;
-
-						if (!r4300i_LW_VAddr(Section->CompilePC + 4, &NewCommand.Hex)) {
-							//DisplayError(GS(MSG_FAIL_LOAD_WORD));
-							//ExitThread(0);
-							StopEmulation();
-						}
-
-						EffectDelaySlot = 0;
-						if (NewCommand.op == R4300i_CP1) {
-							if (NewCommand.fmt == R4300i_COP1_S && (NewCommand.funct & 0x30) == 0x30 ) {
-								EffectDelaySlot = 1;
-							}
-							if (NewCommand.fmt == R4300i_COP1_D && (NewCommand.funct & 0x30) == 0x30 ) {
-								EffectDelaySlot = 1;
-							}
-						}
-						if (!EffectDelaySlot) {
-							Section->Jump.PermLoop = 1;
-						}
-					}
-					break;
-				}
-				break;
-			case R4300i_COP1_MT: break;
-			case R4300i_COP1_DMT: break;
-			case R4300i_COP1_CT: break;
-			case R4300i_COP1_S: break;
-			case R4300i_COP1_D: break;
-			case R4300i_COP1_W: break;
-			case R4300i_COP1_L: break;
-			default:
-				NextInstruction = END_BLOCK;
-				Section->CompilePC -= 4;
-			}
-			break;
-		case R4300i_BEQL:
-		case R4300i_BNEL:
-		case R4300i_BLEZL:
-		case R4300i_BGTZL:
-			NextInstruction = LIKELY_DELAY_SLOT;
-			Section->Cont.TargetPC = Section->CompilePC + 8;
-			Section->Jump.TargetPC = Section->CompilePC + ((short)Command.offset << 2) + 4;
-			if (Section->CompilePC == Section->Jump.TargetPC) {
-				if (!DelaySlotEffectsCompare(Section->CompilePC,Command.rs,Command.rt)) {
-					Section->Jump.PermLoop = 1;
-				}
-			}
-			break;
-		case R4300i_DADDI:
-		case R4300i_DADDIU:
-			if (Command.rt == 0) { break; }
-			if (Section->InLoop && Command.rs == Command.rt) {
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-			}
-			if (IsConst(Command.rs)) {
-				if (Is64Bit(Command.rs)) {
-					int imm32 = (short)Opcode.immediate;
-					int64_t imm64 = imm32;
-					MipsReg_S(Command.rt) = MipsRegLo_S(Command.rs) + imm64;
-				} else {
-					MipsReg_S(Command.rt) = MipsRegLo_S(Command.rs) + (short)Command.immediate;
-				}
-				MipsRegState(Command.rt) = STATE_CONST_64;
-			} else {
-				MipsRegState(Command.rt) = STATE_UNKNOWN;
-			}
-			break;
-		case R4300i_LDR:
-		case R4300i_LDL:
-		case R4300i_LB:
-		case R4300i_LH:
-		case R4300i_LWL:
-		case R4300i_LW:
-		case R4300i_LWU:
-		case R4300i_LL:
-		case R4300i_LBU:
-		case R4300i_LHU:
-		case R4300i_LWR:
-		case R4300i_SC:
-			if (Command.rt == 0) { break; }
-			MipsRegState(Command.rt) = STATE_UNKNOWN;
-			break;
-		case R4300i_SB: break;
-		case R4300i_SH: break;
-		case R4300i_SWL: break;
-		case R4300i_SW: break;
-		case R4300i_SWR: break;
-		case R4300i_SDL: break;
-		case R4300i_SDR: break;
-		case R4300i_CACHE: break;
-		case R4300i_LWC1: break;
-		case R4300i_SWC1: break;
-		case R4300i_LDC1: break;
-		case R4300i_LD:
-			if (Command.rt == 0) { break; }
-			MipsRegState(Command.rt) = STATE_UNKNOWN;
-			break;
-		case R4300i_SDC1: break;
-		case R4300i_SD: break;
-		default:
-			NextInstruction = END_BLOCK;
-			Section->CompilePC -= 4;
-			if (Command.Hex == 0x7C1C97C0) { break; }
-			if (Command.Hex == 0x7FFFFFFF) { break; }
-			if (Command.Hex == 0xF1F3F5F7) { break; }
-			if (Command.Hex == 0xC1200000) { break; }
-			if (Command.Hex == 0x4C5A5353) { break; }
-		}
-
-		switch (NextInstruction) {
-		case NORMAL:
-			Section->CompilePC += 4;
-			break;
-		case DELAY_SLOT:
-			NextInstruction = DELAY_SLOT_DONE;
-			Section->CompilePC += 4;
-			break;
-		case LIKELY_DELAY_SLOT:
-			memcpy(&Section->Cont.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-			NextInstruction = LIKELY_DELAY_SLOT_DONE;
-			Section->CompilePC += 4;
-			break;
-		case DELAY_SLOT_DONE:
-			memcpy(&Section->Cont.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-			memcpy(&Section->Jump.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-			NextInstruction = END_BLOCK;
-			break;
-		case LIKELY_DELAY_SLOT_DONE:
-			memcpy(&Section->Jump.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-			NextInstruction = END_BLOCK;
-			break;
-		}
-		if ((Section->CompilePC & 0xFFFFF000) != (Section->StartPC & 0xFFFFF000)) {
-			if (NextInstruction != END_BLOCK && NextInstruction != NORMAL) {
-			//	DisplayError("Branch running over delay slot ???\nNextInstruction == %d",NextInstruction);
-				Section->Cont.TargetPC = (uint32_t)-1;
-				Section->Jump.TargetPC = (uint32_t)-1;
-			}
-			NextInstruction = END_BLOCK;
-			Section->CompilePC -= 4;
-		}
-	} while (NextInstruction != END_BLOCK);
-
-	if (Section->Cont.TargetPC != (uint32_t)-1) {
-		if ((Section->Cont.TargetPC & 0xFFFFF000) != (Section->StartPC & 0xFFFFF000)) {
-			Section->Cont.TargetPC = (uint32_t)-1;
-		}
-	}
-	if (Section->Jump.TargetPC != (uint32_t)-1) {
-		if ((Section->Jump.TargetPC & 0xFFFFF000) != (Section->StartPC & 0xFFFFF000)) {
-			Section->Jump.TargetPC = (uint32_t)-1;
-		}
-	}
-}
-
-void FixConstants (BLOCK_SECTION * Section, uint32_t Test, int * Changed) {
-	BLOCK_SECTION * Parent;
-	int count, NoOfParents;
-	REG_INFO Original[2];
-
-	if (Section == NULL) { return; }
-	if (Section->Test == Test) { return; }
-	Section->Test = Test;
-
-	InheritConstants(Section);
-
-	memcpy(&Original[0],&Section->Cont.RegSet,sizeof(REG_INFO));
-	memcpy(&Original[1],&Section->Jump.RegSet,sizeof(REG_INFO));
-
-	if (Section->ParentSection) {
-		for (NoOfParents = 0;Section->ParentSection[NoOfParents] != NULL;NoOfParents++) {
-			Parent = Section->ParentSection[NoOfParents];
-			if (Parent->ContinueSection == Section) {
-				for (count = 0; count < 32; count++) {
-					if (Section->RegStart.MIPS_RegState[count] != Parent->Cont.RegSet.MIPS_RegState[count]) {
-						Section->RegStart.MIPS_RegState[count] = STATE_UNKNOWN;
-						//*Changed = 1;
-					}
-					Section->RegStart.MIPS_RegState[count] = STATE_UNKNOWN;
-				}
-			}
-			if (Parent->JumpSection == Section) {
-				for (count = 0; count < 32; count++) {
-					if (Section->RegStart.MIPS_RegState[count] != Parent->Jump.RegSet.MIPS_RegState[count]) {
-						Section->RegStart.MIPS_RegState[count] = STATE_UNKNOWN;
-						//*Changed = 1;
-					}
-				}
-			}
-			memcpy(&Section->RegWorking,&Section->RegStart,sizeof(REG_INFO));
-		}
-	}
-	FillSectionInfo(Section);
-	if (memcmp(&Original[0],&Section->Cont.RegSet,sizeof(REG_INFO)) != 0) { *Changed = 1; }
-	if (memcmp(&Original[1],&Section->Jump.RegSet,sizeof(REG_INFO)) != 0) { *Changed = 1; }
-
-	if (Section->JumpSection) { FixConstants(Section->JumpSection,Test,Changed); }
-	if (Section->ContinueSection) { FixConstants(Section->ContinueSection,Test,Changed); }
-}
-
-void FixRandomReg (void) {
-//	while ((int)Registers.CP0[1] < (int)Registers.CP0[6]) {
-//		Registers.CP0[1] += 32 - Registers.CP0[6];
-//	}
-}
-
-void FreeSection (BLOCK_SECTION * Section, BLOCK_SECTION * Parent) {
-	if (Section == NULL) { return; }
-
-	if (Section->ParentSection) {
-		int NoOfParents, count;
-
-		for (NoOfParents = 0;Section->ParentSection[NoOfParents] != NULL;NoOfParents++);
-
-		for (count = 0; count < NoOfParents; count++) {
-			if (Section->ParentSection[count] == Parent) {
-				if (NoOfParents == 1) {
-					free(Section->ParentSection);
-					Section->ParentSection = NULL;
-				} else {
-					memmove(&Section->ParentSection[count],&Section->ParentSection[count + 1],
-						sizeof(void*) * (NoOfParents - count));
-					Section->ParentSection = realloc(Section->ParentSection,NoOfParents*sizeof(void *));
-				}
-				NoOfParents -= 1;
-			}
-		}
-
-		if (Parent->JumpSection == Section) { Parent->JumpSection = NULL; }
-		if (Parent->ContinueSection == Section) { Parent->ContinueSection = NULL; }
-
-		if (Section->ParentSection) {
-			for (count = 0; count < NoOfParents; count++) {
-				if (!IsAllParentLoops(Section,Section->ParentSection[count],0,GetNewTestValue())) { return; }
-			}
-			for (count = 0; count < NoOfParents; count++) {
-				Parent = Section->ParentSection[count];
-				if (Parent->JumpSection == Section) { Parent->JumpSection = NULL; }
-				if (Parent->ContinueSection == Section) { Parent->ContinueSection = NULL; }
-			}
-			free(Section->ParentSection);
-			Section->ParentSection = NULL;
-		}
-	}
-	if (Section->ParentSection == NULL) {
-		FreeSection(Section->JumpSection,Section);
-		FreeSection(Section->ContinueSection,Section);
-		Section->JumpSection = NULL;
-		Section->ContinueSection = NULL;
-		free(Section);
-		Section = 0;
-	}
-}
-
-void GenerateBasicSectionLinkage (BLOCK_SECTION * Section) {
-	//_asm int 3
-}
-
-void GenerateSectionLinkage (BLOCK_SECTION * Section) {
-	BLOCK_SECTION * TargetSection[2], *Parent;
-	JUMP_INFO * JumpInfo[2];
-	uint8_t * Jump;
-	int count;
-
-	TargetSection[0] = Section->ContinueSection;
-	TargetSection[1] = Section->JumpSection;
-	JumpInfo[0] = &Section->Cont;
-	JumpInfo[1] = &Section->Jump;
-
-	for (count = 0; count < 2; count ++) {
-		if (JumpInfo[count]->LinkLocation == NULL && JumpInfo[count]->FallThrough == 0) {
-			JumpInfo[count]->TargetPC = -1;
-		}
-	}
-	if ((Section->CompilePC & 0xFFC) == 0xFFC) {
-		//Handle Fall througth
-		Jump = NULL;
-		for (count = 0; count < 2; count ++) {
-			if (!JumpInfo[count]->FallThrough) { continue; }
-			JumpInfo[count]->FallThrough = 0;
-			if (JumpInfo[count]->LinkLocation != NULL) {
-				SetJump32(JumpInfo[count]->LinkLocation,RecompPos);
-				JumpInfo[count]->LinkLocation = NULL;
-				if (JumpInfo[count]->LinkLocation2 != NULL) {
-					SetJump32(JumpInfo[count]->LinkLocation2,RecompPos);
-					JumpInfo[count]->LinkLocation2 = NULL;
-				}
-			}
-			MoveConstToVariable(JumpInfo[count]->TargetPC,&JumpToLocation);
-			if (JumpInfo[(count + 1) & 1]->LinkLocation == NULL) { break; }
-			JmpLabel8(0);
-			Jump = RecompPos - 1;
-		}
-		for (count = 0; count < 2; count ++) {
-			if (JumpInfo[count]->LinkLocation == NULL) { continue; }
-			JumpInfo[count]->FallThrough = 0;
-			if (JumpInfo[count]->LinkLocation != NULL) {
-				SetJump32(JumpInfo[count]->LinkLocation,RecompPos);
-				JumpInfo[count]->LinkLocation = NULL;
-				if (JumpInfo[count]->LinkLocation2 != NULL) {
-					SetJump32(JumpInfo[count]->LinkLocation2,RecompPos);
-					JumpInfo[count]->LinkLocation2 = NULL;
-				}
-			}
-			MoveConstToVariable(JumpInfo[count]->TargetPC,&JumpToLocation);
-			if (JumpInfo[(count + 1) & 1]->LinkLocation == NULL) { break; }
-			JmpLabel8(0);
-			Jump = RecompPos - 1;
-		}
-		if (Jump != NULL) {
-			SetJump8(Jump,RecompPos);
-		}
-		MoveConstToVariable(Section->CompilePC + 4,&PROGRAM_COUNTER);
-		if (BlockCycleCount != 0) {
-			AddConstToVariable(BlockCycleCount,&CP0[9]);
-			SubConstFromVariable(BlockCycleCount,&Timers->Timer);
-		}
-		if (BlockRandomModifier != 0) { SubConstFromVariable(BlockRandomModifier,&CP0[1]); }
-		WriteBackRegisters(Section);
-		MoveConstToVariable(DELAY_SLOT,&NextInstruction);
-		Ret();
-		return;
-	}
-
-	if (TargetSection[0] != TargetSection[1] || TargetSection[0] == NULL) {
-		for (count = 0; count < 2; count ++) {
-			if (JumpInfo[count]->LinkLocation == NULL && JumpInfo[count]->FallThrough == 0) {
-				FreeSection(TargetSection[count],Section);
-			} else if (TargetSection[count] == NULL && JumpInfo[count]->FallThrough) {
-				if (JumpInfo[count]->LinkLocation != NULL) {
-					SetJump32(JumpInfo[count]->LinkLocation,RecompPos);
-					JumpInfo[count]->LinkLocation = NULL;
-					if (JumpInfo[count]->LinkLocation2 != NULL) {
-						SetJump32(JumpInfo[count]->LinkLocation2,RecompPos);
-						JumpInfo[count]->LinkLocation2 = NULL;
-					}
-				}
-				if (JumpInfo[count]->TargetPC > (Section->CompilePC + 4)) {
-					CompileExit (JumpInfo[count]->TargetPC,&JumpInfo[count]->RegSet,Normal,1,NULL);
-				} else {
-					CompileExit (JumpInfo[count]->TargetPC,&JumpInfo[count]->RegSet,Normal,1,NULL);
-				}
-				JumpInfo[count]->FallThrough = 0;
-			} else if (TargetSection[count] != NULL && JumpInfo[count] != NULL) {
-				if (!JumpInfo[count]->FallThrough) { continue; }
-				if (JumpInfo[count]->TargetPC == TargetSection[count]->StartPC) { continue; }
-				if (JumpInfo[count]->LinkLocation != NULL) {
-					SetJump32(JumpInfo[count]->LinkLocation,RecompPos);
-					JumpInfo[count]->LinkLocation = NULL;
-					if (JumpInfo[count]->LinkLocation2 != NULL) {
-						SetJump32(JumpInfo[count]->LinkLocation2,RecompPos);
-						JumpInfo[count]->LinkLocation2 = NULL;
-					}
-				}
-				CompileExit (JumpInfo[count]->TargetPC,&JumpInfo[count]->RegSet,Normal,1,NULL);
-				FreeSection(TargetSection[count],Section);
-			}
-		}
-	} else {
-		if (Section->Cont.LinkLocation == NULL && Section->Cont.FallThrough == 0) { Section->ContinueSection = NULL; }
-		if (Section->Jump.LinkLocation == NULL && Section->Jump.FallThrough == 0) { Section->JumpSection = NULL; }
-		if (Section->JumpSection == NULL && Section->ContinueSection == NULL) {
-			FreeSection(TargetSection[0],Section);
-		}
-	}
-
-	TargetSection[0] = Section->ContinueSection;
-	TargetSection[1] = Section->JumpSection;
-
-	for (count = 0; count < 2; count ++) {
-		if (TargetSection[count] == NULL) { continue; }
-		if (!JumpInfo[count]->FallThrough) { continue; }
-
-		if (TargetSection[count]->CompiledLocation != NULL) {
-			//char Label[100];
-			JumpInfo[count]->FallThrough = 0;
-			if (JumpInfo[count]->LinkLocation != NULL) {
-				SetJump32(JumpInfo[count]->LinkLocation,RecompPos);
-				JumpInfo[count]->LinkLocation = NULL;
-				if (JumpInfo[count]->LinkLocation2 != NULL) {
-					SetJump32(JumpInfo[count]->LinkLocation2,RecompPos);
-					JumpInfo[count]->LinkLocation2 = NULL;
-				}
-			}
-			if (JumpInfo[count]->RegSet.RandomModifier != 0) {
-				SubConstFromVariable(JumpInfo[count]->RegSet.RandomModifier,&CP0[1]);
-				JumpInfo[count]->RegSet.RandomModifier = 0;
-			}
-			if (JumpInfo[count]->RegSet.CycleCount != 0) {
-				AddConstToVariable(JumpInfo[count]->RegSet.CycleCount,&CP0[9]);
-			}
-			if (JumpInfo[count]->TargetPC <= Section->CompilePC) {
-				uint32_t CycleCount = JumpInfo[count]->RegSet.CycleCount;
-				JumpInfo[count]->RegSet.CycleCount = 0;
-
-				if (JumpInfo[count]->PermLoop) {
-					MoveConstToVariable(JumpInfo[count]->TargetPC,&PROGRAM_COUNTER);
-					Pushad();
-					Call_Direct(InPermLoop);
-					Popad();
-					CompileSystemCheck(0,-1,JumpInfo[count]->RegSet);
-				} else {
-					CompileSystemCheck(CycleCount,JumpInfo[count]->TargetPC,JumpInfo[count]->RegSet);
-				}
-			} else {
-				if (JumpInfo[count]->RegSet.CycleCount != 0) {
-					SubConstFromVariable(JumpInfo[count]->RegSet.CycleCount,&Timers->Timer);
-					JumpInfo[count]->RegSet.CycleCount = 0;
-				}
-			}
-			memcpy(&Section->RegWorking, &JumpInfo[count]->RegSet,sizeof(REG_INFO));
-			SyncRegState(Section,&TargetSection[count]->RegStart);
-			JmpLabel32(0);
-			SetJump32((uint32_t *)RecompPos - 1,TargetSection[count]->CompiledLocation);
-		}
-	}
-	//Section->CycleCount = 0;
-	//Section->RandomModifier = 0;
-
-	for (count = 0; count < 2; count ++) {
-		int count2;
-
-		if (TargetSection[count] == NULL) { continue; }
-		if (TargetSection[count]->ParentSection == NULL) { continue; }
-
-		for (count2 = 0;TargetSection[count]->ParentSection[count2] != NULL;count2++) {
-			Parent = TargetSection[count]->ParentSection[count2];
-			if (Parent->CompiledLocation != NULL) { continue; }
-			if (JumpInfo[count]->FallThrough) {
-				JumpInfo[count]->FallThrough = 0;
-				//JmpLabel32(JumpInfo[count]->BranchLabel,0);
-				JmpLabel32(0);
-				JumpInfo[count]->LinkLocation = RecompPos - 4;
-			}
-		}
-	}
-
-	for (count = 0; count < 2; count ++) {
-		if (JumpInfo[count]->FallThrough) {
-			if (JumpInfo[count]->TargetPC < Section->CompilePC) {
-				uint32_t CycleCount = JumpInfo[count]->RegSet.CycleCount;;
-
-				if (JumpInfo[count]->RegSet.RandomModifier != 0) {
-					SubConstFromVariable(JumpInfo[count]->RegSet.RandomModifier,&CP0[1]);
-					JumpInfo[count]->RegSet.RandomModifier = 0;
-				}
-				if (JumpInfo[count]->RegSet.CycleCount != 0) {
-					AddConstToVariable(JumpInfo[count]->RegSet.CycleCount,&CP0[9]);
-				}
-				JumpInfo[count]->RegSet.CycleCount = 0;
-
-				CompileSystemCheck(CycleCount,JumpInfo[count]->TargetPC,JumpInfo[count]->RegSet);
-			}
-		}
-	}
-
-	for (count = 0; count < 2; count ++) {
-		if (JumpInfo[count]->FallThrough) {
-			GenerateX86Code(TargetSection[count],GetNewTestValue());
-		}
-	}
-
-	for (count = 0; count < 2; count ++) {
-		if (JumpInfo[count]->LinkLocation == NULL) { continue; }
-		if (TargetSection[count] == NULL) {
-			SetJump32(JumpInfo[count]->LinkLocation,RecompPos);
-			JumpInfo[count]->LinkLocation = NULL;
-			if (JumpInfo[count]->LinkLocation2 != NULL) {
-				SetJump32(JumpInfo[count]->LinkLocation2,RecompPos);
-				JumpInfo[count]->LinkLocation2 = NULL;
-			}
-			CompileExit (JumpInfo[count]->TargetPC,&JumpInfo[count]->RegSet,Normal,1,NULL);
-			continue;
-		}
-		if (JumpInfo[count]->TargetPC != TargetSection[count]->StartPC) {
-			//DisplayError("I need to add more code in GenerateSectionLinkage cause this is going to cause an exception");
-			//_asm int 3
-		}
-		if (TargetSection[count]->CompiledLocation == NULL) {
-			GenerateX86Code(TargetSection[count],GetNewTestValue());
-		} else {
-			//char Label[100];
-
-			SetJump32(JumpInfo[count]->LinkLocation,RecompPos);
-			JumpInfo[count]->LinkLocation = NULL;
-			if (JumpInfo[count]->LinkLocation2 != NULL) {
-				SetJump32(JumpInfo[count]->LinkLocation2,RecompPos);
-				JumpInfo[count]->LinkLocation2 = NULL;
-			}
-			memcpy(&Section->RegWorking,&JumpInfo[count]->RegSet,sizeof(REG_INFO));
-			if (JumpInfo[count]->RegSet.RandomModifier != 0) {
-				SubConstFromVariable(JumpInfo[count]->RegSet.RandomModifier,&CP0[1]);
-				JumpInfo[count]->RegSet.RandomModifier = 0;
-			}
-			if (JumpInfo[count]->RegSet.CycleCount != 0) {
-				AddConstToVariable(JumpInfo[count]->RegSet.CycleCount,&CP0[9]);
-			}
-			if (JumpInfo[count]->TargetPC <= Section->CompilePC) {
-				uint32_t CycleCount = JumpInfo[count]->RegSet.CycleCount;
-				JumpInfo[count]->RegSet.CycleCount = 0;
-
-				if (JumpInfo[count]->PermLoop) {
-					MoveConstToVariable(JumpInfo[count]->TargetPC,&PROGRAM_COUNTER);
-					Pushad();
-					Call_Direct(InPermLoop);
-					Popad();
-					CompileSystemCheck(0,-1,JumpInfo[count]->RegSet);
-				} else {
-					CompileSystemCheck(CycleCount,JumpInfo[count]->TargetPC,JumpInfo[count]->RegSet);
-				}
-			} else {
-				if (JumpInfo[count]->RegSet.CycleCount != 0) {
-					SubConstFromVariable(JumpInfo[count]->RegSet.CycleCount,&Timers->Timer);
-					JumpInfo[count]->RegSet.CycleCount = 0;
-				}
-			}
-			memcpy(&Section->RegWorking, &JumpInfo[count]->RegSet,sizeof(REG_INFO));
-			SyncRegState(Section,&TargetSection[count]->RegStart);
-			//JmpLabel32(Label,0);
-			JmpLabel32(0);
-			SetJump32((uint32_t *)RecompPos - 1,TargetSection[count]->CompiledLocation);
-		}
-	}
-}
-
-
-uint32_t GenerateX86Code (BLOCK_SECTION * Section, uint32_t Test) {
-	int count;
-
-	if (Section == NULL) { return 0; }
-	if (Section->CompiledLocation != NULL) {
-		if (Section->Test == Test) { return 0; }
-		Section->Test = Test;
-		if (GenerateX86Code(Section->ContinueSection,Test)) { return 1; }
-		if (GenerateX86Code(Section->JumpSection,Test)) { return 1; }
-		return 0;
-	}
-	if (Section->ParentSection) {
-		for (count = 0;Section->ParentSection[count] != NULL;count++) {
-			BLOCK_SECTION * Parent;
-
-			Parent = Section->ParentSection[count];
-			if (Parent->CompiledLocation != NULL) { continue; }
-			if (IsAllParentLoops(Section,Parent,1,GetNewTestValue())) { continue; }
-			return 0;
-		}
-	}
-	if (!InheritParentInfo(Section)) { return 0; }
-	Section->CompiledLocation = RecompPos;
-	Section->CompilePC = Section->StartPC;
-	NextInstruction = NORMAL;
-
-#ifdef USEX64
-	MoveConstQwordToX86reg(TLB_Map, x86_R15);
-#endif
-
-	do {
-		//__try {
-			if (!r4300i_LW_VAddr(Section->CompilePC, &Opcode.Hex)) {
-				//DisplayError(GS(MSG_FAIL_LOAD_WORD));
-				//ExitThread(0);
-				StopEmulation();
-			}
-
-		BlockCycleCount += 2;
-
-		BlockRandomModifier += 1;
-
-		for (count = 1; count < 64; count ++) { x86Protected(count) = 0; }
-
-		switch (Opcode.op) {
-		case R4300i_SPECIAL:
-			switch (Opcode.funct) {
-			case R4300i_SPECIAL_SLL: Compile_R4300i_SPECIAL_SLL(Section); break;
-			case R4300i_SPECIAL_SRL: Compile_R4300i_SPECIAL_SRL(Section); break;
-			case R4300i_SPECIAL_SRA: Compile_R4300i_SPECIAL_SRA(Section); break;
-			case R4300i_SPECIAL_SLLV: Compile_R4300i_SPECIAL_SLLV(Section); break;
-			case R4300i_SPECIAL_SRLV: Compile_R4300i_SPECIAL_SRLV(Section); break;
-			case R4300i_SPECIAL_SRAV: Compile_R4300i_SPECIAL_SRAV(Section); break;
-			case R4300i_SPECIAL_JR: Compile_R4300i_SPECIAL_JR(Section); break;
-			case R4300i_SPECIAL_JALR: Compile_R4300i_SPECIAL_JALR(Section); break;
-			case R4300i_SPECIAL_MFLO: Compile_R4300i_SPECIAL_MFLO(Section); break;
-			case R4300i_SPECIAL_SYSCALL: Compile_R4300i_SPECIAL_SYSCALL(Section); break;
-			case R4300i_SPECIAL_BREAK: Compile_R4300i_SPECIAL_BREAK(Section); break;
-			case R4300i_SPECIAL_MTLO: Compile_R4300i_SPECIAL_MTLO(Section); break;
-			case R4300i_SPECIAL_MFHI: Compile_R4300i_SPECIAL_MFHI(Section); break;
-			case R4300i_SPECIAL_MTHI: Compile_R4300i_SPECIAL_MTHI(Section); break;
-			case R4300i_SPECIAL_DSLLV: Compile_R4300i_SPECIAL_DSLLV(Section); break;
-			case R4300i_SPECIAL_DSRLV: Compile_R4300i_SPECIAL_DSRLV(Section); break;
-			case R4300i_SPECIAL_DSRAV: Compile_R4300i_SPECIAL_DSRAV(Section); break;
-			case R4300i_SPECIAL_MULT: Compile_R4300i_SPECIAL_MULT(Section); break;
-			case R4300i_SPECIAL_DIV: Compile_R4300i_SPECIAL_DIV(Section); break;
-			case R4300i_SPECIAL_DIVU: Compile_R4300i_SPECIAL_DIVU(Section); break;
-			case R4300i_SPECIAL_MULTU: Compile_R4300i_SPECIAL_MULTU(Section); break;
-			case R4300i_SPECIAL_DMULT: Compile_R4300i_SPECIAL_DMULT(Section); break;
-			case R4300i_SPECIAL_DMULTU: Compile_R4300i_SPECIAL_DMULTU(Section); break;
-			case R4300i_SPECIAL_DDIV: Compile_R4300i_SPECIAL_DDIV(Section); break;
-			case R4300i_SPECIAL_DDIVU: Compile_R4300i_SPECIAL_DDIVU(Section); break;
-			case R4300i_SPECIAL_ADD: Compile_R4300i_SPECIAL_ADD(Section); break;
-			case R4300i_SPECIAL_ADDU: Compile_R4300i_SPECIAL_ADDU(Section); break;
-			case R4300i_SPECIAL_SUB: Compile_R4300i_SPECIAL_SUB(Section); break;
-			case R4300i_SPECIAL_SUBU: Compile_R4300i_SPECIAL_SUBU(Section); break;
-			case R4300i_SPECIAL_AND: Compile_R4300i_SPECIAL_AND(Section); break;
-			case R4300i_SPECIAL_OR: Compile_R4300i_SPECIAL_OR(Section); break;
-			case R4300i_SPECIAL_XOR: Compile_R4300i_SPECIAL_XOR(Section); break;
-			case R4300i_SPECIAL_NOR: Compile_R4300i_SPECIAL_NOR(Section); break;
-			case R4300i_SPECIAL_SLT: Compile_R4300i_SPECIAL_SLT(Section); break;
-			case R4300i_SPECIAL_SLTU: Compile_R4300i_SPECIAL_SLTU(Section); break;
-			case R4300i_SPECIAL_DADD: Compile_R4300i_SPECIAL_DADD(Section); break;
-			case R4300i_SPECIAL_DADDU: Compile_R4300i_SPECIAL_DADDU(Section); break;
-			case R4300i_SPECIAL_DSUB: Compile_R4300i_SPECIAL_DSUB(Section); break;
-			case R4300i_SPECIAL_DSUBU: Compile_R4300i_SPECIAL_DSUBU(Section); break;
-			case R4300i_SPECIAL_DSLL: Compile_R4300i_SPECIAL_DSLL(Section); break;
-			case R4300i_SPECIAL_DSRL: Compile_R4300i_SPECIAL_DSRL(Section); break;
-			case R4300i_SPECIAL_DSRA: Compile_R4300i_SPECIAL_DSRA(Section); break;
-			case R4300i_SPECIAL_DSLL32: Compile_R4300i_SPECIAL_DSLL32(Section); break;
-			case R4300i_SPECIAL_DSRL32: Compile_R4300i_SPECIAL_DSRL32(Section); break;
-			case R4300i_SPECIAL_DSRA32: Compile_R4300i_SPECIAL_DSRA32(Section); break;
-			default:
-				Compile_R4300i_UnknownOpcode(Section); break;
-			}
-			break;
-		case R4300i_REGIMM:
-			switch (Opcode.rt) {
-			case R4300i_REGIMM_BLTZ:Compile_R4300i_Branch(Section,BLTZ_Compare,BranchTypeRs, 0); break;
-			case R4300i_REGIMM_BGEZ:Compile_R4300i_Branch(Section,BGEZ_Compare,BranchTypeRs, 0); break;
-			case R4300i_REGIMM_BLTZL:Compile_R4300i_BranchLikely(Section,BLTZ_Compare, 0); break;
-			case R4300i_REGIMM_BGEZL:Compile_R4300i_BranchLikely(Section,BGEZ_Compare, 0); break;
-			case R4300i_REGIMM_BLTZAL:Compile_R4300i_Branch(Section,BLTZ_Compare,BranchTypeRs, 1); break;
-			case R4300i_REGIMM_BGEZAL:Compile_R4300i_Branch(Section,BGEZ_Compare,BranchTypeRs, 1); break;
-			default:
-				Compile_R4300i_UnknownOpcode(Section); break;
-			}
-			break;
-		case R4300i_BEQ: Compile_R4300i_Branch(Section,BEQ_Compare,BranchTypeRsRt,0); break;
-		case R4300i_BNE: Compile_R4300i_Branch(Section,BNE_Compare,BranchTypeRsRt,0); break;
-		case R4300i_BGTZ:Compile_R4300i_Branch(Section,BGTZ_Compare,BranchTypeRs,0); break;
-		case R4300i_BLEZ:Compile_R4300i_Branch(Section,BLEZ_Compare,BranchTypeRs,0); break;
-		case R4300i_J: Compile_R4300i_J(Section); break;
-		case R4300i_JAL: Compile_R4300i_JAL(Section); break;
-		case R4300i_ADDI: Compile_R4300i_ADDI(Section); break;
-		case R4300i_ADDIU: Compile_R4300i_ADDIU(Section); break;
-		case R4300i_SLTI: Compile_R4300i_SLTI(Section); break;
-		case R4300i_SLTIU: Compile_R4300i_SLTIU(Section); break;
-		case R4300i_ANDI: Compile_R4300i_ANDI(Section); break;
-		case R4300i_ORI: Compile_R4300i_ORI(Section); break;
-		case R4300i_XORI: Compile_R4300i_XORI(Section); break;
-		case R4300i_LUI: Compile_R4300i_LUI(Section); break;
-		case R4300i_CP0:
-			switch (Opcode.rs) {
-			case R4300i_COP0_MF: Compile_R4300i_COP0_MF(Section); break;
-			case R4300i_COP0_MT: Compile_R4300i_COP0_MT(Section); break;
-			default:
-				if ( (Opcode.rs & 0x10 ) != 0 ) {
-					switch( Opcode.funct ) {
-					case R4300i_COP0_CO_TLBR: Compile_R4300i_COP0_CO_TLBR(Section); break;
-					case R4300i_COP0_CO_TLBWI: Compile_R4300i_COP0_CO_TLBWI(Section); break;
-					case R4300i_COP0_CO_TLBWR: Compile_R4300i_COP0_CO_TLBWR(Section); break;
-					case R4300i_COP0_CO_TLBP: Compile_R4300i_COP0_CO_TLBP(Section); break;
-					case R4300i_COP0_CO_ERET: Compile_R4300i_COP0_CO_ERET(Section); break;
-					default: Compile_R4300i_UnknownOpcode(Section); break;
-					}
-				} else {
-					Compile_R4300i_UnknownOpcode(Section);
-				}
-			}
-			break;
-		case R4300i_CP1:
-			switch (Opcode.rs) {
-			case R4300i_COP1_MF: Compile_R4300i_COP1_MF(Section); break;
-			case R4300i_COP1_DMF: Compile_R4300i_COP1_DMF(Section); break;
-			case R4300i_COP1_CF: Compile_R4300i_COP1_CF(Section); break;
-			case R4300i_COP1_MT: Compile_R4300i_COP1_MT(Section); break;
-			case R4300i_COP1_DMT: Compile_R4300i_COP1_DMT(Section); break;
-			case R4300i_COP1_CT: Compile_R4300i_COP1_CT(Section); break;
-			case R4300i_COP1_BC:
-				switch (Opcode.ft) {
-				case R4300i_COP1_BC_BCF: Compile_R4300i_Branch(Section,COP1_BCF_Compare,BranchTypeCop1,0); break;
-				case R4300i_COP1_BC_BCT: Compile_R4300i_Branch(Section,COP1_BCT_Compare,BranchTypeCop1,0); break;
-				case R4300i_COP1_BC_BCFL: Compile_R4300i_BranchLikely(Section,COP1_BCF_Compare,0); break;
-				case R4300i_COP1_BC_BCTL: Compile_R4300i_BranchLikely(Section,COP1_BCT_Compare,0); break;
-				default:
-					Compile_R4300i_UnknownOpcode(Section); break;
-				}
-				break;
-			case R4300i_COP1_S:
-				switch (Opcode.funct) {
-				case R4300i_COP1_FUNCT_ADD: Compile_R4300i_COP1_S_ADD(Section); break;
-				case R4300i_COP1_FUNCT_SUB: Compile_R4300i_COP1_S_SUB(Section); break;
-				case R4300i_COP1_FUNCT_MUL: Compile_R4300i_COP1_S_MUL(Section); break;
-				case R4300i_COP1_FUNCT_DIV: Compile_R4300i_COP1_S_DIV(Section); break;
-				case R4300i_COP1_FUNCT_ABS: Compile_R4300i_COP1_S_ABS(Section); break;
-				case R4300i_COP1_FUNCT_NEG: Compile_R4300i_COP1_S_NEG(Section); break;
-				case R4300i_COP1_FUNCT_SQRT: Compile_R4300i_COP1_S_SQRT(Section); break;
-				case R4300i_COP1_FUNCT_MOV: Compile_R4300i_COP1_S_MOV(Section); break;
-				case R4300i_COP1_FUNCT_TRUNC_L: Compile_R4300i_COP1_S_TRUNC_L(Section); break;
-				case R4300i_COP1_FUNCT_CEIL_L: Compile_R4300i_COP1_S_CEIL_L(Section); break;	//added by Witten
-				case R4300i_COP1_FUNCT_FLOOR_L: Compile_R4300i_COP1_S_FLOOR_L(Section); break;	//added by Witten
-				case R4300i_COP1_FUNCT_ROUND_W: Compile_R4300i_COP1_S_ROUND_W(Section); break;
-				case R4300i_COP1_FUNCT_TRUNC_W: Compile_R4300i_COP1_S_TRUNC_W(Section); break;
-				case R4300i_COP1_FUNCT_CEIL_W: Compile_R4300i_COP1_S_CEIL_W(Section); break;	//added by Witten
-				case R4300i_COP1_FUNCT_FLOOR_W: Compile_R4300i_COP1_S_FLOOR_W(Section); break;
-				case R4300i_COP1_FUNCT_CVT_D: Compile_R4300i_COP1_S_CVT_D(Section); break;
-				case R4300i_COP1_FUNCT_CVT_W: Compile_R4300i_COP1_S_CVT_W(Section); break;
-				case R4300i_COP1_FUNCT_CVT_L: Compile_R4300i_COP1_S_CVT_L(Section); break;
-				case R4300i_COP1_FUNCT_C_F: case R4300i_COP1_FUNCT_C_UN:
-				case R4300i_COP1_FUNCT_C_EQ: case R4300i_COP1_FUNCT_C_UEQ:
-				case R4300i_COP1_FUNCT_C_OLT: case R4300i_COP1_FUNCT_C_ULT:
-				case R4300i_COP1_FUNCT_C_OLE: case R4300i_COP1_FUNCT_C_ULE:
-				case R4300i_COP1_FUNCT_C_SF: case R4300i_COP1_FUNCT_C_NGLE:
-				case R4300i_COP1_FUNCT_C_SEQ: case R4300i_COP1_FUNCT_C_NGL:
-				case R4300i_COP1_FUNCT_C_LT: case R4300i_COP1_FUNCT_C_NGE:
-				case R4300i_COP1_FUNCT_C_LE: case R4300i_COP1_FUNCT_C_NGT:
-					Compile_R4300i_COP1_S_CMP(Section); break;
-				default:
-					Compile_R4300i_UnknownOpcode(Section); break;
-				}
-				break;
-			case R4300i_COP1_D:
-				switch (Opcode.funct) {
-				case R4300i_COP1_FUNCT_ADD: Compile_R4300i_COP1_D_ADD(Section); break;
-				case R4300i_COP1_FUNCT_SUB: Compile_R4300i_COP1_D_SUB(Section); break;
-				case R4300i_COP1_FUNCT_MUL: Compile_R4300i_COP1_D_MUL(Section); break;
-				case R4300i_COP1_FUNCT_DIV: Compile_R4300i_COP1_D_DIV(Section); break;
-				case R4300i_COP1_FUNCT_ABS: Compile_R4300i_COP1_D_ABS(Section); break;
-				case R4300i_COP1_FUNCT_NEG: Compile_R4300i_COP1_D_NEG(Section); break;
-				case R4300i_COP1_FUNCT_SQRT: Compile_R4300i_COP1_D_SQRT(Section); break;
-				case R4300i_COP1_FUNCT_MOV: Compile_R4300i_COP1_D_MOV(Section); break;
-				case R4300i_COP1_FUNCT_TRUNC_L: Compile_R4300i_COP1_D_TRUNC_L(Section); break;	//added by Witten
-				case R4300i_COP1_FUNCT_CEIL_L: Compile_R4300i_COP1_D_CEIL_L(Section); break;	//added by Witten
-				case R4300i_COP1_FUNCT_FLOOR_L: Compile_R4300i_COP1_D_FLOOR_L(Section); break;	//added by Witten
-				case R4300i_COP1_FUNCT_ROUND_W: Compile_R4300i_COP1_D_ROUND_W(Section); break;
-				case R4300i_COP1_FUNCT_TRUNC_W: Compile_R4300i_COP1_D_TRUNC_W(Section); break;
-				case R4300i_COP1_FUNCT_CEIL_W: Compile_R4300i_COP1_D_CEIL_W(Section); break;	//added by Witten
-				case R4300i_COP1_FUNCT_FLOOR_W: Compile_R4300i_COP1_D_FLOOR_W(Section); break;	//added by Witten
-				case R4300i_COP1_FUNCT_CVT_S: Compile_R4300i_COP1_D_CVT_S(Section); break;
-				case R4300i_COP1_FUNCT_CVT_W: Compile_R4300i_COP1_D_CVT_W(Section); break;
-				case R4300i_COP1_FUNCT_CVT_L: Compile_R4300i_COP1_D_CVT_L(Section); break;
-				case R4300i_COP1_FUNCT_C_F: case R4300i_COP1_FUNCT_C_UN:
-				case R4300i_COP1_FUNCT_C_EQ: case R4300i_COP1_FUNCT_C_UEQ:
-				case R4300i_COP1_FUNCT_C_OLT: case R4300i_COP1_FUNCT_C_ULT:
-				case R4300i_COP1_FUNCT_C_OLE: case R4300i_COP1_FUNCT_C_ULE:
-				case R4300i_COP1_FUNCT_C_SF: case R4300i_COP1_FUNCT_C_NGLE:
-				case R4300i_COP1_FUNCT_C_SEQ: case R4300i_COP1_FUNCT_C_NGL:
-				case R4300i_COP1_FUNCT_C_LT: case R4300i_COP1_FUNCT_C_NGE:
-				case R4300i_COP1_FUNCT_C_LE: case R4300i_COP1_FUNCT_C_NGT:
-					Compile_R4300i_COP1_D_CMP(Section); break;
-				default:
-					Compile_R4300i_UnknownOpcode(Section); break;
-				}
-				break;
-			case R4300i_COP1_W:
-				switch (Opcode.funct) {
-				case R4300i_COP1_FUNCT_CVT_S: Compile_R4300i_COP1_W_CVT_S(Section); break;
-				case R4300i_COP1_FUNCT_CVT_D: Compile_R4300i_COP1_W_CVT_D(Section); break;
-				default:
-					Compile_R4300i_UnknownOpcode(Section); break;
-				}
-				break;
-			case R4300i_COP1_L:
-				switch (Opcode.funct) {
-				case R4300i_COP1_FUNCT_CVT_S: Compile_R4300i_COP1_L_CVT_S(Section); break;
-				case R4300i_COP1_FUNCT_CVT_D: Compile_R4300i_COP1_L_CVT_D(Section); break;
-				default:
-					Compile_R4300i_UnknownOpcode(Section); break;
-				}
-				break;
-			default:
-				Compile_R4300i_UnknownOpcode(Section); break;
-			}
-			break;
-		case R4300i_BEQL: Compile_R4300i_BranchLikely(Section,BEQ_Compare,0); break;
-		case R4300i_BNEL: Compile_R4300i_BranchLikely(Section,BNE_Compare,0); break;
-		case R4300i_BGTZL:Compile_R4300i_BranchLikely(Section,BGTZ_Compare,0); break;
-		case R4300i_BLEZL:Compile_R4300i_BranchLikely(Section,BLEZ_Compare,0); break;
-		case R4300i_DADDIU: Compile_R4300i_DADDIU(Section); break;
-		case R4300i_LDL: Compile_R4300i_LDL(Section); break;
-		case R4300i_LDR: Compile_R4300i_LDR(Section); break;
-		case R4300i_LB: Compile_R4300i_LB(Section); break;
-		case R4300i_LH: Compile_R4300i_LH(Section); break;
-		case R4300i_LWL: Compile_R4300i_LWL(Section); break;
-		case R4300i_LW: Compile_R4300i_LW(Section); break;
-		case R4300i_LBU: Compile_R4300i_LBU(Section); break;
-		case R4300i_LHU: Compile_R4300i_LHU(Section); break;
-		case R4300i_LWR: Compile_R4300i_LWR(Section); break;
-		case R4300i_LWU: Compile_R4300i_LWU(Section); break;	//added by Witten
-		case R4300i_SB: Compile_R4300i_SB(Section); break;
-		case R4300i_SH: Compile_R4300i_SH(Section); break;
-		case R4300i_SWL: Compile_R4300i_SWL(Section); break;
-		case R4300i_SW: Compile_R4300i_SW(Section); break;
-		case R4300i_SWR: Compile_R4300i_SWR(Section); break;
-		case R4300i_SDL: Compile_R4300i_SDL(Section); break;
-		case R4300i_SDR: Compile_R4300i_SDR(Section); break;
-		case R4300i_CACHE: Compile_R4300i_CACHE(Section); break;
-		case R4300i_LL: Compile_R4300i_LL(Section); break;
-		case R4300i_LWC1: Compile_R4300i_LWC1(Section); break;
-		case R4300i_LDC1: Compile_R4300i_LDC1(Section); break;
-		case R4300i_SC: Compile_R4300i_SC(Section); break;
-		case R4300i_LD: Compile_R4300i_LD(Section); break;
-		case R4300i_SWC1: Compile_R4300i_SWC1(Section); break;
-		case R4300i_SDC1: Compile_R4300i_SDC1(Section); break;
-		case R4300i_SD: Compile_R4300i_SD(Section); break;
-		default:
-			Compile_R4300i_UnknownOpcode(Section); break;
-		}
-
-		for (count = 1; count < 64; count ++) { x86Protected(count) = 0; }
-
-		UnMap_AllFPRs(Section);
-
-		if ((Section->CompilePC &0xFFC) == 0xFFC) {
-			if (NextInstruction == DO_DELAY_SLOT) {
-			}
-			if (NextInstruction == NORMAL) {
-				CompileExit (Section->CompilePC + 4,&Section->RegWorking,Normal,1,NULL);
-				NextInstruction = END_BLOCK;
-			}
-		}
-
-		switch (NextInstruction) {
-		case NORMAL:
-			Section->CompilePC += 4;
-			break;
-		case DO_DELAY_SLOT:
-			NextInstruction = DELAY_SLOT;
-			Section->CompilePC += 4;
-			break;
-		case DELAY_SLOT:
-			NextInstruction = DELAY_SLOT_DONE;
-			BlockCycleCount -= 2;
-			BlockRandomModifier -= 1;
-			Section->CompilePC -= 4;
-			break;
-		}
-
-	} while (NextInstruction != END_BLOCK);
-
-	return 1;
-}
-
-uint32_t GetNewTestValue(void) {
-	static uint32_t LastTest = 0;
-	if (LastTest == 0xFFFFFFFF) { LastTest = 0; }
-	LastTest += 1;
-	return LastTest;
-}
-
-void InitilizeRegSet(REG_INFO * RegSet) {
-	int count;
-
-	RegSet->MIPS_RegState[0] = STATE_CONST_32;
-	RegSet->MIPS_RegVal[0].DW = 0;
-	for (count = 1; count < 32; count ++ ) {
-		RegSet->MIPS_RegState[count] = STATE_UNKNOWN;
-		RegSet->MIPS_RegVal[count].DW = 0;
-
-	}
-	for (count = 0; count < 64; count ++ ) {
-		RegSet->x86reg_MappedTo[count] = NotMapped;
-		RegSet->x86reg_Protected[count] = 0;
-		RegSet->x86reg_MapOrder[count] = 0;
-	}
-	RegSet->CycleCount = 0;
-	RegSet->RandomModifier = 0;
-
-	RegSet->Stack_TopPos = 0;
-	for (count = 0; count < 8; count ++ ) {
-		RegSet->x86fpu_MappedTo[count] = -1;
-		RegSet->x86fpu_State[count] = FPU_Unkown;
-		RegSet->x86fpu_RoundingModel[count] = RoundDefault;
-	}
-	RegSet->Fpu_Used = 0;
-	RegSet->RoundingModel = RoundUnknown;
-}
-
-void InheritConstants(BLOCK_SECTION * Section) {
-	int NoOfParents, count;
-	BLOCK_SECTION * Parent;
-	REG_INFO * RegSet;
-
-
-	if (Section->ParentSection == NULL) {
-		InitilizeRegSet(&Section->RegStart);
-		memcpy(&Section->RegWorking,&Section->RegStart,sizeof(REG_INFO));
-		return;
-	}
-
-	Parent = Section->ParentSection[0];
-	RegSet = Section == Parent->ContinueSection?&Parent->Cont.RegSet:&Parent->Jump.RegSet;
-	memcpy(&Section->RegStart,RegSet,sizeof(REG_INFO));
-	memcpy(&Section->RegWorking,&Section->RegStart,sizeof(REG_INFO));
-
-	for (NoOfParents = 1;Section->ParentSection[NoOfParents] != NULL;NoOfParents++) {
-		Parent = Section->ParentSection[NoOfParents];
-		RegSet = Section == Parent->ContinueSection?&Parent->Cont.RegSet:&Parent->Jump.RegSet;
-
-		for (count = 0; count < 32; count++) {
-			if (IsConst(count)) {
-				if (MipsRegState(count) != RegSet->MIPS_RegState[count]) {
-					MipsRegState(count) = STATE_UNKNOWN;
-				} else if (Is32Bit(count) && MipsRegLo(count) != RegSet->MIPS_RegVal[count].UW[0]) {
-					MipsRegState(count) = STATE_UNKNOWN;
-				} else if (Is64Bit(count) && MipsReg(count) != RegSet->MIPS_RegVal[count].UDW) {
-					MipsRegState(count) = STATE_UNKNOWN;
-				}
-			}
-		}
-	}
-	memcpy(&Section->RegStart,&Section->RegWorking,sizeof(REG_INFO));
-}
-
-uint32_t InheritParentInfo (BLOCK_SECTION * Section) {
-	int count, start, NoOfParents, NoOfCompiledParents, FirstParent,CurrentParent;
-	BLOCK_PARENT * SectionParents;
-	BLOCK_SECTION * Parent;
-	JUMP_INFO * JumpInfo;
-	//char Label[100];
-	uint32_t NeedSync;
-
-	DisplaySectionInformation(Section,Section->SectionID,GetNewTestValue());
-
-	if (Section->ParentSection == NULL) {
-		InitilizeRegSet(&Section->RegStart);
-		memcpy(&Section->RegWorking,&Section->RegStart,sizeof(REG_INFO));
-		return 1;
-	}
-
-	NoOfParents = 0;
-	for (count = 0;Section->ParentSection[count] != NULL;count++) {
-		Parent = Section->ParentSection[count];
-		NoOfParents += Parent->JumpSection != Parent->ContinueSection?1:2;
-	}
-
-	if (NoOfParents == 0) {
-		return 0;
-	} else if (NoOfParents == 1) {
-		Parent = Section->ParentSection[0];
-		if (Section == Parent->ContinueSection) { JumpInfo = &Parent->Cont; }
-		else if (Section == Parent->JumpSection) { JumpInfo = &Parent->Jump; }
-		else {
-		}
-
-		memcpy(&Section->RegStart,&JumpInfo->RegSet,sizeof(REG_INFO));
-		if (JumpInfo->LinkLocation != NULL) {
-			SetJump32(JumpInfo->LinkLocation,RecompPos);
-			if (JumpInfo->LinkLocation2 != NULL) {
-				SetJump32(JumpInfo->LinkLocation2,RecompPos);
-			}
-		}
-		memcpy(&Section->RegWorking,&Section->RegStart,sizeof(REG_INFO));
-		return 1;
-	}
-
-	//Multiple Parents
-	for (count = 0, NoOfCompiledParents = 0;Section->ParentSection[count] != NULL;count++) {
-		Parent = Section->ParentSection[count];
-		if (Parent->CompiledLocation != NULL) {
-			NoOfCompiledParents += Parent->JumpSection != Parent->ContinueSection?1:2;
-		}
-	}
-	if (NoOfCompiledParents == 0){ return 0; }
-	SectionParents = (BLOCK_PARENT *)malloc(NoOfParents * sizeof(BLOCK_PARENT));
-
-	for (count = 0, NoOfCompiledParents = 0;Section->ParentSection[count] != NULL;count++) {
-		Parent = Section->ParentSection[count];
-		if (Parent->CompiledLocation == NULL) { continue; }
-		if (Parent->JumpSection != Parent->ContinueSection) {
-			SectionParents[NoOfCompiledParents].Parent = Parent;
-			SectionParents[NoOfCompiledParents].JumpInfo =
-				Section == Parent->ContinueSection?&Parent->Cont:&Parent->Jump;
-			NoOfCompiledParents += 1;
-		} else {
-			SectionParents[NoOfCompiledParents].Parent = Parent;
-			SectionParents[NoOfCompiledParents].JumpInfo = &Parent->Cont;
-			NoOfCompiledParents += 1;
-			SectionParents[NoOfCompiledParents].Parent = Parent;
-			SectionParents[NoOfCompiledParents].JumpInfo = &Parent->Jump;
-			NoOfCompiledParents += 1;
-		}
-	}
-
-	start = NoOfCompiledParents;
-	for (count = 0;Section->ParentSection[count] != NULL;count++) {
-		Parent = Section->ParentSection[count];
-		if (Parent->CompiledLocation != NULL) { continue; }
-		if (Parent->JumpSection != Parent->ContinueSection) {
-			SectionParents[start].Parent = Parent;
-			SectionParents[start].JumpInfo =
-				Section == Parent->ContinueSection?&Parent->Cont:&Parent->Jump;
-			start += 1;
-		} else {
-			SectionParents[start].Parent = Parent;
-			SectionParents[start].JumpInfo = &Parent->Cont;
-			start += 1;
-			SectionParents[start].Parent = Parent;
-			SectionParents[start].JumpInfo = &Parent->Jump;
-			start += 1;
-		}
-	}
-	FirstParent = 0;
-	for (count = 1;count < NoOfCompiledParents;count++) {
-		if (SectionParents[count].JumpInfo->FallThrough) {
-			FirstParent = count; break;
-		}
-	}
-
-	//Link First Parent to start
-	Parent = SectionParents[FirstParent].Parent;
-	JumpInfo = SectionParents[FirstParent].JumpInfo;
-
-	memcpy(&Section->RegWorking,&JumpInfo->RegSet,sizeof(REG_INFO));
-	if (JumpInfo->LinkLocation != NULL) {
-		SetJump32(JumpInfo->LinkLocation,RecompPos);
-		JumpInfo->LinkLocation = NULL;
-		if (JumpInfo->LinkLocation2 != NULL) {
-			SetJump32(JumpInfo->LinkLocation2,RecompPos);
-			JumpInfo->LinkLocation2 = NULL;
-		}
-	}
-	if (BlockRandomModifier != 0) { SubConstFromVariable(BlockRandomModifier,&CP0[1]); }
-	if (BlockCycleCount != 0) {
-		AddConstToVariable(BlockCycleCount,&CP0[9]);
-		SubConstFromVariable(BlockCycleCount,&Timers->Timer);
-	}
-	JumpInfo->FallThrough = 0;
-
-	//Fix up initial state
-	UnMap_AllFPRs(Section);
-	for (count = 0;count < NoOfParents;count++) {
-		int count2, count3;
-		REG_INFO * RegSet;
-
-		if (count == FirstParent) { continue; }
-		Parent = SectionParents[count].Parent;
-		RegSet = &SectionParents[count].JumpInfo->RegSet;
-
-		if (CurrentRoundingModel != RegSet->RoundingModel) { CurrentRoundingModel = RoundUnknown; }
-		if (NoOfParents != NoOfCompiledParents) { CurrentRoundingModel = RoundUnknown; }
-
-		for (count2 = 1; count2 < 32; count2++) {
-			if (Is32BitMapped(count2)) {
-				switch (RegSet->MIPS_RegState[count2]) {
-				case STATE_MAPPED_64: Map_GPR_64bit(Section,count2,count2); break;
-				case STATE_MAPPED_32_ZERO: break;
-				case STATE_MAPPED_32_SIGN:
-					if (IsUnsigned(count2)) {
-						MipsRegState(count2) = STATE_MAPPED_32_SIGN;
-					}
-					break;
-				case STATE_CONST_64: Map_GPR_64bit(Section,count2,count2); break;
-				case STATE_CONST_32:
-					if ((RegSet->MIPS_RegVal[count2].W[0] < 0) && IsUnsigned(count2)) {
-						MipsRegState(count2) = STATE_MAPPED_32_SIGN;
-					}
-					break;
-				case STATE_UNKNOWN:
-					//Map_GPR_32bit(Section,count2,1,count2);
-					Map_GPR_64bit(Section,count2,count2); //??
-					//UnMap_GPR(Section,count2,1); ??
-					break;
-				}
-			}
-			if (IsConst(count2)) {
-				if (MipsRegState(count2) != RegSet->MIPS_RegState[count2]) {
-					if (Is32Bit(count2)) {
-						Map_GPR_32bit(Section,count2,1,count2);
-					} else {
-						Map_GPR_32bit(Section,count2,1,count2);
-					}
-				} else if (Is32Bit(count2) && MipsRegLo(count2) != RegSet->MIPS_RegVal[count2].UW[0]) {
-					Map_GPR_32bit(Section,count2,1,count2);
-				} else if (Is64Bit(count2) && MipsReg(count2) != RegSet->MIPS_RegVal[count2].UDW) {
-					Map_GPR_32bit(Section,count2,1,count2);
-				}
-			}
-			for (count3 = 1; count3 < 64; count3 ++) { x86Protected(count3) = 0; }
-		}
-	}
-	memcpy(&Section->RegStart,&Section->RegWorking,sizeof(REG_INFO));
-
-	//Sync registers for different blocks
-//	sprintf(Label,"Section_%d",Section->SectionID);
-	CurrentParent = FirstParent;
-	NeedSync = 0;
-	for (count = 0;count < NoOfCompiledParents;count++) {
-		REG_INFO * RegSet;
-		int count2;
-
-		if (count == FirstParent) { continue; }
-		Parent = SectionParents[count].Parent;
-		JumpInfo = SectionParents[count].JumpInfo;
-		RegSet = &SectionParents[count].JumpInfo->RegSet;
-
-		if (JumpInfo->RegSet.CycleCount != 0) { NeedSync = 1; }
-		if (JumpInfo->RegSet.RandomModifier != 0) { NeedSync = 1; }
-
-		for (count2 = 0; count2 < 8; count2++) {
-			if (FpuMappedTo(count2) == (uint32_t)-1) {
-				NeedSync = 1;
-			}
-		}
-
-		for (count2 = 0; count2 < 32; count2++) {
-			if (NeedSync == 1) { break; }
-			if (MipsRegState(count2) != RegSet->MIPS_RegState[count2]) {
-				NeedSync = 1;
-				continue;
-			}
-			switch (MipsRegState(count2)) {
-			case STATE_UNKNOWN: break;
-			case STATE_MAPPED_64:
-				if (MipsReg(count2) != RegSet->MIPS_RegVal[count2].UDW) {
-					NeedSync = 1;
-				}
-				break;
-			case STATE_MAPPED_32_ZERO:
-			case STATE_MAPPED_32_SIGN:
-				if (MipsRegLo(count2) != RegSet->MIPS_RegVal[count2].UW[0]) {
-					//DisplayError("Parent: %d",Parent->SectionID);
-					NeedSync = 1;
-				}
-				break;
-			case STATE_CONST_32:
-				if (MipsRegLo(count2) != RegSet->MIPS_RegVal[count2].UW[0]) {
-					NeedSync = 1;
-				}
-				break;
-			}
-		}
-		if (NeedSync == 0) { continue; }
-		Parent = SectionParents[CurrentParent].Parent;
-		JumpInfo = SectionParents[CurrentParent].JumpInfo;
-		//JmpLabel32(Label,0);
-		JmpLabel32(0);
-		JumpInfo->LinkLocation = RecompPos - 4;
-		JumpInfo->LinkLocation2 = NULL;
-
-		CurrentParent = count;
-		Parent = SectionParents[CurrentParent].Parent;
-		JumpInfo = SectionParents[CurrentParent].JumpInfo;
-		if (JumpInfo->LinkLocation != NULL) {
-			SetJump32(JumpInfo->LinkLocation,RecompPos);
-			JumpInfo->LinkLocation = NULL;
-			if (JumpInfo->LinkLocation2 != NULL) {
-				SetJump32(JumpInfo->LinkLocation2,RecompPos);
-				JumpInfo->LinkLocation2 = NULL;
-			}
-		}
-		memcpy(&Section->RegWorking,&JumpInfo->RegSet,sizeof(REG_INFO));
-		if (BlockRandomModifier != 0) { SubConstFromVariable(BlockRandomModifier,&CP0[1]); }
-		if (BlockCycleCount != 0) {
-			AddConstToVariable(BlockCycleCount,&CP0[9]);
-			SubConstFromVariable(BlockCycleCount,&Timers->Timer);
-		}
-		SyncRegState(Section,&Section->RegStart); 		//Sync
-		memcpy(&Section->RegStart,&Section->RegWorking,sizeof(REG_INFO));
-
-	}
-
-	for (count = 0;count < NoOfCompiledParents;count++) {
-		Parent = SectionParents[count].Parent;
-		JumpInfo = SectionParents[count].JumpInfo;
-
-		if (JumpInfo->LinkLocation != NULL) {
-			SetJump32(JumpInfo->LinkLocation,RecompPos);
-			JumpInfo->LinkLocation = NULL;
-			if (JumpInfo->LinkLocation2 != NULL) {
-				SetJump32(JumpInfo->LinkLocation2,RecompPos);
-				JumpInfo->LinkLocation2 = NULL;
-			}
-		}
-	}
-
-	BlockCycleCount = 0;
-	BlockRandomModifier = 0;
-	free(SectionParents);
-	SectionParents = NULL;
-	return 1;
-}
-
-uint32_t IsAllParentLoops(BLOCK_SECTION * Section, BLOCK_SECTION * Parent, uint32_t IgnoreIfCompiled, uint32_t Test) {
-	int count;
-
-	if (IgnoreIfCompiled && Parent->CompiledLocation != NULL) { return 1; }
-	if (!Section->InLoop) { return 0; }
-	if (!Parent->InLoop) { return 0; }
-	if (Parent->ParentSection == NULL) { return 0; }
-	if (Section == Parent) { return 1; }
-	if (Parent->Test == Test) { return 1; }
-	Parent->Test = Test;
-
-	for (count = 0;Parent->ParentSection[count] != NULL;count++) {
-		if (!IsAllParentLoops(Section,Parent->ParentSection[count],IgnoreIfCompiled,Test)) { return 0; }
-	}
-	return 1;
-}
-
-void InitilzeSection (BLOCK_SECTION * Section, BLOCK_SECTION * Parent, uint32_t StartAddr, uint32_t ID) {
-	Section->ParentSection = NULL;
-	Section->JumpSection = NULL;
-	Section->ContinueSection = NULL;
-	Section->CompiledLocation = NULL;
-
-	Section->SectionID = ID;
-	Section->Test = 0;
-	Section->Test2 = 0;
-	Section->InLoop = 0;
-
-	Section->StartPC = StartAddr;
-	Section->CompilePC = Section->StartPC;
-
-	Section->Jump.LinkLocation = NULL;
-	Section->Jump.LinkLocation2 = NULL;
-	Section->Jump.FallThrough = 0;
-	Section->Jump.PermLoop = 0;
-	Section->Jump.TargetPC = (uint32_t)-1;
-	Section->Cont.LinkLocation = NULL;
-	Section->Cont.LinkLocation2 = NULL;
-	Section->Cont.FallThrough = 0;
-	Section->Cont.PermLoop = 0;
-	Section->Cont.TargetPC = (uint32_t)-1;
-
-	AddParent(Section,Parent);
-}
-
-void MarkCodeBlock (uint32_t PAddr) {
-	if (PAddr < RdramSize) {
-		N64_Blocks.NoOfRDRamBlocks[PAddr >> 12] += 1;
-	} else if (PAddr >= 0x04000000 && PAddr <= 0x04000FFC) {
-		N64_Blocks.NoOfDMEMBlocks += 1;
-	} else if (PAddr >= 0x04001000 && PAddr <= 0x04001FFC) {
-		N64_Blocks.NoOfIMEMBlocks += 1;
-	} else if (PAddr >= 0x1FC00000 && PAddr <= 0x1FC00800) {
-		N64_Blocks.NoOfPifRomBlocks += 1;
-	} else {
-	}
-}
-
-extern uint8_t * MemChunk;
-
-void CallBlock(void (*block)(void)) {
-			
-#ifdef USEX64 	
-	// Make sure the Memory block pointer is in register R15
-	__asm__ __volatile__("mov %%rax, %%r15" : : "a"(MemChunk));
-	__asm__ __volatile__("pushq %rbx");
-	__asm__ __volatile__("pushq %rcx");
-	__asm__ __volatile__("pushq %rdx");
-	__asm__ __volatile__("pushq %r9");
-	__asm__ __volatile__("pushq %r10");
-	__asm__ __volatile__("pushq %r11");
-	__asm__ __volatile__("pushq %r12");
-	__asm__ __volatile__("pushq %r13");
-	__asm__ __volatile__("pushq %r14");
-	__asm__ __volatile__("pushq %r15");
-
-	block();
-
-	__asm__ __volatile__("popq %r15");
-	__asm__ __volatile__("popq %r14");
-	__asm__ __volatile__("popq %r13");
-	__asm__ __volatile__("popq %r12");
-	__asm__ __volatile__("popq %r11");
-	__asm__ __volatile__("popq %r10");
-	__asm__ __volatile__("popq %r9");
-	__asm__ __volatile__("popq %rdx");
-	__asm__ __volatile__("popq %rcx");
-	__asm__ __volatile__("popq %rbx");
-#else
-	__asm__ __volatile__("pusha");
-	block();
-	__asm__ __volatile__("popa");
-#endif
-
-}
-//#include <windows.h>
-//int r4300i_CPU_MemoryFilter64( DWORD dwExptCode, LPEXCEPTION_POINTERS lpEP);
-
-uint32_t lastgood = 0;
-
-
-void StartRecompilerCPU (void ) {
-	uintptr_t Addr;
-	void (*Block)(void) = 0;
-
-	InitExceptionHandler();
-
-	ResetRecompCode();
-	memset(&N64_Blocks,0,sizeof(N64_Blocks));
-	NextInstruction = NORMAL;
-
-	//__try {
-
-		//for (;;) {
-		while(cpu_running == 1) {
-
-			if(PROGRAM_COUNTER < 0x90000000)
-				lastgood = PROGRAM_COUNTER;
-			Addr = PROGRAM_COUNTER;
-				if (!TranslateVaddr(&Addr)) {
-					DoTLBMiss(NextInstruction == DELAY_SLOT,PROGRAM_COUNTER);
-					NextInstruction = NORMAL;
-					Addr = PROGRAM_COUNTER;
-					if (!TranslateVaddr(&Addr)) {
-						StopEmulation();
-					}
-				}
-			if (NextInstruction == DELAY_SLOT) {
-					Block = *(DelaySlotTable + (Addr >> 12));
-
-				if (Block == NULL) {
-					Block = CompileDelaySlot();
-
-					*(DelaySlotTable + (Addr >> 12)) = Block;
-
-					NextInstruction = NORMAL;
-				}
-
-				CallBlock(Block);
-
-				continue;
-			}
-
-
-				if (Addr > 0x10000000)
-				{
-					if (PROGRAM_COUNTER >= 0xB0000000 && PROGRAM_COUNTER < (RomFileSize | 0xB0000000)) {
-						while (PROGRAM_COUNTER >= 0xB0000000 && PROGRAM_COUNTER < (RomFileSize | 0xB0000000)) {
-							ExecuteInterpreterOpCode();
-						}
-						continue;
-					} else {
-
-						StopEmulation();
-					}
-				}
-
-			Block = *(JumpTable + (Addr >> 2));
-
-
-			if (Block == NULL) {
-				Block = Compiler4300iBlock();
-
-				*(JumpTable + (Addr >> 2)) = Block;
-
-				NextInstruction = NORMAL;
-			}
-
-
-			CallBlock(Block);
-		}
-		
-		cpu_stopped = 1;
-}
-
-
-void SyncRegState (BLOCK_SECTION * Section, REG_INFO * SyncTo) {
-	int count, x86Reg,x86RegHi, changed;
-
-	changed = 0;
-	UnMap_AllFPRs(Section);
-	if (CurrentRoundingModel != SyncTo->RoundingModel) { CurrentRoundingModel = RoundUnknown; }
-
-	for (count = 1; count < 32; count ++) {
-		if (MipsRegState(count) == SyncTo->MIPS_RegState[count]) {
-			switch (MipsRegState(count)) {
-			case STATE_UNKNOWN: continue;
-			case STATE_MAPPED_64:
-				if (MipsReg(count) == SyncTo->MIPS_RegVal[count].UDW) {
-					continue;
-				}
-				break;
-			case STATE_MAPPED_32_ZERO:
-			case STATE_MAPPED_32_SIGN:
-				if (MipsRegLo(count) == SyncTo->MIPS_RegVal[count].UW[0]) {
-					continue;
-				}
-				break;
-			case STATE_CONST_64:
-				if (MipsReg(count) != SyncTo->MIPS_RegVal[count].UDW) {
-				}
-				continue;
-			case STATE_CONST_32:
-				if (MipsRegLo(count) != SyncTo->MIPS_RegVal[count].UW[0]) {
-				}
-				continue;
-			}
-		}
-		changed = 1;
-
-		switch (SyncTo->MIPS_RegState[count]) {
-		case STATE_UNKNOWN: UnMap_GPR(Section,count,1); break;
-		case STATE_MAPPED_64:
-			x86Reg = SyncTo->MIPS_RegVal[count].UW[0];
-			x86RegHi = SyncTo->MIPS_RegVal[count].UW[1];
-			UnMap_X86reg(Section,x86Reg);
-			UnMap_X86reg(Section,x86RegHi);
-			switch (MipsRegState(count)) {
-			case STATE_UNKNOWN:
-				MoveVariableToX86reg(&GPR[count].UW[0],x86Reg);
-				MoveVariableToX86reg(&GPR[count].UW[1],x86RegHi);
-				break;
-			case STATE_MAPPED_64:
-				MoveX86RegToX86Reg(MipsRegLo(count),x86Reg);
-				x86Mapped(MipsRegLo(count)) = NotMapped;
-				MoveX86RegToX86Reg(MipsRegHi(count),x86RegHi);
-				x86Mapped(MipsRegHi(count)) = NotMapped;
-				break;
-			case STATE_MAPPED_32_SIGN:
-				MoveX86RegToX86Reg(MipsRegLo(count),x86RegHi);
-				ShiftRightSignImmed(x86RegHi,31);
-				MoveX86RegToX86Reg(MipsRegLo(count),x86Reg);
-				x86Mapped(MipsRegLo(count)) = NotMapped;
-				break;
-			case STATE_MAPPED_32_ZERO:
-				XorX86RegToX86Reg(x86RegHi,x86RegHi);
-				MoveX86RegToX86Reg(MipsRegLo(count),x86Reg);
-				x86Mapped(MipsRegLo(count)) = NotMapped;
-				break;
-			case STATE_CONST_64:
-				MoveConstToX86reg(MipsRegHi(count),x86RegHi);
-				MoveConstToX86reg(MipsRegLo(count),x86Reg);
-				break;
-			case STATE_CONST_32:
-				MoveConstToX86reg(MipsRegLo_S(count) >> 31,x86RegHi);
-				MoveConstToX86reg(MipsRegLo(count),x86Reg);
-				break;
-			default:
-				continue;
-			}
-			MipsRegLo(count) = x86Reg;
-			MipsRegHi(count) = x86RegHi;
-			MipsRegState(count) = STATE_MAPPED_64;
-			x86Mapped(x86Reg) = GPR_Mapped;
-			x86Mapped(x86RegHi) = GPR_Mapped;
-			x86MapOrder(x86Reg) = 1;
-			x86MapOrder(x86RegHi) = 1;
-			break;
-		case STATE_MAPPED_32_SIGN:
-			x86Reg = SyncTo->MIPS_RegVal[count].UW[0];
-			UnMap_X86reg(Section,x86Reg);
-			switch (MipsRegState(count)) {
-			case STATE_UNKNOWN: MoveVariableToX86reg(&GPR[count].UW[0],x86Reg); break;
-			case STATE_CONST_32: MoveConstToX86reg(MipsRegLo(count),x86Reg); break;
-			case STATE_MAPPED_32_SIGN:
-				MoveX86RegToX86Reg(MipsRegLo(count),x86Reg);
-				x86Mapped(MipsRegLo(count)) = NotMapped;
-				break;
-			case STATE_MAPPED_32_ZERO:
-				if (MipsRegLo(count) != (uint32_t)x86Reg) {
-					MoveX86RegToX86Reg(MipsRegLo(count),x86Reg);
-					x86Mapped(MipsRegLo(count)) = NotMapped;
-				}
-				break;
-			case STATE_MAPPED_64:
-				MoveX86RegToX86Reg(MipsRegLo(count),x86Reg);
-				x86Mapped(MipsRegLo(count)) = NotMapped;
-				x86Mapped(MipsRegHi(count)) = NotMapped;
-				break;
-			}
-			MipsRegLo(count) = x86Reg;
-			MipsRegState(count) = STATE_MAPPED_32_SIGN;
-			x86Mapped(x86Reg) = GPR_Mapped;
-			x86MapOrder(x86Reg) = 1;
-			break;
-		case STATE_MAPPED_32_ZERO:
-			x86Reg = SyncTo->MIPS_RegVal[count].UW[0];
-			UnMap_X86reg(Section,x86Reg);
-			switch (MipsRegState(count)) {
-			case STATE_MAPPED_64:
-			case STATE_UNKNOWN:
-				MoveVariableToX86reg(&GPR[count].UW[0],x86Reg);
-				break;
-			case STATE_MAPPED_32_ZERO:
-				MoveX86RegToX86Reg(MipsRegLo(count),x86Reg);
-				x86Mapped(MipsRegLo(count)) = NotMapped;
-				break;
-			case STATE_CONST_32:
-				if (MipsRegLo_S(count) < 0) {
-				}
-				MoveConstToX86reg(MipsRegLo(count),x86Reg);
-				break;
-			}
-			MipsRegLo(count) = x86Reg;
-			MipsRegState(count) = SyncTo->MIPS_RegState[count];
-			x86Mapped(x86Reg) = GPR_Mapped;
-			x86MapOrder(x86Reg) = 1;
-			break;
-		default:
-			changed = 0;
-		}
-	}
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/recompiler_cpu.h Deleted

@@ -1,240 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#ifndef _RECOMPILER_CPU_H_
-#define _RECOMPILER_CPU_H_
-
-#include "types.h"
-
-#pragma pack(push,1)
-
-#define MaxCodeBlocks			50000
-#define MaxOrigMem				65000
-
-#define NotMapped				0
-#define GPR_Mapped				1
-#define Temp_Mapped				2
-#define Stack_Mapped			3
-
-#define BranchTypeCop1			0
-#define BranchTypeRs			1
-#define BranchTypeRsRt			2
-
-//Exit Block Methods
-#define Normal					0
-#define Normal_NoSysCheck		1
-#define DoCPU_Action			2
-#define COP1_Unuseable			3
-#define DoSysCall				4
-#define TLBReadMiss				5
-#define ExitResetRecompCode		6
-#define DoBreak					7
-
-#define STATE_KNOWN_VALUE		1
-//#define STATE_UNKNOW_VALUE
-
-#define STATE_X86_MAPPED		2
-//#define STATE_CONST
-
-#define STATE_SIGN				4
-//#define STATE_ZERO
-
-#define STATE_32BIT				8
-//#define STATE_64BIT
-
-#define STATE_UNKNOWN			0
-
-//STATE_MAPPED_64 = 3;
-//STATE_MAPPED_32_ZERO = 11
-//STATE_MAPPED_32_SIGN = 15
-#define STATE_MAPPED_64			(STATE_KNOWN_VALUE | STATE_X86_MAPPED)
-#define STATE_MAPPED_32_ZERO	(STATE_KNOWN_VALUE | STATE_X86_MAPPED | STATE_32BIT)
-#define STATE_MAPPED_32_SIGN	(STATE_KNOWN_VALUE | STATE_X86_MAPPED | STATE_32BIT | STATE_SIGN)
-
-//STATE_CONST_64 = 1
-//STATE_CONST_32 = 13
-#define STATE_CONST_64			(STATE_KNOWN_VALUE)
-#define STATE_CONST_32			(STATE_KNOWN_VALUE | STATE_32BIT | STATE_SIGN)
-
-#define IsKnown(Reg)			((MipsRegState(Reg) & STATE_KNOWN_VALUE) != 0)
-#define IsUnknown(Reg)			(!IsKnown(Reg))
-
-#define IsMapped(Reg)			(IsKnown(Reg) && (MipsRegState(Reg) & STATE_X86_MAPPED) != 0)
-#define IsConst(Reg)			(IsKnown(Reg) && !IsMapped(Reg))
-
-#define IsSigned(Reg)			(IsKnown(Reg) && (MipsRegState(Reg) & STATE_SIGN) != 0)
-#define IsUnsigned(Reg)			(IsKnown(Reg) && !IsSigned(Reg))
-
-#define Is32Bit(Reg)			(IsKnown(Reg) && (MipsRegState(Reg) & STATE_32BIT) != 0)
-#define Is64Bit(Reg)			(IsKnown(Reg) && !Is32Bit(Reg))
-
-#define Is32BitMapped(Reg)		(Is32Bit(Reg) && (MipsRegState(Reg) & STATE_X86_MAPPED) != 0)
-#define Is64BitMapped(Reg)		(Is64Bit(Reg) && !Is32BitMapped(Reg))
-
-#define MipsRegState(Reg)		Section->RegWorking.MIPS_RegState[Reg]
-#define MipsReg(Reg)			Section->RegWorking.MIPS_RegVal[Reg].UDW
-#define MipsReg_S(Reg)			Section->RegWorking.MIPS_RegVal[Reg].DW
-#define MipsRegLo(Reg)			Section->RegWorking.MIPS_RegVal[Reg].UW[0]
-#define MipsRegLo_S(Reg)		Section->RegWorking.MIPS_RegVal[Reg].W[0]
-#define MipsRegHi(Reg)			Section->RegWorking.MIPS_RegVal[Reg].UW[1]
-#define MipsRegHi_S(Reg)		Section->RegWorking.MIPS_RegVal[Reg].W[1]
-
-#define x86MapOrder(Reg)		Section->RegWorking.x86reg_MapOrder[Reg]
-#define x86Protected(Reg)		Section->RegWorking.x86reg_Protected[Reg]
-#define x86Mapped(Reg)			Section->RegWorking.x86reg_MappedTo[Reg]
-
-#define BlockCycleCount			Section->RegWorking.CycleCount
-#define BlockRandomModifier		Section->RegWorking.RandomModifier
-
-
-#define StackTopPos				Section->RegWorking.Stack_TopPos
-#define FpuMappedTo(Reg)		Section->RegWorking.x86fpu_MappedTo[Reg]
-#define FpuState(Reg)			Section->RegWorking.x86fpu_State[Reg]
-#define FpuRoundingModel(Reg)	Section->RegWorking.x86fpu_RoundingModel[Reg]
-#define FpuBeenUsed				Section->RegWorking.Fpu_Used
-#define CurrentRoundingModel	Section->RegWorking.RoundingModel
-
-typedef struct {
-	//r4k
-	int32_t		    MIPS_RegState[32];
-	MIPS_DWORD		MIPS_RegVal[32];
-
-	uint32_t		x86reg_MappedTo[64];
-	uint32_t		x86reg_MapOrder[64];
-	uint32_t		x86reg_Protected[64];
-
-	uint32_t		CycleCount;
-	uint32_t		RandomModifier;
-
-	//FPU
-	uint32_t		Stack_TopPos;
-	uint32_t		x86fpu_MappedTo[16];
-	uint32_t		x86fpu_State[16];
-	uint32_t		x86fpu_RoundingModel[16];
-
-	uint32_t        Fpu_Used;
-	uint32_t       RoundingModel;
-} REG_INFO;
-
-typedef struct {
-	uint32_t		TargetPC;
-	//uint8_t *		BranchLabel;
-	uint8_t *		LinkLocation;
-	uint8_t *		LinkLocation2;
-	uint32_t		FallThrough;
-	uint32_t		PermLoop;
-	uint32_t		DoneDelaySlot;
-	REG_INFO	RegSet;
-} JUMP_INFO;
-
-typedef struct {
-	/* Block Connection info */
-	void **		ParentSection;
-	void *		ContinueSection;
-	void *		JumpSection;
-	uint8_t *		CompiledLocation;
-
-
-	uint32_t		SectionID;
-	uint32_t		Test;
-	uint32_t		Test2;
-	uint32_t		InLoop;
-
-	uint32_t		StartPC;
-	uint32_t		CompilePC;
-
-	/* Register Info */
-	REG_INFO	RegStart;
-	REG_INFO	RegWorking;
-
-	/* Jump Info */
-	JUMP_INFO   Jump;
-	JUMP_INFO   Cont;
-} BLOCK_SECTION;
-
-typedef struct {
-	BLOCK_SECTION * Parent;
-	JUMP_INFO     * JumpInfo;
-} BLOCK_PARENT;
-
-typedef struct {
-	uint32_t    TargetPC;
-	REG_INFO ExitRegSet;
-	int32_t      reason;
-	int32_t      NextInstruction;
-	uint8_t *   JumpLoc; //32bit jump
-} EXIT_INFO;
-
-typedef struct {
-	uint32_t	 	  StartVAddr;
-	uint8_t *		  CompiledLocation;
-	int32_t           NoOfSections;
-	BLOCK_SECTION BlockInfo;
-	EXIT_INFO  ** ExitInfo;
-	int32_t           ExitCount;
-} BLOCK_INFO;
-
-typedef struct {
-	void * CodeBlock;
-	QWORD  OriginalMemory;
-} TARGET_INFO;
-
-typedef struct {
-	uint32_t PAddr;
-	uint32_t VAddr;
-	uint32_t OriginalValue;
-	void * CompiledLocation;
-} ORIGINAL_MEMMARKER;
-
-typedef struct {
-	uint32_t NoOfRDRamBlocks[2048];
-	uint32_t NoOfDMEMBlocks;
-	uint32_t NoOfIMEMBlocks;
-	uint32_t NoOfPifRomBlocks;
-} N64_Blocks_t;
-
-extern N64_Blocks_t N64_Blocks;
-
-#pragma pack(pop)
-
-uint8_t *Compiler4300iBlock    ( void );
-uint8_t *CompileDelaySlot      ( void );
-void CompileExit            ( uint32_t TargetPC, REG_INFO * ExitRegSet, int32_t reason, int32_t CompileNow, void (*x86Jmp)(uintptr_t Value));
-void CompileSystemCheck     ( uint32_t TimerModifier, uint32_t TargetPC, REG_INFO RegSet );
-void FixRandomReg           ( void );
-void FreeSection            ( BLOCK_SECTION * Section, BLOCK_SECTION * Parent);
-void StartRecompilerCPU     ( void );
-void GenerateSectionLinkage ( BLOCK_SECTION * Section );
-void InitilizeInitialCompilerVariable ( void);
-int UnMap_TempRegSet (REG_INFO * RegWorking);
-
-extern uint32_t * TLBLoadAddress, TargetIndex;
-extern TARGET_INFO * TargetInfo;
-extern uint16_t FPU_RoundingMode;
-
-#define SetJump32(Loc,JumpLoc) *(uint32_t *)(Loc)= (uint32_t)(((uint32_t)(JumpLoc)) - (((uint32_t)(Loc)) + 4));
-#define SetJump8(Loc,JumpLoc)  *(uint8_t  *)(Loc)= (uint8_t )(((uint8_t )(JumpLoc)) - (((uint8_t )(Loc)) + 1));
-
-#endif

audacious-plugins-3.1.1.tar.bz2/src/usf/recompiler_fpu_ops.c Deleted

@@ -1,1089 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include "main.h"
-#include "cpu.h"
-#include "x86.h"
-#include "types.h"
-
-uint16_t FPU_RoundingMode = 0x0000;//_RC_NEAR
-char Name[50];
-
-void ChangeDefaultRoundingModel (void) {
-	switch((FPCR[31] & 3)) {
-	case 0: FPU_RoundingMode = 0x0000; break; //_RC_NEAR
-	case 1: FPU_RoundingMode = 0x0C00; break; //_RC_CHOP
-	case 2: FPU_RoundingMode = 0x0800; break; //_RC_UP
-	case 3: FPU_RoundingMode = 0x0400; break; //_RC_UP
-	}
-}
-
-void CompileCop1Test (BLOCK_SECTION * Section) {
-	if (FpuBeenUsed) { return; }
-	TestVariable(STATUS_CU1,&STATUS_REGISTER);
-	CompileExit(Section->CompilePC,&Section->RegWorking,COP1_Unuseable,0,JeLabel32);
-	FpuBeenUsed = 1;
-}
-
-/********************** Load/store functions ************************/
-void Compile_R4300i_LWC1 (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2, TempReg3;
-	CompileCop1Test(Section);
-	if ((Opcode.ft & 1) != 0) {
-		if (RegInStack(Section,Opcode.ft-1,FPU_Double) || RegInStack(Section,Opcode.ft-1,FPU_Qword)) {
-			UnMap_FPR(Section,Opcode.ft-1,1);
-		}
-	}
-	if (RegInStack(Section,Opcode.ft,FPU_Double) || RegInStack(Section,Opcode.ft,FPU_Qword)) {
-		UnMap_FPR(Section,Opcode.ft,1);
-	} else {
-		UnMap_FPR(Section,Opcode.ft,0);
-	}
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-
-		TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-		Compile_LW(TempReg1,Address);
-
-		TempReg2 = Map_TempReg(Section,x86_Any,-1,0);
-		MovePointerToX86reg(&FPRFloatLocation[Opcode.ft],TempReg2);
-		MoveX86regToX86Pointer(TempReg1,TempReg2);
-		return;
-	}
-	if (IsMapped(Opcode.base) && Opcode.offset == 0) {
-		ProtectGPR(Section,Opcode.base);
-		TempReg1 = MipsRegLo(Opcode.base);
-
-	} else {
-		if (IsMapped(Opcode.base)) {
-			ProtectGPR(Section,Opcode.base);
-			if (Opcode.offset != 0) {
-				TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-				LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-			} else {
-				TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-			}
-			UnProtectGPR(Section,Opcode.base);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-			if (Opcode.immediate == 0) {
-			} else if (Opcode.immediate == 1) {
-				IncX86reg(TempReg1);
-			} else if (Opcode.immediate == 0xFFFF) {
-				DecX86reg(TempReg1);
-			} else {
-				AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-			}
-		}
-	}
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	CompileReadTLBMiss(Section,TempReg1,TempReg2);
-
-	TempReg3 = Map_TempReg(Section,x86_Any,-1,0);
-	MoveX86regPointerToX86reg(TempReg1, TempReg2,TempReg3);
-
-	MovePointerToX86reg(&FPRFloatLocation[Opcode.ft],TempReg2);
-	MoveX86regToX86Pointer(TempReg3,TempReg2);
-}
-
-void Compile_R4300i_LDC1 (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2, TempReg3;
-
-
-
-	CompileCop1Test(Section);
-
-	UnMap_FPR(Section,Opcode.ft,0);
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-		TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-		Compile_LW(TempReg1,Address);
-
-		TempReg2 = Map_TempReg(Section,x86_Any,-1,0);
-		MovePointerToX86reg(&FPRDoubleLocation[Opcode.ft],TempReg2);
-		AddConstToX86Reg(TempReg2  | x64_Reg,4);
-		MoveX86regToX86Pointer(TempReg1,TempReg2);
-
-		Compile_LW(TempReg1,Address + 4);
-		MovePointerToX86reg(&FPRDoubleLocation[Opcode.ft],TempReg2);
-		MoveX86regToX86Pointer(TempReg1,TempReg2);
-		return;
-	}
-	if (IsMapped(Opcode.base) && Opcode.offset == 0) {
-		ProtectGPR(Section,Opcode.base);
-		TempReg1 = MipsRegLo(Opcode.base);
-
-	} else {
-		if (IsMapped(Opcode.base)) {
-			ProtectGPR(Section,Opcode.base);
-			if (Opcode.offset != 0) {
-				TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-				LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-			} else {
-				TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-			}
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-			if (Opcode.immediate == 0) {
-			} else if (Opcode.immediate == 1) {
-				IncX86reg(TempReg1);
-			} else if (Opcode.immediate == 0xFFFF) {
-				DecX86reg(TempReg1);
-			} else {
-				AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-			}
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	CompileReadTLBMiss(Section,TempReg1,TempReg2);
-	TempReg3 = Map_TempReg(Section,x86_Any,-1,0);
-	MoveX86regPointerToX86reg(TempReg1, TempReg2,TempReg3);
-	Push(TempReg2);
-	MoveVariableToX86reg(&FPRDoubleLocation[Opcode.ft],TempReg2 | x64_Reg);
-	AddConstToX86Reg(TempReg2 | x64_Reg,4);
-	MoveX86regToX86Pointer(TempReg3,TempReg2);
-	Pop(TempReg2);
-	MoveX86regPointerToX86regDisp8(TempReg1, TempReg2,TempReg3,4);
-	MoveVariableToX86reg(&FPRDoubleLocation[Opcode.ft],TempReg2 | x64_Reg);
-	MoveX86regToX86Pointer(TempReg3,TempReg2);
-
-}
-
-void Compile_R4300i_SWC1 (BLOCK_SECTION * Section){
-	uint32_t TempReg1, TempReg2, TempReg3;
-
-
-
-	CompileCop1Test(Section);
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-
-		UnMap_FPR(Section,Opcode.ft,1);
-		TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-
-		MovePointerToX86reg(&FPRFloatLocation[Opcode.ft],TempReg1);
-		MoveX86PointerToX86reg(TempReg1,TempReg1);
-		Compile_SW_Register(TempReg1, Address);
-		return;
-	}
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	//For tlb miss
-	//0041C522 85 C0                test        eax,eax
-	//0041C524 75 01                jne         0041C527
-
-	UnMap_FPR(Section,Opcode.ft,1);
-	TempReg3 = Map_TempReg(Section,x86_Any,-1,0);
-
-	MovePointerToX86reg(&FPRFloatLocation[Opcode.ft],TempReg3);
-	MoveX86PointerToX86reg(TempReg3,TempReg3);
-	MoveX86regToX86regPointer(TempReg3,TempReg1, TempReg2);
-
-}
-
-void Compile_R4300i_SDC1 (BLOCK_SECTION * Section){
-	uint32_t TempReg1, TempReg2, TempReg3;
-
-	CompileCop1Test(Section);
-
-
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-
-		TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-
-		MovePointerToX86reg((uint8_t *)&FPRDoubleLocation[Opcode.ft],TempReg1);
-		AddConstToX86Reg(TempReg1 | x64_Reg,4);
-		MoveX86PointerToX86reg(TempReg1,TempReg1);
-		Compile_SW_Register(TempReg1, Address);
-
-
-		MovePointerToX86reg(&FPRDoubleLocation[Opcode.ft],TempReg1);
-		MoveX86PointerToX86reg(TempReg1,TempReg1);
-		Compile_SW_Register(TempReg1, Address + 4);
-		return;
-	}
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	//For tlb miss
-	//0041C522 85 C0                test        eax,eax
-	//0041C524 75 01                jne         0041C527
-
-	TempReg3 = Map_TempReg(Section,x86_Any,-1,0);
-
-	MoveVariableToX86reg((uint8_t *)&FPRDoubleLocation[Opcode.ft],TempReg3 | x64_Reg);
-
-	AddConstToX86Reg(TempReg3 | x64_Reg,4);
-	MoveX86PointerToX86reg(TempReg3,TempReg3);
-	MoveX86regToX86regPointer(TempReg3,TempReg1, TempReg2);
-	AddConstToX86Reg(TempReg1,4);
-
-
-	MovePointerToX86reg((uint8_t *)&FPRDoubleLocation[Opcode.ft],TempReg3);
-	MoveX86PointerToX86reg(TempReg3,TempReg3);
-	MoveX86regToX86regPointer(TempReg3,TempReg1, TempReg2);
-
-
-}
-
-/************************** COP1 functions **************************/
-void Compile_R4300i_COP1_MF (BLOCK_SECTION * Section) {
-	uint32_t TempReg;
-
-
-	CompileCop1Test(Section);
-
-	UnMap_FPR(Section,Opcode.fs,1);
-	Map_GPR_32bit(Section,Opcode.rt, 1, -1);
-	TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-
-	MovePointerToX86reg((uint8_t *)&FPRFloatLocation[Opcode.fs],TempReg);
-	MoveX86PointerToX86reg(MipsRegLo(Opcode.rt),TempReg);
-}
-
-void Compile_R4300i_COP1_DMF (BLOCK_SECTION * Section) {
-	uint32_t TempReg;
-
-
-	CompileCop1Test(Section);
-
-	UnMap_FPR(Section,Opcode.fs,1);
-	Map_GPR_64bit(Section,Opcode.rt, -1);
-	TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-	MovePointerToX86reg((uint8_t *)&FPRDoubleLocation[Opcode.fs],TempReg);
-	AddConstToX86Reg(TempReg | x64_Reg,4);
-	MoveX86PointerToX86reg(MipsRegHi(Opcode.rt),TempReg);
-
-	MovePointerToX86reg((uint8_t *)&FPRDoubleLocation[Opcode.fs],TempReg);
-	MoveX86PointerToX86reg(MipsRegLo(Opcode.rt),TempReg);
-}
-
-void Compile_R4300i_COP1_CF(BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-
-	if (Opcode.fs != 31 && Opcode.fs != 0) { Compile_R4300i_UnknownOpcode (Section); return; }
-	Map_GPR_32bit(Section,Opcode.rt,1,-1);
-	MoveVariableToX86reg(&FPCR[Opcode.fs],MipsRegLo(Opcode.rt));
-}
-
-void Compile_R4300i_COP1_MT( BLOCK_SECTION * Section) {
-	uint32_t TempReg;
-
-
-	CompileCop1Test(Section);
-
-	if ((Opcode.fs & 1) != 0) {
-		if (RegInStack(Section,Opcode.fs-1,FPU_Double) || RegInStack(Section,Opcode.fs-1,FPU_Qword)) {
-			UnMap_FPR(Section,Opcode.fs-1,1);
-		}
-	}
-	UnMap_FPR(Section,Opcode.fs,1);
-	TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-	MovePointerToX86reg((uint8_t *)&FPRFloatLocation[Opcode.fs],TempReg);
-
-	if (IsConst(Opcode.rt)) {
-		MoveConstToX86Pointer(MipsRegLo(Opcode.rt),TempReg);
-	} else if (IsMapped(Opcode.rt)) {
-		MoveX86regToX86Pointer(MipsRegLo(Opcode.rt),TempReg);
-	} else {
-		MoveX86regToX86Pointer(Map_TempReg(Section,x86_Any, Opcode.rt, 0),TempReg);
-	}
-}
-
-void Compile_R4300i_COP1_DMT( BLOCK_SECTION * Section) {
-	uint32_t TempReg;
-
-
-	CompileCop1Test(Section);
-
-	if ((Opcode.fs & 1) == 0) {
-		if (RegInStack(Section,Opcode.fs+1,FPU_Float) || RegInStack(Section,Opcode.fs+1,FPU_Dword)) {
-			UnMap_FPR(Section,Opcode.fs+1,1);
-		}
-	}
-	UnMap_FPR(Section,Opcode.fs,1);
-	TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-	MovePointerToX86reg((uint8_t *)&FPRDoubleLocation[Opcode.fs],TempReg);
-
-	if (IsConst(Opcode.rt)) {
-		MoveConstToX86Pointer(MipsRegLo(Opcode.rt),TempReg);
-		AddConstToX86Reg(TempReg,4);
-		if Is64Bit(Opcode.rt) {
-			MoveConstToX86Pointer(MipsRegHi(Opcode.rt),TempReg);
-		} else {
-			MoveConstToX86Pointer(MipsRegLo_S(Opcode.rt) >> 31,TempReg);
-		}
-	} else if (IsMapped(Opcode.rt)) {
-		MoveX86regToX86Pointer(MipsRegLo(Opcode.rt),TempReg);
-		AddConstToX86Reg64(TempReg,4);
-		if Is64Bit(Opcode.rt) {
-			MoveX86regToX86Pointer(MipsRegHi(Opcode.rt),TempReg);
-		} else {
-			MoveX86regToX86Pointer(Map_TempReg(Section,x86_Any, Opcode.rt, 1),TempReg);
-		}
-	} else {
-		int x86Reg = Map_TempReg(Section,x86_Any, Opcode.rt, 0);
-		MoveX86regToX86Pointer(x86Reg,TempReg);
-		AddConstToX86Reg64(TempReg,4);
-		MoveX86regToX86Pointer(Map_TempReg(Section,x86Reg, Opcode.rt, 1),TempReg);
-	}
-}
-
-
-void Compile_R4300i_COP1_CT(BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fs != 31) { Compile_R4300i_UnknownOpcode (Section); return; }
-
-	if (IsConst(Opcode.rt)) {
-		MoveConstToVariable(MipsRegLo(Opcode.rt),&FPCR[Opcode.fs]);
-	} else if (IsMapped(Opcode.rt)) {
-		MoveX86regToVariable(MipsRegLo(Opcode.rt),&FPCR[Opcode.fs]);
-	} else {
-		MoveX86regToVariable(Map_TempReg(Section,x86_Any,Opcode.rt,0),&FPCR[Opcode.fs]);
-	}
-	Pushad();
-	Call_Direct(ChangeDefaultRoundingModel);
-	Popad();
-	CurrentRoundingModel = RoundUnknown;
-}
-
-/************************** COP1: S functions ************************/
-void Compile_R4300i_COP1_S_ADD (BLOCK_SECTION * Section) {
-	uint32_t Reg1 = Opcode.ft == Opcode.fd?Opcode.ft:Opcode.fs;
-	uint32_t Reg2 = Opcode.ft == Opcode.fd?Opcode.fs:Opcode.ft;
-
-
-
-	CompileCop1Test(Section);
-
-	Load_FPR_ToTop(Section,Opcode.fd,Reg1, FPU_Float);
-	if (RegInStack(Section,Reg2, FPU_Float)) {
-		fpuAddReg(StackPosition(Section,Reg2));
-	} else {
-		uint32_t TempReg;
-
-		UnMap_FPR(Section,Reg2,1);
-		TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-		MovePointerToX86reg((uint8_t *)&FPRFloatLocation[Reg2],TempReg);
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fd, FPU_Float);
-		fpuAddDwordRegPointer(TempReg);
-	}
-	UnMap_FPR(Section,Opcode.fd,1);
-}
-
-void Compile_R4300i_COP1_S_SUB (BLOCK_SECTION * Section) {
-	uint32_t Reg1 = Opcode.ft == Opcode.fd?Opcode.ft:Opcode.fs;
-	uint32_t Reg2 = Opcode.ft == Opcode.fd?Opcode.fs:Opcode.ft;
-	uint32_t TempReg;
-
-
-
-	CompileCop1Test(Section);
-
-	if (Opcode.fd == Opcode.ft) {
-		UnMap_FPR(Section,Opcode.fd,1);
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-
-		TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-		MovePointerToX86reg((uint8_t *)&FPRFloatLocation[Opcode.ft],TempReg);
-		fpuSubDwordRegPointer(TempReg);
-	} else {
-		Load_FPR_ToTop(Section,Opcode.fd,Reg1, FPU_Float);
-		if (RegInStack(Section,Reg2, FPU_Float)) {
-			fpuSubReg(StackPosition(Section,Reg2));
-		} else {
-			UnMap_FPR(Section,Reg2,1);
-			Load_FPR_ToTop(Section,Opcode.fd,Opcode.fd, FPU_Float);
-
-			TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-			MovePointerToX86reg((uint8_t *)&FPRFloatLocation[Reg2],TempReg);
-			fpuSubDwordRegPointer(TempReg);
-		}
-	}
-	UnMap_FPR(Section,Opcode.fd,1);
-}
-
-void Compile_R4300i_COP1_S_MUL (BLOCK_SECTION * Section) {
-	uint32_t Reg1 = Opcode.ft == Opcode.fd?Opcode.ft:Opcode.fs;
-	uint32_t Reg2 = Opcode.ft == Opcode.fd?Opcode.fs:Opcode.ft;
-	uint32_t TempReg;
-
-
-
-	CompileCop1Test(Section);
-
-	Load_FPR_ToTop(Section,Opcode.fd,Reg1, FPU_Float);
-	if (RegInStack(Section,Reg2, FPU_Float)) {
-		fpuMulReg(StackPosition(Section,Reg2));
-	} else {
-		UnMap_FPR(Section,Reg2,1);
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fd, FPU_Float);
-
-		TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-		MovePointerToX86reg((uint8_t *)&FPRFloatLocation[Reg2],TempReg);
-		fpuMulDwordRegPointer(TempReg);
-	}
-	UnMap_FPR(Section,Opcode.fd,1);
-}
-
-void Compile_R4300i_COP1_S_DIV (BLOCK_SECTION * Section) {
-	uint32_t Reg1 = Opcode.ft == Opcode.fd?Opcode.ft:Opcode.fs;
-	uint32_t Reg2 = Opcode.ft == Opcode.fd?Opcode.fs:Opcode.ft;
-	uint32_t TempReg;
-
-
-
-	CompileCop1Test(Section);
-
-	if (Opcode.fd == Opcode.ft) {
-		UnMap_FPR(Section,Opcode.fd,1);
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-
-		TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-		MovePointerToX86reg((uint8_t *)&FPRFloatLocation[Opcode.ft],TempReg);
-		fpuDivDwordRegPointer(TempReg);
-	} else {
-		Load_FPR_ToTop(Section,Opcode.fd,Reg1, FPU_Float);
-		if (RegInStack(Section,Reg2, FPU_Float)) {
-			fpuDivReg(StackPosition(Section,Reg2));
-		} else {
-			UnMap_FPR(Section,Reg2,1);
-			Load_FPR_ToTop(Section,Opcode.fd,Opcode.fd, FPU_Float);
-
-			TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-			MovePointerToX86reg((uint8_t *)&FPRFloatLocation[Reg2],TempReg);
-			fpuDivDwordRegPointer(TempReg);
-		}
-	}
-
-	UnMap_FPR(Section,Opcode.fd,1);
-}
-
-void Compile_R4300i_COP1_S_ABS (BLOCK_SECTION * Section) {
-
-	Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	fpuAbs();
-	UnMap_FPR(Section,Opcode.fd,1);
-}
-
-void Compile_R4300i_COP1_S_NEG (BLOCK_SECTION * Section) {
-
-	Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	fpuNeg();
-	UnMap_FPR(Section,Opcode.fd,1);
-}
-
-void Compile_R4300i_COP1_S_SQRT (BLOCK_SECTION * Section) {
-
-	Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	fpuSqrt();
-	UnMap_FPR(Section,Opcode.fd,1);
-}
-
-void Compile_R4300i_COP1_S_MOV (BLOCK_SECTION * Section) {
-
-	Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-}
-
-void Compile_R4300i_COP1_S_TRUNC_L (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Float)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Float,FPU_Qword,RoundTruncate);
-}
-
-void Compile_R4300i_COP1_S_CEIL_L (BLOCK_SECTION * Section) {			//added by Witten
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Float)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Float,FPU_Qword,RoundUp);
-}
-
-void Compile_R4300i_COP1_S_FLOOR_L (BLOCK_SECTION * Section) {			//added by Witten
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Float)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Float,FPU_Qword,RoundDown);
-}
-
-void Compile_R4300i_COP1_S_ROUND_W (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Float)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Float,FPU_Dword,RoundNearest);
-}
-
-void Compile_R4300i_COP1_S_TRUNC_W (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Float)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Float,FPU_Dword,RoundTruncate);
-}
-
-void Compile_R4300i_COP1_S_CEIL_W (BLOCK_SECTION * Section) {			// added by Witten
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Float)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Float,FPU_Dword,RoundUp);
-}
-
-void Compile_R4300i_COP1_S_FLOOR_W (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Float)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Float,FPU_Dword,RoundDown);
-}
-
-void Compile_R4300i_COP1_S_CVT_D (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Float)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Float,FPU_Double,RoundDefault);
-}
-
-void Compile_R4300i_COP1_S_CVT_W (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Float)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Float,FPU_Dword,RoundDefault);
-}
-
-void Compile_R4300i_COP1_S_CVT_L (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Float)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Float);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Float,FPU_Qword,RoundDefault);
-}
-
-void Compile_R4300i_COP1_S_CMP (BLOCK_SECTION * Section) {
-	uint32_t Reg1 = RegInStack(Section,Opcode.ft, FPU_Float)?Opcode.ft:Opcode.fs;
-	uint32_t Reg2 = RegInStack(Section,Opcode.ft, FPU_Float)?Opcode.fs:Opcode.ft;
-	int x86reg, cmp = 0;
-
-
-
-
-	CompileCop1Test(Section);
-	//if ((Opcode.funct & 1) != 0) { Compile_R4300i_UnknownOpcode(Section); }
-	if ((Opcode.funct & 2) != 0) { cmp |= 0x4000; }
-	if ((Opcode.funct & 4) != 0) { cmp |= 0x0100; }
-
-	Load_FPR_ToTop(Section,Reg1,Reg1, FPU_Float);
-	Map_TempReg(Section,x86_EAX, 0, 0);
-	if (RegInStack(Section,Reg2, FPU_Float)) {
-		fpuComReg(StackPosition(Section,Reg2),0);
-	} else {
-		uint32_t TempReg;
-
-		UnMap_FPR(Section,Reg2,1);
-		Load_FPR_ToTop(Section,Reg1,Reg1, FPU_Float);
-
-		TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-		MovePointerToX86reg((uint8_t *)&FPRFloatLocation[Reg2],TempReg);
-		fpuComDwordRegPointer(TempReg,0);
-	}
-	AndConstToVariable(~FPCSR_C, &FSTATUS_REGISTER);
-	fpuStoreStatus();
-	x86reg = Map_TempReg(Section,x86_Any8Bit, 0, 0);
-	TestConstToX86Reg(cmp,x86_EAX);
-	Setnz(x86reg);
-
-	if (cmp != 0) {
-		TestConstToX86Reg(cmp,x86_EAX);
-		Setnz(x86reg);
-
-		if ((Opcode.funct & 1) != 0) {
-			int x86reg2 = Map_TempReg(Section,x86_Any8Bit, 0, 0);
-			AndConstToX86Reg(x86_EAX, 0x4300);
-			CompConstToX86reg(x86_EAX, 0x4300);
-			Setz(x86reg2);
-
-			OrX86RegToX86Reg(x86reg, x86reg2);
-		}
-	} else if ((Opcode.funct & 1) != 0) {
-		AndConstToX86Reg(x86_EAX, 0x4300);
-		CompConstToX86reg(x86_EAX, 0x4300);
-		Setz(x86reg);
-	}
-	ShiftLeftSignImmed(x86reg, 23);
-	OrX86RegToVariable(&FPCR[31], x86reg);
-}
-
-/************************** COP1: D functions ************************/
-void Compile_R4300i_COP1_D_ADD (BLOCK_SECTION * Section) {
-	uint32_t Reg1 = Opcode.ft == Opcode.fd?Opcode.ft:Opcode.fs;
-	uint32_t Reg2 = Opcode.ft == Opcode.fd?Opcode.fs:Opcode.ft;
-
-
-
-	CompileCop1Test(Section);
-
-	Load_FPR_ToTop(Section,Opcode.fd,Reg1, FPU_Double);
-	if (RegInStack(Section,Reg2, FPU_Double)) {
-		fpuAddReg(StackPosition(Section,Reg2));
-	} else {
-		uint32_t TempReg;
-
-		UnMap_FPR(Section,Reg2,1);
-		TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-		MovePointerToX86reg((uint8_t *)&FPRDoubleLocation[Reg2],TempReg);
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fd, FPU_Double);
-		fpuAddQwordRegPointer(TempReg);
-	}
-}
-
-void Compile_R4300i_COP1_D_SUB (BLOCK_SECTION * Section) {
-	uint32_t Reg1 = Opcode.ft == Opcode.fd?Opcode.ft:Opcode.fs;
-	uint32_t Reg2 = Opcode.ft == Opcode.fd?Opcode.fs:Opcode.ft;
-	uint32_t TempReg;
-
-
-
-	CompileCop1Test(Section);
-
-	if (Opcode.fd == Opcode.ft) {
-		UnMap_FPR(Section,Opcode.fd,1);
-		TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-		MovePointerToX86reg((uint8_t *)&FPRDoubleLocation[Opcode.ft],TempReg);
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-		fpuSubQwordRegPointer(TempReg);
-	} else {
-		Load_FPR_ToTop(Section,Opcode.fd,Reg1, FPU_Double);
-		if (RegInStack(Section,Reg2, FPU_Double)) {
-			fpuSubReg(StackPosition(Section,Reg2));
-		} else {
-			UnMap_FPR(Section,Reg2,1);
-
-			TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-			MovePointerToX86reg((uint8_t *)&FPRDoubleLocation[Reg2],TempReg);
-			Load_FPR_ToTop(Section,Opcode.fd,Opcode.fd, FPU_Double);
-			fpuSubQwordRegPointer(TempReg);
-		}
-	}
-}
-
-void Compile_R4300i_COP1_D_MUL (BLOCK_SECTION * Section) {
-	uint32_t Reg1 = Opcode.ft == Opcode.fd?Opcode.ft:Opcode.fs;
-	uint32_t Reg2 = Opcode.ft == Opcode.fd?Opcode.fs:Opcode.ft;
-	uint32_t TempReg;
-
-
-
-	CompileCop1Test(Section);
-
-	Load_FPR_ToTop(Section,Opcode.fd,Reg1, FPU_Double);
-	if (RegInStack(Section,Reg2, FPU_Double)) {
-		fpuMulReg(StackPosition(Section,Reg2));
-	} else {
-		UnMap_FPR(Section,Reg2,1);
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fd, FPU_Double);
-		TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-		MovePointerToX86reg((uint8_t *)&FPRDoubleLocation[Reg2],TempReg);
-		fpuMulQwordRegPointer(TempReg);
-	}
-}
-
-void Compile_R4300i_COP1_D_DIV (BLOCK_SECTION * Section) {
-	uint32_t Reg1 = Opcode.ft == Opcode.fd?Opcode.ft:Opcode.fs;
-	uint32_t Reg2 = Opcode.ft == Opcode.fd?Opcode.fs:Opcode.ft;
-	uint32_t TempReg;
-
-
-
-	CompileCop1Test(Section);
-
-	if (Opcode.fd == Opcode.ft) {
-		UnMap_FPR(Section,Opcode.fd,1);
-		TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-		MovePointerToX86reg((uint8_t *)&FPRDoubleLocation[Opcode.ft],TempReg);
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-		fpuDivQwordRegPointer(TempReg);
-	} else {
-		Load_FPR_ToTop(Section,Opcode.fd,Reg1, FPU_Double);
-		if (RegInStack(Section,Reg2, FPU_Double)) {
-			fpuDivReg(StackPosition(Section,Reg2));
-		} else {
-			UnMap_FPR(Section,Reg2,1);
-			TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-			MovePointerToX86reg((uint8_t *)&FPRDoubleLocation[Reg2],TempReg);
-			Load_FPR_ToTop(Section,Opcode.fd,Opcode.fd, FPU_Double);
-			fpuDivQwordRegPointer(TempReg);
-		}
-	}
-}
-
-void Compile_R4300i_COP1_D_ABS (BLOCK_SECTION * Section) {
-
-	Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	fpuAbs();
-}
-
-void Compile_R4300i_COP1_D_NEG (BLOCK_SECTION * Section) {
-
-	Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	fpuNeg();
-}
-
-void Compile_R4300i_COP1_D_SQRT (BLOCK_SECTION * Section) {
-
-	Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	fpuSqrt();
-}
-
-void Compile_R4300i_COP1_D_MOV (BLOCK_SECTION * Section) {
-
-	Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-}
-
-void Compile_R4300i_COP1_D_TRUNC_L (BLOCK_SECTION * Section) {			//added by Witten
-
-
-	CompileCop1Test(Section);
-	if (RegInStack(Section,Opcode.fs,FPU_Double) || RegInStack(Section,Opcode.fs,FPU_Qword)) {
-		UnMap_FPR(Section,Opcode.fs,1);
-	}
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Double)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Double,FPU_Qword,RoundTruncate);
-}
-
-void Compile_R4300i_COP1_D_CEIL_L (BLOCK_SECTION * Section) {			//added by Witten
-
-
-	CompileCop1Test(Section);
-	if (RegInStack(Section,Opcode.fs,FPU_Double) || RegInStack(Section,Opcode.fs,FPU_Qword)) {
-		UnMap_FPR(Section,Opcode.fs,1);
-	}
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Double)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Double,FPU_Qword,RoundUp);
-}
-
-void Compile_R4300i_COP1_D_FLOOR_L (BLOCK_SECTION * Section) {			//added by Witten
-
-
-	CompileCop1Test(Section);
-	if (RegInStack(Section,Opcode.fs,FPU_Double) || RegInStack(Section,Opcode.fs,FPU_Qword)) {
-		UnMap_FPR(Section,Opcode.fs,1);
-	}
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Double)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Double,FPU_Qword,RoundDown);
-}
-
-void Compile_R4300i_COP1_D_ROUND_W (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (RegInStack(Section,Opcode.fs,FPU_Double) || RegInStack(Section,Opcode.fs,FPU_Qword)) {
-		UnMap_FPR(Section,Opcode.fs,1);
-	}
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Double)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Double,FPU_Dword,RoundNearest);
-}
-
-void Compile_R4300i_COP1_D_TRUNC_W (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (RegInStack(Section,Opcode.fs,FPU_Double) || RegInStack(Section,Opcode.fs,FPU_Qword)) {
-		UnMap_FPR(Section,Opcode.fs,1);
-	}
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Double)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Double,FPU_Dword,RoundTruncate);
-}
-
-void Compile_R4300i_COP1_D_CEIL_W (BLOCK_SECTION * Section) {				// added by Witten
-
-
-	CompileCop1Test(Section);
-	if (RegInStack(Section,Opcode.fs,FPU_Double) || RegInStack(Section,Opcode.fs,FPU_Qword)) {
-		UnMap_FPR(Section,Opcode.fs,1);
-	}
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Double)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Double,FPU_Dword,RoundUp);
-}
-
-void Compile_R4300i_COP1_D_FLOOR_W (BLOCK_SECTION * Section) {			//added by Witten
-
-
-	CompileCop1Test(Section);
-	if (RegInStack(Section,Opcode.fs,FPU_Double) || RegInStack(Section,Opcode.fs,FPU_Qword)) {
-		UnMap_FPR(Section,Opcode.fs,1);
-	}
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Double)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Double,FPU_Dword,RoundDown);
-}
-
-void Compile_R4300i_COP1_D_CVT_S (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (RegInStack(Section,Opcode.fs,FPU_Double) || RegInStack(Section,Opcode.fs,FPU_Qword)) {
-		UnMap_FPR(Section,Opcode.fs,1);
-	}
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Double)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Double,FPU_Float,RoundDefault);
-}
-
-void Compile_R4300i_COP1_D_CVT_W (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (RegInStack(Section,Opcode.fs,FPU_Double) || RegInStack(Section,Opcode.fs,FPU_Qword)) {
-		UnMap_FPR(Section,Opcode.fs,1);
-	}
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Double)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Double,FPU_Dword,RoundDefault);
-}
-
-void Compile_R4300i_COP1_D_CVT_L (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (RegInStack(Section,Opcode.fs,FPU_Double) || RegInStack(Section,Opcode.fs,FPU_Qword)) {
-		UnMap_FPR(Section,Opcode.fs,1);
-	}
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Double)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Double);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Double,FPU_Qword,RoundDefault);
-}
-
-void Compile_R4300i_COP1_D_CMP (BLOCK_SECTION * Section) {
-	uint32_t Reg1 = RegInStack(Section,Opcode.ft, FPU_Float)?Opcode.ft:Opcode.fs;
-	uint32_t Reg2 = RegInStack(Section,Opcode.ft, FPU_Float)?Opcode.fs:Opcode.ft;
-	int x86reg, cmp = 0;
-
-
-
-
-	CompileCop1Test(Section);
-	//if ((Opcode.funct & 1) != 0) { Compile_R4300i_UnknownOpcode(Section); }
-	if ((Opcode.funct & 2) != 0) { cmp |= 0x4000; }
-	if ((Opcode.funct & 4) != 0) { cmp |= 0x0100; }
-
-	Load_FPR_ToTop(Section,Reg1,Reg1, FPU_Double);
-	Map_TempReg(Section,x86_EAX, 0, 0);
-	if (RegInStack(Section,Reg2, FPU_Double)) {
-		fpuComReg(StackPosition(Section,Reg2),0);
-	} else {
-		uint32_t TempReg;
-
-		UnMap_FPR(Section,Reg2,1);
-		TempReg = Map_TempReg(Section,x86_Any,-1,0);
-
-		MovePointerToX86reg((uint8_t *)&FPRDoubleLocation[Reg2],TempReg);
-		Load_FPR_ToTop(Section,Reg1,Reg1, FPU_Double);
-		fpuComQwordRegPointer(TempReg,0);
-	}
-	AndConstToVariable(~FPCSR_C, &FSTATUS_REGISTER);
-	fpuStoreStatus();
-	x86reg = Map_TempReg(Section,x86_Any8Bit, 0, 0);
-	TestConstToX86Reg(cmp,x86_EAX);
-	Setnz(x86reg);
-	if (cmp != 0) {
-		TestConstToX86Reg(cmp,x86_EAX);
-		Setnz(x86reg);
-
-		if ((Opcode.funct & 1) != 0) {
-			int x86reg2 = Map_TempReg(Section,x86_Any8Bit, 0, 0);
-			AndConstToX86Reg(x86_EAX, 0x4300);
-			CompConstToX86reg(x86_EAX, 0x4300);
-			Setz(x86reg2);
-
-			OrX86RegToX86Reg(x86reg, x86reg2);
-		}
-	} else if ((Opcode.funct & 1) != 0) {
-		AndConstToX86Reg(x86_EAX, 0x4300);
-		CompConstToX86reg(x86_EAX, 0x4300);
-		Setz(x86reg);
-	}
-	ShiftLeftSignImmed(x86reg, 23);
-	OrX86RegToVariable(&FPCR[31], x86reg);
-}
-
-/************************** COP1: W functions ************************/
-void Compile_R4300i_COP1_W_CVT_S (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Dword)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Dword);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Dword,FPU_Float,RoundDefault);
-}
-
-void Compile_R4300i_COP1_W_CVT_D (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Dword)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Dword);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Dword,FPU_Double,RoundDefault);
-}
-
-/************************** COP1: L functions ************************/
-void Compile_R4300i_COP1_L_CVT_S (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Qword)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Qword);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Qword,FPU_Float,RoundDefault);
-}
-
-void Compile_R4300i_COP1_L_CVT_D (BLOCK_SECTION * Section) {
-
-
-	CompileCop1Test(Section);
-	if (Opcode.fd != Opcode.fs || !RegInStack(Section,Opcode.fd,FPU_Qword)) {
-		Load_FPR_ToTop(Section,Opcode.fd,Opcode.fs,FPU_Qword);
-	}
-	ChangeFPURegFormat(Section,Opcode.fd,FPU_Qword,FPU_Double,RoundDefault);
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/recompiler_ops.c Deleted

@@ -1,4657 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#include "main.h"
-#include "cpu.h"
-#include "x86.h"
-#include "types.h"
-
-uint32_t BranchCompare = 0;
-
-void CompileReadTLBMiss (BLOCK_SECTION * Section, int32_t AddressReg, int32_t LookUpReg ) {
-#ifdef USEX64
- MoveX86regToMemory(AddressReg, x86_R15, (uintptr_t)TLBLoadAddress-(uintptr_t)TLB_Map);
-#else
-	MoveX86regToVariable(AddressReg,TLBLoadAddress);
-#endif
- TestX86RegToX86Reg(LookUpReg,LookUpReg);
-	CompileExit(Section->CompilePC,&Section->RegWorking,TLBReadMiss,0,JeLabel32);
-}
-
-/************************** Branch functions ************************/
-void Compile_R4300i_Branch (BLOCK_SECTION * Section, void (*CompareFunc)(BLOCK_SECTION * Section), int32_t BranchType, uint32_t Link) {
-	static int32_t EffectDelaySlot;
-	static REG_INFO RegBeforeDelay;
-	int32_t count;
-
-	if ( NextInstruction == NORMAL ) {
-
-		if ((Section->CompilePC & 0xFFC) != 0xFFC) {
-			switch (BranchType) {
-			case BranchTypeRs: EffectDelaySlot = DelaySlotEffectsCompare(Section->CompilePC,Opcode.rs,0); break;
-			case BranchTypeRsRt: EffectDelaySlot = DelaySlotEffectsCompare(Section->CompilePC,Opcode.rs,Opcode.rt); break;
-			case BranchTypeCop1:
-				{
-					OPCODE Command;
-
-					if (!r4300i_LW_VAddr(Section->CompilePC + 4, &Command.Hex)) {
-						//DisplayError(GS(MSG_FAIL_LOAD_WORD));
-						StopEmulation();
-					}
-
-					EffectDelaySlot = 0;
-					if (Command.op == R4300i_CP1) {
-						if (Command.fmt == R4300i_COP1_S && (Command.funct & 0x30) == 0x30 ) {
-							EffectDelaySlot = 1;
-						}
-						if (Command.fmt == R4300i_COP1_D && (Command.funct & 0x30) == 0x30 ) {
-							EffectDelaySlot = 1;
-						}
-					}
-				}
-				break;
-
-			}
-		} else {
-			EffectDelaySlot = 1;
-		}
-		Section->Jump.TargetPC = Section->CompilePC + ((short)Opcode.offset << 2) + 4;
-		Section->Jump.LinkLocation = NULL;
-		Section->Jump.LinkLocation2 = NULL;
-		Section->Jump.DoneDelaySlot = 0;
-		Section->Cont.TargetPC = Section->CompilePC + 8;
-		Section->Cont.LinkLocation = NULL;
-		Section->Cont.LinkLocation2 = NULL;
-		Section->Cont.DoneDelaySlot = 0;
-		if (Section->Jump.TargetPC < Section->Cont.TargetPC) {
-			Section->Cont.FallThrough = 0;
-			Section->Jump.FallThrough = 1;
-		} else {
-			Section->Cont.FallThrough = 1;
-			Section->Jump.FallThrough = 0;
-		}
-		if (Link) {
-			UnMap_GPR(Section, 31, 0);
-			MipsRegLo(31) = Section->CompilePC + 8;
-			MipsRegState(31) = STATE_CONST_32;
-		}
-		if (EffectDelaySlot) {
-			CompareFunc(Section);
-
-			if ((Section->CompilePC & 0xFFC) == 0xFFC) {
-				GenerateSectionLinkage(Section);
-				NextInstruction = END_BLOCK;
-				return;
-			}
-			if (!Section->Jump.FallThrough && !Section->Cont.FallThrough) {
-				if (Section->Jump.LinkLocation != NULL) {
-					SetJump32((uint32_t *)Section->Jump.LinkLocation,(uint32_t *)RecompPos);
-					Section->Jump.LinkLocation = NULL;
-					if (Section->Jump.LinkLocation2 != NULL) {
-						SetJump32((uint32_t *)Section->Jump.LinkLocation2,(uint32_t *)RecompPos);
-						Section->Jump.LinkLocation2 = NULL;
-					}
-					Section->Jump.FallThrough = 1;
-				} else if (Section->Cont.LinkLocation != NULL){
-
-					SetJump32((uint32_t *)Section->Cont.LinkLocation,(uint32_t *)RecompPos);
-					Section->Cont.LinkLocation = NULL;
-					if (Section->Cont.LinkLocation2 != NULL) {
-						SetJump32((uint32_t *)Section->Cont.LinkLocation2,(uint32_t *)RecompPos);
-						Section->Cont.LinkLocation2 = NULL;
-					}
-					Section->Cont.FallThrough = 1;
-				}
-			}
-			for (count = 1; count < 64; count ++) { x86Protected(count) = 0; }
-			memcpy(&RegBeforeDelay,&Section->RegWorking,sizeof(REG_INFO));
-		}
-		NextInstruction = DO_DELAY_SLOT;
-	} else if (NextInstruction == DELAY_SLOT_DONE ) {
-		if (EffectDelaySlot) {
-			JUMP_INFO * FallInfo = Section->Jump.FallThrough?&Section->Jump:&Section->Cont;
-			JUMP_INFO * JumpInfo = Section->Jump.FallThrough?&Section->Cont:&Section->Jump;
-
-			if (FallInfo->FallThrough && !FallInfo->DoneDelaySlot) {
-				for (count = 1; count < 64; count ++) { x86Protected(count) = 0; }
-				memcpy(&FallInfo->RegSet,&Section->RegWorking,sizeof(REG_INFO));
-				FallInfo->DoneDelaySlot = 1;
-				if (!JumpInfo->DoneDelaySlot) {
-					FallInfo->FallThrough = 0;
-					JmpLabel32(0);
-					FallInfo->LinkLocation = RecompPos - 4;
-
-					if (JumpInfo->LinkLocation != NULL) {
-						SetJump32((uint32_t *)JumpInfo->LinkLocation,(uint32_t *)RecompPos);
-						JumpInfo->LinkLocation = NULL;
-						if (JumpInfo->LinkLocation2 != NULL) {
-							SetJump32((uint32_t *)JumpInfo->LinkLocation2,(uint32_t *)RecompPos);
-							JumpInfo->LinkLocation2 = NULL;
-						}
-						JumpInfo->FallThrough = 1;
-						NextInstruction = DO_DELAY_SLOT;
-						memcpy(&Section->RegWorking,&RegBeforeDelay,sizeof(REG_INFO));
-						return;
-					}
-				}
-			}
-		} else {
-			int32_t count;
-
-			CompareFunc(Section);
-			for (count = 1; count < 64; count ++) { x86Protected(count) = 0; }
-			memcpy(&Section->Cont.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-			memcpy(&Section->Jump.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-		}
-		GenerateSectionLinkage(Section);
-		NextInstruction = END_BLOCK;
-	} else {
-
-	}
-}
-
-void Compile_R4300i_BranchLikely (BLOCK_SECTION * Section, void (*CompareFunc)(BLOCK_SECTION * Section), uint32_t Link) {
-	int32_t count;
-
-	if ( NextInstruction == NORMAL ) {
-		Section->Jump.TargetPC = Section->CompilePC + ((short)Opcode.offset << 2) + 4;
-		Section->Jump.FallThrough = 1;
-		Section->Jump.LinkLocation = NULL;
-		Section->Jump.LinkLocation2 = NULL;
-		Section->Cont.TargetPC = Section->CompilePC + 8;
-		Section->Cont.FallThrough = 0;
-		Section->Cont.LinkLocation = NULL;
-		Section->Cont.LinkLocation2 = NULL;
-		if (Link) {
-			UnMap_GPR(Section, 31, 0);
-			MipsRegLo(31) = Section->CompilePC + 8;
-			MipsRegState(31) = STATE_CONST_32;
-		}
-		CompareFunc(Section);
-		for (count = 1; count < 64; count ++) { x86Protected(count) = 0; }
-		memcpy(&Section->Cont.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-
-		if (Section->Cont.FallThrough) {
-			if (Section->Jump.LinkLocation != NULL) {
-			}
-			GenerateSectionLinkage(Section);
-			NextInstruction = END_BLOCK;
-		} else {
-			if ((Section->CompilePC & 0xFFC) == 0xFFC) {
-				Section->Jump.FallThrough = 0;
-				if (Section->Jump.LinkLocation != NULL) {
-					SetJump32(Section->Jump.LinkLocation,RecompPos);
-					Section->Jump.LinkLocation = NULL;
-					if (Section->Jump.LinkLocation2 != NULL) {
-						SetJump32(Section->Jump.LinkLocation2,RecompPos);
-						Section->Jump.LinkLocation2 = NULL;
-					}
-				}
-				JmpLabel32(0);
-				Section->Jump.LinkLocation = RecompPos - 4;
-				if (Section->Cont.LinkLocation != NULL) {
-					SetJump32(Section->Cont.LinkLocation,RecompPos);
-					Section->Cont.LinkLocation = NULL;
-					if (Section->Cont.LinkLocation2 != NULL) {
-						SetJump32(Section->Cont.LinkLocation2,RecompPos);
-						Section->Cont.LinkLocation2 = NULL;
-					}
-				}
-				CompileExit (Section->CompilePC + 8,&Section->RegWorking,Normal,1,NULL);
-				GenerateSectionLinkage(Section);
-				NextInstruction = END_BLOCK;
-			} else {
-				NextInstruction = DO_DELAY_SLOT;
-			}
-		}
-	} else if (NextInstruction == DELAY_SLOT_DONE ) {
-		for (count = 1; count < 64; count ++) { x86Protected(count) = 0; }
-		memcpy(&Section->Jump.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-		GenerateSectionLinkage(Section);
-		NextInstruction = END_BLOCK;
-	} else {
-	}
-}
-
-void BNE_Compare (BLOCK_SECTION * Section) {
-	uint8_t *Jump;
-
-	if (IsKnown(Opcode.rs) && IsKnown(Opcode.rt)) {
-		if (IsConst(Opcode.rs) && IsConst(Opcode.rt)) {
-			if (Is64Bit(Opcode.rs) || Is64Bit(Opcode.rt)) {
-				Compile_R4300i_UnknownOpcode(Section);
-			} else if (MipsRegLo(Opcode.rs) != MipsRegLo(Opcode.rt)) {
-				Section->Jump.FallThrough = 1;
-				Section->Cont.FallThrough = 0;
-			} else {
-				Section->Jump.FallThrough = 0;
-				Section->Cont.FallThrough = 1;
-			}
-		} else if (IsMapped(Opcode.rs) && IsMapped(Opcode.rt)) {
-			if (Is64Bit(Opcode.rs) || Is64Bit(Opcode.rt)) {
-				ProtectGPR(Section,Opcode.rs);
-				ProtectGPR(Section,Opcode.rt);
-
-				CompX86RegToX86Reg(
-					Is32Bit(Opcode.rs)?Map_TempReg(Section,x86_Any,Opcode.rs,1):MipsRegHi(Opcode.rs),
-					Is32Bit(Opcode.rt)?Map_TempReg(Section,x86_Any,Opcode.rt,1):MipsRegHi(Opcode.rt)
-				);
-
-				if (Section->Jump.FallThrough) {
-					JneLabel8(0);
-					Jump = RecompPos - 1;
-				} else {
-					JneLabel32(0);
-					Section->Jump.LinkLocation = RecompPos - 4;
-				}
-				CompX86RegToX86Reg(MipsRegLo(Opcode.rs),MipsRegLo(Opcode.rt));
-				if (Section->Cont.FallThrough) {
-					JneLabel32 ( 0 );
-					Section->Jump.LinkLocation2 = RecompPos - 4;
-				} else if (Section->Jump.FallThrough) {
-					JeLabel32 ( 0 );
-					Section->Cont.LinkLocation = RecompPos - 4;
-					SetJump8(Jump,RecompPos);
-				} else {
-					JeLabel32 ( 0 );
-					Section->Cont.LinkLocation = RecompPos - 4;
-					JmpLabel32(0);
-					Section->Jump.LinkLocation2 = RecompPos - 4;
-				}
-			} else {
-				CompX86RegToX86Reg(MipsRegLo(Opcode.rs),MipsRegLo(Opcode.rt));
-				if (Section->Cont.FallThrough) {
-					JneLabel32 ( 0 );
-					Section->Jump.LinkLocation = RecompPos - 4;
-				} else if (Section->Jump.FallThrough) {
-					JeLabel32 ( 0 );
-					Section->Cont.LinkLocation = RecompPos - 4;
-				} else {
-					JeLabel32 ( 0 );
-					Section->Cont.LinkLocation = RecompPos - 4;
-					JmpLabel32(0);
-					Section->Jump.LinkLocation = RecompPos - 4;
-				}
-			}
-		} else {
-			uint32_t ConstReg = IsConst(Opcode.rt)?Opcode.rt:Opcode.rs;
-			uint32_t MappedReg = IsConst(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-			if (Is64Bit(ConstReg) || Is64Bit(MappedReg)) {
-				if (Is32Bit(ConstReg) || Is32Bit(MappedReg)) {
-					ProtectGPR(Section,MappedReg);
-					if (Is32Bit(MappedReg)) {
-						CompConstToX86reg(Map_TempReg(Section,x86_Any,MappedReg,1),MipsRegHi(ConstReg));
-					} else {
-						CompConstToX86reg(MipsRegHi(MappedReg),(int32_t)MipsRegLo(ConstReg) >> 31);
-					}
-				} else {
-					CompConstToX86reg(MipsRegHi(MappedReg),MipsRegHi(ConstReg));
-				}
-				if (Section->Jump.FallThrough) {
-					JneLabel8(0);
-					Jump = RecompPos - 1;
-				} else {
-					JneLabel32(0);
-					Section->Jump.LinkLocation = RecompPos - 4;
-				}
-				if (MipsRegLo(ConstReg) == 0) {
-					OrX86RegToX86Reg(MipsRegLo(MappedReg),MipsRegLo(MappedReg));
-				} else {
-					CompConstToX86reg(MipsRegLo(MappedReg),MipsRegLo(ConstReg));
-				}
-				if (Section->Cont.FallThrough) {
-					JneLabel32 ( 0 );
-					Section->Jump.LinkLocation2 = RecompPos - 4;
-				} else if (Section->Jump.FallThrough) {
-					JeLabel32 ( 0 );
-					Section->Cont.LinkLocation = RecompPos - 4;
-
-
-					SetJump8(Jump,RecompPos);
-				} else {
-					JeLabel32 ( 0 );
-					Section->Cont.LinkLocation = RecompPos - 4;
-					JmpLabel32(0);
-					Section->Jump.LinkLocation2 = RecompPos - 4;
-				}
-			} else {
-				if (MipsRegLo(ConstReg) == 0) {
-					OrX86RegToX86Reg(MipsRegLo(MappedReg),MipsRegLo(MappedReg));
-				} else {
-					CompConstToX86reg(MipsRegLo(MappedReg),MipsRegLo(ConstReg));
-				}
-				if (Section->Cont.FallThrough) {
-					JneLabel32 ( 0 );
-					Section->Jump.LinkLocation = RecompPos - 4;
-				} else if (Section->Jump.FallThrough) {
-					JeLabel32 ( 0 );
-					Section->Cont.LinkLocation = RecompPos - 4;
-				} else {
-					JeLabel32 ( 0 );
-					Section->Cont.LinkLocation = RecompPos - 4;
-					JmpLabel32(0);
-					Section->Jump.LinkLocation = RecompPos - 4;
-				}
-			}
-		}
-	} else if (IsKnown(Opcode.rs) || IsKnown(Opcode.rt)) {
-		uint32_t KnownReg = IsKnown(Opcode.rt)?Opcode.rt:Opcode.rs;
-		uint32_t UnknownReg = IsKnown(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-		if (IsConst(KnownReg)) {
-			if (Is64Bit(KnownReg)) {
-				CompConstToVariable(MipsRegHi(KnownReg),&GPR[UnknownReg].W[1]);
-			} else if (IsSigned(KnownReg)) {
-				CompConstToVariable(((int32_t)MipsRegLo(KnownReg) >> 31),&GPR[UnknownReg].W[1]);
-			} else {
-				CompConstToVariable(0,&GPR[UnknownReg].W[1]);
-			}
-		} else {
-			if (Is64Bit(KnownReg)) {
-				CompX86regToVariable(MipsRegHi(KnownReg),&GPR[UnknownReg].W[1]);
-			} else if (IsSigned(KnownReg)) {
-				ProtectGPR(Section,KnownReg);
-				CompX86regToVariable(Map_TempReg(Section,x86_Any,KnownReg,1),&GPR[UnknownReg].W[1]);
-			} else {
-				CompConstToVariable(0,&GPR[UnknownReg].W[1]);
-			}
-		}
-		if (Section->Jump.FallThrough) {
-			JneLabel8(0);
-			Jump = RecompPos - 1;
-		} else {
-			JneLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-		}
-		if (IsConst(KnownReg)) {
-			CompConstToVariable(MipsRegLo(KnownReg),&GPR[UnknownReg].W[0]);
-		} else {
-			CompX86regToVariable(MipsRegLo(KnownReg),&GPR[UnknownReg].W[0]);
-		}
-		if (Section->Cont.FallThrough) {
-			JneLabel32 ( 0 );
-			Section->Jump.LinkLocation2 = RecompPos - 4;
-		} else if (Section->Jump.FallThrough) {
-			JeLabel32 ( 0 );
-			Section->Cont.LinkLocation = RecompPos - 4;
-
-
-			SetJump8(Jump,RecompPos);
-		} else {
-			JeLabel32 ( 0 );
-			Section->Cont.LinkLocation = RecompPos - 4;
-			JmpLabel32(0);
-			Section->Jump.LinkLocation2 = RecompPos - 4;
-		}
-	} else {
-		int32_t x86Reg;
-
-		x86Reg = Map_TempReg(Section,x86_Any,Opcode.rt,1);
-		CompX86regToVariable(x86Reg,&GPR[Opcode.rs].W[1]);
-		if (Section->Jump.FallThrough) {
-			JneLabel8(0);
-			Jump = RecompPos - 1;
-		} else {
-			JneLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-		}
-
-		x86Reg = Map_TempReg(Section,x86Reg,Opcode.rt,0);
-		CompX86regToVariable(x86Reg,&GPR[Opcode.rs].W[0]);
-		if (Section->Cont.FallThrough) {
-			JneLabel32 ( 0 );
-			Section->Jump.LinkLocation2 = RecompPos - 4;
-		} else if (Section->Jump.FallThrough) {
-			JeLabel32 ( 0 );
-			Section->Cont.LinkLocation = RecompPos - 4;
-
-
-			SetJump8(Jump,RecompPos);
-		} else {
-			JeLabel32 ( 0 );
-			Section->Cont.LinkLocation = RecompPos - 4;
-			JmpLabel32(0);
-			Section->Jump.LinkLocation2 = RecompPos - 4;
-		}
-	}
-}
-
-void BEQ_Compare (BLOCK_SECTION * Section) {
-	uint8_t *Jump;
-
-	if (IsKnown(Opcode.rs) && IsKnown(Opcode.rt)) {
-		if (IsConst(Opcode.rs) && IsConst(Opcode.rt)) {
-			if (Is64Bit(Opcode.rs) || Is64Bit(Opcode.rt)) {
-				Compile_R4300i_UnknownOpcode(Section);
-			} else if (MipsRegLo(Opcode.rs) == MipsRegLo(Opcode.rt)) {
-				Section->Jump.FallThrough = 1;
-				Section->Cont.FallThrough = 0;
-			} else {
-				Section->Jump.FallThrough = 0;
-				Section->Cont.FallThrough = 1;
-			}
-		} else if (IsMapped(Opcode.rs) && IsMapped(Opcode.rt)) {
-			if (Is64Bit(Opcode.rs) || Is64Bit(Opcode.rt)) {
-				ProtectGPR(Section,Opcode.rs);
-				ProtectGPR(Section,Opcode.rt);
-
-				CompX86RegToX86Reg(
-					Is32Bit(Opcode.rs)?Map_TempReg(Section,x86_Any,Opcode.rs,1):MipsRegHi(Opcode.rs),
-					Is32Bit(Opcode.rt)?Map_TempReg(Section,x86_Any,Opcode.rt,1):MipsRegHi(Opcode.rt)
-				);
-				if (Section->Cont.FallThrough) {
-					JneLabel8(0);
-					Jump = RecompPos - 1;
-				} else {
-					JneLabel32(0);
-					Section->Cont.LinkLocation = RecompPos - 4;
-				}
-				CompX86RegToX86Reg(MipsRegLo(Opcode.rs),MipsRegLo(Opcode.rt));
-				if (Section->Cont.FallThrough) {
-					JeLabel32 ( 0 );
-					Section->Jump.LinkLocation = RecompPos - 4;
-
-
-					SetJump8(Jump,RecompPos);
-				} else if (Section->Jump.FallThrough) {
-					JneLabel32 ( 0 );
-					Section->Cont.LinkLocation2 = RecompPos - 4;
-				} else {
-					JneLabel32 ( 0 );
-					Section->Cont.LinkLocation2 = RecompPos - 4;
-					JmpLabel32(0);
-					Section->Jump.LinkLocation = RecompPos - 4;
-				}
-			} else {
-				CompX86RegToX86Reg(MipsRegLo(Opcode.rs),MipsRegLo(Opcode.rt));
-				if (Section->Cont.FallThrough) {
-					JeLabel32 ( 0 );
-					Section->Jump.LinkLocation = RecompPos - 4;
-				} else if (Section->Jump.FallThrough) {
-					JneLabel32 ( 0 );
-					Section->Cont.LinkLocation = RecompPos - 4;
-				} else {
-					JneLabel32 ( 0 );
-					Section->Cont.LinkLocation = RecompPos - 4;
-					JmpLabel32(0);
-					Section->Jump.LinkLocation = RecompPos - 4;
-				}
-			}
-		} else {
-			uint32_t ConstReg = IsConst(Opcode.rt)?Opcode.rt:Opcode.rs;
-			uint32_t MappedReg = IsConst(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-			if (Is64Bit(ConstReg) || Is64Bit(MappedReg)) {
-				if (Is32Bit(ConstReg) || Is32Bit(MappedReg)) {
-					if (Is32Bit(MappedReg)) {
-						ProtectGPR(Section,MappedReg);
-						CompConstToX86reg(Map_TempReg(Section,x86_Any,MappedReg,1),MipsRegHi(ConstReg));
-					} else {
-						CompConstToX86reg(MipsRegHi(MappedReg),(int32_t)MipsRegLo(ConstReg) >> 31);
-					}
-				} else {
-					CompConstToX86reg(MipsRegHi(MappedReg),MipsRegHi(ConstReg));
-				}
-				if (Section->Cont.FallThrough) {
-					JneLabel8(0);
-					Jump = RecompPos - 1;
-				} else {
-					JneLabel32(0);
-					Section->Cont.LinkLocation = RecompPos - 4;
-				}
-				if (MipsRegLo(ConstReg) == 0) {
-					OrX86RegToX86Reg(MipsRegLo(MappedReg),MipsRegLo(MappedReg));
-				} else {
-					CompConstToX86reg(MipsRegLo(MappedReg),MipsRegLo(ConstReg));
-				}
-				if (Section->Cont.FallThrough) {
-					JeLabel32 ( 0 );
-					Section->Jump.LinkLocation = RecompPos - 4;
-
-
-					SetJump8(Jump,RecompPos);
-				} else if (Section->Jump.FallThrough) {
-					JneLabel32 ( 0 );
-					Section->Cont.LinkLocation2 = RecompPos - 4;
-				} else {
-					JneLabel32 ( 0 );
-					Section->Cont.LinkLocation2 = RecompPos - 4;
-					JmpLabel32(0);
-					Section->Jump.LinkLocation = RecompPos - 4;
-				}
-			} else {
-				if (MipsRegLo(ConstReg) == 0) {
-					OrX86RegToX86Reg(MipsRegLo(MappedReg),MipsRegLo(MappedReg));
-				} else {
-					CompConstToX86reg(MipsRegLo(MappedReg),MipsRegLo(ConstReg));
-				}
-				if (Section->Cont.FallThrough) {
-					JeLabel32 ( 0 );
-					Section->Jump.LinkLocation = RecompPos - 4;
-				} else if (Section->Jump.FallThrough) {
-					JneLabel32 ( 0 );
-					Section->Cont.LinkLocation = RecompPos - 4;
-				} else {
-					JneLabel32 ( 0 );
-					Section->Cont.LinkLocation = RecompPos - 4;
-					JmpLabel32(0);
-					Section->Jump.LinkLocation = RecompPos - 4;
-				}
-			}
-		}
-	} else if (IsKnown(Opcode.rs) || IsKnown(Opcode.rt)) {
-		uint32_t KnownReg = IsKnown(Opcode.rt)?Opcode.rt:Opcode.rs;
-		uint32_t UnknownReg = IsKnown(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-		if (IsConst(KnownReg)) {
-			if (Is64Bit(KnownReg)) {
-				CompConstToVariable(MipsRegHi(KnownReg),&GPR[UnknownReg].W[1]);
-			} else if (IsSigned(KnownReg)) {
-				CompConstToVariable((int32_t)MipsRegLo(KnownReg) >> 31,&GPR[UnknownReg].W[1]);
-			} else {
-				CompConstToVariable(0,&GPR[UnknownReg].W[1]);
-			}
-		} else {
-			ProtectGPR(Section,KnownReg);
-			if (Is64Bit(KnownReg)) {
-				CompX86regToVariable(MipsRegHi(KnownReg),&GPR[UnknownReg].W[1]);
-			} else if (IsSigned(KnownReg)) {
-				CompX86regToVariable(Map_TempReg(Section,x86_Any,KnownReg,1),&GPR[UnknownReg].W[1]);
-			} else {
-				CompConstToVariable(0,&GPR[UnknownReg].W[1]);
-			}
-		}
-		if (Section->Cont.FallThrough) {
-			JneLabel8(0);
-			Jump = RecompPos - 1;
-		} else {
-			JneLabel32(0);
-			Section->Cont.LinkLocation = RecompPos - 4;
-		}
-		if (IsConst(KnownReg)) {
-			CompConstToVariable(MipsRegLo(KnownReg),&GPR[UnknownReg].W[0]);
-		} else {
-			CompX86regToVariable(MipsRegLo(KnownReg),&GPR[UnknownReg].W[0]);
-		}
-		if (Section->Cont.FallThrough) {
-			JeLabel32 ( 0 );
-			Section->Jump.LinkLocation = RecompPos - 4;
-
-
-			SetJump8(Jump,RecompPos);
-		} else if (Section->Jump.FallThrough) {
-			JneLabel32 ( 0 );
-			Section->Cont.LinkLocation2 = RecompPos - 4;
-		} else {
-			JneLabel32 ( 0 );
-			Section->Cont.LinkLocation2 = RecompPos - 4;
-			JmpLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-		}
-	} else {
-		int32_t x86Reg = Map_TempReg(Section,x86_Any,Opcode.rs,1);
-		CompX86regToVariable(x86Reg,&GPR[Opcode.rt].W[1]);
-		if (Section->Cont.FallThrough) {
-			JneLabel8(0);
-			Jump = RecompPos - 1;
-		} else {
-			JneLabel32(0);
-			Section->Cont.LinkLocation = RecompPos - 4;
-		}
-		CompX86regToVariable(Map_TempReg(Section,x86Reg,Opcode.rs,0),&GPR[Opcode.rt].W[0]);
-		if (Section->Cont.FallThrough) {
-			JeLabel32 ( 0 );
-			Section->Jump.LinkLocation = RecompPos - 4;
-
-
-			SetJump8(Jump,RecompPos);
-		} else if (Section->Jump.FallThrough) {
-			JneLabel32 ( 0 );
-			Section->Cont.LinkLocation2 = RecompPos - 4;
-		} else {
-			JneLabel32 ( 0 );
-			Section->Cont.LinkLocation2 = RecompPos - 4;
-			JmpLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-		}
-	}
-}
-
-void BGTZ_Compare (BLOCK_SECTION * Section) {
-	if (IsConst(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-			if (MipsReg_S(Opcode.rs) > 0) {
-				Section->Jump.FallThrough = 1;
-				Section->Cont.FallThrough = 0;
-			} else {
-				Section->Jump.FallThrough = 0;
-				Section->Cont.FallThrough = 1;
-			}
-		} else {
-			if (MipsRegLo_S(Opcode.rs) > 0) {
-				Section->Jump.FallThrough = 1;
-				Section->Cont.FallThrough = 0;
-			} else {
-				Section->Jump.FallThrough = 0;
-				Section->Cont.FallThrough = 1;
-			}
-		}
-	} else if (IsMapped(Opcode.rs) && Is32Bit(Opcode.rs)) {
-		CompConstToX86reg(MipsRegLo(Opcode.rs),0);
-		if (Section->Jump.FallThrough) {
-			JleLabel32 ( 0 );
-			Section->Cont.LinkLocation = RecompPos - 4;
-		} else if (Section->Cont.FallThrough) {
-			JgLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-		} else {
-			JleLabel32 ( 0 );
-			Section->Cont.LinkLocation = RecompPos - 4;
-			JmpLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-		}
-	} else {
-		uint8_t *Jump;
-
-		if (IsMapped(Opcode.rs)) {
-			CompConstToX86reg(MipsRegHi(Opcode.rs),0);
-		} else {
-			CompConstToVariable(0,&GPR[Opcode.rs].W[1]);
-		}
-		if (Section->Jump.FallThrough) {
-			JlLabel32 ( 0 );
-			Section->Cont.LinkLocation = RecompPos - 4;
-			JgLabel8(0);
-			Jump = RecompPos - 1;
-		} else if (Section->Cont.FallThrough) {
-			JlLabel8(0);
-			Jump = RecompPos - 1;
-			JgLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-		} else {
-			JlLabel32 ( 0 );
-			Section->Cont.LinkLocation = RecompPos - 4;
-			JgLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-		}
-
-		if (IsMapped(Opcode.rs)) {
-			CompConstToX86reg(MipsRegLo(Opcode.rs),0);
-		} else {
-			CompConstToVariable(0,&GPR[Opcode.rs].W[0]);
-		}
-		if (Section->Jump.FallThrough) {
-			JeLabel32 ( 0 );
-			Section->Cont.LinkLocation2 = RecompPos - 4;
-
-			*((uint8_t *)(Jump))=(uint8_t)(RecompPos - Jump - 1);
-		} else if (Section->Cont.FallThrough) {
-			JneLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-
-			*((uint8_t *)(Jump))=(uint8_t)(RecompPos - Jump - 1);
-		} else {
-			JneLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-			JmpLabel32 ( 0 );
-			Section->Cont.LinkLocation2 = RecompPos - 4;
-		}
-	}
-}
-
-void BLEZ_Compare (BLOCK_SECTION * Section) {
-	if (IsConst(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-			if (MipsReg_S(Opcode.rs) <= 0) {
-				Section->Jump.FallThrough = 1;
-				Section->Cont.FallThrough = 0;
-			} else {
-				Section->Jump.FallThrough = 0;
-				Section->Cont.FallThrough = 1;
-			}
-		} else if (IsSigned(Opcode.rs)) {
-			if (MipsRegLo_S(Opcode.rs) <= 0) {
-				Section->Jump.FallThrough = 1;
-				Section->Cont.FallThrough = 0;
-			} else {
-				Section->Jump.FallThrough = 0;
-				Section->Cont.FallThrough = 1;
-			}
-		} else {
-			if (MipsRegLo(Opcode.rs) == 0) {
-				Section->Jump.FallThrough = 1;
-				Section->Cont.FallThrough = 0;
-			} else {
-				Section->Jump.FallThrough = 0;
-				Section->Cont.FallThrough = 1;
-			}
-		}
-	} else {
-		if (IsMapped(Opcode.rs) && Is32Bit(Opcode.rs)) {
-			CompConstToX86reg(MipsRegLo(Opcode.rs),0);
-			if (Section->Jump.FallThrough) {
-				JgLabel32 ( 0 );
-				Section->Cont.LinkLocation = RecompPos - 4;
-			} else if (Section->Cont.FallThrough) {
-				JleLabel32(0);
-				Section->Jump.LinkLocation = RecompPos - 4;
-			} else {
-				JgLabel32 ( 0 );
-				Section->Cont.LinkLocation = RecompPos - 4;
-				JmpLabel32(0);
-				Section->Jump.LinkLocation = RecompPos - 4;
-			}
-		} else {
-			uint8_t *Jump;
-
-			if (IsMapped(Opcode.rs)) {
-				CompConstToX86reg(MipsRegHi(Opcode.rs),0);
-			} else {
-				CompConstToVariable(0,&GPR[Opcode.rs].W[1]);
-			}
-			if (Section->Jump.FallThrough) {
-				JgLabel32 ( 0 );
-				Section->Cont.LinkLocation = RecompPos - 4;
-				JlLabel8(0);
-				Jump = RecompPos - 1;
-			} else if (Section->Cont.FallThrough) {
-				JgLabel8(0);
-				Jump = RecompPos - 1;
-				JlLabel32(0);
-				Section->Jump.LinkLocation = RecompPos - 4;
-			} else {
-				JgLabel32 ( 0 );
-				Section->Cont.LinkLocation = RecompPos - 4;
-				JlLabel32(0);
-				Section->Jump.LinkLocation = RecompPos - 4;
-			}
-
-			if (IsMapped(Opcode.rs)) {
-				CompConstToX86reg(MipsRegLo(Opcode.rs),0);
-			} else {
-				CompConstToVariable(0,&GPR[Opcode.rs].W[0]);
-			}
-			if (Section->Jump.FallThrough) {
-				JneLabel32 ( 0 );
-				Section->Cont.LinkLocation2 = RecompPos - 4;
-
-				*((uint8_t *)(Jump))=(uint8_t)(RecompPos - Jump - 1);
-			} else if (Section->Cont.FallThrough) {
-				JeLabel32 ( 0 );
-				Section->Jump.LinkLocation2 = RecompPos - 4;
-
-				*((uint8_t *)(Jump))=(uint8_t)(RecompPos - Jump - 1);
-			} else {
-				JneLabel32 ( 0 );
-				Section->Cont.LinkLocation2 = RecompPos - 4;
-				JmpLabel32(0);
-				Section->Jump.LinkLocation2 = RecompPos - 4;
-			}
-		}
-	}
-}
-
-void BLTZ_Compare (BLOCK_SECTION * Section) {
-	if (IsConst(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-			if (MipsReg_S(Opcode.rs) < 0) {
-				Section->Jump.FallThrough = 1;
-				Section->Cont.FallThrough = 0;
-			} else {
-				Section->Jump.FallThrough = 0;
-				Section->Cont.FallThrough = 1;
-			}
-		} else if (IsSigned(Opcode.rs)) {
-			if (MipsRegLo_S(Opcode.rs) < 0) {
-				Section->Jump.FallThrough = 1;
-				Section->Cont.FallThrough = 0;
-			} else {
-				Section->Jump.FallThrough = 0;
-				Section->Cont.FallThrough = 1;
-			}
-		} else {
-			Section->Jump.FallThrough = 0;
-			Section->Cont.FallThrough = 1;
-		}
-	} else if (IsMapped(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-			CompConstToX86reg(MipsRegHi(Opcode.rs),0);
-			if (Section->Jump.FallThrough) {
-				JgeLabel32 ( 0 );
-				Section->Cont.LinkLocation = RecompPos - 4;
-			} else if (Section->Cont.FallThrough) {
-				JlLabel32(0);
-				Section->Jump.LinkLocation = RecompPos - 4;
-			} else {
-				JgeLabel32 ( 0 );
-				Section->Cont.LinkLocation = RecompPos - 4;
-				JmpLabel32(0);
-				Section->Jump.LinkLocation = RecompPos - 4;
-			}
-		} else if (IsSigned(Opcode.rs)) {
-			CompConstToX86reg(MipsRegLo(Opcode.rs),0);
-			if (Section->Jump.FallThrough) {
-				JgeLabel32 ( 0 );
-				Section->Cont.LinkLocation = RecompPos - 4;
-			} else if (Section->Cont.FallThrough) {
-				JlLabel32(0);
-				Section->Jump.LinkLocation = RecompPos - 4;
-			} else {
-				JgeLabel32 ( 0 );
-				Section->Cont.LinkLocation = RecompPos - 4;
-				JmpLabel32(0);
-				Section->Jump.LinkLocation = RecompPos - 4;
-			}
-		} else {
-			Section->Jump.FallThrough = 0;
-			Section->Cont.FallThrough = 1;
-		}
-	} else if (IsUnknown(Opcode.rs)) {
-		CompConstToVariable(0,&GPR[Opcode.rs].W[1]);
-		if (Section->Jump.FallThrough) {
-			JgeLabel32 ( 0 );
-			Section->Cont.LinkLocation = RecompPos - 4;
-		} else if (Section->Cont.FallThrough) {
-			JlLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-		} else {
-			JlLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-			JmpLabel32 ( 0 );
-			Section->Cont.LinkLocation = RecompPos - 4;
-		}
-	}
-}
-
-void BGEZ_Compare (BLOCK_SECTION * Section) {
-	if (IsConst(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-#ifndef EXTERNAL_RELEASE
-			DisplayError("BGEZ 1");
-#endif
-			Compile_R4300i_UnknownOpcode(Section);
-		} else if IsSigned(Opcode.rs) {
-			if (MipsRegLo_S(Opcode.rs) >= 0) {
-				Section->Jump.FallThrough = 1;
-				Section->Cont.FallThrough = 0;
-			} else {
-				Section->Jump.FallThrough = 0;
-				Section->Cont.FallThrough = 1;
-			}
-		} else {
-			Section->Jump.FallThrough = 1;
-			Section->Cont.FallThrough = 0;
-		}
-	} else if (IsMapped(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-			CompConstToX86reg(MipsRegHi(Opcode.rs),0);
-			if (Section->Cont.FallThrough) {
-				JgeLabel32 ( 0 );
-				Section->Jump.LinkLocation = RecompPos - 4;
-			} else if (Section->Jump.FallThrough) {
-				JlLabel32 ( 0 );
-				Section->Cont.LinkLocation = RecompPos - 4;
-			} else {
-				JlLabel32 ( 0 );
-				Section->Cont.LinkLocation = RecompPos - 4;
-				JmpLabel32(0);
-				Section->Jump.LinkLocation = RecompPos - 4;
-			}
-		} else if (IsSigned(Opcode.rs)) {
-			CompConstToX86reg(MipsRegLo(Opcode.rs),0);
-			if (Section->Cont.FallThrough) {
-				JgeLabel32 ( 0 );
-				Section->Jump.LinkLocation = RecompPos - 4;
-			} else if (Section->Jump.FallThrough) {
-				JlLabel32 ( 0 );
-				Section->Cont.LinkLocation = RecompPos - 4;
-			} else {
-				JlLabel32 ( 0 );
-				Section->Cont.LinkLocation = RecompPos - 4;
-				JmpLabel32(0);
-				Section->Jump.LinkLocation = RecompPos - 4;
-			}
-		} else {
-			Section->Jump.FallThrough = 1;
-			Section->Cont.FallThrough = 0;
-		}
-	} else {
-		CompConstToVariable(0,&GPR[Opcode.rs].W[1]);
-		if (Section->Cont.FallThrough) {
-			JgeLabel32 ( 0 );
-			Section->Jump.LinkLocation = RecompPos - 4;
-		} else if (Section->Jump.FallThrough) {
-			JlLabel32 ( 0 );
-			Section->Cont.LinkLocation = RecompPos - 4;
-		} else {
-			JlLabel32 ( 0 );
-			Section->Cont.LinkLocation = RecompPos - 4;
-			JmpLabel32(0);
-			Section->Jump.LinkLocation = RecompPos - 4;
-		}
-	}
-}
-
-void COP1_BCF_Compare (BLOCK_SECTION * Section) {
-	TestVariable(FPCSR_C,&FPCR[31]);
-	if (Section->Cont.FallThrough) {
-		JeLabel32 ( 0 );
-		Section->Jump.LinkLocation = RecompPos - 4;
-	} else if (Section->Jump.FallThrough) {
-		JneLabel32 ( 0 );
-		Section->Cont.LinkLocation = RecompPos - 4;
-	} else {
-		JneLabel32 ( 0 );
-		Section->Cont.LinkLocation = RecompPos - 4;
-		JmpLabel32(0);
-		Section->Jump.LinkLocation = RecompPos - 4;
-	}
-}
-
-void COP1_BCT_Compare (BLOCK_SECTION * Section) {
-	TestVariable(FPCSR_C,&FPCR[31]);
-	if (Section->Cont.FallThrough) {
-		JneLabel32 ( 0 );
-		Section->Jump.LinkLocation = RecompPos - 4;
-	} else if (Section->Jump.FallThrough) {
-		JeLabel32 ( 0 );
-		Section->Cont.LinkLocation = RecompPos - 4;
-	} else {
-		JeLabel32 ( 0 );
-		Section->Cont.LinkLocation = RecompPos - 4;
-		JmpLabel32(0);
-		Section->Jump.LinkLocation = RecompPos - 4;
-	}
-}
-/************************* OpCode functions *************************/
-void Compile_R4300i_J (BLOCK_SECTION * Section) {
-	if ( NextInstruction == NORMAL ) {
-		Section->Jump.TargetPC = (Section->CompilePC & 0xF0000000) + (Opcode.target << 2);;
-		Section->Jump.FallThrough = 1;
-		Section->Jump.LinkLocation = NULL;
-		Section->Jump.LinkLocation2 = NULL;
-		NextInstruction = DO_DELAY_SLOT;
-		if ((Section->CompilePC & 0xFFC) == 0xFFC) {
-			memcpy(&Section->Jump.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-			GenerateSectionLinkage(Section);
-			NextInstruction = END_BLOCK;
-		}
-	} else if (NextInstruction == DELAY_SLOT_DONE ) {
-		memcpy(&Section->Jump.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-		GenerateSectionLinkage(Section);
-		NextInstruction = END_BLOCK;
-	} else {
-#ifndef EXTERNAL_RELEASE
-		DisplayError("WTF\n\nJal\nNextInstruction = %X", NextInstruction);
-#endif
-	}
-}
-
-void Compile_R4300i_JAL (BLOCK_SECTION * Section) {
-
-	//UnMap_TempReg(Section);
-	if ( NextInstruction == NORMAL ) {
-
-		UnMap_GPR(Section, 31, 0);
-		MipsRegLo(31) = Section->CompilePC + 8;
-		MipsRegState(31) = STATE_CONST_32;
-		if ((Section->CompilePC & 0xFFC) == 0xFFC) {
-			MoveConstToVariable((Section->CompilePC & 0xF0000000) + (Opcode.target << 2),&JumpToLocation);
-			MoveConstToVariable(Section->CompilePC + 4,&PROGRAM_COUNTER);
-			if (BlockCycleCount != 0) {
-				AddConstToVariable(BlockCycleCount,&CP0[9]);
-				SubConstFromVariable(BlockCycleCount,&Timers->Timer);
-			}
-			if (BlockRandomModifier != 0) { SubConstFromVariable(BlockRandomModifier,&CP0[1]); }
-			WriteBackRegisters(Section);
-			MoveConstToVariable(DELAY_SLOT,&NextInstruction);
-			Ret();
-			NextInstruction = END_BLOCK;
-			return;
-		}
-		NextInstruction = DO_DELAY_SLOT;
-	} else if (NextInstruction == DELAY_SLOT_DONE ) {
-		MoveConstToVariable((Section->CompilePC & 0xF0000000) + (Opcode.target << 2),&PROGRAM_COUNTER);
-		CompileExit((uint32_t)-1,&Section->RegWorking,Normal,1,NULL);
-		NextInstruction = END_BLOCK;
-	} else {
-#ifndef EXTERNAL_RELEASE
-		DisplayError("WTF\n\nBranch\nNextInstruction = %X", NextInstruction);
-#endif
-	}
-	return;
-
-	if ( NextInstruction == NORMAL ) {
-
-
-		UnMap_GPR(Section, 31, 0);
-		MipsRegLo(31) = Section->CompilePC + 8;
-		MipsRegState(31) = STATE_CONST_32;
-		NextInstruction = DO_DELAY_SLOT;
-
-		Section->Jump.TargetPC = (Section->CompilePC & 0xF0000000) + (Opcode.target << 2);
-		Section->Jump.FallThrough = 1;
-		Section->Jump.LinkLocation = NULL;
-		Section->Jump.LinkLocation2 = NULL;
-		if ((Section->CompilePC & 0xFFC) == 0xFFC) {
-			memcpy(&Section->Jump.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-			GenerateSectionLinkage(Section);
-			NextInstruction = END_BLOCK;
-		}
-	} else if (NextInstruction == DELAY_SLOT_DONE ) {
-		memcpy(&Section->Jump.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-		GenerateSectionLinkage(Section);
-		NextInstruction = END_BLOCK;
-	} else {
-#ifndef EXTERNAL_RELEASE
-		DisplayError("WTF\n\nJal\nNextInstruction = %X", NextInstruction);
-#endif
-	}
-}
-
-void Compile_R4300i_ADDI (BLOCK_SECTION * Section) {
-
-	if (Opcode.rt == 0) { return; }
-	if (IsConst(Opcode.rs)) {
-		if (IsMapped(Opcode.rt)) { UnMap_GPR(Section,Opcode.rt, 0); }
-		MipsRegLo(Opcode.rt) = MipsRegLo(Opcode.rs) + (short)Opcode.immediate;
-		MipsRegState(Opcode.rt) = STATE_CONST_32;
-		return;
-	}
-	Map_GPR_32bit(Section,Opcode.rt,1,Opcode.rs);
-	if (Opcode.immediate == 0) {
-	} else if (Opcode.immediate == 1) {
-		IncX86reg(MipsRegLo(Opcode.rt));
-	} else if (Opcode.immediate == 0xFFFF) {
-		DecX86reg(MipsRegLo(Opcode.rt));
-	} else {
-		AddConstToX86Reg(MipsRegLo(Opcode.rt),(short)Opcode.immediate);
-	}
-
-}
-
-void Compile_R4300i_ADDIU (BLOCK_SECTION * Section) {
-
-
-
-	if (Opcode.rt == 0) { return; }
-
-	if (IsConst(Opcode.rs)) {
-		if (IsMapped(Opcode.rt)) { UnMap_GPR(Section,Opcode.rt, 0); }
-		MipsRegLo(Opcode.rt) = MipsRegLo(Opcode.rs) + (short)Opcode.immediate;
-		MipsRegState(Opcode.rt) = STATE_CONST_32;
-		return;
-	}
-	Map_GPR_32bit(Section,Opcode.rt,1,Opcode.rs);
-	if (Opcode.immediate == 0) {
-	} else if (Opcode.immediate == 1) {
-		IncX86reg(MipsRegLo(Opcode.rt));
-	} else if (Opcode.immediate == 0xFFFF) {
-		DecX86reg(MipsRegLo(Opcode.rt));
-	} else {
-		AddConstToX86Reg(MipsRegLo(Opcode.rt),(short)Opcode.immediate);
-	}
-}
-
-void Compile_R4300i_SLTIU (BLOCK_SECTION * Section) {
-
-	if (Opcode.rt == 0) { return; }
-
-	if (IsConst(Opcode.rs)) {
-		uint32_t Result;
-
-		if (Is64Bit(Opcode.rs)) {
-			int64_t Immediate = (int64_t)((short)Opcode.immediate);
-			Result = MipsReg(Opcode.rs) < ((unsigned)(Immediate))?1:0;
-		} else if (Is32Bit(Opcode.rs)) {
-			Result = MipsRegLo(Opcode.rs) < ((unsigned)((short)Opcode.immediate))?1:0;
-		}
-		UnMap_GPR(Section,Opcode.rt, 0);
-		MipsRegState(Opcode.rt) = STATE_CONST_32;
-		MipsRegLo(Opcode.rt) = Result;
-	} else if (IsMapped(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-			uint8_t * Jump[2];
-
-			CompConstToX86reg(MipsRegHi(Opcode.rs),((short)Opcode.immediate >> 31));
-			JeLabel8(0);
-			Jump[0] = RecompPos - 1;
-			SetbVariable(&BranchCompare);
-			JmpLabel8(0);
-			Jump[1] = RecompPos - 1;
-
-
-			*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-			CompConstToX86reg(MipsRegLo(Opcode.rs),(short)Opcode.immediate);
-			SetbVariable(&BranchCompare);
-
-
-			*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-			Map_GPR_32bit(Section,Opcode.rt,0, -1);
-			MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rt));
-		} else {
-			CompConstToX86reg(MipsRegLo(Opcode.rs),(short)Opcode.immediate);
-			SetbVariable(&BranchCompare);
-			Map_GPR_32bit(Section,Opcode.rt,0, -1);
-			MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rt));
-		}
-	} else {
-		uint8_t * Jump;
-
-		CompConstToVariable(((short)Opcode.immediate >> 31),&GPR[Opcode.rs].W[1]);
-		JneLabel8(0);
-		Jump = RecompPos - 1;
-		CompConstToVariable((short)Opcode.immediate,&GPR[Opcode.rs].W[0]);
-
-
-		*((uint8_t *)(Jump))=(uint8_t)(RecompPos - Jump - 1);
-		SetbVariable(&BranchCompare);
-		Map_GPR_32bit(Section,Opcode.rt,0, -1);
-		MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rt));
-
-
-		/*SetbVariable(&BranchCompare);
-		JmpLabel8(0);
-		Jump[1] = RecompPos - 1;
-
-
-		*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-		CompConstToVariable((short)Opcode.immediate,&GPR[Opcode.rs].W[0]);
-		SetbVariable(&BranchCompare);
-
-
-		*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-		Map_GPR_32bit(Section,Opcode.rt,0, -1);
-		MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rt));*/
-	}
-}
-
-void Compile_R4300i_SLTI (BLOCK_SECTION * Section) {
-
-	if (Opcode.rt == 0) { return; }
-
-	if (IsConst(Opcode.rs)) {
-		uint32_t Result;
-
-		if (Is64Bit(Opcode.rs)) {
-			int64_t Immediate = (int64_t)((short)Opcode.immediate);
-			Result = (int64_t)MipsReg(Opcode.rs) < Immediate?1:0;
-		} else if (Is32Bit(Opcode.rs)) {
-			Result = MipsRegLo_S(Opcode.rs) < (short)Opcode.immediate?1:0;
-		}
-		UnMap_GPR(Section,Opcode.rt, 0);
-		MipsRegState(Opcode.rt) = STATE_CONST_32;
-		MipsRegLo(Opcode.rt) = Result;
-	} else if (IsMapped(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-			uint8_t * Jump[2];
-
-			CompConstToX86reg(MipsRegHi(Opcode.rs),((short)Opcode.immediate >> 31));
-			JeLabel8(0);
-			Jump[0] = RecompPos - 1;
-			SetlVariable(&BranchCompare);
-			JmpLabel8(0);
-			Jump[1] = RecompPos - 1;
-
-
-			*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-			CompConstToX86reg(MipsRegLo(Opcode.rs),(short)Opcode.immediate);
-			SetbVariable(&BranchCompare);
-
-
-			*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-			Map_GPR_32bit(Section,Opcode.rt,0, -1);
-			MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rt));
-		} else {
-		/*	CompConstToX86reg(MipsRegLo(Opcode.rs),(short)Opcode.immediate);
-			SetlVariable(&BranchCompare);
-			Map_GPR_32bit(Section,Opcode.rt,0, -1);
-			MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rt));
-			*/
-			ProtectGPR(Section, Opcode.rs);
-			Map_GPR_32bit(Section,Opcode.rt,0, -1);
-			CompConstToX86reg(MipsRegLo(Opcode.rs),(short)Opcode.immediate);
-
-			if (MipsRegLo(Opcode.rt) > x86_EDX) {
-				SetlVariable(&BranchCompare);
-				MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rt));
-			} else {
-				Setl(MipsRegLo(Opcode.rt));
-				AndConstToX86Reg(MipsRegLo(Opcode.rt), 1);
-			}
-		}
-	} else {
-		uint8_t * Jump[2];
-
-		CompConstToVariable(((short)Opcode.immediate >> 31),&GPR[Opcode.rs].W[1]);
-		JeLabel8(0);
-		Jump[0] = RecompPos - 1;
-		SetlVariable(&BranchCompare);
-		JmpLabel8(0);
-		Jump[1] = RecompPos - 1;
-
-
-		*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-		CompConstToVariable((short)Opcode.immediate,&GPR[Opcode.rs].W[0]);
-		SetbVariable(&BranchCompare);
-
-
-		*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-		Map_GPR_32bit(Section,Opcode.rt,0, -1);
-		MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rt));
-	}
-}
-
-void Compile_R4300i_ANDI (BLOCK_SECTION * Section) {
-
-
-	if (Opcode.rt == 0) { return;}
-
-	if (IsConst(Opcode.rs)) {
-		if (IsMapped(Opcode.rt)) { UnMap_GPR(Section,Opcode.rt, 0); }
-		MipsRegState(Opcode.rt) = STATE_CONST_32;
-		MipsRegLo(Opcode.rt) = MipsRegLo(Opcode.rs) & Opcode.immediate;
-	} else if (Opcode.immediate != 0) {
-		Map_GPR_32bit(Section,Opcode.rt,0,Opcode.rs);
-		AndConstToX86Reg(MipsRegLo(Opcode.rt),Opcode.immediate);
-	} else {
-		Map_GPR_32bit(Section,Opcode.rt,0,0);
-	}
-}
-
-void Compile_R4300i_ORI (BLOCK_SECTION * Section) {
-
-	if (Opcode.rt == 0) { return;}
-
-	if (IsConst(Opcode.rs)) {
-		if (IsMapped(Opcode.rt)) { UnMap_GPR(Section,Opcode.rt, 0); }
-		MipsRegState(Opcode.rt) = MipsRegState(Opcode.rs);
-		MipsRegHi(Opcode.rt) = MipsRegHi(Opcode.rs);
-		MipsRegLo(Opcode.rt) = MipsRegLo(Opcode.rs) | Opcode.immediate;
-	} else if (IsMapped(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-			Map_GPR_64bit(Section,Opcode.rt,Opcode.rs);
-		} else {
-			Map_GPR_32bit(Section,Opcode.rt,IsSigned(Opcode.rs),Opcode.rs);
-		}
-		OrConstToX86Reg(Opcode.immediate,MipsRegLo(Opcode.rt));
-	} else {
-		Map_GPR_64bit(Section,Opcode.rt,Opcode.rs);
-		OrConstToX86Reg(Opcode.immediate,MipsRegLo(Opcode.rt));
-	}
-}
-
-void Compile_R4300i_XORI (BLOCK_SECTION * Section) {
-
-	if (Opcode.rt == 0) { return;}
-
-	if (IsConst(Opcode.rs)) {
-		if (Opcode.rs != Opcode.rt) { UnMap_GPR(Section,Opcode.rt, 0); }
-		MipsRegState(Opcode.rt) = MipsRegState(Opcode.rs);
-		MipsRegHi(Opcode.rt) = MipsRegHi(Opcode.rs);
-		MipsRegLo(Opcode.rt) = MipsRegLo(Opcode.rs) ^ Opcode.immediate;
-	} else {
-		if (IsMapped(Opcode.rs) && Is32Bit(Opcode.rs)) {
-			Map_GPR_32bit(Section,Opcode.rt,IsSigned(Opcode.rs),Opcode.rs);
-		} else {
-			Map_GPR_64bit(Section,Opcode.rt,Opcode.rs);
-		}
-		if (Opcode.immediate != 0) { XorConstToX86Reg(MipsRegLo(Opcode.rt),Opcode.immediate); }
-	}
-}
-
-void Compile_R4300i_LUI (BLOCK_SECTION * Section) {
-
-	if (Opcode.rt == 0) { return;}
-
-	UnMap_GPR(Section,Opcode.rt, 0);
-	MipsRegLo(Opcode.rt) = ((short)Opcode.offset << 16);
-	MipsRegState(Opcode.rt) = STATE_CONST_32;
-}
-
-void Compile_R4300i_DADDIU (BLOCK_SECTION * Section) {
-
-
-	if (Opcode.rs != 0) { UnMap_GPR(Section,Opcode.rs,1); }
-	if (Opcode.rs != 0) { UnMap_GPR(Section,Opcode.rt,1); }
-	Pushad();
-	MoveConstToVariable(Opcode.Hex, &Opcode.Hex );
-	Call_Direct(r4300i_DADDIU);
-	Popad();
-}
-
-void Compile_R4300i_LDL (BLOCK_SECTION * Section) {
-
-	if (Opcode.base != 0) { UnMap_GPR(Section,Opcode.base,1); }
-	if (Opcode.rt != 0) { UnMap_GPR(Section,Opcode.rt,1); }
-	Pushad();
-	MoveConstToVariable(Opcode.Hex, &Opcode.Hex );
-	Call_Direct(r4300i_LDL);
-	Popad();
-
-}
-
-void Compile_R4300i_LDR (BLOCK_SECTION * Section) {
-
-	if (Opcode.base != 0) { UnMap_GPR(Section,Opcode.base,1); }
-	if (Opcode.rt != 0) { UnMap_GPR(Section,Opcode.rt,1); }
-	Pushad();
-	MoveConstToVariable(Opcode.Hex, &Opcode.Hex );
-	Call_Direct(r4300i_LDR);
-	Popad();
-}
-
-
-void Compile_R4300i_LB (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2;
-
-	if (Opcode.rt == 0) return;
-
-//	UnMap_TempReg(Section); //hax
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = (MipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 3;
-		Map_GPR_32bit(Section,Opcode.rt,1,0);
-		Compile_LB(MipsRegLo(Opcode.rt),Address,1);
-		return;
-	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-
-	CompileReadTLBMiss(Section,TempReg1,TempReg2);
-	XorConstToX86Reg(TempReg1|x64_Reg,3);
-	Map_GPR_32bit(Section,Opcode.rt,1,-1);
-	MoveSxByteX86regPointerToX86reg(TempReg1, TempReg2,MipsRegLo(Opcode.rt));
-}
-
-
-void Compile_R4300i_LH (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2;
-
-
-
-	if (Opcode.rt == 0) return;
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = (MipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 2;
-		Map_GPR_32bit(Section,Opcode.rt,1,0);
-		Compile_LH(MipsRegLo(Opcode.rt),Address,1);
-		return;
-	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	CompileReadTLBMiss(Section,TempReg1,TempReg2);
-	XorConstToX86Reg(TempReg1,2);
-	Map_GPR_32bit(Section,Opcode.rt,1,-1);
-	MoveSxHalfX86regPointerToX86reg(TempReg1, TempReg2,MipsRegLo(Opcode.rt));
-
-}
-
-void Compile_R4300i_LWL (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2, Offset, shift;
-
-
-
-	if (Opcode.rt == 0) return;
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address, Value;
-
-		Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-		Offset = Address & 3;
-
-		Map_GPR_32bit(Section,Opcode.rt,1,Opcode.rt);
-		Value = Map_TempReg(Section,x86_Any,-1,0);
-		Compile_LW(Value,(Address & ~3));
-		AndConstToX86Reg(MipsRegLo(Opcode.rt),LWL_MASK[Offset]);
-		ShiftLeftSignImmed(Value,(uint8_t)LWL_SHIFT[Offset]);
-		AddX86RegToX86Reg(MipsRegLo(Opcode.rt),Value);
-		return;
-	}
-
-	shift = Map_TempReg(Section,x86_ECX,-1,0);
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-		UnProtectGPR(Section,Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-
-	CompileReadTLBMiss(Section,TempReg1,TempReg2);
-
-	Offset = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, Offset);
-	AndConstToX86Reg(Offset,3);
-	AndConstToX86Reg(TempReg1,~3);
-
-	Map_GPR_32bit(Section,Opcode.rt,1,Opcode.rt);
-	AndVariableDispToX86Reg(LWL_MASK,MipsRegLo(Opcode.rt),Offset,4);
-	MoveVariableDispToX86Reg(LWL_SHIFT,shift,Offset,4);
-
-	MoveX86regPointerToX86reg(TempReg1, TempReg2,TempReg1);
-
-	ShiftLeftSign(TempReg1);
-	AddX86RegToX86Reg(MipsRegLo(Opcode.rt),TempReg1);
-}
-
-void Compile_R4300i_LW (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2;
-
-	if (Opcode.rt == 0) return;
-
-	{
-		if (IsConst(Opcode.base)) {
-			uint32_t Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-			Map_GPR_32bit(Section,Opcode.rt,1,-1);
-			Compile_LW(MipsRegLo(Opcode.rt),Address);
-			return;
-		}
-
-		if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-		if (IsMapped(Opcode.base) && Opcode.offset == 0) {
-			ProtectGPR(Section,Opcode.base);
-			TempReg1 = MipsRegLo(Opcode.base);
-		} else {
-			if (IsMapped(Opcode.base)) {
-				ProtectGPR(Section,Opcode.base);
-				if (Opcode.offset != 0) {
-					TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-					LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-				} else {
-					TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-				}
-			} else {
-				TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-				if (Opcode.immediate == 0) {
-				} else if (Opcode.immediate == 1) {
-					IncX86reg(TempReg1);
-				} else if (Opcode.immediate == 0xFFFF) {
-					DecX86reg(TempReg1);
-				} else {
-					AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-				}
-			}
-		}
-		TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-		Map_GPR_32bit(Section,Opcode.rt,1,-1);
-		MoveX86RegToX86Reg(TempReg1, TempReg2);
-		ShiftRightUnsignImmed(TempReg2,12);
-		LOAD_FROM_TLB(TempReg2, TempReg2);
-		CompileReadTLBMiss(Section,TempReg1,TempReg2);
-		MoveX86regPointerToX86reg(TempReg1, TempReg2,MipsRegLo(Opcode.rt));
-	}
-}
-
-void Compile_R4300i_LBU (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2;
-
-
-
-	if (Opcode.rt == 0) return;
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = (MipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 3;
-		Map_GPR_32bit(Section,Opcode.rt,0,0);
-		Compile_LB(MipsRegLo(Opcode.rt),Address,0);
-		return;
-	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	CompileReadTLBMiss(Section,TempReg1,TempReg2);
-	XorConstToX86Reg(TempReg1,3);
-	Map_GPR_32bit(Section,Opcode.rt,0,-1);
-	MoveZxByteX86regPointerToX86reg(TempReg1, TempReg2,MipsRegLo(Opcode.rt));
-
-}
-
-void Compile_R4300i_LHU (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2;
-
-
-
-	if (Opcode.rt == 0) return;
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = (MipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 2;
-		Map_GPR_32bit(Section,Opcode.rt,0,0);
-		Compile_LH(MipsRegLo(Opcode.rt),Address,0);
-		return;
-	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	CompileReadTLBMiss(Section,TempReg1,TempReg2);
-	XorConstToX86Reg(TempReg1,2);
-	Map_GPR_32bit(Section,Opcode.rt,0,-1);
-	MoveZxHalfX86regPointerToX86reg(TempReg1, TempReg2,MipsRegLo(Opcode.rt));
-
-}
-
-void Compile_R4300i_LWR (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2, Offset, shift;
-
-
-
-	if (Opcode.rt == 0) return;
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address, Value;
-
-		Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-		Offset = Address & 3;
-
-		Map_GPR_32bit(Section,Opcode.rt,1,Opcode.rt);
-		Value = Map_TempReg(Section,x86_Any,-1,0);
-		Compile_LW(Value,(Address & ~3));
-		AndConstToX86Reg(MipsRegLo(Opcode.rt),LWR_MASK[Offset]);
-		ShiftRightUnsignImmed(Value,(uint8_t)LWR_SHIFT[Offset]);
-		AddX86RegToX86Reg(MipsRegLo(Opcode.rt),Value);
-		return;
-	}
-
-	shift = Map_TempReg(Section,x86_ECX,-1,0);
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-		UnProtectGPR(Section,Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-
-	CompileReadTLBMiss(Section,TempReg1,TempReg2);
-
-	Offset = Map_TempReg(Section,x64_Any,-1,0);
- //BreakPoint();
-	MoveX86RegToX86Reg(TempReg1, Offset);
-	AndConstToX86Reg(Offset,3);
-	AndConstToX86Reg(TempReg1,~3);
-
-	Map_GPR_32bit(Section,Opcode.rt,1,Opcode.rt);
-	AndVariableDispToX86Reg(LWR_MASK,MipsRegLo(Opcode.rt),Offset,4);
-	MoveVariableDispToX86Reg(LWR_SHIFT,shift,Offset,4);
-
-	MoveX86regPointerToX86reg(TempReg1, TempReg2,TempReg1);
-
-	ShiftRightUnsign(TempReg1);
-	AddX86RegToX86Reg(MipsRegLo(Opcode.rt),TempReg1);
-}
-
-void Compile_R4300i_LWU (BLOCK_SECTION * Section) {			//added by Witten
-	uint32_t TempReg1, TempReg2;
-
-
-
-	if (Opcode.rt == 0) return;
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = (MipsRegLo(Opcode.base) + (short)Opcode.offset);
-		Map_GPR_32bit(Section,Opcode.rt,0,0);
-		Compile_LW(MipsRegLo(Opcode.rt),Address);
-		return;
-	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	//MoveVariableDispToX86Reg(TLB_Map,TempReg2,TempReg2,8);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	CompileReadTLBMiss(Section,TempReg1,TempReg2);
-	Map_GPR_32bit(Section,Opcode.rt,0,-1);
-	MoveZxHalfX86regPointerToX86reg(TempReg1, TempReg2,MipsRegLo(Opcode.rt));
-
-}
-
-void Compile_R4300i_SB (BLOCK_SECTION * Section){
-	uint32_t TempReg1, TempReg2;
-
-
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = (MipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 3;
-
-		if (IsConst(Opcode.rt)) {
-			Compile_SB_Const((uint8_t)MipsRegLo(Opcode.rt), Address);
-		} else if (IsMapped(Opcode.rt) && Is8BitReg(MipsRegLo(Opcode.rt))) {
-			Compile_SB_Register(MipsRegLo(Opcode.rt), Address);
-		} else {
-			Compile_SB_Register(Map_TempReg(Section,x86_Any8Bit,Opcode.rt,0), Address);
-		}
-		return;
-	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-		UnProtectGPR(Section,Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	//MoveVariableDispToX86Reg(TLB_Map,TempReg2,TempReg2,8);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	//For tlb miss
-	//0041C522 85 C0 test eax,eax
-	//0041C524 75 01 jne 0041C527
-
-	XorConstToX86Reg(TempReg1 | x64_Reg,3);
-	if (IsConst(Opcode.rt)) {
-		MoveConstByteToX86regPointer((uint8_t)MipsRegLo(Opcode.rt),TempReg1, TempReg2);
-	} else if (IsMapped(Opcode.rt) && Is8BitReg(MipsRegLo(Opcode.rt))) {
-		MoveX86regByteToX86regPointer(MipsRegLo(Opcode.rt),TempReg1, TempReg2);
-	} else {
-
-		UnProtectGPR(Section,Opcode.rt);
-		MoveX86regByteToX86regPointer(Map_TempReg(Section,x86_Any8Bit,Opcode.rt,0),TempReg1, TempReg2);
-	}
-
-}
-
-void Compile_R4300i_SH (BLOCK_SECTION * Section){
-	uint32_t TempReg1, TempReg2;
-
-
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = (MipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 2;
-
-		if (IsConst(Opcode.rt)) {
-			Compile_SH_Const((uint16_t)MipsRegLo(Opcode.rt), Address);
-		} else if (IsMapped(Opcode.rt)) {
-			Compile_SH_Register(MipsRegLo(Opcode.rt), Address);
-		} else {
-			Compile_SH_Register(Map_TempReg(Section,x86_Any,Opcode.rt,0), Address);
-		}
-		return;
-	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-		UnProtectGPR(Section,Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	//MoveVariableDispToX86Reg(TLB_Map,TempReg2,TempReg2,8);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	//For tlb miss
-	//0041C522 85 C0 test eax,eax
-	//0041C524 75 01 jne 0041C527
-
-	XorConstToX86Reg(TempReg1,2);
-	if (IsConst(Opcode.rt)) {
-		MoveConstHalfToX86regPointer((uint16_t)MipsRegLo(Opcode.rt),TempReg1, TempReg2);
-	} else if (IsMapped(Opcode.rt)) {
-		MoveX86regHalfToX86regPointer(MipsRegLo(Opcode.rt),TempReg1, TempReg2);
-	} else {
-		MoveX86regHalfToX86regPointer(Map_TempReg(Section,x86_Any,Opcode.rt,0),TempReg1, TempReg2);
-	}
-
-}
-
-void Compile_R4300i_SWL (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2, Value, Offset, shift;
-
-
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address;
-
-		Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-		Offset = Address & 3;
-
-		Value = Map_TempReg(Section,x86_Any,-1,0);
-		Compile_LW(Value,(Address & ~3));
-		AndConstToX86Reg(Value,SWL_MASK[Offset]);
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.rt,0);
-		ShiftRightUnsignImmed(TempReg1,(uint8_t)SWL_SHIFT[Offset]);
-		AddX86RegToX86Reg(Value,TempReg1);
-		Compile_SW_Register(Value, (Address & ~3));
-		return;
-	}
-	shift = Map_TempReg(Section,x86_ECX,-1,0);
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-		UnProtectGPR(Section,Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	//MoveVariableDispToX86Reg(TLB_Map,TempReg2,TempReg2,8);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-
-		//For tlb miss
-		//0041C522 85 C0 test eax,eax
-		//0041C524 75 01 jne 0041C527
-
-	Offset = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, Offset);
-	AndConstToX86Reg(Offset,3);
-	AndConstToX86Reg(TempReg1,~3);
-
-	Value = Map_TempReg(Section,x86_Any,-1,0);
-
-	MoveX86regPointerToX86reg(TempReg1, TempReg2,Value);
-
-
-	AndVariableDispToX86Reg(SWL_MASK,Value,Offset,4);
-	if (!IsConst(Opcode.rt) || MipsRegLo(Opcode.rt) != 0) {
-		MoveVariableDispToX86Reg(SWL_SHIFT,shift,Offset,4);
-		if (IsConst(Opcode.rt)) {
-			MoveConstToX86reg(MipsRegLo(Opcode.rt),Offset);
-		} else if (IsMapped(Opcode.rt)) {
-			MoveX86RegToX86Reg(MipsRegLo(Opcode.rt),Offset);
-		} else {
-			MoveVariableToX86reg(&GPR[Opcode.rt].UW[0],Offset);
-		}
-		ShiftRightUnsign(Offset);
-		AddX86RegToX86Reg(Value,Offset);
-	}
-
-
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	//MoveVariableDispToX86Reg(TLB_Map,TempReg2,TempReg2,8);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-
-	MoveX86regToX86regPointer(Value,TempReg1, TempReg2);
-
-}
-
-void Compile_R4300i_SW (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2;
-
-	{
-		if (IsConst(Opcode.base)) {
-			uint32_t Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-
-
-			if (IsConst(Opcode.rt)) {
-				Compile_SW_Const(MipsRegLo(Opcode.rt), Address);
-			} else if (IsMapped(Opcode.rt)) {
-				Compile_SW_Register(MipsRegLo(Opcode.rt), Address);
-			} else {
-				Compile_SW_Register(Map_TempReg(Section,x86_Any,Opcode.rt,0), Address);
-			}
-			return;
-		}
-		if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-		if (IsMapped(Opcode.base)) {
-			ProtectGPR(Section,Opcode.base);
-			if (Opcode.offset != 0) {
-				TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-				LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-			} else {
-				TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-			}
-			UnProtectGPR(Section,Opcode.base);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-			if (Opcode.immediate == 0) {
-			} else if (Opcode.immediate == 1) {
-				IncX86reg(TempReg1);
-			} else if (Opcode.immediate == 0xFFFF) {
-				DecX86reg(TempReg1);
-			} else {
-				AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-			}
-		}
-
-		TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-		MoveX86RegToX86Reg(TempReg1, TempReg2);
-		ShiftRightUnsignImmed(TempReg2,12);
-		LOAD_FROM_TLB(TempReg2, TempReg2);
-		//For tlb miss
-		//0041C522 85 C0 test eax,eax
-		//0041C524 75 01 jne 0041C527
-
-		if (IsConst(Opcode.rt)) {
-			MoveConstToX86regPointer(MipsRegLo(Opcode.rt),TempReg1, TempReg2);
-		} else if (IsMapped(Opcode.rt)) {
-			MoveX86regToX86regPointer(MipsRegLo(Opcode.rt),TempReg1, TempReg2);
-		} else {
-			MoveX86regToX86regPointer(Map_TempReg(Section,x86_Any,Opcode.rt,0),TempReg1, TempReg2);
-		}
-
-	}
-}
-
-void Compile_R4300i_SWR (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2, Value, Offset, shift;
-
-
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address;
-
-		Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-		Offset = Address & 3;
-
-		Value = Map_TempReg(Section,x86_Any,-1,0);
-		Compile_LW(Value,(Address & ~3));
-		AndConstToX86Reg(Value,SWR_MASK[Offset]);
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.rt,0);
-		ShiftLeftSignImmed(TempReg1,(uint8_t)SWR_SHIFT[Offset]);
-		AddX86RegToX86Reg(Value,TempReg1);
-		Compile_SW_Register(Value, (Address & ~3));
-		return;
-	}
-	shift = Map_TempReg(Section,x86_ECX,-1,0);
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-		UnProtectGPR(Section,Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	//MoveVariableDispToX86Reg(TLB_Map,TempReg2,TempReg2,8);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-
-		//For tlb miss
-		//0041C522 85 C0 test eax,eax
-		//0041C524 75 01 jne 0041C527
-
-	Offset = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, Offset);
-	AndConstToX86Reg(Offset,3);
-	AndConstToX86Reg(TempReg1,~3);
-
-	Value = Map_TempReg(Section,x86_Any,-1,0);
-
-	MoveX86regPointerToX86reg(TempReg1, TempReg2,Value);
-
-	AndVariableDispToX86Reg(SWR_MASK,Value,Offset,4);
-	if (!IsConst(Opcode.rt) || MipsRegLo(Opcode.rt) != 0) {
-		MoveVariableDispToX86Reg(SWR_SHIFT,shift,Offset,4);
-		if (IsConst(Opcode.rt)) {
-			MoveConstToX86reg(MipsRegLo(Opcode.rt),Offset);
-		} else if (IsMapped(Opcode.rt)) {
-			MoveX86RegToX86Reg(MipsRegLo(Opcode.rt),Offset);
-		} else {
-			MoveVariableToX86reg(&GPR[Opcode.rt].UW[0],Offset);
-		}
-		ShiftLeftSign(Offset);
-		AddX86RegToX86Reg(Value,Offset);
-	}
-
-
-
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	//MoveVariableDispToX86Reg(TLB_Map,TempReg2,TempReg2,8);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-
-	MoveX86regToX86regPointer(Value,TempReg1, TempReg2);
-
-}
-
-void Compile_R4300i_SDL (BLOCK_SECTION * Section) {
-
-	if (Opcode.base != 0) { UnMap_GPR(Section,Opcode.base,1); }
-	if (Opcode.rt != 0) { UnMap_GPR(Section,Opcode.rt,1); }
-	Pushad();
-	MoveConstToVariable(Opcode.Hex, &Opcode.Hex );
-	Call_Direct(r4300i_SDL);
-	Popad();
-
-}
-
-void Compile_R4300i_SDR (BLOCK_SECTION * Section) {
-
-	if (Opcode.base != 0) { UnMap_GPR(Section,Opcode.base,1); }
-	if (Opcode.rt != 0) { UnMap_GPR(Section,Opcode.rt,1); }
-	Pushad();
-	MoveConstToVariable(Opcode.Hex, &Opcode.Hex );
-	Call_Direct(r4300i_SDR);
-	Popad();
-
-}
-
-void ClearRecomplierCache (uint32_t Address) {
-	if (!TranslateVaddr(&Address)) { DisplayError("Cache: Failed to translate: %X",Address); return; }
-	if (Address < RdramSize) {
-		uint32_t Block = Address >> 12;
-		if (N64_Blocks.NoOfRDRamBlocks[Block] > 0) {
-			N64_Blocks.NoOfRDRamBlocks[Block] = 0;
-			memset(JumpTable + (Block << 10),0,0x1000);
-			*(DelaySlotTable + Block) = NULL;
-		}
-	} else {
-#ifndef EXTERNAL_RELEASE
-		DisplayError("ClearRecomplierCache: %X",Address);
-#endif
-	}
-}
-
-void Compile_R4300i_CACHE (BLOCK_SECTION * Section){
-/*
-	if (SelfModCheck != ModCode_Cache && SelfModCheck != ModCode_ChangeMemory && SelfModCheck != ModCode_CheckMemory2 && SelfModCheck != ModCode_CheckMemoryCache) {
-		return;
-	}
-
-	switch(Opcode.rt) {
-	case 0:
-	case 16:
-		Pushad();
-		if (IsConst(Opcode.base)) {
-			uint32_t Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-			MoveConstToX86reg(Address,x86_ECX);
-		} else if (IsMapped(Opcode.base)) {
-			if (MipsRegLo(Opcode.base) == x86_ECX) {
-				AddConstToX86Reg(x86_ECX,(short)Opcode.offset);
-			} else {
-				LeaSourceAndOffset(x86_ECX,MipsRegLo(Opcode.base),(short)Opcode.offset);
-			}
-		} else {
-			MoveVariableToX86reg(&GPR[Opcode.base].UW[0],x86_ECX);
-			AddConstToX86Reg(x86_ECX,(short)Opcode.offset);
-		}
-		Call_Direct(ClearRecomplierCache);
-		Popad();
-		break;
-	case 1:
-	case 3:
-	case 13:
-	case 5:
-	case 8:
-	case 9:
-	case 17:
-	case 21:
-	case 25:
-		break;
-#ifndef EXTERNAL_RELEASE
-	default:
-		DisplayError("cache: %d",Opcode.rt);
-#endif
-	}
-	*/
-}
-
-void Compile_R4300i_LL (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2;
-
-
-
-	if (Opcode.rt == 0) return;
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-		Map_GPR_32bit(Section,Opcode.rt,1,-1);
-		Compile_LW(MipsRegLo(Opcode.rt),Address);
-		MoveConstToVariable(1,&LLBit);
-		TranslateVaddr(&Address);
-		MoveConstToVariable(Address,&LLAddr);
-		return;
-	}
-
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base) && Opcode.offset == 0) {
-		ProtectGPR(Section,Opcode.base);
-		TempReg1 = MipsRegLo(Opcode.base);
-	} else {
-		if (IsMapped(Opcode.base)) {
-			ProtectGPR(Section,Opcode.base);
-			if (Opcode.offset != 0) {
-				TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-				LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-			} else {
-				TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-			}
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-			if (Opcode.immediate == 0) {
-			} else if (Opcode.immediate == 1) {
-				IncX86reg(TempReg1);
-			} else if (Opcode.immediate == 0xFFFF) {
-				DecX86reg(TempReg1);
-			} else {
-				AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-			}
-		}
-	}
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	//MoveVariableDispToX86Reg(TLB_Map,TempReg2,TempReg2,8);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	CompileReadTLBMiss(Section,TempReg1,TempReg2);
-	Map_GPR_32bit(Section,Opcode.rt,1,-1);
-	MoveX86regPointerToX86reg(TempReg1, TempReg2,MipsRegLo(Opcode.rt));
-	MoveConstToVariable(1,&LLBit);
-	MoveX86regToVariable(TempReg1,&LLAddr);
-	AddX86regToVariable(TempReg2,&LLAddr);
-	SubConstFromVariable((uintptr_t)N64MEM,&LLAddr);
-
-}
-
-void Compile_R4300i_SC (BLOCK_SECTION * Section){
-	uint32_t TempReg1, TempReg2;
-	uint8_t * Jump;
-
-
-
-	CompConstToVariable(1,&LLBit);
-	JneLabel32(0);
-	Jump = RecompPos - 4;
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-
-		if (IsConst(Opcode.rt)) {
-			Compile_SW_Const(MipsRegLo(Opcode.rt), Address);
-		} else if (IsMapped(Opcode.rt)) {
-			Compile_SW_Register(MipsRegLo(Opcode.rt), Address);
-		} else {
-			Compile_SW_Register(Map_TempReg(Section,x86_Any,Opcode.rt,0), Address);
-		}
-
-		*((uint32_t *)(Jump))=(uint8_t)(RecompPos - Jump - 4);
-		Map_GPR_32bit(Section,Opcode.rt,0,-1);
-		MoveVariableToX86reg(&LLBit,MipsRegLo(Opcode.rt));
-		return;
-	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-		UnProtectGPR(Section,Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	//MoveVariableDispToX86Reg(TLB_Map,TempReg2,TempReg2,8);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	//For tlb miss
-	//0041C522 85 C0 test eax,eax
-	//0041C524 75 01 jne 0041C527
-
-	if (IsConst(Opcode.rt)) {
-		MoveConstToX86regPointer(MipsRegLo(Opcode.rt),TempReg1, TempReg2);
-	} else if (IsMapped(Opcode.rt)) {
-		MoveX86regToX86regPointer(MipsRegLo(Opcode.rt),TempReg1, TempReg2);
-	} else {
-		MoveX86regToX86regPointer(Map_TempReg(Section,x86_Any,Opcode.rt,0),TempReg1, TempReg2);
-	}
-
-
-	*((uint32_t *)(Jump))=(uint8_t)(RecompPos - Jump - 4);
-	Map_GPR_32bit(Section,Opcode.rt,0,-1);
-	MoveVariableToX86reg(&LLBit,MipsRegLo(Opcode.rt));
-
-}
-
-void Compile_R4300i_LD (BLOCK_SECTION * Section) {
-	uint32_t TempReg1, TempReg2;
-
-
-
-	if (Opcode.rt == 0) return;
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-		Map_GPR_64bit(Section,Opcode.rt,-1);
-		Compile_LW(MipsRegHi(Opcode.rt),Address);
-		Compile_LW(MipsRegLo(Opcode.rt),Address + 4);
-		return;
-	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base) && Opcode.offset == 0) {
-
-	ProtectGPR(Section,Opcode.base);
-	TempReg1 = MipsRegLo(Opcode.base);
-
-	} else {
-		if (IsMapped(Opcode.base)) {
-			ProtectGPR(Section,Opcode.base);
-			if (Opcode.offset != 0) {
-				TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-				LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-			} else {
-				TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-			}
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-			if (Opcode.immediate == 0) {
-			} else if (Opcode.immediate == 1) {
-				IncX86reg(TempReg1);
-			} else if (Opcode.immediate == 0xFFFF) {
-				DecX86reg(TempReg1);
-			} else {
-				AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-			}
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	//MoveVariableDispToX86Reg(TLB_Map,TempReg2,TempReg2,8);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	//For tlb miss
-	//0041C522 85 C0 test eax,eax
-	//0041C524 75 01 jne 0041C527
-	Map_GPR_64bit(Section,Opcode.rt,-1);
-	MoveX86regPointerToX86reg(TempReg1, TempReg2,MipsRegHi(Opcode.rt));
-	MoveX86regPointerToX86regDisp8(TempReg1, TempReg2,MipsRegLo(Opcode.rt),4);
-
-
-}
-
-void Compile_R4300i_SD (BLOCK_SECTION * Section){
-	uint32_t TempReg1, TempReg2;
-
-
-
-	if (IsConst(Opcode.base)) {
-		uint32_t Address = MipsRegLo(Opcode.base) + (short)Opcode.offset;
-
-		if (IsConst(Opcode.rt)) {
-			if (Is64Bit(Opcode.rt)) {
-				Compile_SW_Const(MipsRegHi(Opcode.rt), Address);
-			} else {
-				Compile_SW_Const((MipsRegLo_S(Opcode.rt) >> 31), Address);
-			}
-			Compile_SW_Const(MipsRegLo(Opcode.rt), Address + 4);
-		} else if (IsMapped(Opcode.rt)) {
-			if (Is64Bit(Opcode.rt)) {
-				Compile_SW_Register(MipsRegHi(Opcode.rt), Address);
-			} else {
-				Compile_SW_Register(Map_TempReg(Section,x86_Any,Opcode.rt,1), Address);
-			}
-			Compile_SW_Register(MipsRegLo(Opcode.rt), Address + 4);
-		} else {
-			Compile_SW_Register(TempReg1 = Map_TempReg(Section,x86_Any,Opcode.rt,1), Address);
-			Compile_SW_Register(Map_TempReg(Section,TempReg1,Opcode.rt,0), Address + 4);
-		}
-		return;
-	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Section,Opcode.rt); }
-	if (IsMapped(Opcode.base)) {
-		ProtectGPR(Section,Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(Section,x86_Any,-1,0);
-			LeaSourceAndOffset(TempReg1,MipsRegLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		}
-	} else {
-		TempReg1 = Map_TempReg(Section,x86_Any,Opcode.base,0);
-		if (Opcode.immediate == 0) {
-		} else if (Opcode.immediate == 1) {
-			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {
-			DecX86reg(TempReg1);
-		} else {
-			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-		}
-	}
-
-	TempReg2 = Map_TempReg(Section,x64_Any,-1,0);
-	MoveX86RegToX86Reg(TempReg1, TempReg2);
-	ShiftRightUnsignImmed(TempReg2,12);
-	//MoveVariableDispToX86Reg(TLB_Map,TempReg2,TempReg2,8);
-	LOAD_FROM_TLB(TempReg2, TempReg2);
-	//For tlb miss
-	//0041C522 85 C0 test eax,eax
-	//0041C524 75 01 jne 0041C527
-
-	if (IsConst(Opcode.rt)) {
-		if (Is64Bit(Opcode.rt)) {
-			MoveConstToX86regPointer(MipsRegHi(Opcode.rt),TempReg1, TempReg2);
-		} else {
-			MoveConstToX86regPointer((MipsRegLo_S(Opcode.rt) >> 31),TempReg1, TempReg2);
-		}
-		AddConstToX86Reg(TempReg1,4);
-		MoveConstToX86regPointer(MipsRegLo(Opcode.rt),TempReg1, TempReg2);
-	} else if (IsMapped(Opcode.rt)) {
-		if (Is64Bit(Opcode.rt)) {
-			MoveX86regToX86regPointer(MipsRegHi(Opcode.rt),TempReg1, TempReg2);
-		} else {
-			MoveX86regToX86regPointer(Map_TempReg(Section,x86_Any,Opcode.rt,1),TempReg1, TempReg2);
-		}
-		AddConstToX86Reg(TempReg1,4);
-		MoveX86regToX86regPointer(MipsRegLo(Opcode.rt),TempReg1, TempReg2);
-	} else {
-		int32_t X86Reg = Map_TempReg(Section,x86_Any,Opcode.rt,1);
-		MoveX86regToX86regPointer(X86Reg,TempReg1, TempReg2);
-		AddConstToX86Reg(TempReg1,4);
-		MoveX86regToX86regPointer(Map_TempReg(Section,X86Reg,Opcode.rt,0),TempReg1, TempReg2);
-	}
-
-}
-
-/********************** R4300i OpCodes: Special **********************/
-void Compile_R4300i_SPECIAL_SLL (BLOCK_SECTION * Section) {
-
-
-	if (Opcode.rd == 0) { return; }
-	if (IsConst(Opcode.rt)) {
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsRegLo(Opcode.rd) = MipsRegLo(Opcode.rt) << Opcode.sa;
-		MipsRegState(Opcode.rd) = STATE_CONST_32;
-		return;
-	}
-	if (Opcode.rd != Opcode.rt && IsMapped(Opcode.rt)) {
-		switch (Opcode.sa) {
-		case 0:
-			Map_GPR_32bit(Section,Opcode.rd,1,Opcode.rt);
-			break;
-		case 1:
-			ProtectGPR(Section,Opcode.rt);
-			Map_GPR_32bit(Section,Opcode.rd,1,-1);
-			LeaRegReg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt), 2);
-			break;
-		case 2:
-			ProtectGPR(Section,Opcode.rt);
-			Map_GPR_32bit(Section,Opcode.rd,1,-1);
-			LeaRegReg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt), 4);
-			break;
-		case 3:
-			ProtectGPR(Section,Opcode.rt);
-			Map_GPR_32bit(Section,Opcode.rd,1,-1);
-			LeaRegReg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt), 8);
-			break;
-		default:
-			Map_GPR_32bit(Section,Opcode.rd,1,Opcode.rt);
-			ShiftLeftSignImmed(MipsRegLo(Opcode.rd),(uint8_t)Opcode.sa);
-		}
-	} else {
-		Map_GPR_32bit(Section,Opcode.rd,1,Opcode.rt);
-		ShiftLeftSignImmed(MipsRegLo(Opcode.rd),(uint8_t)Opcode.sa);
-	}
-}
-
-void Compile_R4300i_SPECIAL_SRL (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(Opcode.rt)) {
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsRegLo(Opcode.rd) = MipsRegLo(Opcode.rt) >> Opcode.sa;
-		MipsRegState(Opcode.rd) = STATE_CONST_32;
-		return;
-	}
-	Map_GPR_32bit(Section,Opcode.rd,1,Opcode.rt);
-	ShiftRightUnsignImmed(MipsRegLo(Opcode.rd),(uint8_t)Opcode.sa);
-}
-
-void Compile_R4300i_SPECIAL_SRA (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(Opcode.rt)) {
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsRegLo(Opcode.rd) = MipsRegLo_S(Opcode.rt) >> Opcode.sa;
-		MipsRegState(Opcode.rd) = STATE_CONST_32;
-		return;
-	}
-	Map_GPR_32bit(Section,Opcode.rd,1,Opcode.rt);
-	ShiftRightSignImmed(MipsRegLo(Opcode.rd),(uint8_t)Opcode.sa);
-}
-
-void Compile_R4300i_SPECIAL_SLLV (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(Opcode.rs)) {
-		uint32_t Shift = (MipsRegLo(Opcode.rs) & 0x1F);
-		if (IsConst(Opcode.rt)) {
-			if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-			MipsRegLo(Opcode.rd) = MipsRegLo(Opcode.rt) << Shift;
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else {
-			Map_GPR_32bit(Section,Opcode.rd,1,Opcode.rt);
-			ShiftLeftSignImmed(MipsRegLo(Opcode.rd),(uint8_t)Shift);
-		}
-		return;
-	}
-	Map_TempReg(Section,x86_ECX,Opcode.rs,0);
-	AndConstToX86Reg(x86_ECX,0x1F);
-	Map_GPR_32bit(Section,Opcode.rd,1,Opcode.rt);
-	ShiftLeftSign(MipsRegLo(Opcode.rd));
-}
-
-void Compile_R4300i_SPECIAL_SRLV (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsKnown(Opcode.rs) && IsConst(Opcode.rs)) {
-		uint32_t Shift = (MipsRegLo(Opcode.rs) & 0x1F);
-		if (IsConst(Opcode.rt)) {
-			if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-			MipsRegLo(Opcode.rd) = MipsRegLo(Opcode.rt) >> Shift;
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-			return;
-		}
-		Map_GPR_32bit(Section,Opcode.rd,1,Opcode.rt);
-		ShiftRightUnsignImmed(MipsRegLo(Opcode.rd),(uint8_t)Shift);
-		return;
-	}
-	Map_TempReg(Section,x86_ECX,Opcode.rs,0);
-	AndConstToX86Reg(x86_ECX,0x1F);
-	Map_GPR_32bit(Section,Opcode.rd,1,Opcode.rt);
-	ShiftRightUnsign(MipsRegLo(Opcode.rd));
-}
-
-void Compile_R4300i_SPECIAL_SRAV (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsKnown(Opcode.rs) && IsConst(Opcode.rs)) {
-		uint32_t Shift = (MipsRegLo(Opcode.rs) & 0x1F);
-		if (IsConst(Opcode.rt)) {
-			if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-			MipsRegLo(Opcode.rd) = MipsRegLo_S(Opcode.rt) >> Shift;
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-			return;
-		}
-		Map_GPR_32bit(Section,Opcode.rd,1,Opcode.rt);
-		ShiftRightSignImmed(MipsRegLo(Opcode.rd),(uint8_t)Shift);
-		return;
-	}
-	Map_TempReg(Section,x86_ECX,Opcode.rs,0);
-	AndConstToX86Reg(x86_ECX,0x1F);
-	Map_GPR_32bit(Section,Opcode.rd,1,Opcode.rt);
-	ShiftRightSign(MipsRegLo(Opcode.rd));
-}
-
-void Compile_R4300i_SPECIAL_JR (BLOCK_SECTION * Section) {
-
-	if ( NextInstruction == NORMAL ) {
-
-		if (IsConst(Opcode.rs)) {
-			Section->Jump.TargetPC = MipsRegLo(Opcode.rs);
-			Section->Jump.FallThrough = 1;
-			Section->Jump.LinkLocation = NULL;
-			Section->Jump.LinkLocation2 = NULL;
-			Section->Cont.FallThrough = 0;
-			Section->Cont.LinkLocation = NULL;
-			Section->Cont.LinkLocation2 = NULL;
-			if ((Section->CompilePC & 0xFFC) == 0xFFC) {
-				GenerateSectionLinkage(Section);
-				NextInstruction = END_BLOCK;
-				return;
-			}
-		}
-		if ((Section->CompilePC & 0xFFC) == 0xFFC) {
-			if (IsMapped(Opcode.rs)) {
-				MoveX86regToVariable(MipsRegLo(Opcode.rs),&JumpToLocation);
-			} else {
-				MoveX86regToVariable(Map_TempReg(Section,x86_Any,Opcode.rs,0),&JumpToLocation);
-			}
-			MoveConstToVariable(Section->CompilePC + 4,&PROGRAM_COUNTER);
-			if (BlockCycleCount != 0) {
-				AddConstToVariable(BlockCycleCount,&CP0[9]);
-				SubConstFromVariable(BlockCycleCount,&Timers->Timer);
-			}
-			if (BlockRandomModifier != 0) { SubConstFromVariable(BlockRandomModifier,&CP0[1]); }
-			WriteBackRegisters(Section);
-			MoveConstToVariable(DELAY_SLOT,&NextInstruction);
-			Ret();
-			NextInstruction = END_BLOCK;
-			return;
-		}
-		if (DelaySlotEffectsCompare(Section->CompilePC,Opcode.rs,0)) {
-			if (IsConst(Opcode.rs)) {
-				MoveConstToVariable(MipsRegLo(Opcode.rs),&PROGRAM_COUNTER);
-			} else 	if (IsMapped(Opcode.rs)) {
-				MoveX86regToVariable(MipsRegLo(Opcode.rs),&PROGRAM_COUNTER);
-			} else {
-				MoveX86regToVariable(Map_TempReg(Section,x86_Any,Opcode.rs,0),&PROGRAM_COUNTER);
-			}
-		}
-		NextInstruction = DO_DELAY_SLOT;
-	} else if (NextInstruction == DELAY_SLOT_DONE ) {
-		if (DelaySlotEffectsCompare(Section->CompilePC,Opcode.rs,0)) {
-
-			CompileExit((uint32_t)-1,&Section->RegWorking,Normal,1,NULL);
-		} else {
-			if (IsConst(Opcode.rs)) {
-				memcpy(&Section->Jump.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-				GenerateSectionLinkage(Section);
-			} else {
-				if (IsMapped(Opcode.rs)) {
-
-					MoveX86regToVariable(MipsRegLo(Opcode.rs),&PROGRAM_COUNTER);
-				} else {
-					MoveX86regToVariable(Map_TempReg(Section,x86_Any,Opcode.rs,0),&PROGRAM_COUNTER);
-				}
-				CompileExit((uint32_t)-1,&Section->RegWorking,Normal,1,NULL);
-			}
-		}
-		NextInstruction = END_BLOCK;
-	} else {
-#ifndef EXTERNAL_RELEASE
-		DisplayError("WTF\n\nBranch\nNextInstruction = %X", NextInstruction);
-#endif
-	}
-}
-
-void Compile_R4300i_SPECIAL_JALR (BLOCK_SECTION * Section) {
-	if ( NextInstruction == NORMAL ) {
-
-		if (DelaySlotEffectsCompare(Section->CompilePC,Opcode.rs,0)) {
-			Compile_R4300i_UnknownOpcode(Section);
-		}
-		UnMap_GPR(Section, Opcode.rd, 0);
-		MipsRegLo(Opcode.rd) = Section->CompilePC + 8;
-		MipsRegState(Opcode.rd) = STATE_CONST_32;
-		if ((Section->CompilePC & 0xFFC) == 0xFFC) {
-			if (IsMapped(Opcode.rs)) {
-				MoveX86regToVariable(MipsRegLo(Opcode.rs),&JumpToLocation);
-			} else {
-				MoveX86regToVariable(Map_TempReg(Section,x86_Any,Opcode.rs,0),&JumpToLocation);
-			}
-			MoveConstToVariable(Section->CompilePC + 4,&PROGRAM_COUNTER);
-			if (BlockCycleCount != 0) {
-				AddConstToVariable(BlockCycleCount,&CP0[9]);
-				SubConstFromVariable(BlockCycleCount,&Timers->Timer);
-			}
-			if (BlockRandomModifier != 0) { SubConstFromVariable(BlockRandomModifier,&CP0[1]); }
-			WriteBackRegisters(Section);
-			MoveConstToVariable(DELAY_SLOT,&NextInstruction);
-			Ret();
-			NextInstruction = END_BLOCK;
-			return;
-		}
-		NextInstruction = DO_DELAY_SLOT;
-	} else if (NextInstruction == DELAY_SLOT_DONE ) {
-		if (IsConst(Opcode.rs)) {
-			memcpy(&Section->Jump.RegSet,&Section->RegWorking,sizeof(REG_INFO));
-			Section->Jump.TargetPC = MipsRegLo(Opcode.rs);
-			Section->Jump.FallThrough = 1;
-			Section->Jump.LinkLocation = NULL;
-			Section->Jump.LinkLocation2 = NULL;
-			Section->Cont.FallThrough = 0;
-			Section->Cont.LinkLocation = NULL;
-			Section->Cont.LinkLocation2 = NULL;
-
-			GenerateSectionLinkage(Section);
-		} else {
-			if (IsMapped(Opcode.rs)) {
-				MoveX86regToVariable(MipsRegLo(Opcode.rs),&PROGRAM_COUNTER);
-			} else {
-				MoveX86regToVariable(Map_TempReg(Section,x86_Any,Opcode.rs,0),&PROGRAM_COUNTER);
-			}
-			CompileExit((uint32_t)-1,&Section->RegWorking,Normal,1,NULL);
-		}
-		NextInstruction = END_BLOCK;
-	} else {
-	}
-}
-
-void Compile_R4300i_SPECIAL_SYSCALL (BLOCK_SECTION * Section) {
-	CompileExit(Section->CompilePC,&Section->RegWorking,DoSysCall,1,NULL);
-}
-
-void Compile_R4300i_SPECIAL_BREAK (BLOCK_SECTION * Section) {
-	//CompileExit(Section->CompilePC,Section->RegWorking,DoBreak,1,NULL);
-	MoveConstToVariable(1,WaitMode);
-}
-
-
-void Compile_R4300i_SPECIAL_MFLO (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	Map_GPR_64bit(Section,Opcode.rd,-1);
-	MoveVariableToX86reg(&LO.UW[0],MipsRegLo(Opcode.rd));
-	MoveVariableToX86reg(&LO.UW[1],MipsRegHi(Opcode.rd));
-}
-
-void Compile_R4300i_SPECIAL_MTLO (BLOCK_SECTION * Section) {
-
-
-	if (IsKnown(Opcode.rs) && IsConst(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-			MoveConstToVariable(MipsRegHi(Opcode.rs),&LO.UW[1]);
-		} else if (IsSigned(Opcode.rs) && ((MipsRegLo(Opcode.rs) & 0x80000000) != 0)) {
-			MoveConstToVariable(0xFFFFFFFF,&LO.UW[1]);
-		} else {
-			MoveConstToVariable(0,&LO.UW[1]);
-		}
-		MoveConstToVariable(MipsRegLo(Opcode.rs), &LO.UW[0]);
-	} else if (IsKnown(Opcode.rs) && IsMapped(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-			MoveX86regToVariable(MipsRegHi(Opcode.rs),&LO.UW[1]);
-		} else if (IsSigned(Opcode.rs)) {
-			MoveX86regToVariable(Map_TempReg(Section,x86_Any,Opcode.rs,1),&LO.UW[1]);
-		} else {
-			MoveConstToVariable(0,&LO.UW[1]);
-		}
-		MoveX86regToVariable(MipsRegLo(Opcode.rs), &LO.UW[0]);
-	} else {
-		int32_t x86reg = Map_TempReg(Section,x86_Any,Opcode.rs,1);
-		MoveX86regToVariable(x86reg,&LO.UW[1]);
-		MoveX86regToVariable(Map_TempReg(Section,x86reg,Opcode.rs,0), &LO.UW[0]);
-	}
-}
-
-void Compile_R4300i_SPECIAL_MFHI (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	Map_GPR_64bit(Section,Opcode.rd,-1);
-	MoveVariableToX86reg(&HI.UW[0],MipsRegLo(Opcode.rd));
-	MoveVariableToX86reg(&HI.UW[1],MipsRegHi(Opcode.rd));
-}
-
-void Compile_R4300i_SPECIAL_MTHI (BLOCK_SECTION * Section) {
-
-	if (IsKnown(Opcode.rs) && IsConst(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-			MoveConstToVariable(MipsRegHi(Opcode.rs),&HI.UW[1]);
-		} else if (IsSigned(Opcode.rs) && ((MipsRegLo(Opcode.rs) & 0x80000000) != 0)) {
-			MoveConstToVariable(0xFFFFFFFF,&HI.UW[1]);
-		} else {
-			MoveConstToVariable(0,&HI.UW[1]);
-		}
-		MoveConstToVariable(MipsRegLo(Opcode.rs), &HI.UW[0]);
-	} else if (IsKnown(Opcode.rs) && IsMapped(Opcode.rs)) {
-		if (Is64Bit(Opcode.rs)) {
-			MoveX86regToVariable(MipsRegHi(Opcode.rs),&HI.UW[1]);
-		} else if (IsSigned(Opcode.rs)) {
-			MoveX86regToVariable(Map_TempReg(Section,x86_Any,Opcode.rs,1),&HI.UW[1]);
-		} else {
-			MoveConstToVariable(0,&HI.UW[1]);
-		}
-		MoveX86regToVariable(MipsRegLo(Opcode.rs), &HI.UW[0]);
-	} else {
-		int32_t x86reg = Map_TempReg(Section,x86_Any,Opcode.rs,1);
-		MoveX86regToVariable(x86reg,&HI.UW[1]);
-		MoveX86regToVariable(Map_TempReg(Section,x86reg,Opcode.rs,0), &HI.UW[0]);
-	}
-}
-
-void Compile_R4300i_SPECIAL_DSLLV (BLOCK_SECTION * Section) {
-	uint8_t * Jump[2];
-
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(Opcode.rs)) {
-		uint32_t Shift = (MipsRegLo(Opcode.rs) & 0x3F);
-		Compile_R4300i_UnknownOpcode(Section);
-		return;
-	}
-	Map_TempReg(Section,x86_ECX,Opcode.rs,0);
-	AndConstToX86Reg(x86_ECX,0x3F);
-	Map_GPR_64bit(Section,Opcode.rd,Opcode.rt);
-	CompConstToX86reg(x86_ECX,0x20);
-	JaeLabel8( 0);
-	Jump[0] = RecompPos - 1;
-	ShiftLeftDouble(MipsRegHi(Opcode.rd),MipsRegLo(Opcode.rd));
-	ShiftLeftSign(MipsRegLo(Opcode.rd));
-	JmpLabel8( 0);
-	Jump[1] = RecompPos - 1;
-
-	//MORE32:
-
-
-	*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-	MoveX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegHi(Opcode.rd));
-	XorX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rd));
-	AndConstToX86Reg(x86_ECX,0x1F);
-	ShiftLeftSign(MipsRegHi(Opcode.rd));
-
-	//continue:
-
-
-	*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-}
-
-void Compile_R4300i_SPECIAL_DSRLV (BLOCK_SECTION * Section) {
-	uint8_t * Jump[2];
-
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(Opcode.rs)) {
-		uint32_t Shift = (MipsRegLo(Opcode.rs) & 0x3F);
-		if (IsConst(Opcode.rt)) {
-			if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-			MipsReg(Opcode.rd) = Is64Bit(Opcode.rt)?MipsReg(Opcode.rt):(int64_t)MipsRegLo_S(Opcode.rt);
-			MipsReg(Opcode.rd) = MipsReg(Opcode.rd) >> Shift;
-			if ((MipsRegHi(Opcode.rd) == 0) && (MipsRegLo(Opcode.rd) & 0x80000000) == 0) {
-				MipsRegState(Opcode.rd) = STATE_CONST_32;
-			} else if ((MipsRegHi(Opcode.rd) == 0xFFFFFFFF) && (MipsRegLo(Opcode.rd) & 0x80000000) != 0) {
-				MipsRegState(Opcode.rd) = STATE_CONST_32;
-			} else {
-				MipsRegState(Opcode.rd) = STATE_CONST_64;
-			}
-			return;
-		}
-		//if (Shift < 0x20) {
-		//} else {
-		//}
-		//Compile_R4300i_UnknownOpcode(Section);
-		//return;
-	}
-	Map_TempReg(Section,x86_ECX,Opcode.rs,0);
-	AndConstToX86Reg(x86_ECX,0x3F);
-	Map_GPR_64bit(Section,Opcode.rd,Opcode.rt);
-	CompConstToX86reg(x86_ECX,0x20);
-	JaeLabel8( 0);
-	Jump[0] = RecompPos - 1;
-	ShiftRightDouble(MipsRegLo(Opcode.rd),MipsRegHi(Opcode.rd));
-	ShiftRightUnsign(MipsRegHi(Opcode.rd));
-	JmpLabel8( 0);
-	Jump[1] = RecompPos - 1;
-
-	//MORE32:
-
-
-	*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-	MoveX86RegToX86Reg(MipsRegHi(Opcode.rd),MipsRegLo(Opcode.rd));
-	XorX86RegToX86Reg(MipsRegHi(Opcode.rd),MipsRegHi(Opcode.rd));
-	AndConstToX86Reg(x86_ECX,0x1F);
-	ShiftRightUnsign(MipsRegLo(Opcode.rd));
-
-	//continue:
-
-
-	*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-}
-
-void Compile_R4300i_SPECIAL_DSRAV (BLOCK_SECTION * Section) {
-	uint8_t * Jump[2];
-
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(Opcode.rs)) {
-		uint32_t Shift = (MipsRegLo(Opcode.rs) & 0x3F);
-		Compile_R4300i_UnknownOpcode(Section);
-		return;
-	}
-	Map_TempReg(Section,x86_ECX,Opcode.rs,0);
-	AndConstToX86Reg(x86_ECX,0x3F);
-	Map_GPR_64bit(Section,Opcode.rd,Opcode.rt);
-	CompConstToX86reg(x86_ECX,0x20);
-	JaeLabel8( 0);
-	Jump[0] = RecompPos - 1;
-	ShiftRightDouble(MipsRegLo(Opcode.rd),MipsRegHi(Opcode.rd));
-	ShiftRightSign(MipsRegHi(Opcode.rd));
-	JmpLabel8( 0);
-	Jump[1] = RecompPos - 1;
-
-	//MORE32:
-
-
-	*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-	MoveX86RegToX86Reg(MipsRegHi(Opcode.rd),MipsRegLo(Opcode.rd));
-	ShiftRightSignImmed(MipsRegHi(Opcode.rd),0x1F);
-	AndConstToX86Reg(x86_ECX,0x1F);
-	ShiftRightSign(MipsRegLo(Opcode.rd));
-
-	//continue:
-
-
-	*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-}
-
-void Compile_R4300i_SPECIAL_MULT ( BLOCK_SECTION * Section) {
-
-
-	x86Protected(x86_EDX) = 1;
-	Map_TempReg(Section,x86_EAX,Opcode.rs,0);
-	x86Protected(x86_EDX) = 0;
-	Map_TempReg(Section,x86_EDX,Opcode.rt,0);
-
-	imulX86reg(x86_EDX);
-
-	MoveX86regToVariable(x86_EAX,&LO.UW[0]);
-	MoveX86regToVariable(x86_EDX,&HI.UW[0]);
-	ShiftRightSignImmed(x86_EAX,31);	/* paired */
-	ShiftRightSignImmed(x86_EDX,31);
-	MoveX86regToVariable(x86_EAX,&LO.UW[1]);
-	MoveX86regToVariable(x86_EDX,&HI.UW[1]);
-}
-
-void Compile_R4300i_SPECIAL_MULTU (BLOCK_SECTION * Section) {
-
-
-	x86Protected(x86_EDX) = 1;
-	Map_TempReg(Section,x86_EAX,Opcode.rs,0);
-	x86Protected(x86_EDX) = 0;
-	Map_TempReg(Section,x86_EDX,Opcode.rt,0);
-
-	MulX86reg(x86_EDX);
-
-	MoveX86regToVariable(x86_EAX,&LO.UW[0]);
-	MoveX86regToVariable(x86_EDX,&HI.UW[0]);
-	ShiftRightSignImmed(x86_EAX,31);	/* paired */
-	ShiftRightSignImmed(x86_EDX,31);
-	MoveX86regToVariable(x86_EAX,&LO.UW[1]);
-	MoveX86regToVariable(x86_EDX,&HI.UW[1]);
-}
-
-void Compile_R4300i_SPECIAL_DIV (BLOCK_SECTION * Section) {
-	uint8_t *Jump[2];
-
-
-
-	if (IsConst(Opcode.rt)) {
-		if (MipsRegLo(Opcode.rt) == 0) {
-			MoveConstToVariable(0, &LO.UW[0]);
-			MoveConstToVariable(0, &LO.UW[1]);
-			MoveConstToVariable(0, &HI.UW[0]);
-			MoveConstToVariable(0, &HI.UW[1]);
-			return;
-		}
-		Jump[1] = NULL;
-	} else {
-		if (IsMapped(Opcode.rt)) {
-			CompConstToX86reg(MipsRegLo(Opcode.rt),0);
-		} else {
-			CompConstToVariable(0, &GPR[Opcode.rt].W[0]);
-		}
-		JneLabel8( 0);
-		Jump[0] = RecompPos - 1;
-
-		MoveConstToVariable(0, &LO.UW[0]);
-		MoveConstToVariable(0, &LO.UW[1]);
-		MoveConstToVariable(0, &HI.UW[0]);
-		MoveConstToVariable(0, &HI.UW[1]);
-
-		JmpLabel8( 0);
-		Jump[1] = RecompPos - 1;
-
-
-
-		*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-	}
-	/*	lo = (SD)rs / (SD)rt;
-		hi = (SD)rs % (SD)rt; */
-
-	x86Protected(x86_EDX) = 1;
-	Map_TempReg(Section,x86_EAX,Opcode.rs,0);
-
-	/* edx is the signed portion to eax */
-	x86Protected(x86_EDX) = 0;
-	Map_TempReg(Section,x86_EDX, -1, 0);
-
-	MoveX86RegToX86Reg(x86_EAX, x86_EDX);
-	ShiftRightSignImmed(x86_EDX,31);
-
-	if (IsMapped(Opcode.rt)) {
-		idivX86reg(MipsRegLo(Opcode.rt));
-	} else {
-		idivX86reg(Map_TempReg(Section,x86_Any,Opcode.rt,0));
-	}
-
-
-	MoveX86regToVariable(x86_EAX,&LO.UW[0]);
-	MoveX86regToVariable(x86_EDX,&HI.UW[0]);
-	ShiftRightSignImmed(x86_EAX,31);	/* paired */
-	ShiftRightSignImmed(x86_EDX,31);
-	MoveX86regToVariable(x86_EAX,&LO.UW[1]);
-	MoveX86regToVariable(x86_EDX,&HI.UW[1]);
-
-	if( Jump[1] != NULL ) {
-
-
-		*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-	}
-}
-
-void Compile_R4300i_SPECIAL_DIVU ( BLOCK_SECTION * Section) {
-	uint8_t *Jump[2];
-	int32_t x86reg;
-
-
-
-	if (IsConst(Opcode.rt)) {
-		if (MipsRegLo(Opcode.rt) == 0) {
-			MoveConstToVariable(0, &LO.UW[0]);
-			MoveConstToVariable(0, &LO.UW[1]);
-			MoveConstToVariable(0, &HI.UW[0]);
-			MoveConstToVariable(0, &HI.UW[1]);
-			return;
-		}
-		Jump[1] = NULL;
-	} else {
-		if (IsMapped(Opcode.rt)) {
-			CompConstToX86reg(MipsRegLo(Opcode.rt),0);
-		} else {
-			CompConstToVariable(0, &GPR[Opcode.rt].W[0]);
-		}
-		JneLabel8( 0);
-		Jump[0] = RecompPos - 1;
-
-		MoveConstToVariable(0, &LO.UW[0]);
-		MoveConstToVariable(0, &LO.UW[1]);
-		MoveConstToVariable(0, &HI.UW[0]);
-		MoveConstToVariable(0, &HI.UW[1]);
-
-		JmpLabel8( 0);
-		Jump[1] = RecompPos - 1;
-
-
-
-		*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-	}
-
-
-	/*	lo = (UD)rs / (UD)rt;
-		hi = (UD)rs % (UD)rt; */
-
-	x86Protected(x86_EAX) = 1;
-	Map_TempReg(Section,x86_EDX, 0, 0);
-	x86Protected(x86_EAX) = 0;
-
-	Map_TempReg(Section,x86_EAX,Opcode.rs,0);
-	x86reg = Map_TempReg(Section,x86_Any,Opcode.rt,0);
-
- DivX86reg(x86reg);
-
-	MoveX86regToVariable(x86_EAX,&LO.UW[0]);
-	MoveX86regToVariable(x86_EDX,&HI.UW[0]);
-
-	/* wouldnt these be zero (???) */
-
-	ShiftRightSignImmed(x86_EAX,31);	/* paired */
-	ShiftRightSignImmed(x86_EDX,31);
-	MoveX86regToVariable(x86_EAX,&LO.UW[1]);
-	MoveX86regToVariable(x86_EDX,&HI.UW[1]);
-
-	if( Jump[1] != NULL ) {
-
-
-		*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-	}
-}
-
-void Compile_R4300i_SPECIAL_DMULT (BLOCK_SECTION * Section) {
-
-
-	if (Opcode.rs != 0) { UnMap_GPR(Section,Opcode.rs,1); }
-	if (Opcode.rs != 0) { UnMap_GPR(Section,Opcode.rt,1); }
-	Pushad();
-	MoveConstToVariable(Opcode.Hex, &Opcode.Hex );
-	Call_Direct(r4300i_SPECIAL_DMULT);
-	Popad();
-}
-
-void Compile_R4300i_SPECIAL_DMULTU (BLOCK_SECTION * Section) {
-
-
-	/* LO.UDW = (uint64)GPR[Opcode.rs].UW[0] * (uint64)GPR[Opcode.rt].UW[0]; */
-	x86Protected(x86_EDX) = 1;
-	Map_TempReg(Section,x86_EAX,Opcode.rs,0);
-	x86Protected(x86_EDX) = 0;
-	Map_TempReg(Section,x86_EDX,Opcode.rt,0);
-
-	MulX86reg(x86_EDX);
-	MoveX86regToVariable(x86_EAX, &LO.UW[0]);
-	MoveX86regToVariable(x86_EDX, &LO.UW[1]);
-
-	/* HI.UDW = (uint64)GPR[Opcode.rs].UW[1] * (uint64)GPR[Opcode.rt].UW[1]; */
-	Map_TempReg(Section,x86_EAX,Opcode.rs,1);
-	Map_TempReg(Section,x86_EDX,Opcode.rt,1);
-
-	MulX86reg(x86_EDX);
-	MoveX86regToVariable(x86_EAX, &HI.UW[0]);
-	MoveX86regToVariable(x86_EDX, &HI.UW[1]);
-
-	/* Tmp[0].UDW = (uint64)GPR[Opcode.rs].UW[1] * (uint64)GPR[Opcode.rt].UW[0]; */
-	Map_TempReg(Section,x86_EAX,Opcode.rs,1);
-	Map_TempReg(Section,x86_EDX,Opcode.rt,0);
-
-	Map_TempReg(Section,x86_EBX,-1,0);
-	Map_TempReg(Section,x86_ECX,-1,0);
-
-	MulX86reg(x86_EDX);
-	MoveX86RegToX86Reg(x86_EAX, x86_EBX); /* EDX:EAX -> ECX:EBX */
-	MoveX86RegToX86Reg(x86_EDX, x86_ECX);
-
-	/* Tmp[1].UDW = (uint64)GPR[Opcode.rs].UW[0] * (uint64)GPR[Opcode.rt].UW[1]; */
-	Map_TempReg(Section,x86_EAX,Opcode.rs,0);
-	Map_TempReg(Section,x86_EDX,Opcode.rt,1);
-
-	MulX86reg(x86_EDX);
-	Map_TempReg(Section,x86_ESI,-1,0);
-	Map_TempReg(Section,x86_EDI,-1,0);
-	MoveX86RegToX86Reg(x86_EAX, x86_ESI); /* EDX:EAX -> EDI:ESI */
-	MoveX86RegToX86Reg(x86_EDX, x86_EDI);
-
-	/* Tmp[2].UDW = (uint64)LO.UW[1] + (uint64)Tmp[0].UW[0] + (uint64)Tmp[1].UW[0]; */
-	XorX86RegToX86Reg(x86_EDX, x86_EDX);
-	MoveVariableToX86reg(&LO.UW[1], x86_EAX);
-	AddX86RegToX86Reg(x86_EAX, x86_EBX);
-	AddConstToX86Reg(x86_EDX, 0);
-	AddX86RegToX86Reg(x86_EAX, x86_ESI);
-	AddConstToX86Reg(x86_EDX, 0);			/* EDX:EAX */
-
-	/* LO.UDW += ((uint64)Tmp[0].UW[0] + (uint64)Tmp[1].UW[0]) << 32; */
-	/* [low+4] += ebx + esi */
-
-	AddX86regToVariable(x86_EBX, &LO.UW[1]);
-	AddX86regToVariable(x86_ESI, &LO.UW[1]);
-
-	/* HI.UDW += (uint64)Tmp[0].UW[1] + (uint64)Tmp[1].UW[1] + Tmp[2].UW[1]; */
-	/* [hi] += ecx + edi + edx */
-
-	/*AddX86regToVariable(x86_ECX, &HI.UW[0]);
-	AdcConstToVariable(&HI.UW[1], 0);
-
-	AddX86regToVariable(x86_EDI, &HI.UW[0]);
-	AdcConstToVariable(&HI.UW[1], 0);
-
-	AddX86regToVariable(x86_EDX, &HI.UW[0]);
-	AdcConstToVariable(&HI.UW[1], 0);*/
-}
-
-void Compile_R4300i_SPECIAL_DDIV (BLOCK_SECTION * Section) {
-
-
-	UnMap_GPR(Section,Opcode.rs,1);
-	UnMap_GPR(Section,Opcode.rt,1);
-	Pushad();
-	MoveConstToVariable(Opcode.Hex, &Opcode.Hex );
-	Call_Direct(r4300i_SPECIAL_DDIV);
-	Popad();
-}
-
-void Compile_R4300i_SPECIAL_DDIVU (BLOCK_SECTION * Section) {
-
-
-	UnMap_GPR(Section,Opcode.rs,1);
-	UnMap_GPR(Section,Opcode.rt,1);
-	Pushad();
-	MoveConstToVariable(Opcode.Hex, &Opcode.Hex );
-	Call_Direct(r4300i_SPECIAL_DDIVU);
-	Popad();
-}
-
-void Compile_R4300i_SPECIAL_ADD (BLOCK_SECTION * Section) {
-	int32_t source1 = Opcode.rd == Opcode.rt?Opcode.rt:Opcode.rs;
-	int32_t source2 = Opcode.rd == Opcode.rt?Opcode.rs:Opcode.rt;
-
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(source1) && IsConst(source2)) {
-		uint32_t temp = MipsRegLo(source1) + MipsRegLo(source2);
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsRegLo(Opcode.rd) = temp;
-		MipsRegState(Opcode.rd) = STATE_CONST_32;
-		return;
-	}
-
-	Map_GPR_32bit(Section,Opcode.rd,1, source1);
-	if (IsConst(source2)) {
-		if (MipsRegLo(source2) != 0) {
-			AddConstToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-		}
-	} else if (IsKnown(source2) && IsMapped(source2)) {
-		AddX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-	} else {
-		AddVariableToX86reg(MipsRegLo(Opcode.rd),&GPR[source2].W[0]);
-	}
-}
-
-void Compile_R4300i_SPECIAL_ADDU (BLOCK_SECTION * Section) {
-	int32_t source1 = Opcode.rd == Opcode.rt?Opcode.rt:Opcode.rs;
-	int32_t source2 = Opcode.rd == Opcode.rt?Opcode.rs:Opcode.rt;
-
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(source1) && IsConst(source2)) {
-		uint32_t temp = MipsRegLo(source1) + MipsRegLo(source2);
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsRegLo(Opcode.rd) = temp;
-		MipsRegState(Opcode.rd) = STATE_CONST_32;
-		return;
-	}
-
-	Map_GPR_32bit(Section,Opcode.rd,1, source1);
-	if (IsConst(source2)) {
-		if (MipsRegLo(source2) != 0) {
-			AddConstToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-		}
-	} else if (IsKnown(source2) && IsMapped(source2)) {
-		AddX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-	} else {
-		AddVariableToX86reg(MipsRegLo(Opcode.rd),&GPR[source2].W[0]);
-	}
-}
-
-void Compile_R4300i_SPECIAL_SUB (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(Opcode.rt) && IsConst(Opcode.rs)) {
-		uint32_t temp = MipsRegLo(Opcode.rs) - MipsRegLo(Opcode.rt);
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsRegLo(Opcode.rd) = temp;
-		MipsRegState(Opcode.rd) = STATE_CONST_32;
-	} else {
-		if (Opcode.rd == Opcode.rt) {
-			int32_t x86Reg = Map_TempReg(Section,x86_Any,Opcode.rt,0);
-			Map_GPR_32bit(Section,Opcode.rd,1, Opcode.rs);
-			SubX86RegToX86Reg(MipsRegLo(Opcode.rd),x86Reg);
-			return;
-		}
-		Map_GPR_32bit(Section,Opcode.rd,1, Opcode.rs);
-		if (IsConst(Opcode.rt)) {
-			SubConstFromX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt));
-		} else if (IsMapped(Opcode.rt)) {
-			SubX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt));
-		} else {
-			SubVariableFromX86reg(MipsRegLo(Opcode.rd),&GPR[Opcode.rt].W[0]);
-		}
-	}
-}
-
-void Compile_R4300i_SPECIAL_SUBU (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(Opcode.rt) && IsConst(Opcode.rs)) {
-		uint32_t temp = MipsRegLo(Opcode.rs) - MipsRegLo(Opcode.rt);
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsRegLo(Opcode.rd) = temp;
-		MipsRegState(Opcode.rd) = STATE_CONST_32;
-	} else {
-		if (Opcode.rd == Opcode.rt) {
-			int32_t x86Reg = Map_TempReg(Section,x86_Any,Opcode.rt,0);
-			Map_GPR_32bit(Section,Opcode.rd,1, Opcode.rs);
-			SubX86RegToX86Reg(MipsRegLo(Opcode.rd),x86Reg);
-			return;
-		}
-		Map_GPR_32bit(Section,Opcode.rd,1, Opcode.rs);
-		if (IsConst(Opcode.rt)) {
-			SubConstFromX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt));
-		} else if (IsMapped(Opcode.rt)) {
-			SubX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt));
-		} else {
-			SubVariableFromX86reg(MipsRegLo(Opcode.rd),&GPR[Opcode.rt].W[0]);
-		}
-	}
-}
-
-void Compile_R4300i_SPECIAL_AND (BLOCK_SECTION * Section) {
-
-	if (IsKnown(Opcode.rt) && IsKnown(Opcode.rs)) {
-		if (IsConst(Opcode.rt) && IsConst(Opcode.rs)) {
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				MipsReg(Opcode.rd) =
-					(Is64Bit(Opcode.rt)?MipsReg(Opcode.rt):(int64_t)MipsRegLo_S(Opcode.rt)) &
-					(Is64Bit(Opcode.rs)?MipsReg(Opcode.rs):(int64_t)MipsRegLo_S(Opcode.rs));
-
-				if (MipsRegLo_S(Opcode.rd) < 0 && MipsRegHi_S(Opcode.rd) == -1){
-					MipsRegState(Opcode.rd) = STATE_CONST_32;
-				} else if (MipsRegLo_S(Opcode.rd) >= 0 && MipsRegHi_S(Opcode.rd) == 0){
-					MipsRegState(Opcode.rd) = STATE_CONST_32;
-				} else {
-					MipsRegState(Opcode.rd) = STATE_CONST_64;
-				}
-			} else {
-				MipsReg(Opcode.rd) = MipsRegLo(Opcode.rt) & MipsReg(Opcode.rs);
-				MipsRegState(Opcode.rd) = STATE_CONST_32;
-			}
-		} else if (IsMapped(Opcode.rt) && IsMapped(Opcode.rs)) {
-			int32_t source1 = Opcode.rd == Opcode.rt?Opcode.rt:Opcode.rs;
-			int32_t source2 = Opcode.rd == Opcode.rt?Opcode.rs:Opcode.rt;
-
-			ProtectGPR(Section,source1);
-			ProtectGPR(Section,source2);
-			if (Is32Bit(source1) && Is32Bit(source2)) {
-				int32_t Sign = (IsSigned(Opcode.rt) && IsSigned(Opcode.rs))?1:0;
-				Map_GPR_32bit(Section,Opcode.rd,Sign,source1);
-				AndX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-			} else if (Is32Bit(source1) || Is32Bit(source2)) {
-				if (IsUnsigned(Is32Bit(source1)?source1:source2)) {
-					Map_GPR_32bit(Section,Opcode.rd,0,source1);
-					AndX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-				} else {
-					Map_GPR_64bit(Section,Opcode.rd,source1);
-					if (Is32Bit(source2)) {
-						AndX86RegToX86Reg(MipsRegHi(Opcode.rd),Map_TempReg(Section,x86_Any,source2,1));
-					} else {
-						AndX86RegToX86Reg(MipsRegHi(Opcode.rd),MipsRegHi(source2));
-					}
-					AndX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-				}
-			} else {
-				Map_GPR_64bit(Section,Opcode.rd,source1);
-				AndX86RegToX86Reg(MipsRegHi(Opcode.rd),MipsRegHi(source2));
-				AndX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-			}
-		} else {
-			int32_t ConstReg = IsConst(Opcode.rt)?Opcode.rt:Opcode.rs;
-			int32_t MappedReg = IsConst(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-			if (Is64Bit(ConstReg)) {
-				if (Is32Bit(MappedReg) && IsUnsigned(MappedReg)) {
-					if (MipsRegLo(ConstReg) == 0) {
-						Map_GPR_32bit(Section,Opcode.rd,0, 0);
-					} else {
-						uint32_t Value = MipsRegLo(ConstReg);
-						Map_GPR_32bit(Section,Opcode.rd,0, MappedReg);
-						AndConstToX86Reg(MipsRegLo(Opcode.rd),Value);
-					}
-				} else {
-					int64_t Value = MipsReg(ConstReg);
-					Map_GPR_64bit(Section,Opcode.rd,MappedReg);
-					AndConstToX86Reg(MipsRegHi(Opcode.rd),(uint32_t)(Value >> 32));
-					AndConstToX86Reg(MipsRegLo(Opcode.rd),(uint32_t)Value);
-				}
-			} else if (Is64Bit(MappedReg)) {
-				uint32_t Value = MipsRegLo(ConstReg);
-				if (Value != 0) {
-					Map_GPR_32bit(Section,Opcode.rd,IsSigned(ConstReg)?1:0,MappedReg);
-					AndConstToX86Reg(MipsRegLo(Opcode.rd),(uint32_t)Value);
-				} else {
-					Map_GPR_32bit(Section,Opcode.rd,IsSigned(ConstReg)?1:0, 0);
-				}
-			} else {
-				uint32_t Value = MipsRegLo(ConstReg);
-				int32_t Sign = 0;
-				if (IsSigned(ConstReg) && IsSigned(MappedReg)) { Sign = 1; }
-				if (Value != 0) {
-					Map_GPR_32bit(Section,Opcode.rd,Sign,MappedReg);
-					AndConstToX86Reg(MipsRegLo(Opcode.rd),Value);
-				} else {
-					Map_GPR_32bit(Section,Opcode.rd,0, 0);
-				}
-			}
-		}
-	} else if (IsKnown(Opcode.rt) || IsKnown(Opcode.rs)) {
-		uint32_t KnownReg = IsKnown(Opcode.rt)?Opcode.rt:Opcode.rs;
-		uint32_t UnknownReg = IsKnown(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-		if (IsConst(KnownReg)) {
-			if (Is64Bit(KnownReg)) {
-				uint64_t Value = MipsReg(KnownReg);
-				Map_GPR_64bit(Section,Opcode.rd,UnknownReg);
-				AndConstToX86Reg(MipsRegHi(Opcode.rd),(uint32_t)(Value >> 32));
-				AndConstToX86Reg(MipsRegLo(Opcode.rd),(uint32_t)Value);
-			} else {
-				uint32_t Value = MipsRegLo(KnownReg);
-				Map_GPR_32bit(Section,Opcode.rd,IsSigned(KnownReg),UnknownReg);
-				AndConstToX86Reg(MipsRegLo(Opcode.rd),(uint32_t)Value);
-			}
-		} else {
-			ProtectGPR(Section,KnownReg);
-			if (KnownReg == Opcode.rd) {
-				if (Is64Bit(KnownReg)) {
-					Map_GPR_64bit(Section,Opcode.rd,KnownReg);
-					AndVariableToX86Reg(&GPR[UnknownReg].W[1],MipsRegHi(Opcode.rd));
-					AndVariableToX86Reg(&GPR[UnknownReg].W[0],MipsRegLo(Opcode.rd));
-				} else {
-					Map_GPR_32bit(Section,Opcode.rd,IsSigned(KnownReg),KnownReg);
-					AndVariableToX86Reg(&GPR[UnknownReg].W[0],MipsRegLo(Opcode.rd));
-				}
-			} else {
-				if (Is64Bit(KnownReg)) {
-					Map_GPR_64bit(Section,Opcode.rd,UnknownReg);
-					AndX86RegToX86Reg(MipsRegHi(Opcode.rd),MipsRegHi(KnownReg));
-					AndX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(KnownReg));
-				} else {
-					Map_GPR_32bit(Section,Opcode.rd,IsSigned(KnownReg),UnknownReg);
-					AndX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(KnownReg));
-				}
-			}
-		}
-	} else {
-		Map_GPR_64bit(Section,Opcode.rd,Opcode.rt);
-		AndVariableToX86Reg(&GPR[Opcode.rs].W[1],MipsRegHi(Opcode.rd));
-		AndVariableToX86Reg(&GPR[Opcode.rs].W[0],MipsRegLo(Opcode.rd));
-	}
-}
-
-void Compile_R4300i_SPECIAL_OR (BLOCK_SECTION * Section) {
-
-
-	if (IsKnown(Opcode.rt) && IsKnown(Opcode.rs)) {
-		if (IsConst(Opcode.rt) && IsConst(Opcode.rs)) {
-			if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				MipsReg(Opcode.rd) =
-					(Is64Bit(Opcode.rt)?MipsReg(Opcode.rt):(int64_t)MipsRegLo_S(Opcode.rt)) |
-					(Is64Bit(Opcode.rs)?MipsReg(Opcode.rs):(int64_t)MipsRegLo_S(Opcode.rs));
-				if (MipsRegLo_S(Opcode.rd) < 0 && MipsRegHi_S(Opcode.rd) == -1){
-					MipsRegState(Opcode.rd) = STATE_CONST_32;
-				} else if (MipsRegLo_S(Opcode.rd) >= 0 && MipsRegHi_S(Opcode.rd) == 0){
-					MipsRegState(Opcode.rd) = STATE_CONST_32;
-				} else {
-					MipsRegState(Opcode.rd) = STATE_CONST_64;
-				}
-			} else {
-				MipsRegLo(Opcode.rd) = MipsRegLo(Opcode.rt) | MipsRegLo(Opcode.rs);
-				MipsRegState(Opcode.rd) = STATE_CONST_32;
-			}
-		} else if (IsMapped(Opcode.rt) && IsMapped(Opcode.rs)) {
-			int32_t source1 = Opcode.rd == Opcode.rt?Opcode.rt:Opcode.rs;
-			int32_t source2 = Opcode.rd == Opcode.rt?Opcode.rs:Opcode.rt;
-
-			ProtectGPR(Section,Opcode.rt);
-			ProtectGPR(Section,Opcode.rs);
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				Map_GPR_64bit(Section,Opcode.rd,source1);
-				if (Is64Bit(source2)) {
-					OrX86RegToX86Reg(MipsRegHi(Opcode.rd),MipsRegHi(source2));
-				} else {
-					OrX86RegToX86Reg(MipsRegHi(Opcode.rd),Map_TempReg(Section,x86_Any,source2,1));
-				}
-			} else {
-				ProtectGPR(Section,source2);
-				Map_GPR_32bit(Section,Opcode.rd,1,source1);
-			}
-			OrX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-		} else {
-			uint32_t ConstReg = IsConst(Opcode.rt)?Opcode.rt:Opcode.rs;
-			uint32_t MappedReg = IsConst(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				uint64_t Value;
-
-				if (Is64Bit(ConstReg)) {
-					Value = MipsReg(ConstReg);
-				} else {
-					Value = IsSigned(ConstReg)?MipsRegLo_S(ConstReg):MipsRegLo(ConstReg);
-				}
-				Map_GPR_64bit(Section,Opcode.rd,MappedReg);
-				if ((Value >> 32) != 0) {
-					OrConstToX86Reg((uint32_t)(Value >> 32),MipsRegHi(Opcode.rd));
-				}
-				if ((uint32_t)Value != 0) {
-					OrConstToX86Reg((uint32_t)Value,MipsRegLo(Opcode.rd));
-				}
-			} else {
-				int32_t Value = MipsRegLo(ConstReg);
-				Map_GPR_32bit(Section,Opcode.rd,1, MappedReg);
-				if (Value != 0) { OrConstToX86Reg(Value,MipsRegLo(Opcode.rd)); }
-			}
-		}
-	} else if (IsKnown(Opcode.rt) || IsKnown(Opcode.rs)) {
-		int32_t KnownReg = IsKnown(Opcode.rt)?Opcode.rt:Opcode.rs;
-		int32_t UnknownReg = IsKnown(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-		if (IsConst(KnownReg)) {
-			uint64_t Value;
-
-			Value = Is64Bit(KnownReg)?MipsReg(KnownReg):MipsRegLo_S(KnownReg);
-			Map_GPR_64bit(Section,Opcode.rd,UnknownReg);
-			if ((Value >> 32) != 0) {
-				OrConstToX86Reg((uint32_t)(Value >> 32),MipsRegHi(Opcode.rd));
-			}
-			if ((uint32_t)Value != 0) {
-				OrConstToX86Reg((uint32_t)Value,MipsRegLo(Opcode.rd));
-			}
-		} else {
-			Map_GPR_64bit(Section,Opcode.rd,KnownReg);
-			OrVariableToX86Reg(&GPR[UnknownReg].W[1],MipsRegHi(Opcode.rd));
-			OrVariableToX86Reg(&GPR[UnknownReg].W[0],MipsRegLo(Opcode.rd));
-		}
-	} else {
-		Map_GPR_64bit(Section,Opcode.rd,Opcode.rt);
-		OrVariableToX86Reg(&GPR[Opcode.rs].W[1],MipsRegHi(Opcode.rd));
-		OrVariableToX86Reg(&GPR[Opcode.rs].W[0],MipsRegLo(Opcode.rd));
-	}
-}
-
-void Compile_R4300i_SPECIAL_XOR (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	//BreakPoint();
-
-	if (Opcode.rt == Opcode.rs) {
-		UnMap_GPR(Section, Opcode.rd, 0);
-		MipsRegState(Opcode.rd) = STATE_CONST_32;
-		MipsRegLo(Opcode.rd) = 0;
-		return;
-	}
-	if (IsKnown(Opcode.rt) && IsKnown(Opcode.rs)) {
-		if (IsConst(Opcode.rt) && IsConst(Opcode.rs)) {
-			if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-#ifndef EXTERNAL_RELEASE
-				DisplayError("XOR 1");
-#endif
-				Compile_R4300i_UnknownOpcode(Section);
-			} else {
-				MipsRegState(Opcode.rd) = STATE_CONST_32;
-				MipsRegLo(Opcode.rd) = MipsRegLo(Opcode.rt) ^ MipsRegLo(Opcode.rs);
-			}
-		} else if (IsMapped(Opcode.rt) && IsMapped(Opcode.rs)) {
-			int32_t source1 = Opcode.rd == Opcode.rt?Opcode.rt:Opcode.rs;
-			int32_t source2 = Opcode.rd == Opcode.rt?Opcode.rs:Opcode.rt;
-
-			ProtectGPR(Section,source1);
-			ProtectGPR(Section,source2);
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				Map_GPR_64bit(Section,Opcode.rd,source1);
-				if (Is64Bit(source2)) {
-					XorX86RegToX86Reg(MipsRegHi(Opcode.rd),MipsRegHi(source2));
-				} else if (IsSigned(source2)) {
-					XorX86RegToX86Reg(MipsRegHi(Opcode.rd),Map_TempReg(Section,x86_Any,source2,1));
-				}
-				XorX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-			} else {
-				if (IsSigned(Opcode.rt) != IsSigned(Opcode.rs)) {
-					Map_GPR_32bit(Section,Opcode.rd,1,source1);
-				} else {
-					Map_GPR_32bit(Section,Opcode.rd,IsSigned(Opcode.rt),source1);
-				}
-				XorX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-			}
-		} else {
-			uint32_t ConstReg = IsConst(Opcode.rt)?Opcode.rt:Opcode.rs;
-			uint32_t MappedReg = IsConst(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				uint32_t ConstHi, ConstLo;
-
-				ConstHi = Is32Bit(ConstReg)?(uint32_t)(MipsRegLo_S(ConstReg) >> 31):MipsRegHi(ConstReg);
-				ConstLo = MipsRegLo(ConstReg);
-				Map_GPR_64bit(Section,Opcode.rd,MappedReg);
-				if (ConstHi != 0) { XorConstToX86Reg(MipsRegHi(Opcode.rd),ConstHi); }
-				if (ConstLo != 0) { XorConstToX86Reg(MipsRegLo(Opcode.rd),ConstLo); }
-			} else {
-				int32_t Value = MipsRegLo(ConstReg);
-				if (IsSigned(Opcode.rt) != IsSigned(Opcode.rs)) {
-					Map_GPR_32bit(Section,Opcode.rd,1, MappedReg);
-				} else {
-					Map_GPR_32bit(Section,Opcode.rd,IsSigned(MappedReg)?1:0, MappedReg);
-				}
-				if (Value != 0) { XorConstToX86Reg(MipsRegLo(Opcode.rd),Value); }
-			}
-		}
-	} else if (IsKnown(Opcode.rt) || IsKnown(Opcode.rs)) {
-		int32_t KnownReg = IsKnown(Opcode.rt)?Opcode.rt:Opcode.rs;
-		int32_t UnknownReg = IsKnown(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-		if (IsConst(KnownReg)) {
-			uint64_t Value;
-
-			if (Is64Bit(KnownReg)) {
-				Value = MipsReg(KnownReg);
-			} else {
-				if (IsSigned(KnownReg)) {
-					Value = (int32_t)MipsRegLo(KnownReg);
-				} else {
-					Value = MipsRegLo(KnownReg);
-				}
-			}
-			Map_GPR_64bit(Section,Opcode.rd,UnknownReg);
-			if ((Value >> 32) != 0) {
-				XorConstToX86Reg(MipsRegHi(Opcode.rd),(uint32_t)(Value >> 32));
-			}
-			if ((uint32_t)Value != 0) {
-				XorConstToX86Reg(MipsRegLo(Opcode.rd),(uint32_t)Value);
-			}
-		} else {
-			Map_GPR_64bit(Section,Opcode.rd,KnownReg);
-			XorVariableToX86reg(&GPR[UnknownReg].W[1],MipsRegHi(Opcode.rd));
-			XorVariableToX86reg(&GPR[UnknownReg].W[0],MipsRegLo(Opcode.rd));
-		}
-	} else {
-		Map_GPR_64bit(Section,Opcode.rd,Opcode.rt);
-		XorVariableToX86reg(&GPR[Opcode.rs].W[1],MipsRegHi(Opcode.rd));
-		XorVariableToX86reg(&GPR[Opcode.rs].W[0],MipsRegLo(Opcode.rd));
-	}
-}
-
-void Compile_R4300i_SPECIAL_NOR (BLOCK_SECTION * Section) {
-
-
-	if (IsKnown(Opcode.rt) && IsKnown(Opcode.rs)) {
-		if (IsConst(Opcode.rt) && IsConst(Opcode.rs)) {
-			if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				Compile_R4300i_UnknownOpcode(Section);
-			} else {
-				MipsRegLo(Opcode.rd) = ~(MipsRegLo(Opcode.rt) | MipsRegLo(Opcode.rs));
-				MipsRegState(Opcode.rd) = STATE_CONST_32;
-			}
-		} else if (IsMapped(Opcode.rt) && IsMapped(Opcode.rs)) {
-			int32_t source1 = Opcode.rd == Opcode.rt?Opcode.rt:Opcode.rs;
-			int32_t source2 = Opcode.rd == Opcode.rt?Opcode.rs:Opcode.rt;
-
-			ProtectGPR(Section,source1);
-			ProtectGPR(Section,source2);
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				Map_GPR_64bit(Section,Opcode.rd,source1);
-				if (Is64Bit(source2)) {
-					OrX86RegToX86Reg(MipsRegHi(Opcode.rd),MipsRegHi(source2));
-				} else {
-					OrX86RegToX86Reg(MipsRegHi(Opcode.rd),Map_TempReg(Section,x86_Any,source2,1));
-				}
-				OrX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-				NotX86Reg(MipsRegHi(Opcode.rd));
-				NotX86Reg(MipsRegLo(Opcode.rd));
-			} else {
-				ProtectGPR(Section,source2);
-				if (IsSigned(Opcode.rt) != IsSigned(Opcode.rs)) {
-					Map_GPR_32bit(Section,Opcode.rd,1,source1);
-				} else {
-					Map_GPR_32bit(Section,Opcode.rd,IsSigned(Opcode.rt),source1);
-				}
-				OrX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(source2));
-				NotX86Reg(MipsRegLo(Opcode.rd));
-			}
-		} else {
-			uint32_t ConstReg = IsConst(Opcode.rt)?Opcode.rt:Opcode.rs;
-			uint32_t MappedReg = IsConst(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				uint64_t Value;
-
-				if (Is64Bit(ConstReg)) {
-					Value = MipsReg(ConstReg);
-				} else {
-					Value = IsSigned(ConstReg)?MipsRegLo_S(ConstReg):MipsRegLo(ConstReg);
-				}
-				Map_GPR_64bit(Section,Opcode.rd,MappedReg);
-				if ((Value >> 32) != 0) {
-					OrConstToX86Reg((uint32_t)(Value >> 32),MipsRegHi(Opcode.rd));
-				}
-				if ((uint32_t)Value != 0) {
-					OrConstToX86Reg((uint32_t)Value,MipsRegLo(Opcode.rd));
-				}
-				NotX86Reg(MipsRegHi(Opcode.rd));
-				NotX86Reg(MipsRegLo(Opcode.rd));
-			} else {
-				int32_t Value = MipsRegLo(ConstReg);
-				if (IsSigned(Opcode.rt) != IsSigned(Opcode.rs)) {
-					Map_GPR_32bit(Section,Opcode.rd,1, MappedReg);
-				} else {
-					Map_GPR_32bit(Section,Opcode.rd,IsSigned(MappedReg)?1:0, MappedReg);
-				}
-				if (Value != 0) { OrConstToX86Reg(Value,MipsRegLo(Opcode.rd)); }
-				NotX86Reg(MipsRegLo(Opcode.rd));
-			}
-		}
-	} else if (IsKnown(Opcode.rt) || IsKnown(Opcode.rs)) {
-		int32_t KnownReg = IsKnown(Opcode.rt)?Opcode.rt:Opcode.rs;
-		int32_t UnknownReg = IsKnown(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-		if (IsConst(KnownReg)) {
-			uint64_t Value;
-
-			Value = Is64Bit(KnownReg)?MipsReg(KnownReg):MipsRegLo_S(KnownReg);
-			Map_GPR_64bit(Section,Opcode.rd,UnknownReg);
-			if ((Value >> 32) != 0) {
-				OrConstToX86Reg((uint32_t)(Value >> 32),MipsRegHi(Opcode.rd));
-			}
-			if ((uint32_t)Value != 0) {
-				OrConstToX86Reg((uint32_t)Value,MipsRegLo(Opcode.rd));
-			}
-		} else {
-			Map_GPR_64bit(Section,Opcode.rd,KnownReg);
-			OrVariableToX86Reg(&GPR[UnknownReg].W[1],MipsRegHi(Opcode.rd));
-			OrVariableToX86Reg(&GPR[UnknownReg].W[0],MipsRegLo(Opcode.rd));
-		}
-		NotX86Reg(MipsRegHi(Opcode.rd));
-		NotX86Reg(MipsRegLo(Opcode.rd));
-	} else {
-		Map_GPR_64bit(Section,Opcode.rd,Opcode.rt);
-		OrVariableToX86Reg(&GPR[Opcode.rs].W[1],MipsRegHi(Opcode.rd));
-		OrVariableToX86Reg(&GPR[Opcode.rs].W[0],MipsRegLo(Opcode.rd));
-		NotX86Reg(MipsRegHi(Opcode.rd));
-		NotX86Reg(MipsRegLo(Opcode.rd));
-	}
-}
-
-void Compile_R4300i_SPECIAL_SLT (BLOCK_SECTION * Section) {
-
-
-	if (IsKnown(Opcode.rt) && IsKnown(Opcode.rs)) {
-		if (IsConst(Opcode.rt) && IsConst(Opcode.rs)) {
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				DisplayError("1");
-				Compile_R4300i_UnknownOpcode(Section);
-			} else {
-				if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-				MipsRegState(Opcode.rd) = STATE_CONST_32;
-				if (MipsRegLo_S(Opcode.rs) < MipsRegLo_S(Opcode.rt)) {
-					MipsRegLo(Opcode.rd) = 1;
-				} else {
-					MipsRegLo(Opcode.rd) = 0;
-				}
-			}
-		} else if (IsMapped(Opcode.rt) && IsMapped(Opcode.rs)) {
-			ProtectGPR(Section,Opcode.rt);
-			ProtectGPR(Section,Opcode.rs);
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				uint8_t *Jump[2];
-
-				CompX86RegToX86Reg(
-					Is64Bit(Opcode.rs)?MipsRegHi(Opcode.rs):Map_TempReg(Section,x86_Any,Opcode.rs,1),
-					Is64Bit(Opcode.rt)?MipsRegHi(Opcode.rt):Map_TempReg(Section,x86_Any,Opcode.rt,1)
-				);
-				JeLabel8(0);
-				Jump[0] = RecompPos - 1;
-				SetlVariable(&BranchCompare);
-				JmpLabel8(0);
-				Jump[1] = RecompPos - 1;
-
-
-
-				*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-				CompX86RegToX86Reg(MipsRegLo(Opcode.rs), MipsRegLo(Opcode.rt));
-				SetbVariable(&BranchCompare);
-
-
-				*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-				Map_GPR_32bit(Section,Opcode.rd,1, -1);
-				MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rd));
-			} else {
-				Map_GPR_32bit(Section,Opcode.rd,1, -1);
-				CompX86RegToX86Reg(MipsRegLo(Opcode.rs), MipsRegLo(Opcode.rt));
-
-				if (MipsRegLo(Opcode.rd) > x86_EDX) {
-					SetlVariable(&BranchCompare);
-					MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rd));
-				} else {
-					Setl(MipsRegLo(Opcode.rd));
-					AndConstToX86Reg(MipsRegLo(Opcode.rd), 1);
-				}
-			}
-		} else {
-			uint32_t ConstReg = IsConst(Opcode.rs)?Opcode.rs:Opcode.rt;
-			uint32_t MappedReg = IsConst(Opcode.rs)?Opcode.rt:Opcode.rs;
-
-			ProtectGPR(Section,MappedReg);
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				uint8_t *Jump[2];
-
-				CompConstToX86reg(
-					Is64Bit(MappedReg)?MipsRegHi(MappedReg):Map_TempReg(Section,x86_Any,MappedReg,1),
-					Is64Bit(ConstReg)?MipsRegHi(ConstReg):(MipsRegLo_S(ConstReg) >> 31)
-				);
-				JeLabel8(0);
-				Jump[0] = RecompPos - 1;
-				if (MappedReg == Opcode.rs) {
-					SetlVariable(&BranchCompare);
-				} else {
-					SetgVariable(&BranchCompare);
-				}
-				JmpLabel8(0);
-				Jump[1] = RecompPos - 1;
-
-
-
-				*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-				CompConstToX86reg(MipsRegLo(MappedReg), MipsRegLo(ConstReg));
-				if (MappedReg == Opcode.rs) {
-					SetbVariable(&BranchCompare);
-				} else {
-					SetaVariable(&BranchCompare);
-				}
-
-
-				*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-				Map_GPR_32bit(Section,Opcode.rd,1, -1);
-				MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rd));
-			} else {
-				uint32_t Constant = MipsRegLo(ConstReg);
-				Map_GPR_32bit(Section,Opcode.rd,1, -1);
-				CompConstToX86reg(MipsRegLo(MappedReg), Constant);
-
-				if (MipsRegLo(Opcode.rd) > x86_EDX) {
-					if (MappedReg == Opcode.rs) {
-						SetlVariable(&BranchCompare);
-					} else {
-						SetgVariable(&BranchCompare);
-					}
-					MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rd));
-				} else {
-					if (MappedReg == Opcode.rs) {
-						Setl(MipsRegLo(Opcode.rd));
-					} else {
-						Setg(MipsRegLo(Opcode.rd));
-					}
-					AndConstToX86Reg(MipsRegLo(Opcode.rd), 1);
-				}
-			}
-		}
-	} else if (IsKnown(Opcode.rt) || IsKnown(Opcode.rs)) {
-		uint32_t KnownReg = IsKnown(Opcode.rt)?Opcode.rt:Opcode.rs;
-		uint32_t UnknownReg = IsKnown(Opcode.rt)?Opcode.rs:Opcode.rt;
-		uint8_t *Jump[2];
-
-		if (IsConst(KnownReg)) {
-			if (Is64Bit(KnownReg)) {
-				CompConstToVariable(MipsRegHi(KnownReg),&GPR[UnknownReg].W[1]);
-			} else {
-				CompConstToVariable(((int32_t)MipsRegLo(KnownReg) >> 31),&GPR[UnknownReg].W[1]);
-			}
-		} else {
-			if (Is64Bit(KnownReg)) {
-				CompX86regToVariable(MipsRegHi(KnownReg),&GPR[UnknownReg].W[1]);
-			} else {
-				ProtectGPR(Section,KnownReg);
-				CompX86regToVariable(Map_TempReg(Section,x86_Any,KnownReg,1),&GPR[UnknownReg].W[1]);
-			}
-		}
-		JeLabel8(0);
-		Jump[0] = RecompPos - 1;
-		if (KnownReg == (IsConst(KnownReg)?Opcode.rs:Opcode.rt)) {
-			SetgVariable(&BranchCompare);
-		} else {
-			SetlVariable(&BranchCompare);
-		}
-		JmpLabel8(0);
-		Jump[1] = RecompPos - 1;
-
-
-
-		*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-		if (IsConst(KnownReg)) {
-			CompConstToVariable(MipsRegLo(KnownReg),&GPR[UnknownReg].W[0]);
-		} else {
-			CompX86regToVariable(MipsRegLo(KnownReg),&GPR[UnknownReg].W[0]);
-		}
-		if (KnownReg == (IsConst(KnownReg)?Opcode.rs:Opcode.rt)) {
-			SetaVariable(&BranchCompare);
-		} else {
-			SetbVariable(&BranchCompare);
-		}
-
-
-		*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-		Map_GPR_32bit(Section,Opcode.rd,1, -1);
-		MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rd));
-	} else {
-		uint8_t *Jump[2];
-		int32_t x86Reg;
-
-		x86Reg = Map_TempReg(Section,x86_Any,Opcode.rs,1);
-		CompX86regToVariable(x86Reg,&GPR[Opcode.rt].W[1]);
-		JeLabel8(0);
-		Jump[0] = RecompPos - 1;
-		SetlVariable(&BranchCompare);
-		JmpLabel8(0);
-		Jump[1] = RecompPos - 1;
-
-
-
-		*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-		CompX86regToVariable(Map_TempReg(Section,x86Reg,Opcode.rs,0),&GPR[Opcode.rt].W[0]);
-		SetbVariable(&BranchCompare);
-
-
-		*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-		Map_GPR_32bit(Section,Opcode.rd,1, -1);
-		MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rd));
-	}
-}
-
-void Compile_R4300i_SPECIAL_SLTU (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsKnown(Opcode.rt) && IsKnown(Opcode.rs)) {
-		if (IsConst(Opcode.rt) && IsConst(Opcode.rs)) {
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-#ifndef EXTERNAL_RELEASE
-				DisplayError("1");
-#endif
-				Compile_R4300i_UnknownOpcode(Section);
-			} else {
-				if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-				MipsRegState(Opcode.rd) = STATE_CONST_32;
-				if (MipsRegLo(Opcode.rs) < MipsRegLo(Opcode.rt)) {
-					MipsRegLo(Opcode.rd) = 1;
-				} else {
-					MipsRegLo(Opcode.rd) = 0;
-				}
-			}
-		} else if (IsMapped(Opcode.rt) && IsMapped(Opcode.rs)) {
-			ProtectGPR(Section,Opcode.rt);
-			ProtectGPR(Section,Opcode.rs);
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				uint8_t *Jump[2];
-
-				CompX86RegToX86Reg(
-					Is64Bit(Opcode.rs)?MipsRegHi(Opcode.rs):Map_TempReg(Section,x86_Any,Opcode.rs,1),
-					Is64Bit(Opcode.rt)?MipsRegHi(Opcode.rt):Map_TempReg(Section,x86_Any,Opcode.rt,1)
-				);
-				JeLabel8(0);
-				Jump[0] = RecompPos - 1;
-				SetbVariable(&BranchCompare);
-				JmpLabel8(0);
-				Jump[1] = RecompPos - 1;
-
-
-
-				*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-				CompX86RegToX86Reg(MipsRegLo(Opcode.rs), MipsRegLo(Opcode.rt));
-				SetbVariable(&BranchCompare);
-
-
-				*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-				Map_GPR_32bit(Section,Opcode.rd,1, -1);
-				MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rd));
-			} else {
-				CompX86RegToX86Reg(MipsRegLo(Opcode.rs), MipsRegLo(Opcode.rt));
-				SetbVariable(&BranchCompare);
-				Map_GPR_32bit(Section,Opcode.rd,1, -1);
-				MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rd));
-			}
-		} else {
-			if (Is64Bit(Opcode.rt) || Is64Bit(Opcode.rs)) {
-				uint32_t MappedRegHi, MappedRegLo, ConstHi, ConstLo, MappedReg, ConstReg;
-				uint8_t *Jump[2];
-
-				ConstReg = IsConst(Opcode.rt)?Opcode.rt:Opcode.rs;
-				MappedReg = IsConst(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-				ConstLo = MipsRegLo(ConstReg);
-				ConstHi = (int32_t)ConstLo >> 31;
-				if (Is64Bit(ConstReg)) { ConstHi = MipsRegHi(ConstReg); }
-
-				ProtectGPR(Section,MappedReg);
-				MappedRegLo = MipsRegLo(MappedReg);
-				MappedRegHi = MipsRegHi(MappedReg);
-				if (Is32Bit(MappedReg)) {
-					MappedRegHi = Map_TempReg(Section,x86_Any,MappedReg,1);
-				}
-
-
-				Map_GPR_32bit(Section,Opcode.rd,1, -1);
-				CompConstToX86reg(MappedRegHi, ConstHi);
-				JeLabel8(0);
-				Jump[0] = RecompPos - 1;
-				if (MappedReg == Opcode.rs) {
-					SetbVariable(&BranchCompare);
-				} else {
-					SetaVariable(&BranchCompare);
-				}
-				JmpLabel8(0);
-				Jump[1] = RecompPos - 1;
-
-
-
-				*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-				CompConstToX86reg(MappedRegLo, ConstLo);
-				if (MappedReg == Opcode.rs) {
-					SetbVariable(&BranchCompare);
-				} else {
-					SetaVariable(&BranchCompare);
-				}
-
-
-				*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-				Map_GPR_32bit(Section,Opcode.rd,1, -1);
-				MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rd));
-			} else {
-				uint32_t Const = IsConst(Opcode.rs)?MipsRegLo(Opcode.rs):MipsRegLo(Opcode.rt);
-				uint32_t MappedReg = IsConst(Opcode.rt)?Opcode.rs:Opcode.rt;
-
-				CompConstToX86reg(MipsRegLo(MappedReg), Const);
-				if (MappedReg == Opcode.rs) {
-					SetbVariable(&BranchCompare);
-				} else {
-					SetaVariable(&BranchCompare);
-				}
-				Map_GPR_32bit(Section,Opcode.rd,1, -1);
-				MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rd));
-			}
-		}
-	} else if (IsKnown(Opcode.rt) || IsKnown(Opcode.rs)) {
-		uint32_t KnownReg = IsKnown(Opcode.rt)?Opcode.rt:Opcode.rs;
-		uint32_t UnknownReg = IsKnown(Opcode.rt)?Opcode.rs:Opcode.rt;
-		uint8_t *Jump[2];
-
-		if (IsConst(KnownReg)) {
-			if (Is64Bit(KnownReg)) {
-				CompConstToVariable(MipsRegHi(KnownReg),&GPR[UnknownReg].W[1]);
-			} else {
-				CompConstToVariable(((int32_t)MipsRegLo(KnownReg) >> 31),&GPR[UnknownReg].W[1]);
-			}
-		} else {
-			if (Is64Bit(KnownReg)) {
-				CompX86regToVariable(MipsRegHi(KnownReg),&GPR[UnknownReg].W[1]);
-			} else {
-				ProtectGPR(Section,KnownReg);
-				CompX86regToVariable(Map_TempReg(Section,x86_Any,KnownReg,1),&GPR[UnknownReg].W[1]);
-			}
-		}
-		JeLabel8(0);
-		Jump[0] = RecompPos - 1;
-		if (KnownReg == (IsConst(KnownReg)?Opcode.rs:Opcode.rt)) {
-			SetaVariable(&BranchCompare);
-		} else {
-			SetbVariable(&BranchCompare);
-		}
-		JmpLabel8(0);
-		Jump[1] = RecompPos - 1;
-
-
-
-		*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-		if (IsConst(KnownReg)) {
-			CompConstToVariable(MipsRegLo(KnownReg),&GPR[UnknownReg].W[0]);
-		} else {
-			CompX86regToVariable(MipsRegLo(KnownReg),&GPR[UnknownReg].W[0]);
-		}
-		if (KnownReg == (IsConst(KnownReg)?Opcode.rs:Opcode.rt)) {
-			SetaVariable(&BranchCompare);
-		} else {
-			SetbVariable(&BranchCompare);
-		}
-
-
-		*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-		Map_GPR_32bit(Section,Opcode.rd,1, -1);
-		MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rd));
-	} else {
-		uint8_t *Jump[2];
-		int32_t x86Reg;
-
-		x86Reg = Map_TempReg(Section,x86_Any,Opcode.rs,1);
-		CompX86regToVariable(x86Reg,&GPR[Opcode.rt].W[1]);
-		JeLabel8(0);
-		Jump[0] = RecompPos - 1;
-		SetbVariable(&BranchCompare);
-		JmpLabel8(0);
-		Jump[1] = RecompPos - 1;
-
-
-
-		*((uint8_t *)(Jump[0]))=(uint8_t)(RecompPos - Jump[0] - 1);
-		CompX86regToVariable(Map_TempReg(Section,x86Reg,Opcode.rs,0),&GPR[Opcode.rt].W[0]);
-		SetbVariable(&BranchCompare);
-
-
-		*((uint8_t *)(Jump[1]))=(uint8_t)(RecompPos - Jump[1] - 1);
-		Map_GPR_32bit(Section,Opcode.rd,1, -1);
-		MoveVariableToX86reg(&BranchCompare,MipsRegLo(Opcode.rd));
-	}
-}
-
-void Compile_R4300i_SPECIAL_DADD (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(Opcode.rt) && IsConst(Opcode.rs)) {
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsReg(Opcode.rd) =
-			Is64Bit(Opcode.rs)?MipsReg(Opcode.rs):(int64_t)MipsRegLo_S(Opcode.rs) +
-			Is64Bit(Opcode.rt)?MipsReg(Opcode.rt):(int64_t)MipsRegLo_S(Opcode.rt);
-		if (MipsRegLo_S(Opcode.rd) < 0 && MipsRegHi_S(Opcode.rd) == -1){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else if (MipsRegLo_S(Opcode.rd) >= 0 && MipsRegHi_S(Opcode.rd) == 0){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else {
-			MipsRegState(Opcode.rd) = STATE_CONST_64;
-		}
-	} else {
-		Map_GPR_64bit(Section,Opcode.rd,Opcode.rs);
-		if (IsConst(Opcode.rt)) {
-			AddConstToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt));
-			AddConstToX86Reg(MipsRegHi(Opcode.rd),MipsRegHi(Opcode.rt));
-		} else if (IsMapped(Opcode.rt)) {
-			int32_t HiReg = Is64Bit(Opcode.rt)?MipsRegHi(Opcode.rt):Map_TempReg(Section,x86_Any,Opcode.rt,1);
-			ProtectGPR(Section,Opcode.rt);
-			AddX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt));
-			AdcX86RegToX86Reg(MipsRegHi(Opcode.rd),HiReg);
-		} else {
-			AddVariableToX86reg(MipsRegLo(Opcode.rd),&GPR[Opcode.rt].W[0]);
-			AdcVariableToX86reg(MipsRegHi(Opcode.rd),&GPR[Opcode.rt].W[1]);
-		}
-	}
-}
-
-void Compile_R4300i_SPECIAL_DADDU (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(Opcode.rt) && IsConst(Opcode.rs)) {
-		int64_t ValRs = Is64Bit(Opcode.rs)?MipsReg(Opcode.rs):(int64_t)MipsRegLo_S(Opcode.rs);
-		int64_t ValRt = Is64Bit(Opcode.rt)?MipsReg(Opcode.rt):(int64_t)MipsRegLo_S(Opcode.rt);
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsReg(Opcode.rd) = ValRs + ValRt;
-		if ((MipsRegHi(Opcode.rd) == 0) && (MipsRegLo(Opcode.rd) & 0x80000000) == 0) {
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else if ((MipsRegHi(Opcode.rd) == 0xFFFFFFFF) && (MipsRegLo(Opcode.rd) & 0x80000000) != 0) {
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else {
-			MipsRegState(Opcode.rd) = STATE_CONST_64;
-		}
-	} else {
-		Map_GPR_64bit(Section,Opcode.rd,Opcode.rs);
-		if (IsConst(Opcode.rt)) {
-			AddConstToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt));
-			AddConstToX86Reg(MipsRegHi(Opcode.rd),MipsRegHi(Opcode.rt));
-		} else if (IsMapped(Opcode.rt)) {
-			int32_t HiReg = Is64Bit(Opcode.rt)?MipsRegHi(Opcode.rt):Map_TempReg(Section,x86_Any,Opcode.rt,1);
-			ProtectGPR(Section,Opcode.rt);
-			AddX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt));
-			AdcX86RegToX86Reg(MipsRegHi(Opcode.rd),HiReg);
-		} else {
-			AddVariableToX86reg(MipsRegLo(Opcode.rd),&GPR[Opcode.rt].W[0]);
-			AdcVariableToX86reg(MipsRegHi(Opcode.rd),&GPR[Opcode.rt].W[1]);
-		}
-	}
-}
-
-void Compile_R4300i_SPECIAL_DSUB (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(Opcode.rt) && IsConst(Opcode.rs)) {
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsReg(Opcode.rd) =
-			Is64Bit(Opcode.rs)?MipsReg(Opcode.rs):(int64_t)MipsRegLo_S(Opcode.rs) -
-			Is64Bit(Opcode.rt)?MipsReg(Opcode.rt):(int64_t)MipsRegLo_S(Opcode.rt);
-		if (MipsRegLo_S(Opcode.rd) < 0 && MipsRegHi_S(Opcode.rd) == -1){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else if (MipsRegLo_S(Opcode.rd) >= 0 && MipsRegHi_S(Opcode.rd) == 0){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else {
-			MipsRegState(Opcode.rd) = STATE_CONST_64;
-		}
-	} else {
-		if (Opcode.rd == Opcode.rt) {
-			int32_t HiReg = Map_TempReg(Section,x86_Any,Opcode.rt,1);
-			int32_t LoReg = Map_TempReg(Section,x86_Any,Opcode.rt,0);
-			Map_GPR_64bit(Section,Opcode.rd,Opcode.rs);
-			SubX86RegToX86Reg(MipsRegLo(Opcode.rd),LoReg);
-			SbbX86RegToX86Reg(MipsRegHi(Opcode.rd),HiReg);
-			return;
-		}
-		Map_GPR_64bit(Section,Opcode.rd,Opcode.rs);
-		if (IsConst(Opcode.rt)) {
-			SubConstFromX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt));
-			SbbConstFromX86Reg(MipsRegHi(Opcode.rd),MipsRegHi(Opcode.rt));
-		} else if (IsMapped(Opcode.rt)) {
-			int32_t HiReg = Is64Bit(Opcode.rt)?MipsRegHi(Opcode.rt):Map_TempReg(Section,x86_Any,Opcode.rt,1);
-			ProtectGPR(Section,Opcode.rt);
-			SubX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt));
-			SbbX86RegToX86Reg(MipsRegHi(Opcode.rd),HiReg);
-		} else {
-			SubVariableFromX86reg(MipsRegLo(Opcode.rd),&GPR[Opcode.rt].W[0]);
-			SbbVariableFromX86reg(MipsRegHi(Opcode.rd),&GPR[Opcode.rt].W[1]);
-		}
-	}
-}
-
-void Compile_R4300i_SPECIAL_DSUBU (BLOCK_SECTION * Section) {
-
-	if (Opcode.rd == 0) { return; }
-
-	if (IsConst(Opcode.rt) && IsConst(Opcode.rs)) {
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsReg(Opcode.rd) =
-			Is64Bit(Opcode.rs)?MipsReg(Opcode.rs):(int64_t)MipsRegLo_S(Opcode.rs) -
-			Is64Bit(Opcode.rt)?MipsReg(Opcode.rt):(int64_t)MipsRegLo_S(Opcode.rt);
-		if (MipsRegLo_S(Opcode.rd) < 0 && MipsRegHi_S(Opcode.rd) == -1){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else if (MipsRegLo_S(Opcode.rd) >= 0 && MipsRegHi_S(Opcode.rd) == 0){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else {
-			MipsRegState(Opcode.rd) = STATE_CONST_64;
-		}
-	} else {
-		if (Opcode.rd == Opcode.rt) {
-			int32_t HiReg = Map_TempReg(Section,x86_Any,Opcode.rt,1);
-			int32_t LoReg = Map_TempReg(Section,x86_Any,Opcode.rt,0);
-			Map_GPR_64bit(Section,Opcode.rd,Opcode.rs);
-			SubX86RegToX86Reg(MipsRegLo(Opcode.rd),LoReg);
-			SbbX86RegToX86Reg(MipsRegHi(Opcode.rd),HiReg);
-			return;
-		}
-		Map_GPR_64bit(Section,Opcode.rd,Opcode.rs);
-		if (IsConst(Opcode.rt)) {
-			SubConstFromX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt));
-			SbbConstFromX86Reg(MipsRegHi(Opcode.rd),MipsRegHi(Opcode.rt));
-		} else if (IsMapped(Opcode.rt)) {
-			int32_t HiReg = Is64Bit(Opcode.rt)?MipsRegHi(Opcode.rt):Map_TempReg(Section,x86_Any,Opcode.rt,1);
-			ProtectGPR(Section,Opcode.rt);
-			SubX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rt));
-			SbbX86RegToX86Reg(MipsRegHi(Opcode.rd),HiReg);
-		} else {
-			SubVariableFromX86reg(MipsRegLo(Opcode.rd),&GPR[Opcode.rt].W[0]);
-			SbbVariableFromX86reg(MipsRegHi(Opcode.rd),&GPR[Opcode.rt].W[1]);
-		}
-	}
-}
-
-void Compile_R4300i_SPECIAL_DSLL (BLOCK_SECTION * Section) {
-
-
-	if (Opcode.rd == 0) { return; }
-	if (IsConst(Opcode.rt)) {
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-
-		MipsReg(Opcode.rd) = Is64Bit(Opcode.rt)?MipsReg(Opcode.rt):(int64_t)MipsRegLo_S(Opcode.rt) << Opcode.sa;
-		if (MipsRegLo_S(Opcode.rd) < 0 && MipsRegHi_S(Opcode.rd) == -1){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else if (MipsRegLo_S(Opcode.rd) >= 0 && MipsRegHi_S(Opcode.rd) == 0){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else {
-			MipsRegState(Opcode.rd) = STATE_CONST_64;
-		}
-		return;
-	}
-
-	Map_GPR_64bit(Section,Opcode.rd,Opcode.rt);
-	ShiftLeftDoubleImmed(MipsRegHi(Opcode.rd),MipsRegLo(Opcode.rd),(uint8_t)Opcode.sa);
-	ShiftLeftSignImmed(	MipsRegLo(Opcode.rd),(uint8_t)Opcode.sa);
-}
-
-void Compile_R4300i_SPECIAL_DSRL (BLOCK_SECTION * Section) {
-
-
-	if (Opcode.rd == 0) { return; }
-	if (IsConst(Opcode.rt)) {
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-
-		MipsReg(Opcode.rd) = Is64Bit(Opcode.rt)?MipsReg(Opcode.rt):(QWORD)MipsRegLo_S(Opcode.rt) >> Opcode.sa;
-		if (MipsRegLo_S(Opcode.rd) < 0 && MipsRegHi_S(Opcode.rd) == -1){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else if (MipsRegLo_S(Opcode.rd) >= 0 && MipsRegHi_S(Opcode.rd) == 0){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else {
-			MipsRegState(Opcode.rd) = STATE_CONST_64;
-		}
-		return;
-	}
-	Map_GPR_64bit(Section,Opcode.rd,Opcode.rt);
-	ShiftRightDoubleImmed(MipsRegLo(Opcode.rd),MipsRegHi(Opcode.rd),(uint8_t)Opcode.sa);
-	ShiftRightUnsignImmed(MipsRegHi(Opcode.rd),(uint8_t)Opcode.sa);
-}
-
-void Compile_R4300i_SPECIAL_DSRA (BLOCK_SECTION * Section) {
-
-
-	if (Opcode.rd == 0) { return; }
-	if (IsConst(Opcode.rt)) {
-		if (IsMapped(Opcode.rd)) { UnMap_GPR(Section,Opcode.rd, 0); }
-
-		MipsReg_S(Opcode.rd) = Is64Bit(Opcode.rt)?MipsReg_S(Opcode.rt):(int64_t)MipsRegLo_S(Opcode.rt) >> Opcode.sa;
-		if (MipsRegLo_S(Opcode.rd) < 0 && MipsRegHi_S(Opcode.rd) == -1){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else if (MipsRegLo_S(Opcode.rd) >= 0 && MipsRegHi_S(Opcode.rd) == 0){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else {
-			MipsRegState(Opcode.rd) = STATE_CONST_64;
-		}
-		return;
-	}
-	Map_GPR_64bit(Section,Opcode.rd,Opcode.rt);
-	ShiftRightDoubleImmed(MipsRegLo(Opcode.rd),MipsRegHi(Opcode.rd),(uint8_t)Opcode.sa);
-	ShiftRightSignImmed(MipsRegHi(Opcode.rd),(uint8_t)Opcode.sa);
-}
-
-void Compile_R4300i_SPECIAL_DSLL32 (BLOCK_SECTION * Section) {
-
-
-	if (Opcode.rd == 0) { return; }
-	if (IsConst(Opcode.rt)) {
-		if (Opcode.rt != Opcode.rd) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsRegHi(Opcode.rd) = MipsRegLo(Opcode.rt) << Opcode.sa;
-		MipsRegLo(Opcode.rd) = 0;
-		if (MipsRegLo_S(Opcode.rd) < 0 && MipsRegHi_S(Opcode.rd) == -1){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else if (MipsRegLo_S(Opcode.rd) >= 0 && MipsRegHi_S(Opcode.rd) == 0){
-			MipsRegState(Opcode.rd) = STATE_CONST_32;
-		} else {
-			MipsRegState(Opcode.rd) = STATE_CONST_64;
-		}
-
-	} else if (IsMapped(Opcode.rt)) {
-		ProtectGPR(Section,Opcode.rt);
-		Map_GPR_64bit(Section,Opcode.rd,-1);
-		if (Opcode.rt != Opcode.rd) {
-			MoveX86RegToX86Reg(MipsRegLo(Opcode.rt),MipsRegHi(Opcode.rd));
-		} else {
-			int32_t HiReg = MipsRegHi(Opcode.rt);
-			MipsRegHi(Opcode.rt) = MipsRegLo(Opcode.rt);
-			MipsRegLo(Opcode.rt) = HiReg;
-		}
-		if ((uint8_t)Opcode.sa != 0) {
-			ShiftLeftSignImmed(MipsRegHi(Opcode.rd),(uint8_t)Opcode.sa);
-		}
-		XorX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rd));
-	} else {
-		Map_GPR_64bit(Section,Opcode.rd,-1);
-		MoveVariableToX86reg(&GPR[Opcode.rt],MipsRegHi(Opcode.rd));
-		if ((uint8_t)Opcode.sa != 0) {
-			ShiftLeftSignImmed(MipsRegHi(Opcode.rd),(uint8_t)Opcode.sa);
-		}
-		XorX86RegToX86Reg(MipsRegLo(Opcode.rd),MipsRegLo(Opcode.rd));
-	}
-}
-
-void Compile_R4300i_SPECIAL_DSRL32 (BLOCK_SECTION * Section) {
-
-	if (IsConst(Opcode.rt)) {
-		if (Opcode.rt != Opcode.rd) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsRegState(Opcode.rd) = STATE_CONST_32;
-		MipsRegLo(Opcode.rd) = (uint32_t)(MipsReg(Opcode.rt) >> (Opcode.sa + 32));
-	} else if (IsMapped(Opcode.rt)) {
-		ProtectGPR(Section,Opcode.rt);
-		if (Is64Bit(Opcode.rt)) {
-			if (Opcode.rt == Opcode.rd) {
-				int32_t HiReg = MipsRegHi(Opcode.rt);
-				MipsRegHi(Opcode.rt) = MipsRegLo(Opcode.rt);
-				MipsRegLo(Opcode.rt) = HiReg;
-				Map_GPR_32bit(Section,Opcode.rd,0,-1);
-			} else {
-				Map_GPR_32bit(Section,Opcode.rd,0,-1);
-				MoveX86RegToX86Reg(MipsRegHi(Opcode.rt),MipsRegLo(Opcode.rd));
-			}
-			if ((uint8_t)Opcode.sa != 0) {
-				ShiftRightUnsignImmed(MipsRegLo(Opcode.rd),(uint8_t)Opcode.sa);
-			}
-		} else {
-			Compile_R4300i_UnknownOpcode(Section);
-		}
-	} else {
-		Map_GPR_32bit(Section,Opcode.rd,0,-1);
-		MoveVariableToX86reg(&GPR[Opcode.rt].UW[1],MipsRegLo(Opcode.rd));
-		if ((uint8_t)Opcode.sa != 0) {
-			ShiftRightUnsignImmed(MipsRegLo(Opcode.rd),(uint8_t)Opcode.sa);
-		}
-	}
-}
-
-void Compile_R4300i_SPECIAL_DSRA32 (BLOCK_SECTION * Section) {
-
-	if (IsConst(Opcode.rt)) {
-		if (Opcode.rt != Opcode.rd) { UnMap_GPR(Section,Opcode.rd, 0); }
-		MipsRegState(Opcode.rd) = STATE_CONST_32;
-		MipsRegLo(Opcode.rd) = (uint32_t)(MipsReg_S(Opcode.rt) >> (Opcode.sa + 32));
-	} else if (IsMapped(Opcode.rt)) {
-		ProtectGPR(Section,Opcode.rt);
-		if (Is64Bit(Opcode.rt)) {
-			if (Opcode.rt == Opcode.rd) {
-				int32_t HiReg = MipsRegHi(Opcode.rt);
-				MipsRegHi(Opcode.rt) = MipsRegLo(Opcode.rt);
-				MipsRegLo(Opcode.rt) = HiReg;
-				Map_GPR_32bit(Section,Opcode.rd,1,-1);
-			} else {
-				Map_GPR_32bit(Section,Opcode.rd,1,-1);
-				MoveX86RegToX86Reg(MipsRegHi(Opcode.rt),MipsRegLo(Opcode.rd));
-			}
-			if ((uint8_t)Opcode.sa != 0) {
-				ShiftRightSignImmed(MipsRegLo(Opcode.rd),(uint8_t)Opcode.sa);
-			}
-		} else {
-			Compile_R4300i_UnknownOpcode(Section);
-		}
-	} else {
-		Map_GPR_32bit(Section,Opcode.rd,1,-1);
-		MoveVariableToX86reg(&GPR[Opcode.rt].UW[1],MipsRegLo(Opcode.rd));
-		if ((uint8_t)Opcode.sa != 0) {
-			ShiftRightSignImmed(MipsRegLo(Opcode.rd),(uint8_t)Opcode.sa);
-		}
-	}
-}
-
-/************************** COP0 functions **************************/
-void Compile_R4300i_COP0_MF(BLOCK_SECTION * Section) {
-
-
-	switch (Opcode.rd) {
-	case 9: //Count
-		AddConstToVariable(BlockCycleCount,&CP0[9]);
-		SubConstFromVariable(BlockCycleCount,&Timers->Timer);
-		BlockCycleCount = 0;
-	}
-	Map_GPR_32bit(Section,Opcode.rt,1,-1);
-	MoveVariableToX86reg(&CP0[Opcode.rd],MipsRegLo(Opcode.rt));
-}
-
-void Compile_R4300i_COP0_MT (BLOCK_SECTION * Section) {
-	int32_t OldStatusReg;
-	uint8_t *Jump;
-
-
-
-	switch (Opcode.rd) {
-	case 0: //Index
-	case 2: //EntryLo0
-	case 3: //EntryLo1
-	case 4: //Context
-	case 5: //PageMask
-	case 9: //Count
-	case 10: //Entry Hi
-	case 11: //Compare
-	case 14: //EPC
-	case 16: //Config
-	case 18: //WatchLo
-	case 19: //WatchHi
-	case 28: //Tag lo
-	case 29: //Tag Hi
-	case 30: //ErrEPC
-		if (IsConst(Opcode.rt)) {
-			MoveConstToVariable(MipsRegLo(Opcode.rt), &CP0[Opcode.rd]);
-		} else if (IsMapped(Opcode.rt)) {
-			MoveX86regToVariable(MipsRegLo(Opcode.rt), &CP0[Opcode.rd]);
-		} else {
-			MoveX86regToVariable(Map_TempReg(Section,x86_Any,Opcode.rt,0), &CP0[Opcode.rd]);
-		}
-		switch (Opcode.rd) {
-		case 4: //Context
-			AndConstToVariable(0xFF800000,&CP0[Opcode.rd]);
-			break;
-		case 9: //Count
-			BlockCycleCount = 0;
-			Pushad();
-			Call_Direct(ChangeCompareTimer);
-			Popad();
-			break;
-		case 11: //Compare
-			AddConstToVariable(BlockCycleCount,&CP0[9]);
-			SubConstFromVariable(BlockCycleCount,&Timers->Timer);
-			BlockCycleCount = 0;
-			AndConstToVariable(~CAUSE_IP7,&FAKE_CAUSE_REGISTER);
-			Pushad();
-			Call_Direct(ChangeCompareTimer);
-			Popad();
-		}
-		break;
-	case 12: //Status
-		OldStatusReg = Map_TempReg(Section,x86_Any,-1,0);
-		MoveVariableToX86reg(&CP0[Opcode.rd],OldStatusReg);
-		if (IsConst(Opcode.rt)) {
-			MoveConstToVariable(MipsRegLo(Opcode.rt), &CP0[Opcode.rd]);
-		} else if (IsMapped(Opcode.rt)) {
-			MoveX86regToVariable(MipsRegLo(Opcode.rt), &CP0[Opcode.rd]);
-		} else {
-			MoveX86regToVariable(Map_TempReg(Section,x86_Any,Opcode.rt,0), &CP0[Opcode.rd]);
-		}
-		XorVariableToX86reg(&CP0[Opcode.rd],OldStatusReg);
-		TestConstToX86Reg(STATUS_FR,OldStatusReg);
-		JeLabel8(0);
-		Jump = RecompPos - 1;
-		Pushad();
-		Call_Direct(SetFpuLocations);
-		Popad();
-		*(uint8_t *)(Jump)= (uint8_t )(((uint8_t )(RecompPos)) - (((uint8_t )(Jump)) + 1));
-
-		//TestConstToX86Reg(STATUS_FR,OldStatusReg);
-		//CompileExit(Section->CompilePC+4,Section->RegWorking,ExitResetRecompCode,0,JneLabel32);
-		Pushad();
-		Call_Direct(CheckInterrupts);
-		Popad();
-		break;
-	case 6: //Wired
-		Pushad();
-		if (BlockRandomModifier != 0) { SubConstFromVariable(BlockRandomModifier,&CP0[1]); }
-		BlockRandomModifier = 0;
-		Call_Direct(FixRandomReg);
-		Popad();
-		if (IsConst(Opcode.rt)) {
-			MoveConstToVariable(MipsRegLo(Opcode.rt), &CP0[Opcode.rd]);
-		} else if (IsMapped(Opcode.rt)) {
-			MoveX86regToVariable(MipsRegLo(Opcode.rt), &CP0[Opcode.rd]);
-		} else {
-			MoveX86regToVariable(Map_TempReg(Section,x86_Any,Opcode.rt,0), &CP0[Opcode.rd]);
-		}
-		break;
-	case 13: //cause
-		if (IsConst(Opcode.rt)) {
-			AndConstToVariable(0xFFFFCFF,&CP0[Opcode.rd]);
-#ifndef EXTERNAL_RELEASE
-			if ((MipsRegLo(Opcode.rt) & 0x300) != 0 ){ DisplayError("Set IP0 or IP1"); }
-#endif
-		} else {
-			Compile_R4300i_UnknownOpcode(Section);
-		}
-		Pushad();
-		Call_Direct(CheckInterrupts);
-		Popad();
-		break;
-	default:
-		Compile_R4300i_UnknownOpcode(Section);
-	}
-}
-
-/************************** COP0 CO functions ***********************/
-void Compile_R4300i_COP0_CO_TLBR( BLOCK_SECTION * Section) {
-	Pushad();
-	Call_Direct(TLB_Read);
-	Popad();
-}
-
-void Compile_R4300i_COP0_CO_TLBWI( BLOCK_SECTION * Section) {
-	Pushad();
-	MoveVariableToX86reg(&INDEX_REGISTER,x86_EDI);
-	AndConstToX86Reg(x86_EDI,0x1F);
-#ifdef USEX64
-	Call_Direct(WriteTLBEntry);
-#else
-	Push(x86_ECX);
-	Call_Direct(WriteTLBEntry);
-	AddConstToX86Reg(x86_ESP, 0x4);
-#endif
-	Popad();
-}
-
-void Compile_R4300i_COP0_CO_TLBWR( BLOCK_SECTION * Section) {
-	if (BlockRandomModifier != 0) { SubConstFromVariable(BlockRandomModifier,&CP0[1]); }
-	BlockRandomModifier = 0;
-	Pushad();
-	//Call_Direct(FixRandomReg);
-	MoveVariableToX86reg(&RANDOM_REGISTER,x86_EDI);
-	AndConstToX86Reg(x86_EDI,0x1F);
-	//BreakPoint();
-	//Push(x86_ECX);
-#ifdef USEX64
-	Call_Direct(WriteTLBEntry);
-#else
-	Push(x86_ECX);
-	Call_Direct(WriteTLBEntry);
-	AddConstToX86Reg(x86_ESP, 0x4);
-#endif
-
-	//AddConstToX86Reg(x86_ESP,4);
-	Popad();
-}
-
-
-
-void Compile_R4300i_COP0_CO_TLBP( BLOCK_SECTION * Section) {
-	Pushad();
-	Call_Direct(TLB_Probe);
-	Popad();
-}
-
-void compiler_COP0_CO_ERET (void) {
-	if ((STATUS_REGISTER & STATUS_ERL) != 0) {
-		PROGRAM_COUNTER = ERROREPC_REGISTER;
-		STATUS_REGISTER &= ~STATUS_ERL;
-	} else {
-		PROGRAM_COUNTER = EPC_REGISTER;
-		STATUS_REGISTER &= ~STATUS_EXL;
-	}
-	LLBit = 0;
-	CheckInterrupts();
-}
-
-void Compile_R4300i_COP0_CO_ERET( BLOCK_SECTION * Section) {
-	WriteBackRegisters(Section);
-	Pushad();
-	Call_Direct(compiler_COP0_CO_ERET);
-	Popad();
-	CompileExit((uint32_t)-1,&Section->RegWorking,Normal,1,NULL);
-	NextInstruction = END_BLOCK;
-}
-
-/************************** Other functions **************************/
-void Compile_R4300i_UnknownOpcode (BLOCK_SECTION * Section) {
-
-//	Int3();
-	FreeSection(Section->ContinueSection,Section);
-	FreeSection(Section->JumpSection,Section);
-	BlockCycleCount -= 2;
-	BlockRandomModifier -= 1;
-	MoveConstToVariable(Section->CompilePC,&PROGRAM_COUNTER);
-	WriteBackRegisters(Section);
-	AddConstToVariable(BlockCycleCount,&CP0[9]);
-	SubConstFromVariable(BlockRandomModifier,&CP0[1]);
-	MoveConstToVariable(Opcode.Hex,&Opcode.Hex);
-	Pushad();
-	Call_Direct(R4300i_UnknownOpcode);
-	Popad();
-	Ret();
-	if (NextInstruction == NORMAL) { NextInstruction = END_BLOCK; }
-}
-

audacious-plugins-3.1.1.tar.bz2/src/usf/recompiler_ops.h Deleted

@@ -1,196 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-void CompileReadTLBMiss (BLOCK_SECTION * Section, int32_t AddressReg, int32_t LookUpReg );
-
-/************************** Branch functions  ************************/
-void Compile_R4300i_Branch         ( BLOCK_SECTION * Section, void (*CompareFunc)(BLOCK_SECTION * Section), int32_t BranchType, uint32_t Link);
-void Compile_R4300i_BranchLikely   ( BLOCK_SECTION * Section, void (*CompareFunc)(BLOCK_SECTION * Section), uint32_t Link);
-void BNE_Compare                   ( BLOCK_SECTION * Section );
-void BEQ_Compare                   ( BLOCK_SECTION * Section );
-void BGTZ_Compare                  ( BLOCK_SECTION * Section );
-void BLEZ_Compare                  ( BLOCK_SECTION * Section );
-void BLTZ_Compare                  ( BLOCK_SECTION * Section );
-void BGEZ_Compare                  ( BLOCK_SECTION * Section );
-void COP1_BCF_Compare              ( BLOCK_SECTION * Section );
-void COP1_BCT_Compare              ( BLOCK_SECTION * Section );
-
-/*************************  OpCode functions *************************/
-void Compile_R4300i_J              ( BLOCK_SECTION * Section );
-void Compile_R4300i_JAL            ( BLOCK_SECTION * Section );
-void Compile_R4300i_ADDI           ( BLOCK_SECTION * Section );
-void Compile_R4300i_ADDIU          ( BLOCK_SECTION * Section );
-void Compile_R4300i_SLTI           ( BLOCK_SECTION * Section );
-void Compile_R4300i_SLTIU          ( BLOCK_SECTION * Section );
-void Compile_R4300i_ANDI           ( BLOCK_SECTION * Section );
-void Compile_R4300i_ORI            ( BLOCK_SECTION * Section );
-void Compile_R4300i_XORI           ( BLOCK_SECTION * Section );
-void Compile_R4300i_LUI            ( BLOCK_SECTION * Section );
-void Compile_R4300i_DADDIU         ( BLOCK_SECTION * Section );
-void Compile_R4300i_LDL            ( BLOCK_SECTION * Section );
-void Compile_R4300i_LDR            ( BLOCK_SECTION * Section );
-void Compile_R4300i_LB             ( BLOCK_SECTION * Section );
-void Compile_R4300i_LH             ( BLOCK_SECTION * Section );
-void Compile_R4300i_LWL            ( BLOCK_SECTION * Section );
-void Compile_R4300i_LW             ( BLOCK_SECTION * Section );
-void Compile_R4300i_LBU            ( BLOCK_SECTION * Section );
-void Compile_R4300i_LHU            ( BLOCK_SECTION * Section );
-void Compile_R4300i_LWR            ( BLOCK_SECTION * Section );
-void Compile_R4300i_LWU            ( BLOCK_SECTION * Section );		//added by Witten
-void Compile_R4300i_SB             ( BLOCK_SECTION * Section );
-void Compile_R4300i_SH             ( BLOCK_SECTION * Section );
-void Compile_R4300i_SWL            ( BLOCK_SECTION * Section );
-void Compile_R4300i_SW             ( BLOCK_SECTION * Section );
-void Compile_R4300i_SWR            ( BLOCK_SECTION * Section );
-void Compile_R4300i_SDL            ( BLOCK_SECTION * Section );
-void Compile_R4300i_SDR            ( BLOCK_SECTION * Section );
-void Compile_R4300i_CACHE          ( BLOCK_SECTION * Section );
-void Compile_R4300i_LL             ( BLOCK_SECTION * Section );
-void Compile_R4300i_LWC1           ( BLOCK_SECTION * Section );
-void Compile_R4300i_LDC1           ( BLOCK_SECTION * Section );
-void Compile_R4300i_LD             ( BLOCK_SECTION * Section );
-void Compile_R4300i_SC             ( BLOCK_SECTION * Section );
-void Compile_R4300i_SWC1           ( BLOCK_SECTION * Section );
-void Compile_R4300i_SDC1           ( BLOCK_SECTION * Section );
-void Compile_R4300i_SD             ( BLOCK_SECTION * Section );
-
-/********************** R4300i OpCodes: Special **********************/
-void Compile_R4300i_SPECIAL_SLL    ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_SRL    ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_SRA    ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_SLLV   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_SRLV   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_SRAV   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_JR     ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_JALR   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_SYSCALL( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_MFLO   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_MTLO   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_MFHI   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_MTHI   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DSLLV  ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DSRLV  ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DSRAV  ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_MULT   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_MULTU  ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DIV    ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DIVU   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DMULT  ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DMULTU ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DDIV   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DDIVU  ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_ADD    ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_ADDU   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_SUB    ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_SUBU   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_AND    ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_OR     ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_XOR    ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_NOR    ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_SLT    ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_SLTU   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DADD   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DADDU  ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DSUB   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DSUBU  ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DSLL   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DSRL   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DSRA   ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DSLL32 ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DSRL32 ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_DSRA32 ( BLOCK_SECTION * Section );
-void Compile_R4300i_SPECIAL_BREAK  ( BLOCK_SECTION * Section );
-
-/************************** COP0 functions **************************/
-void Compile_R4300i_COP0_MF        ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP0_MT        ( BLOCK_SECTION * Section );
-
-/************************** COP0 CO functions ***********************/
-void Compile_R4300i_COP0_CO_TLBR   ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP0_CO_TLBWI  ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP0_CO_TLBWR  ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP0_CO_TLBP   ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP0_CO_ERET   ( BLOCK_SECTION * Section );
-
-/************************** COP1 functions **************************/
-void Compile_R4300i_COP1_MF        ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_DMF       ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_CF        ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_MT        ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_DMT       ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_CT        ( BLOCK_SECTION * Section );
-
-/************************** COP1: S functions ************************/
-void Compile_R4300i_COP1_S_ADD     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_SUB     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_MUL     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_DIV     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_ABS     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_NEG     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_SQRT    ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_MOV     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_TRUNC_L ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_CEIL_L  ( BLOCK_SECTION * Section );			//added by Witten
-void Compile_R4300i_COP1_S_FLOOR_L ( BLOCK_SECTION * Section );			//added by Witten
-void Compile_R4300i_COP1_S_ROUND_W ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_TRUNC_W ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_CEIL_W  ( BLOCK_SECTION * Section );			//added by Witten
-void Compile_R4300i_COP1_S_FLOOR_W ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_CVT_D   ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_CVT_W   ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_CVT_L   ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_S_CMP     ( BLOCK_SECTION * Section );
-
-/************************** COP1: D functions ************************/
-void Compile_R4300i_COP1_D_ADD     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_SUB     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_MUL     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_DIV     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_ABS     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_NEG     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_SQRT    ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_MOV     ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_TRUNC_L ( BLOCK_SECTION * Section );			//added by Witten
-void Compile_R4300i_COP1_D_CEIL_L  ( BLOCK_SECTION * Section );			//added by Witten
-void Compile_R4300i_COP1_D_FLOOR_L ( BLOCK_SECTION * Section );			//added by Witten
-void Compile_R4300i_COP1_D_ROUND_W ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_TRUNC_W ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_CEIL_W  ( BLOCK_SECTION * Section );			//added by Witten
-void Compile_R4300i_COP1_D_FLOOR_W ( BLOCK_SECTION * Section );			//added by Witten
-void Compile_R4300i_COP1_D_CVT_S   ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_CVT_W   ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_CVT_L   ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_D_CMP     ( BLOCK_SECTION * Section );
-
-/************************** COP1: W functions ************************/
-void Compile_R4300i_COP1_W_CVT_S   ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_W_CVT_D   ( BLOCK_SECTION * Section );
-
-/************************** COP1: L functions ************************/
-void Compile_R4300i_COP1_L_CVT_S   ( BLOCK_SECTION * Section );
-void Compile_R4300i_COP1_L_CVT_D   ( BLOCK_SECTION * Section );
-
-/************************** Other functions **************************/
-void Compile_R4300i_UnknownOpcode  ( BLOCK_SECTION * Section );

audacious-plugins-3.1.1.tar.bz2/src/usf/registers.c Deleted

@@ -1,1054 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-// #ifdef EXT_REGS
-
-#include "main.h"
-#include "cpu.h"
-#include "x86.h"
-#include "types.h"
-
-uint32_t PROGRAM_COUNTER, * CP0,*FPCR,*RegRDRAM,*RegSP,*RegDPC,*RegMI,*RegVI,*RegAI,*RegPI,
-	*RegRI,*RegSI, HalfLine, RegModValue, ViFieldNumber, LLBit, LLAddr;
-void * FPRDoubleLocation[32], * FPRFloatLocation[32];
-MIPS_DWORD *GPR, *FPR, HI, LO;
-int32_t fpuControl;
-N64_REGISTERS * Registers = 0;
-
-void SetupRegisters(N64_REGISTERS * n64_Registers) {
-	PROGRAM_COUNTER = n64_Registers->PROGRAM_COUNTER;
-	HI.DW = n64_Registers->HI.DW;
-	LO.DW = n64_Registers->LO.DW;
-	CP0 = n64_Registers->CP0;
-	GPR = n64_Registers->GPR;
-	FPR = n64_Registers->FPR;
-	FPCR = n64_Registers->FPCR;
-	RegRDRAM = n64_Registers->RDRAM;
-	RegSP = n64_Registers->SP;
-	RegDPC = n64_Registers->DPC;
-	RegMI = n64_Registers->MI;
-	RegVI = n64_Registers->VI;
-	RegAI = n64_Registers->AI;
-	RegPI = n64_Registers->PI;
-	RegRI = n64_Registers->RI;
-	RegSI = n64_Registers->SI;
-	PIF_Ram = n64_Registers->PIF_Ram;
-}
-
-int fUnMap_8BitTempReg (BLOCK_SECTION * Section);
-int UnMap_TempReg (BLOCK_SECTION * Section);
-uint32_t UnMap_X86reg (BLOCK_SECTION * Section, uint32_t x86Reg);
-
-void ChangeFPURegFormat (BLOCK_SECTION * Section, int32_t Reg, int32_t OldFormat, int32_t NewFormat, int32_t RoundingModel) {
-	int32_t i;
-
-	for (i = 0; i < 8; i++) {
-		if (FpuMappedTo(i) == (uint32_t)Reg) {
-			if (FpuState(i) != (uint32_t)OldFormat) {
-				UnMap_FPR(Section,Reg,1);
-				Load_FPR_ToTop(Section,Reg,Reg,OldFormat);
-				ChangeFPURegFormat(Section,Reg,OldFormat,NewFormat,RoundingModel);
-				return;
-			}
-			FpuRoundingModel(i) = RoundingModel;
-			FpuState(i) = NewFormat;
-			return;
-		}
-	}
-
-}
-
-void ChangeMiIntrMask (void) {
-	if ( ( RegModValue & MI_INTR_MASK_CLR_SP ) != 0 ) { MI_INTR_MASK_REG &= ~MI_INTR_MASK_SP; }
-	if ( ( RegModValue & MI_INTR_MASK_SET_SP ) != 0 ) { MI_INTR_MASK_REG |= MI_INTR_MASK_SP; }
-	if ( ( RegModValue & MI_INTR_MASK_CLR_SI ) != 0 ) { MI_INTR_MASK_REG &= ~MI_INTR_MASK_SI; }
-	if ( ( RegModValue & MI_INTR_MASK_SET_SI ) != 0 ) { MI_INTR_MASK_REG |= MI_INTR_MASK_SI; }
-	if ( ( RegModValue & MI_INTR_MASK_CLR_AI ) != 0 ) { MI_INTR_MASK_REG &= ~MI_INTR_MASK_AI; }
-	if ( ( RegModValue & MI_INTR_MASK_SET_AI ) != 0 ) { MI_INTR_MASK_REG |= MI_INTR_MASK_AI; }
-	if ( ( RegModValue & MI_INTR_MASK_CLR_VI ) != 0 ) { MI_INTR_MASK_REG &= ~MI_INTR_MASK_VI; }
-	if ( ( RegModValue & MI_INTR_MASK_SET_VI ) != 0 ) { MI_INTR_MASK_REG |= MI_INTR_MASK_VI; }
-	if ( ( RegModValue & MI_INTR_MASK_CLR_PI ) != 0 ) { MI_INTR_MASK_REG &= ~MI_INTR_MASK_PI; }
-	if ( ( RegModValue & MI_INTR_MASK_SET_PI ) != 0 ) { MI_INTR_MASK_REG |= MI_INTR_MASK_PI; }
-	if ( ( RegModValue & MI_INTR_MASK_CLR_DP ) != 0 ) { MI_INTR_MASK_REG &= ~MI_INTR_MASK_DP; }
-	if ( ( RegModValue & MI_INTR_MASK_SET_DP ) != 0 ) { MI_INTR_MASK_REG |= MI_INTR_MASK_DP; }
-}
-
-void ChangeMiModeReg (void) {
-	MI_MODE_REG &= ~0x7F;
-	MI_MODE_REG |= (RegModValue & 0x7F);
-	if ( ( RegModValue & MI_CLR_INIT ) != 0 ) { MI_MODE_REG &= ~MI_MODE_INIT; }
-	if ( ( RegModValue & MI_SET_INIT ) != 0 ) { MI_MODE_REG |= MI_MODE_INIT; }
-	if ( ( RegModValue & MI_CLR_EBUS ) != 0 ) { MI_MODE_REG &= ~MI_MODE_EBUS; }
-	if ( ( RegModValue & MI_SET_EBUS ) != 0 ) { MI_MODE_REG |= MI_MODE_EBUS; }
-	if ( ( RegModValue & MI_CLR_DP_INTR ) != 0 ) { MI_INTR_REG &= ~MI_INTR_DP; }
-	if ( ( RegModValue & MI_CLR_RDRAM ) != 0 ) { MI_MODE_REG &= ~MI_MODE_RDRAM; }
-	if ( ( RegModValue & MI_SET_RDRAM ) != 0 ) { MI_MODE_REG |= MI_MODE_RDRAM; }
-}
-
-void ChangeSpStatus (void) {
-	if ( ( RegModValue & SP_CLR_HALT ) != 0) { SP_STATUS_REG &= ~SP_STATUS_HALT; }
-	if ( ( RegModValue & SP_SET_HALT ) != 0) { SP_STATUS_REG |= SP_STATUS_HALT; }
-	if ( ( RegModValue & SP_CLR_BROKE ) != 0) { SP_STATUS_REG &= ~SP_STATUS_BROKE; }
-	if ( ( RegModValue & SP_CLR_INTR ) != 0) {
-		MI_INTR_REG &= ~MI_INTR_SP;
-		CheckInterrupts();
-	}
-
-	if ( ( RegModValue & SP_CLR_SSTEP ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SSTEP; }
-	if ( ( RegModValue & SP_SET_SSTEP ) != 0) { SP_STATUS_REG |= SP_STATUS_SSTEP; }
-	if ( ( RegModValue & SP_CLR_INTR_BREAK ) != 0) { SP_STATUS_REG &= ~SP_STATUS_INTR_BREAK; }
-	if ( ( RegModValue & SP_SET_INTR_BREAK ) != 0) { SP_STATUS_REG |= SP_STATUS_INTR_BREAK; }
-	if ( ( RegModValue & SP_CLR_SIG0 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG0; }
-	if ( ( RegModValue & SP_SET_SIG0 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG0; }
-	if ( ( RegModValue & SP_CLR_SIG1 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG1; }
-	if ( ( RegModValue & SP_SET_SIG1 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG1; }
-	if ( ( RegModValue & SP_CLR_SIG2 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG2; }
-	if ( ( RegModValue & SP_SET_SIG2 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG2; }
-	if ( ( RegModValue & SP_CLR_SIG3 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG3; }
-	if ( ( RegModValue & SP_SET_SIG3 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG3; }
-	if ( ( RegModValue & SP_CLR_SIG4 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG4; }
-	if ( ( RegModValue & SP_SET_SIG4 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG4; }
-	if ( ( RegModValue & SP_CLR_SIG5 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG5; }
-	if ( ( RegModValue & SP_SET_SIG5 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG5; }
-	if ( ( RegModValue & SP_CLR_SIG6 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG6; }
-	if ( ( RegModValue & SP_SET_SIG6 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG6; }
-	if ( ( RegModValue & SP_CLR_SIG7 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG7; }
-	if ( ( RegModValue & SP_SET_SIG7 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG7; }
-
-	RunRsp();
-
-}
-
-int32_t Free8BitX86Reg (BLOCK_SECTION * Section) {
-	int32_t x86Reg, count, MapCount[64], MapReg[64];
-
-	//if (x86Mapped(x86_EBX) == NotMapped && !x86Protected(x86_EBX)) {return x86_EBX; }
-	//if (x86Mapped(x86_EAX) == NotMapped && !x86Protected(x86_EAX)) {return x86_EAX; }
-	//if (x86Mapped(x86_EDX) == NotMapped && !x86Protected(x86_EDX)) {return x86_EDX; }
-	//if (x86Mapped(x86_ECX) == NotMapped && !x86Protected(x86_ECX)) {return x86_ECX; }
-	if (x86Mapped(x86_EBX&0x2f) == NotMapped && !x86Protected(x86_EBX&0x2f)) {return x86_EBX; }
-	if (x86Mapped(x86_EDX&0x2f) == NotMapped && !x86Protected(x86_EDX&0x2f)) {return x86_EDX; }
-	if (x86Mapped(x86_ECX&0x2f) == NotMapped && !x86Protected(x86_ECX&0x2f)) {return x86_ECX; }
-	if (x86Mapped(x86_EAX&0x2f) == NotMapped && !x86Protected(x86_EAX&0x2f)) {return x86_EAX; }
-#ifdef EXT_REGS
-	if (x86Mapped(x86_R9D&0x2f) == NotMapped && !x86Protected(x86_R9D&0x2f)) {return x86_R9D; }
-	if (x86Mapped(x86_R10D&0x2f) == NotMapped && !x86Protected(x86_R10D&0x2f)) {return x86_R10D; }
-	if (x86Mapped(x86_R11D&0x2f) == NotMapped && !x86Protected(x86_R11D&0x2f)) {return x86_R11D; }
-	if (x86Mapped(x86_R14D&0x2f) == NotMapped && !x86Protected(x86_R14D&0x2f)) {return x86_R14D; }
-#endif
-
-	x86Reg = UnMap_8BitTempReg(Section);
-	if (x86Reg >= 0) { return x86Reg; }
-
-	for (count = 0; count < 64; count ++) {
-		MapCount[count] = x86MapOrder(count);
-		MapReg[count] = count;
-	}
-	for (count = 0; count < 64; count ++) {
-		int i;
-
-		for (i = 0; i < 63; i ++) {
-			int temp;
-
-			if (MapCount[i] < MapCount[i+1]) {
-				temp = MapCount[i];
-				MapCount[i] = MapCount[i+1];
-				MapCount[i+1] = temp;
-				temp = MapReg[i];
-				MapReg[i] = MapReg[i+1];
-				MapReg[i+1] = temp;
-			}
-		}
-
-	}
-	for (count = 0; count < 64; count ++) {
-		if (MapCount[count] > 0) {
-			if (!Is8BitReg(count)) { continue; }
-			if (UnMap_X86reg(Section,count)) {
-				return count;
-			}
-		}
-	}
-
-	return -1;
-}
-
-
-int32_t FreeX86Reg (BLOCK_SECTION * Section) {
-	int32_t x86Reg, count, MapCount[64], MapReg[64], StackReg;
-
-	if (x86Mapped(x86_ESI&0x2f) == NotMapped && !x86Protected(x86_ESI&0x2f)) {return x86_ESI; }
-	if (x86Mapped(x86_EDI&0x2f) == NotMapped && !x86Protected(x86_EDI&0x2f)) {return x86_EDI; }
-	if (x86Mapped(x86_EBX&0x2f) == NotMapped && !x86Protected(x86_EBX&0x2f)) {return x86_EBX; }
-	if (x86Mapped(x86_EDX&0x2f) == NotMapped && !x86Protected(x86_EDX&0x2f)) {return x86_EDX; }
-	if (x86Mapped(x86_ECX&0x2f) == NotMapped && !x86Protected(x86_ECX&0x2f)) {return x86_ECX; }
-	if (x86Mapped(x86_EAX&0x2f) == NotMapped && !x86Protected(x86_EAX&0x2f)) {return x86_EAX; }
-#ifdef EXT_REGS
-	if (x86Mapped(x86_R9D&0x2f) == NotMapped && !x86Protected(x86_R9D&0x2f)) {return x86_R9D; }
-	if (x86Mapped(x86_R10D&0x2f) == NotMapped && !x86Protected(x86_R10D&0x2f)) {return x86_R10D; }
-	if (x86Mapped(x86_R11D&0x2f) == NotMapped && !x86Protected(x86_R11D&0x2f)) {return x86_R11D; }
-	if (x86Mapped(x86_R12D&0x2f) == NotMapped && !x86Protected(x86_R12D&0x2f)) {return x86_R12D; }
-	if (x86Mapped(x86_R13D&0x2f) == NotMapped && !x86Protected(x86_R13D&0x2f)) {return x86_R13D; }
-	if (x86Mapped(x86_R14D&0x2f) == NotMapped && !x86Protected(x86_R14D&0x2f)) {return x86_R14D; }
-#endif
-
-	x86Reg = UnMap_TempReg(Section);
-	if (x86Reg > 0) { return x86Reg; }
-
-	for (count = 0; count < 64; count ++) {
-		MapCount[count] = x86MapOrder(count);
-		MapReg[count] = count;
-	}
-	for (count = 0; count < 64; count ++) {
-		int i;
-
-		for (i = 0; i < 63; i ++) {
-			int temp;
-
-			if (MapCount[i] < MapCount[i+1]) {
-				temp = MapCount[i];
-				MapCount[i] = MapCount[i+1];
-				MapCount[i+1] = temp;
-				temp = MapReg[i];
-				MapReg[i] = MapReg[i+1];
-				MapReg[i+1] = temp;
-			}
-		}
-
-	}
-	StackReg = -1;
-	for (count = 0; count < 64; count ++) {
-		if (MapCount[count] > 0 && x86Mapped(MapReg[count]) != Stack_Mapped) {
-			if (UnMap_X86reg(Section,MapReg[count])) {
-				return MapReg[count];
-			}
-		}
-		if (x86Mapped(MapReg[count]) == Stack_Mapped) { StackReg = MapReg[count]; }
-	}
-	if (StackReg >= 0) {
-		UnMap_X86reg(Section,StackReg);
-		return StackReg;
-	}
-	return -1;
-}
-
-
-uint32_t Is8BitReg (int32_t x86Reg) {
-	if (x86Reg == x86_EAX) { return 1; }
-	if (x86Reg == x86_EBX) { return 1; }
-	if (x86Reg == x86_ECX) { return 1; }
-	if (x86Reg == x86_EDX) { return 1; }
-#ifdef EXT_REGS
-	if (x86Reg == x86_R9D) { return 1; }
-	if (x86Reg == x86_R10D) { return 1; }
-	if (x86Reg == x86_R11D) { return 1; }
-	if (x86Reg == x86_R14D) { return 1; }
-#endif
-	return 0;
-}
-
-void Load_FPR_ToTop (BLOCK_SECTION * Section, int32_t Reg, int32_t RegToLoad, int32_t Format) {
-	int32_t i;
-
-	if (RegToLoad < 0) { return; }
-	if (Reg < 0) { return; }
-
-	if (Format == FPU_Double || Format == FPU_Qword) {
-		UnMap_FPR(Section,Reg + 1,1);
-		UnMap_FPR(Section,RegToLoad + 1,1);
-	} else {
-		if ((Reg & 1) != 0) {
-			for (i = 0; i < 8; i++) {
-				if (FpuMappedTo(i) == (uint32_t)(Reg - 1)) {
-					if (FpuState(i) == FPU_Double || FpuState(i) == FPU_Qword) {
-						UnMap_FPR(Section,Reg,1);
-					}
-					i = 8;
-				}
-			}
-		}
-		if ((RegToLoad & 1) != 0) {
-			for (i = 0; i < 8; i++) {
-				if (FpuMappedTo(i) == (uint32_t)(RegToLoad - 1)) {
-					if (FpuState(i) == FPU_Double || FpuState(i) == FPU_Qword) {
-						UnMap_FPR(Section,RegToLoad,1);
-					}
-					i = 8;
-				}
-			}
-		}
-	}
-
-	if (Reg == RegToLoad) {
-		//if different format then unmap original reg from stack
-		for (i = 0; i < 8; i++) {
-			if (FpuMappedTo(i) == (uint32_t)Reg) {
-				if (FpuState(i) != (uint32_t)Format) {
-					UnMap_FPR(Section,Reg,1);
-				}
-				i = 8;
-			}
-		}
-	} else {
-		UnMap_FPR(Section,Reg,0);
-	}
-
-	if (RegInStack(Section,RegToLoad,Format)) {
-		if (Reg != RegToLoad) {
-			if (FpuMappedTo((StackTopPos - 1) & 7) != (uint32_t)RegToLoad) {
-				UnMap_FPR(Section,FpuMappedTo((StackTopPos - 1) & 7),1);
-				fpuLoadReg(&StackTopPos,StackPosition(Section,RegToLoad));
-				FpuRoundingModel(StackTopPos) = RoundDefault;
-				FpuMappedTo(StackTopPos) = Reg;
-				FpuState(StackTopPos) = Format;
-			} else {
-				UnMap_FPR(Section,FpuMappedTo((StackTopPos - 1) & 7),1);
-				Load_FPR_ToTop (Section,Reg, RegToLoad, Format);
-			}
-		} else {
-			uint32_t RegPos, StackPos, i;
-
-			for (i = 0; i < 8; i++) {
-				if (FpuMappedTo(i) == (uint32_t)Reg) {
-					RegPos = i;
-					i = 8;
-				}
-			}
-
-			if (RegPos == StackTopPos) {
-				return;
-			}
-			StackPos = StackPosition(Section,Reg);
-
-			FpuRoundingModel(RegPos) = FpuRoundingModel(StackTopPos);
-			FpuMappedTo(RegPos) = FpuMappedTo(StackTopPos);
-			FpuState(RegPos) = FpuState(StackTopPos);
-
-			fpuExchange(StackPos);
-
-			FpuRoundingModel(StackTopPos) = RoundDefault;
-			FpuMappedTo(StackTopPos) = Reg;
-			FpuState(StackTopPos) = Format;
-		}
-	} else {
-		int TempReg;
-
-		UnMap_FPR(Section,FpuMappedTo((StackTopPos - 1) & 7),1);
-		for (i = 0; i < 8; i++) {
-			if (FpuMappedTo(i) == (uint32_t)RegToLoad) {
-				UnMap_FPR(Section,RegToLoad,1);
-				i = 8;
-			}
-		}
-		TempReg = Map_TempReg(Section,x86_Any,-1,0);
-		switch (Format) {
-		case FPU_Dword:
-			MovePointerToX86reg(&FPRFloatLocation[RegToLoad],TempReg);
-			MovePointerToX86reg(&FPRFloatLocation[RegToLoad],TempReg);
-
-			fpuLoadIntegerDwordFromX86Reg(&StackTopPos,TempReg);
-			break;
-		case FPU_Qword:
-			MovePointerToX86reg(&FPRDoubleLocation[RegToLoad],TempReg);
-			fpuLoadIntegerQwordFromX86Reg(&StackTopPos,TempReg);
-			break;
-		case FPU_Float:
-			MovePointerToX86reg(&FPRFloatLocation[RegToLoad],TempReg);
-			fpuLoadDwordFromX86Reg(&StackTopPos,TempReg);
-			break;
-		case FPU_Double:
-			MovePointerToX86reg(&FPRDoubleLocation[RegToLoad],TempReg);
-			fpuLoadQwordFromX86Reg(&StackTopPos,TempReg);
-			break;
-		}
-		x86Protected(TempReg) = 0;
-		FpuRoundingModel(StackTopPos) = RoundDefault;
-		FpuMappedTo(StackTopPos) = Reg;
-		FpuState(StackTopPos) = Format;
-	}
-
-	//CurrentRoundingModel,FpuRoundingModel(StackTopPos));
-}
-
-void Map_GPR_32bit (BLOCK_SECTION * Section, int32_t Reg, uint32_t SignValue, int32_t MipsRegToLoad) {
-	int x86Reg,count;
-
-	if (Reg == 0) {
-		return;
-	}
-
-	if (IsUnknown(Reg) || IsConst(Reg)) {
-		x86Reg = FreeX86Reg(Section);
-		if (x86Reg < 0) {
-			printf("out of registers\n");
-			return;
-		}
-	} else {
-		if (Is64Bit(Reg)) {
-			x86MapOrder(MipsRegHi(Reg)) = 0;
-			x86Mapped(MipsRegHi(Reg)) = NotMapped;
-			x86Protected(MipsRegHi(Reg)) = 0;
-			MipsRegHi(Reg) = 0;
-		}
-		x86Reg = MipsRegLo(Reg);
-	}
-	for (count = 0; count < 64; count ++) {
-		if (x86MapOrder(count) > 0) {
-			x86MapOrder(count) += 1;
-		}
-	}
-	x86MapOrder(x86Reg) = 1;
-
-	if (MipsRegToLoad > 0) {
-		if (IsUnknown(MipsRegToLoad)) {
-			MoveVariableToX86reg(&GPR[MipsRegToLoad].UW[0],x86Reg);
-		} else if (IsMapped(MipsRegToLoad)) {
-			if (Reg != MipsRegToLoad) {
-				MoveX86RegToX86Reg(MipsRegLo(MipsRegToLoad),x86Reg);
-			}
-		} else {
-			if (MipsRegLo(MipsRegToLoad) != 0) {
-				MoveConstToX86reg(MipsRegLo(MipsRegToLoad),x86Reg);
-			} else {
-				XorX86RegToX86Reg(x86Reg,x86Reg);
-			}
-		}
-	} else if (MipsRegToLoad == 0) {
-		XorX86RegToX86Reg(x86Reg,x86Reg);
-	}
-	x86Mapped(x86Reg) = GPR_Mapped;
-	x86Protected(x86Reg) = 1;
-	MipsRegLo(Reg) = x86Reg;
-	MipsRegState(Reg) = SignValue ? STATE_MAPPED_32_SIGN : STATE_MAPPED_32_ZERO;
-}
-
-void Map_GPR_64bit (BLOCK_SECTION * Section, int32_t Reg, int32_t MipsRegToLoad) {
-	int x86Hi, x86lo, count;
-
-	if (Reg == 0) {
-
-		return;
-	}
-
-	ProtectGPR(Section,Reg);
-	if (IsUnknown(Reg) || IsConst(Reg)) {
-		x86Hi = FreeX86Reg(Section);
-		if (x86Hi < 0) { printf("out of registers\n"); return; }
-		x86Protected(x86Hi) = 1;
-
-		x86lo = FreeX86Reg(Section);
-		if (x86lo < 0) { printf("out of registers\n"); return; }
-		x86Protected(x86lo) = 1;
-
-	} else {
-		x86lo = MipsRegLo(Reg);
-		if (Is32Bit(Reg)) {
-			x86Protected(x86lo) = 1;
-			x86Hi = FreeX86Reg(Section);
-			if (x86Hi < 0) { printf("out of registers\n"); return; }
-			x86Protected(x86Hi) = 1;
-		} else {
-			x86Hi = MipsRegHi(Reg);
-		}
-	}
-
-	for (count = 0; count < 64; count ++) {
-		if (x86MapOrder(count) > 0) { x86MapOrder(count) += 1; }
-	}
-
-	x86MapOrder(x86Hi) = 1;
-	x86MapOrder(x86lo) = 1;
-	if (MipsRegToLoad > 0) {
-		if (IsUnknown(MipsRegToLoad)) {
-			MoveVariableToX86reg(&GPR[MipsRegToLoad].UW[1],x86Hi);
-			MoveVariableToX86reg(&GPR[MipsRegToLoad].UW[0],x86lo);
-		} else if (IsMapped(MipsRegToLoad)) {
-			if (Is32Bit(MipsRegToLoad)) {
-				if (IsSigned(MipsRegToLoad)) {
-
-					MoveX86RegToX86Reg(MipsRegLo(MipsRegToLoad),x86Hi);
-					ShiftRightSignImmed(x86Hi,31);
-				} else {
-					XorX86RegToX86Reg(x86Hi,x86Hi);
-				}
-				if (Reg != MipsRegToLoad) {
-					MoveX86RegToX86Reg(MipsRegLo(MipsRegToLoad),x86lo);
-				}
-			} else {
-				if (Reg != MipsRegToLoad) {
-					MoveX86RegToX86Reg(MipsRegHi(MipsRegToLoad),x86Hi);
-					MoveX86RegToX86Reg(MipsRegLo(MipsRegToLoad),x86lo);
-				}
-			}
-		} else {
-			if (Is32Bit(MipsRegToLoad)) {
-				if (IsSigned(MipsRegToLoad)) {
-					if (MipsRegLo((int)MipsRegLo(MipsRegToLoad) >> 31) != 0) {
-						MoveConstToX86reg((int)MipsRegLo(MipsRegToLoad) >> 31,x86Hi);
-					} else {
-						XorX86RegToX86Reg(x86Hi,x86Hi);
-					}
-				} else {
-					XorX86RegToX86Reg(x86Hi,x86Hi);
-				}
-			} else {
-				if (MipsRegHi(MipsRegToLoad) != 0) {
-					MoveConstToX86reg(MipsRegHi(MipsRegToLoad),x86Hi);
-				} else {
-					XorX86RegToX86Reg(x86Hi,x86Hi);
-				}
-			}
-			if (MipsRegLo(MipsRegToLoad) != 0) {
-				MoveConstToX86reg(MipsRegLo(MipsRegToLoad),x86lo);
-			} else {
-				XorX86RegToX86Reg(x86lo,x86lo);
-			}
-		}
-	} else if (MipsRegToLoad == 0) {
-		XorX86RegToX86Reg(x86Hi,x86Hi);
-		XorX86RegToX86Reg(x86lo,x86lo);
-	}
-	x86Mapped(x86Hi) = GPR_Mapped;
-	x86Mapped(x86lo) = GPR_Mapped;
-	MipsRegHi(Reg) = x86Hi;
-	MipsRegLo(Reg) = x86lo;
-	MipsRegState(Reg) = STATE_MAPPED_64;
-}
-
-int32_t Map_TempReg (BLOCK_SECTION * Section, int32_t x86Reg, int32_t MipsReg, uint32_t LoadHiWord) {
-	int32_t count, x64reg = 0;
-
-	//if((x86Reg & x64_Reg) || (x86Reg & x64_Any))
-		//Int3();
-	x64reg = (x86Reg & x64_Reg) || (x86Reg & x64_Any);
-	x86Reg &= ~x64_Reg;
-
- 	if ((x86Reg == x86_Any) || (x86Reg == x64_Any)) {
-		for (count = 0; count < 64; count ++ ) {
-			if (x86Mapped(count) == Temp_Mapped) {
-				if (x86Protected(count) == 0) { x86Reg = count; }
-			}
-		}
-
-		if ((x86Reg == x86_Any) || (x86Reg == x64_Any)) {
-			x86Reg = FreeX86Reg(Section);
-			if (x86Reg < 0) {
-				x86Reg = FreeX86Reg(Section);
-				return -1;
-			}
-		}
-	} else if (x86Reg == x86_Any8Bit) {
-		if (x86Mapped(x86_EBX&0x2f) == Temp_Mapped && !x86Protected(x86_EBX&0x2f)) { x86Reg = x86_EBX; }
-		if (x86Mapped(x86_EAX&0x2f) == Temp_Mapped && !x86Protected(x86_EAX&0x2f)) { x86Reg = x86_EAX; }
-		if (x86Mapped(x86_EDX&0x2f) == Temp_Mapped && !x86Protected(x86_EDX&0x2f)) { x86Reg = x86_EDX; }
-		if (x86Mapped(x86_ECX&0x2f) == Temp_Mapped && !x86Protected(x86_ECX&0x2f)) { x86Reg = x86_ECX; }
-
-#ifdef EXT_REGS
-		if (x86Mapped(x86_R9D&0x2f) == Temp_Mapped && !x86Protected(x86_R9D&0x2f)) { x86Reg = x86_R9D; }
-		if (x86Mapped(x86_R10D&0x2f) == Temp_Mapped && !x86Protected(x86_R10D&0x2f)) { x86Reg = x86_R10D; }
-		if (x86Mapped(x86_R11D&0x2f) == Temp_Mapped && !x86Protected(x86_R11D&0x2f)) { x86Reg = x86_R11D; }
-		if (x86Mapped(x86_R14D&0x2f) == Temp_Mapped && !x86Protected(x86_R14D&0x2f)) { x86Reg = x86_R14D; }
-#endif
-
-		if (x86Reg == x86_Any8Bit) {
-			x86Reg = Free8BitX86Reg(Section);
-			if (x86Reg < 0) {
-				return -1;
-			}
-		}
-	} else {
-		int NewReg;
-
-		if (x86Mapped(x86Reg) == GPR_Mapped) {
-			if (x86Protected(x86Reg) == 1) {
-				return -1;
-			}
-			x86Protected(x86Reg) = 1;
-			NewReg = FreeX86Reg(Section);
-			for (count = 1; count < 32; count ++) {
-				if (IsMapped(count)) {
-					if (MipsRegLo(count) == (uint32_t)x86Reg) {
-						if (NewReg < 0) {
-							UnMap_GPR(Section,count,1);
-							count = 32;
-							continue;
-						}
-
-						x86Mapped(NewReg) = GPR_Mapped;
-						x86MapOrder(NewReg) = x86MapOrder(x86Reg);
-						MipsRegLo(count) = NewReg;
-						MoveX86RegToX86Reg(x86Reg,NewReg);
-						if (MipsReg == count && LoadHiWord == 0) { MipsReg = -1; }
-						count = 32;
-					}
-					if (Is64Bit(count) && MipsRegHi(count) == (uint32_t)x86Reg) {
-						if (NewReg < 0) {
-							UnMap_GPR(Section,count,1);
-							count = 32;
-							continue;
-						}
-						x86Mapped(NewReg) = GPR_Mapped;
-						x86MapOrder(NewReg) = x86MapOrder(x86Reg);
-						MipsRegHi(count) = NewReg;
-						MoveX86RegToX86Reg(x86Reg,NewReg);
-						if (MipsReg == count && LoadHiWord == 1) { MipsReg = -1; }
-						count = 32;
-					}
-				}
-			}
-		}
-		if (x86Mapped(x86Reg) == Stack_Mapped) {
-			UnMap_X86reg(Section,x86Reg);
-		}
-	}
-	if (MipsReg >= 0) {
-		if (LoadHiWord) {
-			if (IsUnknown(MipsReg)) {
-				MoveVariableToX86reg(&GPR[MipsReg].UW[1],x86Reg);
-			} else if (IsMapped(MipsReg)) {
-				if (Is64Bit(MipsReg)) {
-					MoveX86RegToX86Reg(MipsRegHi(MipsReg),x86Reg);
-				} else if (IsSigned(MipsReg)){
-					MoveX86RegToX86Reg(MipsRegLo(MipsReg),x86Reg);
-
-					ShiftRightSignImmed(x86Reg,31);
-				} else {
-					MoveConstToX86reg(0,x86Reg);
-				}
-			} else {
-				if (Is64Bit(MipsReg)) {
-					if (MipsRegHi(MipsReg) != 0) {
-						MoveConstToX86reg(MipsRegHi(MipsReg),x86Reg);
-					} else {
-						XorX86RegToX86Reg(x86Reg,x86Reg);
-					}
-				} else {
-					if ((int)MipsRegLo(MipsReg) >> 31 != 0) {
-						MoveConstToX86reg((int)MipsRegLo(MipsReg) >> 31,x86Reg);
-					} else {
-						XorX86RegToX86Reg(x86Reg,x86Reg);
-					}
-				}
-			}
-		} else {
-			if (IsUnknown(MipsReg)) {
-				MoveVariableToX86reg(&GPR[MipsReg].UW[0],x86Reg);
-			} else if (IsMapped(MipsReg)) {
-				MoveX86RegToX86Reg(MipsRegLo(MipsReg),x86Reg);
-			} else {
-				if (MipsRegLo(MipsReg) != 0) {
-					MoveConstToX86reg(MipsRegLo(MipsReg),x86Reg);
-				} else {
-					XorX86RegToX86Reg(x86Reg,x86Reg);
-				}
-			}
-		}
-	}
-	x86Mapped(x86Reg) = Temp_Mapped;
-	x86Protected(x86Reg) = 1;
-	for (count = 0; count < 64; count ++) {
-		if (x86MapOrder(count) > 0) {
-			x86MapOrder(count) += 1;
-		}
-	}
-	x86MapOrder(x86Reg) = 1;
-	if(x64reg) x86Reg |= x64_Reg;
-	return x86Reg;
-}
-
-void ProtectGPR(BLOCK_SECTION * Section, uint32_t Reg) {
-	if (IsUnknown(Reg)) { return; }
-	if (IsConst(Reg)) { return; }
-	if (Is64Bit(Reg)) {
-		x86Protected(MipsRegHi(Reg)) = 1;
-	}
-	x86Protected(MipsRegLo(Reg)) = 1;
-}
-
-uint32_t RegInStack(BLOCK_SECTION * Section,int32_t Reg, int32_t Format) {
-	int i;
-
-	for (i = 0; i < 8; i++) {
-		if (FpuMappedTo(i) == (uint32_t)Reg) {
-			if (FpuState(i) == (uint32_t)Format) { return 1; }
-			else if (Format == -1) { return 1; }
-			return 0;
-		}
-	}
-	return 0;
-}
-
-void SetFpuLocations (void) {
-	int count;
-
-	if ((STATUS_REGISTER & STATUS_FR) == 0) {
-		for (count = 0; count < 32; count ++) {
-			FPRFloatLocation[count] = (void *)(&FPR[count >> 1].W[count & 1]);
-			//FPRDoubleLocation[count] = FPRFloatLocation[count];
-			FPRDoubleLocation[count] = (void *)(&FPR[count >> 1].DW);
-		}
-	} else {
-		for (count = 0; count < 32; count ++) {
-			FPRFloatLocation[count] = (void *)(&FPR[count].W[1]);
-			//FPRFloatLocation[count] = (void *)(&FPR[count].W[1]);
-			//FPRDoubleLocation[count] = FPRFloatLocation[count];
-			FPRDoubleLocation[count] = (void *)(&FPR[count].DW);
-		}
-	}
-}
-
-int32_t StackPosition (BLOCK_SECTION * Section, int32_t Reg) {
-	int32_t i;
-
-	for (i = 0; i < 8; i++) {
-		if (FpuMappedTo(i) == (uint32_t)Reg) {
-			return ((i - StackTopPos) & 7);
-		}
-	}
-	return -1;
-}
-
-int UnMap_8BitTempReg (BLOCK_SECTION * Section) {
-	int32_t count;
-
-	for (count = 0; count < 64; count ++) {
-		if (!Is8BitReg(count)) { continue; }
-		if (MipsRegState(count) == Temp_Mapped) {
-			if (x86Protected(count) == 0) {
-				x86Mapped(count) = NotMapped;
-				return count;
-			}
-		}
-	}
-	return -1;
-}
-
-void UnMap_AllFPRs ( BLOCK_SECTION * Section ) {
-	int32_t StackPos;
-
-	for (;;) {
-		int i, StartPos;
-		StackPos = StackTopPos;
-		if (FpuMappedTo(StackTopPos) != -1 ) {
-			UnMap_FPR(Section,FpuMappedTo(StackTopPos),1);
-			continue;
-		}
-		//see if any more registers mapped
-		StartPos = StackTopPos;
-		for (i = 0; i < 8; i++) {
-			if (FpuMappedTo((StartPos + i) & 7) != -1 ) { fpuIncStack(&StackTopPos); }
-		}
-		if (StackPos != StackTopPos) { continue; }
-		return;
-	}
-}
-
-void UnMap_FPR (BLOCK_SECTION * Section, int32_t Reg, int32_t WriteBackValue ) {
-	int32_t TempReg;
-	int32_t i;
-
-	if (Reg < 0) { return; }
-	for (i = 0; i < 8; i++) {
-		if (FpuMappedTo(i) != (uint32_t)Reg) { continue; }
-		if (WriteBackValue) {
-			int RegPos;
-
-			if (((i - StackTopPos + 8) & 7) != 0) {
-				uint32_t RoundingModel, MappedTo, RegState;
-
-				RoundingModel = FpuRoundingModel(StackTopPos);
-				MappedTo = FpuMappedTo(StackTopPos);
-				RegState = FpuState(StackTopPos);
-				FpuRoundingModel(StackTopPos) = FpuRoundingModel(i);
-				FpuMappedTo(StackTopPos) = FpuMappedTo(i);
-				FpuState(StackTopPos) = FpuState(i);
-				FpuRoundingModel(i) = RoundingModel;
-				FpuMappedTo(i) = MappedTo;
-				FpuState(i) = RegState;
-				fpuExchange((i - StackTopPos) & 7);
-			}
-
-			if (CurrentRoundingModel != FpuRoundingModel(i)) {
-				int x86reg;
-
-				fpuControl = 0;
-				fpuStoreControl(&fpuControl);
-				x86reg = Map_TempReg(Section,x86_Any,-1,0);
-				MoveVariableToX86reg(&fpuControl, x86reg);
-				AndConstToX86Reg(x86reg, 0xF3FF);
-
-				switch (FpuRoundingModel(i)) {
-				case RoundDefault: OrVariableToX86Reg(&FPU_RoundingMode,x86reg); break;
-				case RoundTruncate: OrConstToX86Reg(0x0C00, x86reg); break;
-				case RoundNearest: /*OrConstToX86Reg(0x0000, x86reg);*/ break;
-				case RoundDown: OrConstToX86Reg(0x0400, x86reg); break;
-				case RoundUp: OrConstToX86Reg(0x0800, x86reg); break;
-				}
-				MoveX86regToVariable(x86reg, &fpuControl);
-				fpuLoadControl(&fpuControl);
-				CurrentRoundingModel = FpuRoundingModel(i);
-			}
-
-			RegPos = StackTopPos;
-			TempReg = Map_TempReg(Section,x86_Any,-1,0);
-			switch (FpuState(StackTopPos)) {
-			case FPU_Dword:
-				MovePointerToX86reg(&FPRFloatLocation[FpuMappedTo(StackTopPos)],TempReg);
-				fpuStoreIntegerDwordFromX86Reg(&StackTopPos,TempReg, 1);
-				break;
-			case FPU_Qword:
-				MovePointerToX86reg(&FPRDoubleLocation[FpuMappedTo(StackTopPos)],TempReg);
-				fpuStoreIntegerQwordFromX86Reg(&StackTopPos,TempReg, 1);
-				break;
-			case FPU_Float:
-				MovePointerToX86reg(&FPRFloatLocation[FpuMappedTo(StackTopPos)],TempReg);
-				fpuStoreDwordFromX86Reg(&StackTopPos,TempReg, 1);
-				break;
-			case FPU_Double:
-				MovePointerToX86reg(&FPRDoubleLocation[FpuMappedTo(StackTopPos)],TempReg);
-				fpuStoreQwordFromX86Reg(&StackTopPos,TempReg, 1);
-				break;
-			}
-			x86Protected(TempReg) = 0;
-			FpuRoundingModel(RegPos) = RoundDefault;
-			FpuMappedTo(RegPos) = -1;
-			FpuState(RegPos) = FPU_Unkown;
-		} else {
-			fpuFree((i - StackTopPos) & 7);
-			FpuRoundingModel(i) = RoundDefault;
-			FpuMappedTo(i) = -1;
-			FpuState(i) = FPU_Unkown;
-		}
-		return;
-	}
-}
-
-void UnMap_GPR (BLOCK_SECTION * Section, uint32_t Reg, int32_t WriteBackValue) {
-	if (Reg == 0) {
-		return;
-	}
-	if (IsUnknown(Reg)) { return; }
-	if (IsConst(Reg)) {
-		if (!WriteBackValue) {
-			MipsRegState(Reg) = STATE_UNKNOWN;
-			return;
-		}
-		if (Is64Bit(Reg)) {
-			MoveConstToVariable(MipsRegHi(Reg),&GPR[Reg].UW[1]);
-			MoveConstToVariable(MipsRegLo(Reg),&GPR[Reg].UW[0]);
-			MipsRegState(Reg) = STATE_UNKNOWN;
-			return;
-		}
-		if ((MipsRegLo(Reg) & 0x80000000) != 0) {
-			MoveConstToVariable(0xFFFFFFFF,&GPR[Reg].UW[1]);
-		} else {
-			MoveConstToVariable(0,&GPR[Reg].UW[1]);
-		}
-		MoveConstToVariable(MipsRegLo(Reg),&GPR[Reg].UW[0]);
-		MipsRegState(Reg) = STATE_UNKNOWN;
-		return;
-	}
-	if (Is64Bit(Reg)) {
-		x86Mapped(MipsRegHi(Reg)) = NotMapped;
-		x86Protected(MipsRegHi(Reg)) = 0;
-	}
-	x86Mapped(MipsRegLo(Reg)) = NotMapped;
-	x86Protected(MipsRegLo(Reg)) = 0;
-	if (!WriteBackValue) {
-		MipsRegState(Reg) = STATE_UNKNOWN;
-		return;
-	}
-	MoveX86regToVariable(MipsRegLo(Reg),&GPR[Reg].UW[0]);
-	if (Is64Bit(Reg)) {
-		MoveX86regToVariable(MipsRegHi(Reg),&GPR[Reg].UW[1]);
-	} else {
-		if (IsSigned(Reg)) {
-			ShiftRightSignImmed(MipsRegLo(Reg),31);
-			MoveX86regToVariable(MipsRegLo(Reg),&GPR[Reg].UW[1]);
-		} else {
-			MoveConstToVariable(0,&GPR[Reg].UW[1]);
-		}
-	}
-	MipsRegState(Reg) = STATE_UNKNOWN;
-}
-
-int UnMap_TempReg (BLOCK_SECTION * Section) {
-	int count;
-
-	for (count = 0; count < 64; count ++) {
-		if (x86Mapped(count) == Temp_Mapped) {
-			if (x86Protected(count) == 0) {
-				x86Mapped(count) = NotMapped;
-				return count & 0xff;
-			}
-		}
-	}
-	return -1;
-}
-
-int UnMap_TempRegSet (REG_INFO * RegWorking) {
-	int count;
-
-	for (count = 0; count < 64; count ++) {
-		if (RegWorking->x86reg_MappedTo[count] == Temp_Mapped) {
-			if (RegWorking->x86reg_Protected[count] == 0) {
-				RegWorking->x86reg_MappedTo[count] = NotMapped;
-				return count;
-			}
-		}
-	}
-	return -1;
-}
-
-
-uint32_t UnMap_X86reg (BLOCK_SECTION * Section, uint32_t x86Reg) {
-	int count;
-
-	if (x86Mapped(x86Reg) == NotMapped && x86Protected(x86Reg) == 0) { return 1; }
-	if (x86Mapped(x86Reg) == Temp_Mapped) {
-		if (x86Protected(x86Reg) == 0) {
-			x86Mapped(x86Reg) = NotMapped;
-			return 1;
-		}
-		return 0;
-	}
-	for (count = 1; count < 32; count ++) {
-		if (IsMapped(count)) {
-			if (Is64Bit(count)) {
-				if (MipsRegHi(count) == x86Reg) {
-					if (x86Protected(x86Reg) == 0) {
-						UnMap_GPR(Section,count,1);
-						return 1;
-					}
-					break;
-				}
-			}
-			if (MipsRegLo(count) == x86Reg) {
-				if (x86Protected(x86Reg) == 0) {
-					UnMap_GPR(Section,count,1);
-					return 1;
-				}
-				break;
-			}
-		}
-	}
-	return 0;
-}
-
-void UnProtectGPR(BLOCK_SECTION * Section, uint32_t Reg) {
-	if (IsUnknown(Reg)) { return; }
-	if (IsConst(Reg)) { return; }
-	if (Is64Bit(Reg)) {
-		x86Protected(MipsRegHi(Reg)) = 0;
-	}
-	x86Protected(MipsRegLo(Reg)) = 0;
-}
-
-void UpdateCurrentHalfLine (void) {
-	if (Timers->Timer < 0) {
-		HalfLine = 0;
-		return;
-	}
-	HalfLine = (Timers->Timer / 1500);
-	HalfLine &= ~1;
-	HalfLine += ViFieldNumber;
-
-}
-
-void WriteBackRegisters (BLOCK_SECTION * Section) {
-	int32_t count;
-	uint32_t bEdiZero = 0;
-	uint32_t bEsiSign = 0;
-	/*** coming soon ***/
-	//uint32_t bEaxGprLo = 0;
-	//uint32_t bEbxGprHi = 0;
-
-	for (count = 1; count < 64; count ++) { x86Protected(count) = 0; }
-	for (count = 1; count < 64; count ++) { UnMap_X86reg (Section, count); }
-
-	/*************************************/
-
-	for (count = 1; count < 32; count ++) {
-		switch (MipsRegState(count)) {
-		case STATE_UNKNOWN: break;
-		case STATE_CONST_32:
-			if (!bEdiZero && (!MipsRegLo(count) || !(MipsRegLo(count) & 0x80000000))) {
-				XorX86RegToX86Reg(x86_EDI, x86_EDI);
-				bEdiZero = 1;
-			}
-			if (!bEsiSign && (MipsRegLo(count) & 0x80000000)) {
-				MoveConstToX86reg(0xFFFFFFFF, x86_ESI);
-				bEsiSign = 1;
-			}
-
-			if ((MipsRegLo(count) & 0x80000000) != 0) {
-				MoveX86regToVariable(x86_ESI,&GPR[count].UW[1]);
-			} else {
-				MoveX86regToVariable(x86_EDI,&GPR[count].UW[1]);
-			}
-
-			if (MipsRegLo(count) == 0) {
-				MoveX86regToVariable(x86_EDI,&GPR[count].UW[0]);
-			} else if (MipsRegLo(count) == 0xFFFFFFFF) {
-				MoveX86regToVariable(x86_ESI,&GPR[count].UW[0]);
-			} else
-				MoveConstToVariable(MipsRegLo(count),&GPR[count].UW[0]);
-
-			MipsRegState(count) = STATE_UNKNOWN;
-			break;
-		case STATE_CONST_64:
-			if (MipsRegLo(count) == 0 || MipsRegHi(count) == 0) {
-				XorX86RegToX86Reg(x86_EDI, x86_EDI);
-				bEdiZero = 1;
-			}
-			if (MipsRegLo(count) == 0xFFFFFFFF || MipsRegHi(count) == 0xFFFFFFFF) {
-				MoveConstToX86reg(0xFFFFFFFF, x86_ESI);
-				bEsiSign = 1;
-			}
-
-			if (MipsRegHi(count) == 0) {
-				MoveX86regToVariable(x86_EDI,&GPR[count].UW[1]);
-			} else if (MipsRegLo(count) == 0xFFFFFFFF) {
-				MoveX86regToVariable(x86_ESI,&GPR[count].UW[1]);
-			} else {
-				MoveConstToVariable(MipsRegHi(count),&GPR[count].UW[1]);
-			}
-
-			if (MipsRegLo(count) == 0) {
-				MoveX86regToVariable(x86_EDI,&GPR[count].UW[0]);
-			} else if (MipsRegLo(count) == 0xFFFFFFFF) {
-				MoveX86regToVariable(x86_ESI,&GPR[count].UW[0]);
-			} else {
-				MoveConstToVariable(MipsRegLo(count),&GPR[count].UW[0]);
-			}
-			MipsRegState(count) = STATE_UNKNOWN;
-			break;
-
-		}
-	}
-	UnMap_AllFPRs(Section);
-}
-

audacious-plugins-3.1.1.tar.bz2/src/usf/registers.h Deleted

@@ -1,403 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#ifndef REGISTERS_H
-#define REGISTERS_H
-
-#include "recompiler_cpu.h"
-#include "types.h"
-
-#define INDEX_REGISTER			CP0[0]
-#define RANDOM_REGISTER			CP0[1]
-#define ENTRYLO0_REGISTER		CP0[2]
-#define ENTRYLO1_REGISTER		CP0[3]
-#define CONTEXT_REGISTER		CP0[4]
-#define PAGE_MASK_REGISTER		CP0[5]
-#define WIRED_REGISTER			CP0[6]
-#define BAD_VADDR_REGISTER		CP0[8]
-#define COUNT_REGISTER			CP0[9]
-#define ENTRYHI_REGISTER		CP0[10]
-#define COMPARE_REGISTER		CP0[11]
-#define STATUS_REGISTER			CP0[12]
-#define CAUSE_REGISTER			CP0[13]
-#define EPC_REGISTER			CP0[14]
-#define CONFIG_REGISTER			CP0[16]
-#define TAGLO_REGISTER			CP0[28]
-#define TAGHI_REGISTER			CP0[29]
-#define ERROREPC_REGISTER		CP0[30]
-#define FAKE_CAUSE_REGISTER		CP0[32]
-
-#define COMPARE_REGISTER_NO		11
-#define STATUS_REGISTER_NO		12
-#define CAUSE_REGISTER_NO		13
-
-#define REVISION_REGISTER		FPCR[0]
-#define FSTATUS_REGISTER		FPCR[31]
-
-#define GPR_S0					GPR[16]
-#define GPR_S1					GPR[17]
-#define GPR_S2					GPR[18]
-#define GPR_S3					GPR[19]
-#define GPR_S4					GPR[20]
-#define GPR_S5					GPR[21]
-#define GPR_S6					GPR[22]
-#define GPR_S7					GPR[23]
-#define GPR_SP					GPR[29]
-#define GPR_RA					GPR[31]
-
-#define RDRAM_CONFIG_REG		RegRDRAM[0]
-#define RDRAM_DEVICE_TYPE_REG	RegRDRAM[0]
-#define RDRAM_DEVICE_ID_REG		RegRDRAM[1]
-#define RDRAM_DELAY_REG			RegRDRAM[2]
-#define RDRAM_MODE_REG			RegRDRAM[3]
-#define RDRAM_REF_INTERVAL_REG	RegRDRAM[4]
-#define RDRAM_REF_ROW_REG		RegRDRAM[5]
-#define RDRAM_RAS_INTERVAL_REG	RegRDRAM[6]
-#define RDRAM_MIN_INTERVAL_REG	RegRDRAM[7]
-#define RDRAM_ADDR_SELECT_REG	RegRDRAM[8]
-#define RDRAM_DEVICE_MANUF_REG	RegRDRAM[9]
-
-#define SP_MEM_ADDR_REG			RegSP[0]
-#define SP_DRAM_ADDR_REG		RegSP[1]
-#define SP_RD_LEN_REG			RegSP[2]
-#define SP_WR_LEN_REG			RegSP[3]
-#define SP_STATUS_REG			RegSP[4]
-#define SP_DMA_FULL_REG			RegSP[5]
-#define SP_DMA_BUSY_REG			RegSP[6]
-#define SP_SEMAPHORE_REG		RegSP[7]
-#define SP_PC_REG				RegSP[8]
-#define SP_IBIST_REG			RegSP[9]
-
-#define DPC_START_REG			RegDPC[0]
-#define DPC_END_REG				RegDPC[1]
-#define DPC_CURRENT_REG			RegDPC[2]
-#define DPC_STATUS_REG			RegDPC[3]
-#define DPC_CLOCK_REG			RegDPC[4]
-#define DPC_BUFBUSY_REG			RegDPC[5]
-#define DPC_PIPEBUSY_REG		RegDPC[6]
-#define DPC_TMEM_REG			RegDPC[7]
-
-#define MI_INIT_MODE_REG		RegMI[0]
-#define MI_MODE_REG				RegMI[0]
-#define MI_VERSION_REG			RegMI[1]
-#define MI_NOOP_REG				RegMI[1]
-#define MI_INTR_REG				RegMI[2]
-#define MI_INTR_MASK_REG		RegMI[3]
-
-#define VI_STATUS_REG			RegVI[0]
-#define VI_CONTROL_REG			RegVI[0]
-#define VI_ORIGIN_REG 			RegVI[1]
-#define VI_DRAM_ADDR_REG		RegVI[1]
-#define VI_WIDTH_REG 			RegVI[2]
-#define VI_H_WIDTH_REG 			RegVI[2]
-#define VI_INTR_REG  			RegVI[3]
-#define VI_V_INTR_REG 			RegVI[3]
-#define VI_CURRENT_REG 			RegVI[4]
-#define VI_V_CURRENT_LINE_REG	RegVI[4]
-#define VI_BURST_REG  			RegVI[5]
-#define VI_TIMING_REG 			RegVI[5]
-#define VI_V_SYNC_REG 			RegVI[6]
-#define VI_H_SYNC_REG 			RegVI[7]
-#define VI_LEAP_REG  			RegVI[8]
-#define VI_H_SYNC_LEAP_REG		RegVI[8]
-#define VI_H_START_REG 			RegVI[9]
-#define VI_H_VIDEO_REG			RegVI[9]
-#define VI_V_START_REG 			RegVI[10]
-#define VI_V_VIDEO_REG			RegVI[10]
-#define VI_V_BURST_REG			RegVI[11]
-#define VI_X_SCALE_REG			RegVI[12]
-#define VI_Y_SCALE_REG			RegVI[13]
-
-#define AI_DRAM_ADDR_REG		RegAI[0]
-#define AI_LEN_REG				RegAI[1]
-#define AI_CONTROL_REG			RegAI[2]
-#define AI_STATUS_REG			RegAI[3]
-#define AI_DACRATE_REG			RegAI[4]
-#define AI_BITRATE_REG			RegAI[5]
-
-#define PI_DRAM_ADDR_REG		RegPI[0]
-#define PI_CART_ADDR_REG		RegPI[1]
-#define PI_RD_LEN_REG			RegPI[2]
-#define PI_WR_LEN_REG			RegPI[3]
-#define PI_STATUS_REG			RegPI[4]
-#define PI_BSD_DOM1_LAT_REG 	RegPI[5]
-#define PI_DOMAIN1_REG		 	RegPI[5]
-#define PI_BSD_DOM1_PWD_REG	 	RegPI[6]
-#define PI_BSD_DOM1_PGS_REG	 	RegPI[7]
-#define PI_BSD_DOM1_RLS_REG	 	RegPI[8]
-#define PI_BSD_DOM2_LAT_REG	 	RegPI[9]
-#define PI_DOMAIN2_REG		 	RegPI[9]
-#define PI_BSD_DOM2_PWD_REG	 	RegPI[10]
-#define PI_BSD_DOM2_PGS_REG	 	RegPI[11]
-#define PI_BSD_DOM2_RLS_REG	 	RegPI[12]
-
-#define RI_MODE_REG				RegRI[0]
-#define RI_CONFIG_REG			RegRI[1]
-#define RI_CURRENT_LOAD_REG		RegRI[2]
-#define RI_SELECT_REG			RegRI[3]
-#define RI_COUNT_REG			RegRI[4]
-#define RI_REFRESH_REG			RegRI[4]
-#define RI_LATENCY_REG			RegRI[5]
-#define RI_RERROR_REG			RegRI[6]
-#define RI_WERROR_REG			RegRI[7]
-
-#define SI_DRAM_ADDR_REG		RegSI[0]
-#define SI_PIF_ADDR_RD64B_REG	RegSI[1]
-#define SI_PIF_ADDR_WR64B_REG	RegSI[2]
-#define SI_STATUS_REG			RegSI[3]
-
-#define STATUS_IE				0x00000001
-#define STATUS_EXL				0x00000002
-#define STATUS_ERL				0x00000004
-#define STATUS_IP0				0x00000100
-#define STATUS_IP1				0x00000200
-#define STATUS_IP2				0x00000400
-#define STATUS_IP3				0x00000800
-#define STATUS_IP4				0x00001000
-#define STATUS_IP5				0x00002000
-#define STATUS_IP6				0x00004000
-#define STATUS_IP7				0x00008000
-#define STATUS_BEV				0x00400000
-#define STATUS_FR				0x04000000
-#define STATUS_CU0				0x10000000
-#define STATUS_CU1				0x20000000
-
-#define CAUSE_EXC_CODE			0xFF
-#define CAUSE_IP0				0x100
-#define CAUSE_IP1				0x200
-#define CAUSE_IP2				0x400
-#define CAUSE_IP3				0x800
-#define CAUSE_IP4				0x1000
-#define CAUSE_IP5				0x2000
-#define CAUSE_IP6				0x4000
-#define CAUSE_IP7				0x8000
-#define CAUSE_BD				0x80000000
-
-#define SP_CLR_HALT				0x00001	    /* Bit  0: clear halt */
-#define SP_SET_HALT				0x00002	    /* Bit  1: set halt */
-#define SP_CLR_BROKE			0x00004	    /* Bit  2: clear broke */
-#define SP_CLR_INTR				0x00008	    /* Bit  3: clear intr */
-#define SP_SET_INTR				0x00010	    /* Bit  4: set intr */
-#define SP_CLR_SSTEP			0x00020	    /* Bit  5: clear sstep */
-#define SP_SET_SSTEP			0x00040	    /* Bit  6: set sstep */
-#define SP_CLR_INTR_BREAK		0x00080	    /* Bit  7: clear intr on break */
-#define SP_SET_INTR_BREAK		0x00100	    /* Bit  8: set intr on break */
-#define SP_CLR_SIG0				0x00200	    /* Bit  9: clear signal 0 */
-#define SP_SET_SIG0				0x00400	    /* Bit 10: set signal 0 */
-#define SP_CLR_SIG1				0x00800	    /* Bit 11: clear signal 1 */
-#define SP_SET_SIG1				0x01000	    /* Bit 12: set signal 1 */
-#define SP_CLR_SIG2				0x02000	    /* Bit 13: clear signal 2 */
-#define SP_SET_SIG2				0x04000	    /* Bit 14: set signal 2 */
-#define SP_CLR_SIG3				0x08000	    /* Bit 15: clear signal 3 */
-#define SP_SET_SIG3				0x10000	    /* Bit 16: set signal 3 */
-#define SP_CLR_SIG4				0x20000	    /* Bit 17: clear signal 4 */
-#define SP_SET_SIG4				0x40000	    /* Bit 18: set signal 4 */
-#define SP_CLR_SIG5				0x80000	    /* Bit 19: clear signal 5 */
-#define SP_SET_SIG5				0x100000	/* Bit 20: set signal 5 */
-#define SP_CLR_SIG6				0x200000	/* Bit 21: clear signal 6 */
-#define SP_SET_SIG6				0x400000	/* Bit 22: set signal 6 */
-#define SP_CLR_SIG7				0x800000	/* Bit 23: clear signal 7 */
-#define SP_SET_SIG7				0x1000000   /* Bit 24: set signal 7 */
-
-#define SP_STATUS_HALT			0x001		/* Bit  0: halt */
-#define SP_STATUS_BROKE			0x002		/* Bit  1: broke */
-#define SP_STATUS_DMA_BUSY		0x004		/* Bit  2: dma busy */
-#define SP_STATUS_DMA_FULL		0x008		/* Bit  3: dma full */
-#define SP_STATUS_IO_FULL		0x010		/* Bit  4: io full */
-#define SP_STATUS_SSTEP			0x020		/* Bit  5: single step */
-#define SP_STATUS_INTR_BREAK	0x040		/* Bit  6: interrupt on break */
-#define SP_STATUS_SIG0			0x080		/* Bit  7: signal 0 set */
-#define SP_STATUS_SIG1			0x100		/* Bit  8: signal 1 set */
-#define SP_STATUS_SIG2			0x200		/* Bit  9: signal 2 set */
-#define SP_STATUS_SIG3			0x400		/* Bit 10: signal 3 set */
-#define SP_STATUS_SIG4			0x800		/* Bit 11: signal 4 set */
-#define SP_STATUS_SIG5	       0x1000		/* Bit 12: signal 5 set */
-#define SP_STATUS_SIG6	       0x2000		/* Bit 13: signal 6 set */
-#define SP_STATUS_SIG7	       0x4000		/* Bit 14: signal 7 set */
-
-#define DPC_CLR_XBUS_DMEM_DMA	0x0001		/* Bit 0: clear xbus_dmem_dma */
-#define DPC_SET_XBUS_DMEM_DMA	0x0002		/* Bit 1: set xbus_dmem_dma */
-#define DPC_CLR_FREEZE			0x0004		/* Bit 2: clear freeze */
-#define DPC_SET_FREEZE			0x0008		/* Bit 3: set freeze */
-#define DPC_CLR_FLUSH			0x0010		/* Bit 4: clear flush */
-#define DPC_SET_FLUSH			0x0020		/* Bit 5: set flush */
-#define DPC_CLR_TMEM_CTR		0x0040		/* Bit 6: clear tmem ctr */
-#define DPC_CLR_PIPE_CTR		0x0080		/* Bit 7: clear pipe ctr */
-#define DPC_CLR_CMD_CTR			0x0100		/* Bit 8: clear cmd ctr */
-#define DPC_CLR_CLOCK_CTR		0x0200		/* Bit 9: clear clock ctr */
-
-#define DPC_STATUS_XBUS_DMEM_DMA	0x001	/* Bit  0: xbus_dmem_dma */
-#define DPC_STATUS_FREEZE			0x002	/* Bit  1: freeze */
-#define DPC_STATUS_FLUSH			0x004	/* Bit  2: flush */
-#define DPC_STATUS_START_GCLK		0x008	/* Bit  3: start gclk */
-#define DPC_STATUS_TMEM_BUSY		0x010	/* Bit  4: tmem busy */
-#define DPC_STATUS_PIPE_BUSY		0x020	/* Bit  5: pipe busy */
-#define DPC_STATUS_CMD_BUSY			0x040	/* Bit  6: cmd busy */
-#define DPC_STATUS_CBUF_READY		0x080	/* Bit  7: cbuf ready */
-#define DPC_STATUS_DMA_BUSY			0x100	/* Bit  8: dma busy */
-#define DPC_STATUS_END_VALID		0x200	/* Bit  9: end valid */
-#define DPC_STATUS_START_VALID		0x400	/* Bit 10: start valid */
-
-#define MI_CLR_INIT				0x0080		/* Bit  7: clear init mode */
-#define MI_SET_INIT				0x0100		/* Bit  8: set init mode */
-#define MI_CLR_EBUS				0x0200		/* Bit  9: clear ebus test */
-#define MI_SET_EBUS				0x0400		/* Bit 10: set ebus test mode */
-#define MI_CLR_DP_INTR			0x0800		/* Bit 11: clear dp interrupt */
-#define MI_CLR_RDRAM			0x1000		/* Bit 12: clear RDRAM reg */
-#define MI_SET_RDRAM			0x2000		/* Bit 13: set RDRAM reg mode */
-
-#define MI_MODE_INIT			0x0080		/* Bit  7: init mode */
-#define MI_MODE_EBUS			0x0100		/* Bit  8: ebus test mode */
-#define MI_MODE_RDRAM			0x0200		/* Bit  9: RDRAM reg mode */
-
-#define MI_INTR_MASK_CLR_SP		0x0001		/* Bit  0: clear SP mask */
-#define MI_INTR_MASK_SET_SP		0x0002		/* Bit  1: set SP mask */
-#define MI_INTR_MASK_CLR_SI		0x0004		/* Bit  2: clear SI mask */
-#define MI_INTR_MASK_SET_SI		0x0008		/* Bit  3: set SI mask */
-#define MI_INTR_MASK_CLR_AI		0x0010		/* Bit  4: clear AI mask */
-#define MI_INTR_MASK_SET_AI		0x0020		/* Bit  5: set AI mask */
-#define MI_INTR_MASK_CLR_VI		0x0040		/* Bit  6: clear VI mask */
-#define MI_INTR_MASK_SET_VI		0x0080		/* Bit  7: set VI mask */
-#define MI_INTR_MASK_CLR_PI		0x0100		/* Bit  8: clear PI mask */
-#define MI_INTR_MASK_SET_PI		0x0200		/* Bit  9: set PI mask */
-#define MI_INTR_MASK_CLR_DP		0x0400		/* Bit 10: clear DP mask */
-#define MI_INTR_MASK_SET_DP		0x0800		/* Bit 11: set DP mask */
-
-#define MI_INTR_MASK_SP			0x01		/* Bit 0: SP intr mask */
-#define MI_INTR_MASK_SI			0x02		/* Bit 1: SI intr mask */
-#define MI_INTR_MASK_AI			0x04		/* Bit 2: AI intr mask */
-#define MI_INTR_MASK_VI			0x08		/* Bit 3: VI intr mask */
-#define MI_INTR_MASK_PI			0x10		/* Bit 4: PI intr mask */
-#define MI_INTR_MASK_DP			0x20		/* Bit 5: DP intr mask */
-
-#define MI_INTR_SP				0x01		/* Bit 0: SP intr */
-#define MI_INTR_SI				0x02		/* Bit 1: SI intr */
-#define MI_INTR_AI				0x04		/* Bit 2: AI intr */
-#define MI_INTR_VI				0x08		/* Bit 3: VI intr */
-#define MI_INTR_PI				0x10		/* Bit 4: PI intr */
-#define MI_INTR_DP				0x20		/* Bit 5: DP intr */
-
-#define	PI_STATUS_DMA_BUSY		0x01
-#define	PI_STATUS_IO_BUSY		0x02
-#define	PI_STATUS_ERROR			0x04
-
-#define	PI_SET_RESET			0x01
-#define	PI_CLR_INTR				0x02
-
-#define	SI_STATUS_DMA_BUSY		0x0001
-#define	SI_STATUS_RD_BUSY		0x0002
-#define	SI_STATUS_DMA_ERROR		0x0008
-#define	SI_STATUS_INTERRUPT		0x1000
-
-#define FPCSR_FS				0x01000000	/* flush denorm to zero */
-#define	FPCSR_C					0x00800000	/* condition bit */
-#define	FPCSR_CE				0x00020000	/* cause: unimplemented operation */
-#define	FPCSR_CV				0x00010000	/* cause: invalid operation */
-#define	FPCSR_CZ				0x00008000	/* cause: division by zero */
-#define	FPCSR_CO				0x00004000	/* cause: overflow */
-#define	FPCSR_CU				0x00002000	/* cause: underflow */
-#define	FPCSR_CI				0x00001000	/* cause: inexact operation */
-#define	FPCSR_EV				0x00000800	/* enable: invalid operation */
-#define	FPCSR_EZ				0x00000400	/* enable: division by zero */
-#define	FPCSR_EO				0x00000200	/* enable: overflow */
-#define	FPCSR_EU				0x00000100	/* enable: underflow */
-#define	FPCSR_EI				0x00000080	/* enable: inexact operation */
-#define	FPCSR_FV				0x00000040	/* flag: invalid operation */
-#define	FPCSR_FZ				0x00000020	/* flag: division by zero */
-#define	FPCSR_FO				0x00000010	/* flag: overflow */
-#define	FPCSR_FU				0x00000008	/* flag: underflow */
-#define	FPCSR_FI				0x00000004	/* flag: inexact operation */
-#define	FPCSR_RM_MASK			0x00000003	/* rounding mode mask */
-#define	FPCSR_RM_RN				0x00000000	/* round to nearest */
-#define	FPCSR_RM_RZ				0x00000001	/* round to zero */
-#define	FPCSR_RM_RP				0x00000002	/* round to positive infinity */
-#define	FPCSR_RM_RM				0x00000003	/* round to negative infinity */
-
-#define FPR_Type(Reg)	(Reg) == R4300i_COP1_S ? "S" : (Reg) == R4300i_COP1_D ? "D" :\
-						(Reg) == R4300i_COP1_W ? "W" : "L"
-
-typedef struct {
-	uint32_t      PROGRAM_COUNTER;
-    MIPS_DWORD    GPR[32];
-	MIPS_DWORD    FPR[32];
-	uint32_t      CP0[33];
-	uint32_t      FPCR[32];
-	MIPS_DWORD	  HI;
-	MIPS_DWORD 	  LO;
-	uint32_t      RDRAM[10];
-	uint32_t      SP[10];
-	uint32_t      DPC[10];
-	uint32_t      MI[4];
-	uint32_t      VI[14];
-	uint32_t      AI[6];
-	uint32_t      PI[13];
-	uint32_t      RI[8];
-	uint32_t      SI[4];
-	int8_t       PIF_Ram[0x40];
-} N64_REGISTERS;
-
-
-extern uint32_t PROGRAM_COUNTER, * CP0,*FPCR,*RegRDRAM,*RegSP,*RegDPC,*RegMI,*RegVI,*RegAI,*RegPI,
-	*RegRI,*RegSI, HalfLine, RegModValue, ViFieldNumber, LLBit, LLAddr;
-extern void * FPRDoubleLocation[32], * FPRFloatLocation[32];
-extern MIPS_DWORD *GPR, *FPR, HI, LO;
-extern N64_REGISTERS * Registers;
-
-enum FPU_Format {
-	FPU_Unkown,FPU_Dword, FPU_Qword, FPU_Float, FPU_Double
-};
-
-enum FPU_RoundingModel {
-	RoundUnknown, RoundDefault, RoundTruncate, RoundNearest, RoundDown, RoundUp
-};
-
-void ChangeFPURegFormat       ( BLOCK_SECTION * Section, int32_t Reg, int32_t OldFormat, int32_t NewFormat, int32_t RoundingModel );
-void ChangeMiIntrMask         ( void );
-void ChangeMiModeReg          ( void );
-void ChangeSpStatus           ( void );
-void InitalizeR4300iRegisters ( void );
-uint32_t Is8BitReg                ( int32_t x86Reg);
-void Load_FPR_ToTop           ( BLOCK_SECTION * Section, int32_t Reg, int32_t RegToLoad, int32_t Format);
-void Map_GPR_32bit            ( BLOCK_SECTION * Section, int32_t Reg, uint32_t SignValue, int32_t MipsRegToLoad );
-void Map_GPR_64bit            ( BLOCK_SECTION * Section, int32_t Reg, int32_t MipsRegToLoad );
-int32_t  Map_TempReg              ( BLOCK_SECTION * Section, int32_t x86Reg, int32_t MipsReg, uint32_t LoadHiWord );
-uint32_t RegInStack               ( BLOCK_SECTION * Section, int32_t Reg, int32_t Format );
-void ProtectGPR               ( BLOCK_SECTION * Section, uint32_t Reg );
-void SetFpuLocations          ( void );
-int32_t  StackPosition            ( BLOCK_SECTION * Section, int32_t Reg );
-int UnMap_8BitTempReg (BLOCK_SECTION * Section);
-void UnMap_AllFPRs            ( BLOCK_SECTION * Section );
-void UnMap_FPR                ( BLOCK_SECTION * Section, int32_t Reg, int32_t WriteBackValue );
-void UnMap_GPR                ( BLOCK_SECTION * Section, uint32_t Reg, int32_t WriteBackValue );
-uint32_t UnMap_X86reg             ( BLOCK_SECTION * Section, uint32_t x86Reg );
-void UnProtectGPR             ( BLOCK_SECTION * Section, uint32_t Reg );
-void UpdateCurrentHalfLine    ( void );
-void WriteBackRegisters       ( BLOCK_SECTION * Section );
-
-
-void SetupRegisters(N64_REGISTERS * n64_Registers);
-
-#endif

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp.c Deleted

@@ -1,1066 +0,0 @@
-#include <stdlib.h>
-#include <stdint.h>
-#include "usf.h"
-#include "cpu.h"
-#include "memory.h"
-#include "audio.h"
-#include "rsp.h"
-#include "types.h"
-#include "main.h"
-
-#include "rsp_recompiler_cpu.h"
-
-
-
-uint32_t NoOfMaps, MapsCRC[MaxMaps], Table,ConditionalMove=0;
-uint8_t * RSPRecompCode = 0, * RSPRecompCodeSecondary, * RSPRecompPos, *RSPJumpTables;
-void ** RSPJumpTable;
-
-
-RSP_COMPILER Compiler;
-//REGISTER32 RSP_GPR[32], RSP_Flags[4];
-REGISTER32 *RSP_GPR, RSP_Flags[4];
-REGISTER * RSP_ACCUM;
-VECTOR * RSP_Vect;
-
-REGISTER EleSpec[32], Indx[32];
-RSPOPCODE RSPOpC;
-uint32_t *PrgCount = 0, RSPNextInstruction = 0;
-uint32_t RSP_NextInstruction = 0;
-REGISTER32 Recp, RecpResult, SQroot, SQrootResult;
-
-uint32_t RSP_NextInstruction, RSP_JumpTo;
-uint32_t RSP_Running = 0;
-int32_t RSP_Cpu = 0;
-
-
-void RSPReInitMemory()
-{
-
-	if(RSPRecompCode == NULL) {
-		printf("enough memory for RSP RSPRecompCode!");
-		return;
-	}
-
-	RSPRecompCodeSecondary = RSPRecompCode + RSP_RECOMPMEM_SIZE;
-
-
-	if( RSPJumpTables == NULL ) {
-		DisplayError("Not enough memory for Jump Table!");
-		return;
-	}
-
-	memset((uint8_t*)RSPJumpTables, 0, 0x2000 * MaxMaps);
-	memset((uint8_t*)RSPRecompCode, 0, 0x00400000);
-	memset((uint8_t*)RSPRecompCodeSecondary, 0, 0x00200000);
-
-
-	RSPJumpTable = (void **)RSPJumpTables;
-	RSPRecompPos = RSPRecompCode;
-	NoOfMaps = 0;
-}
-
-int32_t RSPAllocateMemory (void) {
-
-	RSPRecompCode=(uint8_t *) malloc_exec(RSP_RECOMPMEM_SIZE + RSP_SECRECOMPMEM_SIZE);
-	if(RSPRecompCode == NULL) {
-		DisplayError("Not enough memory for RSP RSPRecompCode!");
-		return 0;
-	}
-
-	RSPRecompCodeSecondary = RSPRecompCode + RSP_RECOMPMEM_SIZE;
-
-	RSPJumpTables = malloc(0x2000 * MaxMaps);
-
-	if( RSPJumpTables == NULL ) {
-		DisplayError("Not enough memory for Jump Table!");
-		return 0;
-	}
-
-	memset((uint8_t*)RSPJumpTables, 0, 0x2000 * MaxMaps);
-	memset((uint8_t*)RSPRecompCode, 0, 0x00400000);
-	memset((uint8_t*)RSPRecompCodeSecondary, 0, 0x00200000);
-
-	RSPJumpTable = (void **)RSPJumpTables;
-	RSPRecompPos = RSPRecompCode;
-	NoOfMaps = 0;
-	return 1;
-}
-
-FILE *qfil = 0;
-
-void real_run_rsp(uint32_t cycles)
-{
-//replace with interpreter
-if(RSP_Cpu) {
-	RSP_Running = 1;
-
- while(RSP_Running) {
- 	// int32_t last = -1, count = 0, el, del;
- RSP_LW_IMEM(*PrgCount, &RSPOpC.Hex);
-
- /*if(*PrgCount == 0x100) {
-		int32_t i= 0;
-			FILE *fil4 = fopen("sc2000i.dmem","wb");
-			for(i = 0; i < 0x2000;i+=4) {
-				uint32_t dat = 0;
-				dat = *(int32_t*)(DMEM + i);
-				DoBswap(&dat);
-				fwrite(&dat,1,4,fil4);
-			}
-			fclose(fil4);
- 	printf("RSP: %x\n", RSP_GPR[26].UW);
-// Int3();
-//			RSPBreakPoint();
-		}*/
-/*
-			if(!qfil) qfil = fopen("rsplogi.log","wb");
-	fprintf(qfil,"PC = %08x ", *PrgCount);
-			fprintf(qfil,"r0=%08x at=%08x v0=%08x v1=%08x a0=%08x a1=%08x a2=%08x a3=%08x t0=%08x t1=%08x t2=%08x t3=%08x t4=%08x t5=%08x t6=%08x t7=%08x s0=%08x s1=%08x s2=%08x s3=%08x s4=%08x s5=%08x s6=%08x s7=%08x t8=%08x t9=%08x k0=%08x k1=%08x gp=%08x sp=%08x s8=%08x ra=%08x\n",
-				RSP_GPR[0].UW,RSP_GPR[1].UW,RSP_GPR[2].UW,RSP_GPR[3].UW,
-			RSP_GPR[4].UW,RSP_GPR[5].UW,RSP_GPR[6].UW,RSP_GPR[7].UW,
-			RSP_GPR[8].UW,RSP_GPR[9].UW,RSP_GPR[10].UW,RSP_GPR[11].UW,RSP_GPR[12].UW,
-			RSP_GPR[13].UW,RSP_GPR[14].UW,RSP_GPR[15].UW,RSP_GPR[16].UW,
-			RSP_GPR[17].UW,RSP_GPR[18].UW,RSP_GPR[19].UW,RSP_GPR[20].UW,
-			RSP_GPR[21].UW,RSP_GPR[22].UW,RSP_GPR[23].UW,RSP_GPR[24].UW,
-			RSP_GPR[25].UW,RSP_GPR[26].UW,RSP_GPR[27].UW,RSP_GPR[28].UW,
-			RSP_GPR[29].UW,RSP_GPR[30].UW,RSP_GPR[31].UW);
-*/
- /*if((RSPOpC.op == 18) && (RSPOpC.rs & 0x10)) {
-			for (count = 0; count < 8; count ++ ) {
-				el = Indx[RSPOpC.rs].B[count];
-				del = EleSpec[RSPOpC.rs].B[el];
-				if((last >= 0) && (last != del))
-					printf("not same!\t%d\n", RSPOpC.funct);
- // 16,19,20,22
- // funct: 0,16,6,14,44,15,7
-				last = del;
-			}
- }*/
-
- //if(RSPOpC.rs < 0x10) printf("%d\n", RSPOpC.rs);
-
- (RSP_Opcode[ RSPOpC.op ])();
-
- switch (RSP_NextInstruction) {
- case NORMAL:
- *PrgCount = (*PrgCount + 4) & 0xFFC;
- break;
- case DELAY_SLOT:
- RSP_NextInstruction = JUMP;
- *PrgCount = (*PrgCount + 4) & 0xFFC;
- break;
- case JUMP:
- RSP_NextInstruction = NORMAL;
-
- *PrgCount = RSP_JumpTo;
- break;
- }
-
- }
-
- *PrgCount -= 4;
-
- return;
-
- } else {
- 	RunRecompilerCPU(cycles);
- }
-
-}
-
-void RSP_SP_DMA_READ (void) {
-	uint32_t i, j, Length, Skip, Count;
-	uint8_t *Dest, *Source;
-
-	SP_DRAM_ADDR_REG &= 0x00FFFFFF;
-
-	if (SP_DRAM_ADDR_REG > 0x800000) {
-		printf("SP DMA READ\nSP_DRAM_ADDR_REG not in RDRam space");
-		return;
-	}
-
-	if ((SP_RD_LEN_REG & 0xFFF) + 1 + (SP_MEM_ADDR_REG & 0xFFF) > 0x1000) {
-		printf("SP DMA READ\ncould not fit copy in memory segement\nSP_RD_LEN_REG=%08x\nSP_MEM_ADDR_REG=%08x",SP_RD_LEN_REG,SP_MEM_ADDR_REG);
-		return;
-	}
-
-	Length = ((SP_RD_LEN_REG & 0xFFF) | 7) + 1;
-	Skip = (SP_RD_LEN_REG >> 20) + Length;
-	Count = ((SP_RD_LEN_REG >> 12) & 0xFF) + 1;
-
-	if ((SP_MEM_ADDR_REG & 0x1000) != 0) {
-		Dest = IMEM + ((SP_MEM_ADDR_REG & 0x0FFF) & ~7);
-	} else {
-		Dest = DMEM + ((SP_MEM_ADDR_REG & 0x0FFF) & ~7);
-	}
-	Source = RDRAM + (SP_DRAM_ADDR_REG & ~7);
-
-#if defined(RSP_SAFE_DMA)
-	for (j = 0 ; j < Count; j++) {
-		for (i = 0 ; i < Length; i++) {
-			*(uint8_t *)(((uint32_t)Dest + j * Length + i) ^ 3) = *(uint8_t *)(((uint32_t)Source + j * Skip + i) ^ 3);
-		}
-	}
-#else
-	if ((Skip & 0x3) == 0) {
-		for (j = 0; j < Count; j++) {
-			memcpy(Dest, Source, Length);
-			Source += Skip;
-			Dest += Length;
-		}
-	} else {
-		for (j = 0 ; j < Count; j++) {
-			for (i = 0 ; i < Length; i++) {
-				*(uint8_t *)(((uint32_t)Dest + i) ^ 3) = *(uint8_t *)(((uint32_t)Source + i) ^ 3);
-			}
-			Source += Skip;
-			Dest += Length;
-		}
-	}
-#endif
-	if ((!RSP_Cpu) && ((SP_MEM_ADDR_REG & 0x1000) != 0)) {
-		RSPSetJumpTable();
-	}
-
-
-
-	SP_DMA_BUSY_REG = 0;
-	SP_STATUS_REG &= ~SP_STATUS_DMA_BUSY;
-}
-
-void RSP_SP_DMA_WRITE (void) {
-	uint32_t i, j, Length, Skip, Count;
-	uint8_t *Dest, *Source;
-
-	SP_DRAM_ADDR_REG &= 0x00FFFFFF;
-
-	if (SP_DRAM_ADDR_REG > 0x800000) {
-		printf("SP DMA WRITE\nSP_DRAM_ADDR_REG not in RDRam space");
-		return;
-	}
-
-	if ((SP_WR_LEN_REG & 0xFFF) + 1 + (SP_MEM_ADDR_REG & 0xFFF) > 0x1000) {
-		printf("SP DMA READ\ncould not fit copy in memory segement\nSP_WR_LEN_REG=%08x\nSP_MEM_ADDR_REG=%08x",SP_WR_LEN_REG,SP_MEM_ADDR_REG);
-		return;
-	}
-
-	Length = ((SP_WR_LEN_REG & 0xFFF) | 7) + 1;
-	Skip = (SP_WR_LEN_REG >> 20) + Length;
-	Count = ((SP_WR_LEN_REG >> 12) & 0xFF) + 1;
-	Dest = RDRAM + (SP_DRAM_ADDR_REG & ~7);
-	Source = DMEM + ((SP_MEM_ADDR_REG & 0x1FFF) & ~7);
-
-#if defined(RSP_SAFE_DMA)
-	for (j = 0 ; j < Count; j++) {
-		for (i = 0 ; i < Length; i++) {
-			*(uint8_t *)(((uint32_t)Dest + j * Skip + i) ^ 3) = *(uint8_t *)(((uint32_t)Source + j * Length + i) ^ 3);
-		}
-	}
-#else
-	if ((Skip & 0x3) == 0) {
-		for (j = 0; j < Count; j++) {
-			memcpy(Dest, Source, Length);
-			Source += Length;
-			Dest += Skip;
-		}
-	} else {
-		for (j = 0 ; j < Count; j++) {
-			for (i = 0 ; i < Length; i++) {
-				*(uint8_t *)(((uint32_t)Dest + i) ^ 3) = *(uint8_t *)(((uint32_t)Source + i) ^ 3);
-			}
-			Source += Length;
-			Dest += Skip;
-		}
-	}
-#endif
-	SP_DMA_BUSY_REG = 0;
-	SP_STATUS_REG &= ~SP_STATUS_DMA_BUSY;
-}
-
-void RSP_LB_DMEM ( uint32_t Addr, uint8_t * Value ) {
-	* Value = *(uint8_t *)(DMEM + ((Addr ^ 3) & 0xFFF)) ;
-}
-
-void RSP_LBV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	RSP_Vect[vect].B[15 - element] = *(DMEM + ((Addr ^ 3) & 0xFFF));
-}
-
-void RSP_LDV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t length, Count;
-
-	length = 8;
-	if (length > 16 - element) {
-		length = 16 - element;
-	}
-	for (Count = element; Count < (length + element); Count ++ ){
-		RSP_Vect[vect].B[15 - Count] = *(DMEM + ((Addr ^ 3) & 0xFFF));
-		Addr += 1;
-	}
-
-}
-
-void RSP_LFV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t length, count;
-	VECTOR Temp;
-
-	length = 8;
-	if (length > 16 - element) {
-		length = 16 - element;
-	}
-
-	Temp.HW[7] = *(DMEM + (((Addr + element) ^3) & 0xFFF)) << 7;
-	Temp.HW[6] = *(DMEM + (((Addr + ((0x4 - element) ^ 3) & 0xf)) & 0xFFF)) << 7;
-	Temp.HW[5] = *(DMEM + (((Addr + ((0x8 - element) ^ 3) & 0xf)) & 0xFFF)) << 7;
-	Temp.HW[4] = *(DMEM + (((Addr + ((0xC - element) ^ 3) & 0xf)) & 0xFFF)) << 7;
-	Temp.HW[3] = *(DMEM + (((Addr + ((0x8 - element) ^ 3) & 0xf)) & 0xFFF)) << 7;
-	Temp.HW[2] = *(DMEM + (((Addr + ((0xC - element) ^ 3) & 0xf)) & 0xFFF)) << 7;
-	Temp.HW[1] = *(DMEM + (((Addr + ((0x10 - element) ^ 3) & 0xf)) & 0xFFF)) << 7;
-	Temp.HW[0] = *(DMEM + (((Addr + ((0x4 - element) ^ 3) & 0xf)) & 0xFFF)) << 7;
-
-	for (count = element; count < (length + element); count ++ ){
-		RSP_Vect[vect].B[15 - count] = Temp.B[15 - count];
-	}
-}
-
-void RSP_LH_DMEM ( uint32_t Addr, uint16_t * Value ) {
-	if ((Addr & 0x1) != 0) {
-		if (Addr > 0xFFE) {
-			printf("hmmmm.... Problem with:\nRSP_LH_DMEM");
-			return;
-		}
-		Addr &= 0xFFF;
-		*Value = *(uint8_t *)(DMEM + (Addr^ 3)) << 8;
-		*Value += *(uint8_t *)(DMEM + ((Addr + 1)^ 3));
-		return;
-	}
-	* Value = *(uint16_t *)(DMEM + ((Addr ^ 2 ) & 0xFFF));
-
-}
-
-void RSP_LHV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	RSP_Vect[vect].HW[7] = *(DMEM + ((Addr + ((0x10 - element) & 0xF) ^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[6] = *(DMEM + ((Addr + ((0x10 - element + 2) & 0xF) ^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[5] = *(DMEM + ((Addr + ((0x10 - element + 4) & 0xF) ^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[4] = *(DMEM + ((Addr + ((0x10 - element + 6) & 0xF) ^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[3] = *(DMEM + ((Addr + ((0x10 - element + 8) & 0xF) ^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[2] = *(DMEM + ((Addr + ((0x10 - element + 10) & 0xF) ^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[1] = *(DMEM + ((Addr + ((0x10 - element + 12) & 0xF) ^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[0] = *(DMEM + ((Addr + ((0x10 - element + 14) & 0xF) ^3) & 0xFFF)) << 7;
-}
-
-void RSP_LLV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t length, Count;
-
-	length = 4;
-	if (length > 16 - element) {
-		length = 16 - element;
-	}
-	for (Count = element; Count < (length + element); Count ++ ){
-		RSP_Vect[vect].B[15 - Count] = *(DMEM + ((Addr ^ 3) & 0xFFF));
-		Addr += 1;
-	}
-
-}
-
-void RSP_LPV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	RSP_Vect[vect].HW[7] = *(DMEM + ((Addr + ((0x10 - element) & 0xF)^3) & 0xFFF)) << 8;
-	RSP_Vect[vect].HW[6] = *(DMEM + ((Addr + ((0x10 - element + 1) & 0xF)^3) & 0xFFF)) << 8;
-	RSP_Vect[vect].HW[5] = *(DMEM + ((Addr + ((0x10 - element + 2) & 0xF)^3) & 0xFFF)) << 8;
-	RSP_Vect[vect].HW[4] = *(DMEM + ((Addr + ((0x10 - element + 3) & 0xF)^3) & 0xFFF)) << 8;
-	RSP_Vect[vect].HW[3] = *(DMEM + ((Addr + ((0x10 - element + 4) & 0xF)^3) & 0xFFF)) << 8;
-	RSP_Vect[vect].HW[2] = *(DMEM + ((Addr + ((0x10 - element + 5) & 0xF)^3) & 0xFFF)) << 8;
-	RSP_Vect[vect].HW[1] = *(DMEM + ((Addr + ((0x10 - element + 6) & 0xF)^3) & 0xFFF)) << 8;
-	RSP_Vect[vect].HW[0] = *(DMEM + ((Addr + ((0x10 - element + 7) & 0xF)^3) & 0xFFF)) << 8;
-}
-
-void RSP_LRV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t length, Count, offset;
-
-	offset = (Addr & 0xF) - 1;
-	length = (Addr & 0xF) - element;
-	Addr &= 0xFF0;
-	for (Count = element; Count < (length + element); Count ++ ){
-		RSP_Vect[vect].B[offset - Count] = *(DMEM + ((Addr ^ 3) & 0xFFF));
-		Addr += 1;
-	}
-
-}
-
-void RSP_LQV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t length, Count;
-
-	length = ((Addr + 0x10) & ~0xF) - Addr;
-	if (length > 16 - element) {
-		length = 16 - element;
-	}
-	for (Count = element; Count < (length + element); Count ++ ){
-		RSP_Vect[vect].B[15 - Count] = *(DMEM + ((Addr ^ 3) & 0xFFF));
-		Addr += 1;
-	}
-
-}
-
-void RSP_LSV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t length, Count;
-
-	length = 2;
-	if (length > 16 - element) {
-		length = 16 - element;
-	}
-	for (Count = element; Count < (length + element); Count ++ ){
-		RSP_Vect[vect].B[15 - Count] = *(DMEM + ((Addr ^ 3) & 0xFFF));
-		Addr += 1;
-	}
-}
-
-void RSP_LTV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t del, count, length;
-
-	length = 8;
-	if (length > 32 - vect) {
-		length = 32 - vect;
-	}
-
-	Addr = ((Addr + 8) & 0xFF0) + (element & 0x1);
-	for (count = 0; count < length; count ++) {
-		del = ((8 - (element >> 1) + count) << 1) & 0xF;
-		RSP_Vect[vect + count].B[15 - del] = *(DMEM + (Addr ^ 3));
-		RSP_Vect[vect + count].B[14 - del] = *(DMEM + ((Addr + 1) ^ 3));
-		Addr += 2;
-	}
-}
-
-void RSP_LUV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	RSP_Vect[vect].HW[7] = *(DMEM + ((Addr + ((0x10 - element) & 0xF)^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[6] = *(DMEM + ((Addr + ((0x10 - element + 1) & 0xF)^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[5] = *(DMEM + ((Addr + ((0x10 - element + 2) & 0xF)^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[4] = *(DMEM + ((Addr + ((0x10 - element + 3) & 0xF)^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[3] = *(DMEM + ((Addr + ((0x10 - element + 4) & 0xF)^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[2] = *(DMEM + ((Addr + ((0x10 - element + 5) & 0xF)^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[1] = *(DMEM + ((Addr + ((0x10 - element + 6) & 0xF)^3) & 0xFFF)) << 7;
-	RSP_Vect[vect].HW[0] = *(DMEM + ((Addr + ((0x10 - element + 7) & 0xF)^3) & 0xFFF)) << 7;
-}
-
-void RSP_LW_DMEM ( uint32_t Addr, uint32_t * Value ) {
-	if ((Addr & 0x3) != 0) {
-		Addr &= 0xFFF;
-		if (Addr > 0xFFC) {
-			printf("hmmmm.... Problem with:\nRSP_LW_DMEM");
-			return;
-		}
-		*Value = *(uint8_t *)(DMEM + (Addr^ 3)) << 0x18;
-		*Value += *(uint8_t *)(DMEM + ((Addr + 1)^ 3)) << 0x10;
-		*Value += *(uint8_t *)(DMEM + ((Addr + 2)^ 3)) << 8;
-		*Value += *(uint8_t *)(DMEM + ((Addr + 3)^ 3));
-		return;
-	}
-	* Value = *(uint32_t *)(DMEM + (Addr & 0xFFF));
-}
-
-void RSP_LW_IMEM ( uint32_t Addr, uint32_t * Value ) {
-	if ((Addr & 0x3) != 0) {
-		printf("Unaligned RSP_LW_IMEM");
-	}
-	* Value = *(uint32_t *)(IMEM + (Addr & 0xFFF));
-}
-
-void RSP_SB_DMEM ( uint32_t Addr, uint8_t Value ) {
-	*(uint8_t *)(DMEM + ((Addr ^ 3) & 0xFFF)) = Value;
-}
-
-void RSP_SBV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	*(DMEM + ((Addr ^ 3) & 0xFFF)) = RSP_Vect[vect].B[15 - element];
-}
-
-void RSP_SDV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t Count;
-
-	for (Count = element; Count < (8 + element); Count ++ ){
-		*(DMEM + ((Addr ^ 3) & 0xFFF)) = RSP_Vect[vect].B[15 - (Count & 0xF)];
-		Addr += 1;
-	}
-}
-
-void RSP_SFV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t offset = Addr & 0xF;
-	Addr &= 0xFF0;
-
-	switch (element) {
-	case 0:
-		*(DMEM + ((Addr + offset)^3)) = RSP_Vect[vect].UHW[7] >> 7;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = RSP_Vect[vect].UHW[6] >> 7;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = RSP_Vect[vect].UHW[5] >> 7;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = RSP_Vect[vect].UHW[4] >> 7;
-		break;
-	case 1:
-		*(DMEM + ((Addr + offset)^3)) = RSP_Vect[vect].UHW[1] >> 7;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = RSP_Vect[vect].UHW[0] >> 7;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = RSP_Vect[vect].UHW[3] >> 7;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = RSP_Vect[vect].UHW[2] >> 7;
-		break;
-	case 2:
-		*(DMEM + ((Addr + offset)^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = 0;
-		break;
-	case 3:
-		*(DMEM + ((Addr + offset)^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF)^3))) = 0;
-		break;
-	case 4:
-		*(DMEM + ((Addr + offset)^3)) = RSP_Vect[vect].UHW[6] >> 7;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = RSP_Vect[vect].UHW[5] >> 7;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = RSP_Vect[vect].UHW[4] >> 7;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = RSP_Vect[vect].UHW[7] >> 7;
-		break;
-	case 5:
-		*(DMEM + ((Addr + offset)^3)) = RSP_Vect[vect].UHW[0] >> 7;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = RSP_Vect[vect].UHW[3] >> 7;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = RSP_Vect[vect].UHW[2] >> 7;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = RSP_Vect[vect].UHW[1] >> 7;
-		break;
-	case 6:
-		*(DMEM + ((Addr + offset)^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = 0;
-		break;
-	case 7:
-		*(DMEM + ((Addr + offset)^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = 0;
-		break;
-	case 8:
-		*(DMEM + ((Addr + offset)^3)) = RSP_Vect[vect].UHW[3] >> 7;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = RSP_Vect[vect].UHW[2] >> 7;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = RSP_Vect[vect].UHW[1] >> 7;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = RSP_Vect[vect].UHW[0] >> 7;
-		break;
-	case 9:
-		*(DMEM + ((Addr + offset)^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = 0;
-		break;
-	case 10:
-		*(DMEM + ((Addr + offset)^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = 0;
-		break;
-	case 11:
-		*(DMEM + ((Addr + offset)^3)) = RSP_Vect[vect].UHW[4] >> 7;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = RSP_Vect[vect].UHW[7] >> 7;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = RSP_Vect[vect].UHW[6] >> 7;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = RSP_Vect[vect].UHW[5] >> 7;
-		break;
-	case 12:
-		*(DMEM + ((Addr + offset)^3)) = RSP_Vect[vect].UHW[2] >> 7;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = RSP_Vect[vect].UHW[1] >> 7;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = RSP_Vect[vect].UHW[0] >> 7;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = RSP_Vect[vect].UHW[3] >> 7;
-		break;
-	case 13:
-		*(DMEM + ((Addr + offset)^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = 0;
-		break;
-	case 14:
-		*(DMEM + ((Addr + offset)^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = 0;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = 0;
-		break;
-	case 15:
-		*(DMEM + ((Addr + offset)^3)) = RSP_Vect[vect].UHW[7] >> 7;
-		*(DMEM + ((Addr + ((offset + 4) & 0xF))^3)) = RSP_Vect[vect].UHW[6] >> 7;
-		*(DMEM + ((Addr + ((offset + 8) & 0xF))^3)) = RSP_Vect[vect].UHW[5] >> 7;
-		*(DMEM + ((Addr + ((offset + 12) & 0xF))^3)) = RSP_Vect[vect].UHW[4] >> 7;
-		break;
-	}
-}
-
-void RSP_SH_DMEM ( uint32_t Addr, uint16_t Value ) {
-	if ((Addr & 0x1) != 0) {
-		printf("Unaligned RSP_SH_DMEM");
-		return;
-	}
-	*(uint16_t *)(DMEM + ((Addr ^ 2) & 0xFFF)) = Value;
-}
-
-void RSP_SHV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	*(DMEM + ((Addr^3) & 0xFFF)) = (RSP_Vect[vect].UB[(15 - element) & 0xF] << 1) +
-		(RSP_Vect[vect].UB[(14 - element) & 0xF] >> 7);
-	*(DMEM + (((Addr + 2)^3) & 0xFFF)) = (RSP_Vect[vect].UB[(13 - element) & 0xF] << 1) +
-		(RSP_Vect[vect].UB[(12 - element) & 0xF] >> 7);
-	*(DMEM + (((Addr + 4)^3) & 0xFFF)) = (RSP_Vect[vect].UB[(11 - element) & 0xF] << 1) +
-		(RSP_Vect[vect].UB[(10 - element) & 0xF] >> 7);
-	*(DMEM + (((Addr + 6)^3) & 0xFFF)) = (RSP_Vect[vect].UB[(9 - element) & 0xF] << 1) +
-		(RSP_Vect[vect].UB[(8 - element) & 0xF] >> 7);
-	*(DMEM + (((Addr + 8)^3) & 0xFFF)) = (RSP_Vect[vect].UB[(7 - element) & 0xF] << 1) +
-		(RSP_Vect[vect].UB[(6 - element) & 0xF] >> 7);
-	*(DMEM + (((Addr + 10)^3) & 0xFFF)) = (RSP_Vect[vect].UB[(5 - element) & 0xF] << 1) +
-		(RSP_Vect[vect].UB[(4 - element) & 0xF] >> 7);
-	*(DMEM + (((Addr + 12)^3) & 0xFFF)) = (RSP_Vect[vect].UB[(3 - element) & 0xF] << 1) +
-		(RSP_Vect[vect].UB[(2 - element) & 0xF] >> 7);
-	*(DMEM + (((Addr + 14)^3) & 0xFFF)) = (RSP_Vect[vect].UB[(1 - element) & 0xF] << 1) +
-		(RSP_Vect[vect].UB[(0 - element) & 0xF] >> 7);
-}
-
-void RSP_SLV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t Count;
-
-	for (Count = element; Count < (4 + element); Count ++ ){
-		*(DMEM + ((Addr ^3) & 0xFFF)) = RSP_Vect[vect].B[15 - (Count & 0xF)];
-		Addr += 1;
-	}
-}
-
-void RSP_SPV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t Count;
-
-	for (Count = element; Count < (8 + element); Count ++ ){
-		if (((Count) & 0xF) < 8) {
-			*(DMEM + ((Addr ^ 3) & 0xFFF)) = RSP_Vect[vect].UB[15 - ((Count & 0xF) << 1)];
-		} else {
-			*(DMEM + ((Addr ^ 3) & 0xFFF)) = (RSP_Vect[vect].UB[15 - ((Count & 0x7) << 1)] << 1) +
-				(RSP_Vect[vect].UB[14 - ((Count & 0x7) << 1)] >> 7);
-		}
-		Addr += 1;
-	}
-}
-
-void RSP_SQV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t length, Count;
-
-	length = ((Addr + 0x10) & ~0xF) - Addr;
-	for (Count = element; Count < (length + element); Count ++ ){
-		*(DMEM + ((Addr ^ 3) & 0xFFF)) = RSP_Vect[vect].B[15 - (Count & 0xF)];
-		Addr += 1;
-	}
-}
-
-void RSP_SRV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t length, Count, offset;
-
-	length = (Addr & 0xF);
-	offset = (0x10 - length) & 0xF;
-	Addr &= 0xFF0;
-	for (Count = element; Count < (length + element); Count ++ ){
-		*(DMEM + ((Addr ^ 3) & 0xFFF)) = RSP_Vect[vect].B[15 - ((Count + offset) & 0xF)];
-		Addr += 1;
-	}
-}
-
-void RSP_SSV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t Count;
-
-	for (Count = element; Count < (2 + element); Count ++ ){
-		*(DMEM + ((Addr ^ 3) & 0xFFF)) = RSP_Vect[vect].B[15 - (Count & 0xF)];
-		Addr += 1;
-	}
-}
-
-void RSP_STV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t del, count, length;
-
-	length = 8;
-	if (length > 32 - vect) {
-		length = 32 - vect;
-	}
-	length = length << 1;
-	del = element >> 1;
-	for (count = 0; count < length; count += 2) {
-		*(DMEM + ((Addr ^ 3) & 0xFFF)) = RSP_Vect[vect + del].UB[15 - count];
-		*(DMEM + (((Addr + 1) ^ 3) & 0xFFF)) = RSP_Vect[vect + del].UB[14 - count];
-		del = (del + 1) & 7;
-		Addr += 2;
-	}
-}
-
-void RSP_SUV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t Count;
-
-	for (Count = element; Count < (8 + element); Count ++ ){
-		if (((Count) & 0xF) < 8) {
-			*(DMEM + ((Addr ^ 3) & 0xFFF)) = (RSP_Vect[vect].UB[15 - ((Count & 0x7) << 1)] << 1) +
-				(RSP_Vect[vect].UB[14 - ((Count & 0x7) << 1)] >> 7);
-		} else {
-			*(DMEM + ((Addr ^ 3) & 0xFFF)) = RSP_Vect[vect].UB[15 - ((Count & 0x7) << 1)];
-		}
-		Addr += 1;
-	}
-}
-
-void RSP_SW_DMEM ( uint32_t Addr, uint32_t Value ) {
-	Addr &= 0xFFF;
-
-	if ((Addr & 0x3) != 0) {
-		if (Addr > 0xFFC) {
-			printf("hmmmm.... Problem with:\nRSP_SW_DMEM");
-			return;
-		}
-		*(uint8_t *)(DMEM + (Addr ^ 3)) = (uint8_t)(Value >> 0x18);
-		*(uint8_t *)(DMEM + ((Addr + 1) ^ 3)) = (uint8_t)(Value >> 0x10);
-		*(uint8_t *)(DMEM + ((Addr + 2) ^ 3)) = (uint8_t)(Value >> 0x8);
-		*(uint8_t *)(DMEM + ((Addr + 3) ^ 3)) = (uint8_t)(Value);
-		return;
-	}
-	*(uint32_t *)(DMEM + Addr) = Value;
-}
-
-void RSP_SWV_DMEM ( uint32_t Addr, int32_t vect, int32_t element ) {
-	int32_t Count, offset;
-
-	offset = Addr & 0xF;
-	Addr &= 0xFF0;
-	for (Count = element; Count < (16 + element); Count ++ ){
-		*(DMEM + ((Addr + (offset & 0xF)) ^ 3)) = RSP_Vect[vect].B[15 - (Count & 0xF)];
-		offset += 1;
-	}
-}
-
-int runcount = 0;
-
-int32_t init_rsp(void)
-{
-
-
-	int32_t i = 0, CpuFeatures = 0;
-	runcount++;
-
-	RSP_Running = 0;
-
-
-	NoOfMaps = 0;
-	Table = 0;
-	ConditionalMove = 0;
-
-
-	RSP_NextInstruction = 0;
-	RSP_JumpTo = 0;
-
-	dwBuffer = MainBuffer;
-
-	pLastSecondary == NULL;
-	pLastPrimary = NULL;
-	RSPBlockID = 1;
-
-	memset(RSP_GPR,0,sizeof(RSP_GPR));
-	memset(RSP_Vect,0,sizeof(RSP_Vect));
-	memset(RSP_ACCUM,0,sizeof(RSP_ACCUM));
-	memset(RSP_Flags,0,sizeof(RSP_Flags));
-
-	for(i = 0; i < 64; i++) {
-		RSP_Opcode[i]= rsp_UnknownOpcode;
-		RSP_RegImm[i>>1]= rsp_UnknownOpcode;
-		RSP_Special[i]= rsp_UnknownOpcode;
-		RSP_Cop0[i>>1]= rsp_UnknownOpcode;
-		RSP_Cop2[i>>1]= rsp_UnknownOpcode;
-		RSP_Vector[i] = rsp_UnknownOpcode;
-		RSP_Lc2[i>>1] = rsp_UnknownOpcode;
-		RSP_Sc2[i>>1] = rsp_UnknownOpcode;
-	}
-
-
-	RSP_Opcode[ 0] = RSP_Opcode_SPECIAL;
- RSP_Opcode[ 1] = RSP_Opcode_REGIMM;
- RSP_Opcode[ 2] = RSP_Opcode_J;
- RSP_Opcode[ 3] = RSP_Opcode_JAL;
- RSP_Opcode[ 4] = RSP_Opcode_BEQ;
- RSP_Opcode[ 5] = RSP_Opcode_BNE;
- RSP_Opcode[ 6] = RSP_Opcode_BLEZ;
- RSP_Opcode[ 7] = RSP_Opcode_BGTZ;
- RSP_Opcode[ 8] = RSP_Opcode_ADDI;
- RSP_Opcode[ 9] = RSP_Opcode_ADDIU;
- RSP_Opcode[10] = RSP_Opcode_SLTI;
- RSP_Opcode[11] = RSP_Opcode_SLTIU;
- RSP_Opcode[12] = RSP_Opcode_ANDI;
- RSP_Opcode[13] = RSP_Opcode_ORI;
- RSP_Opcode[14] = RSP_Opcode_XORI;
- RSP_Opcode[15] = RSP_Opcode_LUI;
- RSP_Opcode[16] = RSP_Opcode_COP0;
- RSP_Opcode[18] = RSP_Opcode_COP2;
- RSP_Opcode[32] = RSP_Opcode_LB;
- RSP_Opcode[33] = RSP_Opcode_LH;
- RSP_Opcode[35] = RSP_Opcode_LW;
- RSP_Opcode[36] = RSP_Opcode_LBU;
- RSP_Opcode[37] = RSP_Opcode_LHU;
- RSP_Opcode[40] = RSP_Opcode_SB;
- RSP_Opcode[41] = RSP_Opcode_SH;
- RSP_Opcode[43] = RSP_Opcode_SW;
- RSP_Opcode[50] = RSP_Opcode_LC2;
- RSP_Opcode[58] = RSP_Opcode_SC2;
-
- RSP_Special[ 0] = RSP_Special_SLL;
- RSP_Special[ 2] = RSP_Special_SRL;
- RSP_Special[ 3] = RSP_Special_SRA;
- RSP_Special[ 4] = RSP_Special_SLLV;
- RSP_Special[ 6] = RSP_Special_SRLV;
- RSP_Special[ 7] = RSP_Special_SRAV;
- RSP_Special[ 8] = RSP_Special_JR;
- RSP_Special[ 9] = RSP_Special_JALR;
- RSP_Special[13] = RSP_Special_BREAK;
- RSP_Special[32] = RSP_Special_ADD;
- RSP_Special[33] = RSP_Special_ADDU;
- RSP_Special[34] = RSP_Special_SUB;
- RSP_Special[35] = RSP_Special_SUBU;
- RSP_Special[36] = RSP_Special_AND;
- RSP_Special[37] = RSP_Special_OR;
- RSP_Special[38] = RSP_Special_XOR;
- RSP_Special[39] = RSP_Special_NOR;
- RSP_Special[42] = RSP_Special_SLT;
- RSP_Special[43] = RSP_Special_SLTU;
-
- RSP_RegImm[ 0] = RSP_Opcode_BLTZ;
- RSP_RegImm[ 1] = RSP_Opcode_BGEZ;
- RSP_RegImm[16] = RSP_Opcode_BLTZAL;
-
- RSP_Cop0[ 0] = RSP_Cop0_MF;
- RSP_Cop0[ 4] = RSP_Cop0_MT;
-
- RSP_Cop2[ 0] = RSP_Cop2_MF;
- RSP_Cop2[ 2] = RSP_Cop2_CF;
- RSP_Cop2[ 4] = RSP_Cop2_MT;
- RSP_Cop2[ 6] = RSP_Cop2_CT;
- RSP_Cop2[16] = RSP_COP2_VECTOR;
- RSP_Cop2[17] = RSP_COP2_VECTOR;
- RSP_Cop2[18] = RSP_COP2_VECTOR;
- RSP_Cop2[19] = RSP_COP2_VECTOR;
- RSP_Cop2[20] = RSP_COP2_VECTOR;
- RSP_Cop2[21] = RSP_COP2_VECTOR;
- RSP_Cop2[22] = RSP_COP2_VECTOR;
- RSP_Cop2[23] = RSP_COP2_VECTOR;
- RSP_Cop2[24] = RSP_COP2_VECTOR;
- RSP_Cop2[25] = RSP_COP2_VECTOR;
- RSP_Cop2[26] = RSP_COP2_VECTOR;
- RSP_Cop2[27] = RSP_COP2_VECTOR;
- RSP_Cop2[28] = RSP_COP2_VECTOR;
- RSP_Cop2[29] = RSP_COP2_VECTOR;
- RSP_Cop2[30] = RSP_COP2_VECTOR;
- RSP_Cop2[31] = RSP_COP2_VECTOR;
-
- RSP_Vector[ 0] = RSP_Vector_VMULF;
- RSP_Vector[ 1] = RSP_Vector_VMULU;
- RSP_Vector[ 4] = RSP_Vector_VMUDL;
- RSP_Vector[ 5] = RSP_Vector_VMUDM;
- RSP_Vector[ 6] = RSP_Vector_VMUDN;
- RSP_Vector[ 7] = RSP_Vector_VMUDH;
- RSP_Vector[ 8] = RSP_Vector_VMACF;
- RSP_Vector[ 9] = RSP_Vector_VMACU;
- RSP_Vector[11] = RSP_Vector_VMACQ;
- RSP_Vector[12] = RSP_Vector_VMADL;
- RSP_Vector[13] = RSP_Vector_VMADM;
- RSP_Vector[14] = RSP_Vector_VMADN;
- RSP_Vector[15] = RSP_Vector_VMADH;
- RSP_Vector[16] = RSP_Vector_VADD;
- RSP_Vector[17] = RSP_Vector_VSUB;
- RSP_Vector[19] = RSP_Vector_VABS;
- RSP_Vector[20] = RSP_Vector_VADDC;
- RSP_Vector[21] = RSP_Vector_VSUBC;
- RSP_Vector[29] = RSP_Vector_VSAW;
- RSP_Vector[32] = RSP_Vector_VLT;
- RSP_Vector[33] = RSP_Vector_VEQ;
- RSP_Vector[34] = RSP_Vector_VNE;
- RSP_Vector[35] = RSP_Vector_VGE;
- RSP_Vector[36] = RSP_Vector_VCL;
- RSP_Vector[37] = RSP_Vector_VCH;
- RSP_Vector[38] = RSP_Vector_VCR;
- RSP_Vector[39] = RSP_Vector_VMRG;
- RSP_Vector[40] = RSP_Vector_VAND;
- RSP_Vector[41] = RSP_Vector_VNAND;
- RSP_Vector[42] = RSP_Vector_VOR;
- RSP_Vector[43] = RSP_Vector_VNOR;
- RSP_Vector[44] = RSP_Vector_VXOR;
- RSP_Vector[45] = RSP_Vector_VNXOR;
- RSP_Vector[48] = RSP_Vector_VRCP;
- RSP_Vector[49] = RSP_Vector_VRCPL;
- RSP_Vector[50] = RSP_Vector_VRCPH;
- RSP_Vector[51] = RSP_Vector_VMOV;
- RSP_Vector[52] = RSP_Vector_VRSQ;
- RSP_Vector[53] = RSP_Vector_VRSQL;
- RSP_Vector[54] = RSP_Vector_VRSQH;
- RSP_Vector[55] = RSP_Vector_VNOOP;
-
- RSP_Lc2[ 0] = RSP_Opcode_LBV;
- RSP_Lc2[ 1] = RSP_Opcode_LSV;
- RSP_Lc2[ 2] = RSP_Opcode_LLV;
- RSP_Lc2[ 3] = RSP_Opcode_LDV;
- RSP_Lc2[ 4] = RSP_Opcode_LQV;
- RSP_Lc2[ 5] = RSP_Opcode_LRV;
- RSP_Lc2[ 6] = RSP_Opcode_LPV;
- RSP_Lc2[ 7] = RSP_Opcode_LUV;
- RSP_Lc2[ 8] = RSP_Opcode_LHV;
- RSP_Lc2[ 9] = RSP_Opcode_LFV;
- RSP_Lc2[11] = RSP_Opcode_LTV;
-
- RSP_Sc2[ 0] = RSP_Opcode_SBV;
- RSP_Sc2[ 1] = RSP_Opcode_SSV;
- RSP_Sc2[ 2] = RSP_Opcode_SLV;
- RSP_Sc2[ 3] = RSP_Opcode_SDV;
- RSP_Sc2[ 4] = RSP_Opcode_SQV;
- RSP_Sc2[ 5] = RSP_Opcode_SRV;
- RSP_Sc2[ 6] = RSP_Opcode_SPV;
- RSP_Sc2[ 7] = RSP_Opcode_SUV;
- RSP_Sc2[ 8] = RSP_Opcode_SHV;
- RSP_Sc2[ 9] = RSP_Opcode_SFV;
- RSP_Sc2[10] = RSP_Opcode_SWV;
- RSP_Sc2[11] = RSP_Opcode_STV;
-
- EleSpec[ 0].DW = 0;
-	EleSpec[ 1].DW = 0;
-	EleSpec[ 2].DW = 0;
-	EleSpec[ 3].DW = 0;
-	EleSpec[ 4].DW = 0;
-	EleSpec[ 5].DW = 0;
-	EleSpec[ 6].DW = 0;
-	EleSpec[ 7].DW = 0;
-	EleSpec[ 8].DW = 0;
-	EleSpec[ 9].DW = 0;
-	EleSpec[10].DW = 0;
-	EleSpec[11].DW = 0;
-	EleSpec[12].DW = 0;
-	EleSpec[13].DW = 0;
-	EleSpec[14].DW = 0;
-	EleSpec[15].DW = 0;
-	EleSpec[16].DW = 0x0001020304050607ULL; /* None */
-	EleSpec[17].DW = 0x0001020304050607ULL; /* None */
-	EleSpec[18].DW = 0x0000020204040606ULL; /* 0q */
-	EleSpec[19].DW = 0x0101030305050707ULL; /* 1q */
-	EleSpec[20].DW = 0x0000000004040404ULL; /* 0h */
-	EleSpec[21].DW = 0x0101010105050505ULL; /* 1h */
-	EleSpec[22].DW = 0x0202020206060606ULL; /* 2h */
-	EleSpec[23].DW = 0x0303030307070707ULL; /* 3h */
-	EleSpec[24].DW = 0x0000000000000000ULL; /* 0 */
-	EleSpec[25].DW = 0x0101010101010101ULL; /* 1 */
-	EleSpec[26].DW = 0x0202020202020202ULL; /* 2 */
-	EleSpec[27].DW = 0x0303030303030303ULL; /* 3 */
-	EleSpec[28].DW = 0x0404040404040404ULL; /* 4 */
-	EleSpec[29].DW = 0x0505050505050505ULL; /* 5 */
-	EleSpec[30].DW = 0x0606060606060606ULL; /* 6 */
-	EleSpec[31].DW = 0x0707070707070707ULL; /* 7 */
-
-	Indx[ 0].DW = 0;
-	Indx[ 1].DW = 0;
-	Indx[ 2].DW = 0;
-	Indx[ 3].DW = 0;
-	Indx[ 4].DW = 0;
-	Indx[ 5].DW = 0;
-	Indx[ 6].DW = 0;
-	Indx[ 7].DW = 0;
-	Indx[ 8].DW = 0;
-	Indx[ 9].DW = 0;
-	Indx[10].DW = 0;
-	Indx[11].DW = 0;
-	Indx[12].DW = 0;
-	Indx[13].DW = 0;
-	Indx[14].DW = 0;
-	Indx[15].DW = 0;
-
-	Indx[16].DW = 0x0001020304050607ULL; /* None */
-	Indx[17].DW = 0x0001020304050607ULL; /* None */
-	Indx[18].DW = 0x0103050700020406ULL; /* 0q */
-	Indx[19].DW = 0x0002040601030507ULL; /* 1q */
-	Indx[20].DW = 0x0102030506070004ULL; /* 0h */
-	Indx[21].DW = 0x0002030406070105ULL; /* 1h */
-	Indx[22].DW = 0x0001030405070206ULL; /* 2h */
-	Indx[23].DW = 0x0001020405060307ULL; /* 3h */
-	Indx[24].DW = 0x0102030405060700ULL; /* 0 */
-	Indx[25].DW = 0x0002030405060701ULL; /* 1 */
-	Indx[26].DW = 0x0001030405060702ULL; /* 2 */
-	Indx[27].DW = 0x0001020405060703ULL; /* 3 */
-	Indx[28].DW = 0x0001020305060704ULL; /* 4 */
-	Indx[29].DW = 0x0001020304060705ULL; /* 5 */
-	Indx[30].DW = 0x0001020304050706ULL; /* 6 */
-	Indx[31].DW = 0x0001020304050607ULL; /* 7 */
-
-	for (i = 16; i < 32; i ++) {
-		int32_t count;
-
-		for (count = 0; count < 8; count ++) {
-			Indx[i].B[count] = 7 - Indx[i].B[count];
-			EleSpec[i].B[count] = 7 - EleSpec[i].B[count];
-		}
-		for (count = 0; count < 4; count ++) {
-			uint8_t Temp;
-
-			Temp = Indx[i].B[count];
-			Indx[i].B[count] = Indx[i].B[7 - count];
-			Indx[i].B[7 - count] = Temp;
-		}
-	}
-
-	PrgCount = &SP_PC_REG;
-
-	memset(&Compiler, 0, sizeof(Compiler));
-
-	Compiler.bAlignGPR = 1;
-	Compiler.bAlignVector = 1;
-	Compiler.bFlags = 1;
-	Compiler.bReOrdering = 1;
-	Compiler.bSections = 0; //do i really need to do this?
-	Compiler.bDest = 1;
-	Compiler.bAccum = 1;
-	Compiler.bGPRConstants = 1;
-
-	if(!fake_seek_stopping) {
-		RSPAllocateMemory();
-	} else {
-		RSPReInitMemory();
-	}
-
-	memset(RSP_GPR,0,sizeof(RSP_GPR));
-	memset(RSP_Vect,0,sizeof(RSP_Vect));
-
-#ifndef USEX64
-	asm volatile("push %%ebx; mov $1, %%eax; cpuid; pop %%ebx" : : "a"(CpuFeatures) : "edx","ecx");
-#else
-	asm volatile("push %%rbx; mov $1, %%eax; cpuid; pop %%rbx" : : "a"(CpuFeatures) : "rdx","rcx");
-#endif
-
-
-	Compiler.mmx2 = CpuFeatures & 0x4000000;
-	Compiler.sse = CpuFeatures & 0x2000000;
-	Compiler.mmx = CpuFeatures & 0x800000;
-
-	if(!RSP_Cpu)
-		BuildRecompilerCPU();
-
-	ClearAllx86Code();
-
-	return 0; /* ??? */
-}
-
-void RSPSetJumpTable (void) {
-	uint32_t CRC, count;
-
-	CRC = 0;
-	for (count = 0; count < 0x800; count += 0x40) {
-		CRC += *(uint32_t *)(IMEM + count);
-	}
-
-	for (count = 0; count <	NoOfMaps; count++ ) {
-		if (CRC == MapsCRC[count]) {
-			RSPJumpTable = (void **)(RSPJumpTables + (count * (sizeof(void*) * 0x400)));
-			Table = count;
-			return;
-		}
-	}
-
-	if (NoOfMaps == MaxMaps) {
-		DisplayError("Used up all the Jump tables in the rsp");
-		StopEmulation();
-	}
-
-	MapsCRC[NoOfMaps] = CRC;
-
-	RSPJumpTable = (void **)(RSPJumpTables + (NoOfMaps * (sizeof(void*) * 0x400) ));
-	Table = NoOfMaps;
-	NoOfMaps += 1;
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp.h Deleted

@@ -1,423 +0,0 @@
-#ifndef _RSP_H_
-#define _RSP_H_
-
-#include <stdint.h>
-#include <string.h>
-#include <math.h>
-#include "types.h"
-
-#define CPU_Message(...)
-//#define DisplayError printf
-
-#pragma pack(push,1)
-
-typedef struct tagOPCODE {
-	union {
-
-		uint32_t Hex;
-		uint8_t Ascii[4];
-
-		struct {
-			unsigned offset : 16;
-			unsigned rt : 5;
-			unsigned rs : 5;
-			unsigned op : 6;
-		};
-
-		struct {
-			unsigned immediate : 16;
-			unsigned : 5;
-			unsigned base : 5;
-			unsigned : 6;
-		};
-
-		struct {
-			unsigned target : 26;
-			unsigned : 6;
-		};
-
-		struct {
-			unsigned funct : 6;
-			unsigned sa : 5;
-			unsigned rd : 5;
-			unsigned : 5;
-			unsigned : 5;
-			unsigned : 6;
-		};
-
-		struct {
-			signed voffset : 7;
-			unsigned del : 4;
-			unsigned : 5;
-			unsigned dest : 5;
-			unsigned : 5;
-			unsigned : 6;
-		};
-
-	};
-} RSPOPCODE;
-
-#pragma pack(pop)
-
-#define REGISTER32	MIPS_WORD
-#define REGISTER	MIPS_DWORD
-
-
-//RSP OpCodes
-#define	RSP_SPECIAL				 0
-#define	RSP_REGIMM				 1
-#define RSP_J					 2
-#define RSP_JAL					 3
-#define RSP_BEQ					 4
-#define RSP_BNE					 5
-#define RSP_BLEZ				 6
-#define RSP_BGTZ				 7
-#define RSP_ADDI				 8
-#define RSP_ADDIU				 9
-#define RSP_SLTI				10
-#define RSP_SLTIU				11
-#define RSP_ANDI				12
-#define RSP_ORI					13
-#define RSP_XORI				14
-#define RSP_LUI					15
-#define	RSP_CP0					16
-#define	RSP_CP2					18
-#define RSP_LB					32
-#define RSP_LH					33
-#define RSP_LW					35
-#define RSP_LBU					36
-#define RSP_LHU					37
-#define RSP_SB					40
-#define RSP_SH					41
-#define RSP_SW					43
-#define RSP_LC2					50
-#define RSP_SC2					58
-
-/* RSP Special opcodes */
-#define RSP_SPECIAL_SLL			 0
-#define RSP_SPECIAL_SRL			 2
-#define RSP_SPECIAL_SRA			 3
-#define RSP_SPECIAL_SLLV		 4
-#define RSP_SPECIAL_SRLV		 6
-#define RSP_SPECIAL_SRAV		 7
-#define RSP_SPECIAL_JR			 8
-#define RSP_SPECIAL_JALR		 9
-#define RSP_SPECIAL_BREAK		13
-#define RSP_SPECIAL_ADD			32
-#define RSP_SPECIAL_ADDU		33
-#define RSP_SPECIAL_SUB			34
-#define RSP_SPECIAL_SUBU		35
-#define RSP_SPECIAL_AND			36
-#define RSP_SPECIAL_OR			37
-#define RSP_SPECIAL_XOR			38
-#define RSP_SPECIAL_NOR			39
-#define RSP_SPECIAL_SLT			42
-#define RSP_SPECIAL_SLTU		43
-
-/* RSP RegImm opcodes */
-#define RSP_REGIMM_BLTZ			 0
-#define RSP_REGIMM_BGEZ			 1
-#define RSP_REGIMM_BLTZAL		16
-#define RSP_REGIMM_BGEZAL		17
-
-/* RSP COP0 opcodes */
-#define	RSP_COP0_MF				 0
-#define	RSP_COP0_MT				 4
-
-/* RSP COP2 opcodes */
-#define	RSP_COP2_MF				 0
-#define	RSP_COP2_CF				 2
-#define	RSP_COP2_MT				 4
-#define	RSP_COP2_CT				 6
-
-/* RSP Vector opcodes */
-#define	RSP_VECTOR_VMULF		 0
-#define	RSP_VECTOR_VMULU		 1
-#define	RSP_VECTOR_VRNDP		 2
-#define	RSP_VECTOR_VMULQ		 3
-#define	RSP_VECTOR_VMUDL		 4
-#define	RSP_VECTOR_VMUDM		 5
-#define	RSP_VECTOR_VMUDN		 6
-#define	RSP_VECTOR_VMUDH		 7
-#define	RSP_VECTOR_VMACF		 8
-#define	RSP_VECTOR_VMACU		 9
-#define	RSP_VECTOR_VRNDN		10
-#define	RSP_VECTOR_VMACQ		11
-#define	RSP_VECTOR_VMADL		12
-#define	RSP_VECTOR_VMADM		13
-#define	RSP_VECTOR_VMADN		14
-#define	RSP_VECTOR_VMADH		15
-#define	RSP_VECTOR_VADD			16
-#define	RSP_VECTOR_VSUB			17
-#define	RSP_VECTOR_VABS			19
-#define	RSP_VECTOR_VADDC		20
-#define	RSP_VECTOR_VSUBC		21
-#define	RSP_VECTOR_VSAW			29
-#define	RSP_VECTOR_VLT			32
-#define	RSP_VECTOR_VEQ			33
-#define	RSP_VECTOR_VNE			34
-#define	RSP_VECTOR_VGE			35
-#define	RSP_VECTOR_VCL			36
-#define	RSP_VECTOR_VCH			37
-#define	RSP_VECTOR_VCR			38
-#define	RSP_VECTOR_VMRG			39
-#define	RSP_VECTOR_VAND			40
-#define	RSP_VECTOR_VNAND		41
-#define	RSP_VECTOR_VOR			42
-#define	RSP_VECTOR_VNOR			43
-#define	RSP_VECTOR_VXOR			44
-#define	RSP_VECTOR_VNXOR		45
-#define	RSP_VECTOR_VRCP			48
-#define	RSP_VECTOR_VRCPL		49
-#define	RSP_VECTOR_VRCPH		50
-#define	RSP_VECTOR_VMOV			51
-#define	RSP_VECTOR_VRSQ			52
-#define	RSP_VECTOR_VRSQL		53
-#define	RSP_VECTOR_VRSQH		54
-#define	RSP_VECTOR_VNOOP		55
-
-/* RSP LSC2 opcodes */
-#define RSP_LSC2_BV				 0
-#define RSP_LSC2_SV				 1
-#define RSP_LSC2_LV				 2
-#define RSP_LSC2_DV				 3
-#define RSP_LSC2_QV				 4
-#define RSP_LSC2_RV				 5
-#define RSP_LSC2_PV				 6
-#define RSP_LSC2_UV				 7
-#define RSP_LSC2_HV				 8
-#define RSP_LSC2_FV				 9
-#define RSP_LSC2_WV				10
-#define	RSP_LSC2_TV				11
-
-
-/************************* OpCode functions *************************/
-void RSP_Opcode_SPECIAL ( void );
-void RSP_Opcode_REGIMM ( void );
-void RSP_Opcode_J ( void );
-void RSP_Opcode_JAL ( void );
-void RSP_Opcode_BEQ ( void );
-void RSP_Opcode_BNE ( void );
-void RSP_Opcode_BLEZ ( void );
-void RSP_Opcode_BGTZ ( void );
-void RSP_Opcode_ADDI ( void );
-void RSP_Opcode_ADDIU ( void );
-void RSP_Opcode_SLTI ( void );
-void RSP_Opcode_SLTIU ( void );
-void RSP_Opcode_ANDI ( void );
-void RSP_Opcode_ORI ( void );
-void RSP_Opcode_XORI ( void );
-void RSP_Opcode_LUI ( void );
-void RSP_Opcode_COP0 ( void );
-void RSP_Opcode_COP2 ( void );
-void RSP_Opcode_LB ( void );
-void RSP_Opcode_LH ( void );
-void RSP_Opcode_LW ( void );
-void RSP_Opcode_LBU ( void );
-void RSP_Opcode_LHU ( void );
-void RSP_Opcode_SB ( void );
-void RSP_Opcode_SH ( void );
-void RSP_Opcode_SW ( void );
-void RSP_Opcode_LC2 ( void );
-void RSP_Opcode_SC2 ( void );
-/********************** R4300i OpCodes: Special **********************/
-void RSP_Special_SLL ( void );
-void RSP_Special_SRL ( void );
-void RSP_Special_SRA ( void );
-void RSP_Special_SLLV ( void );
-void RSP_Special_SRLV ( void );
-void RSP_Special_SRAV ( void );
-void RSP_Special_JR ( void );
-void RSP_Special_JALR ( void );
-void RSP_Special_BREAK ( void );
-void RSP_Special_ADD ( void );
-void RSP_Special_ADDU ( void );
-void RSP_Special_SUB ( void );
-void RSP_Special_SUBU ( void );
-void RSP_Special_AND ( void );
-void RSP_Special_OR ( void );
-void RSP_Special_XOR ( void );
-void RSP_Special_NOR ( void );
-void RSP_Special_SLT ( void );
-void RSP_Special_SLTU ( void );
-/********************** R4300i OpCodes: RegImm **********************/
-void RSP_Opcode_BLTZ ( void );
-void RSP_Opcode_BGEZ ( void );
-void RSP_Opcode_BLTZAL ( void );
-void RSP_Opcode_BGEZAL ( void );
-/************************** Cop0 functions *************************/
-void RSP_Cop0_MF ( void );
-void RSP_Cop0_MT ( void );
-/************************** Cop2 functions *************************/
-void RSP_Cop2_MF ( void );
-void RSP_Cop2_CF ( void );
-void RSP_Cop2_MT ( void );
-void RSP_Cop2_CT ( void );
-void RSP_COP2_VECTOR ( void );
-/************************** Vect functions **************************/
-void RSP_Vector_VMULF ( void );
-void RSP_Vector_VMULU	( void );
-void RSP_Vector_VMUDL ( void );
-void RSP_Vector_VMUDM ( void );
-void RSP_Vector_VMUDN ( void );
-void RSP_Vector_VMUDH ( void );
-void RSP_Vector_VMACF ( void );
-void RSP_Vector_VMACU ( void );
-void RSP_Vector_VMACQ ( void );
-void RSP_Vector_VMADL ( void );
-void RSP_Vector_VMADM ( void );
-void RSP_Vector_VMADN ( void );
-void RSP_Vector_VMADH ( void );
-void RSP_Vector_VADD ( void );
-void RSP_Vector_VSUB ( void );
-void RSP_Vector_VABS ( void );
-void RSP_Vector_VADDC ( void );
-void RSP_Vector_VSUBC ( void );
-void RSP_Vector_VSAW ( void );
-void RSP_Vector_VLT ( void );
-void RSP_Vector_VEQ ( void );
-void RSP_Vector_VNE ( void );
-void RSP_Vector_VGE ( void );
-void RSP_Vector_VCL ( void );
-void RSP_Vector_VCH ( void );
-void RSP_Vector_VCR ( void );
-void RSP_Vector_VMRG ( void );
-void RSP_Vector_VAND ( void );
-void RSP_Vector_VNAND ( void );
-void RSP_Vector_VOR ( void );
-void RSP_Vector_VNOR ( void );
-void RSP_Vector_VXOR ( void );
-void RSP_Vector_VNXOR ( void );
-void RSP_Vector_VRCP ( void );
-void RSP_Vector_VRCPL ( void );
-void RSP_Vector_VRCPH ( void );
-void RSP_Vector_VMOV ( void );
-void RSP_Vector_VRSQ ( void );
-void RSP_Vector_VRSQL ( void );
-void RSP_Vector_VRSQH ( void );
-void RSP_Vector_VNOOP ( void );
-/************************** lc2 functions **************************/
-void RSP_Opcode_LBV ( void );
-void RSP_Opcode_LSV ( void );
-void RSP_Opcode_LLV ( void );
-void RSP_Opcode_LDV ( void );
-void RSP_Opcode_LQV ( void );
-void RSP_Opcode_LRV ( void );
-void RSP_Opcode_LPV ( void );
-void RSP_Opcode_LUV ( void );
-void RSP_Opcode_LHV ( void );
-void RSP_Opcode_LFV ( void );
-void RSP_Opcode_LTV ( void );
-/************************** lc2 functions **************************/
-void RSP_Opcode_SBV ( void );
-void RSP_Opcode_SSV ( void );
-void RSP_Opcode_SLV ( void );
-void RSP_Opcode_SDV ( void );
-void RSP_Opcode_SQV ( void );
-void RSP_Opcode_SRV ( void );
-void RSP_Opcode_SPV ( void );
-void RSP_Opcode_SUV ( void );
-void RSP_Opcode_SHV ( void );
-void RSP_Opcode_SFV ( void );
-void RSP_Opcode_STV ( void );
-void RSP_Opcode_SWV ( void );
-/************************** Other functions **************************/
-void rsp_UnknownOpcode ( void );
-void RSPSetJumpTable ( void );
-
-extern void (*RSP_Opcode[64])();
-extern void (*RSP_RegImm[32])();
-extern void (*RSP_Special[64])();
-extern void (*RSP_Cop0[32])();
-extern void (*RSP_Cop2[32])();
-extern void (*RSP_Vector[64])();
-extern void (*RSP_Lc2[32])();
-extern void (*RSP_Sc2[32])();
-
-void RSP_SP_DMA_READ (void);
-void RSP_SP_DMA_WRITE(void);
-
-/******************* Function prototypes are hard ********************/
-void RSP_LB_DMEM ( uint32_t Addr, uint8_t * Value );
-void RSP_LH_DMEM ( uint32_t Addr, uint16_t * Value );
-void RSP_LW_DMEM ( uint32_t Addr, uint32_t * Value );
-void RSP_LW_IMEM ( uint32_t Addr, uint32_t * Value );
-void RSP_SB_DMEM ( uint32_t Addr, uint8_t Value );
-void RSP_SH_DMEM ( uint32_t Addr, uint16_t Value );
-void RSP_SW_DMEM ( uint32_t Addr, uint32_t Value );
-void RSP_LBV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LSV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LLV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SFV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_STV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SWV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LDV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LQV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LRV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LBV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LDV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LFV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LHV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LLV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LPV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LRV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LQV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LSV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LTV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_LUV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SBV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SDV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SFV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SHV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SLV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SPV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SQV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SRV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SSV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_STV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SUV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-void RSP_SWV_DMEM ( uint32_t Addr, int32_t vect, int32_t element );
-
-extern REGISTER32 *RSP_GPR, RSP_Flags[4];
-extern REGISTER *RSP_ACCUM;
-extern VECTOR *RSP_Vect;
-
-extern REGISTER EleSpec[32], Indx[32];
-extern RSPOPCODE RSPOpC;
-extern uint32_t *PrgCount, RSPNextInstruction;
-extern uint32_t RSP_NextInstruction;
-extern REGISTER32 Recp, RecpResult, SQroot, SQrootResult;
-
-extern uint32_t RSP_NextInstruction, RSP_JumpTo;
-
-
-extern uint32_t RSP_Running;
-
-
-//extern uint8_t * RSPRecompPos, * RSPRecompCode, * RSPRecompCodeSecondary;
-//extern uint8_t * RSPJumpTable;
-#define MaxMaps	32
-
-extern uint32_t NoOfMaps, MapsCRC[MaxMaps], Table, ConditionalMove;
-extern uint8_t * RSPRecompCode, * RSPRecompCodeSecondary, * RSPRecompPos, *RSPJumpTables;
-extern void ** RSPJumpTable;
-
-
-#define NORMAL					0
-#define DO_DELAY_SLOT			1
-#define DO_END_DELAY_SLOT		2
-#define DELAY_SLOT				3
-#define END_DELAY_SLOT			4
-#define LIKELY_DELAY_SLOT		5
-#define JUMP	 				6
-#define DELAY_SLOT_DONE			7
-#define LIKELY_DELAY_SLOT_DONE	8
-#define END_BLOCK 				9
-#define FINISH_BLOCK			10 // from RSP Recompiler CPU
-#define FINISH_SUB_BLOCK		11 // from RSP Recompiler CPU
-
-void real_run_rsp(uint32_t cycles);
-int32_t init_rsp(void);
-
-
-#endif

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp_interpreter_cpu.c Deleted

@@ -1,1706 +0,0 @@
-#include <stdlib.h>
-#include <stdint.h>
-#include "usf.h"
-#include "cpu.h"
-#include "memory.h"
-#include "audio.h"
-#include "rsp.h"
-
-
-void (*RSP_Opcode[64])();
-void (*RSP_RegImm[32])();
-void (*RSP_Special[64])();
-void (*RSP_Cop0[32])();
-void (*RSP_Cop2[32])();
-void (*RSP_Vector[64])();
-void (*RSP_Lc2[32])();
-void (*RSP_Sc2[32])();
-
-void RSP_Opcode_SPECIAL ( void ) {
-	(RSP_Special[ RSPOpC.funct ])();
-}
-
-void RSP_Opcode_REGIMM ( void ) {
-	(RSP_RegImm[ RSPOpC.rt ])();
-}
-
-void RSP_Opcode_J ( void ) {
-	RSP_NextInstruction = DELAY_SLOT;
-	RSP_JumpTo = (RSPOpC.target << 2) & 0xFFC;
-}
-
-void RSP_Opcode_JAL ( void ) {
-	RSP_NextInstruction = DELAY_SLOT;
-	RSP_GPR[31].UW = ( *PrgCount + 8 ) & 0xFFC;
-	RSP_JumpTo = (RSPOpC.target << 2) & 0xFFC;
-}
-
-void RSP_Opcode_BEQ ( void ) {
-	RSP_NextInstruction = DELAY_SLOT;
-	if (RSP_GPR[RSPOpC.rs].W == RSP_GPR[RSPOpC.rt].W) {
-		RSP_JumpTo = ( *PrgCount + ((int16_t)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
-}
-
-void RSP_Opcode_BNE ( void ) {
-	RSP_NextInstruction = DELAY_SLOT;
-	if (RSP_GPR[RSPOpC.rs].W != RSP_GPR[RSPOpC.rt].W) {
-		RSP_JumpTo = ( *PrgCount + ((int16_t)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
-}
-
-void RSP_Opcode_BLEZ ( void ) {
-	RSP_NextInstruction = DELAY_SLOT;
-	if (RSP_GPR[RSPOpC.rs].W <= 0) {
-		RSP_JumpTo = ( *PrgCount + ((int16_t)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
-}
-
-void RSP_Opcode_BGTZ ( void ) {
-	RSP_NextInstruction = DELAY_SLOT;
-	if (RSP_GPR[RSPOpC.rs].W > 0) {
-		RSP_JumpTo = ( *PrgCount + ((int16_t)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
-}
-
-void RSP_Opcode_ADDI ( void ) {
-	if (RSPOpC.rt != 0) {
-		RSP_GPR[RSPOpC.rt].W = RSP_GPR[RSPOpC.rs].W + (int16_t)RSPOpC.immediate;
-	}
-}
-
-void RSP_Opcode_ADDIU ( void ) {
-	if (RSPOpC.rt != 0) {
-		RSP_GPR[RSPOpC.rt].UW = RSP_GPR[RSPOpC.rs].UW + (uint32_t)((int16_t)RSPOpC.immediate);
-	}
-}
-
-void RSP_Opcode_SLTI (void) {
-	if (RSPOpC.rt == 0) { return; }
-	if (RSP_GPR[RSPOpC.rs].W < (int16_t)RSPOpC.immediate) {
-		RSP_GPR[RSPOpC.rt].W = 1;
-	} else {
-		RSP_GPR[RSPOpC.rt].W = 0;
-	}
-}
-
-void RSP_Opcode_SLTIU (void) {
-	if (RSPOpC.rt == 0) { return; }
-	if (RSP_GPR[RSPOpC.rs].UW < (uint32_t)(int16_t)RSPOpC.immediate) {
-		RSP_GPR[RSPOpC.rt].W = 1;
-	} else {
-		RSP_GPR[RSPOpC.rt].W = 0;
-	}
-}
-
-void RSP_Opcode_ANDI ( void ) {
-	if (RSPOpC.rt != 0) {
-		RSP_GPR[RSPOpC.rt].W = RSP_GPR[RSPOpC.rs].W & RSPOpC.immediate;
-	}
-}
-
-void RSP_Opcode_ORI ( void ) {
-	if (RSPOpC.rt != 0) {
-		RSP_GPR[RSPOpC.rt].W = RSP_GPR[RSPOpC.rs].W | RSPOpC.immediate;
-	}
-}
-
-void RSP_Opcode_XORI ( void ) {
-	if (RSPOpC.rt != 0) {
-		RSP_GPR[RSPOpC.rt].W = RSP_GPR[RSPOpC.rs].W ^ RSPOpC.immediate;
-	}
-}
-
-void RSP_Opcode_LUI (void) {
-	if (RSPOpC.rt != 0) {
-		RSP_GPR[RSPOpC.rt].W = (int16_t)RSPOpC.offset << 16;
-	}
-}
-
-void RSP_Opcode_COP0 (void) {
-	(RSP_Cop0[ RSPOpC.rs ])();
-}
-
-void RSP_Opcode_COP2 (void) {
-	(RSP_Cop2[ RSPOpC.rs ])();
-}
-
-void RSP_Opcode_LB ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (int16_t)RSPOpC.offset) & 0xFFF);
-	RSP_LB_DMEM( Address, &RSP_GPR[RSPOpC.rt].UB[0] );
-	RSP_GPR[RSPOpC.rt].W = RSP_GPR[RSPOpC.rt].B[0];
-}
-
-void RSP_Opcode_LH ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (int16_t)RSPOpC.offset) & 0xFFF);
-	RSP_LH_DMEM( Address, &RSP_GPR[RSPOpC.rt].UHW[0] );
-	RSP_GPR[RSPOpC.rt].W = RSP_GPR[RSPOpC.rt].HW[0];
-}
-
-void RSP_Opcode_LW ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (int16_t)RSPOpC.offset) & 0xFFF);
-	RSP_LW_DMEM( Address, &RSP_GPR[RSPOpC.rt].UW );
-}
-
-void RSP_Opcode_LBU ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (int16_t)RSPOpC.offset) & 0xFFF);
-	RSP_LB_DMEM( Address, &RSP_GPR[RSPOpC.rt].UB[0] );
-	RSP_GPR[RSPOpC.rt].UW = RSP_GPR[RSPOpC.rt].UB[0];
-}
-
-void RSP_Opcode_LHU ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (int16_t)RSPOpC.offset) & 0xFFF);
-	RSP_LH_DMEM( Address, &RSP_GPR[RSPOpC.rt].UHW[0] );
-	RSP_GPR[RSPOpC.rt].UW = RSP_GPR[RSPOpC.rt].UHW[0];
-}
-
-void RSP_Opcode_SB ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (int16_t)RSPOpC.offset) & 0xFFF);
-	RSP_SB_DMEM( Address, RSP_GPR[RSPOpC.rt].UB[0] );
-}
-
-void RSP_Opcode_SH ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (int16_t)RSPOpC.offset) & 0xFFF);
-	//if(Address == 0x370) {
-	//	printf("%08x\nOpcode: %08x\n%08x\nRA: %08x\n", RSPCompilePC, RSPOpC.Hex, (int16_t)RSPOpC.offset,RSP_GPR[31].UW);
-	//}
-
-	RSP_SH_DMEM( Address, RSP_GPR[RSPOpC.rt].UHW[0] );
-}
-
-void RSP_Opcode_SW ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (int16_t)RSPOpC.offset) & 0xFFF);
-	RSP_SW_DMEM( Address, RSP_GPR[RSPOpC.rt].UW );
-}
-
-void RSP_Opcode_LC2 (void) {
-	(RSP_Lc2 [ RSPOpC.rd ])();
-}
-
-void RSP_Opcode_SC2 (void) {
-	(RSP_Sc2 [ RSPOpC.rd ])();
-}
-/********************** R4300i OpCodes: Special **********************/
-void RSP_Special_SLL ( void ) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].W = RSP_GPR[RSPOpC.rt].W << RSPOpC.sa;
-	}
-}
-
-void RSP_Special_SRL ( void ) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].UW = RSP_GPR[RSPOpC.rt].UW >> RSPOpC.sa;
-	}
-}
-
-void RSP_Special_SRA ( void ) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].W = RSP_GPR[RSPOpC.rt].W >> RSPOpC.sa;
-	}
-}
-
-void RSP_Special_SLLV (void) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].W = RSP_GPR[RSPOpC.rt].W << (RSP_GPR[RSPOpC.rs].W & 0x1F);
-	}
-}
-
-void RSP_Special_SRLV (void) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].UW = RSP_GPR[RSPOpC.rt].UW >> (RSP_GPR[RSPOpC.rs].W & 0x1F);
-	}
-}
-
-void RSP_Special_SRAV (void) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].W = RSP_GPR[RSPOpC.rt].W >> (RSP_GPR[RSPOpC.rs].W & 0x1F);
-	}
-}
-
-void RSP_Special_JR (void) {
-	RSP_NextInstruction = DELAY_SLOT;
-	RSP_JumpTo = (RSP_GPR[RSPOpC.rs].W & 0xFFC);
-}
-
-void RSP_Special_JALR (void) {
-	RSP_NextInstruction = DELAY_SLOT;
-	RSP_GPR[RSPOpC.rd].W = (*PrgCount + 8) & 0xFFC;
-	RSP_JumpTo = (RSP_GPR[RSPOpC.rs].W & 0xFFC);
-}
-
-#define R4300i_SP_Intr			0x1
-
-void RSP_Special_BREAK ( void ) {
-	RSP_Running = 0;
-	SP_STATUS_REG |= (SP_STATUS_HALT | SP_STATUS_BROKE );
-	if ((SP_STATUS_REG & SP_STATUS_INTR_BREAK) != 0 ) {
-		MI_INTR_REG |= R4300i_SP_Intr;
-		CheckInterrupts();
-	}
-}
-
-void RSP_Special_ADD (void) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].W = RSP_GPR[RSPOpC.rs].W + RSP_GPR[RSPOpC.rt].W;
-	}
-}
-
-void RSP_Special_ADDU (void) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].UW = RSP_GPR[RSPOpC.rs].UW + RSP_GPR[RSPOpC.rt].UW;
-	}
-}
-
-void RSP_Special_SUB (void) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].W = RSP_GPR[RSPOpC.rs].W - RSP_GPR[RSPOpC.rt].W;
-	}
-}
-
-void RSP_Special_SUBU (void) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].UW = RSP_GPR[RSPOpC.rs].UW - RSP_GPR[RSPOpC.rt].UW;
-	}
-}
-
-void RSP_Special_AND (void) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].UW = RSP_GPR[RSPOpC.rs].UW & RSP_GPR[RSPOpC.rt].UW;
-	}
-}
-
-void RSP_Special_OR (void) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].UW = RSP_GPR[RSPOpC.rs].UW | RSP_GPR[RSPOpC.rt].UW;
-	}
-}
-
-void RSP_Special_XOR (void) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].UW = RSP_GPR[RSPOpC.rs].UW ^ RSP_GPR[RSPOpC.rt].UW;
-	}
-}
-
-void RSP_Special_NOR (void) {
-	if (RSPOpC.rd != 0) {
-		RSP_GPR[RSPOpC.rd].UW = ~(RSP_GPR[RSPOpC.rs].UW | RSP_GPR[RSPOpC.rt].UW);
-	}
-}
-
-void RSP_Special_SLT (void) {
-	if (RSPOpC.rd == 0) { return; }
-	if (RSP_GPR[RSPOpC.rs].W < RSP_GPR[RSPOpC.rt].W) {
-		RSP_GPR[RSPOpC.rd].UW = 1;
-	} else {
-		RSP_GPR[RSPOpC.rd].UW = 0;
-	}
-}
-
-void RSP_Special_SLTU (void) {
-	if (RSPOpC.rd == 0) { return; }
-	if (RSP_GPR[RSPOpC.rs].UW < RSP_GPR[RSPOpC.rt].UW) {
-		RSP_GPR[RSPOpC.rd].UW = 1;
-	} else {
-		RSP_GPR[RSPOpC.rd].UW = 0;
-	}
-}
-/********************** R4300i OpCodes: RegImm **********************/
-void RSP_Opcode_BLTZ ( void ) {
-	RSP_NextInstruction = DELAY_SLOT;
-	if (RSP_GPR[RSPOpC.rs].W < 0) {
-		RSP_JumpTo = ( *PrgCount + ((int16_t)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
-}
-
-void RSP_Opcode_BGEZ ( void ) {
-	RSP_NextInstruction = DELAY_SLOT;
-	if (RSP_GPR[RSPOpC.rs].W >= 0) {
-		RSP_JumpTo = ( *PrgCount + ((int16_t)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
-}
-
-void RSP_Opcode_BLTZAL ( void ) {
-	RSP_NextInstruction = DELAY_SLOT;
-	RSP_GPR[31].UW = ( *PrgCount + 8 ) & 0xFFC;
-	if (RSP_GPR[RSPOpC.rs].W < 0) {
-		RSP_JumpTo = ( *PrgCount + ((int16_t)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
-}
-
-void RSP_Opcode_BGEZAL ( void ) {
-	RSP_NextInstruction = DELAY_SLOT;
-	RSP_GPR[31].UW = ( *PrgCount + 8 ) & 0xFFC;
-	if (RSP_GPR[RSPOpC.rs].W >= 0) {
-		RSP_JumpTo = ( *PrgCount + ((int16_t)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
-}
-/************************** Cop0 functions *************************/
-void RSP_Cop0_MF (void) {
-	switch (RSPOpC.rd) {
-	case 4: RSP_GPR[RSPOpC.rt].UW = SP_STATUS_REG; break;
-	case 5: RSP_GPR[RSPOpC.rt].UW = SP_DMA_FULL_REG; break;
-	case 6: RSP_GPR[RSPOpC.rt].UW = SP_DMA_BUSY_REG; break;
-	case 7:
-		RSP_GPR[RSPOpC.rt].W = 0;
-		//RSP_GPR[RSPOpC.rt].W = SP_SEMAPHORE_REG;
-		//SP_SEMAPHORE_REG = 1;
-		break;
-	case 8: RSP_GPR[RSPOpC.rt].UW = DPC_START_REG ; break;
-	case 9: RSP_GPR[RSPOpC.rt].UW = DPC_END_REG ; break;
-	case 10: RSP_GPR[RSPOpC.rt].UW = DPC_CURRENT_REG; break;
-	case 11: RSP_GPR[RSPOpC.rt].W = DPC_STATUS_REG; break;
-	case 12: RSP_GPR[RSPOpC.rt].W = DPC_CLOCK_REG; break;
-	default:
-		printf("have not implemented RSP MF cpu->CP0 reg (%d)",RSPOpC.rd);
-	}
-}
-
-void RSP_Cop0_MT (void) {
-	switch (RSPOpC.rd) {
-	case 0: SP_MEM_ADDR_REG = RSP_GPR[RSPOpC.rt].UW; break;
-	case 1: SP_DRAM_ADDR_REG = RSP_GPR[RSPOpC.rt].UW; break;
-	case 2:
-		SP_RD_LEN_REG = RSP_GPR[RSPOpC.rt].UW;
-		RSP_SP_DMA_READ();
-		break;
-	case 3:
-		SP_WR_LEN_REG = RSP_GPR[RSPOpC.rt].UW;
-		RSP_SP_DMA_WRITE();
-		break;
-	case 4:
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_HALT ) != 0) { SP_STATUS_REG &= ~SP_STATUS_HALT; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_HALT ) != 0) { SP_STATUS_REG |= SP_STATUS_HALT; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_BROKE ) != 0) { SP_STATUS_REG &= ~SP_STATUS_BROKE; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_INTR ) != 0) { MI_INTR_REG &= ~R4300i_SP_Intr; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_INTR ) != 0) { printf("SP_SET_INTR"); }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_SSTEP ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SSTEP; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_SSTEP ) != 0) { SP_STATUS_REG |= SP_STATUS_SSTEP; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_INTR_BREAK ) != 0) { SP_STATUS_REG &= ~SP_STATUS_INTR_BREAK; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_INTR_BREAK ) != 0) { SP_STATUS_REG |= SP_STATUS_INTR_BREAK; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_SIG0 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG0; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_SIG0 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG0; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_SIG1 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG1; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_SIG1 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG1; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_SIG2 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG2; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_SIG2 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG2; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_SIG3 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG3; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_SIG3 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG3; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_SIG4 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG4; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_SIG4 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG4; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_SIG5 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG5; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_SIG5 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG5; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_SIG6 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG6; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_SIG6 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG6; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_SIG7 ) != 0) { SP_STATUS_REG &= ~SP_STATUS_SIG7; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_SIG7 ) != 0) { SP_STATUS_REG |= SP_STATUS_SIG7; }
-		break;
-	case 7: SP_SEMAPHORE_REG = 0; break;
-	case 8:
-		DPC_START_REG = RSP_GPR[RSPOpC.rt].UW;
-		DPC_CURRENT_REG = RSP_GPR[RSPOpC.rt].UW;
-		break;
-	case 9:
-		DPC_END_REG = RSP_GPR[RSPOpC.rt].UW;
-		break;
-	case 10: DPC_CURRENT_REG = RSP_GPR[RSPOpC.rt].UW; break;
-	case 11:
-		if ( ( RSP_GPR[RSPOpC.rt].W & DPC_CLR_XBUS_DMEM_DMA ) != 0) { DPC_STATUS_REG &= ~DPC_STATUS_XBUS_DMEM_DMA; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & DPC_SET_XBUS_DMEM_DMA ) != 0) { DPC_STATUS_REG |= DPC_STATUS_XBUS_DMEM_DMA; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & DPC_CLR_FREEZE ) != 0) { DPC_STATUS_REG &= ~DPC_STATUS_FREEZE; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & DPC_SET_FREEZE ) != 0) { DPC_STATUS_REG |= DPC_STATUS_FREEZE; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & DPC_CLR_FLUSH ) != 0) { DPC_STATUS_REG &= ~DPC_STATUS_FLUSH; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & DPC_SET_FLUSH ) != 0) { DPC_STATUS_REG |= DPC_STATUS_FLUSH; }
-		if ( ( RSP_GPR[RSPOpC.rt].W & DPC_CLR_TMEM_CTR ) != 0) { /* printf("RSP: DPC_STATUS_REG: DPC_CLR_TMEM_CTR"); */ }
-		if ( ( RSP_GPR[RSPOpC.rt].W & DPC_CLR_PIPE_CTR ) != 0) { printf("RSP: DPC_STATUS_REG: DPC_CLR_PIPE_CTR"); }
-		if ( ( RSP_GPR[RSPOpC.rt].W & DPC_CLR_CMD_CTR ) != 0) { printf("RSP: DPC_STATUS_REG: DPC_CLR_CMD_CTR"); }
-		if ( ( RSP_GPR[RSPOpC.rt].W & DPC_CLR_CLOCK_CTR ) != 0) { /* printf("RSP: DPC_STATUS_REG: DPC_CLR_CLOCK_CTR"); */ }
-		break;
-	default:
-		printf("have not implemented RSP MT cpu->CP0 reg (%d)",RSPOpC.rd);
-	}
-}
-
-/************************** Cop2 functions *************************/
-void RSP_Cop2_MF (void) {
-	int32_t element = (RSPOpC.sa >> 1);
-	RSP_GPR[RSPOpC.rt].B[1] = RSP_Vect[RSPOpC.rd].B[15 - element];
-	RSP_GPR[RSPOpC.rt].B[0] = RSP_Vect[RSPOpC.rd].B[15 - ((element + 1) % 16)];
-	RSP_GPR[RSPOpC.rt].W = RSP_GPR[RSPOpC.rt].HW[0];
-}
-
-void RSP_Cop2_CF (void) {
-	switch ((RSPOpC.rd & 0x03)) {
-	case 0: RSP_GPR[RSPOpC.rt].W = RSP_Flags[0].HW[0]; break;
-	case 1: RSP_GPR[RSPOpC.rt].W = RSP_Flags[1].HW[0]; break;
-	case 2: RSP_GPR[RSPOpC.rt].W = RSP_Flags[2].HW[0]; break;
-	case 3: RSP_GPR[RSPOpC.rt].W = RSP_Flags[2].HW[0]; break;
-	}
-}
-
-void RSP_Cop2_MT (void) {
-	int32_t element = 15 - (RSPOpC.sa >> 1);
-	RSP_Vect[RSPOpC.rd].B[element] = RSP_GPR[RSPOpC.rt].B[1];
-	if (element != 0) {
-		RSP_Vect[RSPOpC.rd].B[element - 1] = RSP_GPR[RSPOpC.rt].B[0];
-	}
-}
-
-void RSP_Cop2_CT (void) {
-	switch ((RSPOpC.rd & 0x03)) {
-	case 0: RSP_Flags[0].HW[0] = RSP_GPR[RSPOpC.rt].HW[0]; break;
-	case 1: RSP_Flags[1].HW[0] = RSP_GPR[RSPOpC.rt].HW[0]; break;
-	case 2: RSP_Flags[2].B[0] = RSP_GPR[RSPOpC.rt].B[0]; break;
-	case 3: RSP_Flags[2].B[0] = RSP_GPR[RSPOpC.rt].B[0]; break;
-	}
-}
-
-void RSP_COP2_VECTOR (void) {
-//((void (*)()) RSP_Vector[ RSPOpC.funct ])();
-	(RSP_Vector[ RSPOpC.funct ])();
-}
-/************************** Vect functions **************************/
- /*
- vmulf $v27, $v31[14]
-
- Format: VMULF $v<dest>, $v<s1>, $v<s2>[el]
- sa rd rt rs
- */
-void RSP_Vector_VMULF (void) {
-	int32_t count, el, del;
-	REGISTER32 temp;
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		if (RSP_Vect[RSPOpC.rd].UHW[el] != 0x8000 || RSP_Vect[RSPOpC.rt].UHW[del] != 0x8000) {
-			temp.W = ((int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)RSP_Vect[RSPOpC.rt].HW[del]) << 1;
-			temp.UW += 0x8000;
-			RSP_ACCUM[el].HW[2] = temp.HW[1];
-			RSP_ACCUM[el].HW[1] = temp.HW[0];
-			if ( RSP_ACCUM[el].HW[2] < 0 ) {
-				RSP_ACCUM[el].HW[3] = -1;
-			} else {
-				RSP_ACCUM[el].HW[3] = 0;
-			}
-			RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-		} else {
-			temp.W = 0x80000000;
-			RSP_ACCUM[el].UHW[3] = 0;
-			RSP_ACCUM[el].UHW[2] = 0x8000;
-			RSP_ACCUM[el].UHW[1] = 0x8000;
-			RSP_Vect[RSPOpC.sa].HW[el] = 0x7FFF;
-		}
-	}
-}
-
-void RSP_Vector_VMULU (void) {
-	int32_t count, el, del;
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-		RSP_ACCUM[el].DW = (int64_t)(RSP_Vect[RSPOpC.rd].HW[el] * RSP_Vect[RSPOpC.rt].HW[del]) << 17;
-		RSP_ACCUM[el].DW += 0x80000000;
-		if (RSP_ACCUM[el].DW < 0) {
-			RSP_Vect[RSPOpC.sa].HW[el] = 0;
-		} else if ((int16_t)(RSP_ACCUM[el].UHW[3] ^ RSP_ACCUM[el].UHW[2]) < 0) {
-			RSP_Vect[RSPOpC.sa].HW[el] = -1;
-		} else {
-			RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-		}
-	}
-}
-
-/*
- vmudl $v23, $v30, $v24[10]
- rs=10, rt=24, rd=30, sa=23
-
- Format: VMUDM $v<dest>, $v<s1>, $v<s2>[el]
- 					sa		 rd	 rt rs
- vmudm $v23, $v20, $v24[10]
- rs=10, rt=24, rd=20, sa=23
-
-*/
-
-void RSP_Vector_VMUDL (void) {
-	int32_t count, el, del;
-	REGISTER32 temp;
-
-	/*if(((*PrgCount) & 0xFFC) == 0xC08) {
-		for(int32_t i = 0; i < 32; i++) {
-			cprintf("i = %d : ", i);
-			for (count = 0; count < 8; count ++ ) {
-				cprintf("%d,%d ", Indx[i].B[count], EleSpec[i].B[Indx[i].B[count]]);
-			}
-			cprintf("\n");
-		}
-
-	}*/
-
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		temp.UW = (uint32_t)RSP_Vect[RSPOpC.rd].UHW[el] * (uint32_t)RSP_Vect[RSPOpC.rt].UHW[del];
-
-		RSP_ACCUM[el].W[1] = 0;
-		RSP_ACCUM[el].HW[1] = temp.HW[1];
-		RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[1];
-
-	}
-
-}
-
-void RSP_Vector_VMUDM (void) {
-	int32_t count, el, del;
-	REGISTER32 temp;
-
-//	cprintf("%08x%08x x %08x%08x = ", RSP_Vect[RSPOpC.rd].DW[0], RSP_Vect[RSPOpC.rd].DW[1],RSP_Vect[RSPOpC.rt].DW[0],RSP_Vect[RSPOpC.rt].DW[1])
-
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		temp.UW = (uint32_t)((int32_t)RSP_Vect[RSPOpC.rd].HW[el]) * (uint32_t)RSP_Vect[RSPOpC.rt].UHW[del];
-		if (temp.W < 0) {
-			RSP_ACCUM[el].HW[3] = -1;
-		} else {
-			RSP_ACCUM[el].HW[3] = 0;
-		}
-		RSP_ACCUM[el].HW[2] = temp.HW[1];
-		RSP_ACCUM[el].HW[1] = temp.HW[0];
-		RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-	}
-	//cprintf("%08x%08x\n", RSP_Vect[RSPOpC.sa].DW[0],RSP_Vect[RSPOpC.sa].DW[1]);
-}
-
-
-void RSP_Vector_VMUDN (void) {
-	int32_t count, el, del;
-	REGISTER32 temp;
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-
-		temp.UW = (uint32_t)RSP_Vect[RSPOpC.rd].UHW[el] * (uint32_t)(int32_t)(RSP_Vect[RSPOpC.rt].HW[del]);
-		if (temp.W < 0) {
-			RSP_ACCUM[el].HW[3] = -1;
-		} else {
-			RSP_ACCUM[el].HW[3] = 0;
-		}
-		RSP_ACCUM[el].HW[2] = temp.HW[1];
-		RSP_ACCUM[el].HW[1] = temp.HW[0];
-		RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[1];
-	}
-
-}
-
-void RSP_Vector_VMUDH (void) {
-	int32_t count, el, del;
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		RSP_ACCUM[el].W[1] = (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)RSP_Vect[RSPOpC.rt].HW[del];
-		RSP_ACCUM[el].HW[1] = 0;
-		if (RSP_ACCUM[el].HW[3] < 0) {
-			if (RSP_ACCUM[el].UHW[3] != 0xFFFF) {
-				RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)0x8000;
-			} else {
-				if (RSP_ACCUM[el].HW[2] >= 0) {
-					RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)0x8000;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-				}
-			}
-		} else {
-			if (RSP_ACCUM[el].UHW[3] != 0) {
-				RSP_Vect[RSPOpC.sa].HW[el] = 0x7FFF;
-			} else {
-				if (RSP_ACCUM[el].HW[2] < 0) {
-					RSP_Vect[RSPOpC.sa].HW[el] = 0x7FFF;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-				}
-			}
-		}
-	}
-}
-
-void RSP_Vector_VMACF (void) {
-	int32_t count, el, del;
-	//UWORD temp, temp2;
-	REGISTER32 temp;
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		/*temp.W = (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)(uint32_t)RSP_Vect[RSPOpC.rt].HW[del];
-		RSP_ACCUM[el].UHW[3] += (uint16_t)(temp.W >> 31);
-		temp.UW = temp.UW << 1;
-		temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1];
-		RSP_ACCUM[el].HW[1] = temp2.HW[0];
-		temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
-		RSP_ACCUM[el].HW[2] = temp2.HW[0];
-		RSP_ACCUM[el].HW[3] += temp2.HW[1];*/
-		temp.W = (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)(uint32_t)RSP_Vect[RSPOpC.rt].HW[del];
-		RSP_ACCUM[el].DW += ((int64_t)temp.W) << 17;
-		if (RSP_ACCUM[el].HW[3] < 0) {
-			if (RSP_ACCUM[el].UHW[3] != 0xFFFF) {
-				RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)0x8000;
-			} else {
-				if (RSP_ACCUM[el].HW[2] >= 0) {
-					RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)0x8000;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-				}
-			}
-		} else {
-			if (RSP_ACCUM[el].UHW[3] != 0) {
-				RSP_Vect[RSPOpC.sa].HW[el] = 0x7FFF;
-			} else {
-				if (RSP_ACCUM[el].HW[2] < 0) {
-					RSP_Vect[RSPOpC.sa].HW[el] = 0x7FFF;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-				}
-			}
-		}
-	}
-}
-
-void RSP_Vector_VMACU (void) {
-	int32_t count, el, del;
-	REGISTER32 temp, temp2;
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		temp.W = (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)(uint32_t)RSP_Vect[RSPOpC.rt].HW[del];
-		RSP_ACCUM[el].UHW[3] += (uint16_t)(temp.W >> 31);
-		temp.UW = temp.UW << 1;
-		temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1];
-		RSP_ACCUM[el].HW[1] = temp2.HW[0];
-		temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
-		RSP_ACCUM[el].HW[2] = temp2.HW[0];
-		RSP_ACCUM[el].HW[3] += temp2.HW[1];
-		if (RSP_ACCUM[el].HW[3] < 0) {
-			RSP_Vect[RSPOpC.sa].HW[el] = 0;
-		} else {
-			if (RSP_ACCUM[el].UHW[3] != 0) {
-				RSP_Vect[RSPOpC.sa].UHW[el] = 0xFFFF;
-			} else {
-				if (RSP_ACCUM[el].HW[2] < 0) {
-					RSP_Vect[RSPOpC.sa].UHW[el] = 0xFFFF;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-				}
-			}
-		}
-	}
-}
-
-void RSP_Vector_VMACQ (void) {
-	int32_t count, el, del;
-	REGISTER32 temp;
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		if (RSP_ACCUM[el].W[1] > 0x20) {
-			if ((RSP_ACCUM[el].W[1] & 0x20) == 0) {
-				RSP_ACCUM[el].W[1] -= 0x20;
-			}
-		} else if (RSP_ACCUM[el].W[1] < -0x20) {
-			if ((RSP_ACCUM[el].W[1] & 0x20) == 0) {
-				RSP_ACCUM[el].W[1] += 0x20;
-			}
-		}
-		temp.W = RSP_ACCUM[el].W[1] >> 1;
-		if (temp.HW[1] < 0) {
-			if (temp.UHW[1] != 0xFFFF) {
-				RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)0x8000;
-			} else {
-				if (temp.HW[0] >= 0) {
-					RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)0x8000;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)(temp.UW & 0xFFF0);
-				}
-			}
-		} else {
-			if (temp.UHW[1] != 0) {
-				RSP_Vect[RSPOpC.sa].HW[el] = 0x7FF0;
-			} else {
-				if (temp.HW[0] < 0) {
-					RSP_Vect[RSPOpC.sa].HW[el] = 0x7FF0;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)(temp.UW & 0xFFF0);
-				}
-			}
-		}
-	}
-}
-
-void RSP_Vector_VMADL (void) {
-	int32_t count, el, del;
-	REGISTER32 temp, temp2;
-
-
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		temp.UW = (uint32_t)RSP_Vect[RSPOpC.rd].UHW[el] * (uint32_t)RSP_Vect[RSPOpC.rt].UHW[del];
-		temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[1];
-		RSP_ACCUM[el].HW[1] = temp2.HW[0];
-		temp2.UW = RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
-		RSP_ACCUM[el].HW[2] = temp2.HW[0];
-		RSP_ACCUM[el].HW[3] += temp2.HW[1];
-		if (RSP_ACCUM[el].HW[3] < 0) {
-			if (RSP_ACCUM[el].UHW[3] != 0xFFFF) {
-				RSP_Vect[RSPOpC.sa].HW[el] = 0;
-			} else {
-				if (RSP_ACCUM[el].HW[2] >= 0) {
-					RSP_Vect[RSPOpC.sa].HW[el] = 0;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[1];
-				}
-			}
-		} else {
-			if (RSP_ACCUM[el].UHW[3] != 0) {
-				RSP_Vect[RSPOpC.sa].UHW[el] = 0xFFFF;
-			} else {
-				if (RSP_ACCUM[el].HW[2] < 0) {
-					RSP_Vect[RSPOpC.sa].UHW[el] = 0xFFFF;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[1];
-				}
-			}
-		}
-	}
-
-}
-
-void RSP_Vector_VMADM (void) {
-	int32_t count, el, del;
-	REGISTER32 temp, temp2;
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		temp.UW = (uint32_t)((int32_t)RSP_Vect[RSPOpC.rd].HW[el]) * (uint32_t)RSP_Vect[RSPOpC.rt].UHW[del];
-		temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1];
-		RSP_ACCUM[el].HW[1] = temp2.HW[0];
-		temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
-		RSP_ACCUM[el].HW[2] = temp2.HW[0];
-		RSP_ACCUM[el].HW[3] += temp2.HW[1];
-		if (temp.W < 0) {
-			RSP_ACCUM[el].HW[3] -= 1;
-		}
-		if (RSP_ACCUM[el].HW[3] < 0) {
-			if (RSP_ACCUM[el].UHW[3] != 0xFFFF) {
-				RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)0x8000;
-			} else {
-				if (RSP_ACCUM[el].HW[2] >= 0) {
-					RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)0x8000;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-				}
-			}
-		} else {
-			if (RSP_ACCUM[el].UHW[3] != 0) {
-				RSP_Vect[RSPOpC.sa].HW[el] = 0x7FFF;
-			} else {
-				if (RSP_ACCUM[el].HW[2] < 0) {
-					RSP_Vect[RSPOpC.sa].HW[el] = 0x7FFF;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-				}
-			}
-		}
-		//RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-	}
-}
-
-void RSP_Vector_VMADN (void) {
-	int32_t count, el, del;
-	REGISTER32 temp, temp2;
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		temp.UW = (uint32_t)RSP_Vect[RSPOpC.rd].UHW[el] * (uint32_t)((int32_t)RSP_Vect[RSPOpC.rt].HW[del]);
-		temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1];
-		RSP_ACCUM[el].HW[1] = temp2.HW[0];
-		temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
-		RSP_ACCUM[el].HW[2] = temp2.HW[0];
-		RSP_ACCUM[el].HW[3] += temp2.HW[1];
-		if (temp.W < 0) {
-			RSP_ACCUM[el].HW[3] -= 1;
-		}
-		if (RSP_ACCUM[el].HW[3] < 0) {
-			if (RSP_ACCUM[el].UHW[3] != 0xFFFF) {
-				RSP_Vect[RSPOpC.sa].HW[el] = 0;
-			} else {
-				if (RSP_ACCUM[el].HW[2] >= 0) {
-					RSP_Vect[RSPOpC.sa].HW[el] = 0;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[1];
-				}
-			}
-		} else {
-			if (RSP_ACCUM[el].UHW[3] != 0) {
-				RSP_Vect[RSPOpC.sa].UHW[el] = 0xFFFF;
-			} else {
-				if (RSP_ACCUM[el].HW[2] < 0) {
-					RSP_Vect[RSPOpC.sa].UHW[el] = 0xFFFF;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[1];
-				}
-			}
-		}
-	}
-}
-
-void RSP_Vector_VMADH (void) {
-	int32_t count, el, del;
-
-	for (count = 0; count < 8; count ++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		RSP_ACCUM[el].W[1] += (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)RSP_Vect[RSPOpC.rt].HW[del];
-		if (RSP_ACCUM[el].HW[3] < 0) {
-			if (RSP_ACCUM[el].UHW[3] != 0xFFFF) {
-				RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)0x8000;
-			} else {
-				if (RSP_ACCUM[el].HW[2] >= 0) {
-					RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)0x8000;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-				}
-			}
-		} else {
-			if (RSP_ACCUM[el].UHW[3] != 0) {
-				RSP_Vect[RSPOpC.sa].HW[el] = 0x7FFF;
-			} else {
-				if (RSP_ACCUM[el].HW[2] < 0) {
-					RSP_Vect[RSPOpC.sa].HW[el] = 0x7FFF;
-				} else {
-					RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[2];
-				}
-			}
-		}
-	}
-}
-
-void RSP_Vector_VADD (void) {
-	int32_t count, el, del;
-	REGISTER32 temp;
-
-	for ( count = 0; count < 8; count++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		temp.W = (int32_t)RSP_Vect[RSPOpC.rd].HW[el] + (int32_t)RSP_Vect[RSPOpC.rt].HW[del] +
-			 ((RSP_Flags[0].UW >> (7 - el)) & 0x1);
-		RSP_ACCUM[el].HW[1] = temp.HW[0];
-		if ((temp.HW[0] & 0x8000) == 0) {
-			if (temp.HW[1] != 0) {
-				RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)0x8000;
-			} else {
-				RSP_Vect[RSPOpC.sa].HW[el] = temp.HW[0];
-			}
-		} else {
-			if (temp.HW[1] != -1 ) {
-				RSP_Vect[RSPOpC.sa].HW[el] = 0x7FFF;
-			} else {
-				RSP_Vect[RSPOpC.sa].HW[el] = temp.HW[0];
-			}
-		}
-	}
-	RSP_Flags[0].UW = 0;
-}
-
-void RSP_Vector_VSUB (void) {
-	int32_t count, el, del;
-	REGISTER32 temp;
-
-	for ( count = 0; count < 8; count++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		temp.W = (int32_t)RSP_Vect[RSPOpC.rd].HW[el] - (int32_t)RSP_Vect[RSPOpC.rt].HW[del] -
-			 ((RSP_Flags[0].UW >> (7 - el)) & 0x1);
-		RSP_ACCUM[el].HW[1] = temp.HW[0];
-		if ((temp.HW[0] & 0x8000) == 0) {
-			if (temp.HW[1] != 0) {
-				RSP_Vect[RSPOpC.sa].HW[el] = (uint16_t)0x8000;
-			} else {
-				RSP_Vect[RSPOpC.sa].HW[el] = temp.HW[0];
-			}
-		} else {
-			if (temp.HW[1] != -1 ) {
-				RSP_Vect[RSPOpC.sa].HW[el] = 0x7FFF;
-			} else {
-				RSP_Vect[RSPOpC.sa].HW[el] = temp.HW[0];
-			}
-		}
-	}
-	RSP_Flags[0].UW = 0;
-}
-
-void RSP_Vector_VABS (void) {
-	int32_t count, el, del;
-
-	for ( count = 0; count < 8; count++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		if (RSP_Vect[RSPOpC.rd].HW[el] > 0) {
-			RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rt].UHW[del];
-		} else if (RSP_Vect[RSPOpC.rd].HW[el] < 0) {
-			if (RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[el]] == 0x8000) {
-				RSP_Vect[RSPOpC.sa].HW[el] = 0x7FFF;
-			} else {
-				RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rt].HW[del] * -1;
-			}
-		} else {
-			RSP_Vect[RSPOpC.sa].HW[el] = 0;
-		}
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.sa].HW[el];
-	}
-}
-
-void RSP_Vector_VADDC (void) {
-	int32_t count, el, del;
-	REGISTER32 temp;
-
-	RSP_Flags[0].UW = 0;
-	for ( count = 0; count < 8; count++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		temp.UW = (int32_t)RSP_Vect[RSPOpC.rd].UHW[el] + (int32_t)RSP_Vect[RSPOpC.rt].UHW[del];
-		RSP_ACCUM[el].HW[1] = temp.HW[0];
-		RSP_Vect[RSPOpC.sa].HW[el] = temp.HW[0];
-		if (temp.UW & 0xffff0000) {
-			RSP_Flags[0].UW |= ( 1 << (7 - el) );
-		}
-	}
-}
-
-void RSP_Vector_VSUBC (void) {
-	int32_t count, el, del;
-	REGISTER32 temp;
-
-	RSP_Flags[0].UW = 0x0;
-	for ( count = 0; count < 8; count++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		temp.UW = (int32_t)RSP_Vect[RSPOpC.rd].UHW[el] - (int32_t)RSP_Vect[RSPOpC.rt].UHW[del];
-		RSP_ACCUM[el].HW[1] = temp.HW[0];
-		RSP_Vect[RSPOpC.sa].HW[el] = temp.HW[0];
-		if (temp.HW[0] != 0) {
-			RSP_Flags[0].UW |= ( 0x1 << (15 - el) );
-		}
-		if (temp.UW & 0xffff0000) {
-			RSP_Flags[0].UW |= ( 0x1 << (7 - el) );
-		}
-	}
-}
-
-void RSP_Vector_VSAW (void) {
-	switch ((RSPOpC.rs & 0xF)) {
-	case 8:
-		RSP_Vect[RSPOpC.sa].HW[0] = RSP_ACCUM[0].HW[3];
-		RSP_Vect[RSPOpC.sa].HW[1] = RSP_ACCUM[1].HW[3];
-		RSP_Vect[RSPOpC.sa].HW[2] = RSP_ACCUM[2].HW[3];
-		RSP_Vect[RSPOpC.sa].HW[3] = RSP_ACCUM[3].HW[3];
-		RSP_Vect[RSPOpC.sa].HW[4] = RSP_ACCUM[4].HW[3];
-		RSP_Vect[RSPOpC.sa].HW[5] = RSP_ACCUM[5].HW[3];
-		RSP_Vect[RSPOpC.sa].HW[6] = RSP_ACCUM[6].HW[3];
-		RSP_Vect[RSPOpC.sa].HW[7] = RSP_ACCUM[7].HW[3];
-		break;
-	case 9:
-		RSP_Vect[RSPOpC.sa].HW[0] = RSP_ACCUM[0].HW[2];
-		RSP_Vect[RSPOpC.sa].HW[1] = RSP_ACCUM[1].HW[2];
-		RSP_Vect[RSPOpC.sa].HW[2] = RSP_ACCUM[2].HW[2];
-		RSP_Vect[RSPOpC.sa].HW[3] = RSP_ACCUM[3].HW[2];
-		RSP_Vect[RSPOpC.sa].HW[4] = RSP_ACCUM[4].HW[2];
-		RSP_Vect[RSPOpC.sa].HW[5] = RSP_ACCUM[5].HW[2];
-		RSP_Vect[RSPOpC.sa].HW[6] = RSP_ACCUM[6].HW[2];
-		RSP_Vect[RSPOpC.sa].HW[7] = RSP_ACCUM[7].HW[2];
-		break;
-	case 10:
-		RSP_Vect[RSPOpC.sa].HW[0] = RSP_ACCUM[0].HW[1];
-		RSP_Vect[RSPOpC.sa].HW[1] = RSP_ACCUM[1].HW[1];
-		RSP_Vect[RSPOpC.sa].HW[2] = RSP_ACCUM[2].HW[1];
-		RSP_Vect[RSPOpC.sa].HW[3] = RSP_ACCUM[3].HW[1];
-		RSP_Vect[RSPOpC.sa].HW[4] = RSP_ACCUM[4].HW[1];
-		RSP_Vect[RSPOpC.sa].HW[5] = RSP_ACCUM[5].HW[1];
-		RSP_Vect[RSPOpC.sa].HW[6] = RSP_ACCUM[6].HW[1];
-		RSP_Vect[RSPOpC.sa].HW[7] = RSP_ACCUM[7].HW[1];
-		break;
-	default:
-		RSP_Vect[RSPOpC.sa].DW[1] = 0;
-		RSP_Vect[RSPOpC.sa].DW[0] = 0;
-	}
-}
-
-void RSP_Vector_VLT (void) {
-	int32_t count, el, del;
-
-	RSP_Flags[1].UW = 0;
-	for ( count = 0; count < 8; count++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		if (RSP_Vect[RSPOpC.rd].HW[el] < RSP_Vect[RSPOpC.rt].HW[del]) {
-			RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rd].UHW[el];
-			RSP_Flags[1].UW |= ( 1 << (7 - el) );
-		} else if (RSP_Vect[RSPOpC.rd].HW[el] != RSP_Vect[RSPOpC.rt].HW[del]) {
-			RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rt].UHW[del];
-			RSP_Flags[1].UW &= ~( 1 << (7 - el) );
-		} else {
-			RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rd].UHW[el];
-			if ( (RSP_Flags[0].UW & (0x101 << (7 - el))) == (uint16_t)(0x101 << (7 - el))) {
-				RSP_Flags[1].UW |= ( 1 << (7 - el) );
-			} else {
-				RSP_Flags[1].UW &= ~( 1 << (7 - el) );
-			}
-		}
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.sa].HW[el];
-	}
-	RSP_Flags[0].UW = 0;
-}
-
-void RSP_Vector_VEQ (void) {
-	int32_t count, el, del;
-
-	RSP_Flags[1].UW = 0;
-	for ( count = 0; count < 8; count++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
- RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rt].UHW[del];
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rt].UHW[del];
-		if (RSP_Vect[RSPOpC.rd].UHW[el] == RSP_Vect[RSPOpC.rt].UHW[del]) {
-			if ( (RSP_Flags[0].UW & (1 << (15 - el))) == 0) {
-				RSP_Flags[1].UW |= ( 1 << (7 - el));
-			}
-		}
-	}
-	RSP_Flags[0].UW = 0;
-}
-
-void RSP_Vector_VNE (void) {
-	int32_t count, el, del;
-
-	RSP_Flags[1].UW = 0;
-	for ( count = 0; count < 8; count++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
- RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rd].UHW[el];
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rd].UHW[el];
-		if (RSP_Vect[RSPOpC.rd].UHW[el] != RSP_Vect[RSPOpC.rt].UHW[del]) {
-			RSP_Flags[1].UW |= ( 1 << (7 - el) );
-		} else {
-			if ( (RSP_Flags[0].UW & (1 << (15 - el))) != 0) {
-				RSP_Flags[1].UW |= ( 1 << (7 - el) );
-			}
-		}
-	}
-	RSP_Flags[0].UW = 0;
-}
-
-void RSP_Vector_VGE (void) {
-	int32_t count, el, del;
-
-	RSP_Flags[1].UW = 0;
-	for ( count = 0; count < 8; count++ ) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		if (RSP_Vect[RSPOpC.rd].HW[el] == RSP_Vect[RSPOpC.rt].HW[del]) {
-			RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rd].UHW[el];
-			if ( (RSP_Flags[0].UW & (0x101 << (7 - el))) == (uint16_t)(0x101 << (7 - el))) {
-				RSP_Flags[1].UW &= ~( 1 << (7 - el) );
-			} else {
-				RSP_Flags[1].UW |= ( 1 << (7 - el) );
-			}
-		} else if (RSP_Vect[RSPOpC.rd].HW[el] > RSP_Vect[RSPOpC.rt].HW[del]) {
-			RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rd].UHW[el];
-			RSP_Flags[1].UW |= ( 1 << (7 - el) );
-		} else {
-			RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rt].UHW[del];
-			RSP_Flags[1].UW &= ~( 1 << (7 - el) );
-		}
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.sa].HW[el];
-	}
-	RSP_Flags[0].UW = 0;
-}
-
-void RSP_Vector_VCL (void) {
-	int32_t count, el, del;
-
-	for (count = 0;count < 8; count++) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		if ((RSP_Flags[0].UW & ( 1 << (7 - el))) != 0 ) {
-			if ((RSP_Flags[0].UW & ( 1 << (15 - el))) != 0 ) {
-				if ((RSP_Flags[1].UW & ( 1 << (7 - el))) != 0 ) {
-					RSP_ACCUM[el].HW[1] = -RSP_Vect[RSPOpC.rt].UHW[del];
-				} else {
-					RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rd].HW[el];
-				}
-			} else {
-				if ((RSP_Flags[2].UW & ( 1 << (7 - el)))) {
-					if ( RSP_Vect[RSPOpC.rd].UHW[el] + RSP_Vect[RSPOpC.rt].UHW[del] > 0x10000) {
-						RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rd].HW[el];
-						RSP_Flags[1].UW &= ~(1 << (7 - el));
-					} else {
-						RSP_ACCUM[el].HW[1] = -RSP_Vect[RSPOpC.rt].UHW[del];
-						RSP_Flags[1].UW |= (1 << (7 - el));
-					}
-				} else {
-					if (RSP_Vect[RSPOpC.rt].UHW[del] + RSP_Vect[RSPOpC.rd].UHW[el] != 0) {
-						RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rd].HW[el];
-						RSP_Flags[1].UW &= ~(1 << (7 - el));
-					} else {
-						RSP_ACCUM[el].HW[1] = -RSP_Vect[RSPOpC.rt].UHW[del];
-						RSP_Flags[1].UW |= (1 << (7 - el));
-					}
-				}
-			}
-		} else {
-			if ((RSP_Flags[0].UW & ( 1 << (15 - el))) != 0 ) {
-				if ((RSP_Flags[1].UW & ( 1 << (15 - el))) != 0 ) {
-					RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rt].HW[del];
-				} else {
-					RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rd].HW[el];
-				}
-			} else {
-				if ( RSP_Vect[RSPOpC.rd].UHW[el] - RSP_Vect[RSPOpC.rt].UHW[del] >= 0) {
-					RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rt].UHW[del];
-					RSP_Flags[1].UW |= (1 << (15 - el));
-				} else {
-					RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rd].HW[el];
-					RSP_Flags[1].UW &= ~(1 << (15 - el));
-				}
-			}
-		}
-		RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[1];
-	}
-	RSP_Flags[0].UW = 0;
-	RSP_Flags[2].UW = 0;
-}
-
-void RSP_Vector_VCH (void) {
-	int32_t count, el, del;
-
-	RSP_Flags[0].UW = 0;
-	RSP_Flags[1].UW = 0;
-	RSP_Flags[2].UW = 0;
-
-	for (count = 0;count < 8; count++) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		if ((RSP_Vect[RSPOpC.rd].HW[el] ^ RSP_Vect[RSPOpC.rt].HW[del]) < 0) {
-			RSP_Flags[0].UW |= ( 1 << (7 - el));
-			if (RSP_Vect[RSPOpC.rt].HW[del] < 0) {
-				RSP_Flags[1].UW |= ( 1 << (15 - el));
-
-			}
-			if (RSP_Vect[RSPOpC.rd].HW[el] + RSP_Vect[RSPOpC.rt].HW[del] <= 0) {
-				if (RSP_Vect[RSPOpC.rd].HW[el] + RSP_Vect[RSPOpC.rt].HW[del] == -1) {
-					RSP_Flags[2].UW |= ( 1 << (7 - el));
-				}
-				RSP_Flags[1].UW |= ( 1 << (7 - el));
-				RSP_Vect[RSPOpC.sa].HW[el] = -RSP_Vect[RSPOpC.rt].UHW[del];
-			} else {
-				RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rd].HW[el];
-			}
-			if (RSP_Vect[RSPOpC.rd].HW[el] + RSP_Vect[RSPOpC.rt].HW[del] != 0) {
-				if (RSP_Vect[RSPOpC.rd].HW[el] != ~RSP_Vect[RSPOpC.rt].HW[del]) {
-					RSP_Flags[0].UW |= ( 1 << (15 - el));
-				}
-			}
-		} else {
-			if (RSP_Vect[RSPOpC.rt].HW[del] < 0) {
-				RSP_Flags[1].UW |= ( 1 << (7 - el));
-			}
-			if (RSP_Vect[RSPOpC.rd].HW[el] - RSP_Vect[RSPOpC.rt].HW[del] >= 0) {
-				RSP_Flags[1].UW |= ( 1 << (15 - el));
-				RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rt].UHW[del];
-			} else {
-				RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rd].HW[el];
-			}
-			if (RSP_Vect[RSPOpC.rd].HW[el] - RSP_Vect[RSPOpC.rt].HW[del] != 0) {
-				if (RSP_Vect[RSPOpC.rd].HW[el] != ~RSP_Vect[RSPOpC.rt].HW[del]) {
-					RSP_Flags[0].UW |= ( 1 << (15 - el));
-				}
-			}
-		}
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.sa].HW[el];
-	}
-}
-
-void RSP_Vector_VCR (void) {
-	int32_t count, el, del;
-
-	RSP_Flags[0].UW = 0;
-	RSP_Flags[1].UW = 0;
-	RSP_Flags[2].UW = 0;
-	for (count = 0;count < 8; count++) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		if ((RSP_Vect[RSPOpC.rd].HW[el] ^ RSP_Vect[RSPOpC.rt].HW[del]) < 0) {
-			if (RSP_Vect[RSPOpC.rt].HW[del] < 0) {
-				RSP_Flags[1].UW |= ( 1 << (15 - el));
-			}
-			if (RSP_Vect[RSPOpC.rd].HW[el] + RSP_Vect[RSPOpC.rt].HW[del] <= 0) {
-				RSP_ACCUM[el].HW[1] = ~RSP_Vect[RSPOpC.rt].UHW[del];
-				RSP_Flags[1].UW |= ( 1 << (7 - el));
-			} else {
-				RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rd].HW[el];
-			}
-		} else {
-			if (RSP_Vect[RSPOpC.rt].HW[del] < 0) {
-				RSP_Flags[1].UW |= ( 1 << (7 - el));
-			}
-			if (RSP_Vect[RSPOpC.rd].HW[el] - RSP_Vect[RSPOpC.rt].HW[del] >= 0) {
-				RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rt].UHW[del];
-				RSP_Flags[1].UW |= ( 1 << (15 - el));
-			} else {
-				RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rd].HW[el];
-			}
-		}
-		RSP_Vect[RSPOpC.sa].HW[el] = RSP_ACCUM[el].HW[1];
-	}
-}
-
-void RSP_Vector_VMRG (void) {
-	int32_t count, el, del;
-
-	for ( count = 0; count < 8; count ++ ){
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		if ((RSP_Flags[1].UW & ( 1 << (7 - el))) != 0) {
-			RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rd].HW[el];
-		} else {
-			RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rt].HW[del];
-		}
-	}
-}
-
-void RSP_Vector_VAND (void) {
-	int32_t count, el, del;
-
-	for ( count = 0; count < 8; count ++ ){
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-		RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rd].HW[el] & RSP_Vect[RSPOpC.rt].HW[del];
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.sa].HW[el];
-	}
-}
-
-void RSP_Vector_VNAND (void) {
-	int32_t count, el, del;
-
-	for ( count = 0; count < 8; count ++ ){
-		el = 7 - count;
-		del = EleSpec[RSPOpC.rs].B[el];
-		RSP_Vect[RSPOpC.sa].HW[el] = ~(RSP_Vect[RSPOpC.rd].HW[el] & RSP_Vect[RSPOpC.rt].HW[del]);
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.sa].HW[el];
-	}
-}
-
-void RSP_Vector_VOR (void) {
-	int32_t count, el, del;
-
-	for ( count = 0; count < 8; count ++ ){
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-		RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rd].HW[el] | RSP_Vect[RSPOpC.rt].HW[del];
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.sa].HW[el];
-	}
-}
-
-void RSP_Vector_VNOR (void) {
-	int32_t count, el, del;
-
-	for ( count = 0; count < 8; count ++ ){
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-		RSP_Vect[RSPOpC.sa].HW[el] = ~(RSP_Vect[RSPOpC.rd].HW[el] | RSP_Vect[RSPOpC.rt].HW[del]);
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.sa].HW[el];
-	}
-}
-
-void RSP_Vector_VXOR (void) {
-	int32_t count, el, del;
-
-	for ( count = 0; count < 8; count ++ ){
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-		RSP_Vect[RSPOpC.sa].HW[el] = RSP_Vect[RSPOpC.rd].HW[el] ^ RSP_Vect[RSPOpC.rt].HW[del];
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.sa].HW[el];
-	}
-}
-
-void RSP_Vector_VNXOR (void) {
-	int32_t count, el, del;
-
-	for ( count = 0; count < 8; count ++ ){
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-		RSP_Vect[RSPOpC.sa].HW[el] = ~(RSP_Vect[RSPOpC.rd].HW[el] ^ RSP_Vect[RSPOpC.rt].HW[del]);
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.sa].HW[el];
-	}
-}
-
-void RSP_Vector_VRCP (void) {
-	int32_t count, neg;
-
-	RecpResult.W = RSP_Vect[RSPOpC.rt].HW[EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)]];
-	if (RecpResult.UW == 0) {
-		RecpResult.UW = 0x7FFFFFFF;
-	} else {
-		if (RecpResult.W < 0) {
-			neg = 1;
-			RecpResult.W = ~RecpResult.W + 1;
-		} else {
-			neg = 0;
-		}
-		for (count = 15; count > 0; count--) {
-			if ((RecpResult.W & (1 << count))) {
-				RecpResult.W &= (0xFFC0 >> (15 - count) );
-				count = 0;
-			}
-		}
-		RecpResult.W = (int32_t)((0x7FFFFFFF / (double)RecpResult.W));
-		for (count = 31; count > 0; count--) {
-			if ((RecpResult.W & (1 << count))) {
-				RecpResult.W &= (0xFFFF8000 >> (31 - count) );
-				count = 0;
-			}
-		}
-		if (neg == 1) {
-			RecpResult.W = ~RecpResult.W;
-		}
-	}
-	for ( count = 0; count < 8; count++ ) {
-		RSP_ACCUM[count].HW[1] = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[count]];
-	}
-	RSP_Vect[RSPOpC.sa].HW[7 - (RSPOpC.rd & 0x7)] = RecpResult.UHW[0];
-}
-
-void RSP_Vector_VRCPL (void) {
-	int32_t count, neg;
-
-	RecpResult.UW = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)]] | Recp.W;
-	if (RecpResult.UW == 0) {
-		RecpResult.UW = 0x7FFFFFFF;
-	} else {
-		if (RecpResult.W < 0) {
-			neg = 1;
-			if (RecpResult.UHW[1] == 0xFFFF && RecpResult.HW[0] < 0) {
-				RecpResult.W = ~RecpResult.W + 1;
-			} else {
-				RecpResult.W = ~RecpResult.W;
-			}
-		} else {
-			neg = 0;
-		}
-		for (count = 31; count > 0; count--) {
-			if ((RecpResult.W & (1 << count))) {
-				RecpResult.W &= (0xFFC00000 >> (31 - count) );
-				count = 0;
-			}
-		}
-		RecpResult.W = 0x7FFFFFFF / RecpResult.W;
-		for (count = 31; count > 0; count--) {
-			if ((RecpResult.W & (1 << count))) {
-				RecpResult.W &= (0xFFFF8000 >> (31 - count) );
-				count = 0;
-			}
-		}
-		if (neg == 1) {
-			RecpResult.W = ~RecpResult.W;
-		}
-	}
-	for ( count = 0; count < 8; count++ ) {
-		RSP_ACCUM[count].HW[1] = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[count]];
-	}
-	RSP_Vect[RSPOpC.sa].HW[7 - (RSPOpC.rd & 0x7)] = RecpResult.UHW[0];
-}
-
-void RSP_Vector_VRCPH (void) {
-	int32_t count;
-
-	Recp.UHW[1] = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)]];
-	for ( count = 0; count < 8; count++ ) {
-		RSP_ACCUM[count].HW[1] = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[count]];
-	}
-	RSP_Vect[RSPOpC.sa].UHW[7 - (RSPOpC.rd & 0x7)] = RecpResult.UHW[1];
-}
-
-void RSP_Vector_VMOV (void) {
-	RSP_Vect[RSPOpC.sa].UHW[7 - (RSPOpC.rd & 0x7)] =
-		RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)]];
-}
-
-void RSP_Vector_VRSQ (void) {
-	int32_t count, neg;
-
-	SQrootResult.W = RSP_Vect[RSPOpC.rt].HW[EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)]];
-	if (SQrootResult.UW == 0) {
-		SQrootResult.UW = 0x7FFFFFFF;
-	} else if (SQrootResult.UW == 0xFFFF8000) {
-		SQrootResult.UW = 0xFFFF0000;
-	} else {
-		if (SQrootResult.W < 0) {
-			neg = 1;
-			SQrootResult.W = ~SQrootResult.W + 1;
-		} else {
-			neg = 0;
-		}
-		for (count = 15; count > 0; count--) {
-			if ((SQrootResult.W & (1 << count))) {
-				SQrootResult.W &= (0xFF80 >> (15 - count) );
-				count = 0;
-			}
-		}
-		//SQrootResult.W = sqrt(SQrootResult.W);
-		SQrootResult.W = (int32_t)(0x7FFFFFFF / (int32_t) sqrt((double) SQrootResult.W));
-		for (count = 31; count > 0; count--) {
-			if ((SQrootResult.W & (1 << count))) {
-				SQrootResult.W &= (0xFFFF8000 >> (31 - count) );
-				count = 0;
-			}
-		}
-		if (neg == 1) {
-			SQrootResult.W = ~SQrootResult.W;
-		}
-	}
-	for ( count = 0; count < 8; count++ ) {
-		RSP_ACCUM[count].HW[1] = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[count]];
-	}
-	RSP_Vect[RSPOpC.sa].HW[7 - (RSPOpC.rd & 0x7)] = SQrootResult.UHW[0];
-}
-
-void RSP_Vector_VRSQL (void) {
-	int32_t count, neg;
-
-	SQrootResult.UW = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)]] | SQroot.W;
-	if (SQrootResult.UW == 0) {
-		SQrootResult.UW = 0x7FFFFFFF;
-	} else if (SQrootResult.UW == 0xFFFF8000) {
-		SQrootResult.UW = 0xFFFF0000;
-	} else {
-		if (SQrootResult.W < 0) {
-			neg = 1;
-			if (SQrootResult.UHW[1] == 0xFFFF && SQrootResult.HW[0] < 0) {
-				SQrootResult.W = ~SQrootResult.W + 1;
-			} else {
-				SQrootResult.W = ~SQrootResult.W;
-			}
-		} else {
-			neg = 0;
-		}
-		for (count = 31; count > 0; count--) {
-			if ((SQrootResult.W & (1 << count))) {
-				SQrootResult.W &= (0xFF800000 >> (31 - count) );
-				count = 0;
-			}
-		}
-		SQrootResult.W = (int32_t)(0x7FFFFFFF / (int32_t) sqrt((double) SQrootResult.W));
-
-		for (count = 31; count > 0; count--) {
-			if ((SQrootResult.W & (1 << count))) {
-				SQrootResult.W &= (0xFFFF8000 >> (31 - count) );
-				count = 0;
-			}
-		}
-		if (neg == 1) {
-			SQrootResult.W = ~SQrootResult.W;
-		}
-	}
-	for ( count = 0; count < 8; count++ ) {
-		RSP_ACCUM[count].HW[1] = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[count]];
-	}
-	RSP_Vect[RSPOpC.sa].HW[7 - (RSPOpC.rd & 0x7)] = SQrootResult.UHW[0];
-}
-
-void RSP_Vector_VRSQH (void) {
-	int32_t count;
-
-	SQroot.UHW[1] = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)]];
-	for ( count = 0; count < 8; count++ ) {
-		RSP_ACCUM[count].HW[1] = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[count]];
-	}
-	RSP_Vect[RSPOpC.sa].UHW[7 - (RSPOpC.rd & 0x7)] = SQrootResult.UHW[1];
-}
-
-void RSP_Vector_VNOOP (void) {}
-/************************** lc2 functions **************************/
-void RSP_Opcode_LBV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset)) &0xFFF);
-	RSP_LBV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_LSV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 1)) &0xFFF);
-	RSP_LSV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_LLV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 2)) &0xFFF);
-	RSP_LLV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_LDV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 3)) &0xFFF);
-	RSP_LDV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_LQV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 4)) &0xFFF);
-	RSP_LQV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_LRV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 4)) &0xFFF);
-	RSP_LRV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_LPV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 3)) &0xFFF);
-	RSP_LPV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_LUV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 3)) &0xFFF);
-	RSP_LUV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_LHV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 4)) &0xFFF);
-	RSP_LHV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_LFV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 4)) &0xFFF);
-	RSP_LFV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_LTV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 4)) &0xFFF);
-	RSP_LTV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-/************************** sc2 functions **************************/
-void RSP_Opcode_SBV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset)) &0xFFF);
-	RSP_SBV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_SSV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 1)) &0xFFF);
-	RSP_SSV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_SLV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 2)) &0xFFF);
-	RSP_SLV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_SDV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 3)) &0xFFF);
-	RSP_SDV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_SQV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 4)) &0xFFF);
-	RSP_SQV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_SRV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 4)) &0xFFF);
-	RSP_SRV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_SPV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 3)) &0xFFF);
-	RSP_SPV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_SUV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 3)) &0xFFF);
-	RSP_SUV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_SHV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 4)) &0xFFF);
-	RSP_SHV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_SFV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 4)) &0xFFF);
-	RSP_SFV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_STV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 4)) &0xFFF);
-	RSP_STV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-void RSP_Opcode_SWV ( void ) {
-	uint32_t Address = ((RSP_GPR[RSPOpC.base].UW + (uint32_t)(RSPOpC.voffset << 4)) & 0xFFF);
-	RSP_SWV_DMEM( Address, RSPOpC.rt, RSPOpC.del);
-}
-
-/************************** Other functions **************************/
-
-void rsp_UnknownOpcode (void) {
-
-	printf("Unhandled RSP opcode (%08x)\n", RSPOpC.Hex);
-	//ExitThread(0);
-	exit(0);
-}
-

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp_mmx.c Deleted

@@ -1,143 +0,0 @@
-/*
- * RSP Compiler plug in for Project 64 (A Nintendo 64 emulator).
- *
- * (c) Copyright 2001 jabo (jabo@emulation64.com) and
- * zilmar (zilmar@emulation64.com)
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include "rsp.h"
-#include "rsp_x86.h"
-#include "recompiler_cpu.h"
-#include "memory.h"
-
-#define PUTDST8(dest,value)  (*((uint8_t *)(dest))=(uint8_t)(value)); dest += 1;
-#define PUTDST16(dest,value) (*((uint16_t *)(dest))=(uint16_t)(value)); dest += 2;
-#define PUTDST32(dest,value) (*((uint32_t *)(dest))=(uint32_t)(value)); dest += 4;
-#define PUTDST64(dest,value) {(*((uint64_t *)(dest))=(uint64_t)(value)); dest += 8;}
-
-void RSPMmxEmptyMultimediaState(void) {
-	PUTDST16(RSPRecompPos,0x770f);
-}
-
-void RSPMmxMoveRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0x7f0f,Source,Dest);
-}
-
-void RSPMmxMoveQwordVariableToReg(int32_t Dest, void *Variable) {
-    OPCODE_REG_VARIABLE(,16,0x6f0f,Dest,Variable);
-}
-
-void RSPMmxMoveQwordRegToVariable(int32_t Dest, void *Variable) {
-	OPCODE_REG_VARIABLE(,16,0x7f0f,Dest,Variable);
-}
-
-void RSPMmxPorRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0x7f0f,Source,Dest);
-}
-
-void RSPMmxPorVariableToReg(void * Variable, int32_t Dest) {
-	OPCODE_REG_VARIABLE(,16,0xeb0f,Dest,Variable);
-}
-
-void RSPMmxPandRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0xdb0f,Dest,Source);
-}
-
-void RSPMmxPandVariableToReg(void * Variable, int32_t Dest) {
-	OPCODE_REG_VARIABLE(,16,0xdb0f,Dest,Variable);
-}
-
-void RSPMmxPandnRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0xdf0f,Dest,Source);
-}
-
-void RSPMmxXorRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0xef0f,Dest,Source);
-}
-
-void RSPMmxShuffleMemoryToReg(int32_t Dest, void * Variable, uint8_t Immed) {
-    OPCODE_REG_VARIABLE(,16,0x700f,Dest,(uint8_t*)Variable);
-    PUTDST8(RSPRecompPos, Immed);
-}
-
-void RSPMmxPmullwRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0xd50f,Dest,Source);
-}
-
-void RSPMmxPmullwVariableToReg(int32_t Dest, void * Variable) {
-    OPCODE_REG_VARIABLE(,16,0xd50f,Dest,Variable);
-}
-
-void RSPMmxPmulhuwRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0xe40f,Dest,Source);
-}
-
-void RSPMmxPmulhwRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0xe50f,Dest,Source);
-}
-
-void RSPMmxPmulhwRegToVariable(int32_t Dest, void * Variable) {
-	OPCODE_REG_VARIABLE(,16,0xe50f,Dest,Variable);
-}
-
-void RSPMmxPsrlwImmed(int32_t Dest, uint8_t Immed) {
-	OPCODE_REG_REG(16,0xe50f,OP_D2,Dest);
-	PUTDST8(RSPRecompPos, Immed);
-}
-
-void RSPMmxPsrawImmed(int32_t Dest, uint8_t Immed) {
-	OPCODE_REG_REG(16,0x710f,OP_D4,Dest);
-	PUTDST8(RSPRecompPos, Immed);
-}
-
-void RSPMmxPsllwImmed(int32_t Dest, uint8_t Immed) {
-	OPCODE_REG_REG(16,0x710f,OP_D6,Dest);
-	PUTDST8(RSPRecompPos, Immed);
-}
-
-void RSPMmxPaddswRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0xed0f,Dest,Source);
-}
-
-void RSPMmxPaddswVariableToReg(int32_t Dest, void * Variable) {
-	OPCODE_REG_VARIABLE(,16,0xed0f,Dest,Variable);
-}
-
-void RSPMmxPaddwRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0xfd0f,Dest,Source);
-}
-
-void RSPMmxPackSignedDwords(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0x6b0f,Dest,Source);
-}
-
-void RSPMmxUnpackLowWord(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0x610f,Dest,Source);
-}
-
-void RSPMmxUnpackHighWord(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0x690f,Dest,Source);
-}
-
-void RSPMmxCompareGreaterWordRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0x650f,Dest,Source);
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp_recompiler_analysis.c Deleted

@@ -1,1780 +0,0 @@
-/*
- * RSP Compiler plug in for Project 64 (A Nintendo 64 emulator).
- *
- * (c) Copyright 2001 jabo (jabo@emulation64.com) and
- * zilmar (zilmar@emulation64.com)
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include "rsp.h"
-#include "rsp_recompiler_cpu.h"
-
-#define RSP_SAFE_ANALYSIS /* makes optimization less risky (dlist useful) */
-
-/************************************************************
-** IsOpcodeNop
-**
-** Output: BOOLean whether opcode at PC is a NOP
-** Input: PC
-*************************************************************/
-
-int32_t IsOpcodeNop(uint32_t PC) {
-	RSPOPCODE RspOp;
-	RSP_LW_IMEM(PC, &RspOp.Hex);
-
-	if (RspOp.op == RSP_SPECIAL && RspOp.funct == RSP_SPECIAL_SLL) {
-		return (RspOp.rd == 0) ? 1 : 0;
-	}
-
-	return 0;
-}
-
-/************************************************************
-** IsNextInstructionMmx
-**
-** Output: determines EMMS status
-** Input: PC
-*************************************************************/
-
-int32_t IsNextInstructionMmx(uint32_t PC) {
-	RSPOPCODE RspOp;
-
-	if (IsMmxEnabled == 0)
-		return 0;
-
-	PC += 4;
-	if (PC >= 0x1000) return 0;
-	RSP_LW_IMEM(PC, &RspOp.Hex);
-
-	if (RspOp.op != RSP_CP2)
-		return 0;
-
-	if ((RspOp.rs & 0x10) != 0) {
-		switch (RspOp.funct) {
-		case RSP_VECTOR_VMULF:
-		case RSP_VECTOR_VMUDL: /* Warning: Not all handled? */
-		case RSP_VECTOR_VMUDM:
-		case RSP_VECTOR_VMUDN:
-		case RSP_VECTOR_VMUDH:
-			if (1 == WriteToAccum(7, PC)) {
-				return 0;
-			} else if ((RspOp.rs & 0x0f) >= 2 && (RspOp.rs & 0x0f) <= 7 && IsMmx2Enabled == 0) {
-				return 0;
-			} else
-				return 1;
-
-		case RSP_VECTOR_VAND:
-		case RSP_VECTOR_VOR:
-		case RSP_VECTOR_VXOR:
-			if (1 == WriteToAccum(Low16BitAccum, PC)) {
-				return 0;
-			} else if ((RspOp.rs & 0x0f) >= 2 && (RspOp.rs & 0x0f) <= 7 && IsMmx2Enabled == 0) {
-				return 0;
-			} else
-				return 1;
-
-		case RSP_VECTOR_VADD:
-			/* Requires no accumulator write! & No flags! */
-			if (WriteToAccum(Low16BitAccum, RSPCompilePC) == 1) {
-				return 0;
-			} else if (UseRspFlags(RSPCompilePC) == 1) {
-				return 0;
-			} else if ((RspOp.rs & 0x0f) >= 2 && (RspOp.rs & 0x0f) <= 7 && IsMmx2Enabled == 0) {
-				return 0;
-			} else
-				return 1;
-
-		default:
-			return 0;
-		}
-	} else
-		return 0;
-}
-
-/************************************************************
-** WriteToAccum2
-**
-** Output:
-**	1: Accumulation series
-**	0: Accumulator is reset after this op
-**
-** Input: PC, Location in accumulator
-*************************************************************/
-
-#define HIT_BRANCH	0x2
-
-uint32_t WriteToAccum2 (int32_t Location, int32_t PC, int32_t RecursiveCall) {
-	RSPOPCODE RspOp;
-	uint32_t BranchTarget = 0;
-	int32_t BranchImmed = 0;
-	uint32_t JumpTarget = 0;
-	int32_t JumpUncond = 0;
-
-	int32_t Instruction_State = RSPNextInstruction;
-
-	if (Compiler.bAccum == 0) return 1;
-
-	if (Instruction_State == DELAY_SLOT) {
-		return 1;
-	}
-
-	do {
-		PC += 4;
-		if (PC >= 0x1000) { return 1; }
-		RSP_LW_IMEM(PC, &RspOp.Hex);
-
-		switch (RspOp.op) {
- 		case RSP_REGIMM:
-			switch (RspOp.rt) {
-			case RSP_REGIMM_BLTZ:
-			case RSP_REGIMM_BGEZ:
-			case RSP_REGIMM_BLTZAL:
-			case RSP_REGIMM_BGEZAL:
-				Instruction_State = DO_DELAY_SLOT;
-				break;
-			default:
-				CompilerWarning("Unkown opcode in WriteToAccum\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				return 1;
-			}
-			break;
-		case RSP_SPECIAL:
-			switch (RspOp.funct) {
-			case RSP_SPECIAL_SLL:
-			case RSP_SPECIAL_SRL:
-			case RSP_SPECIAL_SRA:
-			case RSP_SPECIAL_SLLV:
-			case RSP_SPECIAL_SRLV:
-			case RSP_SPECIAL_SRAV:
-			case RSP_SPECIAL_ADD:
-			case RSP_SPECIAL_ADDU:
-			case RSP_SPECIAL_SUB:
-			case RSP_SPECIAL_SUBU:
-			case RSP_SPECIAL_AND:
-			case RSP_SPECIAL_OR:
-			case RSP_SPECIAL_XOR:
-			case RSP_SPECIAL_NOR:
-			case RSP_SPECIAL_SLT:
-			case RSP_SPECIAL_SLTU:
-			case RSP_SPECIAL_BREAK:
-				break;
-
-			case RSP_SPECIAL_JR:
-				Instruction_State = DO_DELAY_SLOT;
-				break;
-
-			default:
-				CompilerWarning("Unkown opcode in WriteToAccum\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				return 1;
-			}
-			break;
-		case RSP_J:
-		case RSP_JAL:
-			if (!JumpTarget) {
-				JumpUncond = 1;
-				JumpTarget = (RspOp.target << 2) & 0xFFC;
-			}
-			Instruction_State = DO_DELAY_SLOT;
-			break;
-
-		case RSP_BEQ:
-		case RSP_BNE:
-		case RSP_BLEZ:
-		case RSP_BGTZ:
-			Instruction_State = DO_DELAY_SLOT;
-			BranchTarget = (PC + ((int16_t)RspOp.offset << 2) + 4) & 0xFFC;
-			BranchImmed = (int16_t)RspOp.offset;
-			break;
-		case RSP_ADDI:
-		case RSP_ADDIU:
-		case RSP_SLTI:
-		case RSP_SLTIU:
-		case RSP_ANDI:
-		case RSP_ORI:
-		case RSP_XORI:
-		case RSP_LUI:
-		case RSP_CP0:
-			break;
-
-		case RSP_CP2:
-			if ((RspOp.rs & 0x10) != 0) {
-				switch (RspOp.funct) {
-				case RSP_VECTOR_VMULF:
-				case RSP_VECTOR_VMUDL:
-				case RSP_VECTOR_VMUDM:
-				case RSP_VECTOR_VMUDN:
-				case RSP_VECTOR_VMUDH:
-					return 0;
-				case RSP_VECTOR_VMACF:
-				case RSP_VECTOR_VMADL:
-				case RSP_VECTOR_VMADM:
-				case RSP_VECTOR_VMADN:
-				case RSP_VECTOR_VMADH:
-					return 1;
-				case RSP_VECTOR_VABS: // hope this is ok
-				case RSP_VECTOR_VADD:
-				case RSP_VECTOR_VADDC:
-				case RSP_VECTOR_VSUB:
-				case RSP_VECTOR_VSUBC:
-				case RSP_VECTOR_VAND:
-				case RSP_VECTOR_VOR:
-				case RSP_VECTOR_VXOR:
-				case RSP_VECTOR_VNXOR:
-				case RSP_VECTOR_VCR:
-				case RSP_VECTOR_VCH:
-				case RSP_VECTOR_VCL:
-				case RSP_VECTOR_VRCP:
-				case RSP_VECTOR_VRCPL: // hope this is ok
-				case RSP_VECTOR_VRCPH:
-				case RSP_VECTOR_VRSQL:
-				case RSP_VECTOR_VRSQH: // hope this is ok
-				case RSP_VECTOR_VLT:
-				case RSP_VECTOR_VEQ:
-				case RSP_VECTOR_VGE:
-					if (Location == Low16BitAccum) { return 0; }
-					break;
-
-				case RSP_VECTOR_VMOV:
-				case RSP_VECTOR_VMRG:
-					break;
-				case RSP_VECTOR_VSAW:
-					return 1;
-				default:
-					CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
-					return 1;
-				}
-			} else {
-				switch (RspOp.rs) {
-				case RSP_COP2_CF:
-				case RSP_COP2_CT:
-				case RSP_COP2_MT:
-				case RSP_COP2_MF:
-					break;
-				default:
-					CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
-					return 1;
-				}
-			}
-			break;
-		case RSP_LB:
-		case RSP_LH:
-		case RSP_LW:
-		case RSP_LBU:
-		case RSP_LHU:
-		case RSP_SB:
-		case RSP_SH:
-		case RSP_SW:
-			break;
-		case RSP_LC2:
-			switch (RspOp.rd) {
-			case RSP_LSC2_SV:
-			case RSP_LSC2_DV:
-			case RSP_LSC2_RV:
-			case RSP_LSC2_QV:
-			case RSP_LSC2_LV:
-			case RSP_LSC2_UV:
-			case RSP_LSC2_PV:
-			case RSP_LSC2_TV:
-				break;
-			default:
-				CompilerWarning("Unkown opcode in WriteToAccum\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				return 1;
-			}
-			break;
-		case RSP_SC2:
-			switch (RspOp.rd) {
-			case RSP_LSC2_BV:
-			case RSP_LSC2_SV:
-			case RSP_LSC2_LV:
-			case RSP_LSC2_DV:
-			case RSP_LSC2_QV:
-			case RSP_LSC2_RV:
-			case RSP_LSC2_PV:
-			case RSP_LSC2_UV:
-			case RSP_LSC2_HV:
-			case RSP_LSC2_FV:
-			case RSP_LSC2_WV:
-			case RSP_LSC2_TV:
-				break;
-			default:
-				CompilerWarning("Unkown opcode in WriteToAccum\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				return 1;
-			}
-			break;
-		default:
-			CompilerWarning("Unkown opcode in WriteToAccum\n%s",RSPOpcodeName(RspOp.Hex,PC));
-			return 1;
-		}
-		switch (Instruction_State) {
-		case NORMAL: break;
-		case DO_DELAY_SLOT:
-			Instruction_State = DELAY_SLOT;
-			break;
-		case DELAY_SLOT:
-			if (JumpUncond) {
-				PC = JumpTarget - 0x04;
-				Instruction_State = NORMAL;
-			} else {
-				Instruction_State = FINISH_BLOCK;
-			}
-			JumpUncond = 0;
-			break;
-		}
-	} while (Instruction_State != FINISH_BLOCK);
-
-	/***
-	** This is a tricky situation because most of the
-	** microcode does loops, so looping back and checking
-	** can prove effective, but it's still a branch..
-	***/
-
-	if (BranchTarget != 0 && RecursiveCall == 0) {
-		uint32_t BranchTaken, BranchFall;
-
-		/* analysis of branch taken */
-		BranchTaken = WriteToAccum2(Location, BranchTarget - 4, 1);
-		/* analysis of branch as nop */
-		BranchFall = WriteToAccum2(Location, PC, 1);
-
-		if (BranchImmed < 0) {
-			if (BranchTaken != 0) {
-				/*
-				** took this back branch and couldnt find a place
-				** that resets the accum or hit a branch etc
-				**/
-				return 1;
-			} else if (BranchFall == HIT_BRANCH) {
-				/* risky? the loop ended, hit another branch after loop-back */
-
-#if !defined(RSP_SAFE_ANALYSIS)
-				CPU_Message("WriteToDest: Backward branch hit, BranchFall = Hit branch (returning 0)");
-				return 0;
-#endif
-				return 1;
-			} else {
-				/* otherwise this is completely valid */
-				return BranchFall;
-			}
-		} else {
-			if (BranchFall != 0) {
-				/*
-				** took this forward branch and couldnt find a place
-				** that resets the accum or hit a branch etc
-				**/
-				return 1;
-			} else if (BranchTaken == HIT_BRANCH) {
-				/* risky? jumped forward, hit another branch */
-
-#if !defined(RSP_SAFE_ANALYSIS)
-				CPU_Message("WriteToDest: Forward branch hit, BranchTaken = Hit branch (returning 0)");
-				return 0;
-#endif
-
-				return 1;
-			} else {
-				/* otherwise this is completely valid */
-				return BranchTaken;
-			}
-		}
-	} else {
-		return HIT_BRANCH;
-	}
-}
-
-int32_t WriteToAccum (int32_t Location, int32_t PC) {
-	uint32_t value = WriteToAccum2(Location, PC, 0);
-
-	if (value == HIT_BRANCH) {
-		return 1; /* ??? */
-	} else
-		return value;
-}
-
-/************************************************************
-** WriteToVectorDest
-**
-** Output:
-**	1: Destination is over-written later
-**	0: Destination is used as a source later
-**
-** Input: PC, Register
-*************************************************************/
-
-int32_t WriteToVectorDest2 (uint32_t DestReg, int32_t PC, int32_t RecursiveCall) {
-	RSPOPCODE RspOp;
-	uint32_t BranchTarget = 0;
-	int32_t BranchImmed = 0;
-	uint32_t JumpTarget = 0;
-	int32_t JumpUncond = 0;
-
-	int32_t Instruction_State = RSPNextInstruction;
-
-	if (Compiler.bDest == 0) return 1;
-
-	if (Instruction_State == DELAY_SLOT) {
-		return 1;
-	}
-
-	do {
-		PC += 4;
-		if (PC >= 0x1000) { return 1; }
-		RSP_LW_IMEM(PC, &RspOp.Hex);
-
-		switch (RspOp.op) {
-
-		case RSP_REGIMM:
-			switch (RspOp.rt) {
-			case RSP_REGIMM_BLTZ:
-			case RSP_REGIMM_BGEZ:
-			case RSP_REGIMM_BLTZAL:
-			case RSP_REGIMM_BGEZAL:
-				Instruction_State = DO_DELAY_SLOT;
-				break;
-			default:
-				CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				return 1;
-			}
-			break;
-		case RSP_SPECIAL:
-			switch (RspOp.funct) {
-			case RSP_SPECIAL_SLL:
-			case RSP_SPECIAL_SRL:
-			case RSP_SPECIAL_SRA:
-			case RSP_SPECIAL_SLLV:
-			case RSP_SPECIAL_SRLV:
-			case RSP_SPECIAL_SRAV:
-			case RSP_SPECIAL_ADD:
-			case RSP_SPECIAL_ADDU:
-			case RSP_SPECIAL_SUB:
-			case RSP_SPECIAL_SUBU:
-			case RSP_SPECIAL_AND:
-			case RSP_SPECIAL_OR:
-			case RSP_SPECIAL_XOR:
-			case RSP_SPECIAL_NOR:
-			case RSP_SPECIAL_SLT:
-			case RSP_SPECIAL_SLTU:
-			case RSP_SPECIAL_BREAK:
-				break;
-
-			case RSP_SPECIAL_JR:
-				Instruction_State = DO_DELAY_SLOT;
-				break;
-
-			default:
-				CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				return 1;
-			}
-			break;
-		case RSP_J:
-		case RSP_JAL:
-			if (!JumpTarget) {
-				JumpUncond = 1;
-				JumpTarget = (RspOp.target << 2) & 0xFFC;
-			}
-			Instruction_State = DO_DELAY_SLOT;
-			break;
-		case RSP_BEQ:
-		case RSP_BNE:
-		case RSP_BLEZ:
-		case RSP_BGTZ:
-			Instruction_State = DO_DELAY_SLOT;
-			BranchTarget = (PC + ((int16_t)RspOp.offset << 2) + 4) & 0xFFC;
-			BranchImmed = (int16_t)RspOp.offset;
-			break;
-		case RSP_ADDI:
-		case RSP_ADDIU:
-		case RSP_SLTI:
-		case RSP_SLTIU:
-		case RSP_ANDI:
-		case RSP_ORI:
-		case RSP_XORI:
-		case RSP_LUI:
-		case RSP_CP0:
-			break;
-
-		case RSP_CP2:
-			if ((RspOp.rs & 0x10) != 0) {
-				switch (RspOp.funct) {
-				case RSP_VECTOR_VMULF:
-				case RSP_VECTOR_VMUDL:
-				case RSP_VECTOR_VMUDM:
-				case RSP_VECTOR_VMUDN:
-				case RSP_VECTOR_VMUDH:
-				case RSP_VECTOR_VMACF:
-				case RSP_VECTOR_VMADL:
-				case RSP_VECTOR_VMADM:
-				case RSP_VECTOR_VMADN:
-				case RSP_VECTOR_VMADH:
-				case RSP_VECTOR_VADD:
-				case RSP_VECTOR_VADDC:
-				case RSP_VECTOR_VSUB:
-				case RSP_VECTOR_VSUBC:
-				case RSP_VECTOR_VAND:
-				case RSP_VECTOR_VOR:
-				case RSP_VECTOR_VXOR:
-				case RSP_VECTOR_VNXOR:
-				case RSP_VECTOR_VABS:
-					if (DestReg == RspOp.rd) { return 1; }
-					if (DestReg == RspOp.rt) { return 1; }
-					if (DestReg == RspOp.sa) { return 0; }
-					break;
-
-				case RSP_VECTOR_VMOV:
-					if (DestReg == RspOp.rt) { return 1; }
-					break;
-
-				case RSP_VECTOR_VCR:
-				case RSP_VECTOR_VRCP:
-				case RSP_VECTOR_VRCPH:
-				case RSP_VECTOR_VRSQH:
-				case RSP_VECTOR_VCH:
-				case RSP_VECTOR_VCL:
-					return 1;
-
-				case RSP_VECTOR_VMRG:
-				case RSP_VECTOR_VLT:
-				case RSP_VECTOR_VEQ:
-				case RSP_VECTOR_VGE:
-					if (DestReg == RspOp.rd) { return 1; }
-					if (DestReg == RspOp.rt) { return 1; }
-					if (DestReg == RspOp.sa) { return 0; }
-					break;
-				case RSP_VECTOR_VSAW:
-					if (DestReg == RspOp.sa) { return 0; }
-					break;
-				default:
-					CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
-					return 1;
-				}
-			} else {
-				switch (RspOp.rs) {
-				case RSP_COP2_CF:
-				case RSP_COP2_CT:
-					break;
-				case RSP_COP2_MT:
-				/*	if (DestReg == RspOp.rd) { return 0; } */
-					break;
-				case RSP_COP2_MF:
-					if (DestReg == RspOp.rd) { return 1; }
-					break;
-				default:
-					CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
-					return 1;
-				}
-			}
-			break;
-		case RSP_LB:
-		case RSP_LH:
-		case RSP_LW:
-		case RSP_LBU:
-		case RSP_LHU:
-		case RSP_SB:
-		case RSP_SH:
-		case RSP_SW:
-			break;
-		case RSP_LC2:
-			switch (RspOp.rd) {
-			case RSP_LSC2_SV:
-			case RSP_LSC2_DV:
-			case RSP_LSC2_RV:
-				break;
-
-			case RSP_LSC2_QV:
-			case RSP_LSC2_LV:
-			case RSP_LSC2_UV:
-			case RSP_LSC2_PV:
-			case RSP_LSC2_TV:
-				break;
-
-			default:
-				CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				return 1;
-			}
-			break;
-		case RSP_SC2:
-			switch (RspOp.rd) {
-			case RSP_LSC2_BV:
-			case RSP_LSC2_SV:
-			case RSP_LSC2_LV:
-			case RSP_LSC2_DV:
-			case RSP_LSC2_QV:
-			case RSP_LSC2_RV:
-			case RSP_LSC2_PV:
-			case RSP_LSC2_UV:
-			case RSP_LSC2_HV:
-			case RSP_LSC2_FV:
-			case RSP_LSC2_WV:
-			case RSP_LSC2_TV:
-				if (DestReg == RspOp.rt) { return 1; }
-				break;
-			default:
-				CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				return 1;
-			}
-			break;
-		default:
-			CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
-			return 1;
-		}
-		switch (Instruction_State) {
-		case NORMAL: break;
-		case DO_DELAY_SLOT:
-			Instruction_State = DELAY_SLOT;
-			break;
-		case DELAY_SLOT:
-			if (JumpUncond) {
-				PC = JumpTarget - 0x04;
-				Instruction_State = NORMAL;
-			} else {
-				Instruction_State = FINISH_BLOCK;
-			}
-			JumpUncond = 0;
-			break;
-		}
-	} while (Instruction_State != FINISH_BLOCK);
-
-	/***
-	** This is a tricky situation because most of the
-	** microcode does loops, so looping back and checking
-	** can prove effective, but it's still a branch..
-	***/
-
-	if (BranchTarget != 0 && RecursiveCall == 0) {
-		uint32_t BranchTaken, BranchFall;
-
-		/* analysis of branch taken */
-		BranchTaken = WriteToVectorDest2(DestReg, BranchTarget - 4, 1);
-		/* analysis of branch as nop */
-		BranchFall = WriteToVectorDest2(DestReg, PC, 1);
-
-		if (BranchImmed < 0) {
-			if (BranchTaken != 0) {
-				/*
-				** took this back branch and found a place
-				** that needs this vector as a source
-				**/
-				return 1;
-			} else if (BranchFall == HIT_BRANCH) {
-				/* (dlist) risky? the loop ended, hit another branch after loop-back */
-
-#if !defined(RSP_SAFE_ANALYSIS)
-				CPU_Message("WriteToDest: Backward branch hit, BranchFall = Hit branch (returning 0)");
-				return 0;
-#endif
-
-				return 1;
-			} else {
-				/* otherwise this is completely valid */
-				return BranchFall;
-			}
-		} else {
-			if (BranchFall != 0) {
-				/*
-				** took this forward branch and found a place
-				** that needs this vector as a source
-				**/
-				return 1;
-			} else if (BranchTaken == HIT_BRANCH) {
-				/* (dlist) risky? jumped forward, hit another branch */
-
-#if !defined(RSP_SAFE_ANALYSIS)
-				CPU_Message("WriteToDest: Forward branch hit, BranchTaken = Hit branch (returning 0)");
-				return 0;
-#endif
-
-				return 1;
-			} else {
-				/* otherwise this is completely valid */
-				return BranchTaken;
-			}
-		}
-	} else {
-		return HIT_BRANCH;
-	}
-}
-
-int32_t WriteToVectorDest (uint32_t DestReg, int32_t PC) {
-	uint32_t value = WriteToVectorDest2(DestReg, PC, 0);
-
-	if (value == HIT_BRANCH) {
-		return 1; /* ??? */
-	} else
-		return value;
-}
-
-/************************************************************
-** UseRspFlags
-**
-** Output:
-**	1: Flags are determined not in use
-**	0: Either unable to determine or are in use
-**
-** Input: PC
-*************************************************************/
-
-/* TODO: consider delay slots and such in a branch? */
-int32_t UseRspFlags (int32_t PC) {
-	RSPOPCODE RspOp;
-	int32_t Instruction_State = RSPNextInstruction;
-
-	if (Compiler.bFlags == 0) return 1;
-
-	if (Instruction_State == DELAY_SLOT) {
-		return 1;
-	}
-
-	do {
-		PC -= 4;
-		if (PC < 0) { return 1; }
-		RSP_LW_IMEM(PC, &RspOp.Hex);
-
-		switch (RspOp.op) {
-
-		case RSP_REGIMM:
-			switch (RspOp.rt) {
-			case RSP_REGIMM_BLTZ:
-			case RSP_REGIMM_BGEZ:
-				Instruction_State = DO_DELAY_SLOT;
-				break;
-			default:
-				CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				return 1;
-			}
-			break;
-		case RSP_SPECIAL:
-			switch (RspOp.funct) {
-			case RSP_SPECIAL_SLL:
-			case RSP_SPECIAL_SRL:
-			case RSP_SPECIAL_SRA:
-			case RSP_SPECIAL_SLLV:
-			case RSP_SPECIAL_SRLV:
-			case RSP_SPECIAL_SRAV:
-			case RSP_SPECIAL_ADD:
-			case RSP_SPECIAL_ADDU:
-			case RSP_SPECIAL_SUB:
-			case RSP_SPECIAL_SUBU:
-			case RSP_SPECIAL_AND:
-			case RSP_SPECIAL_OR:
-			case RSP_SPECIAL_XOR:
-			case RSP_SPECIAL_NOR:
-			case RSP_SPECIAL_SLT:
-			case RSP_SPECIAL_SLTU:
-			case RSP_SPECIAL_BREAK:
-				break;
-
-			case RSP_SPECIAL_JR:
-				Instruction_State = DO_DELAY_SLOT;
-				break;
-
-			default:
-				CompilerWarning("Unkown opcode in WriteToVectorDest\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				return 1;
-			}
-			break;
-		case RSP_J:
-		case RSP_JAL:
-		case RSP_BEQ:
-		case RSP_BNE:
-		case RSP_BLEZ:
-		case RSP_BGTZ:
-			Instruction_State = DO_DELAY_SLOT;
-			break;
-		case RSP_ADDI:
-		case RSP_ADDIU:
-		case RSP_SLTI:
-		case RSP_SLTIU:
-		case RSP_ANDI:
-		case RSP_ORI:
-		case RSP_XORI:
-		case RSP_LUI:
-		case RSP_CP0:
-			break;
-
-		case RSP_CP2:
-			if ((RspOp.rs & 0x10) != 0) {
-				switch (RspOp.funct) {
-				case RSP_VECTOR_VMULF:
-				case RSP_VECTOR_VMUDL:
-				case RSP_VECTOR_VMUDM:
-				case RSP_VECTOR_VMUDN:
-				case RSP_VECTOR_VMUDH:
-					break;
-				case RSP_VECTOR_VMACF:
-				case RSP_VECTOR_VMADL:
-				case RSP_VECTOR_VMADM:
-				case RSP_VECTOR_VMADN:
-				case RSP_VECTOR_VMADH:
-					break;
-
-				case RSP_VECTOR_VSUB:
-				case RSP_VECTOR_VADD:
-					return 0;
-				case RSP_VECTOR_VSUBC:
-				case RSP_VECTOR_VADDC:
-					return 1;
-
-				case RSP_VECTOR_VABS:
-				case RSP_VECTOR_VAND:
-				case RSP_VECTOR_VOR:
-				case RSP_VECTOR_VXOR:
-				case RSP_VECTOR_VRCPH:
-				case RSP_VECTOR_VRSQL:
-				case RSP_VECTOR_VRSQH:
-				case RSP_VECTOR_VRCPL:
-				case RSP_VECTOR_VRCP:
-					break;
-
-				case RSP_VECTOR_VCR:
-				case RSP_VECTOR_VCH:
-				case RSP_VECTOR_VCL:
-				case RSP_VECTOR_VLT:
-				case RSP_VECTOR_VEQ:
-				case RSP_VECTOR_VGE:
-				case RSP_VECTOR_VMRG:
-					return 1;
-
-				case RSP_VECTOR_VSAW:
-				case RSP_VECTOR_VMOV:
-					break;
-
-				default:
-					CompilerWarning("Unkown opcode in UseRspFlags\n%s",RSPOpcodeName(RspOp.Hex,PC));
-					return 1;
-				}
-			} else {
-				switch (RspOp.rs) {
-				case RSP_COP2_CT:
-					return 1;
-
-				case RSP_COP2_CF:
-				case RSP_COP2_MT:
-				case RSP_COP2_MF:
-					break;
-				default:
-					CompilerWarning("Unkown opcode in UseRspFlags\n%s",RSPOpcodeName(RspOp.Hex,PC));
-					return 1;
-				}
-			}
-			break;
-		case RSP_LB:
-		case RSP_LH:
-		case RSP_LW:
-		case RSP_LBU:
-		case RSP_LHU:
-		case RSP_SB:
-		case RSP_SH:
-		case RSP_SW:
-			break;
-		case RSP_LC2:
-			switch (RspOp.rd) {
-			case RSP_LSC2_SV:
-			case RSP_LSC2_DV:
-			case RSP_LSC2_RV:
-			case RSP_LSC2_QV:
-			case RSP_LSC2_LV:
-			case RSP_LSC2_UV:
-			case RSP_LSC2_PV:
-			case RSP_LSC2_TV:
-				break;
-			default:
-				CompilerWarning("Unkown opcode in UseRspFlags\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				return 1;
-			}
-			break;
-		case RSP_SC2:
-			switch (RspOp.rd) {
-			case RSP_LSC2_BV:
-			case RSP_LSC2_SV:
-			case RSP_LSC2_LV:
-			case RSP_LSC2_DV:
-			case RSP_LSC2_QV:
-			case RSP_LSC2_RV:
-			case RSP_LSC2_PV:
-			case RSP_LSC2_UV:
-			case RSP_LSC2_HV:
-			case RSP_LSC2_FV:
-			case RSP_LSC2_WV:
-			case RSP_LSC2_TV:
-				break;
-			default:
-				CompilerWarning("Unkown opcode in UseRspFlags\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				return 1;
-			}
-			break;
-		default:
-			CompilerWarning("Unkown opcode in UseRspFlags\n%s",RSPOpcodeName(RspOp.Hex,PC));
-			return 1;
-		}
-		switch (Instruction_State) {
-		case NORMAL: break;
-		case DO_DELAY_SLOT:
-			Instruction_State = DELAY_SLOT;
-			break;
-		case DELAY_SLOT:
-			Instruction_State = FINISH_BLOCK;
-			break;
-		}
-	} while ( Instruction_State != FINISH_BLOCK);
-	return 1;
-}
-
-/************************************************************
-** IsRegisterConstant
-**
-** Output:
-**	1: Register is constant throughout
-**	0: Register is not constant at all
-**
-** Input: PC, Pointer to constant to fill
-*************************************************************/
-
-int32_t IsRegisterConstant (uint32_t Reg, uint32_t * Constant) {
-	uint32_t PC = 0;
-	uint32_t References = 0;
-	uint32_t Const = 0;
-	RSPOPCODE RspOp;
-
-	if (Compiler.bGPRConstants == 0)
-		return 0;
-
-	while (PC < 0x1000) {
-
-		RSP_LW_IMEM(PC, &RspOp.Hex);
-		PC += 4;
-
-		switch (RspOp.op) {
-		case RSP_REGIMM:
-			break;
-
-		case RSP_SPECIAL:
-			switch (RspOp.funct) {
-			case RSP_SPECIAL_SLL:
-			case RSP_SPECIAL_SRL:
-			case RSP_SPECIAL_SRA:
-			case RSP_SPECIAL_SLLV:
-			case RSP_SPECIAL_SRLV:
-			case RSP_SPECIAL_SRAV:
-			case RSP_SPECIAL_ADD:
-			case RSP_SPECIAL_ADDU:
-			case RSP_SPECIAL_SUB:
-			case RSP_SPECIAL_SUBU:
-			case RSP_SPECIAL_AND:
-			case RSP_SPECIAL_OR:
-			case RSP_SPECIAL_XOR:
-			case RSP_SPECIAL_NOR:
-			case RSP_SPECIAL_SLT:
-			case RSP_SPECIAL_SLTU:
-				if (RspOp.rd == Reg) { return 0; }
-				break;
-
-			case RSP_SPECIAL_BREAK:
-			case RSP_SPECIAL_JR:
-				break;
-
-			default:
-			//	CompilerWarning("Unkown opcode in IsRegisterConstant\n%s",RSPOpcodeName(RspOp.Hex,PC));
-			//	return 0;
-				break;
-			}
-			break;
-
-		case RSP_J:
-		case RSP_JAL:
-		case RSP_BEQ:
-		case RSP_BNE:
-		case RSP_BLEZ:
-		case RSP_BGTZ:
-			break;
-
-		case RSP_ADDI:
-		case RSP_ADDIU:
-			if (RspOp.rt == Reg) {
-				if (!RspOp.rs) {
-					if (References > 0) { return 0; }
-					Const = (int16_t)RspOp.immediate;
-					References++;
-				} else
-					return 0;
-			}
-			break;
-		case RSP_ORI:
-			if (RspOp.rt == Reg) {
-				if (!RspOp.rs) {
-					if (References > 0) { return 0; }
-					Const = (uint16_t)RspOp.immediate;
-					References++;
-				} else
-					return 0;
-			}
-			break;
-
-		case RSP_LUI:
-			if (RspOp.rt == Reg) {
-				if (References > 0) { return 0; }
-				Const = (int16_t)RspOp.offset << 16;
-				References++;
-			}
-			break;
-
-		case RSP_ANDI:
-		case RSP_XORI:
-		case RSP_SLTI:
-		case RSP_SLTIU:
-			if (RspOp.rt == Reg) { return 0; }
-			break;
-
-		case RSP_CP0:
-			switch (RspOp.rs) {
-			case RSP_COP0_MF:
-				if (RspOp.rt == Reg) { return 0; }
-			case RSP_COP0_MT:
-				break;
-			}
-			break;
-
-		case RSP_CP2:
-			if ((RspOp.rs & 0x10) == 0) {
-				switch (RspOp.rs) {
-				case RSP_COP2_CT:
-				case RSP_COP2_MT:
-					break;
-
-				case RSP_COP2_CF:
-				case RSP_COP2_MF:
-					if (RspOp.rt == Reg) { return 0; }
-					break;
-
-				default:
-				//	CompilerWarning("Unkown opcode in IsRegisterConstant\n%s",RSPOpcodeName(RspOp.Hex,PC));
-				//	return 0;
-					break;
-				}
-			}
-			break;
-
-		case RSP_LB:
-		case RSP_LH:
-		case RSP_LW:
-		case RSP_LBU:
-		case RSP_LHU:
-			if (RspOp.rt == Reg) { return 0; }
-			break;
-
-		case RSP_SB:
-		case RSP_SH:
-		case RSP_SW:
-			break;
-		case RSP_LC2:
-			break;
-		case RSP_SC2:
-			break;
-		default:
-		//	CompilerWarning("Unkown opcode in IsRegisterConstant\n%s",RSPOpcodeName(RspOp.Hex,PC));
-		//	return 0;
-			break;
-		}
-	}
-
-	if (References > 0) {
-		*Constant = Const;
-		return 1;
-	} else {
-		*Constant = 0;
-		return 0;
-	}
-}
-
-/************************************************************
-** IsOpcodeBranch
-**
-** Output:
-**	1: opcode is a branch
-**	0: opcode is not a branch
-**
-** Input: PC
-*************************************************************/
-
-int32_t IsOpcodeBranch(uint32_t PC, RSPOPCODE RspOp) {
-	switch (RspOp.op) {
-	case RSP_REGIMM:
-		switch (RspOp.rt) {
-		case RSP_REGIMM_BLTZ:
-		case RSP_REGIMM_BGEZ:
-		case RSP_REGIMM_BLTZAL:
-		case RSP_REGIMM_BGEZAL:
-			return 1;
-		default:
-			//CompilerWarning("Unknown opcode in IsOpcodeBranch\n%s",RSPOpcodeName(RspOp.Hex,PC));
-			break;
-		}
-		break;
-	case RSP_SPECIAL:
-		switch (RspOp.funct) {
-		case RSP_SPECIAL_SLL:
-		case RSP_SPECIAL_SRL:
-		case RSP_SPECIAL_SRA:
-		case RSP_SPECIAL_SLLV:
-		case RSP_SPECIAL_SRLV:
-		case RSP_SPECIAL_SRAV:
-		case RSP_SPECIAL_ADD:
-		case RSP_SPECIAL_ADDU:
-		case RSP_SPECIAL_SUB:
-		case RSP_SPECIAL_SUBU:
-		case RSP_SPECIAL_AND:
-		case RSP_SPECIAL_OR:
-		case RSP_SPECIAL_XOR:
-		case RSP_SPECIAL_NOR:
-		case RSP_SPECIAL_SLT:
-		case RSP_SPECIAL_SLTU:
-		case RSP_SPECIAL_BREAK:
-			break;
-
-		case RSP_SPECIAL_JALR:
-		case RSP_SPECIAL_JR:
-			return 1;
-
-		default:
-			//CompilerWarning("Unknown opcode in IsOpcodeBranch\n%s",RSPOpcodeName(RspOp.Hex,PC));
-			break;
-		}
-		break;
-	case RSP_J:
-	case RSP_JAL:
-	case RSP_BEQ:
-	case RSP_BNE:
-	case RSP_BLEZ:
-	case RSP_BGTZ:
-		return 1;
-
-	case RSP_ADDI:
-	case RSP_ADDIU:
-	case RSP_SLTI:
-	case RSP_SLTIU:
-	case RSP_ANDI:
-	case RSP_ORI:
-	case RSP_XORI:
-	case RSP_LUI:
-
-	case RSP_CP0:
-	case RSP_CP2:
-		break;
-
-	case RSP_LB:
-	case RSP_LH:
-	case RSP_LW:
-	case RSP_LBU:
-	case RSP_LHU:
-	case RSP_SB:
-	case RSP_SH:
-	case RSP_SW:
-		break;
-
-	case RSP_LC2:
-	case RSP_SC2:
-		break;
-
-	default:
-		//CompilerWarning("Unknown opcode in IsOpcodeBranch\n%s",RSPOpcodeName(RspOp.Hex,PC));
-		break;
-	}
-
-	return 0;
-}
-
-/************************************************************
-** GetInstructionInfo
-**
-** Output: None in regard to return value
-**
-** Input:
-**	pointer to info structure, fills this
-** with valid opcode data
-*************************************************************/
-
-/* 3 possible values, GPR, VEC, VEC & GPR, NOOP is zero */
-#define GPR_Instruction		0x0001 /* GPR Instruction flag */
-#define VEC_Instruction		0x0002 /* Vec Instruction flag */
-#define Instruction_Mask	(GPR_Instruction | VEC_Instruction)
-
-/* 3 possible values, one flag must be set only */
-#define Load_Operation		0x0004 /* Load Instruction flag */
-#define Store_Operation		0x0008 /* Store Instruction flag */
-#define Accum_Operation		0x0010 /* Vector op uses accum - loads & stores dont */
-#define MemOperation_Mask	(Load_Operation | Store_Operation)
-#define Operation_Mask		(MemOperation_Mask | Accum_Operation)
-
-/* Per situation basis flags */
-#define VEC_ResetAccum		0x0000 /* Vector op resets acc */
-#define VEC_Accumulate		0x0020 /* Vector op accumulates */
-
-#define InvalidOpcode		0x0040
-
-typedef struct {
-	union {
-		uint32_t DestReg;
-		uint32_t StoredReg;
-	};
-	union {
-		uint32_t SourceReg0;
-		uint32_t IndexReg;
-	};
-	uint32_t SourceReg1;
-	uint32_t flags;
-} OPCODE_INFO;
-
-void GetInstructionInfo(uint32_t PC, RSPOPCODE * RspOp, OPCODE_INFO * info) {
-	switch (RspOp->op) {
-	case RSP_REGIMM:
-		switch (RspOp->rt) {
-		case RSP_REGIMM_BLTZ:
-		case RSP_REGIMM_BLTZAL:
-		case RSP_REGIMM_BGEZ:
-		case RSP_REGIMM_BGEZAL:
-			info->flags = InvalidOpcode;
-			info->SourceReg0 = RspOp->rs;
-			info->SourceReg1 = -1;
-			break;
-
-		default:
-			CompilerWarning("Unkown opcode in GetInstructionInfo\n%s",RSPOpcodeName(RspOp->Hex,PC));
-			info->flags = InvalidOpcode;
-			break;
-		}
-		break;
-	case RSP_SPECIAL:
-		switch (RspOp->funct) {
-		case RSP_SPECIAL_BREAK:
-			info->DestReg = -1;
-			info->SourceReg0 = -1;
-			info->SourceReg1 = -1;
-			info->flags = GPR_Instruction;
-			break;
-
-		case RSP_SPECIAL_SLL:
-		case RSP_SPECIAL_SRL:
-		case RSP_SPECIAL_SRA:
-			info->DestReg = RspOp->rd;
-			info->SourceReg0 = RspOp->rt;
-			info->SourceReg1 = -1;
-			info->flags = GPR_Instruction;
-			break;
-		case RSP_SPECIAL_SLLV:
-		case RSP_SPECIAL_SRLV:
-		case RSP_SPECIAL_SRAV:
-		case RSP_SPECIAL_ADD:
-		case RSP_SPECIAL_ADDU:
-		case RSP_SPECIAL_SUB:
-		case RSP_SPECIAL_SUBU:
-		case RSP_SPECIAL_AND:
-		case RSP_SPECIAL_OR:
-		case RSP_SPECIAL_XOR:
-		case RSP_SPECIAL_NOR:
-		case RSP_SPECIAL_SLT:
-		case RSP_SPECIAL_SLTU:
-			info->DestReg = RspOp->rd;
-			info->SourceReg0 = RspOp->rs;
-			info->SourceReg1 = RspOp->rt;
-			info->flags = GPR_Instruction;
-			break;
-
-		case RSP_SPECIAL_JR:
-			info->flags = InvalidOpcode;
-			info->SourceReg0 = -1;
-			info->SourceReg1 = -1;
-			break;
-
-		default:
-			CompilerWarning("Unkown opcode in GetInstructionInfo\n%s",RSPOpcodeName(RspOp->Hex,PC));
-			info->flags = InvalidOpcode;
-			break;
-		}
-		break;
-	case RSP_J:
-	case RSP_JAL:
-		info->flags = InvalidOpcode;
-		info->SourceReg0 = -1;
-		info->SourceReg1 = -1;
-		break;
-	case RSP_BEQ:
-	case RSP_BNE:
-		info->flags = InvalidOpcode;
-		info->SourceReg0 = RspOp->rt;
-		info->SourceReg1 = RspOp->rs;
-		break;
-	case RSP_BLEZ:
-	case RSP_BGTZ:
-		info->flags = InvalidOpcode;
-		info->SourceReg0 = RspOp->rs;
-		info->SourceReg1 = -1;
-		break;
-
-	case RSP_ADDI:
-	case RSP_ADDIU:
-	case RSP_SLTI:
-	case RSP_SLTIU:
-	case RSP_ANDI:
-	case RSP_ORI:
-	case RSP_XORI:
-		info->DestReg = RspOp->rt;
-		info->SourceReg0 = RspOp->rs;
-		info->SourceReg1 = -1;
-		info->flags = GPR_Instruction;
-		break;
-
-	case RSP_LUI:
-		info->DestReg = RspOp->rt;
-		info->SourceReg0 = -1;
-		info->SourceReg1 = -1;
-		info->flags = GPR_Instruction;
-		break;
-
-	case RSP_CP0:
-		switch (RspOp->rs) {
-		case RSP_COP0_MF:
-			info->DestReg = RspOp->rt;
-			info->SourceReg0 = -1;
-			info->SourceReg1 = -1;
-			info->flags = GPR_Instruction | Load_Operation;
-			break;
-
-		case RSP_COP0_MT:
-			info->StoredReg = RspOp->rt;
-			info->SourceReg0 = -1;
-			info->SourceReg1 = -1;
-			info->flags = GPR_Instruction | Store_Operation;
-			break;
-		}
-		break;
-
-	case RSP_CP2:
-		if ((RspOp->rs & 0x10) != 0) {
-			switch (RspOp->funct) {
-			case RSP_VECTOR_VNOOP:
-				info->DestReg = -1;
-				info->SourceReg0 = -1;
-				info->SourceReg1 = -1;
-				info->flags = VEC_Instruction;
-				break;
-
-			case RSP_VECTOR_VMULF:
-			case RSP_VECTOR_VMUDL:
-			case RSP_VECTOR_VMUDM:
-			case RSP_VECTOR_VMUDN:
-			case RSP_VECTOR_VMUDH:
-				info->DestReg = RspOp->sa;
-				info->SourceReg0 = RspOp->rd;
-				info->SourceReg1 = RspOp->rt;
-				info->flags = VEC_Instruction | VEC_ResetAccum | Accum_Operation;
-				break;
-			case RSP_VECTOR_VMACF:
-			case RSP_VECTOR_VMADL:
-			case RSP_VECTOR_VMADM:
-			case RSP_VECTOR_VMADN:
-			case RSP_VECTOR_VMADH:
-				info->DestReg = RspOp->sa;
-				info->SourceReg0 = RspOp->rd;
-				info->SourceReg1 = RspOp->rt;
-				info->flags = VEC_Instruction | VEC_Accumulate | Accum_Operation;
-				break;
-			case RSP_VECTOR_VABS:
-			case RSP_VECTOR_VADD:
-			case RSP_VECTOR_VADDC:
-			case RSP_VECTOR_VSUB:
-			case RSP_VECTOR_VSUBC:
-			case RSP_VECTOR_VAND:
-			case RSP_VECTOR_VOR:
-			case RSP_VECTOR_VXOR:
-			case RSP_VECTOR_VNXOR:
-			case RSP_VECTOR_VCR:
-			case RSP_VECTOR_VCH:
-			case RSP_VECTOR_VCL:
-			case RSP_VECTOR_VRCP:
-			case RSP_VECTOR_VRCPL:
-			case RSP_VECTOR_VRCPH:
-			case RSP_VECTOR_VRSQL:
-			case RSP_VECTOR_VRSQH:
-			case RSP_VECTOR_VLT:
-			case RSP_VECTOR_VEQ:
-			case RSP_VECTOR_VGE:
-				info->DestReg = RspOp->sa;
-				info->SourceReg0 = RspOp->rd;
-				info->SourceReg1 = RspOp->rt;
-				info->flags = VEC_Instruction | VEC_ResetAccum | Accum_Operation;
-				break;
-
-			case RSP_VECTOR_VMOV:
-				info->flags = InvalidOpcode;
-			/*	info->DestReg = RspOp->sa;
-				info->SourceReg0 = RspOp->rt;
-				info->SourceReg1 = -1;
-				info->flags = VEC_Instruction; * Assume reset? */
-				break;
-
-			case RSP_VECTOR_VMRG:
-				info->flags = InvalidOpcode;
-			/*	info->DestReg = RspOp->sa;
-				info->SourceReg0 = RspOp->rt;
-				info->SourceReg1 = RspOp->rd;
-				info->flags = VEC_Instruction; * Assume reset? */
-				break;
-
-			case RSP_VECTOR_VSAW:
-			//	info->flags = InvalidOpcode;
-				info->DestReg = RspOp->sa;
-				info->SourceReg0 = -1;
-				info->SourceReg1 = -1;
-				info->flags = VEC_Instruction | Accum_Operation | VEC_Accumulate;
-				break;
-
-			default:
-				CompilerWarning("Unkown opcode in GetInstructionInfo\n%s",RSPOpcodeName(RspOp->Hex,PC));
-				info->flags = InvalidOpcode;
-				break;
-			}
-		} else {
-			switch (RspOp->rs) {
-			case RSP_COP2_CT:
-				info->StoredReg = RspOp->rt;
-				info->SourceReg0 = -1;
-				info->SourceReg1 = -1;
-				info->flags = GPR_Instruction | Store_Operation;
-				break;
-			case RSP_COP2_CF:
-				info->DestReg = RspOp->rt;
-				info->SourceReg0 = -1;
-				info->SourceReg1 = -1;
-				info->flags = GPR_Instruction | Load_Operation;
-				break;
-
-			/* RD is always the vector register, RT is always GPR */
-			case RSP_COP2_MT:
-				info->DestReg = RspOp->rd;
-				info->SourceReg0 = RspOp->rt;
-				info->SourceReg1 = -1;
-				info->flags = VEC_Instruction | GPR_Instruction | Load_Operation;
-				break;
-			case RSP_COP2_MF:
-				info->DestReg = RspOp->rt;
-				info->SourceReg0 = RspOp->rd;
-				info->SourceReg1 = -1;
-				info->flags = VEC_Instruction | GPR_Instruction | Store_Operation;
-				break;
-			default:
-				CompilerWarning("Unkown opcode in GetInstructionInfo\n%s",RSPOpcodeName(RspOp->Hex,PC));
-				info->flags = InvalidOpcode;
-				break;
-			}
-		}
-		break;
-	case RSP_LB:
-	case RSP_LH:
-	case RSP_LW:
-	case RSP_LBU:
-	case RSP_LHU:
-		info->DestReg = RspOp->rt;
-		info->IndexReg = RspOp->base;
-		info->SourceReg1 = -1;
-		info->flags = Load_Operation | GPR_Instruction;
-		break;
-	case RSP_SB:
-	case RSP_SH:
-	case RSP_SW:
-		info->StoredReg = RspOp->rt;
-		info->IndexReg = RspOp->base;
-		info->SourceReg1 = -1;
-		info->flags = Store_Operation | GPR_Instruction;
-		break;
-	case RSP_LC2:
-		switch (RspOp->rd) {
-		case RSP_LSC2_SV:
-		case RSP_LSC2_DV:
-		case RSP_LSC2_RV:
-		case RSP_LSC2_QV:
-		case RSP_LSC2_LV:
-		case RSP_LSC2_UV:
-		case RSP_LSC2_PV:
-			info->DestReg = RspOp->rt;
-			info->IndexReg = RspOp->base;
-			info->SourceReg1 = -1;
-			info->flags = Load_Operation | VEC_Instruction;
-			break;
-
-		case RSP_LSC2_TV:
-			info->flags = InvalidOpcode;
-			break;
-		default:
-			CompilerWarning("Unkown opcode in GetInstructionInfo\n%s",RSPOpcodeName(RspOp->Hex,PC));
-			info->flags = InvalidOpcode;
-			break;
-		}
-		break;
-	case RSP_SC2:
-		switch (RspOp->rd) {
-		case RSP_LSC2_BV:
-		case RSP_LSC2_SV:
-		case RSP_LSC2_LV:
-		case RSP_LSC2_DV:
-		case RSP_LSC2_QV:
-		case RSP_LSC2_RV:
-		case RSP_LSC2_PV:
-		case RSP_LSC2_UV:
-		case RSP_LSC2_HV:
-		case RSP_LSC2_FV:
-		case RSP_LSC2_WV:
-			info->DestReg = RspOp->rt;
-			info->IndexReg = RspOp->base;
-			info->SourceReg1 = -1;
-			info->flags = Store_Operation | VEC_Instruction;
-			break;
-		case RSP_LSC2_TV:
-			info->flags = InvalidOpcode;
-			break;
-		default:
-			CompilerWarning("Unkown opcode in GetInstructionInfo\n%s",RSPOpcodeName(RspOp->Hex,PC));
-			info->flags = InvalidOpcode;
-			break;
-		}
-		break;
-	default:
-	/*	CompilerWarning("Unkown opcode in GetInstructionInfo\n%s",RSPOpcodeName(RspOp->Hex,PC));
-	*/	info->flags = InvalidOpcode;
-		break;
-	}
-}
-
-/************************************************************
-** DelaySlotAffectBranch
-**
-** Output:
-**	1: Delay slot does affect the branch
-**	0: Registers do not affect each other
-**
-** Input: PC
-*************************************************************/
-
-int32_t DelaySlotAffectBranch(uint32_t PC) {
-	RSPOPCODE Branch, Delay;
-	OPCODE_INFO infoBranch, infoDelay;
-
-	if (IsOpcodeNop(PC + 4) == 1) {
-		return 0;
-	}
-
-	RSP_LW_IMEM(PC, &Branch.Hex);
-	RSP_LW_IMEM(PC+4, &Delay.Hex);
-
-	memset(&infoDelay,0,sizeof(infoDelay));
-	memset(&infoBranch,0,sizeof(infoBranch));
-
-	GetInstructionInfo(PC, &Branch, &infoBranch);
-	GetInstructionInfo(PC+4, &Delay, &infoDelay);
-
-	if ((infoDelay.flags & Instruction_Mask) == VEC_Instruction) {
-		return 0;
-	}
-
-	if (infoBranch.SourceReg0 == infoDelay.DestReg) { return 1; }
-	if (infoBranch.SourceReg1 == infoDelay.DestReg) { return 1; }
-
-	return 0;
-}
-
-/************************************************************
-** CompareInstructions
-**
-** Output:
-**	1: The opcodes are fine, no dependency
-**	0: Watch it, these ops cant be touched
-**
-** Input:
-**	Top, not the current operation, the one above
-**	Bottom: the current opcode for re-ordering bubble style
-*************************************************************/
-
-int32_t CompareInstructions(uint32_t PC, RSPOPCODE * Top, RSPOPCODE * Bottom) {
-
-	OPCODE_INFO info0, info1;
-	uint32_t InstructionType;
-
-	GetInstructionInfo(PC - 4, Top, &info0);
-	GetInstructionInfo(PC, Bottom, &info1);
-
-	/* usually branches and such */
-	if ((info0.flags & InvalidOpcode) != 0) return 0;
-	if ((info1.flags & InvalidOpcode) != 0) return 0;
-
-	InstructionType = (info0.flags & Instruction_Mask) << 2;
-	InstructionType |= info1.flags & Instruction_Mask;
-	InstructionType &= 0x0F; /* Paranoia */
-
-	/* 4 bit range, 16 possible combinations */
-	switch (InstructionType) {
-	/*
-	** Detect noop instruction, 7 cases, (see flags) */
-	case 0x01: case 0x02: case 0x03: /* First is a noop */
-		return 1;
-	case 0x00:						 /* Both ??? */
-	case 0x10: case 0x20: case 0x30: /* Second is a noop */
-		return 0;
-
-	case 0x06: /* GPR than Vector - 01,10 */
-		if ((info0.flags & MemOperation_Mask) != 0 && (info1.flags & MemOperation_Mask) != 0) {
-			/* TODO: We have a vector & GPR memory operation */
-			return 0;
-		} else if ((info1.flags & MemOperation_Mask) != 0) {
-			/* We have a vector memory operation */
-			return (info1.IndexReg == info0.DestReg) ? 0 : 1;
-		} else {
-			/* We could have memory or normal gpr instruction here
-			** paired with some kind of vector operation
-			*/
-			return 1;
-		}
-		return 0;
-
-	case 0x0A: /* Vector than Vector - 10,10 */
-
-		/*
-		** Check for Vector Store than Vector multiply (VMULF)
-		**
-		** This basically gives preferences to putting stores
-		** as close to the finish of an operation as possible
-		*/
-		if ((info0.flags & Store_Operation) != 0 && (info1.flags & Accum_Operation) != 0
-			&& !(info1.flags & VEC_Accumulate)) { return 0; }
-
-		/*
-		** Look for loads and than some kind of vector operation
-		** that does no accumulating, there is no reason to reorder
-		*/
-		if ((info0.flags & Load_Operation) != 0 && (info1.flags & Accum_Operation) != 0
-			&& !(info1.flags & VEC_Accumulate)) { return 0; }
-
-		if ((info0.flags & MemOperation_Mask) != 0 && (info1.flags & MemOperation_Mask) != 0) {
-			/*
-			** TODO: This is a bitch, its best to leave it alone
-			**/
-			return 0;
-		} else if ((info1.flags & MemOperation_Mask) != 0) {
-			/* Remember stored reg & loaded reg are the same */
-			if (info0.DestReg == info1.DestReg) { return 0; }
-
-			if (info1.flags & Load_Operation) {
-				if (info0.SourceReg0 == info1.DestReg) { return 0; }
-				if (info0.SourceReg1 == info1.DestReg) { return 0; }
-			} else if (info1.flags & Store_Operation) {
-				/* It can store source regs */
-				return 1;
-			}
-
-			return 1;
-		} else if ((info0.flags & MemOperation_Mask) != 0) {
-			/* Remember stored reg & loaded reg are the same */
-			if (info0.DestReg == info1.DestReg) { return 0; }
-
-			if (info0.flags & Load_Operation) {
-				if (info1.SourceReg0 == info0.DestReg) { return 0; }
-				if (info1.SourceReg1 == info0.DestReg) { return 0; }
-			} else if (info0.flags & Store_Operation) {
-				/* It can store source regs */
-				return 1;
-			}
-
-			return 1;
-		} else if ((info0.flags & VEC_Accumulate) != 0) {
-			/*
-			** Example:
-			**		VMACF
-			**		VMUDH or VMADH or VADD
-			*/
-
-			return 0;
-		} else if ((info1.flags & VEC_Accumulate) != 0) {
-			/*
-			** Example:
-			**		VMULF
-			**		VMADH
-			*/
-
-			return 0;
-		} else {
-			/*
-			** Example:
-			**		VMULF or VADDC
-			**		VADD or VMUDH
-			*/
-
-			return 0;
-		}
-		break;
-
-	case 0x09: /* Vector than GPR - 10,01 */
-		/**********
-		** this is where the bias comes into play, otherwise
-		** we can sit here all day swapping these 2 types
-		***********/
-		return 0;
-
-	case 0x05: /* GPR than GPR - 01,01 */
-	case 0x07: /* GPR than Cop2 - 01, 11 */
-	case 0x0D: /* Cop2 than GPR - 11, 01 */
-	case 0x0F: /* Cop2 than Cop2 - 11, 11 */
-		return 0;
-
-	case 0x0B: /* Vector than Cop2 - 10, 11 */
-		if (info1.flags & Load_Operation) {
-			/* Move To Cop2 (dest) from GPR (source) */
-			if (info1.DestReg == info0.DestReg) { return 0; }
-			if (info1.DestReg == info0.SourceReg0) { return 0; }
-			if (info1.DestReg == info0.SourceReg1) { return 0; }
-		} else if (info1.flags & Store_Operation) {
-			/* Move From Cop2 (source) to GPR (dest) */
-			if (info1.SourceReg0 == info0.DestReg) { return 0; }
-			if (info1.SourceReg0 == info0.SourceReg0) { return 0; }
-			if (info1.SourceReg0 == info0.SourceReg1) { return 0; }
-		} else {
-			//CompilerWarning("ReOrder: Unhandled Vector than Cop2");
-		}
-		// we want vectors on top
-		return 0;
-
-	case 0x0E: /* Cop2 than Vector - 11, 10 */
-		if (info0.flags & Load_Operation) {
-			/* Move To Cop2 (dest) from GPR (source) */
-			if (info0.DestReg == info1.DestReg) { return 0; }
-			if (info0.DestReg == info1.SourceReg0) { return 0; }
-			if (info0.DestReg == info1.SourceReg1) { return 0; }
-		} else if (info0.flags & Store_Operation) {
-			/* Move From Cop2 (source) to GPR (dest) */
-			if (info0.SourceReg0 == info1.DestReg) { return 0; }
-			if (info0.SourceReg0 == info1.SourceReg0) { return 0; }
-			if (info0.SourceReg0 == info1.SourceReg1) { return 0; }
-		} else {
-			//CompilerWarning("ReOrder: Unhandled Cop2 than Vector");
-		}
-		// we want this at the top
-		return 1;
-
-	default:
-		CompilerWarning("ReOrder: Unhandled instruction type: %i", InstructionType);
-	}
-
-	return 0;
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp_recompiler_cpu.c Deleted

@@ -1,954 +0,0 @@
-/*
- * RSP Compiler plug in for Project 64 (A Nintendo 64 emulator).
- *
- * (c) Copyright 2001 jabo (jabo@emulation64.com) and
- * zilmar (zilmar@emulation64.com)
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <float.h>
-#include "rsp.h"
-#include "rsp_recompiler_cpu.h"
-#include "rsp_recompiler_ops.h"
-#include "rsp_x86.h"
-#include "recompiler_cpu.h"
-#include "memory.h"
-#include "main.h"
-#include "usf.h"
-#include "types.h"
-
-/* #define REORDER_BLOCK_VERBOSE */
-#define LINK_BRANCHES_VERBOSE /* no choice really */
-#define X86_RECOMP_VERBOSE
-#define BUILD_BRANCHLABELS_VERBOSE
-
-uint32_t RSPCompilePC, RSPBlockID = 0;
-uint32_t dwBuffer = MainBuffer;
-
-RSP_BLOCK RSPCurrentBlock;
-RSP_CODE RspCode;
-
-uint8_t * pLastSecondary = NULL, * pLastPrimary = NULL;
-
-void BuildRecompilerCPU ( void ) {
-	RSP_Opcode[ 0] = RSPCompile_SPECIAL;
-	RSP_Opcode[ 1] = RSPCompile_REGIMM;
-	RSP_Opcode[ 2] = RSPCompile_J;
-	RSP_Opcode[ 3] = RSPCompile_JAL;
-	RSP_Opcode[ 4] = RSPCompile_BEQ;
-	RSP_Opcode[ 5] = RSPCompile_BNE;
-	RSP_Opcode[ 6] = RSPCompile_BLEZ;
-	RSP_Opcode[ 7] = RSPCompile_BGTZ;
-	RSP_Opcode[ 8] = RSPCompile_ADDI;
-	RSP_Opcode[ 9] = RSPCompile_ADDIU;
-	RSP_Opcode[10] = RSPCompile_SLTI;
-	RSP_Opcode[11] = RSPCompile_SLTIU;
-	RSP_Opcode[12] = RSPCompile_ANDI;
-	RSP_Opcode[13] = RSPCompile_ORI;
-	RSP_Opcode[14] = RSPCompile_XORI;
-	RSP_Opcode[15] = RSPCompile_LUI;
-	RSP_Opcode[16] = RSPCompile_COP0;
-	RSP_Opcode[17] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[18] = RSPCompile_COP2;
-	RSP_Opcode[19] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[20] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[21] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[22] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[23] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[24] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[25] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[26] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[27] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[28] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[29] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[30] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[31] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[32] = RSPCompile_LB;
-	RSP_Opcode[33] = RSPCompile_LH;
-	RSP_Opcode[34] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[35] = RSPCompile_LW;
-	RSP_Opcode[36] = RSPCompile_LBU;
-	RSP_Opcode[37] = RSPCompile_LHU;
-	RSP_Opcode[38] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[39] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[40] = RSPCompile_SB;
-	RSP_Opcode[41] = RSPCompile_SH;
-	RSP_Opcode[42] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[43] = RSPCompile_SW;
-	RSP_Opcode[44] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[45] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[46] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[47] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[48] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[49] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[50] = RSPCompile_LC2;
-	RSP_Opcode[51] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[52] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[53] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[54] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[55] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[56] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[57] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[58] = RSPCompile_SC2;
-	RSP_Opcode[59] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[60] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[61] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[62] = RSPCompile_UnknownOpcode;
-	RSP_Opcode[63] = RSPCompile_UnknownOpcode;
-
-	RSP_Special[ 0] = RSPCompile_Special_SLL;
-	RSP_Special[ 1] = RSPCompile_UnknownOpcode;
-	RSP_Special[ 2] = RSPCompile_Special_SRL;
-	RSP_Special[ 3] = RSPCompile_Special_SRA;
-	RSP_Special[ 4] = RSPCompile_Special_SLLV;
-	RSP_Special[ 5] = RSPCompile_UnknownOpcode;
-	RSP_Special[ 6] = RSPCompile_Special_SRLV;
-	RSP_Special[ 7] = RSPCompile_Special_SRAV;
-	RSP_Special[ 8] = RSPCompile_Special_JR;
-	RSP_Special[ 9] = RSPCompile_Special_JALR;
-	RSP_Special[10] = RSPCompile_UnknownOpcode;
-	RSP_Special[11] = RSPCompile_UnknownOpcode;
-	RSP_Special[12] = RSPCompile_UnknownOpcode;
-	RSP_Special[13] = RSPCompile_Special_BREAK;
-	RSP_Special[14] = RSPCompile_UnknownOpcode;
-	RSP_Special[15] = RSPCompile_UnknownOpcode;
-	RSP_Special[16] = RSPCompile_UnknownOpcode;
-	RSP_Special[17] = RSPCompile_UnknownOpcode;
-	RSP_Special[18] = RSPCompile_UnknownOpcode;
-	RSP_Special[19] = RSPCompile_UnknownOpcode;
-	RSP_Special[20] = RSPCompile_UnknownOpcode;
-	RSP_Special[21] = RSPCompile_UnknownOpcode;
-	RSP_Special[22] = RSPCompile_UnknownOpcode;
-	RSP_Special[23] = RSPCompile_UnknownOpcode;
-	RSP_Special[24] = RSPCompile_UnknownOpcode;
-	RSP_Special[25] = RSPCompile_UnknownOpcode;
-	RSP_Special[26] = RSPCompile_UnknownOpcode;
-	RSP_Special[27] = RSPCompile_UnknownOpcode;
-	RSP_Special[28] = RSPCompile_UnknownOpcode;
-	RSP_Special[29] = RSPCompile_UnknownOpcode;
-	RSP_Special[30] = RSPCompile_UnknownOpcode;
-	RSP_Special[31] = RSPCompile_UnknownOpcode;
-	RSP_Special[32] = RSPCompile_Special_ADD;
-	RSP_Special[33] = RSPCompile_Special_ADDU;
-	RSP_Special[34] = RSPCompile_Special_SUB;
-	RSP_Special[35] = RSPCompile_Special_SUBU;
-	RSP_Special[36] = RSPCompile_Special_AND;
-	RSP_Special[37] = RSPCompile_Special_OR;
-	RSP_Special[38] = RSPCompile_Special_XOR;
-	RSP_Special[39] = RSPCompile_Special_NOR;
-	RSP_Special[40] = RSPCompile_UnknownOpcode;
-	RSP_Special[41] = RSPCompile_UnknownOpcode;
-	RSP_Special[42] = RSPCompile_Special_SLT;
-	RSP_Special[43] = RSPCompile_Special_SLTU;
-	RSP_Special[44] = RSPCompile_UnknownOpcode;
-	RSP_Special[45] = RSPCompile_UnknownOpcode;
-	RSP_Special[46] = RSPCompile_UnknownOpcode;
-	RSP_Special[47] = RSPCompile_UnknownOpcode;
-	RSP_Special[48] = RSPCompile_UnknownOpcode;
-	RSP_Special[49] = RSPCompile_UnknownOpcode;
-	RSP_Special[50] = RSPCompile_UnknownOpcode;
-	RSP_Special[51] = RSPCompile_UnknownOpcode;
-	RSP_Special[52] = RSPCompile_UnknownOpcode;
-	RSP_Special[53] = RSPCompile_UnknownOpcode;
-	RSP_Special[54] = RSPCompile_UnknownOpcode;
-	RSP_Special[55] = RSPCompile_UnknownOpcode;
-	RSP_Special[56] = RSPCompile_UnknownOpcode;
-	RSP_Special[57] = RSPCompile_UnknownOpcode;
-	RSP_Special[58] = RSPCompile_UnknownOpcode;
-	RSP_Special[59] = RSPCompile_UnknownOpcode;
-	RSP_Special[60] = RSPCompile_UnknownOpcode;
-	RSP_Special[61] = RSPCompile_UnknownOpcode;
-	RSP_Special[62] = RSPCompile_UnknownOpcode;
-	RSP_Special[63] = RSPCompile_UnknownOpcode;
-
-	RSP_RegImm[ 0] = RSPCompile_RegImm_BLTZ;
-	RSP_RegImm[ 1] = RSPCompile_RegImm_BGEZ;
-	RSP_RegImm[ 2] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[ 3] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[ 4] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[ 5] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[ 6] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[ 7] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[ 8] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[ 9] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[10] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[11] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[12] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[13] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[14] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[15] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[16] = RSPCompile_RegImm_BLTZAL;
-	RSP_RegImm[17] = RSPCompile_RegImm_BGEZAL;
-	RSP_RegImm[18] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[19] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[20] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[21] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[22] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[23] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[24] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[25] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[26] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[27] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[28] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[29] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[30] = RSPCompile_UnknownOpcode;
-	RSP_RegImm[31] = RSPCompile_UnknownOpcode;
-
-	RSP_Cop0[ 0] = RSPCompile_Cop0_MF;
-	RSP_Cop0[ 1] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[ 2] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[ 3] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[ 4] = RSPCompile_Cop0_MT;
-	RSP_Cop0[ 5] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[ 6] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[ 7] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[ 8] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[ 9] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[10] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[11] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[12] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[13] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[14] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[15] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[16] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[17] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[18] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[19] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[20] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[21] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[22] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[23] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[24] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[25] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[26] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[27] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[28] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[29] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[30] = RSPCompile_UnknownOpcode;
-	RSP_Cop0[31] = RSPCompile_UnknownOpcode;
-
-	RSP_Cop2[ 0] = RSPCompile_Cop2_MF;
-	RSP_Cop2[ 1] = RSPCompile_UnknownOpcode;
-	RSP_Cop2[ 2] = RSPCompile_Cop2_CF;
-	RSP_Cop2[ 3] = RSPCompile_UnknownOpcode;
-	RSP_Cop2[ 4] = RSPCompile_Cop2_MT;
-	RSP_Cop2[ 5] = RSPCompile_UnknownOpcode;
-	RSP_Cop2[ 6] = RSPCompile_Cop2_CT;
-	RSP_Cop2[ 7] = RSPCompile_UnknownOpcode;
-	RSP_Cop2[ 8] = RSPCompile_UnknownOpcode;
-	RSP_Cop2[ 9] = RSPCompile_UnknownOpcode;
-	RSP_Cop2[10] = RSPCompile_UnknownOpcode;
-	RSP_Cop2[11] = RSPCompile_UnknownOpcode;
-	RSP_Cop2[12] = RSPCompile_UnknownOpcode;
-	RSP_Cop2[13] = RSPCompile_UnknownOpcode;
-	RSP_Cop2[14] = RSPCompile_UnknownOpcode;
-	RSP_Cop2[15] = RSPCompile_UnknownOpcode;
-	RSP_Cop2[16] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[17] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[18] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[19] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[20] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[21] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[22] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[23] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[24] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[25] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[26] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[27] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[28] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[29] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[30] = RSPCompile_COP2_VECTOR;
-	RSP_Cop2[31] = RSPCompile_COP2_VECTOR;
-
-	RSP_Vector[ 0] = RSPCompile_Vector_VMULF;
-	RSP_Vector[ 1] = RSPCompile_Vector_VMULU;
-	RSP_Vector[ 2] = RSPCompile_UnknownOpcode;
-	RSP_Vector[ 3] = RSPCompile_UnknownOpcode;
-	RSP_Vector[ 4] = RSPCompile_Vector_VMUDL;
-	RSP_Vector[ 5] = RSPCompile_Vector_VMUDM;
-	RSP_Vector[ 6] = RSPCompile_Vector_VMUDN;
-	RSP_Vector[ 7] = RSPCompile_Vector_VMUDH;
-	RSP_Vector[ 8] = RSPCompile_Vector_VMACF;
-	RSP_Vector[ 9] = RSPCompile_Vector_VMACU;
-	RSP_Vector[10] = RSPCompile_UnknownOpcode;
-	RSP_Vector[11] = RSPCompile_Vector_VMACQ;
-	RSP_Vector[12] = RSPCompile_Vector_VMADL;
-	RSP_Vector[13] = RSPCompile_Vector_VMADM;
-	RSP_Vector[14] = RSPCompile_Vector_VMADN;
-	RSP_Vector[15] = RSPCompile_Vector_VMADH;
-	RSP_Vector[16] = RSPCompile_Vector_VADD;
-	RSP_Vector[17] = RSPCompile_Vector_VSUB;
-	RSP_Vector[18] = RSPCompile_UnknownOpcode;
-	RSP_Vector[19] = RSPCompile_Vector_VABS;
-	RSP_Vector[20] = RSPCompile_Vector_VADDC;
-	RSP_Vector[21] = RSPCompile_Vector_VSUBC;
-	RSP_Vector[22] = RSPCompile_UnknownOpcode;
-	RSP_Vector[23] = RSPCompile_UnknownOpcode;
-	RSP_Vector[24] = RSPCompile_UnknownOpcode;
-	RSP_Vector[25] = RSPCompile_UnknownOpcode;
-	RSP_Vector[26] = RSPCompile_UnknownOpcode;
-	RSP_Vector[27] = RSPCompile_UnknownOpcode;
-	RSP_Vector[28] = RSPCompile_UnknownOpcode;
-	RSP_Vector[29] = RSPCompile_Vector_VSAW;
-	RSP_Vector[30] = RSPCompile_UnknownOpcode;
-	RSP_Vector[31] = RSPCompile_UnknownOpcode;
-	RSP_Vector[32] = RSPCompile_Vector_VLT;
-	RSP_Vector[33] = RSPCompile_Vector_VEQ;
-	RSP_Vector[34] = RSPCompile_Vector_VNE;
-	RSP_Vector[35] = RSPCompile_Vector_VGE;
-	RSP_Vector[36] = RSPCompile_Vector_VCL;
-	RSP_Vector[37] = RSPCompile_Vector_VCH;
-	RSP_Vector[38] = RSPCompile_Vector_VCR;
-	RSP_Vector[39] = RSPCompile_Vector_VMRG;
-	RSP_Vector[40] = RSPCompile_Vector_VAND;
-	RSP_Vector[41] = RSPCompile_Vector_VNAND;
-	RSP_Vector[42] = RSPCompile_Vector_VOR;
-	RSP_Vector[43] = RSPCompile_Vector_VNOR;
-	RSP_Vector[44] = RSPCompile_Vector_VXOR;
-	RSP_Vector[45] = RSPCompile_Vector_VNXOR;
-	RSP_Vector[46] = RSPCompile_UnknownOpcode;
-	RSP_Vector[47] = RSPCompile_UnknownOpcode;
-	RSP_Vector[48] = RSPCompile_Vector_VRCP;
-	RSP_Vector[49] = RSPCompile_Vector_VRCPL;
-	RSP_Vector[50] = RSPCompile_Vector_VRCPH;
-	RSP_Vector[51] = RSPCompile_Vector_VMOV;
-	RSP_Vector[52] = RSPCompile_Vector_VRSQ;
-	RSP_Vector[53] = RSPCompile_Vector_VRSQL;
-	RSP_Vector[54] = RSPCompile_Vector_VRSQH;
-	RSP_Vector[55] = RSPCompile_Vector_VNOOP;
-	RSP_Vector[56] = RSPCompile_UnknownOpcode;
-	RSP_Vector[57] = RSPCompile_UnknownOpcode;
-	RSP_Vector[58] = RSPCompile_UnknownOpcode;
-	RSP_Vector[59] = RSPCompile_UnknownOpcode;
-	RSP_Vector[60] = RSPCompile_UnknownOpcode;
-	RSP_Vector[61] = RSPCompile_UnknownOpcode;
-	RSP_Vector[62] = RSPCompile_UnknownOpcode;
-	RSP_Vector[63] = RSPCompile_UnknownOpcode;
-
-	RSP_Lc2[ 0] = RSPCompile_Opcode_LBV;
-	RSP_Lc2[ 1] = RSPCompile_Opcode_LSV;
-	RSP_Lc2[ 2] = RSPCompile_Opcode_LLV;
-	RSP_Lc2[ 3] = RSPCompile_Opcode_LDV;
-	RSP_Lc2[ 4] = RSPCompile_Opcode_LQV;
-	RSP_Lc2[ 5] = RSPCompile_Opcode_LRV;
-	RSP_Lc2[ 6] = RSPCompile_Opcode_LPV;
-	RSP_Lc2[ 7] = RSPCompile_Opcode_LUV;
-	RSP_Lc2[ 8] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[ 9] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[10] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[11] = RSPCompile_Opcode_LTV;
-	RSP_Lc2[12] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[13] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[14] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[15] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[16] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[17] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[18] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[19] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[20] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[21] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[22] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[23] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[24] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[25] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[26] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[27] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[28] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[29] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[30] = RSPCompile_UnknownOpcode;
-	RSP_Lc2[31] = RSPCompile_UnknownOpcode;
-
-	RSP_Sc2[ 0] = RSPCompile_Opcode_SBV;
-	RSP_Sc2[ 1] = RSPCompile_Opcode_SSV;
-	RSP_Sc2[ 2] = RSPCompile_Opcode_SLV;
-	RSP_Sc2[ 3] = RSPCompile_Opcode_SDV;
-	RSP_Sc2[ 4] = RSPCompile_Opcode_SQV;
-	RSP_Sc2[ 5] = RSPCompile_Opcode_SRV;
-	RSP_Sc2[ 6] = RSPCompile_Opcode_SPV;
-	RSP_Sc2[ 7] = RSPCompile_Opcode_SUV;
-	RSP_Sc2[ 8] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[ 9] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[10] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[11] = RSPCompile_Opcode_STV;
-	RSP_Sc2[12] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[13] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[14] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[15] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[16] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[17] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[18] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[19] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[20] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[21] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[22] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[23] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[24] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[25] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[26] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[27] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[28] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[29] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[30] = RSPCompile_UnknownOpcode;
-	RSP_Sc2[31] = RSPCompile_UnknownOpcode;
-
-	RSPBlockID = 0;
-}
-
-/******************************************************
-** ReOrderSubBlock
-**
-** Desc:
-** this can be done, but will be interesting to put
-** between branches labels, and actual branches, whichever
-** occurs first in code
-**
-********************************************************/
-
-void ReOrderInstructions(uint32_t StartPC, uint32_t EndPC) {
-	uint32_t InstructionCount = EndPC - StartPC;
-	uint32_t Count, ReorderedOps, CurrentPC;
-	RSPOPCODE PreviousOp, CurrentOp, RspOp;
-
-	PreviousOp.Hex = *(uint32_t*)(IMEM + StartPC);
-
-	if (1 == IsOpcodeBranch(StartPC, PreviousOp)) {
-		/* the sub block ends here anyway */
-		return;
-	}
-
-	if (IsOpcodeNop(StartPC) && IsOpcodeNop(StartPC + 4) && IsOpcodeNop(StartPC + 8)) {
-		/* Dont even bother */
-		return;
-	}
-
-	CPU_Message("***** Doing reorder (%X to %X) *****", StartPC, EndPC);
-
-	if (InstructionCount < 0x0010) { return; }
-	if (InstructionCount > 0x0A00) { return; }
-
-	CPU_Message(" Before:");
-	for (Count = StartPC; Count < EndPC; Count += 4) {
-		RSP_LW_IMEM(Count, &RspOp.Hex);
-		//CPU_Message(" %X %s",Count,RSPOpcodeName(RspOp.Hex,Count));
-	}
-
-	for (Count = 0; Count < InstructionCount; Count += 4) {
-		CurrentPC = StartPC;
-		PreviousOp.Hex = *(uint32_t*)(IMEM + CurrentPC);
-		ReorderedOps = 0;
-
-		for (;;) {
-			CurrentPC += 4;
-			if (CurrentPC >= EndPC) { break; }
-			CurrentOp.Hex = *(uint32_t*)(IMEM + CurrentPC);
-
-			if (1 == CompareInstructions(CurrentPC, &PreviousOp, &CurrentOp)) {
-				/* Move current opcode up */
-				*(uint32_t*)(IMEM + CurrentPC - 4) = CurrentOp.Hex;
-			 	*(uint32_t*)(IMEM + CurrentPC) = PreviousOp.Hex;
-
-				ReorderedOps++;
-				#ifdef REORDER_BLOCK_VERBOSE
-				CPU_Message("Swapped %X and %X", CurrentPC - 4, CurrentPC);
-				#endif
-			}
-			PreviousOp.Hex = *(uint32_t*)(IMEM + CurrentPC);
-
-			if (IsOpcodeNop(CurrentPC) && IsOpcodeNop(CurrentPC + 4) && IsOpcodeNop(CurrentPC + 8)) {
-				CurrentPC = EndPC;
-			}
-		}
-
-		if (ReorderedOps == 0) {
-			Count = InstructionCount;
-		}
-	}
-
-	CPU_Message(" After:");
-	for (Count = StartPC; Count < EndPC; Count += 4) {
-		RSP_LW_IMEM(Count, &RspOp.Hex);
-		//CPU_Message(" %X %s",Count,RSPOpcodeName(RspOp.Hex,Count));
-	}
-	CPU_Message("");
-}
-
-void ReOrderSubBlock(RSP_BLOCK * Block) {
-	uint32_t end = 0x0ffc;
-	uint32_t count;
-
-	//return; //fixthis
-	if (!Compiler.bReOrdering) {
-		return;
-	}
-	if (Block->CurrPC > 0xFF0) {
-		return;
-	}
-
-	/* find the label or jump closest to us */
-	if (RspCode.LabelCount) {
-		for (count = 0; count < RspCode.LabelCount; count++) {
-			if (RspCode.BranchLabels[count] < end &&
-				 RspCode.BranchLabels[count] > Block->CurrPC) {
-				end = RspCode.BranchLabels[count];
-			}
-		}
-	}
-	if (RspCode.BranchCount) {
-		for (count = 0; count < RspCode.BranchCount; count++) {
-			if (RspCode.BranchLocations[count] < end &&
-				 RspCode.BranchLocations[count] > Block->CurrPC) {
-				end = RspCode.BranchLocations[count];
-			}
-		}
-	}
-
-	/* it wont actually re-order the op at the end */
-	ReOrderInstructions(Block->CurrPC, end);
-}
-
-/******************************************************
-** DetectGPRConstants
-**
-** Desc:
-** this needs to be called on a sub-block basis, like
-** after every time we hit a branch and delay slot
-**
-********************************************************/
-
-void DetectGPRConstants(RSP_CODE * code) {
-	uint32_t Count, Constant = 0;
-
-	memset(&code->bIsRegConst, 0, sizeof(int32_t) * 0x20);
-	memset(&code->MipsRegConst, 0, sizeof(uint32_t) * 0x20);
-
-	if (!Compiler.bGPRConstants) {
-		return;
-	}
-	CPU_Message("***** Detecting constants *****");
-
-	/*** Setup R0 ***/
-	code->bIsRegConst[0] = 1;
-	code->MipsRegConst[0] = 0;
-
-	/* Do your global search for them */
-	for (Count = 1; Count < 32; Count++) {
-		if (IsRegisterConstant(Count, &Constant) == 1) {
-			//CPU_Message("Global: %s is a constant of: %08X", GPR_Name(Count), Constant);
-			code->bIsRegConst[Count] = 1;
-			code->MipsRegConst[Count] = Constant;
-		}
-	}
-	CPU_Message("");
-}
-
-/******************************************************
-** CompilerToggleBuffer and ClearX86Code
-**
-** Desc:
-** 1> toggles the compiler buffer, useful for poorly
-** taken branches like alignment
-**
-** 2> clears all the x86 code, jump tables etc
-**
-********************************************************/
-
-void CompilerToggleBuffer(void) {
-	if (dwBuffer == MainBuffer) {
-		dwBuffer = SecondaryBuffer;
-		pLastPrimary = RSPRecompPos;
-
-		if (pLastSecondary == NULL) {
-			pLastSecondary = RSPRecompCodeSecondary;
-		}
-
-		RSPRecompPos = pLastSecondary;
-		CPU_Message(" (Secondary Buffer Active 0x%08X)", pLastSecondary);
-	} else {
-		dwBuffer = MainBuffer;
-		pLastSecondary = RSPRecompPos;
-
-		if (pLastPrimary == NULL) {
-			pLastPrimary = RSPRecompCode;
-		}
-
-		RSPRecompPos = pLastPrimary;
-		CPU_Message(" (Primary Buffer Active 0x%08X)", pLastPrimary);
-	}
-}
-
-void ClearAllx86Code (void) {
-	extern uint32_t NoOfMaps, MapsCRC[32];
-	extern uint8_t *RSPJumpTables;
-
-	memset(&MapsCRC, 0, sizeof(uint32_t) * 0x20);
-	NoOfMaps = 0;
-	memset(RSPJumpTables,0,0x2000*32);
-
-	RSPRecompPos = RSPRecompCode;
-
-	pLastPrimary = NULL;
-	pLastSecondary = NULL;
-}
-
-/******************************************************
-** Link Branches
-**
-** Desc:
-** resolves all the collected branches, x86 style
-**
-********************************************************/
-
-void LinkBranches(RSP_BLOCK * Block) {
-	uint32_t Count, Target;
-	uint32_t * JumpWord;
-	uint8_t * X86Code;
-	RSP_BLOCK Save;
-
-	if (!RSPCurrentBlock.ResolveCount) {
-		return;
-	}
-	CPU_Message("***** Linking branches (%i) *****", RSPCurrentBlock.ResolveCount);
-
-	for (Count = 0; Count < RSPCurrentBlock.ResolveCount; Count++) {
-		Target = RSPCurrentBlock.BranchesToResolve[Count].TargetPC;
-		X86Code = *(RSPJumpTable + (Target >> 2));
-
-		if (!X86Code) {
-			*PrgCount = Target;
-			CPU_Message("");
-			CPU_Message("===== (Generate Code: %04X) =====", Target);
-			Save = *Block;
-
-			/* compile this block and link */
-			CompilerRSPBlock();
-			LinkBranches(Block);
-
-			*Block = Save;
-			CPU_Message("===== (End Generate Code: %04X) =====", Target);
-			CPU_Message("");
-			X86Code = *(RSPJumpTable + (Target >> 2));
-		}
-
-		JumpWord = RSPCurrentBlock.BranchesToResolve[Count].X86JumpLoc;
-		RSPx86_SetBranch32b(JumpWord, (uint32_t*)X86Code);
-
-		CPU_Message("Linked RSP branch from x86: %08X, to RSP: %X / x86: %08X",
-			JumpWord, Target, X86Code);
-	}
-	CPU_Message("***** Done Linking Branches *****");
-	CPU_Message("");
-}
-
-/******************************************************
-** BuildBranchLabels
-**
-** Desc:
-** Branch labels are used to start and stop re-ordering
-** sections as well as set the jump table to points
-** within a block that are safe
-**
-********************************************************/
-
-void BuildBranchLabels(void) {
-	RSPOPCODE RspOp;
-	uint32_t i, Dest;
-
-	#ifdef BUILD_BRANCHLABELS_VERBOSE
-	CPU_Message("***** Building branch labels *****");
-	#endif
-
-	for (i = 0; i < 0x1000; i += 4) {
-		RspOp.Hex = *(uint32_t*)(IMEM + i);
-
-		if (1 == IsOpcodeBranch(i, RspOp)) {
-			if (RspCode.LabelCount >= 175) {
-				CompilerWarning("Out of space for Branch Labels",1);
-				return;
-			}
-
-			RspCode.BranchLocations[RspCode.BranchCount++] = i;
-			if (RspOp.op == RSP_SPECIAL) {
-				/* register jump not predictable */
-			} else if (RspOp.op == RSP_J || RspOp.op == RSP_JAL) {
-				/* for JAL its a sub-block for returns */
-				Dest = (RspOp.target << 2) & 0xFFC;
-				RspCode.BranchLabels[RspCode.LabelCount] = Dest;
-				RspCode.LabelCount += 1;
-				#ifdef BUILD_BRANCHLABELS_VERBOSE
-				CPU_Message("[%02i] Added branch at %X to %X", RspCode.LabelCount, i, Dest);
-				#endif
-			} else {
-				Dest = (i + ((int16_t)RspOp.offset << 2) + 4) & 0xFFC;
-				RspCode.BranchLabels[RspCode.LabelCount] = Dest;
-				RspCode.LabelCount += 1;
-				#ifdef BUILD_BRANCHLABELS_VERBOSE
-				CPU_Message("[%02i] Added branch at %X to %X", RspCode.LabelCount, i, Dest);
-				#endif
-			}
-		}
-	}
-
-	#ifdef BUILD_BRANCHLABELS_VERBOSE
-	CPU_Message("***** End branch labels *****");
-	CPU_Message("");
-	#endif
-}
-
-int32_t IsJumpLabel(uint32_t PC) {
-	uint32_t Count;
-
-	if (!RspCode.LabelCount) {
-		return 0;
-	}
-
-	for (Count = 0; Count < RspCode.LabelCount; Count++) {
-		if (PC == RspCode.BranchLabels[Count]) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
-
-
-void CompilerLinkBlocks(void) {
-	uint8_t * KnownCode = *(RSPJumpTable + (RSPCompilePC >> 2));
-
-	CPU_Message("***** Linking block to X86: %08X *****", KnownCode);
-	RSPNextInstruction = FINISH_BLOCK;
-
-	/* block linking scenario */
-	RSPJmpLabel32(0);
-	RSPx86_SetBranch32b(RSPRecompPos - 4, KnownCode);
-}
-
-
-void CompilerRSPBlock ( void ) {
-	uint32_t Count, Padding, X86BaseAddress = (uint32_t)RSPRecompPos;
-
-	RSPNextInstruction = NORMAL;
-	RSPCompilePC = *PrgCount;
-
-	memset(&RSPCurrentBlock, 0, sizeof(RSPCurrentBlock));
-	RSPCurrentBlock.StartPC = RSPCompilePC;
-	RSPCurrentBlock.CurrPC = RSPCompilePC;
-
-
-	/* Align the block to a boundary */
-	if (X86BaseAddress & 7) {
-		Padding = (8 - (X86BaseAddress & 7)) & 7;
-		for (Count = 0; Count < Padding; Count++) {
-			*(RSPRecompPos++) = 0x90;
-		}
-	}
-
-	if (Compiler.bReOrdering == 1) {
-		memcpy(&RSPCurrentBlock.IMEM[0], IMEM, 0x1000);
-		ReOrderSubBlock(&RSPCurrentBlock);
-	}
-
-	/* this is for the block about to be compiled */
-	*(RSPJumpTable + (RSPCompilePC >> 2)) = RSPRecompPos;
-
-
-#ifdef USEX64
-	RSPMoveConstQwordToX86reg(TLB_Map, x86_R15);
-#endif
-
-	do {
-		/*
-		** Re-Ordering is setup to allow us to have loop labels
-		** so here we see if this is one and put it in the jump table
-		**/
-
-		if (RSPNextInstruction == NORMAL && IsJumpLabel(RSPCompilePC)) {
-			/* jumps come around twice */
-			if (NULL == *(RSPJumpTable + (RSPCompilePC >> 2))) {
-				CPU_Message("***** Adding Jump Table Entry for PC: %04X at X86: %08X *****", RSPCompilePC, RSPRecompPos);
-				CPU_Message("");
-				*(RSPJumpTable + (RSPCompilePC >> 2)) = RSPRecompPos;
-
-				/* reorder from here to next label or branch */
-				RSPCurrentBlock.CurrPC = RSPCompilePC;
-				ReOrderSubBlock(&RSPCurrentBlock);
-			} else if (RSPNextInstruction != DELAY_SLOT_DONE) {
-				/*
-				 * we could link the blocks here, but performance
-				 * wise it might be better to just let it run
-				 */
-			}
-		}
-
-		if (Compiler.bSections == 1) {
-		//	if (1 == RSP_DoSections()) {
-		//		continue;
-		//	}
-		}
-
-		#ifdef X86_RECOMP_VERBOSE
-		if (0 == IsOpcodeNop(RSPCompilePC)) {
-			CPU_Message("X86 Address: %08X", RSPRecompPos);
-		}
-		#endif
-
-		RSP_LW_IMEM(RSPCompilePC, &RSPOpC.Hex);
-
-		if (RSPOpC.Hex == 0xFFFFFFFF) {
-			/* i think this pops up an unknown op dialog */
-			/* NextInstruction = FINISH_BLOCK; */
-		} else {
-			((void (*)()) RSP_Opcode[ RSPOpC.op ])();
-		}
-
-		//printf("%08x\n", RSPNextInstruction);
-
-		switch (RSPNextInstruction) {
-		case NORMAL:
-			RSPCompilePC += 4;
-			break;
-		case DO_DELAY_SLOT:
-			RSPNextInstruction = DELAY_SLOT;
-			RSPCompilePC += 4;
-			break;
-		case DELAY_SLOT:
-			RSPNextInstruction = DELAY_SLOT_DONE;
-			RSPCompilePC -= 4;
-			break;
-		case FINISH_SUB_BLOCK:
-			RSPNextInstruction = NORMAL;
-			RSPCompilePC += 8;
-			if (RSPCompilePC >= 0x1000) {
-				RSPNextInstruction = FINISH_BLOCK;
-			} else if (NULL == *(RSPJumpTable + (RSPCompilePC >> 2))) {
-				/* this is for the new block being compiled now */
-				CPU_Message("**** Continuing static SubBlock (jump table entry added for PC: %04X at X86: %08X) *****", RSPCompilePC, RSPRecompPos);
-				*(RSPJumpTable + (RSPCompilePC >> 2)) = RSPRecompPos;
-
-				RSPCurrentBlock.CurrPC = RSPCompilePC;
-				/* reorder from after delay to next label or branch */
-				ReOrderSubBlock(&RSPCurrentBlock);
-			} else {
-				CompilerLinkBlocks();
-			}
-			break;
-
-		case FINISH_BLOCK: break;
-		default:
-			DisplayError("Rsp Main loop\n\nWTF NextInstruction = %d",RSPNextInstruction);
-			RSPCompilePC += 4;
-			break;
-		}
-	} while ( RSPNextInstruction != FINISH_BLOCK && RSPCompilePC < 0x1000);
-	CPU_Message("==== end of recompiled code ====");
-
-	if (Compiler.bReOrdering == 1) {
-		memcpy(IMEM, &RSPCurrentBlock.IMEM[0], 0x1000);
-	}
-}
-
-#include "types.h"
-
-
-void RunRecompilerCPU ( uint32_t Cycles ) {
-	uint8_t * Block = 0;
-
-	RSP_Running = 1;
-	RSPSetJumpTable();
-
-
-
-	while (RSP_Running) {
-
-		Block = *(RSPJumpTable + (*PrgCount >> 2));
-
-		if (Block == NULL) {
-			//__try {
-				memset(&RspCode, 0, sizeof(RspCode));
-				BuildBranchLabels();
-				DetectGPRConstants(&RspCode);
-				CompilerRSPBlock();
-			/*} __except(EXCEPTION_EXECUTE_HANDLER) {
-				DisplayError("Error RSPCompilePC = %08X", RSPCompilePC);
-				ClearAllx86Code();
-				continue;
-			}*/
-
-			Block = *(RSPJumpTable + (*PrgCount >> 2));
-
-			/*
-			** we are done compiling, but we may have references
-			** to fill in still either from this block, or jumps
-			** that go out of it, let's rock
-			**/
-
-			LinkBranches(&RSPCurrentBlock);
-		}
-		{
-
-			void (*block)();
-			block=Block;
-#ifdef USEX64			
-			__asm__ __volatile__("pushq %rax");
-			__asm__ __volatile__("pushq %rbx");
-			__asm__ __volatile__("pushq %rcx");
-			__asm__ __volatile__("pushq %rdx");
-			__asm__ __volatile__("pushq %rbp");
-			__asm__ __volatile__("pushq %r8");
-			__asm__ __volatile__("pushq %r9");
-			__asm__ __volatile__("pushq %r10");
-			__asm__ __volatile__("pushq %r11");
-			__asm__ __volatile__("pushq %r12");
-			__asm__ __volatile__("pushq %r13");
-			__asm__ __volatile__("pushq %r14");
-			__asm__ __volatile__("pushq %r15");
-
-			block();
-
-			__asm__ __volatile__("popq %r15");
-			__asm__ __volatile__("popq %r14");
-			__asm__ __volatile__("popq %r13");
-			__asm__ __volatile__("popq %r12");
-			__asm__ __volatile__("popq %r11");
-			__asm__ __volatile__("popq %r10");
-			__asm__ __volatile__("popq %r9");
-			__asm__ __volatile__("popq %r8");
-			__asm__ __volatile__("popq %rbp");
-			__asm__ __volatile__("popq %rdx");
-			__asm__ __volatile__("popq %rcx");
-			__asm__ __volatile__("popq %rbx");
-			__asm__ __volatile__("popq %rax");
-
-#else
-			__asm__ __volatile__("pusha");
-			block();
-			__asm__ __volatile__("popa");
-#endif
-		}
-
-	}
-
-//	if (IsMmxEnabled == 1) {
-//		_Emms();
-//	}
-	return;
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp_recompiler_cpu.h Deleted

@@ -1,116 +0,0 @@
-/*
- * RSP Compiler plug in for Project 64 (A Nintendo 64 emulator).
- *
- * (c) Copyright 2001 jabo (jabo@emulation64.com) and
- * zilmar (zilmar@emulation64.com)
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include "rsp.h"
-
-extern uint32_t RSPCompilePC, RSPNextInstruction;
-
-//#define CompilerWarning if (ShowErrors) DisplayError
-//#define CompilerWarning(blah,blah2)
-#define CompilerWarning(...)
-
-#define High16BitAccum		1
-#define Middle16BitAccum	2
-#define Low16BitAccum		4
-#define EntireAccum			(Low16BitAccum|Middle16BitAccum|High16BitAccum)
-
-int32_t WriteToAccum (int32_t Location, int32_t PC);
-int32_t WriteToVectorDest (uint32_t DestReg, int32_t PC);
-int32_t UseRspFlags (int32_t PC);
-
-int32_t DelaySlotAffectBranch(uint32_t PC);
-int32_t CompareInstructions(uint32_t PC, RSPOPCODE * Top, RSPOPCODE * Bottom);
-int32_t IsOpcodeBranch(uint32_t PC, RSPOPCODE RspOp);
-int32_t IsOpcodeNop(uint32_t PC);
-
-int32_t IsNextInstructionMmx(uint32_t PC);
-int32_t IsRegisterConstant (uint32_t Reg, uint32_t * Constant);
-
-void RSP_Element2Mmx(int32_t MmxReg);
-void RSP_MultiElement2Mmx(int32_t MmxReg1, int32_t MmxReg2);
-
-#define MainBuffer			0
-#define SecondaryBuffer		1
-
-void RunRecompilerCPU ( uint32_t Cycles );
-void BuildRecompilerCPU ( void );
-
-void CompilerRSPBlock ( void );
-void CompilerToggleBuffer (void);
-int32_t RSP_DoSections(void);
-
-void ClearAllx86Code (void);
-
-typedef struct {
-	uint32_t StartPC, CurrPC;		/* block start */
-
-	struct {
-		uint32_t TargetPC;			/* Target for this unknown branch */
-		uint32_t * X86JumpLoc;		/* Our x86 dword to fill */
-	} BranchesToResolve[200];	/* Branches inside or outside block */
-
-	uint32_t ResolveCount;			/* Branches with NULL jump table */
-	uint8_t IMEM[0x1000];			/* Saved off for re-order */
-} RSP_BLOCK;
-
-extern RSP_BLOCK RSPCurrentBlock;
-
-typedef struct {
-	int32_t bIsRegConst[32];		/* BOOLean toggle for constant */
-	uint32_t MipsRegConst[32];		/* Value of register 32-bit */
-	uint32_t BranchLabels[200];
-	uint32_t LabelCount;
-	uint32_t BranchLocations[200];
-	uint32_t BranchCount;
-} RSP_CODE;
-
-extern RSP_CODE RspCode;
-
-#define IsRegConst(i)	(RspCode.bIsRegConst[i])
-#define MipsRegConst(i) (RspCode.MipsRegConst[i])
-
-typedef struct {
-	int32_t mmx, mmx2, sse;	/* CPU specs and compiling */
-	int32_t bFlags;			/* RSP Flag Analysis */
-	int32_t bReOrdering;		/* Instruction reordering */
-	int32_t bSections;			/* Microcode sections */
-	int32_t bDest;				/* Vector destionation toggle */
-	int32_t bAccum;			/* Accumulator toggle */
-	int32_t bGPRConstants;		/* Analyze GPR constants */
-	int32_t bAlignVector;		/* Align known vector loads */
-	int32_t bAlignGPR;			/* Align known gpr loads */
-} RSP_COMPILER;
-
-extern RSP_COMPILER Compiler;
-
-
-extern uint8_t * pLastSecondary, * pLastPrimary;
-extern uint32_t RSPBlockID;
-extern uint32_t dwBuffer;
-
-#define IsMmxEnabled	(Compiler.mmx)
-#define IsMmx2Enabled	(Compiler.mmx2)
-#define IsSseEnabled	(Compiler.sse)

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp_recompiler_ops.c Deleted

@@ -1,4619 +0,0 @@
-/*
- * RSP Compiler plug in for Project 64 (A Nintendo 64 emulator).
- *
- * (c) Copyright 2001 jabo (jabo@emulation64.com) and
- * zilmar (zilmar@emulation64.com)
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include "types.h"
-#include "rsp.h"
-#include "rsp_recompiler_cpu.h"
-#include "rsp_x86.h"
-#include "recompiler_cpu.h"
-#include "memory.h"
-#include "registers.h"
-#include "usf.h"
-#include "types.h"
-#include "main.h"
-
-MIPSUWORD Recp, RecpResult, SQroot, SQrootResult;
-uint32_t ESP_RegSave = 0, EBP_RegSave = 0;
-uint32_t RSPBranchCompare = 0;
-extern int runcount;
-/* align option affects: sw, lh, sh */
-/* align option affects: lrv, ssv, lsv */
-
-#if 1
-#define RSPCompile_Immediates	/* ADDI, ADDIU, ANDI, ORI, XORI, LUI */
-
-#define RSPCompile_GPRLoads	/* LB, LH, LW, LBU, LHU */
-#define RSPCompile_GPRStores	/* SB, SH, SW */
-#define RSPCompile_Special		/* SLL, SRL, SRA, SRLV */
-							/* XOR, OR, AND, SUB, SUBU, ADDU, ADD, SLT */
-
-#define RSPCompile_Cop0
-#define RSPCompile_Cop2
-
-#define RSP_VectorMuls
-#define RSP_VectorLoads
-#define RSP_VectorMisc
-
-#ifdef RSP_VectorMuls
-#	define RSPCompileVmulf	/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileVmacf	/* Rewritten & Verified 12/15/2000 - Jabo */
-#	define RSPCompileVmudm	/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileVmudh	/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileVmudn	/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileVmudl	/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileVmadl
-#	define RSPCompileVmadm	/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileVmadh	/* Verified 12/15/2000 - Jabo */
-#	define RSPCompileVmadn	/* Verified 12/17/2000 - Jabo */
-#endif
-#ifdef RSP_VectorMisc
-#	define RSPCompileVrsqh
-#	define RSPCompileVrcph
-#	define RSPCompileVsaw		/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileVabs		/* Verified 12/15/2000 - Jabo */
-#	define RSPCompileVmov		/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileVxor		/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileVor		/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileVand		/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileVsub		/* Verified 12/17/2000 - Jabo (watch flags) */
-#	define RSPCompileVadd		/* Verified 12/17/2000 - Jabo (watch flags) */
-#	define RSPCompileVaddc
-#	define RSPCompileVsubc
-#	define RSPCompileVmrg
-#endif
-#ifdef RSP_VectorLoads
-#	define RSPCompileSqv		/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileSdv		/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileSsv		/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileLrv		/* Rewritten & Verified 12/17/2000 - Jabo */
-#	define RSPCompileLqv		/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileLdv		/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileLsv		/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileLlv		/* Verified 12/17/2000 - Jabo */
-#	define RSPCompileSlv
-#endif
-#endif
-
-void RSPBranch_AddRef(uint32_t Target, uint32_t * X86Loc) {
-	if (RSPCurrentBlock.ResolveCount >= 150) {
-		//CompilerWarning(1);
-	} else {
-		uint8_t * KnownCode = *(RSPJumpTable + (Target >> 2));
-
-		if (KnownCode == NULL) {
-			uint32_t i = RSPCurrentBlock.ResolveCount;
-			RSPCurrentBlock.BranchesToResolve[i].TargetPC = Target;
-			RSPCurrentBlock.BranchesToResolve[i].X86JumpLoc = X86Loc;
-			RSPCurrentBlock.ResolveCount += 1;
-		} else {
-			CPU_Message( KnownCode);
-			RSPx86_SetBranch32b((uint32_t*)X86Loc, (uint32_t*)KnownCode);
-		}
-	}
-}
-
-int32_t test33 = 0;
-void RSPCheat_r4300iOpcode ( void * FunctAddress) {
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-	RSPMoveConstToVariable(RSPCompilePC, &test33);
-	RSPPushad();
-	RSPMoveConstToVariable(RSPOpC.Hex, &RSPOpC.Hex );
-	RSPCall_Direct(FunctAddress);
-	RSPPopad();
-}
-
-void RSPCheat_r4300iOpcodeNoMessage( void * FunctAddress) {
-	RSPMoveConstToVariable(RSPCompilePC, &test33);
-	RSPPushad();
-	RSPMoveConstToVariable(RSPOpC.Hex, &RSPOpC.Hex );
-	RSPCall_Direct(FunctAddress);
-	RSPPopad();
-}
-
-void RSPx86_SetBranch8b(void * JumpByte, void * Destination) {
-	/* calculate 32-bit relative offset */
-	int32_t n = (uint8_t*)Destination - ((uint8_t*)JumpByte + 1);
-
-	/* check limits, no pun intended */
-	if (n > 0x80 || n < -0x7F) {
-		//CompilerWarning( n, RSPCompilePC);
-	} else
-		*(uint8_t*)(JumpByte) = (uint8_t)n;
-}
-
-void RSPx86_SetBranch32b(void * JumpByte, void * Destination) {
-	//intptr_t disp = (uintptr_t)Destination - (uintptr_t)JumpByte;
-
-	//if(disp < 0) disp = 0 - disp;
-	//if(disp >= 0x7f000000) {
-	//	Int3();
-	//}
-	*(uint32_t*)(JumpByte) = (uint32_t)((uint8_t*)Destination - (uint8_t*)((uint32_t*)JumpByte + 1));
-}
-
-/************************* OpCode functions *************************/
-void RSPCompile_SPECIAL ( void ) {
-	((void (*)()) RSP_Special[ RSPOpC.funct ])();
-}
-
-void RSPCompile_REGIMM ( void ) {
-	((void (*)()) RSP_RegImm[ RSPOpC.rt ])();
-}
-
-void RSPCompile_J ( void ) {
-	if ( RSPNextInstruction == NORMAL ) {
-		CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-		RSPNextInstruction = DO_DELAY_SLOT;
-	} else if ( RSPNextInstruction == DELAY_SLOT_DONE ) {
-		RSPJmpLabel32 ( 0 );
-		RSPBranch_AddRef((RSPOpC.target << 2) & 0xFFC, (uint32_t*)(RSPRecompPos - 4));
-		RSPNextInstruction = FINISH_SUB_BLOCK;
-	} else {
-		CompilerWarning( NextInstruction);
-	}
-}
-
-void RSPCompile_JAL ( void ) {
-	if ( RSPNextInstruction == NORMAL ) {
-		CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-		RSPMoveConstToVariable(RSPCompilePC + 8, &RSP_GPR[31].UW);
-		RSPNextInstruction = DO_DELAY_SLOT;
-	} else if ( RSPNextInstruction == DELAY_SLOT_DONE ) {
-		RSPJmpLabel32 (0 );
-		RSPBranch_AddRef((RSPOpC.target << 2) & 0xFFC, (uint32_t*)(RSPRecompPos - 4));
-		RSPNextInstruction = FINISH_SUB_BLOCK;
-	} else {
-		CompilerWarning( NextInstruction);
-	}
-}
-
-void RSPCompile_BEQ ( void ) {
-	static int32_t bDelayAffect;
-
-	if ( RSPNextInstruction == NORMAL ) {
-		CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-		if (RSPOpC.rs == 0 && RSPOpC.rt == 0) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		bDelayAffect = DelaySlotAffectBranch(RSPCompilePC);
-		if (0 == bDelayAffect) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		if (RSPOpC.rt == 0) {
-			RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-		} else if (RSPOpC.rs == 0) {
-			RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rt].W);
-		} else {
-			RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W,x86_EAX);
-			RSPCompX86regToVariable(x86_EAX,&RSP_GPR[RSPOpC.rs].W);
-		}
-		RSPSetzVariable(&RSPBranchCompare);
-		RSPNextInstruction = DO_DELAY_SLOT;
-	} else if ( RSPNextInstruction == DELAY_SLOT_DONE ) {
-		uint32_t Target = (RSPCompilePC + ((int16_t)RSPOpC.offset << 2) + 4) & 0xFFC;
-
-		if (RSPOpC.rs == 0 && RSPOpC.rt == 0) {
-			RSPJmpLabel32 (0 );
-			RSPBranch_AddRef(Target, (uint32_t*)(RSPRecompPos - 4));
-			RSPNextInstruction = FINISH_SUB_BLOCK;
-			return;
-		}
-		if (0 == bDelayAffect) {
-			if (RSPOpC.rt == 0) {
-				RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-			} else if (RSPOpC.rs == 0) {
-				RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rt].W);
-			} else {
-				RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W,x86_EAX);
-				RSPCompX86regToVariable(x86_EAX,&RSP_GPR[RSPOpC.rs].W);
-			}
-			RSPJeLabel32( 0);
-		} else {
-			/* take a look at the branch compare variable */
-			RSPCompConstToVariable(1, &RSPBranchCompare);
-			RSPJeLabel32( 0);
-		}
-		RSPBranch_AddRef(Target, (uint32_t*)(RSPRecompPos - 4));
-		RSPNextInstruction = FINISH_SUB_BLOCK;
-	} else {
-		CompilerWarning( NextInstruction);
-	}
-}
-
-void RSPCompile_BNE ( void ) {
-	static int32_t bDelayAffect;
-
-	if ( RSPNextInstruction == NORMAL ) {
-		CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-		if (RSPOpC.rs == 0 && RSPOpC.rt == 0) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-
-		bDelayAffect = DelaySlotAffectBranch(RSPCompilePC);
-		if (0 == bDelayAffect) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		if (RSPOpC.rt == 0) {
-			RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-		} else if (RSPOpC.rs == 0) {
-			RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rt].W);
-		} else {
-			RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W,x86_EAX);
-			RSPCompX86regToVariable(x86_EAX,&RSP_GPR[RSPOpC.rs].W);
-		}
-		RSPSetnzVariable(&RSPBranchCompare);
-		RSPNextInstruction = DO_DELAY_SLOT;
-	} else if ( RSPNextInstruction == DELAY_SLOT_DONE ) {
-		uint32_t Target = (RSPCompilePC + ((int16_t)RSPOpC.offset << 2) + 4) & 0xFFC;
-
-		if (RSPOpC.rs == 0 && RSPOpC.rt == 0) {
-			RSPNextInstruction = FINISH_SUB_BLOCK;
-			return;
-		}
-
-		if (0 == bDelayAffect) {
-			if (RSPOpC.rt == 0) {
-				RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-			} else if (RSPOpC.rs == 0) {
-				RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rt].W);
-			} else {
-				RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W,x86_EAX);
-				RSPCompX86regToVariable(x86_EAX,&RSP_GPR[RSPOpC.rs].W);
-			}
-			RSPJneLabel32( 0);
-		} else {
-			/* take a look at the branch compare variable */
-			RSPCompConstToVariable(1, &RSPBranchCompare);
-			RSPJeLabel32( 0);
-		}
-		//if(RSPCompilePC==0x24)
-		//	Int3();
-		RSPBranch_AddRef(Target, (uint32_t*)(RSPRecompPos - 4));
-		RSPNextInstruction = FINISH_SUB_BLOCK;
-	} else {
-		CompilerWarning( NextInstruction);
-	}
-}
-
-void RSPCompile_BLEZ ( void ) {
-	static int32_t bDelayAffect;
-
-	if ( RSPNextInstruction == NORMAL ) {
-		CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-		if (RSPOpC.rs == 0) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		bDelayAffect = DelaySlotAffectBranch(RSPCompilePC);
-		if (0 == bDelayAffect) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-		RSPSetleVariable(&RSPBranchCompare);
-		RSPNextInstruction = DO_DELAY_SLOT;
-	} else if ( RSPNextInstruction == DELAY_SLOT_DONE ) {
-		uint32_t Target = (RSPCompilePC + ((int16_t)RSPOpC.offset << 2) + 4) & 0xFFC;
-
-		if (RSPOpC.rs == 0) {
-			RSPJmpLabel32 ( 0 );
-			RSPBranch_AddRef(Target, (uint32_t*)(RSPRecompPos - 4));
-			RSPNextInstruction = FINISH_SUB_BLOCK;
-			return;
-		}
-		if (0 == bDelayAffect) {
-			RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-			RSPJleLabel32( 0);
-		} else {
-			/* take a look at the branch compare variable */
-			RSPCompConstToVariable(1, &RSPBranchCompare);
-			RSPJeLabel32( 0);
-		}
-
-		RSPBranch_AddRef(Target, (uint32_t*)(RSPRecompPos - 4));
-		RSPNextInstruction = FINISH_SUB_BLOCK;
-	} else {
-		CompilerWarning( NextInstruction);
-	}
-}
-
-void RSPCompile_BGTZ ( void ) {
-	static int32_t bDelayAffect;
-
-	if ( RSPNextInstruction == NORMAL ) {
-		CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-		if (RSPOpC.rs == 0) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		bDelayAffect = DelaySlotAffectBranch(RSPCompilePC);
-		if (0 == bDelayAffect) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-		RSPSetgVariable(&RSPBranchCompare);
-		RSPNextInstruction = DO_DELAY_SLOT;
-	} else if ( RSPNextInstruction == DELAY_SLOT_DONE ) {
-		uint32_t Target = (RSPCompilePC + ((int16_t)RSPOpC.offset << 2) + 4) & 0xFFC;
-
-		if (RSPOpC.rs == 0) {
-			RSPNextInstruction = FINISH_SUB_BLOCK;
-			return;
-		}
-		if (0 == bDelayAffect) {
-			RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-			RSPJgLabel32( 0);
-		} else {
-			/* take a look at the branch compare variable */
-			RSPCompConstToVariable(1, &RSPBranchCompare);
-			RSPJeLabel32( 0);
-		}
-		RSPBranch_AddRef(Target, (uint32_t*)(RSPRecompPos - 4));
-		RSPNextInstruction = FINISH_SUB_BLOCK;
-	} else {
-		CompilerWarning( NextInstruction);
-	}
-}
-
-void RSPCompile_ADDI ( void ) {
-	int32_t Immediate = (int16_t)RSPOpC.immediate;
-
-	#ifndef RSPCompile_Immediates
-	RSPCheat_r4300iOpcode(RSP_Opcode_ADDI); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rt == 0) return;
-
-	if (RSPOpC.rt == RSPOpC.rs) {
-		RSPAddConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW);
-	} else if (RSPOpC.rs == 0) {
-		RSPMoveConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].UW, x86_EAX);
-		if (Immediate != 0) {
-			RSPAddConstToX86Reg(x86_EAX, Immediate);
-		}
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-	}
-}
-
-void RSPCompile_ADDIU ( void ) {
-	int32_t Immediate = (int16_t)RSPOpC.immediate;
-
-	#ifndef RSPCompile_Immediates
-	RSPCheat_r4300iOpcode(RSP_Opcode_ADDIU); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rt == 0) return;
-
-	if (RSPOpC.rt == RSPOpC.rs) {
-		RSPAddConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW);
-	} else if (RSPOpC.rs == 0) {
-		RSPMoveConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].UW, x86_EAX);
-		RSPAddConstToX86Reg(x86_EAX, Immediate);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-	}
-}
-
-void RSPCompile_SLTI ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_SLTI);
-}
-
-void RSPCompile_SLTIU ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_SLTIU);
-}
-
-void RSPCompile_ANDI ( void ) {
-	int32_t Immediate = (uint16_t)RSPOpC.immediate;
-
-	#ifndef RSPCompile_Immediates
-	RSPCheat_r4300iOpcode(RSP_Opcode_ANDI); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rt == 0) return;
-
-	if (RSPOpC.rt == RSPOpC.rs) {
-		RSPAndConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW);
-	} else if (RSPOpC.rs == 0) {
-		RSPMoveConstToVariable(0, &RSP_GPR[RSPOpC.rt].UW);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].UW, x86_EAX);
-		RSPAndConstToX86Reg(x86_EAX, Immediate);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-	}
-}
-
-void RSPCompile_ORI ( void ) {
-	int32_t Immediate = (uint16_t)RSPOpC.immediate;
-
-	#ifndef RSPCompile_Immediates
-	RSPCheat_r4300iOpcode(RSP_Opcode_ORI); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rt == 0) return;
-
-	if (RSPOpC.rt == RSPOpC.rs) {
-		RSPOrConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW);
-	} else if (RSPOpC.rs == 0) {
-		RSPMoveConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].UW, x86_EAX);
-		if (Immediate != 0) {
-			RSPOrConstToX86Reg(Immediate, x86_EAX);
-		}
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-	}
-}
-
-void RSPCompile_XORI ( void ) {
-	int32_t Immediate = (uint16_t)RSPOpC.immediate;
-
-	#ifndef RSPCompile_Immediates
-	RSPCheat_r4300iOpcode(RSP_Opcode_XORI); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rt == 0) return;
-
-	if (RSPOpC.rt == RSPOpC.rs) {
-		RSPXorConstToVariable(&RSP_GPR[RSPOpC.rt].UW, Immediate);
-	} else if (RSPOpC.rs == 0) {
-		RSPMoveConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].UW, x86_EAX);
-		if (Immediate != 0) {
-			RSPXorConstToX86Reg(x86_EAX, Immediate);
-		}
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-	}
-}
-
-void RSPCompile_LUI ( void ) {
-	int32_t n = (int16_t)RSPOpC.offset << 16;
-
-	#ifndef RSPCompile_Immediates
-	RSPCheat_r4300iOpcode(RSP_Opcode_LUI); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rt == 0) return;
-	RSPMoveConstToVariable(n, &RSP_GPR[RSPOpC.rt].W);
-}
-
-void RSPCompile_COP0 (void) {
-	((void (*)()) RSP_Cop0[ RSPOpC.rs ])();
-}
-
-void RSPCompile_COP2 (void) {
-	((void (*)()) RSP_Cop2[ RSPOpC.rs ])();
-}
-
-void RSPCompile_LB ( void ) {
-	int32_t Offset = (int16_t)RSPOpC.offset;
-
-	#ifndef RSPCompile_GPRLoads
-	RSPCheat_r4300iOpcode(RSP_Opcode_LB); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (Offset != 0) RSPAddConstToX86Reg(x86_EBX, Offset);
-	RSPXorConstToX86Reg(x86_EBX, 3);
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-
-	RSPMoveSxN64MemToX86regByte(x86_EAX, x86_EBX);
-	RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-}
-
-void RSPCompile_LH ( void ) {
-	int32_t Offset = (int16_t)RSPOpC.offset;
-	uint8_t * Jump[2];
-
-	#ifndef RSPCompile_GPRLoads
-	RSPCheat_r4300iOpcode(RSP_Opcode_LH); return;
-	#endif
-
-	if(RSPCompilePC == 0x108) {
-		//	RSPBreakPoint();
-//			_asm int32_t 3
-
-		}
-
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + Offset) ^ 2;
-		Addr &= 0xfff;
-
-		if ((Addr & 1) != 0) {
-			CompilerWarning( RSPCompilePC);
-			RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_LH);
-			return;
-		} else {
-
-
-			RSPMoveSxVariableToX86regHalf(DMEM + Addr, x86_EAX);
-			RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-			return;
-		}
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (Offset != 0) RSPAddConstToX86Reg(x86_EBX, Offset);
-
-	if (Compiler.bAlignGPR == 0) {
-		RSPTestConstToX86Reg(1, x86_EBX);
-		RSPJneLabel32( 0);
-		Jump[0] = RSPRecompPos - 4;
-
-		CompilerToggleBuffer();
-
-		CPU_Message(" Unaligned:");
-		RSPx86_SetBranch32b(Jump[0], RSPRecompPos);
-
-		RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_LH);
-		RSPJmpLabel32( 0);
-		Jump[1] = RSPRecompPos - 4;
-
-		CompilerToggleBuffer();
-	}
-
-	RSPXorConstToX86Reg(x86_EBX, 2);
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-
-
-	RSPMoveSxN64MemToX86regHalf(x86_EAX, x86_EBX);
-	RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-
-	if (Compiler.bAlignGPR == 0) {
-		CPU_Message(" Done:");
-		RSPx86_SetBranch32b(Jump[1], RSPRecompPos);
-	}
-}
-
-void RSPCompile_LW ( void ) {
-	int32_t Offset = (int16_t)RSPOpC.offset;
-	uint8_t * Jump[2];
-
-	#ifndef RSPCompile_GPRLoads
-	RSPCheat_r4300iOpcode(RSP_Opcode_LW); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + Offset) & 0xfff;
-
-		if ((Addr & 3) != 0) {
-			CompilerWarning( RSPCompilePC);
-			RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_LW);
-			return;
-		} else {
-
-
-			RSPMoveVariableToX86reg(DMEM + Addr, x86_EAX);
-			RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-			return;
-		}
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (Offset != 0) RSPAddConstToX86Reg(x86_EBX, Offset);
-
-	RSPTestConstToX86Reg(3, x86_EBX);
-	RSPJneLabel32( 0);
-	Jump[0] = RSPRecompPos - 4;
-
-	//if(runcount == 2)
-		//asm("int $3");
-
-	CompilerToggleBuffer();
-
-	RSPx86_SetBranch32b(Jump[0], RSPRecompPos);
-	CPU_Message(" Unaligned:");
-
-	RSPLeaSourceAndOffset(x86_ECX , x86_EBX, 2);
-	RSPLeaSourceAndOffset(x86_EDX , x86_EBX, 3);
-	RSPMoveX86RegToX86Reg(x86_EBX, x86_EAX);
-	RSPAddConstToX86Reg(x86_EBX, 1);
-
-	RSPXorConstToX86Reg(x86_EAX, 3);
-	RSPXorConstToX86Reg(x86_EBX, 3);
-	RSPXorConstToX86Reg(x86_ECX, 3);
-	RSPXorConstToX86Reg(x86_EDX, 3);
-	RSPMoveN64MemToX86regByte(x86_EAX, x86_EAX);
-	RSPMoveN64MemToX86regByte(x86_EBX, x86_EBX);
-	RSPMoveN64MemToX86regByte(x86_ECX, x86_ECX);
-	RSPMoveN64MemToX86regByte(x86_EDX, x86_EDX);
-	RSPMoveX86regByteToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UB[3]);
-	RSPMoveX86regByteToVariable(x86_EBX, &RSP_GPR[RSPOpC.rt].UB[2]);
-	RSPMoveX86regByteToVariable(x86_ECX, &RSP_GPR[RSPOpC.rt].UB[1]);
-	RSPMoveX86regByteToVariable(x86_EDX, &RSP_GPR[RSPOpC.rt].UB[0]);
-
-	RSPJmpLabel32( 0);
-	Jump[1] = RSPRecompPos - 4;
-	CompilerToggleBuffer();
-
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-	RSPMoveN64MemToX86reg(x86_EAX, x86_EBX);
-	RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-
-	CPU_Message(" Done:");
-	RSPx86_SetBranch32b(Jump[1], RSPRecompPos);
-}
-
-void RSPCompile_LBU ( void ) {
-	int32_t Offset = (int16_t)RSPOpC.offset;
-
-	#ifndef RSPCompile_GPRLoads
-	RSPCheat_r4300iOpcode(RSP_Opcode_LBU); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	RSPXorX86RegToX86Reg(x86_EAX, x86_EAX);
-
-	if (Offset != 0) RSPAddConstToX86Reg(x86_EBX, Offset);
-	RSPXorConstToX86Reg(x86_EBX, 3);
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-
-	RSPMoveN64MemToX86regByte(x86_EAX, x86_EBX);
-	RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-}
-
-void RSPCompile_LHU ( void ) {
-	int32_t Offset = (int16_t)RSPOpC.offset;
-	uint8_t * Jump[2];
-
-	#ifndef RSPCompile_GPRLoads
-	RSPCheat_r4300iOpcode(RSP_Opcode_LHU); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + Offset) ^ 2;
-		Addr &= 0xfff;
-
-
-		if ((Addr & 1) != 0) {
-			CompilerWarning( RSPCompilePC);
-			RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_LHU);
-			return;
-		} else {
-
-
-			RSPMoveZxVariableToX86regHalf(DMEM + Addr, x86_ECX);
-			RSPMoveX86regToVariable(x86_ECX, &RSP_GPR[RSPOpC.rt].UW);
-			return;
-		}
-	}
-
-
-
-	/*
-	 * should really just do it by bytes but whatever for now
-	 */
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (Offset != 0) {
-		RSPAddConstToX86Reg(x86_EBX, Offset);
-	}
-	RSPTestConstToX86Reg(1, x86_EBX);
-	RSPJneLabel32( 0);
-	Jump[0] = RSPRecompPos - 4;
-
-	CompilerToggleBuffer();
-	CPU_Message(" Unaligned:");
-	RSPx86_SetBranch32b(Jump[0], RSPRecompPos);
-	RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_LHU);
-	RSPJmpLabel32( 0);
-	Jump[1] = RSPRecompPos - 4;
-	CompilerToggleBuffer();
-
-	RSPXorConstToX86Reg(x86_EBX, 2);
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-	RSPMoveZxN64MemToX86regHalf(x86_EAX, x86_EBX);
-	RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-
-	CPU_Message(" Done:");
-	RSPx86_SetBranch32b(Jump[1], RSPRecompPos);
-}
-
-void RSPCompile_SB ( void ) {
-	int32_t Offset = (int16_t)RSPOpC.offset;
-
-	#ifndef RSPCompile_GPRStores
-	RSPCheat_r4300iOpcode(RSP_Opcode_SB); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	RSPMoveVariableToX86regByte(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-
-	if (Offset != 0) RSPAddConstToX86Reg(x86_EBX, Offset);
-	RSPXorConstToX86Reg(x86_EBX, 3);
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-
-	RSPMoveX86regByteToN64Mem(x86_EAX, x86_EBX);
-}
-
-void RSPCompile_SH ( void ) {
-	int32_t Offset = (int16_t)RSPOpC.offset;
-	uint8_t * Jump[2];
-
-	#ifndef RSPCompile_GPRStores
-	RSPCheat_r4300iOpcode(RSP_Opcode_SH); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + Offset) ^ 2;
-		Addr &= 0xfff;
-
-		if ((Offset & 1) != 0) {
-			CompilerWarning( RSPCompilePC);
-			RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_SH);
-			return;
-		} else {
-
-
-			RSPMoveVariableToX86regHalf(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-			RSPMoveX86regHalfToVariable(x86_EAX, DMEM + Addr);
-			return;
-		}
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (Offset != 0) RSPAddConstToX86Reg(x86_EBX, Offset);
-
-	if (Compiler.bAlignGPR == 0) {
-		RSPTestConstToX86Reg(1, x86_EBX);
-		RSPJneLabel32( 0);
-		Jump[0] = RSPRecompPos - 4;
-
-		CompilerToggleBuffer();
-
-		CPU_Message(" Unaligned:");
-		RSPx86_SetBranch32b(Jump[0], RSPRecompPos);
-
-		RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_SH);
-		RSPJmpLabel32( 0);
-		Jump[1] = RSPRecompPos - 4;
-
-		CompilerToggleBuffer();
-	}
-
-	RSPXorConstToX86Reg(x86_EBX, 2);
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-
-	RSPMoveVariableToX86regHalf(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-	RSPMoveX86regHalfToN64Mem(x86_EAX, x86_EBX);
-
-	if (Compiler.bAlignGPR == 0) {
-		CPU_Message(" Done:");
-		RSPx86_SetBranch32b(Jump[1], RSPRecompPos);
-	}
-}
-
-void RSPCompile_SW ( void ) {
-	int32_t Offset = (int16_t)RSPOpC.offset;
-	uint8_t * Jump[2];
-
-	#ifndef RSPCompile_GPRStores
-	RSPCheat_r4300iOpcode(RSP_Opcode_SW); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + Offset) & 0xfff;
-
-		if ((Addr & 3) != 0) {
-			CompilerWarning( RSPCompilePC);
-			RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_SW);
-			return;
-		} else {
-
-
-			RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-			RSPMoveX86regToVariable(x86_EAX, DMEM + Addr);
-			return;
-		}
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (Offset != 0) RSPAddConstToX86Reg(x86_EBX, Offset);
-
-	if (Compiler.bAlignGPR == 0) {
-		RSPTestConstToX86Reg(3, x86_EBX);
-		RSPJneLabel32( 0);
-		Jump[0] = RSPRecompPos - 4;
-
-		CompilerToggleBuffer();
-
-		CPU_Message(" Unaligned:");
-		RSPx86_SetBranch32b(Jump[0], RSPRecompPos);
-
-		RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_SW);
-		RSPJmpLabel32( 0);
-		Jump[1] = RSPRecompPos - 4;
-
-		CompilerToggleBuffer();
-	}
-
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-	RSPMoveX86regToN64Mem(x86_EAX, x86_EBX);
-
-	if (Compiler.bAlignGPR == 0) {
-		CPU_Message(" Done:");
-		RSPx86_SetBranch32b(Jump[1], RSPRecompPos);
-	}
-}
-
-void RSPCompile_LC2 (void) {
-	((void (*)()) RSP_Lc2 [ RSPOpC.rd ])();
-}
-
-void RSPCompile_SC2 (void) {
-	((void (*)()) RSP_Sc2 [ RSPOpC.rd ])();
-}
-/********************** R4300i OpCodes: Special **********************/
-
-void RSPCompile_Special_SLL ( void ) {
-	#ifndef RSPCompile_Special
-	RSPCheat_r4300iOpcode(RSP_Special_SLL); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-	if (RSPOpC.rd == 0) return;
-
-	if (RSPOpC.rd == RSPOpC.rt) {
-		RSPShiftLeftSignVariableImmed(&RSP_GPR[RSPOpC.rd].W, (uint8_t)RSPOpC.sa);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPShiftLeftSignImmed(x86_EAX, (uint8_t)RSPOpC.sa);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	}
-}
-
-void RSPCompile_Special_SRL ( void ) {
-	#ifndef RSPCompile_Special
-	RSPCheat_r4300iOpcode(RSP_Special_SRL); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-	if (RSPOpC.rd == 0) return;
-
-	if (RSPOpC.rd == RSPOpC.rt) {
-		RSPShiftRightUnsignVariableImmed(&RSP_GPR[RSPOpC.rd].W, (uint8_t)RSPOpC.sa);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPShiftRightUnsignImmed(x86_EAX, (uint8_t)RSPOpC.sa);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	}
-}
-
-void RSPCompile_Special_SRA ( void ) {
-	#ifndef RSPCompile_Special
-	RSPCheat_r4300iOpcode(RSP_Special_SRA); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-	if (RSPOpC.rd == 0) return;
-
-	if (RSPOpC.rd == RSPOpC.rt) {
-		RSPShiftRightSignVariableImmed(&RSP_GPR[RSPOpC.rd].W, (uint8_t)RSPOpC.sa);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPShiftRightSignImmed(x86_EAX, (uint8_t)RSPOpC.sa);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	}
-}
-
-void RSPCompile_Special_SLLV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Special_SLLV);
-}
-
-void RSPCompile_Special_SRLV ( void ) {
-	#ifndef RSPCompile_Special
-	RSPCheat_r4300iOpcode(RSP_Special_SRLV); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-	if (RSPOpC.rd == 0) return;
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_ECX);
-	RSPAndConstToX86Reg(x86_ECX, 0x1F);
-	RSPShiftRightUnsign(x86_EAX);
-	RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-}
-
-void RSPCompile_Special_SRAV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Special_SRAV);
-}
-
-void RSPCompile_Special_JR (void) {
-	uint8_t * Jump;
-
-	if ( RSPNextInstruction == NORMAL ) {
-		CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-		/* transfer destination to location pointed to by PrgCount */
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W,x86_EAX);
-		RSPAndConstToX86Reg(x86_EAX,0xFFC);
-		RSPMoveX86regToVariable(x86_EAX,PrgCount);
-		RSPNextInstruction = DO_DELAY_SLOT;
-	} else if ( RSPNextInstruction == DELAY_SLOT_DONE ) {
-		//RSPBreakPoint();
-		RSPMoveVariableToX86reg(PrgCount, x86_EAX);
-#ifdef USEX64
-		RSPShiftLeftDoubleImmed(x86_EAX,x86_EAX,1);
-#endif
-		RSPAddVariableToX86reg(x86_RAX, &RSPJumpTable);
-		RSPMoveX86regPointerToX86reg(x86_RAX, x86_RAX);
-
-		RSPTestX86RegToX86Reg(x86_RAX, x86_RAX);
-		RSPJeLabel8( 0);
-		Jump = RSPRecompPos - 1;
-		RSPPush(x86_RAX);
-		RSPPop(x86_RAX);
-		RSPJumpX86Reg(x86_RAX);
-
-		RSPx86_SetBranch8b(Jump, RSPRecompPos);
-		CPU_Message(" Null:");
-		RSPRet();
-		RSPNextInstruction = FINISH_SUB_BLOCK;
-	} else {
-		CompilerWarning( NextInstruction);
-	}
-}
-
-int32_t llastjump = 0;
-void RSPCompile_Special_JALR ( void ) {
-	uint8_t * Jump;
-	uint32_t Const = (RSPCompilePC + 8) & 0xFFC;
-
-	if (RSPNextInstruction == NORMAL) {
-		CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-		RSPMoveConstToVariable(Const, &RSP_GPR[RSPOpC.rd].W);
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W,x86_EAX);
-		RSPAndConstToX86Reg(x86_EAX,0xFFC);
-		RSPMoveX86regToVariable(x86_EAX,PrgCount);
-		RSPNextInstruction = DO_DELAY_SLOT;
-	} else if (RSPNextInstruction == DELAY_SLOT_DONE) {
-
-		RSPMoveVariableToX86reg(PrgCount, x86_EAX);
-#ifdef USEX64
-		RSPShiftLeftDoubleImmed(x86_RAX,x86_EAX,1);
-#endif
-		RSPAddVariableToX86reg(x86_RAX, &RSPJumpTable);
-		RSPMoveX86regPointerToX86reg(x86_RAX, x86_RAX);
-
-		RSPTestX86RegToX86Reg(x86_RAX, x86_RAX);
-		RSPJeLabel8( 0);
-		Jump = RSPRecompPos - 1;
-
-		RSPJumpX86Reg(x86_RAX);
-
-		RSPx86_SetBranch8b(Jump, RSPRecompPos);
-		CPU_Message(" Null:");
-		RSPRet();
-		RSPNextInstruction = FINISH_SUB_BLOCK;
-	} else {
-		CompilerWarning( NextInstruction);
-	}
-}
-
-void RSPCompile_Special_BREAK ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Special_BREAK);
-	if (RSPNextInstruction != NORMAL) {
-		DisplayError("Compile_Special_BREAK: problem");
-	}
-	RSPMoveConstToVariable(RSPCompilePC + 4,PrgCount);
-	RSPRet();
-	RSPNextInstruction = FINISH_BLOCK;
-}
-
-void RSPCompile_Special_ADD ( void ) {
-	#ifndef RSPCompile_Special
-	RSPCheat_r4300iOpcode(RSP_Special_ADD); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rd == 0) return;
-
-	if (RSPOpC.rd == RSPOpC.rs) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPAddX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else if (RSPOpC.rd == RSPOpC.rt) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPAddX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else if (RSPOpC.rs == RSPOpC.rt) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPAddX86RegToX86Reg(x86_EAX, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else if (RSPOpC.rs == 0) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else if (RSPOpC.rt == 0) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPAddVariableToX86reg(x86_EAX, &RSP_GPR[RSPOpC.rt].W);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	}
-}
-
-void RSPCompile_Special_ADDU ( void ) {
-	#ifndef RSPCompile_Special
-	RSPCheat_r4300iOpcode(RSP_Special_ADDU); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rd == 0) return;
-
-	if (RSPOpC.rd == RSPOpC.rs) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPAddX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else if (RSPOpC.rd == RSPOpC.rt) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPAddX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else if (RSPOpC.rs == RSPOpC.rt) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPAddX86RegToX86Reg(x86_EAX, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else if (RSPOpC.rs == 0) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else if (RSPOpC.rt == 0) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPAddVariableToX86reg(x86_EAX, &RSP_GPR[RSPOpC.rt].W);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	}
-}
-
-void RSPCompile_Special_SUB ( void ) {
-	#ifndef RSPCompile_Special
-	RSPCheat_r4300iOpcode(RSP_Special_SUB); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rd == 0) return;
-
-	if (RSPOpC.rd == RSPOpC.rs) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPSubX86regFromVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else if (RSPOpC.rs == RSPOpC.rt) {
-		RSPMoveConstToVariable(0, &RSP_GPR[RSPOpC.rd].W);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPSubVariableFromX86reg(x86_EAX, &RSP_GPR[RSPOpC.rt].W);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	}
-}
-
-void RSPCompile_Special_SUBU ( void ) {
-	#ifndef RSPCompile_Special
-	RSPCheat_r4300iOpcode(RSP_Special_SUBU); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rd == 0) return;
-
-	if (RSPOpC.rd == RSPOpC.rs) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPSubX86regFromVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else if (RSPOpC.rs == RSPOpC.rt) {
-		RSPMoveConstToVariable(0, &RSP_GPR[RSPOpC.rd].W);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPSubVariableFromX86reg(x86_EAX, &RSP_GPR[RSPOpC.rt].W);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	}
-}
-
-void RSPCompile_Special_AND ( void ) {
-	#ifndef RSPCompile_Special
-	RSPCheat_r4300iOpcode(RSP_Special_AND); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rd == 0) return;
-
-	if (RSPOpC.rd == RSPOpC.rs) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPAndX86RegToVariable(&RSP_GPR[RSPOpC.rd].W, x86_EAX);
-	} else if (RSPOpC.rd == RSPOpC.rt) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPAndX86RegToVariable(&RSP_GPR[RSPOpC.rd].W, x86_EAX);
-	} else if (RSPOpC.rs == RSPOpC.rt) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPAndVariableToX86Reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	}
-}
-
-void RSPCompile_Special_OR ( void ) {
-	#ifndef RSPCompile_Special
-	RSPCheat_r4300iOpcode(RSP_Special_OR); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rd == 0) return;
-
-	if (RSPOpC.rd == RSPOpC.rs) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPOrX86RegToVariable(&RSP_GPR[RSPOpC.rd].W, x86_EAX);
-	} else if (RSPOpC.rd == RSPOpC.rt) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPOrX86RegToVariable(&RSP_GPR[RSPOpC.rd].W, x86_EAX);
-	} else if (RSPOpC.rs == 0) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else if (RSPOpC.rt == 0) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPOrVariableToX86Reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	}
-}
-
-void RSPCompile_Special_XOR ( void ) {
-	#ifndef RSPCompile_Special
-	RSPCheat_r4300iOpcode(RSP_Special_XOR); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.rd == 0) return;
-
-	if (RSPOpC.rd == RSPOpC.rs) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPXorX86RegToVariable(&RSP_GPR[RSPOpC.rd].W, x86_EAX);
-	} else if (RSPOpC.rd == RSPOpC.rt) {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPXorX86RegToVariable(&RSP_GPR[RSPOpC.rd].W, x86_EAX);
-	} else if (RSPOpC.rs == RSPOpC.rt) {
-		RSPMoveConstToVariable(0, &RSP_GPR[RSPOpC.rd].W);
-	} else {
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, x86_EAX);
-		RSPXorVariableToX86reg(&RSP_GPR[RSPOpC.rt].W, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W);
-	}
-}
-
-void RSPCompile_Special_NOR ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Special_NOR);
-}
-
-void RSPCompile_Special_SLT ( void ) {
-	#ifndef RSPCompile_Special
-	RSPCheat_r4300iOpcode(RSP_Special_SLT); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-	if (RSPOpC.rt == 0) { return; }
-
-	if (RSPOpC.rt == RSPOpC.rs) {
-		RSPMoveConstToVariable(0, &RSP_GPR[RSPOpC.rd].UW);
-	} else {
-		RSPXorX86RegToX86Reg(x86_EBX, x86_EBX);
-		if (RSPOpC.rs == 0) {
-			RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-			RSPCompConstToX86reg(x86_EAX, 0);
-			RSPSetg(x86_EBX);
-		} else if (RSPOpC.rt == 0) {
-			RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].UW, x86_EAX);
-			RSPCompConstToX86reg(x86_EAX, 0);
-			RSPSetl(x86_EBX);
-		} else {
-			RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].UW, x86_EAX);
-			RSPCompX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-			RSPSetl(x86_EBX);
-		}
-		RSPMoveX86regToVariable(x86_EBX, &RSP_GPR[RSPOpC.rd].UW);
-	}
-}
-
-void RSPCompile_Special_SLTU ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Special_SLTU);
-}
-
-/********************** R4300i OpCodes: RegImm **********************/
-void RSPCompile_RegImm_BLTZ ( void ) {
-	static int32_t bDelayAffect;
-
-	if ( RSPNextInstruction == NORMAL ) {
-		CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-		if (RSPOpC.rs == 0) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		bDelayAffect = DelaySlotAffectBranch(RSPCompilePC);
-		if (0 == bDelayAffect) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-		RSPSetlVariable(&RSPBranchCompare);
-		RSPNextInstruction = DO_DELAY_SLOT;
-	} else if ( RSPNextInstruction == DELAY_SLOT_DONE ) {
-		uint32_t Target = (RSPCompilePC + ((int16_t)RSPOpC.offset << 2) + 4) & 0xFFC;
-
-		if (RSPOpC.rs == 0) {
-			RSPNextInstruction = FINISH_SUB_BLOCK;
-			return;
-		}
-		if (0 == bDelayAffect) {
-			RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-			RSPJlLabel32( 0);
-		} else {
-			/* take a look at the branch compare variable */
-			RSPCompConstToVariable(1, &RSPBranchCompare);
-			RSPJeLabel32( 0);
-		}
-		RSPBranch_AddRef(Target, (uint32_t*)(RSPRecompPos - 4));
-		RSPNextInstruction = FINISH_SUB_BLOCK;
-	} else {
-		//CompilerWarning( NextInstruction, RSPCompilePC);
-	}
-}
-
-void RSPCompile_RegImm_BGEZ ( void ) {
-	static int32_t bDelayAffect;
-
-	if ( RSPNextInstruction == NORMAL ) {
-		CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-		if (RSPOpC.rs == 0) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		bDelayAffect = DelaySlotAffectBranch(RSPCompilePC);
-		if (0 == bDelayAffect) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-		RSPSetgeVariable(&RSPBranchCompare);
-		RSPNextInstruction = DO_DELAY_SLOT;
-	} else if ( RSPNextInstruction == DELAY_SLOT_DONE ) {
-		uint32_t Target = (RSPCompilePC + ((int16_t)RSPOpC.offset << 2) + 4) & 0xFFC;
-
-		if (RSPOpC.rs == 0) {
-			RSPJmpLabel32 ( 0 );
-			RSPBranch_AddRef(Target, (uint32_t*)(RSPRecompPos - 4));
-			RSPNextInstruction = FINISH_SUB_BLOCK;
-			return;
-		}
-		if (0 == bDelayAffect) {
-			RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-			RSPJgeLabel32( 0);
-		} else {
-			/* take a look at the branch compare variable */
-			RSPCompConstToVariable(1, &RSPBranchCompare);
-			RSPJeLabel32( 0);
-		}
-		RSPBranch_AddRef(Target, (uint32_t*)(RSPRecompPos - 4));
-		RSPNextInstruction = FINISH_SUB_BLOCK;
-	} else {
-		CompilerWarning( NextInstruction);
-	}
-}
-
-void RSPCompile_RegImm_BLTZAL ( void ) {
-	if ( RSPNextInstruction == NORMAL ) {
-		CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-		RSPMoveConstToVariable(RSPCompilePC + 8, &RSP_GPR[31].UW);
-		if (RSPOpC.rs == 0) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-		RSPSetlVariable(&RSPBranchCompare);
-		RSPNextInstruction = DO_DELAY_SLOT;
-	} else if ( RSPNextInstruction == DELAY_SLOT_DONE ) {
-		uint32_t Target = (RSPCompilePC + ((int16_t)RSPOpC.offset << 2) + 4) & 0xFFC;
-
-		if (RSPOpC.rs == 0) {
-			RSPNextInstruction = FINISH_SUB_BLOCK;
-			return;
-		}
-
-		/* take a look at the branch compare variable */
-		RSPCompConstToVariable(1, &RSPBranchCompare);
-		RSPJeLabel32( 0);
-		RSPBranch_AddRef(Target, (uint32_t*)(RSPRecompPos - 4));
-		RSPNextInstruction = FINISH_SUB_BLOCK;
-	} else {
-		CompilerWarning( NextInstruction);
-	}
-}
-
-void RSPCompile_RegImm_BGEZAL ( void ) {
-	static int32_t bDelayAffect;
-
-	if ( RSPNextInstruction == NORMAL ) {
-		CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-		RSPMoveConstToVariable(RSPCompilePC + 8, &RSP_GPR[31].UW);
-		if (RSPOpC.rs == 0) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		bDelayAffect = DelaySlotAffectBranch(RSPCompilePC);
-		if (0 == bDelayAffect) {
-			RSPNextInstruction = DO_DELAY_SLOT;
-			return;
-		}
-		RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-		RSPSetgeVariable(&RSPBranchCompare);
-		RSPNextInstruction = DO_DELAY_SLOT;
-	} else if ( RSPNextInstruction == DELAY_SLOT_DONE ) {
-		uint32_t Target = (RSPCompilePC + ((int16_t)RSPOpC.offset << 2) + 4) & 0xFFC;
-
-		if (RSPOpC.rs == 0) {
-			RSPJmpLabel32 ( 0 );
-			RSPBranch_AddRef(Target, (uint32_t*)(RSPRecompPos - 4));
-			RSPNextInstruction = FINISH_SUB_BLOCK;
-			return;
-		}
-		if (0 == bDelayAffect) {
-			RSPCompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W);
-			RSPJgeLabel32( 0);
-		} else {
-			/* take a look at the branch compare variable */
-			RSPCompConstToVariable(1, &RSPBranchCompare);
-			RSPJeLabel32( 0);
-		}
-		RSPBranch_AddRef(Target, (uint32_t*)(RSPRecompPos - 4));
-		RSPNextInstruction = FINISH_SUB_BLOCK;
-	} else {
-		CompilerWarning( NextInstruction);
-	}
-}
-
-/************************** Cop0 functions *************************/
-
-void RSPCompile_Cop0_MF ( void ) {
-	#ifndef RSPCompile_Cop0
-	RSPCheat_r4300iOpcode(RSP_Cop0_MF); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	switch (RSPOpC.rd) {
-	case 4:
-		RSPMoveVariableToX86reg(&SP_STATUS_REG, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-		break;
-	case 5:
-		RSPMoveVariableToX86reg(&SP_DMA_FULL_REG, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-		break;
-	case 6:
-		RSPMoveVariableToX86reg(&SP_DMA_BUSY_REG, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-		break;
-	case 7:
-		RSPMoveConstToVariable(0, &RSP_GPR[RSPOpC.rt].UW);
-		//RSPCheat_r4300iOpcode(RSP_Cop0_MF);
-		break;
-	case 8:
-		RSPMoveVariableToX86reg(&DPC_START_REG, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-		break;
-	case 9:
-		RSPMoveVariableToX86reg(&DPC_END_REG, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-		break;
-	case 10:
-		RSPMoveVariableToX86reg(&DPC_CURRENT_REG, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-		break;
-	case 11:
-		RSPMoveVariableToX86reg(&DPC_STATUS_REG, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-		break;
-	case 12:
-		RSPMoveVariableToX86reg(&DPC_CLOCK_REG, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW);
-		break;
-
-	//default:
-		//CompilerWarning(COP0_Name(RSPOpC.rd),RSPOpC.rd);
-	}
-}
-
-void RSPCompile_Cop0_MT ( void ) {
-#ifndef RSPCompile_Cop0
-	RSPCheat_r4300iOpcode(RSP_Cop0_MT);
-#else
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	switch (RSPOpC.rd) {
-	case 0:
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &SP_MEM_ADDR_REG);
-		break;
-	case 1:
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &SP_DRAM_ADDR_REG);
-		break;
-	case 2:
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &SP_RD_LEN_REG);
-		RSPPushad();
-		RSPCall_Direct(RSP_SP_DMA_READ);
-		RSPPopad();
-		break;
-	case 3:
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &SP_WR_LEN_REG);
-		RSPPushad();
-		RSPCall_Direct(RSP_SP_DMA_WRITE);
-		RSPPopad();
-		break;
-	case 7:
-		RSPMoveConstToVariable(0, &SP_SEMAPHORE_REG);
-		break;
-	case 8:
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &DPC_START_REG);
-		RSPMoveX86regToVariable(x86_EAX, &DPC_CURRENT_REG);
-		break;
-	case 9:
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &DPC_END_REG);
-
-		break;
-	case 10:
-		RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, x86_EAX);
-		RSPMoveX86regToVariable(x86_EAX, &DPC_CURRENT_REG);
-		break;
-
-	default:
-		RSPCheat_r4300iOpcode(RSP_Cop0_MT);
-		break;
-	}
-#endif
-	if (RSPOpC.rd == 2) {
-		uint8_t * Jump;
-
-		RSPTestConstToVariable(0x1000, &SP_MEM_ADDR_REG);
-		RSPJeLabel8( 0);
-		Jump = RSPRecompPos - 1;
-
-		RSPMoveConstToVariable(RSPCompilePC + 4,PrgCount);
-		RSPRet();
-
-		CPU_Message("DontExit:");
-		RSPx86_SetBranch8b(Jump, RSPRecompPos);
-	}
-}
-/************************** Cop2 functions *************************/
-
-void RSPCompile_Cop2_MF ( void ) {
-
-	int32_t element = (RSPOpC.sa >> 1);
-
-	int32_t element1 = 15 - element;
-	int32_t element2 = 15 - ((element + 1) % 16);
-
-	#ifndef RSPCompile_Cop2
-	RSPCheat_r4300iOpcode(RSP_Cop2_MF); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (element2 != (element1 - 1)) {
-		RSPXorX86RegToX86Reg(x86_EAX, x86_EAX);
-		RSPXorX86RegToX86Reg(x86_EBX, x86_EBX);
-
-
-		RSPMoveVariableToX86regByte(&RSP_Vect[RSPOpC.rd].B[element1], x86_EAX);
-
-
-		RSPMoveVariableToX86regByte(&RSP_Vect[RSPOpC.rd].B[element2], x86_EBX);
-
-		RSPShiftLeftSignImmed(x86_EAX, 8);
-		RSPOrX86RegToX86Reg(x86_EAX, x86_EBX);
-		RSPCwde();
-
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].W);
-	} else {
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].B[element2], x86_EAX);
-
-		RSPMoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].W);
-	}
-}
-
-void RSPCompile_Cop2_CF ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Cop2_CF);
-}
-
-void RSPCompile_Cop2_MT ( void ) {
-
-	int32_t element = 15 - (RSPOpC.sa >> 1);
-
-	#ifndef RSPCompile_Cop2
-	RSPCheat_r4300iOpcode(RSP_Cop2_MT); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-	if (element == 0) {
-
-		RSPMoveVariableToX86regByte(&RSP_GPR[RSPOpC.rt].B[1], x86_EAX);
-
-
-		RSPMoveX86regByteToVariable(x86_EAX, &RSP_Vect[RSPOpC.rd].B[element]);
-	} else {
-
-		RSPMoveVariableToX86regHalf(&RSP_GPR[RSPOpC.rt].B[0], x86_EAX);
-
-
-		RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.rd].B[element - 1]);
-	}
-}
-
-void RSPCompile_Cop2_CT ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Cop2_CT);
-}
-
-void RSPCompile_COP2_VECTOR (void) {
-	((void (*)()) RSP_Vector[ RSPOpC.funct ])();
-}
-
-/************************** Vect functions **************************/
-
-MIPS_DWORD MMX_Scratch;
-
-void RSP_Element2Mmx(int32_t MmxReg) {
-
-
-	uint32_t Rs = RSPOpC.rs & 0x0f;
-	uint32_t el;
-
-	switch (Rs) {
-	case 0: case 1:
-	case 2: case 3:
-	case 4:	case 5:
-	case 6:	case 7:
-		//CompilerWarning("Unimplemented RSP_Element2Mmx");
-		break;
-
-	default:
-		/*
-		 * Noticed the exclusive-or of seven to take into account
-		 * the pseudo-swapping we have in the vector registers
-		 */
-
-		el = (RSPOpC.rs & 0x07) ^ 7;
-
-		if (IsMmx2Enabled == 0) {
-
-			RSPMoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[el], x86_ECX);
-			RSPMoveX86regHalfToVariable(x86_ECX, &MMX_Scratch.HW[0]);
-			RSPMoveX86regHalfToVariable(x86_ECX, &MMX_Scratch.HW[1]);
-			RSPMoveX86regHalfToVariable(x86_ECX, &MMX_Scratch.HW[2]);
-			RSPMoveX86regHalfToVariable(x86_ECX, &MMX_Scratch.HW[3]);
-			RSPMmxMoveQwordVariableToReg(MmxReg, &MMX_Scratch.HW[0]);
-		} else {
-			uint32_t Qword;
-
-			Qword = (el >> 2) & 0x1;
-			el &= 0x3;
-
-
-			RSPMmxShuffleMemoryToReg(MmxReg,
-				&RSP_Vect[RSPOpC.rt].DW[Qword], _MMX_SHUFFLE(el, el, el, el));
-		}
-		break;
-	}
-}
-
-void RSP_MultiElement2Mmx(int32_t MmxReg1, int32_t MmxReg2) {
-
-	uint32_t Rs = RSPOpC.rs & 0x0f;
-
-	/*
-	 * Ok, this is tricky, hopefully this clears it up:
-	 *
-	 * $vd[0] = $vd[0] + $vt[2]
-	 * because of swapped registers becomes:
-	 * $vd[7] = $vd[7] + $vt[5]
-	 *
-	 * we must perform this swap correctly, this involves the 3-bit
-	 * xclusive or, 2-bits of which are done within a dword boundary,
-	 * the last bit, is ignored because we are loading the source linearly,
-	 * so the xclusive or has transparently happened on that side
-	 *
-	 */
-
-	switch (Rs) {
-	case 0:
-	case 1:
-
-		RSPMmxMoveQwordVariableToReg(MmxReg1, &RSP_Vect[RSPOpC.rt].UHW[0]);
-
-		RSPMmxMoveQwordVariableToReg(MmxReg2, &RSP_Vect[RSPOpC.rt].UHW[4]);
-		break;
-	case 2:
-		/* [0q] | 0 | 0 | 2 | 2 | 4 | 4 | 6 | 6 | */
-
-		RSPMmxShuffleMemoryToReg(MmxReg1, &RSP_Vect[RSPOpC.rt].DW[0], 0xF5);
-
-		RSPMmxShuffleMemoryToReg(MmxReg2, &RSP_Vect[RSPOpC.rt].DW[1], 0xF5);
-		break;
-	case 3:
-		/* [1q] | 1 | 1 | 3 | 3 | 5 | 5 | 7 | 7 | */
-
-		RSPMmxShuffleMemoryToReg(MmxReg1, &RSP_Vect[RSPOpC.rt].DW[0], 0xA0);
-		//RSPMmxShuffleMemoryToReg(MmxReg1, &RSP_Vect[RSPOpC.rt].DW[0], 0x0A);
-
-		RSPMmxShuffleMemoryToReg(MmxReg2, &RSP_Vect[RSPOpC.rt].DW[1], 0xA0);
-		//RSPMmxShuffleMemoryToReg(MmxReg2, &RSP_Vect[RSPOpC.rt].DW[1], 0x0A);
-		break;
-	case 4:
-		/* [0h] | 0 | 0 | 0 | 0 | 4 | 4 | 4 | 4 | */
-
-		RSPMmxShuffleMemoryToReg(MmxReg1, &RSP_Vect[RSPOpC.rt].DW[0], 0xFF);
-
-		RSPMmxShuffleMemoryToReg(MmxReg2, &RSP_Vect[RSPOpC.rt].DW[1], 0xFF);
-		break;
-	case 5:
-		/* [1h] | 1 | 1 | 1 | 1 | 5 | 5 | 5 | 5 | */
-
-		RSPMmxShuffleMemoryToReg(MmxReg1, &RSP_Vect[RSPOpC.rt].DW[0], 0xAA);
-
-		RSPMmxShuffleMemoryToReg(MmxReg2, &RSP_Vect[RSPOpC.rt].DW[1], 0xAA);
-		break;
-	case 6:
-		/* [2h] | 2 | 2 | 2 | 2 | 6 | 6 | 6 | 6 | */
-
-		RSPMmxShuffleMemoryToReg(MmxReg1, &RSP_Vect[RSPOpC.rt].DW[0], 0x55);
-
-		RSPMmxShuffleMemoryToReg(MmxReg2, &RSP_Vect[RSPOpC.rt].DW[1], 0x55);
-		break;
-	case 7:
-		/* [3h] | 3 | 3 | 3 | 3 | 7 | 7 | 7 | 7 | */
-
-		RSPMmxShuffleMemoryToReg(MmxReg1, &RSP_Vect[RSPOpC.rt].DW[0], 0x00);
-
-		RSPMmxShuffleMemoryToReg(MmxReg2, &RSP_Vect[RSPOpC.rt].DW[1], 0x00);
-		break;
-
-	default:
-		//CompilerWarning("Unimplemented RSP_MultiElement2Mmx [?]");
-		break;
-	}
-}
-
-int32_t RSPCompile_Vector_VMULF_MMX ( void ) {
-
-
-	/* Do our MMX checks here */
-	if (IsMmxEnabled == 0)
-		return 0;
-	if ((RSPOpC.rs & 0x0f) >= 2 && (RSPOpC.rs & 0x0f) <= 7 && IsMmx2Enabled == 0)
-		return 0;
-
-	/* NOTE: Problem here is the lack of +/- 0x8000 rounding */
-
-	RSPMmxMoveQwordVariableToReg(x86_MM0, &RSP_Vect[RSPOpC.rd].UHW[0]);
-
-	RSPMmxMoveQwordVariableToReg(x86_MM1, &RSP_Vect[RSPOpC.rd].UHW[4]);
-
-	if ((RSPOpC.rs & 0xF) < 2) {
-
-		RSPMmxPmulhwRegToVariable(x86_MM0, &RSP_Vect[RSPOpC.rt].UHW[0]);
-
-		RSPMmxPmulhwRegToVariable(x86_MM1, &RSP_Vect[RSPOpC.rt].UHW[4]);
-	} else if ((RSPOpC.rs & 0xF) >= 8) {
-		RSP_Element2Mmx(x86_MM2);
-		RSPMmxPmulhwRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPmulhwRegToReg(x86_MM1, x86_MM2);
-	} else {
-		RSP_MultiElement2Mmx(x86_MM2, x86_MM3);
-		RSPMmxPmulhwRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPmulhwRegToReg(x86_MM1, x86_MM3);
-	}
-	RSPMmxPsllwImmed(x86_MM0, 1);
-	RSPMmxPsllwImmed(x86_MM1, 1);
-
-
-	RSPMmxMoveQwordRegToVariable(x86_MM0, &RSP_Vect[RSPOpC.sa].UHW[0]);
-
-	RSPMmxMoveQwordRegToVariable(x86_MM1, &RSP_Vect[RSPOpC.sa].UHW[4]);
-
-	if (IsNextInstructionMmx(RSPCompilePC) == 0)
-		RSPMmxEmptyMultimediaState();
-
-	return 1;
-}
-
-void RSPCompile_Vector_VMULF ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bOptimize = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToAccum = WriteToAccum(EntireAccum, RSPCompilePC);
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-
-	#ifndef RSPCompileVmulf
-	RSPCheat_r4300iOpcode(RSP_Vector_VMULF); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bWriteToAccum == 0) {
-		if (1 == RSPCompile_Vector_VMULF_MMX())
-			return;
-	}
-
-	if (bOptimize == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-
-	if (bWriteToDest == 1) {
-		RSPMoveConstToX86reg(0x7fff0000, x86_ESI);
-	}
-	if (bWriteToAccum == 1) {
-		RSPXorX86RegToX86Reg(x86_EDI, x86_EDI);
-	}
-
-	for (count = 0; count < 8; count++) {
-		CPU_Message( count);
-
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);
-
-		if (RSPOpC.rt == RSPOpC.rd && !bOptimize) {
-			RSPimulX86reg(x86_EAX);
-		} else {
-			if (bOptimize == 0) {
-
-				RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-			}
-			RSPimulX86reg(x86_EBX);
-		}
-
-		RSPShiftLeftSignImmed(x86_EAX, 1);
-		RSPAddConstToX86Reg(x86_EAX, 0x8000);
-
-		if (bWriteToAccum == 1) {
-			RSPMoveX86regToVariable(x86_EAX, &RSP_ACCUM[el].HW[1]);
-			/* calculate sign extension into edx */
-			RSPMoveX86RegToX86Reg(x86_EAX, x86_EDX);
-			RSPShiftRightSignImmed(x86_EDX, 31);
-		}
-
-		RSPCompConstToX86reg(x86_EAX, 0x80008000);
-
-		if (bWriteToAccum == 1) {
-			RSPCondMoveEqual(x86_EDX, x86_EDI);
-			RSPMoveX86regHalfToVariable(x86_EDX, &RSP_ACCUM[el].HW[3]);
-		}
-		if (bWriteToDest == 1) {
-			RSPCondMoveEqual(x86_EAX, x86_ESI);
-			RSPShiftRightUnsignImmed(x86_EAX, 16);
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);
-		}
-	}
-}
-
-void RSPCompile_Vector_VMULU ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VMULU);
-}
-
-int32_t RSPCompile_Vector_VMUDL_MMX ( void ) {
-
-
-	/* Do our MMX checks here */
-	if (IsMmxEnabled == 0)
-		return 0;
-	if (IsMmx2Enabled == 0)
-		return 0;
-
-
-	RSPMmxMoveQwordVariableToReg(x86_MM0, &RSP_Vect[RSPOpC.rd].UHW[0]);
-
-	RSPMmxMoveQwordVariableToReg(x86_MM1, &RSP_Vect[RSPOpC.rd].UHW[4]);
-
-	if ((RSPOpC.rs & 0xF) < 2) {
-
-		RSPMmxMoveQwordVariableToReg(x86_MM2, &RSP_Vect[RSPOpC.rt].UHW[0]);
-
-		RSPMmxMoveQwordVariableToReg(x86_MM3, &RSP_Vect[RSPOpC.rt].UHW[4]);
-
-		RSPMmxPmulhuwRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPmulhuwRegToReg(x86_MM1, x86_MM3);
-	} else if ((RSPOpC.rs & 0xF) >= 8) {
-		RSP_Element2Mmx(x86_MM2);
-		RSPMmxPmulhuwRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPmulhuwRegToReg(x86_MM1, x86_MM2);
-	} else {
-		RSP_MultiElement2Mmx(x86_MM2, x86_MM3);
-		RSPMmxPmulhuwRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPmulhuwRegToReg(x86_MM1, x86_MM3);
-	}
-
-
-	RSPMmxMoveQwordRegToVariable(x86_MM0, &RSP_Vect[RSPOpC.sa].UHW[0]);
-
-	RSPMmxMoveQwordRegToVariable(x86_MM1, &RSP_Vect[RSPOpC.sa].UHW[4]);
-
-	if (IsNextInstructionMmx(RSPCompilePC) == 0)
-		RSPMmxEmptyMultimediaState();
-
-	return 1;
-}
-
-void RSPCompile_Vector_VMUDL ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bOptimize = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-	int32_t bWriteToAccum = WriteToAccum(EntireAccum, RSPCompilePC);
-
-	#ifndef RSPCompileVmudl
-	RSPCheat_r4300iOpcode(RSP_Vector_VMUDL); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bWriteToAccum == 0) {
-		if (1 == RSPCompile_Vector_VMUDL_MMX())
-			return;
-	}
-
-	if (bOptimize == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-
-	if (bWriteToAccum == 1)
-		RSPXorX86RegToX86Reg(x86_EDI, x86_EDI);
-
-	for (count = 0; count < 8; count++) {
-		CPU_Message( count);
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].UHW[el], x86_EAX);
-
-		if (bOptimize == 0) {
-
-			RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-		}
-
-		RSPimulX86reg(x86_EBX);
-
-		if (bWriteToAccum == 1) {
-
-			RSPMoveX86regToVariable(x86_EAX, &RSP_ACCUM[el].UW[0]);
-
-			RSPMoveX86regToVariable(x86_EDI, &RSP_ACCUM[el].UW[1]);
-		}
-
-		if (bWriteToDest == 1) {
-			RSPShiftRightUnsignImmed(x86_EAX, 16);
-
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);
-		}
-	}
-}
-
-int32_t RSPCompile_Vector_VMUDM_MMX ( void ) {
-
-
-	/* Do our MMX checks here */
-	if (IsMmxEnabled == 0)
-		return 0;
-	if (IsMmx2Enabled == 0)
-		return 0;
-
-
-	RSPMmxMoveQwordVariableToReg(x86_MM0, &RSP_Vect[RSPOpC.rd].UHW[0]);
-
-	RSPMmxMoveQwordVariableToReg(x86_MM1, &RSP_Vect[RSPOpC.rd].UHW[4]);
-
-	if ((RSPOpC.rs & 0xF) < 2) {
-
-		RSPMmxMoveQwordVariableToReg(x86_MM4, &RSP_Vect[RSPOpC.rt].UHW[0]);
-
-		RSPMmxMoveQwordVariableToReg(x86_MM5, &RSP_Vect[RSPOpC.rt].UHW[4]);
-
-		/* Copy the signed portion */
-		RSPMmxMoveRegToReg(x86_MM2, x86_MM0);
-		RSPMmxMoveRegToReg(x86_MM3, x86_MM1);
-
-		/* high((u16)a * b) */
-		RSPMmxPmulhuwRegToReg(x86_MM0, x86_MM4);
-		RSPMmxPmulhuwRegToReg(x86_MM1, x86_MM5);
-
-		/* low((a >> 15) * b) */
-		RSPMmxPsrawImmed(x86_MM2, 15);
-		RSPMmxPsrawImmed(x86_MM3, 15);
-		RSPMmxPmullwRegToReg(x86_MM2, x86_MM4);
-		RSPMmxPmullwRegToReg(x86_MM3, x86_MM5);
-	} else if ((RSPOpC.rs & 0xF) >= 8) {
-		RSP_Element2Mmx(x86_MM4);
-
-		/* Copy the signed portion */
-		RSPMmxMoveRegToReg(x86_MM2, x86_MM0);
-		RSPMmxMoveRegToReg(x86_MM3, x86_MM1);
-
-		/* high((u16)a * b) */
-		RSPMmxPmulhuwRegToReg(x86_MM0, x86_MM4);
-		RSPMmxPmulhuwRegToReg(x86_MM1, x86_MM4);
-
-		/* low((a >> 15) * b) */
-		RSPMmxPsrawImmed(x86_MM2, 15);
-		RSPMmxPsrawImmed(x86_MM3, 15);
-		RSPMmxPmullwRegToReg(x86_MM2, x86_MM4);
-		RSPMmxPmullwRegToReg(x86_MM3, x86_MM4);
-	} else {
-		RSP_MultiElement2Mmx(x86_MM4, x86_MM5);
-
-		/* Copy the signed portion */
-		RSPMmxMoveRegToReg(x86_MM2, x86_MM0);
-		RSPMmxMoveRegToReg(x86_MM3, x86_MM1);
-
-		/* high((u16)a * b) */
-		RSPMmxPmulhuwRegToReg(x86_MM0, x86_MM4);
-		RSPMmxPmulhuwRegToReg(x86_MM1, x86_MM5);
-
-		/* low((a >> 15) * b) */
-		RSPMmxPsrawImmed(x86_MM2, 15);
-		RSPMmxPsrawImmed(x86_MM3, 15);
-		RSPMmxPmullwRegToReg(x86_MM2, x86_MM4);
-		RSPMmxPmullwRegToReg(x86_MM3, x86_MM5);
-	}
-
-	/* Add them up */
-	RSPMmxPaddwRegToReg(x86_MM0, x86_MM2);
-	RSPMmxPaddwRegToReg(x86_MM1, x86_MM3);
-
-
-	RSPMmxMoveQwordRegToVariable(x86_MM0, &RSP_Vect[RSPOpC.sa].UHW[0]);
-
-	RSPMmxMoveQwordRegToVariable(x86_MM1, &RSP_Vect[RSPOpC.sa].UHW[4]);
-
-	if (IsNextInstructionMmx(RSPCompilePC) == 0)
-		RSPMmxEmptyMultimediaState();
-
-	return 1;
-}
-
-void RSPCompile_Vector_VMUDM ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bOptimize = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-	int32_t bWriteToAccum = WriteToAccum(EntireAccum, RSPCompilePC);
-
-	#ifndef RSPCompileVmudm
-	RSPCheat_r4300iOpcode(RSP_Vector_VMUDM); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bWriteToAccum == 0) {
-		if (1 == RSPCompile_Vector_VMUDM_MMX())
-			return;
-	}
-
-	if (bOptimize == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-
-	RSPPush(x86_RBP);
-
-	RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rd].HW[0], x86_RBP);
-
-	if (bWriteToDest) {
-
-		RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.sa].HW[0], x86_RCX);
-	} else if (!bOptimize) {
-
-		RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rt].HW[0], x86_RCX);
-	}
-
-	for (count = 0; count < 8; count++) {
-		CPU_Message( count);
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		/*
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);*/
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, el * 2, x86_EAX);
-
-		if (bOptimize == 0) {
-			if (bWriteToDest == 1) {
-
-				RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-			} else {
-				RSPMoveZxX86RegPtrDispToX86RegHalf(x86_RCX, del * 2, x86_EBX);
-			}
-		}
-
-		RSPimulX86reg(x86_EBX);
-
-		if (bWriteToAccum == 0 && bWriteToDest == 1) {
-			RSPShiftRightUnsignImmed(x86_EAX, 16);
-			/*
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);*/
-			RSPMoveX86regHalfToX86regPointerDisp(x86_EAX, x86_ECX, el * 2);
-		} else {
-			RSPMoveX86RegToX86Reg(x86_EAX, x86_EDX);
-			RSPShiftRightSignImmed(x86_EDX, 16);
-			RSPShiftLeftSignImmed(x86_EAX, 16);
-
-			if (bWriteToAccum == 1) {
-
-				RSPMoveX86regToVariable(x86_EAX, &RSP_ACCUM[el].UW[0]);
-
-				RSPMoveX86regToVariable(x86_EDX ,&RSP_ACCUM[el].UW[1]);
-			}
-			if (bWriteToDest == 1) {
-				/*
-				RSPMoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.sa].HW[el]);*/
-				RSPMoveX86regHalfToX86regPointerDisp(x86_EDX, x86_ECX, el * 2);
-			}
-		}
-	}
-
-	RSPPop(x86_RBP);
-}
-
-int32_t RSPCompile_Vector_VMUDN_MMX ( void ) {
-
-
-	/* Do our MMX checks here */
-	if (IsMmxEnabled == 0)
-		return 0;
-	if ((RSPOpC.rs & 0x0f) >= 2 && (RSPOpC.rs & 0x0f) <= 7 && IsMmx2Enabled == 0)
-		return 0;
-
-
-	RSPMmxMoveQwordVariableToReg(x86_MM0, &RSP_Vect[RSPOpC.rd].UHW[0]);
-
-	RSPMmxMoveQwordVariableToReg(x86_MM1, &RSP_Vect[RSPOpC.rd].UHW[4]);
-
-	if ((RSPOpC.rs & 0xF) < 2) {
-
-		RSPMmxPmullwVariableToReg(x86_MM0, &RSP_Vect[RSPOpC.rt].UHW[0]);
-
-		RSPMmxPmullwVariableToReg(x86_MM1, &RSP_Vect[RSPOpC.rt].UHW[4]);
-	} else if ((RSPOpC.rs & 0xF) >= 8) {
-		RSP_Element2Mmx(x86_MM2);
-		RSPMmxPmullwRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPmullwRegToReg(x86_MM1, x86_MM2);
-	} else {
-		RSP_MultiElement2Mmx(x86_MM2, x86_MM3);
-		RSPMmxPmullwRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPmullwRegToReg(x86_MM1, x86_MM3);
-	}
-
-
-	RSPMmxMoveQwordRegToVariable(x86_MM0, &RSP_Vect[RSPOpC.sa].UHW[0]);
-
-	RSPMmxMoveQwordRegToVariable(x86_MM1, &RSP_Vect[RSPOpC.sa].UHW[4]);
-
-	if (IsNextInstructionMmx(RSPCompilePC) == 0)
-		RSPMmxEmptyMultimediaState();
-
-	return 1;
-}
-
-void RSPCompile_Vector_VMUDN ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bOptimize = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-	int32_t bWriteToAccum = WriteToAccum(EntireAccum, RSPCompilePC);
-
-	#ifndef RSPCompileVmudn
-	RSPCheat_r4300iOpcode(RSP_Vector_VMUDN); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bWriteToAccum == 0) {
-		if (1 == RSPCompile_Vector_VMUDN_MMX())
-			return;
-	}
-
-	if (bOptimize == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-
-	RSPPush(x86_RBP);
-
-	RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rd].HW[0], x86_RBP);
-
-	for (count = 0; count < 8; count++) {
-		CPU_Message( count);
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		/*
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].UHW[el], x86_EAX);*/
-		RSPMoveZxX86RegPtrDispToX86RegHalf(x86_RBP, el * 2, x86_EAX);
-
-		if (bOptimize == 0) {
-
-			RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-		}
-
-		RSPimulX86reg(x86_EBX);
-
-		if (bWriteToDest == 1) {
-
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);
-		}
-
-		if (bWriteToAccum == 1) {
-			RSPMoveX86RegToX86Reg(x86_EAX, x86_EDX);
-			RSPShiftRightSignImmed(x86_EDX, 16);
-			RSPShiftLeftSignImmed(x86_EAX, 16);
-
-			RSPMoveX86regToVariable(x86_EAX, &RSP_ACCUM[el].UW[0]);
-
-			RSPMoveX86regToVariable(x86_EDX, &RSP_ACCUM[el].UW[1]);
-		}
-	}
-	RSPPop(x86_RBP);
-}
-
-int32_t RSPCompile_Vector_VMUDH_MMX ( void ) {
-
-
-	/* Do our MMX checks here */
-	if (IsMmxEnabled == 0)
-		return 0;
-	if ((RSPOpC.rs & 0x0f) >= 2 && (RSPOpC.rs & 0x0f) <= 7 && IsMmx2Enabled == 0)
-		return 0;
-
-
-	RSPMmxMoveQwordVariableToReg(x86_MM0, &RSP_Vect[RSPOpC.rd].HW[0]);
-
-	RSPMmxMoveQwordVariableToReg(x86_MM1, &RSP_Vect[RSPOpC.rd].HW[4]);
-
-	/* Registers 4 & 5 are high */
-	RSPMmxMoveRegToReg(x86_MM4, x86_MM0);
-	RSPMmxMoveRegToReg(x86_MM5, x86_MM1);
-
-	if ((RSPOpC.rs & 0x0f) < 2) {
-
-		RSPMmxMoveQwordVariableToReg(x86_MM2, &RSP_Vect[RSPOpC.rt].HW[0]);
-
-		RSPMmxMoveQwordVariableToReg(x86_MM3, &RSP_Vect[RSPOpC.rt].HW[4]);
-
-		RSPMmxPmullwRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPmulhwRegToReg(x86_MM4, x86_MM2);
-		RSPMmxPmullwRegToReg(x86_MM1, x86_MM3);
-		RSPMmxPmulhwRegToReg(x86_MM5, x86_MM3);
-	} else if ((RSPOpC.rs & 0x0f) >= 8) {
-		RSP_Element2Mmx(x86_MM2);
-
-		RSPMmxPmullwRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPmulhwRegToReg(x86_MM4, x86_MM2);
-		RSPMmxPmullwRegToReg(x86_MM1, x86_MM2);
-		RSPMmxPmulhwRegToReg(x86_MM5, x86_MM2);
-	} else {
-		RSP_MultiElement2Mmx(x86_MM2, x86_MM3);
-
-		RSPMmxPmullwRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPmulhwRegToReg(x86_MM4, x86_MM2);
-		RSPMmxPmullwRegToReg(x86_MM1, x86_MM3);
-		RSPMmxPmulhwRegToReg(x86_MM5, x86_MM3);
-	}
-
-	/* 0 & 1 are low, 4 & 5 are high */
-	RSPMmxMoveRegToReg(x86_MM6, x86_MM0);
-	RSPMmxMoveRegToReg(x86_MM7, x86_MM1);
-
-	RSPMmxUnpackLowWord(x86_MM0, x86_MM4);
-	RSPMmxUnpackHighWord(x86_MM6, x86_MM4);
-	RSPMmxUnpackLowWord(x86_MM1, x86_MM5);
-	RSPMmxUnpackHighWord(x86_MM7, x86_MM5);
-
-	/* Integrate copies */
-	RSPMmxPackSignedDwords(x86_MM0, x86_MM6);
-	RSPMmxPackSignedDwords(x86_MM1, x86_MM7);
-
-
-	RSPMmxMoveQwordRegToVariable(x86_MM0, &RSP_Vect[RSPOpC.sa].HW[0]);
-
-	RSPMmxMoveQwordRegToVariable(x86_MM1, &RSP_Vect[RSPOpC.sa].HW[4]);
-
-	if (IsNextInstructionMmx(RSPCompilePC) == 0)
-		RSPMmxEmptyMultimediaState();
-
-	return 1;
-}
-
-void RSPCompile_Vector_VMUDH ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bOptimize = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-	int32_t bWriteToAccum = WriteToAccum(EntireAccum, RSPCompilePC);
-
-//	RSPBreakPoint();
-	#ifndef RSPCompileVmudh
-	RSPCheat_r4300iOpcode(RSP_Vector_VMUDH); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bWriteToAccum == 0) {
-		if (1 == RSPCompile_Vector_VMUDH_MMX())
-			return;
-	}
-
-	if (bWriteToDest == 0 && bOptimize == 1) {
-		RSPPush(x86_RBP);
-
-
-		/* Load source */
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-
-		/*
-		 * Pipe lined segment 0
-		 */
-
-
-		RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rd].HW[0], x86_RBP);
-
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 0, x86_EAX);
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 2, x86_ECX);
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 4, x86_EDI);
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 6, x86_ESI);
-
-		RSPImulX86RegToX86Reg(x86_EAX, x86_EBX);
-		RSPImulX86RegToX86Reg(x86_ECX, x86_EBX);
-		RSPImulX86RegToX86Reg(x86_EDI, x86_EBX);
-		RSPImulX86RegToX86Reg(x86_ESI, x86_EBX);
-		RSPXorX86RegToX86Reg(x86_EDX, x86_EDX);
-
-		RSPMoveConstQwordToX86reg((uintptr_t)&RSP_ACCUM[0].W[0], x86_RBP);
-
-		RSPMoveX86RegToX86regPointerDisp(x86_EDX, x86_RBP, 0);
-		RSPMoveX86RegToX86regPointerDisp(x86_EAX, x86_RBP, 4);
-		RSPMoveX86RegToX86regPointerDisp(x86_EDX, x86_RBP, 8);
-		RSPMoveX86RegToX86regPointerDisp(x86_ECX, x86_RBP, 12);
-		RSPMoveX86RegToX86regPointerDisp(x86_EDX, x86_RBP, 16);
-		RSPMoveX86RegToX86regPointerDisp(x86_EDI, x86_RBP, 20);
-		RSPMoveX86RegToX86regPointerDisp(x86_EDX, x86_RBP, 24);
-		RSPMoveX86RegToX86regPointerDisp(x86_ESI, x86_RBP, 28);
-
-		/*
-		 * Pipe lined segment 1
-		 */
-
-
-		RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rd].HW[0], x86_RBP);
-
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 8, x86_EAX);
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 10, x86_ECX);
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 12, x86_EDI);
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 14, x86_ESI);
-
-		RSPImulX86RegToX86Reg(x86_EAX, x86_EBX);
-		RSPImulX86RegToX86Reg(x86_ECX, x86_EBX);
-		RSPImulX86RegToX86Reg(x86_EDI, x86_EBX);
-		RSPImulX86RegToX86Reg(x86_ESI, x86_EBX);
-		RSPXorX86RegToX86Reg(x86_EDX, x86_EDX);
-
-		RSPMoveConstQwordToX86reg((uintptr_t)&RSP_ACCUM[0].W[0], x86_RBP);
-
-		RSPMoveX86RegToX86regPointerDisp(x86_EDX, x86_RBP, 32);
-		RSPMoveX86RegToX86regPointerDisp(x86_EAX, x86_RBP, 36);
-		RSPMoveX86RegToX86regPointerDisp(x86_EDX, x86_RBP, 40);
-		RSPMoveX86RegToX86regPointerDisp(x86_ECX, x86_RBP, 44);
-		RSPMoveX86RegToX86regPointerDisp(x86_EDX, x86_RBP, 48);
-		RSPMoveX86RegToX86regPointerDisp(x86_EDI, x86_RBP, 52);
-		RSPMoveX86RegToX86regPointerDisp(x86_EDX, x86_RBP, 56);
-		RSPMoveX86RegToX86regPointerDisp(x86_ESI, x86_RBP, 60);
-
-		RSPPop(x86_RBP);
-	} else {
-		if (bOptimize == 1) {
-			del = (RSPOpC.rs & 0x07) ^ 7;
-
-			RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-		}
-		if (bWriteToDest == 1) {
-			/*
-			 * Prepare for conditional moves
-			 */
-			RSPMoveConstToX86reg(0x00007fff, x86_ESI);
-			RSPMoveConstToX86reg(0xFFFF8000, x86_EDI);
-		}
-
-		for (count = 0; count < 8; count++) {
-			CPU_Message( count);
-			el = Indx[RSPOpC.rs].B[count];
-			del = EleSpec[RSPOpC.rs].B[el];
-
-
-			RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);
-
-			if (bOptimize == 0) {
-
-				RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-			}
-			RSPimulX86reg(x86_EBX);
-
-			if (bWriteToAccum == 1) {
-				RSPMoveX86regToVariable(x86_EAX, &RSP_ACCUM[el].W[1]);
-				RSPMoveConstToVariable(0, &RSP_ACCUM[el].W[0]);
-			}
-
-			if (bWriteToDest == 1) {
-				RSPCompX86RegToX86Reg(x86_EAX, x86_ESI);
-				RSPCondMoveGreater(x86_EAX, x86_ESI);
-				RSPCompX86RegToX86Reg(x86_EAX, x86_EDI);
-				RSPCondMoveLess(x86_EAX, x86_EDI);
-
-
-				RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);
-			}
-		}
-	}
-}
-
-void RSPCompile_Vector_VMACF ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bOptimize = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-	int32_t bWriteToAccum = WriteToAccum(EntireAccum, RSPCompilePC);
-
-	#ifndef RSPCompileVmacf
-	RSPCheat_r4300iOpcode(RSP_Vector_VMACF); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bWriteToDest == 1) {
-		/*
-		 * Prepare for conditional moves
-		 */
-		RSPMoveConstToX86reg(0x00007fff, x86_ESI);
-		RSPMoveConstToX86reg(0xFFFF8000, x86_EDI);
-	}
-	if (bOptimize == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-
-	for (count = 0; count < 8; count++) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		CPU_Message( count);
-
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);
-
-		if (bOptimize == 0) {
-
-			RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-		}
-
-		RSPimulX86reg(x86_EBX);
-
-		RSPMoveX86RegToX86Reg(x86_EAX, x86_EDX);
-		RSPShiftRightSignImmed(x86_EDX, 15);
-		RSPShiftLeftSignImmed(x86_EAX, 17);
-
-		RSPAddX86regToVariable(x86_EAX, &RSP_ACCUM[el].W[0]);
-		RSPAdcX86regToVariable(x86_EDX, &RSP_ACCUM[el].W[1]);
-
-		if (bWriteToDest == 1) {
-			RSPMoveVariableToX86reg(&RSP_ACCUM[el].W[1], x86_EAX);
-
-			RSPCompX86RegToX86Reg(x86_EAX, x86_ESI);
-			RSPCondMoveGreater(x86_EAX, x86_ESI);
-			RSPCompX86RegToX86Reg(x86_EAX, x86_EDI);
-			RSPCondMoveLess(x86_EAX, x86_EDI);
-
-
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);
-		}
-	}
-}
-
-void RSPCompile_Vector_VMACU ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VMACU);
-}
-
-void RSPCompile_Vector_VMACQ ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VMACQ);
-}
-
-void RSPCompile_Vector_VMADL ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bOptimize = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-
-	#ifndef RSPCompileVmadl
-	RSPCheat_r4300iOpcode(RSP_Vector_VMADL); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bOptimize == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-
-	if (bWriteToDest == 1) {
-		/*
-		 * Prepare for conditional moves
-		 */
-		RSPMoveConstToX86reg(0x00007FFF, x86_ESI);
-		RSPMoveConstToX86reg(0xFFFF8000, x86_EDI);
-
-		RSPPush(x86_RBP);
-		RSPMoveConstToX86reg(0x0000FFFF, x86_EBP);
-	}
-
-	for (count = 0; count < 8; count++) {
-		CPU_Message( count);
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);
-
-		if (bOptimize == 0) {
-
-			RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-		}
-
-		RSPimulX86reg(x86_EBX);
-
-		RSPAddX86regToVariable(x86_EAX, &RSP_ACCUM[el].W[0]);
-
-		RSPAdcConstToVariable(&RSP_ACCUM[el].W[1], 0);
-
-		if (bWriteToDest != 0) {
-			RSPXorX86RegToX86Reg(x86_EDX, x86_EDX);
-			RSPMoveVariableToX86reg(&RSP_ACCUM[el].W[1], x86_EAX);
-			RSPMoveZxVariableToX86regHalf(&RSP_ACCUM[el].HW[1], x86_ECX);
-
-			RSPCompX86RegToX86Reg(x86_EAX, x86_ESI);
-			RSPCondMoveGreater(x86_ECX, x86_EBP);
-			RSPCompX86RegToX86Reg(x86_EAX, x86_EDI);
-			RSPCondMoveLess(x86_ECX, x86_EDX);
-
-
-			RSPMoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.sa].HW[el]);
-		}
-	}
-
-	if (bWriteToDest == 1) {
-		RSPPop(x86_EBP);
-	}
-}
-
-void RSPCompile_Vector_VMADM ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bOptimize = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-	int32_t bWriteToAccum = WriteToAccum(EntireAccum, RSPCompilePC);
-
-	#ifndef RSPCompileVmadm
-	RSPCheat_r4300iOpcode(RSP_Vector_VMADM); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bOptimize == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-	if (bWriteToDest == 1) {
-		/*
-		 * Prepare for conditional moves
-		 */
-		RSPMoveConstToX86reg(0x00007fff, x86_ESI);
-		RSPMoveConstToX86reg(0xFFFF8000, x86_EDI);
-	}
-
-	RSPPush(x86_RBP);
-
-	RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rd].HW[0], x86_RBP);
-
-	if (bWriteToDest) {
-
-		RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.sa].HW[0], x86_RCX);
-	} else if (!bOptimize) {
-
-		RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rt].HW[0], x86_RCX);
-	}
-
-	for (count = 0; count < 8; count++) {
-		CPU_Message( count);
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		/*
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);*/
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, el * 2, x86_EAX);
-
-		if (bOptimize == 0) {
-			if (bWriteToDest == 1) {
-
-				RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-			} else {
-				RSPMoveZxX86RegPtrDispToX86RegHalf(x86_ECX, del * 2, x86_EBX);
-			}
-		}
-
-		RSPimulX86reg(x86_EBX);
-
-		RSPMoveX86RegToX86Reg(x86_EAX, x86_EDX);
-		RSPShiftRightSignImmed(x86_EDX, 16);
-		RSPShiftLeftSignImmed(x86_EAX, 16);
-		RSPAddX86regToVariable(x86_EAX, &RSP_ACCUM[el].W[0]);
-		RSPAdcX86regToVariable(x86_EDX, &RSP_ACCUM[el].W[1]);
-
-		if (bWriteToDest == 1) {
-			/* For compare */
-
-			RSPMoveVariableToX86reg(&RSP_ACCUM[el].W[1], x86_EAX);
-
-			RSPCompX86RegToX86Reg(x86_EAX, x86_ESI);
-			RSPCondMoveGreater(x86_EAX, x86_ESI);
-			RSPCompX86RegToX86Reg(x86_EAX, x86_EDI);
-			RSPCondMoveLess(x86_EAX, x86_EDI);
-
-			/*
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);*/
-			RSPMoveX86regHalfToX86regPointerDisp(x86_EAX, x86_ECX, el * 2);
-		}
-	}
-
-	RSPPop(x86_RBP);
-}
-
-void RSPCompile_Vector_VMADN ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bOptimize = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-	int32_t bWriteToAccum = WriteToAccum(EntireAccum, RSPCompilePC);
-
-	#ifndef RSPCompileVmadn
-	RSPCheat_r4300iOpcode(RSP_Vector_VMADN); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bOptimize == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-	if (bWriteToDest == 1) {
-		/*
-		 * Prepare for conditional moves
-		 */
-		RSPMoveConstToX86reg(0x0000ffff, x86_ESI);
-		RSPMoveConstToX86reg(0x00000000, x86_EDI);
-	}
-
-	RSPPush(x86_RBP);
-
-	RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rd].HW[0], x86_RBP);
-
-	for (count = 0; count < 8; count++) {
-		CPU_Message( count);
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		/*
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].UHW[el], x86_EAX);*/
-		RSPMoveZxX86RegPtrDispToX86RegHalf(x86_RBP, el * 2, x86_EAX);
-
-		if (bOptimize == 0) {
-
-			RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-		}
-
-		RSPimulX86reg(x86_EBX);
-
-		RSPMoveX86RegToX86Reg(x86_EAX, x86_EDX);
-		RSPShiftRightSignImmed(x86_EDX, 16);
-		RSPShiftLeftSignImmed(x86_EAX, 16);
-		RSPAddX86regToVariable(x86_EAX, &RSP_ACCUM[el].W[0]);
-		RSPAdcX86regToVariable(x86_EDX, &RSP_ACCUM[el].W[1]);
-
-		if (bWriteToDest == 1) {
-			/* For compare */
-
-			RSPMoveVariableToX86reg(&RSP_ACCUM[el].W[1], x86_EAX);
-
-			/* For vector */
-
-			RSPMoveVariableToX86regHalf(&RSP_ACCUM[el].HW[1], x86_ECX);
-
-			/* Weird eh */
-			RSPCompConstToX86reg(x86_EAX, 0x7fff);
-			RSPCondMoveGreater(x86_ECX, x86_ESI);
-			RSPCompConstToX86reg(x86_EAX, -0x8000);
-			RSPCondMoveLess(x86_ECX, x86_EDI);
-
-
-			RSPMoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.sa].HW[el]);
-		}
-	}
-	RSPPop(x86_RBP);
-}
-
-void RSPCompile_Vector_VMADH ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bOptimize = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-
-	#ifndef RSPCompileVmadh
-	RSPCheat_r4300iOpcode(RSP_Vector_VMADH); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bOptimize == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-
-	if (bWriteToDest == 1) {
-		/*
-		 * Prepare for conditional moves
-		 */
-		RSPMoveConstToX86reg(0x00007fff, x86_ESI);
-		RSPMoveConstToX86reg(0xFFFF8000, x86_EDI);
-	}
-
-	if (bWriteToDest == 0 && bOptimize == 1) {
-		RSPPush(x86_RBP);
-
-		RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rd].HW[0], x86_RBP);
-
-		/*
-		 * Pipe lined segment 0
-		 */
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 0, x86_EAX);
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 2, x86_ECX);
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 4, x86_EDI);
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 6, x86_ESI);
-
-		RSPImulX86RegToX86Reg(x86_EAX, x86_EBX);
-		RSPImulX86RegToX86Reg(x86_ECX, x86_EBX);
-		RSPImulX86RegToX86Reg(x86_EDI, x86_EBX);
-		RSPImulX86RegToX86Reg(x86_ESI, x86_EBX);
-
-
-		RSPAddX86regToVariable(x86_EAX, &RSP_ACCUM[0].W[1]);
-
-		RSPAddX86regToVariable(x86_ECX, &RSP_ACCUM[1].W[1]);
-
-		RSPAddX86regToVariable(x86_EDI, &RSP_ACCUM[2].W[1]);
-
-		RSPAddX86regToVariable(x86_ESI, &RSP_ACCUM[3].W[1]);
-
-		/*
-		 * Pipe lined segment 1
-		 */
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 8, x86_EAX);
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 10, x86_ECX);
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 12, x86_EDI);
-		RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, 14, x86_ESI);
-
-		RSPImulX86RegToX86Reg(x86_EAX, x86_EBX);
-		RSPImulX86RegToX86Reg(x86_ECX, x86_EBX);
-		RSPImulX86RegToX86Reg(x86_EDI, x86_EBX);
-		RSPImulX86RegToX86Reg(x86_ESI, x86_EBX);
-
-
-		RSPAddX86regToVariable(x86_EAX, &RSP_ACCUM[4].W[1]);
-
-		RSPAddX86regToVariable(x86_ECX, &RSP_ACCUM[5].W[1]);
-
-		RSPAddX86regToVariable(x86_EDI, &RSP_ACCUM[6].W[1]);
-
-		RSPAddX86regToVariable(x86_ESI, &RSP_ACCUM[7].W[1]);
-
-		RSPPop(x86_EBP);
-	} else {
-		RSPPush(x86_RBP);
-
-		RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rd].HW[0], x86_RBP);
-
-		if (bWriteToDest) {
-
-			RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.sa].HW[0], x86_RCX);
-		} else if (!bOptimize) {
-
-			RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rt].HW[0], x86_RCX);
-		}
-
-		for (count = 0; count < 8; count++) {
-			CPU_Message( count);
-			el = Indx[RSPOpC.rs].B[count];
-			del = EleSpec[RSPOpC.rs].B[el];
-
-			/*
-			RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);*/
-			RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RBP, el * 2, x86_EAX);
-
-			if (bOptimize == 0) {
-				if (bWriteToDest == 1) {
-
-					RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-				} else {
-					RSPMoveSxX86RegPtrDispToX86RegHalf(x86_RCX, del * 2, x86_EBX);
-				}
-			}
-
-			RSPimulX86reg(x86_EBX);
-
-			RSPAddX86regToVariable(x86_EAX, &RSP_ACCUM[el].W[1]);
-
-			if (bWriteToDest == 1) {
-				RSPMoveVariableToX86reg(&RSP_ACCUM[el].W[1], x86_EAX);
-
-				RSPCompX86RegToX86Reg(x86_EAX, x86_ESI);
-				RSPCondMoveGreater(x86_EAX, x86_ESI);
-				RSPCompX86RegToX86Reg(x86_EAX, x86_EDI);
-				RSPCondMoveLess(x86_EAX, x86_EDI);
-
-				/*
-				RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);*/
-				RSPMoveX86regHalfToX86regPointerDisp(x86_EAX, x86_ECX, el * 2);
-			}
-		}
-		RSPPop(x86_RBP);
-	}
-}
-
-int32_t RSPCompile_Vector_VADD_MMX ( void ) {
-
-
-	/* Do our MMX checks here */
-	if (IsMmxEnabled == 0)
-		return 0;
-	if ((RSPOpC.rs & 0x0f) >= 2 && (RSPOpC.rs & 0x0f) <= 7 && IsMmx2Enabled == 0)
-		return 0;
-
-
-	RSPMmxMoveQwordVariableToReg(x86_MM0, &RSP_Vect[RSPOpC.rd].UHW[0]);
-
-	RSPMmxMoveQwordVariableToReg(x86_MM1, &RSP_Vect[RSPOpC.rd].UHW[4]);
-
-	if ((RSPOpC.rs & 15) >= 8) {
-		RSP_Element2Mmx(x86_MM2);
-		RSPMmxPaddswRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPaddswRegToReg(x86_MM1, x86_MM2);
-	} else if ((RSPOpC.rs & 15) < 2) {
-
-		RSPMmxPaddswVariableToReg(x86_MM0, &RSP_Vect[RSPOpC.rt].HW[0]);
-
-		RSPMmxPaddswVariableToReg(x86_MM1, &RSP_Vect[RSPOpC.rt].HW[4]);
-	} else {
-		RSP_MultiElement2Mmx(x86_MM2, x86_MM3);
-		RSPMmxPaddswRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPaddswRegToReg(x86_MM1, x86_MM3);
-	}
-
-
-	RSPMmxMoveQwordRegToVariable(x86_MM0, &RSP_Vect[RSPOpC.sa].UHW[0]);
-
-	RSPMmxMoveQwordRegToVariable(x86_MM1, &RSP_Vect[RSPOpC.sa].UHW[4]);
-	RSPMmxEmptyMultimediaState();
-
-	return 1;
-}
-
-void RSPCompile_Vector_VADD ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-	int32_t bElement = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToAccum = WriteToAccum(Low16BitAccum, RSPCompilePC);
-	int32_t bFlagUseage = UseRspFlags(RSPCompilePC);
-
-	#ifndef RSPCompileVadd
-	RSPCheat_r4300iOpcode(RSP_Vector_VADD); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bWriteToAccum == 0 && bFlagUseage == 0) {
-		if (1 == RSPCompile_Vector_VADD_MMX())
-			return;
-	}
-
-	if (bElement == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-	if (bWriteToDest == 1) {
-		/*
-		 * Prepare for conditional moves
-		 */
-		RSPMoveConstToX86reg(0x00007fff, x86_ESI);
-		RSPMoveConstToX86reg(0xffff8000, x86_EDI);
-	}
-
-	/* Used for involking x86 carry flag */
-	RSPXorX86RegToX86Reg(x86_ECX, x86_ECX);
-	RSPPush(x86_RBP);
-	RSPMoveVariableToX86reg(&RSP_Flags[0].UW, x86_EBP);
-
-	for (count = 0; count < 8; count++) {
-		CPU_Message( count);
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);
-
-		if (bElement == 0) {
-
-			RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-		}
-
-		RSPMoveX86RegToX86Reg(x86_EBP, x86_EDX);
-		RSPAndConstToX86Reg(x86_EDX, 1 << (7 - el));
-		RSPCompX86RegToX86Reg(x86_ECX, x86_EDX);
-
-		RSPAdcX86RegToX86Reg(x86_EAX, x86_EBX);
-
-		if (bWriteToAccum == 1) {
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[el].HW[1]);
-		}
-		if (bWriteToDest == 1) {
-			RSPCompX86RegToX86Reg(x86_EAX, x86_ESI);
-			RSPCondMoveGreater(x86_EAX, x86_ESI);
-			RSPCompX86RegToX86Reg(x86_EAX, x86_EDI);
-			RSPCondMoveLess(x86_EAX, x86_EDI);
-
-
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);
-		}
-	}
-	RSPMoveConstToVariable(0, &RSP_Flags[0].UW);
-	RSPPop(x86_EBP);
-}
-
-void RSPCompile_Vector_VSUB ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-	int32_t bOptimize = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToAccum = WriteToAccum(Low16BitAccum, RSPCompilePC);
-
-	#ifndef RSPCompileVsub
-	RSPCheat_r4300iOpcode(RSP_Vector_VSUB); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-	RSPPush(x86_RBP);
-
-	/* Used for involking the x86 carry flag */
-	RSPXorX86RegToX86Reg(x86_ECX, x86_ECX);
-	RSPMoveVariableToX86reg(&RSP_Flags[0].UW, x86_EBP);
-
-	if (bOptimize == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-
-	if (bWriteToDest == 1) {
-		/*
-		 * Prepare for conditional moves
-		 */
-		RSPMoveConstToX86reg(0x00007fff, x86_ESI);
-		RSPMoveConstToX86reg(0xffff8000, x86_EDI);
-	}
-
-	for (count = 0; count < 8; count++) {
-		CPU_Message( count);
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);
-		if (bOptimize == 0) {
-
-			RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-		}
-
-		RSPMoveX86RegToX86Reg(x86_EBP, x86_EDX);
-		RSPAndConstToX86Reg(x86_EDX, 1 << (7 - el));
-		RSPCompX86RegToX86Reg(x86_ECX, x86_EDX);
-
-		RSPSbbX86RegToX86Reg(x86_EAX, x86_EBX);
-
-		if (bWriteToAccum == 1) {
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[el].HW[1]);
-		}
-		if (bWriteToDest == 1) {
-			RSPCompX86RegToX86Reg(x86_EAX, x86_ESI);
-			RSPCondMoveGreater(x86_EAX, x86_ESI);
-			RSPCompX86RegToX86Reg(x86_EAX, x86_EDI);
-			RSPCondMoveLess(x86_EAX, x86_EDI);
-
-
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);
-		}
-	}
-
-	RSPMoveConstToVariable(0, &RSP_Flags[0].UW);
-	RSPPop(x86_EBP);
-}
-
-void RSPCompile_Vector_VABS ( void ) {
-	int32_t count, el, del;
-
-
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-	int32_t bWriteToAccum = WriteToAccum(Low16BitAccum, RSPCompilePC);
-
-	#ifndef RSPCompileVabs
-	RSPCheat_r4300iOpcode(RSP_Vector_VABS); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	for (count = 0; count < 8; count++) {
-		CPU_Message( count);
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		if (RSPOpC.rd == RSPOpC.rt && (RSPOpC.rs & 0xF) < 2) {
-			/**
-			** Optimize: EDI/ESI unused, and ECX is const etc
-			***/
-
-
-			RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);
-
-			/*** Obtain the negative of the source ****/
-			RSPMoveX86RegToX86Reg(x86_EAX, x86_EBX);
-			RSPNegateX86reg(x86_EBX);
-
-			/**
-			** determine negative value,
-			** note: negate(FFFF8000h) == 00008000h
-			***/
-
-			RSPMoveConstToX86reg(0x7fff, x86_ECX);
-			RSPCompConstToX86reg(x86_EBX, 0x00008000);
-			RSPCondMoveEqual(x86_EBX, x86_ECX);
-
-			/* sign clamp, dest = (eax >= 0) ? eax : ebx */
-			RSPCompConstToX86reg(x86_EAX, 0);
-			RSPCondMoveLess(x86_EAX, x86_EBX);
-
-			if (bWriteToDest == 1) {
-
-				RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);
-			}
-			if (bWriteToAccum == 1) {
-
-				RSPMoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[el].HW[1]);
-			}
-		} else {
-			/**
-			** Optimize: ESI unused, and EDX is const etc
-			***/
-
-
-			RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);
-
-			RSPMoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-
-			/*** Obtain the negative of the source ****/
-			RSPMoveX86RegToX86Reg(x86_EBX, x86_ECX);
-			RSPNegateX86reg(x86_EBX);
-
-			/**
-			** determine negative value,
-			** note: negate(FFFF8000h) == 00008000h
-			***/
-
-			RSPMoveConstToX86reg(0x7fff, x86_EDX);
-			RSPCompConstToX86reg(x86_EBX, 0x00008000);
-			RSPCondMoveEqual(x86_EBX, x86_EDX);
-
-			/* sign clamp, dest = (eax >= 0) ? ecx : ebx */
-			RSPCompConstToX86reg(x86_EAX, 0);
-			RSPCondMoveGreaterEqual(x86_EDI, x86_ECX);
-			RSPCondMoveLess(x86_EDI, x86_EBX);
-
-			if (bWriteToDest == 1) {
-
-				RSPMoveX86regHalfToVariable(x86_EDI, &RSP_Vect[RSPOpC.sa].HW[el]);
-			}
-			if (bWriteToAccum == 1) {
-
-				RSPMoveX86regHalfToVariable(x86_EDI, &RSP_ACCUM[el].HW[1]);
-			}
-		}
-	}
-}
-
-void RSPCompile_Vector_VADDC ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-	int32_t bWriteToAccum = WriteToAccum(Low16BitAccum, RSPCompilePC);
-	int32_t bElement = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-
-	#ifndef RSPCompileVaddc
-	RSPCheat_r4300iOpcode(RSP_Vector_VADDC); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bElement == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-
-	/* Initialize flag register */
-	RSPXorX86RegToX86Reg(x86_ECX, x86_ECX);
-
-	RSPPush(x86_RBP);
-
-	RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rd].HW[0], x86_RBP);
-
-	for (count = 0; count < 8; count++) {
-		CPU_Message( count);
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		/*
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);*/
-		RSPMoveZxX86RegPtrDispToX86RegHalf(x86_RBP, el * 2, x86_EAX);
-
-		if (bElement == 0) {
-
-			RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-		}
-
-		RSPAddX86RegToX86Reg(x86_EAX, x86_EBX);
-
-		RSPXorX86RegToX86Reg(x86_EDX, x86_EDX);
-		RSPTestConstToX86Reg(0xFFFF0000, x86_EAX);
-		RSPSetnz(x86_EDX);
-		if ((7 - el) != 0) {
-			RSPShiftLeftSignImmed(x86_EDX, 7 - el);
-		}
-		RSPOrX86RegToX86Reg(x86_ECX, x86_EDX);
-
-		if (bWriteToAccum == 1) {
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[el].HW[1]);
-		}
-		if (bWriteToDest == 1) {
-
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);
-		}
-	}
-	RSPMoveX86regToVariable(x86_ECX, &RSP_Flags[0].UW);
-	RSPPop(x86_RBP);
-}
-
-void RSPCompile_Vector_VSUBC ( void ) {
-
-	int32_t count, el, del;
-
-	int32_t bWriteToDest = WriteToVectorDest(RSPOpC.sa, RSPCompilePC);
-	int32_t bWriteToAccum = WriteToAccum(Low16BitAccum, RSPCompilePC);
-	int32_t bElement = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-
-	#ifndef RSPCompileVsubc
-	RSPCheat_r4300iOpcode(RSP_Vector_VSUBC); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bElement == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-
-	/* Initialize flag register */
-	RSPXorX86RegToX86Reg(x86_ECX, x86_ECX);
-
-	for (count = 0; count < 8; count++) {
-		CPU_Message( count);
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);
-
-		if (bElement == 0) {
-
-			RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-		}
-
-		RSPSubX86RegToX86Reg(x86_EAX, x86_EBX);
-
-		RSPXorX86RegToX86Reg(x86_EDX, x86_EDX);
-		RSPTestConstToX86Reg(0x0000FFFF, x86_EAX);
-		RSPSetnz(x86_EDX);
-		RSPShiftLeftSignImmed(x86_EDX, 15 - el);
-		RSPOrX86RegToX86Reg(x86_ECX, x86_EDX);
-
-		RSPXorX86RegToX86Reg(x86_EDX, x86_EDX);
-		RSPTestConstToX86Reg(0xFFFF0000, x86_EAX);
-		RSPSetnz(x86_EDX);
-		RSPShiftLeftSignImmed(x86_EDX, 7 - el);
-		RSPOrX86RegToX86Reg(x86_ECX, x86_EDX);
-
-		if (bWriteToAccum == 1) {
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[el].HW[1]);
-		}
-		if (bWriteToDest == 1) {
-
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);
-		}
-	}
-	RSPMoveX86regToVariable(x86_ECX, &RSP_Flags[0].UW);
-}
-
-void RSPCompile_Vector_VSAW ( void ) {
-
-	uint32_t Word;
-
-	#ifndef RSPCompileVsaw
-	RSPCheat_r4300iOpcode(RSP_Vector_VSAW); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	switch ((RSPOpC.rs & 0xF)) {
-	case 8: Word = 3; break;
-	case 9: Word = 2; break;
-	case 10: Word = 1; break;
-	default:
-		RSPMoveConstToVariable(0, &RSP_Vect[RSPOpC.sa].DW[1]);
-		RSPMoveConstToVariable(0, &RSP_Vect[RSPOpC.sa].DW[0]);
-		return;
-	}
-
-
-	RSPMoveVariableToX86regHalf(&RSP_ACCUM[1].HW[Word], x86_EAX);
-
-	RSPMoveVariableToX86regHalf(&RSP_ACCUM[3].HW[Word], x86_EBX);
-
-	RSPMoveVariableToX86regHalf(&RSP_ACCUM[5].HW[Word], x86_ECX);
-
-	RSPMoveVariableToX86regHalf(&RSP_ACCUM[7].HW[Word], x86_EDX);
-
-	RSPShiftLeftSignImmed(x86_EAX, 16);
-	RSPShiftLeftSignImmed(x86_EBX, 16);
-	RSPShiftLeftSignImmed(x86_ECX, 16);
-	RSPShiftLeftSignImmed(x86_EDX, 16);
-
-
-	RSPMoveVariableToX86regHalf(&RSP_ACCUM[0].HW[Word], x86_EAX);
-
-	RSPMoveVariableToX86regHalf(&RSP_ACCUM[2].HW[Word], x86_EBX);
-
-	RSPMoveVariableToX86regHalf(&RSP_ACCUM[4].HW[Word], x86_ECX);
-
-	RSPMoveVariableToX86regHalf(&RSP_ACCUM[6].HW[Word], x86_EDX);
-
-
-	RSPMoveX86regToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[0]);
-
-	RSPMoveX86regToVariable(x86_EBX, &RSP_Vect[RSPOpC.sa].HW[2]);
-
-	RSPMoveX86regToVariable(x86_ECX, &RSP_Vect[RSPOpC.sa].HW[4]);
-
-	RSPMoveX86regToVariable(x86_EDX, &RSP_Vect[RSPOpC.sa].HW[6]);
-}
-
-void RSPCompile_Vector_VLT ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VLT);
-}
-
-void RSPCompile_Vector_VEQ ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VEQ);
-}
-
-void RSPCompile_Vector_VNE ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VNE);
-}
-
-int32_t RSPCompile_Vector_VGE_MMX(void) {
-
-
-	if ((RSPOpC.rs & 0xF) >= 2 && (RSPOpC.rs & 0xF) <= 7 && IsMmx2Enabled == 0)
-		return 0;
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-	RSPMoveConstToVariable(0, &RSP_Flags[1].UW);
-
-
-	RSPMmxMoveQwordVariableToReg(x86_MM0, &RSP_Vect[RSPOpC.rd].HW[0]);
-
-	RSPMmxMoveQwordVariableToReg(x86_MM1, &RSP_Vect[RSPOpC.rd].HW[4]);
-	RSPMmxMoveRegToReg(x86_MM2, x86_MM0);
-	RSPMmxMoveRegToReg(x86_MM3, x86_MM1);
-
-	if ((RSPOpC.rs & 0x0f) < 2) {
-
-		RSPMmxMoveQwordVariableToReg(x86_MM4, &RSP_Vect[RSPOpC.rt].HW[0]);
-
-		RSPMmxMoveQwordVariableToReg(x86_MM5, &RSP_Vect[RSPOpC.rt].HW[4]);
-	} else if ((RSPOpC.rs & 0x0f) >= 8) {
-		RSP_Element2Mmx(x86_MM4);
-	} else {
-		RSP_MultiElement2Mmx(x86_MM4, x86_MM5);
-	}
-
-	RSPMmxCompareGreaterWordRegToReg(x86_MM2, x86_MM4);
-	RSPMmxCompareGreaterWordRegToReg(x86_MM3, ((RSPOpC.rs & 0x0f) >= 8) ? x86_MM4 : x86_MM5);
-
-	RSPMmxPandRegToReg(x86_MM0, x86_MM2);
-	RSPMmxPandRegToReg(x86_MM1, x86_MM3);
-	RSPMmxPandnRegToReg(x86_MM2, x86_MM4);
-	RSPMmxPandnRegToReg(x86_MM3, ((RSPOpC.rs & 0x0f) >= 8) ? x86_MM4 : x86_MM5);
-
-	RSPMmxPorRegToReg(x86_MM0, x86_MM2);
-	RSPMmxPorRegToReg(x86_MM1, x86_MM3);
-	RSPMoveConstToVariable(0, &RSP_Flags[0].UW);
-	return 1;
-}
-
-void RSPCompile_Vector_VGE ( void ) {
-/*	int32_t bWriteToAccum = WriteToAccum(Low16BitAccum, RSPCompilePC); */
-
-	/* FIXME: works ok, but needs careful flag analysis */
-/*	#if defined (DLIST)
-	if (bWriteToAccum == 0 && 1 == RSPCompile_Vector_VGE_MMX()) {
-		return;
-	}
-	#endif
-*/
-	RSPCheat_r4300iOpcode(RSP_Vector_VGE);
-}
-
-void RSPCompile_Vector_VCL ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VCL);
-}
-
-void RSPCompile_Vector_VCH ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VCH);
-}
-
-void RSPCompile_Vector_VCR ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VCR);
-}
-
-void RSPCompile_Vector_VMRG ( void ) {
-
-	int32_t count, el, del;
-
-	#ifndef RSPCompileVmrg
-	RSPCheat_r4300iOpcode(RSP_Vector_VMRG); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-	RSPMoveVariableToX86reg(&RSP_Flags[1].UW, x86_EDX);
-
-	for (count = 0;count < 8; count++) {
-		el = Indx[RSPOpC.rs].UB[count];
-		del = EleSpec[RSPOpC.rs].UB[el];
-		CPU_Message( count);
-
-
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);
-
-		RSPMoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-
-		RSPTestConstToX86Reg(1 << (7 - el), x86_EDX);
-		RSPCondMoveNotEqual(x86_ECX, x86_EAX);
-		RSPCondMoveEqual(x86_ECX, x86_EBX);
-
-
-		RSPMoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.sa].HW[el]);
-	}
-}
-
-int32_t RSPCompile_Vector_VAND_MMX ( void ) {
-
-
-	/* Do our MMX checks here */
-	if (IsMmxEnabled == 0)
-		return 0;
-	if ((RSPOpC.rs & 0x0f) >= 2 && (RSPOpC.rs & 0x0f) <= 7 && IsMmx2Enabled == 0)
-		return 0;
-
-
-	RSPMmxMoveQwordVariableToReg(x86_MM0, &RSP_Vect[RSPOpC.rd].UHW[0]);
-
-	RSPMmxMoveQwordVariableToReg(x86_MM1, &RSP_Vect[RSPOpC.rd].UHW[4]);
-
-	if ((RSPOpC.rs & 0xF) >= 8) {
-		RSP_Element2Mmx(x86_MM2);
-		RSPMmxPandRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPandRegToReg(x86_MM1, x86_MM2);
-	} else if ((RSPOpC.rs & 0xF) < 2) {
-
-		RSPMmxPandVariableToReg(&RSP_Vect[RSPOpC.rt].HW[0], x86_MM0);
-
-		RSPMmxPandVariableToReg(&RSP_Vect[RSPOpC.rt].HW[4], x86_MM1);
-	} else {
-		RSP_MultiElement2Mmx(x86_MM2, x86_MM3);
-		RSPMmxPandRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPandRegToReg(x86_MM1, x86_MM3);
-	}
-
-
-	RSPMmxMoveQwordRegToVariable(x86_MM0, &RSP_Vect[RSPOpC.sa].UHW[0]);
-
-	RSPMmxMoveQwordRegToVariable(x86_MM1, &RSP_Vect[RSPOpC.sa].UHW[4]);
-
-	if (IsNextInstructionMmx(RSPCompilePC) == 0)
-		RSPMmxEmptyMultimediaState();
-
-	return 1;
-}
-
-void RSPCompile_Vector_VAND ( void ) {
-
-	int32_t el, del, count;
-	int32_t bElement = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToAccum = WriteToAccum(Low16BitAccum, RSPCompilePC);
-
-	#ifndef RSPCompileVand
-	RSPCheat_r4300iOpcode(RSP_Vector_VAND); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bWriteToAccum == 0) {
-		if (1 == RSPCompile_Vector_VAND_MMX())
-			return;
-	}
-
-	if (bElement == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-
-	for (count = 0; count < 8; count++) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		CPU_Message( count);
-
-
-		RSPMoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);
-
-		if (bElement == 0) {
-
-			RSPAndVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EAX);
-		} else {
-			RSPAndX86RegHalfToX86RegHalf(x86_EAX, x86_EBX);
-		}
-
-
-		RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);
-
-		if (bWriteToAccum != 0) {
-
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[el].HW[1]);
-		}
-	}
-}
-
-void RSPCompile_Vector_VNAND ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VNAND);
-}
-
-int32_t RSPCompile_Vector_VOR_MMX ( void ) {
-
-
-	/* Do our MMX checks here */
-	if (IsMmxEnabled == 0)
-		return 0;
-	if ((RSPOpC.rs & 0x0f) >= 2 && (RSPOpC.rs & 0x0f) <= 7 && IsMmx2Enabled == 0)
-		return 0;
-
-
-	RSPMmxMoveQwordVariableToReg(x86_MM0, &RSP_Vect[RSPOpC.rd].UHW[0]);
-
-	RSPMmxMoveQwordVariableToReg(x86_MM1, &RSP_Vect[RSPOpC.rd].UHW[4]);
-
-	if ((RSPOpC.rs & 0xF) >= 8) {
-		RSP_Element2Mmx(x86_MM2);
-		RSPMmxPorRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPorRegToReg(x86_MM1, x86_MM2);
-	} else if ((RSPOpC.rs & 0xF) < 2) {
-
-		RSPMmxPorVariableToReg(&RSP_Vect[RSPOpC.rt].HW[0], x86_MM0);
-
-		RSPMmxPorVariableToReg(&RSP_Vect[RSPOpC.rt].HW[4], x86_MM1);
-	} else {
-		RSP_MultiElement2Mmx(x86_MM2, x86_MM3);
-		RSPMmxPorRegToReg(x86_MM0, x86_MM2);
-		RSPMmxPorRegToReg(x86_MM1, x86_MM3);
-	}
-
-
-	RSPMmxMoveQwordRegToVariable(x86_MM0, &RSP_Vect[RSPOpC.sa].UHW[0]);
-
-	RSPMmxMoveQwordRegToVariable(x86_MM1, &RSP_Vect[RSPOpC.sa].UHW[4]);
-
-	if (IsNextInstructionMmx(RSPCompilePC) == 0)
-		RSPMmxEmptyMultimediaState();
-
-	return 1;
-}
-
-void RSPCompile_Vector_VOR ( void ) {
-
-	int32_t el, del, count;
-	int32_t bElement = ((RSPOpC.rs & 0x0f) >= 8) ? 1 : 0;
-	int32_t bWriteToAccum = WriteToAccum(Low16BitAccum, RSPCompilePC);
-
-	#ifndef RSPCompileVor
-	RSPCheat_r4300iOpcode(RSP_Vector_VOR); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (bWriteToAccum == 0) {
-		if (1 == RSPCompile_Vector_VOR_MMX())
-			return;
-	}
-
-	if (bElement == 1) {
-		del = (RSPOpC.rs & 0x07) ^ 7;
-
-		RSPMoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EBX);
-	}
-
-	for (count = 0; count < 8; count++) {
-		el = Indx[RSPOpC.rs].B[count];
-		del = EleSpec[RSPOpC.rs].B[el];
-
-		CPU_Message( count);
-
-
-		RSPMoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], x86_EAX);
-
-		if (bElement == 0) {
-
-			RSPOrVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], x86_EAX);
-		} else {
-			RSPOrX86RegToX86Reg(x86_EAX, x86_EBX);
-		}
-
-		if (bWriteToAccum == 1) {
-
-			RSPMoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[el].HW[1]);
-		}
-
-		RSPMoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el]);
-	}
-}
-
-void RSPCompile_Vector_VNOR ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VNOR);
-}
-
-int32_t RSPCompile_Vector_VXOR_MMX ( void ) {
-
-
-	/* Do our MMX checks here */
-	if (IsMmxEnabled == 1)
-		return 0;
-	if ((RSPOpC.rs & 0x0f) >= 2 && (RSPOpC.rs & 0x0f) <= 7 && IsMmx2Enabled == 0)
-		return 0;
-
-	if ((RSPOpC.rs & 0xF) < 2 && (RSPOpC.rd == RSPOpC.rt)) {
-		static uint32_t VXOR_DynaRegCount = 0;
-		RSPMmxXorRegToReg(VXOR_DynaRegCount+1, VXOR_DynaRegCount+1);
-
-
-		RSPMmxMoveQwordRegToVariable(VXOR_DynaRegCount+1, &RSP_Vect[RSPOpC.sa].UHW[0]);
-
-		RSPMmxMoveQwordRegToVariable(VXOR_DynaRegCount+1, &RSP_Vect[RSPOpC.sa].UHW[4]);
-		VXOR_DynaRegCount = (VXOR_DynaRegCount + 1) & 7;
-	} else {
-
-		RSPMmxMoveQwordVariableToReg(x86_MM0, &RSP_Vect[RSPOpC.rd].UHW[0]);
-
-		RSPMmxMoveQwordVariableToReg(x86_MM1, &RSP_Vect[RSPOpC.rd].UHW[4]);
-
-		if ((RSPOpC.rs & 0xF) >= 8) {
-			RSP_Element2Mmx(x86_MM2);
-			RSPMmxXorRegToReg(x86_MM0, x86_MM2);
-			RSPMmxXorRegToReg(x86_MM1, x86_MM2);
-		} else if ((RSPOpC.rs & 0xF) < 2) {
-
-			RSPMmxMoveQwordVariableToReg(x86_MM2, &RSP_Vect[RSPOpC.rt].HW[0]);
-
-			RSPMmxMoveQwordVariableToReg(x86_MM3, &RSP_Vect[RSPOpC.rt].HW[4]);
-
-			RSPMmxXorRegToReg(x86_MM0, x86_MM2);
-			RSPMmxXorRegToReg(x86_MM1, x86_MM3);
-		} else {
-			RSP_MultiElement2Mmx(x86_MM2, x86_MM3);
-			RSPMmxXorRegToReg(x86_MM0, x86_MM2);
-			RSPMmxXorRegToReg(x86_MM1, x86_MM3);
-		}
-
-
-		RSPMmxMoveQwordRegToVariable(x86_MM0, &RSP_Vect[RSPOpC.sa].UHW[0]);
-
-		RSPMmxMoveQwordRegToVariable(x86_MM1, &RSP_Vect[RSPOpC.sa].UHW[4]);
-	}
-
-	if (IsNextInstructionMmx(RSPCompilePC) == 0)
-		RSPMmxEmptyMultimediaState();
-
-	return 1;
-}
-
-void RSPCompile_Vector_VXOR ( void ) {
-	#ifdef RSPCompileVxor
-
-	uint32_t count;
-	int32_t bWriteToAccum = WriteToAccum(Low16BitAccum, RSPCompilePC);
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (!bWriteToAccum || ((RSPOpC.rs & 0xF) < 2 && RSPOpC.rd == RSPOpC.rt)) {
-		if (1 == RSPCompile_Vector_VXOR_MMX()) {
-			if (bWriteToAccum == 1) {
-				RSPXorX86RegToX86Reg(x86_EAX, x86_EAX);
-				for (count = 0; count < 8; count++) {
-
-					RSPMoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[count].HW[1]);
-				}
-			}
-			return;
-		}
-	}
-	#endif
-
-	RSPCheat_r4300iOpcodeNoMessage(RSP_Vector_VXOR);
-}
-
-void RSPCompile_Vector_VNXOR ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VNXOR);
-}
-
-void RSPCompile_Vector_VRCP ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VRCP);
-}
-
-void RSPCompile_Vector_VRCPL ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Vector_VRCPL);
-}
-
-void RSPCompile_Vector_VRCPH ( void ) {
-
-	int32_t count, el, last = -1;
-	int32_t bWriteToAccum = WriteToAccum(Low16BitAccum, RSPCompilePC);
-
-	#ifndef RSPCompileVrcph
-	RSPCheat_r4300iOpcode(RSP_Vector_VRCPH); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	el = EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)];
-
-	RSPMoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], x86_EDX);
-	RSPMoveX86regHalfToVariable(x86_EDX, &Recp.UHW[1]);
-
-	RSPMoveConstHalfToVariable(0, &Recp.UHW[0]);
-
-	RSPMoveVariableToX86regHalf(&RecpResult.UHW[1], x86_ECX);
-	el = 7 - (RSPOpC.rd & 0x7);
-
-	RSPMoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.sa].UHW[el]);
-
-	if (bWriteToAccum == 0) return;
-
-	for (count = 0; count < 8; count++) {
-		el = EleSpec[RSPOpC.rs].B[count];
-
-		if (el != last) {
-
-			RSPMoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], x86_EAX);
-			last = el;
-		}
-
-
-		RSPMoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[count].HW[1]);
-	}
-}
-
-void RSPCompile_Vector_VMOV ( void ) {
-
-	int32_t el;
-
-	#ifndef RSPCompileVmov
-	RSPCheat_r4300iOpcode(RSP_Vector_VMOV); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	el = EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)];
-
-
-	RSPMoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], x86_ECX);
-
-	el = 7 - (RSPOpC.rd & 0x7);
-
-
-	RSPMoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.sa].UHW[el]);
-}
-
-void RSPCompile_Vector_VRSQ ( void ) {
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-	RSPCheat_r4300iOpcodeNoMessage(RSP_Vector_VRSQ);
-}
-
-void RSPCompile_Vector_VRSQL ( void ) {
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-	RSPCheat_r4300iOpcodeNoMessage(RSP_Vector_VRSQL);
-}
-
-void RSPCompile_Vector_VRSQH ( void ) {
-
-	int32_t count, el;
-
-	#ifndef RSPCompileVrsqh
-	RSPCheat_r4300iOpcode(RSP_Vector_VRSQH); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	el = EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)];
-
-	RSPMoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], x86_EDX);
-	RSPMoveX86regHalfToVariable(x86_EDX, &SQroot.UHW[1]);
-
-	RSPMoveVariableToX86regHalf(&SQrootResult.UHW[1], x86_ECX);
-	el = 7 - (RSPOpC.rd & 0x7);
-
-	RSPMoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.sa].UHW[el]);
-
-	for (count = 0; count < 8; count++) {
-		el = EleSpec[RSPOpC.rs].B[count];
-
-		RSPMoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], x86_EAX);
-
-
-		RSPMoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[count].HW[1]);
-	}
-}
-
-void RSPCompile_Vector_VNOOP ( void ) {
-
-}
-
-/************************** lc2 functions **************************/
-
-void RSPCompile_Opcode_LBV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_LBV);
-}
-
-void RSPCompile_Opcode_LSV ( void ) {
-
-	int32_t offset = (RSPOpC.voffset << 1);
-
-	if (RSPOpC.del > 14) {
-		rsp_UnknownOpcode();
-		return;
-	}
-
-	#ifndef RSPCompileLsv
-	RSPCheat_r4300iOpcode(RSP_Opcode_LSV); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + offset) & 0xfff;
-
-		if ((Addr & 1) != 0) {
-
-			RSPMoveVariableToX86regByte(DMEM + ((Addr + 0) ^ 3), x86_ECX);
-
-			RSPMoveVariableToX86regByte(DMEM + ((Addr + 1) ^ 3), x86_EDX);
-
-
-			RSPMoveX86regByteToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 0)]);
-
-			RSPMoveX86regByteToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 1)]);
-		} else {
-
-			RSPMoveVariableToX86regHalf(DMEM + (Addr ^ 2), x86_EDX);
-
-			RSPMoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 1)]);
-		}
-		return;
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (offset != 0) RSPAddConstToX86Reg(x86_EBX, offset);
-	RSPAndConstToX86Reg(x86_EBX, 0x0FFF);
-
-	if (Compiler.bAlignVector == 1) {
-		RSPXorConstToX86Reg(x86_EBX, 2);
-		RSPMoveN64MemToX86regHalf(x86_ECX, x86_EBX);
-
-		RSPMoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 1)]);
-	} else {
-		RSPLeaSourceAndOffset(x86_EAX, x86_EBX, 1);
-		RSPXorConstToX86Reg(x86_EBX, 3);
-		RSPXorConstToX86Reg(x86_EAX, 3);
-
-		RSPMoveN64MemToX86regByte(x86_ECX, x86_EBX);
-		RSPMoveN64MemToX86regByte(x86_EDX, x86_EAX);
-
-
-		RSPMoveX86regByteToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 0)]);
-
-
-		RSPMoveX86regByteToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 1)]);
-	}
-}
-
-void RSPCompile_Opcode_LLV ( void ) {
-
-	int32_t offset = (RSPOpC.voffset << 2);
-	uint8_t * Jump[2];
-
-	#ifndef RSPCompileLlv
-	RSPCheat_r4300iOpcode(RSP_Opcode_LLV); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if ((RSPOpC.del & 0x3) != 0) {
-		rsp_UnknownOpcode();
-		return;
-	}
-
- 	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + offset) & 0xfff;
-
-		if ((Addr & 3) != 0) {
-			//CompilerWarning("Unaligned LLV at constant address");
-			RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_LLV);
-			return;
-		}
-
-
-		RSPMoveVariableToX86reg(DMEM + Addr, x86_EAX);
-
-		RSPMoveX86regToVariable(x86_EAX, &RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 4]);
-		return;
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (offset != 0) RSPAddConstToX86Reg(x86_EBX, offset);
-
-	RSPTestConstToX86Reg(3, x86_EBX);
-	RSPJneLabel32( 0);
-	Jump[0] = RSPRecompPos - 4;
-
-	/*
-	 * Unaligned
-	 */
-	CompilerToggleBuffer();
-
-	CPU_Message(" Unaligned:");
-	*((uint32_t *)(Jump[0]))=(uint32_t)(RSPRecompPos - Jump[0] - 4);
-	RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_LLV);
-	RSPJmpLabel32( 0);
-	Jump[1] = RSPRecompPos - 4;
-
-	CompilerToggleBuffer();
-
-	/*
-	 * Aligned
-	 */
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-	RSPMoveN64MemToX86reg(x86_EAX, x86_EBX);
-	/* Because of byte swapping this swizzle works nicely */
-
-	RSPMoveX86regToVariable(x86_EAX, &RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 4]);
-
-	CPU_Message(" Done:");
-	*((uint32_t *)(Jump[1]))=(uint32_t)(RSPRecompPos - Jump[1] - 4);
-}
-
-void RSPCompile_Opcode_LDV ( void ) {
-
-	int32_t offset = (RSPOpC.voffset << 3);
-	uint8_t * Jump[2], * LoopEntry;
-	//RSPBreakPoint();
-
-	#ifndef RSPCompileLdv
-	RSPCheat_r4300iOpcode(RSP_Opcode_LDV); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	/* FIXME: Conker's hits this */
-	//if ((RSPOpC.del & 0x7) != 0) {
-	//	rsp_UnknownOpcode();
-	//	return;
-	//}
-
-	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + offset) & 0xfff;
-
-		if ((Addr & 3) != 0) {
-			CompilerWarning( RSPCompilePC);
-			RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_LDV);
-			return;
-		}
-
-
-		RSPMoveVariableToX86reg(DMEM + Addr + 0, x86_EAX);
-
-		RSPMoveVariableToX86reg(DMEM + Addr + 4, x86_ECX);
-
-
-		RSPMoveX86regToVariable(x86_EAX, &RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 4]);
-
-		RSPMoveX86regToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 8]);
-		return;
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (offset != 0) {
-		RSPAddConstToX86Reg(x86_EBX, offset);
-	}
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-	RSPTestConstToX86Reg(3, x86_EBX);
-	RSPJneLabel32( 0);
-	Jump[0] = RSPRecompPos - 4;
-
-	CompilerToggleBuffer();
-	CPU_Message(" Unaligned:");
-	RSPx86_SetBranch32b(Jump[0], RSPRecompPos);
-
-	RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rt].UB[15 - RSPOpC.del], x86_RDI);
-	RSPMoveConstToX86reg(8, x86_ECX);
-
-/* mov eax, ebx
- dec edi
- xor eax, 3h
- inc ebx
- mov dl, byte ptr [eax+Dmem]
- dec ecx
- mov byte ptr [edi+1], dl
- jne $Loop */
-
-	LoopEntry = RSPRecompPos;
-	CPU_Message(" Loop:");
-	RSPMoveX86RegToX86Reg(x86_EBX, x86_EAX);
-	RSPXorConstToX86Reg(x86_EAX, 3);
-	RSPMoveN64MemToX86regByte(x86_EDX, x86_EAX);
-	RSPMoveX86regByteToX86regPointer(x86_EDX, x86_EDI);
-	RSPIncX86reg(x86_EBX); /* address constant */
-	RSPDecX86reg(x86_RDI); /* vector pointer */
-	RSPDecX86reg(x86_ECX); /* counter */
-	RSPJneLabel8( 0);
-	RSPx86_SetBranch8b(RSPRecompPos - 1, LoopEntry);
-
-	RSPJmpLabel32( 0);
-	Jump[1] = RSPRecompPos - 4;
-	CompilerToggleBuffer();
-
-	RSPMoveN64MemToX86reg(x86_EAX, x86_EBX);
-	RSPMoveN64MemDispToX86reg(x86_ECX, x86_EBX, 4);
-
-	/* Because of byte swapping this swizzle works nicely */
-
-	RSPMoveX86regToVariable(x86_EAX, &RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 4]);
-
-	RSPMoveX86regToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 8]);
-
-	CPU_Message(" Done:");
-	RSPx86_SetBranch32b(Jump[1], RSPRecompPos);
-}
-
-void RSPCompile_Opcode_LQV ( void ) {
-
-	int32_t offset = (RSPOpC.voffset << 4);
-	uint8_t * Jump[2], * Jump3;
-
-	#ifndef RSPCompileLqv
-	RSPCheat_r4300iOpcode(RSP_Opcode_LQV); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.del != 0) {
-		rsp_UnknownOpcode();
-		return;
-	}
-
-	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + offset) & 0xfff;
-
-		if (Addr & 15) {
-			CompilerWarning( RSPCompilePC);
-			RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_LQV);
-			return;
-		}
-
-		/*
-		 * Aligned store
-		 */
-
-		if (IsSseEnabled == 0) {
-
-			RSPMoveVariableToX86reg(DMEM + Addr + 0, x86_EAX);
-
-			RSPMoveVariableToX86reg(DMEM + Addr + 4, x86_EBX);
-
-			RSPMoveVariableToX86reg(DMEM + Addr + 8, x86_ECX);
-
-			RSPMoveVariableToX86reg(DMEM + Addr + 12, x86_EDX);
-
-
-			RSPMoveX86regToVariable(x86_EAX, &RSP_Vect[RSPOpC.rt].B[12]);
-
-			RSPMoveX86regToVariable(x86_EBX, &RSP_Vect[RSPOpC.rt].B[8]);
-
-			RSPMoveX86regToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].B[4]);
-
-			RSPMoveX86regToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].B[0]);
-		} else {
-
-			RSPSseMoveUnalignedVariableToReg(DMEM + Addr, x86_XMM0);
-			RSPSseShuffleReg(x86_XMM0, x86_MM0, 0x1b);
-
-			RSPSseMoveAlignedRegToVariable(x86_XMM0, &RSP_Vect[RSPOpC.rt].B[0]);
-		}
-		return;
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (offset != 0) {
-		RSPAddConstToX86Reg(x86_EBX, offset);
-	}
-/*
-	//RSPBreakPoint();
-	RSPTestConstToX86Reg(15, x86_EBX);
-	RSPJeLabel32( 0);
-	Jump3 = RSPRecompPos - 4;
-
-	RSPBreakPoint();
-	RSPx86_SetBranch32b((uint32_t*)Jump3, (uint32_t*)RSPRecompPos);
-
-	RSPTestConstToX86Reg(15, x86_EBX);
-	RSPJneLabel32( 0);
-	Jump[0] = RSPRecompPos - 4;
-*/
-
-#define RSetJump32(Loc,JumpLoc) *(uint32_t *)(Loc)= (uint32_t)(((uint64_t)(JumpLoc)) - (((uint64_t)(Loc)) + 4));
-
-	RSPTestConstToX86Reg(15, x86_EBX);
-	RSPJeLabel32( 0);
-	Jump3 = RSPRecompPos - 4;
-//	RSPBreakPoint();
-	//Int3();
-	RSPJmpLabel32( 0);
-	Jump[0] = RSPRecompPos - 4;
-	RSPx86_SetBranch32b((uint32_t*)Jump3, (uint32_t*)RSPRecompPos);
-
- // 000000440000150E E9 15 EE FF FF jmp 0000004400000328
-	CompilerToggleBuffer();
-	CPU_Message(" Unaligned:");
-	//if(RSPRecompPos == 0x0000004400000328)
-		//Int3();
-//	RSPx86_SetBranch32b(Jump[0], RSPRecompPos);
-//void RSPx86_SetBranch32b(void * JumpByte, void * Destination) {
-//	*(uint32_t*)(JumpByte) = (uint32_t)((uint8_t*)Destination - (uint8_t*)((uint32_t*)JumpByte + 1));
-//}
-	//*(uint32_t*)(Jump[0]) = (uint32_t)((uint8_t*)RSPRecompPos - (uint8_t*)((Jump[0]) + 1));
-	RSetJump32(Jump[0], RSPRecompPos);
-
-	RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_LQV);
-	RSPJmpLabel32( 0);
-	Jump[1] = RSPRecompPos - 4;
-	CompilerToggleBuffer();
-
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-	if (IsSseEnabled == 0) {
-		RSPMoveN64MemDispToX86reg(x86_EAX, x86_EBX, 0);
-		RSPMoveN64MemDispToX86reg(x86_ECX, x86_EBX, 4);
-		RSPMoveN64MemDispToX86reg(x86_EDX, x86_EBX, 8);
-		RSPMoveN64MemDispToX86reg(x86_EDI, x86_EBX, 12);
-
-
-		RSPMoveX86regToVariable(x86_EAX, &RSP_Vect[RSPOpC.rt].B[12]);
-
-		RSPMoveX86regToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].B[8]);
-
-		RSPMoveX86regToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].B[4]);
-
-		RSPMoveX86regToVariable(x86_EDI, &RSP_Vect[RSPOpC.rt].B[0]);
-	} else {
-		RSPSseMoveUnalignedN64MemToReg(x86_XMM0, x86_EBX);
-		RSPSseShuffleReg(x86_XMM0, x86_MM0, 0x1b);
-
-		RSPSseMoveAlignedRegToVariable(x86_XMM0, &RSP_Vect[RSPOpC.rt].B[0]);
-	}
-	CPU_Message(" Done:");
-	RSPx86_SetBranch32b((uint32_t*)Jump[1], (uint32_t*)RSPRecompPos);
-}
-
-void RSPCompile_Opcode_LRV ( void ) {
-	int32_t offset = (RSPOpC.voffset << 4);
-	uint8_t * Loop, * Jump[2];
-
-	#ifndef RSPCompileLrv
-	RSPCheat_r4300iOpcode(RSP_Opcode_LRV); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.del != 0) {
-		rsp_UnknownOpcode();
-		return;
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (offset != 0) RSPAddConstToX86Reg(x86_EBX, offset);
-
-	if (Compiler.bAlignVector == 0) {
-		RSPTestConstToX86Reg(1, x86_EBX);
-		RSPJneLabel32( 0);
-		Jump[0] = RSPRecompPos - 4;
-
-		/* Unaligned */
-		CompilerToggleBuffer();
-
-		CPU_Message(" Unaligned:");
-		RSPx86_SetBranch32b(Jump[0], RSPRecompPos);
-
-		RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_LRV);
-		RSPJmpLabel32( 0);
-		Jump[1] = RSPRecompPos - 4;
-
-		CompilerToggleBuffer();
-	}
-
-//	RSPBreakPoint();
-
-	/* Aligned */
-	RSPMoveX86RegToX86Reg(x86_EBX, x86_EAX);
-	RSPAndConstToX86Reg(x86_EAX, 0x0F);
-	RSPAndConstToX86Reg(x86_EBX, 0x0ff0);
-
-	RSPMoveX86RegToX86Reg(x86_EAX, x86_ECX);
-	RSPShiftRightUnsignImmed(x86_ECX, 1);
-
-	RSPJeLabel8( 0);
-	Jump[0] = RSPRecompPos - 1;
-/*
-	RSPDecX86reg(x86_EAX);
-	RSPLeaSourceAndOffset(x86_EAX, x86_EAX, (uint32_t) &RSP_Vect[RSPOpC.rt].B[0]);
-	RSPDecX86reg(x86_EAX);
-*/
-
-//	RSPBreakPoint();
-//Int3();
-	RSPAddQwordToX86Reg(x86_RAX, ((uintptr_t)&RSP_Vect[RSPOpC.rt].UB[0]) - 2);
-
-	CPU_Message(" Loop:");
-	Loop = RSPRecompPos;
-
-	RSPMoveX86RegToX86Reg(x86_EBX, x86_ESI);
-	RSPXorConstToX86Reg(x86_ESI, 2);
-	RSPMoveN64MemToX86regHalf(x86_EDX, x86_ESI);
-	RSPMoveX86regHalfToX86regPointer(x86_EDX, x86_RAX);
-
-	RSPAddConstToX86Reg(x86_EBX, 2);	/* Dmem pointer	*/
-	RSPSubConstFromX86Reg(x86_RAX, 2);	/* Vector pointer */
-	RSPDecX86reg(x86_ECX);				/* Loop counter	*/
-	RSPJneLabel8( 0);
-	RSPx86_SetBranch8b(RSPRecompPos - 1, Loop);
-
-	if (Compiler.bAlignVector == 0) {
-		CPU_Message(" Done:");
-		RSPx86_SetBranch32b((uint32_t*)Jump[1], (uint32_t*)RSPRecompPos);
-	}
-
-	RSPx86_SetBranch8b(Jump[0], RSPRecompPos);
-}
-
-void RSPCompile_Opcode_LPV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_LPV);
-}
-
-void RSPCompile_Opcode_LUV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_LUV);
-}
-
-
-void RSPCompile_Opcode_LHV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_LHV);
-}
-
-
-void RSPCompile_Opcode_LFV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_LFV);
-}
-
-void RSPCompile_Opcode_LTV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_LTV);
-}
-
-/************************** sc2 functions **************************/
-
-void RSPCompile_Opcode_SBV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_SBV);
-}
-
-void RSPCompile_Opcode_SSV ( void ) {
-
-	int32_t offset = (RSPOpC.voffset << 1);
-
-	if (RSPOpC.del > 14) {
-		rsp_UnknownOpcode();
-		return;
-	}
-
-	#ifndef RSPCompileSsv
-	RSPCheat_r4300iOpcode(RSP_Opcode_SSV); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + offset) & 0xfff;
-
-		if ((Addr & 1) != 0) {
-
-			RSPMoveVariableToX86regByte(&RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 0)], x86_ECX);
-
-			RSPMoveVariableToX86regByte(&RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 1)], x86_EDX);
-
-
-			RSPMoveX86regByteToVariable(x86_ECX, DMEM + ((Addr + 0) ^ 3));
-
-			RSPMoveX86regByteToVariable(x86_EDX, DMEM + ((Addr + 1) ^ 3));
-		} else {
-
-			RSPMoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 1)], x86_ECX);
-
-			RSPMoveX86regHalfToVariable(x86_ECX, DMEM + (Addr ^ 2));
-		}
-		return;
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (offset != 0) RSPAddConstToX86Reg(x86_EBX, offset);
-	RSPAndConstToX86Reg(x86_EBX, 0x0FFF);
-
-	if (Compiler.bAlignVector == 1) {
-
-		RSPMoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 1)], x86_ECX);
-		RSPXorConstToX86Reg(x86_EBX, 2);
-		RSPMoveX86regHalfToN64Mem(x86_ECX, x86_EBX);
-	} else {
-		RSPLeaSourceAndOffset(x86_EAX, x86_EBX, 1);
-		RSPXorConstToX86Reg(x86_EBX, 3);
-		RSPXorConstToX86Reg(x86_EAX, 3);
-
-
-		RSPMoveVariableToX86regByte(&RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 0)], x86_ECX);
-
-		RSPMoveVariableToX86regByte(&RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 1)], x86_EDX);
-
-		RSPMoveX86regByteToN64Mem(x86_ECX, x86_EBX);
-		RSPMoveX86regByteToN64Mem(x86_EDX, x86_EAX);
-	}
-}
-
-void RSPCompile_Opcode_SLV ( void ) {
-
-	int32_t offset = (RSPOpC.voffset << 2);
-	uint8_t * Jump[2];
-
-	#ifndef RSPCompileSlv
-	RSPCheat_r4300iOpcode(RSP_Opcode_SLV); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-//	if ((RSPOpC.del & 0x3) != 0) {
-//		rsp_UnknownOpcode();
-//		return;
-//	}
-
- 	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + offset) & 0xfff;
-
-		if ((Addr & 3) != 0) {
-			//CompilerWarning("Unaligned SLV at constant address");
-			RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_SLV);
-			return;
-		}
-
-
-		RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 4], x86_EAX);
-
-		RSPMoveX86regToVariable(x86_EAX, DMEM + Addr);
-		return;
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (offset != 0) RSPAddConstToX86Reg(x86_EBX, offset);
-
-	RSPTestConstToX86Reg(3, x86_EBX);
-	RSPJneLabel32( 0);
-	Jump[0] = RSPRecompPos - 4;
-
-	/*
-	 * Unaligned
-	 */
-	CompilerToggleBuffer();
-
-	CPU_Message(" Unaligned:");
-	*((uint32_t *)(Jump[0]))=(uint32_t)(RSPRecompPos - Jump[0] - 4);
-	RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_SLV);
-	RSPJmpLabel32( 0);
-	Jump[1] = RSPRecompPos - 4;
-
-	CompilerToggleBuffer();
-
-	/*
-	 * Aligned
-	 */
-
-	/* Because of byte swapping this swizzle works nicely */
-
-	RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 4], x86_EAX);
-
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-	RSPMoveX86regToN64Mem(x86_EAX, x86_EBX);
-
-	CPU_Message(" Done:");
-	*((uint32_t *)(Jump[1]))=(uint32_t)(RSPRecompPos - Jump[1] - 4);
-}
-
-void RSPCompile_Opcode_SDV ( void ) {
-
-	int32_t offset = (RSPOpC.voffset << 3);
-	uint8_t * Jump[2], * LoopEntry;
-
-	//if ((RSPOpC.del & 0x7) != 0) {
-	//	rsp_UnknownOpcode();
-	//	return;
-	//}
-
-	#ifndef RSPCompileSdv
-	RSPCheat_r4300iOpcode(RSP_Opcode_SDV); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + offset) & 0xfff;
-
-		if ((Addr & 3) != 0) {
-			CompilerWarning( RSPCompilePC);
-			RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_SDV);
-			return;
-		}
-
-
-		RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 4], x86_EAX);
-
-		RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 8], x86_EBX);
-
-
-		RSPMoveX86regToVariable(x86_EAX, DMEM + Addr);
-
-		RSPMoveX86regToVariable(x86_EBX, DMEM + Addr + 4);
-		return;
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (offset != 0) {
-		RSPAddConstToX86Reg(x86_EBX, offset);
-	}
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-	RSPTestConstToX86Reg(3, x86_EBX);
-	RSPJneLabel32( 0);
-	Jump[0] = RSPRecompPos - 4;
-
-	CompilerToggleBuffer();
-	CPU_Message(" Unaligned:");
-	RSPx86_SetBranch32b((uint32_t*)Jump[0], (uint32_t*)RSPRecompPos);
-
-
-	RSPMoveConstQwordToX86reg((uintptr_t)&RSP_Vect[RSPOpC.rt].UB[15 - RSPOpC.del], x86_RDI);
-	RSPMoveConstToX86reg(8, x86_ECX);
-
-	CPU_Message(" Loop:");
-	LoopEntry = RSPRecompPos;
-	RSPMoveX86RegToX86Reg(x86_EBX, x86_EAX);
-	RSPXorConstToX86Reg(x86_EAX, 3);
-	RSPMoveX86regPointerToX86regByte(x86_EDX, x86_EDI);
-	RSPMoveX86regByteToN64Mem(x86_EDX, x86_EAX);
-	RSPIncX86reg(x86_EBX); /* address constant */
-	RSPDecX86reg(x86_RDI); /* vector pointer */
-	RSPDecX86reg(x86_ECX); /* counter */
-	RSPJneLabel8( 0);
-	RSPx86_SetBranch8b(RSPRecompPos - 1, LoopEntry);
-
-	RSPJmpLabel32( 0);
-	Jump[1] = RSPRecompPos - 4;
-	CompilerToggleBuffer();
-
-
-	RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 4], x86_EAX);
-
-	RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 8], x86_ECX);
-	RSPMoveX86regToN64Mem(x86_EAX, x86_EBX);
-	RSPMoveX86regToN64MemDisp(x86_ECX, x86_EBX, 4);
-
-	CPU_Message(" Done:");
-	RSPx86_SetBranch32b((uint32_t*)Jump[1], (uint32_t*)RSPRecompPos);
-}
-
-void RSPCompile_Opcode_SQV ( void ) {
-
-	int32_t offset = (RSPOpC.voffset << 4);
-	uint8_t * Jump[2];
-
-	#ifndef RSPCompileSqv
- 	RSPCheat_r4300iOpcode(RSP_Opcode_SQV); return;
-	#endif
-
-	CPU_Message(RSPCompilePC,RSPOpcodeName(RSPOpC.Hex,RSPCompilePC));
-
-	if (RSPOpC.del != 0) {
-		rsp_UnknownOpcode();
-		return;
-	}
-
-	if (IsRegConst(RSPOpC.base) == 1) {
-		uint32_t Addr = (MipsRegConst(RSPOpC.base) + offset) & 0xfff;
-
-		if (Addr & 15) {
-			CompilerWarning( RSPCompilePC);
-			RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_SQV);
-			return;
-		}
-
-		/*
-		 * Aligned store
-		 */
-
-		if (IsSseEnabled == 0) {
-
-			RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[12], x86_EAX);
-
-			RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[8], x86_EBX);
-
-			RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[4], x86_ECX);
-
-			RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[0], x86_EDX);
-
-
-			RSPMoveX86regToVariable(x86_EAX, DMEM + Addr + 0);
-
-			RSPMoveX86regToVariable(x86_EBX, DMEM + Addr + 4);
-
-			RSPMoveX86regToVariable(x86_ECX, DMEM + Addr + 8);
-
-			RSPMoveX86regToVariable(x86_EDX, DMEM + Addr + 12);
-		} else {
-
-			RSPSseMoveAlignedVariableToReg(&RSP_Vect[RSPOpC.rt].B[0], x86_XMM0);
-			RSPSseShuffleReg(x86_XMM0, x86_MM0, 0x1b);
-
-			RSPSseMoveUnalignedRegToVariable(x86_XMM0, DMEM + Addr);
-		}
-		return;
-	}
-
-	RSPMoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, x86_EBX);
-	if (offset != 0) {
-		RSPAddConstToX86Reg(x86_EBX, offset);
-	}
-	RSPTestConstToX86Reg(15, x86_EBX);
-	RSPJneLabel32( 0);
-	Jump[0] = RSPRecompPos - 4;
-
-	CompilerToggleBuffer();
-	CPU_Message(" Unaligned:");
-	RSPx86_SetBranch32b((uint32_t*)Jump[0], (uint32_t*)RSPRecompPos);
-	RSPCheat_r4300iOpcodeNoMessage(RSP_Opcode_SQV);
-	RSPJmpLabel32( 0);
-	Jump[1] = RSPRecompPos - 4;
-	CompilerToggleBuffer();
-
-	RSPAndConstToX86Reg(x86_EBX, 0x0fff);
-	if (IsSseEnabled == 0) {
-
-		RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[12], x86_EAX);
-
-		RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[8], x86_ECX);
-
-		RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[4], x86_EDX);
-
-		RSPMoveVariableToX86reg(&RSP_Vect[RSPOpC.rt].B[0], x86_EDI);
-
-		RSPMoveX86regToN64MemDisp(x86_EAX, x86_EBX, 0);
-		RSPMoveX86regToN64MemDisp(x86_ECX, x86_EBX, 4);
-		RSPMoveX86regToN64MemDisp(x86_EDX, x86_EBX, 8);
-		RSPMoveX86regToN64MemDisp(x86_EDI, x86_EBX, 12);
-	} else {
-
-		RSPSseMoveAlignedVariableToReg(&RSP_Vect[RSPOpC.rt].B[0], x86_XMM0);
-		RSPSseShuffleReg(x86_XMM0, x86_MM0, 0x1b);
-		RSPSseMoveUnalignedRegToN64Mem(x86_XMM0, x86_EBX);
-	}
-	CPU_Message(" Done:");
-	RSPx86_SetBranch32b((uint32_t*)Jump[1], (uint32_t*)RSPRecompPos);
-}
-
-void RSPCompile_Opcode_SRV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_SRV);
-}
-
-void RSPCompile_Opcode_SPV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_SPV);
-}
-
-void RSPCompile_Opcode_SUV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_SUV);
-}
-
-void RSPCompile_Opcode_SHV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_SHV);
-}
-
-void RSPCompile_Opcode_SFV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_SFV);
-}
-
-void RSPCompile_Opcode_STV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_STV);
-}
-
-void RSPCompile_Opcode_SWV ( void ) {
-	RSPCheat_r4300iOpcode(RSP_Opcode_SWV);
-}
-
-/************************** Other functions **************************/
-
-void RSPCompile_UnknownOpcode (void) {
-	CPU_Message(RSPCompilePC, RSPOpcodeName(RSPOpC.Hex,RSPCompilePC) );
-	RSPNextInstruction = FINISH_BLOCK;
-	RSPMoveConstToVariable(RSPCompilePC,PrgCount);
-	RSPMoveConstToVariable(RSPOpC.Hex,&RSPOpC.Hex);
-	RSPCall_Direct(rsp_UnknownOpcode );
-	RSPRet();
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp_recompiler_ops.h Deleted

@@ -1,158 +0,0 @@
-/*
- * RSP Compiler plug in for Project 64 (A Nintendo 64 emulator).
- *
- * (c) Copyright 2001 jabo (jabo@emulation64.com) and
- * zilmar (zilmar@emulation64.com)
- *
- * pj64 homepage: www.pj64.net
- * 
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-/************************* OpCode functions *************************/
-void RSPCompile_SPECIAL       ( void );
-void RSPCompile_REGIMM        ( void );
-void RSPCompile_J             ( void );
-void RSPCompile_JAL           ( void );
-void RSPCompile_BEQ           ( void );
-void RSPCompile_BNE           ( void );
-void RSPCompile_BLEZ          ( void );
-void RSPCompile_BGTZ          ( void );
-void RSPCompile_ADDI          ( void );
-void RSPCompile_ADDIU         ( void );
-void RSPCompile_SLTI          ( void );
-void RSPCompile_SLTIU         ( void );
-void RSPCompile_ANDI          ( void );
-void RSPCompile_ORI           ( void );
-void RSPCompile_XORI          ( void );
-void RSPCompile_LUI           ( void );
-void RSPCompile_COP0          ( void );
-void RSPCompile_COP2          ( void );
-void RSPCompile_LB            ( void );
-void RSPCompile_LH            ( void );
-void RSPCompile_LW            ( void );
-void RSPCompile_LBU           ( void );
-void RSPCompile_LHU           ( void );
-void RSPCompile_SB            ( void );
-void RSPCompile_SH            ( void );
-void RSPCompile_SW            ( void );
-void RSPCompile_LC2           ( void );
-void RSPCompile_SC2           ( void );
-/********************** R4300i OpCodes: Special **********************/
-void RSPCompile_Special_SLL   ( void );
-void RSPCompile_Special_SRL   ( void );
-void RSPCompile_Special_SRA   ( void );
-void RSPCompile_Special_SLLV  ( void );
-void RSPCompile_Special_SRLV  ( void );
-void RSPCompile_Special_SRAV  ( void );
-void RSPCompile_Special_JR    ( void );
-void RSPCompile_Special_JALR  ( void );
-void RSPCompile_Special_BREAK ( void );
-void RSPCompile_Special_ADD   ( void );
-void RSPCompile_Special_ADDU  ( void );
-void RSPCompile_Special_SUB   ( void );
-void RSPCompile_Special_SUBU  ( void );
-void RSPCompile_Special_AND   ( void );
-void RSPCompile_Special_OR    ( void );
-void RSPCompile_Special_XOR   ( void );
-void RSPCompile_Special_NOR   ( void );
-void RSPCompile_Special_SLT   ( void );
-void RSPCompile_Special_SLTU  ( void );
-/********************** R4300i OpCodes: RegImm **********************/
-void RSPCompile_RegImm_BLTZ   ( void );
-void RSPCompile_RegImm_BGEZ   ( void );
-void RSPCompile_RegImm_BLTZAL ( void );
-void RSPCompile_RegImm_BGEZAL ( void );
-/************************** Cop0 functions *************************/
-void RSPCompile_Cop0_MF       ( void );
-void RSPCompile_Cop0_MT       ( void );
-/************************** Cop2 functions *************************/
-void RSPCompile_Cop2_MF       ( void );
-void RSPCompile_Cop2_CF       ( void );
-void RSPCompile_Cop2_MT       ( void );
-void RSPCompile_Cop2_CT       ( void );
-void RSPCompile_COP2_VECTOR  ( void );
-/************************** Vect functions **************************/
-void RSPCompile_Vector_VMULF  ( void );
-void RSPCompile_Vector_VMULU  ( void );
-void RSPCompile_Vector_VMUDL  ( void );
-void RSPCompile_Vector_VMUDM  ( void );
-void RSPCompile_Vector_VMUDN  ( void );
-void RSPCompile_Vector_VMUDH  ( void );
-void RSPCompile_Vector_VMACF  ( void );
-void RSPCompile_Vector_VMACU  ( void );
-void RSPCompile_Vector_VMACQ  ( void );
-void RSPCompile_Vector_VMADL  ( void );
-void RSPCompile_Vector_VMADM  ( void );
-void RSPCompile_Vector_VMADN  ( void );
-void RSPCompile_Vector_VMADH  ( void );
-void RSPCompile_Vector_VADD   ( void );
-void RSPCompile_Vector_VSUB   ( void );
-void RSPCompile_Vector_VABS   ( void );
-void RSPCompile_Vector_VADDC  ( void );
-void RSPCompile_Vector_VSUBC  ( void );
-void RSPCompile_Vector_VSAW   ( void );
-void RSPCompile_Vector_VLT    ( void );
-void RSPCompile_Vector_VEQ    ( void );
-void RSPCompile_Vector_VNE    ( void );
-void RSPCompile_Vector_VGE    ( void );
-void RSPCompile_Vector_VCL    ( void );
-void RSPCompile_Vector_VCH    ( void );
-void RSPCompile_Vector_VCR    ( void );
-void RSPCompile_Vector_VMRG   ( void );
-void RSPCompile_Vector_VAND   ( void );
-void RSPCompile_Vector_VNAND  ( void );
-void RSPCompile_Vector_VOR    ( void );
-void RSPCompile_Vector_VNOR   ( void );
-void RSPCompile_Vector_VXOR   ( void );
-void RSPCompile_Vector_VNXOR  ( void );
-void RSPCompile_Vector_VRCP   ( void );
-void RSPCompile_Vector_VRCPL  ( void );
-void RSPCompile_Vector_VRCPH  ( void );
-void RSPCompile_Vector_VMOV   ( void );
-void RSPCompile_Vector_VRSQ   ( void );
-void RSPCompile_Vector_VRSQL  ( void );
-void RSPCompile_Vector_VRSQH  ( void );
-void RSPCompile_Vector_VNOOP  ( void );
-/************************** lc2 functions **************************/
-void RSPCompile_Opcode_LBV    ( void );
-void RSPCompile_Opcode_LSV    ( void );
-void RSPCompile_Opcode_LLV    ( void );
-void RSPCompile_Opcode_LDV    ( void );
-void RSPCompile_Opcode_LQV    ( void );
-void RSPCompile_Opcode_LRV    ( void );
-void RSPCompile_Opcode_LPV    ( void );
-void RSPCompile_Opcode_LUV    ( void );
-void RSPCompile_Opcode_LHV    ( void );
-void RSPCompile_Opcode_LFV    ( void );
-void RSPCompile_Opcode_LTV    ( void );
-/************************** sc2 functions **************************/
-void RSPCompile_Opcode_SBV    ( void );
-void RSPCompile_Opcode_SSV    ( void );
-void RSPCompile_Opcode_SLV    ( void );
-void RSPCompile_Opcode_SDV    ( void );
-void RSPCompile_Opcode_SQV    ( void );
-void RSPCompile_Opcode_SRV    ( void );
-void RSPCompile_Opcode_SPV    ( void );
-void RSPCompile_Opcode_SUV    ( void );
-void RSPCompile_Opcode_SHV    ( void );
-void RSPCompile_Opcode_SFV    ( void );
-void RSPCompile_Opcode_SWV    ( void );
-void RSPCompile_Opcode_STV    ( void );
-/************************** Other functions **************************/
-void RSPCompile_UnknownOpcode (void);

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp_registers.h Deleted

@@ -1,149 +0,0 @@
-/*
- * RSP Compiler plug in for Project 64 (A Nintendo 64 emulator).
- *
- * (c) Copyright 2001 jabo (jabo@emulation64.com) and
- * zilmar (zilmar@emulation64.com)
- *
- * pj64 homepage: www.pj64.net
- * 
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include "types.h"
-
-#define SP_STATUS_HALT			0x001		/* Bit  0: halt */
-#define SP_STATUS_BROKE			0x002		/* Bit  1: broke */
-#define SP_STATUS_DMA_BUSY		0x004		/* Bit  2: dma busy */
-#define SP_STATUS_DMA_FULL		0x008		/* Bit  3: dma full */
-#define SP_STATUS_IO_FULL		0x010		/* Bit  4: io full */
-#define SP_STATUS_SSTEP			0x020		/* Bit  5: single step */
-#define SP_STATUS_INTR_BREAK	0x040		/* Bit  6: interrupt on break */
-#define SP_STATUS_SIG0			0x080		/* Bit  7: signal 0 set */
-#define SP_STATUS_SIG1			0x100		/* Bit  8: signal 1 set */
-#define SP_STATUS_SIG2			0x200		/* Bit  9: signal 2 set */
-#define SP_STATUS_SIG3			0x400		/* Bit 10: signal 3 set */
-#define SP_STATUS_SIG4			0x800		/* Bit 11: signal 4 set */
-#define SP_STATUS_SIG5	       0x1000		/* Bit 12: signal 5 set */
-#define SP_STATUS_SIG6	       0x2000		/* Bit 13: signal 6 set */
-#define SP_STATUS_SIG7	       0x4000		/* Bit 14: signal 7 set */
-
-#define SP_CLR_HALT				0x00001	    /* Bit  0: clear halt */
-#define SP_SET_HALT				0x00002	    /* Bit  1: set halt */
-#define SP_CLR_BROKE			0x00004	    /* Bit  2: clear broke */
-#define SP_CLR_INTR				0x00008	    /* Bit  3: clear intr */
-#define SP_SET_INTR				0x00010	    /* Bit  4: set intr */
-#define SP_CLR_SSTEP			0x00020	    /* Bit  5: clear sstep */
-#define SP_SET_SSTEP			0x00040	    /* Bit  6: set sstep */
-#define SP_CLR_INTR_BREAK		0x00080	    /* Bit  7: clear intr on break */
-#define SP_SET_INTR_BREAK		0x00100	    /* Bit  8: set intr on break */
-#define SP_CLR_SIG0				0x00200	    /* Bit  9: clear signal 0 */
-#define SP_SET_SIG0				0x00400	    /* Bit 10: set signal 0 */
-#define SP_CLR_SIG1				0x00800	    /* Bit 11: clear signal 1 */
-#define SP_SET_SIG1				0x01000	    /* Bit 12: set signal 1 */
-#define SP_CLR_SIG2				0x02000	    /* Bit 13: clear signal 2 */
-#define SP_SET_SIG2				0x04000	    /* Bit 14: set signal 2 */
-#define SP_CLR_SIG3				0x08000	    /* Bit 15: clear signal 3 */
-#define SP_SET_SIG3				0x10000	    /* Bit 16: set signal 3 */
-#define SP_CLR_SIG4				0x20000	    /* Bit 17: clear signal 4 */
-#define SP_SET_SIG4				0x40000	    /* Bit 18: set signal 4 */
-#define SP_CLR_SIG5				0x80000	    /* Bit 19: clear signal 5 */
-#define SP_SET_SIG5				0x100000	/* Bit 20: set signal 5 */
-#define SP_CLR_SIG6				0x200000	/* Bit 21: clear signal 6 */
-#define SP_SET_SIG6				0x400000	/* Bit 22: set signal 6 */
-#define SP_CLR_SIG7				0x800000	/* Bit 23: clear signal 7 */
-#define SP_SET_SIG7				0x1000000   /* Bit 24: set signal 7 */
-
-#define DPC_CLR_XBUS_DMEM_DMA	0x0001		/* Bit 0: clear xbus_dmem_dma */
-#define DPC_SET_XBUS_DMEM_DMA	0x0002		/* Bit 1: set xbus_dmem_dma */
-#define DPC_CLR_FREEZE			0x0004		/* Bit 2: clear freeze */
-#define DPC_SET_FREEZE			0x0008		/* Bit 3: set freeze */
-#define DPC_CLR_FLUSH			0x0010		/* Bit 4: clear flush */
-#define DPC_SET_FLUSH			0x0020		/* Bit 5: set flush */
-#define DPC_CLR_TMEM_CTR		0x0040		/* Bit 6: clear tmem ctr */
-#define DPC_CLR_PIPE_CTR		0x0080		/* Bit 7: clear pipe ctr */
-#define DPC_CLR_CMD_CTR			0x0100		/* Bit 8: clear cmd ctr */
-#define DPC_CLR_CLOCK_CTR		0x0200		/* Bit 9: clear clock ctr */
-
-#define DPC_STATUS_XBUS_DMEM_DMA	0x001	/* Bit  0: xbus_dmem_dma */
-#define DPC_STATUS_FREEZE			0x002	/* Bit  1: freeze */
-#define DPC_STATUS_FLUSH			0x004	/* Bit  2: flush */
-#define DPC_STATUS_START_GCLK		0x008	/* Bit  3: start gclk */
-#define DPC_STATUS_TMEM_BUSY		0x010	/* Bit  4: tmem busy */
-#define DPC_STATUS_PIPE_BUSY		0x020	/* Bit  5: pipe busy */
-#define DPC_STATUS_CMD_BUSY			0x040	/* Bit  6: cmd busy */
-#define DPC_STATUS_CBUF_READY		0x080	/* Bit  7: cbuf ready */
-#define DPC_STATUS_DMA_BUSY			0x100	/* Bit  8: dma busy */
-#define DPC_STATUS_END_VALID		0x200	/* Bit  9: end valid */
-#define DPC_STATUS_START_VALID		0x400	/* Bit 10: start valid */
-
-#define R4300i_SP_Intr			0x1
-
-extern char * x86_Strings[8];
-extern char * GPR_Strings[32];
-
-#define x86_Name(Reg) (x86_Strings[(Reg)])
-#define GPR_Name(Reg) (GPR_Strings[(Reg)])
-
-/*
-#define GPR_Name(Reg)\
-	(Reg) == 0  ? "R0" : (Reg) == 1  ? "AT" : (Reg) == 2  ? "V0" : (Reg) == 3  ? "V1" :\
-	(Reg) == 4  ? "A0" : (Reg) == 5  ? "A1" : (Reg) == 6  ? "A2" : (Reg) == 7  ? "A3" :\
-	(Reg) == 8  ? "T0" : (Reg) == 9  ? "T1" : (Reg) == 10 ? "T2" : (Reg) == 11 ? "T3" :\
-	(Reg) == 12 ? "T4" : (Reg) == 13 ? "T5" : (Reg) == 14 ? "T6" : (Reg) == 15 ? "T7" :\
-	(Reg) == 16 ? "S0" : (Reg) == 17 ? "S1" : (Reg) == 18 ? "S2" : (Reg) == 19 ? "S3" :\
-	(Reg) == 20 ? "S4" : (Reg) == 21 ? "S5" : (Reg) == 22 ? "S6" : (Reg) == 23 ? "S7" :\
-	(Reg) == 24 ? "T8" : (Reg) == 25 ? "T9" : (Reg) == 26 ? "K0" : (Reg) == 27 ? "K1" :\
-	(Reg) == 28 ? "GP" : (Reg) == 29 ? "SP" : (Reg) == 30 ? "S8" :\
-	(Reg) == 31 ? "RA" : "Unknown Register"
-*/
-
-#define COP0_Name(Reg)\
-	(Reg) == 0  ? "SP memory address" :\
-	(Reg) == 1  ? "SP DRAM DMA address" :\
-	(Reg) == 2  ? "SP read DMA length" :\
-	(Reg) == 3  ? "SP write DMA length" :\
-	(Reg) == 4  ? "SP status" :\
-	(Reg) == 5  ? "SP DMA full" :\
-	(Reg) == 6  ? "SP DMA busy" :\
-	(Reg) == 7  ? "SP semaphore" :\
-	(Reg) == 8  ? "DP CMD DMA start" :\
-	(Reg) == 9  ? "DP CMD DMA end" :\
-	(Reg) == 10 ? "DP CMD DMA current" :\
-	(Reg) == 11 ? "DP CMD status" :\
-	(Reg) == 12 ? "DP clock counter" :\
-	(Reg) == 13 ? "DP buffer busy counter" :\
-	(Reg) == 14 ? "DP pipe busy counter" :\
-	(Reg) == 15 ? "DP TMEM load counter" :\
-	"Unknown Register"
-
-#define ElementSpecifier(Elem)\
-	(Elem) == 0  ? "" : (Elem) == 1  ? "" : (Elem) == 2  ? " [0q]" :\
-	(Elem) == 3  ? " [1q]" : (Elem) == 4  ? " [0h]" : (Elem) == 5  ? " [1h]" :\
-    (Elem) == 6  ? " [2h]" : (Elem) == 7  ? " [3h]" : (Elem) == 8  ? " [0]" :\
-	(Elem) == 9  ? " [1]" : (Elem) == 10 ? " [2]" : (Elem) == 11 ? " [3]" :\
-	(Elem) == 12 ? " [4]" : (Elem) == 13 ? " [5]" : (Elem) == 14 ? " [6]" :\
-	(Elem) == 15 ? " [7]" : "Unknown Element"
-
-void InitilizeRSPRegisters (void);
-
-/*** RSP Registers ***/
-extern MIPSUWORD   RSP_GPR[32], RSP_Flags[4];
-extern MIPSUDWORD  RSP_ACCUM[8];
-extern VECTOR  RSP_Vect[32];
-
-

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp_sse.c Deleted

@@ -1,84 +0,0 @@
-/*
- * RSP Compiler plug in for Project 64 (A Nintendo 64 emulator).
- *
- * (c) Copyright 2001 jabo (jabo@emulation64.com) and
- * zilmar (zilmar@emulation64.com)
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include "types.h"
-#include "rsp.h"
-#include "rsp_x86.h"
-#include "recompiler_cpu.h"
-#include "memory.h"
-#include "types.h"
-
-extern uint8_t * DMEM;
-
-#define PUTDST8(dest,value)  (*((uint8_t *)(dest))=(uint8_t)(value)); dest += 1;
-#define PUTDST16(dest,value) (*((uint16_t *)(dest))=(uint16_t)(value)); dest += 2;
-#define PUTDST32(dest,value) (*((uint32_t *)(dest))=(uint32_t)(value)); dest += 4;
-#define PUTDST64(dest,value) {(*((uint64_t *)(dest))=(uint64_t)(value)); dest += 8;}
-
-void RSPSseMoveAlignedVariableToReg(void * Variable, int32_t sseReg) {
-    OPCODE_REG_VARIABLE(,16,0x100F,sseReg,Variable);
-}
-
-void RSPSseMoveAlignedN64MemToReg(int32_t sseReg, int32_t AddrReg) {
-    OPCODE_REG_ADDR_DMEM(,16,0x100F,sseReg,AddrReg);
-}
-
-void RSPSseMoveAlignedRegToVariable(int32_t sseReg, void *Variable) {
-    OPCODE_REG_VARIABLE(,16,0x110f,sseReg,Variable); //290F
-}
-
-void RSPSseMoveAlignedRegToN64Mem(int32_t sseReg, int32_t AddrReg) {
-	OPCODE_REG_ADDR_DMEM(,16,0x110f,sseReg,AddrReg); //290F
-}
-
-void RSPSseMoveUnalignedVariableToReg(void *Variable, int32_t sseReg) {
-	OPCODE_REG_VARIABLE(,16,0x100F,sseReg,Variable);
-}
-
-void RSPSseMoveUnalignedN64MemToReg(int32_t sseReg, int32_t AddrReg) {
-	OPCODE_REG_ADDR_DMEM(,16,0x100f,sseReg,AddrReg);
-}
-
-void RSPSseMoveUnalignedRegToVariable(int32_t sseReg, void *Variable) {
-	OPCODE_REG_VARIABLE(,16,0x110F,sseReg,Variable);
-}
-
-void RSPSseMoveUnalignedRegToN64Mem(int32_t sseReg, int32_t AddrReg) {
-	OPCODE_REG_ADDR_DMEM(,16,0x110f,sseReg,AddrReg);
-}
-
-void RSPSseMoveRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0x280F,Dest,Source)
-}
-
-void RSPSseXorRegToReg(int32_t Dest, int32_t Source) {
-	OPCODE_REG_REG(16,0x570F,Dest,Source)
-}
-
-void RSPSseShuffleReg(int32_t Dest, int32_t Source, uint8_t Immed) {
-	OPCODE_REG_REG(16,0xC60F,Dest,Source)
-	PUTDST8(RSPRecompPos, Immed);
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp_x86.c Deleted

@@ -1,1366 +0,0 @@
-/*
- * RSP Compiler plug in for Project 64 (A Nintendo 64 emulator).
- *
- * (c) Copyright 2001 jabo (jabo@emulation64.com) and
- * zilmar (zilmar@emulation64.com)
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include "rsp.h"
-#include "rsp_x86.h"
-#include "recompiler_cpu.h"
-#include "memory.h"
-#include "types.h"
-#include "main.h"
-
-#define PUTDST8(dest,value) {(*((uint8_t *)(dest))=(uint8_t)(value)); dest += 1;}
-#define PUTDST16(dest,value) {(*((uint16_t *)(dest))=(uint16_t)(value)); dest += 2;}
-#define PUTDST32(dest,value) {(*((uint32_t *)(dest))=(uint32_t)(value)); dest += 4;}
-#define PUTDST64(dest,value) {(*((uint64_t *)(dest))=(uint64_t)(value)); dest += 8;}
-
-
-#define x64_Reg		0x10
-#define X64_Reg		0x10
-#define X64_Ext		0x20
-
-extern uint8_t Index[9];
-
-
-char * x86_Strings[8] = {
-	"eax", "ebx", "ecx", "edx",
-	"esi", "edi", "ebp", "esp"
-};
-
-char * x86_ByteStrings[8] = {
-	"al", "bl", "cl", "dl",
-	"?4", "?5", "?6", "?7"
-};
-
-char * x86_HalfStrings[8] = {
-	"ax", "bx", "cx", "dx",
-	"si", "di", "bp", "sp"
-};
-
-extern uint32_t ConditionalMove;
-
-#define x86Byte_Name(Reg) (x86_ByteStrings[(Reg)])
-#define x86Half_Name(Reg) (x86_HalfStrings[(Reg)])
-
-
-
-void RSPAdcX86regToVariable(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x11,x86reg,Variable)
-}
-
-void RSPAdcConstToVariable(void *Variable, uint8_t Constant) {
-	RSPBreakPoint();
-
-	/*if(((uintptr_t)Variable - (uintptr_t)TLB_Map) < 0x7FFFFFFF) {
-		RSPBreakPoint();
-		OPCODE_REG_MREG_IMM32(8,0x81,OP_D2,x86_R15,(uintptr_t)Variable - (uintptr_t)TLB_Map);
- } else {
- 	LOAD_VARIABLE(x86_TEMP, Variable);
- 	OPCODE_REG_MREG(8,0x81,OP_D2,x86_TEMP);
- }
-
-	PUTDST8(RSPRecompPos,Constant);
- */
-}
-
-void RSPAdcX86RegToX86Reg(int32_t Destination, int32_t Source) {
- OPCODE_REG_REG(8,0x13,Destination,Source);
-}
-
-void RSPAddConstToVariable (uint32_t Const, void *Variable) {
- OPCODE_REG_VARIABLE(,8,0x81,OP_D0,Variable)
- PUTDST32(RSPRecompPos,Const);
-}
-
-void RSPAddConstToX86Reg64 (int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D0,x86reg | x64_Reg);
-		PUTDST32(RSPRecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D0,x86reg | x64_Reg);
-		PUTDST8(RSPRecompPos, Const);
-	}
-}
-
-void RSPAddConstToX86Reg (int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D0,x86reg);
-		PUTDST32(RSPRecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D0,x86reg);
-		PUTDST8(RSPRecompPos, Const);
-	}
-}
-
-
-void RSPAddQwordToX86Reg (int32_t x86reg, uint64_t Const) {
-#ifdef USEX64
-	LOAD_VARIABLE(x86_TEMP, Const);
-	OPCODE_REG_REG(8,0x1,x86_TEMP,x86reg);
-#else
-	RSPAddConstToX86Reg(x86reg, Const);
-#endif
-}
-
-
-void RSPAddVariableToX86reg(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x3,x86reg,Variable)
-}
-
-void RSPAddX86regToVariable(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x1,x86reg,Variable)
-}
-
-void RSPAddX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(8,0x3,Destination,Source);
-}
-
-void RSPAndConstToVariable (uint32_t Const, void *Variable) {
- OPCODE_REG_VARIABLE(,8,0x81,OP_D4,Variable)
- PUTDST32(RSPRecompPos,Const);
-}
-
-void RSPAndConstToX86Reg(int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D4,x86reg);
-		PUTDST32(RSPRecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D4,x86reg);
-		PUTDST8(RSPRecompPos, Const);
-	}
-}
-
-void RSPAndVariableDispToX86Reg(void *Variable, int32_t x86reg, int32_t AddrReg, int32_t Multiplier) {
-#ifdef USEX64
-	if(((uintptr_t)Variable - (uintptr_t)TLB_Map) < 0x7FFFFFFF) {
-		OPCODE_REG_BASE_INDEX_SCALE_IMM32(8,0x23,x86reg,x86_R15,AddrReg,Index[Multiplier], (uintptr_t)Variable - (uintptr_t)TLB_Map);
-	} else {
-		LOAD_VARIABLE(x86_TEMP, Variable);
-		OPCODE_REG_BASE_INDEX_SCALE(8,0x23,x86reg,x86_TEMP,AddrReg,Index[Multiplier]);
-	}
-#else
-	OPCODE_REG_INDEX_SCALE_IMM32(8,0x23,x86reg,AddrReg,Index[Multiplier],Variable);
-#endif
-}
-
-void RSPAndVariableToX86Reg(void * Variable, int32_t x86reg) {
-	OPCODE_REG_VARIABLE(,8,0x23,x86reg,Variable)
-}
-
-void RSPAndX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(8,0x21,Source,Destination);
-}
-
-void RSPBreakPoint (void) {
-	PUTDST8(RSPRecompPos,0xCC);
-}
-
-void RSPCall_Direct(void * FunctAddress) {
-	uintptr_t disp = 0;
-#ifdef USEX64
-	disp = (uintptr_t)FunctAddress-(uintptr_t)RSPRecompPos - 5;
-	RSPSubConstFromX86Reg(x86_RSP, 0x28);
-//	if(disp <= 0x7fffffff) {
-//		PUTDST8(RSPRecompPos,0xE8);
-//		PUTDST32(RSPRecompPos,disp);
-//	} else {
-		LOAD_VARIABLE(x86_TEMP, FunctAddress);
-		OPCODE_REG_REG(8,0xff,OP_D2,x86_TEMP);
-
-//	}
-	RSPAddConstToX86Reg(x86_RSP, 0x28);
-#else
-	disp = (uintptr_t)FunctAddress-(uintptr_t)RSPRecompPos - 5;
-	PUTDST8(RSPRecompPos,0xE8);
-	PUTDST32(RSPRecompPos,disp);
-#endif
-}
-
-void RSPCompConstToVariable(uint32_t Const, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x81,OP_D7,Variable)
- PUTDST32(RSPRecompPos,Const);
-}
-
-void RSPCompConstToX86reg(int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D7,x86reg);
-		PUTDST32(RSPRecompPos,Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D7,x86reg);
-		PUTDST8(RSPRecompPos, Const);
-	}
-}
-
-void RSPCompX86regToVariable(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x3B,x86reg,Variable)
-}
-
-void RSPCompX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(8,0x3B,Destination,Source);
-}
-
-void RSPDecX86reg(x86reg) {
-	OPCODE_REG_REG(8,0xFF,OP_D1,x86reg);
-}
-
-void RSPDivX86reg(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xF7,OP_D6,x86reg);
-}
-
-void RSPidivX86reg(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xF7,OP_D7,x86reg);
-}
-
-void RSPimulX86reg(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xF7,OP_D5,x86reg);
-}
-
-void RSPIncX86reg(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xFF,OP_D0,x86reg);
-}
-
-void RSPJaeLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0x73);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-void RSPJaeLabel32(uint32_t Value) {
-	PUTDST16(RSPRecompPos,0x830F);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPJaLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0x77);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-void RSPJaLabel32(uint32_t Value) {
-	PUTDST16(RSPRecompPos,0x870F);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPJbLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0x72);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-void RSPJbLabel32(uint32_t Value) {
-	PUTDST16(RSPRecompPos,0x820F);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPJecxzLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0xE3);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-void RSPJeLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0x74);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-void RSPJeLabel32(uint32_t Value) {
-	PUTDST16(RSPRecompPos,0x840F);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPJgeLabel32(uint32_t Value) {
-	PUTDST16(RSPRecompPos,0x8D0F);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPJgLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0x7F);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-void RSPJgLabel32(uint32_t Value) {
-	PUTDST16(RSPRecompPos,0x8F0F);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPJleLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0x7E);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-void RSPJleLabel32(uint32_t Value) {
-	PUTDST16(RSPRecompPos,0x8E0F);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPJlLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0x7C);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-void RSPJlLabel32(uint32_t Value) {
-	PUTDST16(RSPRecompPos,0x8C0F);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPJzLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0x74);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-void RSPJnzLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0x75);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-
-void RSPJmpDirectReg( int32_t x86reg ) {
-	OPCODE_REG_REG(8,0xff,OP_D4,x86reg);
-}
-
-void RSPJmpLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0xEB);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-void RSPJmpLabel32( uint32_t Value) {
-	PUTDST8(RSPRecompPos,0xE9);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPJneLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0x75);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-void RSPJneLabel32(uint32_t Value) {
-	PUTDST16(RSPRecompPos,0x850F);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPJnsLabel8( uint8_t Value) {
-	PUTDST8(RSPRecompPos,0x79);
-	PUTDST8(RSPRecompPos,Value);
-}
-
-void RSPJnsLabel32(uint32_t Value) {
-	PUTDST16(RSPRecompPos,0x890F);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPJsLabel32(uint32_t Value) {
-	PUTDST16(RSPRecompPos,0x880F);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPLeaRegReg(int32_t x86RegDest, int32_t x86RegSrc, int32_t multiplier) {
-	OPCODE_REG_BASE_INDEX_SCALE(8,0x8D,x86RegDest,x86_EBP,x86RegSrc,Index[multiplier]);
-	PUTDST32(RSPRecompPos,0x00000000);
-}
-
-void RSPLeaSourceAndOffset(int32_t x86DestReg, int32_t x86SourceReg, int32_t offset) {
- OPCODE_REG_MREG_IMM32(8,0x8D,x86DestReg,x86SourceReg,offset);
-}
-
-void RSPMoveConstByteToVariable (uint8_t Const,void *Variable) {
- OPCODE_REG_VARIABLE(,8,0xC6,OP_D0,Variable)
- PUTDST8(RSPRecompPos,Const);
-}
-
-void RSPMoveConstHalfToVariable (uint16_t Const,void *Variable) {
- OPCODE_REG_VARIABLE(PUTDST8(RSPRecompPos,0x66),8,0xC7,OP_D0,Variable)
- PUTDST16(RSPRecompPos,Const);
-}
-
-void RSPMoveConstHalfToX86regPointer(uint16_t Const, int32_t AddrReg1, int32_t AddrReg2) {
- PUTDST8(RSPRecompPos,0x66);
- OPCODE_REG_BASE_INDEX(8,0xC7,OP_D0,AddrReg1,AddrReg2);
- PUTDST16(RSPRecompPos,Const);
-}
-
-void RSPMoveX86regByteToN64Mem(int32_t x86reg, int32_t AddrReg) {
-	OPCODE_REG_ADDR_DMEM(,8,0x88,x86reg,AddrReg);
-}
-
-void RSPMoveX86regHalfToN64Mem(int32_t x86reg, int32_t AddrReg) {
- OPCODE_REG_ADDR_DMEM(PUTDST8(RSPRecompPos,0x66),8,0x89,x86reg,AddrReg);
-}
-
-void RSPMoveX86regToN64Mem(int32_t x86reg, int32_t AddrReg) {
- OPCODE_REG_ADDR_DMEM(,8,0x89,x86reg,AddrReg);
-}
-
-
-void RSPMoveConstToVariable (uint32_t Const,void *Variable) {
- OPCODE_REG_VARIABLE(,8,0xC7,OP_D0,Variable)
- PUTDST32(RSPRecompPos,Const);
-}
-
-void RSPMoveConstToX86Pointer(uint32_t Const, int32_t X86Pointer) {
- OPCODE_REG_MREG(8,0xC7,OP_D0,X86Pointer);
- PUTDST32(RSPRecompPos,Const);
-}
-
-
-void RSPMoveOffsetToX86reg(uint32_t Const, int32_t x86reg) {
-	OPCODE_REG_REG(8,0xC7,OP_D0,x86reg);
- PUTDST32(RSPRecompPos,Const);
-}
-
-
-void RSPMoveConstToX86reg(uint32_t Const, int32_t x86reg) {
-	OPCODE_REG_REG(8,0xC7,OP_D0,x86reg);
- PUTDST32(RSPRecompPos,Const);
-}
-
-void RSPMoveConstQwordToX86reg(uintptr_t Const, int32_t x86reg) {
-#ifndef USEX64
- OPCODE_REG_REG(8,0xC7,OP_D0,x86reg);
- PUTDST32(RSPRecompPos,Const);
-#else
- PUTDST8(RSPRecompPos, 0x48 | ((x86reg&0x20)>>5));
- PUTDST8(RSPRecompPos, 0xB8 | ((x86reg-1)&0x7));
- PUTDST64(RSPRecompPos,Const);
-#endif
-}
-
-void RSPMoveConstByteToX86regPointer(uint8_t Const, int32_t AddrReg1, int32_t AddrReg2) {
-	OPCODE_REG_BASE_INDEX(8,0xC6,OP_D0,AddrReg1,AddrReg2)
- PUTDST8(RSPRecompPos,Const);
-}
-
-void RSPMoveConstToX86regPointer(uint32_t Const, int32_t AddrReg1, int32_t AddrReg2) {
-	OPCODE_REG_BASE_INDEX(8,0xC7,OP_D0,AddrReg1,AddrReg2);
- PUTDST32(RSPRecompPos,Const);
-}
-
-void RSPMoveN64MemToX86reg(int32_t x86reg, int32_t AddrReg) {
-#ifdef USEX64
-	if(((uintptr_t)DMEM - (uintptr_t)TLB_Map) < 0x7FFFFFFF) {
-		OPCODE_REG_BASE_INDEX_IMM32(8,0x8B,x86reg,x86_R15,AddrReg,(uintptr_t)DMEM - (uintptr_t)TLB_Map);
- } else {
- 	LOAD_VARIABLE(x86_TEMP, DMEM);
-		OPCODE_REG_BASE_INDEX(8,0x8B,x86reg,x86_TEMP,AddrReg);
- }
-#else
-	OPCODE_REG_MREG_IMM32(8,0x8B,x86reg,AddrReg,DMEM);
-#endif
-}
-
-void RSPMoveSxByteX86regPointerToX86reg(int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg) {
-	OPCODE_REG_BASE_INDEX(16,0xBE0F,x86reg,AddrReg1,AddrReg2);
-}
-
-void RSPMoveSxHalfX86regPointerToX86reg(int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg) {
- OPCODE_REG_BASE_INDEX(16,0xBF0F,x86reg,AddrReg1,AddrReg2);
-}
-
-
-void RSPMoveN64MemToX86regByte(int32_t x86reg, int32_t AddrReg) {
-	OPCODE_REG_ADDR_DMEM(,8,0x8A,x86reg,AddrReg);
-}
-
-
-void RSPMoveSxN64MemToX86regByte(int32_t x86reg, int32_t AddrReg) {
- OPCODE_REG_ADDR_DMEM(,16,0xBE0F,x86reg,AddrReg);
-}
-
-void RSPMoveSxVariableToX86regHalf(void *Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(,16,0xBF0F,x86reg,Variable);
-}
-
-
-void RSPMoveSxN64MemToX86regHalf(int32_t x86reg, int32_t AddrReg) {
- OPCODE_REG_ADDR_DMEM(,16,0xBF0F,x86reg,AddrReg);
-}
-
-void RSPMoveZxN64MemToX86regHalf(int32_t x86reg, int32_t AddrReg) {
-	OPCODE_REG_ADDR_DMEM(,16,0xB70F,x86reg,AddrReg);
-}
-
-void RSPMoveVariableToX86reg(void *Variable, int32_t x86reg) {
-	OPCODE_REG_VARIABLE(,8,0x8B,x86reg,Variable);
-}
-
-void RSPMoveX86RegDispToX86Reg(int32_t x86reg, int32_t AddrReg, int32_t IndexReg, int32_t Multiplier) {
-	OPCODE_REG_BASE_INDEX_SCALE(8,0x8B,x86reg,AddrReg,IndexReg,Index[Multiplier]);
-}
-
-void RSPMoveN64MemDispToX86reg(int32_t x86reg, int32_t AddrReg, uint8_t Disp) {
-#ifdef USEX64
-	if(((uintptr_t)DMEM - (uintptr_t)TLB_Map) < 0x7FFFFFFF) {
-		OPCODE_REG_BASE_INDEX_SCALE_IMM32(8,0x8B,x86reg,x86_R15,AddrReg,Index[0],(((uintptr_t)DMEM - (uintptr_t)TLB_Map))+Disp);
-	} else {
-		LOAD_VARIABLE(x86_TEMP, DMEM);
-		OPCODE_REG_BASE_INDEX_SCALE_IMM8(8,0x8B,x86reg,x86_TEMP,AddrReg,Index[0],Disp);
-	}
-#else
- OPCODE_REG_MREG_IMM32(8,0x8B,x86reg,AddrReg,DMEM+Disp);
-#endif
-}
-
-void RSPMoveVariableDispToX86Reg(void *Variable, int32_t x86reg, int32_t AddrReg, int32_t Multiplier) {
-#ifdef USEX64
-	if(((uintptr_t)Variable - (uintptr_t)TLB_Map) < 0x7FFFFFFF) {
-		OPCODE_REG_BASE_INDEX_SCALE_IMM32(8,0x8B,x86reg,x86_R15,AddrReg,Index[Multiplier],((uintptr_t)Variable - (uintptr_t)TLB_Map));
-	} else {
-		LOAD_VARIABLE(x86_TEMP, Variable);
-		OPCODE_REG_BASE_INDEX_SCALE(8,0x8B,x86reg,x86_TEMP,AddrReg,Index[Multiplier]);
-	}
-#else
-	OPCODE_REG_INDEX_SCALE_IMM32(8,0x8B,x86reg,AddrReg,Index[Multiplier],Variable);
-#endif
-}
-
-void RSPMoveN64MemToX86regHalf(int32_t x86reg, int32_t AddrReg)
-{
-	RSPMoveVariableDispToX86Reg(DMEM,x86reg,AddrReg,1);
-}
-
-
-void RSPMoveVariableToX86regByte(void *Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(,8,0x8A,x86reg,Variable);
-}
-
-void RSPMoveVariableToX86regHalf(void *Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(PUTDST8(RSPRecompPos,0x66),8,0x8B,x86reg,Variable);
-}
-
-void RSPMoveX86regByteToVariable(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x88,x86reg,Variable);
-}
-
-void RSPMoveX86regByteToX86regPointer(int32_t x86reg, int32_t AddrReg) {
-	OPCODE_REG_MREG(8,0x88,x86reg,AddrReg);
-}
-
-void RSPMoveX86regHalfToVariable(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(PUTDST8(RSPRecompPos,0x66),8,0x89,x86reg,Variable);
-}
-
-void RSPMoveX86regHalfToX86regPointer(int32_t x86reg, int32_t AddrReg) {
-	PUTDST8(RSPRecompPos,0x66);
-	OPCODE_REG_MREG(8,0x89,x86reg,AddrReg);
-}
-
-void RSPMoveX86PointerToX86reg(int32_t x86reg, int32_t X86Pointer) {
-	OPCODE_REG_MREG(8,0x8B,x86reg,X86Pointer);
-}
-
-void RSPMoveX86regPointerToX86reg(int32_t Destination, int32_t AddrReg) {
-	OPCODE_REG_MREG(8,0x8B,Destination,AddrReg);
-}
-
-void RSPMoveX86regPointerToX86regDisp8(int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg, uint8_t offset) {
-	OPCODE_REG_BASE_INDEX_IMM8(8,0x8B,x86reg,AddrReg1,AddrReg2,offset);
-}
-
-void RSPMoveX86regToMemory(int32_t x86reg, int32_t AddrReg, uint32_t Disp) {
-	OPCODE_REG_MREG_IMM32(8,0x89,x86reg,AddrReg,Disp);
-}
-
-void RSPMoveX86regToVariable(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x89,x86reg,Variable);
-}
-
-void RSPMoveX86RegToX86Reg(int32_t Source, int32_t Destination) {
-	OPCODE_REG_REG(8,0x89,Source|X64_Reg, Destination|X64_Reg);
-}
-
-void RSPMoveX86regToX86Pointer(int32_t x86reg, int32_t X86Pointer) {
-	OPCODE_REG_MREG(8,0x89,x86reg, X86Pointer);
-}
-
-void RSPMoveX86regToX86regPointer(int32_t x86reg, int32_t AddrReg) {
- OPCODE_REG_MREG(8,0x89,x86reg,AddrReg);
-}
-
-void RSPMoveZxByteX86regPointerToX86reg(int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg) {
-	OPCODE_REG_BASE_INDEX(16,0xB60F,x86reg,AddrReg1,AddrReg2);
-}
-
-void RSPMoveZxHalfX86regPointerToX86reg(int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg) {
-	OPCODE_REG_BASE_INDEX(16,0xB70F,x86reg,AddrReg1,AddrReg2);
-}
-
-void RSPMoveZxVariableToX86regByte(void *Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(,16,0xB60F,x86reg,Variable);
-}
-
-void RSPMoveZxVariableToX86regHalf(void *Variable, int32_t x86reg) {
-	OPCODE_REG_VARIABLE(,16,0xB70F,x86reg,Variable);
-}
-
-void RSPMulX86reg(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xF7,OP_D4,x86reg);
-}
-
-void RSPNotX86Reg(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xF7,OP_D2,x86reg);
-}
-
-void RSPOrConstToVariable(uint32_t Const, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x81,OP_D1,Variable);
- PUTDST32(RSPRecompPos,Const);
-}
-
-void RSPOrConstToX86Reg(uint32_t Const, int32_t x86reg) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D1,x86reg);
-		PUTDST32(RSPRecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D1,x86reg);
-		PUTDST8(RSPRecompPos, Const);
-	}
-}
-
-void RSPOrVariableToX86Reg(void * Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(,8,0xb,x86reg,Variable);
-}
-
-void RSPOrX86RegToVariable(void * Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(,8,0x9,x86reg,Variable);
-}
-
-void RSPOrX86RegToX86Reg(int32_t Destination, int32_t Source) {
- OPCODE_REG_REG(8,0x0B,Destination,Source);
-}
-
-void RSPPushfd() {
-	PUTDST8(RSPRecompPos,0x9c);
-}
-
-void RSPPopfd() {
-	PUTDST8(RSPRecompPos,0x9d);
-}
-
-void RSPPopad(void) {
-#ifdef USEX64
-	PUTDST16(RSPRecompPos,0x5f41);
-	PUTDST16(RSPRecompPos,0x5e41);
-	PUTDST16(RSPRecompPos,0x5d41);
-	PUTDST16(RSPRecompPos,0x5c41);
-	PUTDST16(RSPRecompPos,0x5b41);
-	PUTDST16(RSPRecompPos,0x5a41);
-	PUTDST16(RSPRecompPos,0x5941);
-	PUTDST16(RSPRecompPos,0x5841);
-	PUTDST8(RSPRecompPos,0x5f);
-	PUTDST8(RSPRecompPos,0x5e);
-	PUTDST8(RSPRecompPos,0x5b);
-	PUTDST8(RSPRecompPos,0x5a);
-	PUTDST8(RSPRecompPos,0x59);
-	PUTDST8(RSPRecompPos,0x58);
-#else
-	PUTDST8(RSPRecompPos,0x61);
-#endif
-}
-
-void RSPPushad(void) {
-#ifdef USEX64
-	PUTDST8(RSPRecompPos,0x50);
-	PUTDST8(RSPRecompPos,0x51);
-	PUTDST8(RSPRecompPos,0x52);
-	PUTDST8(RSPRecompPos,0x53);
-	PUTDST8(RSPRecompPos,0x56);
-	PUTDST8(RSPRecompPos,0x57);
-	PUTDST16(RSPRecompPos,0x5041);
-	PUTDST16(RSPRecompPos,0x5141);
-	PUTDST16(RSPRecompPos,0x5241);
-	PUTDST16(RSPRecompPos,0x5341);
-	PUTDST16(RSPRecompPos,0x5441);
-	PUTDST16(RSPRecompPos,0x5541);
-	PUTDST16(RSPRecompPos,0x5641);
-	PUTDST16(RSPRecompPos,0x5741);
-#else
-PUTDST8(RSPRecompPos,0x60);
-#endif
-}
-
-void RSPPush(int32_t x86reg) {
-
-#ifdef USEX64
-	PUTDST8(RSPRecompPos, 0x40 | ((x86reg & 0x20) >> 5));
-#endif
-	switch(x86reg&0xf) {
-	case x86_EAX: PUTDST8(RSPRecompPos, 0x50); break;
-	case x86_EBX: PUTDST8(RSPRecompPos, 0x53); break;
-	case x86_ECX: PUTDST8(RSPRecompPos, 0x51); break;
-	case x86_EDX: PUTDST8(RSPRecompPos, 0x52); break;
-	case x86_ESI: PUTDST8(RSPRecompPos, 0x56); break;
-	case x86_EDI: PUTDST8(RSPRecompPos, 0x57); break;
-	case x86_ESP: PUTDST8(RSPRecompPos, 0x54); break;
-	case x86_EBP: PUTDST8(RSPRecompPos, 0x55); break;
-	}
-}
-
-void RSPPop(int32_t x86reg) {
-#ifdef USEX64
-	PUTDST8(RSPRecompPos, 0x40 | ((x86reg & 0x20) >> 5));
-#endif
-	switch(x86reg&0xf) {
-
-	case x86_EAX: PUTDST8(RSPRecompPos, 0x58); break;
-	case x86_EBX: PUTDST8(RSPRecompPos, 0x5B); break;
-	case x86_ECX: PUTDST8(RSPRecompPos, 0x59); break;
-	case x86_EDX: PUTDST8(RSPRecompPos, 0x5A); break;
-	case x86_ESI: PUTDST8(RSPRecompPos, 0x5E); break;
-	case x86_EDI: PUTDST8(RSPRecompPos, 0x5F); break;
-	case x86_ESP: PUTDST8(RSPRecompPos, 0x5C); break;
-	case x86_EBP: PUTDST8(RSPRecompPos, 0x5D); break;
-	}
-}
-
-void RSPPushImm32(uint32_t Value) {
-	PUTDST8(RSPRecompPos,0x68);
-	PUTDST32(RSPRecompPos,Value);
-}
-
-void RSPRet(void) {
-	PUTDST8(RSPRecompPos,0xC3);
-}
-
-void RSPSeta(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x970F,OP_D0,x86reg);
-}
-
-void RSPSetaVariable(void * Variable) {
- OPCODE_REG_VARIABLE(,16,0x970F,OP_D0,Variable);
-}
-
-void RSPSetae(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x930F,OP_D0,x86reg);
-}
-
-void RSPSetb(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x920F,OP_D0,x86reg);
-}
-
-void RSPSetbVariable(void * Variable) {
- OPCODE_REG_VARIABLE(,16,0x920F,OP_D0,Variable);
-}
-
-void RSPSetg(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x9F0F,OP_D0,x86reg);
-}
-
-void RSPSetgVariable(void * Variable) {
- OPCODE_REG_VARIABLE(,16,0x9F0F,OP_D0,Variable);
-}
-
-void RSPSetl(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x9C0F,OP_D0,x86reg);
-}
-
-void RSPSetlVariable(void * Variable) {
- OPCODE_REG_VARIABLE(,16,0x9C0F,OP_D0,Variable);
-}
-
-void RSPShiftLeftSignVariableImmed(void *Variable, uint8_t Immediate) {
- OPCODE_REG_VARIABLE(,8,0xC1,OP_D4,Variable);
- PUTDST8(RSPRecompPos,Immediate);
-}
-
-void RSPShiftRightSignVariableImmed(void *Variable, uint8_t Immediate) {
- OPCODE_REG_VARIABLE(,8,0xC1,OP_D7,Variable);
- PUTDST8(RSPRecompPos,Immediate);
-}
-
-void RSPShiftRightUnsignVariableImmed(void *Variable, uint8_t Immediate) {
- OPCODE_REG_VARIABLE(,8,0xC1,OP_D5,Variable);
- PUTDST8(RSPRecompPos,Immediate);
-}
-
-void RSPSetzVariable(void *Variable) {
-	OPCODE_REG_VARIABLE(,16,0x940F,OP_D0,Variable);
-}
-
-void RSPSetnzVariable(void *Variable) {
-	OPCODE_REG_VARIABLE(,16,0x950F,OP_D0,Variable);
-}
-
-void RSPSetleVariable(void *Variable) {
-	RSPBreakPoint();
-	OPCODE_REG_VARIABLE(,16,0x9E0F,OP_D0,Variable);
-}
-
-void RSPSetgeVariable(void *Variable) {
-	RSPBreakPoint();
-	OPCODE_REG_VARIABLE(,16,0x9D0F,OP_D0,Variable);
-}
-
-void RSPSetz(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x940F,OP_D0,x86reg);
-}
-
-void RSPSetnz(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x950F,OP_D0,x86reg);
-}
-
-void RSPShiftLeftDouble(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(16,0xA50F,Source,Destination);
-}
-
-void RSPShiftLeftDoubleImmed(int32_t Destination, int32_t Source, uint8_t Immediate) {
-	OPCODE_REG_REG(16,0xA40F,Source,Destination);
-	PUTDST8(RSPRecompPos,Immediate);
-}
-
-void RSPShiftLeftSign(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xD3,OP_D4,x86reg);
-}
-
-void RSPShiftLeftSignImmed(int32_t x86reg, uint8_t Immediate) {
-	OPCODE_REG_REG(8,0xC1,OP_D4,x86reg);
-	PUTDST8(RSPRecompPos,Immediate);
-}
-
-void RSPShiftRightSign(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xD3,OP_D7,x86reg);
-}
-
-void RSPShiftRightSignImmed(int32_t x86reg, uint8_t Immediate) {
-	OPCODE_REG_REG(8,0xC1,OP_D7,x86reg);
-	PUTDST8(RSPRecompPos,Immediate);
-}
-
-void RSPShiftRightUnsign(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xD3,OP_D5,x86reg);
-}
-
-void RSPShiftRightDouble(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(16,0xAD0F,Source,Destination);
-}
-
-void RSPShiftRightDoubleImmed(int32_t Destination, int32_t Source, uint8_t Immediate) {
-	OPCODE_REG_REG(16,0xAC0F,Source,Destination);
-	PUTDST8(RSPRecompPos,Immediate);
-}
-
-void RSPShiftRightUnsignImmed(int32_t x86reg, uint8_t Immediate) {
-	OPCODE_REG_REG(8,0xC1,OP_D5,x86reg);
-	PUTDST8(RSPRecompPos,Immediate);
-}
-
-void RSPSbbConstFromX86Reg (int32_t x86reg, uint32_t Const) {
-RSPBreakPoint();
-
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D3,x86reg);
-		PUTDST32(RSPRecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D3,x86reg);
-		PUTDST8(RSPRecompPos, Const);
-	}
-}
-
-void RSPSbbVariableFromX86reg(int32_t x86reg, void * Variable) {
- RSPBreakPoint();
- OPCODE_REG_VARIABLE(,8,0x1B,x86reg,Variable);
-}
-
-void RSPSbbX86RegToX86Reg(int32_t Destination, int32_t Source) {
- OPCODE_REG_REG(8,0x1B,Destination,Source);
-}
-
-void RSPSubConstFromVariable (uint32_t Const, void *Variable) {
-	OPCODE_REG_VARIABLE(,8,0x81,OP_D5,Variable);
-	PUTDST32(RSPRecompPos,Const);
-}
-
-void RSPSubConstFromX86Reg (int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D5,x86reg);
-		PUTDST32(RSPRecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D5,x86reg);
-		PUTDST8(RSPRecompPos, Const);
-	}
-}
-
-void RSPSubVariableFromX86reg(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x2B,x86reg,Variable);
-}
-
-void RSPSubX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(8,0x2B,Destination,Source);
-}
-
-void RSPTestConstToX86Reg(uint32_t Const, int32_t x86reg) {
- OPCODE_REG_REG(8,0xF7,OP_D0,x86reg);
-	PUTDST32(RSPRecompPos,Const);
-}
-
-void RSPTestVariable(uint32_t Const, void * Variable) {
-	OPCODE_REG_VARIABLE(,8,0xf7,OP_D0,Variable);
-	PUTDST32(RSPRecompPos,Const);
-}
-
-void RSPTestX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(8,0x85,Destination,Source);
-}
-
-void RSPTestVariableToX86Reg(uint32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x85,x86reg,Variable);
-}
-
-void RSPXorConstToX86Reg(int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D6,x86reg);
-		PUTDST32(RSPRecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D6,x86reg);
-		PUTDST8(RSPRecompPos, Const);
-	}
-}
-
-
-void RSPXorX86RegToX86Reg(int32_t Source, int32_t Destination) {
-	OPCODE_REG_REG(8,0x31,Destination,Source);
-}
-
-void RSPXorVariableToX86reg(void *Variable, int32_t x86reg) {
-	RSPBreakPoint();
-	OPCODE_REG_VARIABLE(,8,0x33,x86reg,Variable);
-}
-
-
-void RSPXorConstToVariable(void *Variable, uint32_t Const) {
- OPCODE_REG_VARIABLE(,8,0x81,OP_D6,Variable);
- PUTDST32(RSPRecompPos,Const);
-}
-
-// ********************************************************************************************
-
-void RSPAndX86RegToVariable(void * Variable, int32_t x86Reg) {
-	OPCODE_REG_VARIABLE(,8,0x21,x86Reg,Variable);
-}
-
-void RSPXorX86RegToVariable(void *Variable, int32_t x86reg) {
-	OPCODE_REG_VARIABLE(,8,0x31,x86reg,Variable);
-}
-
-void RSPTestConstToVariable(uint32_t Const, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0xf7,OP_D0,Variable);
-	PUTDST32(RSPRecompPos,Const);
-}
-
-void RSPCondMoveGreaterEqual(int32_t Destination, int32_t Source) {
-	if (ConditionalMove == 0) {
-		uint8_t * Jump;
-		// CPU_Message(" [*]cmovge %s, %s",x86_Name(Destination),x86_Name(Source));
-
-		RSPJlLabel8(0);
-		Jump = RSPRecompPos - 1;
-		RSPMoveX86RegToX86Reg(Source, Destination);
-		// CPU_Message(" label:");
-		RSPx86_SetBranch8b(Jump, RSPRecompPos);
-	} else {
-		uint8_t x86Command;
-		// CPU_Message(" cmovge %s, %s",x86_Name(Destination),x86_Name(Source));
-
-		PUTDST16(RSPRecompPos,0x4D0F);
-
-		switch (Source&0xf) {
-		case x86_EAX: x86Command = 0x00; break;
-		case x86_EBX: x86Command = 0x03; break;
-		case x86_ECX: x86Command = 0x01; break;
-		case x86_EDX: x86Command = 0x02; break;
-		case x86_ESI: x86Command = 0x06; break;
-		case x86_EDI: x86Command = 0x07; break;
-		case x86_ESP: x86Command = 0x04; break;
-		case x86_EBP: x86Command = 0x05; break;
-		}
-
-		switch (Destination&0xf) {
-		case x86_EAX: x86Command += 0xC0; break;
-		case x86_EBX: x86Command += 0xD8; break;
-		case x86_ECX: x86Command += 0xC8; break;
-		case x86_EDX: x86Command += 0xD0; break;
-		case x86_ESI: x86Command += 0xF0; break;
-		case x86_EDI: x86Command += 0xF8; break;
-		case x86_ESP: x86Command += 0xE0; break;
-		case x86_EBP: x86Command += 0xE8; break;
-		}
-
-		PUTDST8(RSPRecompPos, x86Command);
-	}
-}
-
-void RSPMoveX86regPointerToX86regByte(int32_t Destination, int32_t AddrReg) {
-	uint8_t x86Command = 0;
-
-	// CPU_Message(" mov %s, byte ptr [%s]",x86Byte_Name(Destination), x86_Name(AddrReg));
-
-	switch (AddrReg&0xf) {
-	case x86_EAX: x86Command = 0x00; break;
-	case x86_EBX: x86Command = 0x03; break;
-	case x86_ECX: x86Command = 0x01; break;
-	case x86_EDX: x86Command = 0x02; break;
-	case x86_ESI: x86Command = 0x06; break;
-	case x86_EDI: x86Command = 0x07; break;
-	default: DisplayError("MoveX86regPointerToX86regByte\nUnknown x86 Register");
-	}
-
-	switch (Destination&0xf) {
-	case x86_EAX: x86Command += 0x00; break;
-	case x86_EBX: x86Command += 0x18; break;
-	case x86_ECX: x86Command += 0x08; break;
-	case x86_EDX: x86Command += 0x10; break;
-	default: DisplayError("MoveX86regPointerToX86regByte\nUnknown x86 Register");
-	}
-
-	PUTDST8(RSPRecompPos, 0x8A);
-	PUTDST8(RSPRecompPos, x86Command);
-}
-
-void RSPMoveX86regToN64MemDisp(int32_t x86reg, int32_t AddrReg, uint8_t Disp) {
-#ifdef USEX64
-	if(((uintptr_t)DMEM - (uintptr_t)TLB_Map) < 0x7FFFFFFF) {
-		OPCODE_REG_BASE_INDEX_IMM32(8,0x89,x86reg,x86_R15,AddrReg,((uintptr_t)DMEM - (uintptr_t)TLB_Map) + Disp);
- } else {
- 	LOAD_VARIABLE(x86_TEMP, DMEM);
- 	OPCODE_REG_MREG_IMM8(8,0xf7,x86reg,x86_TEMP,Disp);
- }
-#else
-	OPCODE_REG_MREG_IMM32(8,0x89,x86reg,AddrReg,DMEM + Disp);
-#endif
-}
-
-void RSPOrVariableToX86regHalf(void * Variable, int32_t x86Reg) {
- OPCODE_REG_VARIABLE(PUTDST8(RSPRecompPos,0x66),8,0xb,x86Reg,Variable);
-}
-
-void RSPAndVariableToX86regHalf(void * Variable, int32_t x86Reg) {
- OPCODE_REG_VARIABLE(PUTDST8(RSPRecompPos,0x66),8,0x23,x86Reg,Variable);
-}
-
-void RSPAndX86RegHalfToX86RegHalf(int32_t Destination, int32_t Source) {
-	PUTDST8(RSPRecompPos, 0x66);
-	OPCODE_REG_REG(8,0x21,Source,Destination);
-}
-
-void RSPCondMoveNotEqual(int32_t Destination, int32_t Source) {
-	if (ConditionalMove == 0) {
-		uint8_t * Jump;
-		// CPU_Message(" [*]cmovne %s, %s",x86_Name(Destination),x86_Name(Source));
-
-		RSPJeLabel8(0);
-		Jump = RSPRecompPos - 1;
-		RSPMoveX86RegToX86Reg(Source, Destination);
-		// CPU_Message(" label:");
-		RSPx86_SetBranch8b(Jump, RSPRecompPos);
-	} else {
-		uint8_t x86Command;
-		// CPU_Message(" cmovne %s, %s",x86_Name(Destination),x86_Name(Source));
-
-		PUTDST16(RSPRecompPos,0x450F);
-
-		switch (Source&0xf) {
-		case x86_EAX: x86Command = 0x00; break;
-		case x86_EBX: x86Command = 0x03; break;
-		case x86_ECX: x86Command = 0x01; break;
-		case x86_EDX: x86Command = 0x02; break;
-		case x86_ESI: x86Command = 0x06; break;
-		case x86_EDI: x86Command = 0x07; break;
-		case x86_ESP: x86Command = 0x04; break;
-		case x86_EBP: x86Command = 0x05; break;
-		}
-
-		switch (Destination&0xf) {
-		case x86_EAX: x86Command += 0xC0; break;
-		case x86_EBX: x86Command += 0xD8; break;
-		case x86_ECX: x86Command += 0xC8; break;
-		case x86_EDX: x86Command += 0xD0; break;
-		case x86_ESI: x86Command += 0xF0; break;
-		case x86_EDI: x86Command += 0xF8; break;
-		case x86_ESP: x86Command += 0xE0; break;
-		case x86_EBP: x86Command += 0xE8; break;
-		}
-
-		PUTDST8(RSPRecompPos, x86Command);
-	}
-}
-
-
-void RSPNegateX86reg(int32_t x86reg) {
-	// CPU_Message(" neg %s", x86_Name(x86reg));
-	switch (x86reg&0xf) {
-	case x86_EAX: PUTDST16(RSPRecompPos,0xd8f7); break;
-	case x86_EBX: PUTDST16(RSPRecompPos,0xdbf7); break;
-	case x86_ECX: PUTDST16(RSPRecompPos,0xd9f7); break;
-	case x86_EDX: PUTDST16(RSPRecompPos,0xdaf7); break;
-	case x86_ESI: PUTDST16(RSPRecompPos,0xdef7); break;
-	case x86_EDI: PUTDST16(RSPRecompPos,0xdff7); break;
-	case x86_ESP: PUTDST16(RSPRecompPos,0xdcf7); break;
-	case x86_EBP: PUTDST16(RSPRecompPos,0xddf7); break;
-	default:
-		DisplayError("NegateX86reg\nUnknown x86 Register");
-	}
-}
-
-
-void RSPImulX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	uint8_t x86Command;
-
-	// CPU_Message(" imul %s, %s",x86_Name(Destination), x86_Name(Source));
-
-	switch (Source&0xf) {
-	case x86_EAX: x86Command = 0x00; break;
-	case x86_EBX: x86Command = 0x03; break;
-	case x86_ECX: x86Command = 0x01; break;
-	case x86_EDX: x86Command = 0x02; break;
-	case x86_ESI: x86Command = 0x06; break;
-	case x86_EDI: x86Command = 0x07; break;
-	case x86_ESP: x86Command = 0x04; break;
-	case x86_EBP: x86Command = 0x05; break;
-	}
-
-	switch (Destination&0xf) {
-	case x86_EAX: x86Command += 0xC0; break;
-	case x86_EBX: x86Command += 0xD8; break;
-	case x86_ECX: x86Command += 0xC8; break;
-	case x86_EDX: x86Command += 0xD0; break;
-	case x86_ESI: x86Command += 0xF0; break;
-	case x86_EDI: x86Command += 0xF8; break;
-	case x86_ESP: x86Command += 0xE0; break;
-	case x86_EBP: x86Command += 0xE8; break;
-	}
-
-	PUTDST16(RSPRecompPos, 0xAF0F);
-	PUTDST8(RSPRecompPos, x86Command);
-}
-
-
-void RSPMoveX86RegToX86regPointerDisp ( int32_t Source, int32_t AddrReg, uint8_t Disp ) {
- OPCODE_REG_MREG_IMM8(8,0x89,Source,AddrReg,Disp);
-}
-
-void RSPCondMoveGreater(int32_t Destination, int32_t Source) {
-	if (ConditionalMove == 0) {
-		uint8_t * Jump;
-		// CPU_Message(" [*]cmovg %s, %s",x86_Name(Destination),x86_Name(Source));
-
-		RSPJleLabel8(0);
-		Jump = RSPRecompPos - 1;
-		RSPMoveX86RegToX86Reg(Source, Destination);
-		// CPU_Message(" label:");
-		RSPx86_SetBranch8b(Jump, RSPRecompPos);
-	} else {
-		uint8_t x86Command;
-		// CPU_Message(" cmovg %s, %s",x86_Name(Destination),x86_Name(Source));
-
-		PUTDST16(RSPRecompPos,0x4F0F);
-
-		switch (Source&0xf) {
-		case x86_EAX: x86Command = 0x00; break;
-		case x86_EBX: x86Command = 0x03; break;
-		case x86_ECX: x86Command = 0x01; break;
-		case x86_EDX: x86Command = 0x02; break;
-		case x86_ESI: x86Command = 0x06; break;
-		case x86_EDI: x86Command = 0x07; break;
-		case x86_ESP: x86Command = 0x04; break;
-		case x86_EBP: x86Command = 0x05; break;
-		}
-
-		switch (Destination&0xf) {
-		case x86_EAX: x86Command += 0xC0; break;
-		case x86_EBX: x86Command += 0xD8; break;
-		case x86_ECX: x86Command += 0xC8; break;
-		case x86_EDX: x86Command += 0xD0; break;
-		case x86_ESI: x86Command += 0xF0; break;
-		case x86_EDI: x86Command += 0xF8; break;
-		case x86_ESP: x86Command += 0xE0; break;
-		case x86_EBP: x86Command += 0xE8; break;
-		}
-
-		PUTDST8(RSPRecompPos, x86Command);
-	}
-}
-
-void RSPCondMoveLess(int32_t Destination, int32_t Source) {
-	if (ConditionalMove == 0) {
-		uint8_t * Jump;
-		// CPU_Message(" [*]cmovl %s, %s",x86_Name(Destination),x86_Name(Source));
-
-		RSPJgeLabel8(0);
-		Jump = RSPRecompPos - 1;
-		RSPMoveX86RegToX86Reg(Source, Destination);
-		// CPU_Message(" label:");
-		RSPx86_SetBranch8b(Jump, RSPRecompPos);
-	} else {
-		uint8_t x86Command;
-		// CPU_Message(" cmovl %s, %s",x86_Name(Destination),x86_Name(Source));
-
-		PUTDST16(RSPRecompPos,0x4C0F);
-
-		switch (Source&0xf) {
-		case x86_EAX: x86Command = 0x00; break;
-		case x86_EBX: x86Command = 0x03; break;
-		case x86_ECX: x86Command = 0x01; break;
-		case x86_EDX: x86Command = 0x02; break;
-		case x86_ESI: x86Command = 0x06; break;
-		case x86_EDI: x86Command = 0x07; break;
-		case x86_ESP: x86Command = 0x04; break;
-		case x86_EBP: x86Command = 0x05; break;
-		}
-
-		switch (Destination&0xf) {
-		case x86_EAX: x86Command += 0xC0; break;
-		case x86_EBX: x86Command += 0xD8; break;
-		case x86_ECX: x86Command += 0xC8; break;
-		case x86_EDX: x86Command += 0xD0; break;
-		case x86_ESI: x86Command += 0xF0; break;
-		case x86_EDI: x86Command += 0xF8; break;
-		case x86_ESP: x86Command += 0xE0; break;
-		case x86_EBP: x86Command += 0xE8; break;
-		}
-
-		PUTDST8(RSPRecompPos, x86Command);
-	}
-}
-
-void RSPMoveSxX86RegPtrDispToX86RegHalf(int32_t AddrReg, uint8_t Disp, int32_t Destination) {
-	OPCODE_REG_MREG_IMM8(16,0xBF0F,Destination,AddrReg,Disp);
-
-}
-
-
-void RSPMoveZxX86RegPtrDispToX86RegHalf(int32_t AddrReg, uint8_t Disp, int32_t Destination) {
-	OPCODE_REG_MREG_IMM8(16,0xB70F,Destination,AddrReg,Disp);
-}
-
-
-void RSPMoveX86regHalfToX86regPointerDisp(int32_t Source, int32_t AddrReg, uint8_t Disp) {
-	uint8_t x86Amb;
-
-	// CPU_Message(" mov word ptr [%s+%X], %s",x86_Name(AddrReg), Disp, x86Half_Name(Source));
-
-	switch (AddrReg&0xf) {
-	case x86_EAX: x86Amb = 0x00; break;
-	case x86_EBX: x86Amb = 0x03; break;
-	case x86_ECX: x86Amb = 0x01; break;
-	case x86_EDX: x86Amb = 0x02; break;
-	case x86_ESI: x86Amb = 0x06; break;
-	case x86_EDI: x86Amb = 0x07; break;
-	case x86_ESP: x86Amb = 0x04; break;
-	case x86_EBP: x86Amb = 0x05; break;
-	default: DisplayError("MoveX86regBytePointer\nUnknown x86 Register");
-	}
-
-	switch (Source&0xf) {
-	case x86_EAX: x86Amb += 0x00; break;
-	case x86_ECX: x86Amb += 0x08; break;
-	case x86_EDX: x86Amb += 0x10; break;
-	case x86_EBX: x86Amb += 0x18; break;
-	case x86_ESI: x86Amb += 0x30; break;
-	case x86_EDI: x86Amb += 0x38; break;
-	case x86_ESP: x86Amb += 0x20; break;
-	case x86_EBP: x86Amb += 0x28; break;
-	default: DisplayError("MoveX86regBytePointer\nUnknown x86 Register");
-	}
-
-	PUTDST16(RSPRecompPos, 0x8966);
-	PUTDST8(RSPRecompPos, x86Amb | 0x40);
-	PUTDST8(RSPRecompPos, Disp);
-}
-
-void RSPCondMoveEqual(int32_t Destination, int32_t Source) {
-	if (ConditionalMove == 0) {
-		uint8_t * Jump;
-		// CPU_Message(" [*]cmove %s, %s",x86_Name(Destination),x86_Name(Source));
-
-		RSPJneLabel8(0);
-		Jump = RSPRecompPos - 1;
-		RSPMoveX86RegToX86Reg(Source, Destination);
-		// CPU_Message(" label:");
-		RSPx86_SetBranch8b(Jump, RSPRecompPos);
-	} else {
-		uint8_t x86Command;
-		// CPU_Message(" cmove %s, %s",x86_Name(Destination),x86_Name(Source));
-
-		PUTDST16(RSPRecompPos,0x440F);
-
-		switch (Source&0xf) {
-		case x86_EAX: x86Command = 0x00; break;
-		case x86_EBX: x86Command = 0x03; break;
-		case x86_ECX: x86Command = 0x01; break;
-		case x86_EDX: x86Command = 0x02; break;
-		case x86_ESI: x86Command = 0x06; break;
-		case x86_EDI: x86Command = 0x07; break;
-		case x86_ESP: x86Command = 0x04; break;
-		case x86_EBP: x86Command = 0x05; break;
-		}
-
-		switch (Destination&0xf) {
-		case x86_EAX: x86Command += 0xC0; break;
-		case x86_EBX: x86Command += 0xD8; break;
-		case x86_ECX: x86Command += 0xC8; break;
-		case x86_EDX: x86Command += 0xD0; break;
-		case x86_ESI: x86Command += 0xF0; break;
-		case x86_EDI: x86Command += 0xF8; break;
-		case x86_ESP: x86Command += 0xE0; break;
-		case x86_EBP: x86Command += 0xE8; break;
-		}
-
-		PUTDST8(RSPRecompPos, x86Command);
-	}
-}
-
-
-void RSPCwd(void) {
-	// CPU_Message(" cwd");
-	PUTDST16(RSPRecompPos, 0x9966);
-}
-
-void RSPCwde(void) {
-	// CPU_Message(" cwde");
-	PUTDST8(RSPRecompPos, 0x98);
-}
-
-void RSPSubX86regFromVariable(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x29,x86reg,Variable);
-}
-
-void RSPJumpX86Reg( int32_t x86reg ) {
-	// CPU_Message(" jmp %s",x86_Name(x86reg));
-/*
-	switch (x86reg) {
-	case x86_EAX: PUTDST16(RSPRecompPos,0xe0ff); break;
-	case x86_EBX: PUTDST16(RSPRecompPos,0xe3ff); break;
-	case x86_ECX: PUTDST16(RSPRecompPos,0xe1ff); break;
-	case x86_EDX: PUTDST16(RSPRecompPos,0xe2ff); break;
-	case x86_ESI: PUTDST16(RSPRecompPos,0xe6ff); break;
-	case x86_EDI: PUTDST16(RSPRecompPos,0xe7ff); break;
-	default: DisplayError("JumpX86Reg: Unknown reg (%08x)", x86reg); Int3();
-	}*/
-	OPCODE_REG_REG(8,0xFF,OP_D4,x86reg);
-}
-
-
-
-
-void RSPJgeLabel8(uint8_t Value) {
-	PUTDST8(RSPRecompPos,0x7D);
-	PUTDST8(RSPRecompPos,Value);
-}
-

audacious-plugins-3.1.1.tar.bz2/src/usf/rsp_x86.h Deleted

@@ -1,552 +0,0 @@
-/*
- * RSP Compiler plug in for Project 64 (A Nintendo 64 emulator).
- *
- * (c) Copyright 2001 jabo (jabo@emulation64.com) and
- * zilmar (zilmar@emulation64.com)
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-/*enum x86RegValues {
-	x86_EAX = 0, x86_EBX = 1, x86_ECX = 2, x86_EDX = 3,
-	x86_ESI = 4, x86_EDI = 5, x86_EBP = 6, x86_ESP = 7
-};*/
-
-#include "types.h"
-
-enum mmxRegValues {
-	x86_MM0 = 1, x86_MM1 = 2, x86_MM2 = 3, x86_MM3 = 4,
-	x86_MM4 = 5, x86_MM5 = 6, x86_MM6 = 7, x86_MM7 = 8
-};
-
-enum sseRegValues {
-	x86_XMM0 = 1, x86_XMM1 = 2, x86_XMM2 = 3, x86_XMM3 = 4,
-	x86_XMM4 = 5, x86_XMM5 = 6, x86_XMM6 = 7, x86_XMM7 = 8
-};
-
-#ifdef USEX64
-enum x86RegValues {
-
- x86_Any	= 0,
- x86_EAX,x86_ECX,x86_EDX,x86_EBX,x86_ESP,x86_EBP,x86_ESI,x86_EDI,x86_Any8Bit=0x40,x64_Any = 0x40,
-
- x86_RAX = 0x11,x86_RCX,x86_RDX,x86_RBX,x86_RSP,x86_RBP,x86_RSI,x86_RDI,
-
-	x86_R8D = 0x21,x86_R9D,x86_R10D,x86_R11D,x86_R12D,x86_R13D,x86_R14D,x86_R15D,
-
-	x86_R8 = 0x31,x86_R9,x86_R10,x86_R11,x86_R12,x86_R13,x86_R14,x86_R15,
-
-};
-
-enum x86FpuValues {
-	x86_ST0,x86_ST1,x86_ST2,x86_ST3,x86_ST4,x86_ST5,x86_ST6,x86_ST7
-};
-
-#define	x86_TEMP		x86_R8
-#define	x86_TEMPD		x86_R8D
-
-#define OP_D0	1
-#define OP_D1	2
-#define OP_D2	3
-#define OP_D3	4
-#define OP_D4	5
-#define OP_D5	6
-#define OP_D6	7
-#define OP_D7	8
-
-#define	LOAD_VARIABLE(reg,variable) \
-	PUTDST8(RSPRecompPos, 0x48 | (((reg)&0x20)>>5)); \
-	PUTDST8(RSPRecompPos,0xB8 | ((reg)-1)&0xf); \
-	PUTDST64(RSPRecompPos,variable);
-
-// 	// 43 0F B6 0C 0D 40 83 C7 04 movzx ecx,byte ptr [r9+4C78340h]
-
-#define OPCODE_REG_REG(oplen,opcode,reg,rm) \
-	PUTDST8(RSPRecompPos, 0x40 | (((rm)&0x20)>>5) | ((((rm|reg))&0x10)>>1) | (((reg)&0x20)>>3)); \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0xC0 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3));
-
-#define OPCODE_REG_MREG(oplen,opcode,reg,rm) \
-	PUTDST8(RSPRecompPos, 0x40 | (((rm)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)); \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	if(((rm)&0xf)==0x6) { \
-		PUTDST8(RSPRecompPos, 0x40 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-		PUTDST8(RSPRecompPos, 0); \
-	} else if(((rm)&0xf)==0x5) { \
-		PUTDST8(RSPRecompPos, 0x0 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-		PUTDST8(RSPRecompPos, 0x24); \
-	} else { \
-		PUTDST8(RSPRecompPos, 0x00 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-	}
-
-#define OPCODE_REG_MREG_IMM32(oplen,opcode,reg,rm,imm32) \
-	PUTDST8(RSPRecompPos, 0x40 | (((rm)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)); \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	if(((rm)&0xf)==0x5) { \
-		PUTDST8(RSPRecompPos, 0x80 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-		PUTDST8(RSPRecompPos, 0x24); \
-	} else { \
-		PUTDST8(RSPRecompPos, 0x80 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-	} \
-	PUTDST32(RSPRecompPos,imm32);
-
-#define OPCODE_REG_BASE_INDEX(oplen,opcode,reg,base,index) \
- PUTDST8(RSPRecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	if(((base)&0xf)!=0x6) { \
-	PUTDST8(RSPRecompPos, 0x04 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, 0x00 | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	} else {\
-	PUTDST8(RSPRecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, 0x00 | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST8(RSPRecompPos, 0); \
-	}
-
-#define OPCODE_REG_MREG_IMM8(oplen,opcode,reg,rm,imm8) \
-	PUTDST8(RSPRecompPos, 0x40 | (((rm)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)); \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x40 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos,imm8);
-
-/*scale is: 0=1,0x40=2,0x80=4,0xc0=8 ??*/
-
-#define OPCODE_REG_INDEX_SCALE(oplen,opcode,reg,base,index,scale) \
- PUTDST8(RSPRecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x04 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, (((scale)-1)*0x40) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) );
-
-#define OPCODE_REG_BASE_INDEX_SCALE(oplen,opcode,reg,base,index,scale) \
- PUTDST8(RSPRecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x04 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, (scale) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) );
-
-#define OPCODE_REG_BASE_INDEX_SCALE_IMM32(oplen,opcode,reg,base,index,scale,imm32) \
- PUTDST8(RSPRecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x84 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, (scale) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST32(RSPRecompPos,imm32);
-
-#define OPCODE_REG_BASE_INDEX_SCALE_IMM8(oplen,opcode,reg,base,index,scale,imm32) \
- PUTDST8(RSPRecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, (scale) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST32(RSPRecompPos,imm32);
-
-
-
-#define OPCODE_REG_BASE_INDEX_IMM8(oplen,opcode,reg,base,index,imm8) \
- PUTDST8(RSPRecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST8(RSPRecompPos, imm8);
-
-#define OPCODE_REG_BASE_INDEX_IMM32(oplen,opcode,reg,base,index,imm32) \
- PUTDST8(RSPRecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x84 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST32(RSPRecompPos, imm32);
-
-#else
-
-enum x86RegValues {
-
- x86_Any	= 0,
- x86_EAX,x86_ECX,x86_EDX,x86_EBX,x86_ESP,x86_EBP,x86_ESI,x86_EDI,x86_Any8Bit=0x40,x64_Any = 0x0,
- x86_RAX = 0x1,x86_RCX,x86_RDX,x86_RBX,x86_RSP,x86_RBP,x86_RSI,x86_RDI,
-
-};
-
-enum x86FpuValues {
-	x86_ST0,x86_ST1,x86_ST2,x86_ST3,x86_ST4,x86_ST5,x86_ST6,x86_ST7
-};
-
-
-#define OP_D0	1
-#define OP_D1	2
-#define OP_D2	3
-#define OP_D3	4
-#define OP_D4	5
-#define OP_D5	6
-#define OP_D6	7
-#define OP_D7	8
-
-// 	// 43 0F B6 0C 0D 40 83 C7 04 movzx ecx,byte ptr [r9+4C78340h]
-
-
-#define OPCODE_REG_DISP(oplen,opcode,reg,disp32) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x5 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST32(RSPRecompPos,disp32);
-
-
-#define OPCODE_REG_REG(oplen,opcode,reg,rm) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0xC0 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3));
-
-#define OPCODE_REG_MREG(oplen,opcode,reg,rm) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	if(((rm)&0xf)==0x6) { \
-		PUTDST8(RSPRecompPos, 0x40 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-		PUTDST8(RSPRecompPos, 0); \
-	} else if(((rm)&0xf)==0x5) { \
-		PUTDST8(RSPRecompPos, 0x0 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-		PUTDST8(RSPRecompPos, 0x24); \
-	} else { \
-		PUTDST8(RSPRecompPos, 0x00 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-	}
-
-#define OPCODE_REG_MREG_IMM32(oplen,opcode,reg,rm,imm32) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	if(((rm)&0xf)==0x5) { \
-		PUTDST8(RSPRecompPos, 0x80 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-		PUTDST8(RSPRecompPos, 0x24); \
-	} else { \
-		PUTDST8(RSPRecompPos, 0x80 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-	} \
-	PUTDST32(RSPRecompPos,imm32);
-
-#define OPCODE_REG_BASE_INDEX(oplen,opcode,reg,base,index) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	if(((base)&0xf)!=0x6) { \
-	PUTDST8(RSPRecompPos, 0x04 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, 0x00 | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	} else {\
-	PUTDST8(RSPRecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, 0x00 | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST8(RSPRecompPos, 0); \
-	}
-
-#define OPCODE_REG_MREG_IMM8(oplen,opcode,reg,rm,imm8) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x40 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos,imm8);
-
-#define OPCODE_REG_INDEX_SCALE(oplen,opcode,reg,base,index,scale) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x04 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, (((scale)-1)*0x40) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) );
-
-#define OPCODE_REG_BASE_INDEX_SCALE(oplen,opcode,reg,base,index,scale) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x04 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, (scale) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) );
-
-#define OPCODE_REG_BASE_INDEX_SCALE_IMM32(oplen,opcode,reg,base,index,scale,imm32) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x84 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, (scale) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST32(RSPRecompPos,imm32);
-
-#define OPCODE_REG_BASE_INDEX_SCALE_IMM8(oplen,opcode,reg,base,index,scale,imm32) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, (scale) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST32(RSPRecompPos,imm32);
-
-
-#define OPCODE_REG_BASE_INDEX_IMM8(oplen,opcode,reg,base,index,imm8) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST8(RSPRecompPos, imm8);
-
-#define OPCODE_REG_BASE_INDEX_IMM32(oplen,opcode,reg,base,index,imm32) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x84 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST32(RSPRecompPos, imm32);
-
-#define OPCODE_REG_INDEX_SCALE_IMM32(oplen,opcode,reg,index,scale,imm32) \
-	PUTDST##oplen (RSPRecompPos, opcode); \
-	PUTDST8(RSPRecompPos, 0x4 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RSPRecompPos, 0x5 | (scale) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST32(RSPRecompPos,imm32);
-
-#endif
-
-
-#ifndef USEX64
-
-#define OPCODE_REG_VARIABLE(PREFIX,oplen,opcode,reg,variable) \
-	PREFIX \
-	OPCODE_REG_DISP(oplen,opcode,reg,variable);
-
-#define OPCODE_REG_ADDR_DMEM(PREFIX,oplen,opcode,reg,addr) \
-	PREFIX \
-	OPCODE_REG_MREG_IMM32(oplen,opcode,reg,addr,DMEM);
-
-#else
-
-#define OPCODE_REG_VARIABLE(PREFIX,oplen,opcode,reg,Variable) \
-	if(((uintptr_t)(Variable) - (uintptr_t)TLB_Map) < 0x7FFFFFFF) { \
-		PREFIX \
-		OPCODE_REG_MREG_IMM32(oplen,opcode,reg,x86_R15,(uintptr_t)(Variable) - (uintptr_t)TLB_Map); \
- } else { \
- 	LOAD_VARIABLE(x86_TEMP, (Variable)); \
- 	PREFIX \
- 	OPCODE_REG_MREG(oplen,opcode,reg,x86_TEMP); \
- }
-
-#define OPCODE_REG_ADDR_DMEM(PREFIX,oplen,opcode,reg,addr) \
-	if(((uintptr_t)(DMEM) - (uintptr_t)TLB_Map) < 0x7FFFFFFF) { \
-		PREFIX \
-		OPCODE_REG_BASE_INDEX_IMM32(oplen,opcode,reg,x86_R15,addr,(uintptr_t)(DMEM) - (uintptr_t)TLB_Map); \
- } else { \
- 	LOAD_VARIABLE(x86_TEMP, (DMEM)); \
- 	PREFIX \
- 	OPCODE_REG_BASE_INDEX(oplen,opcode,reg,x86_TEMP,addr); \
- }
-
-#endif
-
-#ifdef USEX64
-	#define LOAD_FROM_DMEM(dstreg,srcreg) MoveX86RegDispToX86Reg(dstreg, x86_R15, srcreg, 8);
-#else
-	#define LOAD_FROM_DMEM(dstreg,srcreg) MoveVariableDispToX86Reg(DMEM,dstreg,srcreg,4);
-#endif
-
-
-void RSPAdcX86RegToX86Reg				( int32_t Destination, int32_t Source );
-void RSPAdcX86regToVariable			( int32_t x86reg, void * Variable );
-void RSPAdcX86regHalfToVariable		( int32_t x86reg, void * Variable );
-void RSPAdcConstToX86reg				( uint8_t Constant, int32_t x86reg );
-void RSPAdcConstToVariable				( void *Variable, uint8_t Constant );
-void RSPAdcConstHalfToVariable			( void *Variable, uint8_t Constant );
-void RSPAddConstToVariable				( uint32_t Const, void *Variable );
-void RSPAddConstToX86Reg				( int32_t x86Reg, uint32_t Const );
-void RSPAddQwordToX86Reg (int32_t x86reg, uint64_t Const);
-void RSPAddVariableToX86reg			( int32_t x86reg, void * Variable );
-void RSPAddX86regToVariable			( int32_t x86reg, void * Variable );
-void RSPAddX86regHalfToVariable		( int32_t x86reg, void * Variable );
-void RSPAddX86RegToX86Reg				( int32_t Destination, int32_t Source );
-void RSPAndConstToVariable				( uint32_t Const, void *Variable );
-void RSPAndConstToX86Reg				( int32_t x86Reg, uint32_t Const );
-void RSPAndVariableToX86Reg			( void * Variable, int32_t x86Reg );
-void RSPAndVariableToX86regHalf		( void * Variable, int32_t x86Reg );
-void RSPAndX86RegToVariable			( void * Variable, int32_t x86Reg );
-void RSPAndX86RegToX86Reg				( int32_t Destination, int32_t Source );
-void RSPAndX86RegHalfToX86RegHalf		( int32_t Destination, int32_t Source );
-void RSPBreakPoint (void);
-void RSPCall_Direct					( void * FunctAddress );
-void RSPCall_Indirect					( void * FunctAddress );
-void RSPCondMoveEqual					( int32_t Destination, int32_t Source );
-void RSPCondMoveNotEqual				( int32_t Destination, int32_t Source );
-void RSPCondMoveGreater				( int32_t Destination, int32_t Source );
-void RSPCondMoveGreaterEqual			( int32_t Destination, int32_t Source );
-void RSPCondMoveLess					( int32_t Destination, int32_t Source );
-void RSPCondMoveLessEqual				( int32_t Destination, int32_t Source );
-void RSPCompConstToVariable			( uint32_t Const, void * Variable );
-void RSPCompConstHalfToVariable		( uint16_t Const, void * Variable );
-void RSPCompConstToX86reg				( int32_t x86Reg, uint32_t Const );
-void RSPCompX86regToVariable			( int32_t x86Reg, void * Variable );
-void RSPCompVariableToX86reg			( int32_t x86Reg, void * Variable );
-void RSPCompX86RegToX86Reg				( int32_t Destination, int32_t Source );
-void RSPMoveConstQwordToX86reg		 ( uintptr_t, int32_t);
-void RSPCwd							( void );
-void RSPCwde							( void );
-void RSPDecX86reg						( int32_t x86Reg );
-void RSPDivX86reg						( int32_t x86reg );
-void RSPidivX86reg						( int32_t x86reg );
-void RSPimulX86reg						( int32_t x86reg );
-void RSPImulX86RegToX86Reg				( int32_t Destination, int32_t Source );
-void RSPIncX86reg						( int32_t x86Reg );
-void RSPJaeLabel32						( uint32_t Value );
-void RSPJaLabel8						( uint8_t Value );
-void RSPJaLabel32						( uint32_t Value );
-void RSPJbLabel8						( uint8_t Value );
-void RSPJbLabel32						( uint32_t Value );
-void RSPJeLabel8						( uint8_t Value );
-void RSPJeLabel32						( uint32_t Value );
-void RSPJgeLabel8						( uint8_t Value );
-void RSPJgeLabel32						( uint32_t Value );
-void RSPJgLabel8						( uint8_t Value );
-void RSPJgLabel32						( uint32_t Value );
-void RSPJleLabel8						( uint8_t Value );
-void RSPJleLabel32						( uint32_t Value );
-void RSPJlLabel8						( uint8_t Value );
-void RSPJlLabel32						( uint32_t Value );
-void RSPJumpX86Reg						( int32_t x86reg );
-void RSPJmpLabel8						( uint8_t Value );
-void RSPJmpLabel32						( uint32_t Value);
-void RSPJneLabel8						( uint8_t Value );
-void RSPJneLabel32						( uint32_t Value );
-void RSPJnsLabel8						( uint8_t Value );
-void RSPJnsLabel32						( uint32_t Value );
-void RSPJsLabel32						( uint32_t Value );
-void RSPLeaSourceAndOffset				( int32_t x86DestReg, int32_t x86SourceReg, int32_t offset );
-void RSPMoveConstByteToN64Mem			( uint8_t Const, int32_t AddrReg );
-void RSPMoveConstHalfToN64Mem			( uint16_t Const, int32_t AddrReg );
-void RSPMoveConstByteToVariable		( uint8_t Const,void *Variable );
-void RSPMoveConstHalfToVariable		( uint16_t Const, void *Variable );
-void RSPMoveConstToN64Mem				( uint32_t Const, int32_t AddrReg );
-void RSPMoveConstToN64MemDisp			( uint32_t Const, int32_t AddrReg, uint8_t Disp );
-void RSPMoveConstToVariable			( uint32_t Const, void *Variable );
-void RSPMoveConstToX86reg				( uint32_t Const, int32_t x86reg );
-void RSPMoveOffsetToX86reg				( uint32_t Const, int32_t x86reg );
-void RSPMoveX86regByteToX86regPointer	( int32_t Source, int32_t AddrReg );
-void RSPMoveX86regHalfToX86regPointer	( int32_t Source, int32_t AddrReg );
-void RSPMoveX86regHalfToX86regPointerDisp ( int32_t Source, int32_t AddrReg, uint8_t Disp);
-void RSPMoveX86regToX86regPointer		( int32_t Source, int32_t AddrReg );
-void RSPMoveX86RegToX86regPointerDisp	( int32_t Source, int32_t AddrReg, uint8_t Disp );
-void RSPMoveX86regPointerToX86regByte	( int32_t Destination, int32_t AddrReg );
-void RSPMoveX86regPointerToX86regHalf	( int32_t Destination, int32_t AddrReg );
-void RSPMoveX86regPointerToX86reg		( int32_t Destination, int32_t AddrReg );
-void RSPMoveN64MemDispToX86reg			( int32_t x86reg, int32_t AddrReg, uint8_t Disp );
-void RSPMoveN64MemToX86reg				( int32_t x86reg, int32_t AddrReg );
-void RSPMoveN64MemToX86regByte			( int32_t x86reg, int32_t AddrReg );
-void RSPMoveN64MemToX86regHalf			( int32_t x86reg, int32_t AddrReg );
-void RSPMoveX86regByteToN64Mem			( int32_t x86reg, int32_t AddrReg );
-void RSPMoveX86regByteToVariable		( int32_t x86reg, void * Variable );
-void RSPMoveX86regHalfToN64Mem			( int32_t x86reg, int32_t AddrReg );
-void RSPMoveX86regHalfToVariable		( int32_t x86reg, void * Variable );
-void RSPMoveX86regToN64Mem				( int32_t x86reg, int32_t AddrReg );
-void RSPMoveX86regToN64MemDisp			( int32_t x86reg, int32_t AddrReg, uint8_t Disp );
-void RSPMoveX86regToVariable			( int32_t x86reg, void * Variable );
-void RSPMoveX86RegToX86Reg				( int32_t Source, int32_t Destination );
-void RSPMoveVariableToX86reg			( void *Variable, int32_t x86reg );
-void RSPMoveVariableToX86regByte		( void *Variable, int32_t x86reg );
-void RSPMoveVariableToX86regHalf		( void *Variable, int32_t x86reg );
-void RSPMoveSxX86RegHalfToX86Reg		( int32_t Source, int32_t Destination );
-void RSPMoveSxX86RegPtrDispToX86RegHalf( int32_t AddrReg, uint8_t Disp, int32_t Destination );
-void RSPMoveSxN64MemToX86regByte		( int32_t x86reg, int32_t AddrReg );
-void RSPMoveSxN64MemToX86regHalf		( int32_t x86reg, int32_t AddrReg );
-void RSPMoveSxVariableToX86regHalf		( void *Variable, int32_t x86reg );
-void RSPMoveZxX86RegHalfToX86Reg		( int32_t Source, int32_t Destination );
-void RSPMoveZxX86RegPtrDispToX86RegHalf( int32_t AddrReg, uint8_t Disp, int32_t Destination );
-void RSPMoveZxN64MemToX86regByte		( int32_t x86reg, int32_t AddrReg );
-void RSPMoveZxN64MemToX86regHalf		( int32_t x86reg, int32_t AddrReg );
-void RSPMoveZxVariableToX86regHalf		( void *Variable, int32_t x86reg );
-void RSPMulX86reg						( int32_t x86reg );
-void RSPNegateX86reg					( int32_t x86reg );
-void RSPOrConstToVariable				( uint32_t Const, void * Variable );
-void RSPOrConstToX86Reg				( uint32_t Const, int32_t x86Reg );
-void RSPOrVariableToX86Reg				( void * Variable, int32_t x86Reg );
-void RSPOrVariableToX86regHalf			( void * Variable, int32_t x86Reg );
-void RSPOrX86RegToVariable				( void * Variable, int32_t x86Reg );
-void RSPOrX86RegToX86Reg				( int32_t Destination, int32_t Source );
-void RSPPopad							( void );
-void RSPPushad							( void );
-void RSPPush							( int32_t x86reg );
-void RSPPop							( int32_t x86reg );
-void RSPPushImm32						( uint32_t Value );
-void RSPRet							( void );
-void RSPSeta							( int32_t x86reg );
-void RSPSetae							( int32_t x86reg );
-void RSPSetl							( int32_t x86reg );
-void RSPSetb							( int32_t x86reg );
-void RSPSetg							( int32_t x86reg );
-void RSPSetz							( int32_t x86reg );
-void RSPSetnz							( int32_t x86reg );
-void RSPSetlVariable					( void * Variable );
-void RSPSetleVariable					( void * Variable );
-void RSPSetgVariable					( void * Variable );
-void RSPSetgeVariable					( void * Variable );
-void RSPSetbVariable					( void * Variable );
-void RSPSetaVariable					( void * Variable );
-void RSPSetzVariable					( void * Variable );
-void RSPSetnzVariable					( void * Variable );
-void RSPShiftLeftSign					( int32_t x86reg );
-void RSPShiftLeftSignImmed				( int32_t x86reg, uint8_t Immediate );
-void RSPShiftLeftSignVariableImmed		( void *Variable, uint8_t Immediate );
-void RSPShiftRightSignImmed			( int32_t x86reg, uint8_t Immediate );
-void RSPShiftRightSignVariableImmed	( void *Variable, uint8_t Immediate );
-void RSPShiftRightUnsign				( int32_t x86reg );
-void RSPShiftRightUnsignImmed			( int32_t x86reg, uint8_t Immediate );
-void RSPShiftRightUnsignVariableImmed	( void *Variable, uint8_t Immediate );
-void RSPShiftLeftDoubleImmed			( int32_t Destination, int32_t Source, uint8_t Immediate );
-void RSPShiftRightDoubleImmed			( int32_t Destination, int32_t Source, uint8_t Immediate );
-void RSPSubConstFromVariable			( uint32_t Const, void *Variable );
-void RSPSubConstFromX86Reg				( int32_t x86Reg, uint32_t Const );
-void RSPSubVariableFromX86reg			( int32_t x86reg, void * Variable );
-void RSPSubX86RegToX86Reg				( int32_t Destination, int32_t Source );
-void RSPSubX86regFromVariable			( int32_t x86reg, void * Variable );
-void RSPSbbX86RegToX86Reg				( int32_t Destination, int32_t Source );
-void RSPTestConstToVariable			( uint32_t Const, void * Variable );
-void RSPTestConstToX86Reg				( uint32_t Const, int32_t x86reg );
-void RSPTestX86RegToX86Reg				( int32_t Destination, int32_t Source );
-void RSPXorConstToX86Reg				( int32_t x86Reg, uint32_t Const );
-void RSPXorX86RegToX86Reg				( int32_t Source, int32_t Destination );
-void RSPXorVariableToX86reg			( void *Variable, int32_t x86reg );
-void RSPXorX86RegToVariable			( void *Variable, int32_t x86reg );
-void RSPXorConstToVariable				( void *Variable, uint32_t Const );
-
-#define _MMX_SHUFFLE(a, b, c, d)	\
-	((uint8_t)(((a) << 6) | ((b) << 4) | ((c) << 2) | (d)))
-
-void RSPMmxMoveRegToReg				( int32_t Dest, int32_t Source );
-void RSPMmxMoveQwordRegToVariable		( int32_t Dest, void *Variable );
-void RSPMmxMoveQwordVariableToReg		( int32_t Dest, void *Variable );
-void RSPMmxPandRegToReg				( int32_t Dest, int32_t Source );
-void RSPMmxPandnRegToReg				( int32_t Dest, int32_t Source );
-void RSPMmxPandVariableToReg			( void * Variable, int32_t Dest );
-void RSPMmxPorRegToReg					( int32_t Dest, int32_t Source );
-void RSPMmxPorVariableToReg			( void * Variable, int32_t Dest );
-void RSPMmxXorRegToReg					( int32_t Dest, int32_t Source );
-void RSPMmxShuffleMemoryToReg			( int32_t Dest, void * Variable, uint8_t Immed );
-void RSPMmxPmullwRegToReg				( int32_t Dest, int32_t Source );
-void RSPMmxPmullwVariableToReg			( int32_t Dest, void * Variable );
-void RSPMmxPmulhuwRegToReg				( int32_t Dest, int32_t Source );
-void RSPMmxPmulhwRegToReg				( int32_t Dest, int32_t Source );
-void RSPMmxPmulhwRegToVariable			( int32_t Dest, void * Variable );
-void RSPMmxPsrlwImmed					( int32_t Dest, uint8_t Immed );
-void RSPMmxPsrawImmed					( int32_t Dest, uint8_t Immed );
-void RSPMmxPsllwImmed					( int32_t Dest, uint8_t Immed );
-void RSPMmxPaddswRegToReg				( int32_t Dest, int32_t Source );
-void RSPMmxPaddswVariableToReg			( int32_t Dest, void * Variable );
-void RSPMmxPaddwRegToReg				( int32_t Dest, int32_t Source );
-void RSPMmxPackSignedDwords			( int32_t Dest, int32_t Source );
-void RSPMmxUnpackLowWord				( int32_t Dest, int32_t Source );
-void RSPMmxUnpackHighWord				( int32_t Dest, int32_t Source );
-void RSPMmxCompareGreaterWordRegToReg	( int32_t Dest, int32_t Source );
-void RSPMmxEmptyMultimediaState		( void );
-
-void RSPSseMoveAlignedVariableToReg	( void *Variable, int32_t sseReg );
-void RSPSseMoveAlignedRegToVariable	( int32_t sseReg, void *Variable );
-void RSPSseMoveAlignedN64MemToReg		( int32_t sseReg, int32_t AddrReg );
-void RSPSseMoveAlignedRegToN64Mem		( int32_t sseReg, int32_t AddrReg );
-void RSPSseMoveUnalignedVariableToReg	( void *Variable, int32_t sseReg );
-void RSPSseMoveUnalignedRegToVariable	( int32_t sseReg, void *Variable );
-void RSPSseMoveUnalignedN64MemToReg	( int32_t sseReg, int32_t AddrReg );
-void RSPSseMoveUnalignedRegToN64Mem	( int32_t sseReg, int32_t AddrReg );
-void RSPSseMoveRegToReg				( int32_t Dest, int32_t Source );
-void RSPSseXorRegToReg					( int32_t Dest, int32_t Source );
-
-typedef struct {
-	union {
-		struct {
-			unsigned Reg0 : 2;
-			unsigned Reg1 : 2;
-			unsigned Reg2 : 2;
-			unsigned Reg3 : 2;
-		};
-		unsigned UB:8;
-	};
-} SHUFFLE;
-
-void RSPSseShuffleReg					( int32_t Dest, int32_t Source, uint8_t Immed );
-
-void RSPx86_SetBranch32b(void * JumpByte, void * Destination);
-void RSPx86_SetBranch8b(void * JumpByte, void * Destination);
\ No newline at end of file

audacious-plugins-3.1.1.tar.bz2/src/usf/tlb.c Deleted

@@ -1,200 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include "main.h"
-#include "cpu.h"
-
-void SetupTLB_Entry (int32_t Entry);
-
-FASTTLB FastTlb[64];
-TLB tlb[32];
-
-uint32_t AddressDefined ( uintptr_t VAddr) {
-	uint32_t i;
-
-	if (VAddr >= 0x80000000 && VAddr <= 0xBFFFFFFF) {
-		return 1;
-	}
-
-	for (i = 0; i < 64; i++) {
-		if (FastTlb[i].ValidEntry == 0) { continue; }
-		if (VAddr >= FastTlb[i].VSTART && VAddr <= FastTlb[i].VEND) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
-void InitilizeTLB (void) {
-	uint32_t count;
-
-	for (count = 0; count < 32; count++) { tlb[count].EntryDefined = 0; }
-	for (count = 0; count < 64; count++) { FastTlb[count].ValidEntry = 0; }
-	SetupTLB();
-}
-
-void SetupTLB (void) {
-	uint32_t count;
-
-	memset(TLB_Map,0,(0xFFFFF * sizeof(uintptr_t)));
-	for (count = 0x80000000; count < 0xC0000000; count += 0x1000) {
-		TLB_Map[count >> 12] = ((uintptr_t)N64MEM + (count & 0x1FFFFFFF)) - count;
-	}
-	for (count = 0; count < 32; count ++) { SetupTLB_Entry(count); }
-}
-/*
-test=(BYTE *) VirtualAlloc( 0x10, 0x70000, MEM_RESERVE, PAGE_EXECUTE_READWRITE);
-	if(test == 0) {
-		printf("FAIL!\n");
-		exit(0);
-	}
-*/
-
-void SetupTLB_Entry (int Entry) {
-	uint32_t FastIndx;
-
-
-	if (!tlb[Entry].EntryDefined) { return; }
-	FastIndx = Entry << 1;
-	FastTlb[FastIndx].VSTART=tlb[Entry].EntryHi.VPN2 << 13;
-	FastTlb[FastIndx].VEND = FastTlb[FastIndx].VSTART + (tlb[Entry].PageMask.Mask << 12) + 0xFFF;
-	FastTlb[FastIndx].PHYSSTART = tlb[Entry].EntryLo0.PFN << 12;
-	FastTlb[FastIndx].VALID = tlb[Entry].EntryLo0.V;
-	FastTlb[FastIndx].DIRTY = tlb[Entry].EntryLo0.D;
-	FastTlb[FastIndx].GLOBAL = tlb[Entry].EntryLo0.GLOBAL & tlb[Entry].EntryLo1.GLOBAL;
-	FastTlb[FastIndx].ValidEntry = 0;
-
-	FastIndx = (Entry << 1) + 1;
-	FastTlb[FastIndx].VSTART=(tlb[Entry].EntryHi.VPN2 << 13) + ((tlb[Entry].PageMask.Mask << 12) + 0xFFF + 1);
-	FastTlb[FastIndx].VEND = FastTlb[FastIndx].VSTART + (tlb[Entry].PageMask.Mask << 12) + 0xFFF;
-	FastTlb[FastIndx].PHYSSTART = tlb[Entry].EntryLo1.PFN << 12;
-	FastTlb[FastIndx].VALID = tlb[Entry].EntryLo1.V;
-	FastTlb[FastIndx].DIRTY = tlb[Entry].EntryLo1.D;
-	FastTlb[FastIndx].GLOBAL = tlb[Entry].EntryLo0.GLOBAL & tlb[Entry].EntryLo1.GLOBAL;
-	FastTlb[FastIndx].ValidEntry = 0;
-
-	for ( FastIndx = Entry << 1; FastIndx <= (Entry << 1) + 1; FastIndx++) {
-		uint32_t count;
-
-		if (!FastTlb[FastIndx].VALID) {
-			FastTlb[FastIndx].ValidEntry = 1;
-			continue;
-		}
-		if (FastTlb[FastIndx].VEND <= FastTlb[FastIndx].VSTART) {
-			continue;
-		}
-		if (FastTlb[FastIndx].VSTART >= 0x80000000 && FastTlb[FastIndx].VEND <= 0xBFFFFFFF) {
-			continue;
-		}
-		if (FastTlb[FastIndx].PHYSSTART > 0x1FFFFFFF) {
-			continue;
-		}
-
-
-		//exit(0);
- //"c:\music\xsf\usf\pdusf\03 - Carrington Institute.miniusf"
- //"c:\music\xsf\usf\pdusf\03 - Carrington Institute.miniusf"
-
-
-		//test if overlap
-		FastTlb[FastIndx].ValidEntry = 1;
-		for (count = FastTlb[FastIndx].VSTART; count < FastTlb[FastIndx].VEND; count += 0x1000) {
-			TLB_Map[count >> 12] = ((uintptr_t)N64MEM + (count - FastTlb[FastIndx].VSTART + FastTlb[FastIndx].PHYSSTART)) - count;
-		}
-	}
-}
-
-void TLB_Probe (void) {
-	uint32_t Counter;
-
-
-	INDEX_REGISTER |= 0x80000000;
-	for (Counter = 0; Counter < 32; Counter ++) {
-		uint32_t TlbValue = tlb[Counter].EntryHi.Value & (~tlb[Counter].PageMask.Mask << 13);
-		uint32_t EntryHi = ENTRYHI_REGISTER & (~tlb[Counter].PageMask.Mask << 13);
-
-		if (TlbValue == EntryHi) {
-			uint32_t Global = (tlb[Counter].EntryHi.Value & 0x100) != 0;
-			uint32_t SameAsid = ((tlb[Counter].EntryHi.Value & 0xFF) == (ENTRYHI_REGISTER & 0xFF));
-
-			if (Global || SameAsid) {
-				INDEX_REGISTER = Counter;
-				return;
-			}
-		}
-	}
-}
-
-void TLB_Read (void) {
-	uint32_t index = INDEX_REGISTER & 0x1F;
-
-	PAGE_MASK_REGISTER = tlb[index].PageMask.Value ;
-	ENTRYHI_REGISTER = (tlb[index].EntryHi.Value & ~tlb[index].PageMask.Value) ;
-	ENTRYLO0_REGISTER = tlb[index].EntryLo0.Value;
-	ENTRYLO1_REGISTER = tlb[index].EntryLo1.Value;
-}
-
-uint32_t TranslateVaddr ( uintptr_t * Addr) {
-	if (TLB_Map[((*Addr) & 0xffffffff) >> 12] == 0) { return 0; }
-	*Addr = (uintptr_t)((uint8_t *)(TLB_Map[((*Addr) & 0xffffffff) >> 12] + ((*Addr) & 0xffffffff)) - (uintptr_t)N64MEM);
-	return 1;
-}
-
-void WriteTLBEntry (int32_t index) {
-	uint32_t FastIndx;
-
-	FastIndx = index << 1;
-	if ((PROGRAM_COUNTER >= FastTlb[FastIndx].VSTART &&
-		PROGRAM_COUNTER < FastTlb[FastIndx].VEND &&
-		FastTlb[FastIndx].ValidEntry && FastTlb[FastIndx].VALID)
-		||
-		(PROGRAM_COUNTER >= FastTlb[FastIndx + 1].VSTART &&
-		PROGRAM_COUNTER < FastTlb[FastIndx + 1].VEND &&
-		FastTlb[FastIndx + 1].ValidEntry && FastTlb[FastIndx + 1].VALID))
-	{
-		return;
-	}
-
-	if (tlb[index].EntryDefined) {
-		uint32_t count;
-
-		for ( FastIndx = index << 1; FastIndx <= (index << 1) + 1; FastIndx++) {
-			if (!FastTlb[FastIndx].ValidEntry) { continue; }
-			if (!FastTlb[FastIndx].VALID) { continue; }
-			for (count = FastTlb[FastIndx].VSTART; count < FastTlb[FastIndx].VEND; count += 0x1000) {
-				TLB_Map[count >> 12] = 0;
-			}
-		}
-	}
-	tlb[index].PageMask.Value = PAGE_MASK_REGISTER;
-	tlb[index].EntryHi.Value = ENTRYHI_REGISTER;
-	tlb[index].EntryLo0.Value = ENTRYLO0_REGISTER;
-	tlb[index].EntryLo1.Value = ENTRYLO1_REGISTER;
-	tlb[index].EntryDefined = 1;
-
-
-	SetupTLB_Entry(index);
-}

audacious-plugins-3.1.1.tar.bz2/src/usf/tlb.h Deleted

@@ -1,108 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#ifndef _TLB_H_
-#define _TLB_H_
-
-typedef struct {
-	uint32_t EntryDefined;
-	union {
-		uint32_t Value;
-		uint8_t A[4];
-
-		struct {
-			unsigned zero : 13;
-			unsigned Mask : 12;
-			unsigned zero2 : 7;
-		} ;
-
-	} PageMask;
-
-	union {
-		uint32_t Value;
-		uint8_t A[4];
-
-		struct {
-			unsigned ASID : 8;
-			unsigned Zero : 4;
-			unsigned G : 1;
-			unsigned VPN2 : 19;
-		};
-
-	} EntryHi;
-
-	union {
-		uint32_t Value;
-		uint8_t A[4];
-
-		struct {
-			unsigned GLOBAL: 1;
-			unsigned V : 1;
-			unsigned D : 1;
-			unsigned C : 3;
-			unsigned PFN : 20;
-			unsigned ZERO: 6;
-		};
-
-	} EntryLo0;
-
-	union {
-		uint32_t Value;
-		uint8_t A[4];
-
-		struct {
-			unsigned GLOBAL: 1;
-			unsigned V : 1;
-			unsigned D : 1;
-			unsigned C : 3;
-			unsigned PFN : 20;
-			unsigned ZERO: 6;
-		} ;
-
-	} EntryLo1;
-} TLB;
-
-typedef struct {
-   uint32_t VSTART;
-   uint32_t VEND;
-   uint32_t PHYSSTART;
-   uint32_t VALID;
-   uint32_t DIRTY;
-   uint32_t GLOBAL;
-   uint32_t ValidEntry;
-} FASTTLB;
-
-extern FASTTLB FastTlb[64];
-extern TLB tlb[32];
-
-uint32_t AddressDefined ( uintptr_t VAddr);
-void InitilizeTLB   ( void );
-void SetupTLB       ( void );
-void TLB_Probe      ( void );
-void TLB_Read       ( void );
-uint32_t TranslateVaddr ( uintptr_t * Addr);
-void WriteTLBEntry  ( int32_t index );
-
-#endif

audacious-plugins-3.1.1.tar.bz2/src/usf/types.h Deleted

@@ -1,77 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#ifndef __Types_h
-#define __Types_h
-
-#ifdef __LP64__
-#define USEX64
-#define EXTREGS
-#endif
-
-#include <stdint.h>
-typedef uint64_t QWORD;
-
-typedef union tagVect {
-	double				FD[2];
-	int64_t				DW[2];
-	uint64_t			UDW[2];
-	int32_t				W[4];
-	float				FS[4];
-	uint32_t			UW[4];
-	int16_t				HW[8];
-	uint16_t			UHW[8];
-	int8_t				B[16];
-	uint8_t				UB[16];
-} VECTOR;
-
-typedef union tagUWORD {
-	int32_t		W;
-	uint32_t	UW;
-	int16_t		HW[2];
-	uint16_t	UHW[2];
-	int8_t		B[4];
-	uint8_t		UB[4];
-	float F;
-} MIPS_WORD;
-
-typedef union tagUDWORD {
-	double				D;
-	int64_t				DW;
-	uint64_t			UDW;
-	int32_t				W[2];
-	uint32_t			UW[2];
-	int16_t				HW[4];
-	uint16_t			UHW[4];
-	int8_t				B[8];
-	uint8_t				UB[8];
-	float 				F[2];
-} MIPS_DWORD;
-
-typedef MIPS_WORD	MIPSUWORD;
-typedef MIPS_DWORD	MIPSUDWORD;
-
-
-#endif

audacious-plugins-3.1.1.tar.bz2/src/usf/usf.c Deleted

@@ -1,504 +0,0 @@
-
-#include <stdint.h>
-#include "usf.h"
-#include "cpu.h"
-#include "memory.h"
-#include "audio.h"
-#include "psftag.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <audacious/plugin.h>
-
-#include <unistd.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <inttypes.h>
-
-#include "types.h"
-
-extern int SampleRate;
-
-extern InputPlugin usf_ip;
-InputPlayback * pcontext = 0;
-
-void usf_mseek (InputPlayback * context, gint millisecond);
-int8_t filename[512];
-uint32_t cpu_running = 0, use_interpreter = 0, use_audiohle = 0, is_paused = 0, cpu_stopped = 1, fake_seek_stopping = 0;
-uint32_t is_fading = 0, fade_type = 1, fade_time = 5000, is_seeking = 0, seek_backwards = 0, track_time = 180000;
-double seek_time = 0.0, play_time = 0.0, rel_volume = 1.0;
-
-uint32_t enablecompare = 0, enableFIFOfull = 0;
-
-uint32_t usf_length = 0, usf_fade_length = 0;
-
-int8_t title[100];
-uint8_t title_format[] = "%game% - %title%";
-
-extern int32_t RSP_Cpu;
-
-uint32_t get_length_from_string(uint8_t * str_length) {
-	uint32_t ttime = 0, temp = 0, mult = 1, level = 1;
-	char Source[1024];
-	uint8_t * src = Source + strlen(str_length);
-	strcpy(&Source[1], str_length);
-	Source[0] = 0;
-
- while(*src) {
-		if((*src >= '0') && (*src <= '9')) {
-			temp += ((*src - '0') * mult);
-			mult *= 10;
-		} else {
-			mult = 1;
- if(*src == '.') {
- 	ttime = temp;
- 	temp = 0;
- } else if(*src == ':') {
- 	ttime += (temp * (1000 * level));
- 	temp = 0;
-				level *= 60;
- }
-		}
-		src--;
- }
-
- ttime += (temp * (1000 * level));
- return ttime;
-}
-
-int LoadUSF(const gchar * fn, VFSFile *fil)
-{
-	uint32_t reservedsize = 0, codesize = 0, crc = 0, tagstart = 0, reservestart = 0;
-	uint32_t filesize = 0, tagsize = 0, temp = 0;
-	uint8_t buffer[16], * buffer2 = NULL, * tagbuffer = NULL;
-
-	is_fading = 0;
-	fade_type = 1;
-	fade_time = 5000;
-	track_time = 180000;
-	play_time = 0;
-	is_seeking = 0;
-	seek_backwards = 0;
-	seek_time = 0;
-
-	if(!fil) {
-		printf("Could not open USF!\n");
-		return 0;
-	}
-
-	vfs_fread(buffer,4 ,1 ,fil);
-	if(buffer[0] != 'P' && buffer[1] != 'S' && buffer[2] != 'F' && buffer[3] != 0x21) {
-		printf("Invalid header in file!\n");
-		return 0;
-	}
-
- vfs_fread(&reservedsize, 4, 1, fil);
- vfs_fread(&codesize, 4, 1, fil);
- vfs_fread(&crc, 4, 1, fil);
-
- vfs_fseek(fil, 0, SEEK_END);
- filesize = vfs_ftell(fil);
-
- reservestart = 0x10;
- tagstart = reservestart + reservedsize;
- tagsize = filesize - tagstart;
-
-	if(tagsize) {
-		vfs_fseek(fil, tagstart, SEEK_SET);
-		vfs_fread(buffer, 5, 1, fil);
-
-		if(buffer[0] != '[' && buffer[1] != 'T' && buffer[2] != 'A' && buffer[3] != 'G' && buffer[4] != ']') {
-			printf("Erroneous data in tag area! %" PRIu32 "\n", tagsize);
-			return 0;
-		}
-
-		buffer2 = malloc(50001);
-		tagbuffer = malloc(tagsize);
-
- 	vfs_fread(tagbuffer, tagsize, 1, fil);
-
-		psftag_raw_getvar(tagbuffer,"_lib",buffer2,50000);
-
-		if(strlen(buffer2)) {
-			char path[512];
-			int pathlength = 0;
-
-			if(strrchr(fn, '/')) //linux
-				pathlength = strrchr(fn, '/') - fn + 1;
-			else if(strrchr(fn, '\\')) //windows
-				pathlength = strrchr(fn, '\\') - fn + 1;
-			else //no path
-				pathlength = strlen(fn);
-
-			strncpy(path, fn, pathlength);
-			path[pathlength] = 0;
-			strcat(path, buffer2);
-
-			VFSFile *file2 = vfs_fopen(path, "rb");
-			LoadUSF(path, file2);
-			vfs_fclose(file2);
-		}
-
-		psftag_raw_getvar(tagbuffer,"_enablecompare",buffer2,50000);
-		if(strlen(buffer2))
-			enablecompare = 1;
-		else
-			enablecompare = 0;
-
-		psftag_raw_getvar(tagbuffer,"_enableFIFOfull",buffer2,50000);
-		if(strlen(buffer2))
-			enableFIFOfull = 1;
-		else
-			enableFIFOfull = 0;
-
-		psftag_raw_getvar(tagbuffer, "length", buffer2, 50000);
- if(strlen(buffer2)) {
-			track_time = get_length_from_string(buffer2);
-		}
-
-		psftag_raw_getvar(tagbuffer, "fade", buffer2, 50000);
- if(strlen(buffer2)) {
-			fade_time = get_length_from_string(buffer2);
-		}
-
-		psftag_raw_getvar(tagbuffer, "title", buffer2, 50000);
- if(strlen(buffer2))
-			strcpy(title, buffer2);
-		else
-		{
-			int pathlength = 0;
-
-			if(strrchr(fn, '/')) //linux
-				pathlength = strrchr(fn, '/') - fn + 1;
-			else if(strrchr(fn, '\\')) //windows
-				pathlength = strrchr(fn, '\\') - fn + 1;
-			else //no path
-				pathlength = 7;
-
-			strcpy(title, &fn[pathlength]);
-
-		}
-
-		free(buffer2);
-		buffer2 = NULL;
-
-		free(tagbuffer);
-		tagbuffer = NULL;
-
-	}
-
-	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);
-
-		while(len) {
-			vfs_fread(&start, 4, 1, fil);
-
-			while(len) {
-				int page = start >> 16;
-				int readLen = ( ((start + len) >> 16) > page) ? (((page + 1) << 16) - start) : len;
-
- if(ROMPages[page] == 0) {
- 	ROMPages[page] = malloc(0x10000);
- 	memset(ROMPages[page], 0, 0x10000);
- }
-
-				vfs_fread(ROMPages[page] + (start & 0xffff), readLen, 1, fil);
-
-				start += readLen;
-				len -= readLen;
-			}
-
-			vfs_fread(&len, 4, 1, fil);
-		}
-
-	}
-
-
-
-	vfs_fread(&temp, 4, 1, fil);
-	if(temp == 0x34365253) {
-		int len = 0, start = 0;
-		vfs_fread(&len, 4, 1, fil);
-
-		while(len) {
-			vfs_fread(&start, 4, 1, fil);
-
-			vfs_fread(savestatespace + start, len, 1, fil);
-
-			vfs_fread(&len, 4, 1, fil);
-		}
-	}
-
- // Detect the Ramsize before the memory allocation
-
-	if(*(uint32_t*)(savestatespace + 4) == 0x400000) {
-		RdramSize = 0x400000;
-		savestatespace = realloc(savestatespace, 0x40275c);
-	} else if(*(uint32_t*)(savestatespace + 4) == 0x800000)
-		RdramSize = 0x800000;
-
-	return 1;
-}
-
-
-gboolean usf_init()
-{
-	use_audiohle = 0;
-	use_interpreter = 0;
-	RSP_Cpu = 0; // 0 is recompiler, 1 is interpreter
-
-	return TRUE;
-}
-
-void usf_destroy()
-{
-
-}
-
-void usf_seek(InputPlayback * context, gint time)
-{
-	usf_mseek(context, time * 1000);
-}
-
-
-void usf_mseek (InputPlayback * context, gint millisecond)
-{
-	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;
-	} else {
-		is_seeking = 1;
-		seek_time = (double)millisecond;
-	}
-
-	context->output->flush(millisecond/1000);
-}
-
-gboolean usf_playing;
-
-gboolean usf_play (InputPlayback * context, const gchar * filename,
- VFSFile * file, gint start_time, gint stop_time, gboolean pause)
-{
-	// Defaults (which would be overriden by Tags / playing
-	savestatespace = NULL;
-	cpu_running = is_paused = fake_seek_stopping = 0;
-	cpu_stopped = 1;
-	is_fading = 0;
-	fade_type = 1;
-	fade_time = 5000;
-	is_seeking = 0;
-	seek_backwards = 0;
-	track_time = 180000;
-	seek_time = 0.0;
-	play_time = 0.0;
-	rel_volume = 1.0;
-
-
-	pcontext = context;
-
- // Allocate main memory after usf loads (to determine ram size)
-
-	PreAllocate_Memory();
-
- if(!LoadUSF(filename, file)) {
-	Release_Memory();
-	vfs_fclose(file);
- 	return FALSE;
- }
-
-	context->set_pb_ready(context);
-
-	Allocate_Memory();
-
-	usf_playing = TRUE;
-	while(usf_playing) {
-		is_fading = 0;
-		play_time = 0;
-
-		StartEmulationFromSave(savestatespace);
-		if(!fake_seek_stopping) break;
-		while(fake_seek_stopping != 2)
-			usleep(1);
-		fake_seek_stopping = 4;
-	}
-
-	Release_Memory();
-
-	context->output->close_audio();
-
-	return TRUE;
-}
-
-void usf_stop(InputPlayback *context)
-{
-	while (cpu_running == 1)
-	{
-		cpu_running = 0;
-		CloseCpu();
-	}
-
-	usf_playing = FALSE;
-	is_paused = 0;
-}
-
-void usf_pause (InputPlayback * context, gboolean paused)
-{
-	is_paused = paused;
-}
-
-static const gchar *usf_exts [] =
-{
- "usf",
- "miniusf",
- NULL
-};
-
-
-Tuple * usf_get_song_tuple(const gchar * fn, VFSFile *fil)
-{
-	Tuple *	tuple = NULL;
-	uint32_t reservedsize = 0, codesize = 0, crc = 0, tagstart = 0, reservestart = 0, filesize = 0, tagsize = 0;
-	uint8_t buffer[16], * buffer2 = NULL, * tagbuffer = NULL;
-
-	if(!fil) {
-		printf("Could not open USF!\n");
-		return NULL;
-	}
-
-	vfs_fread(buffer,4 ,1 ,fil);
-
-	if(buffer[0] != 'P' && buffer[1] != 'S' && buffer[2] != 'F' && buffer[3] != 0x21) {
-		printf("Invalid header in file!\n");
-		return NULL;
-	}
-
- vfs_fread(&reservedsize, 4, 1, fil);
- vfs_fread(&codesize, 4, 1, fil);
- vfs_fread(&crc, 4, 1, fil);
-
- vfs_fseek(fil, 0, SEEK_END);
- filesize = vfs_ftell(fil);
-
- reservestart = 0x10;
- tagstart = reservestart + reservedsize;
- tagsize = filesize - tagstart;
-
-	tuple = tuple_new_from_filename(fn);
-
-	if(tagsize) {
-		int temp_fade = 0;
-		vfs_fseek(fil, tagstart, SEEK_SET);
-		vfs_fread(buffer, 5, 1, fil);
-
-		if(buffer[0] != '[' && buffer[1] != 'T' && buffer[2] != 'A' && buffer[3] != 'G' && buffer[4] != ']') {
-			printf("Erroneous data in tag area! %" PRIu32 "\n", tagsize);
-			return NULL;
-		}
-
-		buffer2 = malloc(50001);
-		tagbuffer = malloc(tagsize);
-
- 	vfs_fread(tagbuffer, tagsize, 1, fil);
-
-		psftag_raw_getvar(tagbuffer, "fade", buffer2, 50000);
- if(strlen(buffer2))
-			temp_fade = get_length_from_string(buffer2);
-
-		psftag_raw_getvar(tagbuffer, "length", buffer2, 50000);
- if(strlen(buffer2))
- 	tuple_associate_int(tuple, FIELD_LENGTH, NULL, get_length_from_string(buffer2) + temp_fade);
-		else
-			tuple_associate_int(tuple, FIELD_LENGTH, NULL, (180*1000));
-
-		psftag_raw_getvar(tagbuffer, "title", buffer2, 50000);
- if(strlen(buffer2))
-			tuple_associate_string(tuple, FIELD_TITLE, NULL, buffer2);
-		else
-		{
-			char title[512];
-			int pathlength = 0;
-
-			if(strrchr(fn, '/')) //linux
-				pathlength = strrchr(fn, '/') - fn + 1;
-			else if(strrchr(fn, '\\')) //windows
-				pathlength = strrchr(fn, '\\') - fn + 1;
-			else //no path
-				pathlength = 7;
-
-			strcpy(title, &fn[pathlength]);
-
-			tuple_associate_string(tuple, FIELD_TITLE, NULL, title);
-
-		}
-
-		psftag_raw_getvar(tagbuffer, "artist", buffer2, 50000);
- if(strlen(buffer2))
-			tuple_associate_string(tuple, FIELD_ARTIST, NULL, buffer2);
-
-		psftag_raw_getvar(tagbuffer, "game", buffer2, 50000);
- if(strlen(buffer2)) {
-			tuple_associate_string(tuple, FIELD_ALBUM, NULL, buffer2);
-			tuple_associate_string(tuple, -1, "game", buffer2);
-		}
-
-		psftag_raw_getvar(tagbuffer, "copyright", buffer2, 50000);
- if(strlen(buffer2))
-			tuple_associate_string(tuple, FIELD_COPYRIGHT, NULL, buffer2);
-
-		// This for unknown reasons turns the "Kbps" in the UI to "channels"
-		//tuple_associate_string(tuple, FIELD_QUALITY, NULL, "sequenced");
-
-		tuple_associate_string(tuple, FIELD_CODEC, NULL, "Nintendo 64 Audio");
-		tuple_associate_string(tuple, -1, "console", "Nintendo 64");
-
-		free(tagbuffer);
-		free(buffer2);
-	}
-	else
-	{
-		char title[512];
-		int pathlength = 0;
-
-		if(strrchr(fn, '/')) //linux
-			pathlength = strrchr(fn, '/') - fn + 1;
-		else if(strrchr(fn, '\\')) //windows
-			pathlength = strrchr(fn, '\\') - fn + 1;
-		else //no path
-			pathlength = 7;
-
-		strcpy(title, &fn[pathlength]);
-
-
-		tuple_associate_int(tuple, FIELD_LENGTH, NULL, (180 * 1000));
-		tuple_associate_string(tuple, FIELD_TITLE, NULL, title);
-	}
-
-	return tuple;
-}
-
-AUD_INPUT_PLUGIN
-(
- .name = "USF Audio",
- .init = usf_init,
- .play = usf_play,
- .stop = usf_stop,
- .pause = usf_pause,
- .mseek = usf_mseek,
- .extensions = usf_exts,
- .probe_for_tuple = usf_get_song_tuple,
-)

audacious-plugins-3.1.1.tar.bz2/src/usf/usf.h Deleted

audacious-plugins-3.1.1.tar.bz2/src/usf/x86.c Deleted

@@ -1,810 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-#include "main.h"
-#include "cpu.h"
-#include "x86.h"
-#include "types.h"
-
-uint8_t Index[9] = {0,0,0x40,0,0x80,0,0,0,0xC0};
-
-
-void AdcX86regToVariable(int32_t x86reg, void * Variable) {
-	OPCODE_REG_VARIABLE(,8,0x11,x86reg,Variable);
-}
-
-void AdcConstToVariable(void *Variable, uint8_t Constant) {
-	OPCODE_REG_VARIABLE(,8,0x81,OP_D2,Variable);
-	PUTDST8(RecompPos,Constant);
-}
-
-void AdcConstToX86Reg (int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D2,x86reg);
-		PUTDST32(RecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D2,x86reg);
-		PUTDST8(RecompPos, Const);
-	}
-}
-
-void AdcVariableToX86reg(int32_t x86reg, void * Variable) {
-	OPCODE_REG_VARIABLE(,8,0x13	,x86reg,Variable);
-}
-
-void AdcX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(8,0x13,Destination,Source);
-}
-
-void AddConstToVariable (uint32_t Const, void *Variable) {
- OPCODE_REG_VARIABLE(,8,0x81,OP_D0,Variable);
- PUTDST32(RecompPos,Const);
-}
-
-void AddConstToX86Reg64 (int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D0,x86reg | x64_Reg);
-		PUTDST32(RecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D0,x86reg | x64_Reg);
-		PUTDST8(RecompPos, Const);
-	}
-}
-
-void AddConstToX86Reg (int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D0,x86reg);
-		PUTDST32(RecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D0,x86reg);
-		PUTDST8(RecompPos, Const);
-	}
-}
-
-void AddVariableToX86reg(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x3,x86reg,Variable);
-}
-
-void AddX86regToVariable(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x1,x86reg,Variable);
-}
-
-void AddX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(8,0x3,Destination,Source);
-}
-
-void AndConstToVariable (uint32_t Const, void *Variable) {
- OPCODE_REG_VARIABLE(,8,0x81,OP_D4,Variable);
- PUTDST32(RecompPos,Const);
-}
-
-void AndConstToX86Reg(int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D4,x86reg);
-		PUTDST32(RecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D4,x86reg);
-		PUTDST8(RecompPos, Const);
-	}
-}
-
-void AndVariableDispToX86Reg(void *Variable, int32_t x86reg, int32_t AddrReg, int32_t Multiplier) {
-#ifdef USEX64
-	if(((uintptr_t)Variable - (uintptr_t)TLB_Map) < 0x7FFFFFFF) {
-		OPCODE_REG_BASE_INDEX_SCALE_IMM32(8,0x23,x86reg,x86_R15,AddrReg,Index[Multiplier], (uintptr_t)Variable - (uintptr_t)TLB_Map);
-	} else {
-		LOAD_VARIABLE(x86_TEMP, Variable);
-		OPCODE_REG_BASE_INDEX_SCALE(8,0x23,x86reg,x86_TEMP,AddrReg,Index[Multiplier]);
-	}
-#else
-	OPCODE_REG_INDEX_SCALE_IMM32(8,0x23,x86reg,AddrReg,Index[Multiplier],Variable);
-#endif
-}
-
-void AndVariableToX86Reg(void * Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(,8,0x23,x86reg,Variable);
-}
-
-void AndX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(8,0x21,Source,Destination);
-}
-
-void BreakPoint (void) {
-	PUTDST8(RecompPos,0xCC);
-}
-
-void Call_Direct(void * FunctAddress) {
-	uintptr_t disp;
-#ifdef USEX64
-	disp = (uintptr_t)FunctAddress-(uintptr_t)RecompPos - 5;
-	SubConstFromX86Reg(x86_RSP, 0x28);
-	if(disp <= 0x7fffffff) {
-		PUTDST8(RecompPos,0xE8);
-		PUTDST32(RecompPos,disp);
-	} else {
-		LOAD_VARIABLE(x86_TEMP, FunctAddress);
-		OPCODE_REG_REG(8,0xff,OP_D2,x86_TEMP);
-
-	}
-	AddConstToX86Reg(x86_RSP, 0x28);
-#else
-	//BreakPoint();
-	disp = (uintptr_t)FunctAddress-(uintptr_t)RecompPos - 5;
-	PUTDST8(RecompPos,0xE8);
-	PUTDST32(RecompPos,disp);
-#endif
-}
-
-void CompConstToVariable(uint32_t Const, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x81,OP_D7,Variable);
- PUTDST32(RecompPos,Const);
-}
-
-void CompConstToX86reg(int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D7,x86reg);
-		PUTDST32(RecompPos,Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D7,x86reg);
-		PUTDST8(RecompPos, Const);
-	}
-}
-
-void CompX86regToVariable(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x3B,x86reg,Variable);
-}
-
-void CompX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(8,0x3B,Destination,Source);
-}
-
-void DecX86reg(x86reg) {
-	OPCODE_REG_REG(8,0xFF,OP_D1,x86reg);
-}
-
-void DivX86reg(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xF7,OP_D6,x86reg);
-}
-
-void idivX86reg(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xF7,OP_D7,x86reg);
-}
-
-void imulX86reg(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xF7,OP_D5,x86reg);
-}
-
-void IncX86reg(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xFF,OP_D0,x86reg);
-}
-
-void JaeLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0x73);
-	PUTDST8(RecompPos,Value);
-}
-
-void JaeLabel32(uint32_t Value) {
-	PUTDST16(RecompPos,0x830F);
-	PUTDST32(RecompPos,Value);
-}
-
-void JaLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0x77);
-	PUTDST8(RecompPos,Value);
-}
-
-void JaLabel32(uint32_t Value) {
-	PUTDST16(RecompPos,0x870F);
-	PUTDST32(RecompPos,Value);
-}
-
-void JbLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0x72);
-	PUTDST8(RecompPos,Value);
-}
-
-void JbLabel32(uint32_t Value) {
-	PUTDST16(RecompPos,0x820F);
-	PUTDST32(RecompPos,Value);
-}
-
-void JecxzLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0xE3);
-	PUTDST8(RecompPos,Value);
-}
-
-void JeLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0x74);
-	PUTDST8(RecompPos,Value);
-}
-
-void JeLabel32(uint32_t Value) {
-	PUTDST16(RecompPos,0x840F);
-	PUTDST32(RecompPos,Value);
-}
-
-void JgeLabel32(uint32_t Value) {
-	PUTDST16(RecompPos,0x8D0F);
-	PUTDST32(RecompPos,Value);
-}
-
-void JgLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0x7F);
-	PUTDST8(RecompPos,Value);
-}
-
-void JgLabel32(uint32_t Value) {
-	PUTDST16(RecompPos,0x8F0F);
-	PUTDST32(RecompPos,Value);
-}
-
-void JleLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0x7E);
-	PUTDST8(RecompPos,Value);
-}
-
-void JleLabel32(uint32_t Value) {
-	PUTDST16(RecompPos,0x8E0F);
-	PUTDST32(RecompPos,Value);
-}
-
-void JlLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0x7C);
-	PUTDST8(RecompPos,Value);
-}
-
-void JlLabel32(uint32_t Value) {
-	PUTDST16(RecompPos,0x8C0F);
-	PUTDST32(RecompPos,Value);
-}
-
-void JzLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0x74);
-	PUTDST8(RecompPos,Value);
-}
-
-void JnzLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0x75);
-	PUTDST8(RecompPos,Value);
-}
-
-
-void JmpDirectReg( int32_t x86reg ) {
-	OPCODE_REG_REG(8,0xff,OP_D4,x86reg);
-}
-
-void JmpLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0xEB);
-	PUTDST8(RecompPos,Value);
-}
-
-void JmpLabel32( uint32_t Value) {
-	PUTDST8(RecompPos,0xE9);
-	PUTDST32(RecompPos,Value);
-}
-
-void JneLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0x75);
-	PUTDST8(RecompPos,Value);
-}
-
-void JneLabel32(uint32_t Value) {
-	PUTDST16(RecompPos,0x850F);
-	PUTDST32(RecompPos,Value);
-}
-
-void JnsLabel8( uint8_t Value) {
-	PUTDST8(RecompPos,0x79);
-	PUTDST8(RecompPos,Value);
-}
-
-void JnsLabel32(uint32_t Value) {
-	PUTDST16(RecompPos,0x890F);
-	PUTDST32(RecompPos,Value);
-}
-
-void JsLabel32(uint32_t Value) {
-	PUTDST16(RecompPos,0x880F);
-	PUTDST32(RecompPos,Value);
-}
-
-void LeaRegReg(int32_t x86RegDest, int32_t x86RegSrc, int32_t multiplier) {
-	OPCODE_REG_BASE_INDEX_SCALE(8,0x8D,x86RegDest,x86_EBP,x86RegSrc,Index[multiplier]);
-	PUTDST32(RecompPos,0x00000000);
-}
-
-void LeaSourceAndOffset(int32_t x86DestReg, int32_t x86SourceReg, int32_t offset) {
- OPCODE_REG_MREG_IMM32(8,0x8D,x86DestReg,x86SourceReg,offset);
-}
-
-void MoveConstByteToVariable (uint8_t Const,void *Variable) {
- OPCODE_REG_VARIABLE(,8,0xC6,OP_D0,Variable);
- PUTDST8(RecompPos,Const);
-}
-
-void MoveConstHalfToVariable (uint16_t Const,void *Variable) {
- OPCODE_REG_VARIABLE(PUTDST8(RecompPos,0x66),8,0xC7,OP_D0,Variable);
- PUTDST16(RecompPos,Const);
-}
-
-void MoveConstHalfToX86regPointer(uint16_t Const, int32_t AddrReg1, int32_t AddrReg2) {
- PUTDST8(RecompPos,0x66);
- OPCODE_REG_BASE_INDEX(8,0xC7,OP_D0,AddrReg1,AddrReg2);
- PUTDST16(RecompPos,Const);
-}
-
-void MoveConstToVariable (uint32_t Const,void *Variable) {
- OPCODE_REG_VARIABLE(,8,0xC7,OP_D0,Variable);
- PUTDST32(RecompPos,Const);
-}
-
-void MoveConstToX86Pointer(uint32_t Const, int32_t X86Pointer) {
- OPCODE_REG_MREG(8,0xC7,OP_D0,X86Pointer);
- PUTDST32(RecompPos,Const);
-}
-
-
-void MoveConstToX86reg(uint32_t Const, int32_t x86reg) {
-	OPCODE_REG_REG(8,0xC7,OP_D0,x86reg);
- PUTDST32(RecompPos,Const);
-}
-
-void MoveConstQwordToX86reg(uint64_t Const, int32_t x86reg) {
- PUTDST8(RecompPos, 0x48 | ((x86reg&0x20)>>5));
- PUTDST8(RecompPos, 0xB8 | ((x86reg-1)&0x7));
- PUTDST64(RecompPos,Const);
-}
-
-void MoveConstByteToX86regPointer(uint8_t Const, int32_t AddrReg1, int32_t AddrReg2) {
-	OPCODE_REG_BASE_INDEX(8,0xC6,OP_D0,AddrReg1,AddrReg2)
- PUTDST8(RecompPos,Const);
-}
-
-void MoveConstToX86regPointer(uint32_t Const, int32_t AddrReg1, int32_t AddrReg2) {
-	OPCODE_REG_BASE_INDEX(8,0xC7,OP_D0,AddrReg1,AddrReg2);
- PUTDST32(RecompPos,Const);
-}
-
-void MoveSxByteX86regPointerToX86reg(int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg) {
-	OPCODE_REG_BASE_INDEX(16,0xBE0F,x86reg,AddrReg1,AddrReg2);
-}
-
-void MoveSxHalfX86regPointerToX86reg(int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg) {
- OPCODE_REG_BASE_INDEX(16,0xBF0F,x86reg,AddrReg1,AddrReg2);
-}
-
-void MoveSxVariableToX86regByte(void *Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(,16,0xBE0F,x86reg,Variable);
-}
-
-void MoveSxVariableToX86regHalf(void *Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(,16,0xBF0F,x86reg,Variable);
-}
-
-void MoveVariableToX86reg(void *Variable, int32_t x86reg) {
-	OPCODE_REG_VARIABLE(,8,0x8B,x86reg,Variable);
-}
-
-void MovePointerToX86reg(void *Variable, int32_t x86reg) {
-#ifdef USEX64
- OPCODE_REG_VARIABLE(,8,0x8B,x86reg|x64_Reg,Variable);
-#else
- OPCODE_REG_VARIABLE(,8,0x8B,x86reg,Variable);
-#endif
-}
-
-void MoveX86RegDispToX86Reg(int32_t x86reg, int32_t AddrReg, int32_t IndexReg, int32_t Multiplier) {
-	OPCODE_REG_BASE_INDEX_SCALE(8,0x8B,x86reg,AddrReg,IndexReg,Index[Multiplier]);
-}
-
-void MoveVariableDispToX86Reg(void *Variable, int32_t x86reg, int32_t AddrReg, int32_t Multiplier) {
-#ifdef USEX64
-	if(((uintptr_t)Variable - (uintptr_t)TLB_Map) < 0x7FFFFFFF) {
-		OPCODE_REG_BASE_INDEX_SCALE_IMM32(8,0x8B,x86reg,x86_R15,AddrReg,Index[Multiplier],((uintptr_t)Variable - (uintptr_t)TLB_Map));
-	} else {
-		LOAD_VARIABLE(x86_TEMP, Variable);
-		OPCODE_REG_BASE_INDEX_SCALE(8,0x8B,x86reg,x86_TEMP,AddrReg,Index[Multiplier]);
-	}
-#else
-	OPCODE_REG_INDEX_SCALE_IMM32(8,0x8B,x86reg,AddrReg,Index[Multiplier],Variable);
-#endif
-}
-
-void MoveVariableToX86regByte(void *Variable, int32_t x86reg) {
-	OPCODE_REG_VARIABLE(,8,0x8A,x86reg,Variable);
-}
-
-void MoveVariableToX86regHalf(void *Variable, int32_t x86reg) {
-	BreakPoint();
- OPCODE_REG_VARIABLE(PUTDST8(RecompPos,0x66),8,0x8B,x86reg,Variable);
-}
-
-void MoveX86regByteToVariable(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x88,x86reg,Variable);
-}
-
-void MoveX86regByteToX86regPointer(int32_t x86reg, int32_t AddrReg1, int32_t AddrReg2) {
-	OPCODE_REG_BASE_INDEX(8,0x88,x86reg,AddrReg1,AddrReg2);
-}
-
-void MoveX86regHalfToVariable(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(PUTDST8(RecompPos,0x66), 8,0x89,x86reg,Variable);
-}
-
-void MoveX86regHalfToX86regPointer(int32_t x86reg, int32_t AddrReg1, int32_t AddrReg2) {
-	PUTDST8(RecompPos,0x66);
-	OPCODE_REG_BASE_INDEX(8,0x89,x86reg,AddrReg1,AddrReg2);
-}
-
-void MoveX86PointerToX86reg(int32_t x86reg, int32_t X86Pointer) {
-	OPCODE_REG_MREG(8,0x8B,x86reg,X86Pointer);
-}
-
-void MoveX86regPointerToX86reg(int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg) {
-	OPCODE_REG_BASE_INDEX(8,0x8B,x86reg,AddrReg1,AddrReg2);
-}
-
-void MoveX86regPointerToX86regDisp8(int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg, uint8_t offset) {
-	OPCODE_REG_BASE_INDEX_IMM8(8,0x8B,x86reg,AddrReg1,AddrReg2,offset);
-}
-
-void MoveX86regToMemory(int32_t x86reg, int32_t AddrReg, uint32_t Disp) {
-	OPCODE_REG_MREG_IMM32(8,0x89,x86reg,AddrReg,Disp);
-}
-
-void MoveX86regToVariable(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x89,x86reg,Variable);
-}
-
-void MoveX86RegToX86Reg(int32_t Source, int32_t Destination) {
-	OPCODE_REG_REG(8,0x89,Source|X64_Reg, Destination|X64_Reg);
-}
-
-void MoveX86regToX86Pointer(int32_t x86reg, int32_t X86Pointer) {
-	OPCODE_REG_MREG(8,0x89,x86reg, X86Pointer);
-}
-
-void MoveX86regToX86regPointer(int32_t x86reg, int32_t AddrReg1, int32_t AddrReg2) {
- OPCODE_REG_BASE_INDEX(8,0x89,x86reg,AddrReg1,AddrReg2);
-}
-
-void MoveZxByteX86regPointerToX86reg(int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg) {
-	OPCODE_REG_BASE_INDEX(16,0xB60F,x86reg,AddrReg1,AddrReg2);
-}
-
-void MoveZxHalfX86regPointerToX86reg(int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg) {
-	OPCODE_REG_BASE_INDEX(16,0xB70F,x86reg,AddrReg1,AddrReg2);
-}
-
-void MoveZxVariableToX86regByte(void *Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(,16,0xB60F,x86reg,Variable);
-}
-
-void MoveZxVariableToX86regHalf(void *Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(,16,0xB70F,x86reg,Variable);
-}
-
-void MulX86reg(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xF7,OP_D4,x86reg);
-}
-
-void NotX86Reg(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xF7,OP_D2,x86reg);
-}
-
-void OrConstToVariable(uint32_t Const, void * Variable) {
-	if(Const < 0x80) {
-		OPCODE_REG_VARIABLE(,8,0x83,OP_D1,Variable);
-		PUTDST8(RecompPos,Const);
-	} else {
-		OPCODE_REG_VARIABLE(,8,0x81,OP_D1,Variable);
-		PUTDST32(RecompPos,Const);
-	}
-}
-
-void OrConstToX86Reg(uint32_t Const, int32_t x86reg) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D1,x86reg);
-		PUTDST32(RecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D1,x86reg);
-		PUTDST8(RecompPos, Const);
-	}
-}
-
-void OrVariableToX86Reg(void * Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(,8,0xb,x86reg,Variable);
-}
-
-void OrX86RegToVariable(void * Variable, int32_t x86reg) {
- OPCODE_REG_VARIABLE(,8,0x9,x86reg,Variable);
-}
-
-void OrX86RegToX86Reg(int32_t Destination, int32_t Source) {
- OPCODE_REG_REG(8,0x0B,Destination,Source);
-}
-
-void Pushfd() {
-	PUTDST8(RecompPos,0x9c);
-}
-
-void Popfd() {
-	PUTDST8(RecompPos,0x9d);
-}
-
-void Popad(void) {
-#ifdef USEX64
-	PUTDST16(RecompPos,0x5f41);
-	PUTDST16(RecompPos,0x5e41);
-	PUTDST16(RecompPos,0x5d41);
-	PUTDST16(RecompPos,0x5c41);
-	PUTDST16(RecompPos,0x5b41);
-	PUTDST16(RecompPos,0x5a41);
-	PUTDST16(RecompPos,0x5941);
-	PUTDST16(RecompPos,0x5841);
-	PUTDST8(RecompPos,0x5f);
-	PUTDST8(RecompPos,0x5e);
-	PUTDST8(RecompPos,0x5b);
-	PUTDST8(RecompPos,0x5a);
-	PUTDST8(RecompPos,0x59);
-	PUTDST8(RecompPos,0x58);
-#else
-	PUTDST8(RecompPos,0x61);
-#endif
-
-}
-
-void Pushad(void) {
-#ifdef USEX64
-	PUTDST8(RecompPos,0x50);
-	PUTDST8(RecompPos,0x51);
-	PUTDST8(RecompPos,0x52);
-	PUTDST8(RecompPos,0x53);
-	PUTDST8(RecompPos,0x56);
-	PUTDST8(RecompPos,0x57);
-	PUTDST16(RecompPos,0x5041);
-	PUTDST16(RecompPos,0x5141);
-	PUTDST16(RecompPos,0x5241);
-	PUTDST16(RecompPos,0x5341);
-	PUTDST16(RecompPos,0x5441);
-	PUTDST16(RecompPos,0x5541);
-	PUTDST16(RecompPos,0x5641);
-	PUTDST16(RecompPos,0x5741);
-#else
-	PUTDST8(RecompPos,0x60);
-#endif
-}
-
-void Push(int32_t x86reg) {
-#ifdef USEX64
-	PUTDST8(RecompPos, 0x40 | ((x86reg & 0x20) >> 5));
-#endif
-	switch(x86reg&0xf) {
-	case x86_EAX: PUTDST8(RecompPos, 0x50); break;
-	case x86_EBX: PUTDST8(RecompPos, 0x53); break;
-	case x86_ECX: PUTDST8(RecompPos, 0x51); break;
-	case x86_EDX: PUTDST8(RecompPos, 0x52); break;
-	case x86_ESI: PUTDST8(RecompPos, 0x56); break;
-	case x86_EDI: PUTDST8(RecompPos, 0x57); break;
-	case x86_ESP: PUTDST8(RecompPos, 0x54); break;
-	case x86_EBP: PUTDST8(RecompPos, 0x55); break;
-	}
-}
-
-void Pop(int32_t x86reg) {
-#ifdef USEX64
-	PUTDST8(RecompPos, 0x40 | ((x86reg & 0x20) >> 5));
-#endif
-	switch(x86reg&0xf) {
-
-	case x86_EAX: PUTDST8(RecompPos, 0x58); break;
-	case x86_EBX: PUTDST8(RecompPos, 0x5B); break;
-	case x86_ECX: PUTDST8(RecompPos, 0x59); break;
-	case x86_EDX: PUTDST8(RecompPos, 0x5A); break;
-	case x86_ESI: PUTDST8(RecompPos, 0x5E); break;
-	case x86_EDI: PUTDST8(RecompPos, 0x5F); break;
-	case x86_ESP: PUTDST8(RecompPos, 0x5C); break;
-	case x86_EBP: PUTDST8(RecompPos, 0x5D); break;
-	}
-}
-
-void PushImm32(uint32_t Value) {
-	PUTDST8(RecompPos,0x68);
-	PUTDST32(RecompPos,Value);
-}
-
-void Ret(void) {
-	PUTDST8(RecompPos,0xC3);
-}
-
-void Seta(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x970F,OP_D0,x86reg);
-}
-
-void SetaVariable(void * Variable) {
- OPCODE_REG_VARIABLE(,16,0x970F,OP_D0,Variable);
-}
-
-void Setae(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x930F,OP_D0,x86reg);
-}
-
-void Setb(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x920F,OP_D0,x86reg);
-}
-
-void SetbVariable(void * Variable) {
- OPCODE_REG_VARIABLE(,16,0x920F,OP_D0,Variable);
-}
-
-void Setg(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x9F0F,OP_D0,x86reg);
-}
-
-void SetgVariable(void * Variable) {
- OPCODE_REG_VARIABLE(,16,0x9F0F,OP_D0,Variable);
-}
-
-void Setl(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x9C0F,OP_D0,x86reg);
-}
-
-void SetlVariable(void * Variable) {
- OPCODE_REG_VARIABLE(,16,0x9C0F,OP_D0,Variable);
-}
-
-
-void Setz(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x940F,OP_D0,x86reg);
-}
-
-void Setnz(int32_t x86reg) {
-	OPCODE_REG_REG(16,0x950F,OP_D0,x86reg);
-}
-
-void ShiftLeftDouble(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(16,0xA50F,Source,Destination);
-}
-
-void ShiftLeftDoubleImmed(int32_t Destination, int32_t Source, uint8_t Immediate) {
-	OPCODE_REG_REG(16,0xA40F,Source,Destination);
-	PUTDST8(RecompPos,Immediate);
-}
-
-void ShiftLeftSign(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xD3,OP_D4,x86reg);
-}
-
-void ShiftLeftSignImmed(int32_t x86reg, uint8_t Immediate) {
-	OPCODE_REG_REG(8,0xC1,OP_D4,x86reg);
-	PUTDST8(RecompPos,Immediate);
-}
-
-void ShiftRightSign(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xD3,OP_D7,x86reg);
-}
-
-void ShiftRightSignImmed(int32_t x86reg, uint8_t Immediate) {
-	OPCODE_REG_REG(8,0xC1,OP_D7,x86reg);
-	PUTDST8(RecompPos,Immediate);
-}
-
-void ShiftRightUnsign(int32_t x86reg) {
-	OPCODE_REG_REG(8,0xD3,OP_D5,x86reg);
-}
-
-void ShiftRightDouble(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(16,0xAD0F,Source,Destination);
-}
-
-void ShiftRightDoubleImmed(int32_t Destination, int32_t Source, uint8_t Immediate) {
-	OPCODE_REG_REG(16,0xAC0F,Source,Destination);
-	PUTDST8(RecompPos,Immediate);
-}
-
-void ShiftRightUnsignImmed(int32_t x86reg, uint8_t Immediate) {
-	OPCODE_REG_REG(8,0xC1,OP_D5,x86reg);
-	PUTDST8(RecompPos,Immediate);
-}
-
-void SbbConstFromX86Reg (int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D3,x86reg);
-		PUTDST32(RecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D3,x86reg);
-		PUTDST8(RecompPos, Const);
-	}
-}
-
-void SbbVariableFromX86reg(int32_t x86reg, void * Variable) {
-	OPCODE_REG_VARIABLE(,8,0x1b,x86reg,Variable);
-}
-
-void SbbX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(8,0x1B,Destination,Source);
-}
-
-void SubConstFromVariable (uint32_t Const, void *Variable) {
- OPCODE_REG_VARIABLE(,8,0x81,OP_D5,Variable);
-	PUTDST32(RecompPos,Const);
-}
-
-void SubConstFromX86Reg (int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D5,x86reg);
-		PUTDST32(RecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D5,x86reg);
-		PUTDST8(RecompPos, Const);
-	}
-}
-
-void SubVariableFromX86reg(int32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x2B,x86reg,Variable);
-}
-
-void SubX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(8,0x2B,Destination,Source);
-}
-
-void TestConstToX86Reg(uint32_t Const, int32_t x86reg) {
- OPCODE_REG_REG(8,0xF7,OP_D0,x86reg);
-	PUTDST32(RecompPos,Const);
-}
-
-void TestVariable(uint32_t Const, void * Variable) {
-	OPCODE_REG_VARIABLE(,8,0xf7,OP_D0,Variable);
-	PUTDST32(RecompPos,Const);
-}
-
-void TestX86RegToX86Reg(int32_t Destination, int32_t Source) {
-	OPCODE_REG_REG(8,0x85,Destination,Source);
-}
-
-void TestVariableToX86Reg(uint32_t x86reg, void * Variable) {
- OPCODE_REG_VARIABLE(,8,0x85,x86reg,Variable);
-}
-
-void XorConstToX86Reg(int32_t x86reg, uint32_t Const) {
-	if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) {
-		OPCODE_REG_REG(8,0x81,OP_D6,x86reg);
-		PUTDST32(RecompPos, Const);
-	} else {
-		OPCODE_REG_REG(8,0x83,OP_D6,x86reg);
-		PUTDST8(RecompPos, Const);
-	}
-}
-
-void XorX86RegToX86Reg(int32_t Source, int32_t Destination) {
-	OPCODE_REG_REG(8,0x31,Destination,Source);
-}
-
-void XorVariableToX86reg(void *Variable, int32_t x86reg) {
-	OPCODE_REG_VARIABLE(,8,0x33,x86reg,Variable);
-}
-
-

audacious-plugins-3.1.1.tar.bz2/src/usf/x86.h Deleted

@@ -1,544 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-
-
-#define PUTDST8(dest,value) {(*((uint8_t *)(dest))=(uint8_t)(value)); dest += 1;}
-#define PUTDST16(dest,value) {(*((uint16_t *)(dest))=(uint16_t)(value)); dest += 2;}
-#define PUTDST32(dest,value) {(*((uint32_t *)(dest))=(uint32_t)(value)); dest += 4;}
-#define PUTDST64(dest,value) {(*((uint64_t *)(dest))=(uint64_t)(value)); dest += 8;}
-
-#include "types.h"
-
-#ifdef USEX64
-
-#define x64_Reg		0x10
-#define X64_Reg		0x10
-#define X64_Ext		0x20
-
-extern uint8_t Index[9];
-
-enum x86RegValues {
-
- x86_Any	= 0,
- x86_EAX,x86_ECX,x86_EDX,x86_EBX,x86_ESP,x86_EBP,x86_ESI,x86_EDI,x86_Any8Bit=0x40,x64_Any = 0x40,
-
- x86_RAX = 0x11,x86_RCX,x86_RDX,x86_RBX,x86_RSP,x86_RBP,x86_RSI,x86_RDI,
-
-	x86_R8D = 0x21,x86_R9D,x86_R10D,x86_R11D,x86_R12D,x86_R13D,x86_R14D,x86_R15D,
-
-	x86_R8 = 0x31,x86_R9,x86_R10,x86_R11,x86_R12,x86_R13,x86_R14,x86_R15,
-
-};
-
-enum x86FpuValues {
-	x86_ST0,x86_ST1,x86_ST2,x86_ST3,x86_ST4,x86_ST5,x86_ST6,x86_ST7
-};
-
-#define	x86_TEMP		x86_R8
-#define	x86_TEMPD		x86_R8D
-
-#define OP_D0	1
-#define OP_D1	2
-#define OP_D2	3
-#define OP_D3	4
-#define OP_D4	5
-#define OP_D5	6
-#define OP_D6	7
-#define OP_D7	8
-
-#define	LOAD_VARIABLE(reg,variable) \
-	PUTDST8(RecompPos, 0x48 | (((reg)&0x20)>>5)); \
-	PUTDST8(RecompPos,0xB8 | ((reg)-1)&0xf); \
-	PUTDST64(RecompPos,variable);
-
-// 	// 43 0F B6 0C 0D 40 83 C7 04 movzx ecx,byte ptr [r9+4C78340h]
-
-#define OPCODE_REG_REG(oplen,opcode,reg,rm) \
-	PUTDST8(RecompPos, 0x40 | (((rm)&0x20)>>5) | ((((rm|reg))&0x10)>>1) | (((reg)&0x20)>>3)); \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0xC0 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3));
-
-#define OPCODE_REG_MREG(oplen,opcode,reg,rm) \
-	PUTDST8(RecompPos, 0x40 | (((rm)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)); \
-	PUTDST##oplen (RecompPos, opcode); \
-	if(((rm)&0xf)==0x6) { \
-		PUTDST8(RecompPos, 0x40 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-		PUTDST8(RecompPos, 0); \
-	} else if(((rm)&0xf)==0x5) { \
-		PUTDST8(RecompPos, 0x0 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-		PUTDST8(RecompPos, 0x24); \
-	} else { \
-		PUTDST8(RecompPos, 0x00 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-	}
-
-#define OPCODE_REG_MREG_IMM32(oplen,opcode,reg,rm,imm32) \
-	PUTDST8(RecompPos, 0x40 | (((rm)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)); \
-	PUTDST##oplen (RecompPos, opcode); \
-	if(((rm)&0xf)==0x5) { \
-		PUTDST8(RecompPos, 0x80 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-		PUTDST8(RecompPos, 0x24); \
-	} else { \
-		PUTDST8(RecompPos, 0x80 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-	} \
-	PUTDST32(RecompPos,imm32);
-
-#define OPCODE_REG_BASE_INDEX(oplen,opcode,reg,base,index) \
- PUTDST8(RecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RecompPos, opcode); \
-	if(((base)&0xf)!=0x6) { \
-	PUTDST8(RecompPos, 0x04 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, 0x00 | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	} else {\
-	PUTDST8(RecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, 0x00 | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST8(RecompPos, 0); \
-	}
-
-#define OPCODE_REG_MREG_IMM8(oplen,opcode,reg,rm,imm8) \
-	PUTDST8(RecompPos, 0x40 | (((rm)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)); \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x40 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-	PUTDST32(RecompPos,imm8);
-
-/*scale is: 0=1,0x40=2,0x80=4,0xc0=8 ??*/
-
-#define OPCODE_REG_INDEX_SCALE(oplen,opcode,reg,base,index,scale) \
- PUTDST8(RecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x04 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, (((scale)-1)*0x40) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) );
-
-#define OPCODE_REG_BASE_INDEX_SCALE(oplen,opcode,reg,base,index,scale) \
- PUTDST8(RecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x04 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, (scale) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) );
-
-#define OPCODE_REG_BASE_INDEX_SCALE_IMM32(oplen,opcode,reg,base,index,scale,imm32) \
- PUTDST8(RecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x84 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, (scale) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST32(RecompPos,imm32);
-
-#define OPCODE_REG_BASE_INDEX_SCALE_IMM8(oplen,opcode,reg,base,index,scale,imm32) \
- PUTDST8(RecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, (scale) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST32(RecompPos,imm32);
-
-
-#define OPCODE_REG_BASE_INDEX_IMM8(oplen,opcode,reg,base,index,imm8) \
- PUTDST8(RecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST8(RecompPos, imm8);
-
-#define OPCODE_REG_BASE_INDEX_IMM32(oplen,opcode,reg,base,index,imm32) \
- PUTDST8(RecompPos, 0x40 | (((base)&0x20)>>5) | (((reg)&0x10)>>1) | (((reg)&0x20)>>3)| (((index)&0x20)>>4)); \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST8(RecompPos, imm32);
-
-#else /* !USEX64 */
-
-#define x64_Reg		0
-#define X64_Reg		0
-#define X64_Ext		0
-
-
-extern uint8_t Index[9];
-
-enum x86RegValues {
-
- x64_Any = 0, x86_Any	= 0,
- x86_EAX,x86_ECX,x86_EDX,x86_EBX,x86_ESP,x86_EBP,x86_ESI,x86_EDI,x86_Any8Bit=0x40,
-
-};
-
-enum x86FpuValues {
-	x86_ST0,x86_ST1,x86_ST2,x86_ST3,x86_ST4,x86_ST5,x86_ST6,x86_ST7
-};
-
-#define OP_D0	1
-#define OP_D1	2
-#define OP_D2	3
-#define OP_D3	4
-#define OP_D4	5
-#define OP_D5	6
-#define OP_D6	7
-#define OP_D7	8
-
-// 	// 43 0F B6 0C 0D 40 83 C7 04 movzx ecx,byte ptr [r9+4C78340h]
-
-#define OPCODE_REG_DISP(oplen,opcode,reg,disp32) \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x5 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST32(RecompPos,disp32);
-
-#define OPCODE_REG_REG(oplen,opcode,reg,rm) \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0xC0 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3));
-
-#define OPCODE_REG_MREG(oplen,opcode,reg,rm) \
-	PUTDST##oplen (RecompPos, opcode); \
-	if(((rm)&0xf)==0x6) { \
-		PUTDST8(RecompPos, 0x40 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-		PUTDST8(RecompPos, 0); \
-	} else if(((rm)&0xf)==0x5) { \
-		PUTDST8(RecompPos, 0x0 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-		PUTDST8(RecompPos, 0x24); \
-	} else { \
-		PUTDST8(RecompPos, 0x00 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-	}
-
-#define OPCODE_REG_MREG_IMM32(oplen,opcode,reg,rm,imm32) \
-	PUTDST##oplen (RecompPos, opcode); \
-	if(((rm)&0xf)==0x5) { \
-		PUTDST8(RecompPos, 0x80 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-		PUTDST8(RecompPos, 0x24); \
-	} else { \
-		PUTDST8(RecompPos, 0x80 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-	} \
-	PUTDST32(RecompPos,imm32);
-
-#define OPCODE_REG_BASE_INDEX(oplen,opcode,reg,base,index) \
-	PUTDST##oplen (RecompPos, opcode); \
-	if(((base)&0xf)!=0x6) { \
-	PUTDST8(RecompPos, 0x04 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, 0x00 | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	} else {\
-	PUTDST8(RecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, 0x00 | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST8(RecompPos, 0); \
-	}
-
-#define OPCODE_REG_MREG_IMM8(oplen,opcode,reg,rm,imm8) \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x40 | (((rm)-1)&0x7) | ((((reg)-1)&0x7) << 3)); \
-	PUTDST32(RecompPos,imm8);
-
-/*scale is: 0=1,0x40=2,0x80=4,0xc0=8 ??*/
-
-#define OPCODE_REG_INDEX_SCALE(oplen,opcode,reg,base,index,scale) \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x04 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, (((scale)-1)*0x40) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) );
-
-#define OPCODE_REG_BASE_INDEX_SCALE(oplen,opcode,reg,base,index,scale) \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x04 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, (scale) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) );
-
-#define OPCODE_REG_BASE_INDEX_SCALE_IMM32(oplen,opcode,reg,base,index,scale,imm32) \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x84 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, (scale) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST32(RecompPos,imm32);
-
-#define OPCODE_REG_BASE_INDEX_SCALE_IMM8(oplen,opcode,reg,base,index,scale,imm32) \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, (scale) | (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST32(RecompPos,imm32);
-
-
-#define OPCODE_REG_BASE_INDEX_IMM8(oplen,opcode,reg,base,index,imm8) \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST8(RecompPos, imm8);
-
-#define OPCODE_REG_BASE_INDEX_IMM32(oplen,opcode,reg,base,index,imm32) \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x44 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, (((base)-1)&0x7) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST8(RecompPos, imm32);
-
-#define OPCODE_REG_INDEX_SCALE_IMM32(oplen,opcode,reg,index,scale,imm32) \
-	PUTDST##oplen (RecompPos, opcode); \
-	PUTDST8(RecompPos, 0x4 | ((((reg)-1)&0x7) << 3)); \
-	PUTDST8(RecompPos, 0x5 | (scale) | ((((index)-1)&0x7) << 3) ); \
-	PUTDST32(RecompPos,imm32);
-
-#endif
-
-#ifndef USEX64
-
-#define OPCODE_REG_VARIABLE(PREFIX,oplen,opcode,reg,variable) \
-	PREFIX \
-	OPCODE_REG_DISP(oplen,opcode,reg,variable);
-#else
-
-#define OPCODE_REG_VARIABLE(PREFIX,oplen,opcode,reg,Variable) \
-	if(((uintptr_t)(Variable) - (uintptr_t)TLB_Map) < 0x7FFFFFFF) { \
-		PREFIX \
-		OPCODE_REG_MREG_IMM32(oplen,opcode,reg,x86_R15,(uintptr_t)(Variable) - (uintptr_t)TLB_Map); \
- } else { \
- 	LOAD_VARIABLE(x86_TEMP, (Variable)); \
- 	PREFIX \
- 	OPCODE_REG_MREG(oplen,opcode,reg,x86_TEMP); \
- }
-#endif
-
-#ifdef USEX64
-	#define LOAD_FROM_TLB(dstreg,srcreg) MoveX86RegDispToX86Reg(dstreg, x86_R15, srcreg, 8);
-#else
-	#define LOAD_FROM_TLB(dstreg,srcreg) MoveVariableDispToX86Reg(TLB_Map,dstreg,srcreg,4);
-#endif
-
-
-void MoveX86RegDispToX86Reg(int32_t x86Reg, int32_t AddrReg, int32_t IndexReg, int32_t Multiplier);
-void MoveVariableToX86reg64(void *Variable, int32_t x86reg);
-void MovePointerToX86reg(void *Variable, int32_t x86reg);
-void AddConstToX86Reg64 (int32_t x86Reg, uint32_t Const);
-void MoveConstQwordToX86reg(uint64_t Const, int32_t x86reg);
-
-void AdcX86regToVariable ( int32_t x86reg, void * Variable );
-void AdcConstToVariable ( void *Variable, uint8_t Constant );
-void AdcConstToX86Reg ( int32_t x86Reg, uint32_t Const );
-void AdcVariableToX86reg ( int32_t x86reg, void * Variable );
-void AdcX86RegToX86Reg ( int32_t Destination, int32_t Source );
-void AddConstToVariable ( uint32_t Const, void *Variable );
-void AddConstToX86Reg ( int32_t x86Reg, uint32_t Const );
-void AddVariableToX86reg ( int32_t x86reg, void * Variable );
-void AddX86regToVariable ( int32_t x86reg, void * Variable );
-void AddX86RegToX86Reg ( int32_t Destination, int32_t Source );
-void AndConstToVariable ( uint32_t Const, void *Variable );
-void AndConstToX86Reg ( int32_t x86Reg, uint32_t Const );
-void AndVariableToX86Reg ( void * Variable, int32_t x86Reg );
-void AndVariableDispToX86Reg ( void * Variable, int32_t x86Reg, int32_t AddrReg, int32_t Multiplier);
-void AndX86RegToX86Reg ( int32_t Destination, int32_t Source );
-void BreakPoint ( void );
-void Call_Direct ( void * FunctAddress);
-void Call_Indirect ( void * FunctAddress);
-void CompConstToVariable ( uint32_t Const, void * Variable );
-void CompConstToX86reg ( int32_t x86Reg, uint32_t Const );
-void CompX86regToVariable ( int32_t x86Reg, void * Variable );
-void CompVariableToX86reg	 ( int32_t x86Reg, void * Variable );
-void CompX86RegToX86Reg ( int32_t Destination, int32_t Source );
-void DecX86reg ( int32_t x86Reg );
-void DivX86reg ( int32_t x86reg );
-void idivX86reg ( int32_t x86reg );
-void imulX86reg ( int32_t x86reg );
-void IncX86reg ( int32_t x86Reg );
-void JaeLabel8 ( uint8_t Value );
-void JaeLabel32 ( uint32_t Value );
-void JaLabel8 ( uint8_t Value );
-void JaLabel32 ( uint32_t Value );
-void JbLabel8 ( uint8_t Value );
-void JbLabel32 ( uint32_t Value );
-void JecxzLabel8 ( uint8_t Value );
-void JeLabel8 ( uint8_t Value );
-void JeLabel32 ( uint32_t Value );
-void JgeLabel32 ( uint32_t Value );
-void JgLabel8 ( uint8_t Value );
-void JgLabel32 ( uint32_t Value );
-void JleLabel8 ( uint8_t Value );
-void JleLabel32 ( uint32_t Value );
-void JlLabel8 ( uint8_t Value );
-void JlLabel32 ( uint32_t Value );
-void JzLabel8						 ( uint8_t Value );
-void JnzLabel8						 ( uint8_t Value );
-void JmpDirectReg ( int32_t x86reg );
-void JmpIndirectLabel32 ( uint32_t location );
-void JmpIndirectReg ( int32_t x86reg );
-void JmpLabel8 ( uint8_t Value );
-void JmpLabel32 ( uint32_t Value );
-void JneLabel8 ( uint8_t Value );
-void JneLabel32 ( uint32_t Value );
-void JnsLabel8 ( uint8_t Value );
-void JnsLabel32 ( uint32_t Value );
-void JsLabel32 ( uint32_t Value );
-void LeaRegReg ( int32_t x86RegDest, int32_t x86RegSrc, int32_t multiplier );
-void LeaSourceAndOffset ( int32_t x86DestReg, int32_t x86SourceReg, int32_t offset );
-void MoveConstByteToN64Mem ( uint8_t Const, int32_t AddrReg );
-void MoveConstHalfToN64Mem ( uint16_t Const, int32_t AddrReg );
-void MoveConstByteToVariable ( uint8_t Const,void *Variable );
-void MoveConstByteToX86regPointer ( uint8_t Const, int32_t AddrReg1, int32_t AddrReg2 );
-void MoveConstHalfToVariable ( uint16_t Const, void *Variable );
-void MoveConstHalfToX86regPointer ( uint16_t Const, int32_t AddrReg1, int32_t AddrReg2 );
-void MoveConstToMemoryDisp ( uint32_t Const, int32_t AddrReg, uint32_t Disp );
-void MoveConstToN64Mem ( uint32_t Const, int32_t AddrReg );
-void MoveConstToN64MemDisp ( uint32_t Const, int32_t AddrReg, uint8_t Disp );
-void MoveConstToVariable ( uint32_t Const, void *Variable );
-void MoveConstToX86Pointer ( uint32_t Const, int32_t X86Pointer );
-void MoveConstToX86reg ( uint32_t Const, int32_t x86reg );
-void MoveConstToX86regPointer ( uint32_t Const, int32_t AddrReg1, int32_t AddrReg2 );
-void MoveN64MemDispToX86reg ( int32_t x86reg, int32_t AddrReg, uint8_t Disp );
-void MoveN64MemToX86reg ( int32_t x86reg, int32_t AddrReg );
-void MoveN64MemToX86regByte ( int32_t x86reg, int32_t AddrReg );
-void MoveN64MemToX86regHalf ( int32_t x86reg, int32_t AddrReg );
-void MoveSxByteX86regPointerToX86reg ( int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg );
-void MoveSxHalfX86regPointerToX86reg ( int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg );
-void MoveSxN64MemToX86regByte ( int32_t x86reg, int32_t AddrReg );
-void MoveSxN64MemToX86regHalf ( int32_t x86reg, int32_t AddrReg );
-void MoveSxVariableToX86regByte ( void *Variable, int32_t x86reg );
-void MoveSxVariableToX86regHalf ( void *Variable, int32_t x86reg );
-void MoveVariableDispToX86Reg ( void *Variable, int32_t x86Reg, int32_t AddrReg, int32_t Multiplier );
-void MoveVariableToX86reg ( void *Variable, int32_t x86reg );
-void MoveVariableToX86regByte ( void *Variable, int32_t x86reg );
-void MoveVariableToX86regHalf ( void *Variable, int32_t x86reg );
-void MoveX86PointerToX86reg ( int32_t x86reg, int32_t X86Pointer );
-void MoveX86regByteToN64Mem ( int32_t x86reg, int32_t AddrReg );
-void MoveX86regByteToVariable ( int32_t x86reg, void * Variable );
-void MoveX86regByteToX86regPointer ( int32_t x86reg, int32_t AddrReg1, int32_t AddrReg2 );
-void MoveX86regHalfToN64Mem ( int32_t x86reg, int32_t AddrReg );
-void MoveX86regHalfToVariable ( int32_t x86reg, void * Variable );
-void MoveX86regHalfToX86regPointer ( int32_t x86reg, int32_t AddrReg1, int32_t AddrReg2 );
-void MoveX86regPointerToX86reg ( int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg );
-void MoveX86regPointerToX86regDisp8 ( int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg, uint8_t offset );
-void MoveX86regToMemory ( int32_t x86reg, int32_t AddrReg, uint32_t Disp );
-void MoveX86regToN64Mem ( int32_t x86reg, int32_t AddrReg );
-void MoveX86regToN64MemDisp ( int32_t x86reg, int32_t AddrReg, uint8_t Disp );
-void MoveX86regToVariable ( int32_t x86reg, void * Variable );
-void MoveX86RegToX86Reg ( int32_t Source, int32_t Destination );
-void MoveX86regToX86Pointer ( int32_t x86reg, int32_t X86Pointer );
-void MoveX86regToX86regPointer ( int32_t x86reg, int32_t AddrReg1, int32_t AddrReg2 );
-void MoveZxByteX86regPointerToX86reg ( int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg );
-void MoveZxHalfX86regPointerToX86reg ( int32_t AddrReg1, int32_t AddrReg2, int32_t x86reg );
-void MoveZxN64MemToX86regByte ( int32_t x86reg, int32_t AddrReg );
-void MoveZxN64MemToX86regHalf ( int32_t x86reg, int32_t AddrReg );
-void MoveZxVariableToX86regByte ( void *Variable, int32_t x86reg );
-void MoveZxVariableToX86regHalf ( void *Variable, int32_t x86reg );
-void MulX86reg ( int32_t x86reg );
-void NotX86Reg ( int32_t x86Reg );
-void OrConstToVariable ( uint32_t Const, void * Variable );
-void OrConstToX86Reg ( uint32_t Const, int32_t x86Reg );
-void OrVariableToX86Reg ( void * Variable, int32_t x86Reg );
-void OrX86RegToVariable ( void * Variable, int32_t x86Reg );
-void OrX86RegToX86Reg ( int32_t Destination, int32_t Source );
-void Popad ( void );
-void Pushad ( void );
-void Push					 ( int32_t x86reg );
-void Pop					 ( int32_t x86reg );
-void PushImm32 ( uint32_t Value );
-void Ret ( void );
-void Seta ( int32_t x86reg );
-void Setae ( int32_t x86reg );
-void SetaVariable ( void * Variable );
-void Setb ( int32_t x86reg );
-void SetbVariable ( void * Variable );
-void Setg ( int32_t x86reg );
-void SetgVariable ( void * Variable );
-void Setl ( int32_t x86reg );
-void SetlVariable ( void * Variable );
-void Setz					 ( int32_t x86reg );
-void Setnz					 ( int32_t x86reg );
-void ShiftLeftDouble ( int32_t Destination, int32_t Source );
-void ShiftLeftDoubleImmed ( int32_t Destination, int32_t Source, uint8_t Immediate );
-void ShiftLeftSign ( int32_t x86reg );
-void ShiftLeftSignImmed ( int32_t x86reg, uint8_t Immediate );
-void ShiftRightDouble ( int32_t Destination, int32_t Source );
-void ShiftRightDoubleImmed ( int32_t Destination, int32_t Source, uint8_t Immediate );
-void ShiftRightSign ( int32_t x86reg );
-void ShiftRightSignImmed ( int32_t x86reg, uint8_t Immediate );
-void ShiftRightUnsign ( int32_t x86reg );
-void ShiftRightUnsignImmed ( int32_t x86reg, uint8_t Immediate );
-void SbbConstFromX86Reg ( int32_t x86Reg, uint32_t Const );
-void SbbVariableFromX86reg ( int32_t x86reg, void * Variable );
-void SbbX86RegToX86Reg ( int32_t Destination, int32_t Source );
-void SubConstFromVariable ( uint32_t Const, void *Variable );
-void SubConstFromX86Reg ( int32_t x86Reg, uint32_t Const );
-void SubVariableFromX86reg ( int32_t x86reg, void * Variable );
-void SubX86RegToX86Reg ( int32_t Destination, int32_t Source );
-void TestConstToX86Reg ( uint32_t Const, int32_t x86reg );
-void TestVariable ( uint32_t Const, void * Variable );
-void TestX86RegToX86Reg ( int32_t Destination, int32_t Source );
-void TestVariableToX86Reg			 ( uint32_t x86reg, void * Variable);
-void XorConstToX86Reg ( int32_t x86Reg, uint32_t Const );
-void XorX86RegToX86Reg ( int32_t Source, int32_t Destination );
-void XorVariableToX86reg ( void *Variable, int32_t x86reg );
-
-
-void fpuAbs					 ( void );
-void fpuAddDword			 ( void *Variable );
-void fpuAddDwordRegPointer ( int32_t x86Pointer );
-void fpuAddQword			 ( void *Variable );
-void fpuAddQwordRegPointer ( int32_t x86Pointer );
-void fpuAddReg				 ( int32_t x86reg );
-void fpuAddRegPop			 ( int32_t * StackPos, int32_t x86reg );
-void fpuComDword			 ( void *Variable, uint32_t Pop );
-void fpuComDwordRegPointer ( int32_t x86Pointer, uint32_t Pop );
-void fpuComQword			 ( void *Variable, uint32_t Pop );
-void fpuComQwordRegPointer ( int32_t x86Pointer, uint32_t Pop );
-void fpuComReg ( int32_t x86reg, uint32_t Pop );
-void fpuDivDword			 ( void *Variable );
-void fpuDivDwordRegPointer ( int32_t x86Pointer );
-void fpuDivQword			 ( void *Variable );
-void fpuDivQwordRegPointer ( int32_t x86Pointer );
-void fpuDivReg ( int32_t Reg );
-void fpuDivRegPop			 ( int32_t x86reg );
-void fpuExchange ( int32_t Reg );
-void fpuFree ( int32_t Reg );
-void fpuDecStack ( int32_t * StackPos );
-void fpuIncStack ( int32_t * StackPos );
-void fpuLoadControl			 ( void *Variable );
-void fpuLoadDword			 ( int32_t * StackPos, void *Variable );
-void fpuLoadDwordFromX86Reg ( int32_t * StackPos, int32_t x86reg );
-void fpuLoadDwordFromN64Mem ( int32_t * StackPos, int32_t x86reg );
-void fpuLoadInt32bFromN64Mem ( int32_t * StackPos, int32_t x86reg );
-void fpuLoadIntegerDword	 ( int32_t * StackPos, void *Variable );
-void fpuLoadIntegerDwordFromX86Reg ( int32_t * StackPos,int32_t x86Reg );
-void fpuLoadIntegerQword	 ( int32_t * StackPos, void *Variable );
-void fpuLoadIntegerQwordFromX86Reg ( int32_t * StackPos,int32_t x86Reg );
-void fpuLoadQword			 ( int32_t * StackPos, void *Variable );
-void fpuLoadQwordFromX86Reg ( int32_t * StackPos, int32_t x86Reg );
-void fpuLoadQwordFromN64Mem ( int32_t * StackPos, int32_t x86reg );
-void fpuLoadReg ( int32_t * StackPos, int32_t Reg );
-void fpuMulDword ( void *Variable);
-void fpuMulDwordRegPointer ( int32_t x86Pointer );
-void fpuMulQword ( void *Variable);
-void fpuMulQwordRegPointer ( int32_t x86Pointer );
-void fpuMulReg ( int32_t x86reg );
-void fpuMulRegPop ( int32_t x86reg );
-void fpuNeg					 ( void );
-void fpuRound				 ( void );
-void fpuSqrt				 ( void );
-void fpuStoreControl		 ( void *Variable );
-void fpuStoreDword			 ( int32_t * StackPos, void *Variable, uint32_t pop );
-void fpuStoreDwordFromX86Reg ( int32_t * StackPos,int32_t x86Reg, uint32_t pop );
-void fpuStoreDwordToN64Mem	 ( int32_t * StackPos, int32_t x86reg, uint32_t Pop );
-void fpuStoreIntegerDword ( int32_t * StackPos, void *Variable, uint32_t pop );
-void fpuStoreIntegerDwordFromX86Reg ( int32_t * StackPos,int32_t x86Reg, uint32_t pop );
-void fpuStoreIntegerQword ( int32_t * StackPos, void *Variable, uint32_t pop );
-void fpuStoreIntegerQwordFromX86Reg ( int32_t * StackPos, int32_t x86Reg, uint32_t pop );
-void fpuStoreQword			 ( int32_t * StackPos, void *Variable, uint32_t pop );
-void fpuStoreQwordFromX86Reg ( int32_t * StackPos, int32_t x86Reg, uint32_t pop );
-void fpuStoreStatus			 ( void );
-void fpuSubDword			 ( void *Variable );
-void fpuSubDwordRegPointer ( int32_t x86Pointer );
-void fpuSubDwordReverse ( void *Variable );
-void fpuSubQword			 ( void *Variable );
-void fpuSubQwordRegPointer ( int32_t x86Pointer );
-void fpuSubQwordReverse ( void *Variable );
-void fpuSubReg				 ( int32_t x86reg );
-void fpuSubRegPop			 ( int32_t x86reg );
-
-void MoveVariable64ToX86reg(void *Variable, int32_t x86reg);

audacious-plugins-3.1.1.tar.bz2/src/usf/x86_fpu.c Deleted

@@ -1,529 +0,0 @@
-/*
- * Project 64 - A Nintendo 64 emulator.
- *
- * (c) Copyright 2001 zilmar (zilmar@emulation64.com) and
- * Jabo (jabo@emulation64.com).
- *
- * pj64 homepage: www.pj64.net
- *
- * Permission to use, copy, modify and distribute Project64 in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Project64 is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Project64 or software derived from Project64.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so if they want them.
- *
- */
-#include "main.h"
-#include "cpu.h"
-#include "x86.h"
-#include "types.h"
-
-void fpuAbs(void) {
-	PUTDST16(RecompPos,0xE1D9);
-}
-
-void fpuAddDword(void *Variable) {
-	BreakPoint();
-	PUTDST16(RecompPos,0x05D8);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuAddDwordRegPointer(int x86Pointer) {
-	OPCODE_REG_MREG(8,0xD8,OP_D0,x86Pointer);
-}
-
-void fpuAddQword(void *Variable) {
-	BreakPoint();
-	PUTDST16(RecompPos,0x05DC);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuAddQwordRegPointer(int x86Pointer) {
-	OPCODE_REG_MREG(8,0xDC,OP_D0,x86Pointer);
-}
-
-void fpuAddReg(int x86reg) {
-	switch (x86reg&0xf) {
-	case x86_ST0: PUTDST16(RecompPos,0xC0D8); break;
-	case x86_ST1: PUTDST16(RecompPos,0xC1D8); break;
-	case x86_ST2: PUTDST16(RecompPos,0xC2D8); break;
-	case x86_ST3: PUTDST16(RecompPos,0xC3D8); break;
-	case x86_ST4: PUTDST16(RecompPos,0xC4D8); break;
-	case x86_ST5: PUTDST16(RecompPos,0xC5D8); break;
-	case x86_ST6: PUTDST16(RecompPos,0xC6D8); break;
-	case x86_ST7: PUTDST16(RecompPos,0xC7D8); break;
-	}
-}
-
-void fpuAddRegPop(int * StackPos, int x86reg) {
-	*StackPos = (*StackPos + 1) & 7;
-	switch (x86reg&0xf) {
-	case x86_ST0: PUTDST16(RecompPos,0xC0DE); break;
-	case x86_ST1: PUTDST16(RecompPos,0xC1DE); break;
-	case x86_ST2: PUTDST16(RecompPos,0xC2DE); break;
-	case x86_ST3: PUTDST16(RecompPos,0xC3DE); break;
-	case x86_ST4: PUTDST16(RecompPos,0xC4DE); break;
-	case x86_ST5: PUTDST16(RecompPos,0xC5DE); break;
-	case x86_ST6: PUTDST16(RecompPos,0xC6DE); break;
-	case x86_ST7: PUTDST16(RecompPos,0xC7DE); break;
-	}
-}
-
-void fpuComDword(void *Variable, uint32_t Pop) {
-	BreakPoint();
-	PUTDST16(RecompPos, (Pop == 1) ? 0x1DD8 : 0x15D8);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuComDwordRegPointer(int x86Pointer, uint32_t Pop) {
-	if(Pop) {
-		OPCODE_REG_MREG(8,0xD8,OP_D3,x86Pointer);
-	} else {
-		OPCODE_REG_MREG(8,0xD8,OP_D2,x86Pointer);
-	}
-}
-
-void fpuComQword(void *Variable, uint32_t Pop) {
-	BreakPoint();
-	PUTDST16(RecompPos, (Pop == 1) ? 0x1DDC : 0x15DC);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuComQwordRegPointer(int x86Pointer, uint32_t Pop) {
-    if(Pop) {
-		OPCODE_REG_MREG(8,0xDC,OP_D3,x86Pointer);
-	} else {
-		OPCODE_REG_MREG(8,0xDC,OP_D2,x86Pointer);
-	}
-}
-
-void fpuComReg(int x86reg, uint32_t Pop) {
-	int s = (Pop == 1) ? 0x0800 : 0x0000;
-
-	switch (x86reg&0xf) {
-	case x86_ST0: PUTDST16(RecompPos,0xD0D8|s); break;
-	case x86_ST1: PUTDST16(RecompPos,0xD1D8|s); break;
-	case x86_ST2: PUTDST16(RecompPos,0xD2D8|s); break;
-	case x86_ST3: PUTDST16(RecompPos,0xD3D8|s); break;
-	case x86_ST4: PUTDST16(RecompPos,0xD4D8|s); break;
-	case x86_ST5: PUTDST16(RecompPos,0xD5D8|s); break;
-	case x86_ST6: PUTDST16(RecompPos,0xD6D8|s); break;
-	case x86_ST7: PUTDST16(RecompPos,0xD7D8|s); break;
-	}
-}
-
-void fpuDivDword(void *Variable) {
-	BreakPoint();
-	PUTDST16(RecompPos,0x35D8);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuDivDwordRegPointer(int x86Pointer) {
-	OPCODE_REG_MREG(8,0xD8,OP_D6,x86Pointer);
-}
-
-void fpuDivQword(void *Variable) {
-	BreakPoint();
-	PUTDST16(RecompPos,0x35DC);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuDivQwordRegPointer(int x86Pointer) {
-	OPCODE_REG_MREG(8,0xDC,OP_D6,x86Pointer);
-}
-
-void fpuDivReg(int Reg) {
-	switch (Reg) {
-	case x86_ST0: PUTDST16(RecompPos,0xF0D8); break;
-	case x86_ST1: PUTDST16(RecompPos,0xF1D8); break;
-	case x86_ST2: PUTDST16(RecompPos,0xF2D8); break;
-	case x86_ST3: PUTDST16(RecompPos,0xF3D8); break;
-	case x86_ST4: PUTDST16(RecompPos,0xF4D8); break;
-	case x86_ST5: PUTDST16(RecompPos,0xF5D8); break;
-	case x86_ST6: PUTDST16(RecompPos,0xF6D8); break;
-	case x86_ST7: PUTDST16(RecompPos,0xF7D8); break;
-	}
-}
-
-void fpuDivRegPop(int x86reg) {
-	switch (x86reg&0xf) {
-	case x86_ST0: PUTDST16(RecompPos,0xF8DE); break;
-	case x86_ST1: PUTDST16(RecompPos,0xF9DE); break;
-	case x86_ST2: PUTDST16(RecompPos,0xFADE); break;
-	case x86_ST3: PUTDST16(RecompPos,0xFBDE); break;
-	case x86_ST4: PUTDST16(RecompPos,0xFCDE); break;
-	case x86_ST5: PUTDST16(RecompPos,0xFDDE); break;
-	case x86_ST6: PUTDST16(RecompPos,0xFEDE); break;
-	case x86_ST7: PUTDST16(RecompPos,0xFFDE); break;
-	}
-}
-
-void fpuExchange(int Reg) {
-	switch (Reg) {
-	case x86_ST0: PUTDST16(RecompPos,0xC8D9); break;
-	case x86_ST1: PUTDST16(RecompPos,0xC9D9); break;
-	case x86_ST2: PUTDST16(RecompPos,0xCAD9); break;
-	case x86_ST3: PUTDST16(RecompPos,0xCBD9); break;
-	case x86_ST4: PUTDST16(RecompPos,0xCCD9); break;
-	case x86_ST5: PUTDST16(RecompPos,0xCDD9); break;
-	case x86_ST6: PUTDST16(RecompPos,0xCED9); break;
-	case x86_ST7: PUTDST16(RecompPos,0xCFD9); break;
-	}
-}
-
-void fpuFree(int Reg) {
-	switch (Reg) {
-	case x86_ST0: PUTDST16(RecompPos,0xC0DD); break;
-	case x86_ST1: PUTDST16(RecompPos,0xC1DD); break;
-	case x86_ST2: PUTDST16(RecompPos,0xC2DD); break;
-	case x86_ST3: PUTDST16(RecompPos,0xC3DD); break;
-	case x86_ST4: PUTDST16(RecompPos,0xC4DD); break;
-	case x86_ST5: PUTDST16(RecompPos,0xC5DD); break;
-	case x86_ST6: PUTDST16(RecompPos,0xC6DD); break;
-	case x86_ST7: PUTDST16(RecompPos,0xC7DD); break;
-	}
-}
-
-void fpuDecStack(int * StackPos) {
-	*StackPos = (*StackPos - 1) & 7;
-	PUTDST16(RecompPos,0xF6D9);
-}
-
-void fpuIncStack(int * StackPos) {
-	*StackPos = (*StackPos + 1) & 7;
-	PUTDST16(RecompPos,0xF7D9);
-}
-
-void fpuLoadControl(void *Variable) {
-#ifdef USEX64
-	PUTDST16(RecompPos,0xB849);
-	PUTDST64(RecompPos,Variable);
-	PUTDST8(RecompPos,0x41);
-	PUTDST16(RecompPos,0x28D9);
-#else
-	PUTDST16(RecompPos,0x2DD9);
-	PUTDST32(RecompPos,Variable);
-#endif
-}
-
-void fpuLoadDword(int * StackPos,void *Variable) {
-	*StackPos = (*StackPos - 1) & 7;
-	BreakPoint();
-	PUTDST16(RecompPos,0x05D9);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuLoadDwordFromX86Reg(int * StackPos, int x86reg) {
-	*StackPos = (*StackPos - 1) & 7;
-	OPCODE_REG_MREG(8,0xD9,OP_D0,x86reg);
-}
-
-void fpuLoadIntegerDword(int * StackPos,void *Variable) {
-	*StackPos = (*StackPos - 1) & 7;
-	BreakPoint();
-	PUTDST16(RecompPos,0x05DB);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuLoadIntegerDwordFromX86Reg(int * StackPos,int x86reg) {
-	*StackPos = (*StackPos - 1) & 7;
-	OPCODE_REG_MREG(8,0xDB,OP_D0,x86reg);
-}
-
-void fpuLoadIntegerQword(int * StackPos,void *Variable) {
-	*StackPos = (*StackPos - 1) & 7;
-	BreakPoint();
-	PUTDST16(RecompPos,0x2DDF);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuLoadIntegerQwordFromX86Reg(int * StackPos,int x86reg) {
-	*StackPos = (*StackPos - 1) & 7;
-	OPCODE_REG_MREG(8,0xDF,OP_D5,x86reg);
-}
-
-void fpuLoadQword(int * StackPos,void *Variable) {
-	*StackPos = (*StackPos - 1) & 7;
-	BreakPoint();
-	PUTDST16(RecompPos,0x05DD);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuLoadQwordFromX86Reg(int * StackPos, int x86reg) {
-	*StackPos = (*StackPos - 1) & 7;
-	OPCODE_REG_MREG(8,0xDD,OP_D0,x86reg);
-}
-void fpuLoadReg(int * StackPos,int Reg) {
-	*StackPos = (*StackPos - 1) & 7;
-	switch (Reg) {
-	case x86_ST0: PUTDST16(RecompPos,0xC0D9); break;
-	case x86_ST1: PUTDST16(RecompPos,0xC1D9); break;
-	case x86_ST2: PUTDST16(RecompPos,0xC2D9); break;
-	case x86_ST3: PUTDST16(RecompPos,0xC3D9); break;
-	case x86_ST4: PUTDST16(RecompPos,0xC4D9); break;
-	case x86_ST5: PUTDST16(RecompPos,0xC5D9); break;
-	case x86_ST6: PUTDST16(RecompPos,0xC6D9); break;
-	case x86_ST7: PUTDST16(RecompPos,0xC7D9); break;
-		break;
-	}
-}
-
-void fpuMulDword(void *Variable) {
-	BreakPoint();
-	PUTDST16(RecompPos,0x0DD8);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuMulDwordRegPointer(int x86Pointer) {
-	OPCODE_REG_MREG(8,0xD8,OP_D1,x86Pointer);
-}
-
-void fpuMulQword(void *Variable) {
-BreakPoint();
-	PUTDST16(RecompPos,0x0DDC);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuMulQwordRegPointer(int x86Pointer) {
-	OPCODE_REG_MREG(8,0xDC,OP_D1,x86Pointer);
-}
-
-void fpuMulReg(int x86reg) {
-	switch (x86reg&0xf) {
-	case x86_ST0: PUTDST16(RecompPos,0xC8D8); break;
-	case x86_ST1: PUTDST16(RecompPos,0xC9D8); break;
-	case x86_ST2: PUTDST16(RecompPos,0xCAD8); break;
-	case x86_ST3: PUTDST16(RecompPos,0xCBD8); break;
-	case x86_ST4: PUTDST16(RecompPos,0xCCD8); break;
-	case x86_ST5: PUTDST16(RecompPos,0xCDD8); break;
-	case x86_ST6: PUTDST16(RecompPos,0xCED8); break;
-	case x86_ST7: PUTDST16(RecompPos,0xCFD8); break;
-	}
-}
-
-void fpuMulRegPop(int x86reg) {
-	switch (x86reg&0xf) {
-	case x86_ST0: PUTDST16(RecompPos,0xC8DE); break;
-	case x86_ST1: PUTDST16(RecompPos,0xC9DE); break;
-	case x86_ST2: PUTDST16(RecompPos,0xCADE); break;
-	case x86_ST3: PUTDST16(RecompPos,0xCBDE); break;
-	case x86_ST4: PUTDST16(RecompPos,0xCCDE); break;
-	case x86_ST5: PUTDST16(RecompPos,0xCDDE); break;
-	case x86_ST6: PUTDST16(RecompPos,0xCEDE); break;
-	case x86_ST7: PUTDST16(RecompPos,0xCFDE); break;
-	}
-}
-
-void fpuNeg(void) {
-	PUTDST16(RecompPos,0xE0D9);
-}
-
-void fpuRound(void) {
-	PUTDST16(RecompPos,0xFCD9);
-}
-
-void fpuSqrt(void) {
-	PUTDST16(RecompPos,0xFAD9);
-}
-
-void fpuStoreControl(void *Variable) {
-
-#ifdef USEX64
-	PUTDST16(RecompPos,0xB849);
-	PUTDST64(RecompPos,Variable);
-	PUTDST8(RecompPos,0x41);
-	PUTDST16(RecompPos,0x38D9);
-#else
-	PUTDST16(RecompPos,0x3DD9);
-	PUTDST32(RecompPos,Variable);
-#endif
-}
-
-void fpuStoreDword(int * StackPos,void *Variable, uint32_t pop) {
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
-	BreakPoint();
-	PUTDST16(RecompPos,(pop == 0) ? 0x15D9 : 0x1DD9);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuStoreDwordFromX86Reg(int * StackPos,int x86reg, uint32_t pop) {
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
-
-	if(pop) {
-		OPCODE_REG_MREG(8,0xD9,OP_D3,x86reg);
-	} else {
-		OPCODE_REG_MREG(8,0xD9,OP_D2,x86reg);
-	}
-}
-
-
-void fpuStoreIntegerDword(int * StackPos,void *Variable, uint32_t pop) {
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
-	BreakPoint();
-	PUTDST16(RecompPos, (pop == 0) ? 0x15DB : 0x1DDB);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuStoreIntegerDwordFromX86Reg(int * StackPos,int x86reg, uint32_t pop) {
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
-
-	if(pop) {
-		OPCODE_REG_MREG(8,0xDB,OP_D3,x86reg);
-	} else {
-		OPCODE_REG_MREG(8,0xDB,OP_D2,x86reg);
-	}
-}
-
-void fpuStoreIntegerQword(int * StackPos,void *Variable, uint32_t pop) {
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
-	BreakPoint();
-	PUTDST16(RecompPos, (pop == 0) ? 0x35DF : 0x3DDF);
-	PUTDST32(RecompPos,Variable);
-	if (!pop) { BreakPoint(); }
-}
-
-void fpuStoreIntegerQwordFromX86Reg(int * StackPos, int x86reg, uint32_t pop) {
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
-
-	BreakPoint();
-	if(pop) {
-		OPCODE_REG_MREG(8,0xDF,OP_D5,x86reg);
-	} else {
-		OPCODE_REG_MREG(8,0xDF,OP_D4,x86reg);
-	}
-
-}
-
-void fpuStoreQwordFromX86Reg(int * StackPos, int x86reg, uint32_t pop) {
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
-
-	if(pop) {
-		OPCODE_REG_MREG(8,0xDD,OP_D3,x86reg);
-	} else {
-		OPCODE_REG_MREG(8,0xDD,OP_D2,x86reg);
-	}
-
-}
-
-void fpuStoreStatus(void) {
-	PUTDST16(RecompPos,0xE0DF);
-}
-
-void fpuSubDword(void *Variable) {
-	BreakPoint();
-	PUTDST16(RecompPos,0x25D8);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuSubDwordRegPointer(int x86Pointer) {
-    OPCODE_REG_MREG(8,0xD8,OP_D4,x86Pointer);
-}
-
-void fpuSubDwordReverse(void *Variable) {
-BreakPoint();
-	PUTDST16(RecompPos,0x2DD8);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuSubQword(void *Variable) {
-BreakPoint();
-	PUTDST16(RecompPos,0x25DC);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuSubQwordRegPointer(int x86Pointer) {
-    OPCODE_REG_MREG(8,0xDC,OP_D4,x86Pointer);
-}
-
-void fpuSubQwordReverse(void *Variable) {
-	BreakPoint();
-	PUTDST16(RecompPos,0x2DDC);
-	PUTDST32(RecompPos,Variable);
-}
-
-void fpuSubReg(int x86reg) {
-	switch (x86reg&0xf) {
-	case x86_ST0: PUTDST16(RecompPos,0xE0D8); break;
-	case x86_ST1: PUTDST16(RecompPos,0xE1D8); break;
-	case x86_ST2: PUTDST16(RecompPos,0xE2D8); break;
-	case x86_ST3: PUTDST16(RecompPos,0xE3D8); break;
-	case x86_ST4: PUTDST16(RecompPos,0xE4D8); break;
-	case x86_ST5: PUTDST16(RecompPos,0xE5D8); break;
-	case x86_ST6: PUTDST16(RecompPos,0xE6D8); break;
-	case x86_ST7: PUTDST16(RecompPos,0xE7D8); break;
-		break;
-	}
-}
-
-void fpuSubRegPop(int x86reg) {
-	switch (x86reg&0xf) {
-	case x86_ST0: PUTDST16(RecompPos,0xE8DE); break;
-	case x86_ST1: PUTDST16(RecompPos,0xE9DE); break;
-	case x86_ST2: PUTDST16(RecompPos,0xEADE); break;
-	case x86_ST3: PUTDST16(RecompPos,0xEBDE); break;
-	case x86_ST4: PUTDST16(RecompPos,0xECDE); break;
-	case x86_ST5: PUTDST16(RecompPos,0xEDDE); break;
-	case x86_ST6: PUTDST16(RecompPos,0xEEDE); break;
-	case x86_ST7: PUTDST16(RecompPos,0xEFDE); break;
-	}
-}
-void fpuDivDwordReverse(void *Variable) {
-	BreakPoint();
-	PUTDST16(RecompPos,0x3DD8);
-	PUTDST32(RecompPos,Variable);
-}
-
-
-void fpuDivQwordReverse(void *Variable) {
-	BreakPoint();
-	PUTDST16(RecompPos,0x3DDC);
-	PUTDST32(RecompPos,Variable);
-}
-
-unsigned int fpucontrol;
-
-/* returns and pushes current fpu state, bool for set normal */
-int fpuSaveControl(uint32_t bSetNormal) {
-/*	_asm {
-		fnstcw word ptr [fpucontrol]
-	}
-
-	if (bSetNormal == 1) {
-		unsigned short fpunormal = fpucontrol & 0xF3FF;
-		_asm {
-			fldcw word ptr [fpunormal]
-		}
-	}
-*/
-	return fpucontrol;
-}
-
-/* returns and pops fpu state previously pushed */
-int fpuRestoreControl() {
-/*	_asm {
-		fldcw word ptr [fpucontrol]
-	}*/
-	return fpucontrol;
-}
-
-void fpuSetupDouble(void) {
-/*
-	int temp = 0;
-	_asm {
-		fnstcw word ptr [temp]
-		or [temp], 0x300
-		and [temp], 0xFFFFF3FF
-		fldcw word ptr [temp]
-	}  */
-}
-

audacious-plugins-3.1.1.tar.bz2/src/winmm Deleted

audacious-plugins-3.1.1.tar.bz2/src/winmm/Makefile Deleted

audacious-plugins-3.1.1.tar.bz2/src/winmm/waveout.c Deleted

@@ -1,412 +0,0 @@
-/*
- * MS-Windows WaveMapper Output Plugin
- * Copyright (c) 2010-2011 Carlo Bramini
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions, and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions, and the following disclaimer in the documentation
- * provided with the distribution.
- *
- * This software is provided "as is" and without any warranty, express or
- * implied. In no event shall the authors be liable for any damages arising from
- * the use of this software.
- */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <mmsystem.h>
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include <audacious/debug.h>
-#include <audacious/configdb.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-static gboolean winmm_init (void)
-{
-/* TODO: Read UID to be used */
- return TRUE;
-}
-
-static void winmm_about(void)
-{
-/* TODO*/
-}
-
-static void winmm_configure(void)
-{
-/* TODO: Select UID */
-}
-
-#define _WINMM_SIZE_IN_MS 50
-#define _WINMM_NUM_OF_BUF 10
-
-static struct {
- HWAVEOUT hWaveOut;
- UINT uiBufferSize;
- BOOL bIsRunning;
- BOOL bIsPaused;
- UINT CurrentBlock;
- UINT FreeSize;
- LPBYTE OutData;
- UINT PlayingSize;
- DWORD LastVolume;
- UINT BaseTime;
- WAVEFORMATEX wfx;
- CRITICAL_SECTION LockPlaying;
- WAVEHDR WaveHeader[_WINMM_NUM_OF_BUF];
- HANDLE hBlockBusy[_WINMM_NUM_OF_BUF];
- PVOID pSoundBuffer[_WINMM_NUM_OF_BUF];
-} wave;
-
-static void CALLBACK waveOutProc(HWAVEOUT hwo,UINT uMsg,DWORD dwInstance,DWORD dwParam1,DWORD dwParam2)
-{
- if (uMsg == WOM_DONE) {
- WAVEHDR *Block = (WAVEHDR *)dwParam1;
-
- // New buffer in playback
- EnterCriticalSection(&wave.LockPlaying);
- wave.PlayingSize -= wave.uiBufferSize;
- LeaveCriticalSection(&wave.LockPlaying);
-
- SetEvent((HANDLE)Block->dwUser);
- }
-}
-
-static int winmm_open(gint fmt, int rate, int nch)
-{
- WAVEFORMATEX wfx;
- MMRESULT errCode;
- int i;
-
- AUDDBG ("winmm_open(%d,%d,%d)\n",fmt,rate,nch);
-
- // Bits per sample
- switch (fmt) {
- case FMT_U8: wfx.wBitsPerSample = 8; break;
- case FMT_S16_LE: wfx.wBitsPerSample = 16; break;
- case FMT_S24_LE: wfx.wBitsPerSample = 24; break;
- default:
- return 0;
- }
-
- wfx.wFormatTag = WAVE_FORMAT_PCM; // PCM standard.
- wfx.nChannels = nch; // mono/stereo
- wfx.nSamplesPerSec = rate;
- wfx.nBlockAlign = (wfx.wBitsPerSample/8) * wfx.nChannels;
- wfx.nAvgBytesPerSec = rate * wfx.nBlockAlign;
- wfx.cbSize = 0;
-
- wave.uiBufferSize = (wfx.nAvgBytesPerSec * _WINMM_SIZE_IN_MS / 1000UL) & ~3;
-
- errCode = waveOutOpen(&wave.hWaveOut,
- WAVE_MAPPER,
- &wfx,
- (DWORD)waveOutProc,
- (DWORD)NULL, // User data.
- (DWORD)CALLBACK_FUNCTION);
-
- if (errCode != MMSYSERR_NOERROR)
- return 0;
-
- for (i=0; i<_WINMM_NUM_OF_BUF; i++)
- {
- // Allocate the buffer
- wave.pSoundBuffer[i] = HeapAlloc(GetProcessHeap(),
- HEAP_ZERO_MEMORY,
- wave.uiBufferSize);
-
- // Clear the heared content
- ZeroMemory(&wave.WaveHeader[i], sizeof(WAVEHDR));
-
- // Allocate an handle for each block
- wave.hBlockBusy[i] = CreateEvent(NULL, FALSE, TRUE, NULL);
-
- // Copy the handle in the wave header struct too
- wave.WaveHeader[i].dwUser = (DWORD)wave.hBlockBusy[i];
- }
-
- // Initialize object for incrementing Play size
- InitializeCriticalSection(&wave.LockPlaying);
-
- // Engine is running
- wave.bIsRunning = TRUE;
-
- // Engine is not paused
- wave.bIsPaused = FALSE;
-
- // First buffer is surely free
- wave.CurrentBlock = 0;
- wave.OutData = wave.pSoundBuffer[0];
- wave.FreeSize = wave.uiBufferSize;
-
- // Save obtained wfx structure
- wave.wfx = wfx;
-
- // Start from zero!
- wave.BaseTime = 0;
-
- return 1;
-}
-
-static void winmm_write(void *pSound, int dwCopySize)
-{
- DWORD dwFreeSize = wave.FreeSize;
- LPBYTE OutData = (LPBYTE)wave.OutData;
-
- do
- {
- if (dwCopySize > dwFreeSize)
- {
- UINT Current = wave.CurrentBlock;
- WAVEHDR *Header = wave.WaveHeader + Current;
- DWORD dwWaited;
-
- // Copy data in the buffer
- memcpy(OutData, pSound, dwFreeSize);
-
- pSound += dwFreeSize;
-
- // Update the remaining size to copy
- dwCopySize -= dwFreeSize;
-
- if (Header->dwFlags & WHDR_PREPARED)
- waveOutUnprepareHeader(wave.hWaveOut, Header, sizeof(WAVEHDR));
-
- Header->lpData = (LPSTR)wave.pSoundBuffer[Current];
- Header->dwBufferLength = wave.uiBufferSize;
- waveOutPrepareHeader(wave.hWaveOut, Header, sizeof(WAVEHDR));
-
- // Resets the event
- ResetEvent(wave.hBlockBusy[Current]);
-
- // New buffer in playback
- EnterCriticalSection(&wave.LockPlaying);
- wave.PlayingSize += wave.uiBufferSize;
- LeaveCriticalSection(&wave.LockPlaying);
-
- // Send the buffer the the WaveOut queue
- waveOutWrite(wave.hWaveOut, Header, sizeof(WAVEHDR));
-
- // wait a new free block before continuing
- dwWaited = WaitForMultipleObjects(_WINMM_NUM_OF_BUF, wave.hBlockBusy, FALSE, 1000);
-
- if (dwWaited == WAIT_TIMEOUT || dwWaited == WAIT_FAILED)
- return;
-
- dwFreeSize = wave.uiBufferSize;
- wave.CurrentBlock = dwWaited;
- OutData = wave.pSoundBuffer[dwWaited];
- }
- else
- {
- // Copy data in the buffer
- memcpy(OutData, pSound, dwCopySize);
-
- // Update the remaining size to copy
- dwFreeSize -= dwCopySize;
-
- // Update pointer to OutData
- OutData += dwCopySize;
-
- break;
- }
- } while (dwCopySize);
-
- wave.OutData = OutData;
- wave.FreeSize = dwFreeSize;
-}
-
-static void winmm_close(void)
-{
- if (wave.bIsRunning) {
- int i;
-
- wave.bIsRunning = FALSE;
- waveOutReset(wave.hWaveOut); // Reset tout.
- while (waveOutClose(wave.hWaveOut) == WAVERR_STILLPLAYING)
- Sleep(50);
-
- for (i=0; i<_WINMM_NUM_OF_BUF; i++)
- {
- if (wave.WaveHeader[i].dwFlags & WHDR_PREPARED)
- waveOutUnprepareHeader(wave.hWaveOut, &wave.WaveHeader[i], sizeof(WAVEHDR));
-
- HeapFree(GetProcessHeap(), 0, wave.pSoundBuffer[i]);
-
- // Free the handle associated to each block
- CloseHandle(wave.hBlockBusy[i]);
- wave.hBlockBusy[i] = INVALID_HANDLE_VALUE;
- }
- }
-}
-
-static void winmm_flush(int timing)
-{
- if (wave.bIsRunning) {
- waveOutReset(wave.hWaveOut);
- wave.BaseTime = timing;
- }
-}
-
-static void winmm_pause (gboolean paused)
-{
- if (wave.bIsRunning) {
- if (paused) {
- wave.bIsPaused = TRUE;
- waveOutPause(wave.hWaveOut);
- } else {
- wave.bIsPaused = FALSE;
- waveOutRestart(wave.hWaveOut);
- }
- }
-}
-
-static int winmm_buffer_free(void)
-{
- if (wave.bIsRunning) {
- return (wave.uiBufferSize * _WINMM_NUM_OF_BUF) - wave.PlayingSize;
- }
-
- return 0;
-}
-
-static int winmm_written_time(void)
-{
- return (wave.PlayingSize * 1000UL) / wave.wfx.nAvgBytesPerSec;
-}
-
-static void winmm_set_written_time(int timing)
-{
- if (wave.bIsRunning) {
- waveOutReset(wave.hWaveOut);
- wave.BaseTime = timing;
- }
-}
-
-void winmm_drain (void)
-{
- unsigned int i;
-
- if (wave.bIsRunning && !wave.bIsPaused)
- {
- for (i=0; i<_WINMM_NUM_OF_BUF; i++)
- {
- if (i == wave.CurrentBlock)
- continue;
-
- WaitForSingleObject(wave.hBlockBusy[i], INFINITE);
- }
- }
-}
-
-static int winmm_get_output_time(void)
-{
- MMTIME mmt;
- MMRESULT mmr;
- DWORD dwTime;
- LARGE_INTEGER li;
-
- if (!wave.bIsRunning)
- return 0;
-
- dwTime = 0;
-
- ZeroMemory(&mmt, sizeof(MMTIME));
- mmt.wType = TIME_MS;
-
- mmr = waveOutGetPosition(wave.hWaveOut, &mmt, sizeof(MMTIME));
- if (mmr == MMSYSERR_NOERROR) {
-
- switch (mmt.wType) {
- case TIME_MS:
- dwTime = mmt.u.ms;
- break;
-
- case TIME_BYTES:
- li.u.LowPart = mmt.u.cb;
- li.u.HighPart = 0;
- dwTime = (li.QuadPart * 1000UL) / wave.wfx.nAvgBytesPerSec;
- break;
-
- case TIME_SAMPLES:
- li.u.LowPart = mmt.u.sample;
- li.u.HighPart = 0;
- dwTime = (li.QuadPart * 1000UL) / wave.wfx.nSamplesPerSec;
- break;
-
- case TIME_SMPTE:
- dwTime = ((mmt.u.smpte.hour * 3600UL) +
- (mmt.u.smpte.min * 60UL) +
- (mmt.u.smpte.sec ) +
- (mmt.u.smpte.frame / 30UL)) * 1000UL;
- break;
-
- default:
- // Unknown?!?!?
- break;
- }
- }
-
- return wave.BaseTime + dwTime;
-}
-
-static void winmm_get_volume(gint *r, gint *l)
-{
- DWORD dwVolume;
- MMRESULT mmr;
-
- if (!wave.bIsRunning)
- dwVolume = wave.LastVolume;
- else
- {
- mmr = waveOutGetVolume(wave.hWaveOut, &dwVolume);
- if (mmr != MMSYSERR_NOERROR)
- {
- dwVolume = wave.LastVolume;
- }
- }
-
- *r = (HIWORD(dwVolume) * 100UL) / 65535;
- *l = (LOWORD(dwVolume) * 100UL) / 65535;
-}
-
-static void winmm_set_volume(gint r, gint l)
-{
- wave.LastVolume = MAKELONG((l * 65535)/100UL, (r * 65535)/100UL);
-
- if (!wave.bIsRunning)
- return;
-
- waveOutSetVolume(wave.hWaveOut, wave.LastVolume);
-}
-
-AUD_OUTPUT_PLUGIN
-(
- .description = "Windows WaveOut",
- .probe_priority = 0,
- .init = winmm_init,
- .about = winmm_about,
- .configure = winmm_configure,
- .open_audio = winmm_open,
- .write_audio = winmm_write,
- .close_audio = winmm_close,
- .flush = winmm_flush,
- .pause = winmm_pause,
- .buffer_free = winmm_buffer_free,
- .output_time = winmm_get_output_time,
- .written_time = winmm_written_time,
- .get_volume = winmm_get_volume,
- .set_volume = winmm_set_volume,
- .drain = winmm_drain,
- .set_written_time = winmm_set_written_time
-)

audacious-plugins-3.1.1.tar.bz2/INSTALL -> audacious-plugins-3.2.4.tar.bz2/INSTALL Changed

@@ -1,16 +1,25 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
 The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation. It uses
@@ -23,9 +32,9 @@
 
 It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
 If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,30 +44,37 @@
 may remove or edit it.
 
 The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
-The simplest way to compile this package is:
+ The simplest way to compile this package is:
 
 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
 
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
 
 2. Type `make' to compile the package.
 
 3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
 
 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
 source code directory by typing `make clean'. To also remove the
 files that `configure' created (so you can compile the package for
 a different kind of computer), type `make distclean'. There is
@@ -67,45 +83,69 @@
 all sorts of other programs in order to regenerate files that came
 with the distribution.
 
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
 
 You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment. Here
 is an example:
 
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
 *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
 
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+ By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc. You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
 You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files. If you
@@ -116,16 +156,47 @@
 In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
 If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System). The
@@ -137,14 +208,53 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option. TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -152,7 +262,8 @@
 
 where SYSTEM can have one of these forms:
 
- OS KERNEL-OS
+ OS
+ KERNEL-OS
 
 See the file `config.sub' for the possible values of each field. If
 `config.sub' isn't included in this package, then this package doesn't
@@ -170,9 +281,9 @@
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists. Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +292,7 @@
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
 environment passed to `configure'. However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost. In order to avoid this problem, you should set
@@ -190,21 +301,29 @@
 ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
 
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
 
 `--version'
 `-V'
@@ -231,6 +350,16 @@
 Look for the package's source code in directory DIR. Usually
 `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
 `configure' also accepts some other, not widely useful, options. Run
 `configure --help' for more details.

audacious-plugins-3.1.1.tar.bz2/acinclude.m4 -> audacious-plugins-3.2.4.tar.bz2/acinclude.m4 Changed

@@ -1,16 +1,3 @@
-
-dnl ** ADD_PKG_REQUIRES([requirement])
-dnl ** Adds a dependency to package's pkg-config file.
-AC_DEFUN([ADD_PC_REQUIRES], [
-   if test "x$PC_REQUIRES" = "x"; then
-       PC_REQUIRES="$1"
-   else
-       PC_REQUIRES="$PC_REQUIRES, $1"
-   fi
-   AC_SUBST([PC_REQUIRES])
-])
-
-
 dnl ** AUD_CHECK_MODULE([define name], [module], [version required],
 dnl **     [informational name], [additional error message])
 dnl **
@@ -21,7 +8,6 @@
 dnl ** AUD_CHECK_MODULE([GLIB], [gtk+-2.0], [>= 2.8.0], [Gtk+2], [See http://www.gtk.org/])
 AC_DEFUN([AUD_CHECK_MODULE], [
     PKG_CHECK_MODULES([$1], [$2 $3], [
-        ADD_PC_REQUIRES([$2 $3])
     ],[
         PKG_CHECK_EXISTS([$2], [
             cv_pkg_version=`$PKG_CONFIG --modversion "$2" 2>/dev/null`
@@ -174,18 +160,18 @@
 AC_REQUIRE([AC_SYS_LARGEFILE])
 
 if test "x$GCC" = "xyes"; then
-    CFLAGS="$CFLAGS -Wall -pipe"
+    CFLAGS="$CFLAGS -std=gnu99 -Wall -pipe"
     CXXFLAGS="$CXXFLAGS -Wall -pipe"
     AUD_CHECK_CFLAGS(-Wtype-limits)
 fi
 
-dnl Enable "-z defs" only on Linux
+dnl Enable "-Wl,-z,defs" only on Linux
 dnl ==============================
 AC_MSG_CHECKING([for Linux])
 case "$target" in
     *linux*)
         AC_MSG_RESULT([yes])
-        LDFLAGS="$LDFLAGS -z defs"
+        LDFLAGS="$LDFLAGS -Wl,-z,defs"
         ;;
     *)
         AC_MSG_RESULT([no])
@@ -208,15 +194,11 @@
 dnl Check for Gtk+/GLib and pals
 dnl ============================
 AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.16], [Glib2])
+AUD_CHECK_MODULE([GMODULE], [gmodule-2.0], [>= 2.16], [GModule])
 AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.16], [GThread])
 AUD_CHECK_MODULE([PANGO], [pango], [>= 1.20], [Pango])
 AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.6], [Cairo])
 
-dnl Check for libmowgli
-dnl ===================
-AUD_CHECK_MODULE([MOWGLI], [libmowgli], [>= 0.9], [libmowgli],
-    [http://www.atheme.org/projects/mowgli.shtml])
-
 ])

audacious-plugins-3.1.1.tar.bz2/aclocal.m4 -> audacious-plugins-3.2.4.tar.bz2/aclocal.m4 Changed

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -2509,193 +2509,9 @@
 AC_SUBST([$1])dnl
 ])
 
-# Configure paths for SDL
-# Sam Lantinga 9/21/99
-# stolen from Manish Singh
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
-dnl
-AC_DEFUN([AM_PATH_SDL],
-[dnl 
-dnl Get the cflags and libraries from the sdl-config script
-dnl
-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
- sdl_prefix="$withval", sdl_prefix="")
-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
- sdl_exec_prefix="$withval", sdl_exec_prefix="")
-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
-		 , enable_sdltest=yes)
-
- 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
- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
- PATH="$as_save_PATH"
- min_sdl_version=ifelse([$1], ,0.11.0,$1)
- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
- 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"
-dnl
-dnl Now check if the installed SDL is sufficiently new. (Also sanity
-dnl checks the results of sdl-config to some extent
-dnl
- rm -f conf.sdltest
- AC_TRY_RUN([
-#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;
- }
-}
-
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_sdl" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2]) 
- else
- AC_MSG_RESULT(no)
- 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"
- AC_TRY_LINK([
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef main
-#define main K_and_R_C_main
-], [ return 0; ],
- [ 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"],
- [ 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" ])
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- SDL_CFLAGS=""
- SDL_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(SDL_CFLAGS)
- AC_SUBST(SDL_LIBS)
- rm -f conf.sdltest
-])
-
 # Figure out how to run the assembler. -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2717,22 +2533,21 @@
 
 # AM_CONDITIONAL -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
+# serial 10
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -2751,16 +2566,15 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 17
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery. Also note that it means that autoscan, seeing
@@ -2770,7 +2584,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -2783,12 +2597,13 @@
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
 [am_cv_$1_dependencies_compiler_type],
@@ -2796,8 +2611,9 @@
 # We make a subdir and do the tests there. Otherwise we can end up
 # making bogus files that we don't know about and never remove. For
 # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
 mkdir conftest.dir
 # Copy depcomp to subdir because otherwise we won't find it if we're
 # using a relative directory.
@@ -2836,16 +2652,16 @@
 : > sub/conftest.c
 for i in 1 2 3 4 5 6; do
 echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
 done
 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
 # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
 am__obj=sub/conftest.${OBJEXT-o}
 am__minus_obj="-o $am__obj"
 case $depmode in
@@ -2854,16 +2670,16 @@
 test "$am__universal" = false || continue
 ;;
 nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
 if test "x$enable_dependency_tracking" = xyes; then
 	continue
 else
 	break
 fi
 ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
 # not run yet. These depmodes are late enough in the game, and
 # so weak that their functioning should not be impacted.
 am__obj=conftest.${OBJEXT-o}
@@ -2911,7 +2727,7 @@
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -2921,28 +2737,34 @@
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
 am_depcomp="$ac_aux_dir/depcomp"
 AMDEPBACKSLASH='\'
+ am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking. -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
+# serial 6
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
@@ -2961,7 +2783,7 @@
 # Strip MF so we end up with the name of the file.
 mf=`echo "$mf" | sed -e 's/:.*$//'`
 # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
 # some people rename them; so instead we look at the file content.
 # Grep'ing the first line is not enough: some people post-process
 # each Makefile.in and add a new line on top of each file to say so.
@@ -2973,21 +2795,19 @@
 continue
 fi
 # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 test -z "$DEPDIR" && continue
 am__include=`sed -n 's/^am__include = //p' < "$mf"`
 test -z "am__include" && continue
 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
 # Find all dependency output files, they are included files with
 # $(DEPDIR) in their names. We invoke sed twice because it is the
 # simplest approach to changing $(DEPDIR) to its actual value in the
 # expansion.
 for file in `sed -n "
 s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
 # Make sure the directory exists.
 test -f "$dirpart/$file" && continue
 fdir=`AS_DIRNAME(["$file"])`
@@ -3005,7 +2825,7 @@
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
+# is enabled. FIXME. This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -3013,7 +2833,7 @@
 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3036,13 +2856,13 @@
 
 # Check to see how 'make' treats includes.	 -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -3061,7 +2881,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
 am__include=include
@@ -3086,18 +2906,25 @@
 rm -f confinc confmf
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 3
+
 # AM_PROG_MKDIR_P
 # ---------------
-# Check for `mkdir -p'.
+# Check for 'mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
 [AC_PREREQ([2.60])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl FIXME to be removed in Automake 1.13.
+AC_DIAGNOSE([obsolete],
+[$0: this macro is deprecated, and will soon be removed.
+You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
+and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
 dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
 dnl while keeping a definition of mkdir_p for backward compatibility.
 dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
@@ -3114,13 +2941,13 @@
 
 # Helper functions for option handling. -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 6
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -3128,13 +2955,13 @@
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME. Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -3145,13 +2972,13 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -3160,7 +2987,7 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

audacious-plugins-3.1.1.tar.bz2/config.guess -> audacious-plugins-3.2.4.tar.bz2/config.guess Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
 
-timestamp='2006-07-02'
+timestamp='2009-11-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub. If it succeeds, it prints the system name on stdout, and
 # exits with 0. Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -139,23 +139,6 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
-	eval $set_cc_for_build
-	cat << EOF > $dummy.c
-	#include <features.h>
-	#ifdef __UCLIBC__
-	# ifdef __UCLIBC_CONFIG_VERSION__
-	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-	# else
-	LIBC=uclibc
-	# endif
-	#else
-	LIBC=gnu
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
-fi
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -178,6 +161,7 @@
 	 arm*) machine=arm-unknown ;;
 	 sh3el) machine=shl-unknown ;;
 	 sh3eb) machine=sh-unknown ;;
+	 sh5el) machine=sh5le-unknown ;;
 	 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -186,7 +170,7 @@
 	 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		 # Return netbsd for either. FIX?
@@ -340,14 +324,33 @@
 	case `/usr/bin/uname -p` in
 	 sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+ s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
 sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
- i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	 if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	 then
+		SUN_ARCH="x86_64"
+	 fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
 sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -548,7 +551,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -656,7 +659,7 @@
 	 # => hppa64-hp-hpux11.23
 
 	 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	 then
 		HP_ARCH="hppa2.0w"
 	 else
@@ -797,7 +800,7 @@
 i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
 i*:windows32*:*)
@@ -807,15 +810,24 @@
 i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
- x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
- EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+ *:Interix*:*)
+ 	case ${UNAME_MACHINE} in
+	 x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	 authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	 IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+ 8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -845,193 +857,125 @@
 i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+ alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
+	 EV5) UNAME_MACHINE=alphaev5 ;;
+	 EV56) UNAME_MACHINE=alphaev56 ;;
+	 PCA56) UNAME_MACHINE=alphapca56 ;;
+	 PCA57) UNAME_MACHINE=alphapca56 ;;
+	 EV6) UNAME_MACHINE=alphaev6 ;;
+	 EV67) UNAME_MACHINE=alphaev67 ;;
+	 EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
 arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	 | grep -q __ARM_EABI__
+	then
+	 echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
 	exit ;;
 avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 cris:Linux:*:*)
-	echo cris-axis-linux-${LIBC}
+	echo cris-axis-linux-gnu
 	exit ;;
 crisv32:Linux:*:*)
-	echo crisv32-axis-linux-${LIBC}
+	echo crisv32-axis-linux-gnu
 	exit ;;
 frv:Linux:*:*)
- 	echo frv-unknown-linux-${LIBC}
+ 	echo frv-unknown-linux-gnu
+	exit ;;
+ i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
 ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
- mips:Linux:*:*)
+ mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^CPU/{
-		s: ::g
-		p
-	 }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-	;;
- mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^CPU/{
-		s: ::g
-		p
-	 }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
 or32:Linux:*:*)
-	echo or32-unknown-linux-${LIBC}
+	echo or32-unknown-linux-gnu
 	exit ;;
- ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
+ padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
 	exit ;;
- ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
- alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
-	 EV5) UNAME_MACHINE=alphaev5 ;;
-	 EV56) UNAME_MACHINE=alphaev56 ;;
-	 PCA56) UNAME_MACHINE=alphapca56 ;;
-	 PCA57) UNAME_MACHINE=alphapca56 ;;
-	 EV6) UNAME_MACHINE=alphaev6 ;;
-	 EV67) UNAME_MACHINE=alphaev67 ;;
-	 EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
 	exit ;;
 parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	 PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	 PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	 *) echo hppa-unknown-linux-${LIBC} ;;
+	 PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	 PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	 *) echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
+ ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+ ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
 s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
 sh64*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
 x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-${LIBC}
+	echo x86_64-unknown-linux-gnu
+	exit ;;
+ xtensa*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
- i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				 s/[ 	][ 	]*/ /g
-				 s/.*supported targets: *//
-				 s/ .*//
-				 p'`
- case "$ld_supported_targets" in
-	 elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
-		;;
-	 a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
-		exit ;;
-	 coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
-		exit ;;
-	 "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
-		exit ;;
-	esac
-	# This should get integrated into the C code below, but now we hack
-	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	# if __GLIBC__ >= 2
-	LIBC=gnu
-	# else
-	LIBC=gnulibc1
-	# endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^LIBC/{
-		s: ::g
-		p
-	 }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
 i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1060,7 +1004,7 @@
 i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
 i*86:*DOS:*:*)
@@ -1104,8 +1048,11 @@
 pc:*:*:*)
 	# Left here for compatibility:
 # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+ # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
 exit ;;
 Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1143,6 +1090,16 @@
 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 && { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	 && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	 && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	 && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1155,7 +1112,7 @@
 rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
 SM[BE]S:UNIX_SV:*:*)
@@ -1218,6 +1175,9 @@
 BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+ BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
 SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1227,6 +1187,15 @@
 SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+ SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+ SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+ SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
 Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1236,6 +1205,16 @@
 *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	 i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		 grep IS_64BIT_ARCH >/dev/null
+		 then
+		 UNAME_PROCESSOR="x86_64"
+		 fi
+		fi ;;
 	 unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1317,6 +1296,9 @@
 i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+ i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1477,9 +1459,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be

audacious-plugins-3.1.1.tar.bz2/config.h.in -> audacious-plugins-3.2.4.tar.bz2/config.h.in Changed

audacious-plugins-3.1.1.tar.bz2/config.rpath -> audacious-plugins-3.2.4.tar.bz2/config.rpath Changed

@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-# Copyright 1996-2005 Free Software Foundation, Inc.
+# Copyright 1996-2010 Free Software Foundation, Inc.
 # Taken from GNU libtool, 2001
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -25,7 +25,7 @@
 # known workaround is to choose shorter directory names for the build
 # directory and/or the installation directory.
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 shrext=.so
@@ -35,9 +35,19 @@
 host_vendor=`echo "$host" | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'`
 host_os=`echo "$host" | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`
 
-cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
+# Code taken from libtool.m4's _LT_CC_BASENAME.
 
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+for cc_temp in $CC""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's _LT_COMPILER_PIC.
 
 wl=
 if test "$GCC" = yes; then
@@ -48,13 +58,13 @@
 wl='-Wl,'
 ;;
 darwin*)
- case "$cc_basename" in
+ case $cc_basename in
 xlc*)
 wl='-Wl,'
 ;;
 esac
 ;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
 ;;
 hpux9* | hpux10* | hpux11*)
 wl='-Wl,'
@@ -64,9 +74,15 @@
 ;;
 newsos6)
 ;;
- linux*)
+ linux* | k*bsd*-gnu)
 case $cc_basename in
- icc* | ecc*)
+ ecc*)
+ wl='-Wl,'
+ ;;
+ icc* | ifort*)
+ wl='-Wl,'
+ ;;
+ lf95*)
 wl='-Wl,'
 ;;
 pgcc | pgf77 | pgf90)
@@ -78,12 +94,19 @@
 como)
 wl='-lopt='
 ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ wl='-Wl,'
+ ;;
+ esac
+ ;;
 esac
 ;;
 osf3* | osf4* | osf5*)
 wl='-Wl,'
 ;;
- sco3.2v5*)
+ rdos*)
 ;;
 solaris*)
 wl='-Wl,'
@@ -91,11 +114,14 @@
 sunos4*)
 wl='-Qoption ld '
 ;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
 wl='-Wl,'
 ;;
 sysv4*MP*)
 ;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ wl='-Wl,'
+ ;;
 unicos*)
 wl='-Wl,'
 ;;
@@ -104,7 +130,7 @@
 esac
 fi
 
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
 
 hardcode_libdir_flag_spec=
 hardcode_libdir_separator=
@@ -112,7 +138,7 @@
 hardcode_minus_L=no
 
 case "$host_os" in
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
 # FIXME: the MSVC++ port hasn't been tested in a loooong time
 # When not using gcc, we currently assume that we are using
 # Microsoft Visual C++.
@@ -120,6 +146,10 @@
 with_gnu_ld=no
 fi
 ;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
 openbsd*)
 with_gnu_ld=no
 ;;
@@ -127,8 +157,14 @@
 
 ld_shlibs=yes
 if test "$with_gnu_ld" = yes; then
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ # Unlike libtool, we use -rpath here, not --rpath, since the documented
+ # option of GNU ld is called -rpath, not --rpath.
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 case "$host_os" in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
 # On AIX/PPC, the GNU linker is very broken
 if test "$host_cpu" != ia64; then
 ld_shlibs=no
@@ -152,7 +188,7 @@
 ld_shlibs=no
 fi
 ;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
 # hardcode_libdir_flag_spec is actually meaningless, as there is
 # no search path for DLLs.
 hardcode_libdir_flag_spec='-L$libdir'
@@ -162,9 +198,20 @@
 ld_shlibs=no
 fi
 ;;
+ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
 netbsd*)
 ;;
- solaris* | sysv5*)
+ solaris*)
 if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 ld_shlibs=no
 elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -173,16 +220,23 @@
 ld_shlibs=no
 fi
 ;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs=no
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+ ;;
 sunos4*)
 hardcode_direct=yes
 ;;
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- :
- else
- ld_shlibs=no
- fi
- ;;
 *)
 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 :
@@ -191,10 +245,8 @@
 fi
 ;;
 esac
- if test "$ld_shlibs" = yes; then
- # Unlike libtool, we use -rpath here, not --rpath, since the documented
- # option of GNU ld is called -rpath, not --rpath.
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ if test "$ld_shlibs" = no; then
+ hardcode_libdir_flag_spec=
 fi
 else
 case "$host_os" in
@@ -208,7 +260,7 @@
 hardcode_direct=unsupported
 fi
 ;;
- aix4* | aix5*)
+ aix[4-9]*)
 if test "$host_cpu" = ia64; then
 # On IA64, the linker does run time linking by default, so we don't
 # have to do anything special.
@@ -218,13 +270,14 @@
 # Test if we are trying to use run time linking or normal
 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
 # need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 for ld_flag in $LDFLAGS; do
 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
 aix_use_runtimelinking=yes
 break
 fi
 done
+ ;;
 esac
 fi
 hardcode_direct=yes
@@ -236,7 +289,7 @@
 strings "$collect2name" | grep resolve_lib_name >/dev/null
 then
 # We have reworked collect2
- hardcode_direct=yes
+ :
 else
 # We have old collect2
 hardcode_direct=unsupported
@@ -244,6 +297,7 @@
 hardcode_libdir_flag_spec='-L$libdir'
 hardcode_libdir_separator=
 fi
+ ;;
 esac
 fi
 # Begin _LT_AC_SYS_LIBPATH_AIX.
@@ -278,7 +332,7 @@
 ;;
 bsdi[45]*)
 ;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
 # When not using gcc, we currently assume that we are using
 # Microsoft Visual C++.
 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -291,7 +345,7 @@
 if test "$GCC" = yes ; then
 :
 else
- case "$cc_basename" in
+ case $cc_basename in
 xlc*)
 ;;
 *)
@@ -314,7 +368,7 @@
 hardcode_direct=yes
 hardcode_minus_L=yes
 ;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
 hardcode_libdir_flag_spec='-R$libdir'
 hardcode_direct=yes
 ;;
@@ -326,24 +380,25 @@
 # but as the default location of the library.
 hardcode_minus_L=yes
 ;;
- hpux10* | hpux11*)
+ hpux10*)
 if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
- hardcode_direct=no
- ;;
- ia64*)
- hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ fi
+ ;;
+ hpux11*)
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ case $host_cpu in
+ hppa*64*|ia64*)
 hardcode_direct=no
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
 ;;
 *)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
 hardcode_direct=yes
 # hardcode_minus_L: Not really in the search PATH,
 # but as the default location of the library.
@@ -366,18 +421,22 @@
 hardcode_libdir_separator=:
 ;;
 openbsd*)
- hardcode_direct=yes
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct=yes
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
 else
- case "$host_os" in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
+ ld_shlibs=no
 fi
 ;;
 os2*)
@@ -397,8 +456,6 @@
 fi
 hardcode_libdir_separator=:
 ;;
- sco3.2v5*)
- ;;
 solaris*)
 hardcode_libdir_flag_spec='-R$libdir'
 ;;
@@ -427,14 +484,11 @@
 ld_shlibs=yes
 fi
 ;;
- sysv4.2uw2*)
- hardcode_direct=yes
- hardcode_minus_L=no
- ;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 ;;
- sysv5*)
- hardcode_libdir_flag_spec=
+ sysv5* | sco3.2v5* | sco5v6*)
+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator=':'
 ;;
 uts4*)
 hardcode_libdir_flag_spec='-L$libdir'
@@ -446,37 +500,55 @@
 fi
 
 # Check dynamic linker characteristics
-# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec= # the last element of library_names_spec in libtool.m4
 libname_spec='lib$name'
 case "$host_os" in
 aix3*)
+ library_names_spec='$libname.a'
 ;;
- aix4* | aix5*)
+ aix[4-9]*)
+ library_names_spec='$libname$shrext'
 ;;
 amigaos*)
+ library_names_spec='$libname.a'
 ;;
 beos*)
+ library_names_spec='$libname$shrext'
 ;;
 bsdi[45]*)
+ library_names_spec='$libname$shrext'
 ;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
 shrext=.dll
+ library_names_spec='$libname.dll.a $libname.lib'
 ;;
 darwin* | rhapsody*)
 shrext=.dylib
+ library_names_spec='$libname$shrext'
 ;;
 dgux*)
+ library_names_spec='$libname$shrext'
 ;;
 freebsd1*)
 ;;
- kfreebsd*-gnu)
- ;;
- freebsd*)
+ freebsd* | dragonfly*)
+ case "$host_os" in
+ freebsd[123]*)
+ library_names_spec='$libname$shrext$versuffix' ;;
+ *)
+ library_names_spec='$libname$shrext' ;;
+ esac
 ;;
 gnu*)
+ library_names_spec='$libname$shrext'
 ;;
 hpux9* | hpux10* | hpux11*)
- case "$host_cpu" in
+ case $host_cpu in
 ia64*)
 shrext=.so
 ;;
@@ -487,8 +559,13 @@
 shrext=.sl
 ;;
 esac
+ library_names_spec='$libname$shrext'
+ ;;
+ interix[3-9]*)
+ library_names_spec='$libname$shrext'
 ;;
 irix5* | irix6* | nonstopux*)
+ library_names_spec='$libname$shrext'
 case "$host_os" in
 irix5* | nonstopux*)
 libsuff= shlibsuff=
@@ -505,41 +582,59 @@
 ;;
 linux*oldld* | linux*aout* | linux*coff*)
 ;;
- linux*)
+ linux* | k*bsd*-gnu)
+ library_names_spec='$libname$shrext'
 ;;
 knetbsd*-gnu)
+ library_names_spec='$libname$shrext'
 ;;
 netbsd*)
+ library_names_spec='$libname$shrext'
 ;;
 newsos6)
+ library_names_spec='$libname$shrext'
 ;;
 nto-qnx*)
+ library_names_spec='$libname$shrext'
 ;;
 openbsd*)
+ library_names_spec='$libname$shrext$versuffix'
 ;;
 os2*)
 libname_spec='$name'
 shrext=.dll
+ library_names_spec='$libname.a'
 ;;
 osf3* | osf4* | osf5*)
+ library_names_spec='$libname$shrext'
 ;;
- sco3.2v5*)
+ rdos*)
 ;;
 solaris*)
+ library_names_spec='$libname$shrext'
 ;;
 sunos4*)
+ library_names_spec='$libname$shrext$versuffix'
 ;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.3*)
+ library_names_spec='$libname$shrext'
 ;;
 sysv4*MP*)
+ library_names_spec='$libname$shrext'
+ ;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ library_names_spec='$libname$shrext'
 ;;
 uts4*)
+ library_names_spec='$libname$shrext'
 ;;
 esac
 
 sed_quote_subst='s/$["`$\\]$/\\\1/g'
 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
 LC_ALL=C sed -e 's/^$[a-zA-Z0-9_]*$=/acl_cv_\1=/' <<EOF
@@ -553,6 +648,12 @@
 # Shared library suffix (normally "so").
 shlibext="$shlibext"
 
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
 hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"

audacious-plugins-3.1.1.tar.bz2/config.sub -> audacious-plugins-3.2.4.tar.bz2/config.sub Changed

audacious-plugins-3.1.1.tar.bz2/configure -> audacious-plugins-3.2.4.tar.bz2/configure Changed

@@ -1,17 +1,15 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for audacious-plugins 3.1.1.
+# Generated by GNU Autoconf 2.69 for audacious-plugins 3.2.4.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# (C) 2005-2011 Audacious Team
+# (C) 2005-2012 Audacious Team
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -136,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
 emulate sh
@@ -169,7 +192,8 @@
 else
 exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@
 
 
 if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	 *v*x* | *x*v* ) as_opts=-vx ;;
-	 *v* ) as_opts=-v ;;
-	 *x* ) as_opts=-x ;;
-	 * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
 if test x$as_have_required = xno; then :
@@ -330,6 +358,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -451,6 +487,10 @@
 chmod +x "$as_me.lineno" ||
 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
 # Don't try to exec as it changes $[0], causing all sort of problems
 # (the dirname of $[0] is not the place where we might find the
 # original and so on. Autoconf is especially sensitive to this).
@@ -485,16 +525,16 @@
 # ... but there are two gotchas:
 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 elif ln conf$$.file conf$$ 2>/dev/null; then
 as_ln_s=ln
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -506,28 +546,8 @@
 as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -559,8 +579,8 @@
 # Identity of this package.
 PACKAGE_NAME='audacious-plugins'
 PACKAGE_TARNAME='audacious-plugins'
-PACKAGE_VERSION='3.1.1'
-PACKAGE_STRING='audacious-plugins 3.1.1'
+PACKAGE_VERSION='3.2.4'
+PACKAGE_STRING='audacious-plugins 3.2.4'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -646,13 +666,10 @@
 CDIO_CFLAGS
 AMIDIPLUG_BACKENDS
 AMIDIPLUG_BACKEND_DIR
-GMODULE_LIBS
-GMODULE_CFLAGS
 FLUIDSYNTH_LIBS
 FLUIDSYNTH_CFLAGS
 SDL_LIBS
 SDL_CFLAGS
-SDL_CONFIG
 ALSA_LIBS
 ALSA_CFLAGS
 OSS_CFLAGS
@@ -664,6 +681,8 @@
 SIDPLAY2_LIBS
 SIDPLAY1_CFLAGS
 SIDPLAY1_LIBS
+SAMPLERATE_LIBS
+SAMPLERATE_CFLAGS
 JACK_LIBS
 JACK_CFLAGS
 FFMPEG_LIBS
@@ -678,10 +697,12 @@
 WAVPACK_CFLAGS
 LIBFLAC_LIBS
 LIBFLAC_CFLAGS
-OGG_VORBIS_LIBS
-OGG_VORBIS_CFLAGS
+VORBIS_LIBS
+VORBIS_CFLAGS
 BINIO_LIBS
 BINIO_CFLAGS
+GIO_UNIX_LIBS
+GIO_UNIX_CFLAGS
 NOTIFY_LIBS
 NOTIFY_CFLAGS
 XCOMPOSITE_LIBS
@@ -698,10 +719,6 @@
 GDKX11_CFLAGS
 MPG123_LIBS
 MPG123_CFLAGS
-OPENAL_LIBS
-OPENAL_CFLAGS
-LIBROAR_LIBS
-LIBROAR_CFLAGS
 PULSE_LIBS
 PULSE_CFLAGS
 USE_IPV6
@@ -757,15 +774,14 @@
 TERM_SGR0
 TERM_EL
 TPUT
-MOWGLI_LIBS
-MOWGLI_CFLAGS
 CAIRO_LIBS
 CAIRO_CFLAGS
 PANGO_LIBS
 PANGO_CFLAGS
 GTHREAD_LIBS
 GTHREAD_CFLAGS
-PC_REQUIRES
+GMODULE_LIBS
+GMODULE_CFLAGS
 GLIB_LIBS
 GLIB_CFLAGS
 PKG_CONFIG_LIBDIR
@@ -787,6 +803,7 @@
 am__fastdepCCAS_FALSE
 am__fastdepCCAS_TRUE
 CCASDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -874,13 +891,7 @@
 enable_console
 enable_xsf
 enable_pulse
-enable_roar
-enable_openal
-enable_coreaudio
-enable_waveout
-enable_dockalbumart
 enable_psf
-enable_usf
 enable_mp3
 enable_hotkey
 enable_gnomeshortcuts
@@ -889,6 +900,7 @@
 enable_aosd
 enable_aosd_xcomp
 enable_notify
+enable_mpris2
 enable_adplug
 enable_vorbis
 enable_flacng
@@ -912,9 +924,6 @@
 enable_oss4
 enable_alsa
 enable_sdlout
-with_sdl_prefix
-with_sdl_exec_prefix
-enable_sdltest
 enable_amidiplug
 enable_amidiplug_alsa
 enable_amidiplug_flsyn
@@ -927,7 +936,6 @@
 enable_cue
 enable_filewriter
 enable_filewriter_mp3
-enable_filewriter_vorbis
 enable_filewriter_flac
 enable_bs2b
 enable_resample
@@ -954,14 +962,14 @@
 PKG_CONFIG_LIBDIR
 GLIB_CFLAGS
 GLIB_LIBS
+GMODULE_CFLAGS
+GMODULE_LIBS
 GTHREAD_CFLAGS
 GTHREAD_LIBS
 PANGO_CFLAGS
 PANGO_LIBS
 CAIRO_CFLAGS
 CAIRO_LIBS
-MOWGLI_CFLAGS
-MOWGLI_LIBS
 AUDACIOUS_CFLAGS
 AUDACIOUS_LIBS
 GTK_CFLAGS
@@ -970,10 +978,6 @@
 GIO_LIBS
 PULSE_CFLAGS
 PULSE_LIBS
-LIBROAR_CFLAGS
-LIBROAR_LIBS
-OPENAL_CFLAGS
-OPENAL_LIBS
 MPG123_CFLAGS
 MPG123_LIBS
 GDKX11_CFLAGS
@@ -990,10 +994,12 @@
 XCOMPOSITE_LIBS
 NOTIFY_CFLAGS
 NOTIFY_LIBS
+GIO_UNIX_CFLAGS
+GIO_UNIX_LIBS
 BINIO_CFLAGS
 BINIO_LIBS
-OGG_VORBIS_CFLAGS
-OGG_VORBIS_LIBS
+VORBIS_CFLAGS
+VORBIS_LIBS
 LIBFLAC_CFLAGS
 LIBFLAC_LIBS
 WAVPACK_CFLAGS
@@ -1006,13 +1012,15 @@
 FFMPEG_LIBS
 JACK_CFLAGS
 JACK_LIBS
+SAMPLERATE_CFLAGS
+SAMPLERATE_LIBS
 CXXCPP
 ALSA_CFLAGS
 ALSA_LIBS
+SDL_CFLAGS
+SDL_LIBS
 FLUIDSYNTH_CFLAGS
 FLUIDSYNTH_LIBS
-GMODULE_CFLAGS
-GMODULE_LIBS
 CDIO_CFLAGS
 CDIO_LIBS
 CDDB_CFLAGS
@@ -1490,8 +1498,6 @@
 if test "x$host_alias" != x; then
 if test "x$build_alias" = x; then
 cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
 elif test "x$build_alias" != "x$host_alias"; then
 cross_compiling=yes
 fi
@@ -1577,7 +1583,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures audacious-plugins 3.1.1 to adapt to many kinds of systems.
+\`configure' configures audacious-plugins 3.2.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1644,7 +1650,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of audacious-plugins 3.1.1:";;
+ short | recursive ) echo "Configuration of audacious-plugins 3.2.4:";;
 esac
 cat <<\_ACEOF
 
@@ -1652,8 +1658,10 @@
 --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-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
 --disable-largefile omit support for large files
 --disable-nls do not use Native Language Support
 --disable-rpath do not hardcode runtime library paths
@@ -1663,13 +1671,7 @@
 --disable-console disable game music decoder (console)
 --disable-xsf disable Nintendo DS audio decoder (xsf)
 --disable-pulse disable PulseAudio output plugin (default=enabled)
- --disable-roar disable RoarAudio output plugin (default=enabled)
- --enable-openal enable OpenAL output plugin (experimental)
- --disable-coreaudio disable CoreAudio output plugin (default=enabled)
- --enable-waveout enable Windows waveOut output plugin (experimental)
- --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-hotkey disable global hotkey plugin (default=enabled)
 --disable-gnomeshortcuts disable gnome shortcuts (default=enabled)
@@ -1678,8 +1680,9 @@
 --disable-aosd disable Audacious OSD plugin (default=enabled)
 --disable-aosd-xcomp disable Audacious OSD X Composite Support (default=enabled)
 --disable-notify disable notify plugin (default=enabled)
+ --disable-mpris2 disable MPRIS 2 support (default=enabled)
 --disable-adplug disable AdPlug plugin (default=enabled)
- --disable-vorbis disable Ogg Vorbis input plugin (default=enabled)
+ --disable-vorbis disable Ogg Vorbis decoding and encoding
 --disable-flacng disable flac input plugin (default=enabled)
 --disable-wavpack disable WavPack input plugin (default=enabled)
 --disable-aac disable aac plugin (default=enabled)
@@ -1692,7 +1695,6 @@
 --disable-oss4 disable OSS4 output plugin
 --disable-alsa disable ALSA output plugin
 --disable-sdlout disable SDL output plugin
- --disable-sdltest Do not try to compile and run a test SDL program
 --disable-amidiplug disable amidi-plug input plugin (default=check)
 --disable-amidiplug-alsa disable amidi-plug ALSA backend (default=enabled)
 --disable-amidiplug-flsyn disable amidi-plug FluidSynth backend (default=enabled)
@@ -1705,7 +1707,6 @@
 --disable-cue disable cue support. (default=enabled)
 --disable-filewriter disable FileWriter output plugin (default=enabled)
 --disable-filewriter_mp3 disable FileWriter MP3 output part (default=enabled)
- --disable-filewriter_vorbis disable FileWriter Vorbis output part (default=enabled)
 --disable-filewriter_flac disable FileWriter FLAC output part (default=enabled)
 --disable-bs2b disable BS2B effect plugin (default=enabled)
 --disable-resample disable resample effect plugin (default=enabled)
@@ -1730,8 +1731,6 @@
 --with-sidbuilders=DIR What the SIDPlay2 builders install PREFIX is
 --with-builders-inc=DIR Where the SIDPlay2 builders headers are located
 --with-builders-lib=DIR Where the SIDPlay2 builders libraries are installed
- --with-sdl-prefix=PFX Prefix where SDL is installed (optional)
- --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
 
 Some influential environment variables:
 CC C compiler command
@@ -1753,6 +1752,10 @@
 path overriding pkg-config's built-in search path
 GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
 GLIB_LIBS linker flags for GLIB, overriding pkg-config
+ GMODULE_CFLAGS
+ C compiler flags for GMODULE, overriding pkg-config
+ GMODULE_LIBS
+ linker flags for GMODULE, overriding pkg-config
 GTHREAD_CFLAGS
 C compiler flags for GTHREAD, overriding pkg-config
 GTHREAD_LIBS
@@ -1763,9 +1766,6 @@
 CAIRO_CFLAGS
 C compiler flags for CAIRO, overriding pkg-config
 CAIRO_LIBS linker flags for CAIRO, overriding pkg-config
- MOWGLI_CFLAGS
- C compiler flags for MOWGLI, overriding pkg-config
- MOWGLI_LIBS linker flags for MOWGLI, overriding pkg-config
 AUDACIOUS_CFLAGS
 C compiler flags for AUDACIOUS, overriding pkg-config
 AUDACIOUS_LIBS
@@ -1777,13 +1777,6 @@
 PULSE_CFLAGS
 C compiler flags for PULSE, overriding pkg-config
 PULSE_LIBS linker flags for PULSE, overriding pkg-config
- LIBROAR_CFLAGS
- C compiler flags for LIBROAR, overriding pkg-config
- LIBROAR_LIBS
- linker flags for LIBROAR, overriding pkg-config
- 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
@@ -1810,13 +1803,16 @@
 NOTIFY_CFLAGS
 C compiler flags for NOTIFY, overriding pkg-config
 NOTIFY_LIBS linker flags for NOTIFY, overriding pkg-config
+ GIO_UNIX_CFLAGS
+ C compiler flags for GIO_UNIX, overriding pkg-config
+ GIO_UNIX_LIBS
+ linker flags for GIO_UNIX, overriding pkg-config
 BINIO_CFLAGS
 C compiler flags for BINIO, overriding pkg-config
 BINIO_LIBS linker flags for BINIO, overriding pkg-config
- OGG_VORBIS_CFLAGS
- C compiler flags for OGG_VORBIS, overriding pkg-config
- OGG_VORBIS_LIBS
- linker flags for OGG_VORBIS, overriding pkg-config
+ VORBIS_CFLAGS
+ C compiler flags for VORBIS, overriding pkg-config
+ VORBIS_LIBS linker flags for VORBIS, overriding pkg-config
 LIBFLAC_CFLAGS
 C compiler flags for LIBFLAC, overriding pkg-config
 LIBFLAC_LIBS
@@ -1838,17 +1834,19 @@
 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
+ SDL_CFLAGS C compiler flags for SDL, overriding pkg-config
+ SDL_LIBS linker flags for SDL, overriding pkg-config
 FLUIDSYNTH_CFLAGS
 C compiler flags for FLUIDSYNTH, overriding pkg-config
 FLUIDSYNTH_LIBS
 linker flags for FLUIDSYNTH, overriding pkg-config
- GMODULE_CFLAGS
- C compiler flags for GMODULE, overriding pkg-config
- GMODULE_LIBS
- linker flags for GMODULE, overriding pkg-config
 CDIO_CFLAGS C compiler flags for CDIO, overriding pkg-config
 CDIO_LIBS linker flags for CDIO, overriding pkg-config
 CDDB_CFLAGS C compiler flags for CDDB, overriding pkg-config
@@ -1940,14 +1938,14 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-audacious-plugins configure 3.1.1
-generated by GNU Autoconf 2.68
+audacious-plugins configure 3.2.4
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-(C) 2005-2011 Audacious Team
+(C) 2005-2012 Audacious Team
 _ACEOF
 exit
 fi
@@ -2169,7 +2167,7 @@
 	 test ! -s conftest.err
 } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
 }; then :
 ac_retval=0
 else
@@ -2415,7 +2413,7 @@
 	 test ! -s conftest.err
 } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
 }; then :
 ac_retval=0
 else
@@ -2474,8 +2472,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by audacious-plugins $as_me 3.1.1, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+It was created by audacious-plugins $as_me 3.2.4, which was
+generated by GNU Autoconf 2.69. Invocation command line was
 
 $ $0 $@
 
@@ -2827,7 +2825,7 @@
 
 PACKAGE=audacious-plugins
 
-VERSION=3.1.1
+VERSION=3.2.4
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3004,7 +3002,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3044,7 +3042,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CC="gcc"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3097,7 +3095,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="${ac_tool_prefix}cc"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3138,7 +3136,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
 ac_prog_rejected=yes
 continue
@@ -3196,7 +3194,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3240,7 +3238,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CC="$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3686,8 +3684,7 @@
 /* end confdefs.h. */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3800,7 +3797,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3844,7 +3841,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CXX="$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -4057,7 +4054,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
 am__include=include
@@ -4090,6 +4087,7 @@
 if test "x$enable_dependency_tracking" != xno; then
 am_depcomp="$ac_aux_dir/depcomp"
 AMDEPBACKSLASH='\'
+ am__nodep='_no'
 fi
 if test "x$enable_dependency_tracking" != xno; then
 AMDEP_TRUE=
@@ -4118,8 +4116,9 @@
 # We make a subdir and do the tests there. Otherwise we can end up
 # making bogus files that we don't know about and never remove. For
 # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
 mkdir conftest.dir
 # Copy depcomp to subdir because otherwise we won't find it if we're
 # using a relative directory.
@@ -4151,16 +4150,16 @@
 : > sub/conftest.c
 for i in 1 2 3 4 5 6; do
 echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
 done
 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
 # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
 am__obj=sub/conftest.${OBJEXT-o}
 am__minus_obj="-o $am__obj"
 case $depmode in
@@ -4169,16 +4168,16 @@
 test "$am__universal" = false || continue
 ;;
 nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
 if test "x$enable_dependency_tracking" = xyes; then
 	continue
 else
 	break
 fi
 ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
 # not run yet. These depmodes are late enough in the game, and
 # so weak that their functioning should not be impacted.
 am__obj=conftest.${OBJEXT-o}
@@ -4387,7 +4386,7 @@
 for ac_prog in grep ggrep; do
 for ac_exec_ext in '' $ac_executable_extensions; do
 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
 # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4453,7 +4452,7 @@
 for ac_prog in egrep; do
 for ac_exec_ext in '' $ac_executable_extensions; do
 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
 # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5050,6 +5049,8 @@
 esac
 rm -rf conftest*
 fi
+
+
 fi
 
 
@@ -5079,7 +5080,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5122,7 +5123,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5181,7 +5182,7 @@
 
 
 if test "x$GCC" = "xyes"; then
- CFLAGS="$CFLAGS -Wall -pipe"
+ CFLAGS="$CFLAGS -std=gnu99 -Wall -pipe"
 CXXFLAGS="$CXXFLAGS -Wall -pipe"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C/C++ compiler supports -Wtype-limits" >&5
@@ -5223,7 +5224,7 @@
 *linux*)
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
- LDFLAGS="$LDFLAGS -z defs"
+ LDFLAGS="$LDFLAGS -Wl,-z,defs"
 ;;
 *)
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -5316,7 +5317,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5356,7 +5357,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5396,7 +5397,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5436,7 +5437,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5476,7 +5477,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5516,7 +5517,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5556,7 +5557,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_WINDRES="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5693,32 +5694,24 @@
 $as_echo "yes" >&6; }
 
 
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="glib-2.0 >= 2.16"
- else
- PC_REQUIRES="$PC_REQUIRES, glib-2.0 >= 2.16"
- fi
-
-
-
 fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5
-$as_echo_n "checking for GTHREAD... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5
+$as_echo_n "checking for GMODULE... " >&6; }
 
-if test -n "$GTHREAD_CFLAGS"; then
- pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
+if test -n "$GMODULE_CFLAGS"; then
+ pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.16") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 2.16" 2>/dev/null`
+ pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.16" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -5726,16 +5719,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$GTHREAD_LIBS"; then
- pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
+if test -n "$GMODULE_LIBS"; then
+ pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.16") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 2.16" 2>/dev/null`
+ pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.16" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -5756,30 +5749,30 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0 >= 2.16" 2>&1`
+	 GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 >= 2.16" 2>&1`
 else
-	 GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0 >= 2.16" 2>&1`
+	 GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 >= 2.16" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$GTHREAD_PKG_ERRORS" >&5
+	echo "$GMODULE_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
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gmodule-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`
+ cv_pkg_version=`$PKG_CONFIG --modversion "gmodule-2.0" 2>/dev/null`
 as_fn_error $? "
-GThread version $cv_pkg_version was found, but gthread-2.0 >= 2.16 is required.
+GModule version $cv_pkg_version was found, but gmodule-2.0 >= 2.16 is required.
 " "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find GThread! If you are using binary packages based system, check that you
+Cannot find GModule! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
 " "$LINENO" 5
 
@@ -5790,59 +5783,51 @@
 $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
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gmodule-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`
+ cv_pkg_version=`$PKG_CONFIG --modversion "gmodule-2.0" 2>/dev/null`
 as_fn_error $? "
-GThread version $cv_pkg_version was found, but gthread-2.0 >= 2.16 is required.
+GModule version $cv_pkg_version was found, but gmodule-2.0 >= 2.16 is required.
 " "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find GThread! If you are using binary packages based system, check that you
+Cannot find GModule! 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
+	GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS
+	GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="gthread-2.0 >= 2.16"
- else
- PC_REQUIRES="$PC_REQUIRES, gthread-2.0 >= 2.16"
- fi
-
-
-
 fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
-$as_echo_n "checking for PANGO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5
+$as_echo_n "checking for GTHREAD... " >&6; }
 
-if test -n "$PANGO_CFLAGS"; then
- pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
+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 \"pango >= 1.20\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango >= 1.20") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.20" 2>/dev/null`
+ pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 2.16" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -5850,16 +5835,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$PANGO_LIBS"; then
- pkg_cv_PANGO_LIBS="$PANGO_LIBS"
+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 \"pango >= 1.20\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango >= 1.20") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pango >= 1.20" 2>/dev/null`
+ pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 2.16" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -5880,30 +5865,30 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pango >= 1.20" 2>&1`
+	 GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0 >= 2.16" 2>&1`
 else
-	 PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pango >= 1.20" 2>&1`
+	 GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0 >= 2.16" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$PANGO_PKG_ERRORS" >&5
+	echo "$GTHREAD_PKG_ERRORS" >&5
 
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango") 2>&5
+ { { $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 "pango" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "gthread-2.0" 2>/dev/null`
 as_fn_error $? "
-Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
+GThread version $cv_pkg_version was found, but gthread-2.0 >= 2.16 is required.
 " "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find Pango! If you are using binary packages based system, check that you
+Cannot find GThread! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
 " "$LINENO" 5
 
@@ -5914,59 +5899,51 @@
 $as_echo "no" >&6; }
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango") 2>&5
+ { { $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 "pango" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "gthread-2.0" 2>/dev/null`
 as_fn_error $? "
-Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
+GThread version $cv_pkg_version was found, but gthread-2.0 >= 2.16 is required.
 " "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find Pango! If you are using binary packages based system, check that you
+Cannot find GThread! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
 " "$LINENO" 5
 
 fi
 
 else
-	PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS
-	PANGO_LIBS=$pkg_cv_PANGO_LIBS
+	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="pango >= 1.20"
- else
- PC_REQUIRES="$PC_REQUIRES, pango >= 1.20"
- fi
-
-
-
 fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
-$as_echo_n "checking for CAIRO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
+$as_echo_n "checking for PANGO... " >&6; }
 
-if test -n "$CAIRO_CFLAGS"; then
- pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
+if test -n "$PANGO_CFLAGS"; then
+ pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo >= 1.6") 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_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.6" 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
@@ -5974,16 +5951,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$CAIRO_LIBS"; then
- pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
+if test -n "$PANGO_LIBS"; then
+ pkg_cv_PANGO_LIBS="$PANGO_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo >= 1.6") 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_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.6" 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
@@ -6004,30 +5981,30 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= 1.6" 2>&1`
+	 PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pango >= 1.20" 2>&1`
 else
-	 CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= 1.6" 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 "$CAIRO_PKG_ERRORS" >&5
+	echo "$PANGO_PKG_ERRORS" >&5
 
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pango") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 
- cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "pango" 2>/dev/null`
 as_fn_error $? "
-Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
+Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
 " "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find Cairo! If you are using binary packages based system, check that you
+Cannot find Pango! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
 " "$LINENO" 5
 
@@ -6038,60 +6015,51 @@
 $as_echo "no" >&6; }
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pango") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 
- cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "pango" 2>/dev/null`
 as_fn_error $? "
-Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
+Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
 " "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find Cairo! If you are using binary packages based system, check that you
+Cannot find Pango! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
 " "$LINENO" 5
 
 fi
 
 else
-	CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
-	CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
+	PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS
+	PANGO_LIBS=$pkg_cv_PANGO_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="cairo >= 1.6"
- else
- PC_REQUIRES="$PC_REQUIRES, cairo >= 1.6"
- fi
-
-
-
 fi
 
 
 
-
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOWGLI" >&5
-$as_echo_n "checking for MOWGLI... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
+$as_echo_n "checking for CAIRO... " >&6; }
 
-if test -n "$MOWGLI_CFLAGS"; then
- pkg_cv_MOWGLI_CFLAGS="$MOWGLI_CFLAGS"
+if test -n "$CAIRO_CFLAGS"; then
+ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli >= 0.9\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmowgli >= 0.9") 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_MOWGLI_CFLAGS=`$PKG_CONFIG --cflags "libmowgli >= 0.9" 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
@@ -6099,16 +6067,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$MOWGLI_LIBS"; then
- pkg_cv_MOWGLI_LIBS="$MOWGLI_LIBS"
+if test -n "$CAIRO_LIBS"; then
+ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli >= 0.9\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmowgli >= 0.9") 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_MOWGLI_LIBS=`$PKG_CONFIG --libs "libmowgli >= 0.9" 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
@@ -6129,32 +6097,32 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 MOWGLI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmowgli >= 0.9" 2>&1`
+	 CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= 1.6" 2>&1`
 else
-	 MOWGLI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmowgli >= 0.9" 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 "$MOWGLI_PKG_ERRORS" >&5
+	echo "$CAIRO_PKG_ERRORS" >&5
 
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmowgli") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 
- cv_pkg_version=`$PKG_CONFIG --modversion "libmowgli" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
 as_fn_error $? "
-libmowgli version $cv_pkg_version was found, but libmowgli >= 0.9 is required.
-http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
+Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
+" "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find libmowgli! If you are using binary packages based system, check that you
+Cannot find Cairo! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
-http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
+" "$LINENO" 5
 
 fi
 
@@ -6163,41 +6131,33 @@
 $as_echo "no" >&6; }
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmowgli") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 
- cv_pkg_version=`$PKG_CONFIG --modversion "libmowgli" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
 as_fn_error $? "
-libmowgli version $cv_pkg_version was found, but libmowgli >= 0.9 is required.
-http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
+Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
+" "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find libmowgli! If you are using binary packages based system, check that you
+Cannot find Cairo! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
-http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
+" "$LINENO" 5
 
 fi
 
 else
-	MOWGLI_CFLAGS=$pkg_cv_MOWGLI_CFLAGS
-	MOWGLI_LIBS=$pkg_cv_MOWGLI_LIBS
+	CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
+	CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="libmowgli >= 0.9"
- else
- PC_REQUIRES="$PC_REQUIRES, libmowgli >= 0.9"
- fi
-
-
-
 fi
 
 
@@ -6222,7 +6182,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_TPUT="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -6411,6 +6371,8 @@
 
 
 
+CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+
 for ac_func in fcntl fsync mkdtemp
 do :
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -6461,7 +6423,7 @@
 # by default.
 for ac_prog in ginstall scoinst install; do
 for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	 if test $ac_prog = install &&
 	 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	 # AIX install. It has an incompatible calling convention.
@@ -6530,7 +6492,7 @@
 test -z "$as_dir" && as_dir=.
 for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	 as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	 'mkdir (GNU coreutils) '* | \
 	 'mkdir (coreutils) '* | \
@@ -6559,6 +6521,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
+
 mkdir_p="$MKDIR_P"
 case $mkdir_p in
 [\\/$]* | ?:[\\/]*) ;;
@@ -6673,7 +6636,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_GMSGFMT="$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
@@ -8598,12 +8561,12 @@
 pkg_cv_AUDACIOUS_CFLAGS="$AUDACIOUS_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "audacious >= 3.1") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "audacious >= 3.2") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 3.1" 2>/dev/null`
+ pkg_cv_AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 3.2" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -8615,12 +8578,12 @@
 pkg_cv_AUDACIOUS_LIBS="$AUDACIOUS_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "audacious >= 3.1") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "audacious >= 3.2") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 3.1" 2>/dev/null`
+ pkg_cv_AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 3.2" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -8641,19 +8604,19 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audacious >= 3.1" 2>&1`
+	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audacious >= 3.2" 2>&1`
 else
-	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audacious >= 3.1" 2>&1`
+	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audacious >= 3.2" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$AUDACIOUS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Cannot find Audacious 3.1; have you installed Audacious yet?" "$LINENO" 5
+	as_fn_error $? "Cannot find Audacious 3.2; have you installed Audacious yet?" "$LINENO" 5
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	as_fn_error $? "Cannot find Audacious 3.1; have you installed Audacious yet?" "$LINENO" 5
+	as_fn_error $? "Cannot find Audacious 3.2; have you installed Audacious yet?" "$LINENO" 5
 
 else
 	AUDACIOUS_CFLAGS=$pkg_cv_AUDACIOUS_CFLAGS
@@ -8661,13 +8624,6 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="audacious >= 3.1"
- else
- PC_REQUIRES="$PC_REQUIRES, audacious >= 3.1"
- fi
-
-
 fi
 
 CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
@@ -8677,9 +8633,9 @@
 INPUT_PLUGINS="tonegen metronom vtx"
 OUTPUT_PLUGINS="null"
 EFFECT_PLUGINS="compressor crossfade crystalizer ladspa mixer sndstretch stereo_plugin voice_removal echo_plugin"
-GENERAL_PLUGINS="alarm albumart"
+GENERAL_PLUGINS="alarm albumart search-tool"
 VISUALIZATION_PLUGINS="blur_scope cairo-spectrum"
-CONTAINER_PLUGINS="m3u pls asx"
+CONTAINER_PLUGINS="audpl m3u pls asx"
 TRANSPORT_PLUGINS="unix-io"
 
 
@@ -8921,19 +8877,14 @@
 	GIO_LIBS=$pkg_cv_GIO_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="gio-2.0 >= 2.0"
- else
- PC_REQUIRES="$PC_REQUIRES, gio-2.0 >= 2.0"
- fi
-
-
+	enable_gio=yes
 fi
 fi
 
 if test "x$enable_gio" = "xyes"; then
 TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS gio"
+
+
 fi
 
 ### ---------------------------------------------------------------------------
@@ -9228,275 +9179,6 @@
 fi
 
 
-# Check whether --enable-roar was given.
-if test "${enable_roar+set}" = set; then :
- enableval=$enable_roar; enable_roar=$enableval
-else
- enable_roar="yes"
-
-fi
-
-
-if test "x$enable_roar" = "xyes"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBROAR" >&5
-$as_echo_n "checking for LIBROAR... " >&6; }
-
-if test -n "$LIBROAR_CFLAGS"; then
- pkg_cv_LIBROAR_CFLAGS="$LIBROAR_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libroar\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libroar") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBROAR_CFLAGS=`$PKG_CONFIG --cflags "libroar" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$LIBROAR_LIBS"; then
- pkg_cv_LIBROAR_LIBS="$LIBROAR_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libroar\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libroar") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBROAR_LIBS=`$PKG_CONFIG --libs "libroar" 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
-	 LIBROAR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libroar" 2>&1`
- else
-	 LIBROAR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libroar" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBROAR_PKG_ERRORS" >&5
-
-	have_roar=no
-
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_roar=no
-
-else
-	LIBROAR_CFLAGS=$pkg_cv_LIBROAR_CFLAGS
-	LIBROAR_LIBS=$pkg_cv_LIBROAR_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_roar=yes
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS roaraudio"
- TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS roaraudio-vio"
-fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** roaraudio output plugin disabled per user request ***" >&5
-$as_echo "*** roaraudio output plugin disabled per user request ***" >&6; }
- have_roar=no
-fi
-
-
-# Check whether --enable-openal was given.
-if test "${enable_openal+set}" = set; then :
- enableval=$enable_openal; enable_openal=$enableval
-else
- enable_openal=no
-fi
-
-
-if test $enable_openal = yes ; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENAL" >&5
-$as_echo_n "checking for OPENAL... " >&6; }
-
-if test -n "$OPENAL_CFLAGS"; then
- pkg_cv_OPENAL_CFLAGS="$OPENAL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openal\""; } >&5
- ($PKG_CONFIG --exists --print-errors "openal") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_OPENAL_CFLAGS=`$PKG_CONFIG --cflags "openal" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$OPENAL_LIBS"; then
- pkg_cv_OPENAL_LIBS="$OPENAL_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openal\""; } >&5
- ($PKG_CONFIG --exists --print-errors "openal") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_OPENAL_LIBS=`$PKG_CONFIG --libs "openal" 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
-	 OPENAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openal" 2>&1`
- else
-	 OPENAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openal" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$OPENAL_PKG_ERRORS" >&5
-
-	enable_openal=no
-
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	enable_openal=no
-
-else
-	OPENAL_CFLAGS=$pkg_cv_OPENAL_CFLAGS
-	OPENAL_LIBS=$pkg_cv_OPENAL_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	enable_openal=yes
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS openal"
-fi
-fi
-
-
-# Check whether --enable-coreaudio was given.
-if test "${enable_coreaudio+set}" = set; then :
- enableval=$enable_coreaudio; enable_coreaudio=$enableval
-else
- enable_coreaudio="yes"
-
-fi
-
-
-if test "x$enable_coreaudio" = "xyes"; then
-	for ac_header in CoreServices/CoreServices.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "CoreServices/CoreServices.h" "ac_cv_header_CoreServices_CoreServices_h" "$ac_includes_default"
-if test "x$ac_cv_header_CoreServices_CoreServices_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_CORESERVICES_CORESERVICES_H 1
-_ACEOF
- have_coreaudio=yes
-		 OUTPUT_PLUGINS="$OUTPUT_PLUGINS CoreAudio"
-else
- have_coreaudio=no
-fi
-
-done
-
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** CoreAudio output plugin disabled per user request ***" >&5
-$as_echo "*** CoreAudio output plugin disabled per user request ***" >&6; }
-	have_coreaudio=no
-fi
-
-
-# Check whether --enable-waveout was given.
-if test "${enable_waveout+set}" = set; then :
- enableval=$enable_waveout; have_winmm=$enableval
-else
- have_winmm=no
-fi
-
-
-if test "x$have_winmm" = "xyes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Windows Wavemapper Audio is supported" >&5
-$as_echo_n "checking Windows Wavemapper Audio is supported... " >&6; }
-	case "$target" in
-	*mingw*)
-		OUTPUT_PLUGINS="$OUTPUT_PLUGINS winmm"
-		have_winmm=yes
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		;;
-	*)
-		have_winmm=no
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		;;
-	esac
-fi
-
-
-# Check whether --enable-dockalbumart was given.
-if test "${enable_dockalbumart+set}" = set; then :
- enableval=$enable_dockalbumart; enable_dockalbumart=$enableval
-else
- enable_dockalbumart="yes"
-
-fi
-
-
-if test "x$enable_dockalbumart" = "xyes"; then
-	for ac_header in Carbon/Carbon.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "Carbon/Carbon.h" "ac_cv_header_Carbon_Carbon_h" "$ac_includes_default"
-if test "x$ac_cv_header_Carbon_Carbon_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_CARBON_CARBON_H 1
-_ACEOF
- have_dockalbumart=yes
-		 GENERAL_PLUGINS="$GENERAL_PLUGINS dockalbumart"
-else
- have_dockalbumart=no
-fi
-
-done
-
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** DockAlbumArt plugin disabled per user request ***" >&5
-$as_echo "*** DockAlbumArt plugin disabled per user request ***" >&6; }
-	have_dockalbumart=no
-fi
-
-
 # Check whether --enable-psf was given.
 if test "${enable_psf+set}" = set; then :
 enableval=$enable_psf; enable_psf=$enableval
@@ -9510,43 +9192,6 @@
 fi
 
 
-
-# Check whether --enable-usf was given.
-if test "${enable_usf+set}" = set; then :
- enableval=$enable_usf; enable_usf=$enableval
-else
- enable_usf=no
-
-fi
-
-
-if test "x$enable_usf" = "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if your platform is supported for the USF plugin" >&5
-$as_echo_n "checking if your platform is supported for the USF plugin... " >&6; }
- case "$target" in
-	x86_64-*-linux-gnu)
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, AMD64 Linux" >&5
-$as_echo "yes, AMD64 Linux" >&6; }
-		enable_usf=yes
-		;;
-	i*86-*-linux-gnu)
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, X86 Linux" >&5
-$as_echo "yes, X86 Linux" >&6; }
-		enable_usf=yes
-		;;
-	*)
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		enable_usf=no
-		;;
- esac
-
- if test "x$enable_usf" = "xyes"; then
- INPUT_PLUGINS="$INPUT_PLUGINS usf"
- fi
-fi
-
-
 # Check whether --enable-mp3 was given.
 if test "${enable_mp3+set}" = set; then :
 enableval=$enable_mp3; enable_mp3=$enableval
@@ -10631,6 +10276,94 @@
 fi
 
 
+# Check whether --enable-mpris2 was given.
+if test "${enable_mpris2+set}" = set; then :
+ enableval=$enable_mpris2; enable_mpris2=$enableval
+else
+ enable_mpris2=yes
+fi
+
+
+if test $enable_mpris2 = yes ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO_UNIX" >&5
+$as_echo_n "checking for GIO_UNIX... " >&6; }
+
+if test -n "$GIO_UNIX_CFLAGS"; then
+ pkg_cv_GIO_UNIX_CFLAGS="$GIO_UNIX_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.30\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.30") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GIO_UNIX_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.30" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GIO_UNIX_LIBS"; then
+ pkg_cv_GIO_UNIX_LIBS="$GIO_UNIX_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.30\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.30") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GIO_UNIX_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.30" 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
+	 GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.30" 2>&1`
+ else
+	 GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.30" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GIO_UNIX_PKG_ERRORS" >&5
+
+	enable_mpris2=no
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	enable_mpris2=no
+else
+	GIO_UNIX_CFLAGS=$pkg_cv_GIO_UNIX_CFLAGS
+	GIO_UNIX_LIBS=$pkg_cv_GIO_UNIX_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	enable_mpris2=yes
+fi
+fi
+
+if test $enable_mpris2 = yes ; then
+	GENERAL_PLUGINS="$GENERAL_PLUGINS mpris2"
+
+
+fi
+
 
 # Check whether --enable-adplug was given.
 if test "${enable_adplug+set}" = set; then :
@@ -10730,27 +10463,26 @@
 if test "${enable_vorbis+set}" = set; then :
 enableval=$enable_vorbis; enable_vorbis=$enableval
 else
- enable_vorbis="yes"
-
+ enable_vorbis=yes
 fi
 
 
-if test "x$enable_vorbis" = "xyes"; then
+if test $enable_vorbis = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG_VORBIS" >&5
-$as_echo_n "checking for OGG_VORBIS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBIS" >&5
+$as_echo_n "checking for VORBIS... " >&6; }
 
-if test -n "$OGG_VORBIS_CFLAGS"; then
- pkg_cv_OGG_VORBIS_CFLAGS="$OGG_VORBIS_CFLAGS"
+if test -n "$VORBIS_CFLAGS"; then
+ pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.1 vorbisfile >= 1.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.1 vorbisfile >= 1.1") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_OGG_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0 vorbis >= 1.1 vorbisfile >= 1.1" 2>/dev/null`
+ pkg_cv_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10758,16 +10490,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$OGG_VORBIS_LIBS"; then
- pkg_cv_OGG_VORBIS_LIBS="$OGG_VORBIS_LIBS"
+if test -n "$VORBIS_LIBS"; then
+ pkg_cv_VORBIS_LIBS="$VORBIS_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.1 vorbisfile >= 1.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.1 vorbisfile >= 1.1") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_OGG_VORBIS_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0 vorbis >= 1.1 vorbisfile >= 1.1" 2>/dev/null`
+ pkg_cv_VORBIS_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10788,39 +10520,29 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 OGG_VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.1 vorbisfile >= 1.1" 2>&1`
+	 VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>&1`
 else
-	 OGG_VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.1 vorbisfile >= 1.1" 2>&1`
+	 VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$OGG_VORBIS_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libogg/libvorbis, Ogg Vorbis support will not be built ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find libogg/libvorbis, Ogg Vorbis support will not be built ***" >&2;}
- have_oggvorbis=no
+	echo "$VORBIS_PKG_ERRORS" >&5
 
+	enable_vorbis=no
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libogg/libvorbis, Ogg Vorbis support will not be built ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find libogg/libvorbis, Ogg Vorbis support will not be built ***" >&2;}
- have_oggvorbis=no
-
+	enable_vorbis=no
 else
-	OGG_VORBIS_CFLAGS=$pkg_cv_OGG_VORBIS_CFLAGS
-	OGG_VORBIS_LIBS=$pkg_cv_OGG_VORBIS_LIBS
+	VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS
+	VORBIS_LIBS=$pkg_cv_VORBIS_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_oggvorbis=yes
+	enable_vorbis=yes
 fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** Ogg Vorbis plugin disabled per user request ***" >&5
-$as_echo "*** Ogg Vorbis plugin disabled per user request ***" >&6; }
- have_oggvorbis=no
 fi
 
-if test "x$have_oggvorbis" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
+if test $enable_vorbis = yes ; then
+ INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
 fi
 
 
@@ -11317,12 +11039,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.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
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.40.0 libavformat >= 53.5.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.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0" 2>/dev/null`
+ pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11334,12 +11056,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.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
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.40.0 libavformat >= 53.5.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.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0" 2>/dev/null`
+ pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11360,9 +11082,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.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0" 2>&1`
+	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0" 2>&1`
 else
-	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 52.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0" 2>&1`
+	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$FFMPEG_PKG_ERRORS" >&5
@@ -11610,48 +11332,78 @@
 $as_echo "yes" >&6; }
 	enable_jack=$enable_jack
 fi
- { $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
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsamplerate $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 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
+
+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\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "samplerate") 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" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- ac_cv_lib_samplerate_src_process=no
+ pkg_failed=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ else
+ pkg_failed=untried
 fi
-{ $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
+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\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "samplerate") 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" 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
- enable_jack=no
+ _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" 2>&1`
+ else
+	 SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SAMPLERATE_PKG_ERRORS" >&5
 
+	enable_jack=no
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	enable_jack=no
+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; }
+	enable_jack=$enable_jack
+fi
 
 if test $enable_jack = yes ; then
 OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
@@ -11690,7 +11442,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -13161,260 +12913,76 @@
 
 if test $enable_sdlout = yes ; then
 
-# 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
-
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
+$as_echo_n "checking for SDL... " >&6; }
 
-# 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"
+if test -n "$SDL_CFLAGS"; then
+ pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.11\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.11") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.11" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- sdl_exec_prefix=""
+ pkg_failed=yes
 fi
-
-# Check whether --enable-sdltest was given.
-if test "${enable_sdltest+set}" = set; then :
- enableval=$enable_sdltest;
-else
- enable_sdltest=yes
+ else
+ pkg_failed=untried
 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
+if test -n "$SDL_LIBS"; then
+ pkg_cv_SDL_LIBS="$SDL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.11\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.11") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.11" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 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
+ pkg_failed=yes
 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; }
+ else
+ pkg_failed=untried
 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 :
+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
- 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
+ _pkg_short_errors_supported=no
 fi
+ if test $_pkg_short_errors_supported = yes; then
+	 SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.11" 2>&1`
+ else
+	 SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= 1.2.11" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SDL_PKG_ERRORS" >&5
 
- 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; }
- enable_sdlout=yes
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	enable_sdlout=no
+elif test $pkg_failed = untried; then
+ 	{ $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"
+	enable_sdlout=no
+else
+	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+	SDL_LIBS=$pkg_cv_SDL_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	enable_sdlout=yes
 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=""
- enable_sdlout=no
- fi
-
-
- rm -f conf.sdltest
-
 fi
 
 if test $enable_sdlout = yes ; then
@@ -13583,188 +13151,6 @@
 
 if test "x$enable_amidiplug" = "xyes"; then
 INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug"
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
-$as_echo_n "checking for GLIB... " >&6; }
-
-if test -n "$GLIB_CFLAGS"; then
- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6.0") 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.6.0" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$GLIB_LIBS"; then
- pkg_cv_GLIB_LIBS="$GLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6.0") 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.6.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
-	 GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.6.0" 2>&1`
- else
-	 GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.6.0" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GLIB_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (glib-2.0 >= 2.6.0) were not met:
-
-$GLIB_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GLIB_CFLAGS
-and GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GLIB_CFLAGS
-and GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
-	GLIB_LIBS=$pkg_cv_GLIB_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5
-$as_echo_n "checking for GMODULE... " >&6; }
-
-if test -n "$GMODULE_CFLAGS"; then
- pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.6.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.6.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.6.0" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$GMODULE_LIBS"; then
- pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.6.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.6.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.6.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
-	 GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 >= 2.6.0" 2>&1`
- else
-	 GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 >= 2.6.0" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GMODULE_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gmodule-2.0 >= 2.6.0) were not met:
-
-$GMODULE_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GMODULE_CFLAGS
-and GMODULE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GMODULE_CFLAGS
-and GMODULE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS
-	GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
 AMIDIPLUG_BACKEND_DIR=amidi-plug
 
 if test "x$enable_amidiplug_alsa" = "xauto" -o "x$enable_amidiplug_alsa" = "xyes"; then
@@ -14805,97 +14191,14 @@
 fi
 
 
-# Check whether --enable-filewriter_vorbis was given.
-if test "${enable_filewriter_vorbis+set}" = set; then :
- enableval=$enable_filewriter_vorbis; enable_filewriter_vorbis=$enableval
-else
- enable_filewriter_vorbis=yes
-
-fi
-
-
-if test "x$enable_filewriter_vorbis" = "xyes"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG_VORBIS" >&5
-$as_echo_n "checking for OGG_VORBIS... " >&6; }
-
-if test -n "$OGG_VORBIS_CFLAGS"; then
- pkg_cv_OGG_VORBIS_CFLAGS="$OGG_VORBIS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_OGG_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$OGG_VORBIS_LIBS"; then
- pkg_cv_OGG_VORBIS_LIBS="$OGG_VORBIS_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_OGG_VORBIS_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 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
-	 OGG_VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0" 2>&1`
- else
-	 OGG_VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$OGG_VORBIS_PKG_ERRORS" >&5
-
-	have_vorbisenc=no
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_vorbisenc=no
-else
-	OGG_VORBIS_CFLAGS=$pkg_cv_OGG_VORBIS_CFLAGS
-	OGG_VORBIS_LIBS=$pkg_cv_OGG_VORBIS_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_vorbisenc=yes
-fi
- if test "x$have_vorbisenc" = "xyes"; then
+if test $enable_vorbis = yes ; then
 
 $as_echo "#define FILEWRITER_VORBIS 1" >>confdefs.h
 
- FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS `pkg-config --cflags vorbisenc`"
- FILEWRITER_LIBS="$FILEWRITER_LIBS `pkg-config --libs vorbisenc`"
- fi
+ FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $VORBIS_CFLAGS"
+ FILEWRITER_LIBS="$FILEWRITER_LIBS $VORBIS_LIBS"
 fi
 
-
 # Check whether --enable-filewriter_flac was given.
 if test "${enable_filewriter_flac+set}" = set; then :
 enableval=$enable_filewriter_flac; enable_filewriter_flac=$enableval
@@ -15101,48 +14404,77 @@
 
 
 if test "x$enable_resample" = "xyes"; then
- { $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
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsamplerate $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 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
+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\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "samplerate") 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" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- ac_cv_lib_samplerate_src_process=no
+ pkg_failed=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ else
+ pkg_failed=untried
 fi
-{ $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_resample=yes
+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\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "samplerate") 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" 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
- enable_resample=no
+ _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" 2>&1`
+ else
+	 SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SAMPLERATE_PKG_ERRORS" >&5
 
+	enable_resample=no
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	enable_resample=no
+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; }
+	enable_resample=yes
+fi
 fi
 
 if test "x$enable_resample" = "xyes"; then
@@ -15735,16 +15067,16 @@
 # ... but there are two gotchas:
 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 elif ln conf$$.file conf$$ 2>/dev/null; then
 as_ln_s=ln
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -15804,28 +15136,16 @@
 as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -15846,8 +15166,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by audacious-plugins $as_me 3.1.1, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by audacious-plugins $as_me 3.2.4, which was
+generated by GNU Autoconf 2.69. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -15912,11 +15232,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-audacious-plugins config.status 3.1.1
-configured by $0, generated by GNU Autoconf 2.68,
+audacious-plugins config.status 3.2.4
+configured by $0, generated by GNU Autoconf 2.69,
 with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -16006,7 +15326,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 shift
 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
 CONFIG_SHELL='$SHELL'
@@ -16627,7 +15947,7 @@
 # Strip MF so we end up with the name of the file.
 mf=`echo "$mf" | sed -e 's/:.*$//'`
 # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
 # some people rename them; so instead we look at the file content.
 # Grep'ing the first line is not enough: some people post-process
 # each Makefile.in and add a new line on top of each file to say so.
@@ -16661,21 +15981,19 @@
 continue
 fi
 # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 test -z "$DEPDIR" && continue
 am__include=`sed -n 's/^am__include = //p' < "$mf"`
 test -z "am__include" && continue
 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
 # Find all dependency output files, they are included files with
 # $(DEPDIR) in their names. We invoke sed twice because it is the
 # simplest approach to changing $(DEPDIR) to its actual value in the
 # expansion.
 for file in `sed -n "
 s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
 # Make sure the directory exists.
 test -f "$dirpart/$file" && continue
 fdir=`$as_dirname -- "$file" ||
@@ -16870,17 +16188,13 @@
 echo " Open Sound System (oss4): $enable_oss4"
 echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
 echo " PulseAudio (pulse): $have_pulse"
-echo " RoarAudio (roaraudio): $have_roar"
 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"
 echo " -> FileWriter MP3 output part: $have_lame"
-echo " -> FileWriter Vorbis output part: $have_vorbisenc"
+echo " -> FileWriter Vorbis output part: $enable_vorbis"
 echo " -> FileWriter FLAC output part: $have_writer_flac"
 echo " Null Audio output (null): yes"
-echo " Windows waveOut (experimental): $have_winmm"
-echo " OpenAL (experimental): $enable_openal"
 echo " Open Sound System v3 (deprecated): $enable_oss"
 echo
 echo " Input Plugins"
@@ -16895,7 +16209,7 @@
 echo " CD Digital Audio (cdaudio_ng): $enable_cdaudio_ng"
 echo " sndfile extensions: $enable_sndfile"
 echo " Tone Generator: yes"
-echo " Ogg Vorbis (vorbis): $have_oggvorbis"
+echo " Ogg Vorbis (vorbis): $enable_vorbis"
 echo " Free Lossless Audio Codec (flacng): $have_flacng"
 echo " Commodore 64 audio (SID): $have_sidplay $xs_have_sidplay2_api"
 echo " -> libSIDPlay1 support: $xs_have_sidplay1"
@@ -16903,7 +16217,6 @@
 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) (experimental): $enable_usf"
 echo " Nintendo DS audio (xsf): $enable_xsf"
 echo " AdLib synthesizer (adplug): $have_adplug"
 echo " WavPack 4.31+ (wavpack): $have_wavpack"
@@ -16912,6 +16225,9 @@
 echo " General"
 echo " -------"
 echo " Alarm: yes"
+echo " Album Art: yes"
+echo " MPRIS 2 Server: $enable_mpris2"
+echo " Search Tool: yes"
 echo " Song Change: $enable_songchange"
 echo " Status Icon: $have_statusicon"
 echo " Audacious OSD: $have_aosd"
@@ -16921,9 +16237,7 @@
 echo " Gnome Shortcuts Plugin: $have_gnomeshortcuts"
 echo " AudioScrobbler Client: $have_scrobbler"
 echo " Upload to MTP device: $have_mtp_up"
-echo " MacOS Dock Album Art plugin: $have_dockalbumart"
 echo " LyricWiki viewer: $enable_lyricwiki"
-echo " Album Art widget: yes"
 echo
 echo " Effect"
 echo " ------"
@@ -16952,6 +16266,7 @@
 echo
 echo " Container"
 echo " ---------"
+echo " Audacious playlist format (audpl): yes"
 echo " Winamp PLS playlist format (pls): yes"
 echo " M3U playlist format (m3u): yes"
 echo " XML Sharable Playlist Format (xspf): yes"

audacious-plugins-3.1.1.tar.bz2/configure.ac -> audacious-plugins-3.2.4.tar.bz2/configure.ac Changed

@@ -5,8 +5,8 @@
 dnl Initialize
 dnl ==========
 AC_PREREQ([2.59])
-AC_INIT([audacious-plugins], [3.1.1])
-AC_COPYRIGHT([(C) 2005-2011 Audacious Team])
+AC_INIT([audacious-plugins], [3.2.4])
+AC_COPYRIGHT([(C) 2005-2012 Audacious Team])
 
 AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])
 AC_SUBST([VERSION], [AC_PACKAGE_VERSION])
@@ -22,6 +22,10 @@
 BUILDSYS_INIT
 BUILDSYS_SHARED_LIB
 
+dnl This is a legacy branch; disable deprecation warnings
+dnl =====================================================
+CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+
 dnl Headers and functions
 dnl =====================
 AC_CHECK_FUNCS([fcntl fsync mkdtemp])
@@ -36,9 +40,9 @@
 dnl Check for Audacious
 dnl ===================
 
-PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.1],
- [ADD_PC_REQUIRES([audacious >= 3.1])],
- [AC_MSG_ERROR([Cannot find Audacious 3.1; have you installed Audacious yet?])]
+PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.2],
+ [],
+ [AC_MSG_ERROR([Cannot find Audacious 3.2; have you installed Audacious yet?])]
 )
 
 CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
@@ -50,9 +54,9 @@
 INPUT_PLUGINS="tonegen metronom vtx"
 OUTPUT_PLUGINS="null"
 EFFECT_PLUGINS="compressor crossfade crystalizer ladspa mixer sndstretch stereo_plugin voice_removal echo_plugin"
-GENERAL_PLUGINS="alarm albumart"
+GENERAL_PLUGINS="alarm albumart search-tool"
 VISUALIZATION_PLUGINS="blur_scope cairo-spectrum"
-CONTAINER_PLUGINS="m3u pls asx"
+CONTAINER_PLUGINS="audpl m3u pls asx"
 TRANSPORT_PLUGINS="unix-io"
 
 dnl Check for GTK+
@@ -82,11 +86,13 @@
 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])
+ PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.0], [enable_gio=yes], [enable_gio=no])
 fi
 
 if test "x$enable_gio" = "xyes"; then
 TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS gio"
+ AC_SUBST(GIO_CFLAGS)
+ AC_SUBST(GIO_LIBS)
 fi
 
 ### ---------------------------------------------------------------------------
@@ -164,97 +170,6 @@
 have_pulse=no
 fi
 
-dnl *** RoarAudio
-
-AC_ARG_ENABLE(roar,
- [ --disable-roar disable RoarAudio output plugin (default=enabled)],
- [enable_roar=$enableval],
- [enable_roar="yes"]
-)
-
-if test "x$enable_roar" = "xyes"; then
- PKG_CHECK_MODULES(LIBROAR, [libroar],
- [have_roar=yes
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS roaraudio"
- TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS roaraudio-vio"],
- [have_roar=no]
- )
-else
- AC_MSG_RESULT([*** roaraudio output plugin disabled per user request ***])
- have_roar=no
-fi
-
-dnl *** OpenAL
-
-AC_ARG_ENABLE(openal, AS_HELP_STRING(--enable-openal,
- enable OpenAL output plugin (experimental)), enable_openal=$enableval,
- enable_openal=no)
-
-if test $enable_openal = yes ; then
- PKG_CHECK_MODULES(OPENAL, [openal],
- [enable_openal=yes
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS openal"],
- [enable_openal=no]
- )
-fi
-
-dnl *** CoreAudio
-
-AC_ARG_ENABLE(coreaudio,
- [ --disable-coreaudio disable CoreAudio output plugin (default=enabled)],
- [enable_coreaudio=$enableval],
- [enable_coreaudio="yes"]
-)
-
-if test "x$enable_coreaudio" = "xyes"; then
-	AC_CHECK_HEADERS([CoreServices/CoreServices.h],
-		[have_coreaudio=yes
-		 OUTPUT_PLUGINS="$OUTPUT_PLUGINS CoreAudio"],
-		[have_coreaudio=no])
-else
-	AC_MSG_RESULT([*** CoreAudio output plugin disabled per user request ***])
-	have_coreaudio=no
-fi
-
-dnl *** Windows waveOut output plugin
-
-AC_ARG_ENABLE(waveout, AS_HELP_STRING(--enable-waveout,
- enable Windows waveOut output plugin (experimental)),
- have_winmm=$enableval, have_winmm=no)
-
-if test "x$have_winmm" = "xyes"; then
-	AC_MSG_CHECKING([Windows Wavemapper Audio is supported])
-	case "$target" in
-	*mingw*)
-		OUTPUT_PLUGINS="$OUTPUT_PLUGINS winmm"
-		have_winmm=yes
-		AC_MSG_RESULT([yes])
-		;;
-	*)
-		have_winmm=no
-		AC_MSG_RESULT([no])
-		;;
-	esac
-fi
-
-dnl *** Dock Album Art (MacOS)
-
-AC_ARG_ENABLE(dockalbumart,
- [ --disable-dockalbumart disable MacOS dock albumart plugin (default=guess)],
- [enable_dockalbumart=$enableval],
- [enable_dockalbumart="yes"]
-)
-
-if test "x$enable_dockalbumart" = "xyes"; then
-	AC_CHECK_HEADERS([Carbon/Carbon.h],
-		[have_dockalbumart=yes
-		 GENERAL_PLUGINS="$GENERAL_PLUGINS dockalbumart"],
-		[have_dockalbumart=no])
-else
-	AC_MSG_RESULT([*** DockAlbumArt plugin disabled per user request ***])
-	have_dockalbumart=no
-fi
-
 dnl PSF
 dnl ===
 
@@ -267,37 +182,6 @@
 INPUT_PLUGINS="$INPUT_PLUGINS psf"
 fi
 
-
-dnl *** USF
-
-AC_ARG_ENABLE(usf,
- [ --enable-usf enable the USF input plugin (default=disabled)],
- [enable_usf=$enableval],
- [enable_usf=no]
-)
-
-if test "x$enable_usf" = "xyes"; then
- AC_MSG_CHECKING([if your platform is supported for the USF plugin])
- case "$target" in
-	x86_64-*-linux-gnu)
-		AC_MSG_RESULT([yes, AMD64 Linux])
-		enable_usf=yes
-		;;
-	i*86-*-linux-gnu)
-		AC_MSG_RESULT([yes, X86 Linux])
-		enable_usf=yes
-		;;
-	*)
-		AC_MSG_RESULT([no])
-		enable_usf=no
-		;;
- esac
-
- if test "x$enable_usf" = "xyes"; then
- INPUT_PLUGINS="$INPUT_PLUGINS usf"
- fi
-fi
-
 dnl *** MP3
 
 AC_ARG_ENABLE(mp3,
@@ -484,6 +368,23 @@
 GENERAL_PLUGINS="$GENERAL_PLUGINS notify"
 fi
 
+dnl MPRIS 2 (requires GDBus)
+dnl ========================
+
+AC_ARG_ENABLE(mpris2,
+ AS_HELP_STRING([--disable-mpris2], [disable MPRIS 2 support (default=enabled)]),
+ [enable_mpris2=$enableval], [enable_mpris2=yes])
+
+if test $enable_mpris2 = yes ; then
+ PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= 2.30],
+ [enable_mpris2=yes], [enable_mpris2=no])
+fi
+
+if test $enable_mpris2 = yes ; then
+	GENERAL_PLUGINS="$GENERAL_PLUGINS mpris2"
+	AC_SUBST(GIO_UNIX_CFLAGS)
+	AC_SUBST(GIO_UNIX_LIBS)
+fi
 
 dnl *** AdPlug requirement (libbinio)
 
@@ -506,30 +407,26 @@
 	AC_SUBST(BINIO_CFLAGS)
 fi
 
-dnl *** Ogg Vorbis
+dnl Ogg Vorbis
+dnl ==========
+dnl This test is reused later to enable/disable Vorbis support in filewriter.
 
 AC_ARG_ENABLE(vorbis,
- [ --disable-vorbis disable Ogg Vorbis input plugin (default=enabled)],
- [enable_vorbis=$enableval],
- [enable_vorbis="yes"]
-)
+ AS_HELP_STRING([--disable-vorbis], [disable Ogg Vorbis decoding and encoding]),
+ [enable_vorbis=$enableval], [enable_vorbis=yes])
 
-if test "x$enable_vorbis" = "xyes"; then
- PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.1 vorbisfile >= 1.1],
- [have_oggvorbis=yes],
- [AC_MSG_WARN([*** Cannot find libogg/libvorbis, Ogg Vorbis support will not be built ***])
- have_oggvorbis=no]
- )
-else
- AC_MSG_RESULT([*** Ogg Vorbis plugin disabled per user request ***])
- have_oggvorbis=no
+if test $enable_vorbis = yes ; then
+ PKG_CHECK_MODULES(VORBIS,
+ [ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0],
+ [enable_vorbis=yes], [enable_vorbis=no])
 fi
 
-if test "x$have_oggvorbis" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
+if test $enable_vorbis = yes ; then
+ INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
 fi
 
-dnl *** FLACng
+dnl FLAC
+dnl ====
 
 AC_ARG_ENABLE(flacng,
 [ --disable-flacng disable flac input plugin (default=enabled)],
@@ -654,7 +551,7 @@
 
 if test $enable_ffaudio = yes ; then
 PKG_CHECK_MODULES([FFMPEG],
- [libavcodec >= 52.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0],
+ [libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0],
 [have_ffaudio=yes], [have_ffaudio=no])
 fi
 
@@ -674,7 +571,8 @@
 PKG_CHECK_MODULES(JACK, [jack >= 0.120.1 jack < 1.0],
 [enable_jack=$enable_jack], [enable_jack=no])
 ])
- AC_CHECK_LIB([samplerate], [src_process],
+
+ PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
 [enable_jack=$enable_jack], [enable_jack=no])
 
 if test $enable_jack = yes ; then
@@ -797,7 +695,7 @@
 [enable_sdlout=$enableval], [enable_sdlout=yes])
 
 if test $enable_sdlout = yes ; then
- AM_PATH_SDL(1.2.5, [enable_sdlout=yes], [enable_sdlout=no])
+ PKG_CHECK_MODULES([SDL], [sdl >= 1.2.11], [enable_sdlout=yes], [enable_sdlout=no])
 fi
 
 if test $enable_sdlout = yes ; then
@@ -861,8 +759,6 @@
 
 if test "x$enable_amidiplug" = "xyes"; then
 INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug"
- PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0],,)
- PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.6.0],,)
 AMIDIPLUG_BACKEND_DIR=amidi-plug
 AC_SUBST(AMIDIPLUG_BACKEND_DIR)
 if test "x$enable_amidiplug_alsa" = "xauto" -o "x$enable_amidiplug_alsa" = "xyes"; then
@@ -1080,23 +976,14 @@
 fi
 fi
 
+dnl Vorbis support reuses test done for Vorbis input plugin.
 
-AC_ARG_ENABLE(filewriter_vorbis,
- [ --disable-filewriter_vorbis disable FileWriter Vorbis output part (default=enabled) ],
- [enable_filewriter_vorbis=$enableval], [enable_filewriter_vorbis=yes]
-)
-
-if test "x$enable_filewriter_vorbis" = "xyes"; then
- PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0],
- [have_vorbisenc=yes], [have_vorbisenc=no])
- if test "x$have_vorbisenc" = "xyes"; then
- AC_DEFINE(FILEWRITER_VORBIS, 1, [Define if Vorbis output part should be built])
- FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS `pkg-config --cflags vorbisenc`"
- FILEWRITER_LIBS="$FILEWRITER_LIBS `pkg-config --libs vorbisenc`"
- fi
+if test $enable_vorbis = yes ; then
+ AC_DEFINE(FILEWRITER_VORBIS, 1, [Define if Vorbis output part should be built])
+ FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $VORBIS_CFLAGS"
+ FILEWRITER_LIBS="$FILEWRITER_LIBS $VORBIS_LIBS"
 fi
 
-
 AC_ARG_ENABLE(filewriter_flac,
 [ --disable-filewriter_flac disable FileWriter FLAC output part (default=enabled) ],
 [enable_filewriter_flac=$enableval], [enable_filewriter_flac=yes]
@@ -1150,8 +1037,8 @@
 )
 
 if test "x$enable_resample" = "xyes"; then
- AC_CHECK_LIB([samplerate], [src_process], [enable_resample=yes],
- [enable_resample=no])
+ PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
+ [enable_resample=yes], [enable_resample=no])
 fi
 
 if test "x$enable_resample" = "xyes"; then
@@ -1259,17 +1146,13 @@
 echo " Open Sound System (oss4): $enable_oss4"
 echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
 echo " PulseAudio (pulse): $have_pulse"
-echo " RoarAudio (roaraudio): $have_roar"
 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"
 echo " -> FileWriter MP3 output part: $have_lame"
-echo " -> FileWriter Vorbis output part: $have_vorbisenc"
+echo " -> FileWriter Vorbis output part: $enable_vorbis"
 echo " -> FileWriter FLAC output part: $have_writer_flac"
 echo " Null Audio output (null): yes"
-echo " Windows waveOut (experimental): $have_winmm"
-echo " OpenAL (experimental): $enable_openal"
 echo " Open Sound System v3 (deprecated): $enable_oss"
 echo
 echo " Input Plugins"
@@ -1284,7 +1167,7 @@
 echo " CD Digital Audio (cdaudio_ng): $enable_cdaudio_ng"
 echo " sndfile extensions: $enable_sndfile"
 echo " Tone Generator: yes"
-echo " Ogg Vorbis (vorbis): $have_oggvorbis"
+echo " Ogg Vorbis (vorbis): $enable_vorbis"
 echo " Free Lossless Audio Codec (flacng): $have_flacng"
 echo " Commodore 64 audio (SID): $have_sidplay $xs_have_sidplay2_api"
 echo " -> libSIDPlay1 support: $xs_have_sidplay1"
@@ -1292,7 +1175,6 @@
 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) (experimental): $enable_usf"
 echo " Nintendo DS audio (xsf): $enable_xsf"
 echo " AdLib synthesizer (adplug): $have_adplug"
 echo " WavPack 4.31+ (wavpack): $have_wavpack"
@@ -1301,6 +1183,9 @@
 echo " General"
 echo " -------"
 echo " Alarm: yes"
+echo " Album Art: yes"
+echo " MPRIS 2 Server: $enable_mpris2"
+echo " Search Tool: yes"
 echo " Song Change: $enable_songchange"
 echo " Status Icon: $have_statusicon"
 echo " Audacious OSD: $have_aosd"
@@ -1310,9 +1195,7 @@
 echo " Gnome Shortcuts Plugin: $have_gnomeshortcuts"
 echo " AudioScrobbler Client: $have_scrobbler"
 echo " Upload to MTP device: $have_mtp_up"
-echo " MacOS Dock Album Art plugin: $have_dockalbumart"
 echo " LyricWiki viewer: $enable_lyricwiki"
-echo " Album Art widget: yes"
 echo
 echo " Effect"
 echo " ------"
@@ -1341,6 +1224,7 @@
 echo
 echo " Container"
 echo " ---------"
+echo " Audacious playlist format (audpl): yes"
 echo " Winamp PLS playlist format (pls): yes"
 echo " M3U playlist format (m3u): yes"
 echo " XML Sharable Playlist Format (xspf): yes"

audacious-plugins-3.1.1.tar.bz2/extra.mk.in -> audacious-plugins-3.2.4.tar.bz2/extra.mk.in Changed

@@ -53,6 +53,10 @@
 FLUIDSYNTH_LIBS ?= @FLUIDSYNTH_LIBS@
 GDKX11_CFLAGS ?= @GDKX11_CFLAGS@
 GDKX11_LIBS ?= @GDKX11_LIBS@
+GIO_CFLAGS ?= @GIO_CFLAGS@
+GIO_LIBS ?= @GIO_LIBS@
+GIO_UNIX_CFLAGS ?= @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS ?= @GIO_UNIX_LIBS@
 GLIB_CFLAGS ?= @GLIB_CFLAGS@
 GLIB_LIBS ?= @GLIB_LIBS@
 GMODULE_CFLAGS ?= @GMODULE_CFLAGS@
@@ -63,14 +67,10 @@
 JACK_LIBS ?= @JACK_LIBS@
 LIBFLAC_LIBS ?= @LIBFLAC_LIBS@
 LIBFLAC_CFLAGS ?= @LIBFLAC_CFLAGS@
-LIBROAR_CFLAGS ?= @LIBROAR_CFLAGS@
-LIBROAR_LIBS ?= @LIBROAR_LIBS@
 MMS_CFLAGS ?= @MMS_CFLAGS@
 MMS_LIBS ?= @MMS_LIBS@
 MODPLUG_CFLAGS ?= @MODPLUG_CFLAGS@
 MODPLUG_LIBS ?= @MODPLUG_LIBS@
-MOWGLI_CFLAGS ?= @MOWGLI_CFLAGS@
-MOWGLI_LIBS ?= @MOWGLI_LIBS@
 MPG123_CFLAGS ?= @MPG123_CFLAGS@
 MPG123_LIBS ?= @MPG123_LIBS@
 MTP_CFLAGS ?= @MTP_CFLAGS@
@@ -79,10 +79,6 @@
 NEON_LIBS ?= @NEON_LIBS@
 NOTIFY_CFLAGS ?= @NOTIFY_CFLAGS@
 NOTIFY_LIBS ?= @NOTIFY_LIBS@
-OGG_VORBIS_CFLAGS ?= @OGG_VORBIS_CFLAGS@
-OGG_VORBIS_LIBS ?= @OGG_VORBIS_LIBS@
-OPENAL_CFLAGS ?= @OPENAL_CFLAGS@
-OPENAL_LIBS ?= @OPENAL_LIBS@
 OSS_CFLAGS ?= @OSS_CFLAGS@
 PANGO_CFLAGS ?= @PANGO_CFLAGS@
 PANGO_LIBS ?= @PANGO_LIBS@
@@ -100,6 +96,8 @@
 SIDPLAY2_LIBS ?= @SIDPLAY2_LIBS@
 SNDFILE_CFLAGS ?= @SNDFILE_CFLAGS@
 SNDFILE_LIBS ?= @SNDFILE_LIBS@
+VORBIS_CFLAGS ?= @VORBIS_CFLAGS@
+VORBIS_LIBS ?= @VORBIS_LIBS@
 WAVPACK_CFLAGS ?= @WAVPACK_CFLAGS@
 WAVPACK_LIBS ?= @WAVPACK_LIBS@
 XCOMPOSITE_CFLAGS ?= @XCOMPOSITE_CFLAGS@

audacious-plugins-3.1.1.tar.bz2/install-sh -> audacious-plugins-3.2.4.tar.bz2/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,38 +39,68 @@
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
 
-chmodcmd="$chmodprog 0755"
-chowncmd=
 chgrpcmd=
-stripcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -80,81 +110,86 @@
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
+    -c) ;;
+
+    -C) copy_on_change=true;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
+    -s) stripcmd=$stripprog;;
 
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
+    -t) dst_arg=$2
+	shift;;
 
-    -T) no_target_directory=true
-	shift
-	continue;;
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
+    --)	shift
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
+  shift
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,24 +199,47 @@
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -190,71 +248,199 @@
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X$//$[^/]' \| \
+	     X"$dst" : 'X$//$$' \| \
+	     X"$dst" : 'X$/$' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X$\/\/$[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X$\/\/$$/{
+		   s//\1/
+		   q
+		 }
+		 /^X$\/$.*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
 
-  # Make sure that the destination directory exists.
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
 
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
 
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
 
-    pathcomp=
+      eval "$initialize_posix_glob"
 
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +448,9 @@
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -273,51 +458,63 @@
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
 done
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

audacious-plugins-3.1.1.tar.bz2/po/Makefile -> audacious-plugins-3.2.4.tar.bz2/po/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/po/POTFILES.in -> audacious-plugins-3.2.4.tar.bz2/po/POTFILES.in Changed

audacious-plugins-3.1.1.tar.bz2/po/audacious-plugins.pot -> audacious-plugins-3.2.4.tar.bz2/po/audacious-plugins.pot Changed

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-11-15 22:40-0500\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\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"
@@ -90,7 +90,8 @@
 #: src/alarm/interface.c:533 src/alarm/interface.c:581
 #: src/alarm/interface.c:629 src/alarm/interface.c:677
 #: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
 msgid "Default"
 msgstr ""
 
@@ -299,7 +300,7 @@
 msgid "ALSA error"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.c:325
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -331,7 +332,7 @@
 "time software synthesizer based on the SoundFont2 specification (www."
 "fluidsynth.org).\n"
 "Produced audio can be manipulated via player effect plugins and is processed "
-"by chosen ouput plugin.\n"
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
@@ -656,239 +657,239 @@
 msgid "None"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:672
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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:844
+#: src/aosd/aosd_ui.c:843
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -925,11 +926,11 @@
 msgid "Presets:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:241
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:242
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -944,15 +945,15 @@
 "Copyright 2009 John Lindgren"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:550
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:922
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:924
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -1175,7 +1176,7 @@
 msgid "Volume: (%)"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:784
+#: src/ffaudio/ffaudio-core.c:718
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1191,7 +1192,7 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:798
+#: src/ffaudio/ffaudio-core.c:732
 msgid "About FFaudio Plugin"
 msgstr ""
 
@@ -1199,55 +1200,55 @@
 msgid "About FileWriter-Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.c:455
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr ""
 
-#: src/filewriter/filewriter.c:467
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:485
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr ""
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:505
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:515
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:519
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:538
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:541
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:547
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr ""
 
-#: src/filewriter/filewriter.c:572
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr ""
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr ""
 
@@ -1255,151 +1256,151 @@
 msgid "Joint Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr ""
 
-#: src/filewriter/mp3.c:712
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr ""
 
-#: src/filewriter/mp3.c:735
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr ""
 
-#: src/filewriter/mp3.c:760
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr ""
 
-#: src/filewriter/mp3.c:788
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr ""
 
-#: src/filewriter/mp3.c:795
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr ""
 
-#: src/filewriter/mp3.c:819
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr ""
 
-#: src/filewriter/mp3.c:852
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr ""
 
-#: src/filewriter/mp3.c:876
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr ""
 
-#: src/filewriter/mp3.c:901
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr ""
 
-#: src/filewriter/mp3.c:912
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr ""
 
-#: src/filewriter/mp3.c:923
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr ""
 
-#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr ""
 
-#: src/filewriter/mp3.c:945
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr ""
 
-#: src/filewriter/mp3.c:955
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr ""
 
-#: src/filewriter/mp3.c:988
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1004
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr ""
 
-#: src/filewriter/mp3.c:1031
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr ""
 
-#: src/filewriter/mp3.c:1054
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr ""
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1076
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr ""
 
-#: src/filewriter/mp3.c:1104
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1123
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.c:1137
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr ""
 
-#: src/filewriter/mp3.c:1147
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr ""
 
-#: src/filewriter/mp3.c:1170
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr ""
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1193
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
 msgstr ""
 
-#: src/filewriter/mp3.c:1203
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr ""
 
-#: src/filewriter/mp3.c:1210
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr ""
 
-#: src/filewriter/mp3.c:1231
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
 msgstr ""
 
-#: src/filewriter/vorbis.c:236
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr ""
 
-#: src/filewriter/vorbis.c:256
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr ""
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr ""
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1422,31 +1423,15 @@
 "\n"
 msgstr ""
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
-msgid "Open Files"
-msgstr ""
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
-msgid "Add Files"
-msgstr ""
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr ""
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr ""
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr ""
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr ""
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
 msgstr ""
 
@@ -1454,7 +1439,7 @@
 msgid "Year"
 msgstr ""
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
 msgstr ""
 
@@ -1518,243 +1503,251 @@
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
 msgstr ""
 
-#: src/gtkui/menus.c:130
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
 msgstr ""
 
-#: src/gtkui/menus.c:131
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
 msgstr ""
 
-#: src/gtkui/menus.c:132
-msgid "_Add File ..."
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
 msgstr ""
 
-#: src/gtkui/menus.c:133
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
 msgstr ""
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
 msgstr ""
 
-#: src/gtkui/menus.c:136
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
 msgstr ""
 
-#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr ""
 
-#: src/gtkui/menus.c:140
+#: src/gtkui/menus.c:141
 msgid "_Play"
 msgstr ""
 
-#: src/gtkui/menus.c:141
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
 msgstr ""
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:143
 msgid "_Stop"
 msgstr ""
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
 msgstr ""
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:145
 msgid "_Next"
 msgstr ""
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
 msgstr ""
 
-#: src/gtkui/menus.c:147
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
 msgstr ""
 
-#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/menus.c:152
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/menus.c:153
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/menus.c:156
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
 msgstr ""
 
-#: src/gtkui/menus.c:157
+#: src/gtkui/menus.c:158
 msgid "By _Title"
 msgstr ""
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
 msgstr ""
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
 msgstr ""
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
 msgstr ""
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
 msgstr ""
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
 msgstr ""
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/menus.c:165
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
 msgstr ""
 
 #: src/gtkui/menus.c:170
-msgid "_Sort"
+msgid "Remove _Unavailable Files"
 msgstr ""
 
 #: src/gtkui/menus.c:172
+msgid "_Sort"
+msgstr ""
+
+#: src/gtkui/menus.c:174
 msgid "_New"
 msgstr ""
 
-#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
 msgstr ""
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:177
 msgid "_Import ..."
 msgstr ""
 
-#: src/gtkui/menus.c:176
+#: src/gtkui/menus.c:178
 msgid "_Export ..."
 msgstr ""
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:180
 msgid "_Playlist Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:181
 msgid "_Queue Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.c:182
+#: src/gtkui/menus.c:184
 msgid "Volume _Up"
 msgstr ""
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
 msgstr ""
 
-#: src/gtkui/menus.c:185
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
 msgstr ""
 
-#: src/gtkui/menus.c:187
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
 msgstr ""
 
-#: src/gtkui/menus.c:190
+#: src/gtkui/menus.c:192
 msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr ""
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
 msgstr ""
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
 msgstr ""
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
 msgstr ""
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
 msgstr ""
 
-#: src/gtkui/menus.c:201
+#: src/gtkui/menus.c:204
 msgid "_File"
 msgstr ""
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:205
 msgid "_Playback"
 msgstr ""
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
 msgstr ""
 
-#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
 msgstr ""
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:208
 msgid "_Output"
 msgstr ""
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:209
 msgid "_View"
 msgstr ""
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:217
 msgid "_Copy"
 msgstr ""
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:218
 msgid "_Paste"
 msgstr ""
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:219
 msgid "Select _All"
 msgstr ""
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:224
 msgid "_Rename"
 msgstr ""
 
@@ -1762,7 +1755,7 @@
 msgid "GTK Interface"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
 #, c-format
 msgid "%s - Audacious"
 msgstr ""
@@ -1771,30 +1764,34 @@
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.c:103 src/skins/ui_main.c:459
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:458
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.c:107
+#: src/gtkui/ui_statusbar.c:109
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtkui/ui_statusbar.c:122
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
 msgstr ""
@@ -1839,7 +1836,7 @@
 msgid "Volume Down"
 msgstr ""
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
 msgstr ""
 
@@ -1941,7 +1938,7 @@
 msgid "Enable debug printing"
 msgstr ""
 
-#: src/jack/jack.c:422
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1952,73 +1949,73 @@
 "Giacomo Lozito from develia.org"
 msgstr ""
 
-#: src/jack/jack.c:427
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
 msgstr ""
 
-#: src/ladspa/plugin.c:414
+#: src/ladspa/plugin.c:415
 msgid "About LADSPA Host"
 msgstr ""
 
-#: src/ladspa/plugin.c:515
+#: src/ladspa/plugin.c:516
 #, c-format
 msgid "%s Settings"
 msgstr ""
 
-#: src/ladspa/plugin.c:583
+#: src/ladspa/plugin.c:584
 msgid "LADSPA Host Settings"
 msgstr ""
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:593
 msgid "Module paths:"
 msgstr ""
 
-#: src/ladspa/plugin.c:597
+#: src/ladspa/plugin.c:598
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
 msgstr ""
 
-#: src/ladspa/plugin.c:613
+#: src/ladspa/plugin.c:614
 msgid "Available plugins:"
 msgstr ""
 
-#: src/ladspa/plugin.c:625
+#: src/ladspa/plugin.c:626
 msgid "Enable"
 msgstr ""
 
-#: src/ladspa/plugin.c:631
+#: src/ladspa/plugin.c:632
 msgid "Enabled plugins:"
 msgstr ""
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:647
 msgid "Settings"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:269
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:293
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:381
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
 msgstr ""
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr ""
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2027,12 +2024,12 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
@@ -2053,27 +2050,27 @@
 msgid "Changes take effect at the next song change."
 msgstr ""
 
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
 msgstr ""
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
 msgstr ""
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
 msgstr ""
 
-#: src/mtp_up/mtp.c:311
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
 msgstr ""
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
 msgstr ""
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
 msgstr ""
 
@@ -2099,30 +2096,34 @@
 msgid "Run in real time"
 msgstr ""
 
-#: src/oss4/configure.c:76
+#: src/oss4/configure.c:81
 msgid "1. Default device"
 msgstr ""
 
-#: src/oss4/configure.c:132
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
 msgstr ""
 
-#: src/oss4/configure.c:144 src/OSS/configure.c:194
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr ""
 
-#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr ""
 
-#: src/oss4/configure.c:187
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
 msgstr ""
 
-#: src/oss4/configure.c:191
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr ""
+
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr ""
@@ -2168,11 +2169,11 @@
 msgid "Mixer"
 msgstr ""
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:673
+#: src/pulse_audio/pulse_audio.c:677
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr ""
 
@@ -2196,31 +2197,31 @@
 msgid "Method:"
 msgstr ""
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr ""
 
-#: src/scrobbler/configure.c:143
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr ""
 
-#: src/scrobbler/configure.c:165
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr ""
 
-#: src/scrobbler/configure.c:171
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr ""
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr ""
 
-#: src/scrobbler/configure.c:211
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr ""
 
-#: src/scrobbler/configure.c:238
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr ""
 
@@ -2244,11 +2245,45 @@
 msgid "SDL error"
 msgstr ""
 
-#: src/skins/plugin.c:165
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr ""
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr ""
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr ""
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr ""
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr ""
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr ""
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr ""
+
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr ""
 
-#: src/skins/plugin.c:166
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -2338,79 +2373,112 @@
 msgid "Audacious Equalizer"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:896
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
 msgstr ""
 
-#: src/skins/ui_main.c:443
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr ""
+
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:451
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr ""
 
-#: src/skins/ui_main.c:458
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr ""
 
-#: src/skins/ui_main.c:806
+#: src/skins/ui_main.c:807
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:827
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr ""
 
-#: src/skins/ui_main.c:850
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/ui_main.c:852
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/ui_main.c:854
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/ui_main.c:980
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr ""
 
-#: src/skins/ui_main.c:984
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:986
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:989
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/ui_main.c:994
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr ""
 
-#: src/skins/ui_main.c:1648
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:1650
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
 msgstr ""
 
-#: src/skins/ui_main.c:1672
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr ""
 
-#: src/skins/ui_main.c:1674
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
 msgstr ""
 
@@ -2912,145 +2980,129 @@
 msgid "Clear A-B"
 msgstr ""
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
-msgid "Jump to Playlist Start"
-msgstr ""
-
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
 msgstr ""
 
-#: src/skins/ui_manager.c:424
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
 msgstr ""
 
-#: src/skins/ui_manager.c:425
+#: src/skins/ui_manager.c:422
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr ""
 
-#: src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:425
 msgid "Copy"
 msgstr ""
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr ""
 
-#: src/skins/ui_manager.c:432
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr ""
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr ""
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:437
 msgid "Import"
 msgstr ""
 
-#: src/skins/ui_manager.c:441
+#: src/skins/ui_manager.c:438
 msgid "Save"
 msgstr ""
 
-#: src/skins/ui_manager.c:442
+#: src/skins/ui_manager.c:439
 msgid "Delete"
 msgstr ""
 
-#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:445
-msgid "Load preset"
-msgstr ""
-
-#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:453
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr ""
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
 msgstr ""
 
 #: src/skins/ui_manager.c:466
-msgid "Save preset"
-msgstr ""
-
-#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr ""
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:477
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
 #: src/skins/ui_manager.c:481
-msgid "Delete preset"
-msgstr ""
-
-#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 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 "
@@ -3058,39 +3110,39 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3103,12 +3155,12 @@
 msgid "Unarchived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr ""
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
 msgstr ""
 
@@ -3140,29 +3192,29 @@
 msgid "SndStretch - Configuration"
 msgstr ""
 
-#: src/song_change/song_change.c:447
+#: src/song_change/song_change.c:437
 msgid "Command to run when Audacious starts a new song."
 msgstr ""
 
-#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
-#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
 msgstr ""
 
-#: src/song_change/song_change.c:453
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
 msgstr ""
 
-#: src/song_change/song_change.c:459
+#: src/song_change/song_change.c:449
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 
-#: src/song_change/song_change.c:465
+#: src/song_change/song_change.c:455
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3181,25 +3233,25 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:498
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:509
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.c:539
+#: src/song_change/song_change.c:529
 msgid "Song Change"
 msgstr ""
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr ""
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3210,46 +3262,50 @@
 "the system tray area of the window manager.\n"
 msgstr ""
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr ""
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr ""
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
 msgstr ""
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
 msgstr ""
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr ""
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
 msgstr ""
 
-#: src/statusicon/statusicon.c:500
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
 msgstr ""
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
 msgstr ""
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
 msgstr ""
 
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr ""
+
 #: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
@@ -3265,52 +3321,11 @@
 msgid "Configure Extra Stereo"
 msgstr ""
 
-#: src/streambrowser/gui/streambrowser_win.c:78
-msgid "Search:"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:97
-#: src/streambrowser/gui/streambrowser_win.c:372
-msgid "Add Bookmark"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:324
-msgid "Stream name"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:331
-msgid "Now playing"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:369
-msgid "Remove Bookmark"
-msgstr ""
-
-#: src/streambrowser/streambrowser.c:330
-msgid "About Stream Browser"
-msgstr ""
-
-#: src/streambrowser/streambrowser.c:331
-msgid ""
-"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming "
-"directories.\n"
-"Many thanks to the Streamtuner developers <http://www.nongnu.org/"
-"streamtuner>,\n"
-"\tand of course to the whole Audacious community.\n"
-"\n"
-"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-"\n"
-"This was a Google Summer of Code 2008 project."
-msgstr ""
-
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3319,12 +3334,12 @@
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr ""
 
@@ -3332,11 +3347,11 @@
 msgid "About File I/O Plugin"
 msgstr ""
 
-#: src/vorbis/vorbis.c:572
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr ""
 
-#: src/vorbis/vorbis.c:577
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"

audacious-plugins-3.1.1.tar.bz2/po/cs.po -> audacious-plugins-3.2.4.tar.bz2/po/cs.po Changed

@@ -1,36 +1,24 @@
-# Czech translation for audatious-plugins
-# Copyright (C) 2007 Petr Pisar <petr.pisar@atlas.cz>
-# This file is distributed under the same license as the audacious-plugins
-# package.
+# Czech translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
 # Based on audacious-1.2.2.cs.po by Jan Nárovec <finn@sendmail.cz>, 2004.
+# <pavelfric@seznam.cz>, 2012.
 # Petr Pisar <petr.pisar@atlas.cz>, 2007, 2008, 2009, 2010, 2011.
-#
-# clicks (sound) → praskání, praskot 
-# crossfade → přechod
-# gapless → vázaný
-# mixer → směšovač
-# next (song) → další (skladba)
-# pause (playback) → pozastavit (přehrávání)
-# play (a song) → hrát (skladbu)
-# previous (song) → předchozí (skladba)
-# skin → téma
-# stop (playback) → zastavit (přehrávání)
-# tag (metadata) → popisky
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious-plugins audacious-plugins-3.1-24-gf8985b0\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-11-20 21:26+0100\n"
-"PO-Revision-Date: 2011-11-20 21:30+0100\n"
-"Last-Translator: Petr Písař <petr.pisar@atlas.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-03-23 07:21+0000\n"
+"Last-Translator: fri <pavelfric@seznam.cz>\n"
+"Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"g41e8449\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #: src/aac/libmp4.c:256
 #, c-format
@@ -38,10 +26,7 @@
 "Using libfaad2-%s for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
-msgstr ""
-"Pro dekódování použito libfaad2-%s.\n"
-"FAAD2 AAC/HE-AAC/HE-AACv2/DRM dekodér © Nero AG, www.nero.com\n"
-"Copyright © 2005–2006 tým Audacious"
+msgstr "Pro dekódování použito libfaad2-%s.\nFAAD2 AAC/HE-AAC/HE-AACv2/DRM dekodér © Nero AG, www.nero.com\nCopyright © 2005–2006 tým Audacious"
 
 #: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
@@ -49,17 +34,14 @@
 
 #: src/alarm/alarm.c:312
 msgid "About Alarm"
-msgstr "O budíku"
+msgstr "O budíku"
 
 #: src/alarm/alarm.c:313
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr ""
-"Modul, kterým lze začít přehrávání v určitou dobu.\n"
-"\n"
-"Původně napsali Adam Feakin a Daniel Stodden."
+msgstr "Přídavný modul, který se dá použít pro započetí přehrávání v určitou dobu.\n\nPůvodně napsaný Adamem Feakinem a Danielem Stoddenem."
 
 #: src/alarm/interface.c:33
 msgid "Alarm"
@@ -82,19 +64,17 @@
 msgid "Time"
 msgstr "Čas"
 
-# TODO: Pluralize
 #: src/alarm/interface.c:270
 msgid "hours"
-msgstr "h"
+msgstr "hodin"
 
 #: src/alarm/interface.c:331
 msgid "h"
 msgstr "h"
 
-# TODO: Pluralize
 #: src/alarm/interface.c:361
 msgid "minutes"
-msgstr "min"
+msgstr "minut"
 
 #: src/alarm/interface.c:379
 msgid "Quiet after:"
@@ -112,7 +92,8 @@
 #: src/alarm/interface.c:533 src/alarm/interface.c:581
 #: src/alarm/interface.c:629 src/alarm/interface.c:677
 #: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
 msgid "Default"
 msgstr "Standardní"
 
@@ -156,7 +137,6 @@
 msgid "Fading"
 msgstr "Zesilování"
 
-# TODO: Pluralize
 #: src/alarm/interface.c:912
 msgid "seconds"
 msgstr "sekund"
@@ -266,56 +246,7 @@
 " 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 určenou úroveň\n"
-" po vybranou dobu.\n"
-"\n"
-" Začít na: \n"
-" Zesilovat začne na 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"
-" budou 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 přepínač,\n"
-" přejete-li si zobrazovat vzkaz.\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\nDny\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\nHlasitost\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\nVolby:\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:1190 src/skins/ui_manager.c:382
 msgid "Help"
@@ -371,13 +302,11 @@
 msgid "ALSA error"
 msgstr "Chyba ALSY"
 
-#: src/amidi-plug/amidi-plug.c:325
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr ""
-"Nevybrali jste žádné porty sekvenceru určené pro přehrávání MIDI. Můžete tak "
-"učinit v nastavení modulu MIDI."
+msgstr "Nevybrali jste žádné porty sekvenceru určené pro přehrávání MIDI. Můžete tak učinit v nastavení modulu MIDI."
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:35
 msgid "ALSA Backend "
@@ -385,23 +314,10 @@
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:37
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
-"ports. The ALSA sequencer interface is very versatile, it can provide ports "
-"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
-"synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from "
-"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
-"hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Tento backend posílá MIDI události skupině uživatelem vybraných portů ALSA "
-"sekvenceru. Rozhraní ALSA sekvenceru je velmi přizpůsobivé, může poskytovat "
-"porty hardwarovým syntetizátorům na zvukové kartě (př. emu10k1) nebo "
-"syntetizátorům softwarovým, vnějším zařízením atd.\n"
-"Tento backend žádný zvuk nevytváří, MIDI události jsou zpracovány přímo "
-"zařízením/programem, který se ukrývá za ALSA portem. Na příklad MIDI "
-"události zaslané hardwarovému syntetizátoru budou hrány přímo jím.\n"
-"Backend napsal Giacomo Lozito."
+msgstr "Tento backend posílá MIDI události skupině uživatelem vybraných portů ALSA sekvenceru. Rozhraní ALSA sekvenceru je velmi přizpůsobivé, může poskytovat porty hardwarovým syntetizátorům na zvukové kartě (př. emu10k1) nebo syntetizátorům softwarovým, vnějším zařízením atd.\nTento backend žádný zvuk nevytváří, MIDI události jsou zpracovány přímo zařízením/programem, který se ukrývá za ALSA portem. Na příklad MIDI události zaslané hardwarovému syntetizátoru budou hrány přímo jím.\nBackend napsal Giacomo Lozito."
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
@@ -409,19 +325,10 @@
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-"
-"time software synthesizer based on the SoundFont2 specification (www."
-"fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed "
-"by chosen ouput plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Tento backend vytváří zvuky zasíláním MIDI událostí do FluidSynth, což je "
-"softwarový syntetizátor pracující v reálném čase založený na specifikaci "
-"SoundFont2 (www.fluidsynth.org).\n"
-"Vyprodukovaný zvuk může být upraven efektovými moduly přehrávače a následně "
-"je zpracován vybraným výstupním modulem.\n"
-"Backend napsal Giacomo Lozito."
+msgstr "Toto jádro vytváří zvuk posíláním událostí MIDI do FluidSynth, softwarovému syntetizátoru založenému na specifikaci SoundFont2 (www.fluidsynth.org).\nS vytvořeným zvukem lze pracovat prostřednictvím efektových přídavných modulů přehrávače a je zpracován vybraným výstupním přídavným modulem.\nJádro napsáno Giacomo Lozito."
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
@@ -463,9 +370,7 @@
 msgid ""
 "ALSA\n"
 "backend"
-msgstr ""
-"Backend\n"
-"ALSA"
+msgstr "Backend\nALSA"
 
 #: src/amidi-plug/i_configure-ap.c:59
 msgid "AMIDI-Plug - backend information"
@@ -515,9 +420,7 @@
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr ""
-"AMIDI\n"
-"Plug"
+msgstr "AMIDI\nPlug"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
@@ -629,9 +532,7 @@
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr ""
-"Backend\n"
-"FluidSynth"
+msgstr "Backend\nFluidSynth"
 
 #: src/amidi-plug/i_configure-timidity.c:39
 msgid "TIMIDITY BACKEND CONFIGURATION"
@@ -645,9 +546,7 @@
 msgid ""
 "TiMidity\n"
 "backend"
-msgstr ""
-"Backend\n"
-"TiMidity"
+msgstr "Backend\nTiMidity"
 
 #: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
@@ -709,9 +608,7 @@
 msgid ""
 "\n"
 "AMIDI-Plug "
-msgstr ""
-"\n"
-"AMIDI-Plug "
+msgstr "\nAMIDI-Plug "
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -736,28 +633,7 @@
 "Tony Vroon\n"
 "for the good help with alpha testing\n"
 "\n"
-msgstr ""
-"\n"
-"modulární přehrávač MIDI hudby\n"
-"http://www.develia.org/projects.php?p=amidiplug\n"
-"\n"
-"napsal Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-"\n"
-"zvláštní poděkování patří…\n"
-"\n"
-"Clemensu Ladischi a Jaroslavu Kyselovi\n"
-"za jejich úžasné programy aplaymidi a amixer; tyto\n"
-"bylo opravdu užitečné, současně s dokumentací alsa-lib,\n"
-"abych se dozvěděl více o API k ALSA.\n"
-"\n"
-"Alfredu Spadafinovi\n"
-"za krásné logo MIDI klávesnice\n"
-"\n"
-"Tony Vroonovi\n"
-"za výbornou pomoc s testováním alfa verzí\n"
-"\n"
+msgstr "\nmodulární přehrávač MIDI hudby\nhttp://www.develia.org/projects.php?p=amidiplug\n\nnapsal Giacomo Lozito\n< james@develia.org >\n\n\nzvláštní poděkování patří…\n\nClemensu Ladischi a Jaroslavu Kyselovi\nza jejich úžasné programy aplaymidi a amixer; tyto\nbylo opravdu užitečné, současně s dokumentací alsa-lib,\nabych se dozvěděl více o API k ALSA.\n\nAlfredu Spadafinovi\nza krásné logo MIDI klávesnice\n\nTony Vroonovi\nza výbornou pomoc s testováním alfa verzí\n\n"
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
@@ -771,255 +647,242 @@
 msgid "Concave Rectangle"
 msgstr "Konkávní obdélník"
 
-# FIXME: Utilize gettext context feature to distinguish between None (style)
-# and None (keys).
-# http://bugzilla.atheme.org/show_bug.cgi?id=48
-# Not problem anymore TODO: Check it
 #: src/aosd/aosd_style.c:87
 msgid "None"
 msgstr "Žádný"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "Zahájení přehrávání"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Spustí OSD, když se začne přehrávat skladba."
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "Změna názvu"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr ""
-"Spustí OSD, když se během přehrávaní změní název skladby, ale jméno souboru "
-"je stále stejné. To se hodí při přehrávání internetových proudů, v nichž se "
-"střídají skladby."
+msgstr "Spustí OSD, když se během přehrávaní změní název skladby, ale jméno souboru je stále stejné. To se hodí při přehrávání internetových proudů, v nichž se střídají skladby."
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "Změna hlasitosti"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
 msgstr "Spustí OSD, když se změní hlasitost."
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
 msgstr "Pozastavení"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
 msgstr "Spustí OSD, když je přehrávání pozastaveno."
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
 msgstr "Obnovení přehrávání"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Spustí OSD, když přehrávání obnoveno."
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "Umístění"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
 msgstr "Relativní odsazení ve směru osy X:"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
 msgstr "Relativní odsazení ve směru osy Y"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr "Maximální šířka OSD"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr "Nastavení pro více monitorů"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
 msgstr "Zobrazit OSD na:"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "všech monitorech"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "monitoru %i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "Časování (ms)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "Zobrazení:"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "Rozsvícení:"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "Pohasnutí:"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "Fonty"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "Font %i:"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "Stín"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "Internacionalizace"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 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:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "Vyberte soubor se skinem"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr "Styl vyobrazení"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "Barvy %i:"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr "Vlastní skin:"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "Soubor se skinem:"
 
-#: src/aosd/aosd_ui.c:672
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "Procházet"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "Povolit spouštěč"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "Událost"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
 msgstr "Nalezen kompozitní správce"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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 ""
-"Kompozitní správce nebyl nalezen.\n"
-"Pokud nevíte, že byste jste již nějakého spustili, prosím, aktivujte "
-"kompozitního správce, jinak OSD nebude správně fungovat."
+"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
+msgstr "Kompozitní správce nebyl nalezen.\nPokud 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:844
+#: src/aosd/aosd_ui.c:843
 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:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "Průhlednost"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr "Falešná průhlednost"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Skutečná průhlednost (vyžaduje kompozitní rozšíření X)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
 msgstr "Kompozitní rozšíření není nahráno"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
 msgstr "Kompozitní rozšíření není dostupné"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr "OSD Audacious"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
 msgstr "OSD pro Audacious – nastavení"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr "Vyzkoušet"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "Umístění"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "Animace"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "Výzdoba"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "Spouštěč"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "Různé"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
 msgstr "OSD pro Audacious – o modulu"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
-msgstr ""
-"\n"
-"OSD pro Audacious "
+msgstr "\nOSD pro Audacious "
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1030,16 +893,7 @@
 "written by Evan Martin\n"
 "http://neugierig.org/software/ghosd/\n"
 "\n"
-msgstr ""
-"\n"
-"http://www.develia.org/projects.php?p=audacious#aosd\n"
-"napsal Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-"On-Screen-Display je založeno na knihovně Ghosd,\n"
-"kterou napsal Evan Martin\n"
-"http://neugierig.org/software/ghosd/\n"
-"\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\nnapsal Giacomo Lozito\n< james@develia.org >\n\nOn-Screen-Display je založeno na knihovně Ghosd,\nkterou napsal Evan Martin\nhttp://neugierig.org/software/ghosd/\n\n"
 
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
@@ -1051,28 +905,27 @@
 
 #: src/bs2b/plugin.c:157
 msgid "Bauer stereophonic-to-binaural Preferences"
-msgstr "Nastavení Bauerovy stereofonní-dvojušní transformace"
+msgstr "Nastavení stereofonní na binaurální Bauer"
 
 #: src/bs2b/plugin.c:168
 msgid "Feed level:"
-msgstr "Úroveň přeslechu:"
+msgstr "Úroveň podávání:"
 
 #: src/bs2b/plugin.c:182
 msgid "Cut frequency:"
-msgstr "Ořezová frekvence:"
+msgstr "Kmitočet ořezu"
 
 #: src/bs2b/plugin.c:196
 msgid "Presets:"
-msgstr "Předvolby:"
+msgstr "Přednastavení:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:241
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
 msgstr "O zásuvném modulu zvukových CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:242
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
-"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
 "Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
 "\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
@@ -1082,26 +935,17 @@
 "This was a Google Summer of Code 2007 project.\n"
 "\n"
 "Copyright 2009 John Lindgren"
-msgstr ""
-"Copyright © 2007, Calin Crisan <ccrisan@gmail.com> a tým Audacious.\n"
-"\n"
-"Mnoho díků patří vývojářům libcdio <http://www.gnu.org/software/libcdio/>\n"
-"\ta vývojářům libcddb <http://libcddb.sourceforge.net/>.\n"
-"\n"
-"Také děkuji tobě, Tony Vroone, za rady a vedení.\n"
-"\n"
-"Toto byl projekt z Google Summer of Code 2007.\n"
-"Copyright 2009 John Lindgren"
+msgstr "Copyright © 2007, Calin Crisan <ccrisan@gmail.com> a tým Audacious.\n\nMnoho díků patří vývojářům libcdio <http://www.gnu.org/software/libcdio/>\n\ta vývojářům libcddb <http://libcddb.sourceforge.net/>.\n\nTaké děkuji tobě, Tony Vroone, za rady a vedení.\n\nToto byl projekt z Google Summer of Code 2007.\nCopyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:550
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
 msgstr "Zvukové CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:922
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
 msgstr "Mechanika je prázdná"
 
-#: src/cdaudio-ng/cdaudio-ng.c:924
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
 msgstr "Nepodporovaný druh disku."
 
@@ -1238,11 +1082,9 @@
 
 #: src/console/configure.c:271
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not "
-"provide length information (i.e. looping tracks)."
-msgstr ""
-"Implicitní délka, vyjádřená v sekundách, se použije na skladby, které "
-"neposkytují informace o délce (např. nekonečné smyčky)."
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
+msgstr "Implicitní délka, vyjádřená v sekundách, se použije na skladby, které neposkytují informace o délce (např. nekonečné smyčky)."
 
 #: src/console/plugin.c:33
 msgid "About the Game Console Music Decoder"
@@ -1254,11 +1096,7 @@
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
-msgstr ""
-"Dekodér konzolové hudby založený na Game_Music_Emu 0.5.2\n"
-"Podporované formáty: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
-"Implementace v Audacious: William Pitcock <nenold@dereferenced.org>,\n"
-" Shay Green <gblargg@gmail.com>\n"
+msgstr "Dekodér konzolové hudby založený na Game_Music_Emu 0.5.2\nPodporované formáty: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nImplementace v Audacious: William Pitcock <nenold@dereferenced.org>,\n Shay Green <gblargg@gmail.com>\n"
 
 #: src/crossfade/plugin.c:60
 msgid "About Crossfade"
@@ -1279,21 +1117,14 @@
 #: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
-msgstr ""
-"Uplatnění použití přechodu selhalo, protože skladby mají jiný počet kanálů."
+msgstr "Uplatnění použití přechodu selhalo, protože skladby mají jiný počet kanálů."
 
 #: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
-"You can use the Sample Rate Converter effect to resample the songs to the "
-"same rate."
-msgstr ""
-"Uplatnění přechodu selhalo, protože skladby mají rozdílnou vzorkovací "
-"frekvenci.\n"
-"\n"
-"Skladby můžete převzorkovat na stejnou frekvenci pomocí efektu Převodníku "
-"vzorkovací frekvence."
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
+msgstr "Uplatnění přechodu selhalo, protože skladby mají rozdílnou vzorkovací frekvenci.\n\nSkladby můžete převzorkovat na stejnou frekvenci pomocí efektu Převodníku vzorkovací frekvence."
 
 #: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
@@ -1314,11 +1145,7 @@
 "By Johan Levin 1999.\n"
 "\n"
 "Surround echo by Carl van Schaik 1999"
-msgstr ""
-"Modul ozvěny\n"
-"Napsal Johan Levin, 1999.\n"
-"\n"
-"Prostorovou ozvěnu přidal Carl van Schaik, 1999"
+msgstr "Modul ozvěny\nNapsal Johan Levin, 1999.\n\nProstorovou ozvěnu přidal Carl van Schaik, 1999"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
@@ -1340,7 +1167,7 @@
 msgid "Volume: (%)"
 msgstr "Hlasitost: (%)"
 
-#: src/ffaudio/ffaudio-core.c:794
+#: src/ffaudio/ffaudio-core.c:718
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1354,20 +1181,9 @@
 "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"
-"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"
+msgstr "Víceformátový zvuk dekódující modul pro Audacious založený na\nmultimediálním systému FFmpeg (http://www.ffmpeg.org/)\nCopyright © 2000–2009 Fabrice Bellard aj.\n\nModul do Audacious napsali:\n William Pitcock <nenolod@nenolod.net>,\n Matti Hämäläinen <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:808
+#: src/ffaudio/ffaudio-core.c:732
 msgid "About FFaudio Plugin"
 msgstr "O modulu FFaudio"
 
@@ -1375,55 +1191,55 @@
 msgid "About FileWriter-Plugin"
 msgstr "O modulu FileWriter"
 
-#: src/filewriter/filewriter.c:455
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "Nastavení zápisu do souboru"
 
-#: src/filewriter/filewriter.c:467
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "Formát výstupního souboru:"
 
-#: src/filewriter/filewriter.c:485
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "Nastavit"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "Ukládat do původního adresáře"
 
-#: src/filewriter/filewriter.c:505
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr "Ukládat do vlastního adresáře"
 
-#: src/filewriter/filewriter.c:515
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "Složka s výstupními soubory:"
 
-#: src/filewriter/filewriter.c:519
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr "Vybrat složku"
 
-#: src/filewriter/filewriter.c:538
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr "Získat jméno souboru z:"
 
-#: src/filewriter/filewriter.c:541
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr "původních značek v souboru"
 
-#: src/filewriter/filewriter.c:547
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr "jména původního souboru"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "Nezkracovat příponu jména souboru"
 
-#: src/filewriter/filewriter.c:572
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr "Předřadit jménu souboru číslo stopy"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "Auto"
 
@@ -1431,151 +1247,151 @@
 msgid "Joint Stereo"
 msgstr "Joint-stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:712
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr "Nastavení MP3"
 
-#: src/filewriter/mp3.c:735
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "Kvalita algoritmu:"
 
-#: src/filewriter/mp3.c:760
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr "Výstupní vzorkovací kmitočet"
 
-#: src/filewriter/mp3.c:788
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:795
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "Datový tok / Kompresní poměr:"
 
-#: src/filewriter/mp3.c:819
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "Datový tok (kb/s):"
 
-#: src/filewriter/mp3.c:852
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr "Kompresní poměr:"
 
-#: src/filewriter/mp3.c:876
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr "Zvukový režim:"
 
-#: src/filewriter/mp3.c:901
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "Různé:"
 
-#: src/filewriter/mp3.c:912
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr "Vynutit přísnou shodu s ISO"
 
-#: src/filewriter/mp3.c:923
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "Ochrana před chybami"
 
-#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "Kvalita"
 
-#: src/filewriter/mp3.c:945
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr "Povolit VBR/ABR"
 
-#: src/filewriter/mp3.c:955
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "Druh:"
 
-#: src/filewriter/mp3.c:988
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr "Nastavení VBR:"
 
-#: src/filewriter/mp3.c:1004
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "Nejmenší datový tok (kb/s):"
 
-#: src/filewriter/mp3.c:1031
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "Největší datový tok (kb/s):"
 
-#: src/filewriter/mp3.c:1054
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr "Přísně vynucovat nejmenší datový tok"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr "Nastavení ABR:"
 
-#: src/filewriter/mp3.c:1076
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "Průměrný datový tok (kb/s):"
 
-#: src/filewriter/mp3.c:1104
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr "Úroveň kvality VBR:"
 
-#: src/filewriter/mp3.c:1123
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr "Nezapisovat VBR hlavičku Xing"
 
-#: src/filewriter/mp3.c:1137
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1147
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "Parametry rámců:"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr "Označit jako podléhající autorskému právu"
 
-#: src/filewriter/mp3.c:1170
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr "Označit jako původní"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "Parametry ID3:"
 
-#: src/filewriter/mp3.c:1193
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
 msgstr "Vynutit přidání popisků verze 2"
 
-#: src/filewriter/mp3.c:1203
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr "Přidávat jen popisky verze 1"
 
-#: src/filewriter/mp3.c:1210
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr "Přidávat jen popisky verze 2"
 
-#: src/filewriter/mp3.c:1231
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
 msgstr "Popisky"
 
-#: src/filewriter/vorbis.c:236
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Nastavení vorbis kodéru"
 
-#: src/filewriter/vorbis.c:256
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "Úroveň kvality (0–10):"
 
-#: src/flacng/plugin.c:378
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr "O zvukovém modulu FLAC"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1583,13 +1399,7 @@
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr ""
-"\n"
-"\n"
-"Původní kód napsal\n"
-"Ralf Ertzinger <ralf@skytale.net>\n"
-"\n"
-"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\nPůvodní kód napsal\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
@@ -1602,38 +1412,17 @@
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-msgstr ""
-"Modul pro zkratky Gnome\n"
-"Ovládejte přehrávač promocí zkratek z Gnome.\n"
-"\n"
-"Copyright © 2007–2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-
-#: 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:271
-msgid "Add Files"
-msgstr "Přidat soubory"
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr "Audacious2"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr "Rozhraní gnt"
+msgstr "Modul pro zkratky Gnome\nOvládejte přehrávač promocí zkratek z Gnome.\n\nCopyright © 2007–2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
 
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Číslo položky"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "Název"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
 msgstr "Umělec"
 
@@ -1641,7 +1430,7 @@
 msgid "Year"
 msgstr "Rok"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
 msgstr "Album"
 
@@ -1705,243 +1494,251 @@
 msgid "Undock"
 msgstr "Neumisťovat"
 
-#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
 msgstr "Zakázat"
 
-#: src/gtkui/menus.c:130
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
 msgstr "_Otevřít soubory…"
 
-#: src/gtkui/menus.c:131
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
 msgstr "Otevřít _URL…"
 
-#: src/gtkui/menus.c:132
-msgid "_Add File ..."
-msgstr "Přid_at soubor…"
-
 #: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "_Přidat soubory..."
+
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
 msgstr "Přidat U_RL…"
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
 msgstr "_O programu… "
 
-#: src/gtkui/menus.c:136
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
 msgstr "Nasta_vení…"
 
-#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Konec"
 
-#: src/gtkui/menus.c:140
+#: src/gtkui/menus.c:141
 msgid "_Play"
 msgstr "_Hrát"
 
-#: src/gtkui/menus.c:141
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
 msgstr "P_ozastavit"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:143
 msgid "_Stop"
 msgstr "Za_stavit"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
 msgstr "Před_chozí"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:145
 msgid "_Next"
 msgstr "_Další"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
 msgstr "_Opakovat"
 
-#: src/gtkui/menus.c:147
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
 msgstr "Ná_hodné přehrávání"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
 msgstr "Žádné p_okračování dle seznamu skladeb"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
 msgstr "Z_astavuje po skladbě."
 
-#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
 msgstr "_Informace o skladbě…"
 
-#: src/gtkui/menus.c:152
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
 msgstr "Přejí_t na čas…"
 
-#: src/gtkui/menus.c:153
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
 msgstr "Pře_jít na skladbu…"
 
-#: src/gtkui/menus.c:156
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
 msgstr "Podle čísla _stopy"
 
-#: src/gtkui/menus.c:157
+#: src/gtkui/menus.c:158
 msgid "By _Title"
 msgstr "Podle ná_zvu"
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
 msgstr "Podle _umělce"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
 msgstr "Podle a_lba"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
 msgstr "Podle data vy_dání"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
 msgstr "Podle _cesty k souboru"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
 msgstr "_Vlastní název"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
 msgstr "_Obrátit pořadí"
 
-#: src/gtkui/menus.c:165
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
 msgstr "Ná_hodné pořadí"
 
-#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
 msgstr "_Obnovit"
 
 #: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Odstranit _nedostupné soubory"
+
+#: src/gtkui/menus.c:172
 msgid "_Sort"
 msgstr "_Seřadit"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:174
 msgid "_New"
 msgstr "_Nový"
 
-#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:177
 msgid "_Import ..."
 msgstr "_Importovat…"
 
-#: src/gtkui/menus.c:176
+#: src/gtkui/menus.c:178
 msgid "_Export ..."
 msgstr "_Exportovat…"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:180
 msgid "_Playlist Manager ..."
 msgstr "S_právce seznamů skladeb…"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:181
 msgid "_Queue Manager ..."
 msgstr "Správce _fronty…"
 
-#: src/gtkui/menus.c:182
+#: src/gtkui/menus.c:184
 msgid "Volume _Up"
 msgstr "Ze_sílit"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
 msgstr "Z_tišit"
 
-#: src/gtkui/menus.c:185
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
 msgstr "_Ekvalizér"
 
-#: src/gtkui/menus.c:187
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
 msgstr "E_fekty"
 
-#: src/gtkui/menus.c:190
+#: src/gtkui/menus.c:192
 msgid "_Interface"
 msgstr "_Rozhraní"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Vizualizace"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
 msgstr "Zobrazit h_lavní nabídku"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
 msgstr "Zobrazit oblast i_nformací"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
 msgstr "Zobrazit _stavový panel"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
 msgstr "Zobrazit zá_hlaví sloupců"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
 msgstr "Vybrat sloup_ce…"
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
 msgstr "Odro_lovat na změněnou skladbu"
 
-#: src/gtkui/menus.c:201
+#: src/gtkui/menus.c:204
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:205
 msgid "_Playback"
 msgstr "_Přehrát"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
 msgstr "Seznam sk_ladeb"
 
-#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
 msgstr "_Služby"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:208
 msgid "_Output"
 msgstr "_Výstup"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:209
 msgid "_View"
 msgstr "_Zobrazení"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
 msgstr "Ode_brat/přidat z/do fronty"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
 msgstr "V_yjmout"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:217
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:218
 msgid "_Paste"
 msgstr "V_ložit"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:219
 msgid "Select _All"
 msgstr "Vybr_at vše"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:224
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
@@ -1949,32 +1746,36 @@
 msgid "GTK Interface"
 msgstr "Rozhraní GTK"
 
-#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s – Audacious"
 
 #: src/gtkui/ui_gtk.c:162
 msgid "Buffering ..."
-msgstr "Plnění vyrovnávácí paměti…"
+msgstr "Ukládání do vyrovnávací paměti..."
 
-#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr "Chyba"
 
-#: src/gtkui/ui_statusbar.c:103 src/skins/ui_main.c:459
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Zavřít"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:458
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.c:107
+#: src/gtkui/ui_statusbar.c:109
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1982,7 +1783,7 @@
 msgstr[1] "%d kanály"
 msgstr[2] "%d kanálů"
 
-#: src/gtkui/ui_statusbar.c:122
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
@@ -2027,7 +1828,7 @@
 msgid "Volume Down"
 msgstr "Ztišit"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
 msgstr "Přejít na soubor"
 
@@ -2053,14 +1854,10 @@
 
 #: src/hotkey/gui.c:232
 msgid ""
-"It is not recommended to bind the primary mouse buttons without "
-"modificators.\n"
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr ""
-"Přiřazení prvního tlačítka myši mez modifikátoru není doporučeno.\n"
-"\n"
-"Chcete pokračovat?"
+msgstr "Přiřazení prvního tlačítka myši mez modifikátoru není doporučeno.\n\nChcete pokračovat?"
 
 #: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
@@ -2074,9 +1871,7 @@
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr ""
-"Uvnitř textového pole stiskněte kombinaci kláves.\n"
-"Navázat lze také tlačítka myši."
+msgstr "Uvnitř textového pole stiskněte kombinaci kláves.\nNavázat lze také tlačítka myši."
 
 #: src/hotkey/gui.c:405
 msgid "Hotkeys:"
@@ -2108,20 +1903,7 @@
 "\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
-msgstr ""
-"Modul Global Hotkey\n"
-"Ovládá přehrávač pomocí globálních kombinací kláves nebo pomocí "
-"multimediálních kláves.\n"
-"\n"
-"Copyright © 2007–2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-"Přispěvatelé:\n"
-"Copyright © 2006–2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
-"Copyright © 2000–2002 Ville Syrjälä <syrjala@sci.fi>\n"
-"\t\t\tBryn Davies <curious@ihug.com.au>\n"
-"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
-"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
-"\n"
+msgstr "Modul Global Hotkey\nOvládá přehrávač pomocí globálních kombinací kláves nebo pomocí multimediálních kláves.\n\nCopyright © 2007–2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nPřispěvatelé:\nCopyright © 2006–2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright © 2000–2002 Ville Syrjälä <syrjala@sci.fi>\n\t\t\tBryn Davies <curious@ihug.com.au>\n\t\t\tJonathan A. Davis <davis@jdhouse.org>\n\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n\n"
 
 #: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
@@ -2147,7 +1929,7 @@
 msgid "Enable debug printing"
 msgstr "Povolit ladící výpisy"
 
-#: src/jack/jack.c:422
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2156,111 +1938,89 @@
 "\n"
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
-msgstr ""
-"Ovladač jack pro XMMS 0.17\n"
-"\n"
-"xmms-jack.sf.net\n"
-"Chris Morgan<cmorgan@alum.wpi.edu>\n"
-"\n"
-"Pro Audacious převedl\n"
-"Giacomo Lozito z develia.org"
+msgstr "Ovladač jack pro XMMS 0.17\n\nxmms-jack.sf.net\nChris Morgan<cmorgan@alum.wpi.edu>\n\nPro Audacious převedl\nGiacomo Lozito z develia.org"
 
-#: src/jack/jack.c:427
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
 msgstr "O výstupním modulu JACK 0.17"
 
-#: src/ladspa/plugin.c:414
+#: src/ladspa/plugin.c:415
 msgid "About LADSPA Host"
 msgstr "O hostiteli LADSPA"
 
-#: src/ladspa/plugin.c:515
+#: src/ladspa/plugin.c:516
 #, c-format
 msgid "%s Settings"
 msgstr "Nastavení %s"
 
-#: src/ladspa/plugin.c:583
+#: src/ladspa/plugin.c:584
 msgid "LADSPA Host Settings"
 msgstr "Nastavení hostitele LADSPA"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:593
 msgid "Module paths:"
-msgstr "Cesta k modulům:"
+msgstr "Cesty k modulům:"
 
-#: src/ladspa/plugin.c:597
+#: src/ladspa/plugin.c:598
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr ""
-"Cesty se od sebe oddělují dvojtečkou.\n"
-"Tyto cesty se prohledávají spolu s LADSPA_PATH.\n"
-"Po té, co přidáte novou cestu, je třeba stisknout Enter, aby se vyhledaly "
-"nové moduly."
+msgstr "Oddělte více cest dvojtečkou.\nTyto cesty jsou prohledávány kromě LADSPA_PATH.\nPo přidání nových cest stiskněte Enter pro hledání nových přídavných modulů."
 
-#: src/ladspa/plugin.c:613
+#: src/ladspa/plugin.c:614
 msgid "Available plugins:"
 msgstr "Dostupné moduly:"
 
-#: src/ladspa/plugin.c:625
+#: src/ladspa/plugin.c:626
 msgid "Enable"
 msgstr "Povolit"
 
-#: src/ladspa/plugin.c:631
+#: src/ladspa/plugin.c:632
 msgid "Enabled plugins:"
 msgstr "Povolené moduly:"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:647
 msgid "Settings"
 msgstr "Nastavení"
 
-#: src/lyricwiki/lyricwiki.c:269
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
-msgstr ""
-"\n"
-"Vyhledává se text…"
+msgstr "\nVyhledává se text…"
 
-#: src/lyricwiki/lyricwiki.c:293
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
-msgstr ""
-"\n"
-"Připoje se k lyrics.wikia.com…"
+msgstr "\nPřipoje se k lyrics.wikia.com…"
 
-#: src/lyricwiki/lyricwiki.c:381
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
-msgstr ""
-"\n"
-"Žádné texty nebyly nalezeny."
+msgstr "\nŽádné texty nebyly nalezeny."
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr "O metronomu"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr ""
-"Generátor taktu od Martina Strauße <mys@faveve.uni-stuttgart.de>\n"
-"\n"
-"Použijte pomocí URL: tact://tempo*dob/délka\n"
-"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"
+msgstr "Generátor taktu od Martina Strauße <mys@faveve.uni-stuttgart.de>\n\nPoužijte pomocí URL: tact://tempo*dob/délka\nnapř. tact://77 hraje 77 úderů za minutu\nnebo tact://60*3/4 hraje v tempu 60 úderu za minutu v 3⁄4 taktu"
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generátor taktu: %d dob/min"
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generátor taktu: %d dob/min %d⁄%d"
@@ -2281,27 +2041,27 @@
 msgid "Changes take effect at the next song change."
 msgstr "Změny se projeví při přepnutí na další skladbu."
 
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
 msgstr "Prostorový zvuk"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
 msgstr "Nahrává se…"
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
 msgstr "Nahrát do zařízení MTP"
 
-#: src/mtp_up/mtp.c:311
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
 msgstr "Odpojit zařízení MTP"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
 msgstr "Audacious nyní nehraje."
 
@@ -2313,9 +2073,7 @@
 msgid ""
 " by Christian Birchinger <joker@netswarm.net>\n"
 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
-msgstr ""
-" napsal Christian Birchinger <joker@netswaje.net>\n"
-"založeno na modulu pro XMMS, jehož autor je Håvard Kvål <havardk@xmms.org>"
+msgstr " napsal Christian Birchinger <joker@netswaje.net>\nzaloženo na modulu pro XMMS, jehož autor je Håvard Kvål <havardk@xmms.org>"
 
 #: src/null/null.c:68
 msgid "About Null Output"
@@ -2355,7 +2113,7 @@
 
 #: src/oss4/configure.c:201
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr "Zabránit virtuálnímu směšování použitím výlučného režimu."
+msgstr "Povolit výhradní režim kvůli zabránění virtuálního míchání."
 
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
@@ -2402,11 +2160,11 @@
 msgid "Mixer"
 msgstr "Mixér"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr "O modulu OSS"
 
-#: src/pulse_audio/pulse_audio.c:673
+#: src/pulse_audio/pulse_audio.c:677
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "O výstupním modulu PulseAudio pro Audacious"
 
@@ -2422,7 +2180,6 @@
 msgid "Rate mappings:"
 msgstr "Přiřazení frekvencí:"
 
-# FIXME: Rod? Rate mappings?
 #: src/resample/plugin.c:179
 msgid "All others:"
 msgstr "Všechna ostatní:"
@@ -2431,31 +2188,31 @@
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: src/scrobbler/configure.c:143
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "Služby"
 
-#: src/scrobbler/configure.c:165
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "Přístupové jméno:"
 
-#: src/scrobbler/configure.c:171
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr "URL Scrobbleru:"
 
-#: src/scrobbler/configure.c:211
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:238
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
@@ -2463,12 +2220,8 @@
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
-"com>\n"
-msgstr ""
-"Modul AudioScrobbler pro Audacious\n"
-"\n"
-"Původně vytvořil Audun Hove <audun@nlc.no> a Pipian <pipian@pipian.com>\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr "Modul AudioScrobbler pro Audacious\n\nPůvodně vytvořil Audun Hove <audun@nlc.no> a Pipian <pipian@pipian.com>\n"
 
 #: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
@@ -2482,17 +2235,49 @@
 msgid "SDL error"
 msgstr "Chyba SDL"
 
-#: src/skins/plugin.c:165
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Žánr"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Knihovna"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Vytvořit seznam skladeb"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Přidat do seznamu skladeb"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Hledat v knihovně"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "Pro zavedení hudební knihovny doAudacious vyberte složku a potom klepněte na ikonu Obnovit."
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Čekejte, prosím, ..."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Vybrat složku"
+
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "O GUI s měnitelným vzhledem"
 
-#: src/skins/plugin.c:166
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
-msgstr ""
-"Copyright © 2008, Tomasz Moń <desowin@gmail.com>\n"
-"\n"
+msgstr "Copyright © 2008, Tomasz Moń <desowin@gmail.com>\n\n"
 
 #: src/skins/skins_cfg.c:207
 msgid "_Player:"
@@ -2578,79 +2363,112 @@
 msgid "Audacious Equalizer"
 msgstr "Ekvalizér"
 
-#: src/skins/ui_equalizer.c:896
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
 msgstr "Předvolby"
 
-#: src/skins/ui_main.c:443
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Načíst předvolbu"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Nahrát automatické přednastavení"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Nahrát přednastavení ekvalizéru"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Uložit předvolbu"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Uložit automatické přednastavení"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Uložit přednastavení ekvalizéru"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Smazat předvolbu"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Smazat automatické přednastavení"
+
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kb/s"
 
-#: src/skins/ui_main.c:451
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:458
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "prostorový zvuk"
 
-#: src/skins/ui_main.c:806
+#: src/skins/ui_main.c:807
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Přejít na %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:827
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hlasitost: %d %%"
 
-#: src/skins/ui_main.c:850
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Vyvážení: %d %% vlevo"
 
-#: src/skins/ui_main.c:852
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Vyvážení: střed"
 
-#: src/skins/ui_main.c:854
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Vyvážení: %d %% vpravo"
 
-#: src/skins/ui_main.c:980
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Nabídka nastavení"
 
-#: src/skins/ui_main.c:984
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Vypnout „Vždy na vrchu“"
 
-#: src/skins/ui_main.c:986
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Zapnout „Vždy na vrchu“"
 
-#: src/skins/ui_main.c:989
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Informace o souboru"
 
-#: src/skins/ui_main.c:994
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Nabídka znázornění"
 
-#: src/skins/ui_main.c:1648
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
 msgstr "Režim jedné skladby."
 
-#: src/skins/ui_main.c:1650
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
 msgstr "Režim seznamu skladeb."
 
-#: src/skins/ui_main.c:1672
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr "Zastavuje po skladbě."
 
-#: src/skins/ui_main.c:1674
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
 msgstr "Po skladbě nezastavuje."
 
@@ -2927,8 +2745,7 @@
 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í."
+msgstr "Prohledá seznam skladeb a vybere skladby ze seznamu podle zadaných omezení."
 
 #: src/skins/ui_manager.c:257
 msgid "Invert Selection"
@@ -3153,190 +2970,169 @@
 msgid "Clear A-B"
 msgstr "Vyprázdnit A-B"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
-msgid "Jump to Playlist Start"
-msgstr "Přejít na začátek seznamu skladeb"
-
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
 msgstr "Přejít na čas"
 
-#: src/skins/ui_manager.c:424
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
 msgstr "Přepnout frontu"
 
-#: src/skins/ui_manager.c:425
+#: src/skins/ui_manager.c:422
 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:428
+#: src/skins/ui_manager.c:425
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr "Oříznout"
 
-#: src/skins/ui_manager.c:432
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr "Vložit"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "Načíst"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:437
 msgid "Import"
 msgstr "Importovat"
 
-#: src/skins/ui_manager.c:441
+#: src/skins/ui_manager.c:438
 msgid "Save"
 msgstr "Uložit"
 
-#: src/skins/ui_manager.c:442
+#: src/skins/ui_manager.c:439
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
 msgstr "Předvolby"
 
-#: src/skins/ui_manager.c:445
-msgid "Load preset"
-msgstr "Načíst předvolbu"
-
-#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
 msgstr "Souborová předvolba"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr "Načíst souborovou předvolbu"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
 msgstr "Načíst standardní předvolbu do ekvalizéru"
 
-#: src/skins/ui_manager.c:453
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "Vynulovat"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
 msgstr "Vynulovat předvolby ekvalizéru"
 
-#: src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "Ze souboru"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
 msgstr "Načíst předvolbu ze souboru"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
 msgstr "Ze souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
 msgstr "Načíst předvolbu ze souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
 msgstr "Předvolby WinAMPu"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
 msgstr "Importovat předvolby WinAMPu"
 
 #: src/skins/ui_manager.c:466
-msgid "Save preset"
-msgstr "Uložit předvolbu"
-
-#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "Uložit souborovou předvolbu"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
 msgstr "Uložit standardní předvolbu"
 
-#: src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "Do souboru"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
 msgstr "Uložit předvolbu do souboru"
 
-#: src/skins/ui_manager.c:477
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
 msgstr "Do souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
 msgstr "Uložit předvolbu do souboru WinAMP EQF"
 
 #: src/skins/ui_manager.c:481
-msgid "Delete preset"
-msgstr "Smazat předvolbu"
-
-#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "Smazat souborovou předvolbu"
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
 msgstr "Vyhledat skladby v současném seznamu skladeb"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular "
-"expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular"
+" expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr ""
-"Položky seznamu skladeb vyberete vyplněním jednoho, nebo více polí. Pole "
-"používají regulární výrazy a neberou ohled na velikost písmen. Pokud "
-"regulárním výrazům nerozumíte, jednoduše vložte části textu, které chcete "
-"vyhledat."
+msgstr "Položky seznamu skladeb vyberete vyplněním jednoho, nebo více polí. Pole používají regulární výrazy a neberou ohled na velikost písmen. Pokud regulárním výrazům nerozumíte, jednoduše vložte části textu, které chcete vyhledat."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "Název: "
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
 msgstr "Umělec: "
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "Jméno souboru: "
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr "Před hledáním vymazat předchozí výběr"
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 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:295
+#: src/skins/ui_playlist.c:299
 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:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
 msgstr "Zobrazit editor seznamu skladeb"
 
-# FIXME: plural
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
@@ -3349,12 +3145,12 @@
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Nezabalený skin Winampu 2.x"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Adresář („%s“) nebylo možné vytvořit: %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
 msgstr "O modulu sndfile"
 
@@ -3386,32 +3182,29 @@
 msgid "SndStretch - Configuration"
 msgstr "SndStrech – Nastavení"
 
-#: src/song_change/song_change.c:447
+#: src/song_change/song_change.c:437
 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:449 src/song_change/song_change.c:455
-#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
 msgstr "Příkaz:"
 
-#: src/song_change/song_change.c:453
+#: src/song_change/song_change.c:443
 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:459
+#: src/song_change/song_change.c:449
 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."
+msgstr "Příkaz, který se provede, když Audacious dosáhne konce seznamu skladeb."
 
-#: src/song_change/song_change.c:465
+#: src/song_change/song_change.c:455
 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)."
+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:471
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3428,44 +3221,27 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr ""
-"Můžete používat následující formátovací řetězce, které budou\n"
-"před spuštěním příkazu nahrazeny (ne všechny jsou užitečné\n"
-"pro příkaz spouštěný na konci seznamu skladeb).\n"
-"\n"
-"%F: Frekvence (v hertzech)\n"
-"%c: Počet kanálů\n"
-"%f: Název souboru (celá cesta)\n"
-"%l: Délka (v milisekundách)\n"
-"%n nebo %s: Název skladby\n"
-"%r: Datový tok (v bitech za sekundu)\n"
-"%t: Pozice v seznamu skladeb (%02d)\n"
-"%p: Právě se hraje (1, nebo 0)\n"
-"%a: Umělec\n"
-"%b: Album\n"
-"%T: Název stopy"
+msgstr "Můžete používat následující formátovací řetězce, které budou\npřed spuštěním příkazu nahrazeny (ne všechny jsou užitečné\npro příkaz spouštěný na konci seznamu skladeb).\n\n%F: Frekvence (v hertzech)\n%c: Počet kanálů\n%f: Název souboru (celá cesta)\n%l: Délka (v milisekundách)\n%n nebo %s: Název skladby\n%r: Datový tok (v bitech za sekundu)\n%t: Pozice v seznamu skladeb (%02d)\n%p: Právě se hraje (1, nebo 0)\n%a: Umělec\n%b: Album\n%T: Název stopy"
 
-#: src/song_change/song_change.c:498
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr ""
-"Parametry předávané shellu by měly být uzavřeny do "
-"uvozovek. Nerespektování této rady představuje bezpečnostní riziko."
+msgstr "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:509
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr "Příkazy"
 
-#: src/song_change/song_change.c:539
+#: src/song_change/song_change.c:529
 msgid "Song Change"
 msgstr "Změna skladby"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr "O modulu Stavová ikona"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3474,65 +3250,58 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager.\n"
-msgstr ""
-"Modul Stavová ikona\n"
-"\n"
-"\n"
-"Copyright 2005–2007 Giacomo Lozito <james@develia.org>\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"Tento modul poskytuje stavovou ikonu, která\n"
-"je umístěna v systémové oblasti desktopu.\n"
+msgstr "Modul Stavová ikona\n\n\nCopyright 2005–2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nTento modul poskytuje stavovou ikonu, která\nje umístěna v systémové oblasti desktopu.\n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr "Modul stavové ikony – Nastavení"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr "Nabídka při stisku pravého tlačítka"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
 msgstr "Drobná nabídka pro přehrávání č. 1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
 msgstr "Drobná nabídka pro přehrávání č. 2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr "Reakce na rolování myší"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "Změnit hlasitost"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
 msgstr "Změnit hranou skladbu"
 
-#: src/statusicon/statusicon.c:500
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
 msgstr "Ostatní nastavení"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
 msgstr "Zakázat vyskakovací okno"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
 msgstr "Zavřít do oznamovací oblasti (systémové oblasti)"
 
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Postoupit v seznamu skladeb při projíždění nahoru"
+
 #: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
-msgstr ""
-"Extra stereo modul\n"
-"\n"
-"Napsal Johan Levin, 1999."
+msgstr "Extra stereo modul\n\nNapsal Johan Levin, 1999."
 
 #: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
@@ -3542,82 +3311,25 @@
 msgid "Configure Extra Stereo"
 msgstr "Nastavit Extra sterou"
 
-#: src/streambrowser/gui/streambrowser_win.c:78
-msgid "Search:"
-msgstr "Hledat:"
-
-#: src/streambrowser/gui/streambrowser_win.c:97
-#: src/streambrowser/gui/streambrowser_win.c:372
-msgid "Add Bookmark"
-msgstr "Přidat záložku"
-
-#: src/streambrowser/gui/streambrowser_win.c:324
-msgid "Stream name"
-msgstr "Název proudu"
-
-#: src/streambrowser/gui/streambrowser_win.c:331
-msgid "Now playing"
-msgstr "Právě hraje"
-
-#: src/streambrowser/gui/streambrowser_win.c:369
-msgid "Remove Bookmark"
-msgstr "Odstranit záložku"
-
-#: src/streambrowser/streambrowser.c:330
-msgid "About Stream Browser"
-msgstr "O prohlížeči proudů"
-
-#: src/streambrowser/streambrowser.c:331
-msgid ""
-"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming "
-"directories.\n"
-"Many thanks to the Streamtuner developers <http://www.nongnu.org/"
-"streamtuner>,\n"
-"\tand of course to the whole Audacious community.\n"
-"\n"
-"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-"\n"
-"This was a Google Summer of Code 2008 project."
-msgstr ""
-"Copyright © 2008 Calin Crisan <ccrisan@gmail.com> a tým Audacious.\n"
-"\n"
-"Toto je jednoduchý prohlížeč proudů, který obsahuje nejpopulárnější adresáře "
-"proudů.\n"
-"Mnoho díků patří vývojářům Streamtuneru <http://www.nongnu.org/"
-"streamtuner>,\n"
-"\ta samozřejmě celé komunitě kolem Audacious.\n"
-"\n"
-"Také děkuji tobě, Tony Vroone, za rady a vedení, opět.\n"
-"\n"
-"Toto byl projekt z Google Summer of Code 2008."
-
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr "O generátoru tónů"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
-msgstr ""
-"Generátor harmonických tónů, vytvořil Håvard Kvålen <havardk@xmms.org>\n"
-"Upraven Danielem J. Pengem <danielpeng@bigfoot.com>\n"
-"\n"
-"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."
+msgstr "Generátor harmonických tónů, vytvořil Håvard Kvålen <havardk@xmms.org>\nUpraven Danielem J. Pengem <danielpeng@bigfoot.com>\n\nPro jeho aktivaci zadejte URL: tone://frekvence1;frekvence2;frekvence3;...\nnapř. tone://2000;2005 pro přehrání tónů o frekvenci 2000 a 2005 Hz."
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr "Generátor tónů:"
 
@@ -3625,11 +3337,11 @@
 msgid "About File I/O Plugin"
 msgstr "O modulu vstupu/výstupu ze/do souboru"
 
-#: src/vorbis/vorbis.c:572
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "O modulu Ogg Vorbis Audio"
 
-#: src/vorbis/vorbis.c:577
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -3646,22 +3358,7 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>\n"
 "\n"
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
-msgstr ""
-"Modul Ogg Vorbis od Xiph.org Foundation\n"
-"\n"
-"Původní kód napsal\n"
-"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-"Přispěli\n"
-"Chris Montgomery <monty@xiph.org>\n"
-"Peter Alm <peter@xmms.org>\n"
-"Michael Smith <msmith@labyrinth.edu.au>\n"
-"Jack Moffitt <jack@icecast.org>\n"
-"Jorn Baayen <jorn@nl.linux.org>\n"
-"Håvard Kvålen <havardk@xmms.org>\n"
-"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-"Eugene Zagidullin <e.asphyx@gmail.com>\n"
-"\n"
-"Navštivte stránky Xiph.org Foundation na http://www.xiph.org/.\n"
+msgstr "Modul Ogg Vorbis od Xiph.org Foundation\n\nPůvodní kód napsal\nTony Arcieri <bascule@inferno.tusculum.edu>\nPřispěli\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\nNavštivte stránky Xiph.org Foundation na http://www.xiph.org/.\n"
 
 #: src/vtx/about.c:14
 msgid "About Vortex Player"
@@ -3670,23 +3367,13 @@
 #: src/vtx/about.c:15
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
-"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor."
-"ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "\n"
 "Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
 "and other AY/YM music sites.\n"
 "\n"
 "Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr ""
-"Přehrávač souborového formátu Vortex napsal Sashnov Alexander <sashnov@ngs."
-"ru>.\n"
-"Založeno na původním zdrojovém kódu in_vtx.dll od Romana Sherbakova "
-"<v_soft@microfor.ru>.\n"
-"\n"
-"Hudba ve formátu VTX je k nalezení na http://vtx.microfor.ru/music.htm\n"
-"a dalších AY/YM hudebních stránkách.\n"
-"\n"
-"Do Audacious implementoval Pavel Vymetálek <pvymetalek@seznam.cz>."
+msgstr "Přehrávač souborového formátu Vortex napsal Sashnov Alexander <sashnov@ngs.ru>.\nZaloženo na původním zdrojovém kódu in_vtx.dll od Romana Sherbakova <v_soft@microfor.ru>.\n\nHudba ve formátu VTX je k nalezení na http://vtx.microfor.ru/music.htm\na dalších AY/YM hudebních stránkách.\n\nDo Audacious implementoval Pavel Vymetálek <pvymetalek@seznam.cz>."
 
 #: src/wavpack/wavpack.c:353
 #, c-format
@@ -3699,6655 +3386,4 @@
 "\n"
 "Some of the plugin code was by Miles Egan\n"
 "Visit the Wavpack site at http://www.wavpack.com/\n"
-msgstr ""
-"Copyright © 2006 William Pitcock <nenolod -at- nenolod.net>\n"
-"\n"
-"Části kódu modulu napsal Miles Egan\n"
-"Navštivte stránku Wavpacku na http://www.wavpack.com/\n"
-
-#~ 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 "Close"
-#~ msgstr "Zavřít"
-
-#~ 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 "Daemon Interface (like old headless mode)"
-#~ msgstr "Rozhraní démona (jako starý bezhlavý režim)"
-
-#~ msgid ""
-#~ "FileWriter-Plugin\n"
-#~ "\n"
-#~ "This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Modul FileWriter\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit,\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani odvozené záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací naleznete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#~ msgid ""
-#~ "Audacious OSS Driver\n"
-#~ "\n"
-#~ " This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Ovladač OSS programu Audacious\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit,\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se tak\n"
-#~ "nestalo, obraťte se na Free Software Foundation, Inc.,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#~ msgid ""
-#~ "Audacious PulseAudio Output Plugin\n"
-#~ "\n"
-#~ " This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Výstupní modul PulseAudio pro Audacious\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit,\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#~ msgid "About %s"
-#~ msgstr "O %s"
-
-#~ msgid " Error"
-#~ msgstr " Chyba"
-
-#~ msgid "General info"
-#~ msgstr "Obecné informace"
-
-#~ msgid "Tune #%i: "
-#~ msgstr "Skladba č. %i:"
-
-#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "Nebylo možné nalézt soubor s pixmapou: %s"
-
-#~ msgid "Audacious-SID configuration"
-#~ msgstr "Nastavení Audacious-SID"
-
-#~ msgid "8-bit"
-#~ msgstr "8bitový"
-
-#~ msgid "16-bit"
-#~ msgstr "16bitový"
-
-#~ msgid "Resolution:"
-#~ msgstr "Rozlišení:"
-
-#~ msgid "Autopanning"
-#~ msgstr "Automatický posun"
-
-#~ msgid "Channels:"
-#~ msgstr "Kanály:"
-
-#~ msgid "Samplerate:"
-#~ msgstr "Vzorkovací kmitočet:"
-
-#~ msgid "Use oversampling"
-#~ msgstr "Převzorkovat"
-
-#~ msgid "Factor:"
-#~ msgstr "Násobek:"
-
-#~ msgid "Large factors require more CPU-power"
-#~ msgstr "Větší činitel vyžaduje více výkonu CPU"
-
-#~ msgid "Oversampling:"
-#~ msgstr "Převzorkování:"
-
-#~ msgid "Audio"
-#~ msgstr "Zvuk"
-
-#~ msgid "Force speed"
-#~ msgstr "Vnutit rychlost"
-
-#~ msgid ""
-#~ "If enabled, this option \"forces\" the emulation engine to use the "
-#~ "selected clock speed/frequency. Otherwise the speed is determined from "
-#~ "played file itself."
-#~ msgstr ""
-#~ "Je-li zapnuto, bude emulačnímu jádru vnucen vybraná rychlost hodin/"
-#~ "frekvence. V opačném případě bude rychlost určena z přehrávaného souboru "
-#~ "samotného."
-
-#~ msgid "PAL (50 Hz)"
-#~ msgstr "PAL (50 Hz)"
-
-#~ msgid ""
-#~ "PAL is the european TV standard, which uses 50Hz vertical refresh "
-#~ "frequency. Most of SID-tunes have been made for PAL computers."
-#~ msgstr ""
-#~ "PAL je evropský televizní standard, který používá 50Hz vertikální "
-#~ "obnovovací frekvenci. Většina SID skladeb byla určena pro počítače s "
-#~ "výstupem PAL."
-
-#~ msgid "NTSC (60 Hz)"
-#~ msgstr "NTSC (60 Hz)"
-
-#~ msgid ""
-#~ "NTSC is the TV standard with 60Hz vertical refresh rate (and other "
-#~ "features that differ from PAL). It is mainly used in United States, Japan "
-#~ "and certain other countries."
-#~ msgstr ""
-#~ "NTSC je televizní standard s 60HZ vertikální obnovovací frekvencí (kromě "
-#~ "jiných rozdílů od PALU). Používá se především ve Spojených státech, "
-#~ "Japonsku, několika dalších zemí."
-
-#~ msgid "Clock speed:"
-#~ msgstr "Rychlost hodin:"
-
-#~ msgid "Force model"
-#~ msgstr "Vnutit model"
-
-#~ msgid ""
-#~ "If enabled, this option \"forces\" the emulation engine to use the "
-#~ "selected SID-chip model. Otherwise the preferred SID model is determined "
-#~ "from the file (if PSIDv2NG type) or if not available, this setting is "
-#~ "used."
-#~ msgstr ""
-#~ "Je-li zapnuto, emulačnímu jádru bude vnucen vybraný modelu SID čipu. "
-#~ "V opačném případě bude modul SIDU určen ze souboru (je-li typu PSIDv2NG). "
-#~ "Vybraný model bude také použit, nebude-li jej možno ze souboru určit."
-
-#~ msgid "MOS 6581"
-#~ msgstr "MOS 6581"
-
-#~ msgid ""
-#~ "MOS/CSG 6581 is the earlier major version of SID chip. It differs from "
-#~ "8580 in few ways, having much fuller filter (which, due to design error, "
-#~ "is never same between two different SID-chips) and has the \"volume "
-#~ "adjustment bug\", which enables playing of digital samples."
-#~ msgstr ""
-#~ "MOS/CSG 6581 je starší verze SID čipu. Od 8580 se odlišuje tím, že má "
-#~ "plnější filtr (který, kvůli chybě v návrhu, není nikdy stejný mezi dvěma "
-#~ "čipy) a „trpí chybou“ při ladění hlasitosti, která umožňuje přehrávání "
-#~ "digitálních vzorků."
-
-#~ msgid "MOS 8580"
-#~ msgstr "MOS 8580"
-
-#~ msgid "SID model:"
-#~ msgstr "Model SIDU:"
-
-#~ msgid "SIDPlay 1 (frame-based)"
-#~ msgstr "SIDPlay 1 (rámcová technika)"
-
-#~ msgid ""
-#~ "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-#~ "cases, though."
-#~ msgstr ""
-#~ "K emulaci použije libSIDPlay 1.x. Rychlejší, ale ne tak přesné. Ve "
-#~ "většině případů postačuje."
-
-#~ msgid "SIDPlay 2 (cycle-based)"
-#~ msgstr "DISPlay 2 (cyklová technika)"
-
-#~ msgid ""
-#~ "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more "
-#~ "exact emulation."
-#~ msgstr ""
-#~ "K emulaci použijte libSIDPlay 2.x, který kvůli přesnější emulaci vyžaduje "
-#~ "výkonnější CPU."
-
-#~ msgid "Emulation library selection:"
-#~ msgstr "Výběr emulační knihovny"
-
-#~ msgid "Real C64 (SIDPlay 2 only)"
-#~ msgstr "Skutečný C64 (pouze SIDPlay 2)"
-
-#~ msgid "Bank switching"
-#~ msgstr "Přepínání bank"
-
-#~ msgid "Transparent ROM"
-#~ msgstr "Transparentní ROM"
-
-#~ msgid "PlaySID environment"
-#~ msgstr "Prostředí PlaySID"
-
-#~ msgid "Memory mode:"
-#~ msgstr "Režim paměti"
-
-#~ msgid "Emu#1"
-#~ msgstr "Emu#1"
-
-#~ msgid "Optimization mode (faster, inaccurate)"
-#~ msgstr "Optimalizující režim (rychlejší, nepřesný)"
-
-#~ msgid ""
-#~ "This setting can be used to enable libSIDPlay2's \"optimization mode\", "
-#~ "which in downgrades the emulation from cycle-exact to something similar "
-#~ "to frame-exact. The result is lower CPU usage, but worse accuracy."
-#~ msgstr ""
-#~ "Toto nastavení může být použito pro povolení „optimalizující režimu“ "
-#~ "libSIDPlay2, který nezachovává přesnost na cyklus a více se podobá "
-#~ "rámcové technice. Výsledkem je nižší zatížení CPU, ale větší nepřesnost."
-
-#~ msgid "reSID-emulation"
-#~ msgstr "Emulace reSID"
-
-#~ msgid ""
-#~ "reSID is the software SID-chip simulator based on SID reverse-"
-#~ "engineering, created by Dag Lem. It is probably the closest thing to real "
-#~ "SID available as software-only emulation."
-#~ msgstr ""
-#~ "reSID je softwarový emulátor čipu založený na zpětném inženýrství SID "
-#~ "čipu. Autorem je Dag Lem. Jedná se pravděpodobně o nejvěrnější "
-#~ "softwarovou emulaci skutečného čipu."
-
-#~ msgid "HardSID"
-#~ msgstr "HardSID"
-
-#~ msgid ""
-#~ "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-#~ "real SID-chip. Software can be used to control the HardSID and combined "
-#~ "with software emulation of rest of C64 via libSIDPlay2 HardSID can be "
-#~ "used to achieve \"near 100%\" similarity to real C64. For more "
-#~ "information, see http://www.hardsid.com/"
-#~ msgstr ""
-#~ "HardSID je EISA/PCI karta pro PC kompatibilní počítače, která může nést "
-#~ "skutečný SID čip. Software slouží k ovládání HardSIDu a v kombinaci se "
-#~ "softwarovou emulací zbytku C64 pomocí libSIDPlay2 lze dosáhnout „téměř "
-#~ "100%“ shody se skutečným C64. Podrobnosti naleznete na http://www.hardsid."
-#~ "com/"
-
-#~ msgid "SIDPlay 2 options:"
-#~ msgstr "Nastavení SIDPlay 2:"
-
-#~ msgid "Fast (nearest neighbour)"
-#~ msgstr "Rychlá (nejbližší sousední)"
-
-#~ msgid ""
-#~ "Fastest and also worst sounding sampling method, simply picks nearest "
-#~ "neighbouring sample."
-#~ msgstr ""
-#~ "Nejrychlejší a také nejhůře znějící vzorkovací metoda. Jednoduše vybírá "
-#~ "nejbližší vzorek."
-
-#~ msgid "Linear interpolation"
-#~ msgstr "Lineární interpolace"
-
-#~ msgid ""
-#~ "Uses linear interpolation between samples, yielding higher audio quality "
-#~ "with less sampling noise."
-#~ msgstr ""
-#~ "Používá lineární interpolaci mezi vzorky. Tím dosahuje vyšší kvality "
-#~ "zvuku s menšími ruchy."
-
-#~ msgid "Resampling (FIR)"
-#~ msgstr "Převzorkování (FIR)"
-
-#~ msgid "reSID sampling options:"
-#~ msgstr "Nastavení převzorkování reSIDu:"
-
-#~ msgid "Emu#2"
-#~ msgstr "Emu#2"
-
-#~ msgid "Emulate filters"
-#~ msgstr "Emulovat filtry"
-
-#~ msgid ""
-#~ "This option enables emulation of SID filter. The filter is an essential "
-#~ "part of SID's sound capacity, but accurate emulation of it may require "
-#~ "quite much CPU power. However, if filter emulation is disabled, tunes "
-#~ "won't sound authentic at all if they utilize the filter."
-#~ msgstr ""
-#~ "Tato volba zapíná emulaci SID filtru. Tento filtr je nepostradatelnou "
-#~ "součástí výbavy SIDU, avšak jeho přesná emulace může vyžadovat hodně "
-#~ "výkonu CPU. Vypnete-li filtr, sklady které jej používají, nebudou vůbec "
-#~ "znít věrohodně."
-
-#~ msgid "FS"
-#~ msgstr "FS"
-
-#~ msgid "FM"
-#~ msgstr "FM"
-
-#~ msgid "FT"
-#~ msgstr "FT"
-
-#~ msgid "Reset values"
-#~ msgstr "Resetovat hodnoty"
-
-#~ msgid "SIDPlay1"
-#~ msgstr "SIDPlay1"
-
-#~ msgid "Export"
-#~ msgstr "Exportovat"
-
-#~ msgid "Use"
-#~ msgstr "Použít"
-
-#~ msgid "Filter curve:"
-#~ msgstr "Křivka filtru:"
-
-#~ msgid "SIDPlay2"
-#~ msgstr "SIDPlay2"
-
-#~ msgid "Filters"
-#~ msgstr "Filtry"
-
-#~ msgid "Play at least for specified time"
-#~ msgstr "Hrát alespoň po určenou dobu"
-
-#~ msgid ""
-#~ "If enabled, the tune is played at least for the specified time, adding "
-#~ "silence to the end if necessary."
-#~ msgstr ""
-#~ "Je-li zapnuto, skladba bude hrána alespoň po zadanou dobu, případně na "
-#~ "konec bude přidáno ticho."
-
-#~ msgid "Playtime:"
-#~ msgstr "Doba přehrávání:"
-
-#~ msgid "Minimum playtime:"
-#~ msgstr "Minimální doba přehrávání:"
-
-#~ msgid "Play for specified time maximum"
-#~ msgstr "Přehrávat do maximální požadované doby"
-
-#~ msgid ""
-#~ "If enabled, tune is played until specified duration is reached (aka "
-#~ "maximum playtime)."
-#~ msgstr ""
-#~ "Je-li zapnuto, skladba bude hrána nejvýše po zadanou dobu (tj. maximální "
-#~ "délku přehrávání)."
-
-#~ msgid "Only when song length is unknown"
-#~ msgstr "Jen není-li délka skladby známa"
-
-#~ msgid ""
-#~ "If enabled, the maximum playtime is applied only if song/tune length is "
-#~ "not known."
-#~ msgstr ""
-#~ "Je-li zapnuto, maximální doba přehrávání bude uplatněna jen tehdy, nebude-"
-#~ "li délka skladby známa."
-
-#~ msgid "Maximum playtime:"
-#~ msgstr "Maximální doba přehrávání:"
-
-#~ msgid "Use XSIDPLAY-compatible database"
-#~ msgstr "Použít databázi kompatibilní s XSIDPLAY"
-
-#~ msgid ""
-#~ "This option enables using of XSIDPLAY compatible song length database. "
-#~ "(Refer to Audacious-SID documentation for more information)"
-#~ msgstr ""
-#~ "Tato volba zapíná použití databáze délek skladeb kompatibilní "
-#~ "s XSIDPLAY. (Podrobnosti naleznete v dokumentaci k Audacious-SID modulu.)"
-
-#~ msgid "DB-file:"
-#~ msgstr "Databázový soubor:"
-
-#~ msgid "Database path and filename"
-#~ msgstr "Cesta k databázi a jméno souboru"
-
-#~ msgid "Browse for song length-database file"
-#~ msgstr "Ukázat soubor s databází délek"
-
-#~ msgid "Song length database:"
-#~ msgstr "Databáze s délkou skladeb:"
-
-#~ msgid "Songlength"
-#~ msgstr "Délka skladby"
-
-#~ msgid "Override generic Tuplez format string"
-#~ msgstr "Přepsat původní formátovací řetězec Tuplez"
-
-#~ msgid ""
-#~ "By enabling this option you can specify a custom Tuplez formatting string "
-#~ "for SID-files. The SID-plugin specific Tuplez tags are described shortly "
-#~ "below."
-#~ msgstr ""
-#~ "Po povolením této volby lze uživatelem určit formátovací řetězec Tuplez "
-#~ "pro SID soubory. Tuplez značky modulu SID jsou popsány níže."
-
-#~ msgid "Tuplez format string for SID-files"
-#~ msgstr "Formátovací řetězec Tuplez pro soubory SID"
-
-#~ msgid ""
-#~ "SID-specific Tuplez fields:\n"
-#~ "\n"
-#~ "sid-format\t\t- Specific fileformat\n"
-#~ "sid-model\t\t- 6581 or 8580\n"
-#~ "sid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n"
-#~ "\n"
-#~ "Other \"special\" fields set:\n"
-#~ "\n"
-#~ "subsong-num, subsong-id"
-#~ msgstr ""
-#~ "SIDové položky Tuplez:\n"
-#~ "\n"
-#~ "sid-format\t\t– Výslovný formát souboru\n"
-#~ "sid-model\t\t– 6581 nebo 8580\n"
-#~ "sid-speed\t\t– Časování nebo rychlost: PAL/NTSC atd..\n"
-#~ "\n"
-#~ "Další „zvláštní“ sady položek:\n"
-#~ "\n"
-#~ "subsong-num, subsong-id"
-
-#~ msgid "Song title format:"
-#~ msgstr "Formát názvu skladby:"
-
-#~ msgid "Add sub-tunes to playlist"
-#~ msgstr "Do seznamu skladeb přidat podskladby"
-
-#~ msgid ""
-#~ "If enabled, sub-tunes of each file will be added to playlist. If "
-#~ "disabled, only the default sub-tune will be added."
-#~ msgstr ""
-#~ "Je-li zapnuto, podskladby každého souboru budou přidány do seznamu "
-#~ "skladeb. Je-li vypnuto, bude přidána pouze výchozí podskladba."
-
-#~ msgid "Only tunes with specified minimum duration"
-#~ msgstr "Jen skladby se zadanou minimální délkou"
-
-#~ msgid "Only add sub-tunes that have a duration of at least specified time."
-#~ msgstr "Přidat pouze podskladby, jejichž délka je větší nebo rovna zadané."
-
-#~ msgid "Sub-tune handling:"
-#~ msgstr "Zacházení s podskladbami:"
-
-#~ msgid "Use STIL database"
-#~ msgstr "Používat databázi STIL"
-
-#~ msgid ""
-#~ "If this option is enabled (and the database & HVSC settings below are "
-#~ "correctly set), Audacious-SID will use and display additional information "
-#~ "from STIL database when HVSC SIDs are played."
-#~ msgstr ""
-#~ "Je-li tato volba povolena (a databáze a HVSC konfigurace níže správně "
-#~ "nastavena), Audacious-SID použije a zobrazí dodatečné informace "
-#~ "z databáze STIL, je-li hrána skladba z HVSC."
-
-#~ msgid "STIL file:"
-#~ msgstr "Soubor STIL:"
-
-#~ msgid ""
-#~ "Path and filename of STIL database file (STIL.txt), usually found from "
-#~ "HVSC's DOCUMENTS-subdirectory."
-#~ msgstr ""
-#~ "Cesta a jméno souboru souboru s databází STIL (STIL.txt). Obvykle se "
-#~ "nachází v podadresáři DOCUMENTS od HVSC."
-
-#~ msgid "Browse for STIL-database file"
-#~ msgstr "Ukázat na soubor s databází STIL"
-
-#~ msgid "HVSC path:"
-#~ msgstr "Cesta k HVSC"
-
-#~ msgid ""
-#~ "Path to base-directory of your High Voltage SID Collection (HVSC), for "
-#~ "example /media/C64Music/"
-#~ msgstr ""
-#~ "Cesta ke kořenovému adresáři vaší High Voltage SID sbírce (HVSC). Na "
-#~ "příklad „/media/C64Music/“."
-
-#~ msgid "Browse for HVSC path"
-#~ msgstr "Ukázat cestu k HSVC"
-
-#~ msgid "SID Tune Information List (STIL) database:"
-#~ msgstr "Databáze SID Tune Information List (STIL):"
-
-#~ msgid "Cancel any changes"
-#~ msgstr "Jakékoliv změny zamítnout"
-
-#~ msgid "Accept and update changes"
-#~ msgstr "Přijmout a provést změny"
-
-#~ msgid "Audacious-SID Fileinfo"
-#~ msgstr "Audacious – Informace o souboru SID"
-
-#~ msgid "Filename:"
-#~ msgstr "Jméno souboru:"
-
-#~ msgid "Songname:"
-#~ msgstr "Název skladby:"
-
-#~ msgid "Composer:"
-#~ msgstr "Skladatel:"
-
-#~ msgid "Copyright:"
-#~ msgstr "Autorská práva:"
-
-#~ msgid "Song Information:"
-#~ msgstr "Informace o skladbě:"
-
-#~ msgid "Author:"
-#~ msgstr "Autor:"
-
-#~ msgid "Duration:"
-#~ msgstr "Délka:"
-
-#~ msgid "Sub-tune Information:"
-#~ msgstr "Informace o podskladbách"
-
-#~ msgid "Select HVSC song length database"
-#~ msgstr "Vybrat databázi délek skladeb od HVSC"
-
-#~ msgid "Select STIL-database"
-#~ msgstr "Vybrat databázi STIL"
-
-#~ msgid "Select HVSC location prefix"
-#~ msgstr "Vybrat cestu k HVSC"
-
-#~ msgid "Select SIDPlay2 filters file for importing"
-#~ msgstr "Vybrat soubor se SIDPlay2 filtry pro import"
-
-#~ msgid "Select SIDPlay2 filters file for exporting"
-#~ msgstr "Vybrat soubor se SIDPlay2 filtry pro export"
-
-#~ msgid "Confirm selected action"
-#~ msgstr "Potvrdit vybrané akce"
-
-#~ msgid "Yes"
-#~ msgstr "Ano"
-
-#~ msgid "No"
-#~ msgstr "Ne"
-
-#~ msgid ""
-#~ "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-#~ "from the xmms_sndfile plugin which is:\n"
-#~ "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-#~ "\n"
-#~ "This program is free software ; you can redistribute it and/or modify \n"
-#~ "it under the terms of the GNU General Public License as published by \n"
-#~ "the Free Software Foundation ; either version 2 of the License, or \n"
-#~ "(at your option) any later version. \n"
-#~ " \n"
-#~ "This program is distributed in the hope that it will be useful, \n"
-#~ "but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-#~ "See the GNU General Public License for more details. \n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public \n"
-#~ "License along with this program ; if not, write to \n"
-#~ "the Free Software Foundation, Inc., \n"
-#~ "51 Franklin Street, Fifth Floor, \n"
-#~ "Boston, MA 02110-1301 USA"
-#~ msgstr ""
-#~ "Pro Audacious upravil Tony Vroon <chainsaw@gentoo.org>\n"
-#~ "z původního modulu xmms_sndfile,\n"
-#~ "copyright © 2000, 2002 Erik de Castro Lopo\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit,\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, obraťte se na\n"
-#~ "Free Software Foundation, Inc.,\n"
-#~ "51 Franklin Street, Fifth Floor, \n"
-#~ "Boston, MA  02110-1301  USA"
-
-#~ msgid ""
-#~ "OSS4 Output Plugin for Audacious\n"
-#~ "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-#~ "\n"
-#~ "I would like to thank people on #audacious, especially Tony Vroon and "
-#~ "John Lindgren and of course the authors of the previous OSS plugin.\n"
-#~ "\n"
-#~ "This program is free software: you can redistribute it and/or modify it "
-#~ "under the terms of the GNU General Public License as published by the "
-#~ "Free Software Foundation, either version 3 of the License, or (at your "
-#~ "option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful, but "
-#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
-#~ "Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License along "
-#~ "with this program. If not, see <http://www.gnu.org/licenses/>.\n"
-#~ msgstr ""
-#~ "Výstupní modul OSS4 pro Audacious\n"
-#~ "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-#~ "\n"
-#~ "Rád bych poděkoval lidem na #audacious, zvláště Tony Vroonovi a Johnu "
-#~ "Lindgrenovi a samozřejmě autorům předchozího modulu OSS.\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit\n"
-#~ "v souladu s podmínkami GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 3 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY, a to ani odvozené záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "URČITÝ ÚČEL. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, vizte <http://www.gnu.org/licenses/>.\n"
-
-#~ msgid "Save All Playlists"
-#~ msgstr "Uložit všechny seznamy skladeb"
-
-#~ msgid ""
-#~ "Saves all the playlists that are open. Note that this is done "
-#~ "automatically when Audacious quits."
-#~ msgstr ""
-#~ "Uloží všechny seznamy skladeb, které jsou otevřeny. Vezměte na vědomí, že "
-#~ "toto bude rovněž provedeno při ukončení Audacious."
-
-#~ msgid "Opens the playlist manager."
-#~ msgstr "Otevře správce seznamu skladeb."
-
-#~ msgid "Override generic titles"
-#~ msgstr "Přepsat původní názvy"
-
-#~ msgid "Title format:"
-#~ msgstr "Formát názvu:"
-
-#~ msgid "Ogg Vorbis Tags"
-#~ msgstr "Popisky Ogg Vorbis"
-
-#~ msgid "Ogg Vorbis Audio Plugin Configuration"
-#~ msgstr "Nastavení modulu Ogg Vorbis Audio"
-
-#~ msgid "About "
-#~ msgstr "O "
-
-#~ 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 "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 "Select Playlist"
-#~ msgstr "Vybrat seznam skladeb"
-
-#~ msgid "reset to current output volume"
-#~ msgstr "navrátit na současnou hlasitost výstupu"
-
-#~ 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 "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 "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 "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"
-
-#~ msgid ""
-#~ "* Select ALSA output ports *\n"
-#~ "MIDI events will be sent to the ports selected here. In example, if your "
-#~ "audio card provides a hardware synth and you want to play MIDI with it, "
-#~ "you'll probably want to select the wavetable synthesizer ports."
-#~ msgstr ""
-#~ "* Vyberte výstupní port ALSY *\n"
-#~ "MIDI události budou zasílány portům zde vybraným. Na příklad pokud vaše "
-#~ "zvuková karta poskytuje hardwarový syntetizátor a chcete-li jím přehrávat "
-#~ "MIDI, budete pravděpodobně potřebovat vybrat porty tabulkového "
-#~ "(wavetable) syntetizátoru."
-
-#~ msgid ""
-#~ "* Select ALSA mixer card *\n"
-#~ "The ALSA backend outputs directly through ALSA, it doesn't use effect and "
-#~ "ouput plugins from the player. During playback, the player volumeslider "
-#~ "will manipulate the mixer control you select here. If you're using "
-#~ "wavetable synthesizer ports, you'll probably want to select the Synth "
-#~ "control here."
-#~ msgstr ""
-#~ "* Vyberte kartu se směšovačem ALSY *\n"
-#~ "Backend ALSY posílá výstup přímo skrz ALSU. Efekty a výstupní moduly "
-#~ "přehrávače nebudou použity. Během přehrávání jezdec ovládající hlasitost "
-#~ "bude pracovat se směšovačem, který zde vyberete. Používáte-li porty "
-#~ "tabulkového syntetizátoru, pravděpodobně zde budete chtít vybrat "
-#~ "„Ovládání syntézy“."
-
-#~ msgid ""
-#~ "* Select ALSA mixer control *\n"
-#~ "The ALSA backend outputs directly through ALSA, it doesn't use effect and "
-#~ "ouput plugins from the player. During playback, the player volume slider "
-#~ "will manipulate the mixer control you select here. If you're using "
-#~ "wavetable synthesizer ports, you'll probably want to select the Synth "
-#~ "control here."
-#~ msgstr ""
-#~ "* Vyberte ovládání směšovače ALSY *\n"
-#~ "Backend ALSY posílá výstup přímo skrz ALSU. Efekty a výstupní moduly "
-#~ "přehrávače nebudou použity. Během přehrávání jezdec ovládající hlasitost "
-#~ "bude pracovat se směšovačem, který zde vyberete. Používáte-li porty "
-#~ "tabulkového syntetizátoru, pravděpodobně zde budete chtít vybrat "
-#~ "„Ovládání syntézy“."
-
-#~ msgid ""
-#~ "* Backend selection *\n"
-#~ "AMIDI-Plug works with backends, in a modular fashion; here you should "
-#~ "select your backend; that is, the way MIDI events are going to be handled "
-#~ "and played.\n"
-#~ "If you have a hardware synthesizer on your audio card, and ALSA supports "
-#~ "it, you'll want to use the ALSA backend. It can also be used with "
-#~ "anything that provides an interface to the ALSA sequencer, including "
-#~ "software synths or external devices.\n"
-#~ "If you want to rely on a software synthesizer and/or want to pipe audio "
-#~ "into effect and output plugins of the player you'll want to use the good "
-#~ "FluidSynth backend.\n"
-#~ "Press the info button to read specific information about each backend."
-#~ msgstr ""
-#~ "* Výběr backendu *\n"
-#~ "AMIDI-Plug pracuje s backendy modulárním způsobem. Zde byste si měli "
-#~ "vybrat svůj backend, tj. způsob, jakým způsobem se bude zacházet s MIDI "
-#~ "událostmi a jak budou hrány.\n"
-#~ "Jestliže na zvukové kartě máte hardwarový syntetizátor a ALSA jej "
-#~ "podporuje, je rozumné použít backend ALSY. Taktéž přijde vhod, máte "
-#~ "cokoliv jiného, včetně softwarových syntetizátorů nebo vnějších zařízení, "
-#~ "co má rozhraní k sekvenceru ALSY.\n"
-#~ "Pokud se chcete spolehnout na softwarový syntetizátor a/nebo chcete zvuk "
-#~ "protáhnout efektovými a výstupním modulem, dobrou volbou bude backend "
-#~ "FluidSynth.\n"
-#~ "Podrobnosti o jednotlivých backendech získáte přes tlačítko „Podrobnosti“."
-
-#~ msgid ""
-#~ "* Transpose function *\n"
-#~ "This option allows you to play the midi file transposed in a different "
-#~ "key, by shifting of the desired number of semitones all its notes "
-#~ "(excepting those on midi channel 10, reserved for percussions). "
-#~ "Especially useful if you wish to sing or play along with another "
-#~ "instrument."
-#~ msgstr ""
-#~ "* Funkce transpozice *\n"
-#~ "Tato volba nabízí transpozici přehrávaného MIDI souboru do jiné tóniny "
-#~ "o zadaný počet půltónů (kromě tónů 10. stopy, která je vyhrazena pro "
-#~ "bicí). Tato funkce je užitečná, chcete-li doprovázet skladbu zpěvem či "
-#~ "jiným nástrojem."
-
-#~ msgid ""
-#~ "* Drumshift function *\n"
-#~ "This option allows you to shift notes on midi channel 10 (the standard "
-#~ "percussions channel) of the desired number of semitones. This results in "
-#~ "different drumset and percussions being used during midi playback, so if "
-#~ "you wish to enhance (or reduce, or alter) percussion sounds, try to play "
-#~ "with this value."
-#~ msgstr ""
-#~ "* Funkce posunu bubnů *\n"
-#~ "Tato volba nabízí posun not na 10. MIDI kanále (standardní kanál pro "
-#~ "bicí) o zadaný počet půltónů. Výsledkem je odlišná sada bicích nástrojů "
-#~ "použitá během přehrávání. Takže chcete-li vylepšit (ztlumit či jinak "
-#~ "pozměnit) zvuk bicích, pohrejte si s touto hodnotou."
-
-#~ msgid ""
-#~ "* Pre-calculate MIDI length *\n"
-#~ "If this option is enabled, AMIDI-Plug will calculate the MIDI file length "
-#~ "as soon as the player requests it, instead of doing that only when the "
-#~ "MIDI file is being played. In example, MIDI length will be calculated "
-#~ "straight after adding MIDI files in a playlist. Disable this option if "
-#~ "you want faster playlist loading (when a lot of MIDI files are added), "
-#~ "enable it to display more information in the playlist straight after "
-#~ "loading."
-#~ msgstr ""
-#~ "* Předpočítat délku skladby *\n"
-#~ "Pokud je tato funkce zapnuta, AMIDI-Plug vypočítá délku MIDI souboru "
-#~ "okamžitě, jak o ni přehrávač požádá. Jinak bude délka určena až při "
-#~ "prvním přehrání. Na příklad délka skladby bude vypočtena ihned po přidání "
-#~ "MIDI souboru do seznamu skladeb. Vypněte tuto funkci, požadujete-li "
-#~ "rychlejší nahrávání seznamu skladeb (obzvláště má-li mnoho MIDI souborů), "
-#~ "zapněte tuto funkci, potřebujete-li vidět délku skladeb ihned po načtení "
-#~ "seznamu."
-
-#~ msgid ""
-#~ "* Extract comments from MIDI files *\n"
-#~ "Some MIDI files contain text comments (author, copyright, instrument "
-#~ "notes, etc.). If this option is enabled, AMIDI-Plug will extract and "
-#~ "display comments (if available) in the file information dialog."
-#~ msgstr ""
-#~ "* Vytáhnout komentáře z MIDI souborů *\n"
-#~ "Některé MIDI soubory obsahují textové komentáře (autora, autorská práva, "
-#~ "poznámky k nástrojům apod.). Pokud je tato funkce zapnutá, AMIDI-Plug "
-#~ "tyto komentáře zjistí a zobrazí v dialogu o podrobnostech souboru (pokud "
-#~ "existují)."
-
-#~ msgid ""
-#~ "* Extract lyrics from MIDI files *\n"
-#~ "Some MIDI files contain song lyrics. If this option is enabled, AMIDI-"
-#~ "Plug will extract and display song lyrics (if available) in the file "
-#~ "information dialog."
-#~ msgstr ""
-#~ "* Vytáhnout text z MIDI souborů *\n"
-#~ "Některé MIDI soubory obsahují text písně. Pokud je tato funkce zapnuta, "
-#~ "AMIDI-Plug tento text získá a zobrazí v dialogu o podrobnostech souboru "
-#~ "(pokud existuje)."
-
-#~ msgid ""
-#~ "* Select SoundFont files *\n"
-#~ "In order to play MIDI with FluidSynth, you need to specify at least one "
-#~ "valid SoundFont file here (use absolute paths). The loading order is from "
-#~ "the top (first) to the bottom (last)."
-#~ msgstr ""
-#~ "* Výběr SoundFont souborů *\n"
-#~ "Abyste mohli přehrávat MIDI přes FluidSynth, musíte určit alespoň jeden "
-#~ "platný soundfontový soubor (použijte absolutní cesty). Pořadí nahrávání "
-#~ "je od shora (první) dolů (poslední)."
-
-#~ msgid ""
-#~ "* Load SoundFont on player start *\n"
-#~ "Depending on your system speed, SoundFont loading in FluidSynth will "
-#~ "require up to a few seconds. This is a one-time task (the soundfont will "
-#~ "stay loaded until it is changed or the backend is unloaded) that can be "
-#~ "done at player start, or before the first MIDI file is played (the latter "
-#~ "is a better choice if you don't use your player to listen MIDI files "
-#~ "only)."
-#~ msgstr ""
-#~ "* Nahrát SoundFont při spuštění přehrávače *\n"
-#~ "V závislosti na rychlosti vašeho systému nahrávání SoundFontu do "
-#~ "FluidSynthu může trvat i několik sekund. Jedná se jednorázovou záležitost "
-#~ "(soundfont zůstane nahraný, dokud jej nevyměníte nebo nezrušíte backend), "
-#~ "která může být provedena během spouštění přehrávače nebo před zahájením "
-#~ "produkce prvního MIDI souboru (druhá možnost je výhodnější, jestliže "
-#~ "neplánujete poslouchat jen MIDI soubory)."
-
-#~ msgid ""
-#~ "* Load SoundFont on first midifile play *\n"
-#~ "Depending on your system speed, SoundFont loading in FluidSynth will "
-#~ "require up to a few seconds. This is a one-time task (the soundfont will "
-#~ "stay loaded until it is changed or the backend is unloaded) that can be "
-#~ "done at player start, or before the first MIDI file is played (the latter "
-#~ "is a better choice if you don't use your player to listen MIDI files "
-#~ "only)."
-#~ msgstr ""
-#~ "* Nahrát SoundFont před prvním MIDI souborem *\n"
-#~ "V závislosti na rychlosti vašeho systému nahrávání SoundFontu do "
-#~ "FluidSynthu může trvat i několik sekund. Jedná se jednorázovou záležitost "
-#~ "(soundfont zůstane nahraný, dokud jej nevyměníte nebo nezrušíte backend), "
-#~ "která může být provedena během spouštění přehrávače nebo před zahájením "
-#~ "produkce prvního MIDI souboru (druhá možnost je výhodnější, jestliže "
-#~ "neplánujete poslouchat jen MIDI soubory)."
-
-#~ msgid ""
-#~ "* Synthesizer gain *\n"
-#~ "From FluidSynth docs: the gain is applied to the final or master output "
-#~ "of the synthesizer; it is set to a low value by default to avoid the "
-#~ "saturation of the output when random MIDI files are played."
-#~ msgstr ""
-#~ "* Zesílení syntetizátoru *\n"
-#~ "Z dokumentace FluidSynth: zesílení je aplikován na konečný nebo hlavní "
-#~ "výstup syntetizátoru. Implicitně je nastaveno na nízkou hodnotu, aby se "
-#~ "zabránilo ořezávání při přehrávání různorodých MIDI souborů."
-
-#~ msgid ""
-#~ "* Synthesizer polyphony *\n"
-#~ "From FluidSynth docs: the polyphony defines how many voices can be played "
-#~ "in parallel; the number of voices is not necessarily equivalent to the "
-#~ "number of notes played simultaneously; indeed, when a note is struck on a "
-#~ "specific MIDI channel, the preset on that channel may create several "
-#~ "voices, for example, one for the left audio channel and one for the right "
-#~ "audio channels; the number of voices activated depends on the number of "
-#~ "instrument zones that fall in the correspond to the velocity and key of "
-#~ "the played note."
-#~ msgstr ""
-#~ "* Vícehlas syntetizátoru *\n"
-#~ "Z dokumentace FluidSynth: vícehlas určuje, kolik hlasů může hrát "
-#~ "najednou. Počet hlasů není nezbytně shodný s počtem not hraných současně. "
-#~ "Ve skutečnosti když je nota vyslána na určitém MIDI kanálu, předvolba na "
-#~ "takovém kanálu může vytvořit více hlasů, na příklad jeden pro levý "
-#~ "zvukový kanál a jeden pro pravý zvukový kanál. Počet aktivovaných hlasů "
-#~ "závisí na počtu nástrojových zón, které spadají do odpovídající rychlosti "
-#~ "a klíči hrané noty."
-
-#~ msgid ""
-#~ "* Synthesizer reverb *\n"
-#~ "From FluidSynth docs: when set to \"yes\" the reverb effects module is "
-#~ "activated; note that when the reverb module is active, the amount of "
-#~ "signal sent to the reverb module depends on the \"reverb send\" generator "
-#~ "defined in the SoundFont."
-#~ msgstr ""
-#~ "* Dozvuk syntetizátoru *\n"
-#~ "Z dokumentace FluidSynth: je-li nastaveno na „ano“, modul efektu dozvuku "
-#~ "je aktivován. Pamatujte, že při aktivovaném modulu dozvuku je množství "
-#~ "signálu zasílaného tomuto modulu závislé na generátoru „zasílání "
-#~ "dozvuku“, který je definován v SoundFontu."
-
-#~ msgid ""
-#~ "* Synthesizer chorus *\n"
-#~ "From FluidSynth docs: when set to \"yes\" the chorus effects module is "
-#~ "activated; note that when the chorus module is active, the amount of "
-#~ "signal sent to the chorus module depends on the \"chorus send\" generator "
-#~ "defined in the SoundFont."
-#~ msgstr ""
-#~ "* Sbor syntetizátoru *\n"
-#~ "Z dokumentace FluidSynth: je-li nastaveno na „ano“, modul efektu sboru je "
-#~ "aktivován. Pamatujte, že při aktivovaném modulu sboru je množství signálu "
-#~ "zasílaného tomuto modulu závislé na generátoru „zasílání sboru“, který je "
-#~ "definován v SoundFontu."
-
-#~ msgid ""
-#~ "* Synthesizer samplerate *\n"
-#~ "The sample rate of the audio generated by the synthesizer. You can also "
-#~ "specify a custom value in the interval 22050Hz-96000Hz."
-#~ msgstr ""
-#~ "* Vzorkovací frekvence syntetizátoru *\n"
-#~ "Vzorkovací frekvence zvuku generovaného syntetizátorem. Lze zadat vlastní "
-#~ "hodnotu z intervalu 22050 Hz–96000 Hz."
-
-#~ msgid "Target volume:"
-#~ msgstr "Cílová hlasitost:"
-
-#~ msgid ""
-#~ "If enabled, the extension from the original filename will not be stripped "
-#~ "before adding the new file extension to the end."
-#~ msgstr ""
-#~ "Je-li zapnuto, přípona ze jména původního souboru nebude před přidáním "
-#~ "nové přípony odstraněna."
-
-#~ msgid ""
-#~ "best/slowest:0;\n"
-#~ "worst/fastest:9;\n"
-#~ "recommended:2;\n"
-#~ "default:5;"
-#~ msgstr ""
-#~ "nejlepší/nejpomalejší:0;\n"
-#~ "nejhorší/nejrychlejší:9;\n"
-#~ "doporučená:2;\n"
-#~ "výchozí:5;"
-
-#~ msgid "Adds 16 bit checksum to every frame"
-#~ msgstr "Ke každému rámci přidat 16b kontrolní součet"
-
-#~ msgid "Variable bitrate"
-#~ msgstr "Proměnný datový tok"
-
-#~ msgid "Average bitrate"
-#~ msgstr "Průměrný datový tok"
-
-#~ msgid ""
-#~ "For use with players that do not support low bitrate mp3 (Apex AD600-A "
-#~ "DVD/mp3 player)"
-#~ msgstr ""
-#~ "Pro použití v přehrávačích, které nepodporují úzkopásmové MP3 (přehrávač "
-#~ "Apex AD600-A DVD/MP3)"
-
-#~ msgid ""
-#~ "highest:0;\n"
-#~ "lowest:9;\n"
-#~ "default:4;"
-#~ msgstr ""
-#~ "nejvyšší:0;\n"
-#~ "nejnižší:9;\n"
-#~ "výchozí:4;"
-
-#~ msgid "FLAC Audio Plugin "
-#~ msgstr "Zvukový modul FLAC"
-
-#~ msgid "Show playlists"
-#~ msgstr "Zobrazit seznamy skladeb"
-
-#~ msgid "Show/hide playlists"
-#~ msgstr "Zobrazit/skrýt seznamy skladeb"
-
-#~ msgid "LyricWiki"
-#~ msgstr "LyricWiki"
-
-#~ msgid "Stream browser"
-#~ msgstr "Prohlížeč proudů"
-
-#~ msgid "Streambrowser"
-#~ msgstr "Prohlížeč proudů"
-
-#~ msgid ""
-#~ "XMMS BSD Sun Driver\n"
-#~ "\n"
-#~ "Copyright (c) 2001 CubeSoft Communications, Inc.\n"
-#~ "Maintainer: <vedge at csoft.org>.\n"
-#~ msgstr ""
-#~ "BSD ovladač pro Sun programu XMMS\n"
-#~ "\n"
-#~ "Copyright © 2001 CubeSoft Communications, Inc.\n"
-#~ "Správce: <vedge na csoft.org>.\n"
-
-#~ msgid "Audio control device:"
-#~ msgstr "Zařízení ovládání zvuku:"
-
-#~ msgid "Buffer size (ms):"
-#~ msgstr "Velikost vyrovnávací paměti (ms):"
-
-#~ msgid "Volume controls device:"
-#~ msgstr "Zařízení ovládání hlasitosti:"
-
-#~ msgid "XMMS uses mixer exclusively."
-#~ msgstr "XMMS používá výlučný přístup k mixéru"
-
-#~ msgid "Sun driver configuration"
-#~ msgstr "Nastavení ovladače pro Sun"
-
-#~ msgid "Queue"
-#~ msgstr "Fronta"
-
-#~ msgid "Effect strength:"
-#~ msgstr "Síla efektu:"
-
-#~ msgid "PREAMP"
-#~ msgstr "PREAMP"
-
-#~ msgid "60HZ"
-#~ msgstr "60 Hz"
-
-#~ msgid "170HZ"
-#~ msgstr "170 Hz"
-
-#~ msgid "310HZ"
-#~ msgstr "310 Hz"
-
-#~ msgid "600HZ"
-#~ msgstr "600 Hz"
-
-#~ msgid "1KHZ"
-#~ msgstr "1 kHz"
-
-#~ msgid "3KHZ"
-#~ msgstr "3 kHz"
-
-#~ msgid "6KHZ"
-#~ msgstr "6 kHz"
-
-#~ msgid "12KHZ"
-#~ msgstr "12 kHz"
-
-#~ msgid "14KHZ"
-#~ msgstr "14 kHz"
-
-#~ msgid "16KHZ"
-#~ msgstr "16 kHz"
-
-#~ msgid "Audacious standard menu"
-#~ msgstr "Standardní nabídka Audacious"
-
-#~ msgid "Surround echo"
-#~ msgstr "Prostorová ozvěna (surround echo)"
-
-#~ msgid "About ESounD Plugin"
-#~ msgstr "O modulu ESounD"
-
-#~ msgid ""
-#~ "Audacious ESounD Plugin\n"
-#~ "\n"
-#~ " This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Modul ESounD programu Audacious\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit,\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#~ msgid "ESD Output Plugin configuration"
-#~ msgstr "Nastavení výstupního ESD modulu"
-
-#~ msgid "Host:"
-#~ msgstr "Adresa:"
-
-#~ msgid "Use remote host"
-#~ msgstr "Použít vzdálený počítač"
-
-#~ msgid "Volume controls OSS mixer"
-#~ msgstr "Hlasitost ovládána OOS mixérem"
-
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
-#~ msgid "Server"
-#~ msgstr "Server"
-
-#~ msgid "GTK Foobar-like Interface"
-#~ msgstr "Rozhraní GTK podobné Foobaru"
-
-#~ msgid "Load List"
-#~ msgstr "Načíst seznam skladeb"
-
-#~ msgid "Save List"
-#~ msgstr "Uložit seznam"
-
-#~ msgid "About RoarAudio Plugin"
-#~ msgstr "O modulu RoarAudio"
-
-#~ msgid "RoarAudio Audacious Plugin..."
-#~ msgstr "Modul RoarAudio pro Audacious…"
-
-#~ msgid "RoarAudio Plugin - Configuration"
-#~ msgstr "Modul RoarAudio – Nastavení"
-
-#~ msgid "Server Type:"
-#~ msgstr "Druh serveru:"
-
-#~ msgid "Host or Path:"
-#~ msgstr "Stroj nebo cesta:"
-
-#~ msgid "Host:"
-#~ msgstr "Stroj:"
-
-#~ msgid "Server & Network"
-#~ msgstr "Server a síť"
-
-#~ msgid "Proxy Address"
-#~ msgstr "Proxy adresa"
-
-#~ msgid "Proxy"
-#~ msgstr "Proxy"
-
-#~ msgid "Proxy"
-#~ msgstr "Proxy"
-
-#~ msgid "Player Name:"
-#~ msgstr "Název přehrávače:"
-
-#~ msgid "Player"
-#~ msgstr "Přehrávač"
-
-#~ msgid "Current Song"
-#~ msgstr "Současná skladba"
-
-#~ msgid "Meta Data"
-#~ msgstr "Metadata"
-
-#~ msgid ""
-#~ "<big>Unable to save playlist.</big>\n"
-#~ "\n"
-#~ "Unknown file type for '%s'.\n"
-#~ msgstr ""
-#~ "<big>Nelze uložit seznam skladeb.</big>\n"
-#~ "\n"
-#~ "Neznámý typ souboru %s.\n"
-
-#~ msgid "Start of playback"
-#~ msgstr "Začátek přehrávání"
-
-#~ msgid "Automatic songchange"
-#~ msgstr "Automatická změna skladby"
-
-#~ msgid "Manual songchange"
-#~ msgstr "Ruční změna skladby"
-
-#~ msgid "Manual stop"
-#~ msgstr "Ruční zastavení"
-
-#~ msgid "End of playlist"
-#~ msgstr "Konec seznamu skladeb"
-
-#~ msgid "Seeking"
-#~ msgstr "Posun"
-
-#~ msgid "Reopen output device"
-#~ msgstr "Znovu otevřít výstupní zařízení"
-
-#~ msgid "Flush output device"
-#~ msgstr "Vyprázdnit výstupní zařízení"
-
-#~ msgid "None (gapless/off)"
-#~ msgstr "Nic (vázaně/vypnuto)"
-
-#~ msgid "Simple crossfade"
-#~ msgstr "Jednoduchý přechod"
-
-#~ msgid "Advanced crossfade"
-#~ msgstr "Pokročilý přechod"
-
-#~ msgid "Fadein"
-#~ msgstr "Zesilující přechod"
-
-#~ msgid "Fadeout"
-#~ msgstr "Slábnoucí přechod"
-
-#~ msgid "Fadeout/Fadein"
-#~ msgstr "Zesílení/Zeslabení"
-
-#~ msgid ""
-#~ "Audacious Crossfade Plugin\n"
-#~ "\n"
-#~ "Copyright © 2009 William Pitcock <nenolod@atheme.org>\n"
-#~ "\n"
-#~ "...based in part on XMMS-Crossfade:\n"
-#~ "Copyright © 2000-2009 Peter Eisenlohr <peter@eisenlohr.org>\n"
-#~ "\n"
-#~ "based on the original OSS Output Plugin Copyright (C) 1998-2000\n"
-#~ "Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front "
-#~ "Technologies\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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Modul přechodu pro Audacious\n"
-#~ "\n"
-#~ "Copyright © 2009 William Pitcock <nenolod@atheme.org>\n"
-#~ "\n"
-#~ "… částečně založeno na XMMS-Crossfade:\n"
-#~ "Copyright © 2000–2009 Peter Eisenlohr <peter@eisenlohr.org>\n"
-#~ "\n"
-#~ "založeno na původním Výstupní OSS modulu, copyright © 1998–2000\n"
-#~ "Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson a 4Front "
-#~ "Technologies\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2, nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Tento program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani odvozené záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, obraťte se na Free Software Foundation, Inc.\n"
-#~ "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
-
-#~ msgid "Crossfade Configuration"
-#~ msgstr "Nastavení přechodů"
-
-# Toto je tlačítko „About“ ve výběru výstupního podmodulu modulu Crossfade
-#~ msgid "About"
-#~ msgstr "O výstupu"
-
-#~ msgid "Output plugin"
-#~ msgstr "Výstupní modul"
-
-#~ msgid "Throttle Output"
-#~ msgstr "Škrtit výstup"
-
-#~ msgid "Max block size (bytes):"
-#~ msgstr "Maximální velikost bloku (v bajtech):"
-
-#~ msgid "Force close/reopen on songchange"
-#~ msgstr "Vynutit uzavření/otevření při změně skladby"
-
-#~ msgid "Plugin compatibility options"
-#~ msgstr "Volby kompatibility modulu"
-
-#~ msgid ""
-#~ "When modifying the Output Options or the Mixing buffer size, you need to "
-#~ "stop/restart playback for the settings to take effect."
-#~ msgstr ""
-#~ "Když změníte volby výstupu nebo velikost směšovacího bufferu, bude třeba "
-#~ "zastavit/restartovat přehrávání, aby se změny projevily."
-
-#~ msgid "Mixing buffer size (ms):"
-#~ msgstr "Velikost vyrovnávací paměti směšovače (ms):"
-
-#~ msgid ""
-#~ "Specify the size of the mixing buffer. Mixing buffer space is required "
-#~ "for pauses, fade-outs, offsetting (i.e. interleaving the end and "
-#~ "beginning of two songs) and killing trailing gaps. Fade-ins and killing "
-#~ "leading gaps are done on-the-fly and do not depend on mixing buffer "
-#~ "space.\n"
-#~ "Default: n/a - calculated automatically"
-#~ msgstr ""
-#~ "Určuje velikost směšovacího bufferu. Vyrovnávací paměť směšovače je nutná "
-#~ "pro pausy, zeslabování, pozicování (tj. prokládání konce a začátku dvou "
-#~ "skladeb) a zabíjení závěrečných pomlk. Zesilování a zabíjení úvodních "
-#~ "pomlk je prováděno za běhu a nezávisí na směšovacím bufferu.\n"
-#~ "Standardně: nedefinováno – vypočteno automaticky"
-
-#~ msgid "auto"
-#~ msgstr "automaticky"
-
-#~ msgid ""
-#~ "Automatically calculate an optimal buffer size.\n"
-#~ "Default: On"
-#~ msgstr ""
-#~ "Automaticky určit optimální velikost vyrovnávací paměti.\n"
-#~ "Standardně: zapnuto"
-
-#~ msgid "Set parameters for:"
-#~ msgstr "Nastavit parametry pro:"
-
-#~ msgid ""
-#~ "Select the type of songchange you want to configure:\n"
-#~ "* Start of playback: When starting playback by pressing PLAY\n"
-#~ "* Automatic songchange: When reaching the end of a song and the playlist "
-#~ "advances to the next song\n"
-#~ "* Manual songchange: When manually selecting another song, for example by "
-#~ "pressing NEXT/PREV\n"
-#~ "* Manual stop: When pressing the STOP button\n"
-#~ "* End of playlist: After the last song in the playlist has been played\n"
-#~ "* Seeking: When seeking within the current song"
-#~ msgstr ""
-#~ "Vybírá způsob změny skladby, který chcete nastavit:\n"
-#~ "* Začátek přehrávání: Když přehrávání započne stiskem HRÁT\n"
-#~ "* Automatická změna skladby: Když je dosaženo konce jedné skladby a "
-#~ "seznam skladeb přejde na další skladbu\n"
-#~ "* Ruční změna skladby: Když ručně vyberete jinou skladbu, například "
-#~ "stisknutím DALŠÍ/PŘEDCHOZÍ\n"
-#~ "* Ruční zastavení: Když se stiskne tlačítko ZASTAVIT\n"
-#~ "* Konec seznamu skladeb: Po dokončení přehrávání poslední skladby na "
-#~ "seznamu\n"
-#~ "* Posun: Při změně polohy uvnitř současné skladby"
-
-#~ msgid "Crossfade/Transition type:"
-#~ msgstr "Druh přechodu:"
-
-#~ msgid ""
-#~ "Select the transition to be used for the songchange type selected above:\n"
-#~ "* Fade-in: Fade-in at 'Start of playback'\n"
-#~ "* Reopen output device: Force a close/open on the output plugin. This "
-#~ "will most certainly re-introduce gaps and clicks, but might be useful "
-#~ "with some plugins.\n"
-#~ "* Flush output device: Keeps the output plugin opened, but flushes its "
-#~ "buffers. This will give you almost instant reaction when pressing NEXT/"
-#~ "PREV.\n"
-#~ "* None (gapless/off): Gapless mode. Keeps the device opened, but does not "
-#~ "do any fading.\n"
-#~ "* Simple crossfade: Does a simple crossfade between the previous and the "
-#~ "next song.\n"
-#~ "* Advanced crossfade: Allows you to configure the crossfade in more "
-#~ "detail.\n"
-#~ "* Fade-out: Fade-out at 'Manual stop' or 'End of playlist'."
-#~ msgstr ""
-#~ "Vybírá přechod, který se použije při změně skladby způsobem vybraným "
-#~ "výše:\n"
-#~ "* Zesílení: Zesílení na „Začátku přehrávání“\n"
-#~ "* Znovu otevřít výstupní zařízení: Vynutí uzavření/otevření výstupního "
-#~ "modulu. Toto zcela jistě způsobí pomlky a praskot, avšak některé moduly "
-#~ "to potřebují.\n"
-#~ "* Nic (vázaně/vypnuto): Vázaný režim. Zařízení ponechá otevřené, ale "
-#~ "neuplatní žádné přechody.\n"
-#~ "* Jednoduchý přechod: Vytvoří jednoduchý přechod mezi mezi předchozí a "
-#~ "další skladbou.\n"
-#~ "* Pokročilý přechod: Umožní podrobnější nastavení přechodu.\n"
-#~ "* Zeslabení: Zeslabí při „Ručním zastavení“ a na „Konci seznamu skladeb“."
-
-#~ msgid "Reopen"
-#~ msgstr "Znovu otevřít"
-
-#~ msgid "Length (ms):"
-#~ msgstr "Délka (ms):"
-
-#~ msgid ""
-#~ "Specify the length of the silence to be inserted between the tracks.\n"
-#~ "Default: 2000"
-#~ msgstr ""
-#~ "Určuje délku ticha, které bude vloženo mezi stopy.\n"
-#~ "Standardně: 2000"
-
-#~ msgid "Start volume (%):"
-#~ msgstr "Počáteční hlasitost (%):"
-
-#~ msgid "Set the duration for the fadein of the next song."
-#~ msgstr "Nastaví délku trvání zesílení další skladby."
-
-#~ msgid ""
-#~ "Set the start volume. XMMS-crossfade will fade from this volume to 100% "
-#~ "during the time specified above.\n"
-#~ "Default: 0"
-#~ msgstr ""
-#~ "Nastavuje počáteční hlasitost. XMMS-crossfade bude zesilovat z této "
-#~ "hlasitosti do 100 % během doby určené výše.\n"
-#~ "Standardně: 0"
-
-#~ msgid "Fade in"
-#~ msgstr "Zesílení"
-
-#~ msgid "Flush"
-#~ msgstr "Vyprázdnit"
-
-#~ msgid ""
-#~ "Specify the length of the crosssfade.\n"
-#~ "Default: depends on songchange type"
-#~ msgstr ""
-#~ "Určuje délku přechodu.\n"
-#~ "Standardně: závisí na způsobu změny skladby"
-
-#~ msgid "Crossfade"
-#~ msgstr "Přechod"
-
-#~ msgid "Simple XF"
-#~ msgstr "Jednoduchý přechod"
-
-#~ msgid "Set the duration for the fadeout of the previous song."
-#~ msgstr "Nastaví délku trvání zeslabení předchozí skladby."
-
-#~ msgid "End volume (%):"
-#~ msgstr "Koncová hlasitost (%):"
-
-#~ msgid ""
-#~ "Set the end volume. XMMS-crossfade will fade from 100% to this volume "
-#~ "during the time specified above.\n"
-#~ "Default: 0"
-#~ msgstr ""
-#~ "Nastaví koncovou hlasitost. XMMS-crossfade ztiší hudbu ze 100 % na tuto "
-#~ "hlasitost během výše určené doby.\n"
-#~ "Standardně: 0"
-
-#~ msgid "Fade out"
-#~ msgstr "Zeslabení"
-
-#~ msgid "Custom (ms):"
-#~ msgstr "Vlastní (ms):"
-
-#~ msgid "Set a custom offset."
-#~ msgstr "Nastaví vlastní pozici."
-
-#~ msgid ""
-#~ "Set how much the end of the previous and the beginning of the next song "
-#~ "should overlap.\n"
-#~ "* Negative values indicate that the next song should start before the "
-#~ "previous has reached the end.\n"
-#~ "* A value of 0 means that the songs are concatenated seamlessly.\n"
-#~ "* Positive values will yield insert silence inbetween.."
-#~ msgstr ""
-#~ "Řídí, kolik konce z předchozí skladby a začátku z další skladby se bude "
-#~ "překrývat\n"
-#~ "* Záporné hodnoty značí, že další skladba by měla začít dříve, než "
-#~ "předchozí dosáhne konce.\n"
-#~ "* Hodnota rovna 0 znamená, že skladby budou spojeny bez pomlky.\n"
-#~ "* Kladné hodnoty způsobí vložení pomlky mezi skladby."
-
-# Offset → Pozice
-#~ msgid "None (0 ms)"
-#~ msgstr "Žádná (0 ms)"
-
-#~ msgid ""
-#~ "Don't overlap the two songs. The next song will start immediatelly after "
-#~ "the previous has ended."
-#~ msgstr ""
-#~ "Skladby se nebudou překrývat. Další skladba začne okamžitě, jakmile "
-#~ "předchozí skončí."
-
-#~ msgid "Lock to fadeout length"
-#~ msgstr "Zarovnat na délku zeslabení"
-
-#~ msgid "Overlap by the fadeout duration specified above."
-#~ msgstr "Překryv bude roven délce trvání zeslabení určené výše."
-
-#~ msgid "Lock to fadein length"
-#~ msgstr "Zarovnat na délku zesílení"
-
-#~ msgid "Overlap by the fadein duration specified below.."
-#~ msgstr "Překryv bude roven délce trvání zesílení určené níže."
-
-#~ msgid "Offset"
-#~ msgstr "Pozice"
-
-#~ msgid " Enable"
-#~ msgstr "Povolit"
-
-#~ msgid "Lock to Fade-out"
-#~ msgstr "Zarovnat na zeslabení"
-
-#~ msgid "Use the same settings as fade-out."
-#~ msgstr "Použít stejné nastavení jako u zeslabení."
-
-#~ msgid "Advanced XF"
-#~ msgstr "Pokročilý přechod"
-
-#~ msgid "Set the duration for the fadein when starting playback."
-#~ msgstr "Nastaví délku trvání zesílení, když začne přehrávání."
-
-#~ msgid "Set the duration for the fadeout of the last song."
-#~ msgstr "Nastaví délku trvání zeslabení poslední skladby."
-
-#~ msgid ""
-#~ "Set how much additional silence should be played after the end of the "
-#~ "last song. This way, you can avoid the clicks some soundcards produce "
-#~ "when being shut down during playback.\n"
-#~ "Default: 500"
-#~ msgstr ""
-#~ "Řídí, jak dlouhá pomlka se přidá za konec poslední skladby. Tímto "
-#~ "způsobem lze zabránit praskání, které některé zvukové karty vydávají, "
-#~ "když jsou vypnuty během přehrávání.\n"
-#~ "Standardně: 500"
-
-#~ msgid "Additional silence"
-#~ msgstr "Dodatečná pomlka"
-
-#~ msgid ""
-#~ "Set the duration for the fadeout when pausing.\n"
-#~ "Default: 100"
-#~ msgstr ""
-#~ "Nastaví délku trvání zeslabení při pozastavení.\n"
-#~ "Standardně: 100"
-
-#~ msgid ""
-#~ "Set how much additional silence should be played after pausing. This way, "
-#~ "you can avoid the clicks some soundcards produce when entering pause.\n"
-#~ "Default: 100"
-#~ msgstr ""
-#~ "Řídí, jak dlouhá pomlka se přidá za pozastavení přehrávání. Tímto "
-#~ "způsobem lze zabránit praskání, které některé zvukové karty vydávají, "
-#~ "když jsou pozastaveny.\n"
-#~ "Standardně: 100"
-
-#~ msgid ""
-#~ "Set the duration for the fadein when unpausing.\n"
-#~ "Default: 100"
-#~ msgstr ""
-#~ "Nastaví délku trvání zesílení při obnovení pozastaveného přehrávání.\n"
-#~ "Standardně: 100"
-
-#~ msgid "Fade out (ms):"
-#~ msgstr "Zeslabení (ms):"
-
-#~ msgid "Silence (ms):"
-#~ msgstr "Ticho (ms):"
-
-#~ msgid "Fade in (ms):"
-#~ msgstr "Zesílení (ms):"
-
-#~ msgid "Fade out / Fade in"
-#~ msgstr "Zeslabení/Zesílení"
-
-#~ msgid ""
-#~ "Set the maximum length for gaps at the beginning of a stream.\n"
-#~ "Default: 500"
-#~ msgstr ""
-#~ "Zadejte maximální délku pauzy na začátku skladby.\n"
-#~ "Standardně: 500"
-
-#~ msgid ""
-#~ "Set the maximum volume for gaps at the beginning of a stream. All samples "
-#~ "below this value are considered as silent.\n"
-#~ "Default: 512"
-#~ msgstr ""
-#~ "Zadejte maximální hlasitost určující mezeru na začátku skladby. Všechny "
-#~ "vzorky pod touto hodnotou budou považovány za ticho.\n"
-#~ "Standardně: 512"
-
-#~ msgid "Max. length (ms):"
-#~ msgstr "Maximální délka (ms):"
-
-#~ msgid "Max. level (16bit sample):"
-#~ msgstr "Maximální úroveň (16b vzorek):"
-
-#~ msgid "Leading gap killer"
-#~ msgstr "Zabiják úvodních pomlk"
-
-#~ msgid ""
-#~ "Set the maximum length for gaps at the end of a stream.\n"
-#~ "Default: 500"
-#~ msgstr ""
-#~ "Zadejte maximální délku pauzy na konci skladby.\n"
-#~ "Standardně: 500"
-
-#~ msgid ""
-#~ "Set the maximum volume for gaps at the end of a stream. All samples below "
-#~ "this value are considered as silent.\n"
-#~ "Default: 512"
-#~ msgstr ""
-#~ "Zadejte nejvyšší hlasitost určující mezeru na konci skladby. Všechny "
-#~ "vzorky pod touto hodnotou budou považovány za ticho.\n"
-#~ "Standardně: 512"
-
-#~ msgid "Lock to Leading"
-#~ msgstr "Zarovnat na úvod"
-
-#~ msgid "Use the same settings as above."
-#~ msgstr "Použít stejné nastavení jako výše."
-
-#~ msgid "Trailing gap killer"
-#~ msgstr "Zabiják závěrečných pomlk"
-
-#~ msgid "Skip to next zero crossing"
-#~ msgstr "Přeskočit na další nulový přechod"
-
-#~ msgid ""
-#~ "If enabled, XMMS-crossfade will take additional care to avoid clicks with "
-#~ "pre-faded (gapless) tracks. XMMS-crossfade will cut off the end of the "
-#~ "previous song (the beginning of the next song) only at a zero-crossing of "
-#~ "the sample values.\n"
-#~ "Default: On"
-#~ msgstr ""
-#~ "Je-li zapnuto, XMMS-crossing bude brát zvláštní ohled na praskání "
-#~ "u předzeslabených (vázaných) stop. XMMS-crossing odřízne konec předchozí "
-#~ "skladby (začátek další skladby) pouze při nulovém přechodu hodnot "
-#~ "vzorků.\n"
-#~ "Standardně: zapnuto"
-
-#~ msgid "Advanced"
-#~ msgstr "Pokročilé"
-
-#~ msgid "Gap Killer"
-#~ msgstr "Zabiják pomlk"
-
-#~ msgid "Write debug output to <stderr>"
-#~ msgstr "Vypisovat chyby na <stderr>"
-
-#~ msgid ""
-#~ "Monitors what is going on in XMMS-crossfade. If you think you found a bug "
-#~ "in XMMS-crossfade, please enable this option and send me the output.\n"
-#~ "Note that you should disable debug output if you start XMMS from within "
-#~ "Netscape. Netscape will spam you with dialogs containing the debug output "
-#~ "captured from <stderr>.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Sleduje, co se děje v XMMS-crossfade. Pokud si myslíte, že jste našli "
-#~ "chybu v XMMS-crossfade, prosím, zapněte tuto volbu a pošlete mi výstup.\n"
-#~ "Poznamenejme, že byste zakázat ladicí výstup, pokud pouštíte XMMS "
-#~ "z Netscapu. Netscape vás jinak zahltí dialogy s ladicím výstupem "
-#~ "zachyceným na <stderr> (standardním chybovém výstupu).\n"
-#~ "Standardně: vypnuto"
-
-#~ msgid "Debug options"
-#~ msgstr "Ladicí volby"
-
-#~ msgid "Enable volume control"
-#~ msgstr "Povolit ovládání hlasitosti:"
-
-#~ msgid ""
-#~ "Enables/disables XMMS volume and balance controls.\n"
-#~ "Default: On"
-#~ msgstr ""
-#~ "Zapne/vypne ovládání hlasitosti a vyvážení v XMMS.\n"
-#~ "Standardně: zapnuto"
-
-#~ msgid ""
-#~ "Reverses left and right with the balance control.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Prohodí levou a pravou stranu v ovládání vyvážení.\n"
-#~ "Standardně: vypnuto"
-
-#~ msgid "Software Mixer"
-#~ msgstr "Softwarový směšovač"
-
-#~ msgid ""
-#~ "Enable software mixer. Useful for output plugins without mixer support.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Povolit softwarový směšovač. Užitečné pro výstupní moduly bez podpory "
-#~ "mixování zvuku.\n"
-#~ "Standardně: vypnuto"
-
-#~ msgid "Volume control options"
-#~ msgstr "Volby řídící hlasitosti"
-
-#~ msgid "Songchange timeout (ms):"
-#~ msgstr "Časový limit na změnu skladby (ms):"
-
-#~ msgid ""
-#~ "The songchange timeout is the maximum time XMMS-crossfade waits for the "
-#~ "next song. If this timeout is exceeded, the output plugin/device is "
-#~ "closed.\n"
-#~ "Default: 100"
-#~ msgstr ""
-#~ "Časový limit na změnu skladby je maximální čas, po který XMMS-crosfade "
-#~ "čeká na další skladbu. Bude-li tento limit překročen, bude výstupní modul/"
-#~ "zařízení uzavřeno.\n"
-#~ "Standardně: 100"
-
-#~ msgid "Mixing buffer preload (ms):"
-#~ msgstr "Předplnění směšovacího bufferu (ms):"
-
-#~ msgid ""
-#~ "Tells XMMS-crossfade how much data it should buffer before it starts "
-#~ "writing to the output plugin/device. Usually, this value can be set to 0, "
-#~ "because the output plugin does preloading on its own.\n"
-#~ "Default: 0"
-#~ msgstr ""
-#~ "Říká, kolik dat má XMMS-crossfade načíst do bufferu před tím, než začne "
-#~ "zapisovat do výstupního modulu/zařízení. Tato hodnotu může být obvykle 0, "
-#~ "protože výstupní modul si dělá předplnění po svém.\n"
-#~ "Standardně: 0"
-
-#~ msgid "Don't crossfade"
-#~ msgstr "Nedělat přechody u "
-
-# Navazuje na "Don't crossfade"
-#~ msgid "successive tracks"
-#~ msgstr "následujících stop"
-
-#~ msgid ""
-#~ "This option enables the automatic detection of pre-faded or gapless "
-#~ "tracks, like the tracks on some compilations or on most live albums. If "
-#~ "such tracks are detected, crossfading will be disabled and only the "
-#~ "gapkiller (if enabled) will be used for the songchange.\n"
-#~ "Default: On"
-#~ msgstr ""
-#~ "Tato volba zapíná automatické rozpoznávání stop, které již přechod nebo "
-#~ "vázání obsahují, jako je běžné u některých kompilací nebo na většině "
-#~ "živých alb. Jsou-li takové stopy nalezeny, bude vytváření přechodu "
-#~ "zakázáno a pouze zabiják pomlk (je-li povolen) bude použit při změně "
-#~ "skladby.\n"
-#~ "Standardně: zapnuto"
-
-# Navazuje na "Don't crossfade"
-#~ msgid "same file"
-#~ msgstr "téhož souboru"
-
-#~ msgid ""
-#~ "This option disables crossfading between the same file. This can happen "
-#~ "if you have only one file in the playlist and 'repeat' turned on.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Tato volba vypíná přechody mezi stejným souborem. To se může přihodit, "
-#~ "máte-li v seznamu skladeb pouze jeden soubor a je-li zapnuto "
-#~ "„opakování“.\n"
-#~ "Standardně: vypnuto"
-
-#~ msgid "Enable HTTP buffer underrun workaround"
-#~ msgstr "Zapnout obcházení podtečení HTTP bufferu"
-
-#~ msgid ""
-#~ "Enable this when you have problems playing internet HTTP audio streams. "
-#~ "Unfortunately, it also breaks crossfading.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Zapněte tuto volbu, pokud máte problémy s přehráváním internetových HTTP "
-#~ "zvukových proudů. Naneštěstí tato funkce rozbíjí přechody.\n"
-#~ "Standardně: vypnuto"
-
-#~ msgid "Limit OP buffer usage (ms):"
-#~ msgstr "Omezit buffer výstupního modulu (ms):"
-
-#~ msgid ""
-#~ "With this option enabled, XMMS-crossfade will limit the amount of data "
-#~ "being buffered by the output plugin. This way, you can decrease the "
-#~ "latency between pressing STOP/NEXT/PREV and the new song actually being "
-#~ "played. \n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Je-li tato volba zapnuta, XMMS-crossfade omezí množství dat, která "
-#~ "bufferuje výstupní modul. Takto lze zkrátit zpoždění mezi stisknutím "
-#~ "ZASTAVIT/DALŠÍ/PŘEDCHOZÍ a skutečným přehráváním nové skladby.\n"
-#~ "Standardně: vypnuto"
-
-#~ msgid ""
-#~ "Beware that setting this value too low also increases the chance of "
-#~ "buffer underruns.\n"
-#~ "Default: 250"
-#~ msgstr ""
-#~ "Pozor, nastavení této hodnoty příliš nízko zvýší riziko podtečení "
-#~ "vyrovnávací paměti.\n"
-#~ "Standardně: 250"
-
-#~ msgid "Use Quantaudio timing comments"
-#~ msgstr "Použít časové komentáře Quantaudio"
-
-#~ msgid "Keep output opened"
-#~ msgstr "Ponechat výstup otevřený"
-
-#~ msgid ""
-#~ "Keep the output device opened all the time, even if XMMS is stopped. This "
-#~ "way, you can avoid clicks caused by the soundcard when the device is "
-#~ "opened or closed\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Ponechá výstupní zařízení otevřené, i když je přehrávání pozastavené. Tak "
-#~ "lze zabránit cvakání, které způsobují některé zvukové karty při svém "
-#~ "spuštění/zastavení.\n"
-#~ "Standardně: vypnuto"
-
-#~ msgid "Advanced options"
-#~ msgstr "Pokročilé nastavení"
-
-#~ msgid "New"
-#~ msgstr "Nový"
-
-#~ msgid "Save Default List"
-#~ msgstr "Uložit standardní seznam"
-
-#~ msgid "Saves the selected playlist to the default location."
-#~ msgstr "Uloží vybraný seznam skladeb na standardní místo."
-
-#~ msgid "About Icecast-Plugin"
-#~ msgstr "O modulu Icecast"
-
-#~ msgid ""
-#~ "Icecast-Plugin\n"
-#~ "\n"
-#~ "This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Modul Icecast\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit,\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani odvozené záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací naleznete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#~ msgid "Error setting hostname: %s\n"
-#~ msgstr "Chyba při nastavování názvu stroje: %s\n"
-
-#~ msgid "Error setting protocol: %s\n"
-#~ msgstr "Chyba při nastavování protokolu: %s\n"
-
-#~ msgid "Error setting port: %s\n"
-#~ msgstr "Chyba při nastavování portu: %s\n"
-
-#~ msgid "Error setting password: %s\n"
-#~ msgstr "Chyba při nastavování hesla: %s\n"
-
-#~ msgid "Error setting mount: %s\n"
-#~ msgstr "Chyba při nastavování bodu připojení: %s\n"
-
-#~ msgid "Error setting stream %s: %s\n"
-#~ msgstr "Chyba při nastavování proudu %s: %s\n"
-
-#~ msgid "public"
-#~ msgstr "veřejný"
-
-#~ msgid "private"
-#~ msgstr "soukromý"
-
-#~ msgid "Error setting stream name: %s\n"
-#~ msgstr "Chyba při nastavování názvu proudu: %s\n"
-
-#~ msgid "Error setting stream genre: %s\n"
-#~ msgstr "Chyba při nastavování žánru proudu: %s\n"
-
-#~ msgid "Error setting stream URL: %s\n"
-#~ msgstr "Chyba při nastavování URL proudu: %s\n"
-
-#~ msgid "Error setting stream description: %s\n"
-#~ msgstr "Chyba při nastavování popisu proudu: %s\n"
-
-#~ msgid "Error setting user: %s\n"
-#~ msgstr "Chyba při nastavování uživatele: %s\n"
-
-#~ msgid "Error connecting to server: %s\n"
-#~ msgstr "Chyba při připojování se k serveru: %s\n"
-
-#~ msgid "Icecast Configuration"
-#~ msgstr "Nastavení Icecastu"
-
-#~ msgid "Output stream format:"
-#~ msgstr "Formát výstupního proudu:"
-
-#~ msgid "Server address:"
-#~ msgstr "Adresa serveru:"
-
-#~ msgid "Server hostname or IP address"
-#~ msgstr "Název stroje serveru nebo IP adresa"
-
-#~ msgid "Server port number"
-#~ msgstr "Číslo portu serveru"
-
-#~ msgid "Mount point:"
-#~ msgstr "Bod připojení:"
-
-#~ msgid "Mount point for the stream"
-#~ msgstr "Bod připojení proudu"
-
-#~ msgid "User name:"
-#~ msgstr "Uživatelské jméno:"
-
-#~ msgid ""
-#~ "Icecast source user name for the stream; depends on your server "
-#~ "settings.\n"
-#~ "The default value is \"source\""
-#~ msgstr ""
-#~ "Uživatelské jméno icecastového zdroje pro tento proud. Závisí na "
-#~ "nastavení vašeho serveru.\n"
-#~ "Výchozí hodnota je „source“."
-
-#~ msgid "Icecast source user password"
-#~ msgstr "Uživatelské jméno icecastového zdroje"
-
-#~ msgid "Connection timeout (seconds):"
-#~ msgstr "Časový limit připojení (sekundy):"
-
-#~ msgid ""
-#~ "Amount of time before plugin closes connection to server when no audio "
-#~ "data available"
-#~ msgstr ""
-#~ "Doba, po které modul uzavře spojení se serverem, když nebudou k dispozici "
-#~ "žádná zvuková data"
-
-#~ msgid "Buffer size (bytes):"
-#~ msgstr "Velikost vyrovnávací paměti (bajty):"
-
-#~ msgid ""
-#~ "Internal buffer size\n"
-#~ "Try to increase this if you are experiencing audio skipping on client side"
-#~ msgstr ""
-#~ "Velikost vnitřního bufferu\n"
-#~ "Zkuste tuto hodnotu zvýšit, pokud na straně klienta přeskakuje zvuk"
-
-#~ msgid "Flush buffer if "
-#~ msgstr "Vyprázdnit vyrovnávací paměť, když "
-
-#~ msgid "Determines when to flush internal buffer to prevent its overflow"
-#~ msgstr ""
-#~ "Určuje, kdy bude vnitřní buffer vyprázdněn jakožto prevence před jeho "
-#~ "přetečením"
-
-#~ msgid "percents are filled"
-#~ msgstr "procent je zaplněno"
-
-#~ msgid "Stream is public"
-#~ msgstr "Proud je veřejný"
-
-#~ msgid ""
-#~ "Setting this asks the server to list the stream in any directories it "
-#~ "knows about"
-#~ msgstr ""
-#~ "Tímto nastavením vyžádáte server, aby zaregistroval proud v každém "
-#~ "adresáři, který zná"
-
-#~ msgid "Stream name:"
-#~ msgstr "Název proudu:"
-
-#~ msgid "Stream URL:"
-#~ msgstr "URL proudu:"
-
-#~ msgid "The URL of a site about this stream"
-#~ msgstr "URL stránky pojednávající o tomto proudu"
-
-#~ msgid "Stream genre:"
-#~ msgstr "Žánr proudu:"
-
-#~ msgid ""
-#~ "The genre (or genres) of the stream. This is usually a keyword list, eg "
-#~ "\"pop rock rap\""
-#~ msgstr ""
-#~ "Žánr (nebo žánry) proudu. Obvykle se jedná o seznam klíčových slov, "
-#~ "například „pop rock rap“."
-
-#~ msgid "Stream description:"
-#~ msgstr "Popis proudu:"
-
-#~ msgid "Enable fast play-length calculation"
-#~ msgstr "Povolit rychlý výpočet doby hraní"
-
-#~ msgid "Parse XING headers"
-#~ msgstr "Rozebrat hlavičku XING"
-
-#~ msgid "Use SJIS to write ID3 tags (not recommended)"
-#~ msgstr "Pro zápis ID3 popisků použít SJIS (nedoporučuje se)"
-
-#~ msgid "Metadata Settings"
-#~ msgstr "Nastavení metadat"
-
-#~ msgid "MPEG Audio Plugin Configuration"
-#~ msgstr "Nastavení modulu MPEG Audio"
-
-#~ msgid ""
-#~ "Audacious MPEG Audio Plugin\n"
-#~ "\n"
-#~ "Compiled against libMAD version: %d.%d.%d%s\n"
-#~ "\n"
-#~ "Written by:\n"
-#~ " William Pitcock <nenolod@sacredspiral.co.uk>\n"
-#~ " Yoshiki Yazawa <yaz@cc.rim.or.jp>\n"
-#~ "\n"
-#~ "Portions derived from XMMS-MAD by:\n"
-#~ " Sam Clegg\n"
-#~ "\n"
-#~ "ReplayGain support by:\n"
-#~ " Samuel Krempp"
-#~ msgstr ""
-#~ "Audacious modul pro MPEG zvuk\n"
-#~ "\n"
-#~ "Přeložen proti libMAD verze: %d.%d.%d%s\n"
-#~ "\n"
-#~ "Napsal:\n"
-#~ " William Pitcock <nenolod@sacredspiral.co.uk>\n"
-#~ " Yoshiki Yazawa <yaz@cc.rim.or.jp>\n"
-#~ "\n"
-#~ "Částečně odvozeno z XMMS-MAD od:\n"
-#~ " Sam Clegg\n"
-#~ "\n"
-#~ "Podpora zesílení přehrávání od:\n"
-#~ " Samuel Krempp"
-
-#~ msgid "About MPEG Audio Plugin"
-#~ msgstr "O modul pro MPEG zvuk"
-
-#~ msgid "About OSSv4 Driver"
-#~ msgstr "O OSSv4 ovladači"
-
-#~ msgid ""
-#~ "Audacious OSSv4 Driver\n"
-#~ "\n"
-#~ "Based on the OSSv3 Output plugin,\n"
-#~ "Ported to OSSv4's VMIX by Cristi Magherusan <majeru@gentoo.ro>\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.\n"
-#~ "\n"
-#~ "Note: For any issues regarding this plugin (including patches and \n"
-#~ "suggestions) please contact the maintainer, and NO other \n"
-#~ "Audacious developers\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ovladač OSSv4 programu Audacious\n"
-#~ "\n"
-#~ "Založeno na výstupním modulu OSSv3,\n"
-#~ "Na OSSv4 VMIX převedl Cristi Magherusan <majeru@gentoo.ro>\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit,\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani odvozené záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací naleznete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se tak\n"
-#~ "nestalo, obraťte se na Free Software Foundation, Inc.,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
-#~ "Poznámka: V záležitosti tohoto modulu (včetně patchů nebo návrhů),\n"
-#~ "prosíme, kontaktujte jeho správce a NE ostatní vývojáře Audacious.\n"
-#~ "\n"
-
-#~ msgid "Ape2 Tag"
-#~ msgstr "Popisek Ape2"
-
-#~ msgid "Title:"
-#~ msgstr "Název:"
-
-#~ msgid "Artist:"
-#~ msgstr "Umělec:"
-
-#~ msgid "Comment:"
-#~ msgstr "Komentář:"
-
-#~ msgid "Year:"
-#~ msgstr "Rok:"
-
-#~ msgid "Track number:"
-#~ msgstr "Číslo stopy:"
-
-#~ msgid "Genre:"
-#~ msgstr "Žánr:"
-
-#~ msgid "Remove Tag"
-#~ msgstr "Odstranit popisek"
-
-#~ msgid "Wavpack Info:"
-#~ msgstr "Informace o Wavpacku"
-
-#~ msgid "version %d"
-#~ msgstr "verze %d"
-
-#~ msgid "average bitrate: %6.1f kbps"
-#~ msgstr "průměrný datový tok: %6.1f kb/s"
-
-#~ msgid "samplerate: %d Hz"
-#~ msgstr "vzorkovací kmitočet: %d Hz"
-
-#~ msgid "bits per sample: %d"
-#~ msgstr "bitů na vzorek: %d"
-
-#~ msgid "length: %d:%.2d"
-#~ msgstr "délka: %d:%.2d"
-
-#~ msgid "file size: %d Bytes"
-#~ msgstr "velikost souboru: %d bajtů"
-
-#~ msgid "Title Peak: ?"
-#~ msgstr "Vrchol titulu: ?"
-
-#~ msgid "Album Peak: ?"
-#~ msgstr "Vrchol alba: ?"
-
-#~ msgid "Title Gain: ?"
-#~ msgstr "Zesílení titulu: ?"
-
-#~ msgid "Album Gain: ?"
-#~ msgstr "Zesílení alba: ?"
-
-#~ msgid "File Info - %s"
-#~ msgstr "Informace o souboru – %s"
-
-#~ msgid "Enable Dynamic Bitrate Display"
-#~ msgstr "Zapnout zobrazování dynamického datového toku"
-
-#~ msgid "General Plugin Settings"
-#~ msgstr "Obecná nastavení modulu"
-
-#~ msgid "use Track Gain/Peak"
-#~ msgstr "použít zesílení/vrchol skladby"
-
-#~ msgid "use Album Gain/Peak"
-#~ msgstr "použít zesílení/vrchol alba"
-
-#~ msgid "Enable Clipping Prevention"
-#~ msgstr "Povolit prevenci před oříznutím"
-
-#~ msgid "Enable ReplayGain"
-#~ msgstr "Zapnout zesílení pro přehrávání"
-
-#~ msgid "ReplayGain Type"
-#~ msgstr "Typ zesílení pro přehrávání"
-
-#~ msgid "ReplayGain Settings"
-#~ msgstr "Nastavení pro zesílení přehrávání"
-
-#~ msgid "Plugin"
-#~ msgstr "Modul"
-
-#~ msgid "ReplayGain"
-#~ msgstr "Zesílení přehrávání"
-
-#~ msgid "Wavpack Configuration"
-#~ msgstr "Nastavení Wavepacku"
-
-#~ msgid "Entries"
-#~ msgstr "Položky"
-
-#~ msgid "VBR"
-#~ msgstr "VBR"
-
-#~ msgid ""
-#~ "Are you sure you want to close %s? If you do, any changes made since the "
-#~ "playlist was exported will be lost."
-#~ msgstr ""
-#~ "Jste si jisti, že chcete uzavřít %s? Učiníte-li tak, veškeré změny od "
-#~ "posledního exportu seznamu skladeb budou ztraceny."
-
-#~ msgid ""
-#~ "<big>Couldn't initialize the last.fm radio plugin.</big>\n"
-#~ "\n"
-#~ "Check if your Scrobbler's plugin login data is set up properly."
-#~ msgstr ""
-#~ "<big>Nemohu inicializovat modul rádia last.fm.</big>\n"
-#~ "\n"
-#~ "Zkontrolujte, zda přihlašovací údaje v modulu Scrobbler jsou správně "
-#~ "nastavena."
-
-#~ msgid ""
-#~ "There has been an error that may require your attention.\n"
-#~ "\n"
-#~ "Contents of server error:\n"
-#~ "\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Došlo k chybě, která si možná zaslouží vaši pozornost.\n"
-#~ "\n"
-#~ "Obsah chyby ze serveru:\n"
-#~ "\n"
-#~ "%s\n"
-
-#~ msgid "Scrobbler Error"
-#~ msgstr "Chyba Scrobbleru"
-
-#~ msgid "ALSA Gapless Output Plugin Preferences"
-#~ msgstr "Nastavení vázaného výstupního modulu ALSY"
-
-#~ msgid "Dummy Backend "
-#~ msgstr "Prázdný backend "
-
-#~ msgid ""
-#~ "This backend does not produce audio at all. It is mostly useful for "
-#~ "analysis and testing purposes, as it can log all MIDI events to standard "
-#~ "output, standard error or file.\n"
-#~ "Backend written by Giacomo Lozito."
-#~ msgstr ""
-#~ "Tento backend nevytváří vůbec žádný zvuk. Nejvíce je užitečný při analýze "
-#~ "a testování, protože umí zaznamenat všechny MIDI události na standardní "
-#~ "výstup, standardní chybový výstup nebo do souboru.\n"
-#~ "Backend napsal Giacomo Lozito."
-
-#~ msgid "AMIDI-Plug message"
-#~ msgstr "Zpráva AMIDI-Plugu"
-
-#~ msgid "Please stop the player before changing AMIDI-Plug settings."
-#~ msgstr "Prosím, před měněním nastaveni AMIDI-Plugu zastavte přehrávač."
-
-#~ msgid "DUMMY BACKEND CONFIGURATION"
-#~ msgstr "NASTAVENÍ FALEŠNÉHO BACKENDU"
-
-#~ msgid "MIDI logger settings"
-#~ msgstr "Nastavení protokolování MIDI"
-
-#~ msgid "Do not log anything"
-#~ msgstr "Nic neprotokolovat"
-
-#~ msgid "Log MIDI events to standard output"
-#~ msgstr "MIDI události vypisovat na standardní výstup"
-
-#~ msgid "Log MIDI events to standard error"
-#~ msgstr "MIDI události vypisovat na standardní chybový výstup"
-
-#~ msgid "Log MIDI events to file"
-#~ msgstr "MIDI události zapisovat do souboru"
-
-#~ msgid "Logfile settings"
-#~ msgstr "Nastavení souboru s protokolem"
-
-#~ msgid "Use a single file to log everything (rewrite)"
-#~ msgstr "Vše zaznamenávat do jednoho souboru (přepsat)"
-
-#~ msgid "Use a single file to log everything (append)"
-#~ msgstr "Vše zaznamenávat do jednoho souboru (připisovat na konec)"
-
-#~ msgid "Use a different logfile for each MIDI file"
-#~ msgstr ""
-#~ "Každý MIDI soubor zaznamenávat do samostatného protokolového souboru"
-
-#~ msgid "» Log dir:"
-#~ msgstr "» Adresář s protokoly:"
-
-#~ msgid "browse"
-#~ msgstr "procházet:"
-
-#~ msgid "» Log file:"
-#~ msgstr "» Protokolový soubor:"
-
-#~ msgid "Playback speed"
-#~ msgstr "Tempo přehrávání"
-
-#~ msgid "Play at normal speed"
-#~ msgstr "Hrát normální rychlostí"
-
-#~ msgid "Play as fast as possible"
-#~ msgstr "Hrát tak rychle, jak je je možno"
-
-#~ msgid "Dummy Backend not loaded or not available"
-#~ msgstr "Falešný backend není nahrán nebo není dostupný"
-
-#~ msgid ""
-#~ "Dummy\n"
-#~ "backend"
-#~ msgstr ""
-#~ "Falešný\n"
-#~ "backend"
-
-#~ msgid "AudioCompress "
-#~ msgstr "AudioCompress "
-
-#~ msgid ""
-#~ "\n"
-#~ "(c)2003 trikuare studios(http://trikuare.cx)\n"
-#~ "Ported to Audacious by Tony Vroon (chainsaw@gentoo.org)\n"
-#~ "\n"
-#~ "Simple dynamic range compressor for transparently\n"
-#~ "keeping the volume level more or less consistent"
-#~ msgstr ""
-#~ "\n"
-#~ "© 2003 trikuare studios (http://trikuare.cx)\n"
-#~ "Na Audacious převedl Tony Vroon (chainsaw@gentoo.org)\n"
-#~ "\n"
-#~ "Jednoduchý zhušťovač dynamických rozsahů pro snadné\n"
-#~ "udržení hlasitosti na více méně stejné úrovni."
-
-#~ msgid "About AudioCompress"
-#~ msgstr "O AudioCompress"
-
-#~ msgid ""
-#~ "If checked, when the sound peaks the volume will be cut instantly; "
-#~ "otherwise, it will ramp down just in time for the peak (but some minor "
-#~ "clipping may still occur)."
-#~ msgstr ""
-#~ "Je-li zapnuto, všechny vrcholky hlasitosti zvuku budou okamžitě "
-#~ "seříznuty. Jinak bude hlasitost klouzavě snižována jen v místě vrcholu "
-#~ "(drobné přesahy se mohou vyskytnout)."
-
-#~ msgid "The maximum amount to amplify the audio by"
-#~ msgstr "Maximální hodnota kolikrát lze zvuk zesílit"
-
-#~ msgid "Defines how smoothly the volume will ramp up"
-#~ msgstr "Definuje, jak plynule bude hlasitost navyšována"
-
-#~ msgid ""
-#~ "The target audio level for ramping up. Lowering the value gives a bit "
-#~ "more dynamic range for peaks, but will make the overall sound quieter."
-#~ msgstr ""
-#~ "Cílová hladina hlasitosti pro zesílení. Snížením hodnoty získáte "
-#~ "dynamičtější rozsah pro vrcholky, avšak celková zvuk bude tišší."
-
-#~ msgid "How long of a window to maintain"
-#~ msgstr "Jak dlouhé okno udržovat"
-
-#~ msgid " Quality Options "
-#~ msgstr " Nastavení kvality"
-
-#~ msgid " Aggressively prevent clipping"
-#~ msgstr " Agresivní ořezání přesahu"
-
-#~ msgid " Target & gain"
-#~ msgstr " Cíl a zesílení"
-
-#~ msgid "Maximum gain:"
-#~ msgstr "Maximální zesílení:"
-
-#~ msgid "Gain smooth:"
-#~ msgstr "Plynulost zesílení:"
-
-#~ msgid " History "
-#~ msgstr " Historie "
-
-#~ msgid ""
-#~ "How long of a history to maintain. A higher number will make the volume "
-#~ "changes less responsive."
-#~ msgstr ""
-#~ "Jak dlouhou historii udržovat. Vyšší číslo sníží rychlost reakce na změnu "
-#~ "hlasitosti."
-
-#~ msgid "Load default values"
-#~ msgstr "Načíst standardní hodnoty"
-
-#~ msgid "Audio values"
-#~ msgstr "Hodnoty zvuku"
-
-#~ msgid "Buffer settings"
-#~ msgstr "Nastavení vyrovnávací paměti"
-
-#~ msgid "def"
-#~ msgstr "def"
-
-#~ msgid "handy buffer tuner"
-#~ msgstr "šikovný ladič vyrovnávací paměti"
-
-#~ msgid "size"
-#~ msgstr "velikost"
-
-#~ msgid "margin"
-#~ msgstr "okraj"
-
-#~ msgid "increment"
-#~ msgstr "skok"
-
-#~ msgid ""
-#~ "* FluidSynth backend buffer *\n"
-#~ "This button resets the backend buffer parameters to default values."
-#~ msgstr ""
-#~ "* Vyrovnávací paměť FluidSynth backendu *\n"
-#~ "Toto tlačítko restuje hodnoty parametrů vyrovnávací paměti na jejich "
-#~ "výchozí hodnoty."
-
-#~ msgid ""
-#~ "* FluidSynth backend buffer *\n"
-#~ "If you notice skips or slowness during song playback and your system is "
-#~ "not performing any cpu-intensive task (except FluidSynth itself), you may "
-#~ "want to adjust the buffer parameters. Try to move the \"handy buffer tuner"
-#~ "\" some steps to the right until playback is fluid again."
-#~ msgstr ""
-#~ "* Vyrovnávací paměť FluidSynth backendu *\n"
-#~ "Pokud zaznamenáte přeskoky či zpomalení během přehrávání a váš systém "
-#~ "není zaměstnán jinou úlohou odčerpávající výkon procesoru (kromě "
-#~ "samotného FluidSynthu), budete asi chtít pozměnit parametry vyrovnávací "
-#~ "paměti. Zkuste posunout „šikovného ladiče vyrovnávací paměti“ o pár kroků "
-#~ "doprava, dokud se zvuk nestane opět plynulým."
-
-#~ msgid ""
-#~ "* FluidSynth backend buffer *\n"
-#~ "It is a good idea to make buffer adjustments with the \"handy buffer tuner"
-#~ "\" before resorting to manual editing of buffer parameters.\n"
-#~ "However, if you want to fine-tune something and want to know what you're "
-#~ "doing, you can understand how these parameters work by reading the "
-#~ "backend code (b-fluidsynth.c). In short words, every amount of time "
-#~ "(proportional to buffer_SIZE and sample rate), right before gathering "
-#~ "samples, the buffer is resized as follows:\n"
-#~ "buffer_SIZE + buffer_MARGIN + extramargin\n"
-#~ "where extramargin is a value computed as number_of_seconds_of_playback / "
-#~ "margin_INCREMENT ."
-#~ msgstr ""
-#~ "* Vyrovnávací paměť FluidSynth backendu *\n"
-#~ "Je doporučeno nejprve vyzkoušet „šikovného ladiče vyrovnávací paměti“ a "
-#~ "teprve poté použít ruční úpravy parametrů.\n"
-#~ "Pokud však chcete zkusit ruční ladění a chcete-li vědět, co která volba "
-#~ "přesně dělá, měli byste si přečíst zdrojový kód tohoto backendu (b-"
-#~ "fluidsynth.c). Stručně řečeno, po uplynutí určité doby (vztaženo "
-#~ "k buffer_SIZE a vzorkovací frekvenci) přesně před posbíráním vzorků se "
-#~ "velikost vyrovnávací paměti změní následovně:\n"
-#~ "buffer_SIZE + buffer_MARGIN + extramargin\n"
-#~ "kde extramargin je vypočten jako doba_přehrávání_v_sekundách / "
-#~ "margin_INCREMENT ."
-
-#~ msgid "Limit read speed to: "
-#~ msgstr "Omezit rychlost čtení na:"
-
-#~ msgid ""
-#~ "<big>Couldn't open audio.</big>\n"
-#~ "\n"
-#~ "Please check that:\n"
-#~ "1. You have the correct output plugin selected.\n"
-#~ "2. No other programs is blocking the soundcard.\n"
-#~ "3. Your soundcard is configured properly.\n"
-#~ msgstr ""
-#~ "<big>Nelze přehrávat.</big>\n"
-#~ "\n"
-#~ "Zkontrolujte, zda:\n"
-#~ "1. máte vybrán správný výstupní modul,\n"
-#~ "2. žádný jiný program neblokuje zvukovou kartu,\n"
-#~ "3. vaše karta je správně nakonfigurována.\n"
-
-#~ msgid "TiMidity Configuration"
-#~ msgstr "Nastavení TiMidity"
-
-#~ msgid "22000 Hz"
-#~ msgstr "22000 Hz"
-
-#~ msgid "44100 Hz"
-#~ msgstr "44100 Hz"
-
-#~ msgid "Sample Width"
-#~ msgstr "Šířka vzorku"
-
-#~ msgid "TiMidity Configuration File"
-#~ msgstr "Konfigurační souboru Title"
-
-#~ msgid "TiMidity Plugin %s"
-#~ msgstr "Modul TiMidity %s"
-
-#~ msgid ""
-#~ "TiMidity Plugin\n"
-#~ "http://libtimidity.sourceforge.net\n"
-#~ "by Konstantin Korikov"
-#~ msgstr ""
-#~ "Modul TiMidity\n"
-#~ "http://libtimidity.sourceforge.net\n"
-#~ "napsal Konstantin Korikov"
-
-#~ msgid "Couldn't load MIDI file"
-#~ msgstr "Nebylo možné nahrát MIDI soubor"
-
-#~ msgid "Override default devices"
-#~ msgstr "Přebít výchozí zařízení"
-
-#~ msgid "Card:"
-#~ msgstr "Karta:"
-
-#~ msgid "Device:"
-#~ msgstr "Zařízení:"
-
-#~ msgid "Unknown soundcard"
-#~ msgstr "Neznámá zvuková karta"
-
-#~ msgid "Mixer:"
-#~ msgstr "Mixér:"
-
-#~ msgid "Mixer card:"
-#~ msgstr "Karta se směšovačem:"
-
-#~ msgid "Orientation"
-#~ msgstr "Orientace"
-
-#~ msgid "The orientation of the tray"
-#~ msgstr "Orientace traye"
-
-#~ msgid "Can't open file\n"
-#~ msgstr "Soubor nelze otevřít\n"
-
-#~ msgid "Not supported file format\n"
-#~ msgstr "Nepodporovaný formát souboru\n"
-
-#~ msgid "File is corrupted\n"
-#~ msgstr "Soubor je poškozen\n"
-
-#~ msgid "Can't read from file\n"
-#~ msgstr "Nelze číst ze souboru\n"
-
-#~ msgid "Insufficient memory available\n"
-#~ msgstr "Nedostatek paměti\n"
-
-#~ msgid "Output plugin error\n"
-#~ msgstr "Chyba výstupního modulu\n"
-
-#~ msgid "Unknown error\n"
-#~ msgstr "Neznámá chyba\n"
-
-#~ msgid "TTA Decoder Error"
-#~ msgstr "Chyba TTA dekodéru"
-
-#~ msgid "TTA input plugin "
-#~ msgstr "TTA vstupní modul "
-
-#~ msgid ""
-#~ " for BMP\n"
-#~ "Copyright (c) 2004 True Audio Software\n"
-#~ msgstr ""
-#~ " pro BMP\n"
-#~ "Copyright © 2004 True Audio Software\n"
-
-#~ msgid "About True Audio Plugin"
-#~ msgstr "O modulu True Audio"
-
-#~ msgid "/Toggle Decorations"
-#~ msgstr "/Přepnout zobrazení dekorací"
-
-#~ msgid "/-"
-#~ msgstr "/-"
-
-#~ msgid "/Close"
-#~ msgstr "/Zavřít"
-
-#~ msgid "Blur scope"
-#~ msgstr "Blur scope"
-
-#~ msgid "ReplayGain Settings:"
-#~ msgstr "Nastavení pro zesílení přehrávání:"
-
-#~ msgid "ReplayGain Type:"
-#~ msgstr "Typ zesílení pro přehrávání:"
-
-#~ msgid "About Apple Lossless Audio Plugin"
-#~ msgstr "O modulu Apple Lossless Audio (applovký bezztrátový zvukový formát)"
-
-#~ msgid ""
-#~ "Copyright (c) 2006 Audacious team\n"
-#~ "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
-#~ msgstr ""
-#~ "Copyright © 2006 tým Audacious\n"
-#~ "Části © 2005–2006 David Hammerton <crazney -at- crazney.net>"
-
-#~ msgid "About Monkey's Audio Plugin"
-#~ msgstr "O modulu pro Monkey's Audio"
-
-#~ msgid ""
-#~ "Copyright (C) 2007 Eugene Zagidullin <e.asphyx@gmail.com>\n"
-#~ "Based on ffape decoder, Copyright (C) 2007 Benjamin Zores\n"
-#~ "ffape itself based on libdemac by Dave Chapman\n"
-#~ "\n"
-#~ "ffape is a part of FFmpeg project, http://ffmpeg.mplayerhq.hu/"
-#~ msgstr ""
-#~ "Copyright © 2007 Eugene Zagidullin <e.asphyx@gmail.com>\n"
-#~ "Založeno na dekodéru ffape, Copyright © 2007 Benjamin Zores\n"
-#~ "ffape sám vychází z libdemac od Dava Chapmana.\n"
-#~ "\n"
-#~ "ffape je součástí projektu FFmpeg, http://ffmpeg.mplayerhq.hu/"
-
-#~ msgid "ID3 format:"
-#~ msgstr "Formát ID3:"
-
-#~ msgid "ALSA Driver configuration"
-#~ msgstr "Nastavení ovladače ALSA"
-
-#~ msgid "Device settings"
-#~ msgstr "Nastavení zařízení"
-
-#~ msgid "About CD Audio Plugin NG"
-#~ msgstr "O modulu CD Audio NG"
-
-#~ msgid "By Playlist Entry"
-#~ msgstr "Podle položek v seznamu"
-
-#~ msgid "Sorts the list by playlist entry."
-#~ msgstr "Skladby seřadí podle položek seznamu."
-
-#~ msgid "Musepack Decoder Plugin 1.2"
-#~ msgstr "Dekodér musepacku 1.2"
-
-#~ msgid ""
-#~ "Plugin code by\n"
-#~ "Benoit Amiaux\n"
-#~ "Martin Spuler\n"
-#~ "Kuniklo\n"
-#~ "\n"
-#~ "Get latest version at http://musepack.net\n"
-#~ msgstr ""
-#~ "Kód modulu napsali:\n"
-#~ "Benoit Amiaux\n"
-#~ "Martin Spuler\n"
-#~ "Kuniklo\n"
-#~ "\n"
-#~ "Poslední verzi získáte na http://musepack.net/\n"
-
-#~ msgid "Nevermind"
-#~ msgstr "Nevadí"
-
-#~ msgid "Musepack Decoder Configuration"
-#~ msgstr "Nastavení dekodéru musepacku"
-
-#~ msgid "General Settings"
-#~ msgstr "Obecná nastavení"
-
-#~ msgid "Use Track Gain"
-#~ msgstr "Použít zesílení stopy"
-
-#~ msgid "Use Album Gain"
-#~ msgstr "Použít zesílení alba"
-
-#~ msgid "Musepack Tag"
-#~ msgstr "Popis musepacku"
-
-#~ msgid "Musepack Info"
-#~ msgstr "Informace o musepacku"
-
-#~ msgid "Streamversion %d"
-#~ msgstr "Streamversion %d"
-
-#~ msgid "Encoder: %s"
-#~ msgstr "Kodér: %s"
-
-#~ msgid "Profile: %s"
-#~ msgstr "Profil: %s"
-
-#~ msgid "Average bitrate: %6.1f kbps"
-#~ msgstr "Průměrný tok: %6.1f kb/s"
-
-#~ msgid "Samplerate: %d Hz"
-#~ msgstr "Vzorkovací kmitočet: %d Hz"
-
-#~ msgid "Channels: %d"
-#~ msgstr "Kanálů: %d"
-
-#~ msgid "Length: %d:\\%.2d"
-#~ msgstr "Délka: %d:\\%.2d"
-
-#~ msgid "File size: %d Bytes"
-#~ msgstr "Velikost souboru: %d bajtů"
-
-#~ msgid "Track Peak: %5u"
-#~ msgstr "Vrchol stopy: %5u"
-
-#~ msgid "Track Gain: %-+2.2f dB"
-#~ msgstr "Zesílení stopy při přehrávání: %-+2.2f dB"
-
-#~ msgid "Album Peak: %5u"
-#~ msgstr "Vrchol alba: %5u"
-
-#~ msgid "Album Gain: %-+5.2f dB"
-#~ msgstr "Zesílení alba při přehrávání: %-+5.2f dB"
-
-#~ msgid "ID3 Tag:"
-#~ msgstr "ID3 popisek:"
-
-#~ msgid ""
-#~ "Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
-#~ "the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka "
-#~ "McMCC (mcmcc@mail.ru)\n"
-#~ "and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy "
-#~ "<bogorodskiy@inbox.ru>.\n"
-#~ "This plugin based on source code "
-#~ msgstr ""
-#~ "Pro použití v Audacious upravil Tony Vroon (chainsaw@gentoo.org)\n"
-#~ "z BEEP-WMA modulu, na který má práva © 2004, 2005 Mokrushin I. V. alias "
-#~ "McMCC (mcmcc@mail.ru)\n"
-#~ "a BMP-WMA modulu, jehož autorem je © 2004 Roman Bogorodskiy "
-#~ "<bogorodskiy@inbox.ru>.\n"
-#~ "Tento modul je postaven na otevřeném zdrojovém kódu "
-
-#~ msgid " Close "
-#~ msgstr " Zavřít "
-
-#~ msgid "Refresh Rate"
-#~ msgstr "Rychlost překreslování"
-
-#~ msgid "Sample rate mismatch"
-#~ msgstr "Vzorkovací kmitočet nesouhlasí"
-
-#~ msgid ""
-#~ "Xmms is asking for a sample rate that differs from\n"
-#~ " that of the jack server. Xmms 1.2.8 or later\n"
-#~ "contains resampling routines that xmms-jack will\n"
-#~ "dynamically load and use to perform resampling.\n"
-#~ "Or you can restart the jack server\n"
-#~ "with a sample rate that matches the one that\n"
-#~ "xmms desires. -r is the option for the jack\n"
-#~ "alsa driver so -r 44100 or -r 48000 should do\n"
-#~ "\n"
-#~ "Chris Morgan <cmorgan@alum.wpi.edu>\n"
-#~ msgstr ""
-#~ "Xmms požaduje vzorkovací kmitočet, který se liší od\n"
-#~ "kmitočtu jack serveru. Xmms 1.2.8 a novější rutiny\n"
-#~ "pro převzorkování, které xmms-jack automaticky\n"
-#~ "nahraje a použije na převzorkování.\n"
-#~ "Nebo můžete restartovat jack server s takovými\n"
-#~ "kmitočty, které umí XMMS. Jedná se o parametr jack\n"
-#~ "serveru „-r“ (zkuste „-r 44100“ nebo „-r 48000“.\n"
-#~ "\n"
-#~ "Chris Morgan <cmorgan@alum.wpi.edu>\n"
-
-#~ msgid "Full (~50 fps)"
-#~ msgstr "Plná (~50 Hz)"
-
-#~ msgid "Half (~25 fps)"
-#~ msgstr "Poloviční (~25 Hz)"
-
-#~ msgid "Quarter (~13 fps)"
-#~ msgstr "Čtvrtinová (~13 Hz)"
-
-#~ msgid "Eighth (~6 fps)"
-#~ msgstr "Osminová (~6 Hz)"
-
-#~ msgid "Force reopen audio when audio type changed"
-#~ msgstr "Vynutit znovuotevření zvuku, když se typ zvuku změní"
-
-#~ msgid "Miscellaneous Settings"
-#~ msgstr "Ostatní nastavení"
-
-#~ msgid "Display average bitrate for VBR"
-#~ msgstr "U VBR zobrazovat průměrný datový tok"
-
-#~ msgid "Using libfaad2-"
-#~ msgstr "Používám libfaad2-"
-
-#~ msgid "About ALSA Driver"
-#~ msgstr "O ovladači ALSA"
-
-#~ msgid ""
-#~ "Audacious ALSA Driver\n"
-#~ "\n"
-#~ " This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA.\n"
-#~ "Author: Matthieu Sozeau (mattam@altern.org)"
-#~ msgstr ""
-#~ "ALSA ovladač pro Audacious\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit,\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
-#~ "\n"
-#~ "Autor: Matthieu Sozeau (mattam@altern.org)"
-
-#~ msgid "Soundcard:"
-#~ msgstr "Zvuková karta:"
-
-#~ msgid "Buffer time (ms):"
-#~ msgstr "Velikost vyrovnávací paměti (ms):"
-
-#~ msgid "Period time (ms):"
-#~ msgstr "Perioda (ms):"
-
-#~ msgid ""
-#~ "aRts output plugin by Håvard Kvålen <havardk@xmms.org>\n"
-#~ "Audacious port by Giacomo Lozito from develia.org"
-#~ msgstr ""
-#~ "aRts výstupní modul od Håvarda Kvålena <havardk@xmms.org>\n"
-#~ "Převod do Audacious od Giacoma Lozita z develia.org"
-
-#~ msgid "aRts Driver configuration"
-#~ msgstr "Nastavení ovladače aRts"
-
-#~ msgid ""
-#~ "<big>No playable CD found.</big>\n"
-#~ "\n"
-#~ "No CD inserted, or inserted CD is not an audio CD.\n"
-#~ msgstr ""
-#~ "<big>Nebylo nalezeno přehratelné CD.</big>\n"
-#~ "\n"
-#~ "Není vloženo CD, nebo vložené CD není typu Audio CD.\n"
-
-#~ msgid "Print debug information"
-#~ msgstr "Zobrazovat ladící informace"
-
-#~ msgid ""
-#~ "FileWriter-Plugin\n"
-#~ "\n"
-#~ "This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Modul FileWriter\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit,\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
-#~ "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
-
-#~ msgid "auto-M/S mode"
-#~ msgstr "režim auto–M/S"
-
-#~ msgid "Show track numbers in playlist"
-#~ msgstr "Zobrazovat pořadová čísla v seznamu skladeb"
-
-#~ msgid "Audacious Skinned GUI Configuration"
-#~ msgstr "Nastavení GUI Audacious s měnitelným vzhledem"
-
-#~ msgid "Error importing Winamp EQF file '%s'"
-#~ msgstr "Chyba při importování winampového EQF souboru „%s“"
-
-#~ msgid "Enter location to play:"
-#~ msgstr "Zadejte adresu, z které se má hrát:"
-
-#~ msgid "Descriptions of SID-specific Tuplez fields go here. :D"
-#~ msgstr ""
-#~ "Popis pro SID specifických Tuplez položek patří sem. :D"
-
-#~ msgid "Error initializing song-length database!\n"
-#~ msgstr "Chyba při inicializaci databáze délek skladeb!\n"
-
-#~ msgid "Error initializing STIL database!\n"
-#~ msgstr "Chyba při inicializaci databáze STIL!\n"
-
-#~ msgid "Couldn't allocate memory for audio data buffer!\n"
-#~ msgstr "Pro zvukový buffer nelze alokovat paměť!\n"
-
-#~ msgid "Couldn't allocate memory for audio oversampling buffer!\n"
-#~ msgstr "Pro buffer na převzorkování nelze alokovat paměť!\n"
-
-#~ msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"
-#~ msgstr "Nelze inicializovat SID skladbu „%s“ (podskladba č. %i)!\n"
-
-#~ msgid "Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"
-#~ msgstr "Nelze otevřít zvukový výstup XMMS (form=%x, frekv=%i, kanálů=%i)!\n"
-
-#~ msgid "Oversampling rate-conversion pass failed.\n"
-#~ msgstr "Převzorkování kmitočtu se nezdařilo.\n"
-
-#~ msgid "Allocation of sid2FilterPresets structure failed!\n"
-#~ msgstr "Alokace struktury sid2FilterPresets selhala!\n"
-
-#~ msgid "Warning: Could not set filter curve widget points!\n"
-#~ msgstr "Varování: Nelze nastavit widgetové body křivky filtru!\n"
-
-#~ msgid "Error allocating new node. Fatal error.\n"
-#~ msgstr "Chyba při alokaci nového uzlu. Fatální chyba.\n"
-
-#~ msgid "'=' expected on column #%d.\n"
-#~ msgstr "Očekáváno „=“ na sloupci č. %d\n"
-
-#~ msgid "Could not allocate memory for node.\n"
-#~ msgstr "Pro uzel nelze alokovat paměť.\n"
-
-#~ msgid "Could not open SongLengthDB '%s'\n"
-#~ msgstr "SongLengthDB „%s“ nelze otevřít.\n"
-
-#~ msgid "Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n"
-#~ msgstr "Chybný MD5 hash v SongLengthDB souboru „%s“ na řádku %d!\n"
-
-#~ msgid "Invalid entry in SongLengthDB file '%s' line #%d!\n"
-#~ msgstr "Chybný záznam v SongLengthDB souboru „%s“ na řádku %d!\n"
-
-#~ msgid "Invalid line in SongLengthDB file '%s' line #%d\n"
-#~ msgstr "Chybný řádek v SongLengthDB souboru „%s“ na řádku %d\n"
-
-#~ msgid "Not a PSID or RSID file '%s'\n"
-#~ msgstr "„%s“ není PSID nebo RSID souborem\n"
-
-#~ msgid "Error reading SID file header from '%s'\n"
-#~ msgstr "Chyba při čtení hlavičky SID souboru „%s\n"
-
-#~ msgid "Error allocating temp data buffer for file '%s'\n"
-#~ msgstr "Chyba při alokování dočasného datového bufferu pro souboru „%s“\n"
-
-#~ msgid "[SIDPlay1] Could not initialize emulation engine.\n"
-#~ msgstr "[SIDPlay1] Emulační jádro nelze inicializovat.\n"
-
-#~ msgid "[SIDPlay1] Endianess verification failed.\n"
-#~ msgstr "[SIDPlay1] Kontrola pořadí bajtů selhala.\n"
-
-#~ msgid "[SIDPlay1] Emulator engine configuration failed!\n"
-#~ msgstr "[SIDPlay1] Konfigurace emulačního jádra selhala!\n"
-
-#~ msgid "[SIDPlay1] Could not initialize SIDTune object.\n"
-#~ msgstr "[SIDPlay1] SIDTune objekt nelze inicializovat.\n"
-
-#~ msgid ""
-#~ "[SIDPlay1] SID-tune struct pointer was NULL. This should not happen, "
-#~ "report to XMMS-SID author.\n"
-#~ msgstr ""
-#~ "[SIDPlay1] Ukazatel na strukturu skladby SID byl NULL. Toto by se stát "
-#~ "nemělo. Podejte hlášení autorovi XMMS-SID modulu.\n"
-
-#~ msgid ""
-#~ "[SIDPlay1] SID-tune status check failed. This should not happen, report "
-#~ "to XMMS-SID author.\n"
-#~ msgstr ""
-#~ "[SIDPlay1] Kontrola stavu SID skladby selhala. Toto by se stát nemělo. "
-#~ "Podejte hlášení autorovi XMMS-SID modulu.\n"
-
-#~ msgid "[SIDPlay2] Could not initialize emulation engine.\n"
-#~ msgstr "[SIDPlay2] Emulační jádro nelze inicializovat.\n"
-
-#~ msgid "[SIDPlay2] Invalid number of filter curve points (%d > %d)\n"
-#~ msgstr "[SIDPlay2] Chybný počet bodů křivky filtru (%d > %d)\n"
-
-#~ msgid "reSID->create() failed.\n"
-#~ msgstr "selhalo reSID->create().\n"
-
-#~ msgid "reSID->filter(%d) failed.\n"
-#~ msgstr "selhalo reSID->filter(%d).\n"
-
-#~ msgid "reSID->sampling(%d) failed.\n"
-#~ msgstr "selhalo reSID->sampling(%d).\n"
-
-#~ msgid "reSID->filter(NULL) failed.\n"
-#~ msgstr "selhalo reSID->filter(NULL).\n"
-
-#~ msgid "hardSID->create() failed.\n"
-#~ msgstr "selhalo hardSID->create().\n"
-
-#~ msgid "hardSID->filter(%d) failed.\n"
-#~ msgstr "selhalo hardSID->filter(%d).\n"
-
-#~ msgid "[SIDPlay2] Could not initialize SIDBuilder object.\n"
-#~ msgstr "[SIDPlay2] Objekt SIDBuilder nelze inicializovat.\n"
-
-#~ msgid "[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n"
-#~ msgstr "[SIDPlay2] Chybný clockSpeed=%d, vracím se k PALU.\n"
-
-#~ msgid "Invalid sid2OptLevel=%d, falling back to %d.\n"
-#~ msgstr "Chybný sid2OptLevel=%d, vracím se k %d.\n"
-
-#~ msgid "[SIDPlay2] Emulator engine configuration failed!\n"
-#~ msgstr "[SIDPlay2] Konfigurace emulačního jádra selhala!\n"
-
-#~ msgid "[SIDPlay2] Could not initialize SIDTune object.\n"
-#~ msgstr "[SIDPlay2] SIDTune objekt nelze inicializovat.\n"
-
-#~ msgid "[SIDPlay2] currTune->selectSong() failed\n"
-#~ msgstr "[SIDPlay2] selhalo currTune->selectSong()\n"
-
-#~ msgid "[SIDPlay2] currEng->load() failed\n"
-#~ msgstr "[SIDPlay2] selhalo currEng->load()\n"
-
-#~ msgid "Could not allocate memory for t_xs_tuneinfo ('%s')\n"
-#~ msgstr "Paměť pro t_xs_tuneinfo („%s“) nelze alokovat\n"
-
-#~ msgid "Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"
-#~ msgstr "Paměť pro t_xs_subtuneinfo („%s“, %i) nelze alokovat\n"
-
-#~ msgid "SubTune pointer structure realloc failed.\n"
-#~ msgstr "Přemístění ukazatele na strukturu SubTune selhalo.\n"
-
-#~ msgid "SubTune structure malloc failed!\n"
-#~ msgstr "malloc() na struktuře SubTune selhal!\n"
-
-#~ msgid "Could not open STILDB '%s'\n"
-#~ msgstr "STILDB „%s“ nelze otevřít\n"
-
-#~ msgid "Dither output when rounding to 16-bit"
-#~ msgstr "Ditherovat výstup při zaokrouhlování na 16 bitů"
-
-#~ msgid "Base gain (dB):"
-#~ msgstr "Základní zesílení (dB):"
-
-#~ msgid "Enable ReplayGain processing"
-#~ msgstr "Zapnout zesílení pro přehrávání"
-
-#~ msgid "Enable peak info clip prevention"
-#~ msgstr "Povolit info prevence před oříznutím"
-
-#~ msgid "Enable adaptive scaler clip prevention"
-#~ msgstr "Povolit prevenci před oříznutím přizpůsobivým měničem rozsahu"
-
-#~ msgid "Enable 6dB Boost + Hard Limiting"
-#~ msgstr "Povolit 6dB zesílení + tvrdé omezení"
-
-#~ msgid "Playback:"
-#~ msgstr "Přehrávání:"
-
-#~ msgid "Configure keys which controls Audacious playback."
-#~ msgstr "Konfiguruje klávesy, které ovládají přehrávání v Audacious."
-
-#~ msgid "Volume Control:"
-#~ msgstr "Ovládání hlasitosti:"
-
-#~ msgid "Configure keys which controls music volume."
-#~ msgstr "Konfiguruje klávesy, které ovládají hlasitost hudby."
-
-#~ msgid "Configure keys which control the player."
-#~ msgstr "Konfiguruje klávesy, které ovládají přehrávač."
-
-#~ msgid "Track mode"
-#~ msgstr "Režim stopy"
-
-#~ msgid "6dB hard limiting"
-#~ msgstr "Povolit 6dB tvrdé omezení"
-
-#~ msgid "Preamp (dB):"
-#~ msgstr "Předzesílení (dB):"
-
-#~ msgid "About sndfile WAV support"
-#~ msgstr "O podpoře sndfile WAV"
-
-#~ msgid "Play/Pause:"
-#~ msgstr "Hrát/Pozastavit"
-
-#~ msgid "Couldn't open file!"
-#~ msgstr "Soubor nebylo možné otevřít!"
-
-#~ msgid "Couldn't write tag!"
-#~ msgstr "Informace nelze zapsat!"
-
-#~ msgid "Name:"
-#~ msgstr "Jméno:"
-
-#~ msgid " MPEG Info "
-#~ msgstr " MPEG informace "
-
-#~ msgid " ID3 Tag "
-#~ msgstr " ID3 popis "
-
-#~ msgid "Unknown"
-#~ msgstr "Není známo"
-
-#~ msgid "Layer %s"
-#~ msgstr "Vrstva %s"
-
-#~ msgid "VBR (avg. %d kbps)"
-#~ msgstr "VBR (prům. %d kb/s)"
-
-#~ msgid "%d Hz"
-#~ msgstr "%d Hz"
-
-#~ msgid "%d frames"
-#~ msgstr "%d rámců"
-
-#~ msgid "%d:%02d (%d seconds)"
-#~ msgstr "%d:%02d (%d sekund)"
-
-#~ msgid "RG_album=%4s (x%4.2f)"
-#~ msgstr "RG_album=%4s (x%4.2f)"
-
-#~ msgid "RG_track=%4s (x%4.2f)"
-#~ msgstr "RG_stopa=%4s (x%4.2f)"
-
-#~ msgid "Peak album=%4s (%+5.3fdBFS)"
-#~ msgstr "Vrchol alba=%4s (%+5.3f dBFS)"
-
-#~ msgid "Peak track=%4s (%+5.3fdBFS)"
-#~ msgstr "Vrchol stopy=%4s (%+5.3f dBFS)"
-
-#~ msgid "mp3gain undo=%4s (%+5.3fdB)"
-#~ msgstr "historie zesílení MP3=%4s (%+5.3f dB)"
-
-#~ msgid "mp3gain minmax=%4s (max-min=%+6.3fdB)"
-#~ msgstr "minmax zesílení MP3%4s (max-min=%+6.3f dB)"
-
-#~ msgid "Classic Rock"
-#~ msgstr "Klasický rock"
-
-#~ msgid "Country"
-#~ msgstr "Country"
-
-#~ msgid "Dance"
-#~ msgstr "Taneční"
-
-#~ msgid "Disco"
-#~ msgstr "Disko"
-
-#~ msgid "Funk"
-#~ msgstr "Funk"
-
-#~ msgid "Grunge"
-#~ msgstr "Grunge"
-
-#~ msgid "Hip-Hop"
-#~ msgstr "Hip-hop"
-
-#~ msgid "Jazz"
-#~ msgstr "Jazz"
-
-#~ msgid "Metal"
-#~ msgstr "Metal"
-
-#~ msgid "Oldies"
-#~ msgstr "Oldies"
-
-#~ msgid "Other"
-#~ msgstr "Jiný"
-
-#~ msgid "Pop"
-#~ msgstr "Pop"
-
-#~ msgid "R&B"
-#~ msgstr "R&B"
-
-#~ msgid "Rap"
-#~ msgstr "Rap"
-
-#~ msgid "Reggae"
-#~ msgstr "Reggae"
-
-#~ msgid "Rock"
-#~ msgstr "Rock"
-
-#~ msgid "Techno"
-#~ msgstr "Techno"
-
-#~ msgid "Industrial"
-#~ msgstr "Industrial"
-
-#~ msgid "Alternative"
-#~ msgstr "Alternativní hudba"
-
-#~ msgid "Ska"
-#~ msgstr "Ska"
-
-#~ msgid "Death Metal"
-#~ msgstr "Death Metal"
-
-#~ msgid "Soundtrack"
-#~ msgstr "Soundtrack"
-
-#~ msgid "Euro-Techno"
-#~ msgstr "Euro-Techno"
-
-#~ msgid "Ambient"
-#~ msgstr "Ambient"
-
-#~ msgid "Trip-Hop"
-#~ msgstr "Trip-Hop"
-
-#~ msgid "Vocal"
-#~ msgstr "Vokální"
-
-#~ msgid "Jazz+Funk"
-#~ msgstr "Jazz+Funk"
-
-#~ msgid "Fusion"
-#~ msgstr "Fúze"
-
-#~ msgid "Trance"
-#~ msgstr "Trance"
-
-#~ msgid "Instrumental"
-#~ msgstr "Instrumentální"
-
-#~ msgid "Acid"
-#~ msgstr "Acid"
-
-#~ msgid "House"
-#~ msgstr "House"
-
-#~ msgid "Game"
-#~ msgstr "Hra"
-
-#~ msgid "Sound Clip"
-#~ msgstr "Zvukový klip"
-
-#~ msgid "Gospel"
-#~ msgstr "Gospel"
-
-#~ msgid "Noise"
-#~ msgstr "Šum"
-
-#~ msgid "AlternRock"
-#~ msgstr "Alternativní rock"
-
-#~ msgid "Soul"
-#~ msgstr "Soul"
-
-#~ msgid "Punk"
-#~ msgstr "Punk"
-
-#~ msgid "Space"
-#~ msgstr "Space"
-
-#~ msgid "Meditative"
-#~ msgstr "Meditativní"
-
-#~ msgid "Instrumental Pop"
-#~ msgstr "Instrumentální pop"
-
-#~ msgid "Instrumental Rock"
-#~ msgstr "Instrumentální Rock"
-
-#~ msgid "Ethnic"
-#~ msgstr "Etnická hudba"
-
-#~ msgid "Gothic"
-#~ msgstr "Gotická hudba"
-
-#~ msgid "Darkwave"
-#~ msgstr "Darkwave"
-
-#~ msgid "Techno-Industrial"
-#~ msgstr "Techno-Industrial"
-
-#~ msgid "Electronic"
-#~ msgstr "Elektronická"
-
-#~ msgid "Pop-Folk"
-#~ msgstr "Pop-Folk"
-
-#~ msgid "Eurodance"
-#~ msgstr "Eurodance"
-
-#~ msgid "Dream"
-#~ msgstr "Dream"
-
-#~ msgid "Southern Rock"
-#~ msgstr "Jižanský rock"
-
-#~ msgid "Gangsta Rap"
-#~ msgstr "Gangsta Rap"
-
-#~ msgid "Top 40"
-#~ msgstr "Top 40"
-
-#~ msgid "Christian Rap"
-#~ msgstr "Křesťanský rap"
-
-#~ msgid "Pop/Funk"
-#~ msgstr "Pop/Funk"
-
-#~ msgid "Jungle"
-#~ msgstr "Jungle"
-
-#~ msgid "Native American"
-#~ msgstr "Indiánská hudba"
-
-#~ msgid "Cabaret"
-#~ msgstr "Kabaret"
-
-#~ msgid "New Wave"
-#~ msgstr "Nová vlna"
-
-#~ msgid "Psychedelic"
-#~ msgstr "Psychedelická"
-
-#~ msgid "Rave"
-#~ msgstr "Rave"
-
-#~ msgid "Trailer"
-#~ msgstr "Trailer"
-
-#~ msgid "Lo-Fi"
-#~ msgstr "Lo-Fi"
-
-#~ msgid "Tribal"
-#~ msgstr "Tribal"
-
-#~ msgid "Acid Punk"
-#~ msgstr "Acid punk"
-
-#~ msgid "Acid Jazz"
-#~ msgstr "Acid jazz"
-
-#~ msgid "Polka"
-#~ msgstr "Polka"
-
-#~ msgid "Musical"
-#~ msgstr "Muzikál"
-
-#~ msgid "Rock & Roll"
-#~ msgstr "Rock 'n' roll"
-
-#~ msgid "Hard Rock"
-#~ msgstr "Hard rock"
-
-#~ msgid "Folk"
-#~ msgstr "Folk"
-
-#~ msgid "Folk/Rock"
-#~ msgstr "Folk/Rock"
-
-#~ msgid "National Folk"
-#~ msgstr "Národní lidová"
-
-#~ msgid "Fast-Fusion"
-#~ msgstr "Fast-Fusion"
-
-#~ msgid "Bebob"
-#~ msgstr "Bebob"
-
-#~ msgid "Latin"
-#~ msgstr "Latinská"
-
-#~ msgid "Revival"
-#~ msgstr "Revival"
-
-#~ msgid "Celtic"
-#~ msgstr "Keltská hudba"
-
-#~ msgid "Bluegrass"
-#~ msgstr "Bluegrass"
-
-#~ msgid "Avantgarde"
-#~ msgstr "Avantgardní"
-
-#~ msgid "Gothic Rock"
-#~ msgstr "Gotický rock"
-
-#~ msgid "Progressive Rock"
-#~ msgstr "Progresivní rock"
-
-#~ msgid "Psychedelic Rock"
-#~ msgstr "Psychedelický rock"
-
-#~ msgid "Symphonic Rock"
-#~ msgstr "Symfonický rock"
-
-#~ msgid "Slow Rock"
-#~ msgstr "Ploužák"
-
-#~ msgid "Big Band"
-#~ msgstr "Big Band"
-
-#~ msgid "Chorus"
-#~ msgstr "Chór"
-
-#~ msgid "Easy Listening"
-#~ msgstr "Příjemné poslouchání"
-
-#~ msgid "Acoustic"
-#~ msgstr "Akustická"
-
-#~ msgid "Humour"
-#~ msgstr "Humor"
-
-#~ msgid "Speech"
-#~ msgstr "Mluvené"
-
-#~ msgid "Chanson"
-#~ msgstr "Šanson"
-
-#~ msgid "Opera"
-#~ msgstr "Opera"
-
-#~ msgid "Chamber Music"
-#~ msgstr "Komorní hudba"
-
-#~ msgid "Sonata"
-#~ msgstr "Sonáta"
-
-#~ msgid "Symphony"
-#~ msgstr "Symfonie"
-
-#~ msgid "Booty Bass"
-#~ msgstr "Booty Bass"
-
-#~ msgid "Primus"
-#~ msgstr "Primus"
-
-#~ msgid "Porn Groove"
-#~ msgstr "Porn Groove"
-
-#~ msgid "Satire"
-#~ msgstr "Satira"
-
-#~ msgid "Slow Jam"
-#~ msgstr "Slow Jam"
-
-#~ msgid "Club"
-#~ msgstr "Klub"
-
-#~ msgid "Tango"
-#~ msgstr "Tango"
-
-#~ msgid "Samba"
-#~ msgstr "Samba"
-
-#~ msgid "Folklore"
-#~ msgstr "Folklór"
-
-#~ msgid "Ballad"
-#~ msgstr "Balada"
-
-#~ msgid "Power Ballad"
-#~ msgstr "Rocková balada"
-
-#~ msgid "Rhythmic Soul"
-#~ msgstr "Rytmický soul"
-
-#~ msgid "Freestyle"
-#~ msgstr "Freestyle"
-
-#~ msgid "Duet"
-#~ msgstr "Duet"
-
-#~ msgid "Punk Rock"
-#~ msgstr "Punk rock"
-
-#~ msgid "Drum Solo"
-#~ msgstr "Drum Solo"
-
-#~ msgid "A Cappella"
-#~ msgstr "A Cappella"
-
-#~ msgid "Euro-House"
-#~ msgstr "Euro-House"
-
-#~ msgid "Dance Hall"
-#~ msgstr "Dance Hall"
-
-#~ msgid "Goa"
-#~ msgstr "Goa"
-
-#~ msgid "Drum & Bass"
-#~ msgstr "Drum & Bass"
-
-#~ msgid "Club-House"
-#~ msgstr "Club-House"
-
-#~ msgid "Hardcore"
-#~ msgstr "Hardcore"
-
-#~ msgid "Terror"
-#~ msgstr "Terror"
-
-#~ msgid "Indie"
-#~ msgstr "Indie"
-
-#~ msgid "BritPop"
-#~ msgstr "Britpop"
-
-#~ msgid "Negerpunk"
-#~ msgstr "Negerpunk"
-
-#~ msgid "Polsk Punk"
-#~ msgstr "Polsk Punk"
-
-#~ msgid "Beat"
-#~ msgstr "Beat"
-
-#~ msgid "Christian Gangsta Rap"
-#~ msgstr "Křesťanský Gangsta Rap"
-
-#~ msgid "Heavy Metal"
-#~ msgstr "Heavy metal"
-
-#~ msgid "Black Metal"
-#~ msgstr "Black metal"
-
-#~ msgid "Contemporary Christian"
-#~ msgstr "Moderní křesťanská"
-
-#~ msgid "Christian Rock"
-#~ msgstr "Křesťanský rock"
-
-#~ msgid "Merengue"
-#~ msgstr "Merengue"
-
-#~ msgid "Salsa"
-#~ msgstr "Salsa"
-
-#~ msgid "Thrash Metal"
-#~ msgstr "Thrash metal"
-
-#~ msgid "Anime"
-#~ msgstr "Anime"
-
-#~ msgid "JPop"
-#~ msgstr "JPop"
-
-#~ msgid "Synthpop"
-#~ msgstr "Synthpop"
-
-#~ msgid ""
-#~ "An error occured:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nastala chyba:\n"
-#~ "%s"
-
-#~ msgid "Error!"
-#~ msgstr "Chyba!"
-
-#~ msgid "Failed to modify tag (open)"
-#~ msgstr "Změna popisku se nezdařila (otevření)"
-
-#~ msgid "Failed to modify tag (close)"
-#~ msgstr "Změna popisku se nezdařila (zavření)"
-
-#~ msgid "Failed to modify tag"
-#~ msgstr "Nepodařilo se upravit informace"
-
-#~ msgid " Ogg Vorbis Tag "
-#~ msgstr "Popis Ogg Vorbis souboru"
-
-#~ msgid "Date:"
-#~ msgstr "Datum:"
-
-#~ msgid "Version:"
-#~ msgstr "Verze:"
-
-#~ msgid "ISRC number:"
-#~ msgstr "Číslo ISRC:"
-
-#~ msgid "Organization:"
-#~ msgstr "Organizace:"
-
-#~ msgid " Ogg Vorbis ReplayGain "
-#~ msgstr " Zesílení Ogg Vorbis "
-
-#~ msgid "Track gain:"
-#~ msgstr "Zesílení skladby:"
-
-#~ msgid "Track peak:"
-#~ msgstr "Vrchol skladby:"
-
-#~ msgid "Album gain:"
-#~ msgstr "Zesílení alba:"
-
-#~ msgid "Album peak:"
-#~ msgstr "Vrchol alba:"
-
-#~ msgid " Ogg Vorbis Info "
-#~ msgstr " Ogg Vorbis Info "
-
-#~ msgid "File size:"
-#~ msgstr "Velikost souboru:"
-
-#~ msgid "N/A"
-#~ msgstr "není známo"
-
-#~ msgid "%d KBit/s (nominal)"
-#~ msgstr "%d kb/s (jmenovitý tok)"
-
-#~ msgid "%d"
-#~ msgstr "%d"
-
-#~ msgid "%d:%.2d"
-#~ msgstr "%d:%.2d"
-
-#~ msgid "%d Bytes"
-#~ msgstr "%d bajtů"
-
-#~ msgid "Drive %d"
-#~ msgstr "Mechanika %d"
-
-#~ msgid ""
-#~ "Failed to open device %s\n"
-#~ "Error: %s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Nepodařilo se otevřít %s\n"
-#~ "Chyba: %s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Failed to read \"Table of Contents\"\n"
-#~ "Maybe no disc in the drive?\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Nepodařilo se načíst obsah disku.\n"
-#~ "Je disk opravdu v mechanice?\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Device %s OK.\n"
-#~ "Disc has %d tracks"
-#~ msgstr ""
-#~ "Zařízení %s je v pořádku.\n"
-#~ "Disk obsahuje %d stop."
-
-#~ msgid " (%d data tracks)"
-#~ msgstr "(%d datových stop)"
-
-#~ msgid ""
-#~ "Digital audio extraction not tested as the disc has no audio tracks\n"
-#~ msgstr "Čtení zvuku netestováno - tento disk neobsahuje zvukové stopy.\n"
-
-#~ msgid ""
-#~ "Digital audio extraction test: OK\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Test čtení zvuku: v pořádku.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Digital audio extraction test failed: %s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Test čtení zvuku selhal: %s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Failed to check directory %s\n"
-#~ "Error: %s"
-#~ msgstr ""
-#~ "Nepodařilo se načíst adresář %s.\n"
-#~ "Chyba: %s"
-
-#~ msgid "Error: %s exist, but is not a directory"
-#~ msgstr "Chyba: %s existuje, ale není adresářem."
-
-#~ msgid "Directory %s OK."
-#~ msgstr "Adresář %s je v pořádku."
-
-#~ msgid "_Device:"
-#~ msgstr "_Zařízení:"
-
-#~ msgid "Dir_ectory:"
-#~ msgstr "_Adresář:"
-
-#~ msgid "Analog"
-#~ msgstr "Analogově"
-
-#~ msgid "No mixer"
-#~ msgstr "Nepoužívat žádný mixér"
-
-#~ msgid "CDROM drive"
-#~ msgstr "CDROM mechanika"
-
-#~ msgid "OSS mixer"
-#~ msgstr "OSS mixér"
-
-#~ msgid "Check drive..."
-#~ msgstr "Zkontrolovat mechaniku..."
-
-#~ msgid "Remove drive"
-#~ msgstr "Odstranit mechaniku"
-
-#~ msgid "CD Audio Player Configuration"
-#~ msgstr "Nastavení přehrávače CD Audio"
-
-#~ msgid "Add drive"
-#~ msgstr "Přidat mechaniku"
-
-#~ msgid "Device"
-#~ msgstr "Zařízení"
-
-#~ msgid "CDDB:"
-#~ msgstr "CDDB:"
-
-#~ msgid "Use CDDB"
-#~ msgstr "Používat CDDB"
-
-#~ msgid "Get server list"
-#~ msgstr "Získat seznam serverů"
-
-#~ msgid "Show network window"
-#~ msgstr "Výpis síťového provozu"
-
-#~ msgid "CDDB server:"
-#~ msgstr "CDDB server:"
-
-#~ msgid "Name format:"
-#~ msgstr "Formát názvu:"
-
-#~ msgid "CD Audio Plugin"
-#~ msgstr "CD Audio modul"
-
-#~ msgid "CD Audio Track %02u"
-#~ msgstr "CD audio stopa %02u"
-
-#~ msgid "Game console audio module decoder"
-#~ msgstr "Dekodér zvukových modulů pro herní konzole"
-
-#~ msgid "NSF/NSFE"
-#~ msgstr "NSF/NSFE"
-
-#~ msgid "Use optional NSFE playlist"
-#~ msgstr "Použít volitelný NSFE seznam skladeb"
-
-#~ msgid "Disk Writer Plugin %s"
-#~ msgstr "Modul Disk writer %s"
-
-#~ msgid ""
-#~ "You cannot use the Disk Writer plugin\n"
-#~ "when you're running in realtime mode."
-#~ msgstr ""
-#~ "Disk writer nelze použít, pokud\n"
-#~ "jste v režimu reálného času."
-
-#~ msgid "eSound Output Plugin"
-#~ msgstr "Výstupní modul eSound"
-
-#~ msgid "Extra Stereo Plugin %s"
-#~ msgstr "Modul Extra stereo %s"
-
-#~ msgid "BSD Sun Driver %s"
-#~ msgstr "BSD ovladač pro Sun %s"
-
-#~ msgid "TiMidity Player %s"
-#~ msgstr "Přehrávač TiMidity %s"
-
-#~ msgid "Tone Generator %s"
-#~ msgstr "Generátor tónů %s"
-
-#~ msgid "Ogg Vorbis Audio Plugin"
-#~ msgstr "Modul Ogg Vorbis Audio"
-
-#~ msgid "WAV Audio Plugin"
-#~ msgstr "Modul WAV Audio"
-
-#~ msgid "ALSA %s output plugin"
-#~ msgstr "Výstupní modul ALSA %s"
-
-#~ msgid "Use software volume control"
-#~ msgstr "Hlasitost ovládat softwarově"
-
-#~ msgid "AMIDI-Plug %s (MIDI Player)"
-#~ msgstr "AMIDI-Plug %s (Přehrávač MIDI)"
-
-#~ msgid "AMIDI-Plug - warning"
-#~ msgstr "AMIDI-Plug – varování"
-
-#~ msgid ""
-#~ "No sequencer backend has been selected!\n"
-#~ "Please configure AMIDI-Plug before playing."
-#~ msgstr ""
-#~ "Nebyl vybrán žádný sekvencerový backend!\n"
-#~ "Prosím, nejdříve nastavte AMIDI-Plug."
-
-#~ msgid ""
-#~ "\n"
-#~ "EvDev-Plug "
-#~ msgstr ""
-#~ "\n"
-#~ "EvDev-Plug "
-
-#~ msgid "Arabic (IBM-864)"
-#~ msgstr "arabštiny (IBM-864)"
-
-#~ msgid "Arabic (ISO-8859-6)"
-#~ msgstr "arabštiny (ISO-8859-6)"
-
-#~ msgid "Arabic (Windows-1256)"
-#~ msgstr "arabštiny (Windows-1256)"
-
-#~ msgid "Baltic (ISO-8859-13)"
-#~ msgstr "pobaltských jazyků (ISO-8859-13)"
-
-#~ msgid "Baltic (ISO-8859-4)"
-#~ msgstr "pobaltských jazyků (ISO-8859-4)"
-
-#~ msgid "Baltic (Windows-1257)"
-#~ msgstr "pobaltských jazyků (Windows-1257)"
-
-#~ msgid "Celtic (ISO-8859-14)"
-#~ msgstr "keltských jazyků (ISO-8859-14)"
-
-#~ msgid "Central European (IBM-852)"
-#~ msgstr "středoevropských jazyků (IBM-852)"
-
-#~ msgid "Central European (ISO-8859-2)"
-#~ msgstr "pobaltských jazyků (ISO-8859-2)"
-
-#~ msgid "Central European (Windows-1250)"
-#~ msgstr "pobaltských jazyků (Windows-1250)"
-
-#~ msgid "Chinese Simplified (GB18030)"
-#~ msgstr "zjednodušené čínštiny (GB18030)"
-
-#~ msgid "Chinese Simplified (GB2312)"
-#~ msgstr "zjednodušené čínštiny (GB2312)"
-
-#~ msgid "Chinese Traditional (Big5)"
-#~ msgstr "tradiční čínštiny (Big5)"
-
-#~ msgid "Chinese Traditional (Big5-HKSCS)"
-#~ msgstr "tradiční čínštiny (Big5-HKSCS)"
-
-#~ msgid "Cyrillic (IBM-855)"
-#~ msgstr "cyrilice (IBM-855)"
-
-#~ msgid "Cyrillic (ISO-8859-5)"
-#~ msgstr "cyrilice (ISO-8859-2)"
-
-#~ msgid "Cyrillic (ISO-IR-111)"
-#~ msgstr "cyrilice (ISO-IR-111)"
-
-#~ msgid "Cyrillic (KOI8-R)"
-#~ msgstr "cyrilice (KOI8-R)"
-
-#~ msgid "Cyrillic (Windows-1251)"
-#~ msgstr "cyrilice (Windows-1251)"
-
-#~ msgid "Cyrillic/Russian (CP-866)"
-#~ msgstr "ruské cyrilice (CP-866)"
-
-#~ msgid "Cyrillic/Ukrainian (KOI8-U)"
-#~ msgstr "ukrajinské cyrilice (KOI8-U)"
-
-#~ msgid "English (US-ASCII)"
-#~ msgstr "angličtiny (US-ASCII)"
-
-#~ msgid "Greek (ISO-8859-7)"
-#~ msgstr "řečtiny (ISO-8859-7)"
-
-#~ msgid "Greek (Windows-1253)"
-#~ msgstr "řečtiny (Windows-1253)"
-
-#~ msgid "Hebrew (IBM-862)"
-#~ msgstr "hebrejštiny (IBM-862)"
-
-#~ msgid "Hebrew (Windows-1255)"
-#~ msgstr "hebrejštiny (Windows-1255)"
-
-#~ msgid "Japanese (EUC-JP)"
-#~ msgstr "japonštiny (EUC-JP)"
-
-#~ msgid "Japanese (ISO-2022-JP)"
-#~ msgstr "japonštiny (ISO-2022-JP)"
-
-#~ msgid "Japanese (Shift_JIS)"
-#~ msgstr "japonštiny (Shif_JIS)"
-
-#~ msgid "Korean (EUC-KR)"
-#~ msgstr "korejštiny (EUC-KR)"
-
-#~ msgid "Nordic (ISO-8859-10)"
-#~ msgstr "severských jazyků (ISO-8859-10)"
-
-#~ msgid "South European (ISO-8859-3)"
-#~ msgstr "jihoevropských jazyků (ISO-8859-3)"
-
-#~ msgid "Thai (TIS-620)"
-#~ msgstr "thajštiny (TIS-620)"
-
-#~ msgid "Turkish (IBM-857)"
-#~ msgstr "turečtiny (IBM-857)"
-
-#~ msgid "Turkish (ISO-8859-9)"
-#~ msgstr "turečtiny (ISO-8859-9)"
-
-#~ msgid "Turkish (Windows-1254)"
-#~ msgstr "turečtiny (Windows-1254)"
-
-#~ msgid "Unicode (UTF-7)"
-#~ msgstr "unicode (UTF-7)"
-
-#~ msgid "Unicode (UTF-8)"
-#~ msgstr "unicode (UTF-8)"
-
-#~ msgid "Unicode (UTF-16BE)"
-#~ msgstr "unicode (UTF-16BE)"
-
-#~ msgid "Unicode (UTF-16LE)"
-#~ msgstr "unicode (UTF-16LE)"
-
-#~ msgid "Unicode (UTF-32BE)"
-#~ msgstr "unicode (UTF-32BE)"
-
-#~ msgid "Unicode (UTF-32LE)"
-#~ msgstr "unicode (UTF-32LE)"
-
-#~ msgid "Vietnamese (VISCII)"
-#~ msgstr "vietnamštiny (VISCII)"
-
-#~ msgid "Vietnamese (Windows-1258)"
-#~ msgstr "vietnamštiny (Windows-1258)"
-
-#~ msgid "Visual Hebrew (ISO-8859-8)"
-#~ msgstr "vizuální hebrejštiny (ISO-8859-8)"
-
-#~ msgid "Western (IBM-850)"
-#~ msgstr "západních jazyků (IBM-850)"
-
-#~ msgid "Western (ISO-8859-1)"
-#~ msgstr "západních jazyků (ISO-8859-1)"
-
-#~ msgid "Western (ISO-8859-15)"
-#~ msgstr "západních jazyků (ISO-8859-15)"
-
-#~ msgid "Western (Windows-1252)"
-#~ msgstr "západních jazyků (Windows-1252)"
-
-#~ msgid "Arabic (IBM-864-I)"
-#~ msgstr "arabštiny (IBM-864-I)"
-
-#~ msgid "Arabic (ISO-8859-6-E)"
-#~ msgstr "arabštiny (ISO-8859-6-E)"
-
-#~ msgid "Arabic (ISO-8859-6-I)"
-#~ msgstr "arabštiny (ISO-8859-6-I)"
-
-#~ msgid "Arabic (MacArabic)"
-#~ msgstr "arabštiny (MacArabic)"
-
-#~ msgid "Armenian (ARMSCII-8)"
-#~ msgstr "arménštiny (ARMSCII-8)"
-
-#~ msgid "Central European (MacCE)"
-#~ msgstr "středoevropských jazyků (MacCE)"
-
-#~ msgid "Chinese Simplified (GBK)"
-#~ msgstr "zjednodušené čínštiny (GBK)"
-
-#~ msgid "Chinese Simplified (HZ)"
-#~ msgstr "zjednodušené čínštiny (HZ)"
-
-#~ msgid "Chinese Traditional (EUC-TW)"
-#~ msgstr "tradiční čínštiny (EUC-TW)"
-
-#~ msgid "Croatian (MacCroatian)"
-#~ msgstr "chorvatštiny (MacCroatian)"
-
-#~ msgid "Cyrillic (MacCyrillic)"
-#~ msgstr "cyrilice (MacCyrilic)"
-
-#~ msgid "Cyrillic/Ukrainian (MacUkrainian)"
-#~ msgstr "ukrajinské cyrilice (MacUkrainian)"
-
-#~ msgid "Farsi (MacFarsi)"
-#~ msgstr "perštiny (MacFarsi)"
-
-#~ msgid "Greek (MacGreek)"
-#~ msgstr "řečtiny (MacGreek)"
-
-#~ msgid "Gujarati (MacGujarati)"
-#~ msgstr "gudžarátštiny (MacGujarati)"
-
-#~ msgid "Gurmukhi (MacGurmukhi)"
-#~ msgstr "gurmukhi (MacGurmukhi)"
-
-#~ msgid "Hebrew (ISO-8859-8-E)"
-#~ msgstr "hebrejštiny (ISO-8859-8-E)"
-
-#~ msgid "Hebrew (ISO-8859-8-I)"
-#~ msgstr "hebrejštiny (ISO-8859-8-I)"
-
-#~ msgid "Hebrew (MacHebrew)"
-#~ msgstr "hebrejštiny (MacHebrew)"
-
-#~ msgid "Hindi (MacDevanagari)"
-#~ msgstr "hindštiny (MacDevanagari)"
-
-#~ msgid "Icelandic (MacIcelandic)"
-#~ msgstr "islandštiny (MacIcelandic)"
-
-#~ msgid "Korean (JOHAB)"
-#~ msgstr "korejštiny (JOHAB)"
-
-#~ msgid "Korean (UHC)"
-#~ msgstr "korejštiny (UHC)"
-
-#~ msgid "Romanian (MacRomanian)"
-#~ msgstr "rumunštiny (MacRomanian)"
-
-#~ msgid "Turkish (MacTurkish)"
-#~ msgstr "turečtiny (MacTurkish)"
-
-#~ msgid "Vietnamese (TCVN)"
-#~ msgstr "vietnamštiny (TCVN)"
-
-#~ msgid "Vietnamese (VPS)"
-#~ msgstr "vietnamštiny (VPS)"
-
-#~ msgid "Western (MacRoman)"
-#~ msgstr "západních jazyků (MacRoman)"
-
-#~ msgid "Tag Handling"
-#~ msgstr "Zpracování popisků"
-
-#~ msgid "Convert Character Set"
-#~ msgstr "Změnit znakovou sadu"
-
-#~ msgid "Convert character set from :"
-#~ msgstr "Změnit znakovou sadu z:"
-
-#~ msgid "to :"
-#~ msgstr "na:"
-
-#~ msgid "Disable bitrate update during playback (saves cpu usage)"
-#~ msgstr ""
-#~ "Neaktualizovat informace o datovém toku během přehrávání (šetří výkon CPU)"
-
-#~ msgid "Album mode"
-#~ msgstr "Režim alba"
-
-#~ msgid "0 dB"
-#~ msgstr "0 dB"
-
-#~ msgid "Without ReplayGain"
-#~ msgstr "Bez zesíleného přehrávání"
-
-#~ msgid "Dither 24bps to 16bps"
-#~ msgstr "Ditherací převést 24 bitů na 16"
-
-#~ msgid "With ReplayGain"
-#~ msgstr "Se zesíleným přehráváním"
-
-#~ msgid "Noise shaping"
-#~ msgstr "Tvarování šumu"
-
-#~ msgid "high"
-#~ msgstr "vysoké"
-
-#~ msgid "Dither to"
-#~ msgstr "Ditherovat na"
-
-#~ msgid "24 bps"
-#~ msgstr "24 b/s"
-
-#~ msgid ""
-#~ "Flac Plugin by Josh Coalson\n"
-#~ "contributions by\n"
-#~ "......\n"
-#~ "......\n"
-#~ "and\n"
-#~ "Daisuke Shimamura\n"
-#~ "Visit http://flac.sourceforge.net/\n"
-#~ "\n"
-#~ "Audacious Team port"
-#~ msgstr ""
-#~ "Modul Flac napsal Josh Coalson\n"
-#~ "přispěli\n"
-#~ "......\n"
-#~ "......\n"
-#~ "a\n"
-#~ "Daisuke Shimamura\n"
-#~ "Navštivte http://flac.sourceforge.net/\n"
-#~ "\n"
-#~ "Audacious Team port"
-
-#~ msgid "Alt"
-#~ msgstr "Alt"
-
-#~ msgid "Blocksize: %d"
-#~ msgstr "Velikost bloku: %d"
-
-#~ msgid ""
-#~ "Blocksize: variable\n"
-#~ " min/max: %d/%d"
-#~ msgstr ""
-#~ "Velikost bloku: proměnná\n"
-#~ " min/max: %d/%d"
-
-#~ msgid "FLAC Info:"
-#~ msgstr "Podrobnosti o FLAC"
-
-#~ msgid "Filesize: %lld B"
-#~ msgstr "Velikost souboru: %lld B"
-
-#~ msgid "ReplayGain Reference Loudness: %2.1f dB"
-#~ msgstr "Referenční hlasitost: %2.1f dB"
-
-#~ msgid "ReplayGain Track Peak: %1.8f"
-#~ msgstr "Špička zesílení stopy při přehrávání: %1.8f"
-
-#~ msgid "ReplayGain Album Peak: %1.8f"
-#~ msgstr "Špička zesílení alba při přehrávání: %1.8f"
-
-#~ msgid ""
-#~ "<big>Unable to create %s.</big>\n"
-#~ "\n"
-#~ "Could not open glade file (%s). Please check your installation.\n"
-#~ msgstr ""
-#~ "<big>Nelze vytvořit %s.</big>\n"
-#~ "\n"
-#~ "Nepodařilo se otevřít soubor %s. Zkontrolujte prosím sovou instalaci.\n"
-
-#~ msgid ""
-#~ "<big>Unable to play files.</big>\n"
-#~ "\n"
-#~ "The following files could not be played. Please check that:\n"
-#~ "1. they are accessible.\n"
-#~ "2. you have enabled the media plugins required."
-#~ msgstr ""
-#~ "<big>Soubory nelze přehrát</big>\n"
-#~ "\n"
-#~ "Následující soubory nelze přehrát. Zkontrolujte zda:\n"
-#~ "1. jsou přístupné,\n"
-#~ "2. máte povolené příslušné moduly."
-
-#~ msgid "Show more _details"
-#~ msgstr "Ukaž podrobné _informace"
-
-#~ msgid "audacious: %s"
-#~ msgstr "audacious: %s"
-
-#~ msgid "No input plugin recognized this file"
-#~ msgstr "Soubor nebyl rozpoznán žádným vstupním modulem"
-
-#~ msgid "Unable to create log file (%s)!\n"
-#~ msgstr "Nepodařilo se vytvořit protokolový soubor (%s)!\n"
-
-#~ msgid "Select which Audacious session ID to use"
-#~ msgstr "Výběr identifikátoru relace Audacious"
-
-#~ msgid "Skip backwards in playlist"
-#~ msgstr "Přejít zpět v seznamu skladeb"
-
-#~ msgid "Start playing current playlist"
-#~ msgstr "Přehrát skladby v aktuálním seznamu"
-
-#~ msgid "Pause current song"
-#~ msgstr "Pozastavit přehrávanou skladbu"
-
-#~ msgid "Stop current song"
-#~ msgstr "Zastavit přehrávanou skladbu"
-
-#~ msgid "Pause if playing, play otherwise"
-#~ msgstr "Pozastavit při přehrávání; jinak spustit"
-
-#~ msgid "Skip forward in playlist"
-#~ msgstr "Přejít na další skladbu"
-
-#~ msgid "Display Jump to File dialog"
-#~ msgstr "Zobrazit dialog „Přejít na soubor“"
-
-#~ msgid "Don't clear the playlist"
-#~ msgstr "Nemazat seznam skladeb"
-
-#~ msgid "Add new files to a temporary playlist"
-#~ msgstr "Přidat soubory do dočasného seznamu skladeb"
-
-#~ msgid "Display all open Audacious windows"
-#~ msgstr "Zobrazit všechna okna Audacious"
-
-#~ msgid "Enable headless operation"
-#~ msgstr "Zapnout bezhlavý režim"
-
-#~ msgid "Print all errors and warnings to stdout"
-#~ msgstr "Všechny chyby a varování tisknout na standardní výstup"
-
-#~ msgid "Show version and builtin features"
-#~ msgstr "Zobrazit verzi a vestavěné funkce"
-
-#~ msgid "FILE..."
-#~ msgstr "SOUBOR…"
-
-#~ msgid ""
-#~ "<big>Unable to load skin.</big>\n"
-#~ "\n"
-#~ "Check that skin at '%s' is usable and default skin is properly installed "
-#~ "at '%s'\n"
-#~ msgstr ""
-#~ "<big>Nelze načíst skin.</big>\n"
-#~ "\n"
-#~ "Zkontrolujte, zda skin v '%s' je použitelný a zda je standardní skin "
-#~ "správně nainstalován v '%s'.\n"
-
-#~ msgid ""
-#~ "Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n"
-#~ "Please use GTK+ %s or newer.\n"
-#~ msgstr ""
-#~ "Verze knihovny GTK+ (%d.%d.%d) není kompatibilní s Audacious.\n"
-#~ "Použijte GTK+ %s nebo novější.\n"
-
-#~ msgid ""
-#~ "Sorry, threads isn't supported on your platform.\n"
-#~ "\n"
-#~ "If you're on a libc5 based linux system and installed Glib & GTK+ before "
-#~ "you\n"
-#~ "installed LinuxThreads you need to recompile Glib & GTK+.\n"
-#~ msgstr ""
-#~ "Bohužel, váš systém nepodporuje vlákna.\n"
-#~ "\n"
-#~ "Pokud máte Linux založený na libc5 a knihovny Glib a GTK+ byly "
-#~ "nainstalovány dříve\n"
-#~ "než LinuxThreads, budete muset Glib a GTK+ přeložit znovu.\n"
-
-#~ msgid "- play multimedia files"
-#~ msgstr " - hrát multimediální soubory"
-
-#~ msgid ""
-#~ "%s: %s\n"
-#~ "Try `%s --help' for more information.\n"
-#~ msgstr ""
-#~ "%s: %s\n"
-#~ "Pro více informací zkuste „%s --help“.\n"
-
-#~ msgid "%s: Unable to open display, exiting.\n"
-#~ msgstr "%s: Nepodařilo se otevřít displej, končím.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Received SIGSEGV\n"
-#~ "\n"
-#~ "This could be a bug in Audacious. If you don't know why this happened, "
-#~ "file a bug at http://bugs-meta.atheme.org/\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Zachycen SIGSEGV\n"
-#~ "\n"
-#~ "Asi jste narazili na chybu v programu Audacious. Pokud netušíte proč, "
-#~ "nahlaste chybu (anglicky) na http://bugs-meta.atheme.org/\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2007 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright © 2005–2007 vývojový tým Audacious"
-
-#~ msgid "Credits"
-#~ msgstr "Zásluhy"
-
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "The future of UNIX multimedia.\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2007 Audacious Development Team\n"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "Budoucnost multimédií v UNIXu\n"
-#~ "\n"
-#~ "Copyright © 2005–2007 vývojový tým Audacious\n"
-
-#~ msgid "Audacious core developers:"
-#~ msgstr "Vývojáři jádra Audacious:"
-
-#~ msgid "Graphics:"
-#~ msgstr "Grafika:"
-
-#~ msgid "Plugin development:"
-#~ msgstr "Vývoj zásuvných modulů:"
-
-#~ msgid "Patch authors:"
-#~ msgstr "Autoři záplat:"
-
-#~ msgid "0.1.x developers:"
-#~ msgstr "Vývojáři v. 0.1.x:"
-
-#~ msgid "BMP Developers:"
-#~ msgstr "Vývojáři Audacious:"
-
-#~ msgid "Brazilian Portuguese:"
-#~ msgstr "Brazilská portugalština:"
-
-#~ msgid "Breton:"
-#~ msgstr "Bretonština:"
-
-#~ msgid "Bulgarian:"
-#~ msgstr "Bulharština:"
-
-#~ msgid "Croatian:"
-#~ msgstr "Chorvatština:"
-
-#~ msgid "Czech:"
-#~ msgstr "Čeština:"
-
-#~ msgid "Dutch:"
-#~ msgstr "Holandština:"
-
-#~ msgid "Finnish:"
-#~ msgstr "Finština:"
-
-#~ msgid "German:"
-#~ msgstr "Němčina:"
-
-#~ msgid "Georgian:"
-#~ msgstr "Gruzínština:"
-
-#~ msgid "Hindi:"
-#~ msgstr "Hindština:"
-
-#~ msgid "Hungarian:"
-#~ msgstr "Maďarština:"
-
-#~ msgid "Italian:"
-#~ msgstr "Italština:"
-
-#~ msgid "Japanese:"
-#~ msgstr "Japonština:"
-
-#~ msgid "Korean:"
-#~ msgstr "Korejština:"
-
-#~ msgid "Lithuanian:"
-#~ msgstr "Litevština:"
-
-#~ msgid "Macedonian:"
-#~ msgstr "Makedonština:"
-
-#~ msgid "Polish:"
-#~ msgstr "Polština:"
-
-#~ msgid "Romanian:"
-#~ msgstr "Rumunština:"
-
-#~ msgid "Russian:"
-#~ msgstr "Ruština:"
-
-#~ msgid "Serbian (Latin):"
-#~ msgstr "Srbština (latinka):"
-
-#~ msgid "Simplified Chinese:"
-#~ msgstr "Zjednodušená čínština:"
-
-#~ msgid "Slovak:"
-#~ msgstr "Slovenština:"
-
-#~ msgid "Spanish:"
-#~ msgstr "Španělština:"
-
-#~ msgid "Swedish:"
-#~ msgstr "Švédština:"
-
-#~ msgid "Traditional Chinese:"
-#~ msgstr "Tradiční čínština:"
-
-#~ msgid "Turkish:"
-#~ msgstr "Turečtina:"
-
-#~ msgid "Ukrainian:"
-#~ msgstr "Ukrajinština:"
-
-#~ msgid "Welsh:"
-#~ msgstr "Welština:"
-
-#~ msgid "VOLUME: %d%%"
-#~ msgstr "Hlasitost: %d%%"
-
-#~ msgid "BALANCE: %d%% LEFT"
-#~ msgstr "VYROVNÁNÍ: %d%% VLEVO"
-
-#~ msgid "BALANCE: CENTER"
-#~ msgstr "VYROVNÁNÍ: NA STŘED"
-
-#~ msgid "BALANCE: %d%% RIGHT"
-#~ msgstr "VYROVNÁNÍ: %d%% VPRAVO"
-
-#~ msgid "OPTIONS MENU"
-#~ msgstr "NASTAVENÍ"
-
-#~ msgid "DISABLE ALWAYS ON TOP"
-#~ msgstr "ZAKÁZAT FCI „VŽDY NA VRCHU“"
-
-#~ msgid "ENABLE ALWAYS ON TOP"
-#~ msgstr "POVOLIT FCI „VŽDY NA VRCHU“"
-
-#~ msgid "FILE INFO BOX"
-#~ msgstr "INFORMACE O SOUBORU"
-
-#~ msgid "DISABLE DOUBLESIZE"
-#~ msgstr "ZAKÁZAT DVOJITOU VELIKOST"
-
-#~ msgid "ENABLE DOUBLESIZE"
-#~ msgstr "POVOLIT DVOJITOU VELIKOST"
-
-#~ msgid "VISUALIZATION MENU"
-#~ msgstr "NASTAVENÍ ZOBRAZENÍ"
-
-#~ msgid "Error in Audacious."
-#~ msgstr "Chyba v Audacious"
-
-#~ msgid "Appearance"
-#~ msgstr "Vzhled"
-
-#~ msgid "Connectivity"
-#~ msgstr "Připojení"
-
-#~ msgid "Mouse"
-#~ msgstr "Myš"
-
-#~ msgid "Tracknumber"
-#~ msgstr "Číslo stopy"
-
-#~ msgid "Genre"
-#~ msgstr "Žánr"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "localhost"
-#~ msgstr "localhost"
-
-#~ msgid "Enabled"
-#~ msgstr "Povolený"
-
-#~ msgid "Category"
-#~ msgstr "Kategorie"
-
-#~ msgid "Preferences Window"
-#~ msgstr "Okno nastavení"
-
-#~ msgid "Track Information Window"
-#~ msgstr "Okno s podrobnosti o stopě"
-
-#~ msgid "Track Number"
-#~ msgstr "Číslo stopy"
-
-#~ msgid "Track Length"
-#~ msgstr "Délka stopy"
-
-#~ msgid "Close dialog on Open"
-#~ msgstr "Zavřít dialog při otevření"
-
-#~ msgid "Close dialog on Add"
-#~ msgstr "Zavřít dialog při přidání"
-
-#~ msgid "Add/Open URL Dialog"
-#~ msgstr "Dialog Přidat/otevřít URL"
-
-#~ msgid "_Filter:"
-#~ msgstr "_Filtr:"
-
-#~ msgid ""
-#~ "<big>No output plugin selected.</big>\n"
-#~ "You have not selected an output plugin."
-#~ msgstr ""
-#~ "<big>Není vybrán žádný výstupní modul.</big>\n"
-#~ "Musíte vybrat výstupní modul."
-
-#~ msgid "Performer/Artist"
-#~ msgstr "Interpret/umělec"
-
-#~ msgid "File extension"
-#~ msgstr "Přípona souboru"
-
-#~ msgid "%{n:...%}: Display \"...\" only if element %n is present"
-#~ msgstr "%{n:…%}: Zobraz „…“ pouze pokud %n nechybí"
-
-#~ msgid "Artist"
-#~ msgstr "Umělec"
-
-#~ msgid "Track Number"
-#~ msgstr "Číslo stopy"
-
-#~ msgid "Location"
-#~ msgstr "Umístění"
-
-#~ msgid "_Decoder list:"
-#~ msgstr "Seznam _dekódovacích modulů"
-
-#~ msgid "Decoders"
-#~ msgstr "Dekodéry"
-
-#~ msgid "General"
-#~ msgstr "Obecné"
-
-#~ msgid "_Visualization plugin list:"
-#~ msgstr "_Seznam vizualizačních modulů"
-
-#~ msgid "Visualization"
-#~ msgstr "Vizualizační"
-
-#~ msgid "Refresh skin list"
-#~ msgstr "Obnovit seznam skinů"
-
-#~ msgid "Use custom cursors"
-#~ msgstr "Použít vlastní kurzory"
-
-#~ msgid "Show window manager decorations"
-#~ msgstr "Zobrazovat dekorace podle správce oken"
-
-#~ msgid ""
-#~ "This enables the XMMS/GTK1-style file selection dialogs. This selector is "
-#~ "provided by Audacious itself and is faster than the default GTK2 selector "
-#~ "(but sadly not as user-friendly)."
-#~ msgstr ""
-#~ "Tato volba zapne dialog výběru souboru ve stylu XMMS/GTK1. Tento dialog "
-#~ "je poskytován samotným Audacious a je rychlejší než implicitní dialog "
-#~ "GTK2 (avšak ne tak pohodlný)."
-
-#~ msgid "Use XMMS-style file selector instead of the default selector"
-#~ msgstr "Používat dialog výběru souboru jako v XMMS namísto implicitního"
-
-#~ msgid "Mouse wheel"
-#~ msgstr "Kolečko myši"
-
-#~ msgid "percent"
-#~ msgstr "procent."
-
-#~ msgid "Scrolls playlist by"
-#~ msgstr "posune seznam skladeb o"
-
-#~ msgid "Convert underscores to blanks"
-#~ msgstr "Převést podtržítka na mezery"
-
-#~ msgid "Convert %20 to blanks"
-#~ msgstr "Převést %20 na mezery"
-
-#~ msgid "Convert backslash '\\' to forward slash '/'"
-#~ msgstr "Převést zpětná lomítka „\\“ na lomítka dopředná „/“"
-
-#~ msgid "Metadata"
-#~ msgstr "Metadata"
-
-#~ msgid "Load metadata (tag information) from music files."
-#~ msgstr "Načíst metadata (informace popisků) z hudebních souborů."
-
-#~ msgid "Load metadata when adding the file to the playlist or opening it"
-#~ msgstr ""
-#~ "Načíst metadata při vložení souboru do seznamu skladeb nebo při otevření"
-
-#~ msgid "On load"
-#~ msgstr "Při nahrání"
-
-#~ msgid "Fallback character encodings:"
-#~ msgstr "Záložní kódování znaků:"
-
-#~ msgid ""
-#~ "List of character encodings used for fall back conversion of metadata. If "
-#~ "automatic character encoding detector failed or has been disabled, "
-#~ "encodings in this list would be treated as candidates of the encoding of "
-#~ "metadata, and fall back conversion from these encodings to UTF-8 would be "
-#~ "attempted."
-#~ msgstr ""
-#~ "Seznam kódování znaků použitých pro konverzi metadat, nelze-li jejich "
-#~ "kódování s jistotou určit. Pokud automatické rozpoznávání kódování selže "
-#~ "nebo je zakázáno, kódování z tohoto seznamu budou považována za kandidáty "
-#~ "na kódování takových metadat a konverze z těchto kódování do UTF-8 bude "
-#~ "vyzkoušena."
-
-#~ msgid "Auto character encoding detector for:"
-#~ msgstr "Automatické rozpoznávání kódovaní znaků:"
-
-#~ msgid "File Dialog"
-#~ msgstr "Dialog o souboru"
-
-#~ msgid ""
-#~ "Always refresh the file dialog (this will slow opening the dialog on "
-#~ "large directories, and Gnome VFS should handle automatically)."
-#~ msgstr ""
-#~ "Vždy obnovit dialog o souboru (toto zpomalí dialog na velkých adresářích "
-#~ "a Gnome VFS by měl jednat automaticky)."
-
-#~ msgid "Always refresh directory when opening file dialog"
-#~ msgstr "Při otevření dialogu o souboru vždy zkontrolovat adresář"
-
-#~ msgid "Song Display"
-#~ msgstr "Zobrazení skladby"
-
-#~ msgid ""
-#~ "TITLE\n"
-#~ "ARTIST - TITLE\n"
-#~ "ARTIST - ALBUM - TITLE\n"
-#~ "ARTIST - ALBUM - TRACK. TITLE\n"
-#~ "ARTIST [ ALBUM ] - TRACK. TITLE\n"
-#~ "ALBUM - TITLE\n"
-#~ "Custom"
-#~ msgstr ""
-#~ "NÁZEV\n"
-#~ "UMĚLEC – NÁZEV\n"
-#~ "UMĚLEC – ALBUM – NÁZEV\n"
-#~ "UMĚLEC – ALBUM – STOPA. NÁZEV\n"
-#~ "UMĚLEC – [ ALBUM ] – STOPA. NÁZEV\n"
-#~ "ALBUM – NÁZEV\n"
-#~ "Vlastní"
-
-#~ msgid "Show information about titlestring format"
-#~ msgstr "Zobrazit informace o formátu titulku"
-
-#~ msgid "Popup Information"
-#~ msgstr "Vyskakovací okno s podrobnostmi"
-
-#~ msgid ""
-#~ "Toggles popup information window for the pointed entry in the playlist. "
-#~ "The window shows title of song, name of album, genre, year of publish, "
-#~ "track number, track length, and artwork."
-#~ msgstr ""
-#~ "Přepne zobrazovaní vyskakovacího okna s podrobnostmi o vybrané položce "
-#~ "v seznamu skladeb. V okně je zobrazen název skladby, název alba, žánr, "
-#~ "rok vydání, číslo stopy, délka stopy a přebal."
-
-#~ msgid "Show popup information for playlist entries"
-#~ msgstr "Zobrazovat podrobnosti k položkám v seznamu skladeb"
-
-#~ msgid "Edit settings for popup information"
-#~ msgstr "Upravit nastavení pro vyskakovací okno s podrobnostmi"
-
-#~ msgid "Directory preset file:"
-#~ msgstr "Adresář s předvolbami:"
-
-#~ msgid "File preset extension:"
-#~ msgstr "Přípony souborů s předvolbami:"
-
-#~ msgid "Proxy Configuration"
-#~ msgstr "Nastavení proxy"
-
-#~ msgid "Enable proxy usage"
-#~ msgstr "Používat proxy"
-
-#~ msgid "Proxy hostname:"
-#~ msgstr "Jméno počítače:"
-
-#~ msgid "Use authentication with proxy"
-#~ msgstr "Autentizovat se na proxy"
-
-#~ msgid "Proxy username:"
-#~ msgstr "Jméno:"
-
-#~ msgid "Proxy password:"
-#~ msgstr "Heslo:"
-
-#~ msgid ""
-#~ "Changing these settings will require a restart of "
-#~ "Audacious."
-#~ msgstr ""
-#~ "Změna těchto nastavení se projeví až po restartu "
-#~ "Audacious."
-
-#~ msgid "Audio System"
-#~ msgstr "Zvukový systém"
-
-#~ msgid ""
-#~ "This is the amount of time to prebuffer audio "
-#~ "streams by, in milliseconds.\n"
-#~ "Increase this value if you are experiencing audio skipping. \n"
-#~ "Please note however, that high values will result in Audacious performing "
-#~ "poorly."
-#~ msgstr ""
-#~ "Určuje délku zvukového proudu v milisekundách, který "
-#~ "bude předpočítán do vyrovnávací paměti.\n"
-#~ "Pokud máte problémy s přeskakováním zvuku, zvyšte tuto hodnotu.\n"
-#~ "Prosím, vezměte na vědomí, že příliš vysoké hodnoty mohou vézt ke "
-#~ "zhoršení výkonu Audacious."
-
-#~ msgid "Buffer size:"
-#~ msgstr "Velikost vyrovnávací paměti:"
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats on demand. This can "
-#~ "result in a messier playlist, but delivers a major speed benefit."
-#~ msgstr ""
-#~ "Je-li zatrhnuto, Audacious bude rozpoznávat formát souboru, až bude "
-#~ "potřeba. Toto může vézt k ošklivému seznamu skladeb, ale značně urychluje "
-#~ "jeho zpracování."
-
-#~ msgid "Detect file formats on demand, instead of immediately."
-#~ msgstr "Rozpoznávat formát souboru na požádání namísto okamžitě."
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats based by extension. This "
-#~ "is slightly slower than detection on demand, but still provides a minimal "
-#~ "level of format detection."
-#~ msgstr ""
-#~ "Je-li zatrhnuto, Audacious bude rozpoznávat formát souboru podle přípony. "
-#~ "Tento způsob je o něco pomalejší než rozpoznávání na požádání, ale "
-#~ "poskytuje alespoň základní úroveň rozpoznání formátu. "
-
-#~ msgid ""
-#~ "When Audacious starts, automatically begin playing from the point where "
-#~ "we stopped before."
-#~ msgstr ""
-#~ "Po spuštění Audacious automaticky začne hrát tam, kde před tím skončil."
-
-#~ msgid "Continue playback on startup"
-#~ msgstr "Pokračovat v přehrávání po spuštění"
-
-#~ msgid ""
-#~ "When finished playing a song, don't automatically advance to the next."
-#~ msgstr "Po přehrání skladby nepřecházet automaticky na následující."
-
-#~ msgid "Don't advance in the playlist"
-#~ msgstr "Nepokračovat v přehrávání dle seznamu skladeb"
-
-#~ msgid "Popup Information Settings"
-#~ msgstr "Nastavení vyskakovacího okna s detaily"
-
-#~ msgid "Cover image retrieve"
-#~ msgstr "Získání vyobrazení přebalu"
-
-#~ msgid ""
-#~ "While searching for the album's cover, Audacious looks for certain words "
-#~ "in the filename. You can specify those words in the lists below, "
-#~ "separated using commas."
-#~ msgstr ""
-#~ "Během hledání přebalu alba Audacious také zkouší určitá slova z názvu "
-#~ "souboru. Tato slova oddělená čárkou můžete zadat v níže uvedených "
-#~ "seznamech."
-
-#~ msgid "Include:"
-#~ msgstr "Zahrnout:"
-
-#~ msgid "Exclude:"
-#~ msgstr "Vyloučit:"
-
-#~ msgid "Recursively search for cover"
-#~ msgstr "Rekurzivně hledat přebal"
-
-#~ msgid "Search depth: "
-#~ msgstr "Hloubka hledání:"
-
-#~ msgid "Use per-file cover"
-#~ msgstr "Použít přebal pro každý soubor zvlášť"
-
-#~ msgid "Miscellaneous"
-#~ msgstr "Různé"
-
-#~ msgid "Show Progress bar for the current track"
-#~ msgstr "Vyjádřit pozici v přehrávané skladbě posuvníkem"
-
-#~ msgid "Delay until filepopup comes up: "
-#~ msgstr "Čekat na vyskakovací okno o souboru: "
-
-#~ msgid "Chinese:"
-#~ msgstr "Čínský:"
-
-#~ msgid "/Load"
-#~ msgstr "/Načíst"
-
-#~ msgid "/Load/Preset"
-#~ msgstr "/Načíst/Uloženou předvolbu"
-
-#~ msgid "/Load/Default"
-#~ msgstr "/Načíst/Standardní předvolbu"
-
-#~ msgid "/Load/Zero"
-#~ msgstr "/Načíst/Vynulovat"
-
-#~ msgid "/Save"
-#~ msgstr "/Uložit"
-
-#~ msgid "/Save/Preset"
-#~ msgstr "/Uložit/Předvolbu"
-
-#~ msgid "/Save/Default"
-#~ msgstr "/Uložit/Jako standardní"
-
-#~ msgid "/Save/To file"
-#~ msgstr "/Uložit/Do souboru"
-
-#~ msgid "/Delete"
-#~ msgstr "/Smazat"
-
-#~ msgid "/Delete/Preset"
-#~ msgstr "/Smazat/Předvolbu"
-
-#~ msgid "Load auto-preset"
-#~ msgstr "Načíst souborovou předvolbu"
-
-#~ msgid "Load equalizer preset"
-#~ msgstr "Načíst nastavení ekvalizéru"
-
-#~ msgid "Delete auto-preset"
-#~ msgstr "Smazat souborovou předvolbu"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: volba `%s' je nejasná\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: volba `--%s' nemá parametr\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: volba `%c%s' nemá parametr\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: volba `%s' vyžaduje parametr\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: neznámá volba `--%s'\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: neznámá volba `%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: nepřípustný parametr -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: neplatný parametr -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: volba vyžaduje parametr -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: volba `-W %s' je nejasná\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: volba `-W %s' nemá parametr\n"
-
-#~ msgid ""
-#~ "Usage: audacious [options] [files] ...\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "--------\n"
-#~ msgstr ""
-#~ "Použití: audacious [volby] [soubor]…\n"
-#~ "\n"
-#~ "Volby:\n"
-#~ "------\n"
-
-#~ msgid "Display this text and exit"
-#~ msgstr "Zobrazí tento text a skončí"
-
-#~ msgid "Activate Audacious"
-#~ msgstr "Aktivovat Audacious"
-
-#~ msgid "Previous session ID"
-#~ msgstr "ID předchozího sezení"
-
-#~ msgid "Headless operation [experimental]"
-#~ msgstr "Bezhlavý režim [zkušební]"
-
-#~ msgid "Disable error/warning interception (logging)"
-#~ msgstr "Nezachytávat chyby/varování (protokolování)"
-
-#~ msgid "Print version number and exit\n"
-#~ msgstr "Zobrazí číslo verze a skončí\n"
-
-#~ msgid "/Visualization Mode/Analyzer"
-#~ msgstr "/Typ zobrazení/Sloupce"
-
-#~ msgid "/Visualization Mode/Scope"
-#~ msgstr "/Typ zobrazení/Vlnovka"
-
-#~ msgid "/Visualization Mode/Off"
-#~ msgstr "/Typ zobrazení/Vypnout"
-
-#~ msgid "/Analyzer Mode/Normal"
-#~ msgstr "/Sloupce/Normální"
-
-#~ msgid "/Analyzer Mode/Fire"
-#~ msgstr "/Sloupce/Oheň"
-
-#~ msgid "/Analyzer Mode/Lines"
-#~ msgstr "/Sloupce/Tenké"
-
-#~ msgid "/Analyzer Mode/Bars"
-#~ msgstr "/Sloupce/Silné"
-
-#~ msgid "/Analyzer Mode/Peaks"
-#~ msgstr "/Sloupce/Vrcholky"
-
-#~ msgid "/WindowShade VU Mode/Normal"
-#~ msgstr "/Minimalizovaný režim/Normální"
-
-#~ msgid "/WindowShade VU Mode/Smooth"
-#~ msgstr "/Minimalizovaný režim/Jemný"
-
-#~ msgid "/Analyzer Falloff/Slowest"
-#~ msgstr "/Klesání sloupců/Nejpomalejší"
-
-#~ msgid "/Analyzer Falloff/Slow"
-#~ msgstr "/Klesání sloupců/Pomalé"
-
-#~ msgid "/Analyzer Falloff/Medium"
-#~ msgstr "/Klesání sloupců/Střední"
-
-#~ msgid "/Analyzer Falloff/Fast"
-#~ msgstr "/Klesání sloupců/Rychlé"
-
-#~ msgid "/Analyzer Falloff/Fastest"
-#~ msgstr "/Klesání sloupců/Nejrychlejší"
-
-#~ msgid "/Peaks Falloff/Slowest"
-#~ msgstr "/Klesání vrcholků/Nejpomalejší"
-
-#~ msgid "/Peaks Falloff/Slow"
-#~ msgstr "/Klesání vrcholků/Pomalé"
-
-#~ msgid "/Peaks Falloff/Medium"
-#~ msgstr "/Klesání vrcholků/Střední"
-
-#~ msgid "/Peaks Falloff/Fast"
-#~ msgstr "/Klesání vrcholků/Rychlé"
-
-#~ msgid "/Peaks Falloff/Fastest"
-#~ msgstr "/Klesání vrcholků/Nejrychlejší"
-
-#~ msgid "/Files..."
-#~ msgstr "/Soubory..."
-
-#~ msgid "Track Information Popup"
-#~ msgstr "Vyskakovací okno s informacemi o stopě"
-
-#~ msgid "/Show Popup Info"
-#~ msgstr "/Zobrazovat podrobnosti ve vyskakovacím okně"
-
-#~ msgid "/Remove Duplicates/By Title"
-#~ msgstr "/Odebrat duplikáty/Podle názvu"
-
-#~ msgid "/Remove Duplicates/By Filename"
-#~ msgstr "/Odebrat duplikáty/Podle jména souboru"
-
-#~ msgid "/New List"
-#~ msgstr "/Nový seznam"
-
-#~ msgid "/Update View"
-#~ msgstr "/Obnovit seznam"
-
-#~ msgid "/Select All"
-#~ msgstr "/Vybrat vše"
-
-#~ msgid "/Sort List/By Date"
-#~ msgstr "/Řadit/Podle data"
-
-#~ msgid "/Sort Selection/By Title"
-#~ msgstr "/Setřídit vybrané/Podle názvu"
-
-#~ msgid "/Sort Selection/By Artist"
-#~ msgstr "/Setřídit vybrané/Podle umělce"
-
-#~ msgid "/Sort Selection/By Filename"
-#~ msgstr "/Setřídit vybrané/Podle jména souboru"
-
-#~ msgid "/Sort Selection/By Path + Filename"
-#~ msgstr "/Setřídit vybrané/Podle cesty a jména souboru"
-
-#~ msgid "/Sort Selection/By Date"
-#~ msgstr "/Setřídit vybrané/Podle času"
-
-#~ msgid "/Sort Selection/By Track Number"
-#~ msgstr "/Setřídit vybrané/Podle čísla stopy"
-
-#~ msgid "/Sort Selection/By Playlist Entry"
-#~ msgstr "/Setřídit vybrané/Podle položky seznamu"
-
-#~ msgid "Close Dialog on Add"
-#~ msgstr "Zavřít dialog při přidání"
-
-#~ msgid "Deselect All"
-#~ msgstr "Odebrat vše"
-
-#~ msgid "Artist Popup"
-#~ msgstr "Vyskakovací okno o umělci"
-
-#~ msgid "Title"
-#~ msgstr "Název"
-
-#~ msgid "Artist"
-#~ msgstr "Umělec"
-
-#~ msgid "Album"
-#~ msgstr "Album"
-
-#~ msgid "Genre"
-#~ msgstr "Žánr"
-
-#~ msgid "Year"
-#~ msgstr "Rok"
-
-#~ msgid "Track Number"
-#~ msgstr "Číslo stopy"
-
-#~ msgid "Track Length"
-#~ msgstr "Délka stopy"
-
-#~ msgid "_Miscillaneous UI Features"
-#~ msgstr "_Rozličné vlastnosti uživatelského rozhraní"
-
-#~ msgid ""
-#~ "Enables playlist transparency. This is not recommended for slower "
-#~ "machines as it requires some CPU time to create and cache the pixmaps "
-#~ "used for the transparency."
-#~ msgstr ""
-#~ "Zapne průhlednost seznamu skladeb. Nedoporučuje se na pomalých "
-#~ "počítačích, protože vyžaduje jisté množství procesorového času na "
-#~ "vytvoření a udržování pixmap použitých pro průhlednost."
-
-#~ msgid "This enables the window mangaer to show decorations for windows."
-#~ msgstr ""
-#~ "Tímto necháte rozhodní na správci oken, kdy má zobrazovat dekorace oken."
-
-#~ msgid "label65"
-#~ msgstr "jmenovka65"
-
-#~ msgid "label76"
-#~ msgstr "jmenovka76"
-
-#~ msgid "CD Index:"
-#~ msgstr "CD Index:"
-
-#~ msgid "Use CD Index"
-#~ msgstr "Použít server s databází CD"
-
-#~ msgid "CD Index server:"
-#~ msgstr "Server s databází CD:"
-
-#~ msgid "SPC, VGM, NSF/NSFE, GBS, and GYM module decoder"
-#~ msgstr "Dekodér SPC, VGM, NSF/NSFE, GBS a GYM"
-
-#~ msgid "Select the directory where you want to store the MPEG streams:"
-#~ msgstr "Vyberte adresář, do něhož chcete vysílání uložit:"
-
-#~ msgid "Buffer size (kb):"
-#~ msgstr "Velikost vyrovnávací paměti (kB):"
-
-#~ msgid "Save stream to disk:"
-#~ msgstr "Uložit vysílání na disk:"
-
-#~ msgid "Save stream to disk"
-#~ msgstr "Uložit vysílání na disk:"
-
-#~ msgid "SHOUT/Icecast:"
-#~ msgstr "SHOUT/Icecast:"
-
-#~ msgid "Enable Icecast Metadata UDP Channel"
-#~ msgstr "Povolit Icecast Metadata UDP Channel"
-
-#~ msgid "LOOKING UP %s"
-#~ msgstr "Vyhledávám %s"
-
-#~ msgid "Couldn't look up host %s"
-#~ msgstr "Nelze najít server %s"
-
-#~ msgid "CONNECTING TO %s:%d"
-#~ msgstr "Připojuji se k %s: %d"
-
-#~ msgid "CONNECTED: WAITING FOR REPLY"
-#~ msgstr "Připojen: čekám na odpověď"
-
-#~ msgid ""
-#~ "Couldn't connect to host %s\n"
-#~ "Server reported: %s"
-#~ msgstr ""
-#~ "Nepodařilo se připojit k serveru %s\n"
-#~ "Server odpověděl: %s"
-
-#~ msgid "PRE-BUFFERING: %dKB/%dKB"
-#~ msgstr "Předčteno: %d kB/%d kB"
-
-#~ msgid "Stereo (if available)"
-#~ msgstr "Stereo (pokud existuje)"
-
-#~ msgid "Down sample:"
-#~ msgstr "Snížit vzorkovací kmitočet:"
-
-#~ msgid "1:1 (44 kHz)"
-#~ msgstr "1:1 (44 kHz)"
-
-#~ msgid "1:2 (22 kHz)"
-#~ msgstr "1:2 (22 kHz)"
-
-#~ msgid "1:4 (11 kHz)"
-#~ msgstr "1:4 (11 kHz)"
-
-#~ msgid "Decoder"
-#~ msgstr "Dekodér"
-
-#~ msgid "Dual channel"
-#~ msgstr "Dva kanály"
-
-#~ msgid "%d KBit/s"
-#~ msgstr "%d kb/s"
-
-#~ msgid "%ld Hz"
-#~ msgstr "%ld Hz"
-
-#~ msgid "50/15 ms"
-#~ msgstr "50/15 ms"
-
-#~ msgid "CCIT J.17"
-#~ msgstr "CCIT J.17"
-
-#~ msgid "MPEG Level:"
-#~ msgstr "MPEG:"
-
-#~ msgid "Original:"
-#~ msgstr "Originál:"
-
-#~ msgid "Emphasis:"
-#~ msgstr "Zesílení:"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%lu Bytes"
-#~ msgstr "%lu bajtů"
-
-#~ msgid "Select the directory where you want to store the Ogg Vorbis streams:"
-#~ msgstr ""
-#~ "Vyberte adresář, do nějž bude ukládáno vysílání ve formátu Ogg Vorbis:"
-
-#~ msgid "Select the directory where you want to store the output files:"
-#~ msgstr "Vyberte adresář, do něhož chcete soubory uložit:"
-
-#~ msgid "** DOUBLESIZE HAS BEEN REMOVED **"
-#~ msgstr "** FUNKCE ZDVOJNÁSOBENÍ VELIKOSTI BYLA ODSTRANĚNA **"
-
-#~ msgid ""
-#~ "Filename and song title tags should be inside double quotes (\"). Not "
-#~ "doing so might be a security risk. Continue anyway?"
-#~ msgstr ""
-#~ "Jméno souboru a název skladby je lépe napsat do uvozovek (\"), jinak může "
-#~ "být ohrožena bezpečnost počítače. Chcete přesto pokračovat?"
-
-#~ msgid "Convert non-UTF8 ID3 tags to UTF8"
-#~ msgstr "Převést ID3 popisky z jiných kódování do UTF-8"
-
-#~ msgid "ID3 encoding:"
-#~ msgstr "Kódování ID3:"
-
-#~ msgid "Convert non-UTF8 Vorbis tags to UTF8"
-#~ msgstr "Převést Vorbis popisky z jiných kódování do UTF-8"
-
-#~ msgid "Vorbis encoding:"
-#~ msgstr "Vorbis - kódování:"
-
-#~ msgid "William Pitcock"
-#~ msgstr "William Pitcock"
-
-#~ msgid "Tony Vroon"
-#~ msgstr "Tony Vroon"
-
-#~ msgid "Mohammed Sameer"
-#~ msgstr "Mohammed Sameer"
-
-#~ msgid "Artem Baguinski"
-#~ msgstr "Artem Baguinski"
-
-#~ msgid "Edward Brocklesby"
-#~ msgstr "Edward Brocklesby"
-
-#~ msgid "Milosz Derezynski"
-#~ msgstr "Milosz Derezynski"
-
-#~ msgid "David Lau"
-#~ msgstr "David Lau"
-
-#~ msgid "Ole Andre Vadla Ravnaas"
-#~ msgstr "Ole Andre Vadla Ravnaas"
-
-#~ msgid "Michiel Sikkes"
-#~ msgstr "Michiel Sikkes"
-
-#~ msgid "Andrei Badea"
-#~ msgstr "Andrei Badea"
-
-#~ msgid "Peter Behroozi"
-#~ msgstr "Peter Behroozi"
-
-#~ msgid "Bernard Blackham"
-#~ msgstr "Bernard Blackham"
-
-#~ msgid "Oliver Blin"
-#~ msgstr "Oliver Blin"
-
-#~ msgid "Tomas Bzatek"
-#~ msgstr "Tomas Bzatek"
-
-#~ msgid "Liviu Danicel"
-#~ msgstr "Liviu Danicel"
-
-#~ msgid "Jon Dowland"
-#~ msgstr "Jon Dowland"
-
-#~ msgid "Artur Frysiak"
-#~ msgstr "Artur Frysiak"
-
-#~ msgid "Sebastian Kapfer"
-#~ msgstr "Sebastian Kapfer"
-
-#~ msgid "Lukas Koberstein"
-#~ msgstr "Lukas Koberstein"
-
-#~ msgid "Dan Korostelev"
-#~ msgstr "Dan Korostelev"
-
-#~ msgid "Jolan Luff"
-#~ msgstr "Jolan Luff"
-
-#~ msgid "Michael Marineau"
-#~ msgstr "Michael Marineau"
-
-#~ msgid "Tim-Philipp Muller"
-#~ msgstr "Tim-Philipp Muller"
-
-#~ msgid "Julien Portalier"
-#~ msgstr "Julien Portalier"
-
-#~ msgid "Andrew Ruder"
-#~ msgstr "Andrew Ruder"
-
-#~ msgid "Olivier Samyn"
-#~ msgstr "Olivier Samyn"
-
-#~ msgid "Martijn Vernooij"
-#~ msgstr "Martijn Vernooij"
-
-#~ msgid "Philipi Pinto"
-#~ msgstr "Philipi Pinto"
-
-#~ msgid "Thierry Vignaud"
-#~ msgstr "Thierry Vignaud"
-
-#~ msgid "Chao-Hsiung Liao"
-#~ msgstr "Chao-Hsiung Liao"
-
-#~ msgid "Jan Narovec"
-#~ msgstr "Jan Narovec"
-
-#~ msgid "Laurens Buhler"
-#~ msgstr "Laurens Buhler"
-
-#~ msgid "Pauli Virtanen"
-#~ msgstr "Pauli Virtanen"
-
-#~ msgid "David Le Brun"
-#~ msgstr "David Le Brun"
-
-#~ msgid "Matthias Debus"
-#~ msgstr "Matthias Debus"
-
-#~ msgid "George Machitidze"
-#~ msgstr "George Machitidze"
-
-#~ msgid "Kouzinopoulos Haris"
-#~ msgstr "Kouzinopoulos Haris"
-
-#~ msgid "Stavros Giannouris"
-#~ msgstr "Stavros Giannouris"
-
-#~ msgid "Dhananjaya Sharma"
-#~ msgstr "Dhananjaya Sharma"
-
-#~ msgid "Laszlo Dvornik"
-#~ msgstr "Laszlo Dvornik"
-
-#~ msgid "Alessio D'Ascanio"
-#~ msgstr "Alessio D'Ascanio"
-
-#~ msgid "DongCheon Park"
-#~ msgstr "DongCheon Park"
-
-#~ msgid "Rimas Kudelis"
-#~ msgstr "Rimas Kudelis"
-
-#~ msgid "Arangel Angov"
-#~ msgstr "Arangel Angov"
-
-#~ msgid "Jacek Wolszczak"
-#~ msgstr "Jacek Wolszczak"
-
-#~ msgid "Pavlo Bohmat"
-#~ msgstr "Pavlo Bohmat"
-
-#~ msgid "Vitaly Lipatov"
-#~ msgstr "Vitalij Lipatov"
-
-#~ msgid "Pavel Kanzelsberger"
-#~ msgstr "Pavel Kanzelsberger"
-
-#~ msgid "Martin Persenius"
-#~ msgstr "Martin Persenius"
-
-#~ msgid "Mykola Lynnyk"
-#~ msgstr "Mykola Lynnyk"
-
-#~ msgid "Plugins"
-#~ msgstr "Moduly"
-
-#~ msgid "_Media plugin list:"
-#~ msgstr "_Seznam přehrávacích modulů"
-
-#~ msgid ""
-#~ "The change is now effective in Audacious' configuration database, but "
-#~ "won't take effect for playback until the next song!\n"
-#~ "\n"
-#~ "Optionally, you can stop and restart playback for the change to take "
-#~ "effect."
-#~ msgstr ""
-#~ "Změny jsou uloženy, ale projeví se až při přehrávání další skladby.\n"
-#~ "\n"
-#~ "Po zastavení a znovuspuštění se změny samozřejmě projeví i u současné "
-#~ "skladby."
-
-#~ msgid "Appearance"
-#~ msgstr "Vzhled"
-
-#~ msgid "Mouse"
-#~ msgstr "Myš"
-
-#~ msgid "Playlist"
-#~ msgstr "Seznam skladeb"
-
-#~ msgid "Equalizer"
-#~ msgstr "Ekvalizér"
-
-#~ msgid "Use proxy"
-#~ msgstr "Použít proxy"
-
-#~ msgid "Francisco Javier F. Serrador"
-#~ msgstr "Francisco Javier F. Serrador"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "Unable to write to file: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "Nelze zapsat do souboru: %s"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "Unable to open file: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "Nelze otevřít soubor: %s"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "Unable to truncate file: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "Nepodařilo se upravit soubor: %s"
-
-#~ msgid "Couldn't remove tag!"
-#~ msgstr "Informace nelze odstranit!"
-
-#~ msgid "No tag to remove!"
-#~ msgstr "Žádný tag k odstranění!"
-
-#~ msgid "Copy album tags"
-#~ msgstr "Kopírovat společné položky"
-
-#~ msgid "Paste album tags"
-#~ msgstr "Vložit společné položky"
-
-#~ msgid "Content"
-#~ msgstr "Obsah"
-
-#~ msgid "Extension and content"
-#~ msgstr "Obsah i přípona"
-
-#~ msgid " left"
-#~ msgstr "zbývá"
-
-#~ msgid " total, "
-#~ msgstr "celkem,"
-
-#~ msgid ""
-#~ "Enable the selected plugin. Note that after pressing 'Apply' it may take "
-#~ "a while until you can hear the effect, since it is applied before the "
-#~ "audio data goes into the buffer."
-#~ msgstr ""
-#~ "Povolí vybraný modul. Po stisknutí tlačítka ‚Použít‘ může chvilku trvat, "
-#~ "než se změny projeví, protože nové nastavení se aplikuje na data před "
-#~ "vyrovnávací pamětí."
-
-#~ msgid ""
-#~ "Enables the Buffer Monitor. This is a small window which shows how much "
-#~ "data is in the buffers. The top display belongs to the mixing buffer, the "
-#~ "bottom shows how much data is being buffered by the output plugin.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Povolit sledování vyrovnávací paměti – otevře okno, které bude ukazovat "
-#~ "objem dat ve vyrovnávací paměti. Vrchní ukazatel patří vyrovnávací paměti "
-#~ "mixéru, spodní vyrovnávací paměti výstupního modulu.\n"
-#~ "Standardně: vypnuto"
-
-#~ msgid "Open the configuration dialog of the plugin selected above."
-#~ msgstr "Otevře okno s nastavením výše vybraného modulu."
-
-#~ msgid "Rate:"
-#~ msgstr "Tok:"
-
-#~ msgid "Read ID3V2 RVA2 Tag"
-#~ msgstr "Číst ID3V2 RVA2 tag"
-
-#~ msgid "Show Buffer Monitor"
-#~ msgstr "Zapnout sledování vyrovnávací paměti"
-
-#~ msgid "Volume normalizer"
-#~ msgstr "Normalizace hlasitosti"
-
-#~ msgid ""
-#~ "You do not need to press 'Apply' after making changes to the effect "
-#~ "plugin settings. It may take a while though until you can hear the "
-#~ "change, since the plugin is applied before the mixing buffer."
-#~ msgstr ""
-#~ "Změny v nastavení modulu aktivujete tlačítkem ‚Použít‘. Protože změny se "
-#~ "projeví až na nových datech ve vyrovnávací paměti, může chvíli trvat, než "
-#~ "je uslyšíte."
-
-#~ msgid "ms"
-#~ msgstr "ms"
-
-#~ msgid ""
-#~ "Libvisual Audacious Plugin\n"
-#~ "\n"
-#~ "Copyright (C) 2004, Duilio Protti <dprotti@users.sourceforge.net>\n"
-#~ "Dennis Smit <ds@nerds-incorporated.org>\n"
-#~ "\n"
-#~ "The Libvisual Audacious Plugin, more information about Libvisual can be "
-#~ "found at\n"
-#~ "http://libvisual.sf.net\n"
-#~ msgstr ""
-#~ "Modul Libvisual programu Audacious\n"
-#~ "\n"
-#~ "Copyright (C) 2004, Duilio Protti <dprotti@users.sourceforge.net>\n"
-#~ "Dennis Smit <ds@nerds-incorporated.org>\n"
-#~ "\n"
-#~ "Libvisual Audacious Plugin, více informací o modulu Libvisual naleznete "
-#~ "na\n"
-#~ "http://libvisual.sf.net\n"
-
-#~ msgid ""
-#~ "Brazilian Portuguese: Gustavo Sverzut Barbieri\n"
-#~ "Dutch: Dennis Smit\n"
-#~ "French: Jean-Christophe Hoelt\n"
-#~ "Spanish: Duilio Protti\n"
-#~ msgstr ""
-#~ "Brazilská portugalština: Gustavo Sverzut Barbieri\n"
-#~ "Holandština: Dennis Smit\n"
-#~ "Francouzština: Jean-Christophe Hoelt\n"
-#~ "Španělština: Duilio Protti\n"
-
-#~ msgid "LibVisual Audacious Plugin"
-#~ msgstr "Modul LibVisual"
-
-#~ msgid "Visualization Plugins"
-#~ msgstr "Vizualizační moduly"
-
-#~ msgid "Fullscreen"
-#~ msgstr "Na celou obrazovku"
-
-#~ msgid ""
-#~ "You can toggle between normal and fullscreen mode pressing key TAB or F11"
-#~ msgstr ""
-#~ "Mezi normálním a celoobrazovkovým režimem můžete přepínat klávesami Tab "
-#~ "nebo F11."
-
-#~ msgid "Only GL plugins"
-#~ msgstr "Jen GL moduly"
-
-#~ msgid "Maximum Frames Per Second:"
-#~ msgstr "Maximum snímků za sekundu:"
-
-#~ msgid "All plugins enabled"
-#~ msgstr "Všechny moduly povoleny"
-
-#~ msgid " (enabled)"
-#~ msgstr "(povolený)"
-
-#~ msgid "There is no info for this plugin"
-#~ msgstr "K tomuto modulu nejsou žádné informace."
-
-#~ msgid "Cannot initialize SDL!\n"
-#~ msgstr "Nepodařilo se inicializovat SDL.\n"
-
-#~ msgid " will not be loaded."
-#~ msgstr " nebude načten."
-
-#~ msgid "Last plugin: %s"
-#~ msgstr "Poslední modul: %s"
-
-#~ msgid "Developers:"
-#~ msgstr "Vývojáři:"
-
-#~ msgid "DISABLE ALWAYS ON TOP (N/A)"
-#~ msgstr "ZAKÁZAT FCI \"VŽDY NA VRCHU\" (N/A)"
-
-#~ msgid "ENABLE ALWAYS ON TOP (N/A)"
-#~ msgstr "POVOLIT FCI \"VŽDY NA VRCHU\" (N/A)"
-
-#~ msgid "%s - BMP"
-#~ msgstr "%s - BMP"
-
-#~ msgid "bmp: %s"
-#~ msgstr "bmp: %s"
-
-#~ msgid "Add Folders"
-#~ msgstr "Přidat adresáře"
-
-#~ msgid "3DNow! optimized decoder"
-#~ msgstr "Dekodér optimalizovaný pro 3DNow!"
-
-#~ msgid "MMX optimized decoder"
-#~ msgstr "Dekodér optimalizovaný pro MMX"
-
-#~ msgid "FPU decoder"
-#~ msgstr "FPU dekodér"
-
-#~ msgid ""
-#~ "mpg123 decoding engine by Michael Hipp <mh@mpg123.de>\n"
-#~ "Plugin by The XMMS team"
-#~ msgstr ""
-#~ "mpg123 dekodér vytvořil Michael Hipp <mh@mpg123.de>\n"
-#~ "Modul pochází od The XMMS team"
-
-#~ msgid "Advanced settings:"
-#~ msgstr "Pokročilé nastavení:"
-
-#~ msgid "Homepage and Graphics:"
-#~ msgstr "Webové stránky a grafika:"
-
-#~ msgid "Takeshi Aihana"
-#~ msgstr "Takeshi Aihana"
-
-#~ msgid "Beep Media Player"
-#~ msgstr "Beep Media Player"
-
-#~ msgid "BMP"
-#~ msgstr "BMP"
-
-#~ msgid "Add Internet Address"
-#~ msgstr "Přidat internetovou adresu"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "Vlad Gerasimov"
-#~ msgstr "Vlad Gerasimov"
-
-#~ msgid "/By extension"
-#~ msgstr "/Podle přípony"
-
-#~ msgid "Pre-gain with RG info (dB):"
-#~ msgstr "Předzesílení podle RG infa (dB):"
-
-#~ msgid "Pre-gain without RG info (dB):"
-#~ msgstr "Předzesílení bez RG infa (dB):"
-
-#~ msgid "Gain Control"
-#~ msgstr "Řízení zesílení"
+msgstr "Copyright © 2006 William Pitcock <nenolod -at- nenolod.net>\n\nČásti kódu modulu napsal Miles Egan\nNavštivte stránku Wavpacku na http://www.wavpack.com/\n"

audacious-plugins-3.1.1.tar.bz2/po/de.po -> audacious-plugins-3.2.4.tar.bz2/po/de.po Changed

@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-10-25 16:29+0200\n"
-"PO-Revision-Date: 2011-10-29 15:18+0100\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-07 23:37+0100\n"
+"PO-Revision-Date: 2012-01-08 00:12+0100\n"
 "Last-Translator: Thomas Lange\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -28,224 +28,172 @@
 msgid "About MP4 AAC decoder plugin"
 msgstr "Über MP4-AAC-Player-Plugin"
 
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "Über XMMS Alarm"
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "Über Alarm"
 
-#: src/alarm/interface.c:41
-msgid "XMMS Alarm"
-msgstr "XMMS-Alarm"
-
-#: src/alarm/interface.c:50
+#: src/alarm/alarm.c:313
 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"
+"A plugin that can be used to start playing at a certain time.\n"
 "\n"
-"http://www.snika.uklinux.net/xmms-alarm/"
+"Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
-"Ein XMMS-Plugin, das verwendet werden kann,\n"
-"um zu einem bestimmten Zeitpunkt die\n"
+"Ein Plugin, das genutzt werden kann, um zu einer bestimmten Zeit die "
 "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/"
+"Ursprünglich geschrieben von Adam Feakin und Daniel Stodden."
 
-#: src/alarm/interface.c:65
-msgid "Close"
-msgstr "Schließen"
-
-#: src/alarm/interface.c:95
+#: src/alarm/interface.c:33
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/interface.c:102
+#: src/alarm/interface.c:40
 msgid "This is your wakeup call."
 msgstr "Dies ist dein Aufwach-Signal."
 
-#: src/alarm/interface.c:117 src/alarm/interface.c:1338
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
 msgid "OK"
 msgstr "OK"
 
-#: src/alarm/interface.c:151
-msgid "Sorry"
-msgstr "Entschuldigung"
-
-#: src/alarm/interface.c:158
-msgid "Warning"
-msgstr "Warnung"
-
-#: src/alarm/interface.c:167
-msgid ""
-"For safety reasons the \"quiet\" time must be at least 65 seconds longer "
-"than the fading time, it must also be more than 10 seconds. This basically "
-"means that there is a bug in the code and until I find a way of really "
-"fixing it this message will appear :)\n"
-"\n"
-"Your fading settings have NOT been saved\n"
-"\n"
-"--\n"
-"Adam"
-msgstr ""
-"Aus Sicherheitsgründen muss die \"ruhig\"-Zeitangabe mindestens 65 Sekunden "
-"länger als die Übergangszeitangabe sein, außerdem muss sie länger als 10 "
-"Sekunden sein. Das bedeutet, dass ein Bug im Code vorhanden ist. Bis ich "
-"einen wirklich funktionierenden Fix gefunden habe, wird diese Meldung "
-"erscheinen. :)\n"
-"\n"
-"Deine Einstellungen wurden NICHT gespeichert.\n"
-"\n"
-"--\n"
-"Adam"
-
-#: src/alarm/interface.c:183
-msgid "Oh Well"
-msgstr "Jo mei"
-
-#: src/alarm/interface.c:339
+#: src/alarm/interface.c:214
 msgid "Alarm Settings"
 msgstr "Alarm-Einstellungen"
 
-#: src/alarm/interface.c:354 src/alarm/interface.c:526
-#: src/alarm/interface.c:898
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
 msgid "Time"
 msgstr "Zeit"
 
-#: src/alarm/interface.c:395
+#: src/alarm/interface.c:270
 msgid "hours"
 msgstr "Stunden"
 
-#: src/alarm/interface.c:456
+#: src/alarm/interface.c:331
 msgid "h"
 msgstr "Uhr"
 
-#: src/alarm/interface.c:486
+#: src/alarm/interface.c:361
 msgid "minutes"
 msgstr "Minuten"
 
-#: src/alarm/interface.c:504
+#: src/alarm/interface.c:379
 msgid "Quiet after:"
 msgstr "Still nach:"
 
-#: src/alarm/interface.c:514
+#: src/alarm/interface.c:389
 msgid "Alarm at (default):"
 msgstr "Alarm um (standardmäßig):"
 
-#: src/alarm/interface.c:534
+#: src/alarm/interface.c:409
 msgid "Choose the days for the alarm to come on"
 msgstr "Tage wählen, an denen der Alarm ausgelöst werden soll"
 
-#: src/alarm/interface.c:562 src/alarm/interface.c:610
-#: src/alarm/interface.c:658 src/alarm/interface.c:706
-#: src/alarm/interface.c:754 src/alarm/interface.c:802
-#: src/alarm/interface.c:850 src/bs2b/plugin.c:198 src/OSS/configure.c:153
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
 msgid "Default"
 msgstr "Standard"
 
-#: src/alarm/interface.c:888
+#: src/alarm/interface.c:763
 msgid "Day"
 msgstr "Tag"
 
-#: src/alarm/interface.c:908
+#: src/alarm/interface.c:783
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: src/alarm/interface.c:919
+#: src/alarm/interface.c:794
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: src/alarm/interface.c:930
+#: src/alarm/interface.c:805
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: src/alarm/interface.c:941
+#: src/alarm/interface.c:816
 msgid "Friday"
 msgstr "Freitag"
 
-#: src/alarm/interface.c:952
+#: src/alarm/interface.c:827
 msgid "Saturday"
 msgstr "Samstag"
 
-#: src/alarm/interface.c:963
+#: src/alarm/interface.c:838
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: src/alarm/interface.c:973
+#: src/alarm/interface.c:848
 msgid "Monday"
 msgstr "Montag"
 
-#: src/alarm/interface.c:984
+#: src/alarm/interface.c:859
 msgid "Days"
 msgstr "Tage"
 
-#: src/alarm/interface.c:1000
+#: src/alarm/interface.c:875
 msgid "Fading"
 msgstr "Übergang"
 
-#: src/alarm/interface.c:1037
+#: src/alarm/interface.c:912
 msgid "seconds"
 msgstr "Sekunden"
 
-#: src/alarm/interface.c:1045 src/alarm/interface.c:1160
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
 msgid "Volume"
 msgstr "Lautstärke"
 
-#: src/alarm/interface.c:1071
+#: src/alarm/interface.c:946
 msgid "Current"
 msgstr "Momentan"
 
-#: src/alarm/interface.c:1079
+#: src/alarm/interface.c:954
 msgid "Start at"
 msgstr "Beginnen bei"
 
-#: src/alarm/interface.c:1107 src/alarm/interface.c:1151
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
 msgid "%"
 msgstr "%"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:998
 msgid "Final"
 msgstr "Schluss"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1051
 msgid "Additional Command"
 msgstr "Zusätzlicher Befehl"
 
-#: src/alarm/interface.c:1202
+#: src/alarm/interface.c:1077
 msgid "enable"
 msgstr "aktivieren"
 
-#: src/alarm/interface.c:1210
+#: src/alarm/interface.c:1085
 msgid "Playlist (optional)"
 msgstr "Wiedergabeliste (optional)"
 
-#: src/alarm/interface.c:1236
+#: src/alarm/interface.c:1111
 msgid "Browse..."
 msgstr "Suchen..."
 
-#: src/alarm/interface.c:1244 src/alarm/interface.c:1408
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
 msgid "Reminder"
 msgstr "Erinnern"
 
-#: src/alarm/interface.c:1261
+#: src/alarm/interface.c:1136
 msgid "Use reminder"
 msgstr "Erinnerung benutzen"
 
-#: src/alarm/interface.c:1277 src/sndstretch/sndstretch_xmms.c:358
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
 msgid "Options"
 msgstr "Optionen"
 
-#: src/alarm/interface.c:1285
+#: src/alarm/interface.c:1160
 msgid "What do these options mean?"
 msgstr "Was bedeuten diese Einstellungen?"
 
-#: src/alarm/interface.c:1313
+#: src/alarm/interface.c:1188
 msgid ""
 "\n"
 "Time\n"
@@ -348,21 +296,21 @@
 " Erinnerung:\n"
 " Zeige eine Erinnerung an, wenn der Alarm ausgelöst wird.\n"
 
-#: src/alarm/interface.c:1315 src/skins/ui_manager.c:382
+#: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/alarm/interface.c:1347 src/cdaudio-ng/configure.c:249
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
 #: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
 #: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/alarm/interface.c:1415
+#: src/alarm/interface.c:1290
 msgid "Your reminder for today is.."
 msgstr "Die Erinnerung für heute lautet.."
 
-#: src/alarm/interface.c:1440
+#: src/alarm/interface.c:1315
 msgid "Thankyou"
 msgstr "Danke"
 
@@ -402,7 +350,7 @@
 msgid "ALSA error"
 msgstr "ALSA Fehler"
 
-#: src/amidi-plug/amidi-plug.c:335
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -806,19 +754,19 @@
 msgid "None"
 msgstr "Kein"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "Wiedergabebeginn"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Löst OSD beim Abspielen eines Wiedergabelisteneintrags aus."
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "Titeländerung"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
@@ -828,142 +776,142 @@
 "der Dateiname gleich bleibt. Das ist hauptsächlich nützlich, um "
 "Titeländerungen bei Internetstreams anzuzeigen."
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "Lautstärkeänderung"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
 msgstr "Löst OSD bei Lautstärkeänderung aus."
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
 msgstr "Pause An"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
 msgstr "Löst OSD beim Pausieren der Wiedergabe aus."
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
 msgstr "Pause Aus"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Löst OSD beim Fortsetzen der Wiedergabe aus."
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "Platzierung"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
 msgstr "Relative X-Verschiebung:"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
 msgstr "Relative Y-Verschiebung:"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr "Maximale OSD-Breite:"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr "Mehr-Bildschirm-Optionen"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
 msgstr "OSD anzeigen auf:"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "allen Bildschirmen"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "Bildschirm %i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "Zeitablauf (ms)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "Anzeige:"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "Einblenden:"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "Ausblenden:"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "Schriftarten"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "Schriftart %i:"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "Schatten"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "Internationalisierung"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "UTF-8-Konversion von Text deaktivieren (in Aosd)"
 
-#: src/aosd/aosd_ui.c:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "Skin-Datei auswählen"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr "Render-Stil"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "Farben"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "Farbe %i:"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr "Eigener Skin"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "Skin-Datei:"
 
-#: src/aosd/aosd_ui.c:672
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "Suchen"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "Auslöser aktivieren"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "Ereignis"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
 msgstr "Composite-Manager erkannt"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -973,72 +921,72 @@
 "Sofern ein solcher nicht doch aktiv ist, bitte einen solchen aktivieren, "
 "ansonsten wird das OSD nicht funktionieren"
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 msgid "Composite manager not required for fake transparency"
 msgstr "Composite-Manager nicht benötigt für vorgetäuschte Transparenz"
 
-#: src/aosd/aosd_ui.c:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "Transparenz"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr "Pseudo-Transparenz"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Echte Transparenz (benötigt X-Composite-Erweiterung)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
 msgstr "Composite-Erweiterung nicht geladen"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
 msgstr "Composite-Erweiterung nicht verfügbar"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious-OSD"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
 msgstr "Audacious-OSD - Konfiguration"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr "Test"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "Dekoration"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "Auslöser"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "Verschiedenes"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
 msgstr "Über Audacious-OSD"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
@@ -1046,7 +994,7 @@
 "\n"
 "Audacious-OSD "
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1092,11 +1040,11 @@
 msgid "Presets:"
 msgstr "Voreinstellungen:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:241
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
 msgstr "Über AudioCD-Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.c:242
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -1123,15 +1071,15 @@
 "\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:550
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:922
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
 msgstr "Laufwerk ist leer."
 
-#: src/cdaudio-ng/cdaudio-ng.c:924
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
 msgstr "Nicht unterstützter Disk-Typ."
 
@@ -1370,7 +1318,7 @@
 msgid "Volume: (%)"
 msgstr "Lautstärke: (%)"
 
-#: src/ffaudio/ffaudio-core.c:795
+#: src/ffaudio/ffaudio-core.c:719
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1397,7 +1345,7 @@
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:809
+#: src/ffaudio/ffaudio-core.c:733
 msgid "About FFaudio Plugin"
 msgstr "Über FFaudio Plugin"
 
@@ -1405,55 +1353,55 @@
 msgid "About FileWriter-Plugin"
 msgstr "Über FileWriter-Plugin"
 
-#: src/filewriter/filewriter.c:455
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "FileWriter-Konfiguration"
 
-#: src/filewriter/filewriter.c:467
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "Ausgabedatei-Format:"
 
-#: src/filewriter/filewriter.c:485
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "In Original-Verzeichnis speichern"
 
-#: src/filewriter/filewriter.c:505
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr "In anderes Verzeichnis speichern"
 
-#: src/filewriter/filewriter.c:515
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "Ausgabedatei-Verzeichnis:"
 
-#: src/filewriter/filewriter.c:519
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr "Verzeichnis wählen"
 
-#: src/filewriter/filewriter.c:538
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr "Dateiname erhalten von:"
 
-#: src/filewriter/filewriter.c:541
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr "ursprünglichen Datei-Tags"
 
-#: src/filewriter/filewriter.c:547
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr "ursprünglichen Dateinamen"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "Dateiendung nicht entfernen"
 
-#: src/filewriter/filewriter.c:572
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr "Titelnummer vor Dateinamen anhängen"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "Automatisch"
 
@@ -1461,151 +1409,151 @@
 msgid "Joint Stereo"
 msgstr "Joint-Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:712
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr "MP3-Konfiguration"
 
-#: src/filewriter/mp3.c:735
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "Algorithmen-Qualität:"
 
-#: src/filewriter/mp3.c:760
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr "Ausgabe-Abtastfrequenz:"
 
-#: src/filewriter/mp3.c:788
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:795
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "Bitrate / Kompressionsverhältnis:"
 
-#: src/filewriter/mp3.c:819
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "Bitrate (kbps):"
 
-#: src/filewriter/mp3.c:852
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr "Kompressionsverhältnis:"
 
-#: src/filewriter/mp3.c:876
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr "Audio-Modus:"
 
-#: src/filewriter/mp3.c:901
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "Verschiedenes:"
 
-#: src/filewriter/mp3.c:912
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr "Strikte ISO-Erfüllung erzwingen"
 
-#: src/filewriter/mp3.c:923
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "Fehlerschutz"
 
-#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "Qualität"
 
-#: src/filewriter/mp3.c:945
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR aktivieren"
 
-#: src/filewriter/mp3.c:955
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/filewriter/mp3.c:988
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr "VBR-Optionen:"
 
-#: src/filewriter/mp3.c:1004
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "Minimale Bitrate (kbps):"
 
-#: src/filewriter/mp3.c:1031
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "Maximale Bitrate (kbps):"
 
-#: src/filewriter/mp3.c:1054
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr "Minimale Bitrate erzwingen"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr "ABR-Optionen:"
 
-#: src/filewriter/mp3.c:1076
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "Durchschnittliche Bitrate (kbps):"
 
-#: src/filewriter/mp3.c:1104
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr "VBR-Qualitätsstufe:"
 
-#: src/filewriter/mp3.c:1123
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr "Xing-VBR-Header nicht schreiben"
 
-#: src/filewriter/mp3.c:1137
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1147
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "Frame-Parameter:"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr "Als Copyright kennzeichnen"
 
-#: src/filewriter/mp3.c:1170
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr "Als Original kennzeichnen"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "ID3-Parameter:"
 
-#: src/filewriter/mp3.c:1193
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
 msgstr "Hinzufügen von Version-2-Tags erzwingen"
 
-#: src/filewriter/mp3.c:1203
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr "Nur v1-Tag hinzufügen"
 
-#: src/filewriter/mp3.c:1210
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr "Nur v2-Tag hinzufügen"
 
-#: src/filewriter/mp3.c:1231
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.c:236
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis-Encoder-Konfiguration"
 
-#: src/filewriter/vorbis.c:256
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "Qualitätsstufe (0 - 10):"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr "Über FLAC-Audio-Plugin"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1639,31 +1587,15 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
-msgid "Open Files"
-msgstr "Dateien öffnen"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
-msgid "Add Files"
-msgstr "Dateien hinzufügen"
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr "Audacious2"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr "GNT Interface"
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Titelnummer"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "Titel"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
 msgstr "Künstler"
 
@@ -1671,7 +1603,7 @@
 msgid "Year"
 msgstr "Jahr"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
 msgstr "Album"
 
@@ -1735,243 +1667,251 @@
 msgid "Undock"
 msgstr "Abdocken"
 
-#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: src/gtkui/menus.c:130
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
 msgstr "_Dateien öffnen ..."
 
-#: src/gtkui/menus.c:131
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
 msgstr "_URL öffnen ..."
 
-#: src/gtkui/menus.c:132
-msgid "_Add File ..."
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
 msgstr "Dateien _hinzufügen ..."
 
-#: src/gtkui/menus.c:133
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
 msgstr "U_RL hinzufügen ..."
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
 msgstr "_Info ..."
 
-#: src/gtkui/menus.c:136
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
 msgstr "_Einstellungen ..."
 
-#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: src/gtkui/menus.c:140
+#: src/gtkui/menus.c:141
 msgid "_Play"
 msgstr "_Wiedergeben"
 
-#: src/gtkui/menus.c:141
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
 msgstr "_Pause"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:143
 msgid "_Stop"
 msgstr "_Stopp"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
 msgstr "_Vorheriger"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:145
 msgid "_Next"
 msgstr "_Nächster"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
 msgstr "Wieder_holen"
 
-#: src/gtkui/menus.c:147
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
 msgstr "_Zufällige Wiedergabe"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
 msgstr "Wiedergabeliste ni_cht weiterspielen"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
 msgstr "N_ach Titel stoppen"
 
-#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
 msgstr "Titel-_Info ..."
 
-#: src/gtkui/menus.c:152
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
 msgstr "Zu Z_eitangabe springen ..."
 
-#: src/gtkui/menus.c:153
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
 msgstr "Zu _Titel sp_ringen ..."
 
-#: src/gtkui/menus.c:156
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
 msgstr "Nach Titel_nummer"
 
-#: src/gtkui/menus.c:157
+#: src/gtkui/menus.c:158
 msgid "By _Title"
 msgstr "Nach _Titel"
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
 msgstr "Nach _Künstler"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
 msgstr "Nach _Album"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
 msgstr "Nach _Erscheinungsdatum"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
 msgstr "Nach _Dateipfad"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
 msgstr "Nach _benutzerdefiniertem Titel"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
 msgstr "V_ertausche Anordnung"
 
-#: src/gtkui/menus.c:165
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
 msgstr "Zufällige Ano_rdnung"
 
-#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
 msgstr "_Aktualisieren"
 
 #: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Nicht _verfügbare Dateien entfernen"
+
+#: src/gtkui/menus.c:172
 msgid "_Sort"
 msgstr "_Sortieren"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:174
 msgid "_New"
 msgstr "_Neu"
 
-#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
 msgstr "S_chließen"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:177
 msgid "_Import ..."
 msgstr "_Importieren ..."
 
-#: src/gtkui/menus.c:176
+#: src/gtkui/menus.c:178
 msgid "_Export ..."
 msgstr "_Exportieren ..."
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:180
 msgid "_Playlist Manager ..."
 msgstr "_Wiedergabelisten-Manager ..."
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:181
 msgid "_Queue Manager ..."
 msgstr "Warte_schlangen-Manager ..."
 
-#: src/gtkui/menus.c:182
+#: src/gtkui/menus.c:184
 msgid "Volume _Up"
 msgstr "Lautstärke er_höhen"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
 msgstr "Lautstärke _verringern"
 
-#: src/gtkui/menus.c:185
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
 msgstr "_Equalizer"
 
-#: src/gtkui/menus.c:187
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
 msgstr "E_ffekte"
 
-#: src/gtkui/menus.c:190
+#: src/gtkui/menus.c:192
 msgid "_Interface"
 msgstr "_Interface"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Visualisierungen"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
 msgstr "_Menüleiste anzeigen"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
 msgstr "I_nfobereich anzeigen"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
 msgstr "_Statusleiste anzeigen"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
 msgstr "Spaltenüberschriften _anzeigen"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
 msgstr "Spalten aus_wählen ..."
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
 msgstr "Mit Titelwechsel scrol_len"
 
-#: src/gtkui/menus.c:201
+#: src/gtkui/menus.c:204
 msgid "_File"
 msgstr "_Datei"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:205
 msgid "_Playback"
 msgstr "_Wiedergabe"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
 msgstr "W_iedergabeliste"
 
-#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
 msgstr "Di_enste"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:208
 msgid "_Output"
 msgstr "_Ausgabe"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:209
 msgid "_View"
 msgstr "An_sicht"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
 msgstr "In/Aus _Warteschlange"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
 msgstr "Aus_schneiden"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:217
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:218
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:219
 msgid "Select _All"
 msgstr "_Alles auswählen"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:224
 msgid "_Rename"
 msgstr "_Umbenennen"
 
@@ -1979,7 +1919,7 @@
 msgid "GTK Interface"
 msgstr "GTK Interface"
 
-#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
@@ -1988,30 +1928,34 @@
 msgid "Buffering ..."
 msgstr "Puffern ..."
 
-#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr "Fehler"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Schließen"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "Mono"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "Stereo"
 
-#: src/gtkui/ui_statusbar.c:106
+#: src/gtkui/ui_statusbar.c:109
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d Kanal"
 msgstr[1] "%d Kanäle"
 
-#: src/gtkui/ui_statusbar.c:121
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
@@ -2056,7 +2000,7 @@
 msgid "Volume Down"
 msgstr "Lautstärke verringern"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
 msgstr "Zu Datei springen"
 
@@ -2176,7 +2120,7 @@
 msgid "Enable debug printing"
 msgstr "Debug-Ausgabe aktivieren"
 
-#: src/jack/jack.c:422
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2194,28 +2138,28 @@
 "Audacious Portierung durch\n"
 "Giacomo Lozito von develia.org"
 
-#: src/jack/jack.c:427
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
 msgstr "Über JACK Output Plugin 0.17"
 
-#: src/ladspa/plugin.c:414
+#: src/ladspa/plugin.c:415
 msgid "About LADSPA Host"
 msgstr "Über LADSPA Host"
 
-#: src/ladspa/plugin.c:515
+#: src/ladspa/plugin.c:516
 #, c-format
 msgid "%s Settings"
 msgstr "%s Einstellungen"
 
-#: src/ladspa/plugin.c:583
+#: src/ladspa/plugin.c:584
 msgid "LADSPA Host Settings"
 msgstr "LADSPA Einstellungen"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:593
 msgid "Module paths:"
 msgstr "Modulpfade:"
 
-#: src/ladspa/plugin.c:597
+#: src/ladspa/plugin.c:598
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2226,23 +2170,23 @@
 "Nach dem Hinzufügen neuer Pfade Enter drücken, um neue Plugins zu suchen.</"
 "small>"
 
-#: src/ladspa/plugin.c:613
+#: src/ladspa/plugin.c:614
 msgid "Available plugins:"
 msgstr "Verfügbare Plugins:"
 
-#: src/ladspa/plugin.c:625
+#: src/ladspa/plugin.c:626
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: src/ladspa/plugin.c:631
+#: src/ladspa/plugin.c:632
 msgid "Enabled plugins:"
 msgstr "Aktive Plugins:"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:647
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/lyricwiki/lyricwiki.c:227
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
@@ -2250,7 +2194,7 @@
 "\n"
 "Suche nach Liedtexten..."
 
-#: src/lyricwiki/lyricwiki.c:250
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
@@ -2258,7 +2202,7 @@
 "\n"
 "Verbinde zu lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:338
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
@@ -2266,11 +2210,11 @@
 "\n"
 "Keine Liedtexte gefunden."
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr "Über Metronom"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2284,12 +2228,12 @@
 "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:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takt-Generator: %d bpm"
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takt-Generator: %d bpm %d/%d"
@@ -2310,27 +2254,27 @@
 msgid "Changes take effect at the next song change."
 msgstr "Änderungen werden mit dem nächsten Titelwechsel wirksam"
 
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:336
 msgid "Upload in progress..."
 msgstr "Upload läuft..."
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:348
 msgid "Upload to MTP Device"
 msgstr "Auf MTP Gerät hochladen"
 
-#: src/mtp_up/mtp.c:311
+#: src/mtp_up/mtp.c:349
 msgid "Disconnect MTP Device"
 msgstr "MTP Gerät trennen"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
 msgstr "Gestoppt"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
 msgstr "Audacious spielt gerade nichts ab."
 
@@ -2358,30 +2302,34 @@
 msgid "Run in real time"
 msgstr "In Echtzeit ablaufen lassen"
 
-#: src/oss4/configure.c:76
+#: src/oss4/configure.c:81
 msgid "1. Default device"
 msgstr "1. Standardgerät"
 
-#: src/oss4/configure.c:132
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
 msgstr "OSS4-Ausgabeplugin-Einstellungen"
 
-#: src/oss4/configure.c:144 src/OSS/configure.c:194
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "Audiogerät:"
 
-#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "Alternatives Gerät benutzen:"
 
-#: src/oss4/configure.c:187
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
 msgstr "Lautstärke speichern"
 
-#: src/oss4/configure.c:191
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
 msgstr "Formatkonvertierung aktivieren"
 
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Exklusiv-Modus aktivieren, um virtuelles Mischen zu verhindern."
+
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "Über OSS4-Plugin"
@@ -2427,11 +2375,11 @@
 msgid "Mixer"
 msgstr "Mixer"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr "Über OSS-Treiber"
 
-#: src/pulse_audio/pulse_audio.c:687
+#: src/pulse_audio/pulse_audio.c:669
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Über Audacious-PulseAudio-Ausgabe-Plugin"
 
@@ -2455,31 +2403,31 @@
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: src/scrobbler/configure.c:143
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "Dienste"
 
-#: src/scrobbler/configure.c:165
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: src/scrobbler/configure.c:171
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr "Scrobbler-URL:"
 
-#: src/scrobbler/configure.c:211
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:238
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
@@ -2507,11 +2455,47 @@
 msgid "SDL error"
 msgstr "SDL Fehler"
 
-#: src/skins/plugin.c:165
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Genre"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Sammlung"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "Wiedergabeliste _erstellen"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "Zur Wiedergabeliste _hinzufügen"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Durchsuche Sammlung"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"Wähle einen Ordner und klicke auf \"Aktualisieren\", \n"
+"um deine Musiksammlung in Audacious zu importieren."
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Bitte warten ..."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Ordner auswählen"
+
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "Über Skinned GUI"
 
-#: src/skins/plugin.c:166
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -2603,79 +2587,112 @@
 msgid "Audacious Equalizer"
 msgstr "Audacious Equalizer"
 
-#: src/skins/ui_equalizer.c:896
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
 msgstr "Standard"
 
-#: src/skins/ui_main.c:443
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Voreinstellungen laden"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Voreinstellungen automatisch laden"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Equalizer-Voreinstellungen laden"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Speichere Voreinstellungen"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Speichere automatische Voreinstellungen"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Equalizer-Voreinstellungen speichern"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Lösche Voreinstellungen"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Lösche automatische Voreinstellungen"
+
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:451
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:458
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "Surround"
 
-#: src/skins/ui_main.c:806
+#: src/skins/ui_main.c:807
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Suche nach %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:827
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Lautstaerke: (%d%%)"
 
-#: src/skins/ui_main.c:850
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% links"
 
-#: src/skins/ui_main.c:852
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balance: Mitte"
 
-#: src/skins/ui_main.c:854
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% rechts"
 
-#: src/skins/ui_main.c:980
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Optionen"
 
-#: src/skins/ui_main.c:984
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "'Immer im Vordergrund' aus"
 
-#: src/skins/ui_main.c:986
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "'Immer im Vordergrund' an"
 
-#: src/skins/ui_main.c:989
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Dateiinformationen"
 
-#: src/skins/ui_main.c:994
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Visualisierungs-Menü"
 
-#: src/skins/ui_main.c:1648
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
 msgstr "Single-Modus."
 
-#: src/skins/ui_main.c:1650
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
 msgstr "Wiedergabelistenmodus"
 
-#: src/skins/ui_main.c:1672
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr "Nach Titel stoppen."
 
-#: src/skins/ui_main.c:1674
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
 msgstr "Nicht nach Titel stoppen."
 
@@ -3177,145 +3194,129 @@
 msgid "Clear A-B"
 msgstr "A-B leeren"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
-msgid "Jump to Playlist Start"
-msgstr "Zum Anfang der Liste springen"
-
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
 msgstr "Zu Zeitangabe springen"
 
-#: src/skins/ui_manager.c:424
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
 msgstr "In/Aus Warteschlange"
 
-#: src/skins/ui_manager.c:425
+#: src/skins/ui_manager.c:422
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Eintrag in der Wiedergabewarteschleife aktivieren/deaktivieren."
 
-#: src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:425
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/skins/ui_manager.c:432
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr "Einfügen"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "Laden"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:437
 msgid "Import"
 msgstr "Importieren"
 
-#: src/skins/ui_manager.c:441
+#: src/skins/ui_manager.c:438
 msgid "Save"
 msgstr "Speichern"
 
-#: src/skins/ui_manager.c:442
+#: src/skins/ui_manager.c:439
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
 msgstr "Voreinstellung"
 
-#: src/skins/ui_manager.c:445
-msgid "Load preset"
-msgstr "Voreinstellungen laden"
-
-#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
 msgstr "Voreinstellungen automatisch laden"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr "Voreinstellungen laden"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
 msgstr "Standardwerte in Equalizer laden"
 
-#: src/skins/ui_manager.c:453
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "Null"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
 msgstr "Equalizer Einstellungen auf Null setzen"
 
-#: src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "Aus Datei"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
 msgstr "Standardwerte aus Datei laden"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
 msgstr "Aus einer WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
 msgstr "Lade Standard aus WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
 msgstr "WinAMP Standard"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
 msgstr "Importiere WinAMP Standard"
 
 #: src/skins/ui_manager.c:466
-msgid "Save preset"
-msgstr "Speichere"
-
-#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "Speichere"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
 msgstr "Standardwerte speichern"
 
-#: src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "in Datei"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
 msgstr "Speichere in Datei"
 
-#: src/skins/ui_manager.c:477
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
 msgstr "in WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
 msgstr "Speichere in WinAMP-EQF-Datei"
 
 #: src/skins/ui_manager.c:481
-msgid "Delete preset"
-msgstr "Lösche Voreinstellungen"
-
-#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "Lösche Voreinstellungen"
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
 msgstr "Suche Einträge in aktiver Playliste"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 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 "
@@ -3328,39 +3329,39 @@
 "Ausdrücke funktionieren, geben Sie einfach nur einen Teilbegriff für Ihre "
 "Suche ein."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "Titel: "
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
 msgstr "Künstler: "
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "Dateiname: "
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr "Vorherige Auswahl vor dem Suchen löschen"
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
 msgstr "Automatisch zwischen passenden Einträgen wechseln"
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
 msgstr "Erstelle neue Playlist mit passenden Einträgen"
 
-#: src/skins/ui_playlist.c:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
 msgstr "Audacious Wiedergabelisten-Editor"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d von %d)"
@@ -3373,12 +3374,12 @@
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Nichtarchivierter Winamp 2.x-Skin"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Konnte Ordner nicht erstellen (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
 msgstr "Über das Sndfile-Plugin"
 
@@ -3410,31 +3411,31 @@
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - Konfiguration"
 
-#: src/song_change/song_change.c:447
+#: src/song_change/song_change.c:437
 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:449 src/song_change/song_change.c:455
-#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
 msgstr "Befehl:"
 
-#: src/song_change/song_change.c:453
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
 msgstr "Auszuführender Befehl am Ende eines Lieds."
 
-#: src/song_change/song_change.c:459
+#: src/song_change/song_change.c:449
 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:465
+#: src/song_change/song_change.c:455
 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:471
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3469,7 +3470,7 @@
 "%b: Album\n"
 "%T: Titelname"
 
-#: src/song_change/song_change.c:498
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -3477,19 +3478,19 @@
 "Parameter sollten zwischen Anführungszeichen stehen, ohne "
 "besteht ein Sicherheitsrisiko."
 
-#: src/song_change/song_change.c:509
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr "Befehle"
 
-#: src/song_change/song_change.c:539
+#: src/song_change/song_change.c:529
 msgid "Song Change"
 msgstr "Songwechsel"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr "Über Status-Icon-Plugin"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3507,46 +3508,50 @@
 "Dieses Plugin stellt ein Status-Icon bereit, welches\n"
 "im System-Tray des Fenstermanagers angezeigt wird.\n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr "Status-Icon-Plugin - Einstellungen"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr "Rechtsklick-Menü"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
 msgstr "Kleines Wiedergabe-Menü #1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
 msgstr "Kleines Wiedergabe-Menü #2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr "Maus-Scroll-Aktion"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "Lautstärke ändern"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
 msgstr "Aktiven Titel ändern"
 
-#: src/statusicon/statusicon.c:500
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
 msgstr "Andere Einstellungen"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
 msgstr "PopUp-Fenster deaktivieren"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
 msgstr "In den Informationsbereich beenden (System-Tray)"
 
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Durch Hochscrollen in Wiedergabeliste fortschreiten"
+
 #: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
@@ -3565,64 +3570,11 @@
 msgid "Configure Extra Stereo"
 msgstr "Extra Stereo konfigurieren"
 
-#: src/streambrowser/gui/streambrowser_win.c:78
-msgid "Search:"
-msgstr "Suchen:"
-
-#: src/streambrowser/gui/streambrowser_win.c:97
-#: src/streambrowser/gui/streambrowser_win.c:372
-msgid "Add Bookmark"
-msgstr "Lesezeichen setzen"
-
-#: src/streambrowser/gui/streambrowser_win.c:324
-msgid "Stream name"
-msgstr "Streamname"
-
-#: src/streambrowser/gui/streambrowser_win.c:331
-msgid "Now playing"
-msgstr "Aktueller Song"
-
-#: src/streambrowser/gui/streambrowser_win.c:369
-msgid "Remove Bookmark"
-msgstr "Lesezeichen entfernen"
-
-#: src/streambrowser/streambrowser.c:330
-msgid "About Stream Browser"
-msgstr "Über Streambrowser"
-
-#: src/streambrowser/streambrowser.c:331
-msgid ""
-"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming "
-"directories.\n"
-"Many thanks to the Streamtuner developers <http://www.nongnu.org/"
-"streamtuner>,\n"
-"\tand of course to the whole Audacious community.\n"
-"\n"
-"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-"\n"
-"This was a Google Summer of Code 2008 project."
-msgstr ""
-"Copyright (c) 2008, von Calin Crisan <ccrisan@gmail.com> und dem Audacious "
-"Team.\n"
-"\n"
-"Dies ist ein simpler Streambrowser, welcher die beliebtesten Streaming-"
-"verzeichnisse beinhaltet.\n"
-"Vielen Dank an die Streamtuner Entwickler <http://www.nongnu.org/"
-"streamtuner>,\n"
-"\tund natürlich an die ganze Audacious Community.\n"
-"\n"
-"Vielen Dank auch nochmal an Tony Vroon für die Beratung und Führung.\n"
-"\n"
-"Dies war ein Google Summer of Code 2008 Projekt."
-
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr "Über Ton-Generator"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3637,12 +3589,12 @@
 "frequency3;...\n"
 "z.B. tone://2000;2005 für einen Ton mit 2000Hz und einen mit 2005Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr "Ton-Generator: "
 
@@ -3650,11 +3602,11 @@
 msgid "About File I/O Plugin"
 msgstr "Über File I/O Plugin"
 
-#: src/vorbis/vorbis.c:572
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Über Ogg-Vorbis-Audio-Plugin"
 
-#: src/vorbis/vorbis.c:577
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -3676,7 +3628,7 @@
 "\n"
 "Original-Code von\n"
 "Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-"Contributions from\n"
+"Beiträge von\n"
 "Chris Montgomery <monty@xiph.org>\n"
 "Peter Alm <peter@xmms.org>\n"
 "Michael Smith <msmith@labyrinth.edu.au>\n"

audacious-plugins-3.1.1.tar.bz2/po/es.po -> audacious-plugins-3.2.4.tar.bz2/po/es.po Changed

@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
+# Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012.
 # Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010.
 # Jorge Andrés <winninglero@gmail.com>, 2011.
 # <xukosky@yahoo.es>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUDPLUG\n"
-"POT-Creation-Date: 2011-11-15 22:40-0500\n"
-"PO-Revision-Date: 2011-11-17 18:30+0000\n"
-"Last-Translator: xukosky <xukosky@yahoo.es>\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 09:01-0500\n"
+"PO-Revision-Date: 2012-01-12 04:29+0000\n"
+"Last-Translator: Adrián Ramirez Escalante <buried.prophet@gmail.com>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,13 +28,13 @@
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
 msgstr ""
-"Usando libfaad2-%s para decodificar.\n"
-"FAAD2 AAC/HE-AAC/HE-AACv2/DRM decodificador (c) Nero AG, www.nero.com\n"
+"Utilizando libfaad2-%s para decodificar.\n"
+"Decodificador FAAD2 AAC/HE-AAC/HE-AACv2/DRM (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 El equipo de Audacious"
 
 #: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
-msgstr "Acerca del complemento decodificador MP4 AAC"
+msgstr "Cargar ecualizador predefinido"
 
 #: src/alarm/alarm.c:312
 msgid "About Alarm"
@@ -98,7 +99,8 @@
 #: src/alarm/interface.c:533 src/alarm/interface.c:581
 #: src/alarm/interface.c:629 src/alarm/interface.c:677
 #: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -358,7 +360,7 @@
 msgid "ALSA error"
 msgstr "Error de ALSA"
 
-#: src/amidi-plug/amidi-plug.c:325
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -744,19 +746,19 @@
 msgid "None"
 msgstr "Ninguno"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "Reproducción iniciada"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Avisa cuando se reproduce un elemento de la lista de reproducción."
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "Cambio de título"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
@@ -766,142 +768,142 @@
 "el nombre de archivo es el mismo. Esto es principalmente útil para mostrar "
 "cambios de título en los flujos de Internet."
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "Cambio de volumen"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
 msgstr "Avisa cuando se cambia el volumen."
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
 msgstr "Inicio de pausa"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
 msgstr "Avisa cuando la reproducción es pausada."
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
 msgstr "Fin de pausa"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Avisa cuando la reproducción se reanuda."
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "Colocación"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
 msgstr "Desplazamiento X relativo:"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
 msgstr "Desplazamiento Y relativo:"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr "Ancho máximo:"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr "Opciones multi-monitor"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
 msgstr "Mostrar notificaciones utilizando:"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "todos los monitores"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "Temporización (ms)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "Desvanecimiento de entrada:"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "Desvanecimiento de salida:"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "Tipografía %i:"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "Internacionalización"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "Deshabilitar la conversión de texto UTF-8 (en notificaciones)"
 
-#: src/aosd/aosd_ui.c:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "Seleccione un archivo de temas"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr "Estilo de renderizado"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "Colores"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "Color %i:"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr "Tema personalizado"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "Archivo de temas:"
 
-#: src/aosd/aosd_ui.c:672
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "Examinar"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "Activar disparador"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "Evento"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
 msgstr "Administrador de composición detectado"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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"
@@ -909,72 +911,72 @@
 "Administrador de composición no detectado;\n"
 "a menos que sepa que tiene uno ejecutándose, por favor active un administrador de composición o las notificaciones no funcionarán correctamente"
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 msgid "Composite manager not required for fake transparency"
 msgstr "Administrador de composición no necesario para transparencia falsa"
 
-#: src/aosd/aosd_ui.c:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr "Transparencia falsa"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparencia real (requiere composición 3D)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
 msgstr "Extensión de composición no cargada"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
 msgstr "Extensión de composición no disponible"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr "Notificaciones de Audacious"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
 msgstr "Notificaciones de Audacious - configuración"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr "Probar"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "Posición"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "Animación"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "Decoración"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "Disparador"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "Varios"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
 msgstr "Notificaciones de Audacious - acerca de"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
@@ -982,7 +984,7 @@
 "\n"
 "Notificaciones de Audacious"
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1028,11 +1030,11 @@
 msgid "Presets:"
 msgstr "Predefinidos:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:241
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
 msgstr "Acerca del complemento de CD de música"
 
-#: src/cdaudio-ng/cdaudio-ng.c:242
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
@@ -1056,15 +1058,15 @@
 "\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:550
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
 msgstr "CD de música"
 
-#: src/cdaudio-ng/cdaudio-ng.c:922
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
 msgstr "La unidad está vacía."
 
-#: src/cdaudio-ng/cdaudio-ng.c:924
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
 msgstr "Tipo de disco no soportado."
 
@@ -1301,7 +1303,7 @@
 msgid "Volume: (%)"
 msgstr "Volumen: (%)"
 
-#: src/ffaudio/ffaudio-core.c:784
+#: src/ffaudio/ffaudio-core.c:725
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1328,7 +1330,7 @@
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:798
+#: src/ffaudio/ffaudio-core.c:739
 msgid "About FFaudio Plugin"
 msgstr "Acerca del complemento FFaudio"
 
@@ -1336,55 +1338,55 @@
 msgid "About FileWriter-Plugin"
 msgstr "Acerca del complemento escritor de archivos"
 
-#: src/filewriter/filewriter.c:455
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "Configuración del escritor de archivos"
 
-#: src/filewriter/filewriter.c:467
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "Formato del archivo de salida:"
 
-#: src/filewriter/filewriter.c:485
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "Configurar"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "Guardar dentro del directorio original"
 
-#: src/filewriter/filewriter.c:505
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr "Guardar dentro de directorio personalizado"
 
-#: src/filewriter/filewriter.c:515
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "Carpeta de archivo de salida:"
 
-#: src/filewriter/filewriter.c:519
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr "Elija una carpeta"
 
-#: src/filewriter/filewriter.c:538
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr "Obtener nombre de archivo desde:"
 
-#: src/filewriter/filewriter.c:541
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr "etiquetas del archivo original"
 
-#: src/filewriter/filewriter.c:547
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr "nombre del archivo original"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "No quitar la extensión del archivo"
 
-#: src/filewriter/filewriter.c:572
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr "Anteponer el número de pista al nombre de archivo"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "Auto"
 
@@ -1392,151 +1394,151 @@
 msgid "Joint Stereo"
 msgstr "Estéreo conjunto"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "Estereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:712
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr "Configuración MP3"
 
-#: src/filewriter/mp3.c:735
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "Calidad del algoritmo:"
 
-#: src/filewriter/mp3.c:760
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr "Frecuencia de muestreo de salida:"
 
-#: src/filewriter/mp3.c:788
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:795
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "Tasa de bits / Compresión:"
 
-#: src/filewriter/mp3.c:819
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "Tasa de bits (kbps):"
 
-#: src/filewriter/mp3.c:852
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr "Compresión:"
 
-#: src/filewriter/mp3.c:876
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr "Modo de sonido:"
 
-#: src/filewriter/mp3.c:901
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "Varios:"
 
-#: src/filewriter/mp3.c:912
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr "Cumplir estrictamente la norma ISO"
 
-#: src/filewriter/mp3.c:923
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "Error de protección"
 
-#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "Calidad"
 
-#: src/filewriter/mp3.c:945
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr "Activar VBR/ABR"
 
-#: src/filewriter/mp3.c:955
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.c:988
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr "Opciones VBR:"
 
-#: src/filewriter/mp3.c:1004
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "Tasa de bits mínima (kbps):"
 
-#: src/filewriter/mp3.c:1031
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "Tasa de bits máxima (kbps):"
 
-#: src/filewriter/mp3.c:1054
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr "Aplicar estrictamente la tasa de bits mínima"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr "Opciones ABR:"
 
-#: src/filewriter/mp3.c:1076
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "Tasa de bits promedio (kbps):"
 
-#: src/filewriter/mp3.c:1104
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr "Nivel de calidad VBR:"
 
-#: src/filewriter/mp3.c:1123
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr "No escribir la cabecera VBR Xing"
 
-#: src/filewriter/mp3.c:1137
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1147
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "Prametros de cuadro:"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr "Marcar como derechos de autor"
 
-#: src/filewriter/mp3.c:1170
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr "Marcar como original"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "Parametros ID3:"
 
-#: src/filewriter/mp3.c:1193
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
 msgstr "Forzar adición de etiqueta de la versión 2"
 
-#: src/filewriter/mp3.c:1203
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr "Solo agregar etiqueta v1"
 
-#: src/filewriter/mp3.c:1210
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr "Solo agregar etiqueta v2"
 
-#: src/filewriter/mp3.c:1231
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.c:236
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Configuración de codificador Vorbis"
 
-#: src/filewriter/vorbis.c:256
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "Nivel de calidad (0 - 10):"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr "Acerca del complemento de sonido FLAC"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1569,31 +1571,15 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
-msgid "Open Files"
-msgstr "Abrir archivos"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
-msgid "Add Files"
-msgstr "Añadir archivos"
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr "Audacious2"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr "Interfaz gnt"
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
 msgstr "Artista"
 
@@ -1601,7 +1587,7 @@
 msgid "Year"
 msgstr "Año"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
 msgstr "Album"
 
@@ -1665,243 +1651,251 @@
 msgid "Undock"
 msgstr "Desacoplar"
 
-#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: src/gtkui/menus.c:130
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
 msgstr "_Abrir archivos ..."
 
-#: src/gtkui/menus.c:131
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
 msgstr "Abrir _URL ..."
 
-#: src/gtkui/menus.c:132
-msgid "_Add File ..."
-msgstr "Aña_dir archivo ..."
-
 #: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "_Añadir archivos ..."
+
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
 msgstr "Añadir U_RL ..."
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
 msgstr "A_cerca de ..."
 
-#: src/gtkui/menus.c:136
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
 msgstr "_Preferencias"
 
-#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Salir"
 
-#: src/gtkui/menus.c:140
+#: src/gtkui/menus.c:141
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.c:141
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
 msgstr "Pa_usar"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:143
 msgid "_Stop"
 msgstr "_Detener"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:145
 msgid "_Next"
 msgstr "Si_guiente"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
 msgstr "R_epetir"
 
-#: src/gtkui/menus.c:147
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
 msgstr "_Orden aleatorio"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
 msgstr "No avan_zar la lista de reproducción"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
 msgstr "_Detener tras esta canción"
 
-#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
 msgstr "_Información de la canción ..."
 
-#: src/gtkui/menus.c:152
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
 msgstr "_Saltar en el tiempo ..."
 
-#: src/gtkui/menus.c:153
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
 msgstr "Saltar a la _canción ..."
 
-#: src/gtkui/menus.c:156
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
 msgstr "Por _número de pista"
 
-#: src/gtkui/menus.c:157
+#: src/gtkui/menus.c:158
 msgid "By _Title"
 msgstr "Por _título"
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
 msgstr "Por _artista"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
 msgstr "Por a_lbum"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
 msgstr "Por _fecha de estreno"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
 msgstr "Por _ruta de archivo"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
 msgstr "Por título _personalizado"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
 msgstr "Orden _inverso"
 
-#: src/gtkui/menus.c:165
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
 msgstr "Orden alea_torio"
 
-#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
 msgstr "A_ctualizar"
 
 #: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Eliminar archivos _no disponibles"
+
+#: src/gtkui/menus.c:172
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:174
 msgid "_New"
 msgstr "_Nuevo"
 
-#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:177
 msgid "_Import ..."
 msgstr "_Importar ..."
 
-#: src/gtkui/menus.c:176
+#: src/gtkui/menus.c:178
 msgid "_Export ..."
 msgstr "_Exportar ..."
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:180
 msgid "_Playlist Manager ..."
 msgstr "_Gestor de listas de reproducción ..."
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:181
 msgid "_Queue Manager ..."
 msgstr "Gestor de _colas ..."
 
-#: src/gtkui/menus.c:182
+#: src/gtkui/menus.c:184
 msgid "Volume _Up"
 msgstr "_Subir volumen"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
 msgstr "_Bajar volumen"
 
-#: src/gtkui/menus.c:185
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
 msgstr "_Ecualizador"
 
-#: src/gtkui/menus.c:187
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
 msgstr "E_fectos"
 
-#: src/gtkui/menus.c:190
+#: src/gtkui/menus.c:192
 msgid "_Interface"
 msgstr "_Interfaz"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Visualizaciones"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
 msgstr "_Mostrar barra de menú"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
 msgstr "Mostrar barra de _información"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _estado"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
 msgstr "Mostrar _cabeceras de columna"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
 msgstr "_Seleccionar columnas ..."
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
 msgstr "A_vanzar al cambiar de canción"
 
-#: src/gtkui/menus.c:201
+#: src/gtkui/menus.c:204
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:205
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
 msgstr "_Lista de reproducción"
 
-#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:208
 msgid "_Output"
 msgstr "Sali_da"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:209
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
 msgstr "_Encolar/desencolar"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:217
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:218
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:219
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:224
 msgid "_Rename"
 msgstr "_Renombrar"
 
@@ -1909,7 +1903,7 @@
 msgid "GTK Interface"
 msgstr "Interfaz GTK"
 
-#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
@@ -1918,30 +1912,34 @@
 msgid "Buffering ..."
 msgstr "Gestión de memoria intermedia ..."
 
-#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr "Error"
 
-#: src/gtkui/ui_statusbar.c:103 src/skins/ui_main.c:459
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Cerrar"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:458
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/gtkui/ui_statusbar.c:107
+#: src/gtkui/ui_statusbar.c:109
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canales"
 
-#: src/gtkui/ui_statusbar.c:122
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
@@ -1986,7 +1984,7 @@
 msgid "Volume Down"
 msgstr "Bajar volumen"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
 msgstr "Ir al archivo"
 
@@ -2104,7 +2102,7 @@
 msgid "Enable debug printing"
 msgstr "Activar mensajes de depuración"
 
-#: src/jack/jack.c:422
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2122,28 +2120,28 @@
 "Portado a Audacious por\n"
 "Giacomo Lozito de develia.org"
 
-#: src/jack/jack.c:427
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
 msgstr "Acerca del complemento de salida JACK 0.17"
 
-#: src/ladspa/plugin.c:414
+#: src/ladspa/plugin.c:415
 msgid "About LADSPA Host"
 msgstr "Acerca del servidor LADSPA"
 
-#: src/ladspa/plugin.c:515
+#: src/ladspa/plugin.c:516
 #, c-format
 msgid "%s Settings"
 msgstr "Ajustes %s"
 
-#: src/ladspa/plugin.c:583
+#: src/ladspa/plugin.c:584
 msgid "LADSPA Host Settings"
 msgstr "Ajustes del servidor LADSPA"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:593
 msgid "Module paths:"
 msgstr "Rutas de complementos:"
 
-#: src/ladspa/plugin.c:597
+#: src/ladspa/plugin.c:598
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2153,23 +2151,23 @@
 "Estas rutas se utilizan además de LADSPA_PATH.\n"
 "Tras añadir nuevas rutas, pulse Intro para buscar complementos nuevos."
 
-#: src/ladspa/plugin.c:613
+#: src/ladspa/plugin.c:614
 msgid "Available plugins:"
 msgstr "Complementos disponibles:"
 
-#: src/ladspa/plugin.c:625
+#: src/ladspa/plugin.c:626
 msgid "Enable"
 msgstr "Activar"
 
-#: src/ladspa/plugin.c:631
+#: src/ladspa/plugin.c:632
 msgid "Enabled plugins:"
 msgstr "Complementos activos:"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:647
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/lyricwiki/lyricwiki.c:269
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
@@ -2177,7 +2175,7 @@
 "\n"
 "Buscando letras ..."
 
-#: src/lyricwiki/lyricwiki.c:293
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
@@ -2185,7 +2183,7 @@
 "\n"
 "Conectando a lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:381
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
@@ -2193,11 +2191,11 @@
 "\n"
 "No se encontraron letras."
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr "Acerca del metrónomo"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2211,12 +2209,12 @@
 "p. ej. tact://77 para reproducir 77 pulsos por minuto\n"
 "o tact://60*3/4 para reproducir 60 ppm en 3/4 tactos"
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de tacto: %d ppm"
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generador de tacto: %d ppm %d/%d"
@@ -2237,27 +2235,27 @@
 msgid "Changes take effect at the next song change."
 msgstr "Los cambios se aplicarán en el siguiente cambio de canción."
 
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
 msgstr "Envolvente"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
 msgstr "Carga en progreso..."
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
 msgstr "Cargar a un dispositivo MTP"
 
-#: src/mtp_up/mtp.c:311
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
 msgstr "Desconectar dispositivo MTP"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
 msgstr "Detenido"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
 msgstr "Audacious no está reproduciendo."
 
@@ -2285,30 +2283,34 @@
 msgid "Run in real time"
 msgstr "Ejecutar en tiempo real"
 
-#: src/oss4/configure.c:76
+#: src/oss4/configure.c:81
 msgid "1. Default device"
 msgstr "1. Dispositivo predeterminado"
 
-#: src/oss4/configure.c:132
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
 msgstr "Preferencias del complemento de salida OSS4"
 
-#: src/oss4/configure.c:144 src/OSS/configure.c:194
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "Dispositivo de sonido:"
 
-#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "Utilizar dispositivo alternativo:"
 
-#: src/oss4/configure.c:187
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
 msgstr "Guardar volumen entre sesiones"
 
-#: src/oss4/configure.c:191
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
 msgstr "Activar conversiones de formato realizadas por el software OSS."
 
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Activa el modo exclusivo para evitar la mezcla virtual."
+
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "Acerca del complemento OSS4"
@@ -2354,11 +2356,11 @@
 msgid "Mixer"
 msgstr "Mezclador"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr "Acerca del complemento OSS"
 
-#: src/pulse_audio/pulse_audio.c:673
+#: src/pulse_audio/pulse_audio.c:669
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Acerca del complemento de salida PulseAudio"
 
@@ -2382,31 +2384,31 @@
 msgid "Method:"
 msgstr "Método:"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr "Cambiar la contraseña"
 
-#: src/scrobbler/configure.c:143
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "Servicios"
 
-#: src/scrobbler/configure.c:165
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: src/scrobbler/configure.c:171
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr "URL del Scrobbler:"
 
-#: src/scrobbler/configure.c:211
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:238
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
@@ -2432,11 +2434,47 @@
 msgid "SDL error"
 msgstr "Error SDL"
 
-#: src/skins/plugin.c:165
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Género"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Biblioteca"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Crear lista de reproducción"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Añadir a la lista de reproducción"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Buscar biblioteca"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"Para importar su biblioteca musical en Audacious, seleccione una carpeta y "
+"pulse el botón «actualizar»."
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Espere por favor..."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Seleccione un directorio"
+
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "Acerca del interfaz con soporte de temas"
 
-#: src/skins/plugin.c:166
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -2526,79 +2564,112 @@
 msgid "Audacious Equalizer"
 msgstr "Ecualizador de Audacious"
 
-#: src/skins/ui_equalizer.c:896
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
 msgstr "Predefinidos"
 
-#: src/skins/ui_main.c:443
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Cargar predefinido"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Cargar auto-predefinido"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Cargar ecualizador predefinido"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Guardar predefinido"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Guardar auto-predefinido"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Guardar ecualizador predefinido"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Borrar predefinido"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Borrar auto-predefinido"
+
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:451
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:458
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "envolvente"
 
-#: src/skins/ui_main.c:806
+#: src/skins/ui_main.c:807
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Ir a la posición %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:827
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volumen: %d%%"
 
-#: src/skins/ui_main.c:850
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% izquierda"
 
-#: src/skins/ui_main.c:852
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balance: centrado"
 
-#: src/skins/ui_main.c:854
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% derecha"
 
-#: src/skins/ui_main.c:980
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Menú de opciones"
 
-#: src/skins/ui_main.c:984
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Desactivar 'Siempre encima'"
 
-#: src/skins/ui_main.c:986
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Activar 'Siempre encima'"
 
-#: src/skins/ui_main.c:989
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Caja de información de archivo"
 
-#: src/skins/ui_main.c:994
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Menú de visualización"
 
-#: src/skins/ui_main.c:1648
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
 msgstr "Modo único."
 
-#: src/skins/ui_main.c:1650
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
 msgstr "Modo de lista de reproducción."
 
-#: src/skins/ui_main.c:1672
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr "Parar después de la canción."
 
-#: src/skins/ui_main.c:1674
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
 msgstr "No parar después de la canción."
 
@@ -3108,145 +3179,129 @@
 msgid "Clear A-B"
 msgstr "Quitar A-B"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
-msgid "Jump to Playlist Start"
-msgstr "Saltar al inicio de la lista"
-
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
 msgstr "Saltar en el tiempo"
 
-#: src/skins/ui_manager.c:424
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
 msgstr "Conmutar cola"
 
-#: src/skins/ui_manager.c:425
+#: src/skins/ui_manager.c:422
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Activa/desactiva las entradas en la lista de reproducción."
 
-#: src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:425
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/ui_manager.c:432
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "Cargar"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:437
 msgid "Import"
 msgstr "Importar"
 
-#: src/skins/ui_manager.c:441
+#: src/skins/ui_manager.c:438
 msgid "Save"
 msgstr "Guardar"
 
-#: src/skins/ui_manager.c:442
+#: src/skins/ui_manager.c:439
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
 msgstr "Predefinido"
 
-#: src/skins/ui_manager.c:445
-msgid "Load preset"
-msgstr "Cargar predefinido"
-
-#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
 msgstr "Auto-cargar predefinido"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr "Cargar auto-cargar predefinido"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
 msgstr "Cargar el predefinido predeterminado en el ecualizador"
 
-#: src/skins/ui_manager.c:453
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "Cero"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
 msgstr "Pone los niveles predefinidos del ecualizador a cero"
 
-#: src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "Desde archivo"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
 msgstr "Cargar el predefinido desde un archivo"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
 msgstr "Desde archivo"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
 msgstr "Carga el predefinido desde un archivo EQF de WinAMP"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
 msgstr "Predefinidos de WinAMP"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
 msgstr "Importar los predefindos de WinAMP"
 
 #: src/skins/ui_manager.c:466
-msgid "Save preset"
-msgstr "Guardar predefinido"
-
-#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "Guardar auto-cargar predefinido"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
 msgstr "Guardar predefinido predeterminado"
 
-#: src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "A un archivo"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
 msgstr "Guarda el predefinido en un archivo"
 
-#: src/skins/ui_manager.c:477
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
 msgstr "A un archivo EQF de WinAMP"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
 msgstr "Guarda el predefinido en un archivo EQF de WinAMP"
 
 #: src/skins/ui_manager.c:481
-msgid "Delete preset"
-msgstr "Borrar predefinido"
-
-#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "Borrar auto-cargar predefinido"
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
 msgstr "Buscar entradas en la lista de reproducción activa"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 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 "
@@ -3258,39 +3313,39 @@
 "mayúsculas de minúsculas. Si no sabe como funcionan las expresiones "
 "regulares, tan solo escriba la parte del literal que quiere buscar."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "Título: "
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr "Álbum: "
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
 msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "Nombre del archivo: "
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr "Limpiar la selección previa antes de buscar"
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
 msgstr "Conmutar automáticamente la cola para las entradas coincidentes"
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
 msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
 
-#: src/skins/ui_playlist.c:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
 msgstr "Editor de listas de reproducción de Audacious"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
@@ -3303,12 +3358,12 @@
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Tema para Winamp 2.x no archivado"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "No se pudo crear el directorio (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
 msgstr "Acerca del complemento de archivos de sonido"
 
@@ -3340,33 +3395,33 @@
 msgid "SndStretch - Configuration"
 msgstr "Extensor de sonido - Configuración"
 
-#: src/song_change/song_change.c:447
+#: src/song_change/song_change.c:437
 msgid "Command to run when Audacious starts a new song."
 msgstr "Comando a ejecutar cuando Audacious reproduce una canción nueva."
 
-#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
-#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/song_change/song_change.c:453
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
 msgstr "Comando para ejecutar al final de una canción."
 
-#: src/song_change/song_change.c:459
+#: src/song_change/song_change.c:449
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 "Comando para ejecutar cuando Audacious llega al final de una lista de "
 "reproducción."
 
-#: src/song_change/song_change.c:465
+#: src/song_change/song_change.c:455
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "Comando para ejecutar cuando el título cambia para una canción (es decir, "
 "títulos de flujos en red)"
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3400,7 +3455,7 @@
 "%b: Álbum\n"
 "%T: Título de la pista"
 
-#: src/song_change/song_change.c:498
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -3408,19 +3463,19 @@
 "Los parámetros enviados a la consola se deberían "
 "encapsular con comillas. De otra forma existe un riesgo de seguridad."
 
-#: src/song_change/song_change.c:509
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/song_change/song_change.c:539
+#: src/song_change/song_change.c:529
 msgid "Song Change"
 msgstr "Cambio de canción"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr "Acerca del complemento de icono de estado"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3438,46 +3493,50 @@
 "Este complemento proporciona un icono de estado, situado\n"
 "en la bandeja de sistema del gestor de ventanas.\n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr "Complemento de icono de estado - Preferencias"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr "Menú con click derecho"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
 msgstr "Menú pequeño de reproducción #1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
 msgstr "Menú pequeño de reproducción #2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr "Acción de la rueda del ratón"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "Cambiar el volumen"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
 msgstr "Cambiar la canción en reproducción"
 
-#: src/statusicon/statusicon.c:500
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
 msgstr "Otros ajustes"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
 msgstr "Desactivar la ventana emergente"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
 msgstr "Cerrar al área de notificación (bandeja de sistema)"
 
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Avanzar en la lista de reproducción al desplazar arriba"
+
 #: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
@@ -3496,59 +3555,11 @@
 msgid "Configure Extra Stereo"
 msgstr "Configurar estéreo extra"
 
-#: src/streambrowser/gui/streambrowser_win.c:78
-msgid "Search:"
-msgstr "Buscar:"
-
-#: src/streambrowser/gui/streambrowser_win.c:97
-#: src/streambrowser/gui/streambrowser_win.c:372
-msgid "Add Bookmark"
-msgstr "Añadir marcador"
-
-#: src/streambrowser/gui/streambrowser_win.c:324
-msgid "Stream name"
-msgstr "Nombre del flujo"
-
-#: src/streambrowser/gui/streambrowser_win.c:331
-msgid "Now playing"
-msgstr "Reproduciendo"
-
-#: src/streambrowser/gui/streambrowser_win.c:369
-msgid "Remove Bookmark"
-msgstr "Eliminar marcador"
-
-#: src/streambrowser/streambrowser.c:330
-msgid "About Stream Browser"
-msgstr "Acerca del navegador de flujos"
-
-#: src/streambrowser/streambrowser.c:331
-msgid ""
-"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming directories.\n"
-"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
-"\tand of course to the whole Audacious community.\n"
-"\n"
-"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-"\n"
-"This was a Google Summer of Code 2008 project."
-msgstr ""
-"Copyright (c) 2008, por Calin Crisan <ccrisan@gmail.com> y el equipo de Audacious.\n"
-"\n"
-"Este es un navegador de flujos simple que incluye los directorios de flujos más populares.\n"
-"Muchas gracias a los desarrolladores de Streamtuner\n"
-"<http://www.nongnu.org/streamtuner>,\n"
-"»y por supuesto a toda la comunidad de Audacious.\n"
-"\n"
-"También gracias a ti Tony Vroon por ser mi tutor y guía, otra vez.\n"
-"\n"
-"Este fue un proyecto del Google Summer of Code 2008."
-
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr "Acerca del generador de tonos"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3562,12 +3573,12 @@
 "Para utilizarlo, añada una URL: tone://frequencia1;frequencia2;frequencia3;...\n"
 "p. ej. tone://2000;2005 para reproducir un tono de 2000Hz y otro de 2005Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr "Generador de tonos: "
 
@@ -3575,11 +3586,11 @@
 msgid "About File I/O Plugin"
 msgstr "Acerca del complemento de archivos de E/S"
 
-#: src/vorbis/vorbis.c:572
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Acerca del complemento de sonido Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:577
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"

audacious-plugins-3.2.4.tar.bz2/po/es_AR.po Added

@@ -0,0 +1,3666 @@
+# Argentinian Spanish translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012.
+# Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010.
+# Jorge Andrés <winninglero@gmail.com>, 2011.
+# <xukosky@yahoo.es>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 09:01-0500\n"
+"PO-Revision-Date: 2012-01-12 11:23+0000\n"
+"Last-Translator: Adrián Ramirez Escalante <buried.prophet@gmail.com>\n"
+"Language-Team: Spanish (Argentinian)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/aac/libmp4.c:256
+#, c-format
+msgid ""
+"Using libfaad2-%s for decoding.\n"
+"FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
+"Copyright (c) 2005-2006 Audacious team"
+msgstr ""
+"Utilizando libfaad2-%s para decodificar.\n"
+"Decodificador FAAD2 AAC/HE-AAC/HE-AACv2/DRM (c) Nero AG, www.nero.com\n"
+"Copyright (c) 2005-2006 El equipo de Audacious"
+
+#: src/aac/libmp4.c:261
+msgid "About MP4 AAC decoder plugin"
+msgstr "Cargar ecualizador predefinido"
+
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "Acerca de la alarma"
+
+#: src/alarm/alarm.c:313
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr ""
+"Un complemento que se puede utilizar para empezar la reproducción a una hora concreta.\n"
+"\n"
+"Originalmente escrito por Adam Feakin y Daniel Stodden."
+
+#: src/alarm/interface.c:33
+msgid "Alarm"
+msgstr "Alarma"
+
+#: src/alarm/interface.c:40
+msgid "This is your wakeup call."
+msgstr "Esta es su llamada despertador"
+
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
+msgid "OK"
+msgstr "Aceptar"
+
+#: src/alarm/interface.c:214
+msgid "Alarm Settings"
+msgstr "Configuración de la alarma"
+
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
+msgid "Time"
+msgstr "Tiempo"
+
+#: src/alarm/interface.c:270
+msgid "hours"
+msgstr "horas"
+
+#: src/alarm/interface.c:331
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:361
+msgid "minutes"
+msgstr "minutos"
+
+#: src/alarm/interface.c:379
+msgid "Quiet after:"
+msgstr "Silencio tras:"
+
+#: src/alarm/interface.c:389
+msgid "Alarm at (default):"
+msgstr "Alarma a (predeterminado):"
+
+#: src/alarm/interface.c:409
+msgid "Choose the days for the alarm to come on"
+msgstr "Seleccione los días para que salte la alarma"
+
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
+msgid "Default"
+msgstr "Predeterminado"
+
+#: src/alarm/interface.c:763
+msgid "Day"
+msgstr "Día"
+
+#: src/alarm/interface.c:783
+msgid "Tuesday"
+msgstr "Martes"
+
+#: src/alarm/interface.c:794
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#: src/alarm/interface.c:805
+msgid "Thursday"
+msgstr "Jueves"
+
+#: src/alarm/interface.c:816
+msgid "Friday"
+msgstr "Viernes"
+
+#: src/alarm/interface.c:827
+msgid "Saturday"
+msgstr "Sábado"
+
+#: src/alarm/interface.c:838
+msgid "Sunday"
+msgstr "Domingo"
+
+#: src/alarm/interface.c:848
+msgid "Monday"
+msgstr "Lunes"
+
+#: src/alarm/interface.c:859
+msgid "Days"
+msgstr "Días"
+
+#: src/alarm/interface.c:875
+msgid "Fading"
+msgstr "Desvanecimiento"
+
+#: src/alarm/interface.c:912
+msgid "seconds"
+msgstr "segundos"
+
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
+msgid "Volume"
+msgstr "Volumen"
+
+#: src/alarm/interface.c:946
+msgid "Current"
+msgstr "Actual"
+
+#: src/alarm/interface.c:954
+msgid "Start at"
+msgstr "Iniciar a"
+
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:998
+msgid "Final"
+msgstr "Final"
+
+#: src/alarm/interface.c:1051
+msgid "Additional Command"
+msgstr "Comando adicional"
+
+#: src/alarm/interface.c:1077
+msgid "enable"
+msgstr "activar"
+
+#: src/alarm/interface.c:1085
+msgid "Playlist (optional)"
+msgstr "Lista de reproducción (opcional)"
+
+#: src/alarm/interface.c:1111
+msgid "Browse..."
+msgstr "Examinar..."
+
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
+msgid "Reminder"
+msgstr "Recordatorio"
+
+#: src/alarm/interface.c:1136
+msgid "Use reminder"
+msgstr "Utilizar recordatorio"
+
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Opciones"
+
+#: src/alarm/interface.c:1160
+msgid "What do these options mean?"
+msgstr "¿Qué significan estas opciones?"
+
+#: src/alarm/interface.c:1188
+msgid ""
+"\n"
+"Time\n"
+" Alarm at: \n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet After: \n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+"Volume\n"
+" Fading: \n"
+" Fade the volume up to the chosen volume \n"
+" for this amount of time.\n"
+"\n"
+" Start at: \n"
+" Start fading from this volume.\n"
+"\n"
+" Final: \n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+" Playlist: \n"
+" Load this playlist for playing songs from \n"
+" (must have .m3u extension). If no playlist\n"
+" is given then the songs which are currently\n"
+" in the list will be used.\n"
+" The URL of an mp3/ogg stream can also be\n"
+" entered here, but loading of playlists from\n"
+" URLs is not currently supported by xmms.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off,\n"
+" type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown.\n"
+msgstr ""
+"\n"
+"Hora\n"
+" Alarma a: \n"
+" La hora a la que saltará la alarma.\n"
+"\n"
+" Silencio tras: \n"
+" Detener la alarma tras esta cantidad de tiempo.\n"
+" (si el diálogo de despertar no se cierra)\n"
+"\n"
+"\n"
+"Días\n"
+" Día:\n"
+" Seleccione los días para que se active la alarma.\n"
+"\n"
+" Hora:\n"
+" Elija la hora para la alarma en cada día,\n"
+" o seleccione el botón para utilizar la hora\n"
+" predeterminada.\n"
+"\n"
+"\n"
+"Volumen\n"
+" Desvanecimiento: \n"
+" Bajar el volumen hasta el nivel elegido \n"
+" durante este periodo de tiempo.\n"
+"\n"
+" Iniciar a: \n"
+" Empezar a desvanecer desde este volumen.\n"
+"\n"
+" Final: \n"
+" El volumen final del desvanecimiento. Si el tiempo\n"
+" de desvanecimiento es 0 se establece este volumen\n"
+" y empieza la reproducción.\n"
+"\n"
+"\n"
+"Opciones:\n"
+" Comando adicional:\n"
+" Ejecutar este comando a la hora de la alarma.\n"
+"\n"
+" Lista de reproducción: \n"
+" Cargar esta lista de producción para reproducir\n"
+" (debe tener una extensión .m3u). Si no se introduce\n"
+" introduce ninguna lista se utilizarán las canciones\n"
+" en la lista actual.\n"
+" También se puede introducir la URL de un flujo\n"
+" mp3/ogg, pero actualmente xmms no puede cargar\n"
+" listas de reproducción desde URLs.\n"
+"\n"
+" Recordatorio:\n"
+" Mostrar un recordatorio cuando se apaga la alarma,\n"
+" escriba el recordatorio en la caja y seleccione el\n"
+" botón si quiere que se muestre.\n"
+
+#: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Ayuda"
+
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/alarm/interface.c:1290
+msgid "Your reminder for today is.."
+msgstr "Su recordatorio para hoy es..."
+
+#: src/alarm/interface.c:1315
+msgid "Thankyou"
+msgstr "Gracias"
+
+#: src/alsa/config.c:210
+msgid "Default PCM device"
+msgstr "Dispositivo PCM predeterminado"
+
+#: src/alsa/config.c:235
+msgid "Default mixer device"
+msgstr "Dispositivo mezclador predeterminado"
+
+#: src/alsa/config.c:438
+msgid "ALSA Output Plugin Preferences"
+msgstr "Preferencias de complemento de salida ALSA"
+
+#: src/alsa/config.c:445
+msgid "PCM device:"
+msgstr "Dispositivo PCM:"
+
+#: src/alsa/config.c:447 src/OSS/configure.c:237
+msgid "Mixer device:"
+msgstr "Dispositivo mezclador:"
+
+#: src/alsa/config.c:449
+msgid "Mixer element:"
+msgstr "Elemento mezclador:"
+
+#: src/alsa/config.c:452
+msgid "Work around drain hangup"
+msgstr "Evitar los cuelgues por falta de recursos"
+
+#: src/alsa/plugin.c:59
+msgid "About ALSA Output Plugin"
+msgstr "Acerca del complemento de salida ALSA"
+
+#: src/alsa/plugin.c:81
+msgid "ALSA error"
+msgstr "Error de ALSA"
+
+#: src/amidi-plug/amidi-plug.c:326
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr ""
+"No tiene seleccionado ningún puerto secuenciador para la reproducción MIDI."
+" Puede hacerlo en la preferencias del complemento MIDI."
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:35
+msgid "ALSA Backend "
+msgstr "Motor ALSA "
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:37
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"Este motor envía eventos MIDI a un grupo de puertos secuenciadores ALSA definidos. El interfaz secuenciador ALSA es muy versátil, puede proporcionar puertos para sintetizadores hardware (p. ej. emu10k1) pero también sintetizadores software, dispositivos externos, etc.\n"
+"Este motor no produce sonido, los eventos MIDI son manejados directamente por los dispositivos/programas tras los puertos ALSA; por ejemplo, los eventos MIDI enviados a un sintetizador hardware serán reproducidos directamente.\n"
+"Motor escrito por Giacomo Lozito."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
+msgid "FluidSynth Backend "
+msgstr "Motor FluidSynth "
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen ouput plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"Este motor produce sonido al enviar eventos MIDI a FluidSynth, un sintetizador software en tiempo real basado en la especificación SoundFont2 (www.fluidsynth.org).\n"
+"El sonido producido se puede manipular mediante complementos de efectos y es procesado por el complemento de salida elegido.\n"
+"Motor escrito por Giacomo Lozito."
+
+#: src/amidi-plug/i_configure-alsa.c:228
+msgid "ALSA BACKEND CONFIGURATION"
+msgstr "CONFIGURACIÓN DE MOTOR ALSA"
+
+#: src/amidi-plug/i_configure-alsa.c:331
+msgid "Port"
+msgstr "Puerto"
+
+#: src/amidi-plug/i_configure-alsa.c:333
+msgid "Client name"
+msgstr "Nombre del cliente"
+
+#: src/amidi-plug/i_configure-alsa.c:335
+msgid "Port name"
+msgstr "Nombre del puerto"
+
+#: src/amidi-plug/i_configure-alsa.c:346
+msgid "ALSA output ports"
+msgstr "Puertos de salida ALSA"
+
+#: src/amidi-plug/i_configure-alsa.c:399
+msgid "Soundcard: "
+msgstr "Tarjeta de sonido: "
+
+#: src/amidi-plug/i_configure-alsa.c:401
+msgid "Mixer control: "
+msgstr "Control mezclador: "
+
+#: src/amidi-plug/i_configure-alsa.c:413
+msgid "Mixer settings"
+msgstr "Ajustes del mezclador"
+
+#: src/amidi-plug/i_configure-alsa.c:429
+msgid "ALSA Backend not loaded or not available"
+msgstr "Motor ALSA no cargado o no disponible"
+
+#: src/amidi-plug/i_configure-alsa.c:448
+msgid ""
+"ALSA\n"
+"backend"
+msgstr ""
+"motor\n"
+"ALSA"
+
+#: src/amidi-plug/i_configure-ap.c:59
+msgid "AMIDI-Plug - backend information"
+msgstr "Complemento AMIDI - información del motor"
+
+#: src/amidi-plug/i_configure-ap.c:196
+msgid "AMIDI-PLUG PREFERENCES"
+msgstr "PREFERENCIAS DEL COMPLEMENTO AMIDI"
+
+#: src/amidi-plug/i_configure-ap.c:223
+msgid "Backend selection"
+msgstr "Selección de motor"
+
+#: src/amidi-plug/i_configure-ap.c:227
+msgid "Available backends"
+msgstr "Motores disponibles"
+
+#: src/amidi-plug/i_configure-ap.c:257
+msgid "Playback settings"
+msgstr "Ajustes de reproducción"
+
+#: src/amidi-plug/i_configure-ap.c:262
+msgid "Transpose: "
+msgstr "Transponer: "
+
+#: src/amidi-plug/i_configure-ap.c:271
+msgid "Drum shift: "
+msgstr "Cambio de batería: "
+
+#: src/amidi-plug/i_configure-ap.c:289
+msgid "Advanced settings"
+msgstr "Ajustes avanzados"
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "calcular la longitud de los archivos MIDI en lista de reproducción"
+
+#: src/amidi-plug/i_configure-ap.c:298
+msgid "extract comments from MIDI file (if available)"
+msgstr "extraer comentarios desde el archivo MIDI (si está disponible)"
+
+#: src/amidi-plug/i_configure-ap.c:303
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "extraer letras desde el archivo MIDI (si está disponible)"
+
+#: src/amidi-plug/i_configure-ap.c:333
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr "Complemento AMIDI"
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug - select file"
+msgstr "Complemento AMIDI - seleccione un archivo"
+
+#: src/amidi-plug/i_configure.c:129
+msgid "AMIDI-Plug - configuration"
+msgstr "Complemento AMIDI - configuración"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:55
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "Complemento AMIDI - seleccione un archivo SoundFont"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:270
+msgid "FLUIDSYNTH BACKEND CONFIGURATION"
+msgstr "CONFIGURACIÓN DE MOTOR FLUIDSYNTH"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:313
+msgid "SoundFont settings"
+msgstr "Ajustes de SoundFont"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Nombre del archivo"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:349
+msgid "Size (bytes)"
+msgstr "Tamaño (bytes)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:398
+msgid "Load SF on player start"
+msgstr "Cargar SF cuando se inicie el reproductor"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:402
+msgid "Load SF on first midifile play"
+msgstr "Cargar SF en la primera reproducción de archivo MIDI"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:417
+msgid "Synthesizer settings"
+msgstr "Preferencias del sintetizador"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:426
+msgid "gain"
+msgstr "ganancia"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:432
+#: src/amidi-plug/i_configure-fluidsynth.c:460
+#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:519
+msgid "use default"
+msgstr "usar predeterminado"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:435
+#: src/amidi-plug/i_configure-fluidsynth.c:463
+msgid "value:"
+msgstr "valor:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:454
+msgid "poliphony"
+msgstr "polifonía"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:482
+msgid "reverb"
+msgstr "reverberación"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:491
+#: src/amidi-plug/i_configure-fluidsynth.c:522
+msgid "yes"
+msgstr "si"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:493
+#: src/amidi-plug/i_configure-fluidsynth.c:524
+msgid "no"
+msgstr "no"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:513
+msgid "chorus"
+msgstr "coro"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:544
+msgid "sample rate"
+msgstr "frecuencia de muestro"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:550
+msgid "22050 Hz "
+msgstr "22050 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:553
+msgid "44100 Hz "
+msgstr "44100 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:556
+msgid "96000 Hz "
+msgstr "96000 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:559
+msgid "custom "
+msgstr "personalizado "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "Hz "
+msgstr "Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:621
+msgid "FluidSynth Backend not loaded or not available"
+msgstr "Motor FluidSynth no cargado o no disponible"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:640
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr ""
+"Motor\n"
+"FluidSynth"
+
+#: src/amidi-plug/i_configure-timidity.c:39
+msgid "TIMIDITY BACKEND CONFIGURATION"
+msgstr "CONFIGURACIÓN MOTOR TIMIDITY"
+
+#: src/amidi-plug/i_configure-timidity.c:64
+msgid "TiMidity Backend not loaded or not available"
+msgstr "Motor TiMidity no cargado o no disponible"
+
+#: src/amidi-plug/i_configure-timidity.c:83
+msgid ""
+"TiMidity\n"
+"backend"
+msgstr ""
+"Motor\n"
+"TiMidity"
+
+#: src/amidi-plug/i_fileinfo.c:169
+msgid "Name:"
+msgstr "Nombre:"
+
+#: src/amidi-plug/i_fileinfo.c:193
+msgid " MIDI Info "
+msgstr " Información MIDI "
+
+#: src/amidi-plug/i_fileinfo.c:205
+msgid "Format:"
+msgstr "Formato:"
+
+#: src/amidi-plug/i_fileinfo.c:208
+msgid "Length (msec):"
+msgstr "Longitud (mseg):"
+
+#: src/amidi-plug/i_fileinfo.c:211
+msgid "Num of Tracks:"
+msgstr "Número de pistas:"
+
+#: src/amidi-plug/i_fileinfo.c:216
+msgid "variable"
+msgstr "variable"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidi-plug/i_fileinfo.c:223
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "Time Div:"
+msgstr "Div tiempo:"
+
+#: src/amidi-plug/i_fileinfo.c:237
+msgid " MIDI Comments and Lyrics "
+msgstr " Comentarios y letras MIDI "
+
+#: src/amidi-plug/i_fileinfo.c:288
+msgid "* no comments available in this MIDI file *"
+msgstr "* no hay comentarios disponibles en este archivo MIDI *"
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* no hay letras disponibles en este archivo MIDI *"
+
+#: src/amidi-plug/i_fileinfo.c:349
+msgid " (invalid UTF-8)"
+msgstr " (UTF-8 no válido)"
+
+#: src/amidi-plug/i_utils.c:43
+msgid "AMIDI-Plug - about"
+msgstr "Complemento AMIDI - acerca de"
+
+#: src/amidi-plug/i_utils.c:68
+msgid ""
+"\n"
+"AMIDI-Plug "
+msgstr ""
+"\n"
+"Complemento AMIDI"
+
+#: src/amidi-plug/i_utils.c:69
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing\n"
+"\n"
+msgstr ""
+"\n"
+"reproductor de música MIDI modular\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"escrito por Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"\n"
+"agradecimientos especiales a...\n"
+"\n"
+"Clemens Ladisch y Jaroslav Kysela\n"
+"por sus geniales programas aplaymidi and amixer; que\n"
+"fueron muy útiles, junto con la documentación de alsa-lib,\n"
+"para aprender más acerca de la programación ALSA.\n"
+"\n"
+"Alfredo Spadafina\n"
+"por el bonito logo de teclado midi\n"
+"\n"
+"Tony Vroon\n"
+"por su buena ayuda con las pruebas\n"
+"\n"
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "Rectángulo"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "Rectángulo redondeado"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "Rectángulo cóncavo"
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "Ninguno"
+
+#: src/aosd/aosd_trigger.c:78
+msgid "Playback Start"
+msgstr "Reproducción iniciada"
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Avisa cuando se reproduce un elemento de la lista de reproducción."
+
+#: src/aosd/aosd_trigger.c:83
+msgid "Title Change"
+msgstr "Cambio de título"
+
+#: src/aosd/aosd_trigger.c:84
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr ""
+"Avisa cuando, durante la reproducción, el título de la canción cambia pero "
+"el nombre de archivo es el mismo. Esto es principalmente útil para mostrar "
+"cambios de título en los flujos de Internet."
+
+#: src/aosd/aosd_trigger.c:90
+msgid "Volume Change"
+msgstr "Cambio de volumen"
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Triggers OSD when volume is changed."
+msgstr "Avisa cuando se cambia el volumen."
+
+#: src/aosd/aosd_trigger.c:95
+msgid "Pause On"
+msgstr "Inicio de pausa"
+
+#: src/aosd/aosd_trigger.c:96
+msgid "Triggers OSD when playback is paused."
+msgstr "Avisa cuando la reproducción es pausada."
+
+#: src/aosd/aosd_trigger.c:100
+msgid "Pause Off"
+msgstr "Fin de pausa"
+
+#: src/aosd/aosd_trigger.c:101
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Avisa cuando la reproducción se reanuda."
+
+#: src/aosd/aosd_ui.c:179
+msgid "Placement"
+msgstr "Colocación"
+
+#: src/aosd/aosd_ui.c:218
+msgid "Relative X offset:"
+msgstr "Desplazamiento X relativo:"
+
+#: src/aosd/aosd_ui.c:227
+msgid "Relative Y offset:"
+msgstr "Desplazamiento Y relativo:"
+
+#: src/aosd/aosd_ui.c:236
+msgid "Max OSD width:"
+msgstr "Ancho máximo:"
+
+#: src/aosd/aosd_ui.c:249
+msgid "Multi-Monitor options"
+msgstr "Opciones multi-monitor"
+
+#: src/aosd/aosd_ui.c:253
+msgid "Display OSD using:"
+msgstr "Mostrar notificaciones utilizando:"
+
+#: src/aosd/aosd_ui.c:264
+msgid "all monitors"
+msgstr "todos los monitores"
+
+#: src/aosd/aosd_ui.c:267
+#, c-format
+msgid "monitor %i"
+msgstr "monitor %i"
+
+#: src/aosd/aosd_ui.c:322
+msgid "Timing (ms)"
+msgstr "Temporización (ms)"
+
+#: src/aosd/aosd_ui.c:327
+msgid "Display:"
+msgstr "Mostrar:"
+
+#: src/aosd/aosd_ui.c:332
+msgid "Fade in:"
+msgstr "Desvanecimiento de entrada:"
+
+#: src/aosd/aosd_ui.c:337
+msgid "Fade out:"
+msgstr "Desvanecimiento de salida:"
+
+#: src/aosd/aosd_ui.c:418
+msgid "Fonts"
+msgstr "Tipografías"
+
+#: src/aosd/aosd_ui.c:426
+#, c-format
+msgid "Font %i:"
+msgstr "Tipografía %i:"
+
+#: src/aosd/aosd_ui.c:443
+msgid "Shadow"
+msgstr "Sombra"
+
+#: src/aosd/aosd_ui.c:478
+msgid "Internationalization"
+msgstr "Internacionalización"
+
+#: src/aosd/aosd_ui.c:484
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "Deshabilitar la conversión de texto UTF-8 (en notificaciones)"
+
+#: src/aosd/aosd_ui.c:502
+msgid "Select Skin File"
+msgstr "Seleccione un archivo de temas"
+
+#: src/aosd/aosd_ui.c:613
+msgid "Render Style"
+msgstr "Estilo de renderizado"
+
+#: src/aosd/aosd_ui.c:629
+msgid "Colors"
+msgstr "Colores"
+
+#: src/aosd/aosd_ui.c:642
+#, c-format
+msgid "Color %i:"
+msgstr "Color %i:"
+
+#: src/aosd/aosd_ui.c:662
+msgid "Custom Skin"
+msgstr "Tema personalizado"
+
+#: src/aosd/aosd_ui.c:668
+msgid "Skin file:"
+msgstr "Archivo de temas:"
+
+#: src/aosd/aosd_ui.c:671
+msgid "Browse"
+msgstr "Examinar"
+
+#: src/aosd/aosd_ui.c:773
+msgid "Enable trigger"
+msgstr "Activar disparador"
+
+#: src/aosd/aosd_ui.c:800
+msgid "Event"
+msgstr "Evento"
+
+#: src/aosd/aosd_ui.c:828
+msgid "Composite manager detected"
+msgstr "Administrador de composición detectado"
+
+#: src/aosd/aosd_ui.c:835
+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 ""
+"Administrador de composición no detectado;\n"
+"a menos que sepa que tiene uno ejecutándose, por favor active un administrador de composición o las notificaciones no funcionarán correctamente"
+
+#: src/aosd/aosd_ui.c:843
+msgid "Composite manager not required for fake transparency"
+msgstr "Administrador de composición no necesario para transparencia falsa"
+
+#: src/aosd/aosd_ui.c:881
+msgid "Transparency"
+msgstr "Transparencia"
+
+#: src/aosd/aosd_ui.c:887
+msgid "Fake transparency"
+msgstr "Transparencia falsa"
+
+#: src/aosd/aosd_ui.c:889
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Transparencia real (requiere composición 3D)"
+
+#: src/aosd/aosd_ui.c:931
+msgid "Composite extension not loaded"
+msgstr "Extensión de composición no cargada"
+
+#: src/aosd/aosd_ui.c:939
+msgid "Composite extension not available"
+msgstr "Extensión de composición no disponible"
+
+#: src/aosd/aosd_ui.c:958
+#, c-format
+msgid "Audacious OSD"
+msgstr "Notificaciones de Audacious"
+
+#: src/aosd/aosd_ui.c:1039
+msgid "Audacious OSD - configuration"
+msgstr "Notificaciones de Audacious - configuración"
+
+#: src/aosd/aosd_ui.c:1060
+msgid "Test"
+msgstr "Probar"
+
+#: src/aosd/aosd_ui.c:1075
+msgid "Position"
+msgstr "Posición"
+
+#: src/aosd/aosd_ui.c:1080
+msgid "Animation"
+msgstr "Animación"
+
+#: src/aosd/aosd_ui.c:1085
+msgid "Text"
+msgstr "Texto"
+
+#: src/aosd/aosd_ui.c:1090
+msgid "Decoration"
+msgstr "Decoración"
+
+#: src/aosd/aosd_ui.c:1095
+msgid "Trigger"
+msgstr "Disparador"
+
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
+msgid "Misc"
+msgstr "Varios"
+
+#: src/aosd/aosd_ui.c:1137
+msgid "Audacious OSD - about"
+msgstr "Notificaciones de Audacious - acerca de"
+
+#: src/aosd/aosd_ui.c:1167
+msgid ""
+"\n"
+"Audacious OSD "
+msgstr ""
+"\n"
+"Notificaciones de Audacious"
+
+#: src/aosd/aosd_ui.c:1168
+msgid ""
+"\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"written by Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"On-Screen-Display is based on Ghosd library\n"
+"written by Evan Martin\n"
+"http://neugierig.org/software/ghosd/\n"
+"\n"
+msgstr ""
+"\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"escrito por Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"Las notificaciones de Audacious se basan en la biblioteca\n"
+"Ghosd escrita por Evan Martin\n"
+"http://neugierig.org/software/ghosd/\n"
+"\n"
+
+#: src/blur_scope/config.c:73
+msgid "Blur Scope: Color selection"
+msgstr "Alcance de desenfoque: Selección de color"
+
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
+msgid "Options:"
+msgstr "Opciones:"
+
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr "Preferencias del filtro Bauer estereofónico a binaural"
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr "Nivel de alimentación:"
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr "Cortar frecuencia:"
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr "Predefinidos:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:242
+msgid "About Audio CD Plugin"
+msgstr "Acerca del complemento de CD de música"
+
+#: src/cdaudio-ng/cdaudio-ng.c:243
+msgid ""
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project.\n"
+"\n"
+"Copyright 2009 John Lindgren"
+msgstr ""
+"Copyright (c) 2007, por Calin Crisan <ccrisan@gmail.com> y el Equipo Audacious.\n"
+"\n"
+"Muchas gracias a los desarrolladores de libcdio <http://www.gnu.org/software/libcdio/>\n"
+"\ty de libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"También gracias a Tony Vroon su tutoría y orientación.\n"
+"\n"
+"Este fue un proyecto del Google Summer of Code 2007.\n"
+"\n"
+"Copyright 2009 John Lindgren"
+
+#: src/cdaudio-ng/cdaudio-ng.c:552
+msgid "Audio CD"
+msgstr "CD de audio"
+
+#: src/cdaudio-ng/cdaudio-ng.c:924
+msgid "Drive is empty."
+msgstr "La unidad está vacía."
+
+#: src/cdaudio-ng/cdaudio-ng.c:926
+msgid "Unsupported disk type."
+msgstr "Tipo de disco no soportado."
+
+#: src/cdaudio-ng/configure.c:148
+msgid "CD Audio Plugin Configuration"
+msgstr "Configuración de complemento de CD de audio"
+
+#: src/cdaudio-ng/configure.c:160
+msgid "Digital audio extraction"
+msgstr "Extracción digital de sonido"
+
+#: src/cdaudio-ng/configure.c:165
+msgid "Title information"
+msgstr "Información de título"
+
+#: src/cdaudio-ng/configure.c:176
+msgid "Disc speed:"
+msgstr "Velocidad de Disco:"
+
+#: src/cdaudio-ng/configure.c:184
+msgid "Use cd-text if available"
+msgstr "Usar texto en CD si está disponible"
+
+#: src/cdaudio-ng/configure.c:191
+msgid "Use CDDB if available"
+msgstr "Usar CDDB si está disponible"
+
+#: src/cdaudio-ng/configure.c:197
+msgid "Server: "
+msgstr "Servidor: "
+
+#: src/cdaudio-ng/configure.c:201
+msgid "Path: "
+msgstr "Ruta: "
+
+#: src/cdaudio-ng/configure.c:205
+msgid "Port: "
+msgstr "Puerto:"
+
+#: src/cdaudio-ng/configure.c:218
+msgid "Use HTTP instead of CDDBP"
+msgstr "Usar HTTP en lugar de CDDBP"
+
+#: src/cdaudio-ng/configure.c:230
+msgid "Override default device: "
+msgstr "Sobreescribir el dispositivo predeterminado: "
+
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
+msgid "Ok"
+msgstr "Aceptar"
+
+#: src/cd-menu-items/cd-menu-items.c:34
+msgid "Play CD"
+msgstr "Reproducir CD"
+
+#: src/cd-menu-items/cd-menu-items.c:34
+msgid "Add CD"
+msgstr "Agregar CD"
+
+#: src/compressor/plugin.c:63
+msgid "About Dynamic Range Compression Plugin"
+msgstr "Acerca del complemento de compresión de rango dinámico"
+
+#: src/compressor/plugin.c:95
+msgid "Dynamic Range Compressor Preferences"
+msgstr "Preferencias del compresor de rango dinámico"
+
+#: src/compressor/plugin.c:107
+msgid "Center volume:"
+msgstr "Centrar volumen:"
+
+#: src/compressor/plugin.c:120
+msgid "Dynamic range:"
+msgstr "Rango dinámico:"
+
+#: src/console/configure.c:136
+msgid "Game Console Music Decoder"
+msgstr "Decodificador musical de videoconsola"
+
+#: src/console/configure.c:153
+msgid "General"
+msgstr "General"
+
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Reproducción"
+
+#: src/console/configure.c:170
+msgid "Bass:"
+msgstr "Graves:"
+
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
+msgid "secs"
+msgstr "segs"
+
+#: src/console/configure.c:181
+msgid "Treble:"
+msgstr "Agudos:"
+
+#: src/console/configure.c:202
+msgid "Default song length:"
+msgstr "Longitud de canción predeterminada:"
+
+#: src/console/configure.c:208
+msgid "Resampling"
+msgstr "Remuestreo"
+
+#: src/console/configure.c:214
+msgid "Enable audio resampling"
+msgstr "Activar el remuestreo de sonido"
+
+#: src/console/configure.c:229
+msgid "Resampling rate:"
+msgstr "Tasa de remuestreo:"
+
+#: src/console/configure.c:233
+msgid "Hz"
+msgstr "Hz"
+
+#: src/console/configure.c:244
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/configure.c:245
+msgid "Ignore length from SPC tags"
+msgstr "Ignorar longitud de etiquetas SPC"
+
+#: src/console/configure.c:246
+msgid "Increase reverb"
+msgstr "Aumentar la reverberación"
+
+#: src/console/configure.c:271
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
+msgstr ""
+"La longitud de canción predeterminada, expresada en segundos, es usada para "
+"canciones que no preveén información de longitud (es decir pistas cíclicas)."
+
+#: src/console/plugin.c:33
+msgid "About the Game Console Music Decoder"
+msgstr "Acerca del decodificador de música de videoconsola"
+
+#: src/console/plugin.c:34
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2.\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
+" Shay Green <gblargg@gmail.com>\n"
+msgstr ""
+"El motor decodificador de música de videoconsola está basado en Game_Music_Emu 0.5.2.\n"
+"Formatos sopotados: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"Implementación de Audacious por: William Pitcock <nenolod@dereferenced.org>, \n"
+" Shay Green <gblargg@gmail.com>\n"
+
+#: src/crossfade/plugin.c:60
+msgid "About Crossfade"
+msgstr "Acerca de la atenuación cruzada"
+
+#: src/crossfade/plugin.c:92
+msgid "Crossfade Preferences"
+msgstr "Preferencias de la atenuación cruzada"
+
+#: src/crossfade/plugin.c:104
+msgid "Overlap (in seconds):"
+msgstr "Solapamiento (en segundos):"
+
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
+msgid "Crossfade Error"
+msgstr "Error de atenuación cruzada"
+
+#: src/crossfade/plugin.c:135
+msgid ""
+"Crossfading failed because the songs had a different number of channels."
+msgstr ""
+"La atenuación cruzada falló porque las canciones tienen números diferentes "
+"de canales."
+
+#: src/crossfade/plugin.c:143
+msgid ""
+"Crossfading failed because the songs had different sample rates.\n"
+"\n"
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
+msgstr ""
+"La tenuación cruzada falló porque las canciones tienen diferentes frecuencias de muestreo.\n"
+"\n"
+"Puede usar el efecto convertidor de frecuencia de muestro para volver a muestrear las canciones a la misma tasa."
+
+#: src/crystalizer/crystalizer.c:100
+msgid "Configure Crystalizer"
+msgstr "Configurar el cristalizador"
+
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
+msgid "Effect intensity:"
+msgstr "Intensidad de efectos:"
+
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/echo_plugin/gui.c:15
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin 1999.\n"
+"\n"
+"Surround echo by Carl van Schaik 1999"
+msgstr ""
+"Complemento de eco\n"
+"por Johan Levin 1999.\n"
+"\n"
+"Eco envolvente por Carl van Schaik 1999"
+
+#: src/echo_plugin/gui.c:27
+msgid "About Echo Plugin"
+msgstr "Acerca del complemento de eco"
+
+#: src/echo_plugin/gui.c:67
+msgid "Configure Echo"
+msgstr "Configurar eco"
+
+#: src/echo_plugin/gui.c:83
+msgid "Delay: (ms)"
+msgstr "Retraso: (ms)"
+
+#: src/echo_plugin/gui.c:88
+msgid "Feedback: (%)"
+msgstr "Retroalimentación: (%)"
+
+#: src/echo_plugin/gui.c:93
+msgid "Volume: (%)"
+msgstr "Volumen: (%)"
+
+#: src/ffaudio/ffaudio-core.c:725
+#, 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"
+"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 ""
+"Complemento de decodificación de sonido multi-formato para Audacious\n"
+"basado en el marco multimedia FFmpeg (http://www.ffmpeg.org/)\n"
+"Copyright (c) 2000-2009 Fabrice Bellard, y otros.\n"
+"\n"
+"Complemento de Audacious por:\n"
+" William Pitcock <nenolod@nenolod.net>,\n"
+" Matti Hämäläinen <ccr@tnsp.org>\n"
+"\n"
+"libavcodec %s (%s)\n"
+"libavformat %s (%s)\n"
+"libavutil %s (%s)\n"
+
+#: src/ffaudio/ffaudio-core.c:739
+msgid "About FFaudio Plugin"
+msgstr "Acerca del complemento FFaudio"
+
+#: src/filewriter/filewriter.c:166
+msgid "About FileWriter-Plugin"
+msgstr "Acerca del complemento escritor de archivos"
+
+#: src/filewriter/filewriter.c:461
+msgid "File Writer Configuration"
+msgstr "Configuración del escritor de archivos"
+
+#: src/filewriter/filewriter.c:473
+msgid "Output file format:"
+msgstr "Formato del archivo de salida:"
+
+#: src/filewriter/filewriter.c:491
+msgid "Configure"
+msgstr "Configurar"
+
+#: src/filewriter/filewriter.c:506
+msgid "Save into original directory"
+msgstr "Guardar dentro del directorio original"
+
+#: src/filewriter/filewriter.c:511
+msgid "Save into custom directory"
+msgstr "Guardar dentro de directorio personalizado"
+
+#: src/filewriter/filewriter.c:521
+msgid "Output file folder:"
+msgstr "Carpeta de archivo de salida:"
+
+#: src/filewriter/filewriter.c:525
+msgid "Pick a folder"
+msgstr "Elija una carpeta"
+
+#: src/filewriter/filewriter.c:544
+msgid "Get filename from:"
+msgstr "Obtener nombre de archivo desde:"
+
+#: src/filewriter/filewriter.c:547
+msgid "original file tags"
+msgstr "etiquetas del archivo original"
+
+#: src/filewriter/filewriter.c:553
+msgid "original filename"
+msgstr "nombre del archivo original"
+
+#: src/filewriter/filewriter.c:563
+msgid "Don't strip file name extension"
+msgstr "No quitar la extensión del archivo"
+
+#: src/filewriter/filewriter.c:578
+msgid "Prepend track number to filename"
+msgstr "Anteponer el número de pista al nombre de archivo"
+
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
+msgid "Auto"
+msgstr "Auto"
+
+#: src/filewriter/mp3.c:38
+msgid "Joint Stereo"
+msgstr "Estéreo conjunto"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
+msgid "Stereo"
+msgstr "Estereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/mp3.c:706
+msgid "MP3 Configuration"
+msgstr "Configuración MP3"
+
+#: src/filewriter/mp3.c:729
+msgid "Algorithm Quality:"
+msgstr "Calidad del algoritmo:"
+
+#: src/filewriter/mp3.c:754
+msgid "Output Samplerate:"
+msgstr "Frecuencia de muestreo de salida:"
+
+#: src/filewriter/mp3.c:782
+msgid "(Hz)"
+msgstr "(Hz)"
+
+#: src/filewriter/mp3.c:789
+msgid "Bitrate / Compression ratio:"
+msgstr "Tasa de bits / Compresión:"
+
+#: src/filewriter/mp3.c:813
+msgid "Bitrate (kbps):"
+msgstr "Tasa de bits (kbps):"
+
+#: src/filewriter/mp3.c:846
+msgid "Compression ratio:"
+msgstr "Compresión:"
+
+#: src/filewriter/mp3.c:870
+msgid "Audio Mode:"
+msgstr "Modo de sonido:"
+
+#: src/filewriter/mp3.c:895
+msgid "Misc:"
+msgstr "Varios:"
+
+#: src/filewriter/mp3.c:906
+msgid "Enforce strict ISO complience"
+msgstr "Cumplir estrictamente la norma ISO"
+
+#: src/filewriter/mp3.c:917
+msgid "Error protection"
+msgstr "Error de protección"
+
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
+msgid "Quality"
+msgstr "Calidad"
+
+#: src/filewriter/mp3.c:939
+msgid "Enable VBR/ABR"
+msgstr "Activar VBR/ABR"
+
+#: src/filewriter/mp3.c:949
+msgid "Type:"
+msgstr "Tipo:"
+
+#: src/filewriter/mp3.c:982
+msgid "VBR Options:"
+msgstr "Opciones VBR:"
+
+#: src/filewriter/mp3.c:998
+msgid "Minimum bitrate (kbps):"
+msgstr "Tasa de bits mínima (kbps):"
+
+#: src/filewriter/mp3.c:1025
+msgid "Maximum bitrate (kbps):"
+msgstr "Tasa de bits máxima (kbps):"
+
+#: src/filewriter/mp3.c:1048
+msgid "Strictly enforce minimum bitrate"
+msgstr "Aplicar estrictamente la tasa de bits mínima"
+
+#: src/filewriter/mp3.c:1060
+msgid "ABR Options:"
+msgstr "Opciones ABR:"
+
+#: src/filewriter/mp3.c:1070
+msgid "Average bitrate (kbps):"
+msgstr "Tasa de bits promedio (kbps):"
+
+#: src/filewriter/mp3.c:1098
+msgid "VBR quality level:"
+msgstr "Nivel de calidad VBR:"
+
+#: src/filewriter/mp3.c:1117
+msgid "Don't write Xing VBR header"
+msgstr "No escribir la cabecera VBR Xing"
+
+#: src/filewriter/mp3.c:1131
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1141
+msgid "Frame params:"
+msgstr "Prametros de cuadro:"
+
+#: src/filewriter/mp3.c:1153
+msgid "Mark as copyright"
+msgstr "Marcar como derechos de autor"
+
+#: src/filewriter/mp3.c:1164
+msgid "Mark as original"
+msgstr "Marcar como original"
+
+#: src/filewriter/mp3.c:1176
+msgid "ID3 params:"
+msgstr "Parametros ID3:"
+
+#: src/filewriter/mp3.c:1187
+msgid "Force addition of version 2 tag"
+msgstr "Forzar adición de etiqueta de la versión 2"
+
+#: src/filewriter/mp3.c:1197
+msgid "Only add v1 tag"
+msgstr "Solo agregar etiqueta v1"
+
+#: src/filewriter/mp3.c:1204
+msgid "Only add v2 tag"
+msgstr "Solo agregar etiqueta v2"
+
+#: src/filewriter/mp3.c:1225
+msgid "Tags"
+msgstr "Etiquetas"
+
+#: src/filewriter/vorbis.c:240
+msgid "Vorbis Encoder Configuration"
+msgstr "Configuración de codificador Vorbis"
+
+#: src/filewriter/vorbis.c:260
+msgid "Quality level (0 - 10):"
+msgstr "Nivel de calidad (0 - 10):"
+
+#: src/flacng/plugin.c:380
+msgid "About FLAC Audio Plugin"
+msgstr "Acerca del complemento de sonido FLAC"
+
+#: src/flacng/plugin.c:381
+msgid ""
+"\n"
+"\n"
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"\n"
+"Código original por\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
+msgid "About Gnome Shortcut Plugin"
+msgstr "Acerca del complemento de atajos Gnome"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr ""
+"Complemento de atajos Gnome\n"
+"Le permite controlar el reproductor con atajos de Gnome.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+
+#: src/gtkui/columns.c:36
+msgid "Entry number"
+msgstr "Número de entrada"
+
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
+msgid "Title"
+msgstr "Título"
+
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
+msgid "Artist"
+msgstr "Artista"
+
+#: src/gtkui/columns.c:37
+msgid "Year"
+msgstr "Año"
+
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
+msgid "Album"
+msgstr "Album"
+
+#: src/gtkui/columns.c:37
+msgid "Track"
+msgstr "Pista"
+
+#: src/gtkui/columns.c:37
+msgid "Queue position"
+msgstr "Posición de la cola"
+
+#: src/gtkui/columns.c:38
+msgid "Length"
+msgstr "Longitud"
+
+#: src/gtkui/columns.c:38
+msgid "File path"
+msgstr "Ruta del archivo"
+
+#: src/gtkui/columns.c:38
+msgid "File name"
+msgstr "Nombre del archivo"
+
+#: src/gtkui/columns.c:38
+msgid "Custom title"
+msgstr "Título personalizado"
+
+#: src/gtkui/columns.c:39
+msgid "Bitrate"
+msgstr "Tasa de bits"
+
+#: src/gtkui/columns.c:278
+msgid "Choose Columns"
+msgstr "Seleccionar columnas"
+
+#: src/gtkui/columns.c:292
+msgid "Available:"
+msgstr "Disponible:"
+
+#: src/gtkui/columns.c:326
+msgid "Chosen:"
+msgstr "Seleccionado:"
+
+#: src/gtkui/layout.c:122
+msgid "Dock at Left"
+msgstr "Acoplar a la izquierda"
+
+#: src/gtkui/layout.c:122
+msgid "Dock at Right"
+msgstr "Acoplar a la derecha"
+
+#: src/gtkui/layout.c:123
+msgid "Dock at Top"
+msgstr "Acoplar arriba"
+
+#: src/gtkui/layout.c:123
+msgid "Dock at Bottom"
+msgstr "Acoplar abajo"
+
+#: src/gtkui/layout.c:123
+msgid "Undock"
+msgstr "Desacoplar"
+
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
+msgid "Disable"
+msgstr "Deshabilitar"
+
+#: src/gtkui/menus.c:131
+msgid "_Open Files ..."
+msgstr "_Abrir archivos ..."
+
+#: src/gtkui/menus.c:132
+msgid "Open _URL ..."
+msgstr "Abrir _URL ..."
+
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "_Añadir archivos ..."
+
+#: src/gtkui/menus.c:134
+msgid "Add U_RL ..."
+msgstr "Añadir U_RL ..."
+
+#: src/gtkui/menus.c:136
+msgid "A_bout ..."
+msgstr "A_cerca de ..."
+
+#: src/gtkui/menus.c:137
+msgid "_Preferences ..."
+msgstr "_Preferencias"
+
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
+msgid "_Quit"
+msgstr "_Salir"
+
+#: src/gtkui/menus.c:141
+msgid "_Play"
+msgstr "_Reproducir"
+
+#: src/gtkui/menus.c:142
+msgid "Paus_e"
+msgstr "Pa_usar"
+
+#: src/gtkui/menus.c:143
+msgid "_Stop"
+msgstr "_Detener"
+
+#: src/gtkui/menus.c:144
+msgid "Pre_vious"
+msgstr "An_terior"
+
+#: src/gtkui/menus.c:145
+msgid "_Next"
+msgstr "Si_guiente"
+
+#: src/gtkui/menus.c:147
+msgid "_Repeat"
+msgstr "R_epetir"
+
+#: src/gtkui/menus.c:148
+msgid "S_huffle"
+msgstr "_Orden aleatorio"
+
+#: src/gtkui/menus.c:149
+msgid "N_o Playlist Advance"
+msgstr "No avan_zar la lista de reproducción"
+
+#: src/gtkui/menus.c:150
+msgid "Stop _After This Song"
+msgstr "_Detener tras esta canción"
+
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
+msgid "Song _Info ..."
+msgstr "_Información de la canción ..."
+
+#: src/gtkui/menus.c:153
+msgid "Jump to _Time ..."
+msgstr "_Saltar en el tiempo ..."
+
+#: src/gtkui/menus.c:154
+msgid "_Jump to Song ..."
+msgstr "Saltar a la _canción ..."
+
+#: src/gtkui/menus.c:157
+msgid "By Track _Number"
+msgstr "Por _número de pista"
+
+#: src/gtkui/menus.c:158
+msgid "By _Title"
+msgstr "Por _título"
+
+#: src/gtkui/menus.c:159
+msgid "By _Artist"
+msgstr "Por _artista"
+
+#: src/gtkui/menus.c:160
+msgid "By A_lbum"
+msgstr "Por a_lbum"
+
+#: src/gtkui/menus.c:161
+msgid "By Release _Date"
+msgstr "Por _fecha de estreno"
+
+#: src/gtkui/menus.c:162
+msgid "By _File Path"
+msgstr "Por _ruta de archivo"
+
+#: src/gtkui/menus.c:163
+msgid "By _Custom Title"
+msgstr "Por título _personalizado"
+
+#: src/gtkui/menus.c:165
+msgid "R_everse Order"
+msgstr "Orden _inverso"
+
+#: src/gtkui/menus.c:166
+msgid "_Random Order"
+msgstr "Orden alea_torio"
+
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
+msgid "_Refresh"
+msgstr "A_ctualizar"
+
+#: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Eliminar archivos _no disponibles"
+
+#: src/gtkui/menus.c:172
+msgid "_Sort"
+msgstr "_Ordenar"
+
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr "_Nuevo"
+
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
+msgid "_Close"
+msgstr "_Cerrar"
+
+#: src/gtkui/menus.c:177
+msgid "_Import ..."
+msgstr "_Importar ..."
+
+#: src/gtkui/menus.c:178
+msgid "_Export ..."
+msgstr "_Exportar ..."
+
+#: src/gtkui/menus.c:180
+msgid "_Playlist Manager ..."
+msgstr "_Gestor de listas de reproducción ..."
+
+#: src/gtkui/menus.c:181
+msgid "_Queue Manager ..."
+msgstr "Gestor de _colas ..."
+
+#: src/gtkui/menus.c:184
+msgid "Volume _Up"
+msgstr "_Subir volumen"
+
+#: src/gtkui/menus.c:185
+msgid "Volume _Down"
+msgstr "_Bajar volumen"
+
+#: src/gtkui/menus.c:187
+msgid "_Equalizer"
+msgstr "_Ecualizador"
+
+#: src/gtkui/menus.c:189
+msgid "E_ffects"
+msgstr "E_fectos"
+
+#: src/gtkui/menus.c:192
+msgid "_Interface"
+msgstr "_Interfaz"
+
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Visualizaciones"
+
+#: src/gtkui/menus.c:195
+msgid "Show _Menu Bar"
+msgstr "_Mostrar barra de menú"
+
+#: src/gtkui/menus.c:196
+msgid "Show I_nfo Bar"
+msgstr "Mostrar barra de _información"
+
+#: src/gtkui/menus.c:197
+msgid "Show _Status Bar"
+msgstr "Mostrar barra de _estado"
+
+#: src/gtkui/menus.c:199
+msgid "Show Column _Headers"
+msgstr "Mostrar _cabeceras de columna"
+
+#: src/gtkui/menus.c:200
+msgid "Choose _Columns ..."
+msgstr "_Seleccionar columnas ..."
+
+#: src/gtkui/menus.c:201
+msgid "Scrol_l on Song Change"
+msgstr "A_vanzar al cambiar de canción"
+
+#: src/gtkui/menus.c:204
+msgid "_File"
+msgstr "_Archivo"
+
+#: src/gtkui/menus.c:205
+msgid "_Playback"
+msgstr "_Reproducción"
+
+#: src/gtkui/menus.c:206
+msgid "P_laylist"
+msgstr "_Lista de reproducción"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
+msgid "_Services"
+msgstr "_Servicios"
+
+#: src/gtkui/menus.c:208
+msgid "_Output"
+msgstr "Sali_da"
+
+#: src/gtkui/menus.c:209
+msgid "_View"
+msgstr "_Ver"
+
+#: src/gtkui/menus.c:213
+msgid "_Queue/Unqueue"
+msgstr "_Encolar/desencolar"
+
+#: src/gtkui/menus.c:216
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: src/gtkui/menus.c:217
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: src/gtkui/menus.c:218
+msgid "_Paste"
+msgstr "_Pegar"
+
+#: src/gtkui/menus.c:219
+msgid "Select _All"
+msgstr "Seleccionar _todo"
+
+#: src/gtkui/menus.c:224
+msgid "_Rename"
+msgstr "_Renombrar"
+
+#: src/gtkui/ui_gtk.c:95
+msgid "GTK Interface"
+msgstr "Interfaz GTK"
+
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "Gestión de memoria intermedia ..."
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
+msgid "Error"
+msgstr "Error"
+
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Cerrar"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
+msgid "mono"
+msgstr "mono"
+
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
+msgid "stereo"
+msgstr "estéreo"
+
+#: src/gtkui/ui_statusbar.c:109
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] "%d canal"
+msgstr[1] "%d canales"
+
+#: src/gtkui/ui_statusbar.c:124
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/hotkey/gui.c:71
+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 "Reproducir"
+
+#: src/hotkey/gui.c:73
+msgid "Pause/Resume"
+msgstr "Pausa/continuar"
+
+#: 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 "Siguiente pista"
+
+#: src/hotkey/gui.c:76
+msgid "Forward 5 Seconds"
+msgstr "Avanzar 5 segundos"
+
+#: src/hotkey/gui.c:77
+msgid "Rewind 5 Seconds"
+msgstr "Retroceder 5 segundos"
+
+#: src/hotkey/gui.c:78
+msgid "Mute"
+msgstr "Silenciar"
+
+#: src/hotkey/gui.c:79
+msgid "Volume Up"
+msgstr "Subir volumen"
+
+#: src/hotkey/gui.c:80
+msgid "Volume Down"
+msgstr "Bajar volumen"
+
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Jump to File"
+msgstr "Ir al archivo"
+
+#: src/hotkey/gui.c:82
+msgid "Toggle Player Windows"
+msgstr "Cambiar ventanas del reproductor"
+
+#: src/hotkey/gui.c:83
+msgid "Show On-Screen-Display"
+msgstr "Mostrar notificaciones"
+
+#: src/hotkey/gui.c:84
+msgid "Toggle Repeat"
+msgstr "Conmutar el modo repetir"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle Shuffle"
+msgstr "Conmutar orden aleatorio"
+
+#: src/hotkey/gui.c:95
+msgid "(none)"
+msgstr "(ninguno)"
+
+#: src/hotkey/gui.c:232
+msgid ""
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"No se recomienda asociar los botones principales del mouse sin cambios.\n"
+"\n"
+"¿Quiere continuar?"
+
+#: src/hotkey/gui.c:234
+msgid "Binding mouse buttons"
+msgstr "Asociar botones del mouse"
+
+#: src/hotkey/gui.c:384
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Configuración de atajos de teclado"
+
+#: src/hotkey/gui.c:400
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+"Pulse una combinación de teclas dentro del campo de texto.\n"
+"También puede asociar botones del ratón."
+
+#: src/hotkey/gui.c:405
+msgid "Hotkeys:"
+msgstr "Atajos de teclado:"
+
+#: src/hotkey/gui.c:424
+msgid "Action:"
+msgstr "Acción:"
+
+#: src/hotkey/gui.c:432
+msgid "Key Binding:"
+msgstr "Teclas asociadas:"
+
+#: src/hotkey/gui.c:663
+msgid "About Global Hotkey Plugin"
+msgstr "Acerca del complemento de atajos de teclado"
+
+#: src/hotkey/gui.c:664
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr ""
+"Complemento de atajos de teclado\n"
+"Controla el reproductor con combinaciones de teclas o teclas multimedia.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Con la participación de:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+
+#: src/jack/configure.c:66
+msgid "Connect to all available jack ports"
+msgstr "Conectar a todos los puertos jack disponibles"
+
+#: src/jack/configure.c:73
+msgid "Connect only the output ports"
+msgstr "Conectar solo los puertos de salida"
+
+#: src/jack/configure.c:80
+msgid "Connect to no ports"
+msgstr "No conectar puertos"
+
+#: src/jack/configure.c:98
+msgid "jack Plugin configuration"
+msgstr "Configuración del complemento jack"
+
+#: src/jack/configure.c:116
+msgid "Connection mode:"
+msgstr "Modo de conexión:"
+
+#: src/jack/configure.c:128
+msgid "Enable debug printing"
+msgstr "Activar mensajes de depuración"
+
+#: src/jack/jack.c:435
+msgid ""
+"XMMS jack Driver 0.17\n"
+"\n"
+"xmms-jack.sf.net\n"
+"Chris Morgan<cmorgan@alum.wpi.edu>\n"
+"\n"
+"Audacious port by\n"
+"Giacomo Lozito from develia.org"
+msgstr ""
+"Complemento jack para XMMS 0.17\n"
+"\n"
+"xmms-jack.sf.net\n"
+"Chris Morgan<cmorgan@alum.wpi.edu>\n"
+"\n"
+"Portado a Audacious por\n"
+"Giacomo Lozito de develia.org"
+
+#: src/jack/jack.c:440
+msgid "About JACK Output Plugin 0.17"
+msgstr "Acerca del complemento de salida JACK 0.17"
+
+#: src/ladspa/plugin.c:415
+msgid "About LADSPA Host"
+msgstr "Acerca del servidor LADSPA"
+
+#: src/ladspa/plugin.c:516
+#, c-format
+msgid "%s Settings"
+msgstr "Ajustes %s"
+
+#: src/ladspa/plugin.c:584
+msgid "LADSPA Host Settings"
+msgstr "Ajustes del servidor LADSPA"
+
+#: src/ladspa/plugin.c:593
+msgid "Module paths:"
+msgstr "Rutas de complementos:"
+
+#: src/ladspa/plugin.c:598
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+"Separe múltiples rutas por dos puntos.\n"
+"Estas rutas se utilizan además de LADSPA_PATH.\n"
+"Tras añadir nuevas rutas, pulse Intro para buscar complementos nuevos."
+
+#: src/ladspa/plugin.c:614
+msgid "Available plugins:"
+msgstr "Complementos disponibles:"
+
+#: src/ladspa/plugin.c:626
+msgid "Enable"
+msgstr "Activar"
+
+#: src/ladspa/plugin.c:632
+msgid "Enabled plugins:"
+msgstr "Complementos activos:"
+
+#: src/ladspa/plugin.c:647
+msgid "Settings"
+msgstr "Ajustes"
+
+#: src/lyricwiki/lyricwiki.c:267
+msgid ""
+"\n"
+"Looking for lyrics..."
+msgstr ""
+"\n"
+"Buscando letras ..."
+
+#: src/lyricwiki/lyricwiki.c:304
+msgid ""
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr ""
+"\n"
+"Conectando a lyrics.wikia.com..."
+
+#: src/lyricwiki/lyricwiki.c:377
+msgid ""
+"\n"
+"No lyrics were found."
+msgstr ""
+"\n"
+"No se encontraron letras."
+
+#: src/metronom/metronom.c:86
+msgid "About Metronom"
+msgstr "Acerca del metrónomo"
+
+#: src/metronom/metronom.c:87
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr ""
+"Un generador de tacto por Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Para utilizarlo, añada una URL: tact://pulsos*num/den\n"
+"p. ej. tact://77 para reproducir 77 pulsos por minuto\n"
+"o tact://60*3/4 para reproducir 60 ppm en 3/4 tactos"
+
+#: src/metronom/metronom.c:144
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Generador de tacto: %d ppm"
+
+#: src/metronom/metronom.c:146
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Generador de tacto: %d ppm %d/%d"
+
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "Acerca del mezclador de canales"
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "Ajustes del mezclador de canales"
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "Canales de salida:"
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "Los cambios se aplicarán en el siguiente cambio de canción."
+
+#: src/mpg123/mpg123.c:191
+msgid "Surround"
+msgstr "Envolvente"
+
+#: src/mtp_up/mtp.c:340
+msgid "Upload in progress..."
+msgstr "Carga en progreso..."
+
+#: src/mtp_up/mtp.c:352
+msgid "Upload to MTP Device"
+msgstr "Cargar a un dispositivo MTP"
+
+#: src/mtp_up/mtp.c:353
+msgid "Disconnect MTP Device"
+msgstr "Desconectar dispositivo MTP"
+
+#: src/notify/libnotify-aosd_event.c:48
+msgid "Stopped"
+msgstr "Detenido"
+
+#: src/notify/libnotify-aosd_event.c:48
+msgid "Audacious is not playing."
+msgstr "Audacious no está reproduciendo."
+
+#: src/null/null.c:64
+msgid "Null output plugin "
+msgstr "Complemento de salida nula "
+
+#: src/null/null.c:65
+msgid ""
+" by Christian Birchinger <joker@netswarm.net>\n"
+"based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
+msgstr ""
+" por Christian Birchinger <joker@netswarm.net>\n"
+"basado en el complemento de XMMS por Håvard Kvål <havardk@xmms.org>"
+
+#: src/null/null.c:68
+msgid "About Null Output"
+msgstr "Acerca del complemento de salida nula"
+
+#: src/null/null.c:89
+msgid "Null output preferences"
+msgstr "Preferencias de la salida nula"
+
+#: src/null/null.c:100
+msgid "Run in real time"
+msgstr "Ejecutar en tiempo real"
+
+#: src/oss4/configure.c:81
+msgid "1. Default device"
+msgstr "1. Dispositivo predeterminado"
+
+#: src/oss4/configure.c:138
+msgid "OSS4 Output Plugin Preferences"
+msgstr "Preferencias del complemento de salida OSS4"
+
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
+msgid "Audio device:"
+msgstr "Dispositivo de sonido:"
+
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
+msgid "Use alternate device:"
+msgstr "Utilizar dispositivo alternativo:"
+
+#: src/oss4/configure.c:193
+msgid "Save volume between sessions"
+msgstr "Guardar volumen entre sesiones"
+
+#: src/oss4/configure.c:197
+msgid "Enable format conversions made by the OSS software."
+msgstr "Activar conversiones de formato realizadas por el software OSS."
+
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Activa el modo exclusivo para evitar la mezcla virtual."
+
+#: src/oss4/plugin.c:51
+msgid "About OSS4 Plugin"
+msgstr "Acerca del complemento OSS4"
+
+#: src/oss4/utils.c:211
+msgid "OSS4 error"
+msgstr "Error OSS4"
+
+#: src/OSS/configure.c:137
+#, c-format
+msgid "Default (%s)"
+msgstr "Predeterminado (%s)"
+
+#: src/OSS/configure.c:178
+msgid "OSS Driver configuration"
+msgstr "Configuración del complemento OSS"
+
+#: src/OSS/configure.c:281
+msgid "Devices"
+msgstr "Dispositivos"
+
+#: src/OSS/configure.c:283
+msgid "Buffering:"
+msgstr "Gestión de memoria intermedia:"
+
+#: src/OSS/configure.c:296
+msgid "Pre-buffer (percent):"
+msgstr "Información inicial (porcentaje):"
+
+#: src/OSS/configure.c:307
+msgid "Buffering"
+msgstr "Gestión de memoria intermedia"
+
+#: src/OSS/configure.c:308
+msgid "Mixer Settings:"
+msgstr "Ajustes del mezclador:"
+
+#: src/OSS/configure.c:314
+msgid "Volume controls Master not PCM"
+msgstr "El volumen controla el maestro no PCM"
+
+#: src/OSS/configure.c:320
+msgid "Mixer"
+msgstr "Mezclador"
+
+#: src/OSS/OSS.c:41
+msgid "About OSS Driver"
+msgstr "Acerca del complemento OSS"
+
+#: src/pulse_audio/pulse_audio.c:669
+msgid "About Audacious PulseAudio Output Plugin"
+msgstr "Acerca del complemento de salida PulseAudio"
+
+#: src/resample/plugin.c:89
+msgid "About Sample Rate Converter Plugin"
+msgstr "Acerca del módulo de conversión de frecuencia de muestreo"
+
+#: src/resample/plugin.c:144
+msgid "Sample Rate Converter Preferences"
+msgstr "Preferencias del conversor de frecuencia de muestreo"
+
+#: src/resample/plugin.c:156
+msgid "Rate mappings:"
+msgstr "Mapas de frecuencia:"
+
+#: src/resample/plugin.c:179
+msgid "All others:"
+msgstr "Todos los demás:"
+
+#: src/resample/plugin.c:191
+msgid "Method:"
+msgstr "Método:"
+
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
+msgid "Change password"
+msgstr "Cambiar la contraseña"
+
+#: src/scrobbler/configure.c:144
+msgid "Services"
+msgstr "Servicios"
+
+#: src/scrobbler/configure.c:166
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: src/scrobbler/configure.c:172
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: src/scrobbler/configure.c:180
+msgid "Scrobbler URL:"
+msgstr "URL del Scrobbler:"
+
+#: src/scrobbler/configure.c:212
+msgid "Last.FM"
+msgstr "Last.FM"
+
+#: src/scrobbler/configure.c:239
+msgid "Scrobbler"
+msgstr "Scrobbler"
+
+#: src/scrobbler/plugin.c:194
+msgid ""
+"Audacious AudioScrobbler Plugin\n"
+"\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr ""
+"Módulo de AudioScrobbler para Audacious\n"
+"\n"
+"Creado originalmente por Audun Hove <audun@nlc.no> y Pipian <pipian@pipian.com>\n"
+
+#: src/scrobbler/plugin.c:196
+msgid "About Scrobbler Plugin"
+msgstr "Acerca del complemento Scrobbler"
+
+#: src/sdlout/plugin.c:58
+msgid "About SDL Output Plugin"
+msgstr "Acerca del complemento de salida SDL"
+
+#: src/sdlout/plugin.c:78
+msgid "SDL error"
+msgstr "Error SDL"
+
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Género"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Biblioteca"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Crear lista de reproducción"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Añadir a la lista de reproducción"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Buscar biblioteca"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"Para importar su colección musical en Audacious, elija una carpeta y pulse "
+"el botón «actualizar»."
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Espere por favor..."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Elija una carpeta"
+
+#: src/skins/plugin.c:167
+msgid "About Skinned GUI"
+msgstr "Acerca del interfaz con soporte de temas"
+
+#: src/skins/plugin.c:168
+msgid ""
+"Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
+"\n"
+msgstr "Copyright (c) 2008, por Tomasz Moń <desowin@gmail.com>\n"
+
+#: src/skins/skins_cfg.c:207
+msgid "_Player:"
+msgstr "_Reproductor:"
+
+#: src/skins/skins_cfg.c:208
+msgid "Select main player window font:"
+msgstr "Seleccione la tipografía para la ventana principal:"
+
+#: src/skins/skins_cfg.c:210
+msgid "_Playlist:"
+msgstr "Lista de reproducción:"
+
+#: src/skins/skins_cfg.c:211
+msgid "Select playlist font:"
+msgstr "Seleccione la tipografía de la lista de reproducción:"
+
+#: src/skins/skins_cfg.c:215
+msgid "_Fonts"
+msgstr "_Tipografías"
+
+#: src/skins/skins_cfg.c:218
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Usar tipografías de mapa de bits (solo soporta ASCII)"
+
+#: src/skins/skins_cfg.c:220
+msgid "Scroll song title in both directions"
+msgstr "Desplazar el título de la canción en ambas direcciones"
+
+#: src/skins/skins_cfg.c:298
+msgid "_Skin"
+msgstr "_Tema"
+
+#: src/skins/skins_cfg.c:345
+msgid "Interface Preferences"
+msgstr "Preferencias del interfaz"
+
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Preamplificador"
+
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/ui_equalizer.c:379
+msgid "Audacious Equalizer"
+msgstr "Ecualizador de Audacious"
+
+#: src/skins/ui_equalizer.c:887
+msgid "Presets"
+msgstr "Predefinidos"
+
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Cargar predefinido"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Cargar auto-predefinido"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Cargar ecualizador predefinido"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Guardar predefinido"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Guardar auto-predefinido"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Guardar ecualizador predefinido"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Borrar predefinido"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Borrar auto-predefinido"
+
+#: src/skins/ui_main.c:444
+msgid "kbps"
+msgstr "kbps"
+
+#: src/skins/ui_main.c:452
+msgid "kHz"
+msgstr "kHz"
+
+#: src/skins/ui_main.c:459
+msgid "surround"
+msgstr "envolvente"
+
+#: src/skins/ui_main.c:807
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Ir a la posición %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/ui_main.c:828
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volumen: %d%%"
+
+#: src/skins/ui_main.c:851
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balance: %d%% izquierda"
+
+#: src/skins/ui_main.c:853
+msgid "Balance: center"
+msgstr "Balance: centrado"
+
+#: src/skins/ui_main.c:855
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balance: %d%% derecha"
+
+#: src/skins/ui_main.c:981
+msgid "Options Menu"
+msgstr "Menú de opciones"
+
+#: src/skins/ui_main.c:985
+msgid "Disable 'Always On Top'"
+msgstr "Desactivar 'Siempre encima'"
+
+#: src/skins/ui_main.c:987
+msgid "Enable 'Always On Top'"
+msgstr "Activar 'Siempre encima'"
+
+#: src/skins/ui_main.c:990
+msgid "File Info Box"
+msgstr "Caja de información de archivo"
+
+#: src/skins/ui_main.c:995
+msgid "Visualization Menu"
+msgstr "Menú de visualización"
+
+#: src/skins/ui_main.c:1653
+msgid "Single mode."
+msgstr "Modo único."
+
+#: src/skins/ui_main.c:1655
+msgid "Playlist mode."
+msgstr "Modo de lista de reproducción."
+
+#: src/skins/ui_main.c:1677
+msgid "Stopping after song."
+msgstr "Parar después de la canción."
+
+#: src/skins/ui_main.c:1679
+msgid "Not stopping after song."
+msgstr "No parar después de la canción."
+
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+msgid "Autoscroll Songname"
+msgstr "Desplazar el nombre de la canción"
+
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Parar tras la canción actual"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+msgid "Peaks"
+msgstr "Picos"
+
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Orden aleatorio"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "No avanzar la lista de reproducción"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+msgid "Show Player"
+msgstr "Mostrar reproductor"
+
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+msgid "Show Playlist Editor"
+msgstr "Mostrar el editor de listas de reproducción"
+
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+msgid "Show Equalizer"
+msgstr "Mostrar el ecualizador"
+
+#: 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 "Poner en todos los espacios de trabajo"
+
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+msgid "Roll up Player"
+msgstr "Enrollar el reproductor"
+
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+msgid "Roll up Playlist Editor"
+msgstr "Enrollar el editor de listas de reproducción"
+
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+msgid "Roll up Equalizer"
+msgstr "Enrollar el ecualizador"
+
+#: src/skins/ui_manager.c:115
+msgid "Analyzer"
+msgstr "Analizador"
+
+#: src/skins/ui_manager.c:116
+msgid "Scope"
+msgstr "Campo"
+
+#: src/skins/ui_manager.c:117
+msgid "Voiceprint"
+msgstr "Marca de voz"
+
+#: src/skins/ui_manager.c:118
+msgid "Off"
+msgstr "Apagado"
+
+#: 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:123 src/skins/ui_manager.c:140
+msgid "Fire"
+msgstr "Fuego"
+
+#: src/skins/ui_manager.c:124
+msgid "Vertical Lines"
+msgstr "Líneas verticales"
+
+#: src/skins/ui_manager.c:128
+msgid "Lines"
+msgstr "Líneas"
+
+#: src/skins/ui_manager.c:129
+msgid "Bars"
+msgstr "Barras"
+
+#: src/skins/ui_manager.c:133
+msgid "Dot Scope"
+msgstr "Campo de puntos"
+
+#: src/skins/ui_manager.c:134
+msgid "Line Scope"
+msgstr "Campo de líneas"
+
+#: src/skins/ui_manager.c:135
+msgid "Solid Scope"
+msgstr "Campo sólido"
+
+#: src/skins/ui_manager.c:141
+msgid "Ice"
+msgstr "Hielo"
+
+#: src/skins/ui_manager.c:146
+msgid "Smooth"
+msgstr "Suave"
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slowest"
+msgstr "Muy lento"
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+msgid "Slow"
+msgstr "Lento"
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Medium"
+msgstr "Medio"
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fast"
+msgstr "Rápido"
+
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+msgid "Fastest"
+msgstr "Muy rápido"
+
+#: src/skins/ui_manager.c:166
+msgid "Time Elapsed"
+msgstr "Tiempo transcurrido"
+
+#: src/skins/ui_manager.c:167
+msgid "Time Remaining"
+msgstr "Tiempo restante"
+
+#: 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:197
+msgid "Visualization Mode"
+msgstr "Modo de visualización"
+
+#: src/skins/ui_manager.c:198
+msgid "Analyzer Mode"
+msgstr "Modo analizador"
+
+#: src/skins/ui_manager.c:199
+msgid "Scope Mode"
+msgstr "Modo de campo"
+
+#: src/skins/ui_manager.c:200
+msgid "Voiceprint Mode"
+msgstr "Modo marca de voz"
+
+#: src/skins/ui_manager.c:201
+msgid "WindowShade VU Mode"
+msgstr "Modo WindowShade VU"
+
+#: src/skins/ui_manager.c:202
+msgid "Analyzer Falloff"
+msgstr "Caída del analizador"
+
+#: src/skins/ui_manager.c:203
+msgid "Peaks Falloff"
+msgstr "Caída de los picos"
+
+#: 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 "Lista de reproducción siguiente"
+
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+msgid "Select Previous Playlist"
+msgstr "Lista de reproducción anterior"
+
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Eliminar la lista de reproducción"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "Importar lista de reproducción"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Carga un archivo de listas en la lista de reproducción seleccionada."
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "Exportar lista de reproducción"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr "Guarda la lista de reproducción seleccionada."
+
+#: src/skins/ui_manager.c:229
+msgid "Refresh List"
+msgstr "Actualizar lista"
+
+#: src/skins/ui_manager.c:230
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr ""
+"Actualiza los metadatos asociados con una entrada de la lista de "
+"reproducción."
+
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "Gestor de listas de reproducción"
+
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Gestor de colas"
+
+#: src/skins/ui_manager.c:237
+msgid "View"
+msgstr "Ver"
+
+#: src/skins/ui_manager.c:238
+msgid "Interface"
+msgstr "Interfaz"
+
+#: src/skins/ui_manager.c:239
+msgid "Interface Preferences ..."
+msgstr "Preferencias del interfaz ..."
+
+#: src/skins/ui_manager.c:243
+msgid "Add Internet Address..."
+msgstr "Añadir dirección de Internet..."
+
+#: src/skins/ui_manager.c:244
+msgid "Adds a remote track to the playlist."
+msgstr "Añade una pista remota a la lista de reproducción."
+
+#: src/skins/ui_manager.c:247
+msgid "Add Files..."
+msgstr "Añadir archivos..."
+
+#: src/skins/ui_manager.c:248
+msgid "Adds files to the playlist."
+msgstr "Añadir archivos a la lista de reproducción."
+
+#: src/skins/ui_manager.c:253
+msgid "Search and Select"
+msgstr "Buscar y seleccionar"
+
+#: src/skins/ui_manager.c:254
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr ""
+"Busca en la lista de reproducción y selecciona las entradas que cumplen un "
+"criterio específico."
+
+#: src/skins/ui_manager.c:257
+msgid "Invert Selection"
+msgstr "Invertir la selección"
+
+#: src/skins/ui_manager.c:258
+msgid "Inverts the selected and unselected entries."
+msgstr "Invierte las entradas seleccionadas y no seleccionadas."
+
+#: src/skins/ui_manager.c:261
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: src/skins/ui_manager.c:262
+msgid "Selects all of the playlist entries."
+msgstr "Selecciona todos los elementos de la lista de reproducción."
+
+#: src/skins/ui_manager.c:265
+msgid "Select None"
+msgstr "No seleccionar nada"
+
+#: src/skins/ui_manager.c:266
+msgid "Deselects all of the playlist entries."
+msgstr "Quita la selección de todos los elementos de la lista."
+
+#: src/skins/ui_manager.c:271
+msgid "Remove All"
+msgstr "Eliminar todo"
+
+#: src/skins/ui_manager.c:272
+msgid "Removes all entries from the playlist."
+msgstr "Elimina todas las entradas de la lista de reproducción."
+
+#: src/skins/ui_manager.c:275
+msgid "Clear Queue"
+msgstr "Limpiar la cola"
+
+#: src/skins/ui_manager.c:276
+msgid "Clears the queue associated with this playlist."
+msgstr "Limpia la cola asociada con esta lista de reproducción."
+
+#: src/skins/ui_manager.c:279
+msgid "Remove Unavailable Files"
+msgstr "Eliminar los archivos no disponibles"
+
+#: src/skins/ui_manager.c:280
+msgid "Removes unavailable files from the playlist."
+msgstr "Elimina los archivos no disponibles de la lista de reproducción."
+
+#: src/skins/ui_manager.c:283
+msgid "Remove Duplicates"
+msgstr "Eliminar duplicados"
+
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
+msgid "By Title"
+msgstr "Por título"
+
+#: src/skins/ui_manager.c:286
+msgid "Removes duplicate entries from the playlist by title."
+msgstr "Elimina las entradas duplicadas de la lista por título."
+
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
+msgid "By Filename"
+msgstr "Por nombre de archivo"
+
+#: src/skins/ui_manager.c:290
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr ""
+"Elimina las entradas duplicadas de la lista de reproducción por nombre de "
+"archivo."
+
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
+msgid "By Path + Filename"
+msgstr "Por ruta y nombre de archivo"
+
+#: src/skins/ui_manager.c:294
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr ""
+"Elimina las entradas duplicadas de la lista de reproducción por su ruta "
+"completa."
+
+#: src/skins/ui_manager.c:297
+msgid "Remove Unselected"
+msgstr "Eliminar los no seleccionados"
+
+#: src/skins/ui_manager.c:298
+msgid "Remove unselected entries from the playlist."
+msgstr "Elimina las entradas no seleccionadas de la lista de reproducción."
+
+#: src/skins/ui_manager.c:301
+msgid "Remove Selected"
+msgstr "Eliminar los seleccionados"
+
+#: src/skins/ui_manager.c:302
+msgid "Remove selected entries from the playlist."
+msgstr "Elimina las entradas seleccionadas de la lista de reproducción."
+
+#: src/skins/ui_manager.c:307
+msgid "Randomize List"
+msgstr "Ordenar aleatoriamente"
+
+#: src/skins/ui_manager.c:308
+msgid "Randomizes the playlist."
+msgstr "Ordena la lista de reproducción de forma aleatoria."
+
+#: src/skins/ui_manager.c:311
+msgid "Reverse List"
+msgstr "Invertir la lista"
+
+#: src/skins/ui_manager.c:312
+msgid "Reverses the playlist."
+msgstr "Invierte la lista de reproducción."
+
+#: src/skins/ui_manager.c:315
+msgid "Sort List"
+msgstr "Ordenar lista"
+
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
+msgid "Sorts the list by title."
+msgstr "Ordena la lista por título."
+
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+msgid "By Album"
+msgstr "Por álbum"
+
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
+msgid "Sorts the list by album."
+msgstr "Ordena la lista por álbum."
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "By Artist"
+msgstr "Por artista"
+
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+msgid "Sorts the list by artist."
+msgstr "Ordena la lista por artista."
+
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+msgid "Sorts the list by filename."
+msgstr "Ordena la lista por nombre de archivo."
+
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+msgid "Sorts the list by full pathname."
+msgstr "Ordena la lista por ruta de archivo completa."
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "By Date"
+msgstr "Por fecha"
+
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+msgid "Sorts the list by modification time."
+msgstr "Ordena la lista por fecha de modificación."
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "By Track Number"
+msgstr "Por número de pista"
+
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+msgid "Sorts the list by track number."
+msgstr "Ordena la lista por número de pista."
+
+#: src/skins/ui_manager.c:345
+msgid "Sort Selected"
+msgstr "Ordenar los seleccionados"
+
+#: src/skins/ui_manager.c:381
+msgid "File"
+msgstr "Archivo"
+
+#: src/skins/ui_manager.c:384
+msgid "Plugin Services"
+msgstr "Servicios de complementos"
+
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
+msgid "View Track Details"
+msgstr "Ver detalles de la pista"
+
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
+msgid "View track details"
+msgstr "Ver detalles de la pista"
+
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
+msgid "About Audacious"
+msgstr "Acerca de Audacious"
+
+#: src/skins/ui_manager.c:395
+msgid "Play File"
+msgstr "Reproducir archivo"
+
+#: src/skins/ui_manager.c:396
+msgid "Load and play a file"
+msgstr "Carga y reproduce un archivo."
+
+#: src/skins/ui_manager.c:398
+msgid "Play Location"
+msgstr "Reproducir localización"
+
+#: src/skins/ui_manager.c:399
+msgid "Play media from the selected location"
+msgstr "Reproduce los medios desde la localización seleccionada."
+
+#: src/skins/ui_manager.c:401
+msgid "Plugin services"
+msgstr "Servicios de complementos"
+
+#: src/skins/ui_manager.c:403
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: src/skins/ui_manager.c:404
+msgid "Open preferences window"
+msgstr "Abrir la ventana de preferencias"
+
+#: src/skins/ui_manager.c:407
+msgid "Quit Audacious"
+msgstr "Salir de Audacious"
+
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
+msgid "Set A-B"
+msgstr "Poner A-B"
+
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
+msgid "Clear A-B"
+msgstr "Quitar A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Jump to Time"
+msgstr "Saltar en el tiempo"
+
+#: src/skins/ui_manager.c:421
+msgid "Queue Toggle"
+msgstr "Conmutar cola"
+
+#: src/skins/ui_manager.c:422
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Activa/desactiva las entradas en la lista de reproducción."
+
+#: src/skins/ui_manager.c:425
+msgid "Copy"
+msgstr "Copiar"
+
+#: src/skins/ui_manager.c:427
+msgid "Cut"
+msgstr "Cortar"
+
+#: src/skins/ui_manager.c:429
+msgid "Paste"
+msgstr "Pegar"
+
+#: src/skins/ui_manager.c:436
+msgid "Load"
+msgstr "Cargar"
+
+#: src/skins/ui_manager.c:437
+msgid "Import"
+msgstr "Importar"
+
+#: src/skins/ui_manager.c:438
+msgid "Save"
+msgstr "Guardar"
+
+#: src/skins/ui_manager.c:439
+msgid "Delete"
+msgstr "Borrar"
+
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
+msgid "Preset"
+msgstr "Predefinido"
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
+msgid "Auto-load preset"
+msgstr "Auto-cargar predefinido"
+
+#: src/skins/ui_manager.c:445
+msgid "Load auto-load preset"
+msgstr "Cargar auto-cargar predefinido"
+
+#: src/skins/ui_manager.c:448
+msgid "Load default preset into equalizer"
+msgstr "Cargar el predefinido predeterminado en el ecualizador"
+
+#: src/skins/ui_manager.c:450
+msgid "Zero"
+msgstr "Cero"
+
+#: src/skins/ui_manager.c:451
+msgid "Set equalizer preset levels to zero"
+msgstr "Pone los niveles predefinidos del ecualizador a cero"
+
+#: src/skins/ui_manager.c:453
+msgid "From file"
+msgstr "Desde archivo"
+
+#: src/skins/ui_manager.c:454
+msgid "Load preset from file"
+msgstr "Cargar el predefinido desde un archivo"
+
+#: src/skins/ui_manager.c:456
+msgid "From WinAMP EQF file"
+msgstr "Desde archivo"
+
+#: src/skins/ui_manager.c:457
+msgid "Load preset from WinAMP EQF file"
+msgstr "Carga el predefinido desde un archivo EQF de WinAMP"
+
+#: src/skins/ui_manager.c:459
+msgid "WinAMP Presets"
+msgstr "Predefinidos de WinAMP"
+
+#: src/skins/ui_manager.c:460
+msgid "Import WinAMP presets"
+msgstr "Importar los predefindos de WinAMP"
+
+#: src/skins/ui_manager.c:466
+msgid "Save auto-load preset"
+msgstr "Guardar auto-cargar predefinido"
+
+#: src/skins/ui_manager.c:469
+msgid "Save default preset"
+msgstr "Guardar predefinido predeterminado"
+
+#: src/skins/ui_manager.c:471
+msgid "To file"
+msgstr "A un archivo"
+
+#: src/skins/ui_manager.c:472
+msgid "Save preset to file"
+msgstr "Guarda el predefinido en un archivo"
+
+#: src/skins/ui_manager.c:474
+msgid "To WinAMP EQF file"
+msgstr "A un archivo EQF de WinAMP"
+
+#: src/skins/ui_manager.c:475
+msgid "Save preset to WinAMP EQF file"
+msgstr "Guarda el predefinido en un archivo EQF de WinAMP"
+
+#: src/skins/ui_manager.c:481
+msgid "Delete auto-load preset"
+msgstr "Borrar auto-cargar predefinido"
+
+#: src/skins/ui_playlist.c:248
+msgid "Search entries in active playlist"
+msgstr "Buscar entradas en la lista de reproducción activa"
+
+#: src/skins/ui_playlist.c:256
+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 "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr ""
+"Seleccione entradas en la lista de reproducción indicando uno o más campos. "
+"Los campos utilizan sintaxis de expresiones regulares, sin distinguir "
+"mayúsculas de minúsculas. Si no sabe como funcionan las expresiones "
+"regulares, tan solo escriba la parte del literal que quiere buscar."
+
+#: src/skins/ui_playlist.c:264
+msgid "Title: "
+msgstr "Título: "
+
+#: src/skins/ui_playlist.c:271
+msgid "Album: "
+msgstr "Álbum: "
+
+#: src/skins/ui_playlist.c:278
+msgid "Artist: "
+msgstr "Artista: "
+
+#: src/skins/ui_playlist.c:285
+msgid "Filename: "
+msgstr "Nombre del archivo: "
+
+#: src/skins/ui_playlist.c:293
+msgid "Clear previous selection before searching"
+msgstr "Limpiar la selección previa antes de buscar"
+
+#: src/skins/ui_playlist.c:296
+msgid "Automatically toggle queue for matching entries"
+msgstr "Conmutar automáticamente la cola para las entradas coincidentes"
+
+#: src/skins/ui_playlist.c:299
+msgid "Create a new playlist with matching entries"
+msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
+
+#: src/skins/ui_playlist.c:765
+msgid "Audacious Playlist Editor"
+msgstr "Editor de listas de reproducción de Audacious"
+
+#: src/skins/ui_playlist.c:812
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d de %d)"
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr "Tema para Winamp 2.x archivado"
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr "Tema para Winamp 2.x no archivado"
+
+#: src/skins/util.c:774
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr "No se pudo crear el directorio (%s): %s\n"
+
+#: src/sndfile/plugin.c:456
+msgid "About sndfile plugin"
+msgstr "Acerca del complemento de archivos de sonido"
+
+#: src/sndstretch/sndstretch_xmms.c:155
+msgid "About SndStretch"
+msgstr "Acerca del extensor de sonido"
+
+#: src/sndstretch/sndstretch_xmms.c:308
+msgid "Volume corr."
+msgstr "Corr. volumen"
+
+#: src/sndstretch/sndstretch_xmms.c:309
+msgid "Short Overlap"
+msgstr "Solapamiento corto"
+
+#: src/sndstretch/sndstretch_xmms.c:355
+msgid "Speed"
+msgstr "Velocidad"
+
+#: src/sndstretch/sndstretch_xmms.c:356
+msgid "Pitch"
+msgstr "Tono"
+
+#: src/sndstretch/sndstretch_xmms.c:357
+msgid "Scale"
+msgstr "Escala"
+
+#: src/sndstretch/sndstretch_xmms.c:377
+msgid "SndStretch - Configuration"
+msgstr "Extensor de sonido - Configuración"
+
+#: src/song_change/song_change.c:437
+msgid "Command to run when Audacious starts a new song."
+msgstr "Comando a ejecutar cuando Audacious reproduce una canción nueva."
+
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
+msgid "Command:"
+msgstr "Comando:"
+
+#: src/song_change/song_change.c:443
+msgid "Command to run toward the end of a song."
+msgstr "Comando para ejecutar al final de una canción."
+
+#: src/song_change/song_change.c:449
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr ""
+"Comando para ejecutar cuando Audacious llega al final de una lista de "
+"reproducción."
+
+#: src/song_change/song_change.c:455
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr ""
+"Comando para ejecutar cuando el título cambia para una canción (es decir, "
+"títulos de flujos en red)"
+
+#: src/song_change/song_change.c:461
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command).\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: filename (full path)\n"
+"%l: length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr ""
+"Puede utilizar los siguientes formatos de cadena que\n"
+"se reemplazarán antes de ejecutar el comando (no\n"
+"todos son útiles para el final del comando de fin de lista).\n"
+"\n"
+"%F: Frecuencia (en hercios)\n"
+"%c: Número de canales\n"
+"%f: Nombre de archivo (ruta completa)\n"
+"%l: Longitud (en milisegundos)\n"
+"%n o %s: Nombre de la canción\n"
+"%r: Tasa (en bits por segundo)\n"
+"%t: Posición de la lista de reproducción (%02d)\n"
+"%p: Reproduciendo actualmente (1 o 0)\n"
+"%a: Artista\n"
+"%b: Álbum\n"
+"%T: Título de la pista"
+
+#: src/song_change/song_change.c:488
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr ""
+"Los parámetros enviados a la consola se deberían "
+"encapsular con comillas. De otra forma existe un riesgo de seguridad."
+
+#: src/song_change/song_change.c:499
+msgid "Commands"
+msgstr "Comandos"
+
+#: src/song_change/song_change.c:529
+msgid "Song Change"
+msgstr "Cambio de canción"
+
+#: src/statusicon/statusicon.c:379
+msgid "About Status Icon Plugin"
+msgstr "Acerca del complemento de icono de estado"
+
+#: src/statusicon/statusicon.c:380
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager.\n"
+msgstr ""
+"Complemento de icono de estado\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Este complemento proporciona un icono de estado, situado\n"
+"en la bandeja de sistema del gestor de ventanas.\n"
+
+#: src/statusicon/statusicon.c:451
+msgid "Status Icon Plugin - Preferences"
+msgstr "Complemento de icono de estado - Preferencias"
+
+#: src/statusicon/statusicon.c:461
+msgid "Right-Click Menu"
+msgstr "Menú con click derecho"
+
+#: src/statusicon/statusicon.c:466
+msgid "Small playback menu #1"
+msgstr "Menú pequeño de reproducción #1"
+
+#: src/statusicon/statusicon.c:469
+msgid "Small playback menu #2"
+msgstr "Menú pequeño de reproducción #2"
+
+#: src/statusicon/statusicon.c:485
+msgid "Mouse Scroll Action"
+msgstr "Acción de la rueda del ratón"
+
+#: src/statusicon/statusicon.c:489
+msgid "Change volume"
+msgstr "Cambiar el volumen"
+
+#: src/statusicon/statusicon.c:491
+msgid "Change playing song"
+msgstr "Cambiar la canción en reproducción"
+
+#: src/statusicon/statusicon.c:504
+msgid "Other settings"
+msgstr "Otros ajustes"
+
+#: src/statusicon/statusicon.c:509
+msgid "Disable the popup window"
+msgstr "Desactivar la ventana emergente"
+
+#: src/statusicon/statusicon.c:516
+msgid "Close to the notification area (system tray)"
+msgstr "Cerrar al área de notificación (bandeja de sistema)"
+
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Avanzar en la lista de reproducción al desplazar arriba"
+
+#: src/stereo_plugin/stereo.c:45
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin 1999."
+msgstr ""
+"Complemento de estéreo extra\n"
+"\n"
+"Por Johan Levin 1999."
+
+#: src/stereo_plugin/stereo.c:64
+msgid "About Extra Stereo Plugin"
+msgstr "Acerca del complemento de estéreo extra"
+
+#: src/stereo_plugin/stereo.c:95
+msgid "Configure Extra Stereo"
+msgstr "Configurar estéreo extra"
+
+#: src/tonegen/tonegen.c:49
+msgid "About Tone Generator"
+msgstr "Acerca del generador de tonos"
+
+#: src/tonegen/tonegen.c:51
+msgid ""
+"Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
+msgstr ""
+"Generador de tonos por Haavard Kvaalen <havardk@xmms.org>\n"
+"Modificado por Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Para utilizarlo, añada una URL: tone://frequencia1;frequencia2;frequencia3;...\n"
+"p. ej. tone://2000;2005 para reproducir un tono de 2000Hz y otro de 2005Hz"
+
+#: src/tonegen/tonegen.c:101
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.c:101
+msgid "Tone Generator: "
+msgstr "Generador de tonos: "
+
+#: src/unix-io/gtk.c:34
+msgid "About File I/O Plugin"
+msgstr "Acerca del complemento de archivos de E/S"
+
+#: src/vorbis/vorbis.c:573
+msgid "About Ogg Vorbis Audio Plugin"
+msgstr "Acerca del complemento de sonido Ogg Vorbis"
+
+#: src/vorbis/vorbis.c:578
+msgid ""
+"Ogg Vorbis Plugin by the Xiph.org Foundation\n"
+"\n"
+"Original code by\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"Contributions from\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Haavard Kvaalen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>\n"
+"\n"
+"Visit the Xiph.org Foundation at http://www.xiph.org/\n"
+msgstr ""
+"Complemento Ogg Vorbis por la fundación Xiph.org\n"
+"\n"
+"Código original de\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"Contribuciones de\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Haavard Kvaalen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>\n"
+"\n"
+"Visite la fundación Xiph.org en http://www.xiph.org/\n"
+
+#: src/vtx/about.c:14
+msgid "About Vortex Player"
+msgstr "Acerca del reproductor Vortex"
+
+#: src/vtx/about.c:15
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"\n"
+"Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
+"and other AY/YM music sites.\n"
+"\n"
+"Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Reproductor de archivos con formato Vortex por Sashnov Alexander <sashnov@ngs.ru>\n"
+"Basado en el código original in_vtx.dll de Roman Sherbakov <v_soft@microfor.ru>\n"
+"\n"
+"Se puede encontrar música en formato vtx en http://vtx.microfor.ru/music.htm\n"
+"y otros portales de música AY/YM.\n"
+"\n"
+"Implementación de Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/wavpack/wavpack.c:353
+#, c-format
+msgid "Wavpack Decoder Plugin %s"
+msgstr "Complemento decodificador Wavpack %s"
+
+#: src/wavpack/wavpack.c:354
+msgid ""
+"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan\n"
+"Visit the Wavpack site at http://www.wavpack.com/\n"
+msgstr ""
+"Copyright (c) 2006 William Pitcock <nenolod -en- nenolod.net>\n"
+"\n"
+"Parte del código del complemento es de Miles Egan\n"
+"Visite el portal de Wavpack en http://www.wavpack.com/\n"
+
+

audacious-plugins-3.2.4.tar.bz2/po/es_MX.po Added

@@ -0,0 +1,3386 @@
+# Mexican Spanish translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Jorge A. García Sosa <jagsmd@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-04-29 19:35+0000\n"
+"Last-Translator: Jorge A. García Sosa <jagsmd@gmail.com>\n"
+"Language-Team: Spanish (Mexican)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/aac/libmp4.c:256
+#, c-format
+msgid ""
+"Using libfaad2-%s for decoding.\n"
+"FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
+"Copyright (c) 2005-2006 Audacious team"
+msgstr "Usando libfaad2-%s para decodificar.\nDescodificador FAAD2 AAC/HE-AAC/HE-AACv2/DRM (c) Nero AG, www.nero.com\nCopyright (c) 2005-2006 Audacious team"
+
+#: src/aac/libmp4.c:261
+msgid "About MP4 AAC decoder plugin"
+msgstr "Acerca del plugin descodificador MP4 AAC"
+
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "Acerca de Alarm"
+
+#: src/alarm/alarm.c:313
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr "Un plugin que puede ser usado para comenzar a reproducir a una hora dada.\nOriginalmente escrito por Adam Feakin y Daniel Stodden."
+
+#: src/alarm/interface.c:33
+msgid "Alarm"
+msgstr "Alarma"
+
+#: src/alarm/interface.c:40
+msgid "This is your wakeup call."
+msgstr "Esta es tu llamada despertador."
+
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
+msgid "OK"
+msgstr "OK"
+
+#: src/alarm/interface.c:214
+msgid "Alarm Settings"
+msgstr "Ajustes de Alarma"
+
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
+msgid "Time"
+msgstr "Tiempo"
+
+#: src/alarm/interface.c:270
+msgid "hours"
+msgstr "horas"
+
+#: src/alarm/interface.c:331
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:361
+msgid "minutes"
+msgstr "minutos"
+
+#: src/alarm/interface.c:379
+msgid "Quiet after:"
+msgstr "Silencio después de:"
+
+#: src/alarm/interface.c:389
+msgid "Alarm at (default):"
+msgstr "Alarma a las (predeterminado):"
+
+#: src/alarm/interface.c:409
+msgid "Choose the days for the alarm to come on"
+msgstr "Escoge los días para suene la alarma"
+
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
+msgid "Default"
+msgstr "Predeterminado"
+
+#: src/alarm/interface.c:763
+msgid "Day"
+msgstr "Día"
+
+#: src/alarm/interface.c:783
+msgid "Tuesday"
+msgstr "Martes"
+
+#: src/alarm/interface.c:794
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#: src/alarm/interface.c:805
+msgid "Thursday"
+msgstr "Jueves"
+
+#: src/alarm/interface.c:816
+msgid "Friday"
+msgstr "Viernes"
+
+#: src/alarm/interface.c:827
+msgid "Saturday"
+msgstr "Sábado"
+
+#: src/alarm/interface.c:838
+msgid "Sunday"
+msgstr "Domingo"
+
+#: src/alarm/interface.c:848
+msgid "Monday"
+msgstr "Lunes"
+
+#: src/alarm/interface.c:859
+msgid "Days"
+msgstr "Días"
+
+#: src/alarm/interface.c:875
+msgid "Fading"
+msgstr "Disminución"
+
+#: src/alarm/interface.c:912
+msgid "seconds"
+msgstr "segundos"
+
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
+msgid "Volume"
+msgstr "Volumen"
+
+#: src/alarm/interface.c:946
+msgid "Current"
+msgstr "Actual"
+
+#: src/alarm/interface.c:954
+msgid "Start at"
+msgstr "Comenzar a"
+
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:998
+msgid "Final"
+msgstr "Finalizar a"
+
+#: src/alarm/interface.c:1051
+msgid "Additional Command"
+msgstr "Comando Adicional"
+
+#: src/alarm/interface.c:1077
+msgid "enable"
+msgstr "Habilitar"
+
+#: src/alarm/interface.c:1085
+msgid "Playlist (optional)"
+msgstr "Lista de Reproducción (opcional)"
+
+#: src/alarm/interface.c:1111
+msgid "Browse..."
+msgstr "Examinar"
+
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
+msgid "Reminder"
+msgstr "Recodatorio"
+
+#: src/alarm/interface.c:1136
+msgid "Use reminder"
+msgstr "Usar recordatorio"
+
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Opciones"
+
+#: src/alarm/interface.c:1160
+msgid "What do these options mean?"
+msgstr "¿Qué significan estás opciones?"
+
+#: src/alarm/interface.c:1188
+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 "\nTiempo\n Alarma a las: \n La hora a la que sonará la alarma.\n\n Detener Después de: \n Detener la alarma después de esta cantidad de tiempo.\n (si el diálogo de despertar no está cerrado)\n\n\nDías\n Día:\n Selecciona los días que la alarma se activará.\n\n Hora:\n Escoge la hora para la alarma de cada día,\n o selecciona Predeterminada para utilizar la hora\n predeterminada.\n\n\nVolumen\n Disminución: \n Disminuye el volumen al volumen seleccionado \n para esta cantidad de tiempo.\n\n Comenzar a: \n Comienza la disminución a este volumen.\n\n Finalizar: \n El volumen a la que se detendrá la disminución. Si la hora de\n disminución es 0 entonces el volumen se ajustara a esto y comenzará \n reproducir.\n\n\nOpciones:\n Comando Adicional:\n Ejecuta este comando a la hora de la alarma.\n\n Lista de Reproducción: \n Carga esta lista de reproducción para reproducir sus pistas \n (debe tener la extensión .m3u). Si no es dada una\n lista de repoducción entonces serán reproducidas las de la actual\n lista de reproducción.\n También puede ser introducido aquí el URL de un stream de mp3/ogg,\n pero cargar listas de repoducción desde URLs\n no es soportado actualmente por xmms.\n\n Recordatorio:\n Muestra un recordatorio cuando la alarma se apague,\n escribe el recordatorio en la caja y selecciona la type the reminder in the box and turn on the\n opción Habilitar Recordatorio si quieres que sea mostrado.\n"
+
+#: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Ayuda"
+
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/alarm/interface.c:1290
+msgid "Your reminder for today is.."
+msgstr "Tu recordatorio para hoy es.."
+
+#: src/alarm/interface.c:1315
+msgid "Thankyou"
+msgstr "Gracias"
+
+#: src/alsa/config.c:210
+msgid "Default PCM device"
+msgstr "Dispositivo PCM determinado"
+
+#: src/alsa/config.c:235
+msgid "Default mixer device"
+msgstr "Dispositivo mezclador predeterminado"
+
+#: src/alsa/config.c:438
+msgid "ALSA Output Plugin Preferences"
+msgstr "Preferencias del plugin de salida ALSA"
+
+#: src/alsa/config.c:445
+msgid "PCM device:"
+msgstr "Dispositivo PCM:"
+
+#: src/alsa/config.c:447 src/OSS/configure.c:237
+msgid "Mixer device:"
+msgstr "Dispositivo mezclador:"
+
+#: src/alsa/config.c:449
+msgid "Mixer element:"
+msgstr "Elemento mezclador:"
+
+#: src/alsa/config.c:452
+msgid "Work around drain hangup"
+msgstr "Evitar colapsos por falta de recursos"
+
+#: src/alsa/plugin.c:59
+msgid "About ALSA Output Plugin"
+msgstr "Acerca del plugin de salida ALSA"
+
+#: src/alsa/plugin.c:81
+msgid "ALSA error"
+msgstr "Error ALSA"
+
+#: src/amidi-plug/amidi-plug.c:326
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr "No has seleccionado ningún puerto secuenciador para reproducción MIDI. Puedes hacerlo en las preferencias del plugin MIDI."
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:35
+msgid "ALSA Backend "
+msgstr "Motor ALSA"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:37
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr "Este motor envía eventos MIDI a un grupo de puertos secuenciadores ALSA escogidos por el usuario. La interfaz del secuenciador ALSA es muy versátil, puede proveer puertos para sintetizadores por hardware de tarjetas de audio (por ejemplo, emu10k1) pero tambien para sintetizadores por software, dispositivos externos, etc.\nEste motor no produce audio, los eventos MIDI son manejados durectamente desde los dispositivos o programas detrás de los puertos ALSA; por ejemplo, los eventos MIDI enviados al sintetizador por hardware serán reproducidos directamente.\nMotor escrito por Giacomo Lozito."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
+msgid "FluidSynth Backend "
+msgstr "Motor FluidSynth "
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr "Este motor produce audio enviando eventos MIDI a FluidSynth, un sintetizador de software en tiempo real basado en la especificación SoundFont2 (www.fluidsynth.org).\nEl audio producido puede ser manipulado a trevés de los plugins de efecto y es procesado por el plugin de salida elegido.\nMotor escrito por Giacomo Lozito."
+
+#: src/amidi-plug/i_configure-alsa.c:228
+msgid "ALSA BACKEND CONFIGURATION"
+msgstr "CONFIGURACIÓN DEL BACKEND ALSA"
+
+#: src/amidi-plug/i_configure-alsa.c:331
+msgid "Port"
+msgstr "Puerto"
+
+#: src/amidi-plug/i_configure-alsa.c:333
+msgid "Client name"
+msgstr "Nombre del Cliente"
+
+#: src/amidi-plug/i_configure-alsa.c:335
+msgid "Port name"
+msgstr "Nombre del Puerto"
+
+#: src/amidi-plug/i_configure-alsa.c:346
+msgid "ALSA output ports"
+msgstr "Puertos de salida ALSA"
+
+#: src/amidi-plug/i_configure-alsa.c:399
+msgid "Soundcard: "
+msgstr "Tarjeta de sonido:"
+
+#: src/amidi-plug/i_configure-alsa.c:401
+msgid "Mixer control: "
+msgstr "Control del mezclador:"
+
+#: src/amidi-plug/i_configure-alsa.c:413
+msgid "Mixer settings"
+msgstr "Ajustes del mezclador"
+
+#: src/amidi-plug/i_configure-alsa.c:429
+msgid "ALSA Backend not loaded or not available"
+msgstr "El Motor ALSA no está cargado o no está disponible"
+
+#: src/amidi-plug/i_configure-alsa.c:448
+msgid ""
+"ALSA\n"
+"backend"
+msgstr "Motor\nALSA"
+
+#: src/amidi-plug/i_configure-ap.c:59
+msgid "AMIDI-Plug - backend information"
+msgstr "AMIDI-Plug - información del motor"
+
+#: src/amidi-plug/i_configure-ap.c:196
+msgid "AMIDI-PLUG PREFERENCES"
+msgstr "PREFERENCIAS AMIDI-PLUG"
+
+#: src/amidi-plug/i_configure-ap.c:223
+msgid "Backend selection"
+msgstr "Selección del backend"
+
+#: src/amidi-plug/i_configure-ap.c:227
+msgid "Available backends"
+msgstr "Backends disponibles"
+
+#: src/amidi-plug/i_configure-ap.c:257
+msgid "Playback settings"
+msgstr "Ajustes de reproducción"
+
+#: src/amidi-plug/i_configure-ap.c:262
+msgid "Transpose: "
+msgstr "Transponer: "
+
+#: src/amidi-plug/i_configure-ap.c:271
+msgid "Drum shift: "
+msgstr "Cambio de bateria: "
+
+#: src/amidi-plug/i_configure-ap.c:289
+msgid "Advanced settings"
+msgstr "Ajustes avanzados"
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "pre-calcular duración de archivos MIDI en la lista de reproducción"
+
+#: src/amidi-plug/i_configure-ap.c:298
+msgid "extract comments from MIDI file (if available)"
+msgstr "extraer comentarios del archivo MIDI (si están disponibles)"
+
+#: src/amidi-plug/i_configure-ap.c:303
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "extraer letras de canciones del archivo MIDI (si están disponibles)"
+
+#: src/amidi-plug/i_configure-ap.c:333
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr "AMIDI\nPlug"
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug - select file"
+msgstr "AMIDI-Plug - seleccionar archivo"
+
+#: src/amidi-plug/i_configure.c:129
+msgid "AMIDI-Plug - configuration"
+msgstr "AMIDI-Plug - configuración"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:55
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Plug - seleccionar archivo SoundFont"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:270
+msgid "FLUIDSYNTH BACKEND CONFIGURATION"
+msgstr "CONFIGURACIÓN DEL BACKEND FLUIDSYNTH "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:313
+msgid "SoundFont settings"
+msgstr "Ajustes de SoundFont"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Nombre del archivo"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:349
+msgid "Size (bytes)"
+msgstr "Tamaño (bytes)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:398
+msgid "Load SF on player start"
+msgstr "Cargar SF al iniciar el reproductor"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:402
+msgid "Load SF on first midifile play"
+msgstr "Cargar SF al reproducir el primer archivo MIDI"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:417
+msgid "Synthesizer settings"
+msgstr "Ajustes del sintetizador"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:426
+msgid "gain"
+msgstr "ganancia"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:432
+#: src/amidi-plug/i_configure-fluidsynth.c:460
+#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:519
+msgid "use default"
+msgstr "Utilizar predeterminado"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:435
+#: src/amidi-plug/i_configure-fluidsynth.c:463
+msgid "value:"
+msgstr "valor:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:454
+msgid "poliphony"
+msgstr "polifonía"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:482
+msgid "reverb"
+msgstr "reverberación"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:491
+#: src/amidi-plug/i_configure-fluidsynth.c:522
+msgid "yes"
+msgstr "sí"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:493
+#: src/amidi-plug/i_configure-fluidsynth.c:524
+msgid "no"
+msgstr "no"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:513
+msgid "chorus"
+msgstr "coro"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:544
+msgid "sample rate"
+msgstr "frecuencia de muestreo"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:550
+msgid "22050 Hz "
+msgstr "22050 hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:553
+msgid "44100 Hz "
+msgstr "44100 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:556
+msgid "96000 Hz "
+msgstr "96000 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:559
+msgid "custom "
+msgstr "personalizada"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "Hz "
+msgstr "Hz"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:621
+msgid "FluidSynth Backend not loaded or not available"
+msgstr "Backend FluidSynth no cargado o no está disponible"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:640
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr "Backend\nFluidSynth"
+
+#: src/amidi-plug/i_configure-timidity.c:39
+msgid "TIMIDITY BACKEND CONFIGURATION"
+msgstr "CONFIGURACIÓN DEL BACKEND TIMIDITY"
+
+#: src/amidi-plug/i_configure-timidity.c:64
+msgid "TiMidity Backend not loaded or not available"
+msgstr "Backend TiMidity no cargado o no está disponible"
+
+#: src/amidi-plug/i_configure-timidity.c:83
+msgid ""
+"TiMidity\n"
+"backend"
+msgstr "Backend\nTiMidity"
+
+#: src/amidi-plug/i_fileinfo.c:169
+msgid "Name:"
+msgstr "Nombre:"
+
+#: src/amidi-plug/i_fileinfo.c:193
+msgid " MIDI Info "
+msgstr " Información MIDI "
+
+#: src/amidi-plug/i_fileinfo.c:205
+msgid "Format:"
+msgstr "Formato:"
+
+#: src/amidi-plug/i_fileinfo.c:208
+msgid "Length (msec):"
+msgstr "Duración (ms):"
+
+#: src/amidi-plug/i_fileinfo.c:211
+msgid "Num of Tracks:"
+msgstr "Núm de Pistas:"
+
+#: src/amidi-plug/i_fileinfo.c:216
+msgid "variable"
+msgstr "variable"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidi-plug/i_fileinfo.c:223
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "Time Div:"
+msgstr "Div. tiempo:"
+
+#: src/amidi-plug/i_fileinfo.c:237
+msgid " MIDI Comments and Lyrics "
+msgstr " Comentarios y Letras de canción MIDI "
+
+#: src/amidi-plug/i_fileinfo.c:288
+msgid "* no comments available in this MIDI file *"
+msgstr "* no hay comentarios disponibles en este archivo MIDI *"
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* no hay letras de canción disponibles en este archivo MIDI *"
+
+#: src/amidi-plug/i_fileinfo.c:349
+msgid " (invalid UTF-8)"
+msgstr " (UTF-8 inválido)"
+
+#: src/amidi-plug/i_utils.c:43
+msgid "AMIDI-Plug - about"
+msgstr "AMIDI-Plug - acerca de"
+
+#: src/amidi-plug/i_utils.c:68
+msgid ""
+"\n"
+"AMIDI-Plug "
+msgstr "\nAMIDI-Plug "
+
+#: src/amidi-plug/i_utils.c:69
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing\n"
+"\n"
+msgstr "\nreproductor musical modular MIDI\nhttp://www.develia.org/projects.php?p=amidiplug\n\nescrito por Giacomo Lozito\n< james@develia.org >\n\n\nagradecimientos especiales a...\n\nClemens Ladisch y Jaroslav Kysela\npor sus chingones programas aplaymidi y amixer; estos\nfueron realmente útiles, junto con la documentación alsa-lib docs, para\naprender más sobre la API ALSA\n\nAlfredo Spadafina\npor el lindo logotipo de teclado midi\n\nTony Vroon\npor la buena ayuda con las pruebas alfa\n\n"
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "Rectángulo"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "Rectágulo Redondeado"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "Rectángulo Cóncavo"
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "Ninguno"
+
+#: src/aosd/aosd_trigger.c:78
+msgid "Playback Start"
+msgstr "Iniciar Reproducción"
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Muestra Notificación en Pantalla cuando se reproduce un elemento de la lista de reproducción"
+
+#: src/aosd/aosd_trigger.c:83
+msgid "Title Change"
+msgstr "Cambio de Título"
+
+#: src/aosd/aosd_trigger.c:84
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr "Muestra el Notificación en Pantalla cuando, en la reproducción, el título de la pista cambia pero el nombre del archivo es el mismo. Esto es muy útil para mostrar cambios de título en streams de internet."
+
+#: src/aosd/aosd_trigger.c:90
+msgid "Volume Change"
+msgstr "Cambiar Volumen"
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Triggers OSD when volume is changed."
+msgstr "Muestra Notificación en Pantalla cuando cambia el volumen."
+
+#: src/aosd/aosd_trigger.c:95
+msgid "Pause On"
+msgstr "Pausa Encendida"
+
+#: src/aosd/aosd_trigger.c:96
+msgid "Triggers OSD when playback is paused."
+msgstr "Muestra Notificación en Pantalla cuando la reproducción está pausada."
+
+#: src/aosd/aosd_trigger.c:100
+msgid "Pause Off"
+msgstr "Pausa Apagada"
+
+#: src/aosd/aosd_trigger.c:101
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Muestra Notificación en Pantalla cuando la pausa termina."
+
+#: src/aosd/aosd_ui.c:179
+msgid "Placement"
+msgstr "Colocación"
+
+#: src/aosd/aosd_ui.c:218
+msgid "Relative X offset:"
+msgstr "Compensación relativa en X:"
+
+#: src/aosd/aosd_ui.c:227
+msgid "Relative Y offset:"
+msgstr "Compensación relativa en Y:"
+
+#: src/aosd/aosd_ui.c:236
+msgid "Max OSD width:"
+msgstr "Ancho máximo de OSD:"
+
+#: src/aosd/aosd_ui.c:249
+msgid "Multi-Monitor options"
+msgstr "Opciones de varios monitores"
+
+#: src/aosd/aosd_ui.c:253
+msgid "Display OSD using:"
+msgstr "Mostrar OSD utilizando:"
+
+#: src/aosd/aosd_ui.c:264
+msgid "all monitors"
+msgstr "Todos los monitores"
+
+#: src/aosd/aosd_ui.c:267
+#, c-format
+msgid "monitor %i"
+msgstr "monitor %i"
+
+#: src/aosd/aosd_ui.c:322
+msgid "Timing (ms)"
+msgstr "Tiempo (ms)"
+
+#: src/aosd/aosd_ui.c:327
+msgid "Display:"
+msgstr "Mostrar:"
+
+#: src/aosd/aosd_ui.c:332
+msgid "Fade in:"
+msgstr "Desvanecimiento al aparecer:"
+
+#: src/aosd/aosd_ui.c:337
+msgid "Fade out:"
+msgstr "Desvanecimiento al desaparecer:"
+
+#: src/aosd/aosd_ui.c:418
+msgid "Fonts"
+msgstr "Fuentes"
+
+#: src/aosd/aosd_ui.c:426
+#, c-format
+msgid "Font %i:"
+msgstr "Fuente %i:"
+
+#: src/aosd/aosd_ui.c:443
+msgid "Shadow"
+msgstr "Sombra"
+
+#: src/aosd/aosd_ui.c:478
+msgid "Internationalization"
+msgstr "Internacionalización"
+
+#: src/aosd/aosd_ui.c:484
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "Deshabilitar conversión de texto UTF-8 (en Avisos en Pantalla)"
+
+#: src/aosd/aosd_ui.c:502
+msgid "Select Skin File"
+msgstr "Seleccionar archivo de Skin"
+
+#: src/aosd/aosd_ui.c:613
+msgid "Render Style"
+msgstr "Estilo de Renderización"
+
+#: src/aosd/aosd_ui.c:629
+msgid "Colors"
+msgstr "Colores"
+
+#: src/aosd/aosd_ui.c:642
+#, c-format
+msgid "Color %i:"
+msgstr "Color %i:"
+
+#: src/aosd/aosd_ui.c:662
+msgid "Custom Skin"
+msgstr "Skin personalizada"
+
+#: src/aosd/aosd_ui.c:668
+msgid "Skin file:"
+msgstr "Archivo de Skin:"
+
+#: src/aosd/aosd_ui.c:671
+msgid "Browse"
+msgstr "Examinar"
+
+#: src/aosd/aosd_ui.c:773
+msgid "Enable trigger"
+msgstr "Activar Aviso"
+
+#: src/aosd/aosd_ui.c:800
+msgid "Event"
+msgstr "Evento"
+
+#: src/aosd/aosd_ui.c:828
+msgid "Composite manager detected"
+msgstr "Administrador de composición detectado"
+
+#: src/aosd/aosd_ui.c:835
+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 "Administrador de composición no detectado;\na menos que sepas que tienes uno ejecutándose, por favor activa un administrador de composición, de otra forma las Notificaciones en Pantalla no funcionarán apropiadamente"
+
+#: src/aosd/aosd_ui.c:843
+msgid "Composite manager not required for fake transparency"
+msgstr "Administrador de composición no requerido para transparencia falsa"
+
+#: src/aosd/aosd_ui.c:881
+msgid "Transparency"
+msgstr "Transparencia"
+
+#: src/aosd/aosd_ui.c:887
+msgid "Fake transparency"
+msgstr "Transparencia falsa"
+
+#: src/aosd/aosd_ui.c:889
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Transparencia real (requiere X Composite Ext.)"
+
+#: src/aosd/aosd_ui.c:931
+msgid "Composite extension not loaded"
+msgstr "Extensión de composición no cargada"
+
+#: src/aosd/aosd_ui.c:939
+msgid "Composite extension not available"
+msgstr "Extensión de composición no disponible"
+
+#: src/aosd/aosd_ui.c:958
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd_ui.c:1039
+msgid "Audacious OSD - configuration"
+msgstr "Audacious OSD - configuración"
+
+#: src/aosd/aosd_ui.c:1060
+msgid "Test"
+msgstr "Probar"
+
+#: src/aosd/aosd_ui.c:1075
+msgid "Position"
+msgstr "Posición"
+
+#: src/aosd/aosd_ui.c:1080
+msgid "Animation"
+msgstr "Animación"
+
+#: src/aosd/aosd_ui.c:1085
+msgid "Text"
+msgstr "Texto"
+
+#: src/aosd/aosd_ui.c:1090
+msgid "Decoration"
+msgstr "Decoración"
+
+#: src/aosd/aosd_ui.c:1095
+msgid "Trigger"
+msgstr "Avisos"
+
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
+msgid "Misc"
+msgstr "Misc."
+
+#: src/aosd/aosd_ui.c:1137
+msgid "Audacious OSD - about"
+msgstr "Audacious OSD - acerca"
+
+#: src/aosd/aosd_ui.c:1167
+msgid ""
+"\n"
+"Audacious OSD "
+msgstr "\nAudacious OSD "
+
+#: src/aosd/aosd_ui.c:1168
+msgid ""
+"\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"written by Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"On-Screen-Display is based on Ghosd library\n"
+"written by Evan Martin\n"
+"http://neugierig.org/software/ghosd/\n"
+"\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\nexcrito por Giacomo Lozito\n< james@develia.org >\n\nOn-Screen-Display (Notificaciones en Pantalla) está basado en la librería Ghosd\nescrita por Evan Martin\nhttp://neugierig.org/software/ghosd/\n\n"
+
+#: src/blur_scope/config.c:73
+msgid "Blur Scope: Color selection"
+msgstr "Osciloscopio borroso: Selección de color"
+
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
+msgid "Options:"
+msgstr "Opciones:"
+
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr "Preferencias Bauer stereophonic-to-binaural"
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr "Nivel de alimentación:"
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr "Frecuencia de corte:"
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr "Predefinidos:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:242
+msgid "About Audio CD Plugin"
+msgstr "Acerca del plugin Audio CD"
+
+#: src/cdaudio-ng/cdaudio-ng.c:243
+msgid ""
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project.\n"
+"\n"
+"Copyright 2009 John Lindgren"
+msgstr "Copyright (c) 2007, por Calin Crisan <ccrisan@gmail.com> y el Audacious Team.\n\nMuchas gracias a los desarroladores de libcdio <http://www.gnu.org/software/libcdio/>\n\ty a los desarolladores de libcddb <http://libcddb.sourceforge.net/>.\n\nGracias también a Tony Vroon por ser mi mentor y guiarme.\n\nEste fue un proyecto de Google Summer of Code 2007.\n\nCopyright 2009 John Lindgren"
+
+#: src/cdaudio-ng/cdaudio-ng.c:552
+msgid "Audio CD"
+msgstr "CD de Audio"
+
+#: src/cdaudio-ng/cdaudio-ng.c:924
+msgid "Drive is empty."
+msgstr "La unidad de disco está vacía."
+
+#: src/cdaudio-ng/cdaudio-ng.c:926
+msgid "Unsupported disk type."
+msgstr "Tipo de disco no soportado."
+
+#: src/cdaudio-ng/configure.c:148
+msgid "CD Audio Plugin Configuration"
+msgstr "Configuración del plugin CD Audio"
+
+#: src/cdaudio-ng/configure.c:160
+msgid "Digital audio extraction"
+msgstr "Extración de audio digital"
+
+#: src/cdaudio-ng/configure.c:165
+msgid "Title information"
+msgstr "Información de título"
+
+#: src/cdaudio-ng/configure.c:176
+msgid "Disc speed:"
+msgstr "Velocidad del disco:"
+
+#: src/cdaudio-ng/configure.c:184
+msgid "Use cd-text if available"
+msgstr "Utilizar cd-text si está disponible"
+
+#: src/cdaudio-ng/configure.c:191
+msgid "Use CDDB if available"
+msgstr "Utilizar CDDB si está disponible"
+
+#: src/cdaudio-ng/configure.c:197
+msgid "Server: "
+msgstr "Servidor: "
+
+#: src/cdaudio-ng/configure.c:201
+msgid "Path: "
+msgstr "Ruta:"
+
+#: src/cdaudio-ng/configure.c:205
+msgid "Port: "
+msgstr "Puerto: "
+
+#: src/cdaudio-ng/configure.c:218
+msgid "Use HTTP instead of CDDBP"
+msgstr "Utilizar HTTP en vez de CDDBP"
+
+#: src/cdaudio-ng/configure.c:230
+msgid "Override default device: "
+msgstr "Anular dispositivo determinado: "
+
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
+msgid "Ok"
+msgstr "Ok"
+
+#: src/cd-menu-items/cd-menu-items.c:34
+msgid "Play CD"
+msgstr "Reproducir CD"
+
+#: src/cd-menu-items/cd-menu-items.c:34
+msgid "Add CD"
+msgstr "Agregar CD"
+
+#: src/compressor/plugin.c:63
+msgid "About Dynamic Range Compression Plugin"
+msgstr "Acerca del plugin Dynamic Range Compression"
+
+#: src/compressor/plugin.c:95
+msgid "Dynamic Range Compressor Preferences"
+msgstr "Preferencias del Compresor de Rango Dinámico "
+
+#: src/compressor/plugin.c:107
+msgid "Center volume:"
+msgstr "Centrar volumen:"
+
+#: src/compressor/plugin.c:120
+msgid "Dynamic range:"
+msgstr "Rango dinámico:"
+
+#: src/console/configure.c:136
+msgid "Game Console Music Decoder"
+msgstr "Descodificador de Música de Consolas de Juego"
+
+#: src/console/configure.c:153
+msgid "General"
+msgstr "General"
+
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Reproducción"
+
+#: src/console/configure.c:170
+msgid "Bass:"
+msgstr "Bajos: "
+
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
+msgid "secs"
+msgstr "segundos"
+
+#: src/console/configure.c:181
+msgid "Treble:"
+msgstr "Agudos"
+
+#: src/console/configure.c:202
+msgid "Default song length:"
+msgstr "Duración de pista predeterminada:"
+
+#: src/console/configure.c:208
+msgid "Resampling"
+msgstr "Resampling"
+
+#: src/console/configure.c:214
+msgid "Enable audio resampling"
+msgstr "Habilitar resampling de audio"
+
+#: src/console/configure.c:229
+msgid "Resampling rate:"
+msgstr "Frecuencia de resampling:"
+
+#: src/console/configure.c:233
+msgid "Hz"
+msgstr "Hz"
+
+#: src/console/configure.c:244
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/configure.c:245
+msgid "Ignore length from SPC tags"
+msgstr "Ignorar duración proveniente de las etiquetas SPC"
+
+#: src/console/configure.c:246
+msgid "Increase reverb"
+msgstr "Aumentar reverberación"
+
+#: src/console/configure.c:271
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
+msgstr "La duración predeterminada de la pista, expresada en segundos, es usada para pistas que no proveen información de su duración (por ejemplo: pistas de repetición)."
+
+#: src/console/plugin.c:33
+msgid "About the Game Console Music Decoder"
+msgstr "Acerca del Descodificador de Música de Consolas de Juego"
+
+#: src/console/plugin.c:34
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2.\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
+" Shay Green <gblargg@gmail.com>\n"
+msgstr "Motor del descodificador de música de consola basado en Game_Music_Emu 0.5.2.\nFormatos soportados: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nImplementación en Audacious por: William Pitcock <nenolod@dereferenced.org>, \n Shay Green <gblargg@gmail.com>\n"
+
+#: src/crossfade/plugin.c:60
+msgid "About Crossfade"
+msgstr "Acerca de Crossfade"
+
+#: src/crossfade/plugin.c:92
+msgid "Crossfade Preferences"
+msgstr "Preferencias de Crossfade"
+
+#: src/crossfade/plugin.c:104
+msgid "Overlap (in seconds):"
+msgstr "Encimar (en segundos):"
+
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
+msgid "Crossfade Error"
+msgstr "Error de atenuación cruzada"
+
+#: src/crossfade/plugin.c:135
+msgid ""
+"Crossfading failed because the songs had a different number of channels."
+msgstr "La atenuación cruzada falló porque las pistas tenían diferente número de canales."
+
+#: src/crossfade/plugin.c:143
+msgid ""
+"Crossfading failed because the songs had different sample rates.\n"
+"\n"
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
+msgstr "La atenución cruzada falló porque las pistas tenían frecuencias de muestreo.\n\nPuedes usar el efecto Convertidor de Frecuencias de Muestreo para re-muestrear las pistas a la misma frecuencia."
+
+#: src/crystalizer/crystalizer.c:100
+msgid "Configure Crystalizer"
+msgstr "Configurar Cristalizador"
+
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
+msgid "Effect intensity:"
+msgstr "Intensidad del efecto:"
+
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/echo_plugin/gui.c:15
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin 1999.\n"
+"\n"
+"Surround echo by Carl van Schaik 1999"
+msgstr "Plugin Echo\npor Johan Levin, 1999.\n\nEco envolvente por Carl van Schaik, 1999"
+
+#: src/echo_plugin/gui.c:27
+msgid "About Echo Plugin"
+msgstr "Acerca del Plugin Echo"
+
+#: src/echo_plugin/gui.c:67
+msgid "Configure Echo"
+msgstr "Configurar Eco"
+
+#: src/echo_plugin/gui.c:83
+msgid "Delay: (ms)"
+msgstr "Retraso: (ms)"
+
+#: src/echo_plugin/gui.c:88
+msgid "Feedback: (%)"
+msgstr "Feedback: (%)"
+
+#: src/echo_plugin/gui.c:93
+msgid "Volume: (%)"
+msgstr "Volumen: (%)"
+
+#: src/ffaudio/ffaudio-core.c:718
+#, 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"
+"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 "Plugin de descodificación de audio Multi-formato para Audacious basado en\nFFmpeg multimedia framework (http://www.ffmpeg.org/)\nCopyright (c) 2000-2009 Fabrice Bellard, et al.\n\nPlugin para Audacious por:\n William Pitcock <nenolod@nenolod.net>,\n Matti Hämäläinen <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
+
+#: src/ffaudio/ffaudio-core.c:732
+msgid "About FFaudio Plugin"
+msgstr "Acerca del Plugin FFaudio"
+
+#: src/filewriter/filewriter.c:166
+msgid "About FileWriter-Plugin"
+msgstr "Acerca del FileWriter-Plugin"
+
+#: src/filewriter/filewriter.c:461
+msgid "File Writer Configuration"
+msgstr "Configuración del Escritor de Archivos"
+
+#: src/filewriter/filewriter.c:473
+msgid "Output file format:"
+msgstr "Formato del archivo de salida:"
+
+#: src/filewriter/filewriter.c:491
+msgid "Configure"
+msgstr "Configurar"
+
+#: src/filewriter/filewriter.c:506
+msgid "Save into original directory"
+msgstr "Guardar en el directorio original"
+
+#: src/filewriter/filewriter.c:511
+msgid "Save into custom directory"
+msgstr "Guardar en un directorio personalizado"
+
+#: src/filewriter/filewriter.c:521
+msgid "Output file folder:"
+msgstr "Carpeta del archivo de salida:"
+
+#: src/filewriter/filewriter.c:525
+msgid "Pick a folder"
+msgstr "Escoge una carpeta"
+
+#: src/filewriter/filewriter.c:544
+msgid "Get filename from:"
+msgstr "Obtener el nombre del archivo desde:"
+
+#: src/filewriter/filewriter.c:547
+msgid "original file tags"
+msgstr "etiquetas del archivo original"
+
+#: src/filewriter/filewriter.c:553
+msgid "original filename"
+msgstr "nombre del archivo original"
+
+#: src/filewriter/filewriter.c:563
+msgid "Don't strip file name extension"
+msgstr "No quitar la extensión del archivo"
+
+#: src/filewriter/filewriter.c:578
+msgid "Prepend track number to filename"
+msgstr "Colocar primero el número de pista en el nombre del archivo"
+
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
+msgid "Auto"
+msgstr "Auto"
+
+#: src/filewriter/mp3.c:38
+msgid "Joint Stereo"
+msgstr "Estéreo Unido"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
+msgid "Stereo"
+msgstr "Estéreo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
+msgid "Mono"
+msgstr "Monoaural"
+
+#: src/filewriter/mp3.c:706
+msgid "MP3 Configuration"
+msgstr "Configuración MP3"
+
+#: src/filewriter/mp3.c:729
+msgid "Algorithm Quality:"
+msgstr "Calidad del algoritmo:"
+
+#: src/filewriter/mp3.c:754
+msgid "Output Samplerate:"
+msgstr "Frecuencia de muestrei de salida:"
+
+#: src/filewriter/mp3.c:782
+msgid "(Hz)"
+msgstr "(Hz)"
+
+#: src/filewriter/mp3.c:789
+msgid "Bitrate / Compression ratio:"
+msgstr "Relación de Tasa de bits / Compresión:"
+
+#: src/filewriter/mp3.c:813
+msgid "Bitrate (kbps):"
+msgstr "Tasa de bits (kbps):"
+
+#: src/filewriter/mp3.c:846
+msgid "Compression ratio:"
+msgstr "Tasa de Compresión"
+
+#: src/filewriter/mp3.c:870
+msgid "Audio Mode:"
+msgstr "Modo de audio:"
+
+#: src/filewriter/mp3.c:895
+msgid "Misc:"
+msgstr "Misc.:"
+
+#: src/filewriter/mp3.c:906
+msgid "Enforce strict ISO complience"
+msgstr "Forzar conformidad ISO estricta"
+
+#: src/filewriter/mp3.c:917
+msgid "Error protection"
+msgstr "Error de protección"
+
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
+msgid "Quality"
+msgstr "Calidad"
+
+#: src/filewriter/mp3.c:939
+msgid "Enable VBR/ABR"
+msgstr "Habilitar VBR/ABR"
+
+#: src/filewriter/mp3.c:949
+msgid "Type:"
+msgstr "Tipo:"
+
+#: src/filewriter/mp3.c:982
+msgid "VBR Options:"
+msgstr "Opciones VBR:"
+
+#: src/filewriter/mp3.c:998
+msgid "Minimum bitrate (kbps):"
+msgstr "Tasa de bits mínima (kbps):"
+
+#: src/filewriter/mp3.c:1025
+msgid "Maximum bitrate (kbps):"
+msgstr "Tasa de bits máxima (kbps):"
+
+#: src/filewriter/mp3.c:1048
+msgid "Strictly enforce minimum bitrate"
+msgstr "Forzar estríctamente tasa de bits mínima"
+
+#: src/filewriter/mp3.c:1060
+msgid "ABR Options:"
+msgstr "Opciones ABR:"
+
+#: src/filewriter/mp3.c:1070
+msgid "Average bitrate (kbps):"
+msgstr "Promedio de tasa de bits (kbps):"
+
+#: src/filewriter/mp3.c:1098
+msgid "VBR quality level:"
+msgstr "Nivel de calidad VBR:"
+
+#: src/filewriter/mp3.c:1117
+msgid "Don't write Xing VBR header"
+msgstr "No escribir encabezado VBR Xing"
+
+#: src/filewriter/mp3.c:1131
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1141
+msgid "Frame params:"
+msgstr "Parámetros de cuadro:"
+
+#: src/filewriter/mp3.c:1153
+msgid "Mark as copyright"
+msgstr "Marcar como copyright"
+
+#: src/filewriter/mp3.c:1164
+msgid "Mark as original"
+msgstr "Marcar como original"
+
+#: src/filewriter/mp3.c:1176
+msgid "ID3 params:"
+msgstr "Parámetros ID3:"
+
+#: src/filewriter/mp3.c:1187
+msgid "Force addition of version 2 tag"
+msgstr "Forzar adición de etiquetas versión 2"
+
+#: src/filewriter/mp3.c:1197
+msgid "Only add v1 tag"
+msgstr "Sólo agrega etiqueta v1"
+
+#: src/filewriter/mp3.c:1204
+msgid "Only add v2 tag"
+msgstr "Sólo agrega etiqueta v2"
+
+#: src/filewriter/mp3.c:1225
+msgid "Tags"
+msgstr "Etiquetas"
+
+#: src/filewriter/vorbis.c:240
+msgid "Vorbis Encoder Configuration"
+msgstr "Configuración del codificador Vorbis"
+
+#: src/filewriter/vorbis.c:260
+msgid "Quality level (0 - 10):"
+msgstr "Nivel de calidad (0-10):"
+
+#: src/flacng/plugin.c:380
+msgid "About FLAC Audio Plugin"
+msgstr "Acerca del plugin de audio FLAC"
+
+#: src/flacng/plugin.c:381
+msgid ""
+"\n"
+"\n"
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\nCódigo original por\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
+msgid "About Gnome Shortcut Plugin"
+msgstr "Acerca del plugin Atajos Gnome"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr "Plugin Gnome Shortcut \nTe permite controlar el reproductor con los atajos de Gnome.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
+
+#: src/gtkui/columns.c:36
+msgid "Entry number"
+msgstr "Número de entrada"
+
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
+msgid "Title"
+msgstr "Título"
+
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
+msgid "Artist"
+msgstr "Artista"
+
+#: src/gtkui/columns.c:37
+msgid "Year"
+msgstr "Año"
+
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
+msgid "Album"
+msgstr "Álbum"
+
+#: src/gtkui/columns.c:37
+msgid "Track"
+msgstr "Pista"
+
+#: src/gtkui/columns.c:37
+msgid "Queue position"
+msgstr "Posición en cola"
+
+#: src/gtkui/columns.c:38
+msgid "Length"
+msgstr "Duración"
+
+#: src/gtkui/columns.c:38
+msgid "File path"
+msgstr "Ruta del archivo"
+
+#: src/gtkui/columns.c:38
+msgid "File name"
+msgstr "Nombre del archivo"
+
+#: src/gtkui/columns.c:38
+msgid "Custom title"
+msgstr "Título personalizado"
+
+#: src/gtkui/columns.c:39
+msgid "Bitrate"
+msgstr "Tasa de bits"
+
+#: src/gtkui/columns.c:278
+msgid "Choose Columns"
+msgstr "Seleccionar Columnas"
+
+#: src/gtkui/columns.c:292
+msgid "Available:"
+msgstr "Disponibles:"
+
+#: src/gtkui/columns.c:326
+msgid "Chosen:"
+msgstr "Seleccionadas:"
+
+#: src/gtkui/layout.c:122
+msgid "Dock at Left"
+msgstr "Acoplar a la izquierda"
+
+#: src/gtkui/layout.c:122
+msgid "Dock at Right"
+msgstr "Acoplar a la derecha"
+
+#: src/gtkui/layout.c:123
+msgid "Dock at Top"
+msgstr "Acoplar arriba"
+
+#: src/gtkui/layout.c:123
+msgid "Dock at Bottom"
+msgstr "Acoplar abajo"
+
+#: src/gtkui/layout.c:123
+msgid "Undock"
+msgstr "Desacoplar"
+
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
+msgid "Disable"
+msgstr "Dehabilitar"
+
+#: src/gtkui/menus.c:131
+msgid "_Open Files ..."
+msgstr "_Abrir archivos..."
+
+#: src/gtkui/menus.c:132
+msgid "Open _URL ..."
+msgstr "Abrir _URL..."
+
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "A_gregar archivos..."
+
+#: src/gtkui/menus.c:134
+msgid "Add U_RL ..."
+msgstr "Agregar U_RL..."
+
+#: src/gtkui/menus.c:136
+msgid "A_bout ..."
+msgstr "A_cerca..."
+
+#: src/gtkui/menus.c:137
+msgid "_Preferences ..."
+msgstr "_Preferencias"
+
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
+msgid "_Quit"
+msgstr "_Salir"
+
+#: src/gtkui/menus.c:141
+msgid "_Play"
+msgstr "_Reproducir"
+
+#: src/gtkui/menus.c:142
+msgid "Paus_e"
+msgstr "Pa_usa"
+
+#: src/gtkui/menus.c:143
+msgid "_Stop"
+msgstr "_Detener"
+
+#: src/gtkui/menus.c:144
+msgid "Pre_vious"
+msgstr "_Anterior"
+
+#: src/gtkui/menus.c:145
+msgid "_Next"
+msgstr "Siguie_nte"
+
+#: src/gtkui/menus.c:147
+msgid "_Repeat"
+msgstr "Repe_tir"
+
+#: src/gtkui/menus.c:148
+msgid "S_huffle"
+msgstr "A_leatorio"
+
+#: src/gtkui/menus.c:149
+msgid "N_o Playlist Advance"
+msgstr "_No avanzar Lista de Reprod."
+
+#: src/gtkui/menus.c:150
+msgid "Stop _After This Song"
+msgstr "Detener de_spués de esta pista"
+
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
+msgid "Song _Info ..."
+msgstr "_Información de pista..."
+
+#: src/gtkui/menus.c:153
+msgid "Jump to _Time ..."
+msgstr "Saltar al _tiempo"
+
+#: src/gtkui/menus.c:154
+msgid "_Jump to Song ..."
+msgstr "Saltar a la _pista"
+
+#: src/gtkui/menus.c:157
+msgid "By Track _Number"
+msgstr "Por _Núm de pista"
+
+#: src/gtkui/menus.c:158
+msgid "By _Title"
+msgstr "Por _Título"
+
+#: src/gtkui/menus.c:159
+msgid "By _Artist"
+msgstr "Por_Artista"
+
+#: src/gtkui/menus.c:160
+msgid "By A_lbum"
+msgstr "Por Á_lbum"
+
+#: src/gtkui/menus.c:161
+msgid "By Release _Date"
+msgstr "Por _Fecha de Lanzamiento"
+
+#: src/gtkui/menus.c:162
+msgid "By _File Path"
+msgstr "Por _Ruta del Archivo"
+
+#: src/gtkui/menus.c:163
+msgid "By _Custom Title"
+msgstr "Por Título _Personalizado"
+
+#: src/gtkui/menus.c:165
+msgid "R_everse Order"
+msgstr "_Invertir Orden"
+
+#: src/gtkui/menus.c:166
+msgid "_Random Order"
+msgstr "O_rden Aleatorio"
+
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
+msgid "_Refresh"
+msgstr "A_ctualizar"
+
+#: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Remover Archivos No _Disponibles"
+
+#: src/gtkui/menus.c:172
+msgid "_Sort"
+msgstr "_Ordenar"
+
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr "_Nuevo"
+
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
+msgid "_Close"
+msgstr "_Cerrar"
+
+#: src/gtkui/menus.c:177
+msgid "_Import ..."
+msgstr "_Importar..."
+
+#: src/gtkui/menus.c:178
+msgid "_Export ..."
+msgstr "_Exportar..."
+
+#: src/gtkui/menus.c:180
+msgid "_Playlist Manager ..."
+msgstr "Aministrador de _Listas de Reprod..."
+
+#: src/gtkui/menus.c:181
+msgid "_Queue Manager ..."
+msgstr "Administrador de _Colas ..."
+
+#: src/gtkui/menus.c:184
+msgid "Volume _Up"
+msgstr "_Aumentar Volumen"
+
+#: src/gtkui/menus.c:185
+msgid "Volume _Down"
+msgstr "_Disminuir Volumen"
+
+#: src/gtkui/menus.c:187
+msgid "_Equalizer"
+msgstr "_Ecualizador"
+
+#: src/gtkui/menus.c:189
+msgid "E_ffects"
+msgstr "E_fectos"
+
+#: src/gtkui/menus.c:192
+msgid "_Interface"
+msgstr "_Interfaz"
+
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Visualizaciones"
+
+#: src/gtkui/menus.c:195
+msgid "Show _Menu Bar"
+msgstr "Mostrar Barra de _Menú"
+
+#: src/gtkui/menus.c:196
+msgid "Show I_nfo Bar"
+msgstr "Mostrar Barra de I_nformación"
+
+#: src/gtkui/menus.c:197
+msgid "Show _Status Bar"
+msgstr "Mostrar Barra de E_stado"
+
+#: src/gtkui/menus.c:199
+msgid "Show Column _Headers"
+msgstr "Mostrar Encabezados de _Columna"
+
+#: src/gtkui/menus.c:200
+msgid "Choose _Columns ..."
+msgstr "Seleccionar _Columnas ..."
+
+#: src/gtkui/menus.c:201
+msgid "Scrol_l on Song Change"
+msgstr "Avanzar a_l Cambiar Pista"
+
+#: src/gtkui/menus.c:204
+msgid "_File"
+msgstr "_Archivo"
+
+#: src/gtkui/menus.c:205
+msgid "_Playback"
+msgstr "_Reproducción"
+
+#: src/gtkui/menus.c:206
+msgid "P_laylist"
+msgstr "_Lista de Reproducción"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
+msgid "_Services"
+msgstr "_Servicios"
+
+#: src/gtkui/menus.c:208
+msgid "_Output"
+msgstr "_Salida"
+
+#: src/gtkui/menus.c:209
+msgid "_View"
+msgstr "_Ver"
+
+#: src/gtkui/menus.c:213
+msgid "_Queue/Unqueue"
+msgstr "_Formar/Desformar"
+
+#: src/gtkui/menus.c:216
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: src/gtkui/menus.c:217
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: src/gtkui/menus.c:218
+msgid "_Paste"
+msgstr "_Pegar"
+
+#: src/gtkui/menus.c:219
+msgid "Select _All"
+msgstr "Seleccion_ar todo"
+
+#: src/gtkui/menus.c:224
+msgid "_Rename"
+msgstr "_Renombrar"
+
+#: src/gtkui/ui_gtk.c:95
+msgid "GTK Interface"
+msgstr "Interfaz GTK"
+
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "Almacenando en buffer..."
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
+msgid "Error"
+msgstr "Error"
+
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Cerrar"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
+msgid "mono"
+msgstr "monoaural"
+
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
+msgid "stereo"
+msgstr "estéreo"
+
+#: src/gtkui/ui_statusbar.c:109
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] "%d canal"
+msgstr[1] "%d canales"
+
+#: src/gtkui/ui_statusbar.c:124
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/hotkey/gui.c:71
+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 "Reproducir"
+
+#: src/hotkey/gui.c:73
+msgid "Pause/Resume"
+msgstr "Pausa/Continuar"
+
+#: 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 "Siguiente Pista"
+
+#: src/hotkey/gui.c:76
+msgid "Forward 5 Seconds"
+msgstr "Avanzar 5 Segundos"
+
+#: src/hotkey/gui.c:77
+msgid "Rewind 5 Seconds"
+msgstr "Regresar 5 Segundos"
+
+#: src/hotkey/gui.c:78
+msgid "Mute"
+msgstr "Silenciar"
+
+#: src/hotkey/gui.c:79
+msgid "Volume Up"
+msgstr "Aumentar Volumen"
+
+#: src/hotkey/gui.c:80
+msgid "Volume Down"
+msgstr "Disminuir Volumen"
+
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Jump to File"
+msgstr "Saltar al Archivo"
+
+#: src/hotkey/gui.c:82
+msgid "Toggle Player Windows"
+msgstr "Cambiar Ventanas del Reproductor"
+
+#: src/hotkey/gui.c:83
+msgid "Show On-Screen-Display"
+msgstr "Mostrar Notificaciones en Pantalla"
+
+#: src/hotkey/gui.c:84
+msgid "Toggle Repeat"
+msgstr "Cambiar Repetir"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle Shuffle"
+msgstr "Cambiar Aleatorio"
+
+#: src/hotkey/gui.c:95
+msgid "(none)"
+msgstr "(ninguno)"
+
+#: src/hotkey/gui.c:232
+msgid ""
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr "No se recomienda asociar los botones primarios del ratón sin modificadores.\n\n¿Quieres continuar?"
+
+#: src/hotkey/gui.c:234
+msgid "Binding mouse buttons"
+msgstr "Asociar botones del ratón"
+
+#: src/hotkey/gui.c:384
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Configuración del Plugin Global Hotkey"
+
+#: src/hotkey/gui.c:400
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr "Presiona una combinación de teclas dentro de un campo de texto.\nTambién puedes asociar butones del ratón."
+
+#: src/hotkey/gui.c:405
+msgid "Hotkeys:"
+msgstr "Atajos del teclado:"
+
+#: src/hotkey/gui.c:424
+msgid "Action:"
+msgstr "Acción:"
+
+#: src/hotkey/gui.c:432
+msgid "Key Binding:"
+msgstr "Asociación de Teclas:"
+
+#: src/hotkey/gui.c:663
+msgid "About Global Hotkey Plugin"
+msgstr "Acerca del Plugin Global Hotkey"
+
+#: src/hotkey/gui.c:664
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr "Plugin Global Hotkey\nControla el reproductor con combinaciones de teclas o teclas multimedia.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nLos que contribuyeron incluyen a:\nCopyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n\t\t\tBryn Davies <curious@ihug.com.au>\n\t\t\tJonathan A. Davis <davis@jdhouse.org>\n\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n\n"
+
+#: src/jack/configure.c:66
+msgid "Connect to all available jack ports"
+msgstr "Conectar a todos los puertos jack disponibles"
+
+#: src/jack/configure.c:73
+msgid "Connect only the output ports"
+msgstr "Conectar únicamente a los puertos de salida"
+
+#: src/jack/configure.c:80
+msgid "Connect to no ports"
+msgstr "No conectar puertos"
+
+#: src/jack/configure.c:98
+msgid "jack Plugin configuration"
+msgstr "Configuración del plugin jack"
+
+#: src/jack/configure.c:116
+msgid "Connection mode:"
+msgstr "Modo de conexión:"
+
+#: src/jack/configure.c:128
+msgid "Enable debug printing"
+msgstr "Habilitar impresión de mensajes de depuración"
+
+#: src/jack/jack.c:435
+msgid ""
+"XMMS jack Driver 0.17\n"
+"\n"
+"xmms-jack.sf.net\n"
+"Chris Morgan<cmorgan@alum.wpi.edu>\n"
+"\n"
+"Audacious port by\n"
+"Giacomo Lozito from develia.org"
+msgstr "Controlador jack XMMS 0.17\n\nxmms-jack.sf.net\nChris Morgan<cmorgan@alum.wpi.edu>\n\nPuerto Audacious por\nGiacomo Lozito desde develia.org"
+
+#: src/jack/jack.c:440
+msgid "About JACK Output Plugin 0.17"
+msgstr "Acerca del Plugin de Salida JACK 0.17"
+
+#: src/ladspa/plugin.c:415
+msgid "About LADSPA Host"
+msgstr "Acerca del Host LADSPA"
+
+#: src/ladspa/plugin.c:516
+#, c-format
+msgid "%s Settings"
+msgstr "Ajustes %s"
+
+#: src/ladspa/plugin.c:584
+msgid "LADSPA Host Settings"
+msgstr "Ajustes del Host LADSPA"
+
+#: src/ladspa/plugin.c:593
+msgid "Module paths:"
+msgstr "Rutas de Módulos:"
+
+#: src/ladspa/plugin.c:598
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr "Separar rutas múltiples con dos puntos (:).\nEsas rutas se utilizan además del LADSPA_PATH.\nDespués de agregar nuevas rutas, presiona Intro para buscar plugins nuevos."
+
+#: src/ladspa/plugin.c:614
+msgid "Available plugins:"
+msgstr "Plugins disponibles:"
+
+#: src/ladspa/plugin.c:626
+msgid "Enable"
+msgstr "Habilitar"
+
+#: src/ladspa/plugin.c:632
+msgid "Enabled plugins:"
+msgstr "Habilitar plugins:"
+
+#: src/ladspa/plugin.c:647
+msgid "Settings"
+msgstr "Ajustes"
+
+#: src/lyricwiki/lyricwiki.c:267
+msgid ""
+"\n"
+"Looking for lyrics..."
+msgstr "\nBuscándo letras..."
+
+#: src/lyricwiki/lyricwiki.c:304
+msgid ""
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr "\nConectándose a lyrics.wikia.com..."
+
+#: src/lyricwiki/lyricwiki.c:377
+msgid ""
+"\n"
+"No lyrics were found."
+msgstr "\nNo se encontraron letras."
+
+#: src/metronom/metronom.c:86
+msgid "About Metronom"
+msgstr "Acerca de Metronom"
+
+#: src/metronom/metronom.c:87
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr "Un Generador Tact por Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nPara usarlo, agrega una URL: tact://beats*num/den\npor ejemplo, tact://77 para reproducir a 77 golpes por minuto\no tact://60*3/4 para reproducir 60 bpm en tacts 3/4"
+
+#: src/metronom/metronom.c:144
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Generador de tact: %d bpm"
+
+#: src/metronom/metronom.c:146
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Generador de tact: %d bpm %d/%d"
+
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "Acerca de Channel Mixer"
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "Ajustes de Mezclador de Canales"
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "Canales de salida:"
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "Los cambios tendrán efecto en el siguiente cambio de pista."
+
+#: src/mpg123/mpg123.c:191
+msgid "Surround"
+msgstr "Envolvente"
+
+#: src/mtp_up/mtp.c:340
+msgid "Upload in progress..."
+msgstr "Carga en progreso..."
+
+#: src/mtp_up/mtp.c:352
+msgid "Upload to MTP Device"
+msgstr "Cargar en un dispositivo MTP"
+
+#: src/mtp_up/mtp.c:353
+msgid "Disconnect MTP Device"
+msgstr "Desconectar dispositivo MTP"
+
+#: src/notify/libnotify-aosd_event.c:48
+msgid "Stopped"
+msgstr "Detenido"
+
+#: src/notify/libnotify-aosd_event.c:48
+msgid "Audacious is not playing."
+msgstr "Audacious no está reproduciendo."
+
+#: src/null/null.c:64
+msgid "Null output plugin "
+msgstr "Plugin Null output"
+
+#: src/null/null.c:65
+msgid ""
+" by Christian Birchinger <joker@netswarm.net>\n"
+"based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
+msgstr " por Christian Birchinger <joker@netswarm.net>\nbasado en el plugin para XMMS plugin de Håvard Kvål <havardk@xmms.org>"
+
+#: src/null/null.c:68
+msgid "About Null Output"
+msgstr "Acerca Null Output"
+
+#: src/null/null.c:89
+msgid "Null output preferences"
+msgstr "Preferencias de Null output"
+
+#: src/null/null.c:100
+msgid "Run in real time"
+msgstr "Ejecutar en tiempo real"
+
+#: src/oss4/configure.c:81
+msgid "1. Default device"
+msgstr "1. Dispositivo predeterminado"
+
+#: src/oss4/configure.c:138
+msgid "OSS4 Output Plugin Preferences"
+msgstr "Preferencias del Plugin de Salisa OSS4"
+
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
+msgid "Audio device:"
+msgstr "Dispositivo de audio:"
+
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
+msgid "Use alternate device:"
+msgstr "Usar dispositivo alterno:"
+
+#: src/oss4/configure.c:193
+msgid "Save volume between sessions"
+msgstr "Guardar volumen entre sesiones"
+
+#: src/oss4/configure.c:197
+msgid "Enable format conversions made by the OSS software."
+msgstr "Habilitar las conversiones de formato hechas por el software OSS."
+
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Habilitar modo exclusivo para prevenir mezclado virtual."
+
+#: src/oss4/plugin.c:51
+msgid "About OSS4 Plugin"
+msgstr "Acerca del Plugin OSS4"
+
+#: src/oss4/utils.c:211
+msgid "OSS4 error"
+msgstr "Error OSS4"
+
+#: src/OSS/configure.c:137
+#, c-format
+msgid "Default (%s)"
+msgstr "Predeterminado (%s)"
+
+#: src/OSS/configure.c:178
+msgid "OSS Driver configuration"
+msgstr "Configuración del Controlador OSS"
+
+#: src/OSS/configure.c:281
+msgid "Devices"
+msgstr "Dispositivos"
+
+#: src/OSS/configure.c:283
+msgid "Buffering:"
+msgstr "Buffering:"
+
+#: src/OSS/configure.c:296
+msgid "Pre-buffer (percent):"
+msgstr "Pre-buffer (porcentaje):"
+
+#: src/OSS/configure.c:307
+msgid "Buffering"
+msgstr "Buffering"
+
+#: src/OSS/configure.c:308
+msgid "Mixer Settings:"
+msgstr "Configuraciones del mezclador:"
+
+#: src/OSS/configure.c:314
+msgid "Volume controls Master not PCM"
+msgstr "Volumen controla al Maestro, no a PCM"
+
+#: src/OSS/configure.c:320
+msgid "Mixer"
+msgstr "Mezclador"
+
+#: src/OSS/OSS.c:41
+msgid "About OSS Driver"
+msgstr "Acerca del Controlador OSS"
+
+#: src/pulse_audio/pulse_audio.c:677
+msgid "About Audacious PulseAudio Output Plugin"
+msgstr "Acerca del plugin Audacious PulseAudio Output"
+
+#: src/resample/plugin.c:89
+msgid "About Sample Rate Converter Plugin"
+msgstr "Acerca del plugin Sample Rate Converter"
+
+#: src/resample/plugin.c:144
+msgid "Sample Rate Converter Preferences"
+msgstr "Preferencias del Convertidor de Frecuencia de Muestreo"
+
+#: src/resample/plugin.c:156
+msgid "Rate mappings:"
+msgstr "Mapas de Frecuencias:"
+
+#: src/resample/plugin.c:179
+msgid "All others:"
+msgstr "Todos los demás:"
+
+#: src/resample/plugin.c:191
+msgid "Method:"
+msgstr "Método:"
+
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
+msgid "Change password"
+msgstr "Cambiar contraseña"
+
+#: src/scrobbler/configure.c:144
+msgid "Services"
+msgstr "Services"
+
+#: src/scrobbler/configure.c:166
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: src/scrobbler/configure.c:172
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: src/scrobbler/configure.c:180
+msgid "Scrobbler URL:"
+msgstr "URL de Scrobbler:"
+
+#: src/scrobbler/configure.c:212
+msgid "Last.FM"
+msgstr "Last.FM"
+
+#: src/scrobbler/configure.c:239
+msgid "Scrobbler"
+msgstr "Scrobbler"
+
+#: src/scrobbler/plugin.c:194
+msgid ""
+"Audacious AudioScrobbler Plugin\n"
+"\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr "Plugin AudioScrobbler para Audacious\n\nOriginalmente creado por Audun Hove <audun@nlc.no> y Pipian <pipian@pipian.com>\n"
+
+#: src/scrobbler/plugin.c:196
+msgid "About Scrobbler Plugin"
+msgstr "Acerca del plugin Scrobbler"
+
+#: src/sdlout/plugin.c:58
+msgid "About SDL Output Plugin"
+msgstr "Acerca del plugin de salida SDL"
+
+#: src/sdlout/plugin.c:78
+msgid "SDL error"
+msgstr "Error SDL"
+
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Género"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Librería"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Crear Lista de Reproducción"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Agregar a la Lista de Reproducción"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Buscar librería"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "Para importar tu librería de música en Audacious, selecciona una carpeta y luego haz clic en el ícono \"actualizar\"."
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Por favor espere..."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Seleccione Carpeta"
+
+#: src/skins/plugin.c:167
+msgid "About Skinned GUI"
+msgstr "Acerca Skinned GUI"
+
+#: src/skins/plugin.c:168
+msgid ""
+"Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
+"\n"
+msgstr "Copyright (c) 2008, por Tomasz Moń <desowin@gmail.com>\n\n"
+
+#: src/skins/skins_cfg.c:207
+msgid "_Player:"
+msgstr "Re_productor"
+
+#: src/skins/skins_cfg.c:208
+msgid "Select main player window font:"
+msgstr "Selecciona la fuente de la ventana principal del reproductor:"
+
+#: src/skins/skins_cfg.c:210
+msgid "_Playlist:"
+msgstr "_Lista de Reproducción:"
+
+#: src/skins/skins_cfg.c:211
+msgid "Select playlist font:"
+msgstr "Selecciona la fuenta de la lista de reproducción:"
+
+#: src/skins/skins_cfg.c:215
+msgid "_Fonts"
+msgstr "_Fuentes"
+
+#: src/skins/skins_cfg.c:218
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Usar fuentes de mapa de bits (únicamente soporta ASCII)"
+
+#: src/skins/skins_cfg.c:220
+msgid "Scroll song title in both directions"
+msgstr "Desplaza el título de la pista en ambas direcciones"
+
+#: src/skins/skins_cfg.c:298
+msgid "_Skin"
+msgstr "_Skin"
+
+#: src/skins/skins_cfg.c:345
+msgid "Interface Preferences"
+msgstr "Preferencias de Interfaz"
+
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Preamplificación"
+
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/ui_equalizer.c:379
+msgid "Audacious Equalizer"
+msgstr "Ecualizador de Audacious"
+
+#: src/skins/ui_equalizer.c:887
+msgid "Presets"
+msgstr "Presets"
+
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Cargar preset"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Cargar auto-preset"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Cargar preset del ecualizador"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Guardar preset"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Guardar auto-preset"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Guardar preset del ecualizador"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Borrar preset"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Borrar auto-preset"
+
+#: src/skins/ui_main.c:444
+msgid "kbps"
+msgstr "kbps"
+
+#: src/skins/ui_main.c:452
+msgid "kHz"
+msgstr "kHz"
+
+#: src/skins/ui_main.c:459
+msgid "surround"
+msgstr "envolvente"
+
+#: src/skins/ui_main.c:807
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Saltar a %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/ui_main.c:828
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volumen: %d%%"
+
+#: src/skins/ui_main.c:851
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balance: %d%% izquierda"
+
+#: src/skins/ui_main.c:853
+msgid "Balance: center"
+msgstr "Balance: central"
+
+#: src/skins/ui_main.c:855
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balance: %d%% derecha"
+
+#: src/skins/ui_main.c:981
+msgid "Options Menu"
+msgstr "Menú de Opciones"
+
+#: src/skins/ui_main.c:985
+msgid "Disable 'Always On Top'"
+msgstr "Deshabilitar 'Siempre Encima'"
+
+#: src/skins/ui_main.c:987
+msgid "Enable 'Always On Top'"
+msgstr "Habilitar 'Siempre Encima'"
+
+#: src/skins/ui_main.c:990
+msgid "File Info Box"
+msgstr "Caja de Información del Archivo"
+
+#: src/skins/ui_main.c:995
+msgid "Visualization Menu"
+msgstr "Menú de Visualización"
+
+#: src/skins/ui_main.c:1653
+msgid "Single mode."
+msgstr "Modo sencillo."
+
+#: src/skins/ui_main.c:1655
+msgid "Playlist mode."
+msgstr "Modo Lista de Reproducción."
+
+#: src/skins/ui_main.c:1677
+msgid "Stopping after song."
+msgstr "Detener después de la pista."
+
+#: src/skins/ui_main.c:1679
+msgid "Not stopping after song."
+msgstr "No detener después de la pista"
+
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+msgid "Autoscroll Songname"
+msgstr "Desplazamiento automático del Título"
+
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Detener después de la pista actual"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+msgid "Peaks"
+msgstr "Picos"
+
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Aleatorio"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "No avanzar Lista de Reproducción"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+msgid "Show Player"
+msgstr "Mostrar Reproductor"
+
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+msgid "Show Playlist Editor"
+msgstr "Mostrar Editor de Listas de Reproducción"
+
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+msgid "Show Equalizer"
+msgstr "Mostrar Ecualizador"
+
+#: 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 "Colocar en TODOS los Espacios de Trabajo"
+
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+msgid "Roll up Player"
+msgstr "Enrollar Reproductor"
+
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+msgid "Roll up Playlist Editor"
+msgstr "Enrollar Editor de Listas de Resproducción"
+
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+msgid "Roll up Equalizer"
+msgstr "Enrollar Ecualizador"
+
+#: src/skins/ui_manager.c:115
+msgid "Analyzer"
+msgstr "Analizador de Espectro"
+
+#: src/skins/ui_manager.c:116
+msgid "Scope"
+msgstr "Osciloscopio"
+
+#: src/skins/ui_manager.c:117
+msgid "Voiceprint"
+msgstr "Espectrograma"
+
+#: src/skins/ui_manager.c:118
+msgid "Off"
+msgstr "Apagado"
+
+#: 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:123 src/skins/ui_manager.c:140
+msgid "Fire"
+msgstr "Fuego"
+
+#: src/skins/ui_manager.c:124
+msgid "Vertical Lines"
+msgstr "Líneas verticales"
+
+#: src/skins/ui_manager.c:128
+msgid "Lines"
+msgstr "Líneas"
+
+#: src/skins/ui_manager.c:129
+msgid "Bars"
+msgstr "Barras"
+
+#: src/skins/ui_manager.c:133
+msgid "Dot Scope"
+msgstr "Osciloscopio de Puntos"
+
+#: src/skins/ui_manager.c:134
+msgid "Line Scope"
+msgstr "Osciloscopio de Líneas"
+
+#: src/skins/ui_manager.c:135
+msgid "Solid Scope"
+msgstr "Osciloscopio Sólido"
+
+#: src/skins/ui_manager.c:141
+msgid "Ice"
+msgstr "Hielo"
+
+#: src/skins/ui_manager.c:146
+msgid "Smooth"
+msgstr "Suave"
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slowest"
+msgstr "Muy lento"
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+msgid "Slow"
+msgstr "Lento"
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Medium"
+msgstr "Medio"
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fast"
+msgstr "Rápido"
+
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+msgid "Fastest"
+msgstr "Muy rápido"
+
+#: src/skins/ui_manager.c:166
+msgid "Time Elapsed"
+msgstr "Tiempo Transcurrido"
+
+#: src/skins/ui_manager.c:167
+msgid "Time Remaining"
+msgstr "Tiempo Faltante"
+
+#: 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 "Siguiente"
+
+#: src/skins/ui_manager.c:196
+msgid "Visualization"
+msgstr "Visualización"
+
+#: src/skins/ui_manager.c:197
+msgid "Visualization Mode"
+msgstr "Modo de Visualización"
+
+#: src/skins/ui_manager.c:198
+msgid "Analyzer Mode"
+msgstr "Analizador de Espectro"
+
+#: src/skins/ui_manager.c:199
+msgid "Scope Mode"
+msgstr "Osciloscopio "
+
+#: src/skins/ui_manager.c:200
+msgid "Voiceprint Mode"
+msgstr "Espectrograma"
+
+#: src/skins/ui_manager.c:201
+msgid "WindowShade VU Mode"
+msgstr "VU WindowShade"
+
+#: src/skins/ui_manager.c:202
+msgid "Analyzer Falloff"
+msgstr "Caída del analizador"
+
+#: src/skins/ui_manager.c:203
+msgid "Peaks Falloff"
+msgstr "Caida del pico"
+
+#: 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 "Siguiente Lista de Reproducción"
+
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+msgid "Select Previous Playlist"
+msgstr "Anterior Lista de Reproducción"
+
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Borrar Lista de Reproducción"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "Importar Lista de Reproducción"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Carga una lista de reproducción dentro de la lista de reproducción seleccionada"
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "Exportar Lista de Reproducción"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr "Guardar la Lista de Reproducción seleccionada"
+
+#: src/skins/ui_manager.c:229
+msgid "Refresh List"
+msgstr "Actualizar Lista"
+
+#: src/skins/ui_manager.c:230
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Actualiza metadatos asociados con una entrada de Lista de Reproducción"
+
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "Administrador de Listas de Reproducción"
+
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Aministrador de Colas"
+
+#: src/skins/ui_manager.c:237
+msgid "View"
+msgstr "Ver"
+
+#: src/skins/ui_manager.c:238
+msgid "Interface"
+msgstr "Interfaz"
+
+#: src/skins/ui_manager.c:239
+msgid "Interface Preferences ..."
+msgstr "Preferencias de Interfaz..."
+
+#: src/skins/ui_manager.c:243
+msgid "Add Internet Address..."
+msgstr "Agregar Dirección de Internet..."
+
+#: src/skins/ui_manager.c:244
+msgid "Adds a remote track to the playlist."
+msgstr "Agrega una pista remota a la Lista de Reproducción"
+
+#: src/skins/ui_manager.c:247
+msgid "Add Files..."
+msgstr "Agregar Archivos..."
+
+#: src/skins/ui_manager.c:248
+msgid "Adds files to the playlist."
+msgstr "Agregar archivos a la Lista de Reproducción."
+
+#: src/skins/ui_manager.c:253
+msgid "Search and Select"
+msgstr "Buscar y Seleccionar"
+
+#: src/skins/ui_manager.c:254
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr "Busca la lista de reproducción y selecciona las entradas basado en criterios específicos."
+
+#: src/skins/ui_manager.c:257
+msgid "Invert Selection"
+msgstr "Invertir Selección"
+
+#: src/skins/ui_manager.c:258
+msgid "Inverts the selected and unselected entries."
+msgstr "Invierte las entradas seleccionadas y no seleccionadas."
+
+#: src/skins/ui_manager.c:261
+msgid "Select All"
+msgstr "Selecciona Todo"
+
+#: src/skins/ui_manager.c:262
+msgid "Selects all of the playlist entries."
+msgstr "Selecciona todas las entradas de la Lista de Reproducción."
+
+#: src/skins/ui_manager.c:265
+msgid "Select None"
+msgstr "Selecciona ninguno"
+
+#: src/skins/ui_manager.c:266
+msgid "Deselects all of the playlist entries."
+msgstr "Quita la selección de todas las entradas de la lista de reproducción."
+
+#: src/skins/ui_manager.c:271
+msgid "Remove All"
+msgstr "Quitar Todo"
+
+#: src/skins/ui_manager.c:272
+msgid "Removes all entries from the playlist."
+msgstr "Quita todas las entradas de la lista de reproducción."
+
+#: src/skins/ui_manager.c:275
+msgid "Clear Queue"
+msgstr "Limpiar Cola de reproducción"
+
+#: src/skins/ui_manager.c:276
+msgid "Clears the queue associated with this playlist."
+msgstr "Limpia la cola asociada con esta lista de reproducción."
+
+#: src/skins/ui_manager.c:279
+msgid "Remove Unavailable Files"
+msgstr "Remueve los Archivos No Disponibles"
+
+#: src/skins/ui_manager.c:280
+msgid "Removes unavailable files from the playlist."
+msgstr "Remueve los archivos no disponibles de la lista de reproducción."
+
+#: src/skins/ui_manager.c:283
+msgid "Remove Duplicates"
+msgstr "Remover Duplicados"
+
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
+msgid "By Title"
+msgstr "Por Título"
+
+#: src/skins/ui_manager.c:286
+msgid "Removes duplicate entries from the playlist by title."
+msgstr "Remueve las entradas duplicadas de la lista de reproducción por título."
+
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
+msgid "By Filename"
+msgstr "Por Nombre de Archivo"
+
+#: src/skins/ui_manager.c:290
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr "Remueve las entradas duplicadas de la lista de reproducción por nombre de archivo."
+
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
+msgid "By Path + Filename"
+msgstr "Por Ruta + Nombre de archivo"
+
+#: src/skins/ui_manager.c:294
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr "Remueve las entradas duplicadas de la lista de reproducción por su ruta completa."
+
+#: src/skins/ui_manager.c:297
+msgid "Remove Unselected"
+msgstr "Remover No Seleccionados"
+
+#: src/skins/ui_manager.c:298
+msgid "Remove unselected entries from the playlist."
+msgstr "Remueve las entradas no seleccionadas de la lista de reproducción."
+
+#: src/skins/ui_manager.c:301
+msgid "Remove Selected"
+msgstr "Remover Seleccionados"
+
+#: src/skins/ui_manager.c:302
+msgid "Remove selected entries from the playlist."
+msgstr "Remueve las entradas seleccionadas de la lista de reproducción."
+
+#: src/skins/ui_manager.c:307
+msgid "Randomize List"
+msgstr "Aleatorizar Lista"
+
+#: src/skins/ui_manager.c:308
+msgid "Randomizes the playlist."
+msgstr "Aleatoriza la lista de reproducción."
+
+#: src/skins/ui_manager.c:311
+msgid "Reverse List"
+msgstr "Invertir Lista"
+
+#: src/skins/ui_manager.c:312
+msgid "Reverses the playlist."
+msgstr "Invierte el orden de la lista de reproducción."
+
+#: src/skins/ui_manager.c:315
+msgid "Sort List"
+msgstr "Ordenar Lista"
+
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
+msgid "Sorts the list by title."
+msgstr "Ordena la lista de reproducción por título."
+
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+msgid "By Album"
+msgstr "Por Álbum"
+
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
+msgid "Sorts the list by album."
+msgstr "Ordena la lista de reproducción por álbum."
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "By Artist"
+msgstr "Por Artista"
+
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+msgid "Sorts the list by artist."
+msgstr "Ordena la lista de reproducción por Artista."
+
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+msgid "Sorts the list by filename."
+msgstr "Ordena la lista de reproducción por nombre de archivo."
+
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+msgid "Sorts the list by full pathname."
+msgstr "Ordena la lista de reproducción por ruta completa."
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "By Date"
+msgstr "Por Fecha"
+
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+msgid "Sorts the list by modification time."
+msgstr "Ordena la lista de reproducción por hora de modificación."
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "By Track Number"
+msgstr "Por Número de Pista"
+
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+msgid "Sorts the list by track number."
+msgstr "Ordena la lista de reproducción por número de pista."
+
+#: src/skins/ui_manager.c:345
+msgid "Sort Selected"
+msgstr "Ordenar Seleccionado"
+
+#: src/skins/ui_manager.c:381
+msgid "File"
+msgstr "Archivo"
+
+#: src/skins/ui_manager.c:384
+msgid "Plugin Services"
+msgstr "Servicios de Plugin"
+
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
+msgid "View Track Details"
+msgstr "Ver Detaller de la Pista"
+
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
+msgid "View track details"
+msgstr "Ver detalles de la pista"
+
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
+msgid "About Audacious"
+msgstr "Acerca de Audacious"
+
+#: src/skins/ui_manager.c:395
+msgid "Play File"
+msgstr "Reproducir Archivo"
+
+#: src/skins/ui_manager.c:396
+msgid "Load and play a file"
+msgstr "Cargar y reproducir un archivo"
+
+#: src/skins/ui_manager.c:398
+msgid "Play Location"
+msgstr "Reproducir Dirección"
+
+#: src/skins/ui_manager.c:399
+msgid "Play media from the selected location"
+msgstr "Reproducir medios desde la dirección seleccionada"
+
+#: src/skins/ui_manager.c:401
+msgid "Plugin services"
+msgstr "Servicios de plugin"
+
+#: src/skins/ui_manager.c:403
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: src/skins/ui_manager.c:404
+msgid "Open preferences window"
+msgstr "Abrir ventana de preferencias"
+
+#: src/skins/ui_manager.c:407
+msgid "Quit Audacious"
+msgstr "Salir de Audacious"
+
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
+msgid "Set A-B"
+msgstr "Ajusta A-B"
+
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
+msgid "Clear A-B"
+msgstr "Limpiar A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Jump to Time"
+msgstr "Saltar al tiempo"
+
+#: src/skins/ui_manager.c:421
+msgid "Queue Toggle"
+msgstr "Cambiar Cola"
+
+#: src/skins/ui_manager.c:422
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Habilita/deshabilita la entrada en la cola de la lista de reproducción."
+
+#: src/skins/ui_manager.c:425
+msgid "Copy"
+msgstr "Copiar"
+
+#: src/skins/ui_manager.c:427
+msgid "Cut"
+msgstr "Cortar"
+
+#: src/skins/ui_manager.c:429
+msgid "Paste"
+msgstr "Pegar"
+
+#: src/skins/ui_manager.c:436
+msgid "Load"
+msgstr "Cargar"
+
+#: src/skins/ui_manager.c:437
+msgid "Import"
+msgstr "Importar"
+
+#: src/skins/ui_manager.c:438
+msgid "Save"
+msgstr "Guardar"
+
+#: src/skins/ui_manager.c:439
+msgid "Delete"
+msgstr "Borrar"
+
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
+msgid "Preset"
+msgstr "Preset"
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
+msgid "Auto-load preset"
+msgstr "Auto cargar preset"
+
+#: src/skins/ui_manager.c:445
+msgid "Load auto-load preset"
+msgstr "Cargar preset auto-load"
+
+#: src/skins/ui_manager.c:448
+msgid "Load default preset into equalizer"
+msgstr "Cargar preset determinado en el ecualizador"
+
+#: src/skins/ui_manager.c:450
+msgid "Zero"
+msgstr "Cero"
+
+#: src/skins/ui_manager.c:451
+msgid "Set equalizer preset levels to zero"
+msgstr "Ajustar niveles preset del ecualizador a cero"
+
+#: src/skins/ui_manager.c:453
+msgid "From file"
+msgstr "Desde archivo"
+
+#: src/skins/ui_manager.c:454
+msgid "Load preset from file"
+msgstr "Cargar preset desde un archivo"
+
+#: src/skins/ui_manager.c:456
+msgid "From WinAMP EQF file"
+msgstr "Desde archivo WinAMP EQF"
+
+#: src/skins/ui_manager.c:457
+msgid "Load preset from WinAMP EQF file"
+msgstr "Cargar preset desde archivo WinAMP EQF"
+
+#: src/skins/ui_manager.c:459
+msgid "WinAMP Presets"
+msgstr "Presets WinAMP"
+
+#: src/skins/ui_manager.c:460
+msgid "Import WinAMP presets"
+msgstr "Importar presets WinAMP"
+
+#: src/skins/ui_manager.c:466
+msgid "Save auto-load preset"
+msgstr "Guardar preset auto-load"
+
+#: src/skins/ui_manager.c:469
+msgid "Save default preset"
+msgstr "Guardar preset predeterminado"
+
+#: src/skins/ui_manager.c:471
+msgid "To file"
+msgstr "En archivo"
+
+#: src/skins/ui_manager.c:472
+msgid "Save preset to file"
+msgstr "Guardar preset en archivo"
+
+#: src/skins/ui_manager.c:474
+msgid "To WinAMP EQF file"
+msgstr "En archivo WinAMP EQF"
+
+#: src/skins/ui_manager.c:475
+msgid "Save preset to WinAMP EQF file"
+msgstr "Guardar present en archivo WinAMP EQF"
+
+#: src/skins/ui_manager.c:481
+msgid "Delete auto-load preset"
+msgstr "Borrar preset auto-load"
+
+#: src/skins/ui_playlist.c:248
+msgid "Search entries in active playlist"
+msgstr "Buscar entradas en la lista de reproducción activa"
+
+#: src/skins/ui_playlist.c:256
+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 "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr "Selecciona entradas en la lista de reproducción llenando uno o más campos. Los campos usan la sintaxis de expresiones regulares, mayúsculas o minísculas indiscriminadas. Si no sabes como trabajan las expresiones regulares, simplemente inserta una porción literal de lo que buscas."
+
+#: src/skins/ui_playlist.c:264
+msgid "Title: "
+msgstr "Título: "
+
+#: src/skins/ui_playlist.c:271
+msgid "Album: "
+msgstr "Álbum: "
+
+#: src/skins/ui_playlist.c:278
+msgid "Artist: "
+msgstr "Artista: "
+
+#: src/skins/ui_playlist.c:285
+msgid "Filename: "
+msgstr "Nombre de Archivo: "
+
+#: src/skins/ui_playlist.c:293
+msgid "Clear previous selection before searching"
+msgstr "Limpiar selección previa antes de buscar"
+
+#: src/skins/ui_playlist.c:296
+msgid "Automatically toggle queue for matching entries"
+msgstr "Cambiar automáticamente la cola para las entradas coincidentes"
+
+#: src/skins/ui_playlist.c:299
+msgid "Create a new playlist with matching entries"
+msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
+
+#: src/skins/ui_playlist.c:765
+msgid "Audacious Playlist Editor"
+msgstr "Editor de Listas de Reproducción de Audacious"
+
+#: src/skins/ui_playlist.c:812
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d de %d)"
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr "Skin de Winamp 2.x comprimida"
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr "Skin de winamp 2.x sin comprimir"
+
+#: src/skins/util.c:774
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr "No se puede crear el directorio (%s): %s\n"
+
+#: src/sndfile/plugin.c:456
+msgid "About sndfile plugin"
+msgstr "Acerca del plugin sndfile"
+
+#: src/sndstretch/sndstretch_xmms.c:155
+msgid "About SndStretch"
+msgstr "Acerca de SndStretch"
+
+#: src/sndstretch/sndstretch_xmms.c:308
+msgid "Volume corr."
+msgstr "Corr. volumen"
+
+#: src/sndstretch/sndstretch_xmms.c:309
+msgid "Short Overlap"
+msgstr "Encimado corto"
+
+#: src/sndstretch/sndstretch_xmms.c:355
+msgid "Speed"
+msgstr "Velocidad"
+
+#: src/sndstretch/sndstretch_xmms.c:356
+msgid "Pitch"
+msgstr "Tono"
+
+#: src/sndstretch/sndstretch_xmms.c:357
+msgid "Scale"
+msgstr "Escala"
+
+#: src/sndstretch/sndstretch_xmms.c:377
+msgid "SndStretch - Configuration"
+msgstr "SndStretch - Configuración"
+
+#: src/song_change/song_change.c:437
+msgid "Command to run when Audacious starts a new song."
+msgstr "Comando para ejecutar cuando Audacious comience una nueva pista."
+
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
+msgid "Command:"
+msgstr "Comando:"
+
+#: src/song_change/song_change.c:443
+msgid "Command to run toward the end of a song."
+msgstr "Comando para ejecutar al final de una pista."
+
+#: src/song_change/song_change.c:449
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr "Comando para ejecutar cuando Audacious alcance el final de una lista de reproducción."
+
+#: src/song_change/song_change.c:455
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr "Comando para ejecutar cuando el título de una pista cambie (por ejemplo, títulos de flujos de red)."
+
+#: src/song_change/song_change.c:461
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command).\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: filename (full path)\n"
+"%l: length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr "Puedes usar las siguientes cadenas de formato las cuales\nserán sustituidas antes de llamar al comando\n(no todas son útiles para el comando al finalizar la lista de reproducción).\n\n%F: Frecuencia (en hertz)\n%c: Número de canales\n%f: nombre del archivo (ruta completa)\n%l: duración (en milisegundos)\n%n ó %s: Nombre de la Pista\n%r: Tasa (en bits por segundo)\n%t: Posición en la Lista de Reproducción (%02d)\n%p: Reproduciendo actualmente (1 ó 0)\n%a: Artista\n%b: Álbum\n%T: Título de la Pista"
+
+#: src/song_change/song_change.c:488
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr "Parámetros enviados al shell deberán ser encapsulados en apóstrofes. Hacer otra cosa es un riesgo de seguridad."
+
+#: src/song_change/song_change.c:499
+msgid "Commands"
+msgstr "Comandos"
+
+#: src/song_change/song_change.c:529
+msgid "Song Change"
+msgstr "Cambiar Pista"
+
+#: src/statusicon/statusicon.c:379
+msgid "About Status Icon Plugin"
+msgstr "Acerca del plugin de Icono de Estado"
+
+#: src/statusicon/statusicon.c:380
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager.\n"
+msgstr "Plugin Status Icon\n\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nEste plugin provee un ícono de estado colocado en\nel área de la bandeja del sistema del administrador de ventanas.\n"
+
+#: src/statusicon/statusicon.c:451
+msgid "Status Icon Plugin - Preferences"
+msgstr "Status Icon Plugin - Preferencias"
+
+#: src/statusicon/statusicon.c:461
+msgid "Right-Click Menu"
+msgstr "Menú con Clic Derecho"
+
+#: src/statusicon/statusicon.c:466
+msgid "Small playback menu #1"
+msgstr "Menú pequeño de reproducción #1"
+
+#: src/statusicon/statusicon.c:469
+msgid "Small playback menu #2"
+msgstr "Menú pequeño de reproducción #2"
+
+#: src/statusicon/statusicon.c:485
+msgid "Mouse Scroll Action"
+msgstr "Acción con la Rueda del Ratón"
+
+#: src/statusicon/statusicon.c:489
+msgid "Change volume"
+msgstr "Cambiar volumen"
+
+#: src/statusicon/statusicon.c:491
+msgid "Change playing song"
+msgstr "Cambiar pista en reproducción"
+
+#: src/statusicon/statusicon.c:504
+msgid "Other settings"
+msgstr "Otros ajustes"
+
+#: src/statusicon/statusicon.c:509
+msgid "Disable the popup window"
+msgstr "Deshabilitar la ventana emergente"
+
+#: src/statusicon/statusicon.c:516
+msgid "Close to the notification area (system tray)"
+msgstr "Cerrar al área de notificación (bandeja del sistema)"
+
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Avanzar en la lista de reproducción cuando se desplace hacía arriba"
+
+#: src/stereo_plugin/stereo.c:45
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin 1999."
+msgstr "plugin Extra Stereo\n\nPor Johan Levin, 1999."
+
+#: src/stereo_plugin/stereo.c:64
+msgid "About Extra Stereo Plugin"
+msgstr "Acerca del plugin Extra Stereo"
+
+#: src/stereo_plugin/stereo.c:95
+msgid "Configure Extra Stereo"
+msgstr "Configurar Extra Stereo"
+
+#: src/tonegen/tonegen.c:49
+msgid "About Tone Generator"
+msgstr "Acerca de Tone Generator"
+
+#: src/tonegen/tonegen.c:51
+msgid ""
+"Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
+msgstr "Generador de tonos sinusoidales por Haavard Kvaalen <havardk@xmms.org>\nModificado por Daniel J. Peng <danielpeng@bigfoot.com>\n\nPara usarlo, agrega una URL: tone://frecuencia1;frecuencia2;frecuencia3;...\npor ejemplo, tone://2000;2005 para reproducir un tono de 2000Hz y un tono de 2005Hz"
+
+#: src/tonegen/tonegen.c:101
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.c:101
+msgid "Tone Generator: "
+msgstr "Generador de tonos: "
+
+#: src/unix-io/gtk.c:34
+msgid "About File I/O Plugin"
+msgstr "Acerca del plugin File I/O"
+
+#: src/vorbis/vorbis.c:573
+msgid "About Ogg Vorbis Audio Plugin"
+msgstr "Acerca del plugin Ogg Vorbis Audio"
+
+#: src/vorbis/vorbis.c:578
+msgid ""
+"Ogg Vorbis Plugin by the Xiph.org Foundation\n"
+"\n"
+"Original code by\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"Contributions from\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Haavard Kvaalen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>\n"
+"\n"
+"Visit the Xiph.org Foundation at http://www.xiph.org/\n"
+msgstr "Plugin Ogg Vorbis por la Fundación Xiph.org\n\nCódigo original por\nTony Arcieri <bascule@inferno.tusculum.edu>\nContributiones de\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHaavard Kvaalen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\nVisita la Fundación Xiph.org en http://www.xiph.org/\n"
+
+#: src/vtx/about.c:14
+msgid "About Vortex Player"
+msgstr "Acerca del Reproducción Vortex"
+
+#: src/vtx/about.c:15
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"\n"
+"Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
+"and other AY/YM music sites.\n"
+"\n"
+"Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr "Reproductor de archivos en formato Vortex por Sashnov Alexander <sashnov@ngs.ru>\nFundamentado en el código fuente original in_vtx.dll por Roman Sherbakov <v_soft@microfor.ru>\n\nLa música en formato vtx puede ser encontrada en http://vtx.microfor.ru/music.htm\ny otros sitios de música AY/YM.\n\nImplementación para Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/wavpack/wavpack.c:353
+#, c-format
+msgid "Wavpack Decoder Plugin %s"
+msgstr "Plugin Descodificador Wavpack %s"
+
+#: src/wavpack/wavpack.c:354
+msgid ""
+"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan\n"
+"Visit the Wavpack site at http://www.wavpack.com/\n"
+msgstr "Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>\n\nAlgo del código del plugin code fue por Miles Egan\nVisita el sitio Wavpack en http://www.wavpack.com/\n"

audacious-plugins-3.1.1.tar.bz2/po/et.po -> audacious-plugins-3.2.4.tar.bz2/po/et.po Changed

@@ -1,21 +1,23 @@
-# Audacious'e pluginate eesti keele tõlge.
-# Estonian translation of Audacious Plugins.
+# Estonian translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
 #
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Translators:
 # Ivar Smolin <okul at linux ee>, 2007.
-#
+# Ivar Smolin <okul@linux.ee>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious-plugins 1.4.2\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-07-17 18:49-0400\n"
-"PO-Revision-Date: 2007-12-30 17:49+0200\n"
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-05-20 02:25+0000\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
-"Language-Team: Estonian <et@li.org>\n"
-"Language: et\n"
+"Language-Team: Estonian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/aac/libmp4.c:256
 #, c-format
@@ -23,111 +25,329 @@
 "Using libfaad2-%s for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
-msgstr ""
+msgstr "Dekodeerimiseks kasutatakse teeki libfaad2-%s.\nFAAD2 AAC/HE-AAC/HE-AACv2/DRM dekooder (c) Nero AG, www.nero.com\nAutoriõigused (c) 2005-2006 Audaciouse meeskond"
 
 #: src/aac/libmp4.c:261
-#, fuzzy
 msgid "About MP4 AAC decoder plugin"
-msgstr "MP4 AAC esituspluginast lähemalt"
+msgstr "MP4 AAC dekooderpluginast lähemalt"
+
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "Äratusest lähemalt"
+
+#: src/alarm/alarm.c:313
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr "Plugin esituste alustamiseks kindlaksmääratud ajal.\n\nEsialgse koodi autorid on Adam Feakin ja Daniel Stodden."
+
+#: src/alarm/interface.c:33
+msgid "Alarm"
+msgstr "Äratus"
+
+#: src/alarm/interface.c:40
+msgid "This is your wakeup call."
+msgstr "See on sinu äratus."
+
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
+msgid "OK"
+msgstr "Olgu"
+
+#: src/alarm/interface.c:214
+msgid "Alarm Settings"
+msgstr "Äratuste sätted"
+
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
+msgid "Time"
+msgstr "Aeg"
+
+#: src/alarm/interface.c:270
+msgid "hours"
+msgstr "tundi"
+
+#: src/alarm/interface.c:331
+msgid "h"
+msgstr " "
+
+#: src/alarm/interface.c:361
+msgid "minutes"
+msgstr "minutit"
+
+#: src/alarm/interface.c:379
+msgid "Quiet after:"
+msgstr "Vaigistamine pärast:"
+
+#: src/alarm/interface.c:389
+msgid "Alarm at (default):"
+msgstr "Vaikimisi äratuskell (vaikimisi):"
+
+#: src/alarm/interface.c:409
+msgid "Choose the days for the alarm to come on"
+msgstr "Vali päevad, mil äratus tööle hakkab"
+
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
+msgid "Default"
+msgstr "Vaikimisi"
+
+#: src/alarm/interface.c:763
+msgid "Day"
+msgstr "Päev"
+
+#: src/alarm/interface.c:783
+msgid "Tuesday"
+msgstr "Teisipäev"
+
+#: src/alarm/interface.c:794
+msgid "Wednesday"
+msgstr "Kolmapäev"
+
+#: src/alarm/interface.c:805
+msgid "Thursday"
+msgstr "Neljapäev"
+
+#: src/alarm/interface.c:816
+msgid "Friday"
+msgstr "Reede"
+
+#: src/alarm/interface.c:827
+msgid "Saturday"
+msgstr "Laupäev"
+
+#: src/alarm/interface.c:838
+msgid "Sunday"
+msgstr "Pühapäev"
+
+#: src/alarm/interface.c:848
+msgid "Monday"
+msgstr "Esmaspäev"
+
+#: src/alarm/interface.c:859
+msgid "Days"
+msgstr "Päevad"
+
+#: src/alarm/interface.c:875
+msgid "Fading"
+msgstr "Sumbumine"
+
+#: src/alarm/interface.c:912
+msgid "seconds"
+msgstr "sekundit"
+
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
+msgid "Volume"
+msgstr "Valjus"
+
+#: src/alarm/interface.c:946
+msgid "Current"
+msgstr "Praegune"
+
+#: src/alarm/interface.c:954
+msgid "Start at"
+msgstr "Alguses"
+
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:998
+msgid "Final"
+msgstr "Lõpuks"
+
+#: src/alarm/interface.c:1051
+msgid "Additional Command"
+msgstr "Täiendav käsk"
+
+#: src/alarm/interface.c:1077
+msgid "enable"
+msgstr "lubatud"
+
+#: src/alarm/interface.c:1085
+msgid "Playlist (optional)"
+msgstr "Esitusnimekiri (valikuline)"
+
+#: src/alarm/interface.c:1111
+msgid "Browse..."
+msgstr "Sirvi..."
+
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
+msgid "Reminder"
+msgstr "Meeldetuletaja"
+
+#: src/alarm/interface.c:1136
+msgid "Use reminder"
+msgstr "Kasutan meeldetuletajat"
+
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Valikud"
+
+#: src/alarm/interface.c:1160
+msgid "What do these options mean?"
+msgstr "Mida need valikud tähendavad?"
+
+#: src/alarm/interface.c:1188
+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:1190 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Abi"
+
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Loobu"
+
+#: src/alarm/interface.c:1290
+msgid "Your reminder for today is.."
+msgstr "Sinu tänane meeldetuletaja on ..."
+
+#: src/alarm/interface.c:1315
+msgid "Thankyou"
+msgstr "Aitäh"
 
 #: src/alsa/config.c:210
-#, fuzzy
 msgid "Default PCM device"
-msgstr "Vaikimisi PCM-seade (%s)"
+msgstr "Vaikimisi PCM-seade"
 
 #: src/alsa/config.c:235
-#, fuzzy
 msgid "Default mixer device"
-msgstr "Vaikimisi PCM-seade (%s)"
+msgstr "Vaikimisi mikserseade"
 
-#: src/alsa/config.c:447
-#, fuzzy
+#: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
-msgstr "Olekuikooni plugina eelistused"
+msgstr "ALSA väljundplugina eelistused"
 
-#: src/alsa/config.c:454
-#, fuzzy
+#: src/alsa/config.c:445
 msgid "PCM device:"
-msgstr "Miksimisseade:"
+msgstr "PCM-seade:"
 
-#: src/alsa/config.c:456 src/OSS/configure.c:246
+#: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
 msgstr "Miksimisseade:"
 
-#: src/alsa/config.c:458
-#, fuzzy
+#: src/alsa/config.c:449
 msgid "Mixer element:"
-msgstr "Miksimisseade:"
+msgstr "Miksimiselement:"
 
-#: src/alsa/config.c:461
+#: src/alsa/config.c:452
 msgid "Work around drain hangup"
 msgstr ""
 
 #: src/alsa/plugin.c:59
-#, fuzzy
 msgid "About ALSA Output Plugin"
-msgstr "JACK väljundplugina versioonist 0.17 lähemalt"
+msgstr "ALSA väljundpluginast lähemalt"
 
 #: src/alsa/plugin.c:81
-#, fuzzy
 msgid "ALSA error"
-msgstr "Viga!"
+msgstr "ALSA viga"
 
-#: src/amidi-plug/amidi-plug.c:335
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr ""
+msgstr "Sa pole MIDI esitamiseks valinud ühtegi sekventseriporti. Seda saab teha MIDI-plugina eelistustest."
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:35
 msgid "ALSA Backend "
-msgstr ""
+msgstr "ALSA taustaprogramm "
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:37
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
-"ports. The ALSA sequencer interface is very versatile, it can provide ports "
-"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
-"synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from "
-"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
-"hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
-msgstr ""
+msgstr "FluidSynth taustaprogramm "
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-"
-"time software synthesizer based on the SoundFont2 specification (www."
-"fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed "
-"by chosen ouput plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
+msgstr "See taustaprogramm saadab MIDI-sündmused SoundFont2 spetsifikatsioonil põhinevale tarkvaralisele süntesaatorprogrammile FluidSynth (www.fluidsynth.org).\nSünteesitud heli esitatakse valitud väljundplugina abil ning seda on võimalik efektipluginate abil järeltöödelda.\nTaustaprogrammi autor on Giacomo Lozito."
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
-msgstr ""
+msgstr "ALSA TAUSTAPROGRAMMI SÄTTED"
 
 #: src/amidi-plug/i_configure-alsa.c:331
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: src/amidi-plug/i_configure-alsa.c:333
 msgid "Client name"
-msgstr ""
+msgstr "Kliendi nimi"
 
 #: src/amidi-plug/i_configure-alsa.c:335
 msgid "Port name"
-msgstr ""
+msgstr "Pordi nimi"
 
 #: src/amidi-plug/i_configure-alsa.c:346
 msgid "ALSA output ports"
-msgstr ""
+msgstr "ALSA väljundi pordid"
 
 #: src/amidi-plug/i_configure-alsa.c:399
 msgid "Soundcard: "
@@ -143,29 +363,29 @@
 
 #: src/amidi-plug/i_configure-alsa.c:429
 msgid "ALSA Backend not loaded or not available"
-msgstr ""
+msgstr "ALSA taustaprogrammi pole laaditud või pole see saadaval"
 
 #: src/amidi-plug/i_configure-alsa.c:448
 msgid ""
 "ALSA\n"
 "backend"
-msgstr ""
+msgstr "ALSA taustaprogramm"
 
 #: src/amidi-plug/i_configure-ap.c:59
 msgid "AMIDI-Plug - backend information"
-msgstr ""
+msgstr "AMIDI-Plug - taustaprogrammi andmed"
 
 #: src/amidi-plug/i_configure-ap.c:196
 msgid "AMIDI-PLUG PREFERENCES"
-msgstr ""
+msgstr "AMIDI-PLUG EELISTUSED"
 
 #: src/amidi-plug/i_configure-ap.c:223
 msgid "Backend selection"
-msgstr ""
+msgstr "Taustaprogrammi valimine"
 
 #: src/amidi-plug/i_configure-ap.c:227
 msgid "Available backends"
-msgstr ""
+msgstr "Saadaolevad taustaprogrammid"
 
 #: src/amidi-plug/i_configure-ap.c:257
 msgid "Playback settings"
@@ -185,41 +405,41 @@
 
 #: src/amidi-plug/i_configure-ap.c:293
 msgid "pre-calculate length of MIDI files in playlist"
-msgstr ""
+msgstr "esitusnimekirjas olevate MIDI-failide kestuse eelarvutamine"
 
 #: src/amidi-plug/i_configure-ap.c:298
 msgid "extract comments from MIDI file (if available)"
-msgstr ""
+msgstr "MIDI-failidest eraldatakse kommentaarid (kui need on saadaval)"
 
 #: src/amidi-plug/i_configure-ap.c:303
 msgid "extract lyrics from MIDI file (if available)"
-msgstr ""
+msgstr "MIDI-failidest eraldatakse laulusõnad (kui need on saadaval)"
 
 #: src/amidi-plug/i_configure-ap.c:333
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr ""
+msgstr "AMIDI\nPlug"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
-msgstr ""
+msgstr "AMIDI-Plug - faili valimine"
 
 #: src/amidi-plug/i_configure.c:129
 msgid "AMIDI-Plug - configuration"
-msgstr ""
+msgstr "AMIDI-Plug - sätted"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:55
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr ""
+msgstr "AMIDI-Plug - SoundFont faili valimine"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:270
 msgid "FLUIDSYNTH BACKEND CONFIGURATION"
-msgstr ""
+msgstr "FLUIDSYNTH TAUSTAPROGRAMMI SÄTTED"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:313
 msgid "SoundFont settings"
-msgstr ""
+msgstr "SoundFont sätted"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:345
 msgid "Filename"
@@ -227,7 +447,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
-msgstr ""
+msgstr "Suurus (baitides)"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:398
 msgid "Load SF on player start"
@@ -250,7 +470,7 @@
 #: src/amidi-plug/i_configure-fluidsynth.c:488
 #: src/amidi-plug/i_configure-fluidsynth.c:519
 msgid "use default"
-msgstr ""
+msgstr "vaikimisi väärtus"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:435
 #: src/amidi-plug/i_configure-fluidsynth.c:463
@@ -281,7 +501,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:544
 msgid "sample rate"
-msgstr ""
+msgstr "Diskreetimissagedus"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:550
 msgid "22050 Hz "
@@ -297,7 +517,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:559
 msgid "custom "
-msgstr ""
+msgstr "kohandatud "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "Hz "
@@ -311,7 +531,7 @@
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr ""
+msgstr "FluidSynth \ntaustaprogramm"
 
 #: src/amidi-plug/i_configure-timidity.c:39
 msgid "TIMIDITY BACKEND CONFIGURATION"
@@ -325,17 +545,15 @@
 msgid ""
 "TiMidity\n"
 "backend"
-msgstr ""
-"TiMidity\n"
-"taustaprogramm"
+msgstr "TiMidity\ntaustaprogramm"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
 msgstr "Nimi:"
 
 #: src/amidi-plug/i_fileinfo.c:193
 msgid " MIDI Info "
-msgstr ""
+msgstr " MIDI-andmed "
 
 #: src/amidi-plug/i_fileinfo.c:205
 msgid "Format:"
@@ -347,7 +565,7 @@
 
 #: src/amidi-plug/i_fileinfo.c:211
 msgid "Num of Tracks:"
-msgstr ""
+msgstr "Radade arv:"
 
 #: src/amidi-plug/i_fileinfo.c:216
 msgid "variable"
@@ -367,15 +585,15 @@
 
 #: src/amidi-plug/i_fileinfo.c:237
 msgid " MIDI Comments and Lyrics "
-msgstr ""
+msgstr " MIDI kommentaarid ja laulusõnad "
 
 #: src/amidi-plug/i_fileinfo.c:288
 msgid "* no comments available in this MIDI file *"
-msgstr ""
+msgstr "* selles MIDI-failis pole kommentaare *"
 
 #: src/amidi-plug/i_fileinfo.c:301
 msgid "* no lyrics available in this MIDI file *"
-msgstr ""
+msgstr "* selles MIDI-failis pole laulusõnu *"
 
 #: src/amidi-plug/i_fileinfo.c:349
 msgid " (invalid UTF-8)"
@@ -383,13 +601,13 @@
 
 #: src/amidi-plug/i_utils.c:43
 msgid "AMIDI-Plug - about"
-msgstr ""
+msgstr "AMIDI-Plug plugina andmed"
 
 #: src/amidi-plug/i_utils.c:68
 msgid ""
 "\n"
 "AMIDI-Plug "
-msgstr ""
+msgstr "\nAMIDI-Plug "
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -414,259 +632,256 @@
 "Tony Vroon\n"
 "for the good help with alpha testing\n"
 "\n"
-msgstr ""
+msgstr "\nmodulaarne MIDI-muusikaesitaja\nhttp://www.develia.org/projects.php?p=amidiplug\n\nAutor: Giacomo Lozito\n< james@develia.org >\n\n\neriline tänu...\n\nClemens Ladisch ja Jaroslav Kysela\nnende poolt loodud lahedate programmide aplaymidi\nja amixer eest. Nendest oli ALSA API õppimisel lisaks\nalsa-lib dokumentide kõrval väga palju abi.\n\nAlfredo Spadafina\nkena midi klaveri logo eest\n\nTony Vroon\ntõhusa abi eest alfatestimisel\n\n"
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
-msgstr ""
+msgstr "Ristkülik"
 
 #: src/aosd/aosd_style.c:79
 msgid "Rounded Rectangle"
-msgstr ""
+msgstr "Ümarnurkne ristkülik"
 
 #: src/aosd/aosd_style.c:83
 msgid "Concave Rectangle"
-msgstr ""
+msgstr "Nõgus ristkülik"
 
 #: src/aosd/aosd_style.c:87
 msgid "None"
-msgstr ""
+msgstr "Puudub"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "Esitamise alustamine"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
-msgstr ""
+msgstr "OSD käivitamine loo esitamisel esitusnimekirjast."
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "Pealkirja muutumine"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr ""
+msgstr "OSD käivitamine kui esitamise ajal loo pealkiri muutub, kuid esitatav fail või andmevoog jääb samaks. See on kasulik internetiraadiote puhul."
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "Valjuse muutumine"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
-msgstr ""
+msgstr "OSD käivitamine helivaljuse muutmisel."
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
 msgstr "Pausimine"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
-msgstr ""
+msgstr "OSD käivitamine loo pausimisel."
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
 msgstr "Pausi lõpetamine"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
-msgstr ""
+msgstr "OSD käivitamine pausitud loo jätkamisel."
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "Paigutamine"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
-msgstr "Suhteline X-nihe:"
+msgstr "Suhteline nihe X-teljel:"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
-msgstr "Suhteline Y-nihe:"
+msgstr "Suhteline nihe Y-teljel:"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr "Suurim OSD laius:"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr "Mitme monitori valikud"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
-msgstr "OSD-d kuvatakse:"
+msgstr "OSD kuvatakse:"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "kõigil monitoridel"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "%i. monitoril"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "Ajastus (millisekundites)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "Kuvamine:"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "Sujuv näitamine:"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "Sujuv peitmine:"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "Kirjatüübid"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "Kirjatüüp %i:"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "Vari"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
-msgstr ""
+msgstr "Internatsionaliseerimine"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 msgid "Disable UTF-8 conversion of text (in aosd)"
-msgstr ""
+msgstr "Teksti UTF-8 teisendused on keelatud (aosd jaoks)"
 
-#: src/aosd/aosd_ui.c:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
-msgstr ""
+msgstr "Rüüfaili valimine"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr "Renderdamise laad"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "Värvused"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "Värvus %i:"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
-msgstr ""
+msgstr "Kohandatud rüü"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
-msgstr ""
+msgstr "Rüüfail:"
 
-#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
-#: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
-msgstr ""
+msgstr "Sirvi"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "Päästik on lubatud"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "Sündmus"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite "
-"manager otherwise the OSD won't work properly"
+"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "Läbipaistvus"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr "Võltsitud läbipaistvus"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Tegelik läbipaistvus (vajab X Composite laiendust)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
-msgstr ""
+msgstr "Audacious OSD - sätted"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr "Proovi"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "Asukoht"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "Animatsioon"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "Tekst"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "Kaunistused"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "Päästikud"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
-#: src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "Muu"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
-msgstr ""
+msgstr "Audaciouse OSD-st lähemalt"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
-msgstr ""
+msgstr "\nAudacious OSD "
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -677,26 +892,39 @@
 "written by Evan Martin\n"
 "http://neugierig.org/software/ghosd/\n"
 "\n"
-msgstr ""
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\nAutor: Giacomo Lozito\n< james@develia.org >\n\nOn-Screen-Display põhineb Ghosd teegil\nAutor: Evan Martin\nhttp://neugierig.org/software/ghosd/\n\n"
 
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
-msgstr ""
+msgstr "Hägustatud ostsilloskoop: värvuse valimine"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:111
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
 msgid "Options:"
 msgstr "Valikud:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:264
-#, fuzzy
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr ""
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr ""
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr ""
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr "Valmisseadistused:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
-msgstr "FLAC audiopluginast lähemalt"
+msgstr "Audaciouse CD-pluginast lähemalt"
 
-#: src/cdaudio-ng/cdaudio-ng.c:265
-#, fuzzy
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
-"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
 "Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
 "\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
@@ -706,26 +934,17 @@
 "This was a Google Summer of Code 2007 project.\n"
 "\n"
 "Copyright 2009 John Lindgren"
-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."
+msgstr "Autoriõigused (c) 2007 Calin Crisan <ccrisan@gmail.com> ja Audaciouse meeskond.\n\nSuur tänu libcdio arendajatele <http://www.gnu.org/software/libcdio/>\n» ja libcddb arendajatele <http://libcddb.sourceforge.net/>.\n\nSamuti palju tänu Tony Vroonile minu juhendamise eest.\n\nSee projekt valmis Google Summer of Code 2007 raames.\n\nAutoriõigused 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:558
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
-msgstr ""
+msgstr "Audio-CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:913
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
-msgstr ""
+msgstr "Seade on tühi."
 
-#: src/cdaudio-ng/cdaudio-ng.c:915
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -743,7 +962,7 @@
 
 #: src/cdaudio-ng/configure.c:176
 msgid "Disc speed:"
-msgstr ""
+msgstr "Plaadi kiirus:"
 
 #: src/cdaudio-ng/configure.c:184
 msgid "Use cd-text if available"
@@ -758,9 +977,8 @@
 msgstr "Server: "
 
 #: src/cdaudio-ng/configure.c:201
-#, fuzzy
 msgid "Path: "
-msgstr "Muster: "
+msgstr "Rada: "
 
 #: src/cdaudio-ng/configure.c:205
 msgid "Port: "
@@ -768,119 +986,108 @@
 
 #: src/cdaudio-ng/configure.c:218
 msgid "Use HTTP instead of CDDBP"
-msgstr ""
+msgstr "CDDBP asemel kasutatakse HTTP-d"
 
 #: src/cdaudio-ng/configure.c:230
 msgid "Override default device: "
 msgstr "Vaikimisi seadme asemel kasutatakse: "
 
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:131
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:125
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
 msgid "Ok"
 msgstr "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"
+msgstr "Esita CD-lt"
 
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
 msgstr "Lisa CD"
 
-#: src/compressor/plugin.c:67
-#, fuzzy
+#: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
-msgstr "Ekstra stereo pluginast lähemalt"
+msgstr ""
 
-#: src/compressor/plugin.c:99
+#: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
 msgstr ""
 
-#: src/compressor/plugin.c:111
-#, fuzzy
+#: src/compressor/plugin.c:107
 msgid "Center volume:"
-msgstr "Muudetakse valjust"
+msgstr ""
 
-#: src/compressor/plugin.c:124
+#: src/compressor/plugin.c:120
 msgid "Dynamic range:"
 msgstr ""
 
-#: src/console/configure.c:138
-#, fuzzy
+#: src/console/configure.c:136
 msgid "Game Console Music Decoder"
-msgstr "Console Music Decoder pluginast lähemalt"
+msgstr "Mängukonsooli muusikadekooder"
 
-#: src/console/configure.c:155
+#: src/console/configure.c:153
 msgid "General"
 msgstr "Üldine"
 
-#: src/console/configure.c:157 src/skins/ui_manager.c:176
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
 msgid "Playback"
 msgstr "Esitamine"
 
-#: src/console/configure.c:172
+#: src/console/configure.c:170
 msgid "Bass:"
-msgstr ""
+msgstr "Madalad:"
 
-#: src/console/configure.c:176 src/console/configure.c:187
-#: src/console/configure.c:208
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
 msgid "secs"
-msgstr ""
+msgstr "sek"
 
-#: src/console/configure.c:183
+#: src/console/configure.c:181
 msgid "Treble:"
-msgstr ""
+msgstr "Kõrged:"
 
-#: src/console/configure.c:204
+#: src/console/configure.c:202
 msgid "Default song length:"
-msgstr ""
+msgstr "Loo vaikimisi kestus:"
 
-#: src/console/configure.c:210 src/sid/xs_interface.c:666
+#: src/console/configure.c:208
 msgid "Resampling"
 msgstr ""
 
-#: src/console/configure.c:216
+#: src/console/configure.c:214
 msgid "Enable audio resampling"
 msgstr ""
 
-#: src/console/configure.c:231
+#: src/console/configure.c:229
 msgid "Resampling rate:"
 msgstr ""
 
-#: src/console/configure.c:235 src/sid/xs_interface.c:354
+#: src/console/configure.c:233
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:246
+#: src/console/configure.c:244
 msgid "SPC"
-msgstr ""
+msgstr "SPC"
 
-#: src/console/configure.c:247
+#: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
-msgstr ""
+msgstr "SPC-siltidest pärit pikkust tuleb eirata"
 
-#: src/console/configure.c:248
+#: src/console/configure.c:246
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/configure.c:273
+#: src/console/configure.c:271
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not "
-"provide length information (i.e. looping tracks)."
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
 msgstr ""
 
 #: src/console/plugin.c:33
-#, fuzzy
 msgid "About the Game Console Music Decoder"
-msgstr "Console Music Decoder pluginast lähemalt"
+msgstr "Mängukonsooli muusikadekoodrist lähemalt"
 
 #: src/console/plugin.c:34
 msgid ""
@@ -888,90 +1095,78 @@
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
-msgstr ""
+msgstr "Mängukonsoolide muusikavormingute dekoodimismootor põhineb programmil Game_Music_Emu 0.5.2.\nToetatud vormingud: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nAudaciouse plugina autorid on William Pitcock <nenolod@dereferenced.org>, \n Shay Green <gblargg@gmail.com>\n"
 
-#: src/crossfade/plugin.c:65
-#, fuzzy
+#: src/crossfade/plugin.c:60
 msgid "About Crossfade"
-msgstr "Kajapluginast lähemalt"
+msgstr "Sujuvast üleminekust lähemalt"
 
-#: src/crossfade/plugin.c:97
+#: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
-msgstr ""
+msgstr "Sujuva ülemineku eelistused"
 
-#: src/crossfade/plugin.c:109
+#: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
-msgstr ""
+msgstr "Kattuva osa kestus (sekundites):"
 
-#: src/crossfade/plugin.c:140 src/crossfade/plugin.c:146
-#, fuzzy
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
-msgstr "ModPlug'i sätted"
+msgstr "Sujuva ülemineku viga"
 
-#: src/crossfade/plugin.c:140
+#: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
 msgstr ""
 
-#: src/crossfade/plugin.c:148
+#: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
-"You can use the Sample Rate Converter effect to resample the songs to the "
-"same rate."
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:108
-#, fuzzy
+#: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
-msgstr "Seadista..."
+msgstr ""
 
-#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
-msgstr ""
+msgstr "Efekti intensiivsus:"
 
-#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
-#: src/stereo_plugin/stereo.c:138
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
 msgid "Apply"
 msgstr "Rakenda"
 
-#: src/daemon/daemon.c:58
-msgid "Daemon Interface (like old headless mode)"
-msgstr ""
-
 #: src/echo_plugin/gui.c:15
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
 "\n"
 "Surround echo by Carl van Schaik 1999"
-msgstr ""
-"Kajaplugin\n"
-"Autor: Johan Levin 1999.\n"
-"\n"
-"Surround-kaja autor: Carl van Schaik 1999"
+msgstr "Kajaplugin\nAutor: Johan Levin 1999.\n\nSurround-kaja autor: Carl van Schaik 1999"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
 msgstr "Kajapluginast lähemalt"
 
-#: src/echo_plugin/gui.c:72
+#: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
 msgstr "Kaja seadistamine"
 
-#: src/echo_plugin/gui.c:88
+#: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
 msgstr "Viivitus (ms)"
 
-#: src/echo_plugin/gui.c:93
+#: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
-msgstr ""
+msgstr "Uuestikostumine: (%)"
 
-#: src/echo_plugin/gui.c:98
+#: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
 msgstr "Valjus: (%)"
 
-#: src/ffaudio/ffaudio-core.c:763
+#: src/ffaudio/ffaudio-core.c:718
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -985,255 +1180,217 @@
 "libavcodec %s (%s)\n"
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
-msgstr ""
+msgstr "Paljude vormingute audiodekoodimise plugin Audaciousele põhineb\nFFmpeg multimeediaraamistikul (http://www.ffmpeg.org/)\nAutoriõigused (c) 2000-2009 Fabrice Bellard, et al.\n\nAudaciouse plugina autorid:\n William Pitcock <nenolod@nenolod.net>,\n Matti Hämäläinen <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:777
-#, fuzzy
+#: src/ffaudio/ffaudio-core.c:732
 msgid "About FFaudio Plugin"
-msgstr "FLAC audiopluginast lähemalt"
+msgstr "FFaudio pluginast lähemalt"
 
-#: src/filewriter/filewriter.c:155
+#: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
 msgstr "FailiKirjutaja pluginast lähemalt"
 
-#: src/filewriter/filewriter.c:156
-#, fuzzy
-msgid ""
-"FileWriter-Plugin\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Audacious'e ESounD plugin\n"
-"\n"
-" See programm on vaba tarkvara. Te võite seda edasi levitada ja/või\n"
-"muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need\n"
-"on Vaba Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number\n"
-"2 või (vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
-"\n"
-"Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA\n"
-"IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA\n"
-"või SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata\n"
-"GNU Üldist Avalikku Litsentsi.\n"
-"\n"
-"Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos käesoleva\n"
-"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:450
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "Failikirjutaja sätted"
 
-#: src/filewriter/filewriter.c:462
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "Väljundfaili vorming:"
 
-#: src/filewriter/filewriter.c:480
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "Seadista..."
 
-#: src/filewriter/filewriter.c:495
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "Salvestatakse algkataloogi"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr "Salvestatakse kohandatud kataloogi"
 
-#: src/filewriter/filewriter.c:510
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "Väljundkataloog:"
 
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr "Kataloogi valimine"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr "Failinimi tuletatakse lähtefaili:"
 
-#: src/filewriter/filewriter.c:536
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr "siltidest"
 
-#: src/filewriter/filewriter.c:542
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr "nimest"
 
-#: src/filewriter/filewriter.c:552
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "Algse faili laiendit maha ei lõigata"
 
-#: src/filewriter/filewriter.c:567
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr ""
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:783
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr ""
 
 #: src/filewriter/mp3.c:38
-#, fuzzy
 msgid "Joint Stereo"
-msgstr "Stereo"
+msgstr ""
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:724
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr "MP3 sätted"
 
-#: src/filewriter/mp3.c:747
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "Algoritmi kvaliteet:"
 
-#: src/filewriter/mp3.c:772
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr ""
 
-#: src/filewriter/mp3.c:800
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:807
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "Bitikiirus / pakkimistihedus:"
 
-#: src/filewriter/mp3.c:831
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "Bitikiirus (kbps):"
 
-#: src/filewriter/mp3.c:864
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
-msgstr ""
+msgstr "Pakkimistihedus"
 
-#: src/filewriter/mp3.c:888
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
-msgstr ""
+msgstr "Audiorežiim:"
 
-#: src/filewriter/mp3.c:913
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr ""
 
-#: src/filewriter/mp3.c:924
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr ""
 
-#: src/filewriter/mp3.c:935
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
-msgstr ""
+msgstr "Veakaitse"
 
-#: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "Kvaliteet"
 
-#: src/filewriter/mp3.c:957
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr ""
 
-#: src/filewriter/mp3.c:967
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "Liik:"
 
-#: src/filewriter/mp3.c:1000
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1016
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "Vähim bitikiirus (kbps):"
 
-#: src/filewriter/mp3.c:1043
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "Suurim bitikiirus (kbps):"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr ""
 
-#: src/filewriter/mp3.c:1078
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1088
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "Keskmine bitikiirus (kbps):"
 
-#: src/filewriter/mp3.c:1116
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1135
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.c:1149
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr ""
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1171
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr ""
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr ""
 
-#: src/filewriter/mp3.c:1194
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
-msgstr ""
+msgstr "ID3-parameetrid:"
 
-#: src/filewriter/mp3.c:1205
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
 msgstr ""
 
-#: src/filewriter/mp3.c:1215
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr ""
 
-#: src/filewriter/mp3.c:1222
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr ""
 
-#: src/filewriter/mp3.c:1243
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
-msgstr ""
+msgstr "Sildid"
 
-#: src/filewriter/vorbis.c:238
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis-kodeerija sätted"
 
-#: src/filewriter/vorbis.c:258
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "Kvaliteedi tase (0-10):"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr "FLAC audiopluginast lähemalt"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1241,20 +1398,13 @@
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr ""
-"\n"
-"\n"
-"Algse koodi autor:\n"
-"Ralf Ertzinger <ralf@skytale.net>\n"
-"\n"
-"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\nAlgse koodi autor:\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
 msgstr "Gnome kiirklahvide pluginast lähemalt"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:304
-#, fuzzy
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Let's you control the player with Gnome's shortcuts.\n"
@@ -1262,476 +1412,423 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 msgstr ""
-"Gnome kiirklahvide plugin\n"
-"Esitusprogrammi juhtimine GNOME kiirklahvide abil.\n"
-"\n"
-"Autoriõigused (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
-msgid "Open Files"
-msgstr ""
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
-#, fuzzy
-msgid "Add Files"
-msgstr "Failinimi"
-
-#: src/gntui/gntui.c:270
-#, fuzzy
-msgid "Audacious2"
-msgstr "%s - Audacious"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr ""
 
 #: src/gtkui/columns.c:36
-#, fuzzy
 msgid "Entry number"
-msgstr "Loo number:"
+msgstr "Kirje number"
 
-#: src/gtkui/columns.c:36 src/sid/xs_interface.c:1103
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "Pealkiri"
 
-#: src/gtkui/columns.c:37
-#, fuzzy
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
-msgstr "Esitaja:"
+msgstr "Esitaja"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Year"
-msgstr "Aasta:"
+msgstr "Aasta"
 
-#: src/gtkui/columns.c:37
-#, fuzzy
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
-msgstr "Album:"
+msgstr "Album"
 
 #: src/gtkui/columns.c:37
 msgid "Track"
-msgstr ""
+msgstr "Lugu"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Queue position"
-msgstr "Asukoht"
+msgstr "Asukoht järjekorras"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "Length"
-msgstr "Kestus:"
+msgstr "Kestus"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "File path"
-msgstr "Failinimi"
+msgstr "Faili rada"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "File name"
-msgstr "Failinimi"
+msgstr "Faili nimi"
 
 #: src/gtkui/columns.c:38
 msgid "Custom title"
-msgstr ""
+msgstr "Kohandatud pealkiri"
 
 #: src/gtkui/columns.c:39
-#, fuzzy
 msgid "Bitrate"
-msgstr "Bitikiirus:"
+msgstr "Bitikiirus"
 
-#: src/gtkui/columns.c:286
+#: src/gtkui/columns.c:278
 msgid "Choose Columns"
-msgstr ""
+msgstr "Veergude valimine"
 
-#: src/gtkui/columns.c:300
+#: src/gtkui/columns.c:292
 msgid "Available:"
-msgstr ""
+msgstr "Saadaval:"
 
-#: src/gtkui/columns.c:334
+#: src/gtkui/columns.c:326
 msgid "Chosen:"
-msgstr ""
+msgstr "Valitud:"
 
 #: src/gtkui/layout.c:122
 msgid "Dock at Left"
-msgstr ""
+msgstr "Doki vasakule"
 
 #: src/gtkui/layout.c:122
 msgid "Dock at Right"
-msgstr ""
+msgstr "Doki paremale"
 
 #: src/gtkui/layout.c:123
 msgid "Dock at Top"
-msgstr ""
+msgstr "Doki üles"
 
 #: src/gtkui/layout.c:123
 msgid "Dock at Bottom"
-msgstr ""
+msgstr "Doki alla"
 
 #: src/gtkui/layout.c:123
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.c:123
-#, fuzzy
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
-msgstr "lubatud"
+msgstr "Keela"
 
-#: src/gtkui/menus.c:132
-#, fuzzy
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
-msgstr "Failinimi"
+msgstr "_Ava failid ..."
 
-#: src/gtkui/menus.c:133
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
-msgstr ""
+msgstr "Ava _URL ..."
 
-#: src/gtkui/menus.c:134
-#, fuzzy
-msgid "_Add File ..."
-msgstr "Failinimi"
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "_Lisa faile ..."
 
-#: src/gtkui/menus.c:135
-#, fuzzy
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
-msgstr "Failinimi"
+msgstr "Lisa U_RL ..."
 
-#: src/gtkui/menus.c:137
-#, fuzzy
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
-msgstr "\"%s\" pluginast lähemalt"
+msgstr "_Programmist lähemalt"
 
-#: src/gtkui/menus.c:138
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
-msgstr ""
+msgstr "_Eelistused ..."
 
-#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
-#, fuzzy
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
-msgstr "Kvaliteet"
+msgstr "_Välju"
 
-#: src/gtkui/menus.c:142
-#, fuzzy
+#: src/gtkui/menus.c:141
 msgid "_Play"
-msgstr "Esitamine"
+msgstr "_Esita"
 
-#: src/gtkui/menus.c:143
-#, fuzzy
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
-msgstr "Pausimine"
+msgstr "_Peata"
 
-#: src/gtkui/menus.c:144
-#, fuzzy
+#: src/gtkui/menus.c:143
 msgid "_Stop"
-msgstr "Stereo"
+msgstr "_Seiska"
 
-#: src/gtkui/menus.c:145
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
-msgstr ""
+msgstr "Ee_lmine"
 
-#: src/gtkui/menus.c:146
-#, fuzzy
+#: src/gtkui/menus.c:145
 msgid "_Next"
-msgstr "Tekst"
+msgstr "_Järgmine"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
-msgstr ""
+msgstr "Ko_rduv"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
-msgstr ""
+msgstr "Se_gatud"
 
-#: src/gtkui/menus.c:150
-#, fuzzy
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
-msgstr "Esitusnimekirja valimine"
+msgstr "Esitusnimekirja ei _kasutata"
 
-#: src/gtkui/menus.c:151
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
-msgstr ""
+msgstr "Seisk_a pärast praegust lugu"
 
-#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
-msgstr ""
+msgstr "L_oo andmed ..."
 
-#: src/gtkui/menus.c:154
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/menus.c:155
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
-msgstr ""
+msgstr "_Vaheta lugu ..."
 
-#: src/gtkui/menus.c:158
-#, fuzzy
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
-msgstr "Loo number:"
+msgstr "Loo _numbri järgi"
 
-#: src/gtkui/menus.c:159
-#, fuzzy
+#: src/gtkui/menus.c:158
 msgid "By _Title"
-msgstr "Pealkiri"
+msgstr "Peal_kirja järgi"
 
-#: src/gtkui/menus.c:160
-#, fuzzy
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
-msgstr "Esitaja:"
+msgstr "_Esitaja järgi"
 
-#: src/gtkui/menus.c:161
-#, fuzzy
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
-msgstr "Album:"
+msgstr "_Albumi järgi"
 
-#: src/gtkui/menus.c:162
-#, fuzzy
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
-msgstr "Kuupäev:"
+msgstr "_Väljalaske kuupäeva järgi"
 
-#: src/gtkui/menus.c:163
-#, fuzzy
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
-msgstr "Failinimi"
+msgstr "_Faili raja järgi"
 
-#: src/gtkui/menus.c:164
-#, fuzzy
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
-msgstr "Pealkiri"
+msgstr "Ko_handatud pealkirja järgi"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
-msgstr ""
+msgstr "_Pööra järjestus tagurpidi"
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
-msgstr ""
+msgstr "_Järjestus juhuslikuks"
 
-#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
-msgstr ""
+msgstr "_Värskenda"
+
+#: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Ee_malda kättesaamatud failid"
 
 #: src/gtkui/menus.c:172
-#, fuzzy
 msgid "_Sort"
-msgstr "Vabandust"
+msgstr "_Sordi"
 
 #: src/gtkui/menus.c:174
 msgid "_New"
-msgstr ""
+msgstr "_Uus"
 
-#: src/gtkui/menus.c:175
-#, fuzzy
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
-msgstr "Sulge"
+msgstr "Sul_ge"
 
 #: src/gtkui/menus.c:177
-#, fuzzy
 msgid "_Import ..."
-msgstr "Esitusnimekirja andmed kiiresti"
+msgstr "_Impordi ..."
 
 #: src/gtkui/menus.c:178
-#, fuzzy
 msgid "_Export ..."
-msgstr "Esitusnimekirja andmed kiiresti"
+msgstr "_Ekspordi ..."
 
 #: src/gtkui/menus.c:180
-#, fuzzy
 msgid "_Playlist Manager ..."
-msgstr "Esitusnimekirja valimine"
+msgstr "_Halda esitusnimekirju..."
 
-#: src/gtkui/menus.c:183
-#, fuzzy
-msgid "Volume _Up"
-msgstr "Valjus"
+#: src/gtkui/menus.c:181
+msgid "_Queue Manager ..."
+msgstr "Halda _järjekorda ..."
 
 #: src/gtkui/menus.c:184
-#, fuzzy
+msgid "Volume _Up"
+msgstr "_Valjemaks"
+
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
-msgstr "Valjus"
+msgstr "Va_iksemaks"
 
-#: src/gtkui/menus.c:186
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
-msgstr ""
+msgstr "_Ekvalaiser"
 
-#: src/gtkui/menus.c:188
-#, fuzzy
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
-msgstr "Efektid"
+msgstr "E_fektid"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:192
 msgid "_Interface"
-msgstr ""
+msgstr "_Liides"
 
 #: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Visualiseerimine"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
-msgstr ""
+msgstr "_Menüüriba on nähtaval"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
-msgstr ""
+msgstr "_Teaberiba on nähtaval"
 
-#: src/gtkui/menus.c:195
-#, fuzzy
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
-msgstr "Olek"
+msgstr "_Olekuriba on nähtaval"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
-msgstr ""
+msgstr "Veergude _päised on nähtaval"
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
-msgstr ""
+msgstr "Vee_rgude valimine ..."
 
-#: src/gtkui/menus.c:199
-#, fuzzy
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
-msgstr "Loo sõnum"
+msgstr "_Kerimine loo vahetumisel"
 
-#: src/gtkui/menus.c:202
-#, fuzzy
+#: src/gtkui/menus.c:204
 msgid "_File"
-msgstr "Failinimi"
+msgstr "_Fail"
 
-#: src/gtkui/menus.c:203
-#, fuzzy
+#: src/gtkui/menus.c:205
 msgid "_Playback"
-msgstr "Esitamine"
+msgstr "_Esitamine"
 
-#: src/gtkui/menus.c:204
-#, fuzzy
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
-msgstr "Esitusnimekirja valimine"
+msgstr "E_situsnimekiri"
 
-#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
-#, fuzzy
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
-msgstr "Seadmed"
+msgstr "_Teenused"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:208
 msgid "_Output"
-msgstr ""
+msgstr "Väl_jund"
 
-#: src/gtkui/menus.c:207
+#: src/gtkui/menus.c:209
 msgid "_View"
-msgstr ""
+msgstr "_Vaade"
 
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
-msgstr ""
+msgstr "_Järjekorda/järjekorrast maha"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
-msgstr ""
+msgstr "_Lõika"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:217
 msgid "_Copy"
-msgstr ""
+msgstr "_Kopeeri"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:218
 msgid "_Paste"
-msgstr ""
+msgstr "_Aseta"
 
-#: src/gtkui/menus.c:217
-#, fuzzy
+#: src/gtkui/menus.c:219
 msgid "Select _All"
-msgstr "Esitusnimekirja valimine"
+msgstr "Val_i kõik"
 
-#: src/gtkui/menus.c:222
-#, fuzzy
+#: src/gtkui/menus.c:224
 msgid "_Rename"
-msgstr "Failinimi"
+msgstr "_Muuda nime"
 
-#: src/gtkui/ui_gtk.c:75
+#: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
-msgstr ""
+msgstr "GTK liides"
 
-#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#: src/gtkui/ui_gtk.c:156 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
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "Puhverdamine ..."
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
-msgstr "%s - Audacious"
+msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
-msgstr ""
+msgstr "Viga"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
-#, fuzzy
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Sulge"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
-msgstr "Mono"
+msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
-#, fuzzy
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
-msgstr "Stereo"
+msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.c:106
-#, fuzzy, c-format
+#: src/gtkui/ui_statusbar.c:109
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] "Kanaleid"
-msgstr[1] "Kanaleid"
+msgstr[0] "%d kanal"
+msgstr[1] "%d kanalit"
 
-#: src/gtkui/ui_statusbar.c:121
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
-msgstr ""
+msgstr "%d kbps"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
-msgstr ""
+msgstr "Eelmine lugu"
 
 #: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
-#, fuzzy
 msgid "Play"
-msgstr "Esitamine"
+msgstr "Esita"
 
 #: 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"
+msgstr "Seiska"
 
 #: src/hotkey/gui.c:75
 msgid "Next Track"
-msgstr ""
+msgstr "Järgmine lugu"
 
 #: src/hotkey/gui.c:76
 msgid "Forward 5 Seconds"
-msgstr ""
+msgstr "Edasikerimine 5 sekundit"
 
 #: src/hotkey/gui.c:77
 msgid "Rewind 5 Seconds"
-msgstr ""
+msgstr "Tagasikerimine 5 sekundit"
 
 #: src/hotkey/gui.c:78
 msgid "Mute"
 msgstr ""
 
 #: src/hotkey/gui.c:79
-#, fuzzy
 msgid "Volume Up"
-msgstr "Valjus"
+msgstr "Valjemaks"
 
 #: src/hotkey/gui.c:80
-#, fuzzy
 msgid "Volume Down"
-msgstr "Valjus"
+msgstr "Vaiksemaks"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
-msgstr ""
+msgstr "Hüppa failile"
 
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
@@ -1755,19 +1852,18 @@
 
 #: src/hotkey/gui.c:232
 msgid ""
-"It is not recommended to bind the primary mouse buttons without "
-"modificators.\n"
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr ""
+msgstr "Peamisi hiirenuppe pole soovitatav ilma muuteklahvideta siduda.\n\nKas soovid jätkata?"
 
 #: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
-msgstr ""
+msgstr "Hiirenuppude sidumine"
 
 #: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
-msgstr ""
+msgstr "Globaalsete kiirklahvide plugina sätted"
 
 #: src/hotkey/gui.c:400
 msgid ""
@@ -1776,22 +1872,20 @@
 msgstr ""
 
 #: src/hotkey/gui.c:405
-#, fuzzy
 msgid "Hotkeys:"
-msgstr "Host:"
+msgstr "Kiirklahvid:"
 
 #: src/hotkey/gui.c:424
-#, fuzzy
 msgid "Action:"
-msgstr "Failinimi: "
+msgstr "Tegevus:"
 
 #: src/hotkey/gui.c:432
 msgid "Key Binding:"
-msgstr ""
+msgstr "Kiirklahv:"
 
 #: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
-msgstr ""
+msgstr "Globaalsete kiirklahvide pluginast lähemalt"
 
 #: src/hotkey/gui.c:664
 msgid ""
@@ -1807,33 +1901,33 @@
 "\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
-msgstr ""
+msgstr "Globaalsete kiirklahvide plugin\nAudaciouse juhtimine globaalsete klahvikombinatsioonide või multimeediaklahvide abil.\n\nAutoriõigused (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nKaasaaitajad:\nAutoriõigused (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nAutoriõigused (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n»»»Bryn Davies <curious@ihug.com.au>\n»»»Jonathan A. Davis <davis@jdhouse.org>\n»»»Jeremy Tan <nsx@nsx.homeip.net>\n\n"
 
-#: src/jack/configure.c:71
+#: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
 msgstr ""
 
-#: src/jack/configure.c:78
+#: src/jack/configure.c:73
 msgid "Connect only the output ports"
 msgstr ""
 
-#: src/jack/configure.c:85
+#: src/jack/configure.c:80
 msgid "Connect to no ports"
 msgstr ""
 
-#: src/jack/configure.c:103
+#: src/jack/configure.c:98
 msgid "jack Plugin configuration"
-msgstr ""
+msgstr "jack-plugina sätted"
 
-#: src/jack/configure.c:121
+#: src/jack/configure.c:116
 msgid "Connection mode:"
-msgstr ""
+msgstr "Ühendumisrežiim:"
 
-#: src/jack/configure.c:133
+#: src/jack/configure.c:128
 msgid "Enable debug printing"
-msgstr ""
+msgstr "Silumisandmete printimise lubamine"
 
-#: src/jack/jack.c:438
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1842,947 +1936,336 @@
 "\n"
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
-msgstr ""
+msgstr "XMMS-i jack-draiver 0.17\n\nxmms-jack.sf.net\nChris Morgan<cmorgan@alum.wpi.edu>\n\nAudaciousele portis\nGiacomo Lozito - develia.org"
 
-#: src/jack/jack.c:443
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
 msgstr "JACK väljundplugina versioonist 0.17 lähemalt"
 
-#: src/lyricwiki/lyricwiki.c:226
+#: src/ladspa/plugin.c:415
+msgid "About LADSPA Host"
+msgstr "LADSPA hostist lähemalt"
+
+#: src/ladspa/plugin.c:516
+#, c-format
+msgid "%s Settings"
+msgstr "%s sätted"
+
+#: src/ladspa/plugin.c:584
+msgid "LADSPA Host Settings"
+msgstr "LADSPA hosti sätted"
+
+#: src/ladspa/plugin.c:593
+msgid "Module paths:"
+msgstr "Moodulite rajad:"
+
+#: src/ladspa/plugin.c:598
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr "Eralda rajad kooloniga.\nMooduleid otsitakse LADSPA_PATH keskkonnamuutujas ning siin määratud radadelt.\nPärast uute radade lisamist vajuta uute pluginate otsimiseks Enterit."
+
+#: src/ladspa/plugin.c:614
+msgid "Available plugins:"
+msgstr "Saadaolevad pluginad:"
+
+#: src/ladspa/plugin.c:626
+msgid "Enable"
+msgstr "Luba"
+
+#: src/ladspa/plugin.c:632
+msgid "Enabled plugins:"
+msgstr "Lubatud pluginad:"
+
+#: src/ladspa/plugin.c:647
+msgid "Settings"
+msgstr "Sätted"
+
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:249
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:337
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
-msgstr ""
+msgstr "\nLaulusõnu ei leitud."
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr "Metronoomist lähemalt"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr ""
+msgstr "Taktigeneraator.\nAutor: Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nGeneraatori kasutamiseks lisa URL: tact://beats*num/den\nnäiteks 77 lööki minutis: tact://77\nvõi 60 lööki minutis taktimõõduga 3/4: tact://60*3/4"
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Taktigeneraator: %d bpm"
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Taktigeneraator: %d bpm %d/%d"
 
-#: src/mpg123/mpg123.c:183
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "Kanalimiksrist lähemalt"
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "Kanalimiksri sätted"
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "Väljundkanalite arv:"
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "Muutused rakenduvad pärast järgmist loovahetust."
+
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
-msgstr ""
+msgstr "Ruumiline heli"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
 msgstr ""
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
 msgstr ""
 
-#: src/mtp_up/mtp.c:311
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
 msgstr ""
 
-#: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
-msgstr "Stereo"
+msgstr ""
 
-#: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
-msgstr "Esitusnimekirja andmed kiiresti"
+msgstr ""
 
 #: src/null/null.c:64
 msgid "Null output plugin "
-msgstr ""
+msgstr "Nullväljundi plugin "
 
 #: src/null/null.c:65
 msgid ""
 " by Christian Birchinger <joker@netswarm.net>\n"
 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
-msgstr ""
+msgstr " Autor: Christian Birchinger <joker@netswarm.net>\npõhineb XMMS-i pluginal, mille autor on Håvard Kvål <havardk@xmms.org>"
 
 #: src/null/null.c:68
 msgid "About Null Output"
 msgstr "Nullväljundist lähemalt"
 
-#: src/null/null.c:94
+#: src/null/null.c:89
 msgid "Null output preferences"
 msgstr "Nullväljundi eelistused"
 
-#: src/null/null.c:105
+#: src/null/null.c:100
 msgid "Run in real time"
 msgstr ""
 
-#: src/oss4/configure.c:89
-#, fuzzy
+#: src/oss4/configure.c:81
 msgid "1. Default device"
-msgstr "Vaikimisi PCM-seade (%s)"
+msgstr "1. Vaikimisi seade"
 
-#: src/oss4/configure.c:151
-#, fuzzy
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
-msgstr "Olekuikooni plugina eelistused"
+msgstr "OSS4 väljundplugina eelistused"
 
-#: src/oss4/configure.c:163 src/OSS/configure.c:203
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "Audioseade:"
 
-#: src/oss4/configure.c:189 src/OSS/configure.c:226 src/OSS/configure.c:269
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
-msgstr "Kasutatakse alternatiivseadet:"
+msgstr "Kasutatakse alternatiivset seadet:"
 
-#: src/oss4/configure.c:202
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
-msgstr ""
+msgstr "Seansside vahel helivajluse tase salvestatakse"
 
-#: src/oss4/configure.c:206
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr ""
+
 #: src/oss4/plugin.c:51
-#, fuzzy
 msgid "About OSS4 Plugin"
-msgstr "ESounD'i pluginast lähemalt"
+msgstr "OSS4 pluginast lähemalt"
 
-#: src/oss4/plugin.c:52
-#, fuzzy
-msgid ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"This program is free software: you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation, either version 3 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-"Audacious'e PulseAudio väljundplugin\n"
-"\n"
-" See programm on vaba tarkvara. Te võite seda edasi levitada ja/või\n"
-"muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need\n"
-"on Vaba Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number\n"
-"2 või (vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
-"\n"
-"Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA\n"
-"IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA\n"
-"või SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata\n"
-"GNU Üldist Avalikku Litsentsi.\n"
-"\n"
-"Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos käesoleva\n"
-"programmiga; kui ei, siis võtke ühendust Free Software Foundation'iga,\n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#: src/oss4/utils.c:204
-#, fuzzy
+#: src/oss4/utils.c:211
 msgid "OSS4 error"
-msgstr "Viga!"
+msgstr "OSS4 viga"
 
-#: src/OSS/configure.c:146
+#: src/OSS/configure.c:137
 #, c-format
 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
+#: src/OSS/configure.c:178
 msgid "OSS Driver configuration"
 msgstr "OSS draiveri sätted"
 
-#: src/OSS/configure.c:290
+#: src/OSS/configure.c:281
 msgid "Devices"
 msgstr "Seadmed"
 
-#: src/OSS/configure.c:292
+#: src/OSS/configure.c:283
 msgid "Buffering:"
 msgstr "Puhverdamine:"
 
-#: src/OSS/configure.c:305
+#: src/OSS/configure.c:296
 msgid "Pre-buffer (percent):"
 msgstr "Eelpuhver (protsentides):"
 
-#: src/OSS/configure.c:316
+#: src/OSS/configure.c:307
 msgid "Buffering"
 msgstr "Puhverdamine"
 
-#: src/OSS/configure.c:317
+#: src/OSS/configure.c:308
 msgid "Mixer Settings:"
 msgstr "Mikseri sätted"
 
-#: src/OSS/configure.c:323
+#: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
 msgstr ""
 
-#: src/OSS/configure.c:329
+#: src/OSS/configure.c:320
 msgid "Mixer"
 msgstr "Mikser"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr "OSS draiverist lähemalt"
 
-#: src/OSS/OSS.c:41
-msgid ""
-"Audacious OSS Driver\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Audacious'e OSS draiver\n"
-"\n"
-" See programm on vaba tarkvara. Te võite seda edasi levitada ja/või\n"
-"muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need\n"
-"on Vaba Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number\n"
-"2 või (vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
-"\n"
-"Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA\n"
-"IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA\n"
-"või SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata\n"
-"GNU Üldist Avalikku Litsentsi.\n"
-"\n"
-"Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos käesoleva\n"
-"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:687
+#: src/pulse_audio/pulse_audio.c:677
 msgid "About Audacious PulseAudio Output Plugin"
-msgstr "Audacious'e PulseAudio väljundpluginast lähemalt"
+msgstr "Audaciouse PulseAudio väljundpluginast lähemalt"
 
-#: src/pulse_audio/pulse_audio.c:688
-msgid ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Audacious'e PulseAudio väljundplugin\n"
-"\n"
-" See programm on vaba tarkvara. Te võite seda edasi levitada ja/või\n"
-"muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need\n"
-"on Vaba Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number\n"
-"2 või (vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
-"\n"
-"Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA\n"
-"IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA\n"
-"või SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata\n"
-"GNU Üldist Avalikku Litsentsi.\n"
-"\n"
-"Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos käesoleva\n"
-"programmiga; kui ei, siis võtke ühendust Free Software Foundation'iga,\n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#: src/resample/plugin.c:91
-#, fuzzy
+#: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
-msgstr "Olekuikooni pluginast lähemalt"
+msgstr ""
 
-#: src/resample/plugin.c:146
+#: src/resample/plugin.c:144
 msgid "Sample Rate Converter Preferences"
-msgstr ""
+msgstr "Diskreetimissageduste teisendaja eelistused"
 
-#: src/resample/plugin.c:158
+#: src/resample/plugin.c:156
 msgid "Rate mappings:"
-msgstr ""
+msgstr "Sageduste vastavused:"
 
-#: src/resample/plugin.c:181
+#: src/resample/plugin.c:179
 msgid "All others:"
-msgstr ""
+msgstr "Kõik ülejäänud:"
 
-#: src/resample/plugin.c:193
+#: src/resample/plugin.c:191
 msgid "Method:"
-msgstr ""
+msgstr "Meetod:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
-#, fuzzy
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
-msgstr "Vahetatakse esitatavat lugu"
+msgstr ""
 
-#: src/scrobbler/configure.c:150
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "Teenused"
 
-#: src/scrobbler/configure.c:172
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "Kasutajanimi:"
 
-#: src/scrobbler/configure.c:178
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "Parool:"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr ""
 
-#: src/scrobbler/configure.c:218
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:262
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr ""
 
-#: src/scrobbler/plugin.c:213
+#: src/scrobbler/plugin.c:194
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
-"com>\n"
-msgstr ""
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr "Audaciouse AudioScrobbler plugin\n\nAlgupärase plugina autorid: Audun Hove <audun@nlc.no> ja Pipian <pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:215
+#: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
 msgstr ""
 
 #: src/sdlout/plugin.c:58
-#, fuzzy
 msgid "About SDL Output Plugin"
-msgstr "JACK väljundplugina versioonist 0.17 lähemalt"
+msgstr "SDL väljundpluginast lähemalt"
 
 #: src/sdlout/plugin.c:78
-#, fuzzy
 msgid "SDL error"
-msgstr "Viga!"
-
-#: src/sid/xs_about.c:84
-#, c-format
-msgid "About %s"
-msgstr "\"%s\" pluginast lähemalt"
-
-#: 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"
-
-#: src/sid/xs_fileinfo.c:164
-#, c-format
-msgid "Tune #%i: "
-msgstr ""
-
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: src/sid/xs_interface.c:234
-msgid "Audacious-SID configuration"
-msgstr ""
-
-#: src/sid/xs_interface.c:270
-msgid "8-bit"
-msgstr ""
-
-#: src/sid/xs_interface.c:277
-msgid "16-bit"
-msgstr ""
-
-#: src/sid/xs_interface.c:284
-msgid "Resolution:"
-msgstr ""
-
-#: src/sid/xs_interface.c:315
-msgid "Autopanning"
-msgstr ""
-
-#: src/sid/xs_interface.c:322
-msgid "Channels:"
-msgstr "Kanaleid:"
-
-#: src/sid/xs_interface.c:366
-msgid "Samplerate:"
-msgstr ""
-
-#: src/sid/xs_interface.c:383
-msgid "Use oversampling"
-msgstr ""
-
-#: src/sid/xs_interface.c:394
-msgid "Factor:"
-msgstr ""
-
-#: src/sid/xs_interface.c:406
-msgid "Large factors require more CPU-power"
-msgstr ""
-
-#: src/sid/xs_interface.c:412
-msgid "Oversampling:"
-msgstr ""
-
-#: src/sid/xs_interface.c:417
-msgid "Audio"
-msgstr ""
-
-#: src/sid/xs_interface.c:445
-msgid "Force speed"
-msgstr ""
-
-#: src/sid/xs_interface.c:449
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"clock speed/frequency. Otherwise the speed is determined from played file "
-"itself."
-msgstr ""
-
-#: src/sid/xs_interface.c:451
-msgid "PAL (50 Hz)"
-msgstr ""
-
-#: src/sid/xs_interface.c:455
-msgid ""
-"PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
-"Most of SID-tunes have been made for PAL computers."
-msgstr ""
-
-#: src/sid/xs_interface.c:459
-msgid "NTSC (60 Hz)"
-msgstr ""
-
-#: src/sid/xs_interface.c:463
-msgid ""
-"NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
-"that differ from PAL). It is mainly used in United States, Japan and certain "
-"other countries."
-msgstr ""
-
-#: src/sid/xs_interface.c:467
-msgid "Clock speed:"
-msgstr ""
-
-#: src/sid/xs_interface.c:484
-msgid "Force model"
-msgstr ""
-
-#: src/sid/xs_interface.c:488
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"SID-chip model. Otherwise the preferred SID model is determined from the "
-"file (if PSIDv2NG type) or if not available, this setting is used."
-msgstr ""
-
-#: src/sid/xs_interface.c:490
-msgid "MOS 6581"
-msgstr ""
-
-#: src/sid/xs_interface.c:494
-msgid ""
-"MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
-"in few ways, having much fuller filter (which, due to design error, is never "
-"same between two different SID-chips) and has the \"volume adjustment bug\", "
-"which enables playing of digital samples."
-msgstr ""
-
-#: src/sid/xs_interface.c:498
-msgid "MOS 8580"
-msgstr ""
-
-#: src/sid/xs_interface.c:505
-msgid "SID model:"
-msgstr ""
-
-#: src/sid/xs_interface.c:522
-msgid "SIDPlay 1 (frame-based)"
-msgstr ""
-
-#: src/sid/xs_interface.c:526
-msgid ""
-"Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-"cases, though."
-msgstr ""
-
-#: src/sid/xs_interface.c:530
-msgid "SIDPlay 2 (cycle-based)"
-msgstr ""
-
-#: src/sid/xs_interface.c:534
-msgid ""
-"Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
-"emulation."
-msgstr ""
-
-#: src/sid/xs_interface.c:538
-msgid "Emulation library selection:"
-msgstr ""
-
-#: src/sid/xs_interface.c:555
-msgid "Real C64 (SIDPlay 2 only)"
-msgstr ""
-
-#: src/sid/xs_interface.c:562
-msgid "Bank switching"
-msgstr ""
-
-#: src/sid/xs_interface.c:569
-msgid "Transparent ROM"
-msgstr ""
-
-#: src/sid/xs_interface.c:576
-msgid "PlaySID environment"
-msgstr ""
-
-#: src/sid/xs_interface.c:583
-msgid "Memory mode:"
-msgstr ""
-
-#: src/sid/xs_interface.c:588
-msgid "Emu#1"
-msgstr ""
-
-#: src/sid/xs_interface.c:611
-msgid "Optimization mode (faster, inaccurate)"
-msgstr ""
-
-#: src/sid/xs_interface.c:615
-msgid ""
-"This setting can be used to enable libSIDPlay2's \"optimization mode\", "
-"which in downgrades the emulation from cycle-exact to something similar to "
-"frame-exact. The result is lower CPU usage, but worse accuracy."
-msgstr ""
-
-#: src/sid/xs_interface.c:617
-msgid "reSID-emulation"
-msgstr ""
-
-#: src/sid/xs_interface.c:621
-msgid ""
-"reSID is the software SID-chip simulator based on SID reverse-engineering, "
-"created by Dag Lem. It is probably the closest thing to real SID available "
-"as software-only emulation."
-msgstr ""
-
-#: src/sid/xs_interface.c:625
-msgid "HardSID"
-msgstr ""
+msgstr "SDL-i viga"
 
-#: src/sid/xs_interface.c:629
-msgid ""
-"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-"real SID-chip. Software can be used to control the HardSID and combined with "
-"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to "
-"achieve \"near 100%\" similarity to real C64. For more information, see "
-"http://www.hardsid.com/"
-msgstr ""
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Žanr"
 
-#: src/sid/xs_interface.c:633
-msgid "SIDPlay 2 options:"
-msgstr ""
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Teek"
 
-#: src/sid/xs_interface.c:650
-msgid "Fast (nearest neighbour)"
-msgstr ""
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "Loo _esitusnimekiri"
 
-#: src/sid/xs_interface.c:654
-msgid ""
-"Fastest and also worst sounding sampling method, simply picks nearest "
-"neighbouring sample."
-msgstr ""
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Lisa esitusnimekirja"
 
-#: src/sid/xs_interface.c:658
-msgid "Linear interpolation"
-msgstr ""
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Otsing audiokogust"
 
-#: src/sid/xs_interface.c:662
+#: src/search-tool/search-tool.c:645
 msgid ""
-"Uses linear interpolation between samples, yielding higher audio quality "
-"with less sampling noise."
-msgstr ""
-
-#: src/sid/xs_interface.c:673
-msgid "Resampling (FIR)"
-msgstr ""
-
-#: src/sid/xs_interface.c:680
-msgid "reSID sampling options:"
-msgstr ""
-
-#: src/sid/xs_interface.c:685
-msgid "Emu#2"
-msgstr ""
-
-#: src/sid/xs_interface.c:697
-msgid "Emulate filters"
-msgstr ""
-
-#: src/sid/xs_interface.c:701
-msgid ""
-"This option enables emulation of SID filter. The filter is an essential part "
-"of SID's sound capacity, but accurate emulation of it may require quite much "
-"CPU power. However, if filter emulation is disabled, tunes won't sound "
-"authentic at all if they utilize the filter."
-msgstr ""
-
-#: src/sid/xs_interface.c:726
-msgid "FS"
-msgstr ""
-
-#: src/sid/xs_interface.c:743
-msgid "FM"
-msgstr ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "Oma audiokogu importimiseks Audaciousesse vali kataloog ja vajuta värskendamise ikoonile."
 
-#: src/sid/xs_interface.c:760
-msgid "FT"
-msgstr ""
-
-#: src/sid/xs_interface.c:771
-msgid "Reset values"
-msgstr ""
-
-#: src/sid/xs_interface.c:776
-msgid "SIDPlay1"
-msgstr ""
-
-#: src/sid/xs_interface.c:817
-msgid "Export"
-msgstr ""
-
-#: src/sid/xs_interface.c:825
-msgid "Use"
-msgstr ""
-
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
-msgid "Save"
-msgstr ""
-
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
-msgid "Import"
-msgstr ""
-
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
-msgid "Delete"
-msgstr ""
-
-#: src/sid/xs_interface.c:863
-msgid "Filter curve:"
-msgstr ""
-
-#: src/sid/xs_interface.c:868
-msgid "SIDPlay2"
-msgstr ""
-
-#: src/sid/xs_interface.c:874
-msgid "Filters"
-msgstr ""
-
-#: src/sid/xs_interface.c:897
-msgid "Play at least for specified time"
-msgstr ""
-
-#: src/sid/xs_interface.c:901
-msgid ""
-"If enabled, the tune is played at least for the specified time, adding "
-"silence to the end if necessary."
-msgstr ""
-
-#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
-#: src/sid/xs_interface.c:1142
-msgid "Playtime:"
-msgstr ""
-
-#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
-#: src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "sekundit"
-
-#: src/sid/xs_interface.c:928
-msgid "Minimum playtime:"
-msgstr ""
-
-#: src/sid/xs_interface.c:945
-msgid "Play for specified time maximum"
-msgstr ""
-
-#: src/sid/xs_interface.c:949
-msgid ""
-"If enabled, tune is played until specified duration is reached (aka maximum "
-"playtime)."
-msgstr ""
-
-#: src/sid/xs_interface.c:951
-msgid "Only when song length is unknown"
-msgstr ""
-
-#: src/sid/xs_interface.c:955
-msgid ""
-"If enabled, the maximum playtime is applied only if song/tune length is not "
-"known."
-msgstr ""
-
-#: src/sid/xs_interface.c:982
-msgid "Maximum playtime:"
-msgstr ""
-
-#: src/sid/xs_interface.c:999
-msgid "Use XSIDPLAY-compatible database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1003
-msgid ""
-"This option enables using of XSIDPLAY compatible song length database. "
-"(Refer to Audacious-SID documentation for more information)"
-msgstr ""
-
-#: src/sid/xs_interface.c:1010
-msgid "DB-file:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1020
-msgid "Database path and filename"
-msgstr ""
-
-#: src/sid/xs_interface.c:1027
-msgid "Browse for song length-database file"
-msgstr ""
-
-#: src/sid/xs_interface.c:1049
-msgid "Song length database:"
-msgstr ""
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Palun oota..."
 
-#: src/sid/xs_interface.c:1054
-msgid "Songlength"
-msgstr ""
-
-#: src/sid/xs_interface.c:1072
-msgid "Override generic Tuplez format string"
-msgstr ""
-
-#: src/sid/xs_interface.c:1076
-msgid ""
-"By enabling this option you can specify a custom Tuplez formatting string "
-"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
-"below."
-msgstr ""
-
-#: src/sid/xs_interface.c:1087
-msgid "Tuplez format string for SID-files"
-msgstr ""
-
-#: src/sid/xs_interface.c:1090
-msgid ""
-"SID-specific Tuplez fields:\n"
-"\n"
-"sid-format\t\t- Specific fileformat\n"
-"sid-model\t\t- 6581 or 8580\n"
-"sid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n"
-"\n"
-"Other \"special\" fields set:\n"
-"\n"
-"subsong-num, subsong-id"
-msgstr ""
-
-#: src/sid/xs_interface.c:1098
-msgid "Song title format:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1125
-msgid "Add sub-tunes to playlist"
-msgstr ""
-
-#: src/sid/xs_interface.c:1129
-msgid ""
-"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
-"only the default sub-tune will be added."
-msgstr ""
-
-#: src/sid/xs_interface.c:1131
-msgid "Only tunes with specified minimum duration"
-msgstr ""
-
-#: src/sid/xs_interface.c:1135
-msgid "Only add sub-tunes that have a duration of at least specified time."
-msgstr ""
-
-#: src/sid/xs_interface.c:1162
-msgid "Sub-tune handling:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1179
-msgid "Use STIL database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1183
-msgid ""
-"If this option is enabled (and the database & HVSC settings below are "
-"correctly set), Audacious-SID will use and display additional information "
-"from STIL database when HVSC SIDs are played."
-msgstr ""
-
-#: src/sid/xs_interface.c:1190
-msgid "STIL file:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1206
-msgid ""
-"Path and filename of STIL database file (STIL.txt), usually found from "
-"HVSC's DOCUMENTS-subdirectory."
-msgstr ""
-
-#: src/sid/xs_interface.c:1219
-msgid "Browse for STIL-database file"
-msgstr ""
-
-#: src/sid/xs_interface.c:1246
-msgid "HVSC path:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1262
-msgid ""
-"Path to base-directory of your High Voltage SID Collection (HVSC), for "
-"example /media/C64Music/"
-msgstr ""
-
-#: src/sid/xs_interface.c:1275
-msgid "Browse for HVSC path"
-msgstr ""
-
-#: src/sid/xs_interface.c:1297
-msgid "SID Tune Information List (STIL) database:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1321
-msgid "Cancel any changes"
-msgstr ""
-
-#: src/sid/xs_interface.c:1328
-msgid "Accept and update changes"
-msgstr ""
-
-#: src/sid/xs_interface.c:1628
-msgid "Audacious-SID Fileinfo"
-msgstr ""
-
-#: src/sid/xs_interface.c:1649
-msgid "Filename:"
-msgstr "Failinimi:"
-
-#: src/sid/xs_interface.c:1657
-msgid "Songname:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1665
-msgid "Composer:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1673
-msgid "Copyright:"
-msgstr "Autoriõigused:"
-
-#: src/sid/xs_interface.c:1717
-msgid "Song Information:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1752
-msgid "Author:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1786
-msgid "Duration:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1820
-msgid "Sub-tune Information:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1881
-msgid "Select HVSC song length database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1922
-msgid "Select STIL-database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1963
-msgid "Select HVSC location prefix"
-msgstr ""
-
-#: src/sid/xs_interface.c:2004
-msgid "Select SIDPlay2 filters file for importing"
-msgstr ""
-
-#: src/sid/xs_interface.c:2045
-msgid "Select SIDPlay2 filters file for exporting"
-msgstr ""
-
-#: src/sid/xs_interface.c:2093 src/sid/xs_interface.c:2106
-msgid "Confirm selected action"
-msgstr ""
-
-#: src/sid/xs_interface.c:2123
-msgid "Yes"
-msgstr ""
-
-#: src/sid/xs_interface.c:2129
-msgid "No"
-msgstr ""
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Kataloogi valimine"
 
 #: src/skins/plugin.c:167
 msgid "About Skinned GUI"
@@ -2792,48 +2275,43 @@
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
-msgstr ""
+msgstr "Autoriõigused (c) 2008, Tomasz Moń <desowin@gmail.com>\n\n"
 
-#: src/skins/skins_cfg.c:254
-#, fuzzy
+#: src/skins/skins_cfg.c:207
 msgid "_Player:"
-msgstr "Esitamine"
+msgstr "_Esitaja:"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:255
-#, fuzzy
+#: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
-msgstr "Esitusnimekirja valimine"
+msgstr "_Esitusnimekiri:"
 
-#: src/skins/skins_cfg.c:255
-#, fuzzy
+#: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
-msgstr "Esitusnimekirja valimine"
+msgstr "Esitusnimekirja kirjatüübi valimine:"
 
-#: src/skins/skins_cfg.c:259
-#, fuzzy
+#: src/skins/skins_cfg.c:215
 msgid "_Fonts"
-msgstr "Failinimi: "
+msgstr "_Kirjatüübid"
 
-#: src/skins/skins_cfg.c:261
+#: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "Kasutatakse rasterkirja (toetab ainult ASCII kooditabelit)"
 
-#: src/skins/skins_cfg.c:263
+#: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "Loo nime keritakse mõlemas suunas"
 
-#: src/skins/skins_cfg.c:346
-#, fuzzy
+#: src/skins/skins_cfg.c:298
 msgid "_Skin"
-msgstr "Failinimi: "
+msgstr "_Rüü"
 
-#: src/skins/skins_cfg.c:393
+#: src/skins/skins_cfg.c:345
 msgid "Interface Preferences"
-msgstr ""
+msgstr "Liidese eelistused"
 
 #: src/skins/ui_equalizer.c:330
 msgid "Preamp"
@@ -2841,57 +2319,83 @@
 
 #: src/skins/ui_equalizer.c:334
 msgid "31 Hz"
-msgstr ""
+msgstr "31 Hz"
 
 #: src/skins/ui_equalizer.c:335
 msgid "63 Hz"
-msgstr ""
+msgstr "63 Hz"
 
 #: src/skins/ui_equalizer.c:335
 msgid "125 Hz"
-msgstr ""
+msgstr "125 Hz"
 
 #: src/skins/ui_equalizer.c:335
-#, fuzzy
 msgid "250 Hz"
-msgstr "22050 Hz "
+msgstr "250 Hz"
 
 #: src/skins/ui_equalizer.c:335
-#, fuzzy
 msgid "500 Hz"
-msgstr "11000 Hz"
+msgstr "500 Hz"
 
 #: src/skins/ui_equalizer.c:335
-#, fuzzy
 msgid "1 kHz"
-msgstr "11 kHz"
+msgstr "1 kHz"
 
 #: src/skins/ui_equalizer.c:336
-#, fuzzy
 msgid "2 kHz"
-msgstr "22 kHz"
+msgstr "2 kHz"
 
 #: src/skins/ui_equalizer.c:336
-#, fuzzy
 msgid "4 kHz"
-msgstr "44 kHz"
+msgstr "4 kHz"
 
 #: src/skins/ui_equalizer.c:336
-#, fuzzy
 msgid "8 kHz"
-msgstr "44 kHz"
+msgstr "8 kHz"
 
 #: src/skins/ui_equalizer.c:336
-#, fuzzy
 msgid "16 kHz"
-msgstr "44 kHz"
+msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:378
+#: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
-msgstr ""
+msgstr "Audaciouse ekvalaiser"
 
-#: src/skins/ui_equalizer.c:884
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
+msgstr "Valmisseadistused"
+
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Valmisseadistuste laadimine"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Valmisseadistuste salvestamine"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Ekvalaiseri valmisseadistuse salvestamine"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Valmisseadistuse kustutamine"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
 msgstr ""
 
 #: src/skins/ui_main.c:444
@@ -2899,14 +2403,12 @@
 msgstr ""
 
 #: src/skins/ui_main.c:452
-#, fuzzy
 msgid "kHz"
-msgstr "Hz"
+msgstr "kHz"
 
 #: src/skins/ui_main.c:459
-#, fuzzy
 msgid "surround"
-msgstr "Surround-kaja"
+msgstr ""
 
 #: src/skins/ui_main.c:807
 #, c-format
@@ -2914,9 +2416,9 @@
 msgstr ""
 
 #: src/skins/ui_main.c:828
-#, fuzzy, c-format
+#, c-format
 msgid "Volume: %d%%"
-msgstr "Valjus: (%)"
+msgstr "Valjus: %d%%"
 
 #: src/skins/ui_main.c:851
 #, c-format
@@ -2933,9 +2435,8 @@
 msgstr ""
 
 #: src/skins/ui_main.c:981
-#, fuzzy
 msgid "Options Menu"
-msgstr "Valikud"
+msgstr "Valikute menüü"
 
 #: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
@@ -2946,95 +2447,92 @@
 msgstr ""
 
 #: src/skins/ui_main.c:990
-#, fuzzy
 msgid "File Info Box"
-msgstr "Faili andmed"
+msgstr ""
 
 #: src/skins/ui_main.c:995
 msgid "Visualization Menu"
-msgstr ""
+msgstr "Visualiseerimismenüü"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
-msgstr ""
+msgstr "Ühe loo režiim."
 
-#: src/skins/ui_main.c:1647
-#, fuzzy
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
-msgstr "Esitusnimekirja valimine"
+msgstr "Esitusnimekirja režiim."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
-msgstr ""
+msgstr "Seiskamine pärast loo lõppu."
 
-#: src/skins/ui_main.c:1671
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
-msgstr ""
+msgstr "Jätkamine pärast loo lõppu."
 
 #: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
-msgstr ""
+msgstr "Loo nime automaatkerimine"
 
 #: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
 msgid "Stop after Current Song"
-msgstr ""
+msgstr "Seiskamine pärast loo lõppu"
 
 #: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
-msgstr ""
+msgstr "Tipud"
 
 #: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
 msgid "Repeat"
-msgstr ""
+msgstr "Korduv"
 
 #: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
 msgid "Shuffle"
-msgstr ""
+msgstr "Segatud"
 
 #: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
 msgid "No Playlist Advance"
-msgstr ""
+msgstr "Esitusnimekirja ei kasutata"
 
 #: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
-msgstr ""
+msgstr "Näita esitaja akent"
 
 #: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
-msgstr ""
+msgstr "Näita esitusnimekirja redaktorit"
 
 #: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
-msgstr ""
+msgstr "Näita ekvalaiserit"
 
 #: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
-msgstr ""
+msgstr "Alati pealmine"
 
 #: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
-msgstr ""
+msgstr "Näidatakse kõigil tööaladel"
 
 #: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
-msgstr ""
+msgstr "Keri esitaja aken kokku"
 
 #: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
-msgstr ""
+msgstr "Keri esitusnimekirja redaktor kokku"
 
 #: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
-msgstr ""
+msgstr "Keri ekvalaiser kokku"
 
 #: src/skins/ui_manager.c:115
 msgid "Analyzer"
-msgstr ""
+msgstr "Analüsaator"
 
 #: src/skins/ui_manager.c:116
-#, fuzzy
 msgid "Scope"
-msgstr "Stereo"
+msgstr "Skoop"
 
 #: src/skins/ui_manager.c:117
 msgid "Voiceprint"
@@ -3042,111 +2540,104 @@
 
 #: src/skins/ui_manager.c:118
 msgid "Off"
-msgstr ""
+msgstr "Väljas"
 
 #: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 #: src/skins/ui_manager.c:145
-#, fuzzy
 msgid "Normal"
-msgstr "Vorming"
+msgstr "Tavaline"
 
 #: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
-msgstr ""
+msgstr "Tuli"
 
 #: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
-msgstr ""
+msgstr "Püstjoontega"
 
 #: src/skins/ui_manager.c:128
-#, fuzzy
 msgid "Lines"
-msgstr "minutit"
+msgstr "Jooned"
 
 #: src/skins/ui_manager.c:129
 msgid "Bars"
-msgstr ""
+msgstr "Tulbad"
 
 #: src/skins/ui_manager.c:133
-#, fuzzy
 msgid "Dot Scope"
-msgstr "Ei korrata"
+msgstr "Punktidega"
 
 #: src/skins/ui_manager.c:134
 msgid "Line Scope"
-msgstr ""
+msgstr "Joonega"
 
 #: src/skins/ui_manager.c:135
 msgid "Solid Scope"
-msgstr ""
+msgstr "Ühtlane"
 
 #: src/skins/ui_manager.c:141
 msgid "Ice"
-msgstr ""
+msgstr "Jää"
 
 #: src/skins/ui_manager.c:146
 msgid "Smooth"
-msgstr ""
+msgstr "Pehme"
 
 #: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
-msgstr ""
+msgstr "Väga aeglane"
 
 #: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
-#, fuzzy
 msgid "Slow"
-msgstr "Vari"
+msgstr "Aeglane"
 
 #: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Medium"
-msgstr ""
+msgstr "Keskmine"
 
 #: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
-#, fuzzy
 msgid "Fast"
-msgstr "Vorming"
+msgstr "Kiire"
 
 #: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
-msgstr ""
+msgstr "Väga kiire"
 
 #: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
-msgstr ""
+msgstr "Kulunud aeg"
 
 #: src/skins/ui_manager.c:167
 msgid "Time Remaining"
-msgstr ""
+msgstr "Järelejäänud aeg"
 
 #: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-#, fuzzy
 msgid "Pause"
-msgstr "Pausimine"
+msgstr "Pausi"
 
 #: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
 msgid "Previous"
-msgstr ""
+msgstr "Eelmine"
 
 #: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-#, fuzzy
 msgid "Next"
-msgstr "Tekst"
+msgstr "Järgmine"
 
 #: src/skins/ui_manager.c:196
 msgid "Visualization"
-msgstr ""
+msgstr "Visualiseerimine"
 
 #: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
-msgstr ""
+msgstr "Visualiseerimisrežiim"
 
 #: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
-msgstr ""
+msgstr "Analüsaatori režiim"
 
 #: src/skins/ui_manager.c:199
 msgid "Scope Mode"
-msgstr ""
+msgstr "Skoobi režiim"
 
 #: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
@@ -3158,644 +2649,560 @@
 
 #: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
-msgstr ""
+msgstr "Analüsaatori tagasikukkumine"
 
 #: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
-msgstr ""
+msgstr "Tippude tagasikukkumine"
 
 #: src/skins/ui_manager.c:208
-#, fuzzy
 msgid "Playlist"
-msgstr "Esitusnimekirja valimine"
+msgstr "Esitusnimekiri"
 
 #: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
-#, fuzzy
 msgid "New Playlist"
-msgstr "Esitusnimekirja valimine"
+msgstr "Uus esitusnimekiri"
 
 #: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
-#, fuzzy
 msgid "Select Next Playlist"
-msgstr "Esitusnimekirja valimine"
+msgstr "Vali järgmine esitusnimekiri"
 
 #: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
-#, fuzzy
 msgid "Select Previous Playlist"
-msgstr "Esitusnimekirja valimine"
+msgstr "Vali eelmine esitusnimekiri"
 
 #: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
-#, fuzzy
 msgid "Delete Playlist"
-msgstr "Esitusnimekirja valimine"
+msgstr "Kustuta esitusnimekiri"
 
 #: src/skins/ui_manager.c:222
-#, fuzzy
 msgid "Import Playlist"
-msgstr "Esitusnimekirja andmed kiiresti"
+msgstr "Impordi esitusnimekiri"
 
 #: src/skins/ui_manager.c:223
 msgid "Loads a playlist file into the selected playlist."
-msgstr ""
+msgstr "Esitusnimekirja faili laadimine valitud esitusnimekirja."
 
 #: src/skins/ui_manager.c:226
-#, fuzzy
 msgid "Export Playlist"
-msgstr "Esitusnimekirja andmed kiiresti"
+msgstr "Ekspordi esitusnimekiri"
 
 #: src/skins/ui_manager.c:227
-#, fuzzy
 msgid "Saves the selected playlist."
-msgstr "Esitusnimekirja valimine"
+msgstr "Valitud esitusnimekirja salvestamine."
 
 #: 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 ""
+msgstr "Värskenda nimekirja"
 
-#: src/skins/ui_manager.c:235
+#: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
-msgstr ""
+msgstr "Esitusnimekirjas valitud kirjega seotud metaandmete värskendamine."
 
-#: src/skins/ui_manager.c:238
-msgid "List Manager"
-msgstr ""
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "Esitusnimekirjade haldus"
 
-#: src/skins/ui_manager.c:239
-msgid "Opens the playlist manager."
-msgstr ""
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Järjekorra haldus"
 
-#: src/skins/ui_manager.c:243
+#: src/skins/ui_manager.c:237
 msgid "View"
-msgstr ""
+msgstr "Vaade"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:238
 msgid "Interface"
-msgstr ""
+msgstr "Liides"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
-msgstr ""
+msgstr "Liidese eelistused..."
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
-msgstr ""
+msgstr "Lisa internetiaadress..."
 
-#: src/skins/ui_manager.c:250
+#: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
-msgstr ""
+msgstr "Võrgus asuva loo lisamine esitusnimekirja."
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:247
 msgid "Add Files..."
-msgstr ""
+msgstr "Lisa faile..."
 
-#: src/skins/ui_manager.c:254
+#: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
-msgstr ""
+msgstr "Failide lisamine esitusnimekirja"
 
-#: src/skins/ui_manager.c:259
+#: src/skins/ui_manager.c:253
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/ui_manager.c:260
+#: src/skins/ui_manager.c:254
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:263
-#, fuzzy
+#: src/skins/ui_manager.c:257
 msgid "Invert Selection"
-msgstr "Vormingute valimine"
+msgstr ""
 
-#: src/skins/ui_manager.c:264
+#: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:267
-#, fuzzy
+#: src/skins/ui_manager.c:261
 msgid "Select All"
-msgstr "Esitusnimekirja valimine"
+msgstr "Vali kõik"
 
-#: src/skins/ui_manager.c:268
+#: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
-msgstr ""
+msgstr "Kõigi esitusnimekirja kirjete valimine."
 
-#: src/skins/ui_manager.c:271
-#, fuzzy
+#: src/skins/ui_manager.c:265
 msgid "Select None"
-msgstr "Loo lõpp tuvastatakse"
+msgstr ""
 
-#: src/skins/ui_manager.c:272
+#: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
-msgstr ""
+msgstr "Kõigi esitusnimekirja kirjete kustutamine."
 
-#: src/skins/ui_manager.c:277
-#, fuzzy
+#: src/skins/ui_manager.c:271
 msgid "Remove All"
-msgstr "Eemalda"
+msgstr "Eemalda kõik"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
-msgstr ""
+msgstr "Esitusnimekirjast kõikide kirjete eemaldamine"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:275
 msgid "Clear Queue"
 msgstr ""
 
-#: src/skins/ui_manager.c:282
+#: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
-msgstr ""
+msgstr "Eemalda kättesaamatud failid"
 
-#: src/skins/ui_manager.c:286
+#: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
-msgstr ""
+msgstr "Kättesaamatute failide eemaldamine esitusnimekirjast."
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
-msgstr ""
+msgstr "Eemalda korduvad kirjed"
 
-#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
-#: src/skins/ui_manager.c:353
-#, fuzzy
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
 msgid "By Title"
-msgstr "Pealkiri"
+msgstr "Pealkirja järgi"
 
-#: src/skins/ui_manager.c:292
+#: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
-msgstr ""
+msgstr "Esitusnimekirjast korduvate kirjete eemaldamine pealkirja järgi."
 
-#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
-#: src/skins/ui_manager.c:365
-#, fuzzy
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
 msgid "By Filename"
-msgstr "Failinimi"
+msgstr "Failinime järgi"
 
-#: src/skins/ui_manager.c:296
+#: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr ""
+msgstr "Esitusnimekirjast korduvate kirjete eemaldamine failinime järgi."
 
-#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
-#: src/skins/ui_manager.c:369
-#, fuzzy
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
-msgstr "Failinimi"
+msgstr "Raja ja failinime järgi"
 
-#: src/skins/ui_manager.c:300
+#: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr ""
+msgstr "Esitusnimekirjast korduvate kirjete eemaldamine faili täisraja järgi."
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
-msgstr ""
+msgstr "Eemalda valimata kirjed"
 
-#: src/skins/ui_manager.c:304
+#: src/skins/ui_manager.c:298
 msgid "Remove unselected entries from the playlist."
-msgstr ""
+msgstr "Valimata kirjete eemaldamine esitusnimekirjast."
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:301
 msgid "Remove Selected"
-msgstr ""
+msgstr "Eemalda valik"
 
-#: src/skins/ui_manager.c:308
+#: src/skins/ui_manager.c:302
 msgid "Remove selected entries from the playlist."
-msgstr ""
+msgstr "Valitud kirjete eemaldamine esitusnimekirjast"
 
-#: src/skins/ui_manager.c:313
+#: src/skins/ui_manager.c:307
 msgid "Randomize List"
-msgstr ""
+msgstr "Sega nimekiri"
 
-#: src/skins/ui_manager.c:314
-#, fuzzy
+#: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
-msgstr "Esitusnimekirja valimine"
+msgstr "Nimekirja segiajamine"
 
-#: src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:311
 msgid "Reverse List"
-msgstr ""
+msgstr "Pööra järjestus ümber"
 
-#: src/skins/ui_manager.c:318
+#: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
-msgstr ""
+msgstr "Esitusnimekirja järjekorra ümberpööramine"
 
-#: src/skins/ui_manager.c:321
-#, fuzzy
+#: src/skins/ui_manager.c:315
 msgid "Sort List"
-msgstr "Esitaja:"
+msgstr "Nimekirja sortimine"
 
-#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
-msgstr ""
+msgstr "Nimekirja sortimine pealkirja järgi."
 
-#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
-#, fuzzy
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
-msgstr "Album:"
+msgstr "Albumi järgi"
 
-#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
-msgstr ""
+msgstr "Nimekirja sortimine albumi järgi."
 
-#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
-#, fuzzy
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
-msgstr "Esitaja:"
+msgstr "Esitaja järgi"
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
-msgstr ""
+msgstr "Nimekirja sortimine esitaja järgi."
 
-#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
-msgstr ""
+msgstr "Nimekirja sortimine failinime järgi."
 
-#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
-msgstr ""
+msgstr "Nimekirja sortimine täisraja järgi."
 
-#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
-#, fuzzy
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
-msgstr "Kuupäev:"
+msgstr "Kuupäeva järgi"
 
-#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
-msgstr ""
+msgstr "Nimekirja sortimine muutmise aja järgi."
 
-#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
-#, fuzzy
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
-msgstr "Loo number:"
+msgstr "Loo numbri järgi"
 
-#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
-msgstr ""
+msgstr "Nimekirja sortimine loo numbri järgi."
 
-#: src/skins/ui_manager.c:351
-#, fuzzy
+#: src/skins/ui_manager.c:345
 msgid "Sort Selected"
-msgstr "Vormingute valimine"
+msgstr "Valiku sortimine"
 
-#: src/skins/ui_manager.c:387
-#, fuzzy
+#: src/skins/ui_manager.c:381
 msgid "File"
-msgstr "Failinimi"
-
-#: src/skins/ui_manager.c:388
-msgid "Help"
-msgstr "Abi"
+msgstr "Fail"
 
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:384
 msgid "Plugin Services"
-msgstr ""
+msgstr "Pluginate teenused"
 
-#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
-msgstr ""
+msgstr "Vaata loo andmeid"
 
-#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
 msgstr ""
 
-#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
-#, fuzzy
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
-msgstr "Audacious'e LIRC pluginast lähemalt"
+msgstr "Audaciousest lähemalt"
 
-#: src/skins/ui_manager.c:401
-#, fuzzy
+#: src/skins/ui_manager.c:395
 msgid "Play File"
-msgstr "Esitamine"
+msgstr "Esita faili"
 
-#: src/skins/ui_manager.c:402
+#: src/skins/ui_manager.c:396
 msgid "Load and play a file"
-msgstr ""
+msgstr "Faili laadimine ja esitamine"
 
-#: src/skins/ui_manager.c:404
-#, fuzzy
+#: src/skins/ui_manager.c:398
 msgid "Play Location"
-msgstr "Esitusnimekiri (valikuline)"
+msgstr "Esita asukohalt"
 
-#: src/skins/ui_manager.c:405
+#: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
-msgstr ""
+msgstr "Meedia esitamine määratud asukohast"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:401
 msgid "Plugin services"
-msgstr ""
+msgstr "Pluginate teenused"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:403
 msgid "Preferences"
-msgstr ""
+msgstr "Eelistused"
 
-#: src/skins/ui_manager.c:410
+#: src/skins/ui_manager.c:404
 msgid "Open preferences window"
 msgstr ""
 
-#: src/skins/ui_manager.c:413
-#, fuzzy
+#: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
-msgstr "%s - Audacious"
+msgstr "Audaciouse töö lõpetamine"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
 msgstr ""
 
-#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
 msgstr ""
 
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
-msgid "Jump to Playlist Start"
-msgstr ""
-
-#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
-msgstr ""
+msgstr "Hüppa ajahetkele"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
 msgstr ""
 
-#: src/skins/ui_manager.c:431
+#: src/skins/ui_manager.c:422
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr ""
 
-#: src/skins/ui_manager.c:434
+#: src/skins/ui_manager.c:425
 msgid "Copy"
-msgstr ""
+msgstr "Kopeeri"
 
-#: src/skins/ui_manager.c:436
-#, fuzzy
+#: src/skins/ui_manager.c:427
 msgid "Cut"
-msgstr "Praegune"
+msgstr "Lõika"
 
-#: src/skins/ui_manager.c:438
+#: src/skins/ui_manager.c:429
 msgid "Paste"
-msgstr ""
+msgstr "Aseta"
 
-#: src/skins/ui_manager.c:445
+#: src/skins/ui_manager.c:436
 msgid "Load"
+msgstr "Laadi"
+
+#: src/skins/ui_manager.c:437
+msgid "Import"
 msgstr ""
 
-#: 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:438
+msgid "Save"
+msgstr "Salvesta"
 
-#: src/skins/ui_manager.c:451
-msgid "Load preset"
+#: src/skins/ui_manager.c:439
+msgid "Delete"
+msgstr "Kustuta"
+
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
+msgid "Preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
-#: src/skins/ui_manager.c:489
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:457
-#, fuzzy
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
-msgstr "Laadi vaikeväärtused"
+msgstr ""
 
-#: src/skins/ui_manager.c:459
-#, fuzzy
+#: src/skins/ui_manager.c:450
 msgid "Zero"
-msgstr "Stereo"
+msgstr ""
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:453
 msgid "From file"
-msgstr ""
+msgstr "Failist"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
-msgstr ""
+msgstr "Valmisseadistuste laadimine failist"
 
-#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
-msgstr ""
+msgstr "WinAMPi EQF-failist"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
-msgstr ""
+msgstr "Valmisseadistuste laadimine WinAMPi EQF-failist"
 
-#: src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
-msgstr ""
+msgstr "WinAMPi valmisseadistused"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
-msgstr ""
+msgstr "WinAMPi valmisseadistuste importimine"
 
-#: src/skins/ui_manager.c:472
-msgid "Save preset"
-msgstr ""
-
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:466
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:478
-#, fuzzy
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
-msgstr "Laadi vaikeväärtused"
+msgstr "Vaikimisi valmisseadistuste salvestamine"
 
-#: src/skins/ui_manager.c:480
-#, fuzzy
+#: src/skins/ui_manager.c:471
 msgid "To file"
-msgstr "Pealkiri"
+msgstr "Faili"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
-msgstr ""
+msgstr "Valmisseadistuste salvestamine faili"
 
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
-msgstr ""
+msgstr "WinAMPi EQF-faili"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
-msgstr ""
-
-#: src/skins/ui_manager.c:487
-msgid "Delete preset"
-msgstr ""
+msgstr "Valmisseadistuste salvestamine WinAMPi EQF-faili"
 
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:481
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
-msgstr ""
+msgstr "Otsi aktiivsest esitusnimekirjast"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular "
-"expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular"
+" expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr ""
+msgstr "Esitusnimekirjast ühe või enama välja järgi otsimine. Otsinguväljadel kasutatakse tõstutundetut regulaaravaldise süntaksit. Kui sa pole regulaaravaldistega tuttav, siis sisesta lihtsalt otsitav sõnaosa."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "Pealkiri: "
 
-#: src/skins/ui_playlist.c:267
-#, fuzzy
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
-msgstr "Album:"
+msgstr "Album: "
 
-#: src/skins/ui_playlist.c:274
-#, fuzzy
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
-msgstr "Esitaja:"
+msgstr "Esitaja: "
 
-#: src/skins/ui_playlist.c:281
-#, fuzzy
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
-msgstr "Failinimi:"
+msgstr "Failinimi: "
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:762
-#, fuzzy
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
-msgstr "Esitusnimekirja andmed kiiresti"
+msgstr "Audaciouse esitusnimekirja redaktor"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
-msgstr ""
+msgstr "%s (%d/%d-st)"
 
 #: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
-msgstr ""
+msgstr "Arhiveeritud Winamp 2.x rüü"
 
 #: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
-msgstr ""
+msgstr "Arhiveerimata Winamp 2.x rüü"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
-msgstr ""
+msgstr "Kataloogi (%s) pole võimalik luua: %s\n"
 
-#: src/sndfile/plugin.c:438
-#, fuzzy
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
-msgstr "ESounD'i pluginast lähemalt"
-
-#: src/sndfile/plugin.c:439
-msgid ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-msgstr ""
+msgstr "Sndfile pluginast lähemalt"
 
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
-msgstr ""
+msgstr "SndStretch pluginast lähemalt"
 
-#: src/sndstretch/sndstretch_xmms.c:313
+#: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
-msgstr ""
+msgstr "Valjuse korrektsioon"
 
-#: src/sndstretch/sndstretch_xmms.c:314
+#: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:360
+#: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
 msgstr "Kiirus"
 
-#: src/sndstretch/sndstretch_xmms.c:361
+#: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
-msgstr ""
+msgstr "Kõrgus"
 
-#: src/sndstretch/sndstretch_xmms.c:362
+#: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:363
-msgid "Options"
-msgstr "Valikud"
-
-#: src/sndstretch/sndstretch_xmms.c:382
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
-msgstr ""
+msgstr "SndStretch - sätted"
 
-#: src/song_change/song_change.c:464
+#: src/song_change/song_change.c:437
 msgid "Command to run when Audacious starts a new song."
-msgstr ""
+msgstr "Uue loo alustamisel käivitatav käsk:"
 
-#: src/song_change/song_change.c:465 src/song_change/song_change.c:469
-#: src/song_change/song_change.c:473 src/song_change/song_change.c:477
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
-msgstr ""
+msgstr "Käsk:"
 
-#: src/song_change/song_change.c:468
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
-msgstr ""
+msgstr "Loo lõppemisel käivitatav käsk:"
 
-#: src/song_change/song_change.c:472
+#: src/song_change/song_change.c:449
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr ""
+msgstr "Esitusnimekirja lõppu jõudmisel käivitatav käsk:"
 
-#: src/song_change/song_change.c:476
+#: src/song_change/song_change.c:455
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr ""
+msgstr "Loo pealkirja muutumisel käivitatav käsk (näiteks võrguraadio pealkirja muutumisel)."
 
-#: src/song_change/song_change.c:480
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3814,26 +3221,25 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:507
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:518
+#: src/song_change/song_change.c:499
 msgid "Commands"
-msgstr ""
+msgstr "Käsud"
 
-#: src/song_change/song_change.c:555
-#, fuzzy
+#: src/song_change/song_change.c:529
 msgid "Song Change"
-msgstr "Loo sõnum"
+msgstr "Loovahetus"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr "Olekuikooni pluginast lähemalt"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3842,69 +3248,72 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager.\n"
-msgstr ""
+msgstr "Olekuikooni plugin\n\nAutoriõigused 2005-2007 Giacomo Lozito <james@develia.org>\nAutoriõigused 2010 Michał Lipski <tallica@o2.pl>\n\nSee plugin loob Audaciouse ikooni ja paigutab\nselle aknahalduri süsteemisalve. \n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr "Olekuikooni plugina eelistused"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr "Paremklõpsu menüü"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
 msgstr "Väike esitusmenüü nr. 1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
 msgstr "Väike esitusmenüü nr. 2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr "Hiire kerimisel"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "Muudetakse valjust"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
 msgstr "Vahetatakse esitatavat lugu"
 
-#: src/statusicon/statusicon.c:500
-#, fuzzy
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
-msgstr "Mikseri sätted"
+msgstr "Muud sätted"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
-msgstr ""
+msgstr "Hüpikaken on keelatud"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
+msgstr "Sulgemisel jäetakse teavitusalale (süsteemisalve)"
+
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:41
+#: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
-msgstr ""
+msgstr "Täiendava stereo plugin\n\nAutor: Johan Levin, 1999."
 
-#: src/stereo_plugin/stereo.c:65
+#: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
 msgstr "Ekstra stereo pluginast lähemalt"
 
-#: src/stereo_plugin/stereo.c:102
+#: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
-msgstr ""
+msgstr "Täiendava stereo seadistamine"
 
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr "Toonigeneraatorist lähemalt"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3913,43 +3322,24 @@
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
-msgstr ""
+msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
-msgstr ""
+msgstr "Toonigeneraator: "
 
 #: src/unix-io/gtk.c:34
-#, fuzzy
 msgid "About File I/O Plugin"
-msgstr "ESounD'i pluginast lähemalt"
+msgstr "Faili sisend-/väljundpluginast lähemalt"
 
-#: src/vorbis/configure.c:31
-msgid "Override generic titles"
-msgstr "Kasutatakse oma pealkirjavormingut"
-
-#: src/vorbis/configure.c:32
-msgid "Title format:"
-msgstr "Pealkirja vorming:"
-
-#: src/vorbis/configure.c:36
-#, fuzzy
-msgid "Ogg Vorbis Tags"
-msgstr "Ogg Vorbis sildid:"
-
-#: src/vorbis/configure.c:69
-msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr "Ogg Vorbis audioplugina sätted"
-
-#: src/vorbis/vorbis.c:581
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Ogg Vorbis audiopluginast lähemalt"
 
-#: src/vorbis/vorbis.c:586
-#, fuzzy
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -3966,21 +3356,7 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>\n"
 "\n"
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
-msgstr ""
-"Ogg Vorbis plugin (Xiph.org)\n"
-"\n"
-"Algupärase koodi autorid:\n"
-"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-"Contributions from\n"
-"Chris Montgomery <monty@xiph.org>\n"
-"Peter Alm <peter@xmms.org>\n"
-"Michael Smith <msmith@labyrinth.edu.au>\n"
-"Jack Moffitt <jack@icecast.org>\n"
-"Jorn Baayen <jorn@nl.linux.org>\n"
-"Haavard Kvaalen <havardk@xmms.org>\n"
-"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-"\n"
-"Külasta ka Xiph.org kodulehte at http://www.xiph.org/\n"
+msgstr "Ogg Vorbis plugin Xiph.org Foundationilt\n\nAlgnse koodi autor:\nTony Arcieri <bascule@inferno.tusculum.edu>\nAbistajad:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHaavard Kvaalen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\nKülasta Xiph.org Foundationi asukohas http://www.xiph.org/\n"
 
 #: src/vtx/about.c:14
 msgid "About Vortex Player"
@@ -3989,8 +3365,7 @@
 #: src/vtx/about.c:15
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
-"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor."
-"ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "\n"
 "Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
 "and other AY/YM music sites.\n"
@@ -4009,1202 +3384,4 @@
 "\n"
 "Some of the plugin code was by Miles Egan\n"
 "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"
-#~ "recommended:2;\n"
-#~ "default:5;"
-#~ msgstr ""
-#~ "parim/aeglaseim:0;\n"
-#~ "halvim/kiireim:9;\n"
-#~ "soovitatav:2;\n"
-#~ "vaikimisi:5;"
-
-#~ msgid "Variable bitrate"
-#~ msgstr "Muutuv bitikiirus"
-
-#~ msgid "Average bitrate"
-#~ msgstr "Keskmine bitikiirus"
-
-#, fuzzy
-#~ msgid "Show playlists"
-#~ msgstr "Esitusnimekirja valimine"
-
-#, fuzzy
-#~ msgid "Show/hide playlists"
-#~ msgstr "Esitusnimekirja valimine"
-
-#~ msgid "Buffer size (ms):"
-#~ msgstr "Puhvri suurus (ms):"
-
-#, fuzzy
-#~ msgid "Target volume:"
-#~ msgstr "Muudetakse valjust"
-
-#, fuzzy
-#~ msgid "Effect strength:"
-#~ msgstr "Efektid"
-
-#~ msgid "FLAC Audio Plugin "
-#~ msgstr "FLAC audioplugin "
-
-#~ msgid "Audacious standard menu"
-#~ msgstr "Audacious'e standardmenüü"
-
-#~ msgid "Surround echo"
-#~ msgstr "Surround-kaja"
-
-#~ msgid "About ESounD Plugin"
-#~ msgstr "ESounD'i pluginast lähemalt"
-
-#~ msgid ""
-#~ "Audacious ESounD Plugin\n"
-#~ "\n"
-#~ " This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Audacious'e ESounD plugin\n"
-#~ "\n"
-#~ " See programm on vaba tarkvara. Te võite seda edasi levitada ja/või\n"
-#~ "muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need\n"
-#~ "on Vaba Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number\n"
-#~ "2 või (vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
-#~ "\n"
-#~ "Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA\n"
-#~ "IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA\n"
-#~ "või SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata\n"
-#~ "GNU Üldist Avalikku Litsentsi.\n"
-#~ "\n"
-#~ "Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos käesoleva\n"
-#~ "programmiga; kui ei, siis võtke ühendust Free Software Foundation'iga,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#~ msgid "ESD Output Plugin configuration"
-#~ msgstr "ESD väljundplugina sätted"
-
-#~ msgid "Host:"
-#~ msgstr "Host:"
-
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
-#~ msgid "Server"
-#~ msgstr "Server"
-
-#, fuzzy
-#~ msgid "About RoarAudio Plugin"
-#~ msgstr "FLAC audiopluginast lähemalt"
-
-#, fuzzy
-#~ msgid "RoarAudio Audacious Plugin..."
-#~ msgstr "Audacious'e LIRC pluginast lähemalt"
-
-#, fuzzy
-#~ msgid "RoarAudio Plugin - Configuration"
-#~ msgstr "Audioplaatide plugina sätted"
-
-#, fuzzy
-#~ msgid "Server Type:"
-#~ msgstr "Server: "
-
-#, fuzzy
-#~ msgid "Host:"
-#~ msgstr "Failinimi: "
-
-#, fuzzy
-#~ msgid "Proxy Address"
-#~ msgstr "Seadme aadress"
-
-#, fuzzy
-#~ msgid "Proxy"
-#~ msgstr "Gerpok"
-
-#, fuzzy
-#~ msgid "Player Name:"
-#~ msgstr "Esitamine"
-
-#, fuzzy
-#~ msgid "Player"
-#~ msgstr "Nimi:"
-
-#, fuzzy
-#~ msgid "Current Song"
-#~ msgstr "Failinimi: "
-
-#, fuzzy
-#~ msgid "ALSA Gapless Output Plugin Preferences"
-#~ msgstr "Olekuikooni plugina eelistused"
-
-#~ msgid "Buffer settings"
-#~ msgstr "Puhvri sätted"
-
-#~ msgid "About AudioCompress"
-#~ msgstr "AudioCompress pluginast lähemalt"
-
-#~ msgid " History "
-#~ msgstr " Ajalugu "
-
-#~ msgid "Load default values"
-#~ msgstr "Laadi vaikeväärtused"
-
-#~ msgid "Limit read speed to: "
-#~ msgstr "Lugemiskiiruse piirang:"
-
-#, fuzzy
-#~ msgid "End of playlist"
-#~ msgstr "Esitusnimekirja andmed kiiresti"
-
-#, fuzzy
-#~ msgid "Advanced crossfade"
-#~ msgstr "Laiendatud sätted"
-
-#, fuzzy
-#~ msgid "Fadein"
-#~ msgstr "Sujuv näitamine:"
-
-#, fuzzy
-#~ msgid "Fadeout"
-#~ msgstr "Sujuv peitmine:"
-
-#, fuzzy
-#~ msgid "Fadeout/Fadein"
-#~ msgstr "Sujuv peitmine:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audacious Crossfade Plugin\n"
-#~ "\n"
-#~ "Copyright © 2009 William Pitcock <nenolod@atheme.org>\n"
-#~ "\n"
-#~ "...based in part on XMMS-Crossfade:\n"
-#~ "Copyright © 2000-2009 Peter Eisenlohr <peter@eisenlohr.org>\n"
-#~ "\n"
-#~ "based on the original OSS Output Plugin Copyright (C) 1998-2000\n"
-#~ "Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front "
-#~ "Technologies\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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "FailiKirjutaja plugin\n"
-#~ "\n"
-#~ " See programm on vaba tarkvara. Te võite seda edasi levitada ja/või\n"
-#~ "muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need\n"
-#~ "on Vaba Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number\n"
-#~ "2 või (vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
-#~ "\n"
-#~ "Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA\n"
-#~ "IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA\n"
-#~ "või SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata\n"
-#~ "GNU Üldist Avalikku Litsentsi.\n"
-#~ "\n"
-#~ "Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos käesoleva\n"
-#~ "programmiga; kui ei, siis võtke ühendust Free Software Foundation'iga,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#, fuzzy
-#~ msgid "About"
-#~ msgstr "\"%s\" pluginast lähemalt"
-
-#, fuzzy
-#~ msgid "Throttle Output"
-#~ msgstr "aRts väljundist lähemalt"
-
-#, fuzzy
-#~ msgid "Mixing buffer size (ms):"
-#~ msgstr "Puhvri suurus (ms):"
-
-#, fuzzy
-#~ msgid "Reopen"
-#~ msgstr "Eemalda"
-
-#, fuzzy
-#~ msgid "Length (ms):"
-#~ msgstr "Kestus (msek):"
-
-#, fuzzy
-#~ msgid "Start volume (%):"
-#~ msgstr "Valjus: (%)"
-
-#, fuzzy
-#~ msgid "Fade in"
-#~ msgstr "Sujuv näitamine:"
-
-#, fuzzy
-#~ msgid "Simple XF"
-#~ msgstr "Sämplid"
-
-#, fuzzy
-#~ msgid "End volume (%):"
-#~ msgstr "Valjus: (%)"
-
-#, fuzzy
-#~ msgid "Fade out"
-#~ msgstr "Sujuv peitmine:"
-
-#, fuzzy
-#~ msgid "Custom (ms):"
-#~ msgstr "Puhverdamise aeg (ms):"
-
-#, fuzzy
-#~ msgid "Offset"
-#~ msgstr "Efektid"
-
-#, fuzzy
-#~ msgid " Enable"
-#~ msgstr "Lubatud"
-
-#, fuzzy
-#~ msgid "Advanced XF"
-#~ msgstr "Laiendatud sätted"
-
-#, fuzzy
-#~ msgid "Additional silence"
-#~ msgstr "Täiendav käsk"
-
-#, fuzzy
-#~ msgid "Fade out (ms):"
-#~ msgstr "Sujuv peitmine:"
-
-#, fuzzy
-#~ msgid "Fade in (ms):"
-#~ msgstr "Sujuv näitamine:"
-
-#, fuzzy
-#~ msgid "Max. length (ms):"
-#~ msgstr "Kestus (msek):"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Laiendatud sätted"
-
-#, fuzzy
-#~ msgid "Debug options"
-#~ msgstr "Kaunistused"
-
-#, fuzzy
-#~ msgid "Enable volume control"
-#~ msgstr "Helivaljuse juhtimine:"
-
-#, fuzzy
-#~ msgid "Volume control options"
-#~ msgstr "Hiire kerimisel"
-
-#, fuzzy
-#~ msgid "same file"
-#~ msgstr "Pealkiri"
-
-#, fuzzy
-#~ msgid "Limit OP buffer usage (ms):"
-#~ msgstr "Puhvri suurus (ms):"
-
-#, fuzzy
-#~ msgid "Advanced options"
-#~ msgstr "Laiendatud sätted"
-
-#, fuzzy
-#~ msgid "Save Default List"
-#~ msgstr "Vaikimisi (%s)"
-
-#, fuzzy
-#~ msgid "About Icecast-Plugin"
-#~ msgstr "Kajapluginast lähemalt"
-
-#, fuzzy
-#~ msgid ""
-#~ "Icecast-Plugin\n"
-#~ "\n"
-#~ "This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Audacious'e ESounD plugin\n"
-#~ "\n"
-#~ " See programm on vaba tarkvara. Te võite seda edasi levitada ja/või\n"
-#~ "muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need\n"
-#~ "on Vaba Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number\n"
-#~ "2 või (vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
-#~ "\n"
-#~ "Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA\n"
-#~ "IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA\n"
-#~ "või SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata\n"
-#~ "GNU Üldist Avalikku Litsentsi.\n"
-#~ "\n"
-#~ "Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos käesoleva\n"
-#~ "programmiga; kui ei, siis võtke ühendust Free Software Foundation'iga,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#, fuzzy
-#~ msgid "Icecast Configuration"
-#~ msgstr "MP3 sätted"
-
-#, fuzzy
-#~ msgid "Output stream format:"
-#~ msgstr "Väljundfaili vorming:"
-
-#, fuzzy
-#~ msgid "Server address:"
-#~ msgstr "Seadme aadress"
-
-#, fuzzy
-#~ msgid "Mount point:"
-#~ msgstr "Kirjatüüp %i:"
-
-#, fuzzy
-#~ msgid "User name:"
-#~ msgstr "Kasutajanimi:"
-
-#, fuzzy
-#~ msgid "Buffer size (bytes):"
-#~ msgstr "Puhvri suurus (ms):"
-
-#, fuzzy
-#~ msgid "Stream description:"
-#~ msgstr "Kirjeldus:"
-
-#, fuzzy
-#~ msgid "Metadata Settings"
-#~ msgstr "Mikseri sätted"
-
-#~ msgid "MPEG Audio Plugin Configuration"
-#~ msgstr "MPEG audioplugina sätted"
-
-#~ msgid ""
-#~ "Audacious MPEG Audio Plugin\n"
-#~ "\n"
-#~ "Compiled against libMAD version: %d.%d.%d%s\n"
-#~ "\n"
-#~ "Written by:\n"
-#~ " William Pitcock <nenolod@sacredspiral.co.uk>\n"
-#~ " Yoshiki Yazawa <yaz@cc.rim.or.jp>\n"
-#~ "\n"
-#~ "Portions derived from XMMS-MAD by:\n"
-#~ " Sam Clegg\n"
-#~ "\n"
-#~ "ReplayGain support by:\n"
-#~ " Samuel Krempp"
-#~ msgstr ""
-#~ "Audacious MPEG audioplugin\n"
-#~ "\n"
-#~ "Kompileeritud libMAD versiooniga: %d.%d.%d%s\n"
-#~ "\n"
-#~ "Programmeerijad:\n"
-#~ " William Pitcock <nenolod@sacredspiral.co.uk>\n"
-#~ " Yoshiki Yazawa <yaz@cc.rim.or.jp>\n"
-#~ "\n"
-#~ "XMMS-MAD pluginast tuletatud osade autor:\n"
-#~ " Sam Clegg\n"
-#~ "\n"
-#~ "ReplayGain tugi:\n"
-#~ " Samuel Krempp"
-
-#~ msgid "About MPEG Audio Plugin"
-#~ msgstr "MPEG audiopluginast lähemalt"
-
-#~ msgid "About OSSv4 Driver"
-#~ msgstr "OSSv4 draiverist lähemalt"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audacious OSSv4 Driver\n"
-#~ "\n"
-#~ "Based on the OSSv3 Output plugin,\n"
-#~ "Ported to OSSv4's VMIX by Cristi Magherusan <majeru@gentoo.ro>\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.\n"
-#~ "\n"
-#~ "Note: For any issues regarding this plugin (including patches and \n"
-#~ "suggestions) please contact the maintainer, and NO other \n"
-#~ "Audacious developers\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Audacious'e OSSv4 draiver\n"
-#~ "\n"
-#~ " See programm on vaba tarkvara. Te võite seda edasi levitada ja/või\n"
-#~ "muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need\n"
-#~ "on Vaba Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number\n"
-#~ "2 või (vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
-#~ "\n"
-#~ "Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA\n"
-#~ "IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA\n"
-#~ "või SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata\n"
-#~ "GNU Üldist Avalikku Litsentsi.\n"
-#~ "\n"
-#~ "Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos käesoleva\n"
-#~ "programmiga; kui ei, siis võtke ühendust Free Software Foundation'iga,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#~ msgid "TiMidity Configuration"
-#~ msgstr "TiMidity sätted"
-
-#~ msgid "22000 Hz"
-#~ msgstr "22000 Hz"
-
-#~ msgid "44100 Hz"
-#~ msgstr "44100 Hz"
-
-#~ msgid "TiMidity Configuration File"
-#~ msgstr "TiMidity sätete fail"
-
-#~ msgid "TiMidity Plugin %s"
-#~ msgstr "TiMidity plugin %s"
-
-#~ msgid ""
-#~ "TiMidity Plugin\n"
-#~ "http://libtimidity.sourceforge.net\n"
-#~ "by Konstantin Korikov"
-#~ msgstr ""
-#~ "TiMidity plugin\n"
-#~ "http://libtimidity.sourceforge.net\n"
-#~ "autor: Konstantin Korikov"
-
-#~ msgid "Couldn't load MIDI file"
-#~ msgstr "MIDI-faili pole võimalik laadida"
-
-#~ msgid "Title:"
-#~ msgstr "Pealkiri:"
-
-#~ msgid "Comment:"
-#~ msgstr "Kommentaar:"
-
-#~ msgid "Genre:"
-#~ msgstr "Žanr:"
-
-#~ msgid "version %d"
-#~ msgstr "versioon %d"
-
-#~ msgid "average bitrate: %6.1f kbps"
-#~ msgstr "keskmine bitikiirus: %6.1f kbps"
-
-#~ msgid "channels: %d"
-#~ msgstr "kanaleid: %d"
-
-#~ msgid "length: %d:%.2d"
-#~ msgstr "kestus: %d:%.2d"
-
-#~ msgid "file size: %d Bytes"
-#~ msgstr "faili suurus: %d baiti"
-
-#~ msgid "File Info - %s"
-#~ msgstr "Faili andmed: %s"
-
-#, fuzzy
-#~ msgid "ReplayGain Settings"
-#~ msgstr "Alarmi sätted"
-
-#~ msgid "Unknown soundcard"
-#~ msgstr "Tundmatu helikaart"
-
-#~ msgid "Default PCM device (%s)"
-#~ msgstr "Vaikimisi PCM-seade (%s)"
-
-#, fuzzy
-#~ msgid "Device:"
-#~ msgstr "Seadmed"
-
-#~ msgid "Mixer:"
-#~ msgstr "Mikser:"
-
-#, fuzzy
-#~ msgid "Override default devices"
-#~ msgstr "Vaikimisi seadme asemel kasutatakse: "
-
-#, fuzzy
-#~ msgid "Card:"
-#~ msgstr "Aasta:"
-
-#~ msgid "Mixer card:"
-#~ msgstr "Miksimiskaart:"
-
-#~ msgid "About Apple Lossless Audio Plugin"
-#~ msgstr "Apple Lossless Audio pluginast lähemalt"
-
-#~ msgid ""
-#~ "Copyright (c) 2006 Audacious team\n"
-#~ "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
-#~ msgstr ""
-#~ "Autoriõigused (c) 2006 Audacious'e meeskond\n"
-#~ "Osaliselt ka (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
-
-#, fuzzy
-#~ msgid "About Monkey's Audio Plugin"
-#~ msgstr "MPEG audiopluginast lähemalt"
-
-#~ msgid "ID3 format:"
-#~ msgstr "ID3 vorming:"
-
-#~ msgid "ALSA Driver configuration"
-#~ msgstr "ALSA draiveri sätted"
-
-#~ msgid "Device settings"
-#~ msgstr "Seadme sätted"
-
-#~ msgid "About CD Audio Plugin NG"
-#~ msgstr "CD Audio Plugin NG'st lähemalt"
-
-#, fuzzy
-#~ msgid "By Playlist Entry"
-#~ msgstr "Esitusnimekirja andmed kiiresti"
-
-#~ msgid "Average bitrate: %6.1f kbps"
-#~ msgstr "Keskmine bitikiirus: %6.1f kbps"
-
-#~ msgid "Channels: %d"
-#~ msgstr "Kanaleid: %d"
-
-#~ msgid "Length: %d:\\%.2d"
-#~ msgstr "Kestus: %d:\\%.2d"
-
-#~ msgid " Close "
-#~ msgstr " Sulge "
-
-#, fuzzy
-#~ msgid "Audio Settings"
-#~ msgstr "Alarmi sätted"
-
-#, fuzzy
-#~ msgid "Miscellaneous Settings"
-#~ msgstr "Mikseri sätted"
-
-#~ msgid "About ALSA Driver"
-#~ msgstr "ALSA draiverist lähemalt"
-
-#~ msgid ""
-#~ "Audacious ALSA Driver\n"
-#~ "\n"
-#~ " This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA.\n"
-#~ "Author: Matthieu Sozeau (mattam@altern.org)"
-#~ msgstr ""
-#~ "Audacious'e ALSA draiver\n"
-#~ "\n"
-#~ " See programm on vaba tarkvara. Te võite seda edasi levitada ja/või\n"
-#~ "muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need\n"
-#~ "on Vaba Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number\n"
-#~ "2 või (vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
-#~ "\n"
-#~ "Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA\n"
-#~ "IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA\n"
-#~ "või SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata\n"
-#~ "GNU Üldist Avalikku Litsentsi.\n"
-#~ "\n"
-#~ "Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos käesoleva\n"
-#~ "programmiga; kui ei, siis võtke ühendust Free Software Foundation'iga,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
-#~ "Autor: Matthieu Sozeau (mattam@altern.org)"
-
-#~ msgid "Soundcard:"
-#~ msgstr "Helikaart:"
-
-#~ msgid ""
-#~ "<big>No playable CD found.</big>\n"
-#~ "\n"
-#~ "No CD inserted, or inserted CD is not an audio CD.\n"
-#~ msgstr ""
-#~ "<big>Esitatavat CD-plaati ei leitud.</big>\n"
-#~ "\n"
-#~ "CD-plaati pole sisestatud või pole see audioplaat.\n"
-
-#~ msgid "Print debug information"
-#~ msgstr "Silumisandmeid prinditakse"
-
-#, fuzzy
-#~ msgid "Audacious Skinned GUI Configuration"
-#~ msgstr "Audioplaatide plugina sätted"
-
-#~ msgid "Couldn't open file!"
-#~ msgstr "Faili pole võimalik avada!"
-
-#~ msgid "Couldn't write tag!"
-#~ msgstr "Silti pole võimalik kirjutada!"
-
-#~ msgid "Unknown"
-#~ msgstr "Tundmatu"
-
-#~ msgid "%d Hz"
-#~ msgstr "%d Hz"
-
-#~ msgid "%d:%02d (%d seconds)"
-#~ msgstr "%d:%02d (%d sekundit)"
-
-#~ msgid "Version:"
-#~ msgstr "Versioon:"
-
-#~ msgid "File size:"
-#~ msgstr "Faili suurus:"
-
-#~ msgid "%d"
-#~ msgstr "%d"
-
-#~ msgid "%d:%.2d"
-#~ msgstr "%d:%.2d"
-
-#~ msgid "%d Bytes"
-#~ msgstr "%d baiti"
+msgstr "Autoriõigused (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n\nPlugina koodi autor on osaliselt ka Miles Egan\nKülasta Wavpacki saiti aadressil http://www.wavpack.com/\n"

audacious-plugins-3.1.1.tar.bz2/po/fr.po -> audacious-plugins-3.2.4.tar.bz2/po/fr.po Changed

@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# <jagw40k@free.fr>, 2011.
+# Alain-Olivier Breysse <yahoe.001@gmail.com>, 2012.
+# <jagw40k@free.fr>, 2011, 2012.
 # Jean-Alexandre Anglès d'Auriac <jagw40k@free.fr>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUDPLUG\n"
-"POT-Creation-Date: 2011-10-24 16:38-0400\n"
-"PO-Revision-Date: 2011-11-09 21:26+0000\n"
-"Last-Translator: Oxayotl <jagw40k@free.fr>\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-03-12 15:18+0000\n"
+"Last-Translator: Alain-Olivier Breysse <yahoe.001@gmail.com>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,226 +26,174 @@
 "Using libfaad2-%s for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
-msgstr ""
-"Ce module utilise « libfaad-%s » pour le décodage.\n"
-"\n"
-"Décodeur FAAD2 AAC/HE-AAC/HE-AACv2/DRM : (c) Nero AG, www.nero.com\n"
-"\n"
-"Droit d'utilisation 2005-2006 : Équipe de développement Audacious"
+msgstr "Ce module utilise « libfaad-%s » pour le décodage.\n\nDécodeur FAAD2 AAC/HE-AAC/HE-AACv2/DRM © Nero AG, www.nero.com\n\nTous droits réservés © 2005-2006 L'équipe Audacious"
 
 #: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
-msgstr "À propos du décodeur « MP4 AAC »"
+msgstr "À propos du module de décodage MP4 AAC"
 
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "À propos d'Alarme"
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "À propos du module Alarme"
 
-#: src/alarm/interface.c:41
-msgid "XMMS Alarm"
-msgstr "Alarme"
-
-#: src/alarm/interface.c:50
+#: src/alarm/alarm.c:313
 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"
+"A plugin that can be used to start playing at a certain time.\n"
 "\n"
-"http://www.snika.uklinux.net/xmms-alarm/"
-msgstr ""
-"est un greffon pour Audacious, basé sur greffon pour XMMS\n"
-"qui lance la lecture à une date choisie à l'avance.\n"
-"\n"
-"Basé sur le plugin du même nom pour XMMS par \n"
-"Adam Feakin <adamf@snika.uklinux.net> et\n"
-"Daniel Stodden <stodden@in.tum.de>"
-
-#: src/alarm/interface.c:65
-msgid "Close"
-msgstr "Fermer"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr "Un module permettant de démarrer la lecture à une heure prédéterminée.\n\nÉcrit à l'origine par Adam Feakin et Daniel Stodden."
 
-#: src/alarm/interface.c:95
+#: src/alarm/interface.c:33
 msgid "Alarm"
 msgstr "Alarme"
 
-#: src/alarm/interface.c:102
+#: src/alarm/interface.c:40
 msgid "This is your wakeup call."
-msgstr ""
+msgstr "Ceci est votre réveil."
 
-#: src/alarm/interface.c:117 src/alarm/interface.c:1338
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
 msgid "OK"
 msgstr "OK"
 
-#: src/alarm/interface.c:151
-msgid "Sorry"
-msgstr "Désolé"
-
-#: src/alarm/interface.c:158
-msgid "Warning"
-msgstr "Attention"
-
-#: src/alarm/interface.c:167
-msgid ""
-"For safety reasons the \"quiet\" time must be at least 65 seconds longer than the fading time, it must also be more than 10 seconds. This basically means that there is a bug in the code and until I find a way of really fixing it this message will appear :)\n"
-"\n"
-"Your fading settings have NOT been saved\n"
-"\n"
-"--\n"
-"Adam"
-msgstr ""
-"Pour des raisons de sécurité, le temps au bout duquel l'alarme s'éteint doit être au mois plus long de 65 secondes que la durée du fondu. Il doit de plus être de plus de 10 secondes.\n"
-"Ceci montre bien qu'il y a un bug dans le code, et tant que je n'aurais pas réussi à trouver un moyen de réellement le résoudre, ce message apparaîtra :).\n"
-"\n"
-"Vos préférences sur le fondu n'ont PAS été sauvegardées.\n"
-"\n"
-"--\n"
-"Adam"
-
-#: src/alarm/interface.c:183
-msgid "Oh Well"
-msgstr "Réveillez-vous !"
-
-#: src/alarm/interface.c:339
+#: src/alarm/interface.c:214
 msgid "Alarm Settings"
 msgstr "Paramètres de l'alarme"
 
-#: src/alarm/interface.c:354 src/alarm/interface.c:526
-#: src/alarm/interface.c:898
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
 msgid "Time"
 msgstr "Heure"
 
-#: src/alarm/interface.c:395
+#: src/alarm/interface.c:270
 msgid "hours"
 msgstr "heures"
 
-#: src/alarm/interface.c:456
+#: src/alarm/interface.c:331
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.c:486
+#: src/alarm/interface.c:361
 msgid "minutes"
 msgstr "minutes"
 
-#: src/alarm/interface.c:504
+#: src/alarm/interface.c:379
 msgid "Quiet after:"
-msgstr "Arrêter au bout de"
+msgstr "Arrêt après :"
 
-#: src/alarm/interface.c:514
+#: src/alarm/interface.c:389
 msgid "Alarm at (default):"
 msgstr "Se déclencher (par défaut) à :"
 
-#: src/alarm/interface.c:534
+#: src/alarm/interface.c:409
 msgid "Choose the days for the alarm to come on"
 msgstr "Choisissez les jours où l'alarme se déclenche"
 
-#: src/alarm/interface.c:562 src/alarm/interface.c:610
-#: src/alarm/interface.c:658 src/alarm/interface.c:706
-#: src/alarm/interface.c:754 src/alarm/interface.c:802
-#: src/alarm/interface.c:850 src/bs2b/plugin.c:198 src/OSS/configure.c:153
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
 msgid "Default"
 msgstr "Défaut"
 
-#: src/alarm/interface.c:888
+#: src/alarm/interface.c:763
 msgid "Day"
 msgstr "Jour"
 
-#: src/alarm/interface.c:908
+#: src/alarm/interface.c:783
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: src/alarm/interface.c:919
+#: src/alarm/interface.c:794
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: src/alarm/interface.c:930
+#: src/alarm/interface.c:805
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: src/alarm/interface.c:941
+#: src/alarm/interface.c:816
 msgid "Friday"
 msgstr "Vendredi"
 
-#: src/alarm/interface.c:952
+#: src/alarm/interface.c:827
 msgid "Saturday"
 msgstr "Samedi"
 
-#: src/alarm/interface.c:963
+#: src/alarm/interface.c:838
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: src/alarm/interface.c:973
+#: src/alarm/interface.c:848
 msgid "Monday"
 msgstr "Lundi"
 
-#: src/alarm/interface.c:984
+#: src/alarm/interface.c:859
 msgid "Days"
 msgstr "Jours"
 
-#: src/alarm/interface.c:1000
+#: src/alarm/interface.c:875
 msgid "Fading"
 msgstr "Fondu"
 
-#: src/alarm/interface.c:1037
+#: src/alarm/interface.c:912
 msgid "seconds"
 msgstr "secondes"
 
-#: src/alarm/interface.c:1045 src/alarm/interface.c:1160
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.c:1071
+#: src/alarm/interface.c:946
 msgid "Current"
 msgstr "Volume actuel"
 
-#: src/alarm/interface.c:1079
+#: src/alarm/interface.c:954
 msgid "Start at"
 msgstr "Commencer à"
 
-#: src/alarm/interface.c:1107 src/alarm/interface.c:1151
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
 msgid "%"
 msgstr "%"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:998
 msgid "Final"
 msgstr "Finir à"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1051
 msgid "Additional Command"
 msgstr "Commande additionnelle"
 
-#: src/alarm/interface.c:1202
+#: src/alarm/interface.c:1077
 msgid "enable"
 msgstr "activer"
 
-#: src/alarm/interface.c:1210
+#: src/alarm/interface.c:1085
 msgid "Playlist (optional)"
-msgstr "Lire la liste de lecture suivante (optionnel)"
+msgstr "Liste de lecture (optionnel)"
 
-#: src/alarm/interface.c:1236
+#: src/alarm/interface.c:1111
 msgid "Browse..."
 msgstr "Parcourir"
 
-#: src/alarm/interface.c:1244 src/alarm/interface.c:1408
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
 msgid "Reminder"
 msgstr "Pense-bête"
 
-#: src/alarm/interface.c:1261
+#: src/alarm/interface.c:1136
 msgid "Use reminder"
 msgstr "Afficher le pense-bête suivant"
 
-#: src/alarm/interface.c:1277 src/sndstretch/sndstretch_xmms.c:358
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
 msgid "Options"
 msgstr "Options"
 
-#: src/alarm/interface.c:1285
+#: src/alarm/interface.c:1160
 msgid "What do these options mean?"
 msgstr "Que signifient ces options ?"
 
-#: src/alarm/interface.c:1313
+#: src/alarm/interface.c:1188
 msgid ""
 "\n"
 "Time\n"
@@ -297,23 +246,23 @@
 " 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 ""
+msgstr "\nHeure\n Alarme à : \n Heure de l'alarme.\n\n Silencieux après : \n Arrêt de l'alarme après cette durée.\n (si le dialogue de réveil n'est pas fermé)\n\n\nJours\n Jours :\n Choisissez les jours d'activité de l'alarme.\n\n Heure :\n Choisissez l'heure journalière de l'alarme,\n ou sélectionnez cochez la \"Défaut\".\n\n\nVolume\n Fondu : \n Augmente le volume progressivement\n au niveau choisi pour cette durée.\n\n Commence à : \n Commence le fondu à partir de ce volume.\n\n Fini à : \n Volume maximal. Si la durée du fondu est \n 0 alors réglez le volume ainsi et commencez\n la lecture.\n\n\nOptions :\n Commandes additionnelles :\n Éxécutez cette commande à l'heure de l'alarme.\n\n Liste de lecture : \n Charger cette liste de lecture (extension .m3u\n requise). Si il n'y a pas de liste de lecture, alors\n les morceaux actuellement dans la liste seront\n utilisés.\n L'adresse URL d'un flux MP3/OGG peut aussi être saisie\n ici, mais le chargement de listes de lecture XMMS\n n'est pas présentement pris en charge.\n\n Pense-bête :\n Affiche un pense-bête durant l'alarme. Tapez le \n dans la boîte et cochez la case si vous voulez le\n voir s'afficher.\n"
 
-#: src/alarm/interface.c:1315 src/skins/ui_manager.c:382
+#: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
 msgid "Help"
 msgstr "Aide"
 
-#: src/alarm/interface.c:1347 src/cdaudio-ng/configure.c:249
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
 #: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
 #: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/alarm/interface.c:1415
+#: src/alarm/interface.c:1290
 msgid "Your reminder for today is.."
 msgstr "Votre pense-bête pour aujourd'hui est…"
 
-#: src/alarm/interface.c:1440
+#: src/alarm/interface.c:1315
 msgid "Thankyou"
 msgstr "Merci"
 
@@ -343,7 +292,7 @@
 
 #: src/alsa/config.c:452
 msgid "Work around drain hangup"
-msgstr "Contourner le problème d'interruption du flux ( « drain hang-up » )"
+msgstr "Contourner le problème d'interruption du flux \"drain hang-up\""
 
 #: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
@@ -353,13 +302,11 @@
 msgid "ALSA error"
 msgstr "Erreur ALSA"
 
-#: src/amidi-plug/amidi-plug.c:335
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr ""
-"Vous n'avez pas choisi les ports du séquenceur pour la lecture MIDI. Vous "
-"pouvez le faire dans les préférences du module MIDI."
+msgstr "Vous n'avez pas choisi les ports du séquenceur pour la lecture MIDI. Vous pouvez le faire dans les préférences du module MIDI."
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:35
 msgid "ALSA Backend "
@@ -370,11 +317,7 @@
 "This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
 "This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Ce système envoie les événements MIDI à l'ensemble des ports du séquenceur « ALSA » que l'utilisateur a spécifié. L'interface du séquenceur « ALSA » offre des possibilités variées : elle peut fournir des ports aux synthétiseurs matériels des cartes sons (« emu10k1 », par exemple), mais aussi aux synthétiseurs logiciels, aux périphériques externes, etc.\n"
-"Ce système de sortie ne produit pas de flux audio : les événements MIDI sont gérés directement par les périphériques et les applications associés aux ports « ALSA ». Par exemple, les événements MIDI envoyés au synthétiseur matériel seront directement interprétés.\n"
-"\n"
-"Auteur : Giacomo Lozito."
+msgstr "Ce système envoie les événements MIDI à l'ensemble des ports du séquenceur « ALSA » que l'utilisateur a spécifié. L'interface du séquenceur « ALSA » offre des possibilités variées : elle peut fournir des ports aux synthétiseurs matériels des cartes sons (« emu10k1 », par exemple), mais aussi aux synthétiseurs logiciels, aux périphériques externes, etc.\nCe système de sortie ne produit pas de flux audio : les événements MIDI sont gérés directement par les périphériques et les applications associés aux ports « ALSA ». Par exemple, les événements MIDI envoyés au synthétiseur matériel seront directement interprétés.\n\nAuteur : Giacomo Lozito."
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
@@ -383,13 +326,9 @@
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
 "This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen ouput plugin.\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Ce système de sortie produit des flux audio en envoyant les événements MIDI à « FluidSynth », un synthétiseur logiciel en temps réel conçu à partir des principes de « SoundFont2 » (www.fluidsynth.org).\n"
-"Les flux générés peuvent être manipulés grâce aux modules d'effets du lecteur et sont traités par le module de sortie sélectionné.\n"
-"\n"
-"Auteur : Giacomo Lozito."
+msgstr "Ce sytème de sortie produit un flux audio en envoyant les évènements MIDI vers FluidSynth, un synthétiseur logiciel en temps réel conçu d'après la spécification SoundFont2 (www.fluidsynth.org).\nLe flux produit peut être manipulé par des modules d'effet de lecture et est traité par le module de sortie choisi.\nSystème de sortie écrit par Giacomo Lozito."
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
@@ -409,15 +348,15 @@
 
 #: src/amidi-plug/i_configure-alsa.c:346
 msgid "ALSA output ports"
-msgstr "Ports de sortie « ALSA »"
+msgstr "Ports de sortie ALSA"
 
 #: src/amidi-plug/i_configure-alsa.c:399
 msgid "Soundcard: "
-msgstr "Périphérique audio : "
+msgstr "Carte son : "
 
 #: src/amidi-plug/i_configure-alsa.c:401
 msgid "Mixer control: "
-msgstr "Canal du mélangeur audio : "
+msgstr "Contrôl du mélangeur : "
 
 #: src/amidi-plug/i_configure-alsa.c:413
 msgid "Mixer settings"
@@ -425,24 +364,21 @@
 
 #: src/amidi-plug/i_configure-alsa.c:429
 msgid "ALSA Backend not loaded or not available"
-msgstr ""
-"Le système de sortie « ALSA » n'est pas chargé ou n'est pas disponible"
+msgstr "Le système de sortie ALSA n'est pas chargé ou n'est pas disponible"
 
 #: src/amidi-plug/i_configure-alsa.c:448
 msgid ""
 "ALSA\n"
 "backend"
-msgstr ""
-"Sortie\n"
-"\"ALSA\""
+msgstr "Sortie\n\"ALSA\""
 
 #: src/amidi-plug/i_configure-ap.c:59
 msgid "AMIDI-Plug - backend information"
-msgstr "Informations sur le système de sortie"
+msgstr "AMIDI-Plug - Informations sur le système de sortie"
 
 #: src/amidi-plug/i_configure-ap.c:196
 msgid "AMIDI-PLUG PREFERENCES"
-msgstr "PRÉFÉRENCES DU MODULE « AMIDI-PLUG »"
+msgstr "PRÉFÉRENCES DU MODULE AMIDI-PLUG"
 
 #: src/amidi-plug/i_configure-ap.c:223
 msgid "Backend selection"
@@ -450,7 +386,7 @@
 
 #: src/amidi-plug/i_configure-ap.c:227
 msgid "Available backends"
-msgstr "Systèmes disponibles :"
+msgstr "Systèmes de sortie disponibles :"
 
 #: src/amidi-plug/i_configure-ap.c:257
 msgid "Playback settings"
@@ -470,35 +406,33 @@
 
 #: src/amidi-plug/i_configure-ap.c:293
 msgid "pre-calculate length of MIDI files in playlist"
-msgstr "Précalculer la durée des fichiers MIDI dans la liste de lecture"
+msgstr "précalculer la durée des fichiers MIDI dans la liste de lecture"
 
 #: src/amidi-plug/i_configure-ap.c:298
 msgid "extract comments from MIDI file (if available)"
-msgstr "Extraire les commentaires des fichiers MIDI (s'ils sont disponibles)"
+msgstr "extraire les commentaires des fichiers MIDI (s'ils sont disponibles)"
 
 #: src/amidi-plug/i_configure-ap.c:303
 msgid "extract lyrics from MIDI file (if available)"
-msgstr "Extraire les paroles des fichiers MIDI (si elles sont disponibles)"
+msgstr "extraire les paroles des fichiers MIDI (si elles sont disponibles)"
 
 #: src/amidi-plug/i_configure-ap.c:333
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr ""
-"AMIDI\n"
-"Plug"
+msgstr "AMIDI\nPlug"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
-msgstr "'AMIDI-Plug' - choix du fichier"
+msgstr "AMIDI-Plug - choix du fichier"
 
 #: src/amidi-plug/i_configure.c:129
 msgid "AMIDI-Plug - configuration"
-msgstr "Configuration du module « AMIDI-Plug »"
+msgstr "AMIDI-Plug - configuration du module "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:55
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr "Choix du fichier « SoundFont »"
+msgstr "AMIDI-Plug - choix du fichier « SoundFont »"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:270
 msgid "FLUIDSYNTH BACKEND CONFIGURATION"
@@ -514,7 +448,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
-msgstr "Taille (bytes)"
+msgstr "Taille (octets)"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:398
 msgid "Load SF on player start"
@@ -530,7 +464,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:426
 msgid "gain"
-msgstr "Gain"
+msgstr " gain"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:432
 #: src/amidi-plug/i_configure-fluidsynth.c:460
@@ -546,62 +480,59 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:454
 msgid "poliphony"
-msgstr "Polyphonie"
+msgstr "polyphonie"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:482
 msgid "reverb"
-msgstr "Réverbération"
+msgstr "réverbération"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:491
 #: src/amidi-plug/i_configure-fluidsynth.c:522
 msgid "yes"
-msgstr "Oui"
+msgstr "oui"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:493
 #: src/amidi-plug/i_configure-fluidsynth.c:524
 msgid "no"
-msgstr "Non"
+msgstr "non"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:513
 msgid "chorus"
-msgstr "Effet de choeur"
+msgstr "effet de choeur"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:544
 msgid "sample rate"
-msgstr "Fréquence d'échantillonnage"
+msgstr "fréquence d'échantillonnage"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:550
 msgid "22050 Hz "
-msgstr "22050 Hz"
+msgstr "22050 Hz "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:553
 msgid "44100 Hz "
-msgstr "44100 Hz"
+msgstr "44100 Hz "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:556
 msgid "96000 Hz "
-msgstr "96000 Hz"
+msgstr "96000 Hz "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:559
 msgid "custom "
-msgstr "Autre "
+msgstr "personnalisé "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "Hz "
-msgstr "Hz"
+msgstr "Hz "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:621
 msgid "FluidSynth Backend not loaded or not available"
-msgstr ""
-"Le système de sortie « FluidSynth » n'est pas chargé ou n'est pas disponible"
+msgstr "Le système de sortie « FluidSynth » n'est pas chargé ou n'est pas disponible"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:640
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr ""
-"Sortie\n"
-"'FluidSynth'"
+msgstr "Sortie\n'FluidSynth'"
 
 #: src/amidi-plug/i_configure-timidity.c:39
 msgid "TIMIDITY BACKEND CONFIGURATION"
@@ -609,16 +540,13 @@
 
 #: src/amidi-plug/i_configure-timidity.c:64
 msgid "TiMidity Backend not loaded or not available"
-msgstr ""
-"Le système de sortie « TiMidity » n'est pas chargé ou n'est pas disponible"
+msgstr "Le système de sortie « TiMidity » n'est pas chargé ou n'est pas disponible"
 
 #: src/amidi-plug/i_configure-timidity.c:83
 msgid ""
 "TiMidity\n"
 "backend"
-msgstr ""
-"Sortie\n"
-"'TiMidity'"
+msgstr "Sortie\n'TiMidity'"
 
 #: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
@@ -634,7 +562,7 @@
 
 #: src/amidi-plug/i_fileinfo.c:208
 msgid "Length (msec):"
-msgstr "Durée (msec) :"
+msgstr "Durée (msec.) :"
 
 #: src/amidi-plug/i_fileinfo.c:211
 msgid "Num of Tracks:"
@@ -674,15 +602,13 @@
 
 #: src/amidi-plug/i_utils.c:43
 msgid "AMIDI-Plug - about"
-msgstr "À propos de « AMIDI-Plug »"
+msgstr "AMIDI-Plug - À propos de"
 
 #: src/amidi-plug/i_utils.c:68
 msgid ""
 "\n"
 "AMIDI-Plug "
-msgstr ""
-"\n"
-"AMIDI-Plug "
+msgstr "\nAMIDI-Plug "
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -707,30 +633,7 @@
 "Tony Vroon\n"
 "for the good help with alpha testing\n"
 "\n"
-msgstr ""
-"\n"
-"\n"
-"Lecteur de musique « MIDI » modulaire\n"
-"\n"
-"http://www.develia.org/projects.php?p=amidiplug\n"
-"\n"
-"Auteur : Giacomo Lozito < james@develia.org >\n"
-"\n"
-"\n"
-"Remerciements particuliers à...\n"
-"\n"
-"Clemens Ladisch et Jaroslav Kysela\n"
-"pour leurs excellents outils « aplaymidi » et « amixer » :\n"
-"ces derniers étaient très utiles (en plus de la documentation\n"
-"relative à la bibliothèque « ALSA ») pour apprendre\n"
-"l'interface de programmation « ALSA ».\n"
-"\n"
-"Alfredo Spadafina\n"
-"pour le beau logo (clavier MIDI).\n"
-"\n"
-"Tony Vroon\n"
-"pour son aide précieuse, lors de la phase alpha.\n"
-"\n"
+msgstr "\n\nLecteur de musique MIDI modulaire\n\nhttp://www.develia.org/projects.php?p=amidiplug\n\nAuteur : Giacomo Lozito\n< james@develia.org >\n\n\nRemerciements particuliers à...\n\nClemens Ladisch et Jaroslav Kysela\npour leurs excellents logiciels « aplaymidi » et « amixer », très utiles, ainsi que la documentation alsa-lib pour apprendre\nl'interface de programmation ALSA.\n\nAlfredo Spadafina\npour le beau logo du clavier MIDI.\n\nTony Vroon\npour son aide précieuse lors des tests lors de la phase alpha.\n\n"
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
@@ -748,251 +651,238 @@
 msgid "None"
 msgstr "Aucun"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "Début de la lecture"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
-msgstr ""
-"Déclenche la fonction « OSD » lorsqu'une entrée de la liste de lecture est "
-"lue."
+msgstr "Déclenche la fonction « OSD » lorsqu'une entrée de la liste de lecture est lue."
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "Changement de titre"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr ""
-"Déclenche la fonction « OSD » si, pendant la lecture, le titre du morceau "
-"change, alors que le nom du fichier est identique. Cette option est "
-"particulièrement utile pour afficher le changement de titre des flux "
-"Internet."
+msgstr "Déclenche la fonction « OSD » si, pendant la lecture, le titre du morceau change, alors que le nom du fichier est identique. Cette option est particulièrement utile pour afficher le changement de titre des flux Internet."
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "Changement de volume"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
-msgstr "Déclenche la fonction « OSD » en cas de changement de volume."
+msgstr "Déclenche l'affichage à l'écran lors du changement de volume."
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
-msgstr "Mode « pause » activé"
+msgstr "En pause"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
-msgstr ""
-"Déclenche la fonction « OSD » lorsque la lecture est en mode « pause »."
+msgstr "Déclenche l'affichage à l'écran lorsque la lecture est mise en pause."
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
-msgstr "Mode « pause » désactivé"
+msgstr "Pause désactivée"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
-msgstr ""
-"Déclenche la fonction « OSD » lorsque la lecture n'est plus en mode « pause "
-"»."
+msgstr "Déclenche l'affichage à l'écran lorsque la pause de lecture eest désactivée."
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
-msgstr "Décalage horizontal :"
+msgstr "Décalage horizontal X :"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
-msgstr "Décalage vertical :"
+msgstr "Décalage vertical Y :"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
-msgstr "Largeur maximale :"
+msgstr "Largeur d'affichage à l'écran maximale :"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
-msgstr "Options de l'affichage multiple"
+msgstr "Options d'affichage à moniteurs multiples"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
-msgstr "Afficher OSD sur"
+msgstr "Affichage à l'écran avec :"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "tous les moniteurs"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "le moniteur %i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
-msgstr "Durée (ms)"
+msgstr "Durée (ms.)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "Affichage :"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "Fondu d'entrée :"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "Fondu de sortie :"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
-msgstr "Polices"
+msgstr "Polices de caractère"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
-msgstr "Police %i :"
+msgstr "Police de caractère %i :"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "Ombre"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "Internationalisation"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 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:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "Choisir un fichier de thème"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr "Style du rendu"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "Couleur %i :"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr "Thème personnalisé"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "Fichier du thème"
 
-#: src/aosd/aosd_ui.c:672
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "Parcourir"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "Activer le déclencheur"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "Événement"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
 msgstr "Gestionnaire composite détecté"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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 ""
-"Aucun gestionnaire composite n'a été détecté. À moins que vous ne soyez certain d'utiliser un tel gestionnaire,\n"
-"veuillez activer un gestionnaire composite approprié. Sinon, l'affichage « OSD » ne fonctionnera pas correctement."
+msgstr "Aucun gestionnaire composite n'a été détecté;\nà moins que vous ne soyez certain d'utiliser un tel gestionnaire,\nveuillez activer un gestionnaire composite sinon l'affichage à l'écran ne fonctionnera pas correctement."
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 msgid "Composite manager not required for fake transparency"
 msgstr "La fausse transparence ne nécessite pas de gestionnaire composite."
 
-#: src/aosd/aosd_ui.c:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "Transparence"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr "Fausse transparence"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "Véritable transparence (nécessite l'extension « composite » de X)"
+msgstr "Véritable transparence (nécessite l'extension composite de X)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
-msgstr "L'extension « composite » n'est pas chargée"
+msgstr "L'extension composite n'est pas chargée"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
-msgstr "L'extension « composite » n'est pas disponible"
+msgstr "L'extension composite n'est pas disponible"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
-msgstr "Audacious OSD"
+msgstr "Affichage à l'écran Audacious"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
-msgstr "Configuration du module « Audacious OSD »"
+msgstr "Affichage à l'écran Audacious - configuration"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
-msgstr "Essai"
+msgstr "Test"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "Arrangement"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "Texte"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "Décoration"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "Déclenchement"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "Options diverses"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
-msgstr "À propos du module « OSD » pour Audacious"
+msgstr "Affichage à l'écran Audacious - À propos de"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
-msgstr ""
-"\n"
-"Module « OSD » pour Audacious "
+msgstr "\nModule d'affichage à l'écran Audacious"
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1003,16 +893,7 @@
 "written by Evan Martin\n"
 "http://neugierig.org/software/ghosd/\n"
 "\n"
-msgstr ""
-"\n"
-"http://www.develia.org/projects.php?p=audacious#aosd\n"
-"\n"
-"Écrit par Giacomo Lozito < james@develia.org >\n"
-"\n"
-"Le module « On-Screen-Display » a été conçu à partir\n"
-"de la bibliothèque « Ghosd » de Evan Martin\n"
-"\n"
-"http://neugierig.org/software/ghosd/\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\n\nÉcrit par Giacomo Lozito < james@develia.org >\n\nLe module d'affichage à l'écran a été conçu à partir\nde la bibliothèque « Ghosd » de Evan Martin\n\nhttp://neugierig.org/software/ghosd/\n"
 
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
@@ -1024,25 +905,25 @@
 
 #: src/bs2b/plugin.c:157
 msgid "Bauer stereophonic-to-binaural Preferences"
-msgstr ""
+msgstr "Préférences du module Bauer stéréophonique-vers-binaural "
 
 #: src/bs2b/plugin.c:168
 msgid "Feed level:"
-msgstr ""
+msgstr "Niveau d'entrée :"
 
 #: src/bs2b/plugin.c:182
 msgid "Cut frequency:"
-msgstr ""
+msgstr "Fréquence de coupure :"
 
 #: src/bs2b/plugin.c:196
 msgid "Presets:"
-msgstr ""
+msgstr "Préréglages :"
 
-#: src/cdaudio-ng/cdaudio-ng.c:241
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
-msgstr "À propos du module « CD Audio »"
+msgstr "À propos du module CD Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:242
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
@@ -1054,46 +935,31 @@
 "This was a Google Summer of Code 2007 project.\n"
 "\n"
 "Copyright 2009 John Lindgren"
-msgstr ""
-"Droits d'utilisation (2007) :\n"
-"\n"
-"Calin Crisan <ccrisan@gmail.com>\n"
-"Équipe de développement Audacious.\n"
-"\n"
-"Remerciements cordiaux aux développeurs de :\n"
-"\n"
-"« libcdio » <http://www.gnu.org/software/libcdio/>\n"
-"« libcddb » <http://libcddb.sourceforge.net/>\n"
-"\n"
-"Je remercie également Tony Vroon de m'avoir conseillé et soutenu.\n"
-"\n"
-"Ce module était un projet de « Google Summer Of Code 2007 ».\n"
-"\n"
-"Droits d'utilisation (2009) : John Lindgren"
+msgstr "Tous droits réservés © 2007 par Calin Crisan <ccrisan@gmail.com>\net léquipe Audacious.\n\nChaleureux remerciements aux développeurs de :\nlibcdio <http://www.gnu.org/software/libcdio/>\nlibcddb <http://libcddb.sourceforge.net/>\n\nJe remercie également Tony Vroon de ton mentorat et soutien.\n\nCe module était un projet de « Google Summer Of Code 2007 ».\n\nTous droits réservés © 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:550
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
 msgstr "CD audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:922
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
 msgstr "Le lecteur est vide"
 
-#: src/cdaudio-ng/cdaudio-ng.c:924
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
-msgstr "Type de disque non supporté"
+msgstr "Type de disque non pris en charge"
 
 #: src/cdaudio-ng/configure.c:148
 msgid "CD Audio Plugin Configuration"
-msgstr "Configuration du module « CD Audio »"
+msgstr "Configuration du module CD Audio"
 
 #: src/cdaudio-ng/configure.c:160
 msgid "Digital audio extraction"
-msgstr "Extraction audio digitale"
+msgstr "Extraction audio numérique"
 
 #: src/cdaudio-ng/configure.c:165
 msgid "Title information"
-msgstr "Informations sur le titre"
+msgstr "Information sur le titre"
 
 #: src/cdaudio-ng/configure.c:176
 msgid "Disc speed:"
@@ -1101,11 +967,11 @@
 
 #: src/cdaudio-ng/configure.c:184
 msgid "Use cd-text if available"
-msgstr "Utiliser « CD-TEXT », si la fonction est disponible"
+msgstr "Utiliser « CD-TEXT » si la fonction est disponible"
 
 #: src/cdaudio-ng/configure.c:191
 msgid "Use CDDB if available"
-msgstr "Utiliser « CDDB », si le service est disponible"
+msgstr "Utiliser « CDDB » (base de données de disque compact) si le service est disponible"
 
 #: src/cdaudio-ng/configure.c:197
 msgid "Server: "
@@ -1121,7 +987,7 @@
 
 #: src/cdaudio-ng/configure.c:218
 msgid "Use HTTP instead of CDDBP"
-msgstr "Utiliser « HTTP » à la place de « CDDB »"
+msgstr "Utiliser « HTTP » à la place de « CDDBP »"
 
 #: src/cdaudio-ng/configure.c:230
 msgid "Override default device: "
@@ -1139,7 +1005,7 @@
 
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
-msgstr "Ajouter les pistes du CD"
+msgstr "Lire le CD"
 
 #: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
@@ -1151,11 +1017,11 @@
 
 #: src/compressor/plugin.c:107
 msgid "Center volume:"
-msgstr ""
+msgstr "Volume central :"
 
 #: src/compressor/plugin.c:120
 msgid "Dynamic range:"
-msgstr ""
+msgstr "Plage dynamique :"
 
 #: src/console/configure.c:136
 msgid "Game Console Music Decoder"
@@ -1171,7 +1037,7 @@
 
 #: src/console/configure.c:170
 msgid "Bass:"
-msgstr "Basses :"
+msgstr "Grave :"
 
 #: src/console/configure.c:174 src/console/configure.c:185
 #: src/console/configure.c:206
@@ -1180,11 +1046,11 @@
 
 #: src/console/configure.c:181
 msgid "Treble:"
-msgstr "Aiguës :"
+msgstr "Aigu :"
 
 #: src/console/configure.c:202
 msgid "Default song length:"
-msgstr "Durée par défaut :"
+msgstr "Durée par défaut du morceau :"
 
 #: src/console/configure.c:208
 msgid "Resampling"
@@ -1196,7 +1062,7 @@
 
 #: src/console/configure.c:229
 msgid "Resampling rate:"
-msgstr "Fréquence de rééchantillonnage"
+msgstr "Fréquence de rééchantillonnage :"
 
 #: src/console/configure.c:233
 msgid "Hz"
@@ -1218,13 +1084,11 @@
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not"
 " provide length information (i.e. looping tracks)."
-msgstr ""
-"* Durée par défaut *\n"
-"La durée par défaut, exprimée en secondes, est utilisée pour les morceaux qui ne disposent pas d'informations quant à leur durée (les pistes en boucle, par exemple)."
+msgstr "La durée par défaut du morceau, exprimée en secondes, est utilisée pour les morceaux qui ne disposent pas d'information de durée (les pistes en boucle, par exemple)."
 
 #: src/console/plugin.c:33
 msgid "About the Game Console Music Decoder"
-msgstr "À propos de « Game Console Music Decoder »"
+msgstr "À propos du module « Game Console Music Decoder »"
 
 #: src/console/plugin.c:34
 msgid ""
@@ -1232,15 +1096,7 @@
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
-msgstr ""
-"Le moteur de « Console Music Decoder » a été conçu à partir de « Game_Music_Emu 0.5.2 ».\n"
-"\n"
-"Formats supportés : AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
-"\n"
-"Support pour Audacious par :\n"
-"\n"
-"William Pitcock <nenolod@dereferenced.org>\n"
-"Shay Green <gblargg@gmail.com>\n"
+msgstr "Le moteur de « Console Music Decoder » a été conçu à partir de « Game_Music_Emu 0.5.2 ».\nFormats pris en charge : AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nVersion pour Audacious par : William Pitcock <nenolod@dereferenced.org>,\n Shay Green <gblargg@gmail.com>\n"
 
 #: src/crossfade/plugin.c:60
 msgid "About Crossfade"
@@ -1261,17 +1117,14 @@
 #: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
-msgstr ""
-"Le fondu a échoué, parce que les morceaux ont un nombre de voies différent."
+msgstr "Le fondu enchaîné a échoué car les morceaux ont un nombre de voies différent."
 
 #: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
 "You can use the Sample Rate Converter effect to resample the songs to the same rate."
-msgstr ""
-"Le fondu enchaîné a échoué, parce que les morceaux ont une fréquence d'échantillonnage différente.\n"
-"Vous pouvez utiliser l'effet « Sample Rate Converter » pour rééchantillonner les titres à la même fréquence."
+msgstr "Le fondu enchaîné a échoué car les morceaux ont des fréquences d'échantillonnage différentes.\n\nVous pouvez utiliser l'effet « Sample Rate Converter » pour rééchantillonner les titres à la même fréquence."
 
 #: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
@@ -1292,12 +1145,7 @@
 "By Johan Levin 1999.\n"
 "\n"
 "Surround echo by Carl van Schaik 1999"
-msgstr ""
-"Module « Écho »\n"
-"\n"
-"Écrit par Johan Levin (1999).\n"
-"\n"
-"« Surround echo » est écrit par Carl van Schaik (1999)"
+msgstr "Module « Écho »\nÉcrit par Johan Levin (1999).\n\n« Surround echo » est écrit par Carl van Schaik 1999"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
@@ -1309,7 +1157,7 @@
 
 #: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
-msgstr "Délai : (ms)"
+msgstr "Délai : (ms.)"
 
 #: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
@@ -1319,7 +1167,7 @@
 msgid "Volume: (%)"
 msgstr "Volume : (%)"
 
-#: src/ffaudio/ffaudio-core.c:795
+#: src/ffaudio/ffaudio-core.c:718
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1333,9 +1181,9 @@
 "libavcodec %s (%s)\n"
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
-msgstr ""
+msgstr "Module de décodage audio multi-format pour Audacious basé sur l'ensemble de bibliothèques multimédia FFmpeg (http://www.ffmpeg.org/)\nTous droits réservés © 2000-2009 Fabrice Bellard, et al.\n\nModule pour Audacious par :\n William Pitcock <nenolod@nenolod.net>,\n Matti Hämäläinen <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:809
+#: src/ffaudio/ffaudio-core.c:732
 msgid "About FFaudio Plugin"
 msgstr "À propos du module « FFaudio »"
 
@@ -1343,207 +1191,207 @@
 msgid "About FileWriter-Plugin"
 msgstr "À propos du module « FileWriter »"
 
-#: src/filewriter/filewriter.c:455
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "Configuration du module « File Writer »"
 
-#: src/filewriter/filewriter.c:467
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "Format du fichier de sortie :"
 
-#: src/filewriter/filewriter.c:485
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "Configurer"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "Enregistrer dans le répertoire d'origine"
 
-#: src/filewriter/filewriter.c:505
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
-msgstr "Enregistrer dans un répertoire personnel"
+msgstr "Enregistrer dans un répertoire personnalisé"
 
-#: src/filewriter/filewriter.c:515
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "Dossier de destination :"
 
-#: src/filewriter/filewriter.c:519
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr "Choix d'un répertoire"
 
-#: src/filewriter/filewriter.c:538
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
-msgstr "Déterminer le nom du fichier à partir :"
+msgstr "Déterminer le nom du fichier à partir de :"
 
-#: src/filewriter/filewriter.c:541
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
-msgstr "des métadonnées du fichier d'origine"
+msgstr "labels du fichier d'origine"
 
-#: src/filewriter/filewriter.c:547
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
-msgstr "du nom du fichier d'origine"
+msgstr "nom du fichier d'origine"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "Conserver l'extension du nom de fichier"
 
-#: src/filewriter/filewriter.c:572
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr "Ajouter le numéro de la piste au début du nom du fichier"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "Auto"
 
 #: src/filewriter/mp3.c:38
 msgid "Joint Stereo"
-msgstr ""
+msgstr "Stéréo combiné"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "Stéréo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:712
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
-msgstr "Configuration de l'encodeur « MP3 »"
+msgstr "Configuration de l'encodeur MP3"
 
-#: src/filewriter/mp3.c:735
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "Qualité de l'algorithme :"
 
-#: src/filewriter/mp3.c:760
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr "Fréquence d'échantillonnage de sortie :"
 
-#: src/filewriter/mp3.c:788
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:795
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "Débit binaire / Taux de compression :"
 
-#: src/filewriter/mp3.c:819
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "Débit binaire (kbps)"
 
-#: src/filewriter/mp3.c:852
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr "Taux de compression :"
 
-#: src/filewriter/mp3.c:876
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr "Mode audio :"
 
-#: src/filewriter/mp3.c:901
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "Options diverses :"
 
-#: src/filewriter/mp3.c:912
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr "Forcer le respect strict des normes ISO"
 
-#: src/filewriter/mp3.c:923
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "Protection contre les erreurs"
 
-#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "Qualité"
 
-#: src/filewriter/mp3.c:945
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
-msgstr "Activer VBR/ABR"
+msgstr "Activer DBV/DBM (Débit Binaire Variable/Débit Binaire Moyen)"
 
-#: src/filewriter/mp3.c:955
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "Type :"
 
-#: src/filewriter/mp3.c:988
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
-msgstr "Options VBR :"
+msgstr "Options DBV (Débit Binaire Variable) :"
 
-#: src/filewriter/mp3.c:1004
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "Débit binaire minimal (kbps) :"
 
-#: src/filewriter/mp3.c:1031
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "Débit binaire maximal (kbps) :"
 
-#: src/filewriter/mp3.c:1054
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr "Forcer de manière stricte le débit binaire minimal"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
-msgstr "Options ABR :"
+msgstr "Options DBM (Débit Binaire Moyen) :"
 
-#: src/filewriter/mp3.c:1076
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "Débit binaire moyen (kbps) :"
 
-#: src/filewriter/mp3.c:1104
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
-msgstr "Niveau de qualité VBR :"
+msgstr "Niveau de qualité BDV (Débit Binaire Variable) :"
 
-#: src/filewriter/mp3.c:1123
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
-msgstr "Ne pas écrire l'en-tête VBR « Xing »"
+msgstr "Ne pas écrire l'en-tête BDV (Débit Binaire Variable) « Xing »"
 
-#: src/filewriter/mp3.c:1137
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
-msgstr "VBR/ABR"
+msgstr "DBV/DBM (Débit Binaire Variable/Débit Binaire Moyen)"
 
-#: src/filewriter/mp3.c:1147
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "Paramètres des trames :"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
-msgstr "Marquer comme soumises aux droits d'utilisation"
+msgstr "Marquer comme soumises aux droits d'auteur"
 
-#: src/filewriter/mp3.c:1170
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
-msgstr "Marquer comme originales"
+msgstr "Marquer comme originale"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "Paramètres ID3 :"
 
-#: src/filewriter/mp3.c:1193
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
-msgstr "Forcer l'ajout de la version 2 des métadonnées"
+msgstr "Forcer l'ajout de la version 2 des labels"
 
-#: src/filewriter/mp3.c:1203
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
-msgstr "Ajouter uniquement la version 1 des métadonnées"
+msgstr "Ajouter uniquement la version 1 des labels"
 
-#: src/filewriter/mp3.c:1210
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
-msgstr "Ajouter uniquement la version 2 des métadonnées"
+msgstr "Ajouter uniquement la version 2 des labels"
 
-#: src/filewriter/mp3.c:1231
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
-msgstr "Métadonnées"
+msgstr "Labels"
 
-#: src/filewriter/vorbis.c:236
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
-msgstr "Confogiration de l'encodeur « Vorbis »"
+msgstr "Configuration de l'encodeur Vorbis"
 
-#: src/filewriter/vorbis.c:256
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "Niveau de qualité (0 - 10) :"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
-msgstr "À propos du module « FLAC »"
+msgstr "À propos du module FLAC"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1551,13 +1399,7 @@
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr ""
-"\n"
-"\n"
-"Code original :\n"
-"Ralf Ertzinger <ralf@skytale.net>\n"
-"\n"
-"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\nCode original par\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
@@ -1570,40 +1412,17 @@
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-msgstr ""
-"Module « Gnome Shortcut »\n"
-"\n"
-"Ce module permet de contrôler le lecteur avec les raccourcis de « Gnome ».\n"
-"\n"
-"Droits d'utilisation (2007-2008) :\n"
-"Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-
-#: 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:271
-msgid "Add Files"
-msgstr "Ajouter des fichiers"
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr "Audacious2"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr "Interface gnt"
+msgstr "Module « Gnome Shortcut »\nVous permet de contrôler le lecteur avec les raccourcis de Gnome.\n\nTous droits réservés © 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
 
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Place dans la liste"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "Titre"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
 msgstr "Artiste"
 
@@ -1611,7 +1430,7 @@
 msgid "Year"
 msgstr "Année"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
 msgstr "Album"
 
@@ -1621,7 +1440,7 @@
 
 #: src/gtkui/columns.c:37
 msgid "Queue position"
-msgstr "Position dans la queue"
+msgstr "Position dans la file"
 
 #: src/gtkui/columns.c:38
 msgid "Length"
@@ -1629,7 +1448,7 @@
 
 #: src/gtkui/columns.c:38
 msgid "File path"
-msgstr "Emplacement du fichier"
+msgstr "Chemin d'accès du fichier"
 
 #: src/gtkui/columns.c:38
 msgid "File name"
@@ -1637,11 +1456,11 @@
 
 #: src/gtkui/columns.c:38
 msgid "Custom title"
-msgstr "Titre formaté"
+msgstr "Titre personnalisé"
 
 #: src/gtkui/columns.c:39
 msgid "Bitrate"
-msgstr "Débit binaire (kbps)"
+msgstr "Débit binaire"
 
 #: src/gtkui/columns.c:278
 msgid "Choose Columns"
@@ -1675,243 +1494,251 @@
 msgid "Undock"
 msgstr "Séparer"
 
-#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
 msgstr "Désactiver"
 
-#: src/gtkui/menus.c:130
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
 msgstr "Ouvrir des fichiers"
 
-#: src/gtkui/menus.c:131
-msgid "Open _URL ..."
-msgstr "Ouvrir un adresse"
-
 #: src/gtkui/menus.c:132
-msgid "_Add File ..."
-msgstr "Ajouter des fichiers"
+msgid "Open _URL ..."
+msgstr "Ouvrir un adresse _URL..."
 
 #: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "_Ajouter des fichiers..."
+
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
-msgstr "Ajouter une adresse"
+msgstr "Ajouter une adresse U_RL..."
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
-msgstr "À propos"
+msgstr "À_propos de..."
 
-#: src/gtkui/menus.c:136
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
-msgstr "_Préférences"
+msgstr "_Préférences..."
 
-#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: src/gtkui/menus.c:140
+#: src/gtkui/menus.c:141
 msgid "_Play"
-msgstr "Lecture"
+msgstr "_Lecture"
 
-#: src/gtkui/menus.c:141
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
-msgstr "Pause"
+msgstr "Paus_e"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:143
 msgid "_Stop"
-msgstr "Stop"
+msgstr "_Stop"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
-msgstr "Précédent"
+msgstr "Pré_cédent"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:145
 msgid "_Next"
-msgstr "Suivant"
+msgstr "_Suivant"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
-msgstr "Mode « répétition »"
+msgstr "_Répéter"
 
-#: src/gtkui/menus.c:147
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
-msgstr "Mode « lecture aléatoire »"
+msgstr "L_ecture aléatoire"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
-msgstr "Ne pas avancer dans la liste de lecture"
+msgstr "N_e pas avancer dans la liste de lecture"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
-msgstr "Arrêter après le titre en cours de lecture."
+msgstr "Arrêter _après le titre en cours"
 
-#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
-msgstr "Informations sur le morceau"
+msgstr "Information sur le morceau..."
 
-#: src/gtkui/menus.c:152
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
-msgstr "Sauter au temps…"
+msgstr "Sauter au _temps…"
 
-#: src/gtkui/menus.c:153
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
-msgstr "Sauter à la chanson"
+msgstr "_Sauter au morceau..."
 
-#: src/gtkui/menus.c:156
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
-msgstr "Par numéro de piste"
+msgstr "Par _numéro de piste"
 
-#: src/gtkui/menus.c:157
+#: src/gtkui/menus.c:158
 msgid "By _Title"
-msgstr "Par titre"
+msgstr "Par _titre"
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
-msgstr "Par artiste"
+msgstr "Par _artiste"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
-msgstr "Par album"
+msgstr "Par a_lbum"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
-msgstr "Par date de parution"
+msgstr "Par _date de parution"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
-msgstr "Par emplacement de fichier"
+msgstr "Par chemin d'accès de _fichier"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
-msgstr "Par titre formaté"
+msgstr "Par _titre personnalisé"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
-msgstr "Inverser l'ordre"
+msgstr "I_nverser l'ordre"
 
-#: src/gtkui/menus.c:165
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
-msgstr "Mélanger aléatoirement"
+msgstr "Ordre _aléatoire"
 
-#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
 msgstr "_Réactualiser"
 
 #: src/gtkui/menus.c:170
-msgid "_Sort"
-msgstr "Trier"
+msgid "Remove _Unavailable Files"
+msgstr "Retirer les fichiers non disponibles"
 
 #: src/gtkui/menus.c:172
+msgid "_Sort"
+msgstr "_Trier"
+
+#: src/gtkui/menus.c:174
 msgid "_New"
 msgstr "_Nouvelle liste de lecture"
 
-#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
 msgstr "_Fermer"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:177
 msgid "_Import ..."
 msgstr "_Importer"
 
-#: src/gtkui/menus.c:176
+#: src/gtkui/menus.c:178
 msgid "_Export ..."
 msgstr "_Exporter"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:180
 msgid "_Playlist Manager ..."
-msgstr "Gestionnaire de listes de lecture"
+msgstr "_Gestionnaire de liste de lecture..."
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:181
 msgid "_Queue Manager ..."
-msgstr "Gestionnaire de files d'attentes"
+msgstr "_Gestionnaire de file d'attente..."
 
-#: src/gtkui/menus.c:182
+#: src/gtkui/menus.c:184
 msgid "Volume _Up"
-msgstr "Augmenter le volume"
+msgstr "Augmenter le _volume"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
-msgstr "Réduire le volume"
+msgstr "Réduire le _volume"
 
-#: src/gtkui/menus.c:185
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
-msgstr "Égaliseur"
+msgstr "_Égaliseur"
 
-#: src/gtkui/menus.c:187
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
 msgstr "E_ffets audio"
 
-#: src/gtkui/menus.c:190
+#: src/gtkui/menus.c:192
 msgid "_Interface"
 msgstr "_Interface"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Visualisations"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
-msgstr "Afficher la barre de menu"
+msgstr "Afficher la barre de _menu"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
-msgstr "Afficher l'espace informatif"
+msgstr "Afficher la barre d'i_nformation"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
-msgstr "Afficher la barre d'état"
+msgstr "Afficher la barre d'_état"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
-msgstr "Afficher le titre des colonnes"
+msgstr "Afficher les _titres des colonnes"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
-msgstr "Choisir les colonnes à afficher"
+msgstr "Choisir les _colonnes..."
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
 msgstr "Afficher le morceau courant au changement de pistes"
 
-#: src/gtkui/menus.c:201
+#: src/gtkui/menus.c:204
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:205
 msgid "_Playback"
 msgstr "Lecture"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
-msgstr "Liste de lecture"
+msgstr "L_iste de lecture"
 
-#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
-msgstr "Périphériques"
+msgstr "_Services"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:208
 msgid "_Output"
-msgstr "Sortie"
+msgstr "_Sortie"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:209
 msgid "_View"
-msgstr "Affichage"
+msgstr "_Affichage"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
-msgstr "Mettre/enlever dans la file"
+msgstr "_Mettre/enlever dans la file"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
-msgstr "Couper"
+msgstr "Cou_per"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:217
 msgid "_Copy"
-msgstr "Copier"
+msgstr "_Copier"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:218
 msgid "_Paste"
-msgstr "Coller"
+msgstr "_Coller"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:219
 msgid "Select _All"
-msgstr "Sélectionner tout"
+msgstr "Sélectionner _tout"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:224
 msgid "_Rename"
 msgstr "_Renommer"
 
@@ -1919,39 +1746,43 @@
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
 #: src/gtkui/ui_gtk.c:162
 msgid "Buffering ..."
-msgstr ""
+msgstr "Mise en mémoire tampon..."
 
-#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr "Erreur"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Fermer"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.c:106
+#: src/gtkui/ui_statusbar.c:109
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canaux"
 
-#: src/gtkui/ui_statusbar.c:121
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
@@ -1986,7 +1817,7 @@
 
 #: src/hotkey/gui.c:78
 msgid "Mute"
-msgstr "Rendre le volume nul"
+msgstr "Muet"
 
 #: src/hotkey/gui.c:79
 msgid "Volume Up"
@@ -1996,9 +1827,9 @@
 msgid "Volume Down"
 msgstr "Réduire le volume"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
-msgstr "Aller au fichier..."
+msgstr "Aller au fichier"
 
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
@@ -2006,31 +1837,26 @@
 
 #: src/hotkey/gui.c:83
 msgid "Show On-Screen-Display"
-msgstr "Activer l'affichage à l'écran (« OSD »)"
+msgstr "Activer l'affichage à l'écran"
 
 #: src/hotkey/gui.c:84
 msgid "Toggle Repeat"
-msgstr "Bascule le mode « répétition »"
+msgstr "Bascule le mode de répétition"
 
 #: src/hotkey/gui.c:85
 msgid "Toggle Shuffle"
-msgstr "Bascule le mode « lecture aléatoire »"
+msgstr "Bascule le mode de lecture aléatoire"
 
 #: src/hotkey/gui.c:95
 msgid "(none)"
-msgstr "(néant)"
+msgstr "(aucun)"
 
 #: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr ""
-"Il n'est pas recommandé d'associer les boutons\n"
-"de la souris principale sans touche de séquence\n"
-"(« Ctrl », « Maj », « Shift », etc.)\n"
-"\n"
-"Souhaitez-vous quand même poursuivre ?"
+msgstr "Il n'est pas recommandé d'associer les boutons\nde la souris principale sans touche de séquence\n(« Ctrl », « VerrMaj », « Maj », etc...)\n\nSouhaitez-vous poursuivre ?"
 
 #: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
@@ -2044,11 +1870,7 @@
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr ""
-" \n"
-" Appuyez sur une combinaison de touches, à l'intérieur d'un champ textuel.\n"
-" Vous pouvez aussi créer des associations avec les boutons de la souris.\n"
-" "
+msgstr "Appuyez sur une combinaison de touches à l'intérieur d'un champ textuel.\nVous pouvez aussi créer des associations avec les boutons de la souris.\n "
 
 #: src/hotkey/gui.c:405
 msgid "Hotkeys:"
@@ -2080,23 +1902,7 @@
 "\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
-msgstr ""
-"Module « Global Hotkey »\n"
-"\n"
-"Permet de contrôler le lecteur à l'aide de combinaisons de touches\n"
-"ou des fonctions multimédia du clavier.\n"
-"\n"
-"Droits d'utilisation (2007-2008) : Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-"\n"
-"Ont contribué :\n"
-"\n"
-"Vladimir Paskov <vlado.paskov@gmail.com> (Droits d'utilisation 2006-2007)\n"
-"Ville Syrjälä <syrjala@sci.fi> (Droits d'utilisation 2000-2002)\n"
-"Bryn Davies <curious@ihug.com.au>\n"
-"Jonathan A. Davis <davis@jdhouse.org>\n"
-"Jeremy Tan <nsx@nsx.homeip.net>\n"
-"\n"
+msgstr "Module « Global Hotkey »\nPermet de contrôler le lecteur à l'aide de combinaisons de touches\nou des fonctions multimédia du clavier.\n\nTous droits réservés © 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nOnt contribué :\nTous droits réservés © 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nTous droits réservés © 200-2002 Ville Syrjälä <syrjala@sci.fi>\n»»»Bryn Davies <curious@ihug.com.au>\n»»»Jonathan A. Davis <davis@jdhouse.org>\n»»»Jeremy Tan <nsx@nsx.homeip.net>\n"
 
 #: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
@@ -2120,9 +1926,9 @@
 
 #: src/jack/configure.c:128
 msgid "Enable debug printing"
-msgstr "Activer le mode de débogage"
+msgstr "Activer l'impression de débogage"
 
-#: src/jack/jack.c:422
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2131,156 +1937,132 @@
 "\n"
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
-msgstr ""
-"Pilote « Jack » pour XMMS 0.17\n"
-"\n"
-"xmms-jack.sf.net\n"
-"\n"
-"Chris Morgan<cmorgan@alum.wpi.edu>\n"
-"\n"
-"Rétroportage pour Audacious effectué par :\n"
-"Giacomo Lozito from develia.org"
+msgstr "Pilote « xmms-jack » 0.17\n\nxmms-jack.sourceforge.net\nChris Morgan<cmorgan@alum.wpi.edu>\n\nPortage pour Audacious par Giacomo Lozito from develia.org"
 
-#: src/jack/jack.c:427
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
-msgstr "À propos du module « JACK » 0.17"
+msgstr "À propos du module JACK 0.17"
 
-#: src/ladspa/plugin.c:414
+#: src/ladspa/plugin.c:415
 msgid "About LADSPA Host"
-msgstr ""
+msgstr "À propos de l'hôte LADSPA"
 
-#: src/ladspa/plugin.c:515
+#: src/ladspa/plugin.c:516
 #, c-format
 msgid "%s Settings"
-msgstr ""
+msgstr "Réglages %s"
 
-#: src/ladspa/plugin.c:583
+#: src/ladspa/plugin.c:584
 msgid "LADSPA Host Settings"
-msgstr ""
+msgstr "Réglages de l'hôte ADSPA"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:593
 msgid "Module paths:"
-msgstr ""
+msgstr "Chemins de recherche des greffons :"
 
-#: src/ladspa/plugin.c:597
+#: src/ladspa/plugin.c:598
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr ""
+msgstr "Séparez les différents chemins par : (deux points).\n Les greffons sont recherchés dans ces chemins ainsi que ceux de de la variable LADSPA_PATH.\nAprès avoir ajouté de nouveaux chemins, pressez Entrée pour mettre à jour les greffons disponibles."
 
-#: src/ladspa/plugin.c:613
+#: src/ladspa/plugin.c:614
 msgid "Available plugins:"
-msgstr "Greffons disponibles"
+msgstr "Greffons disponibles :"
 
-#: src/ladspa/plugin.c:625
+#: src/ladspa/plugin.c:626
 msgid "Enable"
 msgstr "Activer"
 
-#: src/ladspa/plugin.c:631
+#: src/ladspa/plugin.c:632
 msgid "Enabled plugins:"
-msgstr ""
+msgstr "Greffons activés :"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:647
 msgid "Settings"
-msgstr ""
+msgstr "Paramètres"
 
-#: src/lyricwiki/lyricwiki.c:227
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
-msgstr ""
-"\n"
-"Recherche les paroles"
+msgstr "\nRecherche des paroles..."
 
-#: src/lyricwiki/lyricwiki.c:250
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
-msgstr ""
-"\n"
-"Se connecte à lyrics.wikia.com..."
+msgstr "\nConnexion à lyrics.wikia.com en cours..."
 
-#: src/lyricwiki/lyricwiki.c:338
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
-msgstr ""
-"\n"
-"Les paroles n'ont pas été trouvées."
+msgstr "\nLes paroles n'ont pas été trouvées."
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
-msgstr "À propos du module « Métronome »"
+msgstr "À propos du module « Metronom »"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr ""
-"« Métronome » est un générateur de pulsations écrit par\n"
-"Martin Strauss <mys@faveve.uni-stuttgart.de>.\n"
-"\n"
-"Pour l'utiliser, ajouter une adresse du type :\n"
-"tact://Battements*Numérateur/Dénominateur\n"
-"\n"
-"Exemples :\n"
-"\n"
-"'tact://77' produira 77 battements par minute\n"
-"'tact://60*3/4' produira 60 battements par minute (mesure à 3/4)"
+msgstr "« Metronom » est un générateur de pulsations écrit par\nMartin Strauss <mys@faveve.uni-stuttgart.de>.\n\nPour l'utiliser, ajouter une adresse URL du type :\ntact://Battements*Numérateur/Dénominateur\nExemples : tact://77 produira 77 battements/mn.\nou bien tact://60*3/4' produira 60 battements/mn. (mesure à 3/4)"
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Métronome : %d bpm"
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Métronome : %d bpm %d/%d"
 
 #: src/mixer/plugin.c:64
 msgid "About Channel Mixer"
-msgstr ""
+msgstr "À propos du module de mélange des canaux"
 
 #: src/mixer/plugin.c:93
 msgid "Channel Mixer Settings"
-msgstr ""
+msgstr "Préférences du module de mélange des canaux"
 
 #: src/mixer/plugin.c:102
 msgid "Output channels:"
-msgstr ""
+msgstr "Canaux de sortie :"
 
 #: src/mixer/plugin.c:112
 msgid "Changes take effect at the next song change."
-msgstr ""
+msgstr "Les changements prendront effet lors du prochain changement de morceau"
 
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
-msgstr "Son d'ambiance"
+msgstr "Son ambiophonique"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
-msgstr "Transfert en cours..."
+msgstr "Téléversement en cours..."
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
-msgstr "Envoyer vers le périphérique MTP"
+msgstr "Téléversement vers le périphérique MTP"
 
-#: src/mtp_up/mtp.c:311
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
 msgstr "Déconnecter le périphérique MTP"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
-msgstr "Arreté"
+msgstr "Arrêté"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
-msgstr "Audacious n'est pas en train de lire de la musique."
+msgstr "Audacious n'est pas en train de lire de musique."
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -2290,11 +2072,7 @@
 msgid ""
 " by Christian Birchinger <joker@netswarm.net>\n"
 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
-msgstr ""
-" \n"
-"\n"
-"Écrit par Christian Birchinger <joker@netswarm.net>,\n"
-"à partir du module pour XMMS de Håvard Kvål <havardk@xmms.org>"
+msgstr " Écrit par Christian Birchinger <joker@netswarm.net>,\nà partir du module pour XMMS de Håvard Kvål <havardk@xmms.org>"
 
 #: src/null/null.c:68
 msgid "About Null Output"
@@ -2308,33 +2086,37 @@
 msgid "Run in real time"
 msgstr "Utiliser en temps réel"
 
-#: src/oss4/configure.c:76
+#: src/oss4/configure.c:81
 msgid "1. Default device"
 msgstr "1. Périphérique par défaut"
 
-#: src/oss4/configure.c:132
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
-msgstr "Préférences du module de sortie « OSS4 »"
+msgstr "Préférences du module de sortie OSS4"
 
-#: src/oss4/configure.c:144 src/OSS/configure.c:194
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "Périphérique audio :"
 
-#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "Utiliser un autre périphérique :"
 
-#: src/oss4/configure.c:187
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
-msgstr "Conserver le volume, d'une session à l'autre"
+msgstr "Conserver le volume d'une session à l'autre"
 
-#: src/oss4/configure.c:191
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
-msgstr "Activer les conversions de format logicielles de « OSS »."
+msgstr "Activer les conversions de format du logiciel OSS."
+
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Active le mode exclusif pour empêcher le mixage virtuel."
 
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
-msgstr "À propos du module « OSS4 »"
+msgstr "À propos du module OSS4"
 
 #: src/oss4/utils.c:211
 msgid "OSS4 error"
@@ -2347,7 +2129,7 @@
 
 #: src/OSS/configure.c:178
 msgid "OSS Driver configuration"
-msgstr "Configuration du pilote « OSS »"
+msgstr "Configuration du pilote OSS"
 
 #: src/OSS/configure.c:281
 msgid "Devices"
@@ -2355,7 +2137,7 @@
 
 #: src/OSS/configure.c:283
 msgid "Buffering:"
-msgstr "Tampon"
+msgstr "Mise en mémoire-tampon :"
 
 #: src/OSS/configure.c:296
 msgid "Pre-buffer (percent):"
@@ -2363,7 +2145,7 @@
 
 #: src/OSS/configure.c:307
 msgid "Buffering"
-msgstr "Tampon"
+msgstr "Mise en mémoire-tampon"
 
 #: src/OSS/configure.c:308
 msgid "Mixer Settings:"
@@ -2371,19 +2153,19 @@
 
 #: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
-msgstr "Contrôle du volume via le canal « maître » au lieu du canal « PCM »"
+msgstr "Contrôle du volume via le canal Master au lieu du canal PCM"
 
 #: src/OSS/configure.c:320
 msgid "Mixer"
 msgstr "Mélangeur audio"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
-msgstr "À propos du pilote « OSS »"
+msgstr "À propos du pilote OSS"
 
-#: src/pulse_audio/pulse_audio.c:687
+#: src/pulse_audio/pulse_audio.c:677
 msgid "About Audacious PulseAudio Output Plugin"
-msgstr "À propos du module de sortie « PulseAudio » pour Audacious"
+msgstr "À propos du module de sortie PulseAudio pour Audacious"
 
 #: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
@@ -2405,31 +2187,31 @@
 msgid "Method:"
 msgstr "Méthode :"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: src/scrobbler/configure.c:143
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "Services"
 
-#: src/scrobbler/configure.c:165
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: src/scrobbler/configure.c:171
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
-msgstr "Adresse Scrobbler :"
+msgstr "Adresse URL Scrobbler :"
 
-#: src/scrobbler/configure.c:211
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:238
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
@@ -2438,10 +2220,7 @@
 "Audacious AudioScrobbler Plugin\n"
 "\n"
 "Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
-msgstr ""
-"Module « AudioScrobbler » pour Audacious\n"
-"\n"
-"Initialement créé par Audun Hove <audun@nlc.no> et Pipian <pipian@pipian.com>\n"
+msgstr "Module « AudioScrobbler » pour Audacious\n\nInitialement créé par Audun Hove <audun@nlc.no> et Pipian <pipian@pipian.com>\n"
 
 #: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
@@ -2455,25 +2234,57 @@
 msgid "SDL error"
 msgstr "Erreur SDL"
 
-#: src/skins/plugin.c:165
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Genre"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Bibliothèque"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Créer une liste de lecture"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Ajouter à la liste de lecture"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Rechercher dans la médiathèque"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "Pour importer votre médiathèque dans Audacious, choisissez un dossier, puis utilisez l'icône de rafraîchissement."
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Veuillez patienter…"
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Choisissez un dossier"
+
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "À propos de l'interface à thème"
 
-#: src/skins/plugin.c:166
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
-msgstr ""
-"Droits d'utilisation : Tomasz Moń <desowin@gmail.com> (2008)\n"
-"\n"
+msgstr "Tous droits réservés © 2008 Tomasz Moń <desowin@gmail.com>\n\n"
 
 #: src/skins/skins_cfg.c:207
 msgid "_Player:"
-msgstr "F_enêtre principale"
+msgstr "_Lecteur"
 
 #: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
-msgstr "Police de la fenêtre principale du lecteur"
+msgstr "Police de caractères de la fenêtre principale du lecteur :"
 
 #: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
@@ -2481,15 +2292,15 @@
 
 #: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
-msgstr "Police de la liste de lecture"
+msgstr "Police de caractères de la liste de lecture"
 
 #: src/skins/skins_cfg.c:215
 msgid "_Fonts"
-msgstr "_Polices"
+msgstr "_Polices de caractères"
 
 #: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr "Utiliser des polices bitmap (supporte seulement les caractères ASCII)"
+msgstr "Utiliser des polices de caractères bitmap (seul ASCII est pris en charge)"
 
 #: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
@@ -2551,81 +2362,114 @@
 msgid "Audacious Equalizer"
 msgstr "Égaliseur d'Audacious"
 
-#: src/skins/ui_equalizer.c:896
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
 msgstr "Préréglages"
 
-#: src/skins/ui_main.c:443
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Charger un préréglage"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Charger le réglage automatique"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Charger le réglage de l'égaliseur"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Enregistrer le préréglage"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Enregistrement du réglage automatique"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Enregistrement du réglage de l'égaliseur"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Effacer un préréglage."
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Effacer le réglage automatique"
+
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:451
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:458
+#: src/skins/ui_main.c:459
 msgid "surround"
-msgstr "son d'ambiance"
+msgstr "son ambiophonique"
 
-#: src/skins/ui_main.c:806
+#: src/skins/ui_main.c:807
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Aller à %d:%-2.2d/%d:%-2.2d"
 
-#: src/skins/ui_main.c:827
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume : %d%%"
 
-#: src/skins/ui_main.c:850
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance : %d%% gauche"
 
-#: src/skins/ui_main.c:852
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balance : centre"
 
-#: src/skins/ui_main.c:854
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance : %d%% droite"
 
-#: src/skins/ui_main.c:980
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Menu des options"
 
-#: src/skins/ui_main.c:984
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Annuler « Toujours au premier plan »"
 
-#: src/skins/ui_main.c:986
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Activer « Toujours au premier plan »"
 
-#: src/skins/ui_main.c:989
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Informations sur le fichier"
 
-#: src/skins/ui_main.c:994
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
-msgstr "Menu des effets visuels"
+msgstr "Menu des visualisations"
 
-#: src/skins/ui_main.c:1648
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
 msgstr "Mode « Fichier unique »."
 
-#: src/skins/ui_main.c:1650
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
 msgstr "Mode « Liste de lecture »."
 
-#: src/skins/ui_main.c:1672
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr "Arrêter après le titre en cours de lecture."
 
-#: src/skins/ui_main.c:1674
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
-msgstr "Ne pas arrêter après le titre en cours de lecture."
+msgstr "N'arrête pas après le morceau en cours.."
 
 #: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
@@ -2633,7 +2477,7 @@
 
 #: 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"
+msgstr "Arrêter après le morceau en cours"
 
 #: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
@@ -2641,11 +2485,11 @@
 
 #: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
 msgid "Repeat"
-msgstr "Mode « répétition »"
+msgstr "Répéter"
 
 #: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
 msgid "Shuffle"
-msgstr "Mode « lecture aléatoire »"
+msgstr "Lecture aléatoire"
 
 #: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
 msgid "No Playlist Advance"
@@ -2657,7 +2501,7 @@
 
 #: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
-msgstr "Montrer la liste de lecture"
+msgstr "Montrer l'éditeur de liste de lecture"
 
 #: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
@@ -2722,15 +2566,15 @@
 
 #: src/skins/ui_manager.c:133
 msgid "Dot Scope"
-msgstr "Points"
+msgstr "Oscilloscope à points"
 
 #: src/skins/ui_manager.c:134
 msgid "Line Scope"
-msgstr "Lignes"
+msgstr "Oscilloscope en lignes"
 
 #: src/skins/ui_manager.c:135
 msgid "Solid Scope"
-msgstr "Vagues"
+msgstr "Oscilloscope en vagues"
 
 #: src/skins/ui_manager.c:141
 msgid "Ice"
@@ -2742,7 +2586,7 @@
 
 #: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
-msgstr "Très lente"
+msgstr "La plus lente"
 
 #: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
 msgid "Slow"
@@ -2758,7 +2602,7 @@
 
 #: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
 msgid "Fastest"
-msgstr "Très rapide"
+msgstr "La plus rapide"
 
 #: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
@@ -2782,27 +2626,27 @@
 
 #: src/skins/ui_manager.c:196
 msgid "Visualization"
-msgstr "Effets visuels"
+msgstr "Visualisations"
 
 #: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
-msgstr "Type d'effet visuel"
+msgstr "Mode de visualisation"
 
 #: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
-msgstr "Mode « analyseur »"
+msgstr "Mode analyseur"
 
 #: src/skins/ui_manager.c:199
 msgid "Scope Mode"
-msgstr "Mode « oscilloscope »"
+msgstr "Mode oscilloscope"
 
 #: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
-msgstr "Mode « spectrogramme »"
+msgstr "Mode spectrogramme"
 
 #: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
-msgstr "Mode « VU en fenêtre réduite »"
+msgstr "Mode VU en fenêtre réduite"
 
 #: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
@@ -2822,23 +2666,23 @@
 
 #: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
-msgstr "Liste suivante"
+msgstr "Sélectionner la prochaine liste de lecture"
 
 #: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
-msgstr "Liste précédente"
+msgstr "Sélectionner la liste de de lecture"
 
 #: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
 msgid "Delete Playlist"
-msgstr "Supprimer la liste"
+msgstr "Supprimer la liste de lecture"
 
 #: src/skins/ui_manager.c:222
 msgid "Import Playlist"
-msgstr "Importer une liste de lecture"
+msgstr "Importer la 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."
+msgstr "Importe un fichier de liste de lecture dans la liste active."
 
 #: src/skins/ui_manager.c:226
 msgid "Export Playlist"
@@ -2854,7 +2698,7 @@
 
 #: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Actualise les métadonnées associées à une entrée de la liste."
+msgstr "Actualise les métadonnées associées à une entrée de la liste de lecture."
 
 #: src/skins/ui_manager.c:233
 msgid "Playlist Manager"
@@ -2878,11 +2722,11 @@
 
 #: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
-msgstr "Ajouter un flux Internet..."
+msgstr "Ajouter une adresse Internet..."
 
 #: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
-msgstr "Ajoute un flux distant à la liste de lecture."
+msgstr "Ajoute une piste distante à la liste de lecture."
 
 #: src/skins/ui_manager.c:247
 msgid "Add Files..."
@@ -2900,9 +2744,7 @@
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr ""
-"Effectue une recherche dans la liste de lecture et sélectionne des entrées "
-"en fonction de critères définis."
+msgstr "Recherche dans la liste de lecture et sélectionne des entrées en fonction de critères définis."
 
 #: src/skins/ui_manager.c:257
 msgid "Invert Selection"
@@ -2910,7 +2752,7 @@
 
 #: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
-msgstr "Inverse les entrées sélectionnées et les entrées non sélectionnées."
+msgstr "Inverse les entrées sélectionnées et les non sélectionnées."
 
 #: src/skins/ui_manager.c:261
 msgid "Select All"
@@ -2918,7 +2760,7 @@
 
 #: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
-msgstr "Sélectionne toutes les entrées de la liste."
+msgstr "Sélectionne toutes les entrées de la liste de lecture."
 
 #: src/skins/ui_manager.c:265
 msgid "Select None"
@@ -2942,20 +2784,19 @@
 
 #: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
-msgstr "Vide la file d'attente associée à la liste de lecture active."
+msgstr "Vide la file d'attente associée à cette liste de lecture."
 
 #: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
-msgstr "Effacer les fichiers inexistants"
+msgstr "Effacer les fichiers non disponibles"
 
 #: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
-msgstr ""
-"Efface de la liste de lecture les fichiers qui ne sont plus disponibles."
+msgstr "Efface de la liste de lecture les fichiers non disponibles."
 
 #: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
-msgstr "Effacer les éléments redondants"
+msgstr "Effacer les doublons"
 
 #: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
 #: src/skins/ui_manager.c:347
@@ -2964,7 +2805,7 @@
 
 #: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
-msgstr "Efface les entrées redondantes, en fonction de leur titre."
+msgstr "Efface les doublons de la liste de lecture en fonction de leur titre."
 
 #: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
 #: src/skins/ui_manager.c:359
@@ -2973,16 +2814,16 @@
 
 #: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Efface les entrées redondantes, en fonction de leur nom de fichier."
+msgstr "Efface les doublons de la liste de lecture en fonction de leur nom de fichier."
 
 #: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
 #: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
-msgstr "Par chemin et nom de fichier"
+msgstr "Par chemin d'accès + nom de fichier"
 
 #: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Efface les entrées redondantes, en fonction de leur chemin complet."
+msgstr "Efface les doublons de la liste de lecture en fonction de leur chemin d'accès complet."
 
 #: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
@@ -3022,7 +2863,7 @@
 
 #: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
-msgstr "Trie la liste, en fonction du titre des entrées."
+msgstr "Trie la liste par titre."
 
 #: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
@@ -3038,15 +2879,15 @@
 
 #: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
-msgstr "Trie la liste, en fonction de l'artiste."
+msgstr "Trie la liste par artiste."
 
 #: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
-msgstr "Trie la liste, en fonction du nom de fichier des entrées."
+msgstr "Trie la liste par nom de fichier."
 
 #: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
-msgstr "Trie la liste, en fonction du chemin complet des entrées."
+msgstr "Trie la liste par chemin d'accès complet."
 
 #: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
@@ -3054,7 +2895,7 @@
 
 #: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
-msgstr "Trie la liste, en fonction de la date de modification des entrées."
+msgstr "Trie la liste par date de modification."
 
 #: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
@@ -3062,7 +2903,7 @@
 
 #: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
-msgstr "Trie la liste, en fonction du numéro des pistes."
+msgstr "Trie la liste par numéro de piste."
 
 #: src/skins/ui_manager.c:345
 msgid "Sort Selected"
@@ -3078,7 +2919,7 @@
 
 #: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
-msgstr "Afficher les détails"
+msgstr "Afficher les détails de la piste"
 
 #: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
@@ -3090,31 +2931,31 @@
 
 #: src/skins/ui_manager.c:395
 msgid "Play File"
-msgstr "Lire un fichier..."
+msgstr "Lire le fichier"
 
 #: src/skins/ui_manager.c:396
 msgid "Load and play a file"
-msgstr "Charge et lit un fichier."
+msgstr "Charger et lire un fichier."
 
 #: src/skins/ui_manager.c:398
 msgid "Play Location"
-msgstr "Lire un emplacement..."
+msgstr "Lire un emplacement"
 
 #: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
-msgstr "Lit les média de l'emplacement sélectionné."
+msgstr "Lire les média depuis l'emplacement sélectionné."
 
 #: src/skins/ui_manager.c:401
 msgid "Plugin services"
-msgstr "Affiche le menu propre à certains modules."
+msgstr "Services des modules"
 
 #: src/skins/ui_manager.c:403
 msgid "Preferences"
-msgstr "Préférences..."
+msgstr "Préférences"
 
 #: src/skins/ui_manager.c:404
 msgid "Open preferences window"
-msgstr "Ouvre la fenêtre des préférences."
+msgstr "Ouvrir la fenêtre des préférences."
 
 #: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
@@ -3128,214 +2969,193 @@
 msgid "Clear A-B"
 msgstr "Effacer la boucle A-B"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
-msgid "Jump to Playlist Start"
-msgstr "Aller au début de la liste"
-
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
-msgstr "Aller au temps..."
+msgstr "Aller au temps"
 
-#: src/skins/ui_manager.c:424
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
-msgstr "Mettre dans la file d'attente"
+msgstr "Mise en file d'attente"
 
-#: src/skins/ui_manager.c:425
+#: src/skins/ui_manager.c:422
 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."
+msgstr "Active/désactive l'entrée dans la file d'attente de la liste de lecture."
 
-#: src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:425
 msgid "Copy"
 msgstr "Copier"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr "Couper"
 
-#: src/skins/ui_manager.c:432
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr "Coller"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "Charger"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:437
 msgid "Import"
 msgstr "Importer"
 
-#: src/skins/ui_manager.c:441
+#: src/skins/ui_manager.c:438
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/skins/ui_manager.c:442
+#: src/skins/ui_manager.c:439
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
-msgstr "Préréglage général"
-
-#: src/skins/ui_manager.c:445
-msgid "Load preset"
-msgstr "Charge un préréglage général."
+msgstr "Préréglage"
 
-#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
-msgstr "Préréglage spécifique"
+msgstr "Chargement automatique d'un préréglage"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
-msgstr "Charge un préréglage spécifique."
+msgstr "Charge automatiquement un préréglage"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
-msgstr "Charge le préréglage par défaut dans l'égaliseur."
+msgstr "Charger le préréglage par défaut dans l'égaliseur."
 
-#: src/skins/ui_manager.c:453
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "Remise à zéro"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
-msgstr "Réinitialise les niveaux de l'égaliseur."
+msgstr "Mise à zéro des niveaux de l'égaliseur."
 
-#: src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "À partir d'un fichier"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
-msgstr "Charge un préréglage à partir d'un fichier."
+msgstr "Charger un préréglage à partir d'un fichier."
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
-msgstr "À partir d'un fichier « EQF » de « WinAMP »"
+msgstr "À partir d'un fichier EQF de WinAMP"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
-msgstr "Charge un préréglage à partir d'un fichier « EQF » de « WinAMP »."
+msgstr "Charger un préréglage à partir d'un fichier EQF de WinAMP"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
-msgstr "Préréglages de « WinAMP »"
+msgstr "Préréglages de WinAMP"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
-msgstr "Importe les préréglages de « WinAMP »."
+msgstr "Importer les préréglages de WinAMP"
 
 #: src/skins/ui_manager.c:466
-msgid "Save preset"
-msgstr "Enregistre comme préréglage général."
-
-#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
-msgstr "Enregistre comme préréglage spécifique."
+msgstr "Enregistrer le préréglage automatique."
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
-msgstr "Enregistre comme préréglage par défaut."
+msgstr "Enregistrer le préréglage par défaut."
 
-#: src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "Dans un fichier"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
-msgstr "Enregistre le préréglage dans un fichier."
+msgstr "Enregistrer le préréglage dans un fichier."
 
-#: src/skins/ui_manager.c:477
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
-msgstr "Dans un fichier « EQF » pour « WinAMP »"
+msgstr "Dans un fichier EQF pour WinAMP"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
-msgstr "Enregistre le préréglage dans un fichier « EQF » pour « WinAMP »."
+msgstr "Enregistrer le préréglage dans un fichier EQF pour WinAMP"
 
 #: src/skins/ui_manager.c:481
-msgid "Delete preset"
-msgstr "Efface un préréglage."
-
-#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
-msgstr "Efface un préréglage spécifique."
+msgstr "Effacer un préréglage automatique."
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
-msgstr "Chercher des entrées dans la liste active"
+msgstr "Chercher des entrées dans la liste de lecture active"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 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 "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr ""
-"Le choix des entrées de la liste de lecture s'effectue au moyen des champs ci-dessous.\n"
-"\n"
-"La syntaxe utilisée est celle des expressions rationnelles et est sensible à la casse.\n"
-"\n"
-"Si vous ne savez pas comment fonctionnent les expressions rationnelles, vous pouvez simplement indiquer une expression littérale de ce que vous cherchez."
+msgstr "Le choix des entrées de la liste de lecture s'effectue au moyen des champs ci-dessous. La syntaxe utilisée est celle des expressions rationnelles et n'est pas sensible à la casse.\nSi vous ne savez pas comment fonctionnent les expressions rationnelles, indiquez simplement une expression littérale de ce que vous cherchez."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "Titre : "
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
-msgstr "Titre de l'album : "
+msgstr "Album : "
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
-msgstr "Nom de l'artiste : "
+msgstr "Atiste : "
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "Nom du fichier : "
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr "Effacer la sélection précédente avant d'effectuer la recherche"
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 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:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
-msgstr "Créer une nouvelle liste comportant les entrées trouvées"
+msgstr "Créer une nouvelle liste de lecture à partir des entrées trouvées"
 
-#: src/skins/ui_playlist.c:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
-msgstr "Éditeur de la liste de lecture d'Audacious"
+msgstr "Éditeur de liste de lecture d'Audacious"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d sur %d)"
 
 #: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
-msgstr "Thème « Winamp 2.x » archivé"
+msgstr "Thème Winamp 2.x archivé"
 
 #: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
-msgstr "Thème « Winamp 2.x » non archivé"
+msgstr "Thème Winamp 2.x non archivé"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Impossible de créer le répertoire (%s) : %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
-msgstr "À propos du module « sndfile »"
+msgstr "À propos du module sndfile"
 
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
-msgstr "À propos de « SndStretch »"
+msgstr "À propos du module SndStretch"
 
 #: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
@@ -3343,7 +3163,7 @@
 
 #: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
-msgstr "Chevauchement léger"
+msgstr "Chevauchement court"
 
 #: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
@@ -3359,34 +3179,31 @@
 
 #: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
-msgstr "Configuration de « SndStretch »"
+msgstr "Configuration de SndStretch"
 
-#: src/song_change/song_change.c:447
+#: src/song_change/song_change.c:437
 msgid "Command to run when Audacious starts a new song."
-msgstr "Commande à exécuter lorsqu'un nouveau morceau commence :"
+msgstr "Commande à exécuter lorsqu'Audacious commence un nouveau morceau."
 
-#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
-#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
 msgstr "Commande :"
 
-#: src/song_change/song_change.c:453
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
-msgstr "Commande à exécuter lorsque la lecture d'un morceau se termine :"
+msgstr "Commande à exécuter lorsque la lecture d'un morceau se termine."
 
-#: src/song_change/song_change.c:459
+#: src/song_change/song_change.c:449
 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 :"
+msgstr "Commande à exécuter lorsqu'Audacious atteint la fin de la liste de lecture."
 
-#: src/song_change/song_change.c:465
+#: src/song_change/song_change.c:455
 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) :"
+msgstr "Commande à exécuter lorsque le titre d'un morceau change (par exemple le titre d'un flux en réseau)."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3403,44 +3220,27 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr ""
-"Vous pouvez utiliser les variables de la liste ci-dessous.\n"
-"\n"
-"Elles seront remplacées avant l'appel de la commande à exécuter (toutes ne sont pas utiles pour la fonction « fin de liste ») :\n"
-"\n"
-"%F : Fréquence (en Hertz)\n"
-"%c : Nombre de canaux\n"
-"%f : Nom du fichier (chemin complet)\n"
-"%l : Durée (en millisecondes)\n"
-"%n ou %s : Nom de la chanson\n"
-"%r : Taux d'encodage (en « bits » par seconde)\n"
-"%t : Position dans la liste de lecture (%02d)\n"
-"%p : 1 si la lecture continue, 0 si elle est arrêtée\n"
-"%a : Artiste du morceau\n"
-"%b : Album du morceau\n"
-"%T : Titre du morceau"
-
-#: src/song_change/song_change.c:498
+msgstr "Vous pouvez utiliser les variables suivantes qui seront\nremplacées avant l'appel de la commande à exécuter (toutes ne sont pas utiles pour la fonction « fin de liste de lecture ») :\n\n%F : Fréquence (en Hertz)\n%c : Nombre de canaux\n%f : Nom du fichier (chemin complet)\n%l : Durée (en millisecondes)\n%n ou %s : Nom du morceau\n%r : Taux d'encodage (en bit par seconde)\n%t : Position dans la liste de lecture (%02d)\n%p : 1 si la lecture continue, 0 si elle est arrêtée\n%a : Artiste\n%b : Album\n%T : Titre de la piste"
+
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr ""
-"Les arguments à lancer dans la console doivent être entourés de guillemets.\n"
-"Une utilisation différente constitue un risque en matière de sécurité."
+msgstr "Les arguments à lancer dans la console doivent être entre guillemets.\nL'alternative constitue un risque en matière de sécurité."
 
-#: src/song_change/song_change.c:509
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr "Commandes"
 
-#: src/song_change/song_change.c:539
+#: src/song_change/song_change.c:529
 msgid "Song Change"
-msgstr "Song Change"
+msgstr "Changement de morceau"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
-msgstr "À propos du module « Status Icon »"
+msgstr "À propos du module « Status Icon » (icône d'état)"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3449,150 +3249,98 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager.\n"
-msgstr ""
-"Module « Status Icon »\n"
-"\n"
-"Giacomo Lozito < james@develia.org > (Droits d'utilisation : 2005-2007)\n"
-"Michał Lipski <tallica@o2.pl> (Droits d'utilisation : 2010)\n"
-"\n"
-"Ce module affiche une icône d'état dans l'espace\n"
-"de notification du gestionnaire de fenêtres.\n"
+msgstr "Module « Status Icon »\n\nTous droits réservés © 2005-2007 Giacomo Lozito <james@develia.org >\nTous droits réservés © 2010 Michał Lipski <tallica@o2.pl>\n\nCe module affiche une icône d'état dans l'espace\nde notification du gestionnaire de fenêtres.\n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
-msgstr "Préférences de « Status Icon »"
+msgstr "Préférences du module « Icône d'état »"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
-msgstr "Menu disponible via le clic droit :"
+msgstr "Menu disponible via le clic droit"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
-msgstr "Menu de lecture compact #1"
+msgstr "Menu de lecture compact no 1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
-msgstr "Menu de lecture compact #2"
+msgstr "Menu de lecture compact no 2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
-msgstr "Effet du défilement de la souris :"
+msgstr "Effet de la molette de la souris"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "Changement du volume"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
-msgstr "Changement du titre en cours de lecture"
+msgstr "Changement du morceau en cours"
 
-#: src/statusicon/statusicon.c:500
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
 msgstr "Autres paramètres"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
 msgstr "Désactiver l'affichage d'information au survol"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
-msgstr "Réduire dans la zone de notification à la fermeture"
+msgstr "Réduire vers la zone de notification à la fermeture"
+
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Avancer dans la liste de lecture en roulant la molette vers le haut"
 
 #: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
-msgstr ""
-"Module « Extra Stereo »\n"
-"\n"
-"Écrit par Johan Levin (1999)."
+msgstr "Module « Extra Stereo »\n\nÉcrit par Johan Levin (1999)."
 
 #: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
-msgstr "À propos de « Extra Stereo »"
+msgstr "À propos du module « Extra Stereo »"
 
 #: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
-msgstr "Configuration de « Extra Stereo »"
+msgstr "Configuration d' « Extra Stereo »"
 
-#: src/streambrowser/gui/streambrowser_win.c:78
-msgid "Search:"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:97
-#: src/streambrowser/gui/streambrowser_win.c:372
-msgid "Add Bookmark"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:324
-msgid "Stream name"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:331
-msgid "Now playing"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:369
-msgid "Remove Bookmark"
-msgstr ""
-
-#: src/streambrowser/streambrowser.c:330
-msgid "About Stream Browser"
-msgstr ""
-
-#: src/streambrowser/streambrowser.c:331
-msgid ""
-"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming directories.\n"
-"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
-"\tand of course to the whole Audacious community.\n"
-"\n"
-"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-"\n"
-"This was a Google Summer of Code 2008 project."
-msgstr ""
-
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
-msgstr "À propos de « Tone Generator »"
+msgstr "À propos du module « Tone Generator » (générateur de tonalité)"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
-msgstr ""
-"Générateur de sons sinusoïdaux écrit par Håvard Kvålen <havardk@xmms.org>\n"
-"\n"
-"Modifié par Daniel J. Peng <danielpeng@bigfoot.com>\n"
-"\n"
-"Pour utiliser ce module, il suffit d'ajouter une adresse du type :\n"
-"tone://fréquence1;fréquence2;fréquence3;...\n"
-"\n"
-"Par exemple, \"tone://2000;2005\" émettra un son de 2000 Hz et un son de 2005 Hz."
+msgstr "Générateur de tonalités sinusoïdales écrit par Håvard Kvålen <havardk@xmms.org>\nModifié par Daniel J. Peng <danielpeng@bigfoot.com>\n\nPour l'utiliser il suffit d'ajouter une adresse URL du type :\ntone://fréquence1;fréquence2;fréquence3;...\nPar exemple, \"tone://2000;2005\" émettra un son de 2000 Hz et un son de 2005 Hz."
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
-msgstr "Générateur de sons : "
+msgstr "Générateur de tonalités : "
 
 #: src/unix-io/gtk.c:34
 msgid "About File I/O Plugin"
-msgstr ""
+msgstr "À propos du module de gestion des entrées/sorties"
 
-#: src/vorbis/vorbis.c:572
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
-msgstr "À propos du module audio « Ogg Vorbis »"
+msgstr "À propos du module audio Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:577
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -3609,29 +3357,11 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>\n"
 "\n"
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
-msgstr ""
-"Module « Ogg Vorbis » de « Xiph.org Foundation »\n"
-"\n"
-"\n"
-"Code original :\n"
-"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-"\n"
-"Contributions :\n"
-"Chris Montgomery <monty@xiph.org>\n"
-"Peter Alm <peter@xmms.org>\n"
-"Michael Smith <msmith@labyrinth.edu.au>\n"
-"Jack Moffitt <jack@icecast.org>\n"
-"Jorn Baayen <jorn@nl.linux.org>\n"
-"Håvard Kvålen <havardk@xmms.org>\n"
-"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-"\n"
-"\n"
-"Vous pouvez visiter « Xiph.org Foundation » à cette adresse :\n"
-"http://www.xiph.org/\n"
+msgstr "Module Ogg Vorbis de la fondation Xiph.org\n\n\nCode original par\nTony Arcieri <bascule@inferno.tusculum.edu>\nLes contributeurs sont \nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\nVous pouvez rendre visite à la fondation Xiph.org à http://www.xiph.org/\n"
 
 #: src/vtx/about.c:14
 msgid "About Vortex Player"
-msgstr "À propos du lecteur « Vortex »"
+msgstr "À propos du module Lecteur Vortex"
 
 #: src/vtx/about.c:15
 msgid ""
@@ -3642,25 +3372,12 @@
 "and other AY/YM music sites.\n"
 "\n"
 "Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr ""
-"Lecteur de fichiers au format « Vortex » de\n"
-"Sashnov Alexander <sashnov@ngs.ru>\n"
-"\n"
-"Source originale : « in_vtx.dll » de\n"
-"Roman Sherbakov <v_soft@microfor.ru>\n"
-"\n"
-"La musique au format « vtx » peut être trouvée à l'adresse suivante :\n"
-"\n"
-"http://vtx.microfor.ru/music.htm\n"
-"(et sur les autres sites de musique AY/YM).\n"
-"\n"
-"Adaptation pour Audacious :\n"
-"Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr "Lecteur de fichiers au format Vortex par Sashnov Alexander <sashnov@ngs.ru>\nD'après la source originale in_vtx.dll par Roman Sherbakov <v_soft@microfor.ru>\n\nDe la musique au format vtx peut être trouvée à l'adresse URL http://www.vortexproject.org/multimedia/audio/ et sur les autres sites de musique AY/YM.\n\nAdaptation pour Audacious par Pavel Vymetalek <pvymetalek@seznam.cz>"
 
 #: src/wavpack/wavpack.c:353
 #, c-format
 msgid "Wavpack Decoder Plugin %s"
-msgstr "Module de décodage « Wavpack » %s"
+msgstr "Module de décodage Wavpack %s"
 
 #: src/wavpack/wavpack.c:354
 msgid ""
@@ -3668,12 +3385,4 @@
 "\n"
 "Some of the plugin code was by Miles Egan\n"
 "Visit the Wavpack site at http://www.wavpack.com/\n"
-msgstr ""
-"Droits d'utilisation (2006) : William Pitcock <nenolod -at- nenolod.net>\n"
-"\n"
-"Une partie du code provient de Miles Egan\n"
-"\n"
-"Vous pouvez visiter le site « Wavpack » à l'adresse suivante :\n"
-"http://www.wavpack.com/\n"
-
-
+msgstr "Tous droits réservés © 2006 William Pitcock <nenolod -at- nenolod.net>\n\nUne partie du code provient de Miles Egan\nRendez visite au site Wavpack à l'adresse URL http://www.wavpack.com/\n"

audacious-plugins-3.1.1.tar.bz2/po/hu.po -> audacious-plugins-3.2.4.tar.bz2/po/hu.po Changed

@@ -4,14 +4,14 @@
 #
 # Translators:
 # Peter Polonkai <polesz@nedudu.hu>, 2010.
-# Péter Polonkai <polesz@nedudu.hu>, 2011.
+# Péter Polonkai <polesz@nedudu.hu>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUDPLUG\n"
-"POT-Creation-Date: 2011-10-24 16:38-0400\n"
-"PO-Revision-Date: 2011-11-01 18:12+0000\n"
-"Last-Translator: Polesz <polesz@nedudu.hu>\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 09:01-0500\n"
+"PO-Revision-Date: 2012-01-12 06:38+0000\n"
+"Last-Translator: Péter Polonkai <polesz@nedudu.hu>\n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,202 +34,168 @@
 msgid "About MP4 AAC decoder plugin"
 msgstr "MP4 AAC dekóder bővítmény névjegye"
 
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "XMMS Riasztó névjegye"
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "Ébresztő névjegye"
 
-#: src/alarm/interface.c:41
-msgid "XMMS Alarm"
-msgstr "XMMS Riasztó"
-
-#: src/alarm/interface.c:50
+#: src/alarm/alarm.c:313
 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"
+"A plugin that can be used to start playing at a certain time.\n"
 "\n"
-"http://www.snika.uklinux.net/xmms-alarm/"
+"Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/interface.c:65
-msgid "Close"
-msgstr "Bezár"
-
-#: src/alarm/interface.c:95
+#: src/alarm/interface.c:33
 msgid "Alarm"
 msgstr "Riasztás"
 
-#: src/alarm/interface.c:102
+#: src/alarm/interface.c:40
 msgid "This is your wakeup call."
 msgstr "Ez egy ébresztési hívás."
 
-#: src/alarm/interface.c:117 src/alarm/interface.c:1338
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
 msgid "OK"
 msgstr "OK"
 
-#: src/alarm/interface.c:151
-msgid "Sorry"
-msgstr "Sajnálom"
-
-#: src/alarm/interface.c:158
-msgid "Warning"
-msgstr "Figyelmeztetés"
-
-#: src/alarm/interface.c:167
-msgid ""
-"For safety reasons the \"quiet\" time must be at least 65 seconds longer than the fading time, it must also be more than 10 seconds. This basically means that there is a bug in the code and until I find a way of really fixing it this message will appear :)\n"
-"\n"
-"Your fading settings have NOT been saved\n"
-"\n"
-"--\n"
-"Adam"
-msgstr ""
-
-#: src/alarm/interface.c:183
-msgid "Oh Well"
-msgstr ""
-
-#: src/alarm/interface.c:339
+#: src/alarm/interface.c:214
 msgid "Alarm Settings"
 msgstr "Riasztási beállítások"
 
-#: src/alarm/interface.c:354 src/alarm/interface.c:526
-#: src/alarm/interface.c:898
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
 msgid "Time"
 msgstr "Idő"
 
-#: src/alarm/interface.c:395
+#: src/alarm/interface.c:270
 msgid "hours"
 msgstr "óra"
 
-#: src/alarm/interface.c:456
+#: src/alarm/interface.c:331
 msgid "h"
 msgstr "h"
 
-#: src/alarm/interface.c:486
+#: src/alarm/interface.c:361
 msgid "minutes"
 msgstr "perc"
 
-#: src/alarm/interface.c:504
+#: src/alarm/interface.c:379
 msgid "Quiet after:"
 msgstr "Csendes ezután:"
 
-#: src/alarm/interface.c:514
+#: src/alarm/interface.c:389
 msgid "Alarm at (default):"
 msgstr "Riasztás (alapértelmezett):"
 
-#: src/alarm/interface.c:534
+#: src/alarm/interface.c:409
 msgid "Choose the days for the alarm to come on"
 msgstr "Válassza ki a riasztás napját a következőekből"
 
-#: src/alarm/interface.c:562 src/alarm/interface.c:610
-#: src/alarm/interface.c:658 src/alarm/interface.c:706
-#: src/alarm/interface.c:754 src/alarm/interface.c:802
-#: src/alarm/interface.c:850 src/bs2b/plugin.c:198 src/OSS/configure.c:153
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: src/alarm/interface.c:888
+#: src/alarm/interface.c:763
 msgid "Day"
 msgstr "Nap"
 
-#: src/alarm/interface.c:908
+#: src/alarm/interface.c:783
 msgid "Tuesday"
 msgstr "Kedd"
 
-#: src/alarm/interface.c:919
+#: src/alarm/interface.c:794
 msgid "Wednesday"
 msgstr "Szerda"
 
-#: src/alarm/interface.c:930
+#: src/alarm/interface.c:805
 msgid "Thursday"
 msgstr "Csütörtök"
 
-#: src/alarm/interface.c:941
+#: src/alarm/interface.c:816
 msgid "Friday"
 msgstr "Péntek"
 
-#: src/alarm/interface.c:952
+#: src/alarm/interface.c:827
 msgid "Saturday"
 msgstr "Szombat"
 
-#: src/alarm/interface.c:963
+#: src/alarm/interface.c:838
 msgid "Sunday"
 msgstr "Vasárnap"
 
-#: src/alarm/interface.c:973
+#: src/alarm/interface.c:848
 msgid "Monday"
 msgstr "Hétfő"
 
-#: src/alarm/interface.c:984
+#: src/alarm/interface.c:859
 msgid "Days"
 msgstr "Napok"
 
-#: src/alarm/interface.c:1000
+#: src/alarm/interface.c:875
 msgid "Fading"
 msgstr "Elhalványulás"
 
-#: src/alarm/interface.c:1037
+#: src/alarm/interface.c:912
 msgid "seconds"
 msgstr "másodperc"
 
-#: src/alarm/interface.c:1045 src/alarm/interface.c:1160
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
 msgid "Volume"
 msgstr "Hangerő"
 
-#: src/alarm/interface.c:1071
+#: src/alarm/interface.c:946
 msgid "Current"
 msgstr "Jelenlegi"
 
-#: src/alarm/interface.c:1079
+#: src/alarm/interface.c:954
 msgid "Start at"
 msgstr "Kezdjük a"
 
-#: src/alarm/interface.c:1107 src/alarm/interface.c:1151
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
 msgid "%"
 msgstr "%"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:998
 msgid "Final"
 msgstr "Vége"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1051
 msgid "Additional Command"
 msgstr "További parancs"
 
-#: src/alarm/interface.c:1202
+#: src/alarm/interface.c:1077
 msgid "enable"
 msgstr "engedélyez"
 
-#: src/alarm/interface.c:1210
+#: src/alarm/interface.c:1085
 msgid "Playlist (optional)"
 msgstr "Lejátszólista (opcionális)"
 
-#: src/alarm/interface.c:1236
+#: src/alarm/interface.c:1111
 msgid "Browse..."
 msgstr "Tallózás…"
 
-#: src/alarm/interface.c:1244 src/alarm/interface.c:1408
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
 msgid "Reminder"
 msgstr "Emlékeztető"
 
-#: src/alarm/interface.c:1261
+#: src/alarm/interface.c:1136
 msgid "Use reminder"
 msgstr "Emlékeztető használata"
 
-#: src/alarm/interface.c:1277 src/sndstretch/sndstretch_xmms.c:358
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
 msgid "Options"
 msgstr "Opciók"
 
-#: src/alarm/interface.c:1285
+#: src/alarm/interface.c:1160
 msgid "What do these options mean?"
 msgstr "Mit jelentenek ezek a lehetőségek?"
 
-#: src/alarm/interface.c:1313
+#: src/alarm/interface.c:1188
 msgid ""
 "\n"
 "Time\n"
@@ -284,21 +250,21 @@
 " toggle button if you want it to be shown.\n"
 msgstr ""
 
-#: src/alarm/interface.c:1315 src/skins/ui_manager.c:382
+#: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
 msgid "Help"
 msgstr "Súgó"
 
-#: src/alarm/interface.c:1347 src/cdaudio-ng/configure.c:249
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
 #: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
 #: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/alarm/interface.c:1415
+#: src/alarm/interface.c:1290
 msgid "Your reminder for today is.."
 msgstr "Mai emlékeztető.."
 
-#: src/alarm/interface.c:1440
+#: src/alarm/interface.c:1315
 msgid "Thankyou"
 msgstr "Köszönöm"
 
@@ -338,7 +304,7 @@
 msgid "ALSA error"
 msgstr "ALSA hiba"
 
-#: src/amidi-plug/amidi-plug.c:335
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -452,13 +418,15 @@
 
 #: src/amidi-plug/i_configure-ap.c:303
 msgid "extract lyrics from MIDI file (if available)"
-msgstr ""
+msgstr "dalszöveg kibontása a MIDI fájból (ha elérhető)"
 
 #: src/amidi-plug/i_configure-ap.c:333
 msgid ""
 "AMIDI\n"
 "Plug"
 msgstr ""
+"AMIDI\n"
+"bővítmény"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
@@ -693,161 +661,161 @@
 msgid "None"
 msgstr "Nincs"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "Lejátszás kezdete"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "OSD használata ha a lejátszólista egy eleme elindul."
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "Cím váltás"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
 msgstr ""
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "Hangerő váltás"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
 msgstr "OSD használata ha változik a hangerő."
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
 msgstr "Szünet Be"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
 msgstr "OSD használata ha megállítják a lejátszást."
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
 msgstr "Szünet Ki"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSD használata ha elindítják a lejátszást."
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "Elhelyezés"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
 msgstr "Relatív X pozíció:"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
 msgstr "Relatív Y pozíció:"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr "Max OSD szélesség:"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr "Több monitoros opciók"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
 msgstr "OSD képernyők használata:"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "minden monitoron"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "Időtartam (mp)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "Képernyő:"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "Áttűnés be:"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "Áttűnés ki:"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "Betűkészletek"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "Betűkészlet %i:"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "Árnyék"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "Nemzetközi"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "UTF-8 karakter konverzió letiltása (aosd-ben)"
 
-#: src/aosd/aosd_ui.c:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "Téma fájl választás"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr "Renderelési stílus"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "Színek"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "Szín %i:"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr "Egyedi téma"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "Téma fájl:"
 
-#: src/aosd/aosd_ui.c:672
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "Böngészés"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "Esemény engedélyezése"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "Esemény"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
 msgstr "Kompozit kezelő detektálva"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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"
@@ -855,72 +823,72 @@
 "Kompozít kezelő nem érzékelhető;\n"
 "ha tudja, hogy van egy futó kompozít kezelő, kérjük aktiválja, egyébként az OSD nem fog megfelelően működni"
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 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:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "Átlátszóság"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr "Nem valódi átlátszóság"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 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:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
 msgstr "Kompozit kiterjesztés nem tölthető be"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
 msgstr "Kompozit kiterjesztés nem érhető el"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - beállítás"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr "Teszt"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "Pozíció"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "Animáció"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "Szöveg"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "Dekoráció"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "Esemény"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "Egyéb"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
 msgstr "Audacious OSD - névjegy"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
@@ -928,7 +896,7 @@
 "\n"
 "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -968,17 +936,17 @@
 
 #: src/bs2b/plugin.c:182
 msgid "Cut frequency:"
-msgstr ""
+msgstr "Vágási frekvencia:"
 
 #: src/bs2b/plugin.c:196
 msgid "Presets:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:241
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
 msgstr "Audio CD bővítmény néjvegye"
 
-#: src/cdaudio-ng/cdaudio-ng.c:242
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
@@ -991,16 +959,26 @@
 "\n"
 "Copyright 2009 John Lindgren"
 msgstr ""
+"Copyright (c) 2007, írta Calin Crisan <ccrisan@gmail.com> és az Audacious csapat.\n"
+"\n"
+"Sok-sok köszönet a libcdio fejlesztőknek <http://www.gnu.org/software/libcdio/>\n"
+"»és a libcddb fejlesztőknek <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Továbbá köszönöm Tony Vroon mentori és irányadói segítségét.\n"
+"\n"
+"Ez a Google Summer of Code 2007 projekt keretén belül készült.\n"
+"\n"
+"Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:550
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:922
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
 msgstr "A meghajtó üres."
 
-#: src/cdaudio-ng/cdaudio-ng.c:924
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
 msgstr "Nem támogatott lemez típus."
 
@@ -1226,7 +1204,7 @@
 msgid "Volume: (%)"
 msgstr "Hangerő: (%)"
 
-#: src/ffaudio/ffaudio-core.c:795
+#: src/ffaudio/ffaudio-core.c:725
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1242,7 +1220,7 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:809
+#: src/ffaudio/ffaudio-core.c:739
 msgid "About FFaudio Plugin"
 msgstr "FFaudio bővítmény névjegye"
 
@@ -1250,55 +1228,55 @@
 msgid "About FileWriter-Plugin"
 msgstr "Fájlíró bővítmény névjegye"
 
-#: src/filewriter/filewriter.c:455
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "Fájl Író beállítások"
 
-#: src/filewriter/filewriter.c:467
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "Kimeneti fájl formátum:"
 
-#: src/filewriter/filewriter.c:485
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "Beállítás"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "Mentés az eredeti könyvtárba"
 
-#: src/filewriter/filewriter.c:505
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr "Mentés egyéb könyvtárba"
 
-#: src/filewriter/filewriter.c:515
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "Kimeneti fájl könyvtára:"
 
-#: src/filewriter/filewriter.c:519
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr "Válasszon egy mappát"
 
-#: src/filewriter/filewriter.c:538
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr "Legyen a fájlnévből:"
 
-#: src/filewriter/filewriter.c:541
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr "eredeti fájl kiterjesztések"
 
-#: src/filewriter/filewriter.c:547
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr "eredeti fájlnév"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "Ne vágja le a fájl kiterjesztést"
 
-#: src/filewriter/filewriter.c:572
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr ""
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "Automatikus"
 
@@ -1306,151 +1284,151 @@
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "Sztereó"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "Monó"
 
-#: src/filewriter/mp3.c:712
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr "MP3 Beállítás"
 
-#: src/filewriter/mp3.c:735
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "Algoritmus minősége:"
 
-#: src/filewriter/mp3.c:760
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr "Kimenet mintavétele:"
 
-#: src/filewriter/mp3.c:788
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:795
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "Bitráta / Tömörítési arány:"
 
-#: src/filewriter/mp3.c:819
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "Bitráta (kbps):"
 
-#: src/filewriter/mp3.c:852
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr "Tömörítési arány:"
 
-#: src/filewriter/mp3.c:876
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr "Audio mód:"
 
-#: src/filewriter/mp3.c:901
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "Egyéb:"
 
-#: src/filewriter/mp3.c:912
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr ""
 
-#: src/filewriter/mp3.c:923
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "Hiba védelem"
 
-#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "Minőség"
 
-#: src/filewriter/mp3.c:945
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR engedélyezése"
 
-#: src/filewriter/mp3.c:955
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "Típus:"
 
-#: src/filewriter/mp3.c:988
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr "VBR beállítások:"
 
-#: src/filewriter/mp3.c:1004
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "Minimális bitsebesség (kbps):"
 
-#: src/filewriter/mp3.c:1031
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "Maximális bitsebesség (kbps):"
 
-#: src/filewriter/mp3.c:1054
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr ""
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr "ABR beállítások:"
 
-#: src/filewriter/mp3.c:1076
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "Átlagos bitráta (kbps):"
 
-#: src/filewriter/mp3.c:1104
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr "VBR minőségi szint:"
 
-#: src/filewriter/mp3.c:1123
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr "Ne írjon Xing VBR fejlécet"
 
-#: src/filewriter/mp3.c:1137
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1147
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "Keret paraméterek:"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr "Megjelölés jogvédettként"
 
-#: src/filewriter/mp3.c:1170
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr "Megjelölés eredetiként"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "ID3 paraméterek:"
 
-#: src/filewriter/mp3.c:1193
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
 msgstr "Mindig adja hozzá a 2-es verzió címkéit"
 
-#: src/filewriter/mp3.c:1203
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr "Csak v1 címkék hozzáadása"
 
-#: src/filewriter/mp3.c:1210
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr "Csak v2 címkék hozzáadása"
 
-#: src/filewriter/mp3.c:1231
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
 msgstr "Címkék"
 
-#: src/filewriter/vorbis.c:236
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis kódoló beállítások"
 
-#: src/filewriter/vorbis.c:256
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "Minőségi szint (0-10):"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr "FLAC audio bővítmény névjegye"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1473,31 +1451,15 @@
 "\n"
 msgstr ""
 
-#: 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:271
-msgid "Add Files"
-msgstr "Fájlok hozzáadása"
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr "Audacious2"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr "gnt felület"
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Bejegyzés száma"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "Cím"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
 msgstr "Előadó"
 
@@ -1505,7 +1467,7 @@
 msgid "Year"
 msgstr "Év"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
 msgstr "Album"
 
@@ -1569,286 +1531,298 @@
 msgid "Undock"
 msgstr "Rögzítés feloldása"
 
-#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
 msgstr "Letiltás"
 
-#: src/gtkui/menus.c:130
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
 msgstr "Fájl_ok megnyitása ..."
 
-#: src/gtkui/menus.c:131
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
 msgstr "_URL megnyitása ..."
 
-#: src/gtkui/menus.c:132
-msgid "_Add File ..."
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
 msgstr "Fájlok hozzá_adása ..."
 
-#: src/gtkui/menus.c:133
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
 msgstr "U_RL hozzáadása ..."
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
 msgstr "_Névjegy ..."
 
-#: src/gtkui/menus.c:136
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
 msgstr "_Beállítások ..."
 
-#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: src/gtkui/menus.c:140
+#: src/gtkui/menus.c:141
 msgid "_Play"
 msgstr "_Lejátszás"
 
-#: src/gtkui/menus.c:141
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
 msgstr "_Szünet"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:143
 msgid "_Stop"
 msgstr "_Megállítás"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
 msgstr "Elő_ző"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:145
 msgid "_Next"
 msgstr "_Következő"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
 msgstr "_Ismétlés"
 
-#: src/gtkui/menus.c:147
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
 msgstr "_Véletlenszerű"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
 msgstr "Megállítás _az aktuális szám után"
 
-#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
 msgstr "Dal _információ ..."
 
-#: src/gtkui/menus.c:152
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
 msgstr "Ugrás _időre ..."
 
-#: src/gtkui/menus.c:153
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
 msgstr "Ugrás _dalra ..."
 
-#: src/gtkui/menus.c:156
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
 msgstr "Sáv szeri_nt"
 
-#: src/gtkui/menus.c:157
+#: src/gtkui/menus.c:158
 msgid "By _Title"
 msgstr "Cím szerin_t"
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
 msgstr "Elő_adó szerint"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
 msgstr "A_lbum szerint"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
 msgstr "_Dátum szerint"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
 msgstr "_Fájl útvonal szerint"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
 msgstr "_Egyedi cím szerint"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
 msgstr "Fo_rdított sorrend"
 
-#: src/gtkui/menus.c:165
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
 msgstr "Véletlensze_rű sorrend"
 
-#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
 msgstr "_Frissítés"
 
 #: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "_Nem elérhető fájlok törlése"
+
+#: src/gtkui/menus.c:172
 msgid "_Sort"
 msgstr "Rendezé_s"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:174
 msgid "_New"
 msgstr "_Új"
 
-#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
 msgstr "_Bezár"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:177
 msgid "_Import ..."
 msgstr "_Importálás ..."
 
-#: src/gtkui/menus.c:176
+#: src/gtkui/menus.c:178
 msgid "_Export ..."
 msgstr "_Exportálás ..."
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:180
 msgid "_Playlist Manager ..."
 msgstr "_Lejátszólista kezelő ..."
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:181
 msgid "_Queue Manager ..."
 msgstr "_Várakozási sor kezelő ..."
 
-#: src/gtkui/menus.c:182
+#: src/gtkui/menus.c:184
 msgid "Volume _Up"
 msgstr "Hangerő _fel"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
 msgstr "Hangerő _le"
 
-#: src/gtkui/menus.c:185
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
 msgstr "_Hangszínszabályzó"
 
-#: src/gtkui/menus.c:187
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
 msgstr "E_ffektusok"
 
-#: src/gtkui/menus.c:190
+#: src/gtkui/menus.c:192
 msgid "_Interface"
 msgstr "_Felület"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Megjelenítés"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
 msgstr "_Menü sor mutatása"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
 msgstr "I_nfo sor mutatása"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
 msgstr "_Státusz sor mutatása"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
 msgstr "O_szlop fejlécek mutatása"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
 msgstr "_Válasszon oszlopokat ..."
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
 msgstr ""
 
-#: src/gtkui/menus.c:201
+#: src/gtkui/menus.c:204
 msgid "_File"
 msgstr "_Fájl"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:205
 msgid "_Playback"
 msgstr "L_ejátszás"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
 msgstr "_Lejátszólista"
 
-#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
 msgstr "_Szervizek"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:208
 msgid "_Output"
 msgstr "_Kimenet"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:209
 msgid "_View"
-msgstr ""
+msgstr "_Nézet"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
-msgstr ""
+msgstr "_Kivágás"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:217
 msgid "_Copy"
-msgstr ""
+msgstr "_Másolás"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:218
 msgid "_Paste"
-msgstr ""
+msgstr "_Beillesztés"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:219
 msgid "Select _All"
-msgstr ""
+msgstr "Mind kivál_aszt"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:224
 msgid "_Rename"
-msgstr ""
+msgstr "_Átnevezés"
 
 #: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
 msgstr "GTK+ felület"
 
-#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
 #: src/gtkui/ui_gtk.c:162
 msgid "Buffering ..."
-msgstr ""
+msgstr "Pufferelés ..."
 
-#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr "Hiba"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "sztereó"
 
-#: src/gtkui/ui_statusbar.c:106
+#: src/gtkui/ui_statusbar.c:109
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d csatorna"
+msgstr[1] "%d csatorna"
 
-#: src/gtkui/ui_statusbar.c:121
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
-msgstr ""
+msgstr "%d kbps"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
@@ -1890,7 +1864,7 @@
 msgid "Volume Down"
 msgstr "Hangerő le"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
 msgstr "Ugrás fájlhoz"
 
@@ -1904,11 +1878,11 @@
 
 #: src/hotkey/gui.c:84
 msgid "Toggle Repeat"
-msgstr ""
+msgstr "Ismétlés váltása"
 
 #: src/hotkey/gui.c:85
 msgid "Toggle Shuffle"
-msgstr ""
+msgstr "Véletlenszerű lejátszás váltása"
 
 #: src/hotkey/gui.c:95
 msgid "(none)"
@@ -1991,7 +1965,7 @@
 msgid "Enable debug printing"
 msgstr "Hibakeresés engedélyezése"
 
-#: src/jack/jack.c:422
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2009,51 +1983,51 @@
 "Audacious bővítményt írta:\n"
 "Giacomo Lozito from develia.org"
 
-#: src/jack/jack.c:427
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
 msgstr "JACK kimenet bővítmény névjegye 0.17"
 
-#: src/ladspa/plugin.c:414
+#: src/ladspa/plugin.c:415
 msgid "About LADSPA Host"
 msgstr ""
 
-#: src/ladspa/plugin.c:515
+#: src/ladspa/plugin.c:516
 #, c-format
 msgid "%s Settings"
-msgstr ""
+msgstr "%s Beállítások"
 
-#: src/ladspa/plugin.c:583
+#: src/ladspa/plugin.c:584
 msgid "LADSPA Host Settings"
 msgstr ""
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:593
 msgid "Module paths:"
 msgstr ""
 
-#: src/ladspa/plugin.c:597
+#: src/ladspa/plugin.c:598
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
 msgstr ""
 
-#: src/ladspa/plugin.c:613
+#: src/ladspa/plugin.c:614
 msgid "Available plugins:"
-msgstr ""
+msgstr "Elérhető bővítmények:"
 
-#: src/ladspa/plugin.c:625
+#: src/ladspa/plugin.c:626
 msgid "Enable"
-msgstr ""
+msgstr "Engedélyez"
 
-#: src/ladspa/plugin.c:631
+#: src/ladspa/plugin.c:632
 msgid "Enabled plugins:"
 msgstr "Engedélyezett modulok:"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:647
 msgid "Settings"
 msgstr "Beállítások"
 
-#: src/lyricwiki/lyricwiki.c:227
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
@@ -2061,7 +2035,7 @@
 "\n"
 "Dalszöveg keresése ..."
 
-#: src/lyricwiki/lyricwiki.c:250
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
@@ -2069,7 +2043,7 @@
 "\n"
 "Csatlakozás a lyrics.wikia.com-hoz ..."
 
-#: src/lyricwiki/lyricwiki.c:338
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
@@ -2077,11 +2051,11 @@
 "\n"
 "Dalszöveg nem található."
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr "Metronom névjegye"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2090,12 +2064,12 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact generátor: %d bpm"
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact generátor: %d bpm %d/%d"
@@ -2116,27 +2090,27 @@
 msgid "Changes take effect at the next song change."
 msgstr "Változások a következő dal váltáskor lépnek életbe."
 
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
 msgstr "Térhatású"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
 msgstr "Feltöltés folyamatban..."
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
 msgstr "Feltöltés az MTP Eszközre"
 
-#: src/mtp_up/mtp.c:311
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
 msgstr "MTP Eszköz leválasztása"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
 msgstr "Leállítva"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
 msgstr "Az Audacious nem játszik."
 
@@ -2164,30 +2138,34 @@
 msgid "Run in real time"
 msgstr "Futtatás valós időben"
 
-#: src/oss4/configure.c:76
+#: src/oss4/configure.c:81
 msgid "1. Default device"
 msgstr "1. Alapértelmezett eszköz"
 
-#: src/oss4/configure.c:132
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
 msgstr "OSS4 Kimeneti bővítmény beállítások"
 
-#: src/oss4/configure.c:144 src/OSS/configure.c:194
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "Audio eszköz:"
 
-#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "Alternatív eszköz használata:"
 
-#: src/oss4/configure.c:187
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
 msgstr "Hangerő mentése munkamentek között"
 
-#: src/oss4/configure.c:191
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
 msgstr "Formátum konverzió engedélyezése az OSS szoftverben."
 
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr ""
+
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "OSS4 bővítmény névjegye"
@@ -2233,11 +2211,11 @@
 msgid "Mixer"
 msgstr "Keverő"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr "OSS meghajtó névjegye"
 
-#: src/pulse_audio/pulse_audio.c:687
+#: src/pulse_audio/pulse_audio.c:669
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Audacious PulseAudio kimeneti bővítmény névjegye"
 
@@ -2261,31 +2239,31 @@
 msgid "Method:"
 msgstr "Módszer: "
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: src/scrobbler/configure.c:143
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "Szolgáltatások"
 
-#: src/scrobbler/configure.c:165
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "Felhasználónév:"
 
-#: src/scrobbler/configure.c:171
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr "Scrobbler URL:"
 
-#: src/scrobbler/configure.c:211
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr "Last FM"
 
-#: src/scrobbler/configure.c:238
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr ""
 
@@ -2308,11 +2286,45 @@
 msgid "SDL error"
 msgstr "SDL hiba"
 
-#: src/skins/plugin.c:165
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Műfaj"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Gyűjtemény"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Lejátszólista létrehozása"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "Lejátszólistához hozzá_ad"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Keresés a gyűjteményben"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Kérem várjon ..."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Mappa választás"
+
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "Felhasználói GUI névjegye"
 
-#: src/skins/plugin.c:166
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -2404,79 +2416,112 @@
 msgid "Audacious Equalizer"
 msgstr "Audacious Equalizer"
 
-#: src/skins/ui_equalizer.c:896
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
 msgstr "Profilok"
 
-#: src/skins/ui_main.c:443
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Előre beállított betöltése"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr ""
+
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:451
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:458
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "térhatású"
 
-#: src/skins/ui_main.c:806
+#: src/skins/ui_main.c:807
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Tekerés %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:827
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hangerő: %d%%"
 
-#: src/skins/ui_main.c:850
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balansz: %d%% bal"
 
-#: src/skins/ui_main.c:852
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balansz: közép"
 
-#: src/skins/ui_main.c:854
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balansz: %d%% jobb"
 
-#: src/skins/ui_main.c:980
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Beállítások menü"
 
-#: src/skins/ui_main.c:984
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Tiltja a 'Mindig felül' opciót"
 
-#: src/skins/ui_main.c:986
+#: 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:989
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Fájl Információs doboz"
 
-#: src/skins/ui_main.c:994
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Megjelenítési menü"
 
-#: src/skins/ui_main.c:1648
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
 msgstr "Egyszerű mód."
 
-#: src/skins/ui_main.c:1650
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
 msgstr "Lejátszólista mód."
 
-#: src/skins/ui_main.c:1672
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr "Leállítás az aktuális dal után."
 
-#: src/skins/ui_main.c:1674
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
 msgstr "Nincs leállítás az aktuális dal után."
 
@@ -2983,145 +3028,129 @@
 msgid "Clear A-B"
 msgstr "Törlés A-B"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
-msgid "Jump to Playlist Start"
-msgstr "Ugrás a lejátszólista kezdetére"
-
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
 msgstr "Ugrás a megadott időre"
 
-#: src/skins/ui_manager.c:424
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
 msgstr "Várakozási sor váltása"
 
-#: src/skins/ui_manager.c:425
+#: src/skins/ui_manager.c:422
 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:428
+#: src/skins/ui_manager.c:425
 msgid "Copy"
 msgstr "Másolás"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr "Kivágás"
 
-#: src/skins/ui_manager.c:432
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "Betöltés"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:437
 msgid "Import"
 msgstr "Importálás"
 
-#: src/skins/ui_manager.c:441
+#: src/skins/ui_manager.c:438
 msgid "Save"
 msgstr "Mentés"
 
-#: src/skins/ui_manager.c:442
+#: src/skins/ui_manager.c:439
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
 msgstr "Előre beállított"
 
-#: src/skins/ui_manager.c:445
-msgid "Load preset"
-msgstr "Előre beállított betöltése"
-
-#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
 msgstr "Előre beállított automatikus betöltése"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:453
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "Nulla"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
 msgstr "Legyen minden hangszínszabályozó értéke nulla"
 
-#: src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "Fájlból"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
 msgstr ""
 
 #: src/skins/ui_manager.c:466
-msgid "Save preset"
-msgstr ""
-
-#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "Fájlba"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:477
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
 #: src/skins/ui_manager.c:481
-msgid "Delete preset"
-msgstr ""
-
-#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
 msgstr "Elemek keresése az aktív lejátszólistában"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 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 "
@@ -3129,39 +3158,39 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "Cím:"
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr "Album:"
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
 msgstr "Előadó:"
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "Fájlnév:"
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 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:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
 msgstr "Automatikusan várólistára kerülnek a talált elemek"
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 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:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
 msgstr "Audacious lejátszólista szerkesztő"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d / %d)"
@@ -3174,12 +3203,12 @@
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Nem régi Winamp 2.x bőr"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nem lehet létrehozni a könyvtárat (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
 msgstr "sndfile bővítmény névjegye"
 
@@ -3211,29 +3240,29 @@
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - beállítások"
 
-#: src/song_change/song_change.c:447
+#: src/song_change/song_change.c:437
 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:449 src/song_change/song_change.c:455
-#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
 msgstr "Parancs:"
 
-#: src/song_change/song_change.c:453
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
 msgstr "Parancs futtatása a dal végén."
 
-#: src/song_change/song_change.c:459
+#: src/song_change/song_change.c:449
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Parancs futtatása amikor Audacious elér a lejátszási lista végéhez."
 
-#: src/song_change/song_change.c:465
+#: src/song_change/song_change.c:455
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr "Parancs futtatása ha a dal cím változik (pl. hálózati stream-címek)."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3252,25 +3281,25 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:498
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:509
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr "Parancsok"
 
-#: src/song_change/song_change.c:539
+#: src/song_change/song_change.c:529
 msgid "Song Change"
 msgstr "Szám váltás"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr "Státusz ikon bővítmény névjegye"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3288,46 +3317,50 @@
 "Ez a bővítmény státusz ikont helyez el az\n"
 "ablakkezelő rendszer tálca területén.\n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr "Státusz ikon bővítmény - beállítások"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr "Jobb-Egér menű"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
 msgstr "Kicsi lejátszó menü #1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
 msgstr "Kicsi lejátszó menü #2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr "Egérgörgő működés"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "Hangerő váltás"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
 msgstr "Váltja a lejátszott dalt"
 
-#: src/statusicon/statusicon.c:500
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
 msgstr "Egyéb beállítások"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
 msgstr "Felugró ablakok tiltása"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
 msgstr "Bezáráskor az értesítési területen marad (a tálcán)"
 
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr ""
+
 #: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
@@ -3346,49 +3379,11 @@
 msgid "Configure Extra Stereo"
 msgstr "Extra sztereó beállítások"
 
-#: src/streambrowser/gui/streambrowser_win.c:78
-msgid "Search:"
-msgstr "Keresés:"
-
-#: src/streambrowser/gui/streambrowser_win.c:97
-#: src/streambrowser/gui/streambrowser_win.c:372
-msgid "Add Bookmark"
-msgstr "Könyvjelző hozzáadása"
-
-#: src/streambrowser/gui/streambrowser_win.c:324
-msgid "Stream name"
-msgstr "Folyam neve"
-
-#: src/streambrowser/gui/streambrowser_win.c:331
-msgid "Now playing"
-msgstr "Most játszott"
-
-#: src/streambrowser/gui/streambrowser_win.c:369
-msgid "Remove Bookmark"
-msgstr "Könyvjelző törlése"
-
-#: src/streambrowser/streambrowser.c:330
-msgid "About Stream Browser"
-msgstr "Folyam böngésző névjegye"
-
-#: src/streambrowser/streambrowser.c:331
-msgid ""
-"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming directories.\n"
-"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
-"\tand of course to the whole Audacious community.\n"
-"\n"
-"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-"\n"
-"This was a Google Summer of Code 2008 project."
-msgstr ""
-
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr "Hang generátor névjegye"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3397,12 +3392,12 @@
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr "Hang generátor:"
 
@@ -3410,11 +3405,11 @@
 msgid "About File I/O Plugin"
 msgstr ""
 
-#: src/vorbis/vorbis.c:572
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Ogg Vorbis Audio bővítmény névjegye"
 
-#: src/vorbis/vorbis.c:577
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"

audacious-plugins-3.2.4.tar.bz2/po/it.po Added

@@ -0,0 +1,3387 @@
+# Italian translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Jacopo Lorenzetti <jacopo.jl@gmail.com>, 2011, 2012.
+# Jacopo Lorenzetti <jacopol@cyan.xubiq.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-05-07 10:41+0000\n"
+"Last-Translator: Jacopo Lorenzetti <jacopol@cyan.xubiq.com>\n"
+"Language-Team: Italian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/aac/libmp4.c:256
+#, c-format
+msgid ""
+"Using libfaad2-%s for decoding.\n"
+"FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
+"Copyright (c) 2005-2006 Audacious team"
+msgstr "Per la decodifica è utilizzato libfaad2-%s.\nFAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\nCopyright (c) 2005-2006 Audacious team"
+
+#: src/aac/libmp4.c:261
+msgid "About MP4 AAC decoder plugin"
+msgstr "Informazioni sul plugin di decodifica AAC MP4"
+
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "Informazioni su Sveglia"
+
+#: src/alarm/alarm.c:313
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr "Un plugin che può essere utilizzato per avviare la riproduzione a un'orario prestabilito.\n\nOriginariamente scritto da Adam Feakin e Daniel Stodden."
+
+#: src/alarm/interface.c:33
+msgid "Alarm"
+msgstr "Sveglia"
+
+#: src/alarm/interface.c:40
+msgid "This is your wakeup call."
+msgstr "Questa è la tua sveglia."
+
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
+msgid "OK"
+msgstr "OK"
+
+#: src/alarm/interface.c:214
+msgid "Alarm Settings"
+msgstr "Impostazioni sveglia"
+
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
+msgid "Time"
+msgstr "Ora"
+
+#: src/alarm/interface.c:270
+msgid "hours"
+msgstr "ore"
+
+#: src/alarm/interface.c:331
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:361
+msgid "minutes"
+msgstr "minuti"
+
+#: src/alarm/interface.c:379
+msgid "Quiet after:"
+msgstr "Ferma dopo:"
+
+#: src/alarm/interface.c:389
+msgid "Alarm at (default):"
+msgstr "Sveglia alle (predefinita):"
+
+#: src/alarm/interface.c:409
+msgid "Choose the days for the alarm to come on"
+msgstr "Scegliere i giorni in cui attivare la sveglia"
+
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
+msgid "Default"
+msgstr "Predefinita"
+
+#: src/alarm/interface.c:763
+msgid "Day"
+msgstr "Giorno"
+
+#: src/alarm/interface.c:783
+msgid "Tuesday"
+msgstr "Martedì"
+
+#: src/alarm/interface.c:794
+msgid "Wednesday"
+msgstr "Mercoledì"
+
+#: src/alarm/interface.c:805
+msgid "Thursday"
+msgstr "Giovedì"
+
+#: src/alarm/interface.c:816
+msgid "Friday"
+msgstr "Venerdì"
+
+#: src/alarm/interface.c:827
+msgid "Saturday"
+msgstr "Sabato"
+
+#: src/alarm/interface.c:838
+msgid "Sunday"
+msgstr "Domenica"
+
+#: src/alarm/interface.c:848
+msgid "Monday"
+msgstr "Lunedì"
+
+#: src/alarm/interface.c:859
+msgid "Days"
+msgstr "Giorni"
+
+#: src/alarm/interface.c:875
+msgid "Fading"
+msgstr "Dissolvenza"
+
+#: src/alarm/interface.c:912
+msgid "seconds"
+msgstr "secondi"
+
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
+msgid "Volume"
+msgstr "Volume"
+
+#: src/alarm/interface.c:946
+msgid "Current"
+msgstr "Attuale"
+
+#: src/alarm/interface.c:954
+msgid "Start at"
+msgstr "Inizia a"
+
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:998
+msgid "Final"
+msgstr "Finale"
+
+#: src/alarm/interface.c:1051
+msgid "Additional Command"
+msgstr "Comando aggiuntivo"
+
+#: src/alarm/interface.c:1077
+msgid "enable"
+msgstr "abilita"
+
+#: src/alarm/interface.c:1085
+msgid "Playlist (optional)"
+msgstr "Playlist (opzionale)"
+
+#: src/alarm/interface.c:1111
+msgid "Browse..."
+msgstr "Sfoglia…"
+
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
+msgid "Reminder"
+msgstr "Promemoria"
+
+#: src/alarm/interface.c:1136
+msgid "Use reminder"
+msgstr "Usa promemoria"
+
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Opzioni"
+
+#: src/alarm/interface.c:1160
+msgid "What do these options mean?"
+msgstr "Cosa significano queste opzioni?"
+
+#: src/alarm/interface.c:1188
+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 "\nOra\n Sveglia alle: \n L'ora in cui si attiva la sveglia.\n\n Ferma dopo: \n Ferma la sveglia dopo l'intervallo di tempo\n specificato.\n (se la finestra della sveglia non viene chiusa)\n\n\nGiorni\n Giorno:\n Seleziona i giorni in cui attivare la sveglia.\n\n Ora:\n Scegli l'ora della sveglia per ogni giorno,\n o seleziona la checkbox per utilizzare l'ora\n predefinita.\n\n\nVolume\n Dissolvenza: \n Alza gradualmente il volume fino al valore\n scelto per il tempo selezionato.\n\n Inizia a: \n Inizia la dissolvenza a partire dal volume\n selezionato.\n\n Finale: \n Il volume a cui smettere la dissolvenza. Se\n il tempo della dissolvenza è 0 allora imposta\n il volume a questo valore e avvia la\n riproduzione.\n\n\nOpzioni:\n Comando aggiuntivo:\n All'ora della sveglia esegui il comando\n specificato.\n\n Playlist: \n Carica questa playlist e riproduci i brani da qui\n (deve avere estensione .m3u). Se non viene\n selezionata alcuna playlist saranno usati i\n brani che sono attualmente nella lista.\n Può anche essere inserito l'URL di uno stream\n mp3/ogg, ma il caricamento delle playlist da\n URL al momento non è supportato da xmms.\n\n Promemoria:\n visualizza un promemoria quando si spegne\n la sveglia, se vuoi che venga mostrato digita il\n promemoria nella casella e attiva la checkbox.\n"
+
+#: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Aiuto"
+
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/alarm/interface.c:1290
+msgid "Your reminder for today is.."
+msgstr "Il tuo promemoria di oggi è…"
+
+#: src/alarm/interface.c:1315
+msgid "Thankyou"
+msgstr "Grazie"
+
+#: src/alsa/config.c:210
+msgid "Default PCM device"
+msgstr "Dispositivo PCM predefinito"
+
+#: src/alsa/config.c:235
+msgid "Default mixer device"
+msgstr "Dispositivo mixer predefinito"
+
+#: src/alsa/config.c:438
+msgid "ALSA Output Plugin Preferences"
+msgstr "Preferenze del plugin di uscita ALSA"
+
+#: src/alsa/config.c:445
+msgid "PCM device:"
+msgstr "Dispositivo PCM:"
+
+#: src/alsa/config.c:447 src/OSS/configure.c:237
+msgid "Mixer device:"
+msgstr "Dispositivo mixer:"
+
+#: src/alsa/config.c:449
+msgid "Mixer element:"
+msgstr "Elemento mixer:"
+
+#: src/alsa/config.c:452
+msgid "Work around drain hangup"
+msgstr "Aggira interruzione per esaurimento risorse"
+
+#: src/alsa/plugin.c:59
+msgid "About ALSA Output Plugin"
+msgstr "Informazioni sul plugin di uscita ALSA"
+
+#: src/alsa/plugin.c:81
+msgid "ALSA error"
+msgstr "Errore ALSA"
+
+#: src/amidi-plug/amidi-plug.c:326
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr "Non hai selezionato alcuna porta del sequencer per la riproduzione MIDI. Puoi farlo nelle preferenze del plugin MIDI."
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:35
+msgid "ALSA Backend "
+msgstr "Backend ALSA "
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:37
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr "Questo backend invia eventi MIDI a un gruppo di porte del sequencer ALSA scelte dall'utente. L'interfaccia del sequencer ALSA è molto versatile, può fornire porte per sintetizzatori hardware delle schede audio (emu10k1) ma anche per sintetizzatori software, dispositivi esterni, ecc.\nQuesto backend non produce audio, gli eventi MIDI sono gestiti direttamente dai dispositivi/programmi dietro le porte ALSA; ad esempio, gli eventi MIDI inviati al sintetizzatore hardware saranno riprodotti direttamente.\nBackend scritto da Giacomo Lozito."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
+msgid "FluidSynth Backend "
+msgstr "Backend FluidSynth "
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr "Questo backend produce audio inviando eventi MIDI a FluidSynth, un sintetizzatore software in tempo reale basato sulla specifica SoundFont2 (www.fluidsynth.org).\nL'audio prodotto può essere manipolato tramite i plugin di effetto del lettore e viene elaborato dal plugin di uscita selezionato.\nBackend scritto da Giacomo Lozito."
+
+#: src/amidi-plug/i_configure-alsa.c:228
+msgid "ALSA BACKEND CONFIGURATION"
+msgstr "CONFIGURAZIONE DEL BACKEND ALSA"
+
+#: src/amidi-plug/i_configure-alsa.c:331
+msgid "Port"
+msgstr "Porta"
+
+#: src/amidi-plug/i_configure-alsa.c:333
+msgid "Client name"
+msgstr "Nome del client"
+
+#: src/amidi-plug/i_configure-alsa.c:335
+msgid "Port name"
+msgstr "Nome della porta"
+
+#: src/amidi-plug/i_configure-alsa.c:346
+msgid "ALSA output ports"
+msgstr "Porte di uscita ALSA"
+
+#: src/amidi-plug/i_configure-alsa.c:399
+msgid "Soundcard: "
+msgstr "Scheda audio: "
+
+#: src/amidi-plug/i_configure-alsa.c:401
+msgid "Mixer control: "
+msgstr "Controllo mixer: "
+
+#: src/amidi-plug/i_configure-alsa.c:413
+msgid "Mixer settings"
+msgstr "Impostazioni mixer"
+
+#: src/amidi-plug/i_configure-alsa.c:429
+msgid "ALSA Backend not loaded or not available"
+msgstr "Backend ALSA non caricato o non disponibile"
+
+#: src/amidi-plug/i_configure-alsa.c:448
+msgid ""
+"ALSA\n"
+"backend"
+msgstr "Backend ALSA"
+
+#: src/amidi-plug/i_configure-ap.c:59
+msgid "AMIDI-Plug - backend information"
+msgstr "AMIDI-Plug - informazioni backend"
+
+#: src/amidi-plug/i_configure-ap.c:196
+msgid "AMIDI-PLUG PREFERENCES"
+msgstr "PREFERENZE AMIDI-PLUG"
+
+#: src/amidi-plug/i_configure-ap.c:223
+msgid "Backend selection"
+msgstr "Selezione backend"
+
+#: src/amidi-plug/i_configure-ap.c:227
+msgid "Available backends"
+msgstr "Backend disponibili"
+
+#: src/amidi-plug/i_configure-ap.c:257
+msgid "Playback settings"
+msgstr "Impostazioni di riproduzione"
+
+#: src/amidi-plug/i_configure-ap.c:262
+msgid "Transpose: "
+msgstr "Trasponi: "
+
+#: src/amidi-plug/i_configure-ap.c:271
+msgid "Drum shift: "
+msgstr "Spostamento percussioni: "
+
+#: src/amidi-plug/i_configure-ap.c:289
+msgid "Advanced settings"
+msgstr "Impostazioni avanzate"
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "precalcola durata dei file MIDI nella playlist"
+
+#: src/amidi-plug/i_configure-ap.c:298
+msgid "extract comments from MIDI file (if available)"
+msgstr "estrai commenti dal file MIDI (se disponibili)"
+
+#: src/amidi-plug/i_configure-ap.c:303
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "estrai testi dal file MIDI (se disponibili)"
+
+#: src/amidi-plug/i_configure-ap.c:333
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr "AMIDI\nPlug"
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug - select file"
+msgstr "AMIDI-Plug - seleziona file"
+
+#: src/amidi-plug/i_configure.c:129
+msgid "AMIDI-Plug - configuration"
+msgstr "AMIDI-Plug - configurazione"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:55
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Plug - seleziona file SoundFont"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:270
+msgid "FLUIDSYNTH BACKEND CONFIGURATION"
+msgstr "CONFIGURAZIONE DEL BACKEND FLUIDSYNTH"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:313
+msgid "SoundFont settings"
+msgstr "Impostazioni SoundFont"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Nome del file"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:349
+msgid "Size (bytes)"
+msgstr "Dimensioni (byte)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:398
+msgid "Load SF on player start"
+msgstr "Carica SF all'avvio del lettore"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:402
+msgid "Load SF on first midifile play"
+msgstr "Carica SF alla prima riproduzione di file midi"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:417
+msgid "Synthesizer settings"
+msgstr "Impostazioni sintetizzatore"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:426
+msgid "gain"
+msgstr "guadagno"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:432
+#: src/amidi-plug/i_configure-fluidsynth.c:460
+#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:519
+msgid "use default"
+msgstr "usa predefinito"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:435
+#: src/amidi-plug/i_configure-fluidsynth.c:463
+msgid "value:"
+msgstr "valore:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:454
+msgid "poliphony"
+msgstr "polifonia"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:482
+msgid "reverb"
+msgstr "riverbero"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:491
+#: src/amidi-plug/i_configure-fluidsynth.c:522
+msgid "yes"
+msgstr "sì"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:493
+#: src/amidi-plug/i_configure-fluidsynth.c:524
+msgid "no"
+msgstr "no"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:513
+msgid "chorus"
+msgstr "chorus"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:544
+msgid "sample rate"
+msgstr "frequenza di campionamento"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:550
+msgid "22050 Hz "
+msgstr "22050 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:553
+msgid "44100 Hz "
+msgstr "44100 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:556
+msgid "96000 Hz "
+msgstr "96000 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:559
+msgid "custom "
+msgstr "personalizzata "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "Hz "
+msgstr "Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:621
+msgid "FluidSynth Backend not loaded or not available"
+msgstr "Backend FluidSynth non caricato o non disponibile"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:640
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr "Backend FluidSynth"
+
+#: src/amidi-plug/i_configure-timidity.c:39
+msgid "TIMIDITY BACKEND CONFIGURATION"
+msgstr "CONFIGURAZIONE DEL BACKEND TIMIDITY"
+
+#: src/amidi-plug/i_configure-timidity.c:64
+msgid "TiMidity Backend not loaded or not available"
+msgstr "Backend TiMidity non caricato o non disponibile"
+
+#: src/amidi-plug/i_configure-timidity.c:83
+msgid ""
+"TiMidity\n"
+"backend"
+msgstr "Backend TiMidity"
+
+#: src/amidi-plug/i_fileinfo.c:169
+msgid "Name:"
+msgstr "Nome:"
+
+#: src/amidi-plug/i_fileinfo.c:193
+msgid " MIDI Info "
+msgstr " Informazioni MIDI "
+
+#: src/amidi-plug/i_fileinfo.c:205
+msgid "Format:"
+msgstr "Formato:"
+
+#: src/amidi-plug/i_fileinfo.c:208
+msgid "Length (msec):"
+msgstr "Durata (msec):"
+
+#: src/amidi-plug/i_fileinfo.c:211
+msgid "Num of Tracks:"
+msgstr "Num di tracce:"
+
+#: src/amidi-plug/i_fileinfo.c:216
+msgid "variable"
+msgstr "variabile"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidi-plug/i_fileinfo.c:223
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "Time Div:"
+msgstr "Suddivisione temporale:"
+
+#: src/amidi-plug/i_fileinfo.c:237
+msgid " MIDI Comments and Lyrics "
+msgstr " Commenti e testi MIDI "
+
+#: src/amidi-plug/i_fileinfo.c:288
+msgid "* no comments available in this MIDI file *"
+msgstr "* nessun commento disponibile in questo file MIDI *"
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* nessun testo disponibile in questo file MIDI *"
+
+#: src/amidi-plug/i_fileinfo.c:349
+msgid " (invalid UTF-8)"
+msgstr " (UTF-8 non valido)"
+
+#: src/amidi-plug/i_utils.c:43
+msgid "AMIDI-Plug - about"
+msgstr "AMIDI-Plug - informazioni su"
+
+#: src/amidi-plug/i_utils.c:68
+msgid ""
+"\n"
+"AMIDI-Plug "
+msgstr "\nAMIDI-Plug "
+
+#: src/amidi-plug/i_utils.c:69
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing\n"
+"\n"
+msgstr "\nlettore musicale MIDI modulare\nhttp://www.develia.org/projects.php?p=amidiplug\n\nscritto da Giacomo Lozito\n< james@develia.org >\n\n\nun ringraziamento speciale a…\n\nClemens Ladisch e Jaroslav Kysela\nper i loro favolosi programmi aplaymidi e amixer; sono\nstati davvero utili, insieme alla documentazione di alsa-lib,\nper saperne di più sulle API di ALSA\n\nAlfredo Spadafina\nper il bel logo della tastiera midi\n\nTony Vroon\nper il valido aiuto con il collaudo alpha\n\n"
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "Rettangolo"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "Rettangolo arrotondato"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "Rettangolo concavo"
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "Nessuno"
+
+#: src/aosd/aosd_trigger.c:78
+msgid "Playback Start"
+msgstr "Avvio della riproduzione"
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Visualizza l'OSD quando viene riprodotto un elemento della playlist."
+
+#: src/aosd/aosd_trigger.c:83
+msgid "Title Change"
+msgstr "Cambio titolo"
+
+#: src/aosd/aosd_trigger.c:84
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr "Visualizza l'OSD quando, durante la riproduzione, il titolo del brano cambia ma il nome del file è lo stesso. È utile principalmente per visualizzare i cambi di titolo negli stream su internet."
+
+#: src/aosd/aosd_trigger.c:90
+msgid "Volume Change"
+msgstr "Cambio volume"
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Triggers OSD when volume is changed."
+msgstr "Visualizza l'OSD quando viene cambiato il volume."
+
+#: src/aosd/aosd_trigger.c:95
+msgid "Pause On"
+msgstr "Attivazione pausa"
+
+#: src/aosd/aosd_trigger.c:96
+msgid "Triggers OSD when playback is paused."
+msgstr "Visualizza l'OSD quando viene interrotta la riproduzione."
+
+#: src/aosd/aosd_trigger.c:100
+msgid "Pause Off"
+msgstr "Disattivazione pausa"
+
+#: src/aosd/aosd_trigger.c:101
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Visualizza l'OSD quando viene ripresa la riproduzione."
+
+#: src/aosd/aosd_ui.c:179
+msgid "Placement"
+msgstr "Posizionamento"
+
+#: src/aosd/aosd_ui.c:218
+msgid "Relative X offset:"
+msgstr "Offset X relativo:"
+
+#: src/aosd/aosd_ui.c:227
+msgid "Relative Y offset:"
+msgstr "Offset Y relativo:"
+
+#: src/aosd/aosd_ui.c:236
+msgid "Max OSD width:"
+msgstr "Larghezza massima OSD:"
+
+#: src/aosd/aosd_ui.c:249
+msgid "Multi-Monitor options"
+msgstr "Opzioni multi-monitor"
+
+#: src/aosd/aosd_ui.c:253
+msgid "Display OSD using:"
+msgstr "Visualizza OSD su:"
+
+#: src/aosd/aosd_ui.c:264
+msgid "all monitors"
+msgstr "tutti i monitor"
+
+#: src/aosd/aosd_ui.c:267
+#, c-format
+msgid "monitor %i"
+msgstr "monitor %i"
+
+#: src/aosd/aosd_ui.c:322
+msgid "Timing (ms)"
+msgstr "Temporizzazione (ms)"
+
+#: src/aosd/aosd_ui.c:327
+msgid "Display:"
+msgstr "Visualizza:"
+
+#: src/aosd/aosd_ui.c:332
+msgid "Fade in:"
+msgstr "Dissolvi in ingresso:"
+
+#: src/aosd/aosd_ui.c:337
+msgid "Fade out:"
+msgstr "Dissolvi in uscita:"
+
+#: src/aosd/aosd_ui.c:418
+msgid "Fonts"
+msgstr "Caratteri"
+
+#: src/aosd/aosd_ui.c:426
+#, c-format
+msgid "Font %i:"
+msgstr "Carattere %i:"
+
+#: src/aosd/aosd_ui.c:443
+msgid "Shadow"
+msgstr "Ombra"
+
+#: src/aosd/aosd_ui.c:478
+msgid "Internationalization"
+msgstr "Internazionalizzazione"
+
+#: src/aosd/aosd_ui.c:484
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "Disabilita conversione UTF-8 del testo (in aosd)"
+
+#: src/aosd/aosd_ui.c:502
+msgid "Select Skin File"
+msgstr "Seleziona file della skin"
+
+#: src/aosd/aosd_ui.c:613
+msgid "Render Style"
+msgstr "Stile di resa grafica"
+
+#: src/aosd/aosd_ui.c:629
+msgid "Colors"
+msgstr "Colori"
+
+#: src/aosd/aosd_ui.c:642
+#, c-format
+msgid "Color %i:"
+msgstr "Colore %i:"
+
+#: src/aosd/aosd_ui.c:662
+msgid "Custom Skin"
+msgstr "Skin personalizzata"
+
+#: src/aosd/aosd_ui.c:668
+msgid "Skin file:"
+msgstr "File della skin:"
+
+#: src/aosd/aosd_ui.c:671
+msgid "Browse"
+msgstr "Sfoglia"
+
+#: src/aosd/aosd_ui.c:773
+msgid "Enable trigger"
+msgstr "Abilita visualizzazione in seguito all'evento"
+
+#: src/aosd/aosd_ui.c:800
+msgid "Event"
+msgstr "Evento"
+
+#: src/aosd/aosd_ui.c:828
+msgid "Composite manager detected"
+msgstr "Rilevato compositing manager"
+
+#: src/aosd/aosd_ui.c:835
+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 "Compositing manager non rilevato;\na meno che tu non sappia di averne uno in esecuzione, per favore attiva un compositing manager altrimenti l'OSD non funzionerà correttamente"
+
+#: src/aosd/aosd_ui.c:843
+msgid "Composite manager not required for fake transparency"
+msgstr "Compositing manager non richiesto per la falsa trasparenza"
+
+#: src/aosd/aosd_ui.c:881
+msgid "Transparency"
+msgstr "Trasparenza"
+
+#: src/aosd/aosd_ui.c:887
+msgid "Fake transparency"
+msgstr "Falsa trasparenza"
+
+#: src/aosd/aosd_ui.c:889
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Trasparenza reale (richiede est. Composite di X)"
+
+#: src/aosd/aosd_ui.c:931
+msgid "Composite extension not loaded"
+msgstr "Estensione Composite non caricata"
+
+#: src/aosd/aosd_ui.c:939
+msgid "Composite extension not available"
+msgstr "Estensione Composite non disponibile"
+
+#: src/aosd/aosd_ui.c:958
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd_ui.c:1039
+msgid "Audacious OSD - configuration"
+msgstr "Audacious OSD - configurazione"
+
+#: src/aosd/aosd_ui.c:1060
+msgid "Test"
+msgstr "Prova"
+
+#: src/aosd/aosd_ui.c:1075
+msgid "Position"
+msgstr "Posizione"
+
+#: src/aosd/aosd_ui.c:1080
+msgid "Animation"
+msgstr "Animazione"
+
+#: src/aosd/aosd_ui.c:1085
+msgid "Text"
+msgstr "Testo"
+
+#: src/aosd/aosd_ui.c:1090
+msgid "Decoration"
+msgstr "Decorazione"
+
+#: src/aosd/aosd_ui.c:1095
+msgid "Trigger"
+msgstr "Eventi"
+
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
+msgid "Misc"
+msgstr "Varie"
+
+#: src/aosd/aosd_ui.c:1137
+msgid "Audacious OSD - about"
+msgstr "Audacious OSD - informazioni su"
+
+#: src/aosd/aosd_ui.c:1167
+msgid ""
+"\n"
+"Audacious OSD "
+msgstr "\nAudacious OSD "
+
+#: src/aosd/aosd_ui.c:1168
+msgid ""
+"\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"written by Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"On-Screen-Display is based on Ghosd library\n"
+"written by Evan Martin\n"
+"http://neugierig.org/software/ghosd/\n"
+"\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\nscritto da Giacomo Lozito\n< james@develia.org >\n\nOn-Screen-Display è basato sulla libreria Ghosd\nscritta da Evan Martin\nhttp://neugierig.org/software/ghosd/\n\n"
+
+#: src/blur_scope/config.c:73
+msgid "Blur Scope: Color selection"
+msgstr "Blur Scope: Selezione colore"
+
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
+msgid "Options:"
+msgstr "Opzioni:"
+
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr "Preferenze Stereofonico-a-binaurale Bauer"
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr "Livello di alimentazione:"
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr "Frequenza di taglio:"
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr "Preimpostazioni:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:242
+msgid "About Audio CD Plugin"
+msgstr "Informazioni sul plugin CD Audio"
+
+#: src/cdaudio-ng/cdaudio-ng.c:243
+msgid ""
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project.\n"
+"\n"
+"Copyright 2009 John Lindgren"
+msgstr "Copyright (c) 2007, di Calin Crisan <ccrisan@gmail.com> e del team Audacious.\n\nMolte grazie agli sviluppatori di libcdio <http://www.gnu.org/software/libcdio/>\n»e agli sviluppatori di libcddb <http://libcddb.sourceforge.net/>.\n\nGrazie anche a Tony Vroon per avermi guidato e consigliato.\n\nQuesto è stato un progetto Google Summer of Code 2007.\n\nCopyright 2009 John Lindgren"
+
+#: src/cdaudio-ng/cdaudio-ng.c:552
+msgid "Audio CD"
+msgstr "CD Audio"
+
+#: src/cdaudio-ng/cdaudio-ng.c:924
+msgid "Drive is empty."
+msgstr "Il drive è vuoto."
+
+#: src/cdaudio-ng/cdaudio-ng.c:926
+msgid "Unsupported disk type."
+msgstr "Tipo di disco non supportato."
+
+#: src/cdaudio-ng/configure.c:148
+msgid "CD Audio Plugin Configuration"
+msgstr "Configurazione del plugin Audio CD"
+
+#: src/cdaudio-ng/configure.c:160
+msgid "Digital audio extraction"
+msgstr "Estrazione audio digitale"
+
+#: src/cdaudio-ng/configure.c:165
+msgid "Title information"
+msgstr "Informazioni titoli"
+
+#: src/cdaudio-ng/configure.c:176
+msgid "Disc speed:"
+msgstr "Velocità disco:"
+
+#: src/cdaudio-ng/configure.c:184
+msgid "Use cd-text if available"
+msgstr "Usa cd-text se disponibile"
+
+#: src/cdaudio-ng/configure.c:191
+msgid "Use CDDB if available"
+msgstr "Usa CDDB se disponibile"
+
+#: src/cdaudio-ng/configure.c:197
+msgid "Server: "
+msgstr "Server: "
+
+#: src/cdaudio-ng/configure.c:201
+msgid "Path: "
+msgstr "Percorso: "
+
+#: src/cdaudio-ng/configure.c:205
+msgid "Port: "
+msgstr "Porta: "
+
+#: src/cdaudio-ng/configure.c:218
+msgid "Use HTTP instead of CDDBP"
+msgstr "Usa HTTP invece di CDDBP"
+
+#: src/cdaudio-ng/configure.c:230
+msgid "Override default device: "
+msgstr "Ignora dispositivo predefinito: "
+
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
+msgid "Ok"
+msgstr "Ok"
+
+#: src/cd-menu-items/cd-menu-items.c:34
+msgid "Play CD"
+msgstr "Riproduci CD"
+
+#: src/cd-menu-items/cd-menu-items.c:34
+msgid "Add CD"
+msgstr "Aggiungi CD"
+
+#: src/compressor/plugin.c:63
+msgid "About Dynamic Range Compression Plugin"
+msgstr "Informazioni sul plugin Compressione gamma dinamica"
+
+#: src/compressor/plugin.c:95
+msgid "Dynamic Range Compressor Preferences"
+msgstr "Preferenze Compressore gamma dinamica"
+
+#: src/compressor/plugin.c:107
+msgid "Center volume:"
+msgstr "Volume centrale:"
+
+#: src/compressor/plugin.c:120
+msgid "Dynamic range:"
+msgstr "Gamma dinamica:"
+
+#: src/console/configure.c:136
+msgid "Game Console Music Decoder"
+msgstr "Decodificatore musica console giochi"
+
+#: src/console/configure.c:153
+msgid "General"
+msgstr "Generale"
+
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Riproduzione"
+
+#: src/console/configure.c:170
+msgid "Bass:"
+msgstr "Bassi:"
+
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
+msgid "secs"
+msgstr "sec"
+
+#: src/console/configure.c:181
+msgid "Treble:"
+msgstr "Alti:"
+
+#: src/console/configure.c:202
+msgid "Default song length:"
+msgstr "Durata brano predefinita:"
+
+#: src/console/configure.c:208
+msgid "Resampling"
+msgstr "Ricampionamento"
+
+#: src/console/configure.c:214
+msgid "Enable audio resampling"
+msgstr "Abilita ricampionamento audio"
+
+#: src/console/configure.c:229
+msgid "Resampling rate:"
+msgstr "Frequenza di ricampionamento:"
+
+#: src/console/configure.c:233
+msgid "Hz"
+msgstr "Hz"
+
+#: src/console/configure.c:244
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/configure.c:245
+msgid "Ignore length from SPC tags"
+msgstr "Ignora durata specificata nei tag SPC"
+
+#: src/console/configure.c:246
+msgid "Increase reverb"
+msgstr "Aumenta riverbero"
+
+#: src/console/configure.c:271
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
+msgstr "La durata brano predefinita, espressa in secondi, è utilizzata per i brani che non forniscono informazioni sulla durata (tracce che si ripetono ciclicamente)"
+
+#: src/console/plugin.c:33
+msgid "About the Game Console Music Decoder"
+msgstr "Informazioni sul Decodificatore musica console giochi"
+
+#: src/console/plugin.c:34
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2.\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
+" Shay Green <gblargg@gmail.com>\n"
+msgstr "Motore del decodificatore musica console basato su Game_Music_Emu 0.5.2.\nFormati supportati: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nImplementazione Audacious di: William Pitcock <nenolod@dereferenced.org>, \n Shay Green <gblargg@gmail.com>\n"
+
+#: src/crossfade/plugin.c:60
+msgid "About Crossfade"
+msgstr "Informazioni su Dissolvenza incrociata"
+
+#: src/crossfade/plugin.c:92
+msgid "Crossfade Preferences"
+msgstr "Preferenze Dissolvenza incrociata"
+
+#: src/crossfade/plugin.c:104
+msgid "Overlap (in seconds):"
+msgstr "Sovrapposizione (in secondi):"
+
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
+msgid "Crossfade Error"
+msgstr "Errore Dissolvenza incrociata"
+
+#: src/crossfade/plugin.c:135
+msgid ""
+"Crossfading failed because the songs had a different number of channels."
+msgstr "La dissolvenza incrociata è fallita poiché i brani avevano un numero di canali differente."
+
+#: src/crossfade/plugin.c:143
+msgid ""
+"Crossfading failed because the songs had different sample rates.\n"
+"\n"
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
+msgstr "La dissolvenza incrociata è fallita poiché i brani avevano una differente frequenza di campionamento.\n\nPuoi usare l'effetto Convertitore frequenza di campionamento per ricampionare i brani alla stessa frequenza."
+
+#: src/crystalizer/crystalizer.c:100
+msgid "Configure Crystalizer"
+msgstr "Configura Crystalizer"
+
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
+msgid "Effect intensity:"
+msgstr "Intensità dell'effetto:"
+
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
+msgid "Apply"
+msgstr "Applica"
+
+#: src/echo_plugin/gui.c:15
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin 1999.\n"
+"\n"
+"Surround echo by Carl van Schaik 1999"
+msgstr "Plugin Eco\nDi Johan Levin 1999.\n\nEco surround di Carl van Schaik 1999"
+
+#: src/echo_plugin/gui.c:27
+msgid "About Echo Plugin"
+msgstr "Informazioni sul plugin Eco"
+
+#: src/echo_plugin/gui.c:67
+msgid "Configure Echo"
+msgstr "Configura Eco"
+
+#: src/echo_plugin/gui.c:83
+msgid "Delay: (ms)"
+msgstr "Ritardo: (ms)"
+
+#: src/echo_plugin/gui.c:88
+msgid "Feedback: (%)"
+msgstr "Ritorno: (%)"
+
+#: src/echo_plugin/gui.c:93
+msgid "Volume: (%)"
+msgstr "Volume: (%)"
+
+#: src/ffaudio/ffaudio-core.c:718
+#, 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"
+"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 "Plugin di decodifica audio multi-formato per Audacious basato\nsul framework multimediale FFmpeg (http://www.ffmpeg.org/)\nCopyright (c) 2000-2009 Fabrice Bellard, et al.\n\nPlugin per Audacious di:\n William Pitcock <nenolod@nenolod.net>,\n Matti Hämäläinen <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
+
+#: src/ffaudio/ffaudio-core.c:732
+msgid "About FFaudio Plugin"
+msgstr "Informazioni sul plugin FFaudio"
+
+#: src/filewriter/filewriter.c:166
+msgid "About FileWriter-Plugin"
+msgstr "Informazioni sul plugin FileWriter"
+
+#: src/filewriter/filewriter.c:461
+msgid "File Writer Configuration"
+msgstr "Configurazione File writer"
+
+#: src/filewriter/filewriter.c:473
+msgid "Output file format:"
+msgstr "Formato del file in uscita:"
+
+#: src/filewriter/filewriter.c:491
+msgid "Configure"
+msgstr "Configura"
+
+#: src/filewriter/filewriter.c:506
+msgid "Save into original directory"
+msgstr "Salva nella directory originale"
+
+#: src/filewriter/filewriter.c:511
+msgid "Save into custom directory"
+msgstr "Salva in directory personalizzata"
+
+#: src/filewriter/filewriter.c:521
+msgid "Output file folder:"
+msgstr "Cartella del file in uscita:"
+
+#: src/filewriter/filewriter.c:525
+msgid "Pick a folder"
+msgstr "Seleziona una cartella"
+
+#: src/filewriter/filewriter.c:544
+msgid "Get filename from:"
+msgstr "Ottieni nome file da:"
+
+#: src/filewriter/filewriter.c:547
+msgid "original file tags"
+msgstr "tag del file originale"
+
+#: src/filewriter/filewriter.c:553
+msgid "original filename"
+msgstr "nome del file originale"
+
+#: src/filewriter/filewriter.c:563
+msgid "Don't strip file name extension"
+msgstr "Non togliere estensione dal nome del file"
+
+#: src/filewriter/filewriter.c:578
+msgid "Prepend track number to filename"
+msgstr "Anteponi numero di traccia al nome del file"
+
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
+msgid "Auto"
+msgstr "Auto"
+
+#: src/filewriter/mp3.c:38
+msgid "Joint Stereo"
+msgstr "Joint stereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/mp3.c:706
+msgid "MP3 Configuration"
+msgstr "Configurazione MP3"
+
+#: src/filewriter/mp3.c:729
+msgid "Algorithm Quality:"
+msgstr "Qualità dell'algoritmo:"
+
+#: src/filewriter/mp3.c:754
+msgid "Output Samplerate:"
+msgstr "Frequenza di campionamento in uscita:"
+
+#: src/filewriter/mp3.c:782
+msgid "(Hz)"
+msgstr "(Hz)"
+
+#: src/filewriter/mp3.c:789
+msgid "Bitrate / Compression ratio:"
+msgstr "Bitrate / fattore di compressione:"
+
+#: src/filewriter/mp3.c:813
+msgid "Bitrate (kbps):"
+msgstr "Bitrate (kbps):"
+
+#: src/filewriter/mp3.c:846
+msgid "Compression ratio:"
+msgstr "Fattore di compressione:"
+
+#: src/filewriter/mp3.c:870
+msgid "Audio Mode:"
+msgstr "Modalità audio:"
+
+#: src/filewriter/mp3.c:895
+msgid "Misc:"
+msgstr "Varie:"
+
+#: src/filewriter/mp3.c:906
+msgid "Enforce strict ISO complience"
+msgstr "Rispetta rigorosamente conformità ISO"
+
+#: src/filewriter/mp3.c:917
+msgid "Error protection"
+msgstr "Protezione dagli errori"
+
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
+msgid "Quality"
+msgstr "Qualità"
+
+#: src/filewriter/mp3.c:939
+msgid "Enable VBR/ABR"
+msgstr "Abilita VBR/ABR"
+
+#: src/filewriter/mp3.c:949
+msgid "Type:"
+msgstr "Tipo:"
+
+#: src/filewriter/mp3.c:982
+msgid "VBR Options:"
+msgstr "Opzioni VBR:"
+
+#: src/filewriter/mp3.c:998
+msgid "Minimum bitrate (kbps):"
+msgstr "Bitrate minima (kbps):"
+
+#: src/filewriter/mp3.c:1025
+msgid "Maximum bitrate (kbps):"
+msgstr "Bitrate massima (kbps):"
+
+#: src/filewriter/mp3.c:1048
+msgid "Strictly enforce minimum bitrate"
+msgstr "Rispetta rigorosamente bitrate minima"
+
+#: src/filewriter/mp3.c:1060
+msgid "ABR Options:"
+msgstr "Opzioni ABR:"
+
+#: src/filewriter/mp3.c:1070
+msgid "Average bitrate (kbps):"
+msgstr "Bitrate media (kbps):"
+
+#: src/filewriter/mp3.c:1098
+msgid "VBR quality level:"
+msgstr "Livello di qualità VBR:"
+
+#: src/filewriter/mp3.c:1117
+msgid "Don't write Xing VBR header"
+msgstr "Non scrivere intestazione VBR Xing"
+
+#: src/filewriter/mp3.c:1131
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1141
+msgid "Frame params:"
+msgstr "Parametri frame:"
+
+#: src/filewriter/mp3.c:1153
+msgid "Mark as copyright"
+msgstr "Contrassegna come coperto da copyright"
+
+#: src/filewriter/mp3.c:1164
+msgid "Mark as original"
+msgstr "Contrassegna come originale"
+
+#: src/filewriter/mp3.c:1176
+msgid "ID3 params:"
+msgstr "Parametri ID3:"
+
+#: src/filewriter/mp3.c:1187
+msgid "Force addition of version 2 tag"
+msgstr "Forza aggiunta del tag versione 2"
+
+#: src/filewriter/mp3.c:1197
+msgid "Only add v1 tag"
+msgstr "Aggiungi solo tag v1"
+
+#: src/filewriter/mp3.c:1204
+msgid "Only add v2 tag"
+msgstr "Aggiungi solo tag v2"
+
+#: src/filewriter/mp3.c:1225
+msgid "Tags"
+msgstr "Tag"
+
+#: src/filewriter/vorbis.c:240
+msgid "Vorbis Encoder Configuration"
+msgstr "Configurazione del codificatore Vorbis"
+
+#: src/filewriter/vorbis.c:260
+msgid "Quality level (0 - 10):"
+msgstr "Livello di qualità (0 - 10):"
+
+#: src/flacng/plugin.c:380
+msgid "About FLAC Audio Plugin"
+msgstr "Informazioni sul plugin Audio FLAC"
+
+#: src/flacng/plugin.c:381
+msgid ""
+"\n"
+"\n"
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\nCodice originale di\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
+msgid "About Gnome Shortcut Plugin"
+msgstr "Informazioni sul plugin Scorciatoie Gnome"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr "Plugin Scorciatoie Gnome\nConsente di controllare il lettore con i tasti di scelta rapida di Gnome.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
+
+#: src/gtkui/columns.c:36
+msgid "Entry number"
+msgstr "Numero elemento"
+
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
+msgid "Title"
+msgstr "Titolo"
+
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
+msgid "Artist"
+msgstr "Artista"
+
+#: src/gtkui/columns.c:37
+msgid "Year"
+msgstr "Anno"
+
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
+msgid "Album"
+msgstr "Album"
+
+#: src/gtkui/columns.c:37
+msgid "Track"
+msgstr "Traccia"
+
+#: src/gtkui/columns.c:37
+msgid "Queue position"
+msgstr "Posizione nella coda"
+
+#: src/gtkui/columns.c:38
+msgid "Length"
+msgstr "Durata"
+
+#: src/gtkui/columns.c:38
+msgid "File path"
+msgstr "Percorso del file"
+
+#: src/gtkui/columns.c:38
+msgid "File name"
+msgstr "Nome del file"
+
+#: src/gtkui/columns.c:38
+msgid "Custom title"
+msgstr "Titolo personalizzato"
+
+#: src/gtkui/columns.c:39
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: src/gtkui/columns.c:278
+msgid "Choose Columns"
+msgstr "Scegli colonne"
+
+#: src/gtkui/columns.c:292
+msgid "Available:"
+msgstr "Disponibili:"
+
+#: src/gtkui/columns.c:326
+msgid "Chosen:"
+msgstr "Selezionate:"
+
+#: src/gtkui/layout.c:122
+msgid "Dock at Left"
+msgstr "Aggancia a sinistra"
+
+#: src/gtkui/layout.c:122
+msgid "Dock at Right"
+msgstr "Aggancia a destra"
+
+#: src/gtkui/layout.c:123
+msgid "Dock at Top"
+msgstr "Aggancia in alto"
+
+#: src/gtkui/layout.c:123
+msgid "Dock at Bottom"
+msgstr "Aggancia in basso"
+
+#: src/gtkui/layout.c:123
+msgid "Undock"
+msgstr "Sgancia"
+
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
+msgid "Disable"
+msgstr "Disabilita"
+
+#: src/gtkui/menus.c:131
+msgid "_Open Files ..."
+msgstr "_Apri file…"
+
+#: src/gtkui/menus.c:132
+msgid "Open _URL ..."
+msgstr "Apri _URL…"
+
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "A_ggiungi file…"
+
+#: src/gtkui/menus.c:134
+msgid "Add U_RL ..."
+msgstr "Aggiungi U_RL…"
+
+#: src/gtkui/menus.c:136
+msgid "A_bout ..."
+msgstr "I_nformazioni su…"
+
+#: src/gtkui/menus.c:137
+msgid "_Preferences ..."
+msgstr "_Preferenze…"
+
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
+msgid "_Quit"
+msgstr "_Esci"
+
+#: src/gtkui/menus.c:141
+msgid "_Play"
+msgstr "_Riproduci"
+
+#: src/gtkui/menus.c:142
+msgid "Paus_e"
+msgstr "Interro_mpi"
+
+#: src/gtkui/menus.c:143
+msgid "_Stop"
+msgstr "_Ferma"
+
+#: src/gtkui/menus.c:144
+msgid "Pre_vious"
+msgstr "Pre_cedente"
+
+#: src/gtkui/menus.c:145
+msgid "_Next"
+msgstr "_Successiva"
+
+#: src/gtkui/menus.c:147
+msgid "_Repeat"
+msgstr "Ripe_ti"
+
+#: src/gtkui/menus.c:148
+msgid "S_huffle"
+msgstr "C_asuale"
+
+#: src/gtkui/menus.c:149
+msgid "N_o Playlist Advance"
+msgstr "N_on avanzare nella playlist"
+
+#: src/gtkui/menus.c:150
+msgid "Stop _After This Song"
+msgstr "Ferma _dopo questo brano"
+
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
+msgid "Song _Info ..."
+msgstr "Informazioni sul _brano…"
+
+#: src/gtkui/menus.c:153
+msgid "Jump to _Time ..."
+msgstr "Salta alla _posizione…"
+
+#: src/gtkui/menus.c:154
+msgid "_Jump to Song ..."
+msgstr "Sa_lta al brano…"
+
+#: src/gtkui/menus.c:157
+msgid "By Track _Number"
+msgstr "Per _numero di traccia"
+
+#: src/gtkui/menus.c:158
+msgid "By _Title"
+msgstr "Per _titolo"
+
+#: src/gtkui/menus.c:159
+msgid "By _Artist"
+msgstr "Per _artista"
+
+#: src/gtkui/menus.c:160
+msgid "By A_lbum"
+msgstr "Per a_lbum"
+
+#: src/gtkui/menus.c:161
+msgid "By Release _Date"
+msgstr "Per _data di pubblicazione"
+
+#: src/gtkui/menus.c:162
+msgid "By _File Path"
+msgstr "Per percorso del _file"
+
+#: src/gtkui/menus.c:163
+msgid "By _Custom Title"
+msgstr "Per titolo _personalizzato"
+
+#: src/gtkui/menus.c:165
+msgid "R_everse Order"
+msgstr "Ordine in_verso"
+
+#: src/gtkui/menus.c:166
+msgid "_Random Order"
+msgstr "Ordine _casuale"
+
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
+msgid "_Refresh"
+msgstr "A_ggiorna"
+
+#: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Ri_muovi file non disponibili"
+
+#: src/gtkui/menus.c:172
+msgid "_Sort"
+msgstr "_Ordina"
+
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr "_Nuova"
+
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
+msgid "_Close"
+msgstr "_Chiudi"
+
+#: src/gtkui/menus.c:177
+msgid "_Import ..."
+msgstr "_Importa…"
+
+#: src/gtkui/menus.c:178
+msgid "_Export ..."
+msgstr "_Esporta…"
+
+#: src/gtkui/menus.c:180
+msgid "_Playlist Manager ..."
+msgstr "Gestione _playlist…"
+
+#: src/gtkui/menus.c:181
+msgid "_Queue Manager ..."
+msgstr "Gestione co_da…"
+
+#: src/gtkui/menus.c:184
+msgid "Volume _Up"
+msgstr "_Alza volume"
+
+#: src/gtkui/menus.c:185
+msgid "Volume _Down"
+msgstr "A_bbassa volume"
+
+#: src/gtkui/menus.c:187
+msgid "_Equalizer"
+msgstr "_Equalizzatore"
+
+#: src/gtkui/menus.c:189
+msgid "E_ffects"
+msgstr "E_ffetti"
+
+#: src/gtkui/menus.c:192
+msgid "_Interface"
+msgstr "_Interfaccia"
+
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Visualizzazioni"
+
+#: src/gtkui/menus.c:195
+msgid "Show _Menu Bar"
+msgstr "Mostra barra dei _menu"
+
+#: src/gtkui/menus.c:196
+msgid "Show I_nfo Bar"
+msgstr "Mostra barra i_nformazioni"
+
+#: src/gtkui/menus.c:197
+msgid "Show _Status Bar"
+msgstr "Mostra barra di _stato"
+
+#: src/gtkui/menus.c:199
+msgid "Show Column _Headers"
+msgstr "Mostra in_testazioni di colonna"
+
+#: src/gtkui/menus.c:200
+msgid "Choose _Columns ..."
+msgstr "Scegli _colonne…"
+
+#: src/gtkui/menus.c:201
+msgid "Scrol_l on Song Change"
+msgstr "Sco_rri al cambiare del brano"
+
+#: src/gtkui/menus.c:204
+msgid "_File"
+msgstr "_File"
+
+#: src/gtkui/menus.c:205
+msgid "_Playback"
+msgstr "_Riproduzione"
+
+#: src/gtkui/menus.c:206
+msgid "P_laylist"
+msgstr "_Playlist"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
+msgid "_Services"
+msgstr "_Servizi"
+
+#: src/gtkui/menus.c:208
+msgid "_Output"
+msgstr "_Uscita"
+
+#: src/gtkui/menus.c:209
+msgid "_View"
+msgstr "_Visualizza"
+
+#: src/gtkui/menus.c:213
+msgid "_Queue/Unqueue"
+msgstr "Inserisci/rimuovi dalla _coda"
+
+#: src/gtkui/menus.c:216
+msgid "Cu_t"
+msgstr "T_aglia"
+
+#: src/gtkui/menus.c:217
+msgid "_Copy"
+msgstr "C_opia"
+
+#: src/gtkui/menus.c:218
+msgid "_Paste"
+msgstr "_Incolla"
+
+#: src/gtkui/menus.c:219
+msgid "Select _All"
+msgstr "Seleziona _tutti"
+
+#: src/gtkui/menus.c:224
+msgid "_Rename"
+msgstr "_Rinomina"
+
+#: src/gtkui/ui_gtk.c:95
+msgid "GTK Interface"
+msgstr "Interfaccia GTK"
+
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "Buffering…"
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
+msgid "Error"
+msgstr "Errore"
+
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Chiudi"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
+msgid "mono"
+msgstr "mono"
+
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
+msgid "stereo"
+msgstr "stereo"
+
+#: src/gtkui/ui_statusbar.c:109
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] "%d canale"
+msgstr[1] "%d canali"
+
+#: src/gtkui/ui_statusbar.c:124
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/hotkey/gui.c:71
+msgid "Previous Track"
+msgstr "Traccia precedente"
+
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Riproduci"
+
+#: src/hotkey/gui.c:73
+msgid "Pause/Resume"
+msgstr "Interrompi/riprendi"
+
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Ferma"
+
+#: src/hotkey/gui.c:75
+msgid "Next Track"
+msgstr "Traccia successiva"
+
+#: src/hotkey/gui.c:76
+msgid "Forward 5 Seconds"
+msgstr "Avanza di 5 secondi"
+
+#: src/hotkey/gui.c:77
+msgid "Rewind 5 Seconds"
+msgstr "Riavvolgi di 5 secondi"
+
+#: src/hotkey/gui.c:78
+msgid "Mute"
+msgstr "Silenzia"
+
+#: src/hotkey/gui.c:79
+msgid "Volume Up"
+msgstr "Alza volume"
+
+#: src/hotkey/gui.c:80
+msgid "Volume Down"
+msgstr "Abbassa volume"
+
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Jump to File"
+msgstr "Salta al file"
+
+#: src/hotkey/gui.c:82
+msgid "Toggle Player Windows"
+msgstr "Mostra/nascondi finestre del lettore"
+
+#: src/hotkey/gui.c:83
+msgid "Show On-Screen-Display"
+msgstr "Mostra On-screen-display"
+
+#: src/hotkey/gui.c:84
+msgid "Toggle Repeat"
+msgstr "Attiva/disattiva ripetizione"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle Shuffle"
+msgstr "Attiva/disattiva riproduzione casuale"
+
+#: src/hotkey/gui.c:95
+msgid "(none)"
+msgstr "(nessuno)"
+
+#: src/hotkey/gui.c:232
+msgid ""
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr "Non è consigliabile associare i pulsanti primari del mouse senza modificatori.\n\nVuoi continuare?"
+
+#: src/hotkey/gui.c:234
+msgid "Binding mouse buttons"
+msgstr "Associazione pulsanti del mouse"
+
+#: src/hotkey/gui.c:384
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Configurazione plugin Tasti di scelta rapida globali"
+
+#: src/hotkey/gui.c:400
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr "Premi una combinazione di tasti all'interno di un campo di testo.\nPuoi anche associare i pulsanti del mouse."
+
+#: src/hotkey/gui.c:405
+msgid "Hotkeys:"
+msgstr "Tasti di scelta rapida:"
+
+#: src/hotkey/gui.c:424
+msgid "Action:"
+msgstr "Azione:"
+
+#: src/hotkey/gui.c:432
+msgid "Key Binding:"
+msgstr "Tasto associato:"
+
+#: src/hotkey/gui.c:663
+msgid "About Global Hotkey Plugin"
+msgstr "Informazioni sul plugin Tasti di scelta rapida globali"
+
+#: src/hotkey/gui.c:664
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr "Plugin Tasti di scelta rapida globali\nControlla il lettore con combinazioni di tasti o tasti multimediali globali.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nHanno collaborato, tra gli altri:\nCopyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n»»»Bryn Davies <curious@ihug.com.au>\n»»»Jonathan A. Davis <davis@jdhouse.org>\n»»»Jeremy Tan <nsx@nsx.homeip.net>\n\n"
+
+#: src/jack/configure.c:66
+msgid "Connect to all available jack ports"
+msgstr "Connetti a tutte le porte jack disponibili"
+
+#: src/jack/configure.c:73
+msgid "Connect only the output ports"
+msgstr "Connetti solo le porte di uscita"
+
+#: src/jack/configure.c:80
+msgid "Connect to no ports"
+msgstr "Non connettere a nessuna porta"
+
+#: src/jack/configure.c:98
+msgid "jack Plugin configuration"
+msgstr "Configurazione del plugin jack"
+
+#: src/jack/configure.c:116
+msgid "Connection mode:"
+msgstr "Modalità di connessione:"
+
+#: src/jack/configure.c:128
+msgid "Enable debug printing"
+msgstr "Abilita messaggi di debug"
+
+#: src/jack/jack.c:435
+msgid ""
+"XMMS jack Driver 0.17\n"
+"\n"
+"xmms-jack.sf.net\n"
+"Chris Morgan<cmorgan@alum.wpi.edu>\n"
+"\n"
+"Audacious port by\n"
+"Giacomo Lozito from develia.org"
+msgstr "Driver jack per XMMS 0.17\n\nxmms-jack.sf.net\nChris Morgan<cmorgan@alum.wpi.edu>\n\nPort per Audacious di\nGiacomo Lozito from develia.org"
+
+#: src/jack/jack.c:440
+msgid "About JACK Output Plugin 0.17"
+msgstr "Informazioni sul plugin di uscita JACK 0.17"
+
+#: src/ladspa/plugin.c:415
+msgid "About LADSPA Host"
+msgstr "Informazioni su Host LADSPA"
+
+#: src/ladspa/plugin.c:516
+#, c-format
+msgid "%s Settings"
+msgstr "Impostazioni %s"
+
+#: src/ladspa/plugin.c:584
+msgid "LADSPA Host Settings"
+msgstr "Impostazioni Host LADSPA"
+
+#: src/ladspa/plugin.c:593
+msgid "Module paths:"
+msgstr "Percorsi dei moduli:"
+
+#: src/ladspa/plugin.c:598
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr "Separa più percorsi con i due punti.\nLa ricerca viene effettuata in questi percorsi in aggiunta a LADSPA_PATH.\nDopo aver aggiunto nuovi percorsi, premi Invio per ricercare nuovi plugin."
+
+#: src/ladspa/plugin.c:614
+msgid "Available plugins:"
+msgstr "Plugin disponibili:"
+
+#: src/ladspa/plugin.c:626
+msgid "Enable"
+msgstr "Abilita"
+
+#: src/ladspa/plugin.c:632
+msgid "Enabled plugins:"
+msgstr "Plugin abilitati:"
+
+#: src/ladspa/plugin.c:647
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: src/lyricwiki/lyricwiki.c:267
+msgid ""
+"\n"
+"Looking for lyrics..."
+msgstr "\nRicerca testi in corso…"
+
+#: src/lyricwiki/lyricwiki.c:304
+msgid ""
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr "\nConnessione a lyrics.wikia.com in corso…"
+
+#: src/lyricwiki/lyricwiki.c:377
+msgid ""
+"\n"
+"No lyrics were found."
+msgstr "\nNon sono stati trovati testi."
+
+#: src/metronom/metronom.c:86
+msgid "About Metronom"
+msgstr "Informazioni su Metronomo"
+
+#: src/metronom/metronom.c:87
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr "Un metronomo di Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nPer utilizzarlo, aggiungi un URL: tact://battiti*num/den\np.es. tact://77 per suonare 77 battiti per minuto\noppure tact://60*3/4 per suonare 60 bpm in misure da 3/4"
+
+#: src/metronom/metronom.c:144
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Metronomo: %d bpm"
+
+#: src/metronom/metronom.c:146
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Metronomo: %d bpm %d/%d"
+
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "Informazioni su Mixer canali"
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "Impostazioni Mixer canali"
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "Canali in uscita:"
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "I cambiamenti avranno effetto al prossimo cambio di brano."
+
+#: src/mpg123/mpg123.c:191
+msgid "Surround"
+msgstr "Surround"
+
+#: src/mtp_up/mtp.c:340
+msgid "Upload in progress..."
+msgstr "Caricamento in corso…"
+
+#: src/mtp_up/mtp.c:352
+msgid "Upload to MTP Device"
+msgstr "Carica su dispositivo MTP"
+
+#: src/mtp_up/mtp.c:353
+msgid "Disconnect MTP Device"
+msgstr "Disconnetti dispositivo MTP"
+
+#: src/notify/libnotify-aosd_event.c:48
+msgid "Stopped"
+msgstr "Fermato"
+
+#: src/notify/libnotify-aosd_event.c:48
+msgid "Audacious is not playing."
+msgstr "Audacious non sta riproducendo."
+
+#: src/null/null.c:64
+msgid "Null output plugin "
+msgstr "Plugin di uscita Null "
+
+#: src/null/null.c:65
+msgid ""
+" by Christian Birchinger <joker@netswarm.net>\n"
+"based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
+msgstr " di Christian Birchinger <joker@netswarm.net>\nbasato sul plugin per XMMS di Håvard Kvål <havardk@xmms.org>"
+
+#: src/null/null.c:68
+msgid "About Null Output"
+msgstr "Informazioni su Uscita Null"
+
+#: src/null/null.c:89
+msgid "Null output preferences"
+msgstr "Preferenze di uscita Null"
+
+#: src/null/null.c:100
+msgid "Run in real time"
+msgstr "Esegui in tempo reale"
+
+#: src/oss4/configure.c:81
+msgid "1. Default device"
+msgstr "1. Dispositivo predefinito"
+
+#: src/oss4/configure.c:138
+msgid "OSS4 Output Plugin Preferences"
+msgstr "Preferenze del plugin di uscita OSS4"
+
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
+msgid "Audio device:"
+msgstr "Dispositivo audio:"
+
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
+msgid "Use alternate device:"
+msgstr "Usa dispositivo alternativo:"
+
+#: src/oss4/configure.c:193
+msgid "Save volume between sessions"
+msgstr "Salva il volume tra una sessione e l'altra"
+
+#: src/oss4/configure.c:197
+msgid "Enable format conversions made by the OSS software."
+msgstr "Abilita conversioni di formato effettuate dal software OSS."
+
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Abilita la modalità esclusiva per prevenire il missaggio virtuale."
+
+#: src/oss4/plugin.c:51
+msgid "About OSS4 Plugin"
+msgstr "Informazioni sul plugin OSS4"
+
+#: src/oss4/utils.c:211
+msgid "OSS4 error"
+msgstr "Errore OSS4"
+
+#: src/OSS/configure.c:137
+#, c-format
+msgid "Default (%s)"
+msgstr "Predefinito (%s)"
+
+#: src/OSS/configure.c:178
+msgid "OSS Driver configuration"
+msgstr "Configurazione del driver OSS"
+
+#: src/OSS/configure.c:281
+msgid "Devices"
+msgstr "Dispositivi"
+
+#: src/OSS/configure.c:283
+msgid "Buffering:"
+msgstr "Buffering:"
+
+#: src/OSS/configure.c:296
+msgid "Pre-buffer (percent):"
+msgstr "Pre-buffer (percento):"
+
+#: src/OSS/configure.c:307
+msgid "Buffering"
+msgstr "Buffering"
+
+#: src/OSS/configure.c:308
+msgid "Mixer Settings:"
+msgstr "Impostazioni mixer:"
+
+#: src/OSS/configure.c:314
+msgid "Volume controls Master not PCM"
+msgstr "Volume controlla il Master anziché il PCM"
+
+#: src/OSS/configure.c:320
+msgid "Mixer"
+msgstr "Mixer"
+
+#: src/OSS/OSS.c:41
+msgid "About OSS Driver"
+msgstr "Informazioni sul driver OSS"
+
+#: src/pulse_audio/pulse_audio.c:677
+msgid "About Audacious PulseAudio Output Plugin"
+msgstr "Informazioni sul plugin di uscita PulseAudio per Audacious"
+
+#: src/resample/plugin.c:89
+msgid "About Sample Rate Converter Plugin"
+msgstr "Informazioni sul plugin Convertitore frequenza di campionamento"
+
+#: src/resample/plugin.c:144
+msgid "Sample Rate Converter Preferences"
+msgstr "Preferenze Convertitore frequenza di campionamento"
+
+#: src/resample/plugin.c:156
+msgid "Rate mappings:"
+msgstr "Mappatura frequenze:"
+
+#: src/resample/plugin.c:179
+msgid "All others:"
+msgstr "Tutte le altre:"
+
+#: src/resample/plugin.c:191
+msgid "Method:"
+msgstr "Metodo:"
+
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
+msgid "Change password"
+msgstr "Cambia password"
+
+#: src/scrobbler/configure.c:144
+msgid "Services"
+msgstr "Servizi"
+
+#: src/scrobbler/configure.c:166
+msgid "Username:"
+msgstr "Nome utente:"
+
+#: src/scrobbler/configure.c:172
+msgid "Password:"
+msgstr "Password:"
+
+#: src/scrobbler/configure.c:180
+msgid "Scrobbler URL:"
+msgstr "URL Scrobbler:"
+
+#: src/scrobbler/configure.c:212
+msgid "Last.FM"
+msgstr "Last.FM"
+
+#: src/scrobbler/configure.c:239
+msgid "Scrobbler"
+msgstr "Scrobbler"
+
+#: src/scrobbler/plugin.c:194
+msgid ""
+"Audacious AudioScrobbler Plugin\n"
+"\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr "Plugin AudioScrobbler per Audacious\n\nOriginariamente creato da Audun Hove <audun@nlc.no> e Pipian <pipian@pipian.com>\n"
+
+#: src/scrobbler/plugin.c:196
+msgid "About Scrobbler Plugin"
+msgstr "Informazioni sul plugin Scrobbler"
+
+#: src/sdlout/plugin.c:58
+msgid "About SDL Output Plugin"
+msgstr "Informazioni sul plugin di uscita SDL"
+
+#: src/sdlout/plugin.c:78
+msgid "SDL error"
+msgstr "Errore SDL"
+
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Genere"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Libreria"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Crea playlist"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Aggiungi alla playlist"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Cerca nella libreria"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "Per importare la tua musica in Audacious, scegli una cartella e clicca sull'icona \"aggiorna\"."
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Attendi per favore…"
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Scegli una cartella"
+
+#: src/skins/plugin.c:167
+msgid "About Skinned GUI"
+msgstr "Informazioni GUI con skin"
+
+#: src/skins/plugin.c:168
+msgid ""
+"Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
+"\n"
+msgstr "Copyright (c) 2008, di Tomasz Moń <desowin@gmail.com>\n\n"
+
+#: src/skins/skins_cfg.c:207
+msgid "_Player:"
+msgstr "_Lettore:"
+
+#: src/skins/skins_cfg.c:208
+msgid "Select main player window font:"
+msgstr "Seleziona il carattere della finestra principale del lettore:"
+
+#: src/skins/skins_cfg.c:210
+msgid "_Playlist:"
+msgstr "_Playlist:"
+
+#: src/skins/skins_cfg.c:211
+msgid "Select playlist font:"
+msgstr "Seleziona il carattere della playlist:"
+
+#: src/skins/skins_cfg.c:215
+msgid "_Fonts"
+msgstr "_Caratteri"
+
+#: src/skins/skins_cfg.c:218
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Usa caratteri bitmap (supporta solo ASCII)"
+
+#: src/skins/skins_cfg.c:220
+msgid "Scroll song title in both directions"
+msgstr "Scorri titolo brano in entrambe le direzioni"
+
+#: src/skins/skins_cfg.c:298
+msgid "_Skin"
+msgstr "_Skin"
+
+#: src/skins/skins_cfg.c:345
+msgid "Interface Preferences"
+msgstr "Preferenze interfaccia"
+
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Preamplificazione"
+
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/ui_equalizer.c:379
+msgid "Audacious Equalizer"
+msgstr "Equalizzatore di Audacious"
+
+#: src/skins/ui_equalizer.c:887
+msgid "Presets"
+msgstr "Preimpostazioni"
+
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Carica preimpostazione"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Carica preimpostazione a caricamento automatico"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Carica preimpostazione equalizzatore"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Salva preimpostazione"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Salva preimpostazione a caricamento automatico"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Salva preimpostazione equalizzatore"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Elimina preimpostazione"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Elimina preimpostazione a caricamento automatico"
+
+#: src/skins/ui_main.c:444
+msgid "kbps"
+msgstr "kbps"
+
+#: src/skins/ui_main.c:452
+msgid "kHz"
+msgstr "kHz"
+
+#: src/skins/ui_main.c:459
+msgid "surround"
+msgstr "surround"
+
+#: src/skins/ui_main.c:807
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Vai a %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/ui_main.c:828
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volume: %d%%"
+
+#: src/skins/ui_main.c:851
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Bilanciamento: sinistra %d%%"
+
+#: src/skins/ui_main.c:853
+msgid "Balance: center"
+msgstr "Bilanciamento: centro"
+
+#: src/skins/ui_main.c:855
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Bilanciamento: destra %d%%"
+
+#: src/skins/ui_main.c:981
+msgid "Options Menu"
+msgstr "Menu opzioni"
+
+#: src/skins/ui_main.c:985
+msgid "Disable 'Always On Top'"
+msgstr "Disabilita 'Sempre in primo piano'"
+
+#: src/skins/ui_main.c:987
+msgid "Enable 'Always On Top'"
+msgstr "Abilita 'Sempre in primo piano'"
+
+#: src/skins/ui_main.c:990
+msgid "File Info Box"
+msgstr "Finestra informazioni file"
+
+#: src/skins/ui_main.c:995
+msgid "Visualization Menu"
+msgstr "Menu visualizzazione"
+
+#: src/skins/ui_main.c:1653
+msgid "Single mode."
+msgstr "Modalità singolo."
+
+#: src/skins/ui_main.c:1655
+msgid "Playlist mode."
+msgstr "Modalità playlist."
+
+#: src/skins/ui_main.c:1677
+msgid "Stopping after song."
+msgstr "La riproduzione si fermerà alla fine del brano."
+
+#: src/skins/ui_main.c:1679
+msgid "Not stopping after song."
+msgstr "La riproduzione non si fermerà alla fine del brano."
+
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+msgid "Autoscroll Songname"
+msgstr "Scorri automaticamente nome del brano"
+
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Ferma riproduzione alla fine del brano corrente"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+msgid "Peaks"
+msgstr "Picchi"
+
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Ripeti"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Casuale"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "Non avanzare nella playlist"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+msgid "Show Player"
+msgstr "Mostra lettore"
+
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+msgid "Show Playlist Editor"
+msgstr "Mostra editor della playlist"
+
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+msgid "Show Equalizer"
+msgstr "Mostra equalizzatore"
+
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+msgid "Always on Top"
+msgstr "Sempre in primo piano"
+
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+msgid "Put on All Workspaces"
+msgstr "Visualizza su tutti gli spazi di lavoro"
+
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+msgid "Roll up Player"
+msgstr "Riavvolgi lettore"
+
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+msgid "Roll up Playlist Editor"
+msgstr "Riavvolgi editor della playlist"
+
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+msgid "Roll up Equalizer"
+msgstr "Riavvolgi equalizzatore"
+
+#: src/skins/ui_manager.c:115
+msgid "Analyzer"
+msgstr "Analizzatore"
+
+#: src/skins/ui_manager.c:116
+msgid "Scope"
+msgstr "Oscilloscopio"
+
+#: src/skins/ui_manager.c:117
+msgid "Voiceprint"
+msgstr "Spettrogramma"
+
+#: src/skins/ui_manager.c:118
+msgid "Off"
+msgstr "Spento"
+
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+#: src/skins/ui_manager.c:145
+msgid "Normal"
+msgstr "Normale"
+
+#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+msgid "Fire"
+msgstr "Fuoco"
+
+#: src/skins/ui_manager.c:124
+msgid "Vertical Lines"
+msgstr "Linee verticali"
+
+#: src/skins/ui_manager.c:128
+msgid "Lines"
+msgstr "Linee"
+
+#: src/skins/ui_manager.c:129
+msgid "Bars"
+msgstr "Barre"
+
+#: src/skins/ui_manager.c:133
+msgid "Dot Scope"
+msgstr "Oscilloscopio a punti"
+
+#: src/skins/ui_manager.c:134
+msgid "Line Scope"
+msgstr "Oscilloscopio a linee"
+
+#: src/skins/ui_manager.c:135
+msgid "Solid Scope"
+msgstr "Oscilloscopio pieno"
+
+#: src/skins/ui_manager.c:141
+msgid "Ice"
+msgstr "Ghiaccio"
+
+#: src/skins/ui_manager.c:146
+msgid "Smooth"
+msgstr "Morbida"
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slowest"
+msgstr "Molto lenta"
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+msgid "Slow"
+msgstr "Lenta"
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Medium"
+msgstr "Media"
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fast"
+msgstr "Veloce"
+
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+msgid "Fastest"
+msgstr "Molto veloce"
+
+#: src/skins/ui_manager.c:166
+msgid "Time Elapsed"
+msgstr "Tempo trascorso"
+
+#: src/skins/ui_manager.c:167
+msgid "Time Remaining"
+msgstr "Tempo rimanente"
+
+#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
+msgid "Pause"
+msgstr "Interrompi"
+
+#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+msgid "Previous"
+msgstr "Precedente"
+
+#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
+msgid "Next"
+msgstr "Successivo"
+
+#: src/skins/ui_manager.c:196
+msgid "Visualization"
+msgstr "Visualizzazione"
+
+#: src/skins/ui_manager.c:197
+msgid "Visualization Mode"
+msgstr "Modalità di visualizzazione"
+
+#: src/skins/ui_manager.c:198
+msgid "Analyzer Mode"
+msgstr "Modalità analizzatore"
+
+#: src/skins/ui_manager.c:199
+msgid "Scope Mode"
+msgstr "Modalità oscilloscopio"
+
+#: src/skins/ui_manager.c:200
+msgid "Voiceprint Mode"
+msgstr "Modalità spettrogramma"
+
+#: src/skins/ui_manager.c:201
+msgid "WindowShade VU Mode"
+msgstr "Modalità WindowShade VU"
+
+#: src/skins/ui_manager.c:202
+msgid "Analyzer Falloff"
+msgstr "Caduta analizzatore"
+
+#: src/skins/ui_manager.c:203
+msgid "Peaks Falloff"
+msgstr "Caduta picchi"
+
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Playlist"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Nuova playlist"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+msgid "Select Next Playlist"
+msgstr "Seleziona playlist successiva"
+
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+msgid "Select Previous Playlist"
+msgstr "Seleziona playlist precedente"
+
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Elimina playlist"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "Importa playlist"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Carica un file della playlist all'interno della playlist selezionata."
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "Esporta playlist"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr "Salva la playlist selezionata."
+
+#: src/skins/ui_manager.c:229
+msgid "Refresh List"
+msgstr "Aggiorna lista"
+
+#: src/skins/ui_manager.c:230
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Aggiorna i metadati associati ad un elemento della playlist."
+
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "Gestione playlist"
+
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Gestione coda"
+
+#: src/skins/ui_manager.c:237
+msgid "View"
+msgstr "Visualizza"
+
+#: src/skins/ui_manager.c:238
+msgid "Interface"
+msgstr "Interfaccia"
+
+#: src/skins/ui_manager.c:239
+msgid "Interface Preferences ..."
+msgstr "Preferenze dell'interfaccia…"
+
+#: src/skins/ui_manager.c:243
+msgid "Add Internet Address..."
+msgstr "Aggiungi indirizzo internet…"
+
+#: src/skins/ui_manager.c:244
+msgid "Adds a remote track to the playlist."
+msgstr "Aggiunge una traccia remota alla playlist."
+
+#: src/skins/ui_manager.c:247
+msgid "Add Files..."
+msgstr "Aggiungi file…"
+
+#: src/skins/ui_manager.c:248
+msgid "Adds files to the playlist."
+msgstr "Aggiunge file alla playlist."
+
+#: src/skins/ui_manager.c:253
+msgid "Search and Select"
+msgstr "Cerca e seleziona"
+
+#: src/skins/ui_manager.c:254
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr "Cerca nella playlist e seleziona gli elementi della playlist in base a un criterio specifico."
+
+#: src/skins/ui_manager.c:257
+msgid "Invert Selection"
+msgstr "Inverti selezione"
+
+#: src/skins/ui_manager.c:258
+msgid "Inverts the selected and unselected entries."
+msgstr "Inverte le voci selezionate e non selezionate."
+
+#: src/skins/ui_manager.c:261
+msgid "Select All"
+msgstr "Seleziona tutti"
+
+#: src/skins/ui_manager.c:262
+msgid "Selects all of the playlist entries."
+msgstr "Seleziona tutti gli elementi della playlist."
+
+#: src/skins/ui_manager.c:265
+msgid "Select None"
+msgstr "Deseleziona tutti"
+
+#: src/skins/ui_manager.c:266
+msgid "Deselects all of the playlist entries."
+msgstr "Deseleziona tutti gli elementi della playlist."
+
+#: src/skins/ui_manager.c:271
+msgid "Remove All"
+msgstr "Rimuovi tutti"
+
+#: src/skins/ui_manager.c:272
+msgid "Removes all entries from the playlist."
+msgstr "Rimuove dalla playlist tutti gli elementi."
+
+#: src/skins/ui_manager.c:275
+msgid "Clear Queue"
+msgstr "Cancella coda"
+
+#: src/skins/ui_manager.c:276
+msgid "Clears the queue associated with this playlist."
+msgstr "Cancella la coda associata con questa playlist."
+
+#: src/skins/ui_manager.c:279
+msgid "Remove Unavailable Files"
+msgstr "Rimuovi i file non disponibili"
+
+#: src/skins/ui_manager.c:280
+msgid "Removes unavailable files from the playlist."
+msgstr "Rimuove dalla playlist i file non disponibili."
+
+#: src/skins/ui_manager.c:283
+msgid "Remove Duplicates"
+msgstr "Rimuovi i duplicati"
+
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
+msgid "By Title"
+msgstr "Per titolo"
+
+#: src/skins/ui_manager.c:286
+msgid "Removes duplicate entries from the playlist by title."
+msgstr "Rimuove dalla playlist le voci duplicate in base al titolo."
+
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
+msgid "By Filename"
+msgstr "Per nome del file"
+
+#: src/skins/ui_manager.c:290
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr "Rimuove dalla playlist le voci duplicate in base al nome del file."
+
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
+msgid "By Path + Filename"
+msgstr "Per percorso + nome del file"
+
+#: src/skins/ui_manager.c:294
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr "Rimuove dalla playlist le voci duplicate in base al loro percorso completo."
+
+#: src/skins/ui_manager.c:297
+msgid "Remove Unselected"
+msgstr "Rimuovi deselezionati"
+
+#: src/skins/ui_manager.c:298
+msgid "Remove unselected entries from the playlist."
+msgstr "Rimuove dalla playlist gli elementi deselezionati."
+
+#: src/skins/ui_manager.c:301
+msgid "Remove Selected"
+msgstr "Rimuovi selezionati"
+
+#: src/skins/ui_manager.c:302
+msgid "Remove selected entries from the playlist."
+msgstr "Rimuove dalla playlist gli elementi selezionati."
+
+#: src/skins/ui_manager.c:307
+msgid "Randomize List"
+msgstr "Riordina casualmente la lista"
+
+#: src/skins/ui_manager.c:308
+msgid "Randomizes the playlist."
+msgstr "Riordina casualmente la playlist."
+
+#: src/skins/ui_manager.c:311
+msgid "Reverse List"
+msgstr "Inverti lista"
+
+#: src/skins/ui_manager.c:312
+msgid "Reverses the playlist."
+msgstr "Inverte la playlist."
+
+#: src/skins/ui_manager.c:315
+msgid "Sort List"
+msgstr "Ordina lista"
+
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
+msgid "Sorts the list by title."
+msgstr "Ordina la lista per titolo."
+
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+msgid "By Album"
+msgstr "Per album"
+
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
+msgid "Sorts the list by album."
+msgstr "Ordina la lista per album."
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "By Artist"
+msgstr "Per artista"
+
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+msgid "Sorts the list by artist."
+msgstr "Ordina la lista per artista."
+
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+msgid "Sorts the list by filename."
+msgstr "Ordina la lista per nome del file."
+
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+msgid "Sorts the list by full pathname."
+msgstr "Ordina la lista in base al percorso completo."
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "By Date"
+msgstr "Per data"
+
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+msgid "Sorts the list by modification time."
+msgstr "Ordina la lista per data di modifica."
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "By Track Number"
+msgstr "Per numero di traccia"
+
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+msgid "Sorts the list by track number."
+msgstr "Ordina la lista per numero di traccia."
+
+#: src/skins/ui_manager.c:345
+msgid "Sort Selected"
+msgstr "Ordina selezionati"
+
+#: src/skins/ui_manager.c:381
+msgid "File"
+msgstr "File"
+
+#: src/skins/ui_manager.c:384
+msgid "Plugin Services"
+msgstr "Servizi plugin"
+
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
+msgid "View Track Details"
+msgstr "Visualizza dettagli traccia"
+
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
+msgid "View track details"
+msgstr "Visualizza i dettagli della traccia"
+
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
+msgid "About Audacious"
+msgstr "Informazioni su Audacious"
+
+#: src/skins/ui_manager.c:395
+msgid "Play File"
+msgstr "Riproduci file"
+
+#: src/skins/ui_manager.c:396
+msgid "Load and play a file"
+msgstr "Carica e riproduce un file"
+
+#: src/skins/ui_manager.c:398
+msgid "Play Location"
+msgstr "Riproduci posizione"
+
+#: src/skins/ui_manager.c:399
+msgid "Play media from the selected location"
+msgstr "Riproduce contenuti dalla posizione selezionata"
+
+#: src/skins/ui_manager.c:401
+msgid "Plugin services"
+msgstr "Servizi dei plugin"
+
+#: src/skins/ui_manager.c:403
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: src/skins/ui_manager.c:404
+msgid "Open preferences window"
+msgstr "Apre la finestra delle preferenze"
+
+#: src/skins/ui_manager.c:407
+msgid "Quit Audacious"
+msgstr "Esci da Audacious"
+
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
+msgid "Set A-B"
+msgstr "Imposta A-B"
+
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
+msgid "Clear A-B"
+msgstr "Cancella A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Jump to Time"
+msgstr "Salta alla posizione"
+
+#: src/skins/ui_manager.c:421
+msgid "Queue Toggle"
+msgstr "Attivazione/disattivazione coda"
+
+#: src/skins/ui_manager.c:422
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Attiva/disattiva l'elemento nella coda della playlist."
+
+#: src/skins/ui_manager.c:425
+msgid "Copy"
+msgstr "Copia"
+
+#: src/skins/ui_manager.c:427
+msgid "Cut"
+msgstr "Taglia"
+
+#: src/skins/ui_manager.c:429
+msgid "Paste"
+msgstr "Incolla"
+
+#: src/skins/ui_manager.c:436
+msgid "Load"
+msgstr "Carica"
+
+#: src/skins/ui_manager.c:437
+msgid "Import"
+msgstr "Importa"
+
+#: src/skins/ui_manager.c:438
+msgid "Save"
+msgstr "Salva"
+
+#: src/skins/ui_manager.c:439
+msgid "Delete"
+msgstr "Elimina"
+
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
+msgid "Preset"
+msgstr "Preimpostazione"
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
+msgid "Auto-load preset"
+msgstr "Preimpostazione a caricamento automatico"
+
+#: src/skins/ui_manager.c:445
+msgid "Load auto-load preset"
+msgstr "Carica preimpostazione a caricamento automatico"
+
+#: src/skins/ui_manager.c:448
+msgid "Load default preset into equalizer"
+msgstr "Carica preimpostazione predefinita all'interno dell'equalizzatore"
+
+#: src/skins/ui_manager.c:450
+msgid "Zero"
+msgstr "Azzera"
+
+#: src/skins/ui_manager.c:451
+msgid "Set equalizer preset levels to zero"
+msgstr "Imposta livelli della preimpostazione dell'equalizzatore a zero"
+
+#: src/skins/ui_manager.c:453
+msgid "From file"
+msgstr "Da file"
+
+#: src/skins/ui_manager.c:454
+msgid "Load preset from file"
+msgstr "Carica preimpostazione da file"
+
+#: src/skins/ui_manager.c:456
+msgid "From WinAMP EQF file"
+msgstr "Da un file EQF di WinAMP"
+
+#: src/skins/ui_manager.c:457
+msgid "Load preset from WinAMP EQF file"
+msgstr "Carica preimpostazione da un file EQF di WinAMP"
+
+#: src/skins/ui_manager.c:459
+msgid "WinAMP Presets"
+msgstr "Preimpostazioni di WinAMP"
+
+#: src/skins/ui_manager.c:460
+msgid "Import WinAMP presets"
+msgstr "Imposta preimpostazioni di WinAMP"
+
+#: src/skins/ui_manager.c:466
+msgid "Save auto-load preset"
+msgstr "Salva preimpostazione a caricamento automatico"
+
+#: src/skins/ui_manager.c:469
+msgid "Save default preset"
+msgstr "Salva preimpostazione predefinita"
+
+#: src/skins/ui_manager.c:471
+msgid "To file"
+msgstr "Su file"
+
+#: src/skins/ui_manager.c:472
+msgid "Save preset to file"
+msgstr "Salva preimpostazione su file"
+
+#: src/skins/ui_manager.c:474
+msgid "To WinAMP EQF file"
+msgstr "Su file EQF di WinAMP"
+
+#: src/skins/ui_manager.c:475
+msgid "Save preset to WinAMP EQF file"
+msgstr "Salva preset su un file EQF di WinAMP"
+
+#: src/skins/ui_manager.c:481
+msgid "Delete auto-load preset"
+msgstr "Elimina preimpostazione a caricamento automatico"
+
+#: src/skins/ui_playlist.c:248
+msgid "Search entries in active playlist"
+msgstr "Cerca elementi nella playlist attiva"
+
+#: src/skins/ui_playlist.c:256
+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 "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr "Seleziona gli elementi nella playlist compilando uno o più campi. I campi utilizzano la sintassi delle espressioni regolari, senza distinzione tra maiuscole e minuscole. Se non sai come funzionano le espressioni regolari, inserisci semplicemente una porzione letterale di quello che stai cercando."
+
+#: src/skins/ui_playlist.c:264
+msgid "Title: "
+msgstr "Titolo: "
+
+#: src/skins/ui_playlist.c:271
+msgid "Album: "
+msgstr "Album: "
+
+#: src/skins/ui_playlist.c:278
+msgid "Artist: "
+msgstr "Artista: "
+
+#: src/skins/ui_playlist.c:285
+msgid "Filename: "
+msgstr "Nome del file: "
+
+#: src/skins/ui_playlist.c:293
+msgid "Clear previous selection before searching"
+msgstr "Cancella la selezione precedente prima di effettuare la ricerca"
+
+#: src/skins/ui_playlist.c:296
+msgid "Automatically toggle queue for matching entries"
+msgstr "Inserisci automaticamente in coda gli elementi trovati"
+
+#: src/skins/ui_playlist.c:299
+msgid "Create a new playlist with matching entries"
+msgstr "Crea una nuova playlist con gli elementi trovati"
+
+#: src/skins/ui_playlist.c:765
+msgid "Audacious Playlist Editor"
+msgstr "Editor della playlist di Audacious"
+
+#: src/skins/ui_playlist.c:812
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d di %d)"
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr "Skin Winamp 2.x archiviata"
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr "Skin Winamp 2.x non archiviata"
+
+#: src/skins/util.c:774
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr "Impossibile creare la directory (%s): %s\n"
+
+#: src/sndfile/plugin.c:456
+msgid "About sndfile plugin"
+msgstr "Informazioni sul plugin sndfile"
+
+#: src/sndstretch/sndstretch_xmms.c:155
+msgid "About SndStretch"
+msgstr "Informazioni su SndStretch"
+
+#: src/sndstretch/sndstretch_xmms.c:308
+msgid "Volume corr."
+msgstr "Corr. volume"
+
+#: src/sndstretch/sndstretch_xmms.c:309
+msgid "Short Overlap"
+msgstr "Breve sovrapposizione"
+
+#: src/sndstretch/sndstretch_xmms.c:355
+msgid "Speed"
+msgstr "Velocità"
+
+#: src/sndstretch/sndstretch_xmms.c:356
+msgid "Pitch"
+msgstr "Tono"
+
+#: src/sndstretch/sndstretch_xmms.c:357
+msgid "Scale"
+msgstr "Scala"
+
+#: src/sndstretch/sndstretch_xmms.c:377
+msgid "SndStretch - Configuration"
+msgstr "SndStretch - Configurazione"
+
+#: src/song_change/song_change.c:437
+msgid "Command to run when Audacious starts a new song."
+msgstr "Comando da eseguire quando Audacious inizia un nuovo brano."
+
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
+msgid "Command:"
+msgstr "Comando:"
+
+#: src/song_change/song_change.c:443
+msgid "Command to run toward the end of a song."
+msgstr "Comando da eseguire alla fine del brano."
+
+#: src/song_change/song_change.c:449
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr "Comando da eseguire quando Audacious raggiunge la fine della playlist."
+
+#: src/song_change/song_change.c:455
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr "Comando da eseguire quando cambia il titolo del brano (titoli degli stream di rete)."
+
+#: src/song_change/song_change.c:461
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command).\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: filename (full path)\n"
+"%l: length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr "Puoi usare le seguenti stringhe di formattazione\nle quali saranno sostituite prima di richiamare il\ncomando (non tutte sono utili per il comando a\nfine playlist).\n\n%F: Frequenza (in hertz)\n%c: Numero di canali\n%f: nome del file (percorso completo)\n%l: durata (in millisecondi)\n%n o %s: Nome del brano\n%r: Frequenza (in bit per secondo)\n%t: Posizione nella playlist (%02d)\n%p: Attualmente in riproduzione (1 oppure 0)\n%a: Artista\n%b: Album\n%T: Titolo della traccia"
+
+#: src/song_change/song_change.c:488
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr "I parametri passati alla shell dovrebbero essere racchiusi tra virgolette. Fare diversamente costituisce un rischio per la sicurezza."
+
+#: src/song_change/song_change.c:499
+msgid "Commands"
+msgstr "Comandi"
+
+#: src/song_change/song_change.c:529
+msgid "Song Change"
+msgstr "Cambio brano"
+
+#: src/statusicon/statusicon.c:379
+msgid "About Status Icon Plugin"
+msgstr "Informazioni sul plugin Icona di stato"
+
+#: src/statusicon/statusicon.c:380
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager.\n"
+msgstr "Plugin Icona di stato\n\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nQuesto plugin fornisce un'icona di stato, posta nell'area\ndel system tray del window manager.\n"
+
+#: src/statusicon/statusicon.c:451
+msgid "Status Icon Plugin - Preferences"
+msgstr "Plugin Icona di stato - Preferenze"
+
+#: src/statusicon/statusicon.c:461
+msgid "Right-Click Menu"
+msgstr "Menu click-destro"
+
+#: src/statusicon/statusicon.c:466
+msgid "Small playback menu #1"
+msgstr "Piccolo menu di riproduzione #1"
+
+#: src/statusicon/statusicon.c:469
+msgid "Small playback menu #2"
+msgstr "Piccolo menu di riproduzione #2"
+
+#: src/statusicon/statusicon.c:485
+msgid "Mouse Scroll Action"
+msgstr "Azione scorrimento mouse"
+
+#: src/statusicon/statusicon.c:489
+msgid "Change volume"
+msgstr "Cambia volume"
+
+#: src/statusicon/statusicon.c:491
+msgid "Change playing song"
+msgstr "Cambia brano in riproduzione"
+
+#: src/statusicon/statusicon.c:504
+msgid "Other settings"
+msgstr "Altre impostazioni"
+
+#: src/statusicon/statusicon.c:509
+msgid "Disable the popup window"
+msgstr "Disabilita la finestra popup"
+
+#: src/statusicon/statusicon.c:516
+msgid "Close to the notification area (system tray)"
+msgstr "Chiudi nell'area di notifica (system tray)"
+
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Avanza nella playlist quando si scorre verso l'alto"
+
+#: src/stereo_plugin/stereo.c:45
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin 1999."
+msgstr "Plugin Stereo extra\n\nDi Johan Levin 1999."
+
+#: src/stereo_plugin/stereo.c:64
+msgid "About Extra Stereo Plugin"
+msgstr "Informazioni sul plugin Stereo extra"
+
+#: src/stereo_plugin/stereo.c:95
+msgid "Configure Extra Stereo"
+msgstr "Configura Stereo extra"
+
+#: src/tonegen/tonegen.c:49
+msgid "About Tone Generator"
+msgstr "Informazioni su Generatore toni"
+
+#: src/tonegen/tonegen.c:51
+msgid ""
+"Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
+msgstr "Generatore di toni sinusoidali di Haavard Kvaalen <havardk@xmms.org>\nModificato da Daniel J. Peng <danielpeng@bigfoot.com>\n\nPer utilizzarlo, aggiungi un URL: tone://frequenza1;frequenza2;frequenza3;…\np.es. tone://2000;2005 per riprodurre un tono a 2000Hz e un tono a 2005Hz"
+
+#: src/tonegen/tonegen.c:101
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.c:101
+msgid "Tone Generator: "
+msgstr "Generatore di toni: "
+
+#: src/unix-io/gtk.c:34
+msgid "About File I/O Plugin"
+msgstr "Informazioni sul plugin I/O su file"
+
+#: src/vorbis/vorbis.c:573
+msgid "About Ogg Vorbis Audio Plugin"
+msgstr "Informazioni sul plugin Audio Ogg Vorbis"
+
+#: src/vorbis/vorbis.c:578
+msgid ""
+"Ogg Vorbis Plugin by the Xiph.org Foundation\n"
+"\n"
+"Original code by\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"Contributions from\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Haavard Kvaalen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>\n"
+"\n"
+"Visit the Xiph.org Foundation at http://www.xiph.org/\n"
+msgstr "Plugin Ogg Vorbis della Xiph.org Foundation\n\nCodice originale di\nTony Arcieri <bascule@inferno.tusculum.edu>\nContributi di\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHaavard Kvaalen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\nVisita la Xiph.org Foundation su http://www.xiph.org/\n"
+
+#: src/vtx/about.c:14
+msgid "About Vortex Player"
+msgstr "Informazioni su Lettore Vortex"
+
+#: src/vtx/about.c:15
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"\n"
+"Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
+"and other AY/YM music sites.\n"
+"\n"
+"Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr "Lettore per il formato di file Vortex di Sashnov Alexander <sashnov@ngs.ru>\nFondato sul sorgente originale in_vtx.dll da Roman Sherbakov <v_soft@microfor.ru>\n\nMusica in formato vtx si può trovare su http://vtx.microfor.ru/music.htm\ne su altri siti musicali AY/YM.\n\nImplementazione per Audacious di Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/wavpack/wavpack.c:353
+#, c-format
+msgid "Wavpack Decoder Plugin %s"
+msgstr "Plugin di decodifica Wavpack %s"
+
+#: src/wavpack/wavpack.c:354
+msgid ""
+"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan\n"
+"Visit the Wavpack site at http://www.wavpack.com/\n"
+msgstr "Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n\nParte del codice del plugin era di Miles Egan\nVisita il sito Wavpack su http://www.wavpack.com/\n"

audacious-plugins-3.1.1.tar.bz2/po/ja.po -> audacious-plugins-3.2.4.tar.bz2/po/ja.po Changed

@@ -1,91 +1,311 @@
-# audacious-plugins ja.po.
-# Copyright (C) 2000-2004 Free Software Foundation, Inc.
-# This file is distributed under the same license as the bmp package.
-# Hiroshi Takekawa <sian@big.or.jp>, 2000-2003. (XMMS)
-# -----------------------------------------------------
-# Takeshi AIHANA <aihana@gnome.gr.jp>, 2004. (bmp)
-# -----------------------------------------------------
-# dai <d+po@vdr.jp>, 2005-2007.
-# Thanks to:
-# 	KAZUKI SHIMURA <kazuki@ma.ccnw.ne.jp>
+# Japanese translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
 #
+# Translators:
+# Shuuji Takahashi <shuuji3@gmail.com>, 2012.
+# Warui-chan <>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious-plugins HEAD\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\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"
-"Language: ja\n"
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-05-15 20:28+0000\n"
+"Last-Translator: Shuuji Takahashi <shuuji3@gmail.com>\n"
+"Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/aac/libmp4.c:256
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Using libfaad2-%s for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
-msgstr ""
-" をデコードに使用.\n"
-"FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
-"Copyright (c) 2005-2006 Audacious team"
+msgstr "デコードには libfaad2-%s を使用しています。\nFAAD2 AAC/HE-AAC/HE-AACv2/DRM デコーダ (c) Nero AG, www.nero.com\nCopyright (c) 2005-2006 Audacious チーム"
 
 #: src/aac/libmp4.c:261
-#, fuzzy
 msgid "About MP4 AAC decoder plugin"
-msgstr "MP4 AAC プレイヤプラグインについて"
+msgstr "MP4 AAC デコーダプラグインについて"
+
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "アラームについて"
+
+#: src/alarm/alarm.c:313
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr "設定した時刻に曲を再生するプラグインです。\n\nAdam Feakin と Daniel Stodden が初めに書きました。"
+
+#: src/alarm/interface.c:33
+msgid "Alarm"
+msgstr "アラーム"
+
+#: src/alarm/interface.c:40
+msgid "This is your wakeup call."
+msgstr "目覚ましです。"
+
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
+msgid "OK"
+msgstr "OK"
+
+#: src/alarm/interface.c:214
+msgid "Alarm Settings"
+msgstr "アラームの設定"
+
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
+msgid "Time"
+msgstr "時刻"
+
+#: src/alarm/interface.c:270
+msgid "hours"
+msgstr "時間"
+
+#: src/alarm/interface.c:331
+msgid "h"
+msgstr " "
+
+#: src/alarm/interface.c:361
+msgid "minutes"
+msgstr "分"
+
+#: src/alarm/interface.c:379
+msgid "Quiet after:"
+msgstr "静かになるまでの時間:"
+
+#: src/alarm/interface.c:389
+msgid "Alarm at (default):"
+msgstr "アラーム時刻 (デフォルト)"
+
+#: src/alarm/interface.c:409
+msgid "Choose the days for the alarm to come on"
+msgstr "アラームが鳴る曜日を選んでください"
+
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
+msgid "Default"
+msgstr "デフォルト"
+
+#: src/alarm/interface.c:763
+msgid "Day"
+msgstr "日"
+
+#: src/alarm/interface.c:783
+msgid "Tuesday"
+msgstr "火曜日"
+
+#: src/alarm/interface.c:794
+msgid "Wednesday"
+msgstr "水曜日"
+
+#: src/alarm/interface.c:805
+msgid "Thursday"
+msgstr "木曜日"
+
+#: src/alarm/interface.c:816
+msgid "Friday"
+msgstr "金曜日"
+
+#: src/alarm/interface.c:827
+msgid "Saturday"
+msgstr "土曜日"
+
+#: src/alarm/interface.c:838
+msgid "Sunday"
+msgstr "日曜日"
+
+#: src/alarm/interface.c:848
+msgid "Monday"
+msgstr "月曜日"
+
+#: src/alarm/interface.c:859
+msgid "Days"
+msgstr "日"
+
+#: src/alarm/interface.c:875
+msgid "Fading"
+msgstr "フェード"
+
+#: src/alarm/interface.c:912
+msgid "seconds"
+msgstr "秒"
+
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
+msgid "Volume"
+msgstr "音量"
+
+#: src/alarm/interface.c:946
+msgid "Current"
+msgstr "現在の音量"
+
+#: src/alarm/interface.c:954
+msgid "Start at"
+msgstr "開始"
+
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:998
+msgid "Final"
+msgstr "終了"
+
+#: src/alarm/interface.c:1051
+msgid "Additional Command"
+msgstr "追加コマンド"
+
+#: src/alarm/interface.c:1077
+msgid "enable"
+msgstr "有効"
+
+#: src/alarm/interface.c:1085
+msgid "Playlist (optional)"
+msgstr "プレイリスト (オプション)"
+
+#: src/alarm/interface.c:1111
+msgid "Browse..."
+msgstr "開く"
+
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
+msgid "Reminder"
+msgstr "リマインダ"
+
+#: src/alarm/interface.c:1136
+msgid "Use reminder"
+msgstr "使用するリマインダ"
+
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "オプション"
+
+#: src/alarm/interface.c:1160
+msgid "What do these options mean?"
+msgstr "オプションの説明"
+
+#: src/alarm/interface.c:1188
+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\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:1190 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "ヘルプ"
+
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: src/alarm/interface.c:1290
+msgid "Your reminder for today is.."
+msgstr "今日のリマインダ:"
+
+#: src/alarm/interface.c:1315
+msgid "Thankyou"
+msgstr "ありがとうございます"
 
 #: src/alsa/config.c:210
-#, fuzzy
 msgid "Default PCM device"
-msgstr "デフォルト PCM デバイス (%s)"
+msgstr "デフォルト PCM デバイス"
 
 #: src/alsa/config.c:235
-#, fuzzy
 msgid "Default mixer device"
-msgstr "デフォルト PCM デバイス (%s)"
+msgstr "デフォルトミキサデバイス"
 
-#: src/alsa/config.c:447
-#, fuzzy
+#: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
-msgstr "ステータスアイコンプラグイン - 設定"
+msgstr "ALSA 出力プラグインの設定"
 
-#: src/alsa/config.c:454
-#, fuzzy
+#: src/alsa/config.c:445
 msgid "PCM device:"
-msgstr "ミキサデバイス:"
+msgstr "PCM デバイス:"
 
-#: src/alsa/config.c:456 src/OSS/configure.c:246
+#: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
 msgstr "ミキサデバイス:"
 
-#: src/alsa/config.c:458
-#, fuzzy
+#: src/alsa/config.c:449
 msgid "Mixer element:"
-msgstr "ミキサデバイス:"
+msgstr "ミキサエレメント"
 
-#: src/alsa/config.c:461
+#: src/alsa/config.c:452
 msgid "Work around drain hangup"
 msgstr ""
 
 #: src/alsa/plugin.c:59
-#, fuzzy
 msgid "About ALSA Output Plugin"
-msgstr "JACK 出力プラグイン 0.17 について"
+msgstr "ALSA 出力プラグインについて"
 
 #: src/alsa/plugin.c:81
-#, fuzzy
 msgid "ALSA error"
-msgstr "エラー"
+msgstr "ALSA エラー"
 
-#: src/amidi-plug/amidi-plug.c:335
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr ""
+msgstr "MIDI を再生するためのシーケンサ・ポートが選択されていません。MIDI プラグインの設定で選択することができます。"
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:35
 msgid "ALSA Backend "
@@ -93,23 +313,10 @@
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:37
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
-"ports. The ALSA sequencer interface is very versatile, it can provide ports "
-"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
-"synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from "
-"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
-"hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"このバックエンドは MIDI イベントをユーザが選択した ALSA シーケンサポートのグ"
-"ループに送ります. ALSA シーケンサインターフェイスは非常に用途が広く, emu10k1 "
-"のようなハードウェアシンセサイザーだけでなく, ソフトウェアシンセや外部デバイ"
-"スなどへのポートも提供できます.\n"
-"このバックエンドはオーディオを生成せず, MIDI イベントは ALSA ポートの背後のデ"
-"バイス/プログラムから直接取り扱われます. 例えば, ハードウェアシンセに送られ"
-"た MIDI イベントは直接演奏されるでしょう.\n"
-"バックエンドは Giacomo Lozito によって書かれました."
+msgstr "このバックエンドは、MIDI イベントを、ユーザが選択した ALSA シーケンサ・ポートのグループに送ります。ALSA シーケンサインターフェイスは非常に用途が広く、emu10k1 のようなハードウェアシンセサイザだけでなく、ソフトウェアシンセサイザや外部デバイスなどへのポートもサポートします。\nこのバックエンドはオーディオを生成せず、MIDI イベントは ALSA ポートの背後のデバイスやプログラムから直接取り扱われます。たとえば、ハードウェアシンセサイザに送られた MIDI イベントは直接演奏されます。\nバックエンドは Giacomo Lozito によって書かれました。"
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
@@ -117,23 +324,14 @@
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-"
-"time software synthesizer based on the SoundFont2 specification (www."
-"fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed "
-"by chosen ouput plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"このバックエンドは MIDI イベントを, SoundFont2 仕様に基づくリアルタイムソフト"
-"ウェアシンセサイザーである FluidSynth (www.fluidsynth.org) に送ることでオー"
-"ディオを生成します.\n"
-"生成されたオーディオはプレイヤのエフェクトプラグインを通して操作でき, 選択さ"
-"れた出力プラグインによって処理されます.\n"
-"バックエンドは Giacomo Lozito によって書かれました."
+msgstr "このバックエンドは音声を生成し、MIDI イベントを FluidSynth に送信します。FluidSynth は、SoundFont2 規格に基づいた、リアルタイムソフトウェアシンセサイザです。詳しくは、次のページをご覧ください。www.fluidsynth.org\n生成した音声は、プレイヤーのエフェクトプラグインや出力プラグインで処理することができます。\nバックエンドは、Giacomo Lozito によって書かれました。"
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
-msgstr "ALSA バックエンド設定"
+msgstr "ALSA バックエンドの設定"
 
 #: src/amidi-plug/i_configure-alsa.c:331
 msgid "Port"
@@ -171,9 +369,7 @@
 msgid ""
 "ALSA\n"
 "backend"
-msgstr ""
-"ALSA\n"
-"バックエンド"
+msgstr "ALSA\nバックエンド"
 
 #: src/amidi-plug/i_configure-ap.c:59
 msgid "AMIDI-Plug - backend information"
@@ -223,9 +419,7 @@
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr ""
-"AMIDI\n"
-"Plug"
+msgstr "AMIDI\nPlug"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
@@ -337,9 +531,7 @@
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr ""
-"FluidSynth\n"
-"バックエンド"
+msgstr "FluidSynth\nバックエンド"
 
 #: src/amidi-plug/i_configure-timidity.c:39
 msgid "TIMIDITY BACKEND CONFIGURATION"
@@ -353,11 +545,9 @@
 msgid ""
 "TiMidity\n"
 "backend"
-msgstr ""
-"TiMidity\n"
-"バックエンド"
+msgstr "TiMidity\nバックエンド"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
 msgstr "名前:"
 
@@ -417,9 +607,7 @@
 msgid ""
 "\n"
 "AMIDI-Plug "
-msgstr ""
-"\n"
-"AMIDI-Plug "
+msgstr "\nAMIDI-Plug "
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -444,28 +632,7 @@
 "Tony Vroon\n"
 "for the good help with alpha testing\n"
 "\n"
-msgstr ""
-"\n"
-"モジュラ MIDI ミュージックプレイヤ\n"
-"http://www.develia.org/projects.php?p=amidiplug\n"
-"\n"
-"Giacomo Lozito\n"
-"< james@develia.org > によって書かれた\n"
-"\n"
-"\n"
-"謝辞...\n"
-"\n"
-"Clemens Ladisch と Jaroslav Kysela\n"
-"彼らのクールなプログラム aplaymidi と amixer;\n"
-"これらは ALSA API について学ぶために,\n"
-"alsa-lib 文書と並んで本当に有用でした\n"
-"\n"
-"Alfredo Spadafina\n"
-"立派な midi キーボードロゴ\n"
-"\n"
-"Tony Vroon\n"
-"アルファテストに対する助力\n"
-"\n"
+msgstr "\nモジュラ MIDI ミュージックプレイヤ\nhttp://www.develia.org/projects.php?p=amidiplug\n\nGiacomo Lozito\n< james@develia.org > によって書かれました\n\n\n謝辞\n\nClemens Ladisch と Jaroslav Kysela らによる\n素晴らしいプログラム aplaymidi と amixer に。\nこれらは ALSA API について学ぶために、\nalsa-lib 文書と並んで大変役に立ちました。\n\nAlfredo Spadafina による素敵な midi キーボードロゴに。\n\nTony Vroon によるアルファテストでの助けに。\n\n"
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
@@ -483,249 +650,238 @@
 msgid "None"
 msgstr "なし"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
-msgstr "演奏開始"
+msgstr "再生開始"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "プレイリストのエントリが演奏されたら OSD が動作します."
+msgstr "プレイリストの曲が再生されたときに OSD を表示します。"
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "タイトル変更"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr ""
-"演奏中にファイル名が同じであるのに曲のタイトルが変更されたら, OSD が動作しま"
-"す. これはインターネットストリームのタイトル変更を表示するのにとても役立ちま"
-"す."
+msgstr "再生中に、ファイル名が同じでも、曲のタイトルが変更されたときに OSD を表示します。これは、インターネットストリームのタイトル変更を表示するのにとても役に立ちます。"
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
-msgstr "音量変更"
+msgstr "音量の変更"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
-msgstr "音量が変更されたら OSD が動作します."
+msgstr "音量が変更されたときに OSD が表示されます。"
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
-msgstr "演奏停止"
+msgstr "一時停止"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
-msgstr "演奏が停止されたら OSD が動作します."
+msgstr "再生が停止したときに OSD が表示せれます。"
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
-msgstr "演奏再開"
+msgstr "再生の再開"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
-msgstr "演奏が再開されたら OSD が動作します."
+msgstr "再生が再開したときに OSD が表示されます。"
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
 msgstr "相対 X オフセット:"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
 msgstr "相対 Y オフセット:"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr "最大 OSD 幅:"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr "マルチモニタ オプション"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
 msgstr "OSD を表示するモニタ:"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "全てのモニタ"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "モニタ %i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "タイミング (ミリ秒)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "表示:"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "フェードイン:"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "フェードアウト:"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "フォント"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "フォント %i:"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "影"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "国際化"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "aosd ではテキストの UTF-8 変換を無効にする"
 
-#: src/aosd/aosd_ui.c:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "スキンファイル選択"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr "描画形式"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "色"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "色 %i:"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr "カスタムスキン"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "スキンファイル:"
 
-#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
-#: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "参照"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "トリガー有効"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "イベント"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
 msgstr "Composite マネージャが検出されました"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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 ""
-"Composite マネージャが検出されませんでした;\n"
-"動作させているかわからなければ, Composite マネージャを有効にしてください. そ"
-"うしなければ OSD は正常に動作しないでしょう."
+"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
+msgstr "Composite マネージャが検出されませんでした;\n動作させているかわからなければ, Composite マネージャを有効にしてください. そうしなければ OSD は正常に動作しないでしょう."
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 msgid "Composite manager not required for fake transparency"
 msgstr "Composite マネージャは偽の透明化には必要ではありません"
 
-#: src/aosd/aosd_ui.c:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "透明化"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr "偽の透明化"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "真の透明化 (X Composite 拡張が必要)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
 msgstr "Composite 拡張が読み込まれていません"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
 msgstr "Composite 拡張が有効ではありません"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - 設定"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr "テスト"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "アニメーション"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "文字"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "装飾"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "トリガー"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
-#: src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "その他"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
 msgstr "Audacious OSD について"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
-msgstr ""
-"\n"
-"Audacious OSD "
+msgstr "\nAudacious OSD "
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -736,35 +892,39 @@
 "written by Evan Martin\n"
 "http://neugierig.org/software/ghosd/\n"
 "\n"
-msgstr ""
-"\n"
-"http://www.develia.org/projects.php?p=audacious#aosd\n"
-" Giacomo Lozito\n"
-"< james@develia.org > によって書かれた.\n"
-"\n"
-"On-Screen-Display は Ghosd ライブラリを基礎として\n"
-"Evan Martin によって書かれた.\n"
-"http://neugierig.org/software/ghosd/\n"
-"\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\n Giacomo Lozito\n< james@develia.org > によって書かれました。\n\nOn-Screen-Display は、Ghosd ライブラリを基礎として\nEvan Martin によって書かれました。\nhttp://neugierig.org/software/ghosd/\n\n"
 
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "ブラースコープ: 色の選択"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:111
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
 msgid "Options:"
 msgstr "オプション:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:264
-#, fuzzy
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr "Bauer stereophonic-to-binaural の設定"
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr "フェードレベル:"
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr "Cut 周波数"
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr "プリセット:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
-msgstr "FLAC オーディオプラグインについて"
+msgstr "オーディオ CD プラグインについて"
 
-#: src/cdaudio-ng/cdaudio-ng.c:265
-#, fuzzy
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
-"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
 "Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
 "\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
@@ -774,29 +934,19 @@
 "This was a Google Summer of Code 2007 project.\n"
 "\n"
 "Copyright 2009 John Lindgren"
-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 のプロジェクトでした."
+msgstr "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> および The Audacious チーム\n\nlibcdio developers <http://www.gnu.org/software/libcdio/>\n\tおよび libcddb developers <http://libcddb.sourceforge.net/>\n にたいへん感謝します。\n\nTony Vroon の助言と導きにも感謝します。\n\nこのプログラムは、Google Summer of Code 2007 project の一つです。\n\nCopyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:558
-#, fuzzy
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
-msgstr "オーディオ"
+msgstr "オーディオ CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:913
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
-msgstr ""
+msgstr "ドライブにディスクがありません。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:915
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
-msgstr ""
+msgstr "非対応のディスクです。"
 
 #: src/cdaudio-ng/configure.c:148
 msgid "CD Audio Plugin Configuration"
@@ -804,24 +954,23 @@
 
 #: src/cdaudio-ng/configure.c:160
 msgid "Digital audio extraction"
-msgstr "ディジタルオーディオ抽出"
+msgstr "デジタルオーディオ抽出"
 
 #: src/cdaudio-ng/configure.c:165
 msgid "Title information"
 msgstr "タイトル情報"
 
 #: src/cdaudio-ng/configure.c:176
-#, fuzzy
 msgid "Disc speed:"
-msgstr "クロック速度:"
+msgstr "ディスク速度:"
 
 #: src/cdaudio-ng/configure.c:184
 msgid "Use cd-text if available"
-msgstr "有効ならば cd-text を使う"
+msgstr "可能ならば cd-text を使う"
 
 #: src/cdaudio-ng/configure.c:191
 msgid "Use CDDB if available"
-msgstr "有効ならば CDDB を使う"
+msgstr "可能ならば CDDB を使う"
 
 #: src/cdaudio-ng/configure.c:197
 msgid "Server: "
@@ -843,214 +992,181 @@
 msgid "Override default device: "
 msgstr "デフォルトデバイスを上書きする: "
 
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:131
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:125
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
 msgid "Ok"
 msgstr "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 "演奏"
+msgstr "CD を再生"
 
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
-msgstr "CD を追加"
+msgstr "プレイリストに CD を追加"
 
-#: src/compressor/plugin.c:67
-#, fuzzy
+#: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
-msgstr "エクストラステレオプラグインについて"
+msgstr "ダイナミックレンジ圧縮プラグイン"
 
-#: src/compressor/plugin.c:99
-#, fuzzy
+#: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
-msgstr "オーディオ圧縮 設定"
+msgstr "ダイナミックレンジ圧縮の設定"
 
-#: src/compressor/plugin.c:111
-#, fuzzy
+#: src/compressor/plugin.c:107
 msgid "Center volume:"
-msgstr "音量の変更"
+msgstr "センター音量:"
 
-#: src/compressor/plugin.c:124
+#: src/compressor/plugin.c:120
 msgid "Dynamic range:"
-msgstr ""
+msgstr "ダイナミックレンジ:"
 
-#: src/console/configure.c:138
-#, fuzzy
+#: src/console/configure.c:136
 msgid "Game Console Music Decoder"
-msgstr "コンソールミュージックデコーダ"
+msgstr "ゲームコンソール音楽デコーダ"
 
-#: src/console/configure.c:155
+#: src/console/configure.c:153
 msgid "General"
 msgstr "一般"
 
-#: src/console/configure.c:157 src/skins/ui_manager.c:176
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
 msgid "Playback"
 msgstr "演奏"
 
-#: src/console/configure.c:172
+#: src/console/configure.c:170
 msgid "Bass:"
 msgstr "ベース:"
 
-#: src/console/configure.c:176 src/console/configure.c:187
-#: src/console/configure.c:208
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
 msgid "secs"
 msgstr "秒"
 
-#: src/console/configure.c:183
+#: src/console/configure.c:181
 msgid "Treble:"
 msgstr "トリバル:"
 
-#: src/console/configure.c:204
+#: src/console/configure.c:202
 msgid "Default song length:"
 msgstr "デフォルトの曲の長さ:"
 
-#: src/console/configure.c:210 src/sid/xs_interface.c:666
+#: src/console/configure.c:208
 msgid "Resampling"
 msgstr "リサンプリング"
 
-#: src/console/configure.c:216
+#: src/console/configure.c:214
 msgid "Enable audio resampling"
 msgstr "オーディオリサンプリングを有効にする"
 
-#: src/console/configure.c:231
+#: src/console/configure.c:229
 msgid "Resampling rate:"
 msgstr "リサンプリングレート:"
 
-#: src/console/configure.c:235 src/sid/xs_interface.c:354
+#: src/console/configure.c:233
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:246
+#: src/console/configure.c:244
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:247
+#: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
 msgstr "SPC タグからの長さを無視する"
 
-#: src/console/configure.c:248
+#: src/console/configure.c:246
 msgid "Increase reverb"
 msgstr "リバーブを増やす"
 
-#: src/console/configure.c:273
+#: src/console/configure.c:271
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not "
-"provide length information (i.e. looping tracks)."
-msgstr ""
-"秒数で表現されるデフォルトの曲の長さは, 長さ情報を提供しない曲 (例えばループ"
-"するトラック) に用いられます."
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
+msgstr "秒数で表現されるデフォルトの曲の長さは, 長さ情報を提供しない曲 (例えばループするトラック) に用いられます."
 
 #: src/console/plugin.c:33
-#, fuzzy
 msgid "About the Game Console Music Decoder"
-msgstr "コンソールミュージックデコーダについて"
+msgstr "ゲームコンソール音楽デコーダについて"
 
 #: src/console/plugin.c:34
-#, fuzzy
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2.\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
-msgstr ""
-"Game_Music_Emu 0.5.2 をベースにしたコンソールミュージックデコーダエンジンで"
-"す.\n"
-"サポートするフォーマット: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, "
-"VGZ\n"
-"Audacious の実装は William Pitcock <nenolod@nenolod.net> と\n"
-"Shay Green <hotpop.com@blargg> によります."
+msgstr "コンソール音楽デコーダエンジンは、Game_Music_Emu 0.5.2 を元に書かれました。\n対応形式: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nAudacious 実装を行ったのは、William Pitcock <nenolod@dereferenced.org> と\n Shay Green <gblargg@gmail.com> です。\n"
 
-#: src/crossfade/plugin.c:65
-#, fuzzy
+#: src/crossfade/plugin.c:60
 msgid "About Crossfade"
-msgstr "Scrobbler プラグインについて"
+msgstr "クロスフェードについて"
 
-#: src/crossfade/plugin.c:97
-#, fuzzy
+#: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
-msgstr "設定"
+msgstr "クロスフェードの設定"
 
-#: src/crossfade/plugin.c:109
+#: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
-msgstr ""
+msgstr "オーパーラップ (秒)"
 
-#: src/crossfade/plugin.c:140 src/crossfade/plugin.c:146
-#, fuzzy
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
-msgstr "ModPlug 設定"
+msgstr "クロスフェードエラー"
 
-#: src/crossfade/plugin.c:140
+#: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
-msgstr ""
+msgstr "曲が異なるチャンネル数を持っていたため、クロスフェードが失敗しました。"
 
-#: src/crossfade/plugin.c:148
+#: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
-"You can use the Sample Rate Converter effect to resample the songs to the "
-"same rate."
-msgstr ""
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
+msgstr "曲のサンプリング周波数が異なるため、クロスフェードが失敗しました。<\n\n同じサンプリング周波数にするために、サンプリング周波数コンバータ・エフェクトが利用できます。"
 
-#: src/crystalizer/crystalizer.c:108
+#: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
 msgstr "Crystalizer の設定"
 
-#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
 msgstr "エフェクトの強さ:"
 
-#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
-#: src/stereo_plugin/stereo.c:138
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
 msgid "Apply"
 msgstr "適用"
 
-#: src/daemon/daemon.c:58
-msgid "Daemon Interface (like old headless mode)"
-msgstr ""
-
 #: src/echo_plugin/gui.c:15
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
 "\n"
 "Surround echo by Carl van Schaik 1999"
-msgstr ""
-"エコー プラグイン\n"
-"1999年 Johan Levin による\n"
-"\n"
-"サラウンドエコーは 1999 年 Carl van Schaik による"
+msgstr "エコープラグインは、1999年に Johan Levin によって書かれました。\n\nサラウンドエコーは、1999 年に Carl van Schaik によって書かれました。"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
 msgstr "エコー プラグインについて"
 
-#: src/echo_plugin/gui.c:72
+#: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
 msgstr "エコー設定"
 
-#: src/echo_plugin/gui.c:88
+#: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
 msgstr "遅延: (ミリ秒)"
 
-#: src/echo_plugin/gui.c:93
+#: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
 msgstr "フィードバック: (%)"
 
-#: src/echo_plugin/gui.c:98
+#: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
 msgstr "音量: (%)"
 
-#: src/ffaudio/ffaudio-core.c:763
+#: src/ffaudio/ffaudio-core.c:718
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1064,256 +1180,217 @@
 "libavcodec %s (%s)\n"
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
-msgstr ""
+msgstr "FFmpeg マルチメディアフレームワーク (http://www.ffmpeg.org/)\nに基づいた Audacious のためのマルチフォーマット音声\nデコーディングプラグインです。\nCopyright (c) 2000-2009 Fabrice Bellard, et al.\n\nAudacious プラグインを書いた人:\n William Pitcock <nenolod@nenolod.net>,\n Hämäläinen <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:777
-#, fuzzy
+#: src/ffaudio/ffaudio-core.c:732
 msgid "About FFaudio Plugin"
-msgstr "FLAC オーディオプラグインについて"
+msgstr "FFaudio プラグインについて"
 
-#: src/filewriter/filewriter.c:155
+#: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
 msgstr "ファイルライタ・プラグインについて"
 
-#: src/filewriter/filewriter.c:156
-#, fuzzy
-msgid ""
-"FileWriter-Plugin\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Audacious ESounD プラグイン\n"
-"\n"
-"このプログラムはフリーソフトウェアです;\n"
-"フリーソフトウェア財団が提供する GNU 一般公有使用許諾契約書\n"
-"の第二版, あるいはそれ以降の版が定める条項の下で\n"
-"本プログラムを再頒布または変更することができます.\n"
-"\n"
-"本プログラムは有用とは思いますが,\n"
-"頒布にあたっては, 市場性及び特定目的, 適合性についての\n"
-"暗黙の保証を含めて, いかなる保証も行ないません.\n"
-"詳細については GNU 一般公有使用許諾契約書をご覧下さい.\n"
-"\n"
-"あなたは, 本プログラムと一緒に GNU 一般公有使用許諾契約書の\n"
-"写しを受け取っているはずです. そうでない場合は, the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA.へ手紙を書いて下さい."
-
-#: src/filewriter/filewriter.c:450
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "ファイルライタの設定"
 
-#: src/filewriter/filewriter.c:462
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "出力ファイルフォーマット:"
 
-#: src/filewriter/filewriter.c:480
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "設定"
 
-#: src/filewriter/filewriter.c:495
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "元のディレクトリに保存する"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr "指定のディレクトリに保存する"
 
-#: src/filewriter/filewriter.c:510
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "ファイル出力先ディレクトリ:"
 
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr "ディレクトリの選択"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr "ファイル名の取得元:"
 
-#: src/filewriter/filewriter.c:536
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr "元のファイルのタグ"
 
-#: src/filewriter/filewriter.c:542
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr "元のファイル名"
 
-#: src/filewriter/filewriter.c:552
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "ファイル名から拡張子を取り除かない"
 
-#: src/filewriter/filewriter.c:567
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr "ファイル名の先頭にトラック番号を付加する"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:783
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "自動"
 
 #: src/filewriter/mp3.c:38
-#, fuzzy
 msgid "Joint Stereo"
 msgstr "ジョイントステレオ"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "ステレオ"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "モノラル"
 
-#: src/filewriter/mp3.c:724
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr "MP3 設定"
 
-#: src/filewriter/mp3.c:747
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "アルゴリズム品質:"
 
-#: src/filewriter/mp3.c:772
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr "出力サンプリングレート:"
 
-#: src/filewriter/mp3.c:800
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:807
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "ビットレート / 圧縮率:"
 
-#: src/filewriter/mp3.c:831
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "ビットレート (kbps):"
 
-#: src/filewriter/mp3.c:864
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr "圧縮率:"
 
-#: src/filewriter/mp3.c:888
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr "オーディオ モード:"
 
-#: src/filewriter/mp3.c:913
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "その他:"
 
-#: src/filewriter/mp3.c:924
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr "厳格な ISO 遵守を強制する"
 
-#: src/filewriter/mp3.c:935
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "エラー保護"
 
-#: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "音質"
 
-#: src/filewriter/mp3.c:957
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR を有効にする"
 
-#: src/filewriter/mp3.c:967
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "タイプ:"
 
-#: src/filewriter/mp3.c:1000
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr "VBR オプション:"
 
-#: src/filewriter/mp3.c:1016
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "最小ビットレート (kbps):"
 
-#: src/filewriter/mp3.c:1043
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "最大ビットレート (kbps):"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr "最小ビットレートを厳格に強制する"
 
-#: src/filewriter/mp3.c:1078
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr "ABR オプション:"
 
-#: src/filewriter/mp3.c:1088
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "平均ビットレート (kbps):"
 
-#: src/filewriter/mp3.c:1116
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr "VBR 品質レベル:"
 
-#: src/filewriter/mp3.c:1135
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr "Xing VBR ヘッダを書き込まない"
 
-#: src/filewriter/mp3.c:1149
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "フレーム パラメータ:"
 
-#: src/filewriter/mp3.c:1171
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr "著作権物としてマーク"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr "オリジナルとしてマーク"
 
-#: src/filewriter/mp3.c:1194
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "ID3 パラメータ:"
 
-#: src/filewriter/mp3.c:1205
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
-msgstr "ヴァージョン 2 タグの付加を強制する"
+msgstr "バージョン 2 タグを強制的に付加する"
 
-#: src/filewriter/mp3.c:1215
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr "v1 タグのみ付加する"
 
-#: src/filewriter/mp3.c:1222
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr "v2 タグのみ付加する"
 
-#: src/filewriter/mp3.c:1243
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
 msgstr "タグ"
 
-#: src/filewriter/vorbis.c:238
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis エンコーダ設定"
 
-#: src/filewriter/vorbis.c:258
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "品質レベル (0 - 10):"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr "FLAC オーディオプラグインについて"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1321,13 +1398,7 @@
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr ""
-"\n"
-"\n"
-"オリジナルコードは\n"
-"Ralf Ertzinger <ralf@skytale.net> による\n"
-"\n"
-"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\nオリジナルコードは\nRalf Ertzinger <ralf@skytale.net> による\n\nhttp://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
@@ -1340,445 +1411,379 @@
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-msgstr ""
-"Gnome ショートカットプラグイン\n"
-"Gnome ショートカットでプレイヤを操作しよう．\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
-msgid "Open Files"
-msgstr ""
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
-#, fuzzy
-msgid "Add Files"
-msgstr "ファイルの追加..."
-
-#: src/gntui/gntui.c:270
-#, fuzzy
-msgid "Audacious2"
-msgstr "Audacious"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr ""
+msgstr "Gnome ショートカットプラグイン\nGnome ショートカットでプレイヤを操作しよう．\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
 
 #: src/gtkui/columns.c:36
-#, fuzzy
 msgid "Entry number"
-msgstr "トラック番号:"
+msgstr "リスト番号"
 
-#: src/gtkui/columns.c:36 src/sid/xs_interface.c:1103
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "タイトル"
 
-#: src/gtkui/columns.c:37
-#, fuzzy
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
-msgstr "アーティスト:"
+msgstr "アーティスト"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Year"
-msgstr "年:"
+msgstr "年"
 
-#: src/gtkui/columns.c:37
-#, fuzzy
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
-msgstr "アルバム名:"
+msgstr "アルバム"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Track"
-msgstr "トラック:"
+msgstr "トラック"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Queue position"
-msgstr "位置"
+msgstr "キュー番号"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "Length"
-msgstr "長さ (ミリ秒):"
+msgstr "長さ"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "File path"
-msgstr "ファイル名"
+msgstr "ファイルパス"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "File name"
 msgstr "ファイル名"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "Custom title"
-msgstr "カスタムスキン"
+msgstr "カスタムタイトル"
 
 #: src/gtkui/columns.c:39
-#, fuzzy
 msgid "Bitrate"
-msgstr "ビットレート (kbps):"
+msgstr "ビットレート"
 
-#: src/gtkui/columns.c:286
-#, fuzzy
+#: src/gtkui/columns.c:278
 msgid "Choose Columns"
-msgstr "プレイヤを表示する"
+msgstr "列の選択"
 
-#: src/gtkui/columns.c:300
-#, fuzzy
+#: src/gtkui/columns.c:292
 msgid "Available:"
-msgstr "可変"
+msgstr "利用可能なもの"
 
-#: src/gtkui/columns.c:334
+#: src/gtkui/columns.c:326
 msgid "Chosen:"
-msgstr ""
+msgstr "選択したもの:"
 
 #: src/gtkui/layout.c:122
 msgid "Dock at Left"
-msgstr ""
+msgstr "左側にドッキング"
 
 #: src/gtkui/layout.c:122
 msgid "Dock at Right"
-msgstr ""
+msgstr "右側にドッキング"
 
 #: src/gtkui/layout.c:123
 msgid "Dock at Top"
-msgstr ""
+msgstr "上部にドッキング"
 
 #: src/gtkui/layout.c:123
 msgid "Dock at Bottom"
-msgstr ""
+msgstr "下部にドッキング"
 
 #: src/gtkui/layout.c:123
 msgid "Undock"
-msgstr ""
+msgstr "ドッキングを解く"
 
-#: src/gtkui/layout.c:123
-#, fuzzy
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
-msgstr "可変"
+msgstr "無効"
 
-#: src/gtkui/menus.c:132
-#, fuzzy
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
-msgstr "ファイルの追加..."
+msgstr "ファイルを開く(_O)"
 
-#: src/gtkui/menus.c:133
-#, fuzzy
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
-msgstr "ファイルの追加..."
+msgstr "URL を開く(_U)"
 
-#: src/gtkui/menus.c:134
-#, fuzzy
-msgid "_Add File ..."
-msgstr "ファイルの追加..."
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "ファイルを追加(_A)"
 
-#: src/gtkui/menus.c:135
-#, fuzzy
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
-msgstr "ファイルの追加..."
+msgstr "URL を追加(_R)"
 
-#: src/gtkui/menus.c:137
-#, fuzzy
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
-msgstr "プラグインについて"
+msgstr "プログラムの情報(_B)"
 
-#: src/gtkui/menus.c:138
-#, fuzzy
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
-msgstr "設定"
+msgstr "設定(_P)"
 
-#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: src/gtkui/menus.c:142
-#, fuzzy
+#: src/gtkui/menus.c:141
 msgid "_Play"
-msgstr "演奏"
+msgstr "再生(_P)"
 
-#: src/gtkui/menus.c:143
-#, fuzzy
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
-msgstr "一時停止"
+msgstr "一時停止(_E)"
 
-#: src/gtkui/menus.c:144
-#, fuzzy
+#: src/gtkui/menus.c:143
 msgid "_Stop"
-msgstr "停止"
+msgstr "停止(_S)"
 
-#: src/gtkui/menus.c:145
-#, fuzzy
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
-msgstr "前の曲"
+msgstr "前の曲へ(_V)"
 
-#: src/gtkui/menus.c:146
-#, fuzzy
+#: src/gtkui/menus.c:145
 msgid "_Next"
-msgstr "次の曲"
+msgstr "次の曲へ(_N)"
 
-#: src/gtkui/menus.c:148
-#, fuzzy
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
-msgstr "リピート"
+msgstr "リピート(_R)"
 
-#: src/gtkui/menus.c:149
-#, fuzzy
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
-msgstr "シャッフル"
+msgstr "シャッフル(_H)"
 
-#: src/gtkui/menus.c:150
-#, fuzzy
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
-msgstr "次の曲に進まない"
+msgstr "プレイリストの再生を続けない(_O)"
 
-#: src/gtkui/menus.c:151
-#, fuzzy
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
-msgstr "現在の曲の後に停止する"
+msgstr "曲の再生後に停止(_A)"
 
-#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
-msgstr ""
+msgstr "曲の情報(_I)"
 
-#: src/gtkui/menus.c:154
-#, fuzzy
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
-msgstr "指定した時間へ移動"
+msgstr "指定した時間にジャンプ(_T)"
 
-#: src/gtkui/menus.c:155
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
-msgstr ""
+msgstr "指定した曲にジャンプ(_J)"
 
-#: src/gtkui/menus.c:158
-#, fuzzy
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
-msgstr "トラック番号"
+msgstr "トラックナンバー(_N)"
 
-#: src/gtkui/menus.c:159
-#, fuzzy
+#: src/gtkui/menus.c:158
 msgid "By _Title"
-msgstr "タイトル"
+msgstr "タイトル(_T)"
 
-#: src/gtkui/menus.c:160
-#, fuzzy
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
-msgstr "アーティスト"
+msgstr "アーティスト(_A)"
 
-#: src/gtkui/menus.c:161
-#, fuzzy
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
-msgstr "アルバム名:"
+msgstr "アルバム(_L)"
 
-#: src/gtkui/menus.c:162
-#, fuzzy
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
-msgstr "日付"
+msgstr "リリース日(_D)"
 
-#: src/gtkui/menus.c:163
-#, fuzzy
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
-msgstr "ファイル名"
+msgstr "ファイルパス(_F)"
 
-#: src/gtkui/menus.c:164
-#, fuzzy
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
-msgstr "カスタムスキン"
+msgstr "カスタムタイトル(_C)"
 
-#: src/gtkui/menus.c:166
-#, fuzzy
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
-msgstr "プレイリストを逆順にする"
+msgstr "逆順にする(_E)"
 
-#: src/gtkui/menus.c:167
-#, fuzzy
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
-msgstr "ランダム(R_)"
+msgstr "ランダムに並べる(_R)"
 
-#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
-#, fuzzy
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
-msgstr "リフレッシュレート"
+msgstr "再読み込み(_R)"
+
+#: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "再生できないファイルを削除する(_U)"
 
 #: src/gtkui/menus.c:172
-#, fuzzy
 msgid "_Sort"
-msgstr "ポート"
+msgstr "ソート(_S)"
 
 #: src/gtkui/menus.c:174
 msgid "_New"
-msgstr ""
+msgstr "新しいプレイリスト(_N)"
 
-#: src/gtkui/menus.c:175
-#, fuzzy
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
-msgstr "閉じる"
+msgstr "プレイリストを閉じる(_C)"
 
 #: src/gtkui/menus.c:177
-#, fuzzy
 msgid "_Import ..."
-msgstr "インポート"
+msgstr "インポート(_I)"
 
 #: src/gtkui/menus.c:178
-#, fuzzy
 msgid "_Export ..."
-msgstr "エクスポート"
+msgstr "エクスポート(_E)"
 
 #: src/gtkui/menus.c:180
-#, fuzzy
 msgid "_Playlist Manager ..."
-msgstr "プレイリストマネージャ"
+msgstr "プレイリストマネージャ(_P)"
 
-#: src/gtkui/menus.c:183
-#, fuzzy
-msgid "Volume _Up"
-msgstr "音量を上げる"
+#: src/gtkui/menus.c:181
+msgid "_Queue Manager ..."
+msgstr "キューマネージャ(_Q)"
 
 #: src/gtkui/menus.c:184
-#, fuzzy
+msgid "Volume _Up"
+msgstr "音量を上げる(_U)"
+
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
-msgstr "音量を下げる"
+msgstr "音量を下げる(_D)"
 
-#: src/gtkui/menus.c:186
-#, fuzzy
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
-msgstr "イコライザを表示する"
+msgstr "イコライザ(_E)"
 
-#: src/gtkui/menus.c:188
-#, fuzzy
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
-msgstr "エフェクト"
+msgstr "エフェクト(_E)"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:192
 msgid "_Interface"
-msgstr ""
+msgstr "インターフェイス(_I)"
 
 #: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "視覚化(_V)"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
-msgstr ""
+msgstr "メニューバーを表示する(_M)"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
-msgstr ""
+msgstr "情報バーを表示する(_N)"
 
-#: src/gtkui/menus.c:195
-#, fuzzy
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
-msgstr "状態"
+msgstr "ステータスバーを表示する(_S)"
 
-#: src/gtkui/menus.c:197
-#, fuzzy
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
-msgstr "プレイヤを表示する"
+msgstr "列のヘッダーを表示する(_H)"
 
-#: src/gtkui/menus.c:198
-#, fuzzy
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
-msgstr "プレイヤを表示する"
+msgstr "列を選択する(_C)"
 
-#: src/gtkui/menus.c:199
-#, fuzzy
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
-msgstr "曲メッセージ"
+msgstr "曲が変わったらスクロールする(_L)"
 
-#: src/gtkui/menus.c:202
-#, fuzzy
+#: src/gtkui/menus.c:204
 msgid "_File"
-msgstr "ファイル"
+msgstr "ファイル(_F)"
 
-#: src/gtkui/menus.c:203
-#, fuzzy
+#: src/gtkui/menus.c:205
 msgid "_Playback"
-msgstr "演奏"
+msgstr "再生(_P)"
 
-#: src/gtkui/menus.c:204
-#, fuzzy
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
-msgstr "プレイリスト"
+msgstr "プレイリスト(_L)"
 
-#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
-#, fuzzy
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
-msgstr "デバイス"
+msgstr "サービス(_S)"
 
-#: src/gtkui/menus.c:206
-#, fuzzy
+#: src/gtkui/menus.c:208
 msgid "_Output"
-msgstr "出力プラグインエラー\n"
+msgstr "出力(_O)"
 
-#: src/gtkui/menus.c:207
-#, fuzzy
+#: src/gtkui/menus.c:209
 msgid "_View"
-msgstr "表示"
+msgstr "表示(_V)"
 
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
-msgstr ""
+msgstr "キュー / アンキュー(_Q)"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
-msgstr ""
+msgstr "切り取り(_T)"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:217
 msgid "_Copy"
-msgstr ""
+msgstr "コピー(_C)"
 
-#: src/gtkui/menus.c:216
-#, fuzzy
+#: src/gtkui/menus.c:218
 msgid "_Paste"
-msgstr "最も早い"
+msgstr "貼り付け(_P)"
 
-#: src/gtkui/menus.c:217
-#, fuzzy
+#: src/gtkui/menus.c:219
 msgid "Select _All"
-msgstr "全て選択"
+msgstr "すべて選択(_A)"
 
-#: src/gtkui/menus.c:222
-#, fuzzy
+#: src/gtkui/menus.c:224
 msgid "_Rename"
-msgstr "ファイル名"
+msgstr "名前の変更(_R)"
 
-#: src/gtkui/ui_gtk.c:75
+#: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
-msgstr ""
+msgstr "GTK インターフェイス"
 
-#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#: src/gtkui/ui_gtk.c:156 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
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "バッファ中 ..."
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr "エラー"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "閉じる"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "モノラル"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "ステレオ"
 
-#: src/gtkui/ui_statusbar.c:106
-#, fuzzy, c-format
+#: src/gtkui/ui_statusbar.c:109
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] "チャンネル数"
-msgstr[1] "チャンネル数"
+msgstr[0] "%d チャンネル"
 
-#: src/gtkui/ui_statusbar.c:121
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
-msgstr ""
+msgstr "%d kbps"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
@@ -1786,7 +1791,7 @@
 
 #: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
 msgid "Play"
-msgstr "演奏"
+msgstr "再生"
 
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
@@ -1810,7 +1815,7 @@
 
 #: src/hotkey/gui.c:78
 msgid "Mute"
-msgstr "無音"
+msgstr "ミュート"
 
 #: src/hotkey/gui.c:79
 msgid "Volume Up"
@@ -1820,7 +1825,7 @@
 msgid "Volume Down"
 msgstr "音量を下げる"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
 msgstr "指定したファイルへ移動"
 
@@ -1833,14 +1838,12 @@
 msgstr "On-Screen-Display を表示する"
 
 #: src/hotkey/gui.c:84
-#, fuzzy
 msgid "Toggle Repeat"
-msgstr "リピート"
+msgstr "リピートをトグル"
 
 #: src/hotkey/gui.c:85
-#, fuzzy
 msgid "Toggle Shuffle"
-msgstr "シャッフル"
+msgstr "シャッフルをトグル"
 
 #: src/hotkey/gui.c:95
 msgid "(none)"
@@ -1848,30 +1851,24 @@
 
 #: src/hotkey/gui.c:232
 msgid ""
-"It is not recommended to bind the primary mouse buttons without "
-"modificators.\n"
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr ""
-"修飾キーなしでプライマリマウスボタンに割り当てるのはお勧めしません.\n"
-"\n"
-"続けますか?"
+msgstr "修飾キーなしでプライマリ・マウスのボタンに割り当てるのはお勧めしません。\n\n本当によろしいですか？"
 
 #: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
-msgstr "マウスボタン割り当て"
+msgstr "マウスボタンの割り当て"
 
 #: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
-msgstr "グローバルホットキープラグイン設定"
+msgstr "グローバルホットキープラグインの設定"
 
 #: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr ""
-"テキストフィールド内でキーコンビネーションを押してください.\n"
-"マウスボタンを組み合わせることもできます."
+msgstr "テキストフィールド内でキーコンビネーションを押してください。\nマウスボタンを組み合わせることもできます。"
 
 #: src/hotkey/gui.c:405
 msgid "Hotkeys:"
@@ -1903,45 +1900,33 @@
 "\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
-msgstr ""
-"グローバルホットキープラグイン\n"
-"グローバルキーコンビネーションかマルチメディアキーでプレイヤをコントロール.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-"貢献者:\n"
-"Copyright (C) 2006-2008 Vladimir Paskov <vlado.paskov@gmail.com>\n"
-"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
-"\t\t\tBryn Davies <curious@ihug.com.au>\n"
-"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
-"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
-"\n"
+msgstr "グローバルホットキープラグイン\nグローバルキーコンビネーションまたはマルチメディアキーで、プレイヤをコントロールします。\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\n貢献者:\nCopyright (C) 2006-2008 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n\t\t\tBryn Davies <curious@ihug.com.au>\n\t\t\tJonathan A. Davis <davis@jdhouse.org>\n\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n\n"
 
-#: src/jack/configure.c:71
+#: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
 msgstr "有効なすべての jack ポートに接続する"
 
-#: src/jack/configure.c:78
+#: src/jack/configure.c:73
 msgid "Connect only the output ports"
 msgstr "出力ポートにのみ接続する"
 
-#: src/jack/configure.c:85
+#: src/jack/configure.c:80
 msgid "Connect to no ports"
 msgstr "ポートに接続しない"
 
-#: src/jack/configure.c:103
+#: src/jack/configure.c:98
 msgid "jack Plugin configuration"
 msgstr "jack プラグイン設定"
 
-#: src/jack/configure.c:121
+#: src/jack/configure.c:116
 msgid "Connection mode:"
 msgstr "接続モード"
 
-#: src/jack/configure.c:133
+#: src/jack/configure.c:128
 msgid "Enable debug printing"
-msgstr "デバグ出力を有効にする"
+msgstr "デバッグ出力を有効にする"
 
-#: src/jack/jack.c:438
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1950,91 +1935,132 @@
 "\n"
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
-msgstr ""
-"XMMS jack ドライバ 0.17\n"
-"\n"
-"xmms-jack.sf.net\n"
-"Chris Morgan<cmorgan@alum.wpi.edu>\n"
-"\n"
-"develia.org の Giacomo Lozito による\n"
-"Audacious ポート"
+msgstr "XMMS jack ドライバ 0.17\n\nxmms-jack.sf.net\nChris Morgan<cmorgan@alum.wpi.edu>\n\nAudacious へのポートは、\ndevelia.org の Giacomo Lozito が行いました。"
 
-#: src/jack/jack.c:443
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
 msgstr "JACK 出力プラグイン 0.17 について"
 
-#: src/lyricwiki/lyricwiki.c:226
+#: src/ladspa/plugin.c:415
+msgid "About LADSPA Host"
+msgstr "LADSPA Host について"
+
+#: src/ladspa/plugin.c:516
+#, c-format
+msgid "%s Settings"
+msgstr "%s の設定"
+
+#: src/ladspa/plugin.c:584
+msgid "LADSPA Host Settings"
+msgstr "LADSPA Host の設定"
+
+#: src/ladspa/plugin.c:593
+msgid "Module paths:"
+msgstr "モジュールのパス:"
+
+#: src/ladspa/plugin.c:598
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr "複数のパスはコロンで区切ってください。これらのパス\nが、LADSPA_PATH の他に検索されます。新しいパスを追\n加した後は、新しいプラグインをスキャンするために、\nEnter キーを押してください。"
+
+#: src/ladspa/plugin.c:614
+msgid "Available plugins:"
+msgstr "利用可能なプラグイン:"
+
+#: src/ladspa/plugin.c:626
+msgid "Enable"
+msgstr "有効"
+
+#: src/ladspa/plugin.c:632
+msgid "Enabled plugins:"
+msgstr "有効なプラグイン:"
+
+#: src/ladspa/plugin.c:647
+msgid "Settings"
+msgstr "設定:"
+
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
-msgstr ""
+msgstr "\n歌詞を探しています..."
 
-#: src/lyricwiki/lyricwiki.c:249
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
-msgstr ""
+msgstr "\nlyrics.wikia.com に接続しています..."
 
-#: src/lyricwiki/lyricwiki.c:337
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
-msgstr ""
+msgstr "\n歌詞が見つかりませんでした。"
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr "Metronom について"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr ""
-"Martin Strauss <mys@faveve.uni-stuttgart.de> によるタクトジェネレータ\n"
-"\n"
-"これを使用するには URL に次の形で追加します: tact://beats*num/den\n"
-"例: tact://77 - 毎分 77 拍を演奏\n"
-" tact://60*3/4 - 60 bpm を 3/4 拍子で演奏"
+msgstr "Martin Strauss <mys@faveve.uni-stuttgart.de> によるタクトジェネレータ\n\nこれを使用するには、次の形の URL を追加します: tact://beats*num/den\n例: tact://77 - 毎分 77 拍を演奏\n tact://60*3/4 - 60 bpm を 3/4 拍子で演奏"
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "タクトジェネレータ: %d bpm"
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "タクトジェネレータ: %d bpm %d/%d"
 
-#: src/mpg123/mpg123.c:183
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "チャンネルミキサについて"
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "チャンネルミキサの設定"
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "出力チャンネル:"
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "次に曲が変わったときに変更を適用する。"
+
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
 msgstr "サラウンド"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
-msgstr "アップロード進行中..."
+msgstr "転送中..."
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
-msgstr ""
+msgstr "MTP デバイスへ転送"
 
-#: src/mtp_up/mtp.c:311
-#, fuzzy
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
-msgstr "デバイスを切断"
+msgstr "MTP デバイスを切断"
 
-#: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
-msgstr "停止"
+msgstr "停止しました"
 
-#: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
-msgstr "Audacious - 可視警告"
+msgstr "Audacious は曲を再生していません。"
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -2044,940 +2070,201 @@
 msgid ""
 " by Christian Birchinger <joker@netswarm.net>\n"
 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
-msgstr ""
-" Håvard Kvål <havardk@xmms.org> の XMMS プラグインをベースとした\n"
-" Christian Birchinger <joker@netswarm.net> によるポート"
+msgstr " Håvard Kvål <havardk@xmms.org> の XMMS プラグインを基にした\n Christian Birchinger <joker@netswarm.net> によるポートです。"
 
 #: src/null/null.c:68
 msgid "About Null Output"
 msgstr "ヌル出力プラグインについて"
 
-#: src/null/null.c:94
+#: src/null/null.c:89
 msgid "Null output preferences"
 msgstr "ヌル出力設定"
 
-#: src/null/null.c:105
+#: src/null/null.c:100
 msgid "Run in real time"
 msgstr "実時間で実行する"
 
-#: src/oss4/configure.c:89
-#, fuzzy
+#: src/oss4/configure.c:81
 msgid "1. Default device"
-msgstr "デフォルト PCM デバイス (%s)"
+msgstr "1. デフォルトデバイス"
 
-#: src/oss4/configure.c:151
-#, fuzzy
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
-msgstr "ステータスアイコンプラグイン - 設定"
+msgstr "OSS4 出力プラグインの設定"
 
-#: src/oss4/configure.c:163 src/OSS/configure.c:203
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "オーディオデバイス:"
 
-#: src/oss4/configure.c:189 src/OSS/configure.c:226 src/OSS/configure.c:269
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "代替デバイスを使用する:"
 
-#: src/oss4/configure.c:202
-#, fuzzy
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
-msgstr "セッション間の VMIX 音量を保存"
+msgstr "セッション間で音量を保存する"
 
-#: src/oss4/configure.c:206
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
-msgstr ""
+msgstr "OSS ソフトウェアのフォーマット変換を有効にする"
+
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "バーチャルミキシングを防ぐために排他的モード (exclusive mode) を有効にする"
 
 #: src/oss4/plugin.c:51
-#, fuzzy
 msgid "About OSS4 Plugin"
-msgstr "ESounD プラグインについて"
-
-#: src/oss4/plugin.c:52
-#, fuzzy
-msgid ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"This program is free software: you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation, either version 3 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-"Audacious PulseAudio 出力プラグイン\n"
-"\n"
-"このプログラムはフリーソフトウェアです;\n"
-"フリーソフトウェア財団が提供する GNU 一般公有使用許諾契約書\n"
-"の第二版か, 希望によってはそれ以降の版のどれかが定める条項の下で\n"
-"本プログラムを再頒布または変更することができます.\n"
-"\n"
-"本プログラムは有であることを願って頒布されていますが,\n"
-"まったくの無保証です; 市場性及び特定目的, 適合性についての\n"
-"暗黙の保証を含めて, いかなる保証も行ないません.\n"
-"詳細については GNU 一般公有使用許諾契約書をご覧下さい.\n"
-"\n"
-"あなたは, 本プログラムと一緒に GNU 一般公有使用許諾契約書の\n"
-"写しを受け取っているはずです. そうでない場合は, the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-"USA. まで請求して下さい."
+msgstr "OSS4 プラグインについて"
 
-#: src/oss4/utils.c:204
-#, fuzzy
+#: src/oss4/utils.c:211
 msgid "OSS4 error"
-msgstr "エラー"
+msgstr "OSS4 エラー"
 
-#: src/OSS/configure.c:146
+#: src/OSS/configure.c:137
 #, c-format
 msgid "Default (%s)"
 msgstr "デフォルト (%s)"
 
-#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
-#: src/skins/ui_manager.c:477
-msgid "Default"
-msgstr "デフォルト"
-
-#: src/OSS/configure.c:187
+#: src/OSS/configure.c:178
 msgid "OSS Driver configuration"
 msgstr "OSS ドライバの設定"
 
-#: src/OSS/configure.c:290
+#: src/OSS/configure.c:281
 msgid "Devices"
 msgstr "デバイス"
 
-#: src/OSS/configure.c:292
+#: src/OSS/configure.c:283
 msgid "Buffering:"
 msgstr "バッファリング:"
 
-#: src/OSS/configure.c:305
+#: src/OSS/configure.c:296
 msgid "Pre-buffer (percent):"
-msgstr "事前にバッファリングする割合 (％):"
+msgstr "プリバッファ (%):"
 
-#: src/OSS/configure.c:316
+#: src/OSS/configure.c:307
 msgid "Buffering"
 msgstr "バッファリング"
 
-#: src/OSS/configure.c:317
+#: src/OSS/configure.c:308
 msgid "Mixer Settings:"
 msgstr "ミキサの設定:"
 
-#: src/OSS/configure.c:323
+#: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
 msgstr "音量の調整は PCM ではなくマスタを使用する"
 
-#: src/OSS/configure.c:329
+#: src/OSS/configure.c:320
 msgid "Mixer"
 msgstr "ミキサ"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr "OSS ドライバについて"
 
-#: src/OSS/OSS.c:41
-msgid ""
-"Audacious OSS Driver\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Audacious OSS ドライバ\n"
-"\n"
-"このプログラムはフリーソフトウェアです;\n"
-"フリーソフトウェア財団が提供する GNU 一般公有使用許諾契約書\n"
-"の第二版, あるいはそれ以降の版が定める条項の下で\n"
-"本プログラムを再頒布または変更することができます.\n"
-"\n"
-"本プログラムは有用とは思いますが,\n"
-"頒布にあたっては, 市場性及び特定目的, 適合性についての\n"
-"暗黙の保証を含めて, いかなる保証も行ないません.\n"
-"詳細については GNU 一般公有使用許諾契約書をご覧下さい.\n"
-"\n"
-"あなたは, 本プログラムと一緒に GNU 一般公有使用許諾契約書の\n"
-"写しを受け取っているはずです. そうでない場合は, Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA. へ手紙を書いて下さい."
-
-#: src/pulse_audio/pulse_audio.c:687
+#: src/pulse_audio/pulse_audio.c:677
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Audacious PulseAudio 出力プラグインについて"
 
-#: src/pulse_audio/pulse_audio.c:688
-msgid ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Audacious PulseAudio 出力プラグイン\n"
-"\n"
-"このプログラムはフリーソフトウェアです;\n"
-"フリーソフトウェア財団が提供する GNU 一般公有使用許諾契約書\n"
-"の第二版か, 希望によってはそれ以降の版のどれかが定める条項の下で\n"
-"本プログラムを再頒布または変更することができます.\n"
-"\n"
-"本プログラムは有であることを願って頒布されていますが,\n"
-"まったくの無保証です; 市場性及び特定目的, 適合性についての\n"
-"暗黙の保証を含めて, いかなる保証も行ないません.\n"
-"詳細については GNU 一般公有使用許諾契約書をご覧下さい.\n"
-"\n"
-"あなたは, 本プログラムと一緒に GNU 一般公有使用許諾契約書の\n"
-"写しを受け取っているはずです. そうでない場合は, the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-"USA. まで請求して下さい."
-
-#: src/resample/plugin.c:91
-#, fuzzy
+#: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
-msgstr "ステータスアイコン プラグインについて"
+msgstr "サンプリング周波数コンバータプラグインについて"
 
-#: src/resample/plugin.c:146
+#: src/resample/plugin.c:144
 msgid "Sample Rate Converter Preferences"
-msgstr ""
+msgstr "サンプリング周波数コンバータについて"
 
-#: src/resample/plugin.c:158
+#: src/resample/plugin.c:156
 msgid "Rate mappings:"
-msgstr ""
+msgstr "周波数マッピング"
 
-#: src/resample/plugin.c:181
+#: src/resample/plugin.c:179
 msgid "All others:"
-msgstr ""
+msgstr "その他"
 
-#: src/resample/plugin.c:193
+#: src/resample/plugin.c:191
 msgid "Method:"
-msgstr ""
+msgstr "方法"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
-#, fuzzy
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
-msgstr "演奏曲の変更"
+msgstr "パスワードの変更"
 
-#: src/scrobbler/configure.c:150
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "サービス"
 
-#: src/scrobbler/configure.c:172
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "ユーザ名:"
 
-#: src/scrobbler/configure.c:178
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/scrobbler/configure.c:186
-#, fuzzy
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
-msgstr "Scrobbler エラー"
+msgstr "Scrobbler URL:"
 
-#: src/scrobbler/configure.c:218
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:262
-#, fuzzy
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
-msgstr "Scrobbler エラー"
+msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:213
+#: src/scrobbler/plugin.c:194
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
-"com>\n"
-msgstr ""
-"Audacious AudioScrobbler プラグイン\n"
-"\n"
-"Audun Hove <audun@nlc.no> と Pipian <pipian@pipian.com> によってオリジナルは"
-"作成された\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr "Audacious AudioScrobbler プラグイン\n\nオリジナルは、Audun Hove <audun@nlc.no> と Pipian <pipian@pipian.com> によって作成されました。\n"
 
-#: src/scrobbler/plugin.c:215
+#: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
 msgstr "Scrobbler プラグインについて"
 
 #: src/sdlout/plugin.c:58
-#, fuzzy
 msgid "About SDL Output Plugin"
-msgstr "JACK 出力プラグイン 0.17 について"
+msgstr "SDL 出力プラグインについて"
 
 #: src/sdlout/plugin.c:78
-#, fuzzy
 msgid "SDL error"
-msgstr "エラー"
-
-#: src/sid/xs_about.c:84
-#, c-format
-msgid "About %s"
-msgstr "%s について"
-
-#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "閉じる"
-
-#: src/sid/xs_config.c:326
-#, fuzzy
-msgid " Error"
-msgstr "エラー"
-
-#: src/sid/xs_config.c:326
-msgid "OK"
-msgstr "OK"
-
-#: src/sid/xs_fileinfo.c:151
-msgid "General info"
-msgstr "一般情報"
-
-#: src/sid/xs_fileinfo.c:164
-#, c-format
-msgid "Tune #%i: "
-msgstr "チューン #%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 設定"
-
-#: src/sid/xs_interface.c:270
-msgid "8-bit"
-msgstr " 8ビット"
-
-#: src/sid/xs_interface.c:277
-msgid "16-bit"
-msgstr "16ビット"
-
-#: src/sid/xs_interface.c:284
-msgid "Resolution:"
-msgstr "解像度:"
-
-#: src/sid/xs_interface.c:315
-msgid "Autopanning"
-msgstr "オートパニング"
-
-#: src/sid/xs_interface.c:322
-msgid "Channels:"
-msgstr "チャンネル数:"
-
-#: src/sid/xs_interface.c:366
-msgid "Samplerate:"
-msgstr "サンプリングレート:"
-
-#: src/sid/xs_interface.c:383
-msgid "Use oversampling"
-msgstr "オーバーサンプリングを使う"
-
-#: src/sid/xs_interface.c:394
-msgid "Factor:"
-msgstr "ファクター:"
-
-#: src/sid/xs_interface.c:406
-msgid "Large factors require more CPU-power"
-msgstr "大きなファクターはより CPU パワーを必要とします"
-
-#: src/sid/xs_interface.c:412
-msgid "Oversampling:"
-msgstr "オーバーサンプリング:"
-
-#: src/sid/xs_interface.c:417
-msgid "Audio"
-msgstr "オーディオ"
-
-#: src/sid/xs_interface.c:445
-msgid "Force speed"
-msgstr "速度を強制する"
-
-#: src/sid/xs_interface.c:449
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"clock speed/frequency. Otherwise the speed is determined from played file "
-"itself."
-msgstr ""
-"有効ならば, エミュレーションエンジンに選択されたクロック速度および周波数を使"
-"うことを\"強制\"します. そうでなければ, 速度は演奏するファイル自体から決定さ"
-"れます."
-
-#: src/sid/xs_interface.c:451
-msgid "PAL (50 Hz)"
-msgstr "PAL (50 Hz)"
-
-#: src/sid/xs_interface.c:455
-msgid ""
-"PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
-"Most of SID-tunes have been made for PAL computers."
-msgstr ""
-"PAL は 50Hz のリフレッシュレートを用いるヨーロッパの TV 規格です. ほとんどの "
-"SID-tunes は PAL コンピュータ向けに作られています."
-
-#: src/sid/xs_interface.c:459
-msgid "NTSC (60 Hz)"
-msgstr "NTSC (60 Hz)"
-
-#: src/sid/xs_interface.c:463
-msgid ""
-"NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
-"that differ from PAL). It is mainly used in United States, Japan and certain "
-"other countries."
-msgstr ""
-"NTSC は 60Hz のリフレッシュレートを用い, PAL とは他にも異なる特徴を持つ TV 規"
-"格です. 主にアメリカ, 日本や他の国々で用いられています."
-
-#: src/sid/xs_interface.c:467
-msgid "Clock speed:"
-msgstr "クロック速度:"
-
-#: src/sid/xs_interface.c:484
-msgid "Force model"
-msgstr "モデルを強制する"
-
-#: src/sid/xs_interface.c:488
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"SID-chip model. Otherwise the preferred SID model is determined from the "
-"file (if PSIDv2NG type) or if not available, this setting is used."
-msgstr ""
-"有効ならば, エミュレーションエンジンに選択された SID チップモデルを使うことを"
-"\"強制\"します. 無効ならば, ファイルが PSIDv2NG タイプなら, 望ましい SID モデ"
-"ルが決定されますが, 利用できなければこの設定が用いられます."
-
-#: src/sid/xs_interface.c:490
-msgid "MOS 6581"
-msgstr "MOS 6581"
-
-#: src/sid/xs_interface.c:494
-msgid ""
-"MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
-"in few ways, having much fuller filter (which, due to design error, is never "
-"same between two different SID-chips) and has the \"volume adjustment bug\", "
-"which enables playing of digital samples."
-msgstr ""
-"MOS/CSG 6581 はかつて主流だった SID チップのヴァージョンです. より多くのフィ"
-"ルタを持っている 8580 とは違いはほとんどありませんが (設計の誤りのため, 両者"
-"の SID チップは同じではありません), デジタルサンプルの再生を有効にする \"音量"
-"調整バグ\" があります."
-
-#: src/sid/xs_interface.c:498
-msgid "MOS 8580"
-msgstr "MOS 8580"
-
-#: src/sid/xs_interface.c:505
-msgid "SID model:"
-msgstr "SID モデル:"
-
-#: src/sid/xs_interface.c:522
-msgid "SIDPlay 1 (frame-based)"
-msgstr "SIDPlay 1 (フレームベース)"
-
-#: src/sid/xs_interface.c:526
-msgid ""
-"Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-"cases, though."
-msgstr ""
-"高速ですがそれほど正確ではない libSIDPlay 1.x を用います. ですがほとんどの場"
-"合問題ありません."
-
-#: src/sid/xs_interface.c:530
-msgid "SIDPlay 2 (cycle-based)"
-msgstr "SIDPlay 2 (サイクルベース)"
-
-#: src/sid/xs_interface.c:534
-msgid ""
-"Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
-"emulation."
-msgstr ""
-"より正確なエミュレーションのために強力な CPU を必要とする libSIDPlay 2.x を用"
-"います."
+msgstr "SDL エラー"
 
-#: src/sid/xs_interface.c:538
-msgid "Emulation library selection:"
-msgstr "エミュレーションライブラリの選択"
-
-#: src/sid/xs_interface.c:555
-msgid "Real C64 (SIDPlay 2 only)"
-msgstr "Real C64 (SIDPlay 2 専用)"
-
-#: src/sid/xs_interface.c:562
-msgid "Bank switching"
-msgstr "バンクスイッチング"
-
-#: src/sid/xs_interface.c:569
-msgid "Transparent ROM"
-msgstr "透過 ROM"
-
-#: src/sid/xs_interface.c:576
-msgid "PlaySID environment"
-msgstr "PlaySID 環境"
-
-#: src/sid/xs_interface.c:583
-msgid "Memory mode:"
-msgstr "メモリモード:"
-
-#: src/sid/xs_interface.c:588
-msgid "Emu#1"
-msgstr "Emu#1"
-
-#: src/sid/xs_interface.c:611
-msgid "Optimization mode (faster, inaccurate)"
-msgstr "最適化モード (高速, 不正確)"
-
-#: src/sid/xs_interface.c:615
-msgid ""
-"This setting can be used to enable libSIDPlay2's \"optimization mode\", "
-"which in downgrades the emulation from cycle-exact to something similar to "
-"frame-exact. The result is lower CPU usage, but worse accuracy."
-msgstr ""
-"libSIDPlay2 の \"最適化モード\" を有効にします. これはエミュレーションをサイ"
-"クル正確からフレーム正確に似た何かに格下げします. この結果, CPU 使用率は下が"
-"りますが, 正確さは悪くなります."
-
-#: src/sid/xs_interface.c:617
-msgid "reSID-emulation"
-msgstr "reSID エミュレーション"
-
-#: src/sid/xs_interface.c:621
-msgid ""
-"reSID is the software SID-chip simulator based on SID reverse-engineering, "
-"created by Dag Lem. It is probably the closest thing to real SID available "
-"as software-only emulation."
-msgstr ""
-"reSID は Dag Lem によって作成された, SID リバースエンジニアリングに基づくソフ"
-"トウェア SID チップシミュレータです. ソフトウェアのみでのエミュレーションで"
-"は, 本物の利用可能な SID におそらく最も近いものです."
-
-#: src/sid/xs_interface.c:625
-msgid "HardSID"
-msgstr "HardSID"
-
-#: src/sid/xs_interface.c:629
-msgid ""
-"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-"real SID-chip. Software can be used to control the HardSID and combined with "
-"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to "
-"achieve \"near 100%\" similarity to real C64. For more information, see "
-"http://www.hardsid.com/"
-msgstr ""
-"HardSID は PC 互換機用の EISA/PCI カードに搭載されている SID チップです. "
-"HardSID を操作するにはソフトウェアが用いられ, libSIDPlay1 を通して C64 の残り"
-"のソフトウェアエミュレーションと組み合わされます.HardSID は本物の C64 との類"
-"似点を \"ほぼ 100%\" 達成するために用いられます. より多くの情報は http://www."
-"hardsid.com/ を参照してください."
-
-#: src/sid/xs_interface.c:633
-msgid "SIDPlay 2 options:"
-msgstr "SIDPlay 2 オプション:"
-
-#: src/sid/xs_interface.c:650
-msgid "Fast (nearest neighbour)"
-msgstr "高速 (最近傍)"
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "ジャンル"
 
-#: src/sid/xs_interface.c:654
-msgid ""
-"Fastest and also worst sounding sampling method, simply picks nearest "
-"neighbouring sample."
-msgstr ""
-"単純に最近傍のサンプルを用いるだけの, 最速ですが最悪のサンプリング方法です."
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "ライブラリ"
 
-#: src/sid/xs_interface.c:658
-msgid "Linear interpolation"
-msgstr "線形補間"
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "プレイリストを作成(_C)"
 
-#: src/sid/xs_interface.c:662
-msgid ""
-"Uses linear interpolation between samples, yielding higher audio quality "
-"with less sampling noise."
-msgstr ""
-"高い音質を低いサンプリングノイズで生成する, サンプル間の線形補間を用います."
-
-#: src/sid/xs_interface.c:673
-msgid "Resampling (FIR)"
-msgstr "リサンプリング (FIR)"
-
-#: src/sid/xs_interface.c:680
-msgid "reSID sampling options:"
-msgstr "reSID サンプリングオプション:"
-
-#: src/sid/xs_interface.c:685
-msgid "Emu#2"
-msgstr "Emu#2"
-
-#: src/sid/xs_interface.c:697
-msgid "Emulate filters"
-msgstr "フィルタをエミュレートする"
-
-#: src/sid/xs_interface.c:701
-msgid ""
-"This option enables emulation of SID filter. The filter is an essential part "
-"of SID's sound capacity, but accurate emulation of it may require quite much "
-"CPU power. However, if filter emulation is disabled, tunes won't sound "
-"authentic at all if they utilize the filter."
-msgstr ""
-"SID フィルタのエミュレートを有効にします. フィルタは SID の音源としての本質的"
-"な部分ですが, 正確にエミュレーションするにはとても多くの CPU パワーを必要とし"
-"ます. しかし, フィルタエミュレーションが無効だと, フィルタを使っている音色は"
-"まったく本物のようには聞こえません."
-
-#: src/sid/xs_interface.c:726
-msgid "FS"
-msgstr "FS"
-
-#: src/sid/xs_interface.c:743
-msgid "FM"
-msgstr "FM"
-
-#: src/sid/xs_interface.c:760
-msgid "FT"
-msgstr "FT"
-
-#: src/sid/xs_interface.c:771
-msgid "Reset values"
-msgstr "値をリセット"
-
-#: src/sid/xs_interface.c:776
-msgid "SIDPlay1"
-msgstr "SIDPlay1"
-
-#: src/sid/xs_interface.c:817
-msgid "Export"
-msgstr "エクスポート"
-
-#: src/sid/xs_interface.c:825
-msgid "Use"
-msgstr "使用"
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "プレイリストに追加(_A)"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
-msgid "Save"
-msgstr "保存"
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "ライブラリを検索"
 
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
-msgid "Import"
-msgstr "インポート"
-
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
-msgid "Delete"
-msgstr "削除"
-
-#: src/sid/xs_interface.c:863
-msgid "Filter curve:"
-msgstr "フィルタ曲線:"
-
-#: src/sid/xs_interface.c:868
-msgid "SIDPlay2"
-msgstr "SIDPlay2"
-
-#: src/sid/xs_interface.c:874
-msgid "Filters"
-msgstr "フィルタ"
-
-#: src/sid/xs_interface.c:897
-msgid "Play at least for specified time"
-msgstr "少なくとも指定された時間で演奏"
-
-#: src/sid/xs_interface.c:901
+#: src/search-tool/search-tool.c:645
 msgid ""
-"If enabled, the tune is played at least for the specified time, adding "
-"silence to the end if necessary."
-msgstr ""
-"有効ならば, 必要に応じて末尾に無音部分を追加し, 音色は少なくとも指定された時"
-"間で演奏されます."
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "音楽ライブラリを Audacious へインポートするには、フォルダを選択し、\"再読み込み\" アイコンをクリックしてください。"
 
-#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
-#: src/sid/xs_interface.c:1142
-msgid "Playtime:"
-msgstr "演奏時間:"
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "お待ちください..."
 
-#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
-#: src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "秒"
-
-#: src/sid/xs_interface.c:928
-msgid "Minimum playtime:"
-msgstr "最小演奏時間:"
-
-#: src/sid/xs_interface.c:945
-msgid "Play for specified time maximum"
-msgstr "指定された時間いっぱいまで演奏"
-
-#: src/sid/xs_interface.c:949
-msgid ""
-"If enabled, tune is played until specified duration is reached (aka maximum "
-"playtime)."
-msgstr ""
-"有効ならば, 音色は指定された持続時間 (最大演奏時間) に到達するまで演奏されま"
-"す."
-
-#: src/sid/xs_interface.c:951
-msgid "Only when song length is unknown"
-msgstr "曲の長さが不明な場合のみ"
-
-#: src/sid/xs_interface.c:955
-msgid ""
-"If enabled, the maximum playtime is applied only if song/tune length is not "
-"known."
-msgstr ""
-"有効ならば, 曲や音色の長さが不明な場合のみ, 最大演奏時間が用いられます."
-
-#: src/sid/xs_interface.c:982
-msgid "Maximum playtime:"
-msgstr "最大演奏時間:"
-
-#: src/sid/xs_interface.c:999
-msgid "Use XSIDPLAY-compatible database"
-msgstr "XSIDPLAY 互換データベースを使う"
-
-#: src/sid/xs_interface.c:1003
-msgid ""
-"This option enables using of XSIDPLAY compatible song length database. "
-"(Refer to Audacious-SID documentation for more information)"
-msgstr ""
-"XSIDPLAY 互換の曲の長さデータベースを使用します. (より多くの情報は Audacious-"
-"SID の文書を参照してください)"
-
-#: src/sid/xs_interface.c:1010
-msgid "DB-file:"
-msgstr "DB ファイル:"
-
-#: src/sid/xs_interface.c:1020
-msgid "Database path and filename"
-msgstr "データベースパスとファイル名"
-
-#: src/sid/xs_interface.c:1027
-msgid "Browse for song length-database file"
-msgstr "曲の長さデータベースファイルを参照"
-
-#: src/sid/xs_interface.c:1049
-msgid "Song length database:"
-msgstr "曲の長さデータベース:"
-
-#: src/sid/xs_interface.c:1054
-msgid "Songlength"
-msgstr "曲の長さ"
-
-#: src/sid/xs_interface.c:1072
-msgid "Override generic Tuplez format string"
-msgstr "オリジナルのタプルフォーマット文字列を上書きする"
-
-#: src/sid/xs_interface.c:1076
-msgid ""
-"By enabling this option you can specify a custom Tuplez formatting string "
-"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
-"below."
-msgstr ""
-"このオプションを有効にすると，SID ファイルのカスタムタプルフォーマット文字列"
-"を指定できます．SID プラグインで指定するタプルタグはすぐ下に記述します．"
-
-#: src/sid/xs_interface.c:1087
-msgid "Tuplez format string for SID-files"
-msgstr "SID ファイルのタプルフォーマット文字列"
-
-#: src/sid/xs_interface.c:1090
-msgid ""
-"SID-specific Tuplez fields:\n"
-"\n"
-"sid-format\t\t- Specific fileformat\n"
-"sid-model\t\t- 6581 or 8580\n"
-"sid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n"
-"\n"
-"Other \"special\" fields set:\n"
-"\n"
-"subsong-num, subsong-id"
-msgstr ""
-"SID 特有のタプルフィールド:\n"
-"\n"
-"sid-format\t\t- 特有のファイルフォーマット\n"
-"sid-model\t\t- 6581 か 8580\n"
-"sid-speed\t\t- タイミングか速さ: PAL/NTSC/etc.\n"
-"\n"
-"他の \"特別な\" フィールド:\n"
-"\n"
-"subsong-num, subsong-id"
-
-#: src/sid/xs_interface.c:1098
-msgid "Song title format:"
-msgstr "曲のタイトルの書式:"
-
-#: src/sid/xs_interface.c:1125
-msgid "Add sub-tunes to playlist"
-msgstr "サブチューンをプレイリストに追加"
-
-#: src/sid/xs_interface.c:1129
-msgid ""
-"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
-"only the default sub-tune will be added."
-msgstr ""
-"有効にすると，各ファイルのサブチューンがプレイリストに追加されます．無効にす"
-"ると，デフォルトのサブチューンのみが追加されます．"
-
-#: src/sid/xs_interface.c:1131
-msgid "Only tunes with specified minimum duration"
-msgstr "指定された最小の長さのチューンのみ"
-
-#: src/sid/xs_interface.c:1135
-msgid "Only add sub-tunes that have a duration of at least specified time."
-msgstr "少なくとも指定された時間の持続時間を持ったサブチューンのみ追加します．"
-
-#: src/sid/xs_interface.c:1162
-msgid "Sub-tune handling:"
-msgstr "サブチューンの取り扱い:"
-
-#: src/sid/xs_interface.c:1179
-msgid "Use STIL database"
-msgstr "STIL データベースを使う"
-
-#: src/sid/xs_interface.c:1183
-msgid ""
-"If this option is enabled (and the database & HVSC settings below are "
-"correctly set), Audacious-SID will use and display additional information "
-"from STIL database when HVSC SIDs are played."
-msgstr ""
-"有効ならば (かつ, 以下のデータベースと HVSC 設定が正しくなされていれば), "
-"Audacious-SID は HVSC SID が演奏された場合 STIL データベースから追加情報の使"
-"用・表示を行います."
-
-#: src/sid/xs_interface.c:1190
-msgid "STIL file:"
-msgstr "STIL ファイル:"
-
-#: src/sid/xs_interface.c:1206
-msgid ""
-"Path and filename of STIL database file (STIL.txt), usually found from "
-"HVSC's DOCUMENTS-subdirectory."
-msgstr ""
-"STIL データベースファイル (STIL.txt) のパスとファイル名を指定します.通常, "
-"HVSC のドキュメントのサブディレクトリです."
-
-#: src/sid/xs_interface.c:1219
-msgid "Browse for STIL-database file"
-msgstr "STIL データベースファイルを参照"
-
-#: src/sid/xs_interface.c:1246
-msgid "HVSC path:"
-msgstr "HVSC パス:"
-
-#: src/sid/xs_interface.c:1262
-msgid ""
-"Path to base-directory of your High Voltage SID Collection (HVSC), for "
-"example /media/C64Music/"
-msgstr ""
-"High Voltage SID コレクション (HVSC) のベースディレクトリのパスを指定します. "
-"例: /media/C64Music/"
-
-#: src/sid/xs_interface.c:1275
-msgid "Browse for HVSC path"
-msgstr "HVSC パスを参照"
-
-#: src/sid/xs_interface.c:1297
-msgid "SID Tune Information List (STIL) database:"
-msgstr "SID Tune 情報リスト (STIL) データベース:"
-
-#: src/sid/xs_interface.c:1321
-msgid "Cancel any changes"
-msgstr "あらゆる変更を取り消す"
-
-#: src/sid/xs_interface.c:1328
-msgid "Accept and update changes"
-msgstr "変更を承認して更新する"
-
-#: src/sid/xs_interface.c:1628
-msgid "Audacious-SID Fileinfo"
-msgstr "Audacious-SID ファイル情報"
-
-#: src/sid/xs_interface.c:1649
-msgid "Filename:"
-msgstr "ファイル名:"
-
-#: src/sid/xs_interface.c:1657
-msgid "Songname:"
-msgstr "曲名:"
-
-#: src/sid/xs_interface.c:1665
-msgid "Composer:"
-msgstr "作曲者:"
-
-#: src/sid/xs_interface.c:1673
-msgid "Copyright:"
-msgstr "著作権:"
-
-#: src/sid/xs_interface.c:1717
-msgid "Song Information:"
-msgstr "曲情報:"
-
-#: src/sid/xs_interface.c:1752
-msgid "Author:"
-msgstr "作者:"
-
-#: src/sid/xs_interface.c:1786
-msgid "Duration:"
-msgstr "持続時間:"
-
-#: src/sid/xs_interface.c:1820
-msgid "Sub-tune Information:"
-msgstr "サブチューン情報:"
-
-#: src/sid/xs_interface.c:1881
-msgid "Select HVSC song length database"
-msgstr "HVSC 曲の長さデータベースを選択"
-
-#: src/sid/xs_interface.c:1922
-msgid "Select STIL-database"
-msgstr "STIL データベースを選択"
-
-#: src/sid/xs_interface.c:1963
-msgid "Select HVSC location prefix"
-msgstr "HVSC 位置のプレフィックスを選択"
-
-#: src/sid/xs_interface.c:2004
-msgid "Select SIDPlay2 filters file for importing"
-msgstr "インポートする SIDPlay2 フィルタファイルを選択"
-
-#: src/sid/xs_interface.c:2045
-msgid "Select SIDPlay2 filters file for exporting"
-msgstr "エクスポートする SIDPlay2 フィルタファイルを選択"
-
-#: src/sid/xs_interface.c:2093 src/sid/xs_interface.c:2106
-msgid "Confirm selected action"
-msgstr "選択されたアクションの確認"
-
-#: src/sid/xs_interface.c:2123
-msgid "Yes"
-msgstr "はい"
-
-#: src/sid/xs_interface.c:2129
-msgid "No"
-msgstr "いいえ"
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "フォルダを選択"
 
 #: src/skins/plugin.c:167
 msgid "About Skinned GUI"
@@ -2987,46 +2274,43 @@
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
-msgstr ""
-"Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
-"\n"
+msgstr "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n\n"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:207
 msgid "_Player:"
 msgstr "プレイヤ(_P):"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
 msgstr "メインウィンドウで使用するフォントの選択"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
 msgstr "プレイリスト(_P):"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
 msgstr "プレイリストで使用するフォントの選択"
 
-#: src/skins/skins_cfg.c:259
+#: src/skins/skins_cfg.c:215
 msgid "_Fonts"
 msgstr "フォント(_F)"
 
-#: src/skins/skins_cfg.c:261
+#: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "ビットマップフォントを使用する (ASCII のみ対応)"
 
-#: src/skins/skins_cfg.c:263
+#: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "曲のタイトルを両方向にスクロールする"
 
-#: src/skins/skins_cfg.c:346
+#: src/skins/skins_cfg.c:298
 msgid "_Skin"
 msgstr "スキン(_S)"
 
-#: src/skins/skins_cfg.c:393
-#, fuzzy
+#: src/skins/skins_cfg.c:345
 msgid "Interface Preferences"
-msgstr "設定"
+msgstr "インターフェイスの設定"
 
 #: src/skins/ui_equalizer.c:330
 msgid "Preamp"
@@ -3034,77 +2318,101 @@
 
 #: src/skins/ui_equalizer.c:334
 msgid "31 Hz"
-msgstr ""
+msgstr "31 Hz"
 
 #: src/skins/ui_equalizer.c:335
 msgid "63 Hz"
-msgstr ""
+msgstr "63 Hz"
 
 #: src/skins/ui_equalizer.c:335
 msgid "125 Hz"
-msgstr ""
+msgstr "125 Hz"
 
 #: src/skins/ui_equalizer.c:335
-#, fuzzy
 msgid "250 Hz"
-msgstr "22000 Hz "
+msgstr "250 Hz"
 
 #: src/skins/ui_equalizer.c:335
-#, fuzzy
 msgid "500 Hz"
-msgstr "11000 Hz"
+msgstr "500 Hz"
 
 #: src/skins/ui_equalizer.c:335
-#, fuzzy
 msgid "1 kHz"
-msgstr "11 kHz"
+msgstr "1 kHz"
 
 #: src/skins/ui_equalizer.c:336
-#, fuzzy
 msgid "2 kHz"
-msgstr "22 kHz"
+msgstr "2 kHz"
 
 #: src/skins/ui_equalizer.c:336
-#, fuzzy
 msgid "4 kHz"
-msgstr "44 kHz"
+msgstr "4 kHz"
 
 #: src/skins/ui_equalizer.c:336
-#, fuzzy
 msgid "8 kHz"
-msgstr "48 kHz"
+msgstr "8 kHz"
 
 #: src/skins/ui_equalizer.c:336
-#, fuzzy
 msgid "16 kHz"
-msgstr "48 kHz"
+msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:378
+#: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
 msgstr "Audacious イコライザ"
 
-#: src/skins/ui_equalizer.c:884
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
 msgstr "プリセット"
 
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "プリセットの読み込み"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "自動プリセットの読み込み"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "イコライザのプリセットの読み込み"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "プリセットの保存"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "自動プリセットの保存"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "イコライザプリセットの保存"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "プリセットの削除"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "自動プリセットの削除"
+
 #: src/skins/ui_main.c:444
 msgid "kbps"
-msgstr ""
+msgstr "kbps"
 
 #: src/skins/ui_main.c:452
-#, fuzzy
 msgid "kHz"
-msgstr "Hz"
+msgstr "kHz"
 
 #: src/skins/ui_main.c:459
-#, fuzzy
 msgid "surround"
 msgstr "サラウンド"
 
 #: src/skins/ui_main.c:807
-#, fuzzy, c-format
+#, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "移動先: %d:%-2.2d/%d:%-2.2d (%d%%)"
+msgstr "%d:%-2.2d / %d:%-2.2d へシークする"
 
 #: src/skins/ui_main.c:828
 #, c-format
@@ -3145,23 +2453,21 @@
 msgid "Visualization Menu"
 msgstr "視覚化メニュー"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
-msgstr ""
+msgstr "シングルモード"
 
-#: src/skins/ui_main.c:1647
-#, fuzzy
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
-msgstr "プレイリスト"
+msgstr "プレイリストモード"
 
-#: src/skins/ui_main.c:1669
-#, fuzzy
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
-msgstr "現在の曲の後に停止する"
+msgstr "曲の再生後に停止する"
 
-#: src/skins/ui_main.c:1671
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
-msgstr ""
+msgstr "曲の再生後に停止しない"
 
 #: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
@@ -3369,493 +2675,464 @@
 msgstr "プレイリストの削除"
 
 #: src/skins/ui_manager.c:222
-#, fuzzy
 msgid "Import Playlist"
-msgstr "プレイリストの読み込み"
+msgstr "プレイリストのインポート"
 
 #: src/skins/ui_manager.c:223
 msgid "Loads a playlist file into the selected playlist."
-msgstr "選択したプレイリストにプレイリストファイルを読み込みます."
+msgstr "選択したプレイリストにプレイリストファイルを読み込みます。"
 
 #: src/skins/ui_manager.c:226
-#, fuzzy
 msgid "Export Playlist"
-msgstr "プレイリストの読み込み"
+msgstr "プレイリストのエクスポート"
 
 #: src/skins/ui_manager.c:227
 msgid "Saves the selected playlist."
-msgstr "選択したプレイリストを保存します."
+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:235
+#: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
-msgstr "プレイリストのエントリに関連付けられたメタデータを更新します."
+msgstr "プレイリストのエントリに関連付けられたメタデータを更新します。"
 
-#: src/skins/ui_manager.c:238
-msgid "List Manager"
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
 msgstr "プレイリストマネージャ"
 
-#: src/skins/ui_manager.c:239
-msgid "Opens the playlist manager."
-msgstr "プレイリストマネージャを開きます."
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "キューマネージャ"
 
-#: src/skins/ui_manager.c:243
+#: src/skins/ui_manager.c:237
 msgid "View"
 msgstr "表示"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:238
 msgid "Interface"
-msgstr ""
+msgstr "インターフェイス"
 
-#: src/skins/ui_manager.c:245
-#, fuzzy
+#: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
-msgstr "設定"
+msgstr "インターフェイスの設定"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
-msgstr "インターネットアドレスの追加..."
+msgstr "インターネットアドレスの追加"
 
-#: src/skins/ui_manager.c:250
+#: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
-msgstr "リモートトラックをプレイリストに追加します."
+msgstr "リモートトラックをプレイリストに追加します。"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:247
 msgid "Add Files..."
-msgstr "ファイルの追加..."
+msgstr "ファイルの追加"
 
-#: src/skins/ui_manager.c:254
+#: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
 msgstr "ファイルをプレイリストに追加します."
 
-#: src/skins/ui_manager.c:259
+#: src/skins/ui_manager.c:253
 msgid "Search and Select"
 msgstr "検索と選択"
 
-#: src/skins/ui_manager.c:260
+#: src/skins/ui_manager.c:254
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "プレイリストを検索し, 特定の判定基準に基いて選択します."
+msgstr "プレイリストを検索し、検索条件に合うものを選択します。"
 
-#: src/skins/ui_manager.c:263
+#: src/skins/ui_manager.c:257
 msgid "Invert Selection"
 msgstr "選択範囲の反転"
 
-#: src/skins/ui_manager.c:264
+#: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
-msgstr "エントリの選択と未選択を反転します."
+msgstr "エントリの選択と未選択を反転します。"
 
-#: src/skins/ui_manager.c:267
+#: src/skins/ui_manager.c:261
 msgid "Select All"
 msgstr "全て選択"
 
-#: src/skins/ui_manager.c:268
+#: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
-msgstr "プレイリストの全てのエントリを選択します."
+msgstr "プレイリストの全てのエントリを選択します。"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:265
 msgid "Select None"
 msgstr "未選択にする"
 
-#: src/skins/ui_manager.c:272
+#: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
-msgstr "プレイリストの全てのエントリを未選択にします."
+msgstr "プレイリストの全てのエントリを未選択にします。"
 
-#: src/skins/ui_manager.c:277
+#: src/skins/ui_manager.c:271
 msgid "Remove All"
 msgstr "全て削除"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
 msgstr "全てのエントリをプレイリストから削除します."
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:275
 msgid "Clear Queue"
 msgstr "キューのクリア"
 
-#: src/skins/ui_manager.c:282
+#: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
 msgstr "プレイリストに関連付けられたキューをクリアします."
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
-msgstr "利用不可ファイルの削除"
+msgstr "利用できないファイルの削除"
 
-#: src/skins/ui_manager.c:286
+#: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
-msgstr "利用不可ファイルをプレイリストから削除します."
+msgstr "利用できないファイルをプレイリストから削除します。"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
 msgstr "重複エントリの削除"
 
-#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
 msgid "By Title"
 msgstr "タイトル"
 
-#: src/skins/ui_manager.c:292
+#: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
-msgstr "重複するタイトルのエントリをプレイリストから削除します."
+msgstr "重複するタイトルのエントリをプレイリストから削除します。"
 
-#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
-#: src/skins/ui_manager.c:365
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
 msgid "By Filename"
 msgstr "ファイル名"
 
-#: src/skins/ui_manager.c:296
+#: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "重複するファイル名のエントリをプレイリストから削除します."
 
-#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
-#: src/skins/ui_manager.c:369
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
 msgstr "パス名とファイル名"
 
-#: src/skins/ui_manager.c:300
+#: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "重複するパス名とファイル名のエントリをプレイリストから削除します."
+msgstr "重複するパス名とファイル名のエントリをプレイリストから削除します。"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
 msgstr "選択していないエントリの削除"
 
-#: src/skins/ui_manager.c:304
+#: src/skins/ui_manager.c:298
 msgid "Remove unselected entries from the playlist."
-msgstr "選択していないエントリをプレイリストから削除します."
+msgstr "選択していないエントリをプレイリストから削除します。"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:301
 msgid "Remove Selected"
 msgstr "選択したエントリの削除"
 
-#: src/skins/ui_manager.c:308
+#: src/skins/ui_manager.c:302
 msgid "Remove selected entries from the playlist."
-msgstr "選択したエントリをプレイリストから削除します."
+msgstr "選択したエントリをプレイリストから削除します。"
 
-#: src/skins/ui_manager.c:313
+#: src/skins/ui_manager.c:307
 msgid "Randomize List"
 msgstr "プレイリストをランダムにする"
 
-#: src/skins/ui_manager.c:314
+#: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
-msgstr "プレイリストの順序をランダムにします."
+msgstr "プレイリストの順序をランダムにします。"
 
-#: src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:311
 msgid "Reverse List"
 msgstr "プレイリストを逆順にする"
 
-#: src/skins/ui_manager.c:318
+#: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
-msgstr "プレイリストの順序を逆順にします."
+msgstr "プレイリストの順序を逆順にします。"
 
-#: src/skins/ui_manager.c:321
+#: src/skins/ui_manager.c:315
 msgid "Sort List"
 msgstr "プレイリストのソート"
 
-#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
 msgstr "タイトル順でプレイリストをソートします."
 
-#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
-#, fuzzy
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
-msgstr "アルバム名:"
+msgstr "アルバム"
 
-#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
-#, fuzzy
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
-msgstr "タイトル順でプレイリストをソートします."
+msgstr "アルバム順でプレイリストをソートします。"
 
-#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
 msgstr "アーティスト"
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
-msgstr "アーティスト順でプレイリストをソートします."
+msgstr "アーティスト順でプレイリストをソートします。"
 
-#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
-msgstr "ファイル名順でプレイリストをソートします."
+msgstr "ファイル名順でプレイリストをソートします。"
 
-#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
-msgstr "ファイルのパス名でプレイリストをソートします."
+msgstr "ファイルのパス名でプレイリストをソートします。"
 
-#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
 msgstr "日付"
 
-#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
-msgstr "変更時間でプレイリストをソートします."
+msgstr "変更時間でプレイリストをソートします。"
 
-#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
 msgstr "トラック番号"
 
-#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
-msgstr "トラック番号順でプレイリストをソートします."
+msgstr "トラック番号順でプレイリストをソートします。"
 
-#: src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:345
 msgid "Sort Selected"
 msgstr "選択範囲のソート"
 
-#: src/skins/ui_manager.c:387
+#: src/skins/ui_manager.c:381
 msgid "File"
 msgstr "ファイル"
 
-#: src/skins/ui_manager.c:388
-msgid "Help"
-msgstr "ヘルプ"
-
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:384
 msgid "Plugin Services"
 msgstr "プラグインサービス"
 
-#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
-msgstr "トラックの詳細"
+msgstr "トラックの詳細を表示"
 
-#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
-msgstr "トラックの詳細"
+msgstr "トラックの詳細を表示"
 
-#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
 msgstr "Audacious について"
 
-#: src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:395
 msgid "Play File"
-msgstr "ファイルを演奏"
+msgstr "ファイルを再生"
 
-#: src/skins/ui_manager.c:402
+#: src/skins/ui_manager.c:396
 msgid "Load and play a file"
-msgstr "ファイルを読み込んで演奏"
+msgstr "ファイルを読み込んで再生"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:398
 msgid "Play Location"
-msgstr "場所を演奏"
+msgstr "場所を再生"
 
-#: src/skins/ui_manager.c:405
+#: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
-msgstr "選択した場所からメディアを演奏"
+msgstr "選択した場所からメディアを再生"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:401
 msgid "Plugin services"
 msgstr "プラグインサービス"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:403
 msgid "Preferences"
 msgstr "設定"
 
-#: src/skins/ui_manager.c:410
+#: src/skins/ui_manager.c:404
 msgid "Open preferences window"
 msgstr "設定ウィンドウを開く"
 
-#: src/skins/ui_manager.c:413
+#: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
 msgstr "Audacious を終了する"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
 msgstr "A-B をセット"
 
-#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
 msgstr "A-B をクリア"
 
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
-msgid "Jump to Playlist Start"
-msgstr "最初の曲へ移動"
-
-#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
 msgstr "指定した時間へ移動"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
-msgstr "キューを切り替える"
+msgstr "キューをトグルする"
 
-#: src/skins/ui_manager.c:431
+#: src/skins/ui_manager.c:422
 msgid "Enables/disables the entry in the playlist's queue."
-msgstr "プレイリストのキューに入っているエントリの有効/無効を切り替えます."
+msgstr "プレイリストのキューに入っているエントリの有効/無効を切り替えます。"
 
-#: src/skins/ui_manager.c:434
+#: src/skins/ui_manager.c:425
 msgid "Copy"
-msgstr ""
+msgstr "コピー"
 
-#: src/skins/ui_manager.c:436
-#, fuzzy
+#: src/skins/ui_manager.c:427
 msgid "Cut"
-msgstr "カスタム "
+msgstr "切り取り"
 
-#: src/skins/ui_manager.c:438
-#, fuzzy
+#: src/skins/ui_manager.c:429
 msgid "Paste"
-msgstr "最も早い"
+msgstr "貼り付け"
 
-#: src/skins/ui_manager.c:445
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "読み込み"
 
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
-#: src/skins/ui_manager.c:486
+#: src/skins/ui_manager.c:437
+msgid "Import"
+msgstr "インポート"
+
+#: src/skins/ui_manager.c:438
+msgid "Save"
+msgstr "保存"
+
+#: src/skins/ui_manager.c:439
+msgid "Delete"
+msgstr "削除"
+
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
 msgstr "プリセット"
 
-#: src/skins/ui_manager.c:451
-msgid "Load preset"
-msgstr "プリセットの読み込み"
-
-#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
-#: src/skins/ui_manager.c:489
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
 msgstr "自動読み込みのプリセット"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr "自動読み込みのプリセット"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
 msgstr "イコライザにデフォルトプリセットを読み込む"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "ゼロ"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
 msgstr "イコライザプリセットレベルをゼロにセット"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "ファイル"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
 msgstr "ファイルからプリセットを読み込み"
 
-#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
 msgstr "WinAMP EQF ファイル"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
 msgstr "WinAMP EQF ファイルからプリセットを読み込み"
 
-#: src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
 msgstr "WinAMP プリセット"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
 msgstr "WinAMP プリセット"
 
-#: src/skins/ui_manager.c:472
-msgid "Save preset"
-msgstr "プリセットの保存"
-
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:466
 msgid "Save auto-load preset"
 msgstr "自動読み込みのプリセットの保存"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
 msgstr "デフォルトプリセットの保存"
 
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "ファイル"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
 msgstr "プリセットをファイルへ保存"
 
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
 msgstr "WinAMP EQF ファイル"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
 msgstr "プリセットを WinAMP EQF ファイルへ保存"
 
-#: src/skins/ui_manager.c:487
-msgid "Delete preset"
-msgstr "プリセットの削除"
-
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:481
 msgid "Delete auto-load preset"
 msgstr "自動読み込みのプリセットの削除"
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
 msgstr "有効になっているプレイリストのエントリを検索"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular "
-"expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular"
+" expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr ""
-"1つ以上の項目を埋めることによって, プレイリストのエントリを選択します. 項目は"
-"正規表現が使え, 大文字と小文字を区別しません. 正規表現がどのように動作するか"
-"わからない場合は, 単純に検索しようとしているものの文字を入力します."
+msgstr "1つ以上の項目を入力すると、プレイリストのエントリが選択できます。項目には正規表現が使え、大文字と小文字を区別しません。正規表現の動作がわからない場合は、検索したい文字をそのまま入力してください。"
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "タイトル: "
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr "アルバム名: "
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
 msgstr "アーティスト: "
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "ファイル名: "
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
-msgstr "検索前に以前の選択をクリア"
+msgstr "検索前に前回の選択をクリアする"
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
-msgstr "マッチしたエントリのキューを自動的にトグル"
+msgstr "マッチしたエントリのキューを自動的にトグルする"
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
-msgstr "マッチしたエントリで新しいプレイリストを作成"
+msgstr "マッチしたエントリで新しいプレイリストを作成する"
 
-#: src/skins/ui_playlist.c:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
 msgstr "Audacious プレイリストエディタ"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
-msgstr ""
+msgstr "%s (%d / %d)"
 
 #: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
@@ -3865,115 +3142,66 @@
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Unarchived Winamp 2.x スキン"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "ディレクトリ (%s) を作成できませんでした: %s\n"
 
-#: src/sndfile/plugin.c:438
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
 msgstr "sndfile プラグインについて"
 
-#: src/sndfile/plugin.c:439
-msgid ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-msgstr ""
-"Tony Vroon <chainsaw@gentoo.org> による xmms_sndfile プラグインの\n"
-"Audacious への適応:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"このプログラムはフリーソフトウェアです;\n"
-"フリーソフトウェア財団が提供する GNU 一般公有使用許諾契約書\n"
-"の第二版, あるいはそれ以降の版が定める条項の下で\n"
-"本プログラムを再頒布または変更することができます.\n"
-"\n"
-"本プログラムは有用とは思いますが,\n"
-"頒布にあたっては, 市場性及び特定目的, 適合性についての\n"
-"暗黙の保証を含めて, いかなる保証も行ないません.\n"
-"詳細については GNU 一般公有使用許諾契約書をご覧下さい.\n"
-"\n"
-"あなたは, 本プログラムと一緒に\n"
-"GNU 一般公有使用許諾契約書の写しを受け取っているはずです.\n"
-"そうでない場合は, the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA へ手紙を書いて下さい."
-
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "SndStretch について"
 
-#: src/sndstretch/sndstretch_xmms.c:313
+#: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
 msgstr "音量補正"
 
-#: src/sndstretch/sndstretch_xmms.c:314
+#: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
 msgstr "一部重ね合わせ"
 
-#: src/sndstretch/sndstretch_xmms.c:360
+#: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
 msgstr "スピード"
 
-#: src/sndstretch/sndstretch_xmms.c:361
+#: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
 msgstr "ピッチ"
 
-#: src/sndstretch/sndstretch_xmms.c:362
+#: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
 msgstr "スケール"
 
-#: src/sndstretch/sndstretch_xmms.c:363
-msgid "Options"
-msgstr "オプション"
-
-#: src/sndstretch/sndstretch_xmms.c:382
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - 設定"
 
-#: src/song_change/song_change.c:464
+#: src/song_change/song_change.c:437
 msgid "Command to run when Audacious starts a new song."
-msgstr "Audacious が新しい曲を開始したときに実行するコマンド"
+msgstr "新しい曲を再生したときに実行するコマンド"
 
-#: src/song_change/song_change.c:465 src/song_change/song_change.c:469
-#: src/song_change/song_change.c:473 src/song_change/song_change.c:477
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
 msgstr "コマンド:"
 
-#: src/song_change/song_change.c:468
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
-msgstr "曲の終わりで実行するコマンド."
+msgstr "曲の再生が終わったときに実行するコマンド"
 
-#: src/song_change/song_change.c:472
+#: src/song_change/song_change.c:449
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Audacious がプレイリストの最後に到達したときに実行するコマンド."
+msgstr "プレイリストの最後に到達したときに実行するコマンド"
 
-#: src/song_change/song_change.c:476
+#: src/song_change/song_change.c:455
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr ""
-"例えばネットワークストリームのタイトルなど, 曲のタイトルが変わったときに実行"
-"するコマンド."
+msgstr "曲のタイトルが変わったときに実行するコマンド (ネットワークストリームのタイトルなど)"
 
-#: src/song_change/song_change.c:480
-#, fuzzy
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3990,42 +3218,27 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr ""
-"コマンドを呼び出す前に置換される以下のフォーマット文字列を利用できます(プレイ"
-"リストの最後のコマンドにはすべてが有効ではありせん).\n"
-"\n"
-"%%F: 周波数 (ヘルツ)\n"
-"%%c: チャンネル数\n"
-"%%f: ファイル名 (フルパス)\n"
-"%%l: 長さ (ミリ秒)\n"
-"%%n または %%s: 曲名\n"
-"%%r: レート (ビット毎秒)\n"
-"%%t: プレイリストの位置 (%%02d)\n"
-"%%p: 現在演奏中か (1 or 0)"
+msgstr "以下のフォーマット文字列を使用できます。これらは、\nコマンドの実行前に置換されます。ただしプレイリスト\nの最後に到達したときに実行するコマンドにとっては意\n味のないものもあります。\n\n%F: サンプリング周波数 (Hz)\n%c: チャンネル数\n%f: ファイルネーム (フルパス)\n%l: 曲の長さ (ms)\n%n, %s: カスタムタイトル\n%r: ビットレート (bps)\n%t: プレイリストでの位置 (%02d)\n%p: 再生中？ (1 または 0)\n%a: アーティスト\n%b: アルバム\n%T: 曲のタイトル"
 
-#: src/song_change/song_change.c:507
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr ""
-"シェルに渡されるパラメータはクォートでくくられるべきです."
-"さもないとセキュリティ上の危険があります."
+msgstr "シェルに渡されるパラメータはクォートでくくってください。そうしない場合、セキュリティ上の危険があります。"
 
-#: src/song_change/song_change.c:518
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr "コマンド"
 
-#: src/song_change/song_change.c:555
-#, fuzzy
+#: src/song_change/song_change.c:529
 msgid "Song Change"
-msgstr "曲メッセージ"
+msgstr ""
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr "ステータスアイコン プラグインについて"
 
-#: src/statusicon/statusicon.c:379
-#, fuzzy
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -4034,126 +3247,98 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager.\n"
-msgstr ""
-"\n"
-"Giacomo Lozito < james@develia.org > によって書かれた\n"
-"\n"
-"このプラグインは, ウィンドウマネージャの\n"
-"システムトレイエリアに置かれるステータスアイコンを提供します.\n"
+msgstr "ステータスアイコン プラグイン\n\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nこのプラグインは、ウィンドウマネージャのシステム\nトレイエリアに、ステータスアイコンを表示します。\n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr "ステータスアイコンプラグイン - 設定"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr "右クリックメニュー"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
-msgstr "小型再生メニュー #1"
+msgstr "ミニ再生メニュー #1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
-msgstr "小型再生メニュー #2"
+msgstr "ミニ再生メニュー #2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr "マウススクロールの動作"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "音量の変更"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
-msgstr "演奏曲の変更"
+msgstr "再生曲の変更"
 
-#: src/statusicon/statusicon.c:500
-#, fuzzy
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
-msgstr "ミキサ設定"
+msgstr "その他の設定"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
-msgstr ""
+msgstr "ポップアップウィンドウを無効にする"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:41
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr ""
+
+#: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
-msgstr ""
-"エクストラステレオプラグイン\n"
-"\n"
-"1999. Johan Levin による"
+msgstr "エクストラステレオプラグイン\n\n1999. Johan Levin による"
 
-#: src/stereo_plugin/stereo.c:65
+#: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
 msgstr "エクストラステレオプラグインについて"
 
-#: src/stereo_plugin/stereo.c:102
+#: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
 msgstr "エクストラステレオの設定"
 
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr "トーンジェネレータについて"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
-msgstr ""
-"Haavard Kvaalen <havardk@xmms.org> によるサイントーンジェネーレータ\n"
-"Daniel J. Peng <danielpeng@bigfoot.com> による修正\n"
-"\n"
-"URLに tone://frequency1;frequency2;frequency3;... と追加して使用します\n"
-"例 tone://2000;2005 は 2000Hz トーンと 2005Hz トーンを演奏します"
+msgstr "Haavard Kvaalen <havardk@xmms.org> によるサイントーンジェネーレータ\nDaniel J. Peng <danielpeng@bigfoot.com> による修正\n\nURLに tone://frequency1;frequency2;frequency3;... と追加して使用します\n例 tone://2000;2005 は 2000Hz トーンと 2005Hz トーンを演奏します"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr "トーンジェネレータ: "
 
 #: src/unix-io/gtk.c:34
-#, fuzzy
 msgid "About File I/O Plugin"
-msgstr "ESounD プラグインについて"
-
-#: src/vorbis/configure.c:31
-msgid "Override generic titles"
-msgstr "オリジナルのタイトルを上書きする"
-
-#: src/vorbis/configure.c:32
-msgid "Title format:"
-msgstr "タイトルの書式:"
-
-#: src/vorbis/configure.c:36
-#, fuzzy
-msgid "Ogg Vorbis Tags"
-msgstr "Ogg Vorbis タグ:"
-
-#: src/vorbis/configure.c:69
-msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr "Ogg Vorbis オーディオプラグインの設定"
+msgstr "ファイル I/O プラグインについて"
 
-#: src/vorbis/vorbis.c:581
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Ogg Vorbis オーディオ プラグインについて"
 
-#: src/vorbis/vorbis.c:586
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -4170,22 +3355,7 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>\n"
 "\n"
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
-msgstr ""
-"Xiph.org Foundation による Ogg Vorbis プラグイン\n"
-"\n"
-"オリジナルのコード:\n"
-"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-"貢献者:\n"
-"Chris Montgomery <monty@xiph.org>\n"
-"Peter Alm <peter@xmms.org>\n"
-"Michael Smith <msmith@labyrinth.edu.au>\n"
-"Jack Moffitt <jack@icecast.org>\n"
-"Jorn Baayen <jorn@nl.linux.org>\n"
-"Haavard Kvaalen <havardk@xmms.org>\n"
-"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-"Eugene Zagidullin <e.asphyx@gmail.com>\n"
-"\n"
-"Xiph.org Foundation <http://www.xiph.org/> もご覧下さい.\n"
+msgstr "Xiph.org Foundation による Ogg Vorbis プラグイン\n\nオリジナルのコード:\nTony Arcieri <bascule@inferno.tusculum.edu>\n貢献者:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHaavard Kvaalen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\nXiph.org Foundation <http://www.xiph.org/> もご覧ください。\n"
 
 #: src/vtx/about.c:14
 msgid "About Vortex Player"
@@ -4194,22 +3364,13 @@
 #: src/vtx/about.c:15
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
-"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor."
-"ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "\n"
 "Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
 "and other AY/YM music sites.\n"
 "\n"
 "Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr ""
-"Sashnov Alexander <sashnov@ngs.ru> による Vortex ファイルフォーマットプレイ"
-"ヤ\n"
-"Roman Sherbakov <v_soft@microfor.ru> の in_vtx.dll をオリジナルソースとする\n"
-"\n"
-"vtx フォーマットの音楽は http://vtx.microfor.ru/music.htm や\n"
-"他の AY/YM 音楽サイトで見つけられます.\n"
-"\n"
-"Audacious 実装は Pavel Vymetalek <pvymetalek@seznam.cz> による"
+msgstr "Sashnov Alexander <sashnov@ngs.ru> による Vortex ファイル形式プレイヤです。\nRoman Sherbakov <v_soft@microfor.ru> の in_vtx.dll がオリジナルソースです。\n\nvtx フォーマットの音楽は http://vtx.microfor.ru/music.htm や\n他の AY/YM 音楽サイトで見つけられます。\n\nAudacious の実装は、Pavel Vymetalek <pvymetalek@seznam.cz> が行いました。"
 
 #: src/wavpack/wavpack.c:353
 #, c-format
@@ -4222,2875 +3383,4 @@
 "\n"
 "Some of the plugin code was by Miles Egan\n"
 "Visit the Wavpack site at http://www.wavpack.com/\n"
-msgstr ""
-"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
-"\n"
-"プラグインコードの一部は 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 "
-#~ "audio card provides a hardware synth and you want to play MIDI with it, "
-#~ "you'll probably want to select the wavetable synthesizer ports."
-#~ msgstr ""
-#~ "* ALSA 出力ポートを選択してください *\n"
-#~ "MIDI イベントはここで選択されたポートに送られます. 例えば, あなたのオー"
-#~ "ディオカードがハードウェアシンセを提供し, それで MIDI を演奏したいならば, "
-#~ "ウェーブテーブルシンセサイザーポートを選ぶとよいでしょう."
-
-#~ msgid ""
-#~ "* Select ALSA mixer card *\n"
-#~ "The ALSA backend outputs directly through ALSA, it doesn't use effect and "
-#~ "ouput plugins from the player. During playback, the player volumeslider "
-#~ "will manipulate the mixer control you select here. If you're using "
-#~ "wavetable synthesizer ports, you'll probably want to select the Synth "
-#~ "control here."
-#~ msgstr ""
-#~ "* ALSA ミキサカードを選択してください *\n"
-#~ "ALSA バックエンドは ALSA を直接通して出力しますので, プレイヤのエフェクト"
-#~ "や出力プラグインは使用しません. 再生中, プレイヤのボリュームスライダはここ"
-#~ "で選択したミキサコントロールを操作します. ウェーブテーブルシンセサイザー"
-#~ "ポートを使っているならば, ここでシンセコントロールを選ぶとよいでしょう."
-
-#~ msgid ""
-#~ "* Select ALSA mixer control *\n"
-#~ "The ALSA backend outputs directly through ALSA, it doesn't use effect and "
-#~ "ouput plugins from the player. During playback, the player volume slider "
-#~ "will manipulate the mixer control you select here. If you're using "
-#~ "wavetable synthesizer ports, you'll probably want to select the Synth "
-#~ "control here."
-#~ msgstr ""
-#~ "* ALSA ミキサコントロールを選択してください *\n"
-#~ "ALSA バックエンドは ALSA を直接通して出力しますので, プレイヤのエフェクト"
-#~ "や出力プラグインは使用しません. 再生中, プレイヤのボリュームスライダはここ"
-#~ "で選択したミキサコントロールを操作します. ウェーブテーブルシンセサイザー"
-#~ "ポートを使っているならば, ここでシンセコントロールを選ぶとよいでしょう."
-
-#~ msgid ""
-#~ "* Backend selection *\n"
-#~ "AMIDI-Plug works with backends, in a modular fashion; here you should "
-#~ "select your backend; that is, the way MIDI events are going to be handled "
-#~ "and played.\n"
-#~ "If you have a hardware synthesizer on your audio card, and ALSA supports "
-#~ "it, you'll want to use the ALSA backend. It can also be used with "
-#~ "anything that provides an interface to the ALSA sequencer, including "
-#~ "software synths or external devices.\n"
-#~ "If you want to rely on a software synthesizer and/or want to pipe audio "
-#~ "into effect and output plugins of the player you'll want to use the good "
-#~ "FluidSynth backend.\n"
-#~ "Press the info button to read specific information about each backend."
-#~ msgstr ""
-#~ "* バックエンドを選択してください *\n"
-#~ "AMIDI-Plug はモジュール形式のバックエンドと動作します. ここでバックエンド"
-#~ "を選択してください. それによって, MIDI イベントは取り扱われ, 演奏されま"
-#~ "す.\n"
-#~ "あなたのオーディオカードにハードウェアシンセサイザーがついていて, ALSA が"
-#~ "それをサポートしているならば, ALSA バックエンドを使うとよいでしょう.これは"
-#~ "ソフトウェアシンセや外部デバイスを含む, ALSA シーケンサへのインターフェイ"
-#~ "スを提供するあらゆるものを用いることができます.\n"
-#~ "ソフトウェアシンセサイザーを当てにしたい, およびオーディオをプレイヤのエ"
-#~ "フェクトや出力プラグインに通したいならば, 有用な FluidSynth バックエンドを"
-#~ "用いるとよいでしょう.\n"
-#~ "それぞれのバックエンドの特定の情報を読むには情報ボタンを押してください."
-
-#, fuzzy
-#~ msgid ""
-#~ "* Transpose function *\n"
-#~ "This option allows you to play the midi file transposed in a different "
-#~ "key, by shifting of the desired number of semitones all its notes "
-#~ "(excepting those on midi channel 10, reserved for percussions). "
-#~ "Especially useful if you wish to sing or play along with another "
-#~ "instrument."
-#~ msgstr ""
-#~ "* トランスポーズ機能 *\n"
-#~ "このオプションは MIDI ファイルを, 全ての音(パーカッションのために予約され"
-#~ "た MIDI チャンネル 10 を除く)の半音を要求された数で変化させた異なるキー"
-#~ "で, トランスポーズして演奏できるようにします.他の楽器を加えて演奏させたい"
-#~ "ならば非常に有用です."
-
-#~ msgid ""
-#~ "* Drumshift function *\n"
-#~ "This option allows you to shift notes on midi channel 10 (the standard "
-#~ "percussions channel) of the desired number of semitones. This results in "
-#~ "different drumset and percussions being used during midi playback, so if "
-#~ "you wish to enhance (or reduce, or alter) percussion sounds, try to play "
-#~ "with this value."
-#~ msgstr ""
-#~ "* ドラムシフト機能 *\n"
-#~ "このオプションは, MIDI チャンネル 10 (標準のパーカッションチャンネル) の半"
-#~ "音を要求された数で変化させるようにします. MIDI の演奏中に異なるドラムセッ"
-#~ "トとパーカッションが用いられることにより, この値を用いて演奏することによ"
-#~ "り, パーカッションの音を高める (または弱める, または変える) ことができま"
-#~ "す."
-
-#~ msgid ""
-#~ "* Pre-calculate MIDI length *\n"
-#~ "If this option is enabled, AMIDI-Plug will calculate the MIDI file length "
-#~ "as soon as the player requests it, instead of doing that only when the "
-#~ "MIDI file is being played. In example, MIDI length will be calculated "
-#~ "straight after adding MIDI files in a playlist. Disable this option if "
-#~ "you want faster playlist loading (when a lot of MIDI files are added), "
-#~ "enable it to display more information in the playlist straight after "
-#~ "loading."
-#~ msgstr ""
-#~ "* MIDI 長を前もって計算 *\n"
-#~ "このオプションが有効ならば, AMIDI-Plug は MIDI ファイルの長さを, MIDI ファ"
-#~ "イルが演奏されようとしたときだけではなく, プレイヤが要求したときすぐに計算"
-#~ "します. 例えば, MIDI ファイルがプレイリスト中に追加された直後に MIDI 長を"
-#~ "計算します. (多くの MIDI ファイルが追加されているとき) プレイリストの読み"
-#~ "込みを早くしたいならば, このオプションを無効にします.プレイリストを読み込"
-#~ "んだ直後により多くの情報を表示させたいならば, 有効にします. "
-
-#~ msgid ""
-#~ "* Extract comments from MIDI files *\n"
-#~ "Some MIDI files contain text comments (author, copyright, instrument "
-#~ "notes, etc.). If this option is enabled, AMIDI-Plug will extract and "
-#~ "display comments (if available) in the file information dialog."
-#~ msgstr ""
-#~ "* MIDI ファイルからコメントを抽出 *\n"
-#~ "MIDI ファイルはテキストコメント(作者, 著作権情報, 楽譜など)を含んでいるこ"
-#~ "とがあります. このオプションが有効ならば, AMIDI-Plug はコメントを抽出し, "
-#~ "ファイル情報ダイアログ内に表示します (可能ならば)."
-
-#~ msgid ""
-#~ "* Extract lyrics from MIDI files *\n"
-#~ "Some MIDI files contain song lyrics. If this option is enabled, AMIDI-"
-#~ "Plug will extract and display song lyrics (if available) in the file "
-#~ "information dialog."
-#~ msgstr ""
-#~ "* MIDI ファイルから歌詞を抽出 *\n"
-#~ "MIDI ファイルは歌詞を含んでいることがあります. このオプションが有効なら"
-#~ "ば, AMIDI-Plug は歌詞を抽出し, ファイル情報ダイアログ内に表示します (可能"
-#~ "ならば)."
-
-#~ msgid ""
-#~ "* Select SoundFont files *\n"
-#~ "In order to play MIDI with FluidSynth, you need to specify at least one "
-#~ "valid SoundFont file here (use absolute paths). The loading order is from "
-#~ "the top (first) to the bottom (last)."
-#~ msgstr ""
-#~ "* サウンドフォント ファイルの選択 *\n"
-#~ "FluidSynth で MIDI を演奏するには, ここで少なくとも1つの有効なサウンドフォ"
-#~ "ント ファイルを絶対パスで指定する必要があります. 読み込み順序は上(先)から"
-#~ "下(後)になります."
-
-#~ msgid ""
-#~ "* Load SoundFont on player start *\n"
-#~ "Depending on your system speed, SoundFont loading in FluidSynth will "
-#~ "require up to a few seconds. This is a one-time task (the soundfont will "
-#~ "stay loaded until it is changed or the backend is unloaded) that can be "
-#~ "done at player start, or before the first MIDI file is played (the latter "
-#~ "is a better choice if you don't use your player to listen MIDI files "
-#~ "only)."
-#~ msgstr ""
-#~ "* サウンドフォントをプレイヤ起動時に読み込む *\n"
-#~ "システムの速さによりますが, FluidSynth でのサウンドフォントの読み込みには"
-#~ "数分かかります. これはプレイヤの起動時か, 最初の MIDI ファイルが演奏される"
-#~ "前に一度だけ行われます. MIDI ファイルを聴くことだけにプレイヤを使うのでな"
-#~ "ければ, 後者を選択するのがよいでしょう. (サウンドフォントは, それが変更さ"
-#~ "えるかバックエンドが取り外されるまで, 読み込まれたままです). "
-
-#~ msgid ""
-#~ "* Load SoundFont on first midifile play *\n"
-#~ "Depending on your system speed, SoundFont loading in FluidSynth will "
-#~ "require up to a few seconds. This is a one-time task (the soundfont will "
-#~ "stay loaded until it is changed or the backend is unloaded) that can be "
-#~ "done at player start, or before the first MIDI file is played (the latter "
-#~ "is a better choice if you don't use your player to listen MIDI files "
-#~ "only)."
-#~ msgstr ""
-#~ "* サウンドフォントを最初の MIDI ファイル演奏時に読み込む *\n"
-#~ "システムの速さによりますが, FluidSynth でのサウンドフォントの読み込みには"
-#~ "数分かかります. これはプレイヤの起動時か, 最初の MIDI ファイルが演奏される"
-#~ "前に一度だけ行われます. MIDI ファイルを聴くことだけにプレイヤを使うのでな"
-#~ "ければ, 後者を選択するのがよいでしょう. (サウンドフォントは, それが変更さ"
-#~ "えるかバックエンドが取り外されるまで, 読み込まれたままです). "
-
-#~ msgid ""
-#~ "* Synthesizer gain *\n"
-#~ "From FluidSynth docs: the gain is applied to the final or master output "
-#~ "of the synthesizer; it is set to a low value by default to avoid the "
-#~ "saturation of the output when random MIDI files are played."
-#~ msgstr ""
-#~ "* シンセサイザーゲイン *\n"
-#~ "FluidSynth の文書より: ゲインはシンセサイザーの最後かマスタ出力に適用され"
-#~ "ます. ランダムな MIDI ファイルが演奏されるときに, 出力の飽和を避けるため, "
-#~ "デフォルトでは低い値に設定されています. "
-
-#~ msgid ""
-#~ "* Synthesizer polyphony *\n"
-#~ "From FluidSynth docs: the polyphony defines how many voices can be played "
-#~ "in parallel; the number of voices is not necessarily equivalent to the "
-#~ "number of notes played simultaneously; indeed, when a note is struck on a "
-#~ "specific MIDI channel, the preset on that channel may create several "
-#~ "voices, for example, one for the left audio channel and one for the right "
-#~ "audio channels; the number of voices activated depends on the number of "
-#~ "instrument zones that fall in the correspond to the velocity and key of "
-#~ "the played note."
-#~ msgstr ""
-#~ "* シンセサイザーポリフォニー *\n"
-#~ "FluidSynth の文書より: ポリフォニーはどれだけの音声が並行に演奏されるかを"
-#~ "定義します. 音声の数は, 同時に演奏される音の数と同じである必要はありませ"
-#~ "ん. 実際は, ある音が特定の MIDI チャンネルで鳴らされたとき, そのチャンネル"
-#~ "のプリセットは, 例えば, 一つは左のオーディオチャンネルに, 一つは右のオー"
-#~ "ディオチャンネルに, いくつかの音声を生成します. 生成された音声の数は, 演奏"
-#~ "された音の高さとキーに対応している楽器の数に依存します. "
-
-#~ msgid ""
-#~ "* Synthesizer reverb *\n"
-#~ "From FluidSynth docs: when set to \"yes\" the reverb effects module is "
-#~ "activated; note that when the reverb module is active, the amount of "
-#~ "signal sent to the reverb module depends on the \"reverb send\" generator "
-#~ "defined in the SoundFont."
-#~ msgstr ""
-#~ "* シンセサイザーリバーブ *\n"
-#~ "FluidSynth の文書より: \"はい\" に設定するとリバーブエフェクトモジュールが"
-#~ "有効になります. リバーブモジュールが有効なときは, 多数のシグナルがサウンド"
-#~ "フォントで定義された \"リバーブ センド\" ジェネレータに依存しているリバー"
-#~ "ブモジュールに送られることに注意してください. "
-
-#~ msgid ""
-#~ "* Synthesizer chorus *\n"
-#~ "From FluidSynth docs: when set to \"yes\" the chorus effects module is "
-#~ "activated; note that when the chorus module is active, the amount of "
-#~ "signal sent to the chorus module depends on the \"chorus send\" generator "
-#~ "defined in the SoundFont."
-#~ msgstr ""
-#~ "* シンセサイザーコーラス *\n"
-#~ "FluidSynth の文書より: \"はい\" に設定するとコーラスエフェクトモジュールが"
-#~ "有効になります. コーラスモジュールが有効なときは, 多数のシグナルがサウンド"
-#~ "フォントで定義された \"コーラス センド\" ジェネレータに依存しているコーラ"
-#~ "スモジュールに送られることに注意してください. "
-
-#, fuzzy
-#~ msgid ""
-#~ "* Synthesizer samplerate *\n"
-#~ "The sample rate of the audio generated by the synthesizer. You can also "
-#~ "specify a custom value in the interval 22050Hz-96000Hz."
-#~ msgstr ""
-#~ "* シンセサイザーサンプリングレート *\n"
-#~ "シンセサイザーで生成されたオーディオのサンプリングレートです. "
-#~ "22050Hz-96000Hz の間でカスタム値を指定することもできます.\n"
-#~ "注意: デフォルトのバッファパラメータは 44100Hz に設定されています. サンプ"
-#~ "リングレートを変更したら, よい音質を得るために, バッファパラメータのチュー"
-#~ "ニングが必要になります. "
-
-#~ msgid ""
-#~ "If enabled, the extension from the original filename will not be stripped "
-#~ "before adding the new file extension to the end."
-#~ msgstr ""
-#~ "これを有効にすると, 新しいファイル拡張子を末尾につけるより先に, 元のファイ"
-#~ "ル名の拡張子は取り除かれません."
-
-#~ msgid ""
-#~ "best/slowest:0;\n"
-#~ "worst/fastest:9;\n"
-#~ "recommended:2;\n"
-#~ "default:5;"
-#~ msgstr ""
-#~ "最高品質/最低速:0;\n"
-#~ "最低品質/最高速:9;\n"
-#~ "推奨:2;\n"
-#~ "デフォルト:5;"
-
-#~ msgid "Adds 16 bit checksum to every frame"
-#~ msgstr "すべてのフレームに 16 ビットチェックサムを付加する"
-
-#~ msgid "Variable bitrate"
-#~ msgstr "可変ビットレート"
-
-#~ msgid "Average bitrate"
-#~ msgstr "平均ビットレート"
-
-#~ msgid ""
-#~ "For use with players that do not support low bitrate mp3 (Apex AD600-A "
-#~ "DVD/mp3 player)"
-#~ msgstr ""
-#~ "低いビットレートの mp3 をサポートしないプレイヤ (Apex AD600-A DVD/mp3 "
-#~ "player)のために使います"
-
-#~ msgid ""
-#~ "highest:0;\n"
-#~ "lowest:9;\n"
-#~ "default:4;"
-#~ msgstr ""
-#~ "最高:0;\n"
-#~ "最低:9;\n"
-#~ "デフォルト:4;"
-
-#, fuzzy
-#~ msgid "Show playlists"
-#~ msgstr "プレイリストエディタを表示する"
-
-#, fuzzy
-#~ msgid "Show/hide playlists"
-#~ msgstr "プレイリストの保存"
-
-#~ msgid "About the Sun Driver"
-#~ msgstr "Sun ドライバについて"
-
-#~ msgid ""
-#~ "XMMS BSD Sun Driver\n"
-#~ "\n"
-#~ "Copyright (c) 2001 CubeSoft Communications, Inc.\n"
-#~ "Maintainer: <vedge at csoft.org>.\n"
-#~ msgstr ""
-#~ "XMMS BSD Sun ドライバ\n"
-#~ "\n"
-#~ "Copyright (c) 2001 CubeSoft Communications, Inc.\n"
-#~ "メンテナ: <vedge at csoft.org>.\n"
-
-#~ msgid "Audio control device:"
-#~ msgstr "オーディオコントロールデバイス:"
-
-#~ msgid "Buffer size (ms):"
-#~ msgstr "バッファのサイズ (ミリ秒):"
-
-#~ msgid "Volume controls device:"
-#~ msgstr "音量コントロールデバイス:"
-
-#~ msgid "XMMS uses mixer exclusively."
-#~ msgstr "ミキサを排他的に使う"
-
-#~ msgid "Sun driver configuration"
-#~ msgstr "Sun ドライバの設定"
-
-#, fuzzy
-#~ msgid "Target volume:"
-#~ msgstr "音量の変更"
-
-#, fuzzy
-#~ msgid "Effect strength:"
-#~ msgstr "エフェクトの強さ:"
-
-#~ msgid "FLAC Audio Plugin "
-#~ msgstr "FLAC オーディオ プラグイン"
-
-#, fuzzy
-#~ msgid "Stream browser"
-#~ msgstr "参照"
-
-#, fuzzy
-#~ msgid "Streambrowser"
-#~ msgstr "参照"
-
-#~ msgid "PREAMP"
-#~ msgstr "プリアンプ"
-
-#~ msgid "60HZ"
-#~ msgstr "60HZ"
-
-#~ msgid "170HZ"
-#~ msgstr "170HZ"
-
-#~ msgid "310HZ"
-#~ msgstr "310HZ"
-
-#~ msgid "600HZ"
-#~ msgstr "600HZ"
-
-#~ msgid "1KHZ"
-#~ msgstr "1KHZ"
-
-#~ msgid "3KHZ"
-#~ msgstr "3KHZ"
-
-#~ msgid "6KHZ"
-#~ msgstr "6KHZ"
-
-#~ msgid "12KHZ"
-#~ msgstr "12KHZ"
-
-#~ msgid "14KHZ"
-#~ msgstr "14KHZ"
-
-#~ msgid "16KHZ"
-#~ msgstr "16KHZ"
-
-#~ msgid "Audacious standard menu"
-#~ msgstr "Audacious 標準メニュー"
-
-#~ msgid "Surround echo"
-#~ msgstr "サラウンドエコー"
-
-#~ msgid "About ESounD Plugin"
-#~ msgstr "ESounD プラグインについて"
-
-#~ msgid ""
-#~ "Audacious ESounD Plugin\n"
-#~ "\n"
-#~ " This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Audacious ESounD プラグイン\n"
-#~ "\n"
-#~ "このプログラムはフリーソフトウェアです;\n"
-#~ "フリーソフトウェア財団が提供する GNU 一般公有使用許諾契約書\n"
-#~ "の第二版, あるいはそれ以降の版が定める条項の下で\n"
-#~ "本プログラムを再頒布または変更することができます.\n"
-#~ "\n"
-#~ "本プログラムは有用とは思いますが,\n"
-#~ "頒布にあたっては, 市場性及び特定目的, 適合性についての\n"
-#~ "暗黙の保証を含めて, いかなる保証も行ないません.\n"
-#~ "詳細については GNU 一般公有使用許諾契約書をご覧下さい.\n"
-#~ "\n"
-#~ "あなたは, 本プログラムと一緒に GNU 一般公有使用許諾契約書の\n"
-#~ "写しを受け取っているはずです. そうでない場合は, the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA.へ手紙を書いて下さい."
-
-#~ msgid "ESD Output Plugin configuration"
-#~ msgstr "ESD 出力プラグインの設定"
-
-#~ msgid "Host:"
-#~ msgstr "ホスト名:"
-
-#~ msgid "Use remote host"
-#~ msgstr "リモートホストを利用する"
-
-#~ msgid "Volume controls OSS mixer"
-#~ msgstr "音量の調整は OSS ミキサを使用する"
-
-#~ msgid "Port:"
-#~ msgstr "ポート番号:"
-
-#~ msgid "Server"
-#~ msgstr "サーバ"
-
-#~ msgid "Load List"
-#~ msgstr "プレイリストの読み込み"
-
-#~ msgid "Save List"
-#~ msgstr "プレイリストの保存"
-
-#, fuzzy
-#~ msgid "About RoarAudio Plugin"
-#~ msgstr "FLAC オーディオプラグインについて"
-
-#, fuzzy
-#~ msgid "RoarAudio Audacious Plugin..."
-#~ msgstr "LIRC Audacious プラグインについて"
-
-#, fuzzy
-#~ msgid "RoarAudio Plugin - Configuration"
-#~ msgstr "CD オーディオプラグインの設定"
-
-#, fuzzy
-#~ msgid "Server Type:"
-#~ msgstr "サーバ: "
-
-#, fuzzy
-#~ msgid "Host:"
-#~ msgstr "フォント(_F)"
-
-#, fuzzy
-#~ msgid "Proxy Address"
-#~ msgstr "デバイスアドレス"
-
-#, fuzzy
-#~ msgid "Proxy"
-#~ msgstr "Gerpok"
-
-#, fuzzy
-#~ msgid "Player Name:"
-#~ msgstr "プレイヤ(_P):"
-
-#, fuzzy
-#~ msgid "Player"
-#~ msgstr "名前: "
-
-#, fuzzy
-#~ msgid "Current Song"
-#~ msgstr "動作:"
-
-#~ msgid ""
-#~ "<big>Unable to save playlist.</big>\n"
-#~ "\n"
-#~ "Unknown file type for '%s'.\n"
-#~ msgstr ""
-#~ "<big>プレイリストを保存できません!</big>\n"
-#~ "\n"
-#~ "%s のファイルの種類が不明です.\n"
-
-#, fuzzy
-#~ msgid "ALSA Gapless Output Plugin Preferences"
-#~ msgstr "ステータスアイコンプラグイン - 設定"
-
-#~ msgid "Dummy Backend "
-#~ msgstr "ダミーバックエンド"
-
-#~ msgid ""
-#~ "This backend does not produce audio at all. It is mostly useful for "
-#~ "analysis and testing purposes, as it can log all MIDI events to standard "
-#~ "output, standard error or file.\n"
-#~ "Backend written by Giacomo Lozito."
-#~ msgstr ""
-#~ "このバックエンドはオーディオを全く生成しません. これは全ての MIDI イベント"
-#~ "を標準出力, 標準エラー出力, ファイルにロギングできるので, 解析やテスト目的"
-#~ "にとても有用です.\n"
-#~ "バックエンドは Giacomo Lozito によって書かれました."
-
-#~ msgid "AMIDI-Plug message"
-#~ msgstr "AMIDI-Plug メッセージ"
-
-#~ msgid "Please stop the player before changing AMIDI-Plug settings."
-#~ msgstr "AMIDI-Plug 設定を変更する前にプレイヤを停止してください."
-
-#~ msgid "DUMMY BACKEND CONFIGURATION"
-#~ msgstr "ダミーバックエンド設定"
-
-#~ msgid "MIDI logger settings"
-#~ msgstr "MIDI ロガー設定"
-
-#~ msgid "Do not log anything"
-#~ msgstr "何も記録しない"
-
-#~ msgid "Log MIDI events to standard output"
-#~ msgstr "MIDI イベントを標準出力に記録する"
-
-#~ msgid "Log MIDI events to standard error"
-#~ msgstr "MIDI イベントを標準エラー出力に記録する"
-
-#~ msgid "Log MIDI events to file"
-#~ msgstr "MIDI イベントをファイルに記録する"
-
-#~ msgid "Logfile settings"
-#~ msgstr "ログファイル設定"
-
-#~ msgid "Use a single file to log everything (rewrite)"
-#~ msgstr "すべてのログを単一のファイルに上書きする"
-
-#~ msgid "Use a single file to log everything (append)"
-#~ msgstr "すべてのログを単一のファイルに追記する"
-
-#~ msgid "Use a different logfile for each MIDI file"
-#~ msgstr "MIDI ファイルごとに異なるログファイルを使う"
-
-#~ msgid "» Log dir:"
-#~ msgstr "≫ ログディレクトリ:"
-
-#~ msgid "browse"
-#~ msgstr "参照"
-
-#~ msgid "» Log file:"
-#~ msgstr "≫ ログファイル:"
-
-#~ msgid "Playback speed"
-#~ msgstr "演奏速度"
-
-#~ msgid "Play at normal speed"
-#~ msgstr "通常速度で演奏"
-
-#~ msgid "Play as fast as possible"
-#~ msgstr "できるだけ速く演奏"
-
-#~ msgid "Dummy Backend not loaded or not available"
-#~ msgstr "ダミーバックエンドが読み込まれていないか有効ではありません"
-
-#~ msgid ""
-#~ "Dummy\n"
-#~ "backend"
-#~ msgstr ""
-#~ "ダミー\n"
-#~ "バックエンド"
-
-#~ msgid "Buffer settings"
-#~ msgstr "バッファ設定"
-
-#~ msgid "def"
-#~ msgstr "def"
-
-#~ msgid "handy buffer tuner"
-#~ msgstr "ハンディ バッファチューナー"
-
-#~ msgid "size"
-#~ msgstr "サイズ"
-
-#~ msgid "margin"
-#~ msgstr "マージン"
-
-#~ msgid "increment"
-#~ msgstr "増分"
-
-#~ msgid ""
-#~ "* FluidSynth backend buffer *\n"
-#~ "This button resets the backend buffer parameters to default values."
-#~ msgstr ""
-#~ "* FluidSynth バックエンドバッファ *\n"
-#~ "このボタンはバックエンドバッファをデフォルト値にリセットします."
-
-#~ msgid ""
-#~ "* FluidSynth backend buffer *\n"
-#~ "If you notice skips or slowness during song playback and your system is "
-#~ "not performing any cpu-intensive task (except FluidSynth itself), you may "
-#~ "want to adjust the buffer parameters. Try to move the \"handy buffer tuner"
-#~ "\" some steps to the right until playback is fluid again."
-#~ msgstr ""
-#~ "* FluidSynth バックエンドバッファ *\n"
-#~ "曲の演奏中に音飛びや遅延が発生し, システムが FluidSynth 自身を除いた CPU "
-#~ "を多く消費するタスクを実施していないならば, バッファパラメータの調整を行っ"
-#~ "てください. 演奏が再び流れるようになるまで, \"ハンディバッファチューナー"
-#~ "\" を右に進めてみてください. "
-
-#~ msgid ""
-#~ "* FluidSynth backend buffer *\n"
-#~ "It is a good idea to make buffer adjustments with the \"handy buffer tuner"
-#~ "\" before resorting to manual editing of buffer parameters.\n"
-#~ "However, if you want to fine-tune something and want to know what you're "
-#~ "doing, you can understand how these parameters work by reading the "
-#~ "backend code (b-fluidsynth.c). In short words, every amount of time "
-#~ "(proportional to buffer_SIZE and sample rate), right before gathering "
-#~ "samples, the buffer is resized as follows:\n"
-#~ "buffer_SIZE + buffer_MARGIN + extramargin\n"
-#~ "where extramargin is a value computed as number_of_seconds_of_playback / "
-#~ "margin_INCREMENT ."
-#~ msgstr ""
-#~ "* FluidSynth バックエンドバッファ *\n"
-#~ "バッファパラメータを手で修正する前に、\"ハンディ バッファチューナー\" で"
-#~ "バッファ調整を行うのがよいでしょう. \n"
-#~ "しかし, よいチューニングを行いたい, 何をやろうとしているか知りたいならば, "
-#~ "バックエンドコード (b-fluidsynth.c) を読むことでそれぞれのパラメータがどの"
-#~ "ように機能しているかを知ることができます. 簡単に言うと, あらゆる時間 "
-#~ "(buffer_SIZE とサンプリングレートに比例) サンプリングを集める直前に, バッ"
-#~ "ファは次の式で調整されます:\n"
-#~ "buffer_SIZE + buffer_MARGIN + extramargin\n"
-#~ "extramargin は number_of_seconds_of_playback / margin_INCREMENT で計算され"
-#~ "る値です."
-
-#~ msgid "AudioCompress "
-#~ msgstr "オーディオ圧縮 "
-
-#~ msgid ""
-#~ "\n"
-#~ "(c)2003 trikuare studios(http://trikuare.cx)\n"
-#~ "Ported to Audacious by Tony Vroon (chainsaw@gentoo.org)\n"
-#~ "\n"
-#~ "Simple dynamic range compressor for transparently\n"
-#~ "keeping the volume level more or less consistent"
-#~ msgstr ""
-#~ "\n"
-#~ "(c)2003 trikuare studios(http://trikuare.cx)\n"
-#~ "Tony Vroon (chainsaw@gentoo.org) による Audacious へのポート\n"
-#~ "\n"
-#~ "ボリュームを一定のレベルに透過的に上げ下げする\n"
-#~ "シンプルなダイナミックレンジコンプレッサ"
-
-#~ msgid "About AudioCompress"
-#~ msgstr "AudioCompress について"
-
-#~ msgid ""
-#~ "If checked, when the sound peaks the volume will be cut instantly; "
-#~ "otherwise, it will ramp down just in time for the peak (but some minor "
-#~ "clipping may still occur)."
-#~ msgstr ""
-#~ "有効にすると, ピークに達した際に音量がただちにカットされます; そうでなけれ"
-#~ "ば, 必要に応じて音量が下げられます(ただし若干のクリッピングがそれでも発生"
-#~ "します)."
-
-#~ msgid "The maximum amount to amplify the audio by"
-#~ msgstr "オーディオの増幅に用いられる最大値"
-
-#~ msgid "Defines how smoothly the volume will ramp up"
-#~ msgstr "音量を徐々に上げていく際のなめらかさ"
-
-#~ msgid ""
-#~ "The target audio level for ramping up. Lowering the value gives a bit "
-#~ "more dynamic range for peaks, but will make the overall sound quieter."
-#~ msgstr ""
-#~ "音量を徐々に上げていく際のターゲットのオーディオレベル. 値を低くすると, "
-#~ "ピークへの範囲がより動的になるが, 全体的に音が静かになります."
-
-#~ msgid "How long of a window to maintain"
-#~ msgstr "保存用のウィンドウの長さ"
-
-#~ msgid " Quality Options "
-#~ msgstr " 音質オプション "
-
-#~ msgid " Aggressively prevent clipping"
-#~ msgstr " 積極的にクリッピングを予防する"
-
-#~ msgid " Target & gain"
-#~ msgstr " ターゲットとゲイン"
-
-#~ msgid "Target audio level:"
-#~ msgstr "ターゲットのオーディオレベル:"
-
-#~ msgid "Maximum gain:"
-#~ msgstr "最大ゲイン:"
-
-#~ msgid "Gain smooth:"
-#~ msgstr "ゲインのなめらかさ:"
-
-#~ msgid " History "
-#~ msgstr " 履歴 "
-
-#~ msgid ""
-#~ "How long of a history to maintain. A higher number will make the volume "
-#~ "changes less responsive."
-#~ msgstr "保存する履歴の長さ. 高い数値は音量の変更の応答性を低くします."
-
-#~ msgid "Load default values"
-#~ msgstr "デフォルト値を読み込む"
-
-#~ msgid "Audio values"
-#~ msgstr "オーディオ設定"
-
-#~ msgid "Limit read speed to: "
-#~ msgstr "読み込み速度の制限値: "
-
-#, fuzzy
-#~ msgid "Manual songchange"
-#~ msgstr "あらゆる変更を取り消す"
-
-#, fuzzy
-#~ msgid "End of playlist"
-#~ msgstr "ウィンドウ->プレイリスト"
-
-#, fuzzy
-#~ msgid "Advanced crossfade"
-#~ msgstr "高度な設定"
-
-#, fuzzy
-#~ msgid "Fadein"
-#~ msgstr "フェードイン:"
-
-#, fuzzy
-#~ msgid "Fadeout"
-#~ msgstr "フェードアウト:"
-
-#, fuzzy
-#~ msgid "Fadeout/Fadein"
-#~ msgstr "フェードアウト:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audacious Crossfade Plugin\n"
-#~ "\n"
-#~ "Copyright © 2009 William Pitcock <nenolod@atheme.org>\n"
-#~ "\n"
-#~ "...based in part on XMMS-Crossfade:\n"
-#~ "Copyright © 2000-2009 Peter Eisenlohr <peter@eisenlohr.org>\n"
-#~ "\n"
-#~ "based on the original OSS Output Plugin Copyright (C) 1998-2000\n"
-#~ "Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front "
-#~ "Technologies\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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "ファイルライタ・プラグイン\n"
-#~ "\n"
-#~ "このプログラムはフリーソフトウェアです;\n"
-#~ "フリーソフトウェア財団が提供する GNU 一般公有使用許諾契約書\n"
-#~ "の第二版か, 希望によってはそれ以降の版のどれかが定める条項の下で\n"
-#~ "本プログラムを再頒布または変更することができます.\n"
-#~ "\n"
-#~ "本プログラムは有であることを願って頒布されていますが,\n"
-#~ "まったくの無保証です; 市場性及び特定目的, 適合性についての\n"
-#~ "暗黙の保証を含めて, いかなる保証も行ないません.\n"
-#~ "詳細については GNU 一般公有使用許諾契約書をご覧下さい.\n"
-#~ "\n"
-#~ "あなたは, 本プログラムと一緒に GNU 一般公有使用許諾契約書の\n"
-#~ "写しを受け取っているはずです. そうでない場合は, the Free Software\n"
-#~ "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-#~ "USA. まで請求して下さい."
-
-#, fuzzy
-#~ msgid "About"
-#~ msgstr "プラグインについて"
-
-#, fuzzy
-#~ msgid "Throttle Output"
-#~ msgstr "aRts 出力プラグインについて"
-
-#, fuzzy
-#~ msgid "Max block size (bytes):"
-#~ msgstr "サイズ (バイト)"
-
-#, fuzzy
-#~ msgid "Force close/reopen on songchange"
-#~ msgstr "オーディオタイプが変更されたとき強制的にオーディオを再オープンする"
-
-#, fuzzy
-#~ msgid "Mixing buffer size (ms):"
-#~ msgstr "バッファのサイズ (ミリ秒):"
-
-#, fuzzy
-#~ msgid "auto"
-#~ msgstr "自動"
-
-#, fuzzy
-#~ msgid "Reopen"
-#~ msgstr "削除"
-
-#, fuzzy
-#~ msgid "Start volume (%):"
-#~ msgstr "音量: (%)"
-
-#, fuzzy
-#~ msgid "Fade in"
-#~ msgstr "フェードイン:"
-
-#, fuzzy
-#~ msgid "Simple XF"
-#~ msgstr "サンプリングレート"
-
-#, fuzzy
-#~ msgid "End volume (%):"
-#~ msgstr "音量: (%)"
-
-#, fuzzy
-#~ msgid "Fade out"
-#~ msgstr "フェードアウト:"
-
-#, fuzzy
-#~ msgid "Custom (ms):"
-#~ msgstr "カスタム "
-
-#, fuzzy
-#~ msgid "Offset"
-#~ msgstr "オフ"
-
-#, fuzzy
-#~ msgid " Enable"
-#~ msgstr "有効"
-
-#, fuzzy
-#~ msgid "Advanced XF"
-#~ msgstr "高度な設定"
-
-#, fuzzy
-#~ msgid "Additional silence"
-#~ msgstr "追加コマンド"
-
-#, fuzzy
-#~ msgid "Fade out (ms):"
-#~ msgstr "フェードアウト:"
-
-#, fuzzy
-#~ msgid "Fade in (ms):"
-#~ msgstr "フェードイン:"
-
-#, fuzzy
-#~ msgid "Max. length (ms):"
-#~ msgstr "長さ (ミリ秒):"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "高度な設定"
-
-#, fuzzy
-#~ msgid "Debug options"
-#~ msgstr "装飾"
-
-#, fuzzy
-#~ msgid "Volume control options"
-#~ msgstr "音量コントロールデバイス:"
-
-#, fuzzy
-#~ msgid "same file"
-#~ msgstr "ファイル"
-
-#, fuzzy
-#~ msgid "Limit OP buffer usage (ms):"
-#~ msgstr "バッファのサイズ (ミリ秒):"
-
-#, fuzzy
-#~ msgid "Advanced options"
-#~ msgstr "高度な設定"
-
-#~ msgid "Save Default List"
-#~ msgstr "デフォルトのプレイリストの保存"
-
-#~ msgid "Saves the selected playlist to the default location."
-#~ msgstr "選択したプレイリストをデフォルト位置に保存します."
-
-#, fuzzy
-#~ msgid "About Icecast-Plugin"
-#~ msgstr "エコー プラグインについて"
-
-#, fuzzy
-#~ msgid ""
-#~ "Icecast-Plugin\n"
-#~ "\n"
-#~ "This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Audacious ESounD プラグイン\n"
-#~ "\n"
-#~ "このプログラムはフリーソフトウェアです;\n"
-#~ "フリーソフトウェア財団が提供する GNU 一般公有使用許諾契約書\n"
-#~ "の第二版, あるいはそれ以降の版が定める条項の下で\n"
-#~ "本プログラムを再頒布または変更することができます.\n"
-#~ "\n"
-#~ "本プログラムは有用とは思いますが,\n"
-#~ "頒布にあたっては, 市場性及び特定目的, 適合性についての\n"
-#~ "暗黙の保証を含めて, いかなる保証も行ないません.\n"
-#~ "詳細については GNU 一般公有使用許諾契約書をご覧下さい.\n"
-#~ "\n"
-#~ "あなたは, 本プログラムと一緒に GNU 一般公有使用許諾契約書の\n"
-#~ "写しを受け取っているはずです. そうでない場合は, the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA.へ手紙を書いて下さい."
-
-#, fuzzy
-#~ msgid "Error setting port: %s\n"
-#~ msgstr "プレイリスト \"%s\" を書き込む際にエラー: %s"
-
-#, fuzzy
-#~ msgid "Error setting password: %s\n"
-#~ msgstr "プレイリスト \"%s\" を書き込む際にエラー: %s"
-
-#, fuzzy
-#~ msgid "Error setting stream %s: %s\n"
-#~ msgstr "プレイリスト \"%s\" を書き込む際にエラー: %s"
-
-#, fuzzy
-#~ msgid "Error setting stream URL: %s\n"
-#~ msgstr "プレイリスト \"%s\" を書き込む際にエラー: %s"
-
-#, fuzzy
-#~ msgid "Error connecting to server: %s\n"
-#~ msgstr "LIRC サーバに再接続"
-
-#, fuzzy
-#~ msgid "Icecast Configuration"
-#~ msgstr "MP3 設定"
-
-#, fuzzy
-#~ msgid "Output stream format:"
-#~ msgstr "出力ファイルフォーマット:"
-
-#, fuzzy
-#~ msgid "Server address:"
-#~ msgstr "デバイスアドレス"
-
-#, fuzzy
-#~ msgid "Mount point:"
-#~ msgstr "フォント %i:"
-
-#, fuzzy
-#~ msgid "User name:"
-#~ msgstr "ユーザ名:"
-
-#, fuzzy
-#~ msgid "Connection timeout (seconds):"
-#~ msgstr "接続モード"
-
-#, fuzzy
-#~ msgid "Buffer size (bytes):"
-#~ msgstr "バッファのサイズ (ミリ秒):"
-
-#, fuzzy
-#~ msgid "Stream description:"
-#~ msgstr "ストリームヴァージョン %d"
-
-#~ msgid ""
-#~ "<big>Couldn't initialize the last.fm radio plugin.</big>\n"
-#~ "\n"
-#~ "Check if your Scrobbler's plugin login data is set up properly."
-#~ msgstr ""
-#~ "<big>last.fm ラジオプラグインを初期化できませんでした.</big>\n"
-#~ "\n"
-#~ "Scrobbler プラグインデータが正しく設定されているか確認してください."
-
-#~ msgid "Enable fast play-length calculation"
-#~ msgstr "高速演奏長計算を有効にする"
-
-#~ msgid "Parse XING headers"
-#~ msgstr "XING ヘッダをパースする"
-
-#~ msgid "Use SJIS to write ID3 tags (not recommended)"
-#~ msgstr "ID3 タグの書き込みに SJIS を使う (非推奨)"
-
-#~ msgid "Metadata Settings"
-#~ msgstr "メタデータ設定"
-
-#~ msgid "MPEG Audio Plugin Configuration"
-#~ msgstr "MPEG オーディオ プラグインの設定"
-
-#~ msgid ""
-#~ "Audacious MPEG Audio Plugin\n"
-#~ "\n"
-#~ "Compiled against libMAD version: %d.%d.%d%s\n"
-#~ "\n"
-#~ "Written by:\n"
-#~ " William Pitcock <nenolod@sacredspiral.co.uk>\n"
-#~ " Yoshiki Yazawa <yaz@cc.rim.or.jp>\n"
-#~ "\n"
-#~ "Portions derived from XMMS-MAD by:\n"
-#~ " Sam Clegg\n"
-#~ "\n"
-#~ "ReplayGain support by:\n"
-#~ " Samuel Krempp"
-#~ msgstr ""
-#~ "Audacious MPEG オーディオプラグイン\n"
-#~ "\n"
-#~ "libMAD ヴァージョン %d.%d.%d%s にてコンパイル\n"
-#~ "\n"
-#~ "作者:\n"
-#~ " William Pitcock <nenolod@sacredspiral.co.uk>\n"
-#~ " Yoshiki Yazawa <yaz@cc.rim.or.jp>\n"
-#~ "\n"
-#~ "XMMS-MAD から派生したポート作成:\n"
-#~ " Sam Clegg\n"
-#~ "\n"
-#~ "リプレイゲインサポート:\n"
-#~ " Samuel Krempp"
-
-#~ msgid "About MPEG Audio Plugin"
-#~ msgstr "MPEG オーディオプラグインについて"
-
-#~ msgid "About OSSv4 Driver"
-#~ msgstr "OSSv4 ドライバについて"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audacious OSSv4 Driver\n"
-#~ "\n"
-#~ "Based on the OSSv3 Output plugin,\n"
-#~ "Ported to OSSv4's VMIX by Cristi Magherusan <majeru@gentoo.ro>\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.\n"
-#~ "\n"
-#~ "Note: For any issues regarding this plugin (including patches and \n"
-#~ "suggestions) please contact the maintainer, and NO other \n"
-#~ "Audacious developers\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Audacious OSSv4 ドライバ\n"
-#~ "\n"
-#~ "OSSv3 出力プラグインをベースとして,\n"
-#~ "OSSv4 の VMIX として Cristi Magherusan <majeru@gentoo.ro> がポート.\n"
-#~ "\n"
-#~ "このプログラムはフリーソフトウェアです;\n"
-#~ "フリーソフトウェア財団が提供する GNU 一般公有使用許諾契約書\n"
-#~ "の第二版か, 希望によってはそれ以降の版のどれかが定める条項の下で\n"
-#~ "本プログラムを再頒布または変更することができます.\n"
-#~ "\n"
-#~ "本プログラムは有であることを願って頒布されていますが,\n"
-#~ "まったくの無保証です; 市場性及び特定目的, 適合性についての\n"
-#~ "暗黙の保証を含めて, いかなる保証も行ないません.\n"
-#~ "詳細については GNU 一般公有使用許諾契約書をご覧下さい.\n"
-#~ "\n"
-#~ "あなたは, 本プログラムと一緒に GNU 一般公有使用許諾契約書の\n"
-#~ "写しを受け取っているはずです. そうでない場合は, the Free Software\n"
-#~ "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-#~ "USA. まで請求して下さい."
-
-#~ msgid ""
-#~ "There has been an error that may require your attention.\n"
-#~ "\n"
-#~ "Contents of server error:\n"
-#~ "\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "注意を必要とするエラーが発生しました.\n"
-#~ "\n"
-#~ "サーバエラーの内容:\n"
-#~ "\n"
-#~ "%s\n"
-
-#~ msgid "Scrobbler Error"
-#~ msgstr "Scrobbler エラー"
-
-#~ msgid "VBR"
-#~ msgstr "VBR"
-
-#~ msgid ""
-#~ "<big>Couldn't open audio.</big>\n"
-#~ "\n"
-#~ "Please check that:\n"
-#~ "1. You have the correct output plugin selected.\n"
-#~ "2. No other programs is blocking the soundcard.\n"
-#~ "3. Your soundcard is configured properly.\n"
-#~ msgstr ""
-#~ "<big>オーディオデバイスを開けませんでした.</big>\n"
-#~ "\n"
-#~ "以下をチェックして下さい:\n"
-#~ "1. 現在選択している出力プラグインが正しいか.\n"
-#~ "2. お使いのサウンドカードをブロックしているアプリが他に存在しないか.\n"
-#~ "3. お使いのサウンドカードが正しく設定されているか.\n"
-
-#~ msgid "TiMidity Configuration"
-#~ msgstr "TiMidity の設定"
-
-#~ msgid "22000 Hz"
-#~ msgstr "22000 Hz"
-
-#~ msgid "44100 Hz"
-#~ msgstr "44100 Hz"
-
-#~ msgid "Sample Width"
-#~ msgstr "サンプリング幅"
-
-#~ msgid "TiMidity Configuration File"
-#~ msgstr "TiMidity 設定ファイル"
-
-#~ msgid "TiMidity Plugin %s"
-#~ msgstr "TiMidity プラグイン %s"
-
-#~ msgid ""
-#~ "TiMidity Plugin\n"
-#~ "http://libtimidity.sourceforge.net\n"
-#~ "by Konstantin Korikov"
-#~ msgstr ""
-#~ "TiMidity プラグイン\n"
-#~ "http://libtimidity.sourceforge.net\n"
-#~ "Konstantin Korikov による"
-
-#~ msgid "Couldn't load MIDI file"
-#~ msgstr "MIDI ファイルを読み込めません"
-
-#~ msgid "Ape2 Tag"
-#~ msgstr "Ape2 タグ"
-
-#~ msgid "Title:"
-#~ msgstr "タイトル:"
-
-#~ msgid "Comment:"
-#~ msgstr "コメント:"
-
-#~ msgid "Genre:"
-#~ msgstr "ジャンル:"
-
-#~ msgid "Remove Tag"
-#~ msgstr "タグの削除"
-
-#~ msgid "Wavpack Info:"
-#~ msgstr "Wavpack 情報:"
-
-#~ msgid "version %d"
-#~ msgstr "バージョン %d"
-
-#~ msgid "average bitrate: %6.1f kbps"
-#~ msgstr "平均ビットレート: %6.1f kbps"
-
-#~ msgid "samplerate: %d Hz"
-#~ msgstr "サンプリングレート: %d Hz"
-
-#~ msgid "bits per sample: %d"
-#~ msgstr "ビット/サンプリング: %d"
-
-#~ msgid "channels: %d"
-#~ msgstr "チャンネル数: %d"
-
-#~ msgid "length: %d:%.2d"
-#~ msgstr "長さ: %d:%.2d"
-
-#~ msgid "file size: %d Bytes"
-#~ msgstr "ファイルサイズ: %d Bytes"
-
-#~ msgid "Title Peak: ?"
-#~ msgstr "タイトルピーク: ?"
-
-#~ msgid "Album Peak: ?"
-#~ msgstr "アルバムピーク: ?"
-
-#~ msgid "Title Gain: ?"
-#~ msgstr "タイトルゲイン: ?"
-
-#~ msgid "Album Gain: ?"
-#~ msgstr "アルバムゲイン: ?"
-
-#~ msgid "File Info - %s"
-#~ msgstr "ファイル情報 - %s"
-
-#~ msgid "Enable Dynamic Bitrate Display"
-#~ msgstr "動的ビットレート表示を有効にする"
-
-#, fuzzy
-#~ msgid "General Plugin Settings"
-#~ msgstr "一般的なプラグイン設定:"
-
-#~ msgid "use Track Gain/Peak"
-#~ msgstr "トラックのゲイン/ピークを使用する"
-
-#~ msgid "use Album Gain/Peak"
-#~ msgstr "アルバムのゲイン/ピークを使用する"
-
-#~ msgid "Enable Clipping Prevention"
-#~ msgstr "クリッピング回避機能を有効にする"
-
-#~ msgid "Enable ReplayGain"
-#~ msgstr "リプレイゲインを有効にする"
-
-#~ msgid "ReplayGain Type"
-#~ msgstr "リプレイゲインの種類"
-
-#~ msgid "ReplayGain Settings"
-#~ msgstr "リプレイゲインの設定"
-
-#~ msgid "Plugin"
-#~ msgstr "プラグイン"
-
-#~ msgid "ReplayGain"
-#~ msgstr "リプレイゲイン"
-
-#~ msgid "Wavpack Configuration"
-#~ msgstr "Wavpack 設定"
-
-#~ msgid "Unknown soundcard"
-#~ msgstr "不明なサウンドカード"
-
-#~ msgid "Default PCM device (%s)"
-#~ msgstr "デフォルト PCM デバイス (%s)"
-
-#, fuzzy
-#~ msgid "Device:"
-#~ msgstr "デバイス"
-
-#~ msgid "Mixer:"
-#~ msgstr "ミキサ:"
-
-#~ msgid "Can't open file\n"
-#~ msgstr "ファイルを開けません\n"
-
-#~ msgid "Not supported file format\n"
-#~ msgstr "サポートしていないファイルフォーマットです\n"
-
-#~ msgid "File is corrupted\n"
-#~ msgstr "ファイルが壊れています\n"
-
-#~ msgid "Can't read from file\n"
-#~ msgstr "ファイルから読み込めません\n"
-
-#~ msgid "Insufficient memory available\n"
-#~ msgstr "利用可能メモリが不十分です\n"
-
-#~ msgid "Output plugin error\n"
-#~ msgstr "出力プラグインエラー\n"
-
-#~ msgid "Unknown error\n"
-#~ msgstr "不明なエラー\n"
-
-#~ msgid "TTA Decoder Error"
-#~ msgstr "TTA デコーダエラー"
-
-#~ msgid "TTA input plugin "
-#~ msgstr "TTA 入力プラグイン"
-
-#~ msgid ""
-#~ " for BMP\n"
-#~ "Copyright (c) 2004 True Audio Software\n"
-#~ msgstr ""
-#~ " for BMP\n"
-#~ "Copyright (c) 2004 True Audio Software\n"
-
-#~ msgid "About True Audio Plugin"
-#~ msgstr "True Audio プラグインについて"
-
-#, fuzzy
-#~ msgid "Override default devices"
-#~ msgstr "デフォルトデバイスを上書きする: "
-
-#, fuzzy
-#~ msgid "Card:"
-#~ msgstr "コマンド:"
-
-#~ msgid "Mixer card:"
-#~ msgstr "ミキサカード:"
-
-#~ msgid "Orientation"
-#~ msgstr "向き"
-
-#~ msgid "The orientation of the tray"
-#~ msgstr "トレイの向き"
-
-#~ msgid "/Toggle Decorations"
-#~ msgstr "/装飾の切り替え"
-
-#~ msgid "/-"
-#~ msgstr "/-"
-
-#~ msgid "/Close"
-#~ msgstr "/閉じる"
-
-#~ msgid "Blur scope"
-#~ msgstr "ブラースコープ"
-
-#~ msgid "ReplayGain Settings:"
-#~ msgstr "リプレイゲインの設定:"
-
-#~ msgid "ReplayGain Type:"
-#~ msgstr "リプレイゲインの種類:"
-
-#~ msgid "About Apple Lossless Audio Plugin"
-#~ msgstr "Apple Lossless オーディオプラグインについて"
-
-#~ msgid ""
-#~ "Copyright (c) 2006 Audacious team\n"
-#~ "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"
-#~ msgstr ""
-#~ "Copyright (c) 2006 Audacious team\n"
-#~ "(c) 2005-2006 David Hammerton <crazney -at- crazney.net> によるポート"
-
-#~ msgid "About Monkey's Audio Plugin"
-#~ msgstr "Monkey's オーディオプラグインについて"
-
-#~ msgid ""
-#~ "Copyright (C) 2007 Eugene Zagidullin <e.asphyx@gmail.com>\n"
-#~ "Based on ffape decoder, Copyright (C) 2007 Benjamin Zores\n"
-#~ "ffape itself based on libdemac by Dave Chapman\n"
-#~ "\n"
-#~ "ffape is a part of FFmpeg project, http://ffmpeg.mplayerhq.hu/"
-#~ msgstr ""
-#~ "Copyright (C) 2007 Eugene Zagidullin <e.asphyx@gmail.com>\n"
-#~ "ffape デコーダ (Copyright (C) 2007 Benjamin Zores) を元とする.\n"
-#~ "ffape 自体は Dave Chapman による libdemac を元とする.\n"
-#~ "\n"
-#~ "ffape は FFmpeg プロジェクト(http://ffmpeg.mplayerhq.hu/) の一部である."
-
-#~ msgid "ID3 format:"
-#~ msgstr "ID3 の書式:"
-
-#~ msgid "ALSA Driver configuration"
-#~ msgstr "ALSA ドライバ設定"
-
-#~ msgid "Device settings"
-#~ msgstr "デバイス設定:"
-
-#~ msgid "About CD Audio Plugin NG"
-#~ msgstr "CD オーディオプラグイン NG について"
-
-#~ msgid "By Playlist Entry"
-#~ msgstr "プレイリストのエントリ"
-
-#~ msgid "Sorts the list by playlist entry."
-#~ msgstr "プレイリストのエントリ順でソートします."
-
-#~ msgid "Musepack Decoder Plugin 1.2"
-#~ msgstr "Musepack デコーダプラグイン 1.2"
-
-#~ msgid ""
-#~ "Plugin code by\n"
-#~ "Benoit Amiaux\n"
-#~ "Martin Spuler\n"
-#~ "Kuniklo\n"
-#~ "\n"
-#~ "Get latest version at http://musepack.net\n"
-#~ msgstr ""
-#~ "プラグインコードは\n"
-#~ "Benoit Amiaux\n"
-#~ "Martin Spuler\n"
-#~ "Kuniklo による\n"
-#~ "\n"
-#~ "http://musepack.net にて最新版が取得できます\n"
-
-#~ msgid "Nevermind"
-#~ msgstr "気にしない"
-
-#~ msgid "Musepack Decoder Configuration"
-#~ msgstr "Musepack デコーダ設定"
-
-#~ msgid "General Settings"
-#~ msgstr "一般的な設定"
-
-#~ msgid "Use Track Gain"
-#~ msgstr "トラックゲインを使用する"
-
-#~ msgid "Use Album Gain"
-#~ msgstr "アルバムゲインを使用する"
-
-#~ msgid "Musepack Tag"
-#~ msgstr "Musepack タグ"
-
-#~ msgid "Musepack Info"
-#~ msgstr "Musepack 情報"
-
-#~ msgid "Streamversion %d"
-#~ msgstr "ストリームヴァージョン %d"
-
-#~ msgid "Encoder: %s"
-#~ msgstr "エンコーダ: %s"
-
-#~ msgid "Profile: %s"
-#~ msgstr "プロファイル: %s"
-
-#~ msgid "Average bitrate: %6.1f kbps"
-#~ msgstr "平均ビットレート: %6.1f kbps"
-
-#~ msgid "Samplerate: %d Hz"
-#~ msgstr "サンプリングレート: %d Hz"
-
-#~ msgid "Channels: %d"
-#~ msgstr "チャンネル数: %d"
-
-#~ msgid "Length: %d:\\%.2d"
-#~ msgstr "長さ: %d:\\%.2d"
-
-#~ msgid "File size: %d Bytes"
-#~ msgstr "ファイルサイズ: %d Bytes"
-
-#~ msgid "Track Peak: %5u"
-#~ msgstr "トラックピーク: %5u"
-
-#~ msgid "Track Gain: %-+2.2f dB"
-#~ msgstr "トラックゲイン: %-+2.2f dB"
-
-#~ msgid "Album Peak: %5u"
-#~ msgstr "アルバムピーク: %5u"
-
-#~ msgid "Album Gain: %-+5.2f dB"
-#~ msgstr "アルバムゲイン: %-+5.2f dB"
-
-#~ msgid "ID3 Tag:"
-#~ msgstr " ID3 タグ:"
-
-#~ msgid ""
-#~ "Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n"
-#~ "the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka "
-#~ "McMCC (mcmcc@mail.ru)\n"
-#~ "and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy "
-#~ "<bogorodskiy@inbox.ru>.\n"
-#~ "This plugin based on source code "
-#~ msgstr ""
-#~ "BEEP-WMA プラグイン (Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC "
-#~ "(mcmcc@mail.ru)) と \n"
-#~ "BMP-WMA プラグイン (Copyright (C) 2004 Roman Bogorodskiy "
-#~ "<bogorodskiy@inbox.ru>) の\n"
-#~ "Tony Vroon <chainsaw@gentoo.org> による Audacious への適用.\n"
-#~ "このプラグインは以下のソースコードを元とする: "
-
-#~ msgid " Close "
-#~ msgstr " 閉じる "
-
-#~ msgid "Refresh Rate"
-#~ msgstr "リフレッシュレート"
-
-#~ msgid "Sample rate mismatch"
-#~ msgstr "サンプリングレートの不一致"
-
-#~ msgid ""
-#~ "Xmms is asking for a sample rate that differs from\n"
-#~ " that of the jack server. Xmms 1.2.8 or later\n"
-#~ "contains resampling routines that xmms-jack will\n"
-#~ "dynamically load and use to perform resampling.\n"
-#~ "Or you can restart the jack server\n"
-#~ "with a sample rate that matches the one that\n"
-#~ "xmms desires. -r is the option for the jack\n"
-#~ "alsa driver so -r 44100 or -r 48000 should do\n"
-#~ "\n"
-#~ "Chris Morgan <cmorgan@alum.wpi.edu>\n"
-#~ msgstr ""
-#~ "Xmms が求めているサンプリングレートが jack サーバの\n"
-#~ "それと異なっています. Xmms 1.2.8 以降は xmms-jack が\n"
-#~ "動的に読み込みリサンプリングを行うといったリサンプリング\n"
-#~ "ルーチンを含んでいます.\n"
-#~ "あるいは jack サーバを xmms の求めるサンプリングレートで\n"
-#~ "再起動することもできます. -r が jack alsa ドライバの\n"
-#~ "オプションで, -r 44100 や -r 48000 のように使います.\n"
-#~ "\n"
-#~ "Chris Morgan <cmorgan@alum.wpi.edu>\n"
-
-#~ msgid "Full (~50 fps)"
-#~ msgstr "1:1 (〜50 fps)"
-
-#~ msgid "Half (~25 fps)"
-#~ msgstr "1:2 (〜25 fps)"
-
-#~ msgid "Quarter (~13 fps)"
-#~ msgstr "1:4 (〜13 fps)"
-
-#~ msgid "Eighth (~6 fps)"
-#~ msgstr "1:8 (〜6 fps)"
-
-#~ msgid "Audio Settings"
-#~ msgstr "オーディオ設定"
-
-#~ msgid "Force reopen audio when audio type changed"
-#~ msgstr "オーディオタイプが変更されたとき強制的にオーディオを再オープンする"
-
-#~ msgid "Miscellaneous Settings"
-#~ msgstr "雑多な設定"
-
-#~ msgid "Display average bitrate for VBR"
-#~ msgstr "VBR の平均ビットレートを表示する"
-
-#~ msgid "Using libfaad2-"
-#~ msgstr "libfaad2-"
-
-#~ msgid "About ALSA Driver"
-#~ msgstr "ALSA ドライバについて"
-
-#~ msgid ""
-#~ "Audacious ALSA Driver\n"
-#~ "\n"
-#~ " This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA.\n"
-#~ "Author: Matthieu Sozeau (mattam@altern.org)"
-#~ msgstr ""
-#~ "Audacious ALSA ドライバ\n"
-#~ "\n"
-#~ "このプログラムはフリーソフトウェアです;\n"
-#~ "フリーソフトウェア財団が提供する GNU 一般公有使用許諾契約書\n"
-#~ "の第二版, あるいはそれ以降の版が定める条項の下で\n"
-#~ "本プログラムを再頒布または変更することができます.\n"
-#~ "\n"
-#~ "本プログラムは有用とは思いますが,\n"
-#~ "頒布にあたっては, 市場性及び特定目的, 適合性についての\n"
-#~ "暗黙の保証を含めて, いかなる保証も行ないません.\n"
-#~ "詳細については GNU 一般公有使用許諾契約書をご覧下さい.\n"
-#~ "\n"
-#~ "あなたは, 本プログラムと一緒に GNU 一般公有使用許諾契約書の\n"
-#~ "写しを受け取っているはずです. そうでない場合は, Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA. へ手紙を書いて下さい.\n"
-#~ "作者: Matthieu Sozeau (mattam@altern.org)"
-
-#~ msgid "Soundcard:"
-#~ msgstr "サウンドカード:"
-
-#~ msgid "Buffer time (ms):"
-#~ msgstr "バッファ時間 (ミリ秒):"
-
-#~ msgid "Period time (ms):"
-#~ msgstr "休止時間 (ミリ秒):"
-
-#~ msgid ""
-#~ "aRts output plugin by Håvard Kvålen <havardk@xmms.org>\n"
-#~ "Audacious port by Giacomo Lozito from develia.org"
-#~ msgstr ""
-#~ "Håvard Kvålen <havardk@xmms.org> による aRts 出力プラグイン\n"
-#~ "develia.org の Giacomo Lozito による Audacious ポート"
-
-#~ msgid "aRts Driver configuration"
-#~ msgstr "aRts ドライバ設定"
-
-#~ msgid ""
-#~ "<big>No playable CD found.</big>\n"
-#~ "\n"
-#~ "No CD inserted, or inserted CD is not an audio CD.\n"
-#~ msgstr ""
-#~ "<big>演奏できる CD が見つかりませんでした.</big>\n"
-#~ "\n"
-#~ "CD が挿入されていないか, 挿入された CD はオーディオ CD ではありません.\n"
-
-#~ msgid "Print debug information"
-#~ msgstr "デバグ情報を出力する"
-
-#~ msgid "auto-M/S mode"
-#~ msgstr "自動 M/S モード"
-
-#~ msgid "Show track numbers in playlist"
-#~ msgstr "プレイリストにトラック番号を表示する"
-
-#~ msgid "Audacious Skinned GUI Configuration"
-#~ msgstr "Audacious スキン GUI 設定"
-
-#~ msgid "Error importing Winamp EQF file '%s'"
-#~ msgstr "Winamp EQF ファイル '%s' のインポートエラー"
-
-#~ msgid "Enter location to play:"
-#~ msgstr "演奏する位置の入力:"
+msgstr "Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n\nプラグインのコードの一部は Miles Egan によります。\nWavpack のサイト http://www.wavpack.com/ をご覧ください。\n"

audacious-plugins-3.1.1.tar.bz2/po/lt.po -> audacious-plugins-3.2.4.tar.bz2/po/lt.po Changed

@@ -4,15 +4,15 @@
 #
 # Translators:
 # Algimantas Margevičius <gymka@mail.ru>, 2011.
-# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011.
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011, 2012.
 # gymka <gymka@mail.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUDPLUG\n"
-"POT-Creation-Date: 2011-11-15 22:40-0500\n"
-"PO-Revision-Date: 2011-12-02 07:14+0000\n"
-"Last-Translator: gymka_ltu <margevicius.algimantas@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-02-19 14:43+0000\n"
+"Last-Translator: Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
 "Language-Team: Lithuanian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,28 +26,22 @@
 "Using libfaad2-%s for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
-msgstr ""
-"Dekodavimui naudojamas libfaad2-%s.\n"
-"FAAD2 AAC/HE-AAC/HE-AACv2/DRM dekoderis (c) Nero AG, www.nero.com\n"
-"Copyright (c) 2005-2006 Audacious team"
+msgstr "Dekodavimui naudojamas libfaad2-%s.\nFAAD2 AAC/HE-AAC/HE-AACv2/DRM dekoderis (c) Nero AG, www.nero.com\nCopyright (c) 2005-2006 Audacious team"
 
 #: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
-msgstr "Apie MP4 AAC decoder plugin"
+msgstr "Apie MP4 AAC dekodavimo įskiepį"
 
 #: src/alarm/alarm.c:312
 msgid "About Alarm"
-msgstr "Apie Alarm"
+msgstr "Apie „Alarm“"
 
 #: src/alarm/alarm.c:313
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr ""
-"Įskiepis kuris suteikia galimybę pradėti groti, nuo tam tikros vietos.\n"
-"\n"
-"Originaliai sukūrė Adam Feakin ir Daniel Stodden."
+msgstr "Įskiepis kuris suteikia galimybę pradėti groti, nuo tam tikros vietos.\n\nOriginaliai sukūrė Adam Feakin ir Daniel Stodden."
 
 #: src/alarm/interface.c:33
 msgid "Alarm"
@@ -84,7 +78,7 @@
 
 #: src/alarm/interface.c:379
 msgid "Quiet after:"
-msgstr "Nutilti po:"
+msgstr "Nutildyti po:"
 
 #: src/alarm/interface.c:389
 msgid "Alarm at (default):"
@@ -98,9 +92,10 @@
 #: src/alarm/interface.c:533 src/alarm/interface.c:581
 #: src/alarm/interface.c:629 src/alarm/interface.c:677
 #: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
 msgid "Default"
-msgstr "Numatytasis"
+msgstr "Numatytosios"
 
 #: src/alarm/interface.c:763
 msgid "Day"
@@ -140,7 +135,7 @@
 
 #: src/alarm/interface.c:875
 msgid "Fading"
-msgstr "Blukimas"
+msgstr "Išblukimas"
 
 #: src/alarm/interface.c:912
 msgid "seconds"
@@ -251,62 +246,11 @@
 " Display a reminder when the alarm goes off,\n"
 " type the reminder in the box and turn on the\n"
 " toggle button if you want it to be shown.\n"
-msgstr ""
-"\n"
-"Laikas\n"
-" Žadinti laiku: \n"
-" Laikas kada įjungti žadintuvą.\n"
-"\n"
-" Nutilti po: \n"
-" Po šio laiko tarpo išjungti žadintuvą.\n"
-" (jei prikėlimo žadintuvas neuždarytas)\n"
-"\n"
-"\n"
-"Dienos\n"
-" Diena:\n"
-" Pasirink dienas kuriomis įjungti žadintuvą.\n"
-"\n"
-" Laikas:\n"
-" Pasirinkti kiekvienos dienos žadintuvo laiką,\n"
-" arba pasirinkti numatytąjį laiką.\n"
-"\n"
-"\n"
-"\n"
-"Garsas\n"
-" Garsėjimas: \n"
-" Garsinti iki nurodyto garso, \n"
-" šį laiko tarpą.\n"
-"\n"
-" Pradėti nuo: \n"
-" Pradėti garsinti nuo.\n"
-"\n"
-" Baigti: \n"
-" Garsas ties kuriuo baigti garsinti. Jei garsinimo\n"
-" laikas yra 0 tada nustatykit garsą šitą ir\n"
-" pradėkit groti.\n"
-"\n"
-"\n"
-"Pasirinktys:\n"
-" Papildoma komanda:\n"
-" Vykdyti šią komandą žadintuvo laiku.\n"
-"\n"
-" Grojaraštis: \n"
-" Įkelti šį grojaraštį ir groti dainas iš ji \n"
-" (turi turėti .m3u plėtinį). Jei nenurodytas \n"
-" grojaraštis bus naudojamos dainos kurios\n"
-" dabar yra sąraše.\n"
-" mp3/ogg URL taipogi gali būt čia įvestas,\n"
-" bet grojaraščio įkrovimas iš URL šiuo metu\n"
-" nepalaikomas xmms.\n"
-"\n"
-" Priminimas:\n"
-" Parodyti priminimą žadintuvui išsijungus,\n"
-" įveskit priminimą langelyje ir paspauskite patvirtinimo mygtuką\n"
-" jei norit jog būtų rodomas.\n"
+msgstr "\nLaikas\n Žadinti laiku: \n Laikas kada įjungti žadintuvą.\n\n Nutilti po: \n Po šio laiko tarpo išjungti žadintuvą.\n (jei prikėlimo žadintuvas neuždarytas)\n\n\nDienos\n Diena:\n Pasirink dienas kuriomis įjungti žadintuvą.\n\n Laikas:\n Pasirinkti kiekvienos dienos žadintuvo laiką,\n arba pasirinkti numatytąjį laiką.\n\n\n\nGarsas\n Garsėjimas: \n Garsinti iki nurodyto garso, \n šį laiko tarpą.\n\n Pradėti nuo: \n Pradėti garsinti nuo.\n\n Baigti: \n Garsas ties kuriuo baigti garsinti. Jei garsinimo\n laikas yra 0 tada nustatykit garsą šitą ir\n pradėkit groti.\n\n\nPasirinktys:\n Papildoma komanda:\n Vykdyti šią komandą žadintuvo laiku.\n\n Grojaraštis: \n Įkelti šį grojaraštį ir groti dainas iš ji \n (turi turėti .m3u plėtinį). Jei nenurodytas \n grojaraštis bus naudojamos dainos kurios\n dabar yra sąraše.\n mp3/ogg URL taipogi gali būt čia įvestas,\n bet grojaraščio įkrovimas iš URL šiuo metu\n nepalaikomas xmms.\n\n Priminimas:\n Parodyti priminimą žadintuvui išsijungus,\n įveskit priminimą langelyje ir paspauskite patvirtinimo mygtuką\n jei norit jog būtų rodomas.\n"
 
 #: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
 msgid "Help"
-msgstr "Pagalba"
+msgstr "Žinynas"
 
 #: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
 #: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
@@ -316,7 +260,7 @@
 
 #: src/alarm/interface.c:1290
 msgid "Your reminder for today is.."
-msgstr "Šiandien tavo priminimas yra.."
+msgstr "Šiandienos priminimas..."
 
 #: src/alarm/interface.c:1315
 msgid "Thankyou"
@@ -328,7 +272,7 @@
 
 #: src/alsa/config.c:235
 msgid "Default mixer device"
-msgstr "Numatytasis mikseris"
+msgstr "Numatytasis mikšerio įrenginys"
 
 #: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
@@ -340,11 +284,11 @@
 
 #: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
-msgstr "Mikseris:"
+msgstr "Mikšerio įrenginys:"
 
 #: src/alsa/config.c:449
 msgid "Mixer element:"
-msgstr "Mikserio elementas:"
+msgstr "Mikšerio elementas:"
 
 #: src/alsa/config.c:452
 msgid "Work around drain hangup"
@@ -358,13 +302,11 @@
 msgid "ALSA error"
 msgstr "ALSA klaida"
 
-#: src/amidi-plug/amidi-plug.c:325
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr ""
-"Nepasirinkti jokie MIDI atkūrimo prievadai. Pasirinkt gali MIDI įskiepio "
-"nustatymuose."
+msgstr "Nepasirinkti jokie MIDI atkūrimo prievadai. Juos pasirinkti galite MIDI įskiepio nustatymuose."
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:35
 msgid "ALSA Backend "
@@ -375,10 +317,7 @@
 "This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
 "This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Ši posistemė siunčia MIDI įvykius naudotojo pasirinktai ALSA eiliškumo prievadų grupei. ALSA sekvencerio sąsaja yra labai universali, ji gali suteikti prievadus audio plokščių sintezatoriams (pvz. emu10k1) beto programiniams sintezatoriams, papildomiems įrenginiams ir t.t.\n"
-"Ši posistemė nekuria garso, MIDI įvykius apdoroja tiesiogiai įrenginiai/programos už ALSA prievadų; pavyzdžiui MIDI įvykiai nusiųsti į sintezatorių bus grojami tiesiogiai.\n"
-"Posistemę sukūrė Giacomo Lozito."
+msgstr "Ši posistemė siunčia MIDI įvykius naudotojo pasirinktai ALSA eiliškumo prievadų grupei. ALSA sekvencerio sąsaja yra labai universali, ji gali suteikti prievadus audio plokščių sintezatoriams (pvz. emu10k1) beto programiniams sintezatoriams, papildomiems įrenginiams ir t.t.\nŠi posistemė nekuria garso, MIDI įvykius apdoroja tiesiogiai įrenginiai/programos už ALSA prievadų; pavyzdžiui MIDI įvykiai nusiųsti į sintezatorių bus grojami tiesiogiai.\nPosistemę sukūrė Giacomo Lozito."
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
@@ -387,12 +326,9 @@
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
 "This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen ouput plugin.\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Ši posistemė atkuria garsą sisųdama MIDI įvykius į FluidSynth, realaus laiko programinį sintezatorių, paremtą SoundFont2 specifika (www.fluidsynth.org).\n"
-"Atkurtu garsu galima manipuliuoti grotuvo efektų įskiepiais ir jis yra apdorojamas išvesties įskiepiu.\n"
-"Posistemę sukūrė Giacomo Lozito."
+msgstr "Ši posistemė kuria garsą siųsdama MIDI įvykius į FluidSynth, realaus laiko programinis sintezatorius paremtas SoundFont2 specifika (www.fluidsynth.org).\nSukurtas garsas gali būti manipuliuojamas grotuvo efektų įskiepiais ir yra apdorojamas pasirinktu išvesties įskiepiu.\nPosistemę sukūrė Giacomo Lozito."
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
@@ -420,23 +356,21 @@
 
 #: src/amidi-plug/i_configure-alsa.c:401
 msgid "Mixer control: "
-msgstr "Mikserio valdymas:"
+msgstr "Mikšerio valdymas:"
 
 #: src/amidi-plug/i_configure-alsa.c:413
 msgid "Mixer settings"
-msgstr "Mikserio nustatymai"
+msgstr "Mikšerio nustatymai"
 
 #: src/amidi-plug/i_configure-alsa.c:429
 msgid "ALSA Backend not loaded or not available"
-msgstr "ALSA posistemė neužkrauta arba neprieinama"
+msgstr "ALSA posistemė neįkrauta arba neprieinama"
 
 #: src/amidi-plug/i_configure-alsa.c:448
 msgid ""
 "ALSA\n"
 "backend"
-msgstr ""
-"ALSA\n"
-"posistemė"
+msgstr "ALSA\nposistemė"
 
 #: src/amidi-plug/i_configure-ap.c:59
 msgid "AMIDI-Plug - backend information"
@@ -472,7 +406,7 @@
 
 #: src/amidi-plug/i_configure-ap.c:293
 msgid "pre-calculate length of MIDI files in playlist"
-msgstr "numanomas MIDI failų grojaraštyje ilgis"
+msgstr "numanomas MIDI failų, grojaraštyje, ilgis"
 
 #: src/amidi-plug/i_configure-ap.c:298
 msgid "extract comments from MIDI file (if available)"
@@ -486,9 +420,7 @@
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr ""
-"AMIDI\n"
-"Plug"
+msgstr "AMIDI\nPlug"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
@@ -500,7 +432,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:55
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr "AMIDI-Plug - pasirink SoundFont failą"
+msgstr "AMIDI-Plug - pasirinkite SoundFont failą"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:270
 msgid "FLUIDSYNTH BACKEND CONFIGURATION"
@@ -512,7 +444,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:345
 msgid "Filename"
-msgstr "Bylos vardas"
+msgstr "Failo vardas"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
@@ -600,9 +532,7 @@
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr ""
-"FluidSynth\n"
-"posistemė"
+msgstr "FluidSynth\nposistemė"
 
 #: src/amidi-plug/i_configure-timidity.c:39
 msgid "TIMIDITY BACKEND CONFIGURATION"
@@ -616,9 +546,7 @@
 msgid ""
 "TiMidity\n"
 "backend"
-msgstr ""
-"TiMidity\n"
-"posistemė"
+msgstr "TiMidity\nposistemė"
 
 #: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
@@ -634,7 +562,7 @@
 
 #: src/amidi-plug/i_fileinfo.c:208
 msgid "Length (msec):"
-msgstr "Ilgis (ms):"
+msgstr "Trukmė (ms):"
 
 #: src/amidi-plug/i_fileinfo.c:211
 msgid "Num of Tracks:"
@@ -680,9 +608,7 @@
 msgid ""
 "\n"
 "AMIDI-Plug "
-msgstr ""
-"\n"
-"AMIDI-Plug "
+msgstr "\nAMIDI-Plug "
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -707,28 +633,7 @@
 "Tony Vroon\n"
 "for the good help with alpha testing\n"
 "\n"
-msgstr ""
-"\n"
-"modular MIDI music player\n"
-"http://www.develia.org/projects.php?p=amidiplug\n"
-"\n"
-"sukūrė Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-"\n"
-"ypatinga padėka...\n"
-"\n"
-"Clemens Ladisch and Jaroslav Kysela\n"
-"už jų puikias programas aplaymidi ir amixer; jos\n"
-"ištikro buvo naudingos, su alsa-lib docs, norint \n"
-"daugiau sužinot apei ALSA API\n"
-"\n"
-"Alfredo Spadafina\n"
-"už gražų midi klaviatūros logo\n"
-"\n"
-"Tony Vroon\n"
-"už pagalbą testuojant alpha versiją\n"
-"\n"
+msgstr "\nMIDI muzikos grotuvas\nhttp://www.develia.org/projects.php?p=amidiplug\n\nsukūrė Giacomo Lozito\n< james@develia.org >\n\n\nypatinga padėka...\n\nClemens Ladisch ir Jaroslav Kysela\nuž jų puikias programas aplaymidi ir amixer; jos\niš tikro buvo naudingos, su alsa-lib docs, norint \ndaugiau sužinot apie ALSA API\n\nAlfredo Spadafina\nuž gražų midi klaviatūros logo\n\nTony Vroon\nuž pagalbą testuojant alpha versiją\n\n"
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
@@ -746,245 +651,238 @@
 msgid "None"
 msgstr "Joks"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "Atkūrimo pradžia"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Sužadina OSD kai grojaraščio elementas grojamas."
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "Pavadinimo keitimas"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr ""
-"Sužadina OSD kai, atkūrimo metu, dainos pavadinimas pasikeičia, bet bylos "
-"vardas lieka tas pats. Šita pasirinktis naudingiausia atvaizduojant "
-"interneto srauto dainos pavadinimo pokyčius. "
+msgstr "Sužadina OSD kai, atkūrimo metu, dainos pavadinimas pasikeičia, bet bylos vardas lieka tas pats. Šita pasirinktis naudingiausia atvaizduojant interneto srauto dainos pavadinimo pokyčius. "
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "Garso keitimas"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
 msgstr "Sužadina OSD kai garsas pakeičiamas."
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
 msgstr "Pauzė"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
 msgstr "Sužadina OSD kai atkūrimas sustabdomas"
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
 msgstr "Pauzė išjungiama"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Sužadina OSD kai atkūrimas atkuriamas po pauzės."
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
-msgstr "Vieta"
+msgstr "Padėtis"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
-msgstr "Relative X offset:"
+msgstr "Reliatyvus X poslinkis:"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
-msgstr "Relative Y offset:"
+msgstr "Reliatyvus Y poslinkis:"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr "Didžiausias OSD plotis:"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr "Kelių vaizduoklių pasirinktys"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
 msgstr "Vaizduoklis naudoja OSD:"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "visi vaizduokliai"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "vaizduoklis %i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "Laiko derinimas (ms)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "Monitorius:"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "Nustelbti:"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
-msgstr "Fade out:"
+msgstr "Išblukti:"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "Šriftai"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "Šriftas %i:"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "Šešėlis"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "Lokalizavimas"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 msgid "Disable UTF-8 conversion of text (in aosd)"
-msgstr "Išjungti UTF-8 teksto konvertavimą (aosd'e)"
+msgstr "Išjungti UTF-8 teksto konvertavimą (aosd)"
 
-#: src/aosd/aosd_ui.c:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "Pasirinkti išvaizdos failą"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr "Atvaizdavimo stilius"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "Spalvos"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "Spalva %i:"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
-msgstr "Derintas apipavalidinimas"
+msgstr "Pasirinktinis apipavalidinimas"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "Išvaizdos failas:"
 
-#: src/aosd/aosd_ui.c:672
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "Naršyti"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "Sužadinti"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "Įvykis"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
-msgstr "Composite tvarkytuvas rastas"
+msgstr "Kompozicionavimo tvarkyklė aptikta"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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 ""
-"Composite tvarkyklė nerasta;\n"
-"įjunk composite tvarkyklę, nes OSD neveiks taip kaip priklauso"
+msgstr "Kompozicionavimo tvarkyklė nerasta;\nįjunkite kompozicionavimo tvarkyklę, nes OSD neveiks taip kaip priklauso"
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 msgid "Composite manager not required for fake transparency"
-msgstr "Netikram permatomumui composite tvarkyklė nereikalinga"
+msgstr "Netikram permatomumui kompozicionavimo tvarkyklė nebūtina"
 
-#: src/aosd/aosd_ui.c:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
-msgstr "Skaidrumas"
+msgstr "Permatomumas"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
-msgstr "Netikras skaidrumas"
+msgstr "Netikras permatomumas"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "Tikras skaidrumas (reikalinga X composite plėtinys)"
+msgstr "Tikras permatomumas (reikalinga X kompozicionavimo plėtinys)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
-msgstr "Composite plėtinys neįkrautas"
+msgstr "Kompozicionavimo plėtinys neįkrautas"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
-msgstr "Composite plėtinys neprieinamas"
+msgstr "Kompozicionavimo plėtinys neprieinamas"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - konfigūracija"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr "Testas"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "Pozicija"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "Animacija"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "Tekstas"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "Dekoracijos"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "Sužadintojas"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "Kita"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
 msgstr "Audacious OSD - apie"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
-msgstr ""
-"\n"
-"Audacious OSD "
+msgstr "\nAudacious OSD "
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -995,16 +893,7 @@
 "written by Evan Martin\n"
 "http://neugierig.org/software/ghosd/\n"
 "\n"
-msgstr ""
-"\n"
-"http://www.develia.org/projects.php?p=audacious#aosd\n"
-"sukūrė Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-"On-Screen-Display paremta Ghosd library\n"
-"kurią sukūrė Evan Martin\n"
-"http://neugierig.org/software/ghosd/\n"
-"\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\nsukūrė Giacomo Lozito\n< james@develia.org >\n\nOn-Screen-Display paremta Ghosd library\nkurią sukūrė Evan Martin\nhttp://neugierig.org/software/ghosd/\n\n"
 
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
@@ -1028,13 +917,13 @@
 
 #: src/bs2b/plugin.c:196
 msgid "Presets:"
-msgstr "Nustatymų rinkiniai:"
+msgstr "Profiliai:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:241
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
 msgstr "Apie Audio CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.c:242
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
@@ -1046,27 +935,17 @@
 "This was a Google Summer of Code 2007 project.\n"
 "\n"
 "Copyright 2009 John Lindgren"
-msgstr ""
-"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
-"\n"
-"Didelis dėkui libcdio kūrėjams <http://www.gnu.org/software/libcdio/>\n"
-"\tir libcddb kūrėjams <http://libcddb.sourceforge.net/>.\n"
-"\n"
-"Beto dėkui Tony Vroon už pamokymus ir užvedimą ant kelio.\n"
-"\n"
-"Čia buvo Google Summer Code 2007 projektas.\n"
-"\n"
-"Copyright 2009 John Lindgren"
+msgstr "Autorinės teisės (c) 2007, sukūrė Calin Crisan <ccrisan@gmail.com> ir The Audacious Team.\n\nDidelis dėkui libcdio kūrėjams <http://www.gnu.org/software/libcdio/>\n\tir libcddb kūrėjams <http://libcddb.sourceforge.net/>.\n\nBeto dėkui Tony Vroon už pamokymus ir užvedimą ant kelio.\n\nČia buvo Google Summer Code 2007 projektas.\n\nAutorinės teisės 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:550
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:922
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
 msgstr "Diskasukis tuščias."
 
-#: src/cdaudio-ng/cdaudio-ng.c:924
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
 msgstr "Nepalaikomas disko tipas."
 
@@ -1112,7 +991,7 @@
 
 #: src/cdaudio-ng/configure.c:230
 msgid "Override default device: "
-msgstr "Nepaisyti numatytojo prietaiso:"
+msgstr "Nepaisyti numatytojo įrenginio:"
 
 #: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
 #: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
@@ -1167,7 +1046,7 @@
 
 #: src/console/configure.c:181
 msgid "Treble:"
-msgstr "Treble:"
+msgstr "Aukšti:"
 
 #: src/console/configure.c:202
 msgid "Default song length:"
@@ -1175,11 +1054,11 @@
 
 #: src/console/configure.c:208
 msgid "Resampling"
-msgstr "Resampling"
+msgstr "Diskretizacija"
 
 #: src/console/configure.c:214
 msgid "Enable audio resampling"
-msgstr "Įjungti audio resampling"
+msgstr "Įjungti garso diskretizaciją"
 
 #: src/console/configure.c:229
 msgid "Resampling rate:"
@@ -1195,7 +1074,7 @@
 
 #: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
-msgstr "Ignoruoti SPC žymų ilgį"
+msgstr "Nepaisyti trukmės iš SPC žymų"
 
 #: src/console/configure.c:246
 msgid "Increase reverb"
@@ -1205,9 +1084,7 @@
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not"
 " provide length information (i.e. looping tracks)."
-msgstr ""
-"Numatyta dainos trukmė, išreikšta sekundėmis, naudojama dainom kurios "
-"nesuteikia trukmės informacijos (pvz. looping tracks)"
+msgstr "Numatyta dainos trukmė, išreikšta sekundėmis, naudojama dainom kurios nesuteikia trukmės informacijos (pvz. besikartojantiems takeliams)"
 
 #: src/console/plugin.c:33
 msgid "About the Game Console Music Decoder"
@@ -1219,11 +1096,7 @@
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
-msgstr ""
-"Console music decoder engine paremtas Game_Music_Emu 0.5.2.\n"
-"Palaikomi formatai: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
-"Integravo į Audacious : William Pitcock <nenolod@dereferenced.org>, \n"
-" Shay Green <gblargg@gmail.com>\n"
+msgstr "Console music decoder engine paremtas Game_Music_Emu 0.5.2.\nPalaikomi formatai: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nIntegravo į Audacious : William Pitcock <nenolod@dereferenced.org>, \n Shay Green <gblargg@gmail.com>\n"
 
 #: src/crossfade/plugin.c:60
 msgid "About Crossfade"
@@ -1244,18 +1117,14 @@
 #: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
-msgstr ""
-"Garso perėjimo efektas nepavyko, nes dainos turi skirtingą kanalų skaičių."
+msgstr "Garso perėjimo efektas nepavyko, nes dainos turi skirtingą kanalų skaičių."
 
 #: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
 "You can use the Sample Rate Converter effect to resample the songs to the same rate."
-msgstr ""
-"Garso perėjimo efektas nepavyko, nes dainos turi skirtingus diskretizavimo dažnius.\n"
-"\n"
-"Gali panaudoti Sample Rate Converter efektą padaryti diskretizavimo dažnius tokius pat."
+msgstr "Garso perėjimo efektas nepavyko, nes dainos turi skirtingus diskretizavimo dažnius.\n\nGalite panaudoti Sample Rate Converter efektą padaryti diskretizavimo dažnius tokius pat."
 
 #: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
@@ -1276,11 +1145,7 @@
 "By Johan Levin 1999.\n"
 "\n"
 "Surround echo by Carl van Schaik 1999"
-msgstr ""
-"Echo įskiepis\n"
-"Sukūrė Johan Levin 1999.\n"
-"\n"
-"Surround echo sukūrė Carl van Schaik 1999"
+msgstr "Echo įskiepis\nSukūrė Johan Levin 1999.\n\nSurround echo sukūrė Carl van Schaik 1999"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
@@ -1302,7 +1167,7 @@
 msgid "Volume: (%)"
 msgstr "Garsas: (%)"
 
-#: src/ffaudio/ffaudio-core.c:784
+#: src/ffaudio/ffaudio-core.c:718
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1316,20 +1181,9 @@
 "libavcodec %s (%s)\n"
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
-msgstr ""
-"Daugiaformatis audio dekodavimo įskiepis skirtas Audacious paremtas\n"
-"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
-"Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
-"\n"
-"Audacious įskiepį kūrė:\n"
-" William Pitcock <nenolod@nenolod.net>,\n"
-" Matti Hämäläinen <ccr@tnsp.org>\n"
-"\n"
-"libavcodec %s (%s)\n"
-"libavformat %s (%s)\n"
-"libavutil %s (%s)\n"
+msgstr "Daugiaformatis audio dekodavimo įskiepis skirtas Audacious paremtas\nFFmpeg multimedia framework (http://www.ffmpeg.org/)\nCopyright (c) 2000-2009 Fabrice Bellard, et al.\n\nAudacious įskiepį kūrė:\n William Pitcock <nenolod@nenolod.net>,\n Matti Hämäläinen <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:798
+#: src/ffaudio/ffaudio-core.c:732
 msgid "About FFaudio Plugin"
 msgstr "Apie FFaudio įskiepį"
 
@@ -1337,55 +1191,55 @@
 msgid "About FileWriter-Plugin"
 msgstr "Apie FileWriter įskiepį"
 
-#: src/filewriter/filewriter.c:455
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "File Writer konfigūravimas"
 
-#: src/filewriter/filewriter.c:467
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "Išvesties failo formatas:"
 
-#: src/filewriter/filewriter.c:485
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "Konfigūruoti"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "Išsaugoti originalo aplanke"
 
-#: src/filewriter/filewriter.c:505
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr "Išsaugoti pasirinktame aplanke"
 
-#: src/filewriter/filewriter.c:515
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "Paskirties aplankas:"
 
-#: src/filewriter/filewriter.c:519
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
-msgstr "Rinkis aplanką"
+msgstr "Pasirinkite aplanką"
 
-#: src/filewriter/filewriter.c:538
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr "Gauti failo vardą iš:"
 
-#: src/filewriter/filewriter.c:541
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr "originalios failo žymės"
 
-#: src/filewriter/filewriter.c:547
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr "originalus failo vardas"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "Neištrinti failo plėtinio"
 
-#: src/filewriter/filewriter.c:572
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr "Įdėti takelio numerį į failo vardą"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "Auto"
 
@@ -1393,151 +1247,151 @@
 msgid "Joint Stereo"
 msgstr "Sujungtas stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:712
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr "MP3 konfigūravimas"
 
-#: src/filewriter/mp3.c:735
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "Algoritmo kokybė:"
 
-#: src/filewriter/mp3.c:760
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr "Išvesties diskretizavimo dažnis:"
 
-#: src/filewriter/mp3.c:788
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:795
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "Bitų dažnis / Kompresijos santykis:"
 
-#: src/filewriter/mp3.c:819
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "Bitų dažnis(kbps):"
 
-#: src/filewriter/mp3.c:852
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr "Kompresijos santykis:"
 
-#: src/filewriter/mp3.c:876
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr "Audio režimas:"
 
-#: src/filewriter/mp3.c:901
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "Kita:"
 
-#: src/filewriter/mp3.c:912
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr "Priversti griežtai laikytis ISO suderinamumo"
 
-#: src/filewriter/mp3.c:923
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "Apsauga nuo klaidų"
 
-#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "Kokybė"
 
-#: src/filewriter/mp3.c:945
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr "Įjungti VBR/ABR"
 
-#: src/filewriter/mp3.c:955
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "Tipas:"
 
-#: src/filewriter/mp3.c:988
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr "VBR pasirinktys:"
 
-#: src/filewriter/mp3.c:1004
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "Minimalus bitų dažnis (kbps):"
 
-#: src/filewriter/mp3.c:1031
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "Maksimalus bitų dažnis (kbps):"
 
-#: src/filewriter/mp3.c:1054
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr "Griežtai laikytis minimalaus bitų dažnio"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr "ABR pasirinktys:"
 
-#: src/filewriter/mp3.c:1076
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "Vidutinis bitų dažnis (kbps):"
 
-#: src/filewriter/mp3.c:1104
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr "VBR kokybės lygis:"
 
-#: src/filewriter/mp3.c:1123
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr "Nerašyti Xing VBR antraštės"
 
-#: src/filewriter/mp3.c:1137
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1147
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "Kadro parametrai:"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr "Pažymėti kaip saugomą autorinių teisių"
 
-#: src/filewriter/mp3.c:1170
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr "Pažymėti kaip originalą"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "ID3 parametrai"
 
-#: src/filewriter/mp3.c:1193
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
 msgstr "Priverstinai pridėti 2 versijos žymą"
 
-#: src/filewriter/mp3.c:1203
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr "Pridėti tik v1 žymą"
 
-#: src/filewriter/mp3.c:1210
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr "Pridėti tik v2 žymą"
 
-#: src/filewriter/mp3.c:1231
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
 msgstr "Žymos"
 
-#: src/filewriter/vorbis.c:236
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis koduotojo konfigūracija"
 
-#: src/filewriter/vorbis.c:256
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "Kokybės lygis (0 - 10):"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr "Apie FLAC Audio įskiepį"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1545,13 +1399,7 @@
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr ""
-"\n"
-"\n"
-"Originalų kodą parašė\n"
-"Ralf Ertzinger <ralf@skytale.net>\n"
-"\n"
-"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\nOriginalų kodą parašė\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
@@ -1564,38 +1412,17 @@
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-msgstr ""
-"Gnome Shortcut įskiepis\n"
-"Suteikia galimybę valdyti grotuvą su gnome trumpiniais.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
-msgid "Open Files"
-msgstr "Atverti failus"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
-msgid "Add Files"
-msgstr "Pridėti failus"
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr "Audacious2"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr "gnt vartotojo sąsaja"
+msgstr "Gnome Shortcut įskiepis\nSuteikia galimybę valdyti grotuvą su gnome sparčiaisiais klavišais.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
 
 #: src/gtkui/columns.c:36
 msgid "Entry number"
-msgstr "Įvesties numeris"
+msgstr "Įrašo numeris"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "Pavadinimas"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
 msgstr "Atlikėjas"
 
@@ -1603,7 +1430,7 @@
 msgid "Year"
 msgstr "Metai"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
 msgstr "Albumas"
 
@@ -1667,251 +1494,259 @@
 msgid "Undock"
 msgstr "Padidinti"
 
-#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
 msgstr "Išjungti"
 
-#: src/gtkui/menus.c:130
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
 msgstr "_Atverti failus ..."
 
-#: src/gtkui/menus.c:131
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
 msgstr "Atverti _URL ..."
 
-#: src/gtkui/menus.c:132
-msgid "_Add File ..."
-msgstr "_Pridėti failą ..."
-
 #: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "_Pridėti failus..."
+
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
 msgstr "Pridėti U_RL ..."
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
 msgstr "A_pie"
 
-#: src/gtkui/menus.c:136
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
 msgstr "_Nustatymai ..."
 
-#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Išeiti"
 
-#: src/gtkui/menus.c:140
+#: src/gtkui/menus.c:141
 msgid "_Play"
 msgstr "_Groti"
 
-#: src/gtkui/menus.c:141
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
 msgstr "Pauz_ė"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:143
 msgid "_Stop"
 msgstr "_Sustabdyti"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
 msgstr "Ankste_snis"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:145
 msgid "_Next"
 msgstr "_Sekantis"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
 msgstr "_Kartoti"
 
-#: src/gtkui/menus.c:147
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
 msgstr "S_umaišyti"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
 msgstr "N_esislinkti grojaraščiu"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
 msgstr "Sustabdyti _po šitos dainos"
 
-#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
 msgstr "Dainos _informacija ..."
 
-#: src/gtkui/menus.c:152
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
 msgstr "Šokti į _laiką"
 
-#: src/gtkui/menus.c:153
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
 msgstr "_Pereiti prie dainos ..."
 
-#: src/gtkui/menus.c:156
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
 msgstr "Pagal takelio _numerį"
 
-#: src/gtkui/menus.c:157
+#: src/gtkui/menus.c:158
 msgid "By _Title"
 msgstr "Pagal _pavadinimą"
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
 msgstr "Pagal _atlikėją"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
 msgstr "Pagal a_lbumą"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
 msgstr "Pagal išleidimo _datą"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
 msgstr "Pagal _failo kelią"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
 msgstr "Pagal _derintą eilutę"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
 msgstr "A_tvirkštine tvarka"
 
-#: src/gtkui/menus.c:165
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
 msgstr "_Atsitiktine tvarka"
 
-#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
 msgstr "_Atnaujinti"
 
 #: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Pašalinti _neprieinamus failus"
+
+#: src/gtkui/menus.c:172
 msgid "_Sort"
 msgstr "_Rikiuoti"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:174
 msgid "_New"
 msgstr "_Naujas"
 
-#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
 msgstr "_Uždaryti"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:177
 msgid "_Import ..."
 msgstr "_Įkelti ..."
 
-#: src/gtkui/menus.c:176
+#: src/gtkui/menus.c:178
 msgid "_Export ..."
 msgstr "_Eksportuoti ..."
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:180
 msgid "_Playlist Manager ..."
 msgstr "_Grojaraščio redaktorius ..."
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:181
 msgid "_Queue Manager ..."
 msgstr "_Eilės redaktorius ..."
 
-#: src/gtkui/menus.c:182
+#: src/gtkui/menus.c:184
 msgid "Volume _Up"
 msgstr "Pagarsi_nti"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
 msgstr "Patil_dyti"
 
-#: src/gtkui/menus.c:185
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
 msgstr "_Ekvalaizeris"
 
-#: src/gtkui/menus.c:187
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
 msgstr "E_fektai"
 
-#: src/gtkui/menus.c:190
+#: src/gtkui/menus.c:192
 msgid "_Interface"
-msgstr "_Vartotojo sąsaja"
+msgstr "_Naudotojo sąsaja"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Vizualizacijos"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
 msgstr "Rodyti _meniu juostą"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
 msgstr "Rodyti i_nfo juostą"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
 msgstr "Rodyti _būsenos juostą"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
 msgstr "Rodyti stulpelio _antraštes"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
 msgstr "Pasirinkti _stulpelius ..."
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
 msgstr "Slinkt_is keičiantis dainai"
 
-#: src/gtkui/menus.c:201
+#: src/gtkui/menus.c:204
 msgid "_File"
 msgstr "_Failas"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:205
 msgid "_Playback"
 msgstr "_Atkūrimas"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
 msgstr "G_rojaraštis"
 
-#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
-msgstr "_Paslaugos"
+msgstr "_Tarnybos"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:208
 msgid "_Output"
 msgstr "_Išvestis"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:209
 msgid "_View"
 msgstr "_Rodymas"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
 msgstr "_Į eilę/Iš eilės"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
 msgstr "Iškirpt_i"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:217
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:218
 msgid "_Paste"
 msgstr "_Įklijuoti"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:219
 msgid "Select _All"
 msgstr "Pasirinkti _viską"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:224
 msgid "_Rename"
 msgstr "_Pervadinti"
 
 #: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
-msgstr "GTK vartotojo sąsaja"
+msgstr "GTK naudotojo sąsaja"
 
-#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
@@ -1920,23 +1755,27 @@
 msgid "Buffering ..."
 msgstr "Įkraunama į atmintį ..."
 
-#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr "Klaida"
 
-#: src/gtkui/ui_statusbar.c:103 src/skins/ui_main.c:459
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Užverti"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:458
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.c:107
+#: src/gtkui/ui_statusbar.c:109
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1944,7 +1783,7 @@
 msgstr[1] "%d kanalai"
 msgstr[2] "%d kanalų"
 
-#: src/gtkui/ui_statusbar.c:122
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
@@ -1963,7 +1802,7 @@
 
 #: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
 msgid "Stop"
-msgstr "Stop"
+msgstr "Stabdyti"
 
 #: src/hotkey/gui.c:75
 msgid "Next Track"
@@ -1989,7 +1828,7 @@
 msgid "Volume Down"
 msgstr "Patildyti"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
 msgstr "Šokti į failą"
 
@@ -2018,10 +1857,7 @@
 "It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr ""
-"Nerekomenduojama susieti pagrindinius pelės mygtukus be prižiūrėtojų\n"
-"\n"
-"Tęsti?"
+msgstr "Nerekomenduojama susieti pagrindinius pelės mygtukus be prižiūrėtojų.\n\nTęsti?"
 
 #: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
@@ -2029,19 +1865,17 @@
 
 #: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
-msgstr "Global Hotkey įskiepio konfiguravimas"
+msgstr "Global Hotkey įskiepio konfigūravimas"
 
 #: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr ""
-"Paspauskite klavišų kombinaciją teksto lauke\n"
-"Taip pat galima sieti ir pelės mygtukus."
+msgstr "Paspauskite klavišų kombinaciją teksto lauke.\nTaip pat galima sieti ir pelės mygtukus."
 
 #: src/hotkey/gui.c:405
 msgid "Hotkeys:"
-msgstr "Karštieji klavišai:"
+msgstr "Spartieji klavišai:"
 
 #: src/hotkey/gui.c:424
 msgid "Action:"
@@ -2069,19 +1903,7 @@
 "\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
-msgstr ""
-"Globalus karštųjų klavišų įskiepis\n"
-"Valdyk grotuvą su globalių klavišų kombinacijomis arba multimedia klavišais.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-"Kūrėjai:\n"
-"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
-"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
-"\t\t\tBryn Davies <curious@ihug.com.au>\n"
-"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
-"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
-"\n"
+msgstr "Globalus karštųjų klavišų įskiepis\nValdykite grotuvą su globalių klavišų kombinacijomis arba multimedia klavišais.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nKūrėjai:\nCopyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n\t\t\tBryn Davies <curious@ihug.com.au>\n\t\t\tJonathan A. Davis <davis@jdhouse.org>\n\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n\n"
 
 #: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
@@ -2107,7 +1929,7 @@
 msgid "Enable debug printing"
 msgstr "Įjungti derinimo pranešimus"
 
-#: src/jack/jack.c:422
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2116,121 +1938,100 @@
 "\n"
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
-msgstr ""
-"XMMS jack Driver 0.17\n"
-"\n"
-"xmms-jack.sf.net\n"
-"Chris Morgan<cmorgan@alum.wpi.edu>\n"
-"\n"
-"Pritaikė Audacious programai\n"
-"Giacomo Lozito from develia.org"
+msgstr "XMMS jack Driver 0.17\n\nxmms-jack.sf.net\nChris Morgan<cmorgan@alum.wpi.edu>\n\nPritaikė Audacious programai\nGiacomo Lozito from develia.org"
 
-#: src/jack/jack.c:427
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
 msgstr "Apie JACK išvesties įskiepį 0.17"
 
-#: src/ladspa/plugin.c:414
+#: src/ladspa/plugin.c:415
 msgid "About LADSPA Host"
 msgstr "Apie LADSPA Hot"
 
-#: src/ladspa/plugin.c:515
+#: src/ladspa/plugin.c:516
 #, c-format
 msgid "%s Settings"
 msgstr "%s nustatymai:"
 
-#: src/ladspa/plugin.c:583
+#: src/ladspa/plugin.c:584
 msgid "LADSPA Host Settings"
 msgstr "LADSPA Host nustatymai"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:593
 msgid "Module paths:"
 msgstr "Modulio kelias:"
 
-#: src/ladspa/plugin.c:597
+#: src/ladspa/plugin.c:598
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr ""
-"Atskirk kelis kelius su dvitaškiu.\n"
-"Šie keliai ieškomi neradus ko reikia LADSPA_PATH kelyje.\n"
-"Kai pridedamai nauji keliai, paspausk ENTER naujų įskiepių paieškai."
+msgstr "Atskirkite kelis kelius su dvitaškiu.\nŠie keliai ieškomi neradus ko reikia LADSPA_PATH kelyje.\nKai pridedami nauji keliai, paspauskite ENTER naujų įskiepių paieškai."
 
-#: src/ladspa/plugin.c:613
+#: src/ladspa/plugin.c:614
 msgid "Available plugins:"
 msgstr "Prieinami įskiepiai:"
 
-#: src/ladspa/plugin.c:625
+#: src/ladspa/plugin.c:626
 msgid "Enable"
 msgstr "Įjungti"
 
-#: src/ladspa/plugin.c:631
+#: src/ladspa/plugin.c:632
 msgid "Enabled plugins:"
 msgstr "Įjungti įskiepiai:"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:647
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: src/lyricwiki/lyricwiki.c:269
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
-msgstr ""
-"\n"
-"Ieškoma dainos žodžių..."
+msgstr "\nIeškoma dainos žodžių..."
 
-#: src/lyricwiki/lyricwiki.c:293
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
-msgstr ""
-"\n"
-"Jungiamasi prie lyrics.wikia.com..."
+msgstr "\nJungiamasi prie lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:381
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
-msgstr ""
-"\n"
-"Dainų žodžiai nerasti."
+msgstr "\nDainų žodžiai nerasti."
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr "Apie Metronom"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr ""
-"Takto generatorius, sukūrė Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
-"\n"
-"Norint naudoti, pridėk URL: tact://beats*num/den\n"
-"pvz. tact://77 groti 77 dūžiai per minutę\n"
-"arba tact://60*3/4 groti 60 bpm 3/4 taktu"
+msgstr "Takto generatorius, sukūrė Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nNorint naudoti, pridėkite URL: tact://beats*num/den\npvz. tact://77 groti 77 dūžiai per minutę\narba tact://60*3/4 groti 60 bpm 3/4 taktu"
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takto generatorius: %d bpm"
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takto generatorius: %d bpm %d/%d"
 
 #: src/mixer/plugin.c:64
 msgid "About Channel Mixer"
-msgstr "Apie kanalų mikserį"
+msgstr "Apie kanalų mikšerį"
 
 #: src/mixer/plugin.c:93
 msgid "Channel Mixer Settings"
-msgstr "Kanalų Mikserio nustatymai"
+msgstr "Kanalų Mikšerio nustatymai"
 
 #: src/mixer/plugin.c:102
 msgid "Output channels:"
@@ -2240,41 +2041,39 @@
 msgid "Changes take effect at the next song change."
 msgstr "Pakeitimai įsigalios nuo sekančios dainos."
 
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
-msgstr "Apsupimas"
+msgstr "Erdvinis garsas"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
 msgstr "Išsiunčiama..."
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
 msgstr "Išsiųsti į MTP įrenginį"
 
-#: src/mtp_up/mtp.c:311
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
 msgstr "Atjungti MTP įrenginį"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
 msgstr "Sustabdyta"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
 msgstr "Audacious negroja."
 
 #: src/null/null.c:64
 msgid "Null output plugin "
-msgstr "Null išvesties įskiepio"
+msgstr "Null išvesties įskiepis"
 
 #: src/null/null.c:65
 msgid ""
 " by Christian Birchinger <joker@netswarm.net>\n"
 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
-msgstr ""
-" kūrė Christian Birchinger <joker@netswarm.net>\n"
-"paremta XMMS įskiepiu kurį sukūrė Håvard Kvål <havardk@xmms.org>"
+msgstr " kūrė Christian Birchinger <joker@netswarm.net>\nparemta XMMS įskiepiu kurį sukūrė Håvard Kvål <havardk@xmms.org>"
 
 #: src/null/null.c:68
 msgid "About Null Output"
@@ -2288,30 +2087,34 @@
 msgid "Run in real time"
 msgstr "Vykdyti realiu laiku"
 
-#: src/oss4/configure.c:76
+#: src/oss4/configure.c:81
 msgid "1. Default device"
 msgstr "1. Numatytasis įrenginys"
 
-#: src/oss4/configure.c:132
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
 msgstr "OSS4 išvesties įskiepio nustatymai"
 
-#: src/oss4/configure.c:144 src/OSS/configure.c:194
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "Audio įrenginys:"
 
-#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "Naudoti alternatyvų įrenginį:"
 
-#: src/oss4/configure.c:187
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
 msgstr "Išsaugoti garsą tarp sesijų"
 
-#: src/oss4/configure.c:191
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
 msgstr "Įgalinti formato keitimą kurį padarė OSS programinė įranga."
 
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Įgalinti išskirtinį režimą, siekiant išvengti virtualaus maišymosi."
+
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "Apie OSS4 įskiepį"
@@ -2347,7 +2150,7 @@
 
 #: src/OSS/configure.c:308
 msgid "Mixer Settings:"
-msgstr "Mikserio nustatymai:"
+msgstr "Mikšerio nustatymai:"
 
 #: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
@@ -2355,13 +2158,13 @@
 
 #: src/OSS/configure.c:320
 msgid "Mixer"
-msgstr "Mikseris"
+msgstr "Mikšeris"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr "Apie OSS Driver"
 
-#: src/pulse_audio/pulse_audio.c:673
+#: src/pulse_audio/pulse_audio.c:677
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Apie Audacious PulseAudio išvesties įskiepį"
 
@@ -2385,31 +2188,31 @@
 msgid "Method:"
 msgstr "Metodas:"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr "Keisti slaptažodį"
 
-#: src/scrobbler/configure.c:143
+#: src/scrobbler/configure.c:144
 msgid "Services"
-msgstr "Tarnyba"
+msgstr "Tarnybos"
 
-#: src/scrobbler/configure.c:165
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "Naudotojo vardas:"
 
-#: src/scrobbler/configure.c:171
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr "Scrobbler URL:"
 
-#: src/scrobbler/configure.c:211
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:238
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
@@ -2418,10 +2221,7 @@
 "Audacious AudioScrobbler Plugin\n"
 "\n"
 "Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
-msgstr ""
-"Audacious AudioScrobbler įskiepis\n"
-"\n"
-"Originaliai sukūrė Audun Hove <audun@nlc.no> ir Pipian <pipian@pipian.com>\n"
+msgstr "Audacious AudioScrobbler įskiepis\n\nOriginaliai sukūrė Audun Hove <audun@nlc.no> ir Pipian <pipian@pipian.com>\n"
 
 #: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
@@ -2435,17 +2235,49 @@
 msgid "SDL error"
 msgstr "SDL klaida"
 
-#: src/skins/plugin.c:165
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Žanras"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Fonoteka"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Sukurti grojaraštį"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Pridėti į grojaraštį"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Ieškoti fonotekoje"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "Norėdami importuoti muziką į Audacious fonoteką, pasirinkite aplanką ir paspauskite „atnaujinti“ piktogramą."
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Palaukite..."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Pasirinkite aplanką"
+
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "Apie Skinned GUI"
 
-#: src/skins/plugin.c:166
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
-msgstr ""
-"Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
-"\n"
+msgstr "Copyright (c) 2008, sukūrė Tomasz Moń <desowin@gmail.com>\n\n"
 
 #: src/skins/skins_cfg.c:207
 msgid "_Player:"
@@ -2531,79 +2363,112 @@
 msgid "Audacious Equalizer"
 msgstr "Audacious ekvalaizeris"
 
-#: src/skins/ui_equalizer.c:896
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
 msgstr "Šablonai"
 
-#: src/skins/ui_main.c:443
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Įkrauti šabloną"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Įkrauti auto išankstinius nustatymus"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Įkrauti ekvalaizerio išankstinius nustatymus"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Išsaugoti šablonus"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Išsaugoti auto išankstinius nustatymus"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Išsaugoti ekvalaizerio išankstinius nustatymus"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Ištrinti šabloną"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Ištrinti auto išankstinius nustatymus"
+
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:451
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:458
+#: src/skins/ui_main.c:459
 msgid "surround"
-msgstr "surround"
+msgstr "erdvinis"
 
-#: src/skins/ui_main.c:806
+#: src/skins/ui_main.c:807
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Eiti į %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:827
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Garsumas: %d%%"
 
-#: src/skins/ui_main.c:850
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balansas: %d%% kairė"
 
-#: src/skins/ui_main.c:852
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balansas: centras"
 
-#: src/skins/ui_main.c:854
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balansas: %d%% dešinė"
 
-#: src/skins/ui_main.c:980
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Pasirinkčių meniu"
 
-#: src/skins/ui_main.c:984
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
-msgstr "Išjungti 'Visada viršuje'"
+msgstr "Išjungti „Visada viršuje“"
 
-#: src/skins/ui_main.c:986
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
-msgstr "Įjungti 'Visada viršuje'"
+msgstr "Įjungti „Visada viršuje“"
 
-#: src/skins/ui_main.c:989
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Failo informacijos langas"
 
-#: src/skins/ui_main.c:994
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Vizualizacijos meniu"
 
-#: src/skins/ui_main.c:1648
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
 msgstr "Vieno režimas."
 
-#: src/skins/ui_main.c:1650
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
 msgstr "Grojaraščio režimas."
 
-#: src/skins/ui_main.c:1672
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr "Sustabdymas po dainos."
 
-#: src/skins/ui_main.c:1674
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
 msgstr "Nesustabdyti po dainos."
 
@@ -2617,7 +2482,7 @@
 
 #: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
-msgstr "Pikai"
+msgstr "Viršūnės"
 
 #: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
 msgid "Repeat"
@@ -2653,15 +2518,15 @@
 
 #: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
-msgstr "Sustumti grotuvą"
+msgstr "Suskleisti grotuvą"
 
 #: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
-msgstr "Sustumti grojaraščio redaktorių"
+msgstr "Suskleisti grojaraščio redaktorių"
 
 #: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
-msgstr "Sustumti ekvalaizerį"
+msgstr "Suskleisti ekvalaizerį"
 
 #: src/skins/ui_manager.c:115
 msgid "Analyzer"
@@ -2669,7 +2534,7 @@
 
 #: src/skins/ui_manager.c:116
 msgid "Scope"
-msgstr "Akiratis"
+msgstr "Sritis"
 
 #: src/skins/ui_manager.c:117
 msgid "Voiceprint"
@@ -2702,15 +2567,15 @@
 
 #: src/skins/ui_manager.c:133
 msgid "Dot Scope"
-msgstr "Taško akiratis"
+msgstr "Taško sritis"
 
 #: src/skins/ui_manager.c:134
 msgid "Line Scope"
-msgstr "Linijos akiratis"
+msgstr "Linijos sritis"
 
 #: src/skins/ui_manager.c:135
 msgid "Solid Scope"
-msgstr "Vientisas akiratis"
+msgstr "Vientisa sritis"
 
 #: src/skins/ui_manager.c:141
 msgid "Ice"
@@ -2818,7 +2683,7 @@
 
 #: src/skins/ui_manager.c:223
 msgid "Loads a playlist file into the selected playlist."
-msgstr "Įkrauna grojaraštį į pasirinktą grojaraštį."
+msgstr "Įkrauna grojaraščio failą į pasirinktą grojaraštį."
 
 #: src/skins/ui_manager.c:226
 msgid "Export Playlist"
@@ -2850,11 +2715,11 @@
 
 #: src/skins/ui_manager.c:238
 msgid "Interface"
-msgstr "Vartotojo sąsaja"
+msgstr "Naudotojo sąsaja"
 
 #: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
-msgstr "Vartotojo sąsajos nustatymai..."
+msgstr "Naudotojo sąsajos nustatymai..."
 
 #: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
@@ -2884,7 +2749,7 @@
 
 #: src/skins/ui_manager.c:257
 msgid "Invert Selection"
-msgstr "Apversti pasirinktus"
+msgstr "Invertuoti pažymėjimą"
 
 #: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
@@ -3105,189 +2970,169 @@
 msgid "Clear A-B"
 msgstr "Išvalyti A-B"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
-msgid "Jump to Playlist Start"
-msgstr "Šokti į grojaraščio pradžią"
-
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
 msgstr "Šokti į laiką"
 
-#: src/skins/ui_manager.c:424
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
 msgstr "Perjungti eilę"
 
-#: src/skins/ui_manager.c:425
+#: src/skins/ui_manager.c:422
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Įjungia/Išjungia įrašą grojaraščio eilėje."
 
-#: src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:425
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr "Iškirpti"
 
-#: src/skins/ui_manager.c:432
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr "Įklijuoti"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "Įkrauti"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:437
 msgid "Import"
-msgstr "Įkelti"
+msgstr "Importuoti"
 
-#: src/skins/ui_manager.c:441
+#: src/skins/ui_manager.c:438
 msgid "Save"
 msgstr "Išsaugoti"
 
-#: src/skins/ui_manager.c:442
+#: src/skins/ui_manager.c:439
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
 msgstr "Šablonas"
 
-#: src/skins/ui_manager.c:445
-msgid "Load preset"
-msgstr "Įkrauti šabloną"
-
-#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
 msgstr "Savaime įsikraunantis šablonas"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr "Įkrauti savaime įsikraunantį šabloną"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
 msgstr "Įkrauti numatytąjį šabloną į ekvalaizerį"
 
-#: src/skins/ui_manager.c:453
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "Nulis"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
-msgstr "Nustatyti ekvalaizerio šablono lygius į nulius"
+msgstr "Nustatyti ekvalaizerio šablono lygius nuliui"
 
-#: src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "Iš failo"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
 msgstr "Įkrauti šabloną iš failo"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
 msgstr "Iš WinAMP EQF failo"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
 msgstr "Įkrauti šabloną iš WinAMP EQF failo"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
 msgstr "WinAMP šablonai"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
 msgstr "Importuoti WinAMP šablonus"
 
 #: src/skins/ui_manager.c:466
-msgid "Save preset"
-msgstr "Išsaugoti šablonus"
-
-#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "Išsaugoti savaime įsikraunantį šabloną"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
 msgstr "Išsaugoti numatytąjį šabloną"
 
-#: src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "Į failą"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
 msgstr "Išsaugoti šabloną į failą"
 
-#: src/skins/ui_manager.c:477
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
 msgstr "Į WinAMP EQF failą"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
 msgstr "Išsaugoti šabloną į WinAMP EQF failą"
 
 #: src/skins/ui_manager.c:481
-msgid "Delete preset"
-msgstr "Ištrinti šabloną"
-
-#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "Ištrinti savaime įsikraunantį šabloną"
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
 msgstr "Ieškoti įrašų aktyviame grojaraštyje"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 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 "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr ""
-"Surask ir pasirink įrašus grojaraštyje užpildydamas vieną ar kelis "
-"laukelius. Laukeliai naudoja reguliariųjų išraiškų sintaksę, raidžių lygis "
-"nesvarbus. Jei nežinai kaip veikia reguliariosios išraiškos, paprasčiausiai "
-"įrašyk paraidžiui tai ko ieškai."
+msgstr "Surask ir pasirink įrašus grojaraštyje užpildydamas vieną ar kelis laukelius. Laukeliai naudoja reguliariųjų išraiškų sintaksę, raidžių lygis nesvarbus. Jei nežinai kaip veikia reguliariosios išraiškos, paprasčiausiai įrašyk paraidžiui tai ko ieškai."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "Pavadinimas:"
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr "Albumas:"
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
 msgstr "Atlikėjas:"
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "Failo vardas:"
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr "Prie ieškant, išvalyti buvusius pasirinkimus"
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
 msgstr "Atitinkantiems įrašams automatiškai perjungti eilę"
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
 msgstr "Iš surastų įrašų sukurti naują grojaraštį"
 
-#: src/skins/ui_playlist.c:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
 msgstr "Audacious grojaraščio redaktorius"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d iš %d)"
@@ -3300,12 +3145,12 @@
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Išarchyvuotas Winamp 2.x skin"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
-msgstr "Negaliu sukurt aplanko (%s): %s\n"
+msgstr "Negaliu sukurti aplanko (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
 msgstr "Apie sndfile įsiepį"
 
@@ -3335,33 +3180,31 @@
 
 #: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
-msgstr "SndStretch - Konfiguravimas"
+msgstr "SndStretch - Konfigūravimas"
 
-#: src/song_change/song_change.c:447
+#: src/song_change/song_change.c:437
 msgid "Command to run when Audacious starts a new song."
 msgstr "Komanda kurią paleisti kai Audacious paleidžia naują dainą."
 
-#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
-#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
 msgstr "Komanda:"
 
-#: src/song_change/song_change.c:453
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
 msgstr "Komanda kurią paleisti prieš pasibaigiant dainai."
 
-#: src/song_change/song_change.c:459
+#: src/song_change/song_change.c:449
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Komanda kurią paleisti kai Audacious pasiekia grojaraščio pabaigą."
 
-#: src/song_change/song_change.c:465
+#: src/song_change/song_change.c:455
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr ""
-"Komanda kurią paleisti kai dainos pavadinimas pasikeičia (t.y. interneto "
-"srautų pavadinimai)"
+msgstr "Komanda kurią paleisti kai dainos pavadinimas pasikeičia (t.y. interneto srautų pavadinimai)"
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3378,44 +3221,27 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr ""
-"Galite naudoti tokio formato žymas\n"
-"kurios bus pakeistos prieš kviečiant komandą\n"
-"(nevisos yra naudingos end-of-playlist komandai).\n"
-"\n"
-"%F: Dažnis ( hertcais)\n"
-"%c: Kanalų kiekis\n"
-"%f: failo vardas (pilnas kelias)\n"
-"%l: trukmė (milisekundėmis)\n"
-"%n arba %s: Dainos pavadinimas\n"
-"%r: Rate (bitais per sekundę)\n"
-"%t: Grojaraščio vieta (%02d)\n"
-"%p: Dabar grojama (1 or 0)\n"
-"%a: Atlikėjas\n"
-"%b: Albumas\n"
-"%T: Takelio pavadinimas"
-
-#: src/song_change/song_change.c:498
+msgstr "Galite naudoti tokio formato žymas\nkurios bus pakeistos prieš kviečiant komandą\n(nevisos yra naudingos end-of-playlist komandai).\n\n%F: Dažnis ( hercais)\n%c: Kanalų kiekis\n%f: failo vardas (pilnas kelias)\n%l: trukmė (milisekundėmis)\n%n arba %s: Dainos pavadinimas\n%r: Rate (bitais per sekundę)\n%t: Grojaraščio vieta (%02d)\n%p: Dabar grojama (1 or 0)\n%a: Atlikėjas\n%b: Albumas\n%T: Takelio pavadinimas"
+
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr ""
-"Parametrai pateikti komandų interpretatoriui turi būt "
-"kabutėse. Darant kitaip rizikuojate savo saugumu."
+msgstr "Parametrai pateikti komandų interpretatoriui turi būti kabutėse. Darant kitaip rizikuojate savo saugumu."
 
-#: src/song_change/song_change.c:509
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr "Komandos"
 
-#: src/song_change/song_change.c:539
+#: src/song_change/song_change.c:529
 msgid "Song Change"
 msgstr "Dainos keitimas"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr "Apie Status Icon įskiepį"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3424,63 +3250,58 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager.\n"
-msgstr ""
-"Status Icon įskiepis\n"
-"\n"
-"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"Šis įskiepis sistemos dėkle sukuria piktogramą.\n"
+msgstr "Status Icon įskiepis\n\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nŠis įskiepis sistemos dėkle sukuria piktogramą.\n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr "Status icon įskiepis - Nustatymai"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr "Dešinio pelės klavišo meniu"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
 msgstr "Mažas atkūrimo meniu #1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
 msgstr "Mažas atkūrimo meniu #2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr "Pelės ratuko veiksmas"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "Keisti garsą"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
 msgstr "Keisti grojančią dainą"
 
-#: src/statusicon/statusicon.c:500
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
 msgstr "Kiti nustatymai"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
 msgstr "Išjungti iššokantį langą"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
 msgstr "Uždaryti į pranešimų srity (sistemos dėklą)"
 
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Slenkant aukštyn, žengti grojaraščiu"
+
 #: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
-msgstr ""
-"Extra Stereo Plugin\n"
-"\n"
-"Kūrė Johan Levin 1999."
+msgstr "Extra Stereo Plugin\n\nKūrė Johan Levin 1999."
 
 #: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
@@ -3490,77 +3311,25 @@
 msgid "Configure Extra Stereo"
 msgstr "Konfigūruoti Extra Stereo"
 
-#: src/streambrowser/gui/streambrowser_win.c:78
-msgid "Search:"
-msgstr "Ieškoti:"
-
-#: src/streambrowser/gui/streambrowser_win.c:97
-#: src/streambrowser/gui/streambrowser_win.c:372
-msgid "Add Bookmark"
-msgstr "Pridėti žymą"
-
-#: src/streambrowser/gui/streambrowser_win.c:324
-msgid "Stream name"
-msgstr "Srauto pavadinimas"
-
-#: src/streambrowser/gui/streambrowser_win.c:331
-msgid "Now playing"
-msgstr "Dabar grojama"
-
-#: src/streambrowser/gui/streambrowser_win.c:369
-msgid "Remove Bookmark"
-msgstr "Ištrinti žymą"
-
-#: src/streambrowser/streambrowser.c:330
-msgid "About Stream Browser"
-msgstr "Apie Stream browser"
-
-#: src/streambrowser/streambrowser.c:331
-msgid ""
-"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming directories.\n"
-"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
-"\tand of course to the whole Audacious community.\n"
-"\n"
-"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-"\n"
-"This was a Google Summer of Code 2008 project."
-msgstr ""
-"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming directories.\n"
-"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
-"\tand of course to the whole Audacious community.\n"
-"\n"
-"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-"\n"
-"This was a Google Summer of Code 2008 project."
-
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr "Apie Tonų Generatorių"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
-msgstr ""
-"Sinus tono generatorius, sukūrė Haavard Kvaalen <havardk@xmms.org>\n"
-"Patobulino Daniel J. Peng <danielpeng@bigfoot.com>\n"
-"\n"
-"Norint naudot pridėk URL: tone://frequency1;frequency2;frequency3;...\n"
-"pvz. tone://2000;2005 norint grot 2000Hz toną ir 2005Hz toną"
+msgstr "Sinus tono generatorius, sukūrė Haavard Kvaalen <havardk@xmms.org>\nPatobulino Daniel J. Peng <danielpeng@bigfoot.com>\n\nNorint naudot pridėk URL: tone://frequency1;frequency2;frequency3;...\npvz. tone://2000;2005 norint grot 2000Hz toną ir 2005Hz toną"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr "Tono generatorius: "
 
@@ -3568,11 +3337,11 @@
 msgid "About File I/O Plugin"
 msgstr "Apie File I/O įskiepį"
 
-#: src/vorbis/vorbis.c:572
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Apie Ogg Vorbis Audio įskiepį"
 
-#: src/vorbis/vorbis.c:577
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -3589,22 +3358,7 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>\n"
 "\n"
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
-msgstr ""
-"Ogg Vorbis sukūrė Xiph.org Foundation\n"
-"\n"
-"Orginalų kodą rašė\n"
-"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-"Contributions from\n"
-"Chris Montgomery <monty@xiph.org>\n"
-"Peter Alm <peter@xmms.org>\n"
-"Michael Smith <msmith@labyrinth.edu.au>\n"
-"Jack Moffitt <jack@icecast.org>\n"
-"Jorn Baayen <jorn@nl.linux.org>\n"
-"Haavard Kvaalen <havardk@xmms.org>\n"
-"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-"Eugene Zagidullin <e.asphyx@gmail.com>\n"
-"\n"
-"Aplankykite Xiph.org Foundation http://www.xiph.org/\n"
+msgstr "Ogg Vorbis sukūrė Xiph.org Foundation\n\nOrginalų kodą rašė\nTony Arcieri <bascule@inferno.tusculum.edu>\nContributions from\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHaavard Kvaalen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\nAplankykite Xiph.org Foundation http://www.xiph.org/\n"
 
 #: src/vtx/about.c:14
 msgid "About Vortex Player"
@@ -3619,14 +3373,7 @@
 "and other AY/YM music sites.\n"
 "\n"
 "Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr ""
-"Vortex formato grotuvą kūrė Sashnov Alexander <sashnov@ngs.ru>\n"
-"Sukurtas remiantis kodu rastu _vtx.dll kurį kūrė Roman Sherbakov <v_soft@microfor.ru>\n"
-"\n"
-"Muzikos vtx formatu galim rast http://vtx.microfor.ru/music.htm\n"
-"ir kitose AY/YM muzikos svetainėse.\n"
-"\n"
-"Integravo į Audacious Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr "Vortex formato grotuvą kūrė Sashnov Alexander <sashnov@ngs.ru>\nSukurtas remiantis kodu rastu _vtx.dll kurį kūrė Roman Sherbakov <v_soft@microfor.ru>\n\nMuzikos vtx formatu galim rast http://vtx.microfor.ru/music.htm\nir kitose AY/YM muzikos svetainėse.\n\nIntegravo į Audacious Pavel Vymetalek <pvymetalek@seznam.cz>"
 
 #: src/wavpack/wavpack.c:353
 #, c-format
@@ -3639,10 +3386,4 @@
 "\n"
 "Some of the plugin code was by Miles Egan\n"
 "Visit the Wavpack site at http://www.wavpack.com/\n"
-msgstr ""
-"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
-"\n"
-"Dalį įskiepio sukūrė Miles Egan\n"
-"Aplankykite Wavpack puslapį http://www.wavpack.com/\n"
-
-
+msgstr "Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n\nDalį įskiepio sukūrė Miles Egan\nAplankykite Wavpack puslapį http://www.wavpack.com/\n"

audacious-plugins-3.1.1.tar.bz2/po/pl.po -> audacious-plugins-3.2.4.tar.bz2/po/pl.po Changed

@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
+# Piotr Sokół <psokol@jabster.pl>, 2012.
 # <sz.weihs@gmail.com>, 2011.
+# Szymon Weihs <sz.weihs@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUDPLUG\n"
-"POT-Creation-Date: 2011-11-15 22:40-0500\n"
-"PO-Revision-Date: 2011-11-17 00:56+0000\n"
-"Last-Translator: Shymwo <sz.weihs@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-03-01 13:10+0000\n"
+"Last-Translator: Szymon Weihs <sz.weihs@gmail.com>\n"
 "Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,31 +26,26 @@
 "Using libfaad2-%s for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
-msgstr ""
-"Używanie libfaad2-%s do dekodowania.\n"
-"Dekoder FAAD2 AAC/HE-AAC/HE-AACv2/DRM (c) Nero AG, www.nero.com\n"
-"Copyright (c) 2005-2006 Zespół Audacious"
+msgstr "Dekoduje dźwięk przy użyciu bibliteki libfaad2-%s.\nDekoder FAAD2 AAC/HE-AAC/HE-AACv2/DRM (c) Nero AG, www.nero.com\nCopyright (c) 2005-2006 Zespół Audacious"
 
 #: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
-msgstr "O wtyczce dekodera MP4 AAC"
+msgstr "Informacje o wtyczce MP4 AAC"
 
 #: src/alarm/alarm.c:312
 msgid "About Alarm"
-msgstr "O wtyczce Alarm"
+msgstr "Informacje o wtyczce Alarm"
 
 #: src/alarm/alarm.c:313
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr ""
-"Wtyczka, która może być użyta do rozpoczęcia odtwarzania o ustalonym czasie.\n"
-"Pierwotnie stworzona przez Adam Feaking oraz Daniel Stodden."
+msgstr "Wtyczka, która może być użyta do rozpoczęcia odtwarzania o ustalonym czasie.\nPierwotnie stworzona przez Adam Feaking oraz Daniel Stodden."
 
 #: src/alarm/interface.c:33
 msgid "Alarm"
-msgstr "Budzik"
+msgstr "Alarm"
 
 #: src/alarm/interface.c:40
 msgid "This is your wakeup call."
@@ -60,7 +57,7 @@
 
 #: src/alarm/interface.c:214
 msgid "Alarm Settings"
-msgstr "Ustawienia budzika"
+msgstr "Preferencje wtyczki Alarm"
 
 #: src/alarm/interface.c:229 src/alarm/interface.c:401
 #: src/alarm/interface.c:773
@@ -81,23 +78,24 @@
 
 #: src/alarm/interface.c:379
 msgid "Quiet after:"
-msgstr "Wycisz po:"
+msgstr "Wyciszenie po:"
 
 #: src/alarm/interface.c:389
 msgid "Alarm at (default):"
-msgstr "Alarm o (domyślnie):"
+msgstr "Czas alarmu (domyślnie):"
 
 #: src/alarm/interface.c:409
 msgid "Choose the days for the alarm to come on"
-msgstr "Wybierz dni, w których budzik zostanie uruchomiony"
+msgstr "Proszę wybrać dni, w których alarm będzie uruchamiany."
 
 #: src/alarm/interface.c:437 src/alarm/interface.c:485
 #: src/alarm/interface.c:533 src/alarm/interface.c:581
 #: src/alarm/interface.c:629 src/alarm/interface.c:677
 #: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
 msgid "Default"
-msgstr "Domyślnie"
+msgstr "Domyślny"
 
 #: src/alarm/interface.c:763
 msgid "Day"
@@ -149,11 +147,11 @@
 
 #: src/alarm/interface.c:946
 msgid "Current"
-msgstr "Aktualny"
+msgstr "Bieżąca"
 
 #: src/alarm/interface.c:954
 msgid "Start at"
-msgstr "Rozpocznij od"
+msgstr "Początkowa"
 
 #: src/alarm/interface.c:982 src/alarm/interface.c:1026
 msgid "%"
@@ -161,19 +159,19 @@
 
 #: src/alarm/interface.c:998
 msgid "Final"
-msgstr "Końcowa głośność"
+msgstr "Końcowa"
 
 #: src/alarm/interface.c:1051
 msgid "Additional Command"
-msgstr "Dodatkowe komendy"
+msgstr "Dodatkowe polecenia"
 
 #: src/alarm/interface.c:1077
 msgid "enable"
-msgstr "włącz"
+msgstr "Włączenie"
 
 #: src/alarm/interface.c:1085
 msgid "Playlist (optional)"
-msgstr "Playlista (opcjonalnie)"
+msgstr "Lista odtwarzania (opcjonalnie)"
 
 #: src/alarm/interface.c:1111
 msgid "Browse..."
@@ -248,57 +246,7 @@
 " 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"
+msgstr "\nCzas\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\nDni\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\nGł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\nOpcje:\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:1190 src/skins/ui_manager.c:382
 msgid "Help"
@@ -328,7 +276,7 @@
 
 #: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
-msgstr "Preferencje wtyczki wyjściowej ALSA"
+msgstr "Preferencje wtyczki ALSA"
 
 #: src/alsa/config.c:445
 msgid "PCM device:"
@@ -348,19 +296,17 @@
 
 #: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
-msgstr "O wtyczce wyjściowej ALSA"
+msgstr "Informacje o wtyczce ALSA"
 
 #: src/alsa/plugin.c:81
 msgid "ALSA error"
 msgstr "Błąd ALSA"
 
-#: src/amidi-plug/amidi-plug.c:325
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr ""
-"Nie wybrałeś żadnych portów sekwencera dla odtwarzania MIDI. Możesz to "
-"zrobić w opcjach wtyczki MIDI."
+msgstr "Nie wybrałeś żadnych portów sekwencera dla odtwarzania MIDI. Możesz to zrobić w opcjach wtyczki MIDI."
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:35
 msgid "ALSA Backend "
@@ -371,10 +317,7 @@
 "This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
 "This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Ten backend wysyła zdarzenia MIDI do grupy wybranych przez użytkownika portów sekwencera ALSA. Interfejs sekwencera ALSA jest bardzo wszechstronny, może on dostarczyć porty dla sprzętowych syntezatorów kart dźwiękowych (np. emu10k1), a także dla programowych syntezatorów, zewnętrznych urządzeń itp.\n"
-"Ten backend nie wytwarza dźwięku, zdarzenia MIDI są obsługiwane bezpośrednio przez urządzenia/programy poprzez porty ALSA; na przykład, zdarzenia MIDI wysłane do sprzętowego syntezatora zostaną bezpośrednio odtworzone.\n"
-"Backend napisany przez Giacomo Lozito."
+msgstr "Ten backend wysyła zdarzenia MIDI do grupy wybranych przez użytkownika portów sekwencera ALSA. Interfejs sekwencera ALSA jest bardzo wszechstronny, może on dostarczyć porty dla sprzętowych syntezatorów kart dźwiękowych (np. emu10k1), a także dla programowych syntezatorów, zewnętrznych urządzeń itp.\nTen backend nie wytwarza dźwięku, zdarzenia MIDI są obsługiwane bezpośrednio przez urządzenia/programy poprzez porty ALSA; na przykład, zdarzenia MIDI wysłane do sprzętowego syntezatora zostaną bezpośrednio odtworzone.\nBackend napisany przez Giacomo Lozito."
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
@@ -383,12 +326,9 @@
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
 "This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen ouput plugin.\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Ten backend wytwarza dźwięk poprzez wysyłanie zdarzeń MIDI do FluidSynth, programowego syntezatora czasu rzeczywistego opartego na specyfikacji SoundFont2 (www.fluidsynth.org).\n"
-"Wytworzony dźwięk może być modyfikowany przez wtyczki efektów odtwarzacza i jest przetwarzany przez wybraną wtyczkę wyjściową.\n"
-"Backend napisany przez Giacomo Lozito."
+msgstr "Ten backend wytwarza dźwięk poprzez wysyłanie zdarzeń MIDI do FluidSynth, programowego syntezatora czasu rzeczywistego opartego o specyfikację SoundFont2 (www.fluidsynth.org).\nUzyskany dźwięk może być modyfikowany przez wtyczki efektów odtwarzacza oraz przetworzony przez dowolnie wybraną wtyczkę wyjściową.\nBackend napisany przez Giacomo Lozito."
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
@@ -430,9 +370,7 @@
 msgid ""
 "ALSA\n"
 "backend"
-msgstr ""
-"Backend\n"
-"ALSA"
+msgstr "Backend\nALSA"
 
 #: src/amidi-plug/i_configure-ap.c:59
 msgid "AMIDI-Plug - backend information"
@@ -482,9 +420,7 @@
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr ""
-"AMIDI\n"
-"Plug"
+msgstr "AMIDI\nPlug"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
@@ -596,9 +532,7 @@
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr ""
-"Backend\n"
-"FluidSynth"
+msgstr "Backend\nFluidSynth"
 
 #: src/amidi-plug/i_configure-timidity.c:39
 msgid "TIMIDITY BACKEND CONFIGURATION"
@@ -612,9 +546,7 @@
 msgid ""
 "TiMidity\n"
 "backend"
-msgstr ""
-"Backend\n"
-"TiMidity"
+msgstr "Backend\nTiMidity"
 
 #: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
@@ -634,7 +566,7 @@
 
 #: src/amidi-plug/i_fileinfo.c:211
 msgid "Num of Tracks:"
-msgstr "Liczba utworów"
+msgstr "Liczba ścieżek"
 
 #: src/amidi-plug/i_fileinfo.c:216
 msgid "variable"
@@ -654,7 +586,7 @@
 
 #: src/amidi-plug/i_fileinfo.c:237
 msgid " MIDI Comments and Lyrics "
-msgstr " Komentarze i teksty piosenek MIDI "
+msgstr " Komentarze i teksty utworów MIDI "
 
 #: src/amidi-plug/i_fileinfo.c:288
 msgid "* no comments available in this MIDI file *"
@@ -662,7 +594,7 @@
 
 #: src/amidi-plug/i_fileinfo.c:301
 msgid "* no lyrics available in this MIDI file *"
-msgstr "* brak dostępnych tekstów piosenek w tym pliku MIDI"
+msgstr "* brak dostępnych tekstów utworów w tym pliku MIDI"
 
 #: src/amidi-plug/i_fileinfo.c:349
 msgid " (invalid UTF-8)"
@@ -670,15 +602,13 @@
 
 #: src/amidi-plug/i_utils.c:43
 msgid "AMIDI-Plug - about"
-msgstr "O wtyczce AMIDI-Plug"
+msgstr "Informacje o wtyczce AMIDI-Plug"
 
 #: src/amidi-plug/i_utils.c:68
 msgid ""
 "\n"
 "AMIDI-Plug "
-msgstr ""
-"\n"
-"AMIDI-Plug "
+msgstr "\nAMIDI-Plug "
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -703,28 +633,7 @@
 "Tony Vroon\n"
 "for the good help with alpha testing\n"
 "\n"
-msgstr ""
-"\n"
-"modułowy odtwarzacz muzyczny MIDI\n"
-"http://www.develia.org/projects.php?p=amidiplug\n"
-"\n"
-"stworzony przez Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-"\n"
-"specjalne podziękowania dla...\n"
-"\n"
-"Clemens Ladisch oraz Jaroslav Kysela\n"
-"za ich fajne programy aplaymidi i amixer; były one\n"
-"bardzo przydatne, równolegle z dokumentacją alsa-lib,\n"
-"w nauce ALSA API\n"
-"\n"
-"Alfredo Spadafina\n"
-"za ładne logo z klawiaturą midi\n"
-"\n"
-"Tony Vroon\n"
-"za dobrą pomoc w testowaniu alfa\n"
-"\n"
+msgstr "\nmodułowy odtwarzacz muzyczny MIDI\nhttp://www.develia.org/projects.php?p=amidiplug\n\nstworzony przez Giacomo Lozito\n< james@develia.org >\n\n\nspecjalne podziękowania dla...\n\nClemens Ladisch oraz Jaroslav Kysela\nza ich fajne programy aplaymidi i amixer; były one\nbardzo przydatne, równolegle z dokumentacją alsa-lib,\nw nauce ALSA API\n\nAlfredo Spadafina\nza ładne logo z klawiaturą midi\n\nTony Vroon\nza dobrą pomoc w testowaniu alfa\n\n"
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
@@ -742,245 +651,238 @@
 msgid "None"
 msgstr "Brak"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "Rozpoczęcie odtwarzania"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "Wyświetla OSD, gdy zostanie rozpoczęte odtwarzanie utworu na liście."
+msgstr "Wyświetla menu ekranowe po zmianie pozycji na liście odtwarzania."
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "Zmiana tytułu"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr ""
-"Wyświetla OSD, gdy podczas odtwarzania tytuł piosenki zmieni się, ale plik "
-"pozostanie ten sam. Zazwyczaj przydaje się to przy słuchaniu muzyki ze "
-"strumieni internetowych."
+msgstr "Wyświetla menu ekranowe po zmianie tytułu nagrania, bez zmiany odtwarzanego pliku. Użyteczne podczas odtwarzania strumieni internetowych."
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "Zmiana głośności"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
-msgstr "Wyświetla OSD, gdy nastąpi zmiana głośności"
+msgstr "Wyświetla menu ekranowe po zmianie głośności odtwarzania."
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
-msgstr "Pauza Wł."
+msgstr "Wstrzymanie odtwarzania"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
-msgstr "Wyświetla OSD, gdy odtwarzanie zostanie wstrzymane."
+msgstr "Wyświetla menu ekranowe po wstrzymaniu odtwarzania."
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
-msgstr "Pauza Wył."
+msgstr "Wznowienie odtwarzania"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
-msgstr "Wyświetla OSD, gdy odtwarzanie zostanie wznowione."
+msgstr "Wyświetla menu ekranowe po wznowieniu odtwarzania."
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "Rozmieszczenie"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
 msgstr "Przesunięcie wzdłuż osi X:"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
 msgstr "Przesunięcie wzdłuż osi Y:"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
-msgstr "Maksymalna szerokość OSD:"
+msgstr "Maksymalna szerokość menu:"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
-msgstr "Ustawienia wielu monitorów"
+msgstr "Wiele ekranów"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
-msgstr "Wyświetl OSD używając:"
+msgstr "Wyświetlanie menu ekranowego przy użyciu:"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "wszystkie"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
-msgstr "monitor %i"
+msgstr "Ekran %i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "Czas (ms)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "Wyświetlanie:"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "Pojawianie:"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "Zanikanie:"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "Czcionka %i:"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "Cień"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "Języki"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 msgid "Disable UTF-8 conversion of text (in aosd)"
-msgstr "Wyłącz konwersję tekstu na UTF-8 (w aosd)"
+msgstr "Wyłączenie konwersji tekstu do formatu UTF-8 (w aosd)"
 
-#: src/aosd/aosd_ui.c:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "Wybierz plik skórki"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
-msgstr "Renderuj styl"
+msgstr "Styl renderowania"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "Kolor %i:"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr "Własna skórka"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "Plik skórki:"
 
-#: src/aosd/aosd_ui.c:672
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
-msgstr "Uruchom ten wyzwalacz"
+msgstr "Włączenie"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "Zdarzenia"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
-msgstr "Wykryto menedżer okien obsługujący przezroczystość"
+msgstr "Wykryto menedżer okien obsługujący kompozycje"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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 ""
-"Nie wykryto obsługi przezroczystości!\n"
-"Aby OSD działał teraz prawidłowo, należy uruchomić menedżer okien obsługujący przeroczystość (np. Compiz)."
+msgstr "Nie wykryto menedżera okien obsługującego kompozycje.\nAby menu było wyświetlanie prawidowo, należy uruchomić menedżer okien obsługujący kompozycje (np. Compiz)."
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 msgid "Composite manager not required for fake transparency"
-msgstr "Menedżer okien obsługujący przezroczystość nie jest wymagany"
+msgstr "Menedżer okien obsługujący kompozycje nie jest wymagany dla udawanej przezroczystości"
 
-#: src/aosd/aosd_ui.c:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "Przezroczystość"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
-msgstr "Udawana przezroczystość"
+msgstr "Udawana"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "Prawdziwa przezroczystość (wymaga rozszerzenia X Composite)"
+msgstr "Prawdziwa (wymaga rozszerzenia X Composite)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
-msgstr "Rozszerzenie Composite nie zostało załadowane"
+msgstr "Nie wczytano rozszerzenia kompozycji"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
-msgstr "Rozszerzenie Composite nie jest dostępne"
+msgstr "Rozszerzenie kompozycji jest niedostępne"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
-msgstr "Audacious OSD - konfiguracja"
+msgstr "Preferencje wtyczki Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
-msgstr "Test"
+msgstr "Przetestuj"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "Pozycja"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "Animacja"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "Tekst"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
-msgstr "Dekoracja"
+msgstr "Obramowanie"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
-msgstr "Wyzwalacz"
+msgstr "Wyzwalanie"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "Różne"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
-msgstr "O wtyczce Audacious OSD"
+msgstr "Informacje o wtyczce Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
-msgstr ""
-"\n"
-"Audacious OSD"
+msgstr "\nAudacious OSD"
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -991,16 +893,7 @@
 "written by Evan Martin\n"
 "http://neugierig.org/software/ghosd/\n"
 "\n"
-msgstr ""
-"\n"
-"http://www.develia.org/projects.php?p=audacious#aosd\n"
-"napisany przez Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-"On-Screen-Display jest oparty na bibliotece Ghosd\n"
-"napisanej przez Evan Martin\n"
-"http://neugierig.org/software/ghosd/\n"
-"\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\nnapisany przez Giacomo Lozito\n< james@develia.org >\n\nOn-Screen-Display jest oparty na bibliotece Ghosd\nnapisanej przez Evan Martin\nhttp://neugierig.org/software/ghosd/\n\n"
 
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
@@ -1012,7 +905,7 @@
 
 #: src/bs2b/plugin.c:157
 msgid "Bauer stereophonic-to-binaural Preferences"
-msgstr "Preferencje Bauer stereophonic-to-binaural"
+msgstr "Preferencje wtyczki Bauer stereophonic-to-binaural"
 
 #: src/bs2b/plugin.c:168
 msgid "Feed level:"
@@ -1020,17 +913,17 @@
 
 #: src/bs2b/plugin.c:182
 msgid "Cut frequency:"
-msgstr "Obetnij częstotliwość:"
+msgstr "Częstotliwość obcięcia:"
 
 #: src/bs2b/plugin.c:196
 msgid "Presets:"
-msgstr "Schematy ustawień:"
+msgstr "Profile ustawień:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:241
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
-msgstr "O wtyczce Audio CD"
+msgstr "Informacje o wtyczce Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:242
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
@@ -1042,53 +935,43 @@
 "This was a Google Summer of Code 2007 project.\n"
 "\n"
 "Copyright 2009 John Lindgren"
-msgstr ""
-"Copyright (c) 2007, Calin Crisan <ccrisan@gmail.com> i zespół Audacious.\n"
-"\n"
-"Podziękowania dla deweloperów libcdio <http://www.gnu.org/software/libcdio/>\n"
-"\ti deweloperów libcddb <http://libcddb.sourceforge.net/>.\n"
-"\n"
-"Również dzięki dla Tony Vroon za wskazówki i wszelką pomoc.\n"
-"\n"
-"To był projekt na Google Summer of Code 2007.\n"
-"\n"
-"Copyright 2009 John Lindgren"
+msgstr "Copyright (c) 2007, Calin Crisan <ccrisan@gmail.com> i zespół Audacious.\n\nPodziękowania dla deweloperów libcdio <http://www.gnu.org/software/libcdio/>\n\ti deweloperów libcddb <http://libcddb.sourceforge.net/>.\n\nRównież dzięki dla Tony Vroon za wskazówki i wszelką pomoc.\n\nTo był projekt na Google Summer of Code 2007.\n\nCopyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:550
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:922
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
 msgstr "Brak płyty w napędzie."
 
-#: src/cdaudio-ng/cdaudio-ng.c:924
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
-msgstr "Nieobsługiwany rodzaj dysku."
+msgstr "Nieobsługiwany rodzaj płyty."
 
 #: src/cdaudio-ng/configure.c:148
 msgid "CD Audio Plugin Configuration"
-msgstr "Konfiguracja wtyczki Audio CD"
+msgstr "Preferencje wtyczki Audio CD"
 
 #: src/cdaudio-ng/configure.c:160
 msgid "Digital audio extraction"
-msgstr "Wymuszenie cyfrowego dźwięku"
+msgstr "Dźwięk cyfrowy"
 
 #: src/cdaudio-ng/configure.c:165
 msgid "Title information"
-msgstr "Pobieranie informacji o utworach"
+msgstr "Informacje o nagraniach"
 
 #: src/cdaudio-ng/configure.c:176
 msgid "Disc speed:"
-msgstr "Prędkość dysku:"
+msgstr "Prędkość odczytu:"
 
 #: src/cdaudio-ng/configure.c:184
 msgid "Use cd-text if available"
-msgstr "Użyj info zapisanych na płycie, jeśli dostępne"
+msgstr "Pobieranie informacji zawartych na płycie"
 
 #: src/cdaudio-ng/configure.c:191
 msgid "Use CDDB if available"
-msgstr "Użyj internetowej bazy CDDB, jeśli dostępna"
+msgstr "Pobieranie informacji z internetowej bazy CDDB"
 
 #: src/cdaudio-ng/configure.c:197
 msgid "Server: "
@@ -1104,7 +987,7 @@
 
 #: src/cdaudio-ng/configure.c:218
 msgid "Use HTTP instead of CDDBP"
-msgstr "Użyj HTTP zamiast CDDBP"
+msgstr "Używanie protokołu HTTP zamiast CDDBP"
 
 #: src/cdaudio-ng/configure.c:230
 msgid "Override default device: "
@@ -1114,23 +997,23 @@
 #: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
 #: src/stereo_plugin/stereo.c:118
 msgid "Ok"
-msgstr "Ok"
+msgstr "OK"
 
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
-msgstr "Odtwarzaj CD"
+msgstr "Odtwórz płytę CD"
 
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Add CD"
-msgstr "Dodaj CD"
+msgstr "Dodaj płytę CD"
 
 #: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
-msgstr "O wtyczce Dynamic Range Compression"
+msgstr "Informacje o wtyczce Dynamic Range Compression"
 
 #: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
-msgstr "Konfiguracja - Dynamic Range Compressor"
+msgstr "Preferencje wtyczki Dynamic Range Compressor"
 
 #: src/compressor/plugin.c:107
 msgid "Center volume:"
@@ -1138,7 +1021,7 @@
 
 #: src/compressor/plugin.c:120
 msgid "Dynamic range:"
-msgstr "Zakres dynamiczny:"
+msgstr "Zakres dynamiki:"
 
 #: src/console/configure.c:136
 msgid "Game Console Music Decoder"
@@ -1159,7 +1042,7 @@
 #: src/console/configure.c:174 src/console/configure.c:185
 #: src/console/configure.c:206
 msgid "secs"
-msgstr "sek."
+msgstr "s"
 
 #: src/console/configure.c:181
 msgid "Treble:"
@@ -1167,7 +1050,7 @@
 
 #: src/console/configure.c:202
 msgid "Default song length:"
-msgstr "Domyślna długość piosenki:"
+msgstr "Domyślny czas trwania nagrania:"
 
 #: src/console/configure.c:208
 msgid "Resampling"
@@ -1175,7 +1058,7 @@
 
 #: src/console/configure.c:214
 msgid "Enable audio resampling"
-msgstr "Włącz resampling audio"
+msgstr "Włączenie"
 
 #: src/console/configure.c:229
 msgid "Resampling rate:"
@@ -1191,23 +1074,21 @@
 
 #: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
-msgstr "Ignoruj długość z tagów SPC"
+msgstr "Ignorowanie czasu trwania w etykietach SPC"
 
 #: src/console/configure.c:246
 msgid "Increase reverb"
-msgstr "Zwiększ pogłos"
+msgstr "Zwiększenie pogłosu"
 
 #: src/console/configure.c:271
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not"
 " provide length information (i.e. looping tracks)."
-msgstr ""
-"Domyślna długość piosenki, wyrażona w sekundach, jest używana przy utworach,"
-" dla których nie określono długości (np. ścieżki - pętle). "
+msgstr "Określa domyślny czas trwania nagrania, wyrażony w sekundach. Używany w przypadku nagrań, dla których nie określono czasu trwania (np. zapętlane ścieżki)."
 
 #: src/console/plugin.c:33
 msgid "About the Game Console Music Decoder"
-msgstr "O Game Console Music Decoder"
+msgstr "Informacje o wtyczce Game Console Music Decoder"
 
 #: src/console/plugin.c:34
 msgid ""
@@ -1215,23 +1096,19 @@
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
-msgstr ""
-"Silnik Console music decoder oparty jest na Game_Music_Emu 0.5.2.\n"
-"Obsługiwane formaty: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
-"Implementacja w Audacious: William Pitcock <nenolod@dereferenced.org>, \n"
-" Shay Green <gblargg@gmail.com>\n"
+msgstr "Silnik Console music decoder oparty jest na Game_Music_Emu 0.5.2.\nObsługiwane formaty: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nImplementacja w Audacious: William Pitcock <nenolod@dereferenced.org>, \n Shay Green <gblargg@gmail.com>\n"
 
 #: src/crossfade/plugin.c:60
 msgid "About Crossfade"
-msgstr "O Crossfade"
+msgstr "Informacje o wtyczce Crossfade"
 
 #: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
-msgstr "Konfiguracja Crossfade"
+msgstr "Preferencje wtyczki Crossfade"
 
 #: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
-msgstr "Zachodzenie na siebie (w sek.)"
+msgstr "Czas nakładania (s):"
 
 #: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
@@ -1247,13 +1124,11 @@
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
 "You can use the Sample Rate Converter effect to resample the songs to the same rate."
-msgstr ""
-"Crossfading nie zadziałał, gdyż piosenki mają różne częstotliwości próbkowania.\n"
-"Możesz użyć efektu Sample Rate Converter, aby przekonwertować piosenki do tej samej częstotliwości."
+msgstr "Crossfading nie zadziałał, gdyż piosenki mają różne częstotliwości próbkowania.\nMożesz użyć efektu Sample Rate Converter, aby przekonwertować piosenki do tej samej częstotliwości."
 
 #: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
-msgstr "Konfiguruj Crystalizer"
+msgstr "Preferencje wtyczki Crystalizer"
 
 #: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
@@ -1270,18 +1145,15 @@
 "By Johan Levin 1999.\n"
 "\n"
 "Surround echo by Carl van Schaik 1999"
-msgstr ""
-"Wtyczka Echo\n"
-"Johan Levin 1999.\n"
-"Echo otoczenia: Carl van Shaik 1999"
+msgstr "Wtyczka Echo\nJohan Levin 1999.\nEcho otoczenia: Carl van Shaik 1999"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
-msgstr "O wtyczce Echo"
+msgstr "Informacje o wtyczce Echo"
 
 #: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
-msgstr "Konfiguruj Echo"
+msgstr "Preferencje wtyczki Echo"
 
 #: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
@@ -1289,13 +1161,13 @@
 
 #: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
-msgstr "Oddźwięk: (%)"
+msgstr "Sprzężenie zwrotne: (%)"
 
 #: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
 msgstr "Głośność: (%)"
 
-#: src/ffaudio/ffaudio-core.c:784
+#: src/ffaudio/ffaudio-core.c:718
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1309,228 +1181,217 @@
 "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"
-"Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
-"\n"
-"Wtyczka dla Audacious napisana prez:\n"
-" William Pitcock <nenolod@nenolod.net>,\n"
-" Matti Hämäläinen <ccr@tnsp.org>\n"
-"\n"
-"libavcodec %s (%s)\n"
-"libavformat %s (%s)\n"
-"libavutil %s (%s)\n"
+msgstr "Dekoduje wiele formatów dźwiękowych.\nOparta na framework'u multimedialnym FFmpeg (http://www.ffmpeg.org/)\nCopyright (c) 2000-2009 Fabrice Bellard, et al.\n\nTwórcy wtyczki:\n William Pitcock <nenolod@nenolod.net>,\n Matti Hämäläinen <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:798
+#: src/ffaudio/ffaudio-core.c:732
 msgid "About FFaudio Plugin"
-msgstr "O wtyczce FFaudio"
+msgstr "Informacje o wtyczce FFaudio"
 
 #: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
-msgstr "O wtyczce File-Writer"
+msgstr "Informacje o wtyczce File-Writer"
 
-#: src/filewriter/filewriter.c:455
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
-msgstr "Konfiguracja File Writer"
+msgstr "Preferencje wtyczki File Writer"
 
-#: src/filewriter/filewriter.c:467
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "Format pliku wyjściowego:"
 
-#: src/filewriter/filewriter.c:485
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
-msgstr "Zapisz w oryginalnym katalogu"
+msgstr "Zapisywanie w pierwotnym położeniu"
 
-#: src/filewriter/filewriter.c:505
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
-msgstr "Zapisz we własnym katalogu"
+msgstr "Zapisywanie we własnym położeniu"
 
-#: src/filewriter/filewriter.c:515
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
-msgstr "Folder pliku wyjściowego:"
+msgstr "Położenie pliku docelowego:"
 
-#: src/filewriter/filewriter.c:519
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
-msgstr "Wybierz folder"
+msgstr "Wybór katalogu"
 
-#: src/filewriter/filewriter.c:538
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
-msgstr "Uzyskaj nazwę pliku z:"
+msgstr "Uzyskanie nazwy pliku z:"
 
-#: src/filewriter/filewriter.c:541
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
-msgstr "tagi pliku oryginalnego"
+msgstr "załączonych etykiet"
 
-#: src/filewriter/filewriter.c:547
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
-msgstr "oryginalna nazwa pliku"
+msgstr "nazwy pliku"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
-msgstr "Nie ucinaj rozszerzenia pliku"
+msgstr "Pozostawienie rozszerzenia nazwy pierwotnego pliku"
 
-#: src/filewriter/filewriter.c:572
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
-msgstr "Dodaj do nazwy pliku numer ścieżki"
+msgstr "Dodanie do nazwy pliku numer ścieżki"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "Automatycznie"
 
 #: src/filewriter/mp3.c:38
 msgid "Joint Stereo"
-msgstr "Złącze Stereo"
+msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:712
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
-msgstr "Konfiguracja MP3"
+msgstr "Konfiguracja kodera MP3"
 
-#: src/filewriter/mp3.c:735
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "Jakość algorytmu:"
 
-#: src/filewriter/mp3.c:760
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
-msgstr "Częstotliwość próbkowania na wyjściu:"
+msgstr "Docelowa częstotliwość próbkowania:"
 
-#: src/filewriter/mp3.c:788
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:795
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
-msgstr "Bitrate / stopień kompresji:"
+msgstr "Tempo transmisji/współczynnik kompresji:"
 
-#: src/filewriter/mp3.c:819
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
+msgstr "Tempo transmisji (kb/s):"
 
-#: src/filewriter/mp3.c:852
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
-msgstr "Stopień kompresji:"
+msgstr "Współczynnik kompresji:"
 
-#: src/filewriter/mp3.c:876
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
-msgstr "Tryb audio:"
+msgstr "Kanały:"
 
-#: src/filewriter/mp3.c:901
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "Różne:"
 
-#: src/filewriter/mp3.c:912
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
-msgstr "Wymuś ścisłą zgodność z ISO"
+msgstr "Wymuszenie ścisłej zgodności z ISO"
 
-#: src/filewriter/mp3.c:923
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "Zabezpieczenie przed błędami"
 
-#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "Jakość"
 
-#: src/filewriter/mp3.c:945
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
-msgstr "Włącz VBR/ABR"
+msgstr "Włączenie"
 
-#: src/filewriter/mp3.c:955
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/filewriter/mp3.c:988
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
-msgstr "Opcje VBR:"
+msgstr "Zmienne tempo transmisji (VBR):"
 
-#: src/filewriter/mp3.c:1004
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
-msgstr "Minimalny bitrate (kbps):"
+msgstr "Minimalna wartość (kb/s):"
 
-#: src/filewriter/mp3.c:1031
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
-msgstr "Maksymalny bitrate (kbps):"
+msgstr "Maksymalna wartość (kb/s):"
 
-#: src/filewriter/mp3.c:1054
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
-msgstr "Wymuś minimalny bitrate"
+msgstr "Wymuszenie wartości minimalnej"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
-msgstr "Opcje ABR:"
+msgstr "Średnie tempo transmisji (ABR):"
 
-#: src/filewriter/mp3.c:1076
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
-msgstr "Średni bitrate (kbps):"
+msgstr "Średnia wartość (kb/s):"
 
-#: src/filewriter/mp3.c:1104
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
-msgstr "Poziom jakości VBR:"
+msgstr "Jakość algorytmu:"
 
-#: src/filewriter/mp3.c:1123
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
-msgstr "Nie zapisuj nagłówka Xing VBR"
+msgstr "Pominięcie zapisywania nagłówka Xing VBR"
 
-#: src/filewriter/mp3.c:1137
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1147
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "Parametry klatek:"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
-msgstr "Oznacz prawem autorskim"
+msgstr "Oznaczenie prawem autorskim"
 
-#: src/filewriter/mp3.c:1170
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
-msgstr "Oznacz jako oryginalne"
+msgstr "Oznaczenie jako oryginalne"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "Parametry ID3:"
 
-#: src/filewriter/mp3.c:1193
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
-msgstr "Wymuś dodanie tagów w wersji 2"
+msgstr "Wymuszenie dodawania wersji 2"
 
-#: src/filewriter/mp3.c:1203
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
-msgstr "Dodaj tylko tagi v1"
+msgstr "Dodawanie tylko wersji 1"
 
-#: src/filewriter/mp3.c:1210
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
-msgstr "Dodaj tylko tagi v2"
+msgstr "Dodawanie tylko wersji 2"
 
-#: src/filewriter/mp3.c:1231
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
-msgstr "Tagi"
+msgstr "Etykiety"
 
-#: src/filewriter/vorbis.c:236
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Konfiguracja kodera Vorbis"
 
-#: src/filewriter/vorbis.c:256
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
-msgstr "Poziom jakości (0 - 10):"
+msgstr "Poziom (0 - 10):"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
-msgstr "O wtyczce FLAC Audio"
+msgstr "Informacje o wtyczce FLAC"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1538,17 +1399,11 @@
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr ""
-"\n"
-"\n"
-"Oryginalny kod napisany przez:\n"
-"Ralf Ertzinger <ralf@skytale.net>\n"
-"\n"
-"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\nOryginalny kod napisany przez:\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
-msgstr "O wtyczce Gnome Shortcut"
+msgstr "Informacje o wtyczce Gnome Shortcut"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
@@ -1557,38 +1412,17 @@
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-msgstr ""
-"Wtyczka Gnome Shortcut\n"
-"Kontroluj swój odtwarzacz za pomocą skrótów klawiaturowych Gnome.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
-msgid "Open Files"
-msgstr "Otwórz pliki"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
-msgid "Add Files"
-msgstr "Dodaj pliki"
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr "Audacious2"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr "interfejs gnt"
+msgstr "Wtyczka Gnome Shortcut\nSteruje programem za pomocą skrótów klawiszowych środowiska GNOME.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
 
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Numer porządkowy"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "Tytuł"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
 msgstr "Wykonawca"
 
@@ -1596,13 +1430,13 @@
 msgid "Year"
 msgstr "Rok"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
 msgstr "Album"
 
 #: src/gtkui/columns.c:37
 msgid "Track"
-msgstr "Numer utworu"
+msgstr "Numer ścieżki"
 
 #: src/gtkui/columns.c:37
 msgid "Queue position"
@@ -1626,7 +1460,7 @@
 
 #: src/gtkui/columns.c:39
 msgid "Bitrate"
-msgstr "Próbkowanie"
+msgstr "Tempo transmisji"
 
 #: src/gtkui/columns.c:278
 msgid "Choose Columns"
@@ -1660,251 +1494,259 @@
 msgid "Undock"
 msgstr "Odczep"
 
-#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: src/gtkui/menus.c:130
-msgid "_Open Files ..."
-msgstr "_Otwórz pliki ..."
-
 #: src/gtkui/menus.c:131
-msgid "Open _URL ..."
-msgstr "Otwórz _URL ..."
+msgid "_Open Files ..."
+msgstr "_Otwórz..."
 
 #: src/gtkui/menus.c:132
-msgid "_Add File ..."
-msgstr "_Dodaj pliki ..."
+msgid "Open _URL ..."
+msgstr "Otwórz adres _URL..."
 
 #: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "_Dodaj..."
+
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
-msgstr "Dodaj U_RL ..."
+msgstr "Dodaj adres U_RL..."
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
-msgstr "O _programie ..."
+msgstr "_O programie..."
 
-#: src/gtkui/menus.c:136
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
-msgstr "U_stawienia ..."
+msgstr "_Preferencje..."
 
-#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
-msgstr "_Zamknij"
+msgstr "Za_kończ"
 
-#: src/gtkui/menus.c:140
+#: src/gtkui/menus.c:141
 msgid "_Play"
-msgstr "_Odtwarzaj"
+msgstr "_Rozpocznij"
 
-#: src/gtkui/menus.c:141
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
-msgstr "_Pauza"
+msgstr "_Wstrzymaj"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:143
 msgid "_Stop"
-msgstr "_Stop"
+msgstr "_Zatrzymaj"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
-msgstr "Pop_rzedni"
+msgstr "P_oprzednie nagranie"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:145
 msgid "_Next"
-msgstr "_Następny"
+msgstr "_Następne nagranie"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
-msgstr "Po_wtarzaj"
+msgstr "Po_wtarzanie"
 
-#: src/gtkui/menus.c:147
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
-msgstr "_Losuj"
+msgstr "_Losowanie kolejności"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
-msgstr "O_dtwarzaj pojedynczo"
+msgstr "_Pojedynczo"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
-msgstr "_Zatrzymaj po tym utworze."
+msgstr "Zatrzymanie p_o bieżącym nagraniu"
 
-#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
-msgstr "_Info o utworze ..."
+msgstr "_Informacje o nagraniu..."
 
-#: src/gtkui/menus.c:152
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
-msgstr "Przeskocz do _czasu ..."
+msgstr "Przejdź do _czasu..."
 
-#: src/gtkui/menus.c:153
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
-msgstr "Przeskocz do _utworu ..."
+msgstr "Przejdź do _nagrania..."
 
-#: src/gtkui/menus.c:156
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
-msgstr "_Numer utworu"
+msgstr "Według _numeru ścieżki"
 
-#: src/gtkui/menus.c:157
+#: src/gtkui/menus.c:158
 msgid "By _Title"
-msgstr "_Tytuł"
+msgstr "Według _tytułu"
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
-msgstr "_Wykonawca"
+msgstr "Według _wykonawcy"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
-msgstr "_Album"
+msgstr "Według _albumu"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
-msgstr "_Data premiery"
+msgstr "Według _daty wydania"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
-msgstr "_Położenie pliku"
+msgstr "Według p_ołożenia pliku"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
-msgstr "Wła_sny tytuł"
+msgstr "Według wła_snego tytułu"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
 msgstr "_Odwróć kolejność"
 
-#: src/gtkui/menus.c:165
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
-msgstr "_Losowa kolejność"
+msgstr "Wy_losuj kolejność"
 
-#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
-msgstr "_Odśwież"
+msgstr "_Wczytaj ponownie"
 
 #: src/gtkui/menus.c:170
-msgid "_Sort"
-msgstr "_Sortuj"
+msgid "Remove _Unavailable Files"
+msgstr "Usuń _niedostępne nagrania"
 
 #: src/gtkui/menus.c:172
+msgid "_Sort"
+msgstr "_Sortowanie"
+
+#: src/gtkui/menus.c:174
 msgid "_New"
 msgstr "_Nowa"
 
-#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
 msgstr "_Zamknij"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:177
 msgid "_Import ..."
-msgstr "_Importuj"
+msgstr "_Importuj..."
 
-#: src/gtkui/menus.c:176
+#: src/gtkui/menus.c:178
 msgid "_Export ..."
-msgstr "_Eksportuj"
+msgstr "_Eksportuj..."
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:180
 msgid "_Playlist Manager ..."
-msgstr "_Menedżer playlist ..."
+msgstr "_Menedżer list odtwarzania..."
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:181
 msgid "_Queue Manager ..."
-msgstr "Menedżer _kolejki ..."
+msgstr "Menedżer _kolejki..."
 
-#: src/gtkui/menus.c:182
+#: src/gtkui/menus.c:184
 msgid "Volume _Up"
 msgstr "_Zwiększ głośność"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
 msgstr "Z_mniejsz głośność"
 
-#: src/gtkui/menus.c:185
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
 msgstr "_Korektor graficzny"
 
-#: src/gtkui/menus.c:187
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
 msgstr "_Efekty"
 
-#: src/gtkui/menus.c:190
+#: src/gtkui/menus.c:192
 msgid "_Interface"
 msgstr "_Interfejs"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Wizualizacje"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
-msgstr "Pokaż pasek _menu"
+msgstr "Pasek _menu"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
-msgstr "Pokaż _obszar informacji"
+msgstr "Pasek _informacji"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
-msgstr "Pokaż pasek _stanu"
+msgstr "Pasek _stanu"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
-msgstr "Pokaż _nagłówki kolumn"
+msgstr "_Nagłówki kolumn"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
 msgstr "Wybierz _kolumny ..."
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
-msgstr "_Przewijaj przy zmianie utworu"
+msgstr "_Przewijanie listy po zmianie nagrania"
 
-#: src/gtkui/menus.c:201
+#: src/gtkui/menus.c:204
 msgid "_File"
 msgstr "_Plik"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:205
 msgid "_Playback"
 msgstr "_Odtwarzanie"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
-msgstr "P_laylista"
+msgstr "_Lista"
 
-#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
 msgstr "W_tyczki"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:208
 msgid "_Output"
 msgstr "_Dźwięk"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:209
 msgid "_View"
 msgstr "_Widok"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
-msgstr "_Przełącz kolejkę"
+msgstr "_Dodaj/usuń kolejkę"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
 msgstr "_Wytnij"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:217
 msgid "_Copy"
-msgstr "_Kopiuj"
+msgstr "S_kopiuj"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:218
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:219
 msgid "Select _All"
 msgstr "_Zaznacz wszystko"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:224
 msgid "_Rename"
-msgstr "_Zmień nazwę"
+msgstr "Zmień _nazwę"
 
 #: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
 msgstr "Interfejs GTK"
 
-#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
@@ -1913,23 +1755,27 @@
 msgid "Buffering ..."
 msgstr "Buforowanie ..."
 
-#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr "Błąd"
 
-#: src/gtkui/ui_statusbar.c:103 src/skins/ui_main.c:459
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Zamknij"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:458
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.c:107
+#: src/gtkui/ui_statusbar.c:109
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1937,84 +1783,81 @@
 msgstr[1] "%d kanały"
 msgstr[2] "%d kanałów"
 
-#: src/gtkui/ui_statusbar.c:122
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
-msgstr "%d kbps"
+msgstr "%d kb/s"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
-msgstr "Poprzedni utwór"
+msgstr "Przejście do poprzedniego nagrania"
 
 #: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
 msgid "Play"
-msgstr "Odtwarzaj"
+msgstr "Rozpoczęcie odtwarzania"
 
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
-msgstr "Pauzuj/Wznów"
+msgstr "Wstrzymanie/wznowienie odtwarzania"
 
 #: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
 msgid "Stop"
-msgstr "Stop"
+msgstr "Zatrzymanie odtwarzania"
 
 #: src/hotkey/gui.c:75
 msgid "Next Track"
-msgstr "Następny utwór"
+msgstr "Przejście do następnego nagrania"
 
 #: src/hotkey/gui.c:76
 msgid "Forward 5 Seconds"
-msgstr "Przewiń do przodu o 5 sekund"
+msgstr "Przejście 5 sekund naprzód"
 
 #: src/hotkey/gui.c:77
 msgid "Rewind 5 Seconds"
-msgstr "Przewiń do tyłu o 5 skund"
+msgstr "Przejście 5 sekund wstecz"
 
 #: src/hotkey/gui.c:78
 msgid "Mute"
-msgstr "Wycisz"
+msgstr "Wyciszenie dźwięku"
 
 #: src/hotkey/gui.c:79
 msgid "Volume Up"
-msgstr "Zwiększ głośność"
+msgstr "Zwiększenie głośności"
 
 #: src/hotkey/gui.c:80
 msgid "Volume Down"
-msgstr "Zmniejsz głośność"
+msgstr "Zmniejszenie głośności"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
-msgstr "Przeskocz do pliku"
+msgstr "Przejście do nagrania"
 
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
-msgstr "Przełącz okno odtwarzacza"
+msgstr "Przełączenie widoczności okna odtwarzacza"
 
 #: src/hotkey/gui.c:83
 msgid "Show On-Screen-Display"
-msgstr "Pokaż OSD"
+msgstr "Wyświetlenie menu ekranowego"
 
 #: src/hotkey/gui.c:84
 msgid "Toggle Repeat"
-msgstr "Przełącz powtarzanie"
+msgstr "Przełączenie powtarzania"
 
 #: src/hotkey/gui.c:85
 msgid "Toggle Shuffle"
-msgstr "Przełącz losowanie"
+msgstr "Przełączenie losowania"
 
 #: src/hotkey/gui.c:95
 msgid "(none)"
-msgstr "(---)"
+msgstr "(brak)"
 
 #: src/hotkey/gui.c:232
 msgid ""
 "It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr ""
-"Niezalecane jest dowiązywanie podstawowych przycisków myszy bez dodatkowych klawiszy.\n"
-"\n"
-"Czy chcesz kontynuować?"
+msgstr "Niezalecane jest dowiązywanie podstawowych przycisków myszy bez dodatkowych klawiszy.\n\nKontynuować?"
 
 #: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
@@ -2022,15 +1865,13 @@
 
 #: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
-msgstr "Konfiguracja wtyczki Global Hotkey"
+msgstr "Preferencje wtyczki Global Hotkey"
 
 #: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr ""
-"Proszę wcisnąć kombinację klawiszy wewnątrz pola\n"
-"tekstowego. Możesz również użyć przycisków myszy."
+msgstr "Proszę wcisnąć kombinację klawiszy wewnątrz pola\ntekstowego. Można również użyć przycisków myszy."
 
 #: src/hotkey/gui.c:405
 msgid "Hotkeys:"
@@ -2038,15 +1879,15 @@
 
 #: src/hotkey/gui.c:424
 msgid "Action:"
-msgstr "Akcja:"
+msgstr "Czynność:"
 
 #: src/hotkey/gui.c:432
 msgid "Key Binding:"
-msgstr "Dowiązany klawisz:"
+msgstr "Kombinacja klawiszy:"
 
 #: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
-msgstr "O wtyczce Global Hotkey"
+msgstr "Informacje o wtyczce Global Hotkey"
 
 #: src/hotkey/gui.c:664
 msgid ""
@@ -2062,20 +1903,7 @@
 "\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
-msgstr ""
-"Wtyczka Global Hotkey\n"
-"Kontroluj odtwarzacz za pomocą skrótów klawiszowych\n"
-"lub przycisków multimedialnych.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-"Inne osoby wspierające projekt:\n"
-"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
-"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
-"\t\t\tBryn Davies <curious@ihug.com.au>\n"
-"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
-"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
-"\n"
+msgstr "Wtyczka Global Hotkey\nSteruje programem za pomocą skrótów klawiszowych lub przycisków multimedialnych.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nInne osoby wspierające projekt:\nCopyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n\t\t\tBryn Davies <curious@ihug.com.au>\n\t\t\tJonathan A. Davis <davis@jdhouse.org>\n\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n\n"
 
 #: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
@@ -2101,7 +1929,7 @@
 msgid "Enable debug printing"
 msgstr "Włącz wydruk debugowania"
 
-#: src/jack/jack.c:422
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2110,151 +1938,130 @@
 "\n"
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
-msgstr ""
-"Sterownik XMMS jack 0.17\n"
-"\n"
-"xmms-jack.sf.net\n"
-"Chris Morgan <cmorgan@alum.wpi.edu>\n"
-"\n"
-"Port dla Audacious stworzony przez \n"
-"Giacomo Lozito z develia.org"
+msgstr "Sterownik XMMS jack 0.17\n\nxmms-jack.sf.net\nChris Morgan <cmorgan@alum.wpi.edu>\n\nPort dla Audacious stworzony przez \nGiacomo Lozito z develia.org"
 
-#: src/jack/jack.c:427
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
-msgstr "O wtyczce wyjściowej JACK 0.17"
+msgstr "Informacje o wtyczce JACK 0.17"
 
-#: src/ladspa/plugin.c:414
+#: src/ladspa/plugin.c:415
 msgid "About LADSPA Host"
-msgstr "O wtyczce LADSPA Host"
+msgstr "Informacje o wtyczce LADSPA Host"
 
-#: src/ladspa/plugin.c:515
+#: src/ladspa/plugin.c:516
 #, c-format
 msgid "%s Settings"
 msgstr "Ustawienia %s"
 
-#: src/ladspa/plugin.c:583
+#: src/ladspa/plugin.c:584
 msgid "LADSPA Host Settings"
-msgstr "Ustawienia LADSPA Host"
+msgstr "Preferencje wtyczki LADSPA Host"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:593
 msgid "Module paths:"
-msgstr "Ścieżki modułów:"
+msgstr "Położenia modułów:"
 
-#: src/ladspa/plugin.c:597
+#: src/ladspa/plugin.c:598
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr ""
-"Możesz rozdzielać wiele ścieżek dwukropkiem.\n"
-"Podane ścieżki są przeszukiwane wraz z LADSPA_PATH.\n"
-"Po dodaniu nowych ścieżek wciśnij Enter, aby odszukać nowe wtyczki."
+msgstr "Ścieżki należy rozdzielać dwukropkiem.\nWprowadzone położenia będą przeszukiwane wraz z położeniem LADSPA_PATH.\nPo dodaniu nowych ścieżek proszę wcisnąć Enter, aby wyszukać nowe wtyczki."
 
-#: src/ladspa/plugin.c:613
+#: src/ladspa/plugin.c:614
 msgid "Available plugins:"
 msgstr "Dostępne wtyczki:"
 
-#: src/ladspa/plugin.c:625
+#: src/ladspa/plugin.c:626
 msgid "Enable"
 msgstr "Włącz"
 
-#: src/ladspa/plugin.c:631
+#: src/ladspa/plugin.c:632
 msgid "Enabled plugins:"
 msgstr "Włączone wtyczki:"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:647
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: src/lyricwiki/lyricwiki.c:269
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
-msgstr ""
-"\n"
-"Szukanie tekstu..."
+msgstr "\nWyszukiwanie tekstu..."
 
-#: src/lyricwiki/lyricwiki.c:293
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
-msgstr ""
-"\n"
-"Łączenie z lyrics.wikia.com..."
+msgstr "\nŁączenie z lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:381
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
-msgstr ""
-"\n"
-"Nie znaleziono żadnych tekstów do piosenki."
+msgstr "\nNie odnaleziono tekstów utworu."
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
-msgstr "O wtyczce Metronom"
+msgstr "Informacje o wtyczce Metronom"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr ""
-"Generator Taktu przez Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
-"\n"
-"Aby go użyć, dodaj URL: tact://beats*num/den\n"
-"np. tact://77 by zagrać 77 beat'ów na minutę\n"
-"lub tact://60*3/4 by zagrać 60 bpm w 3/4 taktu"
+msgstr "Generator Taktu przez Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nAby go użyć, dodaj URL: tact://beats*num/den\nnp. tact://77 by zagrać 77 beat'ów na minutę\nlub tact://60*3/4 by zagrać 60 bpm w 3/4 taktu"
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generator taktu: %d bpm"
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generator taktu: %d bpm %d/%d"
 
 #: src/mixer/plugin.c:64
 msgid "About Channel Mixer"
-msgstr "O wtyczce Channel Mixer"
+msgstr "Informacje o wtyczce Channel Mixer"
 
 #: src/mixer/plugin.c:93
 msgid "Channel Mixer Settings"
-msgstr "Ustawienia miksera kanałów"
+msgstr "Preferencje wtyczki Channel Mixer"
 
 #: src/mixer/plugin.c:102
 msgid "Output channels:"
-msgstr "Kanały wyjściowe:"
+msgstr "Ilość kanałów wyjściowych:"
 
 #: src/mixer/plugin.c:112
 msgid "Changes take effect at the next song change."
-msgstr "Zmiany zostaną zastosowane przy przejściu do następnego utworu."
+msgstr "Zmiany zostaną wprowadzone po przejściu do następnego nagrania."
 
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
 msgstr "Trwa wgrywanie..."
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
 msgstr "Wgraj do urządzenia MTP"
 
-#: src/mtp_up/mtp.c:311
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
 msgstr "Rozłącz urządzenie MTP"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
 msgstr "Audacious nie odtwarza."
 
@@ -2266,13 +2073,11 @@
 msgid ""
 " by Christian Birchinger <joker@netswarm.net>\n"
 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
-msgstr ""
-" stworzona przez Christian Birchinger <joker@netswarm.net>\n"
-"bazując na wtyczce XMMS napisanej przez Håvard Kvål <havardk@xmms.org>"
+msgstr " stworzona przez Christian Birchinger <joker@netswarm.net>\nbazując na wtyczce XMMS napisanej przez Håvard Kvål <havardk@xmms.org>"
 
 #: src/null/null.c:68
 msgid "About Null Output"
-msgstr "O wyjściu Null"
+msgstr "Informacje o wtyczce Null"
 
 #: src/null/null.c:89
 msgid "Null output preferences"
@@ -2280,35 +2085,39 @@
 
 #: src/null/null.c:100
 msgid "Run in real time"
-msgstr "Uruchom w czasie rzeczywistym"
+msgstr "Uruchomienie w czasie rzeczywistym"
 
-#: src/oss4/configure.c:76
+#: src/oss4/configure.c:81
 msgid "1. Default device"
 msgstr "1. Domyślne urządzenie"
 
-#: src/oss4/configure.c:132
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
 msgstr "Preferencje wtyczki wyjściowej OSS4"
 
-#: src/oss4/configure.c:144 src/OSS/configure.c:194
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
-msgstr "Urządzenie audio:"
+msgstr "Urządzenie dźwiękowe:"
 
-#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "Użyj alternatywnego urządzenia:"
 
-#: src/oss4/configure.c:187
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
 msgstr "Zapisz głośność pomiędzy sesjami"
 
-#: src/oss4/configure.c:191
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
 msgstr "Włącz konwersje formatu poprzez oprogramowanie OSS"
 
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Włącz tryb ekskluzywny, aby wyłączyć programowe miksowanie."
+
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
-msgstr "O wtyczce OSS4"
+msgstr "Informacje o wtyczce OSS4"
 
 #: src/oss4/utils.c:211
 msgid "OSS4 error"
@@ -2351,21 +2160,21 @@
 msgid "Mixer"
 msgstr "Mikser"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
-msgstr "O sterowniku OSS"
+msgstr "Informacje o sterowniku OSS"
 
-#: src/pulse_audio/pulse_audio.c:673
+#: src/pulse_audio/pulse_audio.c:677
 msgid "About Audacious PulseAudio Output Plugin"
-msgstr "O wtyczce wyjściowej PulseAudio dla Audacious"
+msgstr "Informacje o wtyczce PulseAudio"
 
 #: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
-msgstr "O wtyczce Sample Rate Converter"
+msgstr "Informacje o wtyczce Sample Rate Converter"
 
 #: src/resample/plugin.c:144
 msgid "Sample Rate Converter Preferences"
-msgstr "Ustawienia Sample Rate Converter"
+msgstr "Preferencje wtyczki Sample Rate Converter"
 
 #: src/resample/plugin.c:156
 msgid "Rate mappings:"
@@ -2379,67 +2188,96 @@
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: src/scrobbler/configure.c:143
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "Usługi"
 
-#: src/scrobbler/configure.c:165
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "Nazwa użytkownika:"
 
-#: src/scrobbler/configure.c:171
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr "Adres URL Scrobblera:"
 
-#: src/scrobbler/configure.c:211
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:238
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
-msgstr "Scrobbler"
+msgstr "Preferencje wtyczki Scrobbler"
 
 #: src/scrobbler/plugin.c:194
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
 "Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
-msgstr ""
-"Wtyczka Audacious AudioScrobbler\n"
-"\n"
-"Oryginalnie utworzona przez Audun Hove <audun@nlc.no> oraz Pipian <pipian@pipian.com>\n"
+msgstr "Wtyczka AudioScrobbler\n\nOryginalnie utworzona przez Audun Hove <audun@nlc.no> oraz Pipian <pipian@pipian.com>\n"
 
 #: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
-msgstr "O wtyczce Scrobbler"
+msgstr "Informacje o wtyczce Scrobbler"
 
 #: src/sdlout/plugin.c:58
 msgid "About SDL Output Plugin"
-msgstr "O wtyczce wyjściowej SDL"
+msgstr "Informacje o wtyczce SDL"
 
 #: src/sdlout/plugin.c:78
 msgid "SDL error"
 msgstr "Błąd SDL"
 
-#: src/skins/plugin.c:165
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Gatunek"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Kolekcja"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Utwórz listę odtwarzania"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Dodaj do listy odtwarzania"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Wyszukiwanie..."
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "Aby zaimportować kolekcję muzyczną, proszę wybrać katalog i kliknąć przycisk ponownego wczytywania."
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Proszę czekać..."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Wybór katalogu"
+
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
-msgstr "O interfejsie skórkowym"
+msgstr "Informacje o interfejsie skórkowym"
 
-#: src/skins/plugin.c:166
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
-msgstr ""
-"Copyright (c) 2008, Tomasz Moń <desowin@gmail.com>\n"
-"\n"
+msgstr "Copyright (c) 2008, Tomasz Moń <desowin@gmail.com>\n\n"
 
 #: src/skins/skins_cfg.c:207
 msgid "_Player:"
@@ -2447,15 +2285,15 @@
 
 #: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
-msgstr "Wybierz czcionkę dla głownego okna odtwarzacza:"
+msgstr "Wybór czcionki okna odtwarzacza"
 
 #: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
-msgstr "_Playlista:"
+msgstr "_Lista odtwarzania:"
 
 #: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
-msgstr "Wybierz czcionkę dla playlisty:"
+msgstr "Wybór czcionki listy odtwarzania"
 
 #: src/skins/skins_cfg.c:215
 msgid "_Fonts"
@@ -2463,15 +2301,15 @@
 
 #: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr "Użyj bitmapowych czcionek (tylko dla ASCII)"
+msgstr "Czcionki bitmapowe (obsługuje tylko kodowanie ASCII)"
 
 #: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
-msgstr "Przewijaj tytuł piosenki w obydwu kierunkach"
+msgstr "Przewijanie tytułu utworu w obydwu kierunkach"
 
 #: src/skins/skins_cfg.c:298
 msgid "_Skin"
-msgstr "_Skórka"
+msgstr "_Styl"
 
 #: src/skins/skins_cfg.c:345
 msgid "Interface Preferences"
@@ -2523,91 +2361,124 @@
 
 #: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
-msgstr "Equalizer Audacious"
+msgstr "Korektor graficzny Audacious"
 
-#: src/skins/ui_equalizer.c:896
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
-msgstr "Schematy ustawień"
+msgstr "Profile ustawień"
+
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Wczytywanie profilu"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Wczytywanie automatycznego profilu"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Wczytywanie profilu korektora"
 
-#: src/skins/ui_main.c:443
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Zapisywanie profilu"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Zapisywanie automatycznego profilu"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Zapisywanie profilu korektora"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Usuwanie profilu"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Usuwanie automatycznego profilu"
+
+#: src/skins/ui_main.c:444
 msgid "kbps"
-msgstr "kbps"
+msgstr "kb/s"
 
-#: src/skins/ui_main.c:451
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:458
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "surround"
 
-#: src/skins/ui_main.c:806
+#: src/skins/ui_main.c:807
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Skocz do: %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:827
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Głośność: %d%%"
 
-#: src/skins/ui_main.c:850
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balans: %d%% lewy"
 
-#: src/skins/ui_main.c:852
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Balans: centralny"
 
-#: src/skins/ui_main.c:854
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balans: %d%% prawy"
 
-#: src/skins/ui_main.c:980
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Menu opcji"
 
-#: src/skins/ui_main.c:984
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Wyłącz 'Zawsze na wierzchu'"
 
-#: src/skins/ui_main.c:986
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Włącz 'Zawsze na wierzchu'"
 
-#: src/skins/ui_main.c:989
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Obszar informacji o pliku"
 
-#: src/skins/ui_main.c:994
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Menu wizualizacji"
 
-#: src/skins/ui_main.c:1648
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
 msgstr "Tryb prosty."
 
-#: src/skins/ui_main.c:1650
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
 msgstr "Tryb playlisty."
 
-#: src/skins/ui_main.c:1672
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr "Zatrzymaj po tym utworze."
 
-#: src/skins/ui_main.c:1674
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
 msgstr "Nie zatrzymuj po utworze."
 
 #: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
-msgstr "Auto-przewijanie nazwy piosenki"
+msgstr "Automatyczne przewijanie nazwy utworu"
 
 #: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
 msgid "Stop after Current Song"
-msgstr "Zatrzymaj po tym utworze"
+msgstr "Zatrzymanie po bieżącym nagraniu"
 
 #: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
@@ -2615,27 +2486,27 @@
 
 #: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
 msgid "Repeat"
-msgstr "Powtarzaj"
+msgstr "Powtarzanie"
 
 #: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
 msgid "Shuffle"
-msgstr "Losuj"
+msgstr "Losowanie kolejności"
 
 #: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
 msgid "No Playlist Advance"
-msgstr "Odtwarzaj pojedynczo"
+msgstr "Pojedynczo"
 
 #: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
-msgstr "Pokaż odtwarzacz"
+msgstr "Okno odtwarzacza"
 
 #: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
-msgstr "Pokaż listę odtwarzania"
+msgstr "Okno listy odtwarzania"
 
 #: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
-msgstr "Pokaż korektor graficzny"
+msgstr "Okno korektora graficznego"
 
 #: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
@@ -2643,19 +2514,19 @@
 
 #: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
-msgstr "Umieść na wszystkich pulpitach"
+msgstr "Zawsze na widocznym obszarze roboczym"
 
 #: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
-msgstr "Zwiń odtwarzacz"
+msgstr "Zwiń okno odtwarzacza"
 
 #: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
-msgstr "Zwiń listę odtwarzania"
+msgstr "Zwiń okno listy odtwarzania"
 
 #: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
-msgstr "Zwiń korektor graficzny"
+msgstr "Zwiń okno korektora graficznego"
 
 #: src/skins/ui_manager.c:115
 msgid "Analyzer"
@@ -2676,7 +2547,7 @@
 #: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 #: src/skins/ui_manager.c:145
 msgid "Normal"
-msgstr "Normalny"
+msgstr "Zwykły"
 
 #: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
@@ -2696,11 +2567,11 @@
 
 #: src/skins/ui_manager.c:133
 msgid "Dot Scope"
-msgstr "Kropkowany"
+msgstr "Kropki"
 
 #: src/skins/ui_manager.c:134
 msgid "Line Scope"
-msgstr "Liniowy"
+msgstr "Linie"
 
 #: src/skins/ui_manager.c:135
 msgid "Solid Scope"
@@ -2736,7 +2607,7 @@
 
 #: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
-msgstr "Miniony czas"
+msgstr "Bieżący czas"
 
 #: src/skins/ui_manager.c:167
 msgid "Time Remaining"
@@ -2744,15 +2615,15 @@
 
 #: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
 msgid "Pause"
-msgstr "Pauza"
+msgstr "Wstrzymaj"
 
 #: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
 msgid "Previous"
-msgstr "Poprzedni"
+msgstr "Poprzednie nagranie"
 
 #: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
 msgid "Next"
-msgstr "Następny"
+msgstr "Następne nagranie"
 
 #: src/skins/ui_manager.c:196
 msgid "Visualization"
@@ -2760,71 +2631,71 @@
 
 #: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
-msgstr "Tryb wizualizacji"
+msgstr "Styl wizualizacji"
 
 #: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
-msgstr "Tryb analizatora"
+msgstr "Analizator"
 
 #: src/skins/ui_manager.c:199
 msgid "Scope Mode"
-msgstr "Tryb Scope"
+msgstr "Scope"
 
 #: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
-msgstr "Tryb Voiceprint"
+msgstr "Voiceprint"
 
 #: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
-msgstr "Tryb WindowShade VU"
+msgstr "WindowShade VU"
 
 #: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
-msgstr "Spadek linii/kolumn"
+msgstr "Opadanie linii/kolumn"
 
 #: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
-msgstr "Spadek wierzchołków"
+msgstr "Opadanie wierzchołków"
 
 #: src/skins/ui_manager.c:208
 msgid "Playlist"
-msgstr "Playlista"
+msgstr "Lista odtwarzania"
 
 #: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
 msgid "New Playlist"
-msgstr "Nowa playlista"
+msgstr "Nowa"
 
 #: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
-msgstr "Następna playlista"
+msgstr "Następna"
 
 #: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
-msgstr "Poprzednia playlista"
+msgstr "Poprzednia"
 
 #: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
 msgid "Delete Playlist"
-msgstr "Usuń playlistę"
+msgstr "Usuń"
 
 #: src/skins/ui_manager.c:222
 msgid "Import Playlist"
-msgstr "Importuj listę odtwarzania"
+msgstr "Importuj"
 
 #: src/skins/ui_manager.c:223
 msgid "Loads a playlist file into the selected playlist."
-msgstr "Ładuje playlistę z pliku do obecnej listy"
+msgstr "Wczytuje listę odtwarzania z pliku do bieżącej listy"
 
 #: src/skins/ui_manager.c:226
 msgid "Export Playlist"
-msgstr "Eksportuj listę odtwarzania"
+msgstr "Eksportuj"
 
 #: src/skins/ui_manager.c:227
 msgid "Saves the selected playlist."
-msgstr "Zapisuje wybrane listy odtwarzania"
+msgstr "Zapisuje wybraną listę odtwarzania"
 
 #: src/skins/ui_manager.c:229
 msgid "Refresh List"
-msgstr "Odśwież listę"
+msgstr "Wczytaj ponownie"
 
 #: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
@@ -2832,7 +2703,7 @@
 
 #: src/skins/ui_manager.c:233
 msgid "Playlist Manager"
-msgstr "Menedżer playlist"
+msgstr "Menedżer list odtwarzania"
 
 #: src/skins/ui_manager.c:234
 msgid "Queue Manager"
@@ -2848,15 +2719,15 @@
 
 #: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
-msgstr "Preferencje interfejsu ..."
+msgstr "Preferencje interfejsu..."
 
 #: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
-msgstr "Dodaj adres internetowy..."
+msgstr "Dodaj adres URL..."
 
 #: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
-msgstr "Dodaje zdalny utwór do playlisty."
+msgstr "Dodaje zdalny utwór do listy odtwarzania"
 
 #: src/skins/ui_manager.c:247
 msgid "Add Files..."
@@ -2864,7 +2735,7 @@
 
 #: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
-msgstr "Dodaje pliki do playlisty."
+msgstr "Dodaje pliki do listy odtwarzania"
 
 #: src/skins/ui_manager.c:253
 msgid "Search and Select"
@@ -2874,8 +2745,7 @@
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr ""
-"Przeszukuje playlistę i zaznacza wpisy na podstawie ustalonych kryteriów."
+msgstr "Przeszukuje listę odtwarzania i zaznacza elementy na podstawie ustalonych kryteriów"
 
 #: src/skins/ui_manager.c:257
 msgid "Invert Selection"
@@ -2883,7 +2753,7 @@
 
 #: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
-msgstr "Odwraca zaznaczone i niezaznaczone wpisy."
+msgstr "Odwraca zaznaczone i niezaznaczone elementy"
 
 #: src/skins/ui_manager.c:261
 msgid "Select All"
@@ -2932,7 +2802,7 @@
 #: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
 #: src/skins/ui_manager.c:347
 msgid "By Title"
-msgstr "Tytuł"
+msgstr "Według tytułu"
 
 #: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
@@ -2941,7 +2811,7 @@
 #: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
 #: src/skins/ui_manager.c:359
 msgid "By Filename"
-msgstr "Nazwa pliku"
+msgstr "Według nazwy pliku"
 
 #: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
@@ -2950,7 +2820,7 @@
 #: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
 #: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
-msgstr "Ścieżka + Nazwa pliku"
+msgstr "Według ścieżki i nazwy pliku"
 
 #: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
@@ -2982,15 +2852,15 @@
 
 #: src/skins/ui_manager.c:311
 msgid "Reverse List"
-msgstr "Odwróć listę"
+msgstr "Odwróć kolejność"
 
 #: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
-msgstr "Odwraca kolejność wpisów na playliście"
+msgstr "Odwraca kolejność pozycji na liście odtwarzania"
 
 #: src/skins/ui_manager.c:315
 msgid "Sort List"
-msgstr "Sortuj listę"
+msgstr "Sortowanie"
 
 #: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
@@ -2998,7 +2868,7 @@
 
 #: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
-msgstr "Album"
+msgstr "Według albumu"
 
 #: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
@@ -3006,7 +2876,7 @@
 
 #: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
-msgstr "Wykonawca"
+msgstr "Według wykonawcy"
 
 #: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
@@ -3022,7 +2892,7 @@
 
 #: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
-msgstr "Data"
+msgstr "Według daty"
 
 #: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
@@ -3030,15 +2900,15 @@
 
 #: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
-msgstr "Numer utworu"
+msgstr "Według numeru ścieżki"
 
 #: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
-msgstr "Porządkuje listę na podstawie numeru utworu."
+msgstr "Porządkuje listę na podstawie numeru ścieżki."
 
 #: src/skins/ui_manager.c:345
 msgid "Sort Selected"
-msgstr "Sortuj zaznaczone"
+msgstr "Posortuj zaznaczone"
 
 #: src/skins/ui_manager.c:381
 msgid "File"
@@ -3050,31 +2920,31 @@
 
 #: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
-msgstr "Pokaż szczegóły utworu"
+msgstr "Informacje o nagraniu"
 
 #: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
-msgstr "Pokaż szczegóły utworu"
+msgstr "Informacje o nagraniu"
 
 #: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
-msgstr "O Audacious"
+msgstr "O programie"
 
 #: src/skins/ui_manager.c:395
 msgid "Play File"
-msgstr "Wczytaj plik"
+msgstr "Odtwórz plik"
 
 #: src/skins/ui_manager.c:396
 msgid "Load and play a file"
-msgstr "Ładuje i odtwarza wybrany plik"
+msgstr "Wczytuje i odtwarza wybrany plik"
 
 #: src/skins/ui_manager.c:398
 msgid "Play Location"
-msgstr "Wczytaj lokalizację"
+msgstr "Odtwórz położenie"
 
 #: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
-msgstr "Odtwarza utwór z wybranej lokalizacji"
+msgstr "Odtwarza utwór z wybranego położenia"
 
 #: src/skins/ui_manager.c:401
 msgid "Plugin services"
@@ -3082,7 +2952,7 @@
 
 #: src/skins/ui_manager.c:403
 msgid "Preferences"
-msgstr "Ustawienia"
+msgstr "Preferencje"
 
 #: src/skins/ui_manager.c:404
 msgid "Open preferences window"
@@ -3090,235 +2960,215 @@
 
 #: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
-msgstr "Zamyka Audacious"
+msgstr "Kończy działanie programu"
 
 #: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
-msgstr "Ustaw A-B"
+msgstr "Ustaw pętlę"
 
 #: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
-msgstr "Wyczyść A-B"
-
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
-msgid "Jump to Playlist Start"
-msgstr "Przeskocz do początku playlisty"
+msgstr "Wyczyść pętlę"
 
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
-msgstr "Przeskocz do czasu"
+msgstr "Przejdź do czasu"
 
-#: src/skins/ui_manager.c:424
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
 msgstr "Przełącz kolejkę"
 
-#: src/skins/ui_manager.c:425
+#: src/skins/ui_manager.c:422
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Dodaje/usuwa wpis z kolejki listy odtwarzania"
 
-#: src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:425
 msgid "Copy"
-msgstr "Kopiuj"
+msgstr "Skopiuj"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr "Wytnij"
 
-#: src/skins/ui_manager.c:432
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr "Wklej"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "Wczytaj"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:437
 msgid "Import"
-msgstr "Importuj"
+msgstr "Zaimportuj"
 
-#: src/skins/ui_manager.c:441
+#: src/skins/ui_manager.c:438
 msgid "Save"
 msgstr "Zapisz"
 
-#: src/skins/ui_manager.c:442
+#: src/skins/ui_manager.c:439
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
-msgstr "Ustawienia"
-
-#: src/skins/ui_manager.c:445
-msgid "Load preset"
-msgstr "Wczytaj ustawienia"
+msgstr "Bieżący"
 
-#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
-msgstr "Auto-ładowane ustawienia"
+msgstr "Automatycznie wczytywany"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr "Wczytaj auto-ładowane ustawienia"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
-msgstr "Wczytaj domyślne ustawienia equalizera"
+msgstr "Wczytuje domyślny profil korektora graficznego"
 
-#: src/skins/ui_manager.c:453
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "Wyzeruj"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
-msgstr "Wyzeruj ustawienia equalizera"
+msgstr "Zeruje ustawienia korektora graficznego"
 
-#: src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "Z pliku"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
-msgstr "Wczytaj ustawienia z pliku"
+msgstr "Wczytuje profil ustawień z pliku"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
-msgstr "Z pliku WinAMP EQF"
+msgstr "Z pliku EQF programu WinAMP"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
-msgstr "Wczytaj ustawienia z pliku WinAMP EQF"
+msgstr "Wczytuje profil ustawień korektora graficznego z pliku EQF programu WinAMP"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
-msgstr "Ustawienia WinAMPa"
+msgstr "Profil programu WinAMP"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
-msgstr "Importuj ustawienia WinAMPa"
+msgstr "Importuje profil ustawień korektora graficznego programu WinAMP"
 
 #: src/skins/ui_manager.c:466
-msgid "Save preset"
-msgstr "Zapisz ustawienia"
-
-#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "Zapisz auto-ładowane ustawienia"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
 msgstr "Zapisz domyślne ustawienia"
 
-#: src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "Do pliku"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
 msgstr "Zapisz ustawienia do pliku"
 
-#: src/skins/ui_manager.c:477
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
-msgstr "Do pliku WinAMP EQF"
+msgstr "Do pliku EQF programu WinAMP"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
-msgstr "Zapisz ustawienia do pliku WinAMP EQF"
+msgstr "Zapisuje profil ustawień korektora graficznego do pliku EQF programu WinAMP"
 
 #: src/skins/ui_manager.c:481
-msgid "Delete preset"
-msgstr "Usuń ustawienia"
-
-#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "Usuń auto-ładowane ustawienia"
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
 msgstr "Wyszukaj wpisy w aktywnej playliście"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 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 "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr ""
-"Zaznacz wpisy na playliście poprzez wypełnienie jednego lub więcej pól. Pola"
-" używają składni wyrażeń regularnych, bez uwzględniania wielkości liter. "
-"Jeśli nie wiesz, jak działają wyrażenia regularne, po prostu wstawiaj części"
-" wyrazów tego, czego szukasz."
+msgstr "Zaznacz wpisy na playliście poprzez wypełnienie jednego lub więcej pól. Pola używają składni wyrażeń regularnych, bez uwzględniania wielkości liter. 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:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "Tytuł: "
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr "Album:"
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
-msgstr "Artysta:"
+msgstr "Wykonawca:"
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "Nazwa pliku:"
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr "Wyczyść poprzednie zaznaczenie przed szukaniem"
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
 msgstr "Automatycznie przełącz kolejkę dla pasujących wpisów"
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
 msgstr "Utwórz nową playlistę z pasującymi wpisami"
 
-#: src/skins/ui_playlist.c:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
-msgstr "Edytor playlisty Audacious"
+msgstr "Edytor listy odtwarzania Audacious"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
 
 #: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
-msgstr "Spakowana skórka Winamp 2.x"
+msgstr "Zarchiwizowany styl programu Winamp 2.x"
 
 #: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
-msgstr "Skórka Winamp 2.x"
+msgstr "Styl programu Winamp 2.x"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nie można utworzyć katalogu (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
-msgstr "O wtyczce sndfile"
+msgstr "Informacje o wtyczce sndfile"
 
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
-msgstr "O SndStretch"
+msgstr "Informacje o wtyczce SndStretch"
 
 #: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
-msgstr "Korekcja dźwięku"
+msgstr "Korekcja głośności"
 
 #: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
-msgstr "Krótkie zazębianie się"
+msgstr "Krótkie nakładanie się"
 
 #: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
-msgstr "Szybkość odtwarzania"
+msgstr "Prędkość odtwarzania"
 
 #: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
@@ -3326,37 +3176,35 @@
 
 #: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
-msgstr "Skaluj"
+msgstr "Skala"
 
 #: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
-msgstr "SndStretch - Konfiguracja"
+msgstr "Preferencje wtyczki SndStretch"
 
-#: src/song_change/song_change.c:447
+#: src/song_change/song_change.c:437
 msgid "Command to run when Audacious starts a new song."
-msgstr "Komenda wywoływana przy rozpoczęciu nowej piosenki."
+msgstr "Rozpoczęcie odtwarzania nagrania."
 
-#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
-#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
-msgstr "Komenda:"
+msgstr "Polecenie:"
 
-#: src/song_change/song_change.c:453
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
-msgstr "Komenda wywoływana przy końcu piosenki."
+msgstr "Kończenie odtwarzania nagrania."
 
-#: src/song_change/song_change.c:459
+#: src/song_change/song_change.c:449
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Komenda wywoływana, gdy Audacious dotrze do końca playlisty."
+msgstr "Zakończenie odtwarzania listy odtwarzania."
 
-#: src/song_change/song_change.c:465
+#: src/song_change/song_change.c:455
 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)."
+msgstr "Zmiana tytułu nagrania (np. użyteczne dla internetowych strumieni)."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3373,43 +3221,27 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr ""
-"Możesz użyć poniższych zmiennych, które ulegną\n"
-"odpowiedniemu podstawieniu przed wywołaniem komendy\n"
-"(nie wszystkie są użyteczne dla komend końca playlisty).\n"
-"\n"
-"%F: Częstotliwość (w hertzach)\n"
-"%c: Ilość kanałów\n"
-"%f: nazwa pliku (pełna ścieżka)\n"
-"%l: długość (w milisekundach)\n"
-"%n lub %s: nazwa piosenki\n"
-"%r: Jakość (bity na sekundę)\n"
-"%t: Pozycja na playliście (%02d)\n"
-"%p: Aktualnie odtwarzany (1 lub 0)%a: Wykonawca\n"
-"%b: Album\n"
-"%T: Tytuł utworu"
+msgstr "Można użyć poniższych zmiennych, które ulegną odpowiedniemu\npodstawieniu przed wywołaniem polecenie (nie wszystkie są\nużyteczne dla poleceń zakończenia odtwarzania listy).\n\n%F: Częstotliwość (Hz)\n%c: Ilość kanałów\n%f: Ścieżka pliku\n%l: Czas trwania (ms)\n%n lub %s: Nazwa nagrania\n%r: Tempo transmisji (b/s)\n%t: Pozycja na liście odtwarzania (%02d)\n%p: Stan odtwarzania (1 lub 0)\n%a: Wykonawca\n%b: Album\n%T: Tytuł utworu"
 
-#: src/song_change/song_change.c:498
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr ""
-"Parametry przekazane do powłoki powinny być zawarte w "
-"cudzysłowach. Ich brak jest zagrożeniem dla bezpieczeństwa."
+msgstr "Parametry przekazywane do powłoki powinny być zawarte w cudzysłowach. Ich brak jest zagrożeniem dla bezpieczeństwa systemu."
 
-#: src/song_change/song_change.c:509
+#: src/song_change/song_change.c:499
 msgid "Commands"
-msgstr "Komendy"
+msgstr "Polecenia"
 
-#: src/song_change/song_change.c:539
+#: src/song_change/song_change.c:529
 msgid "Song Change"
-msgstr "Zmiana piosenki"
+msgstr "Preferencje wtyczki Song Change"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
-msgstr "O wtyczce Status Icon"
+msgstr "Informacje o wtyczce Status Icon"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3418,155 +3250,98 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager.\n"
-msgstr ""
-"Wtyczka Status Icon\n"
-"\n"
-"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"Ta wtyczka dostarcza ikonę stanu, umieszczoną\n"
-"w zasobniku systemowym menedżera okien.\n"
+msgstr "Wtyczka Status Icon\n\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nWyświeta ikonę programu w obszarze powiadamiania.\n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
-msgstr "Wtyczka Status Icon - Preferencje"
+msgstr "Preferencje wtyczki Status Icon"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
-msgstr "Menu PPM"
+msgstr "Menu podręczne"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
-msgstr "Małe menu odtwarzania #1"
+msgstr "Małe menu odtwarzania 1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
-msgstr "Małe menu odtwarzania #2"
+msgstr "Małe menu odtwarzania 2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
-msgstr "Akcja rolki myszy"
+msgstr "Czynność kółka myszy"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "Zmiana głośności"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
-msgstr "Zmiana odtwarzanego utworu"
+msgstr "Zmiana bieżącego nagrania"
 
-#: src/statusicon/statusicon.c:500
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
-msgstr "Inne ustawienia"
+msgstr "Inne"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
-msgstr "Wyłącz okno powiadamiania"
+msgstr "Wyłączenie informacji podręcznych"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
-msgstr "Zamknij do obszaru powiadamiania (systemowy tray)"
+msgstr "Minimalizowanie okna do obszaru powiadamiania"
+
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Przechodzenie do następnego nagrania po\nprzekręceniu kółka myszy w górę"
 
 #: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
-msgstr ""
-"Wtyczka Extra Stereo\n"
-"\n"
-"Johan Levin, 1999."
+msgstr "Wtyczka Extra Stereo\n\nJohan Levin, 1999."
 
 #: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
-msgstr "O wtyczce Extra Stereo"
+msgstr "Informacje o wtyczce Extra Stereo"
 
 #: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
-msgstr "Konfiguruj dźwięk stereo"
-
-#: src/streambrowser/gui/streambrowser_win.c:78
-msgid "Search:"
-msgstr "Szukaj:"
-
-#: src/streambrowser/gui/streambrowser_win.c:97
-#: src/streambrowser/gui/streambrowser_win.c:372
-msgid "Add Bookmark"
-msgstr "Dodaj zakładkę"
-
-#: src/streambrowser/gui/streambrowser_win.c:324
-msgid "Stream name"
-msgstr "Nazwa strumienia"
-
-#: src/streambrowser/gui/streambrowser_win.c:331
-msgid "Now playing"
-msgstr "Teraz odtwarzane"
+msgstr "Preferencje wtyczki Extra Stereo"
 
-#: src/streambrowser/gui/streambrowser_win.c:369
-msgid "Remove Bookmark"
-msgstr "Usuń zakładkę"
-
-#: src/streambrowser/streambrowser.c:330
-msgid "About Stream Browser"
-msgstr "O przeglądarce strumieni"
-
-#: src/streambrowser/streambrowser.c:331
-msgid ""
-"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming directories.\n"
-"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
-"\tand of course to the whole Audacious community.\n"
-"\n"
-"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-"\n"
-"This was a Google Summer of Code 2008 project."
-msgstr ""
-"Copyright (c) 2008, 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:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
-msgstr "O generatorze sygnałów"
+msgstr "Informacje o wtyczce Tone Generator"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
-msgstr ""
-"Generator sygnałów Sinus autorstwa Haavard Kvaalen <havardk@xmms.org>\n"
-"Zmodyfikowany przez Daniel J. Peng <danielpeng@bigfoot.com>\n"
-"\n"
-"Aby go użyć, dodaj URL w postaci: tone://częstotliwość1;częstotliwość2;częstotliwość3;...\n"
-"np. tone://2000;2005 aby odtworzyć sygnał o kombinacji częstotliwości 2000Hz oraz 2005Hz"
+msgstr "Generuje sygnały o przebiegu sinusoidalnym.\nTwórca Haavard Kvaalen <havardk@xmms.org>\nZmodyfikowany przez Daniel J. Peng <danielpeng@bigfoot.com>\n\nW celu użycia proszę dodać adres URL o postaci: tone://częstotliwość1;częstotliwość2;częstotliwość3;...\nnp. tone://2000;2005, aby odtworzyć sygnał o kombinacji częstotliwości 2000Hz oraz 2005Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr "Generator sygnałów: "
 
 #: src/unix-io/gtk.c:34
 msgid "About File I/O Plugin"
-msgstr "O wtyczce File I/O"
+msgstr "Informacje o wtyczce File I/O"
 
-#: src/vorbis/vorbis.c:572
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
-msgstr "O wtyczce dźwięku Ogg Vorbis"
+msgstr "Informacje o wtyczce Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:577
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -3583,26 +3358,11 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>\n"
 "\n"
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
-msgstr ""
-"Wtyczka Ogg Vorbis autorstwa Xiph.org Foundation\n"
-"\n"
-"Oryginalny kod:\n"
-"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-"Wsparcie od:\n"
-"Chris Montgomery <monty@xiph.org>\n"
-"Peter Alm <peter@xmms.org>\n"
-"Michael Smith <msmith@labyrinth.edu.au>\n"
-"Jack Moffitt <jack@icecast.org>\n"
-"Jorn Baayen <jorn@nl.linux.org>\n"
-"Haavard Kvaalen <havardk@xmms.org>\n"
-"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-"Eugene Zagidullin <e.asphyx@gmail.com>\n"
-"\n"
-"Odwiedź witrynę Xiph.org Foundation: http://www.xiph.org/\n"
+msgstr "Wtyczka Ogg Vorbis autorstwa Xiph.org Foundation\n\nOryginalny kod:\nTony Arcieri <bascule@inferno.tusculum.edu>\nWsparcie od:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHaavard Kvaalen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\nOdwiedź witrynę Xiph.org Foundation: http://www.xiph.org/\n"
 
 #: src/vtx/about.c:14
 msgid "About Vortex Player"
-msgstr "O odtwarzaczu Vortex"
+msgstr "Informacje o wtyczce Vortex Player"
 
 #: src/vtx/about.c:15
 msgid ""
@@ -3613,14 +3373,7 @@
 "and other AY/YM music sites.\n"
 "\n"
 "Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr ""
-"Odtwarzacz plików formatu Vortex stworzony przez Sashnov Alexander <sashnov@ngs.ru>\n"
-"Oryginalne źródła znalezione w_vtx.dll przez Roman Sherbakov <v_soft@microfor.ru>\n"
-"\n"
-"Muzykę w formacie vtx można znaleźć na http://vtx.microfor.ru/music.htm\n"
-"oraz na innych witrynach z muzyką AY/YM.\n"
-"\n"
-"Implementacja w Audacious: Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr "Odtwarza pliki w formacie Vortex, autorstwa Sashnov Alexander <sashnov@ngs.ru>\nOryginalne źródła znalezione w_vtx.dll przez Roman Sherbakov <v_soft@microfor.ru>\n\nMuzykę w formacie vtx można odnaleźć na http://vtx.microfor.ru/music.htm\noraz na innych witrynach z muzyką AY/YM.\n\nImplementacja w Audacious: Pavel Vymetalek <pvymetalek@seznam.cz>"
 
 #: src/wavpack/wavpack.c:353
 #, c-format
@@ -3633,10 +3386,4 @@
 "\n"
 "Some of the plugin code was by Miles Egan\n"
 "Visit the Wavpack site at http://www.wavpack.com/\n"
-msgstr ""
-"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
-"\n"
-"Część kodu napisał Miles Egan\n"
-"Odwiedź witrynę internetową Wavpack: http://www.wavpack.com/\n"
-
-
+msgstr "Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n\nCzęść kodu napisał Miles Egan\nOdwiedź witrynę internetową Wavpack: http://www.wavpack.com/\n"

audacious-plugins-3.2.4.tar.bz2/po/pt_PT.po Added

@@ -0,0 +1,3387 @@
+# Portuguese translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Bruno Martins <bmomartins@gmail.com>, 2011.
+# Sérgio Marques <smarquespt@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-05-24 11:49+0000\n"
+"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
+"Language-Team: Portuguese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/aac/libmp4.c:256
+#, c-format
+msgid ""
+"Using libfaad2-%s for decoding.\n"
+"FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
+"Copyright (c) 2005-2006 Audacious team"
+msgstr "A utilizar libfaad2 %s para a descodificação.\nDescodificador FAAD2 AAC/HE-AAC/HE-AACv2/DRM (c) Nero AG, www.nero.com\nDireitos de autor (c) 2005-2006, a equipa Audacious"
+
+#: src/aac/libmp4.c:261
+msgid "About MP4 AAC decoder plugin"
+msgstr "Sobre o descodificador MP4 AAC"
+
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "Sobre o Alarme"
+
+#: src/alarm/alarm.c:313
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr "Um suplemento para iniciar a reprodução a uma determinada hora\n\nDesenvolvido por Adam Feakin e Daniel Stodden"
+
+#: src/alarm/interface.c:33
+msgid "Alarm"
+msgstr "Alarme"
+
+#: src/alarm/interface.c:40
+msgid "This is your wakeup call."
+msgstr "Esta é a sua chamada de atenção"
+
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
+msgid "OK"
+msgstr "Aceitar"
+
+#: src/alarm/interface.c:214
+msgid "Alarm Settings"
+msgstr "Definições do alarme"
+
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
+msgid "Time"
+msgstr "Horário"
+
+#: src/alarm/interface.c:270
+msgid "hours"
+msgstr "horas"
+
+#: src/alarm/interface.c:331
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:361
+msgid "minutes"
+msgstr "minutos"
+
+#: src/alarm/interface.c:379
+msgid "Quiet after:"
+msgstr "Silenciar após:"
+
+#: src/alarm/interface.c:389
+msgid "Alarm at (default):"
+msgstr "Alarme às (pré-definido):"
+
+#: src/alarm/interface.c:409
+msgid "Choose the days for the alarm to come on"
+msgstr "Escolha os dias para o alarme"
+
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
+msgid "Default"
+msgstr "Pré-definido"
+
+#: src/alarm/interface.c:763
+msgid "Day"
+msgstr "Dia"
+
+#: src/alarm/interface.c:783
+msgid "Tuesday"
+msgstr "terça"
+
+#: src/alarm/interface.c:794
+msgid "Wednesday"
+msgstr "quarta"
+
+#: src/alarm/interface.c:805
+msgid "Thursday"
+msgstr "quinta"
+
+#: src/alarm/interface.c:816
+msgid "Friday"
+msgstr "sexta"
+
+#: src/alarm/interface.c:827
+msgid "Saturday"
+msgstr "sábado"
+
+#: src/alarm/interface.c:838
+msgid "Sunday"
+msgstr "domingo"
+
+#: src/alarm/interface.c:848
+msgid "Monday"
+msgstr "segunda"
+
+#: src/alarm/interface.c:859
+msgid "Days"
+msgstr "Dias"
+
+#: src/alarm/interface.c:875
+msgid "Fading"
+msgstr "Desvanecimento"
+
+#: src/alarm/interface.c:912
+msgid "seconds"
+msgstr "segundos"
+
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
+msgid "Volume"
+msgstr "Volume"
+
+#: src/alarm/interface.c:946
+msgid "Current"
+msgstr "Atual"
+
+#: src/alarm/interface.c:954
+msgid "Start at"
+msgstr "Ao iniciar"
+
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:998
+msgid "Final"
+msgstr "Ao terminar"
+
+#: src/alarm/interface.c:1051
+msgid "Additional Command"
+msgstr "Comando adicional"
+
+#: src/alarm/interface.c:1077
+msgid "enable"
+msgstr "ativar"
+
+#: src/alarm/interface.c:1085
+msgid "Playlist (optional)"
+msgstr "Lista de reprodução (opcional)"
+
+#: src/alarm/interface.c:1111
+msgid "Browse..."
+msgstr "Procurar..."
+
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
+msgid "Reminder"
+msgstr "Lembrete"
+
+#: src/alarm/interface.c:1136
+msgid "Use reminder"
+msgstr "Utilizar lembrete"
+
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Opções"
+
+#: src/alarm/interface.c:1160
+msgid "What do these options mean?"
+msgstr "O que significam estas opções?"
+
+#: src/alarm/interface.c:1188
+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 "\nHorário\n Alarme às:\n A hora em que o alarme inicia\n\n Silenciar após:\n A duração do alarme\n (se a caixa de diálogo não for fechada)\n\n\nDias\n Dia:\n Selecione os dias para o alarme\n\n Hora:\n Escolha a hora do alarme em cada dia,\n ou o botão alternar para utilizar\n a hora pré-definida\n\n\nVolume\n Desvanecimento:\n Aumentar o volume até\n este valor\n\n Iniciar em: \n Iniciar o desvanecimento neste valor\n\n Finalizar: \n O volume em que o desvanecimento para.\n Se o valor for 0, definir este valor como\n volume e iniciar reprodução\n\n\nOpções:\n Comando adicional:\n Executar este comando com o alarme\n\n Lista de reprodução:\n Carregar esta lista de reprodução e reproduzir\n (com a extensão .m3u). Se não indicar a lista de\n reprodução, as faixas que existirem na lista\n serão as utilizadas\n Também pode indicar um URL de uma emissão mp3/ogg\n mas o carregamento de listas de reprodução em URLs\n ainda não é suportado pelo xmms\n\n Lembrete:\n Mostra um lembrete se o alarme for desligado\n Escreva-o na caixa e ative o botão alternar\n se quiser mostrar o lembrete\n"
+
+#: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Ajuda"
+
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/alarm/interface.c:1290
+msgid "Your reminder for today is.."
+msgstr "O seu lembrete de hoje é..."
+
+#: src/alarm/interface.c:1315
+msgid "Thankyou"
+msgstr "Obrigado"
+
+#: src/alsa/config.c:210
+msgid "Default PCM device"
+msgstr "Dispositivo PCM pré-definido"
+
+#: src/alsa/config.c:235
+msgid "Default mixer device"
+msgstr "Dispositivo misturador pré-definido"
+
+#: src/alsa/config.c:438
+msgid "ALSA Output Plugin Preferences"
+msgstr "Preferências do suplemento Alsa"
+
+#: src/alsa/config.c:445
+msgid "PCM device:"
+msgstr "Dispositivo PCM:"
+
+#: src/alsa/config.c:447 src/OSS/configure.c:237
+msgid "Mixer device:"
+msgstr "Dispositivo misturador:"
+
+#: src/alsa/config.c:449
+msgid "Mixer element:"
+msgstr "Elemento misturador:"
+
+#: src/alsa/config.c:452
+msgid "Work around drain hangup"
+msgstr "Solução para impedir a suspensão"
+
+#: src/alsa/plugin.c:59
+msgid "About ALSA Output Plugin"
+msgstr "Sobre o suplemento Alsa"
+
+#: src/alsa/plugin.c:81
+msgid "ALSA error"
+msgstr "Erro Alsa"
+
+#: src/amidi-plug/amidi-plug.c:326
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr "Ainda não escolheu as portas para a reprodução Midi. Pode escolher as opções nas preferências do suplemento"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:35
+msgid "ALSA Backend "
+msgstr "Infraestrutura Alsa"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:37
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr "Esta infraestrutura envia os eventos Midi para as portas do grupo de utilizadores Alsa. A interface Alsa é versátil e providencia as portas para os sintetizadores das placas de som internas (ex.: emu10k1) e para os dispositivos externos e aplicações de sintetização\nEsta infraestrutura não produz som, uma vez que os eventos Midi são geridos pelos programas ou dispositivos das portas Alsa. Por exemplo, os eventos Midi enviados para os dispositivos sintetizadores serão reproduzidos diretamente\nInfraestrutura desenvolvida por Giacomo Lozito"
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
+msgid "FluidSynth Backend "
+msgstr "Infraestrutura FluidSynth"
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr "Esta infraestrutura produz os sons, enviando os eventos Midi para o FluidSynth, um sintetizador baseado nas especificações SoundFont2 (www.fluidsynth.org)\nOs sons produzidos podem ser manipulados através dos \"plugins\" e são processados pelo suplemento de som escolhido pelo utilizador\nInfraestrutura desenvolvida por Giacomo Lozito."
+
+#: src/amidi-plug/i_configure-alsa.c:228
+msgid "ALSA BACKEND CONFIGURATION"
+msgstr "Configuração da infraestrutura Alsa"
+
+#: src/amidi-plug/i_configure-alsa.c:331
+msgid "Port"
+msgstr "Porta"
+
+#: src/amidi-plug/i_configure-alsa.c:333
+msgid "Client name"
+msgstr "Nome do cliente"
+
+#: src/amidi-plug/i_configure-alsa.c:335
+msgid "Port name"
+msgstr "Nome da porta"
+
+#: src/amidi-plug/i_configure-alsa.c:346
+msgid "ALSA output ports"
+msgstr "Portas Alsa"
+
+#: src/amidi-plug/i_configure-alsa.c:399
+msgid "Soundcard: "
+msgstr "Placa de som: "
+
+#: src/amidi-plug/i_configure-alsa.c:401
+msgid "Mixer control: "
+msgstr "Controlo do misturador: "
+
+#: src/amidi-plug/i_configure-alsa.c:413
+msgid "Mixer settings"
+msgstr "Definições do misturador"
+
+#: src/amidi-plug/i_configure-alsa.c:429
+msgid "ALSA Backend not loaded or not available"
+msgstr "Infraestrutura Alsa não carregada/disponível"
+
+#: src/amidi-plug/i_configure-alsa.c:448
+msgid ""
+"ALSA\n"
+"backend"
+msgstr "Infraestrutura\nAlsa"
+
+#: src/amidi-plug/i_configure-ap.c:59
+msgid "AMIDI-Plug - backend information"
+msgstr "Informações da infraestrutura Amidi"
+
+#: src/amidi-plug/i_configure-ap.c:196
+msgid "AMIDI-PLUG PREFERENCES"
+msgstr "Preferências do AMidi"
+
+#: src/amidi-plug/i_configure-ap.c:223
+msgid "Backend selection"
+msgstr "Seleção de infraestrutura"
+
+#: src/amidi-plug/i_configure-ap.c:227
+msgid "Available backends"
+msgstr "Infraestruturas disponíveis"
+
+#: src/amidi-plug/i_configure-ap.c:257
+msgid "Playback settings"
+msgstr "Definições de reprodução"
+
+#: src/amidi-plug/i_configure-ap.c:262
+msgid "Transpose: "
+msgstr "Transposição: "
+
+#: src/amidi-plug/i_configure-ap.c:271
+msgid "Drum shift: "
+msgstr "Drum shift: "
+
+#: src/amidi-plug/i_configure-ap.c:289
+msgid "Advanced settings"
+msgstr "Definições avançadas"
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "calcular duração dos ficheiros midi na lista de reprodução"
+
+#: src/amidi-plug/i_configure-ap.c:298
+msgid "extract comments from MIDI file (if available)"
+msgstr "extrair comentários dos ficheiros midi (se existentes)"
+
+#: src/amidi-plug/i_configure-ap.c:303
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "extrair letra das músicas dos ficheiros midi (se existente)"
+
+#: src/amidi-plug/i_configure-ap.c:333
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr "Suplemento\nAmidi"
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug - select file"
+msgstr "Amidi - selecione o ficheiro"
+
+#: src/amidi-plug/i_configure.c:129
+msgid "AMIDI-Plug - configuration"
+msgstr "Configuração do Amidi"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:55
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "Amidi - selecione o ficheiro SoundFont"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:270
+msgid "FLUIDSYNTH BACKEND CONFIGURATION"
+msgstr "Configuração da infraestrutura FluidSynth"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:313
+msgid "SoundFont settings"
+msgstr "Definições SoundFont"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:345
+msgid "Filename"
+msgstr "Nome do ficheiro"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:349
+msgid "Size (bytes)"
+msgstr "Tamanho (bytes)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:398
+msgid "Load SF on player start"
+msgstr "Carregar SF ao iniciar o reprodutor"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:402
+msgid "Load SF on first midifile play"
+msgstr "Carregar SF ao reproduzir o ficheiro midi"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:417
+msgid "Synthesizer settings"
+msgstr "Definições do sintetizador"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:426
+msgid "gain"
+msgstr "ganho"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:432
+#: src/amidi-plug/i_configure-fluidsynth.c:460
+#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:519
+msgid "use default"
+msgstr "utilizar predefinições"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:435
+#: src/amidi-plug/i_configure-fluidsynth.c:463
+msgid "value:"
+msgstr "valor:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:454
+msgid "poliphony"
+msgstr "polifonia"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:482
+msgid "reverb"
+msgstr "reverb"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:491
+#: src/amidi-plug/i_configure-fluidsynth.c:522
+msgid "yes"
+msgstr "sim"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:493
+#: src/amidi-plug/i_configure-fluidsynth.c:524
+msgid "no"
+msgstr "não"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:513
+msgid "chorus"
+msgstr "coro"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:544
+msgid "sample rate"
+msgstr "frequência"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:550
+msgid "22050 Hz "
+msgstr "22050 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:553
+msgid "44100 Hz "
+msgstr "44100 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:556
+msgid "96000 Hz "
+msgstr "96000 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:559
+msgid "custom "
+msgstr "personalizada"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "Hz "
+msgstr "Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:621
+msgid "FluidSynth Backend not loaded or not available"
+msgstr "Infraestrutura FluidSynth não carregada/disponível"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:640
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr "Infraestrutura\nFluidSynth"
+
+#: src/amidi-plug/i_configure-timidity.c:39
+msgid "TIMIDITY BACKEND CONFIGURATION"
+msgstr "Configuração da infraestrutura Timidity"
+
+#: src/amidi-plug/i_configure-timidity.c:64
+msgid "TiMidity Backend not loaded or not available"
+msgstr "Infraestrutura Timidity não carregada/disponível"
+
+#: src/amidi-plug/i_configure-timidity.c:83
+msgid ""
+"TiMidity\n"
+"backend"
+msgstr "Infraestrutura\nTimidity"
+
+#: src/amidi-plug/i_fileinfo.c:169
+msgid "Name:"
+msgstr "Nome:"
+
+#: src/amidi-plug/i_fileinfo.c:193
+msgid " MIDI Info "
+msgstr "Informações Midi"
+
+#: src/amidi-plug/i_fileinfo.c:205
+msgid "Format:"
+msgstr "Formato"
+
+#: src/amidi-plug/i_fileinfo.c:208
+msgid "Length (msec):"
+msgstr "Duração (mseg):"
+
+#: src/amidi-plug/i_fileinfo.c:211
+msgid "Num of Tracks:"
+msgstr "N.º de faixas:"
+
+#: src/amidi-plug/i_fileinfo.c:216
+msgid "variable"
+msgstr "variável"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidi-plug/i_fileinfo.c:223
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "Time Div:"
+msgstr "Div. de tempo:"
+
+#: src/amidi-plug/i_fileinfo.c:237
+msgid " MIDI Comments and Lyrics "
+msgstr "Comentários e letras das faixas midi"
+
+#: src/amidi-plug/i_fileinfo.c:288
+msgid "* no comments available in this MIDI file *"
+msgstr "* sem comentários para este ficheiro midi *"
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* sem letra da música para este ficheiro midi *"
+
+#: src/amidi-plug/i_fileinfo.c:349
+msgid " (invalid UTF-8)"
+msgstr " (UTF-8 inválido)"
+
+#: src/amidi-plug/i_utils.c:43
+msgid "AMIDI-Plug - about"
+msgstr "Sobre o Amidi"
+
+#: src/amidi-plug/i_utils.c:68
+msgid ""
+"\n"
+"AMIDI-Plug "
+msgstr "\nSuplemento AMidi"
+
+#: src/amidi-plug/i_utils.c:69
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing\n"
+"\n"
+msgstr "\nUm reprodutor de faixas midi\nhttp://www.develia.org/projects.php?p=amidiplug\n\ndesenvolvido por Giacomo Lozito\n< james@develia.org >\n\n\nUm especial obrigado a...\n\nClemens Ladisch e Jaroslav Kysela\npelos programas aplaymidi e amixer e\naos documentos alsa-lib para\nas informações da API Alsa\n\nAlfredo Spadafina\npelo logótipo do teclado midi\n\nTony Vroon\npela sua ajuda ao testar o módulo\n\n"
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "Retângulo"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "Retângulo arredondado"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "Retângulo côncavo"
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "Nada"
+
+#: src/aosd/aosd_trigger.c:78
+msgid "Playback Start"
+msgstr "Ao iniciar reprodução"
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Ativar OSD ao reproduzir uma faixa da lista de reprodução"
+
+#: src/aosd/aosd_trigger.c:83
+msgid "Title Change"
+msgstr "Ao alterar o título"
+
+#: src/aosd/aosd_trigger.c:84
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr "Ativar OSD se, durante a reprodução, o título da faixa for alterado mas o nome do ficheiro permanece igual. Útil nas reproduções de emissões web"
+
+#: src/aosd/aosd_trigger.c:90
+msgid "Volume Change"
+msgstr "Ao alterar o volume"
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Triggers OSD when volume is changed."
+msgstr "Ativar OSD ao alterar o volume"
+
+#: src/aosd/aosd_trigger.c:95
+msgid "Pause On"
+msgstr "Ao colocar em pausa"
+
+#: src/aosd/aosd_trigger.c:96
+msgid "Triggers OSD when playback is paused."
+msgstr "Ativar OSD se a reprodução for colocada em pausa"
+
+#: src/aosd/aosd_trigger.c:100
+msgid "Pause Off"
+msgstr "Ao retirar da pausa"
+
+#: src/aosd/aosd_trigger.c:101
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Ativar OSD ao retomar a reprodução"
+
+#: src/aosd/aosd_ui.c:179
+msgid "Placement"
+msgstr "Posicionamento"
+
+#: src/aosd/aosd_ui.c:218
+msgid "Relative X offset:"
+msgstr "X relativo:"
+
+#: src/aosd/aosd_ui.c:227
+msgid "Relative Y offset:"
+msgstr "Y relativo:"
+
+#: src/aosd/aosd_ui.c:236
+msgid "Max OSD width:"
+msgstr "Largura máxima do OSD:"
+
+#: src/aosd/aosd_ui.c:249
+msgid "Multi-Monitor options"
+msgstr "Opções de monitores múltiplos"
+
+#: src/aosd/aosd_ui.c:253
+msgid "Display OSD using:"
+msgstr "Mostrar OSD em:"
+
+#: src/aosd/aosd_ui.c:264
+msgid "all monitors"
+msgstr "todos os monitores"
+
+#: src/aosd/aosd_ui.c:267
+#, c-format
+msgid "monitor %i"
+msgstr "monitor %i"
+
+#: src/aosd/aosd_ui.c:322
+msgid "Timing (ms)"
+msgstr "Duração (ms)"
+
+#: src/aosd/aosd_ui.c:327
+msgid "Display:"
+msgstr "Exibição:"
+
+#: src/aosd/aosd_ui.c:332
+msgid "Fade in:"
+msgstr "Aparecer gradual:"
+
+#: src/aosd/aosd_ui.c:337
+msgid "Fade out:"
+msgstr "Desaparecer gradual:"
+
+#: src/aosd/aosd_ui.c:418
+msgid "Fonts"
+msgstr "Tipo de letra"
+
+#: src/aosd/aosd_ui.c:426
+#, c-format
+msgid "Font %i:"
+msgstr "Tipo de letra %i:"
+
+#: src/aosd/aosd_ui.c:443
+msgid "Shadow"
+msgstr "Sombra"
+
+#: src/aosd/aosd_ui.c:478
+msgid "Internationalization"
+msgstr "Internacionalização"
+
+#: src/aosd/aosd_ui.c:484
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "Desativar conversão UTF-8 do texto (osd)"
+
+#: src/aosd/aosd_ui.c:502
+msgid "Select Skin File"
+msgstr "Selecione o ficheiro do tema"
+
+#: src/aosd/aosd_ui.c:613
+msgid "Render Style"
+msgstr "Estilo de renderização"
+
+#: src/aosd/aosd_ui.c:629
+msgid "Colors"
+msgstr "Cores"
+
+#: src/aosd/aosd_ui.c:642
+#, c-format
+msgid "Color %i:"
+msgstr "Cor %i:"
+
+#: src/aosd/aosd_ui.c:662
+msgid "Custom Skin"
+msgstr "Tema personalizado"
+
+#: src/aosd/aosd_ui.c:668
+msgid "Skin file:"
+msgstr "Ficheiro do tema:"
+
+#: src/aosd/aosd_ui.c:671
+msgid "Browse"
+msgstr "Explorar"
+
+#: src/aosd/aosd_ui.c:773
+msgid "Enable trigger"
+msgstr "Ativar ativador"
+
+#: src/aosd/aosd_ui.c:800
+msgid "Event"
+msgstr "Evento"
+
+#: src/aosd/aosd_ui.c:828
+msgid "Composite manager detected"
+msgstr "Detetado um gestor de composição"
+
+#: src/aosd/aosd_ui.c:835
+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 "O gestor de composição não foi detetado\nA menos que tenha a certeza que o gestor está ativo, tem que ativar um gestor de composição para mostrar o OSD"
+
+#: src/aosd/aosd_ui.c:843
+msgid "Composite manager not required for fake transparency"
+msgstr "O gestor de composição não é necessário para a transparência fictícia "
+
+#: src/aosd/aosd_ui.c:881
+msgid "Transparency"
+msgstr "Transparência"
+
+#: src/aosd/aosd_ui.c:887
+msgid "Fake transparency"
+msgstr "Transparência fictícia"
+
+#: src/aosd/aosd_ui.c:889
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Transparência efetiva (requer a extensão X Composite)"
+
+#: src/aosd/aosd_ui.c:931
+msgid "Composite extension not loaded"
+msgstr "Extensão Composite não carregada"
+
+#: src/aosd/aosd_ui.c:939
+msgid "Composite extension not available"
+msgstr "Extensão Composite não disponível"
+
+#: src/aosd/aosd_ui.c:958
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd_ui.c:1039
+msgid "Audacious OSD - configuration"
+msgstr "Configuração do OSD Audacious"
+
+#: src/aosd/aosd_ui.c:1060
+msgid "Test"
+msgstr "Testar"
+
+#: src/aosd/aosd_ui.c:1075
+msgid "Position"
+msgstr "Posição"
+
+#: src/aosd/aosd_ui.c:1080
+msgid "Animation"
+msgstr "Animação"
+
+#: src/aosd/aosd_ui.c:1085
+msgid "Text"
+msgstr "Texto"
+
+#: src/aosd/aosd_ui.c:1090
+msgid "Decoration"
+msgstr "Decoração"
+
+#: src/aosd/aosd_ui.c:1095
+msgid "Trigger"
+msgstr "Ativador"
+
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
+msgid "Misc"
+msgstr "Diversos"
+
+#: src/aosd/aosd_ui.c:1137
+msgid "Audacious OSD - about"
+msgstr "Sobre o OSD Audacious"
+
+#: src/aosd/aosd_ui.c:1167
+msgid ""
+"\n"
+"Audacious OSD "
+msgstr "\nAudacious OSD "
+
+#: src/aosd/aosd_ui.c:1168
+msgid ""
+"\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"written by Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"On-Screen-Display is based on Ghosd library\n"
+"written by Evan Martin\n"
+"http://neugierig.org/software/ghosd/\n"
+"\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\ndesenvolvido por Giacomo Lozito\n< james@develia.org >\n\nOSD baseado na biblioteca Ghosd\ndesenvolvida por Evan Martin\nhttp://neugierig.org/software/ghosd/\n\n"
+
+#: src/blur_scope/config.c:73
+msgid "Blur Scope: Color selection"
+msgstr "Blur Scope: selecção de cores"
+
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
+msgid "Options:"
+msgstr "Opções:"
+
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr "Preferências de Bauer stereophonic-to-binaural"
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr "Nível:"
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr "Frequência de corte:"
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr "Pré-ajuste:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:242
+msgid "About Audio CD Plugin"
+msgstr "Sobre o Audio CD"
+
+#: src/cdaudio-ng/cdaudio-ng.c:243
+msgid ""
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project.\n"
+"\n"
+"Copyright 2009 John Lindgren"
+msgstr "Direitos de autor (c) 2007, de Calin Crisan <ccrisan@gmail.com> e equipa Audacious\n\nObrigado aos programadores libcdio <http://www.gnu.org/software/libcdio/>\n\te aos programadores da libcddb <http://libcddb.sourceforge.net/>.\n\nObrigado a Tony Vroon pelo apoio e ajuda\n\nEste é um projeto do Google Summer of Code 2007\n\nDireitos de autor 2009, John Lindgren"
+
+#: src/cdaudio-ng/cdaudio-ng.c:552
+msgid "Audio CD"
+msgstr "CD áudio"
+
+#: src/cdaudio-ng/cdaudio-ng.c:924
+msgid "Drive is empty."
+msgstr "Unidade vazia"
+
+#: src/cdaudio-ng/cdaudio-ng.c:926
+msgid "Unsupported disk type."
+msgstr "Tipo de disco não suportado"
+
+#: src/cdaudio-ng/configure.c:148
+msgid "CD Audio Plugin Configuration"
+msgstr "Configuração do Audio CD"
+
+#: src/cdaudio-ng/configure.c:160
+msgid "Digital audio extraction"
+msgstr "Extração de áudio digital"
+
+#: src/cdaudio-ng/configure.c:165
+msgid "Title information"
+msgstr "Informações do título"
+
+#: src/cdaudio-ng/configure.c:176
+msgid "Disc speed:"
+msgstr "Velocidade do disco:"
+
+#: src/cdaudio-ng/configure.c:184
+msgid "Use cd-text if available"
+msgstr "Se disponível, utilizar cd-text"
+
+#: src/cdaudio-ng/configure.c:191
+msgid "Use CDDB if available"
+msgstr "Se disponivel, utilizar CDDB"
+
+#: src/cdaudio-ng/configure.c:197
+msgid "Server: "
+msgstr "Servidor: "
+
+#: src/cdaudio-ng/configure.c:201
+msgid "Path: "
+msgstr "Caminho: "
+
+#: src/cdaudio-ng/configure.c:205
+msgid "Port: "
+msgstr "Porta: "
+
+#: src/cdaudio-ng/configure.c:218
+msgid "Use HTTP instead of CDDBP"
+msgstr "Utilizar HTTP em vez de CDDBP"
+
+#: src/cdaudio-ng/configure.c:230
+msgid "Override default device: "
+msgstr "Sobrepor dispositivo pré-definido: "
+
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
+msgid "Ok"
+msgstr "Aceitar"
+
+#: src/cd-menu-items/cd-menu-items.c:34
+msgid "Play CD"
+msgstr "Reproduzir CD"
+
+#: src/cd-menu-items/cd-menu-items.c:34
+msgid "Add CD"
+msgstr "Adicionar CD"
+
+#: src/compressor/plugin.c:63
+msgid "About Dynamic Range Compression Plugin"
+msgstr "Sobre o Dynamic Range Compression"
+
+#: src/compressor/plugin.c:95
+msgid "Dynamic Range Compressor Preferences"
+msgstr "Preferências Dynamic Range Compressor"
+
+#: src/compressor/plugin.c:107
+msgid "Center volume:"
+msgstr "Centrar volume:"
+
+#: src/compressor/plugin.c:120
+msgid "Dynamic range:"
+msgstr "Intervalo dinâmico:"
+
+#: src/console/configure.c:136
+msgid "Game Console Music Decoder"
+msgstr "Descodificador Game Console Music"
+
+#: src/console/configure.c:153
+msgid "General"
+msgstr "Geral"
+
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Reprodução"
+
+#: src/console/configure.c:170
+msgid "Bass:"
+msgstr "Graves:"
+
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
+msgid "secs"
+msgstr "segundos"
+
+#: src/console/configure.c:181
+msgid "Treble:"
+msgstr "Agudos:"
+
+#: src/console/configure.c:202
+msgid "Default song length:"
+msgstr "Duração pré-definida da faixa:"
+
+#: src/console/configure.c:208
+msgid "Resampling"
+msgstr "Remistura"
+
+#: src/console/configure.c:214
+msgid "Enable audio resampling"
+msgstr "Ativar remistura áudio"
+
+#: src/console/configure.c:229
+msgid "Resampling rate:"
+msgstr "Frequência:"
+
+#: src/console/configure.c:233
+msgid "Hz"
+msgstr "Hz"
+
+#: src/console/configure.c:244
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/configure.c:245
+msgid "Ignore length from SPC tags"
+msgstr "Ignorar duração das \"tags\" SPC"
+
+#: src/console/configure.c:246
+msgid "Increase reverb"
+msgstr "Aumentar \"reverb\""
+
+#: src/console/configure.c:271
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
+msgstr "A duração pré-definida da faixa, expressa em segundos, é utilizada pelas faixas que não possuem as informações de duração (exemplo: faixas cíclicas)"
+
+#: src/console/plugin.c:33
+msgid "About the Game Console Music Decoder"
+msgstr "Sobre o Game Console Music Decoder"
+
+#: src/console/plugin.c:34
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2.\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
+" Shay Green <gblargg@gmail.com>\n"
+msgstr "O Console Music Decoder é baseado no Game_Music_Emu 0.5.2.\nOs formatos suportados são: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nImplementação no Audacious por: William Pitcock <nenolod@dereferenced.org>, \n Shay Green <gblargg@gmail.com>\n"
+
+#: src/crossfade/plugin.c:60
+msgid "About Crossfade"
+msgstr "Sobre o Crossfade"
+
+#: src/crossfade/plugin.c:92
+msgid "Crossfade Preferences"
+msgstr "Preferências Crossfade"
+
+#: src/crossfade/plugin.c:104
+msgid "Overlap (in seconds):"
+msgstr "Sobreposição (em segundos):"
+
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
+msgid "Crossfade Error"
+msgstr "Erro Crossfade"
+
+#: src/crossfade/plugin.c:135
+msgid ""
+"Crossfading failed because the songs had a different number of channels."
+msgstr "A sobreposição falhou porque as faixas não possuem o mesmo número de canais"
+
+#: src/crossfade/plugin.c:143
+msgid ""
+"Crossfading failed because the songs had different sample rates.\n"
+"\n"
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
+msgstr "A sobreposição falhou porque as faixas possuem frequências diferentes\n\nPode utilizar o Sample Rate Converter para as converter para a mesmo frequência"
+
+#: src/crystalizer/crystalizer.c:100
+msgid "Configure Crystalizer"
+msgstr "Configurar Crystalizer"
+
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
+msgid "Effect intensity:"
+msgstr "Intensidade do efeito:"
+
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/echo_plugin/gui.c:15
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin 1999.\n"
+"\n"
+"Surround echo by Carl van Schaik 1999"
+msgstr "Suplemento Echo\npor Johan Levin 1999.\n\nSurround echo por Carl van Schaik 1999"
+
+#: src/echo_plugin/gui.c:27
+msgid "About Echo Plugin"
+msgstr "Sobre o Echo"
+
+#: src/echo_plugin/gui.c:67
+msgid "Configure Echo"
+msgstr "Configurar Echo"
+
+#: src/echo_plugin/gui.c:83
+msgid "Delay: (ms)"
+msgstr "Atraso: (ms)"
+
+#: src/echo_plugin/gui.c:88
+msgid "Feedback: (%)"
+msgstr "Feedback: (%)"
+
+#: src/echo_plugin/gui.c:93
+msgid "Volume: (%)"
+msgstr "Volume: (%)"
+
+#: src/ffaudio/ffaudio-core.c:718
+#, 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"
+"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 "Um suplemento de descodificação áudio para o Audacious, baseado\nno programa FFmpeg (http://www.ffmpeg.org/)\nDireitos de autor (c) 2000-2009, Fabrice Bellard e outros\n\nImplementação no Audacious por:\n William Pitcock <nenolod@nenolod.net>,\n Matti Hämäläinen <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
+
+#: src/ffaudio/ffaudio-core.c:732
+msgid "About FFaudio Plugin"
+msgstr "Sobre o FFaudio"
+
+#: src/filewriter/filewriter.c:166
+msgid "About FileWriter-Plugin"
+msgstr "Sobre o FileWriter"
+
+#: src/filewriter/filewriter.c:461
+msgid "File Writer Configuration"
+msgstr "Configurações do FileWriter"
+
+#: src/filewriter/filewriter.c:473
+msgid "Output file format:"
+msgstr "Formato de saída:"
+
+#: src/filewriter/filewriter.c:491
+msgid "Configure"
+msgstr "Configurar"
+
+#: src/filewriter/filewriter.c:506
+msgid "Save into original directory"
+msgstr "Gravar no diretório original"
+
+#: src/filewriter/filewriter.c:511
+msgid "Save into custom directory"
+msgstr "Gravar num diretório personalizado"
+
+#: src/filewriter/filewriter.c:521
+msgid "Output file folder:"
+msgstr "Pasta de destino:"
+
+#: src/filewriter/filewriter.c:525
+msgid "Pick a folder"
+msgstr "Escolha a pasta"
+
+#: src/filewriter/filewriter.c:544
+msgid "Get filename from:"
+msgstr "Obter nome do ficheiro:"
+
+#: src/filewriter/filewriter.c:547
+msgid "original file tags"
+msgstr "das \"tags\" originais"
+
+#: src/filewriter/filewriter.c:553
+msgid "original filename"
+msgstr "do nome de ficheiro original"
+
+#: src/filewriter/filewriter.c:563
+msgid "Don't strip file name extension"
+msgstr "Não remover extensão do ficheiro"
+
+#: src/filewriter/filewriter.c:578
+msgid "Prepend track number to filename"
+msgstr "Prefixar n.º da faixa ao nome do ficheiro"
+
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
+msgid "Auto"
+msgstr "Automático"
+
+#: src/filewriter/mp3.c:38
+msgid "Joint Stereo"
+msgstr "Joint Stereo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
+msgid "Stereo"
+msgstr "Estéreo"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/mp3.c:706
+msgid "MP3 Configuration"
+msgstr "Configuração MP3"
+
+#: src/filewriter/mp3.c:729
+msgid "Algorithm Quality:"
+msgstr "Qualidade do algoritmo:"
+
+#: src/filewriter/mp3.c:754
+msgid "Output Samplerate:"
+msgstr "Frequência de saída:"
+
+#: src/filewriter/mp3.c:782
+msgid "(Hz)"
+msgstr "(Hz)"
+
+#: src/filewriter/mp3.c:789
+msgid "Bitrate / Compression ratio:"
+msgstr "Taxa de dados/compressão:"
+
+#: src/filewriter/mp3.c:813
+msgid "Bitrate (kbps):"
+msgstr "Taxa de dados (kbps):"
+
+#: src/filewriter/mp3.c:846
+msgid "Compression ratio:"
+msgstr "Rácio de compressão:"
+
+#: src/filewriter/mp3.c:870
+msgid "Audio Mode:"
+msgstr "Modo áudio:"
+
+#: src/filewriter/mp3.c:895
+msgid "Misc:"
+msgstr "Div:"
+
+#: src/filewriter/mp3.c:906
+msgid "Enforce strict ISO complience"
+msgstr "Forçar conformidade ISO"
+
+#: src/filewriter/mp3.c:917
+msgid "Error protection"
+msgstr "Proteção de erros"
+
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
+msgid "Quality"
+msgstr "Qualidade"
+
+#: src/filewriter/mp3.c:939
+msgid "Enable VBR/ABR"
+msgstr "Ativar VBR/ABR"
+
+#: src/filewriter/mp3.c:949
+msgid "Type:"
+msgstr "Tipo:"
+
+#: src/filewriter/mp3.c:982
+msgid "VBR Options:"
+msgstr "Opções VBR:"
+
+#: src/filewriter/mp3.c:998
+msgid "Minimum bitrate (kbps):"
+msgstr "Taxa mínima (kbps):"
+
+#: src/filewriter/mp3.c:1025
+msgid "Maximum bitrate (kbps):"
+msgstr "Taxa máxima (kbps):"
+
+#: src/filewriter/mp3.c:1048
+msgid "Strictly enforce minimum bitrate"
+msgstr "Forçar taxa de dados mínima"
+
+#: src/filewriter/mp3.c:1060
+msgid "ABR Options:"
+msgstr "Opções ABR:"
+
+#: src/filewriter/mp3.c:1070
+msgid "Average bitrate (kbps):"
+msgstr "Taxa média (kbps):"
+
+#: src/filewriter/mp3.c:1098
+msgid "VBR quality level:"
+msgstr "Qualidade VBR:"
+
+#: src/filewriter/mp3.c:1117
+msgid "Don't write Xing VBR header"
+msgstr "Não gravar cabeçalho Xing VBR"
+
+#: src/filewriter/mp3.c:1131
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1141
+msgid "Frame params:"
+msgstr "Parâmetros:"
+
+#: src/filewriter/mp3.c:1153
+msgid "Mark as copyright"
+msgstr "Assinalar como copyright"
+
+#: src/filewriter/mp3.c:1164
+msgid "Mark as original"
+msgstr "Assinalar como original"
+
+#: src/filewriter/mp3.c:1176
+msgid "ID3 params:"
+msgstr "Parâmetros ID3:"
+
+#: src/filewriter/mp3.c:1187
+msgid "Force addition of version 2 tag"
+msgstr "Forçar adição de \"tags\" v2"
+
+#: src/filewriter/mp3.c:1197
+msgid "Only add v1 tag"
+msgstr "Só adicionar \"tags\" v1"
+
+#: src/filewriter/mp3.c:1204
+msgid "Only add v2 tag"
+msgstr "Só adicionar \"tags\" v2"
+
+#: src/filewriter/mp3.c:1225
+msgid "Tags"
+msgstr "\"Tags\""
+
+#: src/filewriter/vorbis.c:240
+msgid "Vorbis Encoder Configuration"
+msgstr "Configuração do codificador Vorbis"
+
+#: src/filewriter/vorbis.c:260
+msgid "Quality level (0 - 10):"
+msgstr "Qualidade (0 - 10):"
+
+#: src/flacng/plugin.c:380
+msgid "About FLAC Audio Plugin"
+msgstr "Sobre o Flac Audio"
+
+#: src/flacng/plugin.c:381
+msgid ""
+"\n"
+"\n"
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\nCódigo original:\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
+msgid "About Gnome Shortcut Plugin"
+msgstr "Sobre o Gnome Shortcuts"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr "Suplemento Gnome Shortcuts\nPermite controlar o reprodutor com as teclas de atalho Gnome\n\nDireitos de autor (C) 2007-2008, Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
+
+#: src/gtkui/columns.c:36
+msgid "Entry number"
+msgstr "Número da entrada"
+
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
+msgid "Title"
+msgstr "Título"
+
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
+msgid "Artist"
+msgstr "Artista"
+
+#: src/gtkui/columns.c:37
+msgid "Year"
+msgstr "Ano"
+
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
+msgid "Album"
+msgstr "Álbum"
+
+#: src/gtkui/columns.c:37
+msgid "Track"
+msgstr "Faixa"
+
+#: src/gtkui/columns.c:37
+msgid "Queue position"
+msgstr "Posição na fila"
+
+#: src/gtkui/columns.c:38
+msgid "Length"
+msgstr "Duração"
+
+#: src/gtkui/columns.c:38
+msgid "File path"
+msgstr "Caminho do ficheiro"
+
+#: src/gtkui/columns.c:38
+msgid "File name"
+msgstr "Nome do ficheiro"
+
+#: src/gtkui/columns.c:38
+msgid "Custom title"
+msgstr "Título personalizado"
+
+#: src/gtkui/columns.c:39
+msgid "Bitrate"
+msgstr "Taxa de dados"
+
+#: src/gtkui/columns.c:278
+msgid "Choose Columns"
+msgstr "Escolha as colunas"
+
+#: src/gtkui/columns.c:292
+msgid "Available:"
+msgstr "Disponíveis:"
+
+#: src/gtkui/columns.c:326
+msgid "Chosen:"
+msgstr "Escolhidas:"
+
+#: src/gtkui/layout.c:122
+msgid "Dock at Left"
+msgstr "\"Dock\" à esquerda"
+
+#: src/gtkui/layout.c:122
+msgid "Dock at Right"
+msgstr "\"Dock\" à direita"
+
+#: src/gtkui/layout.c:123
+msgid "Dock at Top"
+msgstr "\"Dock\" no topo"
+
+#: src/gtkui/layout.c:123
+msgid "Dock at Bottom"
+msgstr "\"Dock\" na base"
+
+#: src/gtkui/layout.c:123
+msgid "Undock"
+msgstr "Desacoplar"
+
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
+msgid "Disable"
+msgstr "Desativar"
+
+#: src/gtkui/menus.c:131
+msgid "_Open Files ..."
+msgstr "Abrir ficheir_os..."
+
+#: src/gtkui/menus.c:132
+msgid "Open _URL ..."
+msgstr "Abrir _URL..."
+
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "_Adicionar ficheiros..."
+
+#: src/gtkui/menus.c:134
+msgid "Add U_RL ..."
+msgstr "Adicionar U_RL..."
+
+#: src/gtkui/menus.c:136
+msgid "A_bout ..."
+msgstr "So_bre..."
+
+#: src/gtkui/menus.c:137
+msgid "_Preferences ..."
+msgstr "_Preferências..."
+
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
+msgid "_Quit"
+msgstr "_Sair"
+
+#: src/gtkui/menus.c:141
+msgid "_Play"
+msgstr "Re_produzir"
+
+#: src/gtkui/menus.c:142
+msgid "Paus_e"
+msgstr "Paus_a"
+
+#: src/gtkui/menus.c:143
+msgid "_Stop"
+msgstr "Pa_rar"
+
+#: src/gtkui/menus.c:144
+msgid "Pre_vious"
+msgstr "An_terior"
+
+#: src/gtkui/menus.c:145
+msgid "_Next"
+msgstr "Segui_nte"
+
+#: src/gtkui/menus.c:147
+msgid "_Repeat"
+msgstr "_Repetir"
+
+#: src/gtkui/menus.c:148
+msgid "S_huffle"
+msgstr "Baral_har"
+
+#: src/gtkui/menus.c:149
+msgid "N_o Playlist Advance"
+msgstr "Sem avanç_o na lista de reprodução"
+
+#: src/gtkui/menus.c:150
+msgid "Stop _After This Song"
+msgstr "Parar _após esta faixa"
+
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
+msgid "Song _Info ..."
+msgstr "_Informações da faixa..."
+
+#: src/gtkui/menus.c:153
+msgid "Jump to _Time ..."
+msgstr "Ir para posição _temporal..."
+
+#: src/gtkui/menus.c:154
+msgid "_Jump to Song ..."
+msgstr "I_r para a faixa..."
+
+#: src/gtkui/menus.c:157
+msgid "By Track _Number"
+msgstr "Por _número de faixa"
+
+#: src/gtkui/menus.c:158
+msgid "By _Title"
+msgstr "Por _título"
+
+#: src/gtkui/menus.c:159
+msgid "By _Artist"
+msgstr "Por _artista"
+
+#: src/gtkui/menus.c:160
+msgid "By A_lbum"
+msgstr "Por á_lbum"
+
+#: src/gtkui/menus.c:161
+msgid "By Release _Date"
+msgstr "Por _data de disponibilização"
+
+#: src/gtkui/menus.c:162
+msgid "By _File Path"
+msgstr "Por caminho do _ficheiro"
+
+#: src/gtkui/menus.c:163
+msgid "By _Custom Title"
+msgstr "Por tít_ulo personalizado"
+
+#: src/gtkui/menus.c:165
+msgid "R_everse Order"
+msgstr "Inv_erter ordem"
+
+#: src/gtkui/menus.c:166
+msgid "_Random Order"
+msgstr "Aleató_rio"
+
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
+msgid "_Refresh"
+msgstr "_Atualizar"
+
+#: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Remover ficheiros indisponívei_s"
+
+#: src/gtkui/menus.c:172
+msgid "_Sort"
+msgstr "_Organização"
+
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr "_Nova"
+
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
+msgid "_Close"
+msgstr "Fe_char"
+
+#: src/gtkui/menus.c:177
+msgid "_Import ..."
+msgstr "_Importar..."
+
+#: src/gtkui/menus.c:178
+msgid "_Export ..."
+msgstr "_Exportar..."
+
+#: src/gtkui/menus.c:180
+msgid "_Playlist Manager ..."
+msgstr "Gestão de lista de re_produção..."
+
+#: src/gtkui/menus.c:181
+msgid "_Queue Manager ..."
+msgstr "Gestão de _fila de reprodução"
+
+#: src/gtkui/menus.c:184
+msgid "Volume _Up"
+msgstr "A_umentar volume"
+
+#: src/gtkui/menus.c:185
+msgid "Volume _Down"
+msgstr "Re_duzir volume"
+
+#: src/gtkui/menus.c:187
+msgid "_Equalizer"
+msgstr "_Equalizador"
+
+#: src/gtkui/menus.c:189
+msgid "E_ffects"
+msgstr "E_feitos"
+
+#: src/gtkui/menus.c:192
+msgid "_Interface"
+msgstr "_Interface"
+
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Visualizações"
+
+#: src/gtkui/menus.c:195
+msgid "Show _Menu Bar"
+msgstr "_Mostrar barra de menu"
+
+#: src/gtkui/menus.c:196
+msgid "Show I_nfo Bar"
+msgstr "Mostrar barra de i_nformações"
+
+#: src/gtkui/menus.c:197
+msgid "Show _Status Bar"
+msgstr "Mo_strar barra de estado"
+
+#: src/gtkui/menus.c:199
+msgid "Show Column _Headers"
+msgstr "Mostrar cabeçal_ho das colunas"
+
+#: src/gtkui/menus.c:200
+msgid "Choose _Columns ..."
+msgstr "Escolher _colunas..."
+
+#: src/gtkui/menus.c:201
+msgid "Scrol_l on Song Change"
+msgstr "Des_locar ao alterar faixa"
+
+#: src/gtkui/menus.c:204
+msgid "_File"
+msgstr "_Ficheiro"
+
+#: src/gtkui/menus.c:205
+msgid "_Playback"
+msgstr "Re_produção"
+
+#: src/gtkui/menus.c:206
+msgid "P_laylist"
+msgstr "_Lista de reprodução"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
+msgid "_Services"
+msgstr "_Serviços"
+
+#: src/gtkui/menus.c:208
+msgid "_Output"
+msgstr "S_aída"
+
+#: src/gtkui/menus.c:209
+msgid "_View"
+msgstr "_Ver"
+
+#: src/gtkui/menus.c:213
+msgid "_Queue/Unqueue"
+msgstr "Colocar/retirar da fila"
+
+#: src/gtkui/menus.c:216
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: src/gtkui/menus.c:217
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: src/gtkui/menus.c:218
+msgid "_Paste"
+msgstr "Co_lar"
+
+#: src/gtkui/menus.c:219
+msgid "Select _All"
+msgstr "Selecion_ar tudo"
+
+#: src/gtkui/menus.c:224
+msgid "_Rename"
+msgstr "_Mudar nome"
+
+#: src/gtkui/ui_gtk.c:95
+msgid "GTK Interface"
+msgstr "Interface GTK"
+
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "A processar..."
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
+msgid "Error"
+msgstr "Erro"
+
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Fechar"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
+msgid "mono"
+msgstr "mono"
+
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
+msgid "stereo"
+msgstr "estéreo"
+
+#: src/gtkui/ui_statusbar.c:109
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] "%d canal"
+msgstr[1] "%d canais"
+
+#: src/gtkui/ui_statusbar.c:124
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/hotkey/gui.c:71
+msgid "Previous Track"
+msgstr "Faixa anterior"
+
+#: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+msgid "Play"
+msgstr "Reproduzir"
+
+#: src/hotkey/gui.c:73
+msgid "Pause/Resume"
+msgstr "Pausa/Retomar"
+
+#: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+msgid "Stop"
+msgstr "Parar"
+
+#: src/hotkey/gui.c:75
+msgid "Next Track"
+msgstr "Faixa seguinte"
+
+#: src/hotkey/gui.c:76
+msgid "Forward 5 Seconds"
+msgstr "Avançar 5 segundos"
+
+#: src/hotkey/gui.c:77
+msgid "Rewind 5 Seconds"
+msgstr "Recuar 5 segundos"
+
+#: src/hotkey/gui.c:78
+msgid "Mute"
+msgstr "Silenciar"
+
+#: src/hotkey/gui.c:79
+msgid "Volume Up"
+msgstr "Aumentar volume"
+
+#: src/hotkey/gui.c:80
+msgid "Volume Down"
+msgstr "Reduzir volume"
+
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Jump to File"
+msgstr "Ir para o ficheiro"
+
+#: src/hotkey/gui.c:82
+msgid "Toggle Player Windows"
+msgstr "Alternar janelas do reprodutor"
+
+#: src/hotkey/gui.c:83
+msgid "Show On-Screen-Display"
+msgstr "Mostrar OSD"
+
+#: src/hotkey/gui.c:84
+msgid "Toggle Repeat"
+msgstr "Alternar repetição"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle Shuffle"
+msgstr "Alternar baralhação"
+
+#: src/hotkey/gui.c:95
+msgid "(none)"
+msgstr "(nada)"
+
+#: src/hotkey/gui.c:232
+msgid ""
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr "Não deve associar os botões principais do rato sem modificadores\n\nContinuar?"
+
+#: src/hotkey/gui.c:234
+msgid "Binding mouse buttons"
+msgstr "Associação de botões do rato"
+
+#: src/hotkey/gui.c:384
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Configuração do Global Hotkey"
+
+#: src/hotkey/gui.c:400
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr "Prima a combinação de teclas no campo de texto\nTambém pode associar os botões do rato"
+
+#: src/hotkey/gui.c:405
+msgid "Hotkeys:"
+msgstr "Teclas de atalho:"
+
+#: src/hotkey/gui.c:424
+msgid "Action:"
+msgstr "Ação:"
+
+#: src/hotkey/gui.c:432
+msgid "Key Binding:"
+msgstr "Associação de teclas:"
+
+#: src/hotkey/gui.c:663
+msgid "About Global Hotkey Plugin"
+msgstr "Sobre o Global Hotkey"
+
+#: src/hotkey/gui.c:664
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr "Suplemento Global Hotkey\nPermite controlar o reprodutor com as teclas multimédia ou com as teclas globais\n\nDireitos de autor (C) 2007-2008, Sascha Hlusiak <contact@saschahlusiak.de>\n\nContributos:\nDireitos de autor (C) 2006-2007, Vladimir Paskov <vlado.paskov@gmail.com>\nDireitos de autor (C) 2000-2002, Ville Syrjälä <syrjala@sci.fi>\n\t\t\tBryn Davies <curious@ihug.com.au>\n\t\t\tJonathan A. Davis <davis@jdhouse.org>\n\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n\n"
+
+#: src/jack/configure.c:66
+msgid "Connect to all available jack ports"
+msgstr "Ligar a todas as portas \"jack\" disponíveis"
+
+#: src/jack/configure.c:73
+msgid "Connect only the output ports"
+msgstr "Ligar às portas de saída"
+
+#: src/jack/configure.c:80
+msgid "Connect to no ports"
+msgstr "Não ligar às portas"
+
+#: src/jack/configure.c:98
+msgid "jack Plugin configuration"
+msgstr "Configuração do Jack"
+
+#: src/jack/configure.c:116
+msgid "Connection mode:"
+msgstr "Modo de ligação:"
+
+#: src/jack/configure.c:128
+msgid "Enable debug printing"
+msgstr "Ativar depuração"
+
+#: src/jack/jack.c:435
+msgid ""
+"XMMS jack Driver 0.17\n"
+"\n"
+"xmms-jack.sf.net\n"
+"Chris Morgan<cmorgan@alum.wpi.edu>\n"
+"\n"
+"Audacious port by\n"
+"Giacomo Lozito from develia.org"
+msgstr "Controlador XMMS Jack 0.17\n\nxmms-jack.sf.net\nChris Morgan<cmorgan@alum.wpi.edu>\n\nImplementação no Audacious por\nGiacomo Lozito de develia.org"
+
+#: src/jack/jack.c:440
+msgid "About JACK Output Plugin 0.17"
+msgstr "Sobre o Jack 0.17"
+
+#: src/ladspa/plugin.c:415
+msgid "About LADSPA Host"
+msgstr "Sobre o LADSPA Host"
+
+#: src/ladspa/plugin.c:516
+#, c-format
+msgid "%s Settings"
+msgstr "Definições de %s"
+
+#: src/ladspa/plugin.c:584
+msgid "LADSPA Host Settings"
+msgstr "Definições de LADSPA Host"
+
+#: src/ladspa/plugin.c:593
+msgid "Module paths:"
+msgstr "Caminhos do módulo:"
+
+#: src/ladspa/plugin.c:598
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr "Separe os caminhos com vírgulas\nEstes caminhos serão adicionados ao LADSPA_PATH.\nApós a adição dos caminhos, prima Enter para procurar os novos suplementos"
+
+#: src/ladspa/plugin.c:614
+msgid "Available plugins:"
+msgstr "Suplemento disponíveis:"
+
+#: src/ladspa/plugin.c:626
+msgid "Enable"
+msgstr "Ativar"
+
+#: src/ladspa/plugin.c:632
+msgid "Enabled plugins:"
+msgstr "Suplementos ativos:"
+
+#: src/ladspa/plugin.c:647
+msgid "Settings"
+msgstr "Definições"
+
+#: src/lyricwiki/lyricwiki.c:267
+msgid ""
+"\n"
+"Looking for lyrics..."
+msgstr "\nA procurar a letra das músicas..."
+
+#: src/lyricwiki/lyricwiki.c:304
+msgid ""
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr "\nA procurar em lyrics.wikia.com..."
+
+#: src/lyricwiki/lyricwiki.c:377
+msgid ""
+"\n"
+"No lyrics were found."
+msgstr "\nNão foram encontradas letras"
+
+#: src/metronom/metronom.c:86
+msgid "About Metronom"
+msgstr "Sobre o Metronom"
+
+#: src/metronom/metronom.c:87
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr "Um gerador Tact por Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nPara o utilizar, adicione o URL: tact://beats*num/den\nexemplo: tact://77 para reproduzir 77 batidas por minuto\nou tact://60*3/4 para reproduzir 60 batidas por minuto em 3/4 tacts"
+
+#: src/metronom/metronom.c:144
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Gerador Tact: %d bpm"
+
+#: src/metronom/metronom.c:146
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Gerador Tact: %d bpm %d/%d"
+
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "Sobre o Channel Mixer"
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "Definições do Channel Mixer"
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "Canais de saída:"
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "As alterações serão aplicadas ao alterar a faixa"
+
+#: src/mpg123/mpg123.c:191
+msgid "Surround"
+msgstr "Surround"
+
+#: src/mtp_up/mtp.c:340
+msgid "Upload in progress..."
+msgstr "A enviar..."
+
+#: src/mtp_up/mtp.c:352
+msgid "Upload to MTP Device"
+msgstr "Enviar para dispositivo MTP"
+
+#: src/mtp_up/mtp.c:353
+msgid "Disconnect MTP Device"
+msgstr "Desligar dispositivo MTP"
+
+#: src/notify/libnotify-aosd_event.c:48
+msgid "Stopped"
+msgstr "Parado"
+
+#: src/notify/libnotify-aosd_event.c:48
+msgid "Audacious is not playing."
+msgstr "O Audacious não está a reproduzir"
+
+#: src/null/null.c:64
+msgid "Null output plugin "
+msgstr "Suplemento Null output"
+
+#: src/null/null.c:65
+msgid ""
+" by Christian Birchinger <joker@netswarm.net>\n"
+"based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
+msgstr "por Christian Birchinger <joker@netswarm.net>\nbaseado no suplemento XMMS de Håvard Kvål <havardk@xmms.org>"
+
+#: src/null/null.c:68
+msgid "About Null Output"
+msgstr "Sobre o Null Output"
+
+#: src/null/null.c:89
+msgid "Null output preferences"
+msgstr "Preferências do Null output"
+
+#: src/null/null.c:100
+msgid "Run in real time"
+msgstr "Em tempo real"
+
+#: src/oss4/configure.c:81
+msgid "1. Default device"
+msgstr "1. Dispositivo pré-definido"
+
+#: src/oss4/configure.c:138
+msgid "OSS4 Output Plugin Preferences"
+msgstr "Preferências do suplemento OSS4"
+
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
+msgid "Audio device:"
+msgstr "Dispositivo áudio:"
+
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
+msgid "Use alternate device:"
+msgstr "Utilizar dispositivo alternativo:"
+
+#: src/oss4/configure.c:193
+msgid "Save volume between sessions"
+msgstr "Gravar volume entre as sessões"
+
+#: src/oss4/configure.c:197
+msgid "Enable format conversions made by the OSS software."
+msgstr "Ativar conversão de formatos com o programa OSS"
+
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Ativar modo exclusivo para prevenir mistura virtual"
+
+#: src/oss4/plugin.c:51
+msgid "About OSS4 Plugin"
+msgstr "Sobre o OSS4"
+
+#: src/oss4/utils.c:211
+msgid "OSS4 error"
+msgstr "Erro OSS4"
+
+#: src/OSS/configure.c:137
+#, c-format
+msgid "Default (%s)"
+msgstr "Pré-definido (%s)"
+
+#: src/OSS/configure.c:178
+msgid "OSS Driver configuration"
+msgstr "Configuração do controlador OSS"
+
+#: src/OSS/configure.c:281
+msgid "Devices"
+msgstr "Dispositivos"
+
+#: src/OSS/configure.c:283
+msgid "Buffering:"
+msgstr "A processar:"
+
+#: src/OSS/configure.c:296
+msgid "Pre-buffer (percent):"
+msgstr "Pré-processamento (percentagem):"
+
+#: src/OSS/configure.c:307
+msgid "Buffering"
+msgstr "A processar"
+
+#: src/OSS/configure.c:308
+msgid "Mixer Settings:"
+msgstr "Definições do misturador:"
+
+#: src/OSS/configure.c:314
+msgid "Volume controls Master not PCM"
+msgstr "Utilizar Master e não PCM"
+
+#: src/OSS/configure.c:320
+msgid "Mixer"
+msgstr "Misturador"
+
+#: src/OSS/OSS.c:41
+msgid "About OSS Driver"
+msgstr "Sobre o controlador OSS"
+
+#: src/pulse_audio/pulse_audio.c:677
+msgid "About Audacious PulseAudio Output Plugin"
+msgstr "Sobre o Audacious PulseAudio"
+
+#: src/resample/plugin.c:89
+msgid "About Sample Rate Converter Plugin"
+msgstr "Sobre o Sample Rate Converter"
+
+#: src/resample/plugin.c:144
+msgid "Sample Rate Converter Preferences"
+msgstr "Preferências do Sample Rate Converter"
+
+#: src/resample/plugin.c:156
+msgid "Rate mappings:"
+msgstr "Mapeamento:"
+
+#: src/resample/plugin.c:179
+msgid "All others:"
+msgstr "Todas as outras:"
+
+#: src/resample/plugin.c:191
+msgid "Method:"
+msgstr "Método:"
+
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
+msgid "Change password"
+msgstr "Alterar senha"
+
+#: src/scrobbler/configure.c:144
+msgid "Services"
+msgstr "Serviços"
+
+#: src/scrobbler/configure.c:166
+msgid "Username:"
+msgstr "Utilizador:"
+
+#: src/scrobbler/configure.c:172
+msgid "Password:"
+msgstr "Senha:"
+
+#: src/scrobbler/configure.c:180
+msgid "Scrobbler URL:"
+msgstr "URL do scrobbler:"
+
+#: src/scrobbler/configure.c:212
+msgid "Last.FM"
+msgstr "Last.FM"
+
+#: src/scrobbler/configure.c:239
+msgid "Scrobbler"
+msgstr "Scrobbler"
+
+#: src/scrobbler/plugin.c:194
+msgid ""
+"Audacious AudioScrobbler Plugin\n"
+"\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr "Suplemento Audacious AudioScrobbler\n\nDesenvolvido por Audun Hove <audun@nlc.no> e Pipian <pipian@pipian.com>\n"
+
+#: src/scrobbler/plugin.c:196
+msgid "About Scrobbler Plugin"
+msgstr "Sobre o AudioScrobbler"
+
+#: src/sdlout/plugin.c:58
+msgid "About SDL Output Plugin"
+msgstr "Sobre o SDL"
+
+#: src/sdlout/plugin.c:78
+msgid "SDL error"
+msgstr "Erro SDL"
+
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Género"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Coleção"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Criar lista de reprodução"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Adicionar à lista de reprodução"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Procurar coleção"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "Para importar a coleção de músicas para o Audacious, escolha a pasta e clique no ícone \"Atualizar\""
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Aguarde..."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Escolha a pasta"
+
+#: src/skins/plugin.c:167
+msgid "About Skinned GUI"
+msgstr "Sobre o Skinned GUI"
+
+#: src/skins/plugin.c:168
+msgid ""
+"Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
+"\n"
+msgstr "Direitos de autor (c) 2008, por Tomasz Moń <desowin@gmail.com>\n\n"
+
+#: src/skins/skins_cfg.c:207
+msgid "_Player:"
+msgstr "_Reprodutor:"
+
+#: src/skins/skins_cfg.c:208
+msgid "Select main player window font:"
+msgstr "Selecione o tipo de letra do reprodutor:"
+
+#: src/skins/skins_cfg.c:210
+msgid "_Playlist:"
+msgstr "_Lista de reprodução:"
+
+#: src/skins/skins_cfg.c:211
+msgid "Select playlist font:"
+msgstr "Selecione o tipo de letra da lista de reprodução:"
+
+#: src/skins/skins_cfg.c:215
+msgid "_Fonts"
+msgstr "_Tipo de letra"
+
+#: src/skins/skins_cfg.c:218
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Utilizar letras bitmap (só para ASCII)"
+
+#: src/skins/skins_cfg.c:220
+msgid "Scroll song title in both directions"
+msgstr "Deslocar título em ambas as direções"
+
+#: src/skins/skins_cfg.c:298
+msgid "_Skin"
+msgstr "_Tema"
+
+#: src/skins/skins_cfg.c:345
+msgid "Interface Preferences"
+msgstr "Preferências da interface"
+
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Amplificador"
+
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/ui_equalizer.c:379
+msgid "Audacious Equalizer"
+msgstr "Equalizador Audacious"
+
+#: src/skins/ui_equalizer.c:887
+msgid "Presets"
+msgstr "Pré-ajuste"
+
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Carregar pré-ajuste"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Carregar pré-ajuste automático"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Carregar pré-ajuste de equalizador"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Gravar pré-ajuste"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Gravar pré-ajuste automático"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Gravar pré-ajuste de equalizador"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Eliminar pré-ajuste"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Eliminar pré-ajuste automático"
+
+#: src/skins/ui_main.c:444
+msgid "kbps"
+msgstr "kbps"
+
+#: src/skins/ui_main.c:452
+msgid "kHz"
+msgstr "kHz"
+
+#: src/skins/ui_main.c:459
+msgid "surround"
+msgstr "surround"
+
+#: src/skins/ui_main.c:807
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Ir para %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/ui_main.c:828
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volume: %d%%"
+
+#: src/skins/ui_main.c:851
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Equilíbrio: %d%% à esquerda"
+
+#: src/skins/ui_main.c:853
+msgid "Balance: center"
+msgstr "Equilíbrio: centro"
+
+#: src/skins/ui_main.c:855
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Equilíbrio: %d%% à direita"
+
+#: src/skins/ui_main.c:981
+msgid "Options Menu"
+msgstr "Menu de opções"
+
+#: src/skins/ui_main.c:985
+msgid "Disable 'Always On Top'"
+msgstr "Desativar \"Sempre no topo\""
+
+#: src/skins/ui_main.c:987
+msgid "Enable 'Always On Top'"
+msgstr "Ativar \"Sempre no topo\""
+
+#: src/skins/ui_main.c:990
+msgid "File Info Box"
+msgstr "Caixa de informações de ficheiro"
+
+#: src/skins/ui_main.c:995
+msgid "Visualization Menu"
+msgstr "Menu de visualizações"
+
+#: src/skins/ui_main.c:1653
+msgid "Single mode."
+msgstr "Modo simples"
+
+#: src/skins/ui_main.c:1655
+msgid "Playlist mode."
+msgstr "Modo de lista de reprodução"
+
+#: src/skins/ui_main.c:1677
+msgid "Stopping after song."
+msgstr "Para após a faixa"
+
+#: src/skins/ui_main.c:1679
+msgid "Not stopping after song."
+msgstr "Não para após a faixa"
+
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+msgid "Autoscroll Songname"
+msgstr "Deslocar nome automaticamente"
+
+#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+msgid "Stop after Current Song"
+msgstr "Parar após a faixa atual"
+
+#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+msgid "Peaks"
+msgstr "Peaks"
+
+#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+msgid "Shuffle"
+msgstr "Baralhar"
+
+#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+msgid "No Playlist Advance"
+msgstr "Sem avanço na lista de reprodução"
+
+#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+msgid "Show Player"
+msgstr "Mostrar reprodutor"
+
+#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+msgid "Show Playlist Editor"
+msgstr "Mostrar editor de listas de reprodução"
+
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+msgid "Show Equalizer"
+msgstr "Mostrar equalizador"
+
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+msgid "Always on Top"
+msgstr "Sempre no topo"
+
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+msgid "Put on All Workspaces"
+msgstr "Em todas as áreas de trabalho"
+
+#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+msgid "Roll up Player"
+msgstr "Enrolar reprodutor"
+
+#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+msgid "Roll up Playlist Editor"
+msgstr "Enrolar editor de listas de reprodução"
+
+#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+msgid "Roll up Equalizer"
+msgstr "Enrolar equalizador"
+
+#: src/skins/ui_manager.c:115
+msgid "Analyzer"
+msgstr "Analyzer"
+
+#: src/skins/ui_manager.c:116
+msgid "Scope"
+msgstr "Scope"
+
+#: src/skins/ui_manager.c:117
+msgid "Voiceprint"
+msgstr "Voiceprint"
+
+#: src/skins/ui_manager.c:118
+msgid "Off"
+msgstr "Desligado"
+
+#: 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:123 src/skins/ui_manager.c:140
+msgid "Fire"
+msgstr "Fogo"
+
+#: src/skins/ui_manager.c:124
+msgid "Vertical Lines"
+msgstr "Linhas verticais"
+
+#: src/skins/ui_manager.c:128
+msgid "Lines"
+msgstr "Linhas"
+
+#: src/skins/ui_manager.c:129
+msgid "Bars"
+msgstr "Barras"
+
+#: src/skins/ui_manager.c:133
+msgid "Dot Scope"
+msgstr "Dot Scope"
+
+#: src/skins/ui_manager.c:134
+msgid "Line Scope"
+msgstr "Line Scope"
+
+#: src/skins/ui_manager.c:135
+msgid "Solid Scope"
+msgstr "Solid Scope"
+
+#: src/skins/ui_manager.c:141
+msgid "Ice"
+msgstr "Gelo"
+
+#: src/skins/ui_manager.c:146
+msgid "Smooth"
+msgstr "Suave"
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slowest"
+msgstr "Mais lento"
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+msgid "Slow"
+msgstr "Lento"
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Medium"
+msgstr "Normal"
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fast"
+msgstr "Rápido"
+
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+msgid "Fastest"
+msgstr "Mais rápido"
+
+#: src/skins/ui_manager.c:166
+msgid "Time Elapsed"
+msgstr "Tempo decorrido"
+
+#: src/skins/ui_manager.c:167
+msgid "Time Remaining"
+msgstr "Tempo restante"
+
+#: 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 "Seguinte"
+
+#: src/skins/ui_manager.c:196
+msgid "Visualization"
+msgstr "Visualização"
+
+#: src/skins/ui_manager.c:197
+msgid "Visualization Mode"
+msgstr "Modo de visualização"
+
+#: src/skins/ui_manager.c:198
+msgid "Analyzer Mode"
+msgstr "Modo Analyzer"
+
+#: src/skins/ui_manager.c:199
+msgid "Scope Mode"
+msgstr "Modo Scope"
+
+#: src/skins/ui_manager.c:200
+msgid "Voiceprint Mode"
+msgstr "Modo Voiceprint"
+
+#: src/skins/ui_manager.c:201
+msgid "WindowShade VU Mode"
+msgstr "Modo WindowShade VU"
+
+#: src/skins/ui_manager.c:202
+msgid "Analyzer Falloff"
+msgstr "Recurso do Analyzer"
+
+#: src/skins/ui_manager.c:203
+msgid "Peaks Falloff"
+msgstr "Recurso do Peaks"
+
+#: src/skins/ui_manager.c:208
+msgid "Playlist"
+msgstr "Lista de reprodução"
+
+#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+msgid "New Playlist"
+msgstr "Nova lista de reprodução"
+
+#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+msgid "Select Next Playlist"
+msgstr "Selecionar lista de reprodução seguinte"
+
+#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+msgid "Select Previous Playlist"
+msgstr "Selecionar lista de reprodução anterior"
+
+#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+msgid "Delete Playlist"
+msgstr "Eliminar lista de reprodução"
+
+#: src/skins/ui_manager.c:222
+msgid "Import Playlist"
+msgstr "Importar lista de reprodução"
+
+#: src/skins/ui_manager.c:223
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Carrega uma lista de reprodução para a lista selecionada"
+
+#: src/skins/ui_manager.c:226
+msgid "Export Playlist"
+msgstr "Exportar lista de reprodução"
+
+#: src/skins/ui_manager.c:227
+msgid "Saves the selected playlist."
+msgstr "Grava a lista de reprodução selecionada"
+
+#: src/skins/ui_manager.c:229
+msgid "Refresh List"
+msgstr "Atualiza a lista"
+
+#: src/skins/ui_manager.c:230
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Atualiza os detalhes associados às faixas da lista de reprodução"
+
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "Gestor da lista de reprdução"
+
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Gestor da fila de reprodução"
+
+#: src/skins/ui_manager.c:237
+msgid "View"
+msgstr "Ver"
+
+#: src/skins/ui_manager.c:238
+msgid "Interface"
+msgstr "Interface"
+
+#: src/skins/ui_manager.c:239
+msgid "Interface Preferences ..."
+msgstr "Preferências da interface..."
+
+#: src/skins/ui_manager.c:243
+msgid "Add Internet Address..."
+msgstr "Adicionar endereço web..."
+
+#: src/skins/ui_manager.c:244
+msgid "Adds a remote track to the playlist."
+msgstr "Adiciona uma faixa remota à lista de reprodução"
+
+#: src/skins/ui_manager.c:247
+msgid "Add Files..."
+msgstr "Adicionar ficheiros..."
+
+#: src/skins/ui_manager.c:248
+msgid "Adds files to the playlist."
+msgstr "Adicionar ficheiros à lista de reprodução"
+
+#: src/skins/ui_manager.c:253
+msgid "Search and Select"
+msgstr "Procurar e selecionar"
+
+#: src/skins/ui_manager.c:254
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr "Procura a lista de reprodução e seleciona as faixas com base num critério"
+
+#: src/skins/ui_manager.c:257
+msgid "Invert Selection"
+msgstr "Inverter seleção"
+
+#: src/skins/ui_manager.c:258
+msgid "Inverts the selected and unselected entries."
+msgstr "Inverte a relação entre selecionadas e não"
+
+#: src/skins/ui_manager.c:261
+msgid "Select All"
+msgstr "Selecionar tudo"
+
+#: src/skins/ui_manager.c:262
+msgid "Selects all of the playlist entries."
+msgstr "Seleciona todas as faixas da lista de reprodução"
+
+#: src/skins/ui_manager.c:265
+msgid "Select None"
+msgstr "Não selecionar"
+
+#: src/skins/ui_manager.c:266
+msgid "Deselects all of the playlist entries."
+msgstr "Desmarca todas as faixas da lista de reprodução"
+
+#: src/skins/ui_manager.c:271
+msgid "Remove All"
+msgstr "Remover tudo"
+
+#: src/skins/ui_manager.c:272
+msgid "Removes all entries from the playlist."
+msgstr "Remove todas as faixas da lista de reprodução"
+
+#: src/skins/ui_manager.c:275
+msgid "Clear Queue"
+msgstr "Apagar fila de reprodução"
+
+#: src/skins/ui_manager.c:276
+msgid "Clears the queue associated with this playlist."
+msgstr "Apaga a fila associada à lista de reprodução"
+
+#: src/skins/ui_manager.c:279
+msgid "Remove Unavailable Files"
+msgstr "Remover ficheiros indisponíveis"
+
+#: src/skins/ui_manager.c:280
+msgid "Removes unavailable files from the playlist."
+msgstr "Remove da lista de reprodução os ficheiros indisponíveis"
+
+#: src/skins/ui_manager.c:283
+msgid "Remove Duplicates"
+msgstr "Remover duplicados"
+
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
+msgid "By Title"
+msgstr "Por título"
+
+#: src/skins/ui_manager.c:286
+msgid "Removes duplicate entries from the playlist by title."
+msgstr "Remover da lista de reprodução as entradas duplicadas (por título)"
+
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
+msgid "By Filename"
+msgstr "Por nome de ficheiro"
+
+#: src/skins/ui_manager.c:290
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr "Remover da lista de reprodução as entradas duplicadas (por nome de ficheiro)"
+
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
+msgid "By Path + Filename"
+msgstr "Por caminho e nome de ficheiro"
+
+#: src/skins/ui_manager.c:294
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr "Remover da lista de reprodução as entradas duplicadas (por caminho)"
+
+#: src/skins/ui_manager.c:297
+msgid "Remove Unselected"
+msgstr "Remover desmarcadas"
+
+#: src/skins/ui_manager.c:298
+msgid "Remove unselected entries from the playlist."
+msgstr "Remove da lista de reprodução as entradas desmarcadas"
+
+#: src/skins/ui_manager.c:301
+msgid "Remove Selected"
+msgstr "Remover selecionadas"
+
+#: src/skins/ui_manager.c:302
+msgid "Remove selected entries from the playlist."
+msgstr "Remove da lista de reprodução as entradas selecionadas"
+
+#: src/skins/ui_manager.c:307
+msgid "Randomize List"
+msgstr "Lista aleatória"
+
+#: src/skins/ui_manager.c:308
+msgid "Randomizes the playlist."
+msgstr "Cria uma lista de reprodução aleatória"
+
+#: src/skins/ui_manager.c:311
+msgid "Reverse List"
+msgstr "Inverter lista"
+
+#: src/skins/ui_manager.c:312
+msgid "Reverses the playlist."
+msgstr "Inverte a lista de reprodução"
+
+#: src/skins/ui_manager.c:315
+msgid "Sort List"
+msgstr "Ordenação"
+
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
+msgid "Sorts the list by title."
+msgstr "Ordenar por título"
+
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+msgid "By Album"
+msgstr "Por álbum"
+
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
+msgid "Sorts the list by album."
+msgstr "Ordenar por álbum"
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "By Artist"
+msgstr "Por artista"
+
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+msgid "Sorts the list by artist."
+msgstr "Ordenar por artista"
+
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+msgid "Sorts the list by filename."
+msgstr "Ordenar por nome de ficheiro"
+
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+msgid "Sorts the list by full pathname."
+msgstr "Ordenar por caminho"
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "By Date"
+msgstr "Por data"
+
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+msgid "Sorts the list by modification time."
+msgstr "Ordenar por data de modificação"
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "By Track Number"
+msgstr "Por número de faixa"
+
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+msgid "Sorts the list by track number."
+msgstr "Ordenar por número de faixa"
+
+#: src/skins/ui_manager.c:345
+msgid "Sort Selected"
+msgstr "Ordenar seleção"
+
+#: src/skins/ui_manager.c:381
+msgid "File"
+msgstr "Ficheiro"
+
+#: src/skins/ui_manager.c:384
+msgid "Plugin Services"
+msgstr "Serviços do suplemento"
+
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
+msgid "View Track Details"
+msgstr "Ver detalhes da faixa"
+
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
+msgid "View track details"
+msgstr "Ver detalhes da faixa"
+
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
+msgid "About Audacious"
+msgstr "Sobre o Audacious"
+
+#: src/skins/ui_manager.c:395
+msgid "Play File"
+msgstr "Reproduzir ficheiro"
+
+#: src/skins/ui_manager.c:396
+msgid "Load and play a file"
+msgstr "Carregar e reproduzir ficheiro"
+
+#: src/skins/ui_manager.c:398
+msgid "Play Location"
+msgstr "Reproduzir localização"
+
+#: src/skins/ui_manager.c:399
+msgid "Play media from the selected location"
+msgstr "Reproduzir ficheiros da localização escolhida"
+
+#: src/skins/ui_manager.c:401
+msgid "Plugin services"
+msgstr "Serviços do suplemento"
+
+#: src/skins/ui_manager.c:403
+msgid "Preferences"
+msgstr "Preferências"
+
+#: src/skins/ui_manager.c:404
+msgid "Open preferences window"
+msgstr "Abrir janela de preferências"
+
+#: src/skins/ui_manager.c:407
+msgid "Quit Audacious"
+msgstr "Sair do Audacious"
+
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
+msgid "Set A-B"
+msgstr "Definir A-B"
+
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
+msgid "Clear A-B"
+msgstr "Apagar A-B"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Jump to Time"
+msgstr "Ir para posição temporal"
+
+#: src/skins/ui_manager.c:421
+msgid "Queue Toggle"
+msgstr "Alternador de fila"
+
+#: src/skins/ui_manager.c:422
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Ativa/inativa a entrada na fila da lista de reprodução"
+
+#: src/skins/ui_manager.c:425
+msgid "Copy"
+msgstr "Copiar"
+
+#: src/skins/ui_manager.c:427
+msgid "Cut"
+msgstr "Cortar"
+
+#: src/skins/ui_manager.c:429
+msgid "Paste"
+msgstr "Colar"
+
+#: src/skins/ui_manager.c:436
+msgid "Load"
+msgstr "Carregar"
+
+#: src/skins/ui_manager.c:437
+msgid "Import"
+msgstr "Importar"
+
+#: src/skins/ui_manager.c:438
+msgid "Save"
+msgstr "Gravar"
+
+#: src/skins/ui_manager.c:439
+msgid "Delete"
+msgstr "Eliminar"
+
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
+msgid "Preset"
+msgstr "Pré-ajuste"
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
+msgid "Auto-load preset"
+msgstr "Carregar pré-ajuste automático"
+
+#: src/skins/ui_manager.c:445
+msgid "Load auto-load preset"
+msgstr "Carregar pré-ajuste automático"
+
+#: src/skins/ui_manager.c:448
+msgid "Load default preset into equalizer"
+msgstr "Carregar pré-ajuste pré-definido para o equalizador"
+
+#: src/skins/ui_manager.c:450
+msgid "Zero"
+msgstr "Nulo"
+
+#: src/skins/ui_manager.c:451
+msgid "Set equalizer preset levels to zero"
+msgstr "Definir pré-ajuste nulo"
+
+#: src/skins/ui_manager.c:453
+msgid "From file"
+msgstr "Do ficheiro"
+
+#: src/skins/ui_manager.c:454
+msgid "Load preset from file"
+msgstr "Carregar pré-ajuste do ficheiro"
+
+#: src/skins/ui_manager.c:456
+msgid "From WinAMP EQF file"
+msgstr "Do ficheiro EQF do Winamp"
+
+#: src/skins/ui_manager.c:457
+msgid "Load preset from WinAMP EQF file"
+msgstr "Carregar pré-ajuste EQF Winamp"
+
+#: src/skins/ui_manager.c:459
+msgid "WinAMP Presets"
+msgstr "Pré-ajuste Winamp"
+
+#: src/skins/ui_manager.c:460
+msgid "Import WinAMP presets"
+msgstr "Importar pré-ajuste Winamp"
+
+#: src/skins/ui_manager.c:466
+msgid "Save auto-load preset"
+msgstr "Gravar pré-ajuste automático"
+
+#: src/skins/ui_manager.c:469
+msgid "Save default preset"
+msgstr "Gravar pré-ajuste pré-definido"
+
+#: src/skins/ui_manager.c:471
+msgid "To file"
+msgstr "Para ficheiro"
+
+#: src/skins/ui_manager.c:472
+msgid "Save preset to file"
+msgstr "Gravar pré-ajuste no ficheiro"
+
+#: src/skins/ui_manager.c:474
+msgid "To WinAMP EQF file"
+msgstr "Para ficheiro EQF"
+
+#: src/skins/ui_manager.c:475
+msgid "Save preset to WinAMP EQF file"
+msgstr "Gravar pré-ajuste para EQF Winamp"
+
+#: src/skins/ui_manager.c:481
+msgid "Delete auto-load preset"
+msgstr "Eliminar pré-ajuste automático"
+
+#: src/skins/ui_playlist.c:248
+msgid "Search entries in active playlist"
+msgstr "Procurar entradas na lista de reprodução ativa"
+
+#: src/skins/ui_playlist.c:256
+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 "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr "Seleciona as entradas da lista de reprodução, preenchendo um ou mais campos. Os campos utilizam expressões regulares, sem distinção entre maiúsculas e minúsculas. Se não souber o que são expressões regulares, basta inserir uma parte do que pretende procurar."
+
+#: src/skins/ui_playlist.c:264
+msgid "Title: "
+msgstr "Título:"
+
+#: src/skins/ui_playlist.c:271
+msgid "Album: "
+msgstr "Álbum: "
+
+#: src/skins/ui_playlist.c:278
+msgid "Artist: "
+msgstr "Artista: "
+
+#: src/skins/ui_playlist.c:285
+msgid "Filename: "
+msgstr "Nome do ficheiro:"
+
+#: src/skins/ui_playlist.c:293
+msgid "Clear previous selection before searching"
+msgstr "Apagar seleção anterior antes de procurar"
+
+#: src/skins/ui_playlist.c:296
+msgid "Automatically toggle queue for matching entries"
+msgstr "Alternar fila automaticamente para as entradas coincidentes"
+
+#: src/skins/ui_playlist.c:299
+msgid "Create a new playlist with matching entries"
+msgstr "Criar lista de reprodução com as entradas coincidentes"
+
+#: src/skins/ui_playlist.c:765
+msgid "Audacious Playlist Editor"
+msgstr "Editor de listas de reprodução"
+
+#: src/skins/ui_playlist.c:812
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d de %d)"
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr "Tema Winamp 2.x arquivado"
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr "Tema Winamp 2.x não arquivado"
+
+#: src/skins/util.c:774
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr "Não foi possível criar o diretório (%s): %s\n"
+
+#: src/sndfile/plugin.c:456
+msgid "About sndfile plugin"
+msgstr "Sobre o Sndfile"
+
+#: src/sndstretch/sndstretch_xmms.c:155
+msgid "About SndStretch"
+msgstr "Sobre o SndStretch"
+
+#: src/sndstretch/sndstretch_xmms.c:308
+msgid "Volume corr."
+msgstr "Coreção de volume"
+
+#: src/sndstretch/sndstretch_xmms.c:309
+msgid "Short Overlap"
+msgstr "Sobreposição curta"
+
+#: src/sndstretch/sndstretch_xmms.c:355
+msgid "Speed"
+msgstr "Velocidade"
+
+#: src/sndstretch/sndstretch_xmms.c:356
+msgid "Pitch"
+msgstr "Pitch"
+
+#: src/sndstretch/sndstretch_xmms.c:357
+msgid "Scale"
+msgstr "Escala"
+
+#: src/sndstretch/sndstretch_xmms.c:377
+msgid "SndStretch - Configuration"
+msgstr "Configuração do SndStretch"
+
+#: src/song_change/song_change.c:437
+msgid "Command to run when Audacious starts a new song."
+msgstr "Comando a executar ao iniciar uma nova faixa"
+
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
+msgid "Command:"
+msgstr "Comando:"
+
+#: src/song_change/song_change.c:443
+msgid "Command to run toward the end of a song."
+msgstr "Comando a executar ao terminar uma faixa"
+
+#: src/song_change/song_change.c:449
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr "Comando a executar ao atingir o fim de uma lista de reprodução"
+
+#: src/song_change/song_change.c:455
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr "Comando a executar se o título da faixa for alterado (para emissões web)"
+
+#: src/song_change/song_change.c:461
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command).\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: filename (full path)\n"
+"%l: length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr "Pode utilizar os formatos descritos em baixo, que\nserão substituidos antes da invocação do comando\n(nem todos podem ser utilizados para o comando fim da lista de reprodução)\n\n%F: frequência (em hertz)\n%c: número de canais\n%f: nome do ficheiro (caminho integral)\n%l: duração (em ms)\n%n ou %s: nome da faixa\n%r: taxa (em bits por segundo)\n%t: posição na lista de reprodução (%02d)\n%p: a reproduzir atualmente (1 ou 0)\n%a: artista\n%b: álbum\n%T: título da faixa"
+
+#: src/song_change/song_change.c:488
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr "Os parâmetros enviados à consola devem ser envolvidos em aspas. Se não as indicar corre riscos de segurança."
+
+#: src/song_change/song_change.c:499
+msgid "Commands"
+msgstr "Comandos"
+
+#: src/song_change/song_change.c:529
+msgid "Song Change"
+msgstr "Ao alterar faixa"
+
+#: src/statusicon/statusicon.c:379
+msgid "About Status Icon Plugin"
+msgstr "Sobre o Status Icon"
+
+#: src/statusicon/statusicon.c:380
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager.\n"
+msgstr "Suplemento Status Icon\n\nDireitos de autor 2005-2007, Giacomo Lozito <james@develia.org>\nDireitos de autor 2010, Michał Lipski <tallica@o2.pl>\n\nEste suplemento disponibiliza um ícone na barra de estado\nda área de notificação do gestor de janelas.\n"
+
+#: src/statusicon/statusicon.c:451
+msgid "Status Icon Plugin - Preferences"
+msgstr "Preferências do Status Icon"
+
+#: src/statusicon/statusicon.c:461
+msgid "Right-Click Menu"
+msgstr "Menu no botão direito do rato"
+
+#: src/statusicon/statusicon.c:466
+msgid "Small playback menu #1"
+msgstr "Menu de reprodução #1"
+
+#: src/statusicon/statusicon.c:469
+msgid "Small playback menu #2"
+msgstr "Menu de reprodução #2"
+
+#: src/statusicon/statusicon.c:485
+msgid "Mouse Scroll Action"
+msgstr "Ação da roda do rato"
+
+#: src/statusicon/statusicon.c:489
+msgid "Change volume"
+msgstr "Alterar volume"
+
+#: src/statusicon/statusicon.c:491
+msgid "Change playing song"
+msgstr "Alterar faixa reproduzida"
+
+#: src/statusicon/statusicon.c:504
+msgid "Other settings"
+msgstr "Outras definições"
+
+#: src/statusicon/statusicon.c:509
+msgid "Disable the popup window"
+msgstr "Desativar janela emergente"
+
+#: src/statusicon/statusicon.c:516
+msgid "Close to the notification area (system tray)"
+msgstr "Fechar para a área de notificação"
+
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Avançar na lista de reprodução ao rolar para cima"
+
+#: src/stereo_plugin/stereo.c:45
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin 1999."
+msgstr "Suplemento Extra Stereo\n\nPor Johan Levin 1999."
+
+#: src/stereo_plugin/stereo.c:64
+msgid "About Extra Stereo Plugin"
+msgstr "Sobre o Extra Stereo"
+
+#: src/stereo_plugin/stereo.c:95
+msgid "Configure Extra Stereo"
+msgstr "Configurar Extra Stereo"
+
+#: src/tonegen/tonegen.c:49
+msgid "About Tone Generator"
+msgstr "Sobre o Gerador de tons"
+
+#: src/tonegen/tonegen.c:51
+msgid ""
+"Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
+msgstr "Gerador de tons por Haavard Kvaalen <havardk@xmms.org>\nModificado por Daniel J. Peng <danielpeng@bigfoot.com>\n\nPara o utilizar, adicione o URL: tone://frequência1;frequência2;frequência3;...\nexemplo: tone://2000;2005 para reproduzir um tom a 2000Hz e outro a 2005Hz"
+
+#: src/tonegen/tonegen.c:101
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.c:101
+msgid "Tone Generator: "
+msgstr "Gerador de tons:"
+
+#: src/unix-io/gtk.c:34
+msgid "About File I/O Plugin"
+msgstr "Sobre o File I/O"
+
+#: src/vorbis/vorbis.c:573
+msgid "About Ogg Vorbis Audio Plugin"
+msgstr "Sobre o Ogg Vorbis"
+
+#: src/vorbis/vorbis.c:578
+msgid ""
+"Ogg Vorbis Plugin by the Xiph.org Foundation\n"
+"\n"
+"Original code by\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"Contributions from\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Haavard Kvaalen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>\n"
+"\n"
+"Visit the Xiph.org Foundation at http://www.xiph.org/\n"
+msgstr "Suplemento Ogg Vorbis pela Xiph.org Foundation\n\nCódigo original:\nTony Arcieri <bascule@inferno.tusculum.edu>\nContributos:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHaavard Kvaalen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\nConsulte a página Xiph.org Foundation em http://www.xiph.org/\n"
+
+#: src/vtx/about.c:14
+msgid "About Vortex Player"
+msgstr "Sobre o Vortex Player"
+
+#: src/vtx/about.c:15
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"\n"
+"Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
+"and other AY/YM music sites.\n"
+"\n"
+"Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr "Reprodutor do formato Vortex por Sashnov Alexander <sashnov@ngs.ru>\nCriado com base no código de in_vtx.dll de Roman Sherbakov <v_soft@microfor.ru>\n\nAs faixas no formato .vtx podem ser encontradas em http://vtx.microfor.ru/music.htm\ne noutros sítios de músicas AY/YM.\n\nA implementação no Audacious foi efetuada por Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/wavpack/wavpack.c:353
+#, c-format
+msgid "Wavpack Decoder Plugin %s"
+msgstr "Suplemento de descodificação Wavpack %s"
+
+#: src/wavpack/wavpack.c:354
+msgid ""
+"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan\n"
+"Visit the Wavpack site at http://www.wavpack.com/\n"
+msgstr "Direitos de autor (c) 2006, William Pitcock <nenolod -at- nenolod.net>\n\nParte do código foi escrito por Miles Egan\nConsulte a página Wavpack em http://www.wavpack.com/\n"

audacious-plugins-3.1.1.tar.bz2/po/ru.po -> audacious-plugins-3.2.4.tar.bz2/po/ru.po Changed

@@ -1,30 +1,25 @@
-# Russian translation for Audacious-plugins.
-# Copyright (C) 2006, 2007 Alexander Orlov <alxorlov@pochta.ru>
-# This file is distributed under the same license as the Audacious-plugins package.
-#
-# За основу взят перевод Виталия Липатова для BMP.
-# Улучшения перевода приветствуются :)
+# Russian translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
 #
+# Translators:
 # Alexander Orlov <alxorlov@pochta.ru>, 2007.
+# NaiLi Rootaerc <theism@mail.ru>, 2012.
 # Sergey V. Mironov <serg0@ulx.ru>, 2009.
 # Sergey V. Mironov <sergo@bk.ru>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious-plugins 1.5\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\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"
-"Language: ru\n"
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-03-03 12:58+0000\n"
+"Last-Translator: NaiLi Rootaerc <theism@mail.ru>\n"
+"Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Basepath: /home/asphyx/ahinea/audacious-plugins\n"
-"X-Generator: Lokalize 1.0\n"
-"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"
+"Language: ru\n"
+"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:256
 #, c-format
@@ -32,15 +27,246 @@
 "Using libfaad2-%s for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
-msgstr ""
-"Использование кодека libfaad2-%s.\n"
-"Декодер FAAD2 AAC/HE-AAC/HE-AACv2/DRM (c) Nero AG, www.nero.com\n"
-"Copyright (c) 2005-2006 команда разработчиков Audacious"
+msgstr "Использование кодека libfaad2-%s.\nДекодер FAAD2 AAC/HE-AAC/HE-AACv2/DRM (c) Nero AG, www.nero.com\nCopyright (c) 2005-2006 команда разработчиков Audacious"
 
 #: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "О модуле MP4 AAC"
 
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "Про Будильник"
+
+#: src/alarm/alarm.c:313
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr "Модуль, который начинает и заканчивает воспроизведение по расписанию.\nПервоначально написан Adam Feakin and Daniel Stodden."
+
+#: src/alarm/interface.c:33
+msgid "Alarm"
+msgstr "Будильник"
+
+#: src/alarm/interface.c:40
+msgid "This is your wakeup call."
+msgstr "Это ваш звонок будильника."
+
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
+msgid "OK"
+msgstr "ОК"
+
+#: src/alarm/interface.c:214
+msgid "Alarm Settings"
+msgstr "Настройки будильника"
+
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
+msgid "Time"
+msgstr "Время"
+
+#: src/alarm/interface.c:270
+msgid "hours"
+msgstr "часы"
+
+#: src/alarm/interface.c:331
+msgid "h"
+msgstr "ч"
+
+#: src/alarm/interface.c:361
+msgid "minutes"
+msgstr "минуты"
+
+#: src/alarm/interface.c:379
+msgid "Quiet after:"
+msgstr "Тихо после:"
+
+#: src/alarm/interface.c:389
+msgid "Alarm at (default):"
+msgstr "Будильник в: (по-умолчанию):"
+
+#: src/alarm/interface.c:409
+msgid "Choose the days for the alarm to come on"
+msgstr "Выберите дни для запуска будильника"
+
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
+msgid "Default"
+msgstr "По умолчанию"
+
+#: src/alarm/interface.c:763
+msgid "Day"
+msgstr "День"
+
+#: src/alarm/interface.c:783
+msgid "Tuesday"
+msgstr "Вторник"
+
+#: src/alarm/interface.c:794
+msgid "Wednesday"
+msgstr "Среда"
+
+#: src/alarm/interface.c:805
+msgid "Thursday"
+msgstr "Четверг"
+
+#: src/alarm/interface.c:816
+msgid "Friday"
+msgstr "Пятница"
+
+#: src/alarm/interface.c:827
+msgid "Saturday"
+msgstr "Суббота"
+
+#: src/alarm/interface.c:838
+msgid "Sunday"
+msgstr "Воскресенье"
+
+#: src/alarm/interface.c:848
+msgid "Monday"
+msgstr "Понедельник"
+
+#: src/alarm/interface.c:859
+msgid "Days"
+msgstr "Дни"
+
+#: src/alarm/interface.c:875
+msgid "Fading"
+msgstr "Затухание"
+
+#: src/alarm/interface.c:912
+msgid "seconds"
+msgstr "секунд"
+
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
+msgid "Volume"
+msgstr "Громкость"
+
+#: src/alarm/interface.c:946
+msgid "Current"
+msgstr "Текущее"
+
+#: src/alarm/interface.c:954
+msgid "Start at"
+msgstr "Начать в"
+
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:998
+msgid "Final"
+msgstr "Завершить"
+
+#: src/alarm/interface.c:1051
+msgid "Additional Command"
+msgstr "Дополнительные команды"
+
+#: src/alarm/interface.c:1077
+msgid "enable"
+msgstr "включить"
+
+#: src/alarm/interface.c:1085
+msgid "Playlist (optional)"
+msgstr "Список (выборочно)"
+
+#: src/alarm/interface.c:1111
+msgid "Browse..."
+msgstr "Обзор..."
+
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
+msgid "Reminder"
+msgstr "Напоминатель"
+
+#: src/alarm/interface.c:1136
+msgid "Use reminder"
+msgstr "Применить напоминатель"
+
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Параметры"
+
+#: src/alarm/interface.c:1160
+msgid "What do these options mean?"
+msgstr "Что же эта опция значит?"
+
+#: src/alarm/interface.c:1188
+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 Ссылка на mp3/ogg поток может быть\n введена здесь, но загрузка списка из\n ссылок неполностью поддерживается xmms.\n\n Напоминатель:\n Отображать напоминание когда будильник отключён,\n тип напоминания в окне, если хотите этого\n включите переключатель.\n"
+
+#: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Справка"
+
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Отмена"
+
+#: src/alarm/interface.c:1290
+msgid "Your reminder for today is.."
+msgstr "Ваше напоминание на сегодня это..."
+
+#: src/alarm/interface.c:1315
+msgid "Thankyou"
+msgstr "Спасибо"
+
 #: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Устройство PCM по умолчанию"
@@ -49,25 +275,25 @@
 msgid "Default mixer device"
 msgstr "Микшер по умолчанию"
 
-#: src/alsa/config.c:447
+#: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
 msgstr "Параметры модуля вывода ALSA"
 
-#: src/alsa/config.c:454
+#: src/alsa/config.c:445
 msgid "PCM device:"
 msgstr "Устройство PCM:"
 
-#: src/alsa/config.c:456 src/OSS/configure.c:246
+#: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
 msgstr "Микшер:"
 
-#: src/alsa/config.c:458
+#: src/alsa/config.c:449
 msgid "Mixer element:"
 msgstr "Компонент микшера:"
 
-#: src/alsa/config.c:461
+#: src/alsa/config.c:452
 msgid "Work around drain hangup"
-msgstr ""
+msgstr "Не зависать из-за изъяна \"drain\" в ALSA"
 
 #: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
@@ -77,13 +303,11 @@
 msgid "ALSA error"
 msgstr "Ошибка ALSA"
 
-#: src/amidi-plug/amidi-plug.c:335
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr ""
-"Порт секвенсера для воспроизведения MIDI не выбран. Это можно сделать в "
-"параметрах модуля MIDI."
+msgstr "Порт секвенсера для воспроизведения MIDI не выбран. Это можно сделать в параметрах модуля MIDI."
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:35
 msgid "ALSA Backend "
@@ -91,23 +315,10 @@
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:37
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
-"ports. The ALSA sequencer interface is very versatile, it can provide ports "
-"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
-"synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from "
-"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
-"hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Этот модуль отправляет события MIDI на группу выбранных пользователем портов "
-"синтезатора ALSA. Интерфейс синтезатора ALSA очень разносторонний, он может "
-"предоставлять порты для аппаратных синтезаторов (например, emu10k1), для "
-"программных синтезаторов, для внешних устройств, и др.\n"
-"Этот модуль не производит звук, события MIDI от устройств/программ "
-"обрабатываются напрямую после портов ALSA; например, отправленные на "
-"аппаратный синтезатор события MIDI будут сразу воспроизведены.\n"
-"Этот внутренний модуль написан Giacomo Lozito."
+msgstr "Этот модуль отправляет события MIDI на группу выбранных пользователем портов синтезатора ALSA. Интерфейс синтезатора ALSA очень разносторонний, он может предоставлять порты для аппаратных синтезаторов (например, emu10k1), для программных синтезаторов, для внешних устройств, и др.\nЭтот модуль не производит звук, события MIDI от устройств/программ обрабатываются напрямую после портов ALSA; например, отправленные на аппаратный синтезатор события MIDI будут сразу воспроизведены.\nЭтот внутренний модуль написан Giacomo Lozito."
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
@@ -115,19 +326,10 @@
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-"
-"time software synthesizer based on the SoundFont2 specification (www."
-"fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed "
-"by chosen ouput plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Этот внутренний модуль производит звук, отправляя события MIDI на "
-"FluidSynth, программный синтезатор реального времени, основанный на "
-"спецификациях SoundFont2 (www.fluidsynth.org).\n"
-"Полученный звук может быть изменён с помощью модулей эффектов и обработан "
-"выбранным модулем вывода.\n"
-"Этот внутренний модуль написан Giacomo Lozito."
+msgstr "Этот модуль производит аудио отправляя MIDI события к FluidSynth, программному синтезатору реального времени который основан на спецификации SoundFont2 (www.fluidsynth.org).\n\nПолученные аудио-данные можно корректировать при помощи плагинов-эффектов проигрывателя и обработать выбранным плагином вывода.\n\nМодуль написан Джакомо Лозито (Giacomo Lozito)."
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
@@ -169,9 +371,7 @@
 msgid ""
 "ALSA\n"
 "backend"
-msgstr ""
-"Модуль\n"
-"ALSA"
+msgstr "Модуль\nALSA"
 
 #: src/amidi-plug/i_configure-ap.c:59
 msgid "AMIDI-Plug - backend information"
@@ -221,9 +421,7 @@
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr ""
-"AMIDI\n"
-"Plug"
+msgstr "AMIDI\nPlug"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
@@ -335,9 +533,7 @@
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr ""
-"Модуль\n"
-"FluidSynth"
+msgstr "Модуль\nFluidSynth"
 
 #: src/amidi-plug/i_configure-timidity.c:39
 msgid "TIMIDITY BACKEND CONFIGURATION"
@@ -351,11 +547,9 @@
 msgid ""
 "TiMidity\n"
 "backend"
-msgstr ""
-"Модуль\n"
-"TiMidity"
+msgstr "Модуль\nTiMidity"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
 msgstr "Имя:"
 
@@ -415,9 +609,7 @@
 msgid ""
 "\n"
 "AMIDI-Plug "
-msgstr ""
-"\n"
-"AMIDI-Plug "
+msgstr "\nAMIDI-Plug "
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -442,28 +634,7 @@
 "Tony Vroon\n"
 "for the good help with alpha testing\n"
 "\n"
-msgstr ""
-"\n"
-"модульный проигрыватель MIDI\n"
-"http://www.develia.org/projects.php?p=amidiplug\n"
-"\n"
-"написан Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-"\n"
-"отдельные благодарности...\n"
-"\n"
-"Clemens Ladisch и Jaroslav Kysela\n"
-"за их отличные программы aplaymidi и amixer; они\n"
-"действительно полезные, как и документация alsa-lib для того,\n"
-"чтобы узнать больше об интерфейсе библиотеки ALSA\n"
-"\n"
-"Alfredo Spadafina\n"
-"за прекрасный логотип миди-клавиатуры\n"
-"\n"
-"Tony Vroon\n"
-"за большую помощь в альфа-тестировании\n"
-"\n"
+msgstr "\nмодульный проигрыватель MIDI\nhttp://www.develia.org/projects.php?p=amidiplug\n\nнаписан Giacomo Lozito\n< james@develia.org >\n\n\nотдельные благодарности...\n\nClemens Ladisch и Jaroslav Kysela\nза их отличные программы aplaymidi и amixer; они\nдействительно полезные, как и документация alsa-lib для того,\nчтобы узнать больше об интерфейсе библиотеки ALSA\n\nAlfredo Spadafina\nза прекрасный логотип миди-клавиатуры\n\nTony Vroon\nза большую помощь в альфа-тестировании\n\n"
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
@@ -481,250 +652,238 @@
 msgid "None"
 msgstr "Нет"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "Начало воспроизведения"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Показать OSD в начале воспроизведения."
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "Изменение названия"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr ""
-"Показать OSD, если в процессе воспроизведения меняется название, но имя "
-"файла остаётся прежним. Полезно для отображения названий при воспроизведении "
-"из сети."
+msgstr "Показать OSD, если в процессе воспроизведения меняется название, но имя файла остаётся прежним. Полезно для отображения названий при воспроизведении из сети."
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "Изменение громкости"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
 msgstr "Показать OSD когда меняется громкость."
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
 msgstr "Пауза вкл."
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
 msgstr "Показать OSD, когда воспроизведение приостанавливается."
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
 msgstr "Пауза выкл."
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Показать OSD, когда воспроизведение возобновляется."
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "Расположение"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
 msgstr "Смещение по оси X:"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
 msgstr "Смещение по оси Y:"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr "Максимальная ширина OSD:"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr "Параметры для систем с несколькими мониторами"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
 msgstr "Показать OSD:"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "на всех мониторах"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "на мониторе %i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "Время (мс)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "отображения:"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "появления:"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "затухания:"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "Шрифт %i:"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "Тень"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "Поддержка местных языков"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "Отключить преобразование текста в UTF-8"
 
-#: src/aosd/aosd_ui.c:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "Выберите файл стиля"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr "Стиль отображения"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "Цвет %i:"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr "Другой стиль"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "Файл стиля:"
 
-#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
-#: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "Обзор"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "Включить событие"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "Событие"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
 msgstr "Найден композитный менеджер"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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 ""
-"Композитный менеджер не найден;\n"
-"Пожалуйста, запустите композитный менеджер; в противном случае\n"
-"OSD не будет работать корректно."
+"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
+msgstr "Композитный менеджер не найден;\nПожалуйста, запустите композитный менеджер; в противном случае\nOSD не будет работать корректно."
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 msgid "Composite manager not required for fake transparency"
-msgstr ""
-"Для режима \"Имитированная прозрачность\" композитный менеджер не требуется."
+msgstr "Для режима \"Имитированная прозрачность\" композитный менеджер не требуется."
 
-#: src/aosd/aosd_ui.c:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "Прозрачность"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr "Имитированная прозрачность"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Настоящая прозрачность (требуется расширение X Composite)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
 msgstr "Расширение X Composite не загружено"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
 msgstr "Расширение X Composite недоступно"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
 msgstr "Параметры модуля Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr "Проверить"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "Положение"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "Анимация"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "Стиль"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "События"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
-#: src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "Прочее"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
 msgstr "О модуле Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
-msgstr ""
-"\n"
-"Audacious OSD "
+msgstr "\nAudacious OSD "
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -735,33 +894,39 @@
 "written by Evan Martin\n"
 "http://neugierig.org/software/ghosd/\n"
 "\n"
-msgstr ""
-"\n"
-"http://www.develia.org/projects.php?p=aosd\n"
-"создан Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-"On-Screen-Display основан на библиотеке Ghosd,\n"
-"написанной Evan Martin\n"
-"http://neugierig.org/software/ghosd/\n"
-"\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=aosd\nсоздан Giacomo Lozito\n< james@develia.org >\n\nOn-Screen-Display основан на библиотеке Ghosd,\nнаписанной Evan Martin\nhttp://neugierig.org/software/ghosd/\n\n"
 
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Размытый осциллоскоп: выбор цвета"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:111
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
 msgid "Options:"
 msgstr "Параметры:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:264
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr "Настройка преобразования стереозвука в бинауральный по Бауэру"
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr "Уровень смешивания каналов:"
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr "Частота среза:"
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr "Заготовки:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
 msgstr "О модуле Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:265
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
-"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
 "Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
 "\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
@@ -771,32 +936,19 @@
 "This was a Google Summer of Code 2007 project.\n"
 "\n"
 "Copyright 2009 John Lindgren"
-msgstr ""
-"Copyright (c) 2007 Calin Crisan <ccrisan@gmail.com> и команда разработчиков "
-"Audacious.\n"
-"\n"
-"Автор выражает благодарность разработчикам библиотеки libcdio <http://www."
-"gnu.org/software/libcdio/>\n"
-"\tи разработчикам библиотеки libcddb <http://libcddb.sourceforge.net/>.\n"
-"\n"
-"Также спасибо тебе, Tony Vroon, за наставления.\n"
-"\n"
-"Этот модуль разработан в рамках проекта Google Summer of Code 2007.\n"
-"\n"
-"Copyright 2009 John Lindgren"
+msgstr "Copyright (c) 2007 Calin Crisan <ccrisan@gmail.com> и команда разработчиков Audacious.\n\nАвтор выражает благодарность разработчикам библиотеки libcdio <http://www.gnu.org/software/libcdio/>\n\tи разработчикам библиотеки libcddb <http://libcddb.sourceforge.net/>.\n\nТакже спасибо тебе, Tony Vroon, за наставления.\n\nЭтот модуль разработан в рамках проекта Google Summer of Code 2007.\n\nCopyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:558
-#, fuzzy
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
-msgstr "Звук"
+msgstr "Аудио CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:913
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
-msgstr ""
+msgstr "Привод пуст."
 
-#: src/cdaudio-ng/cdaudio-ng.c:915
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
-msgstr ""
+msgstr "Неподдерживаемый тип диска."
 
 #: src/cdaudio-ng/configure.c:148
 msgid "CD Audio Plugin Configuration"
@@ -842,18 +994,12 @@
 msgid "Override default device: "
 msgstr "Изменить устройство по умолчанию: "
 
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:131
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:125
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
 msgid "Ok"
 msgstr "ОК"
 
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:138
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:132
-msgid "Cancel"
-msgstr "Отмена"
-
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
 msgstr "Воспроизвести CD-диск"
@@ -862,88 +1008,84 @@
 msgid "Add CD"
 msgstr "Добавить CD-диск"
 
-#: src/compressor/plugin.c:67
+#: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
 msgstr "О модуле Динамическая компрессия"
 
-#: src/compressor/plugin.c:99
+#: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
 msgstr "Параметры модуля Динамическая компрессия"
 
-#: src/compressor/plugin.c:111
-#, fuzzy
+#: src/compressor/plugin.c:107
 msgid "Center volume:"
-msgstr "Изменить громкость"
+msgstr "Центр громкости:"
 
-#: src/compressor/plugin.c:124
+#: src/compressor/plugin.c:120
 msgid "Dynamic range:"
-msgstr ""
+msgstr "Динамический диапазон:"
 
-#: src/console/configure.c:138
+#: src/console/configure.c:136
 msgid "Game Console Music Decoder"
 msgstr "Модуль поддержки звука игровой консоли"
 
-#: src/console/configure.c:155
+#: src/console/configure.c:153
 msgid "General"
 msgstr "Основной"
 
-#: src/console/configure.c:157 src/skins/ui_manager.c:176
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
 msgid "Playback"
 msgstr "Воспроизведение"
 
-#: src/console/configure.c:172
+#: src/console/configure.c:170
 msgid "Bass:"
 msgstr "Бас:"
 
-#: src/console/configure.c:176 src/console/configure.c:187
-#: src/console/configure.c:208
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
 msgid "secs"
 msgstr "секунд"
 
-#: src/console/configure.c:183
+#: src/console/configure.c:181
 msgid "Treble:"
 msgstr "Высокие:"
 
-#: src/console/configure.c:204
+#: src/console/configure.c:202
 msgid "Default song length:"
 msgstr "Длительность композиции по умолчанию:"
 
-#: src/console/configure.c:210 src/sid/xs_interface.c:666
+#: src/console/configure.c:208
 msgid "Resampling"
 msgstr "Преобразование частоты"
 
-#: src/console/configure.c:216
+#: src/console/configure.c:214
 msgid "Enable audio resampling"
 msgstr "Включить преобразование"
 
-#: src/console/configure.c:231
+#: src/console/configure.c:229
 msgid "Resampling rate:"
 msgstr "Преобразование частоты:"
 
-#: src/console/configure.c:235 src/sid/xs_interface.c:354
+#: src/console/configure.c:233
 msgid "Hz"
 msgstr "Гц"
 
-#: src/console/configure.c:246
+#: src/console/configure.c:244
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:247
+#: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
 msgstr "Игнорировать длительность из тегов SPC"
 
-#: src/console/configure.c:248
+#: src/console/configure.c:246
 msgid "Increase reverb"
 msgstr "Увеличить реверберацию"
 
-#: src/console/configure.c:273
+#: src/console/configure.c:271
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not "
-"provide length information (i.e. looping tracks)."
-msgstr ""
-"Длительность дорожки по умолчанию, заданная в секундах, используется для "
-"записей, у которых отсутствуют данные о длительности (например, бесконечные "
-"дорожки)."
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
+msgstr "Длительность дорожки по умолчанию, заданная в секундах, используется для записей, у которых отсутствуют данные о длительности (например, бесконечные дорожки)."
 
 #: src/console/plugin.c:33
 msgid "About the Game Console Music Decoder"
@@ -955,100 +1097,79 @@
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
-msgstr ""
-"Модуль поддержки звука игровых консолей основан на Game_Music_Emu 0.5.2.\n"
-"Поддерживаемые форматы: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, "
-"VGZ\n"
-"Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
-"Shay Green <gblargg@gmail.com>\n"
+msgstr "Модуль поддержки звука игровых консолей основан на Game_Music_Emu 0.5.2.\nПоддерживаемые форматы: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nAudacious implementation by: William Pitcock <nenolod@dereferenced.org>, \nShay Green <gblargg@gmail.com>\n"
 
-#: src/crossfade/plugin.c:65
+#: src/crossfade/plugin.c:60
 msgid "About Crossfade"
 msgstr "О модуле Перекрёстное затухание"
 
-#: src/crossfade/plugin.c:97
+#: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
 msgstr "Параметры модуля Перекрёстное затухание"
 
-#: src/crossfade/plugin.c:109
+#: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
 msgstr "Перекрытие (в секундах):"
 
-#: src/crossfade/plugin.c:140 src/crossfade/plugin.c:146
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
 msgstr "Перекрёстное затухание недоступно"
 
-#: src/crossfade/plugin.c:140
+#: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
-msgstr ""
-"Перекрёстное затухание недоступно, поскольку композиции имеет разное "
-"количество каналов."
+msgstr "Перекрёстное затухание недоступно, поскольку композиции имеет разное количество каналов."
 
-#: src/crossfade/plugin.c:148
+#: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
-"You can use the Sample Rate Converter effect to resample the songs to the "
-"same rate."
-msgstr ""
-"Перекрёстное затухание недоступно, поскольку композиции имеют различные "
-"битрейты.\n"
-"\n"
-"Вы можете использовать модуль Преобразования частоты для приведения "
-"композиций к единому битрейту."
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
+msgstr "Перекрёстное затухание недоступно, поскольку композиции имеют различные битрейты.\n\nВы можете использовать модуль Преобразования частоты для приведения композиций к единому битрейту."
 
-#: src/crystalizer/crystalizer.c:108
+#: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
 msgstr "Параметры модуля Crystalizer"
 
-#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
 msgstr "Интенсивность эффекта:"
 
-#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
-#: src/stereo_plugin/stereo.c:138
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
 msgid "Apply"
 msgstr "Применить"
 
-#: src/daemon/daemon.c:58
-msgid "Daemon Interface (like old headless mode)"
-msgstr ""
-
 #: src/echo_plugin/gui.c:15
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
 "\n"
 "Surround echo by Carl van Schaik 1999"
-msgstr ""
-"Модуль Эхо\n"
-"Автор Johan Levin, 1999.\n"
-"\n"
-"Объёмное эхо добавил Carl van Schaik 1999"
+msgstr "Модуль Эхо\nАвтор Johan Levin, 1999.\n\nОбъёмное эхо добавил Carl van Schaik 1999"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
 msgstr "О модуле Эхо"
 
-#: src/echo_plugin/gui.c:72
+#: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
 msgstr "Параметры модуля Эхо"
 
-#: src/echo_plugin/gui.c:88
+#: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
 msgstr "Задержка (мс):"
 
-#: src/echo_plugin/gui.c:93
+#: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
 msgstr "Обратная связь (%):"
 
-#: src/echo_plugin/gui.c:98
+#: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
 msgstr "Громкость (%):"
 
-#: src/ffaudio/ffaudio-core.c:763
-#, fuzzy, c-format
+#: src/ffaudio/ffaudio-core.c:718
+#, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1061,265 +1182,217 @@
 "libavcodec %s (%s)\n"
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
-msgstr ""
-"Многоформатный модуль декодирования звука для Audacious,\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 написали:\n"
-" William Pitcock <nenolod@nenolod.net>,\n"
-" Matti Hämäläinen <ccr@tnsp.org>\n"
+msgstr "Мульти-формат плагина аудио-декодера для Audacious основан на FFmpeg multimedia framework (http://www.ffmpeg.org/)\nCopyright (c) 2000-2009 Fabrice Bellard, et al.\n\nАвторы плагина для Audacious:\n William Pitcock <nenolod@nenolod.net>,\n Matti Hämäläinen <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:777
+#: src/ffaudio/ffaudio-core.c:732
 msgid "About FFaudio Plugin"
 msgstr "О модуле FFaudio"
 
-#: src/filewriter/filewriter.c:155
+#: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
 msgstr "О модуле Запись в файл"
 
-#: src/filewriter/filewriter.c:156
-msgid ""
-"FileWriter-Plugin\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Модуль Запись в файл\n"
-"\n"
-"Эта программа - свободное программное обеспечение; вы можете распространять "
-"и/или модифицировать его в соответствии с условиями\n"
-"Стандартной Общественной Лицензии GNU, изданной Фондом Свободного\n"
-"Программного Обеспечения; или же версией 2 Стандартной Общественной\n"
-"Лицензии Лицензии GNU или (по желанию) любой более поздней её версией.\n"
-"\n"
-"Эта программа распространяется с надеждой, что она будет полезна, но БЕЗ\n"
-"ВСЯКИХ ГАРАНТИЙНЫХ ОБЯЗАТЕЛЬСТВ; без подразумеваемой гарантии товарного\n"
-"состояния и ПРИГОДНОСТИ ИСПОЛЬЗОВАНИЯ ЕЁ ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ.\n"
-"Обратитесь за подробностями к Лицензии GNU.\n"
-"\n"
-"Вы должны были получить копию Стандартной Общественной Лицензии GNU\n"
-"вместе с этой программой; если же нет, то напишите об этом по адресу: Free "
-"Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, "
-"USA."
-
-#: src/filewriter/filewriter.c:450
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "Параметры записи в файл"
 
-#: src/filewriter/filewriter.c:462
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "Формат записываемого файла:"
 
-#: src/filewriter/filewriter.c:480
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "Настройка"
 
-#: src/filewriter/filewriter.c:495
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "Сохранить в тот же каталог"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr "Сохранить в другой каталог"
 
-#: src/filewriter/filewriter.c:510
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "Каталог для записываемых файлов:"
 
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr "Поиск каталога"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr "Создать название файла из:"
 
-#: src/filewriter/filewriter.c:536
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr "имеющихся тегов файла"
 
-#: src/filewriter/filewriter.c:542
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr "имеющегося имени файла"
 
-#: src/filewriter/filewriter.c:552
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "Не удалять расширение имени файла"
 
-#: src/filewriter/filewriter.c:567
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr "Вписать до названия файла номер дорожки"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:783
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "Автоматически"
 
 #: src/filewriter/mp3.c:38
-#, fuzzy
 msgid "Joint Stereo"
-msgstr "Joint стерео"
+msgstr "Объединённое стерео"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "Моно"
 
-#: src/filewriter/mp3.c:724
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr "Параметры MP3"
 
-#: src/filewriter/mp3.c:747
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "Качество алгоритма:"
 
-#: src/filewriter/mp3.c:772
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr "Выходная частота:"
 
-#: src/filewriter/mp3.c:800
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr "(Гц)"
 
-#: src/filewriter/mp3.c:807
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "Битрейт / Степень сжатия:"
 
-#: src/filewriter/mp3.c:831
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "Битрейт (кб/с)"
 
-#: src/filewriter/mp3.c:864
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr "Степень сжатия:"
 
-#: src/filewriter/mp3.c:888
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr "Аудио режим:"
 
-#: src/filewriter/mp3.c:913
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "Прочее:"
 
-#: src/filewriter/mp3.c:924
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr "Полное соответствие ISO"
 
-#: src/filewriter/mp3.c:935
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "Защита от ошибок"
 
-#: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "Качество"
 
-#: src/filewriter/mp3.c:957
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr "Включить VBR/ABR"
 
-#: src/filewriter/mp3.c:967
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/filewriter/mp3.c:1000
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr "Параметры VBR:"
 
-#: src/filewriter/mp3.c:1016
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "Минимальный битрейт (кб/с):"
 
-#: src/filewriter/mp3.c:1043
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "Максимальный битрейт (кб/с):"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr "Строгое соблюдение минимального битрейта"
 
-#: src/filewriter/mp3.c:1078
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr "Параметры ABR:"
 
-#: src/filewriter/mp3.c:1088
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "Средний битрейт (кб/с):"
 
-#: src/filewriter/mp3.c:1116
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr "Уровень качества VBR:"
 
-#: src/filewriter/mp3.c:1135
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr "Не записывать заголовки Xing VBR"
 
-#: src/filewriter/mp3.c:1149
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "Параметры фрейма:"
 
-#: src/filewriter/mp3.c:1171
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr "Пометить авторским правом (copyright)"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr "Пометить как оригинальное"
 
-#: src/filewriter/mp3.c:1194
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "Параметры ID3:"
 
-#: src/filewriter/mp3.c:1205
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
 msgstr "Принудительное добавление 2-й версии тегов"
 
-#: src/filewriter/mp3.c:1215
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr "Только 1-я версия тегов"
 
-#: src/filewriter/mp3.c:1222
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr "Только 2-я версия тегов"
 
-#: src/filewriter/mp3.c:1243
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
 msgstr "Теги"
 
-#: src/filewriter/vorbis.c:238
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Настройка кодека Vorbis"
 
-#: src/filewriter/vorbis.c:258
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "Уровень качества (0 - 10):"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr "О модуле поддержки FLAC"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1327,13 +1400,7 @@
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr ""
-"\n"
-"\n"
-"Оригинальный код написал\n"
-"Ralf Ertzinger <ralf@skytale.net>\n"
-"\n"
-"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\nОригинальный код написал\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
@@ -1346,444 +1413,381 @@
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-msgstr ""
-"Модуль \"Горячие клавиши\" для Gnome\n"
-"Управление проигрывателем при помощи \"горячих\n"
-"клавиш\", указанных в настройках Gnome.\n"
-"\n"
-"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
-msgid "Open Files"
-msgstr "Открыть файлы"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
-msgid "Add Files"
-msgstr "Добавить файлы"
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr "Audacious2"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr "интерфейс gnt"
+msgstr "Модуль \"Горячие клавиши\" для Gnome\nУправление проигрывателем при помощи \"горячих\nклавиш\", указанных в настройках Gnome.\n\nCopyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
 
 #: src/gtkui/columns.c:36
-#, fuzzy
 msgid "Entry number"
-msgstr "Номер дорожки:"
+msgstr "Вступительный номер"
 
-#: src/gtkui/columns.c:36 src/sid/xs_interface.c:1103
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "Название"
 
-#: src/gtkui/columns.c:37
-#, fuzzy
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
-msgstr "Исполнитель:"
+msgstr "Артист"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Year"
-msgstr "Год:"
+msgstr "Год"
 
-#: src/gtkui/columns.c:37
-#, fuzzy
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
-msgstr "Альбом:"
+msgstr "Альбом"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Track"
-msgstr "Дорожка:"
+msgstr "Дорожка"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Queue position"
-msgstr "Положение"
+msgstr "Очередь размещения"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "Length"
-msgstr "Длина:"
+msgstr "Длинна"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "File path"
-msgstr "По имени файла"
+msgstr "Путь к файлу"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "File name"
 msgstr "Имя файла"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "Custom title"
-msgstr "Другой стиль"
+msgstr "Название вручную:"
 
 #: src/gtkui/columns.c:39
-#, fuzzy
 msgid "Bitrate"
-msgstr "Битрэйт:"
+msgstr "Битрейт"
 
-#: src/gtkui/columns.c:286
-#, fuzzy
+#: src/gtkui/columns.c:278
 msgid "Choose Columns"
-msgstr "Отобразить проигрыватель"
+msgstr "Выбрать столбики"
 
-#: src/gtkui/columns.c:300
-#, fuzzy
+#: src/gtkui/columns.c:292
 msgid "Available:"
-msgstr "переменный"
+msgstr "Доступно:"
 
-#: src/gtkui/columns.c:334
+#: src/gtkui/columns.c:326
 msgid "Chosen:"
-msgstr ""
+msgstr "Выбрано:"
 
 #: src/gtkui/layout.c:122
 msgid "Dock at Left"
-msgstr ""
+msgstr "Прикрепить слева"
 
 #: src/gtkui/layout.c:122
 msgid "Dock at Right"
-msgstr ""
+msgstr "Прикрепить справа"
 
 #: src/gtkui/layout.c:123
 msgid "Dock at Top"
-msgstr ""
+msgstr "Прикрепить наверху"
 
 #: src/gtkui/layout.c:123
 msgid "Dock at Bottom"
-msgstr ""
+msgstr "Прикрепить внизу"
 
 #: src/gtkui/layout.c:123
 msgid "Undock"
-msgstr ""
+msgstr "Открепить"
 
-#: src/gtkui/layout.c:123
-#, fuzzy
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
-msgstr "переменный"
+msgstr "Отключить"
 
-#: src/gtkui/menus.c:132
-#, fuzzy
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
-msgstr "Открыть файлы..."
+msgstr "_Открыть файлы ..."
 
-#: src/gtkui/menus.c:133
-#, fuzzy
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
-msgstr "Открыть адрес..."
+msgstr "Открыть _URL ..."
 
-#: src/gtkui/menus.c:134
-#, fuzzy
-msgid "_Add File ..."
-msgstr "Добавить файлы..."
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "_Добавить файлы ..."
 
-#: src/gtkui/menus.c:135
-#, fuzzy
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
-msgstr "Добавить адрес..."
+msgstr "Добавить U_RL ..."
 
-#: src/gtkui/menus.c:137
-#, fuzzy
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
-msgstr "О "
+msgstr "О_ программе ..."
 
-#: src/gtkui/menus.c:138
-#, fuzzy
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
-msgstr "Параметры"
+msgstr "_Настройка..."
 
-#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Выход"
 
-#: src/gtkui/menus.c:142
-#, fuzzy
+#: src/gtkui/menus.c:141
 msgid "_Play"
-msgstr "Воспроизвести"
+msgstr "_Воспроизведение"
 
-#: src/gtkui/menus.c:143
-#, fuzzy
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
-msgstr "Пауза"
+msgstr "Пауз_а"
 
-#: src/gtkui/menus.c:144
-#, fuzzy
+#: src/gtkui/menus.c:143
 msgid "_Stop"
-msgstr "Остановить"
+msgstr "_Стоп"
 
-#: src/gtkui/menus.c:145
-#, fuzzy
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
-msgstr "Предыдущая дорожка"
+msgstr "пре_дыдущее"
 
-#: src/gtkui/menus.c:146
-#, fuzzy
+#: src/gtkui/menus.c:145
 msgid "_Next"
-msgstr "Следующая дорожка"
+msgstr "_Следующее"
 
-#: src/gtkui/menus.c:148
-#, fuzzy
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
-msgstr "Повтор"
+msgstr "_Повтор"
 
-#: src/gtkui/menus.c:149
-#, fuzzy
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
-msgstr "Случайно"
+msgstr "В_разброс"
 
-#: src/gtkui/menus.c:150
-#, fuzzy
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
-msgstr "Без движения по списку воспроизведения"
+msgstr "Н_е передвигаться по списку"
 
-#: src/gtkui/menus.c:151
-#, fuzzy
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
-msgstr "Остановить после дорожки."
+msgstr "Остановить _после этой песни"
 
-#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
-msgstr ""
+msgstr "Информация о _песне"
 
-#: src/gtkui/menus.c:154
-#, fuzzy
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
-msgstr "Перейти к указанному времени"
+msgstr "Перейти к _времени ..."
 
-#: src/gtkui/menus.c:155
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
-msgstr ""
+msgstr "_Перейти к песне ..."
 
-#: src/gtkui/menus.c:158
-#, fuzzy
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
-msgstr "По номеру дорожки"
+msgstr "По _номеру Трека"
 
-#: src/gtkui/menus.c:159
-#, fuzzy
+#: src/gtkui/menus.c:158
 msgid "By _Title"
-msgstr "По названию"
+msgstr "По _названию"
 
-#: src/gtkui/menus.c:160
-#, fuzzy
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
-msgstr "По исполнителю"
+msgstr "По _артисту"
 
-#: src/gtkui/menus.c:161
-#, fuzzy
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
-msgstr "По альбому"
+msgstr "По а_льбому"
 
-#: src/gtkui/menus.c:162
-#, fuzzy
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
-msgstr "По дате"
+msgstr "По _дате выпуска"
 
-#: src/gtkui/menus.c:163
-#, fuzzy
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
-msgstr "По имени файла"
+msgstr "По расположению _файла"
 
-#: src/gtkui/menus.c:164
-#, fuzzy
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
-msgstr "Другой стиль"
+msgstr "По _заданному названию файла"
 
-#: src/gtkui/menus.c:166
-#, fuzzy
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
-msgstr "В обратном порядке"
+msgstr "В _обратном порядке"
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
-msgstr ""
+msgstr "В _случайном порядке"
 
-#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
 msgstr "Обновить"
 
+#: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Убрать _недоступные файлы"
+
 #: src/gtkui/menus.c:172
-#, fuzzy
 msgid "_Sort"
-msgstr "Сортировка"
+msgstr "_Сортировать"
 
 #: src/gtkui/menus.c:174
 msgid "_New"
-msgstr ""
+msgstr "_Новый"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
 msgstr "Закрыть"
 
 #: src/gtkui/menus.c:177
-#, fuzzy
 msgid "_Import ..."
-msgstr "Импорт"
+msgstr "_Импортировать ..."
 
 #: src/gtkui/menus.c:178
-#, fuzzy
 msgid "_Export ..."
-msgstr "Экспорт"
+msgstr "_Экспортировать ..."
 
 #: src/gtkui/menus.c:180
-#, fuzzy
 msgid "_Playlist Manager ..."
-msgstr "Менеджер списков"
+msgstr "_Управление списком ..."
 
-#: src/gtkui/menus.c:183
-#, fuzzy
-msgid "Volume _Up"
-msgstr "Громче"
+#: src/gtkui/menus.c:181
+msgid "_Queue Manager ..."
+msgstr "_Управление очередью ..."
 
 #: src/gtkui/menus.c:184
-#, fuzzy
+msgid "Volume _Up"
+msgstr "Громкость _больше"
+
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
-msgstr "Тише"
+msgstr "Громкость _меньше"
 
-#: src/gtkui/menus.c:186
-#, fuzzy
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
-msgstr "Эквалайзер"
+msgstr "_Эквалайзер"
 
-#: src/gtkui/menus.c:188
-#, fuzzy
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
-msgstr "Эффекты"
+msgstr "Э_ффекты"
 
-#: src/gtkui/menus.c:191
-#, fuzzy
+#: src/gtkui/menus.c:192
 msgid "_Interface"
-msgstr "Интерфейс"
+msgstr "_Интерфейс"
 
 #: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Визуализация"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
-msgstr ""
+msgstr "Показывать _панель меню"
 
-#: src/gtkui/menus.c:194
-#, fuzzy
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
-msgstr "Показать информационное поле"
+msgstr "Показывать п_анель информации"
 
-#: src/gtkui/menus.c:195
-#, fuzzy
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
-msgstr "Показать строку состояния"
+msgstr "Показывать _строку состояния"
 
-#: src/gtkui/menus.c:197
-#, fuzzy
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
-msgstr "Отобразить проигрыватель"
+msgstr "Показывать заголовки _столбцов"
 
-#: src/gtkui/menus.c:198
-#, fuzzy
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
-msgstr "Отобразить проигрыватель"
+msgstr "Показывать _столбцы"
 
-#: src/gtkui/menus.c:199
-#, fuzzy
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
-msgstr "Смена дорожки"
+msgstr "Прокручивать при смене песни"
 
-#: src/gtkui/menus.c:202
-#, fuzzy
+#: src/gtkui/menus.c:204
 msgid "_File"
-msgstr "Файл"
+msgstr "_Файл"
 
-#: src/gtkui/menus.c:203
-#, fuzzy
+#: src/gtkui/menus.c:205
 msgid "_Playback"
-msgstr "Воспроизведение"
+msgstr "_Воспроизведение"
 
-#: src/gtkui/menus.c:204
-#, fuzzy
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
-msgstr "Список воспроизведения"
+msgstr "С_писок"
 
-#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
-#, fuzzy
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
-msgstr "Устройства"
+msgstr "_Службы"
 
-#: src/gtkui/menus.c:206
-#, fuzzy
+#: src/gtkui/menus.c:208
 msgid "_Output"
-msgstr "Вывод"
+msgstr "_Вывод"
 
-#: src/gtkui/menus.c:207
-#, fuzzy
+#: src/gtkui/menus.c:209
 msgid "_View"
-msgstr "Вид"
+msgstr "_Вид"
 
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
-msgstr ""
+msgstr "_Элемент очереди"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
-msgstr ""
+msgstr "_Вырезать"
 
-#: src/gtkui/menus.c:215
-#, fuzzy
+#: src/gtkui/menus.c:217
 msgid "_Copy"
-msgstr "Копировать"
+msgstr "_Копировать"
 
-#: src/gtkui/menus.c:216
-#, fuzzy
+#: src/gtkui/menus.c:218
 msgid "_Paste"
-msgstr "Вставить"
+msgstr "_Вставить"
 
-#: src/gtkui/menus.c:217
-#, fuzzy
+#: src/gtkui/menus.c:219
 msgid "Select _All"
-msgstr "Выбрать все"
+msgstr "Выбрать _всё"
 
-#: src/gtkui/menus.c:222
+#: src/gtkui/menus.c:224
 msgid "_Rename"
 msgstr "_Переименовать"
 
-#: src/gtkui/ui_gtk.c:75
+#: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
 msgstr "Интерфейс GTK"
 
-#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#: src/gtkui/ui_gtk.c:156 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
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "Буферизация ..."
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Закрыть"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "моно"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "стерео"
 
-#: src/gtkui/ui_statusbar.c:106
-#, fuzzy, c-format
+#: src/gtkui/ui_statusbar.c:109
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] "%d каналов"
+msgstr[0] "%d канал"
 msgstr[1] "%d каналов"
-msgstr[2] "%d каналов"
+msgstr[2] "%d каналы"
 
-#: src/gtkui/ui_statusbar.c:121
-#, fuzzy, c-format
+#: src/gtkui/ui_statusbar.c:124
+#, c-format
 msgid "%d kbps"
-msgstr "кбит/с"
+msgstr "%d кбит/с"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
@@ -1825,7 +1829,7 @@
 msgid "Volume Down"
 msgstr "Тише"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
 msgstr "Перейти к файлу"
 
@@ -1838,14 +1842,12 @@
 msgstr "Отобразить экранное сообщение (OSD)"
 
 #: src/hotkey/gui.c:84
-#, fuzzy
 msgid "Toggle Repeat"
-msgstr "Повтор"
+msgstr "Переключить на повтор"
 
 #: src/hotkey/gui.c:85
-#, fuzzy
 msgid "Toggle Shuffle"
-msgstr "Случайно"
+msgstr "Переключить на расброс"
 
 #: src/hotkey/gui.c:95
 msgid "(none)"
@@ -1853,15 +1855,10 @@
 
 #: src/hotkey/gui.c:232
 msgid ""
-"It is not recommended to bind the primary mouse buttons without "
-"modificators.\n"
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr ""
-"Не рекомендуется делать привязки к основным кнопкам мыши без клавиш-"
-"модификаторов.\n"
-"\n"
-"Продолжить?"
+msgstr "Не рекомендуется делать привязки к основным кнопкам мыши без клавиш-модификаторов.\n\nПродолжить?"
 
 #: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
@@ -1875,9 +1872,7 @@
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr ""
-"Нажмите комбинацию клавиш в текстовом поле.\n"
-"Можно также сделать привязки к кнопкам мыши."
+msgstr "Нажмите комбинацию клавиш в текстовом поле.\nМожно также сделать привязки к кнопкам мыши."
 
 #: src/hotkey/gui.c:405
 msgid "Hotkeys:"
@@ -1909,46 +1904,33 @@
 "\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
-msgstr ""
-"Модуль Глобальные \"горячие клавиши\"\n"
-"Управление проигрывателем при помощи сочетаний клавиш\n"
-"или специальных клавиш мультимедийных клавиатур.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-"В разработке принимали участие:\n"
-"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
-"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
-"\t\t\tBryn Davies <curious@ihug.com.au>\n"
-"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
-"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
-"\n"
+msgstr "Модуль Глобальные \"горячие клавиши\"\nУправление проигрывателем при помощи сочетаний клавиш\nили специальных клавиш мультимедийных клавиатур.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nВ разработке принимали участие:\nCopyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n\t\t\tBryn Davies <curious@ihug.com.au>\n\t\t\tJonathan A. Davis <davis@jdhouse.org>\n\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n\n"
 
-#: src/jack/configure.c:71
+#: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
 msgstr "Подсоединиться к доступным портам"
 
-#: src/jack/configure.c:78
+#: src/jack/configure.c:73
 msgid "Connect only the output ports"
 msgstr "Подсоединиться только к портам вывода"
 
-#: src/jack/configure.c:85
+#: src/jack/configure.c:80
 msgid "Connect to no ports"
 msgstr "Не подсоединяться к портам"
 
-#: src/jack/configure.c:103
+#: src/jack/configure.c:98
 msgid "jack Plugin configuration"
 msgstr "Параметры модуля Jack"
 
-#: src/jack/configure.c:121
+#: src/jack/configure.c:116
 msgid "Connection mode:"
 msgstr "Режим соединения:"
 
-#: src/jack/configure.c:133
+#: src/jack/configure.c:128
 msgid "Enable debug printing"
 msgstr "Выводить отладочную информацию"
 
-#: src/jack/jack.c:438
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1957,95 +1939,132 @@
 "\n"
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
-msgstr ""
-"XMMS Jack Драйвер 0.17\n"
-"\n"
-"xmms-jack.sf.net\n"
-"Chris Morgan <cmorgan@alum.wpi.edu>\n"
-"\n"
-"Портирован для Audacious:\n"
-"Giacomo Lozito с develia.org"
+msgstr "XMMS Jack Драйвер 0.17\n\nxmms-jack.sf.net\nChris Morgan <cmorgan@alum.wpi.edu>\n\nПортирован для Audacious:\nGiacomo Lozito с develia.org"
 
-#: src/jack/jack.c:443
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
 msgstr "О модуле вывода JACK 0.17"
 
-#: src/lyricwiki/lyricwiki.c:226
+#: src/ladspa/plugin.c:415
+msgid "About LADSPA Host"
+msgstr "Про хост LADSPA"
+
+#: src/ladspa/plugin.c:516
+#, c-format
+msgid "%s Settings"
+msgstr "%s Настройки"
+
+#: src/ladspa/plugin.c:584
+msgid "LADSPA Host Settings"
+msgstr "Настройки хоста LADSPA"
+
+#: src/ladspa/plugin.c:593
+msgid "Module paths:"
+msgstr "Путь к модулям:"
+
+#: src/ladspa/plugin.c:598
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr "Если путей несколько, разделяйте их двоеточием.\nПоиск осуществляется по указанным путям и переменной LADSPA_PATH.\nУказав пути, нажмите Enter для поиска новых плагинов."
+
+#: src/ladspa/plugin.c:614
+msgid "Available plugins:"
+msgstr "Доступные плагины:"
+
+#: src/ladspa/plugin.c:626
+msgid "Enable"
+msgstr "Включить"
+
+#: src/ladspa/plugin.c:632
+msgid "Enabled plugins:"
+msgstr "Включенные плагины"
+
+#: src/ladspa/plugin.c:647
+msgid "Settings"
+msgstr "Настройки"
+
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
-msgstr ""
+msgstr "\nИщу слова..."
 
-#: src/lyricwiki/lyricwiki.c:249
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
-msgstr ""
+msgstr "\nПодключение к lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:337
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
-msgstr ""
-"\n"
-"Тексты не обнаружены."
+msgstr "\nТексты не обнаружены."
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr "О модуле Метроном"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr ""
-"Тактовый генератор (метроном) от Martin Strauss <mys@faveve.uni-stuttgart."
-"de>\n"
-"\n"
-"Для использования добавьте адрес, например: tact://такты[*числ/знам]\n"
-"Например, tact://77 для воспроизведения 77и тактов в минуту\n"
-"или tact://60*3/4 для воспроизведения 60и тактов в минуту\n"
-"в размере 3/4"
+msgstr "Тактовый генератор (метроном) от Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nДля использования добавьте адрес, например: tact://такты[*числ/знам]\nНапример, tact://77 для воспроизведения 77и тактов в минуту\nили tact://60*3/4 для воспроизведения 60и тактов в минуту\nв размере 3/4"
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Тактовый генератор: %d тактов/с"
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Тактовый генератор: %d такт/мин %d/%d"
 
-#: src/mpg123/mpg123.c:183
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "Про Channel Mixer"
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "Настройки Channel Mixer "
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "Каналов на выходе:"
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "Изменения осуществляются при смене воспроизводимой песни."
+
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
 msgstr "Объёмное звучание"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
 msgstr "Проводится выгрузка..."
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
-msgstr ""
+msgstr "Загрузить на MTP-устройство"
 
-#: src/mtp_up/mtp.c:311
-#, fuzzy
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
-msgstr "Отключить устройство"
+msgstr "Отключить MTP-устройство"
 
-#: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
-msgstr "Остановить"
+msgstr "Остановлен"
 
-#: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
-msgstr "Audacious - предупреждение о неразличимости"
+msgstr "Audacious ничего не воспроизводит."
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -2055,951 +2074,201 @@
 msgid ""
 " by Christian Birchinger <joker@netswarm.net>\n"
 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
-msgstr ""
-"Christian Birchinger <joker@netswarm.net>\n"
-"основан на модуле для XMMS, от Håvard Kvål <havardk@xmms.org>"
+msgstr "Christian Birchinger <joker@netswarm.net>\nоснован на модуле для XMMS, от Håvard Kvål <havardk@xmms.org>"
 
 #: src/null/null.c:68
 msgid "About Null Output"
 msgstr "О модуле Нулевой вывод"
 
-#: src/null/null.c:94
+#: src/null/null.c:89
 msgid "Null output preferences"
 msgstr "Параметры модуля Нулевой вывод"
 
-#: src/null/null.c:105
+#: src/null/null.c:100
 msgid "Run in real time"
 msgstr "Запустить в режиме реального времени"
 
-#: src/oss4/configure.c:89
+#: src/oss4/configure.c:81
 msgid "1. Default device"
 msgstr "1. Устройство по умолчанию"
 
-#: src/oss4/configure.c:151
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
 msgstr "Параметры модуля вывода OSS4"
 
-#: src/oss4/configure.c:163 src/OSS/configure.c:203
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "Звуковое устройство:"
 
-#: src/oss4/configure.c:189 src/OSS/configure.c:226 src/OSS/configure.c:269
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "Использовать другое устройство:"
 
-#: src/oss4/configure.c:202
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
 msgstr "Сохранить громкость между сессиями"
 
-#: src/oss4/configure.c:206
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
 msgstr "Включить преобразование формата с помощью OSS."
 
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Включить эксклюзивный режим, избегать виртуального микширования."
+
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "О модуле OSS4"
 
-#: src/oss4/plugin.c:52
-msgid ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"This program is free software: you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation, either version 3 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-"Модуль вывода OSS4 для Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"Мне хотелось бы поблагодарить людей на канале #audacious, особенно Tony "
-"Vroon и John Lindgren и, конечно, авторов предыдущего модуля OSS.\n"
-"\n"
-"Эта программа - бесплатное программное обеспечение; вы можете распространять "
-"и/или модифицировать ее\n"
-"в соответствии с условиями Лицензии GNU, опубликованную\n"
-"Организацией Бесплатного Программного Обеспечения; вы можете пользоваться "
-"версией 2 Лицензии или\n"
-"(по вашему желанию) любой более поздней версией.\n"
-"\n"
-"Эта программа распространяется в надежде, что она будет полезна,\n"
-"но БЕЗ ВСЯКОЙ ГАРАНТИИ; даже без гарании подразумеваемой\n"
-"РАБОТОСПОСОБНОСТИ или ПРИГОДНОСТИ ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ. Пожалуйста,\n"
-"за подробностями обратитесь к Лицензии GNU.\n"
-"\n"
-"Вы должны были получить копию Лицензии GNU вместе с этой программой;\n"
-"если же нет, то обратитесь к странице <http://www.gnu.org/licenses/>.\n"
-
-#: src/oss4/utils.c:204
+#: src/oss4/utils.c:211
 msgid "OSS4 error"
 msgstr "Ошибка OSS4"
 
-#: src/OSS/configure.c:146
+#: src/OSS/configure.c:137
 #, c-format
 msgid "Default (%s)"
 msgstr "По умолчанию (%s)"
 
-#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
-#: src/skins/ui_manager.c:477
-msgid "Default"
-msgstr "По умолчанию"
-
-#: src/OSS/configure.c:187
+#: src/OSS/configure.c:178
 msgid "OSS Driver configuration"
 msgstr "Параметры модуля OSS"
 
-#: src/OSS/configure.c:290
+#: src/OSS/configure.c:281
 msgid "Devices"
 msgstr "Устройства"
 
-#: src/OSS/configure.c:292
+#: src/OSS/configure.c:283
 msgid "Buffering:"
 msgstr "Буферизация:"
 
-#: src/OSS/configure.c:305
+#: src/OSS/configure.c:296
 msgid "Pre-buffer (percent):"
 msgstr "Предбуферизация (%):"
 
-#: src/OSS/configure.c:316
+#: src/OSS/configure.c:307
 msgid "Buffering"
 msgstr "Буферизация"
 
-#: src/OSS/configure.c:317
+#: src/OSS/configure.c:308
 msgid "Mixer Settings:"
 msgstr "Параметры микшера:"
 
-#: src/OSS/configure.c:323
+#: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
 msgstr "Регулировка громкости через Master, а не через PCM"
 
-#: src/OSS/configure.c:329
+#: src/OSS/configure.c:320
 msgid "Mixer"
 msgstr "Микшер"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr "О модуле OSS"
 
-#: src/OSS/OSS.c:41
-msgid ""
-"Audacious OSS Driver\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Модуль OSS для Audacious\n"
-"\n"
-"Эта программа - свободное программное обеспечение; вы можете распространять "
-"и/или модифицировать его в соответствии с условиями\n"
-"Стандартной Общественной Лицензии GNU, изданной Фондом Свободного\n"
-"Программного Обеспечения; или же версией 2 Стандартной Общественной\n"
-"Лицензии Лицензии GNU или (по желанию) любой более поздней её версией.\n"
-"\n"
-"Эта программа распространяется с надеждой, что она будет полезна, но БЕЗ\n"
-"ВСЯКИХ ГАРАНТИЙНЫХ ОБЯЗАТЕЛЬСТВ; без подразумеваемой гарантии товарного\n"
-"состояния и ПРИГОДНОСТИ ИСПОЛЬЗОВАНИЯ ЕЁ ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ.\n"
-"Обратитесь за подробностями к Лицензии GNU.\n"
-"\n"
-"Вы должны были получить копию Стандартной Общественной Лицензии GNU\n"
-"вместе с этой программой; если же нет, то напишите об этом по адресу: Free "
-"Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, "
-"USA."
-
-#: src/pulse_audio/pulse_audio.c:687
+#: src/pulse_audio/pulse_audio.c:677
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "О модуле вывода PulseAudio"
 
-#: src/pulse_audio/pulse_audio.c:688
-msgid ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Модуль вывода PulseAudio для Audacious\n"
-"\n"
-" Эта программа - бесплатное программное обеспечение; вы можете "
-"распространять и/или модифицировать ее\n"
-"в соответствии с условиями Лицензии GNU, опубликованную\n"
-"Организацией Бесплатного Программного Обеспечения; вы можете пользоваться "
-"версией 2 Лицензии или\n"
-"(по вашему желанию) любой более поздней версией.\n"
-"\n"
-"Эта программа распространяется в надежде, что она будет полезна,\n"
-"но БЕЗ ВСЯКОЙ ГАРАНТИИ; даже без гарании подразумеваемой\n"
-"РАБОТОСПОСОБНОСТИ или ПРИГОДНОСТИ ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ. Пожалуйста,\n"
-"за подробностями обратитесь к Лицензии GNU.\n"
-"\n"
-"Вы должны были получить копию Лицензии GNU вместе с этой программой;\n"
-"если же нет, то напишите об этом по адресу: Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,\n"
-"USA."
-
-#: src/resample/plugin.c:91
+#: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
 msgstr "О модуле Преобразование частоты"
 
-#: src/resample/plugin.c:146
+#: src/resample/plugin.c:144
 msgid "Sample Rate Converter Preferences"
 msgstr "Параметры модуля Преобразование частоты"
 
-#: src/resample/plugin.c:158
+#: src/resample/plugin.c:156
 msgid "Rate mappings:"
 msgstr "Карта битрейтов:"
 
-#: src/resample/plugin.c:181
+#: src/resample/plugin.c:179
 msgid "All others:"
 msgstr "Все остальные:"
 
-#: src/resample/plugin.c:193
+#: src/resample/plugin.c:191
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr "Сменить пароль"
 
-#: src/scrobbler/configure.c:150
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "Службы"
 
-#: src/scrobbler/configure.c:172
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: src/scrobbler/configure.c:178
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr "Scrobbler URL:"
 
-#: src/scrobbler/configure.c:218
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:262
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:213
+#: src/scrobbler/plugin.c:194
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
-"com>\n"
-msgstr ""
-"Модуль AudioScrobbler для Audacious\n"
-"\n"
-"Первоначально был разработан Audun Hove <audun@nlc.no> и Pipian "
-"<pipian@pipian.com>\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr "Модуль AudioScrobbler для Audacious\n\nПервоначально был разработан Audun Hove <audun@nlc.no> и Pipian <pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:215
+#: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
 msgstr "О модуле Scrobbler"
 
 #: src/sdlout/plugin.c:58
-#, fuzzy
 msgid "About SDL Output Plugin"
-msgstr "О модуле вывода ALSA"
+msgstr "Про SDL Output Plugin"
 
 #: src/sdlout/plugin.c:78
-#, fuzzy
 msgid "SDL error"
-msgstr "Ошибка ALSA"
-
-#: src/sid/xs_about.c:84
-#, c-format
-msgid "About %s"
-msgstr "О модуле %s"
-
-#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Закрыть"
-
-#: src/sid/xs_config.c:326
-msgid " Error"
-msgstr "Ошибка"
-
-#: src/sid/xs_config.c:326
-msgid "OK"
-msgstr "ОК"
+msgstr "Сбой SDL"
 
-#: src/sid/xs_fileinfo.c:151
-msgid "General info"
-msgstr "Общая информация"
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Жанр"
 
-#: src/sid/xs_fileinfo.c:164
-#, c-format
-msgid "Tune #%i: "
-msgstr "Дорожка #%i: "
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Библиотека"
 
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Не удалось найти файл изображения: %s"
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Создать список"
 
-#: src/sid/xs_interface.c:234
-msgid "Audacious-SID configuration"
-msgstr "Параметры Audacious-SID"
-
-#: src/sid/xs_interface.c:270
-msgid "8-bit"
-msgstr "8 бит"
-
-#: src/sid/xs_interface.c:277
-msgid "16-bit"
-msgstr "16 бит"
-
-#: src/sid/xs_interface.c:284
-msgid "Resolution:"
-msgstr "Разрешение:"
-
-#: src/sid/xs_interface.c:315
-msgid "Autopanning"
-msgstr "Автоматическое панорамирование"
-
-#: src/sid/xs_interface.c:322
-msgid "Channels:"
-msgstr "Каналы:"
-
-#: src/sid/xs_interface.c:366
-msgid "Samplerate:"
-msgstr "Частота:"
-
-#: src/sid/xs_interface.c:383
-msgid "Use oversampling"
-msgstr "Использовать повышение частоты"
-
-#: src/sid/xs_interface.c:394
-msgid "Factor:"
-msgstr "Коэффициент:"
-
-#: src/sid/xs_interface.c:406
-msgid "Large factors require more CPU-power"
-msgstr "Большие коэффициенты требуют больше ресурсов процессора."
-
-#: src/sid/xs_interface.c:412
-msgid "Oversampling:"
-msgstr "Повышение частоты:"
-
-#: src/sid/xs_interface.c:417
-msgid "Audio"
-msgstr "Звук"
-
-#: src/sid/xs_interface.c:445
-msgid "Force speed"
-msgstr "Принудительное ускорение"
-
-#: src/sid/xs_interface.c:449
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"clock speed/frequency. Otherwise the speed is determined from played file "
-"itself."
-msgstr ""
-"Если включено, то этот параметр заставляет использовать выбранную частоту. В "
-"другом случае скорость воспроизведения определяется из самого проигрываемого "
-"файла."
-
-#: src/sid/xs_interface.c:451
-msgid "PAL (50 Hz)"
-msgstr "PAL (50 Гц)"
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Добавить в список"
 
-#: src/sid/xs_interface.c:455
-msgid ""
-"PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
-"Most of SID-tunes have been made for PAL computers."
-msgstr ""
-"PAL является европейским телевизионным стандартом, использующим 50-герцовую "
-"вертикальную развёртку. Большинство устройств SID было сделано для PAL-"
-"совместимых компьютеров."
-
-#: src/sid/xs_interface.c:459
-msgid "NTSC (60 Hz)"
-msgstr "NTSC (60 Гц)"
-
-#: src/sid/xs_interface.c:463
-msgid ""
-"NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
-"that differ from PAL). It is mainly used in United States, Japan and certain "
-"other countries."
-msgstr ""
-"NTSC является телевизионным стандартом с 60-герцовой вертикальной развёрткой "
-"(и другими функциями, отличающимися от системы PAL). Большей частью, он "
-"используется в Соединённых Штатах, Японии и некоторых других странах."
-
-#: src/sid/xs_interface.c:467
-msgid "Clock speed:"
-msgstr "Тактовая частота:"
-
-#: src/sid/xs_interface.c:484
-msgid "Force model"
-msgstr "Принудительно задать модель"
-
-#: src/sid/xs_interface.c:488
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"SID-chip model. Otherwise the preferred SID model is determined from the "
-"file (if PSIDv2NG type) or if not available, this setting is used."
-msgstr ""
-"Если включено, этот параметр принудительно эмулирует выбранную модель "
-"микросхемы SID. В другом случае, предположительная модель SID определяется "
-"из файла (если тип PSIDv2NG type). Если же если это недоступно, то "
-"используется указанное значение."
-
-#: src/sid/xs_interface.c:490
-msgid "MOS 6581"
-msgstr "MOS 6581"
-
-#: src/sid/xs_interface.c:494
-msgid ""
-"MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
-"in few ways, having much fuller filter (which, due to design error, is never "
-"same between two different SID-chips) and has the \"volume adjustment bug\", "
-"which enables playing of digital samples."
-msgstr ""
-"MOS/CSG 6581 - это самая старшая версия микросхемы SID. Она немного "
-"отличается от 8580, имеет более полные фильтры (которые, в связи с ошибкой "
-"проектирования, никогда не совпадают в разных микросхемах SID) и имеет "
-"\"ошибку настойки громкости\", которая включает воспроизведение цифровых "
-"сэмплов."
-
-#: src/sid/xs_interface.c:498
-msgid "MOS 8580"
-msgstr "MOS 8580"
-
-#: src/sid/xs_interface.c:505
-msgid "SID model:"
-msgstr "Модель SID:"
-
-#: src/sid/xs_interface.c:522
-msgid "SIDPlay 1 (frame-based)"
-msgstr "SIDPlay 1 (frame-based)"
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Поиск в библиотеке"
 
-#: src/sid/xs_interface.c:526
+#: src/search-tool/search-tool.c:645
 msgid ""
-"Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-"cases, though."
-msgstr ""
-"Эмуляция с помощью libSIDPlay версии 1.x, быстрее, но не так точно. Хороший "
-"выбор в большинстве случаев."
-
-#: src/sid/xs_interface.c:530
-msgid "SIDPlay 2 (cycle-based)"
-msgstr "SIDPlay 2 (cycle-based)"
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "Для импорта музыки в библиотеку Audacious, выберите каталог, затем нажмите иконку \"обновить\"."
 
-#: src/sid/xs_interface.c:534
-msgid ""
-"Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
-"emulation."
-msgstr ""
-"Эмуляция с помощью libSIDPlay версии 2.x, которая требует более мощных CPU в "
-"связи в более точной эмуляцией."
-
-#: src/sid/xs_interface.c:538
-msgid "Emulation library selection:"
-msgstr "Выбор библиотеки эмуляции:"
-
-#: src/sid/xs_interface.c:555
-msgid "Real C64 (SIDPlay 2 only)"
-msgstr "Real C64 (только 2-я версия SIDPlay)"
-
-#: src/sid/xs_interface.c:562
-msgid "Bank switching"
-msgstr "Переключение банков"
-
-#: src/sid/xs_interface.c:569
-msgid "Transparent ROM"
-msgstr "Прозрачное ПЗУ"
-
-#: src/sid/xs_interface.c:576
-msgid "PlaySID environment"
-msgstr "Окружение PlaySID"
-
-#: src/sid/xs_interface.c:583
-msgid "Memory mode:"
-msgstr "Режим памяти:"
-
-#: src/sid/xs_interface.c:588
-msgid "Emu#1"
-msgstr "Emu#1"
-
-#: src/sid/xs_interface.c:611
-msgid "Optimization mode (faster, inaccurate)"
-msgstr "Режим оптимизации (быстро, неточно)"
-
-#: src/sid/xs_interface.c:615
-msgid ""
-"This setting can be used to enable libSIDPlay2's \"optimization mode\", "
-"which in downgrades the emulation from cycle-exact to something similar to "
-"frame-exact. The result is lower CPU usage, but worse accuracy."
-msgstr ""
-"Этот параметр может быть использован для включения \"режима оптимизации\" во "
-"2-й версии libSIDPlay, которая снижает эмуляцию от cycle-exact к чему-то "
-"наподобие frame-exact. Результатом является небольшая загрузка процессора с "
-"потерей точности."
-
-#: src/sid/xs_interface.c:617
-msgid "reSID-emulation"
-msgstr "Эмуляция reSID"
-
-#: src/sid/xs_interface.c:621
-msgid ""
-"reSID is the software SID-chip simulator based on SID reverse-engineering, "
-"created by Dag Lem. It is probably the closest thing to real SID available "
-"as software-only emulation."
-msgstr ""
-"reSID это программный симулятор микросхемы SID, полученный в ходе реверс-"
-"инжиниринга SID, создана Dag Lem. Вероятно, она ближе всех к настоящим SID "
-"по сравнению с другими программными эмуляторами."
-
-#: src/sid/xs_interface.c:625
-msgid "HardSID"
-msgstr "HardSID"
-
-#: src/sid/xs_interface.c:629
-msgid ""
-"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-"real SID-chip. Software can be used to control the HardSID and combined with "
-"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to "
-"achieve \"near 100%\" similarity to real C64. For more information, see "
-"http://www.hardsid.com/"
-msgstr ""
-"HardSID это EISA/PCI карта для PC-совместимых устройств, на которых можно "
-"разместить настоящие микросхемы SID. Программы могут быть использованы для "
-"контроля HardSID и, соединив её с программной эмуляцией оставшихся C64 через "
-"libSIDPlay2, HardSID, можно использовать для достижения \"100-процентной "
-"близости\" к настоящему C64. Дополнительную информацию смотрите на http://"
-"www.hardsid.com/"
-
-#: src/sid/xs_interface.c:633
-msgid "SIDPlay 2 options:"
-msgstr "Параметры SIDPlay 2:"
-
-#: src/sid/xs_interface.c:650
-msgid "Fast (nearest neighbour)"
-msgstr "Быстро (ближайший сэмпл)"
-
-#: src/sid/xs_interface.c:654
-msgid ""
-"Fastest and also worst sounding sampling method, simply picks nearest "
-"neighbouring sample."
-msgstr ""
-"Быстрое и также наихудшее звучание сэмплов, простой поиск ближайшего "
-"соседнего сэмпла."
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Пожалуйста подождите ..."
 
-#: src/sid/xs_interface.c:658
-msgid "Linear interpolation"
-msgstr "Линейная интерполяция"
-
-#: src/sid/xs_interface.c:662
-msgid ""
-"Uses linear interpolation between samples, yielding higher audio quality "
-"with less sampling noise."
-msgstr ""
-"Использовать линейную интерполяцию между сэмплами, результатом чего является "
-"повышение качества звука с меньшими шумами."
-
-#: src/sid/xs_interface.c:673
-msgid "Resampling (FIR)"
-msgstr "Преобразование частоты (КИХ)"
-
-#: src/sid/xs_interface.c:680
-msgid "reSID sampling options:"
-msgstr "Параметры reSID"
-
-#: src/sid/xs_interface.c:685
-msgid "Emu#2"
-msgstr "Emu#2"
-
-#: src/sid/xs_interface.c:697
-msgid "Emulate filters"
-msgstr "Эмулировать фильтры"
-
-#: src/sid/xs_interface.c:701
-msgid ""
-"This option enables emulation of SID filter. The filter is an essential part "
-"of SID's sound capacity, but accurate emulation of it may require quite much "
-"CPU power. However, if filter emulation is disabled, tunes won't sound "
-"authentic at all if they utilize the filter."
-msgstr ""
-"Этот параметр активирует эмуляцию фильтра SID. Фильтр является составной "
-"частью звуковых возможностей SID, но точная его эмуляция может потребовать "
-"значительных ресурсов процессора. Однако, если эмуляция фильтра отключена, "
-"то мелодии не будут иметь настоящее звучание, как было бы, если при их "
-"воспроизведении использовался фильтр."
-
-#: src/sid/xs_interface.c:726
-msgid "FS"
-msgstr "FS"
-
-#: src/sid/xs_interface.c:743
-msgid "FM"
-msgstr "FM"
-
-#: src/sid/xs_interface.c:760
-msgid "FT"
-msgstr "FT"
-
-#: src/sid/xs_interface.c:771
-msgid "Reset values"
-msgstr "Сбросить значения"
-
-#: src/sid/xs_interface.c:776
-msgid "SIDPlay1"
-msgstr "SIDPlay1"
-
-#: src/sid/xs_interface.c:817
-msgid "Export"
-msgstr "Экспорт"
-
-#: src/sid/xs_interface.c:825
-msgid "Use"
-msgstr "Использовать"
-
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
-msgid "Save"
-msgstr "Сохранить"
-
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
-msgid "Import"
-msgstr "Импорт"
-
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
-msgid "Delete"
-msgstr "Удалить"
-
-#: src/sid/xs_interface.c:863
-msgid "Filter curve:"
-msgstr "Кривая фильтра:"
-
-#: src/sid/xs_interface.c:868
-msgid "SIDPlay2"
-msgstr "SIDPlay2"
-
-#: src/sid/xs_interface.c:874
-msgid "Filters"
-msgstr "Фильтры"
-
-#: src/sid/xs_interface.c:897
-msgid "Play at least for specified time"
-msgstr "Воспроизводить, как минимум, за указанное время"
-
-#: src/sid/xs_interface.c:901
-msgid ""
-"If enabled, the tune is played at least for the specified time, adding "
-"silence to the end if necessary."
-msgstr ""
-"Если включено, то мелодии проигрываются, по меньшей мере, за указанное "
-"время, добавляя тишину в конце по мере необходимости."
-
-#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
-#: src/sid/xs_interface.c:1142
-msgid "Playtime:"
-msgstr "Время воспроизведения:"
-
-#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
-#: src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "секунд"
-
-#: src/sid/xs_interface.c:928
-msgid "Minimum playtime:"
-msgstr "Минимальное время воспроизведения:"
-
-#: src/sid/xs_interface.c:945
-msgid "Play for specified time maximum"
-msgstr "Воспроизводить указанное максимальное время"
-
-#: src/sid/xs_interface.c:949
-msgid ""
-"If enabled, tune is played until specified duration is reached (aka maximum "
-"playtime)."
-msgstr ""
-"Если включено, то мелодия воспроизводится до достижения заданной "
-"длительности (максимальное время воспроизведения)."
-
-#: src/sid/xs_interface.c:951
-msgid "Only when song length is unknown"
-msgstr "Только когда длительность неизвестна"
-
-#: src/sid/xs_interface.c:955
-msgid ""
-"If enabled, the maximum playtime is applied only if song/tune length is not "
-"known."
-msgstr ""
-"Если включено, то воспроизведение осуществляется за максимальное время, если "
-"длительность дорожки не известна."
-
-#: src/sid/xs_interface.c:982
-msgid "Maximum playtime:"
-msgstr "Максимальное время воспроизведения:"
-
-#: src/sid/xs_interface.c:999
-msgid "Use XSIDPLAY-compatible database"
-msgstr "Использовать XSIDPLAY-совместимые базы данных"
-
-#: src/sid/xs_interface.c:1003
-msgid ""
-"This option enables using of XSIDPLAY compatible song length database. "
-"(Refer to Audacious-SID documentation for more information)"
-msgstr ""
-"Этот параметр активирует использование XSIDPLAY-совместимых баз данных "
-"длительности мелодий. (Для получения дополнительной информации обратитесь к "
-"документации Audacious-SID)."
-
-#: src/sid/xs_interface.c:1010
-msgid "DB-file:"
-msgstr "DB-файл:"
-
-#: src/sid/xs_interface.c:1020
-msgid "Database path and filename"
-msgstr "Путь и имя файла базы данных"
-
-#: src/sid/xs_interface.c:1027
-msgid "Browse for song length-database file"
-msgstr "Перейти к файлу базы данных длительности мелодий"
-
-#: src/sid/xs_interface.c:1049
-msgid "Song length database:"
-msgstr "База данных длительности мелодий:"
-
-#: src/sid/xs_interface.c:1054
-msgid "Songlength"
-msgstr "Длительность"
-
-#: src/sid/xs_interface.c:1072
-msgid "Override generic Tuplez format string"
-msgstr "Переопределить стандартную строку формата Tuplez"
-
-#: src/sid/xs_interface.c:1076
-msgid ""
-"By enabling this option you can specify a custom Tuplez formatting string "
-"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
-"below."
-msgstr ""
-"Включив этот параметр, можно указать другую строку форматирования Tuplez для "
-"SID-файлов. Специальные теги Tuplez модуля SID кратко описаны ниже."
-
-#: src/sid/xs_interface.c:1087
-msgid "Tuplez format string for SID-files"
-msgstr "Формат строки Tuplez для SID-файлов"
-
-#: src/sid/xs_interface.c:1090
-msgid ""
-"SID-specific Tuplez fields:\n"
-"\n"
-"sid-format\t\t- Specific fileformat\n"
-"sid-model\t\t- 6581 or 8580\n"
-"sid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n"
-"\n"
-"Other \"special\" fields set:\n"
-"\n"
-"subsong-num, subsong-id"
-msgstr ""
-"SID-специфичные поля Tuplez:\n"
-"\n"
-"sid-format\t\t- Указать формат файла\n"
-"sid-model\t\t- 6581 или 8580\n"
-"sid-speed\t\t- Тайминги или скорость: PAL/NTSC/ и т.д.\n"
-"\n"
-"Настройка других \"специальных\" полей:\n"
-"\n"
-"Номер поддорожки, идентификатор поддорожки"
-
-#: src/sid/xs_interface.c:1098
-msgid "Song title format:"
-msgstr "Формат названия:"
-
-#: src/sid/xs_interface.c:1125
-msgid "Add sub-tunes to playlist"
-msgstr "Добавить поддорожки в список воспроизведения"
-
-#: src/sid/xs_interface.c:1129
-msgid ""
-"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
-"only the default sub-tune will be added."
-msgstr ""
-"Если включено, встроенные мелодии каждого файла будут добавлены в список "
-"воспроизведения. Если отключено, то будут добавлены только поддорожки по "
-"умолчанию."
-
-#: src/sid/xs_interface.c:1131
-msgid "Only tunes with specified minimum duration"
-msgstr "Только дорожки с минимальной длительностью"
-
-#: src/sid/xs_interface.c:1135
-msgid "Only add sub-tunes that have a duration of at least specified time."
-msgstr ""
-"Добавить только те поддорожки, которые имеют продолжительность не меньше "
-"указанного времени."
-
-#: src/sid/xs_interface.c:1162
-msgid "Sub-tune handling:"
-msgstr "Обработка поддорожек:"
-
-#: src/sid/xs_interface.c:1179
-msgid "Use STIL database"
-msgstr "Использовать базу данных STIL"
-
-#: src/sid/xs_interface.c:1183
-msgid ""
-"If this option is enabled (and the database & HVSC settings below are "
-"correctly set), Audacious-SID will use and display additional information "
-"from STIL database when HVSC SIDs are played."
-msgstr ""
-"Если включён этот параметр (и настройки базы данных и HVSC ниже указаны "
-"правильно), Audacious-SID станет использовать и отображать дополнительную "
-"информацию из базы данных STIL при воспроизведении HVSC SID-файлов."
-
-#: src/sid/xs_interface.c:1190
-msgid "STIL file:"
-msgstr "Файл STIL:"
-
-#: src/sid/xs_interface.c:1206
-msgid ""
-"Path and filename of STIL database file (STIL.txt), usually found from "
-"HVSC's DOCUMENTS-subdirectory."
-msgstr ""
-"Путь и имя файла базы данных STIL (STIL.txt), обычно расположенных в "
-"подкаталоге DOCUMENTS HVSC."
-
-#: src/sid/xs_interface.c:1219
-msgid "Browse for STIL-database file"
-msgstr "Перейти к файлу базы данных STIL"
-
-#: src/sid/xs_interface.c:1246
-msgid "HVSC path:"
-msgstr "Путь HVSC:"
-
-#: src/sid/xs_interface.c:1262
-msgid ""
-"Path to base-directory of your High Voltage SID Collection (HVSC), for "
-"example /media/C64Music/"
-msgstr ""
-"Путь к каталогу базы данных вашей High Voltage SID Collection (HVSC), "
-"например, /media/C64Music/"
-
-#: src/sid/xs_interface.c:1275
-msgid "Browse for HVSC path"
-msgstr "Перейти к HVSC"
-
-#: src/sid/xs_interface.c:1297
-msgid "SID Tune Information List (STIL) database:"
-msgstr "База данных SID Tune Information List (STIL):"
-
-#: src/sid/xs_interface.c:1321
-msgid "Cancel any changes"
-msgstr "Отменить сделанные изменения"
-
-#: src/sid/xs_interface.c:1328
-msgid "Accept and update changes"
-msgstr "Принять изменения и обновить"
-
-#: src/sid/xs_interface.c:1628
-msgid "Audacious-SID Fileinfo"
-msgstr "Audacious-SID: Информация о файле"
-
-#: src/sid/xs_interface.c:1649
-msgid "Filename:"
-msgstr "Имя файла:"
-
-#: src/sid/xs_interface.c:1657
-msgid "Songname:"
-msgstr "Название дорожки:"
-
-#: src/sid/xs_interface.c:1665
-msgid "Composer:"
-msgstr "Композитор:"
-
-#: src/sid/xs_interface.c:1673
-msgid "Copyright:"
-msgstr "Авторское право:"
-
-#: src/sid/xs_interface.c:1717
-msgid "Song Information:"
-msgstr "Информация о дорожке:"
-
-#: src/sid/xs_interface.c:1752
-msgid "Author:"
-msgstr "Автор:"
-
-#: src/sid/xs_interface.c:1786
-msgid "Duration:"
-msgstr "Длительность:"
-
-#: src/sid/xs_interface.c:1820
-msgid "Sub-tune Information:"
-msgstr "Информация о поддорожке:"
-
-#: src/sid/xs_interface.c:1881
-msgid "Select HVSC song length database"
-msgstr "Выберите базу данных длительности дорожек HVSC"
-
-#: src/sid/xs_interface.c:1922
-msgid "Select STIL-database"
-msgstr "Выберите базу данных STIL"
-
-#: src/sid/xs_interface.c:1963
-msgid "Select HVSC location prefix"
-msgstr "Выберите префикс адреса HVSC"
-
-#: src/sid/xs_interface.c:2004
-msgid "Select SIDPlay2 filters file for importing"
-msgstr "Выберите для загрузки файл фильтров SIDPlay2"
-
-#: src/sid/xs_interface.c:2045
-msgid "Select SIDPlay2 filters file for exporting"
-msgstr "Выберите для выгрузки файл фильтров SIDPlay2"
-
-#: src/sid/xs_interface.c:2093 src/sid/xs_interface.c:2106
-msgid "Confirm selected action"
-msgstr "Подтвердить выбранное действие"
-
-#: src/sid/xs_interface.c:2123
-msgid "Yes"
-msgstr "Да"
-
-#: src/sid/xs_interface.c:2129
-msgid "No"
-msgstr "No"
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Выберите каталог"
 
 #: src/skins/plugin.c:167
 msgid "About Skinned GUI"
@@ -3009,46 +2278,43 @@
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
-msgstr ""
-"Copyright (c) 2008, Tomasz Moń <desowin@gmail.com>\n"
-"\n"
+msgstr "Copyright (c) 2008, Tomasz Moń <desowin@gmail.com>\n\n"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:207
 msgid "_Player:"
 msgstr "Проигрыватель:"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
 msgstr "Выберите шрифт основного окна проигрывателя:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
 msgstr "Список воспроизведения:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
 msgstr "Выберите шрифт списка воспроизведения:"
 
-#: src/skins/skins_cfg.c:259
+#: src/skins/skins_cfg.c:215
 msgid "_Fonts"
 msgstr "Шрифты"
 
-#: src/skins/skins_cfg.c:261
+#: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "Использовать растровые шрифты (поддерживает только ASCII)"
 
-#: src/skins/skins_cfg.c:263
+#: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "Прокручивать название песни в обоих направлениях"
 
-#: src/skins/skins_cfg.c:346
+#: src/skins/skins_cfg.c:298
 msgid "_Skin"
 msgstr "Стиль"
 
-#: src/skins/skins_cfg.c:393
-#, fuzzy
+#: src/skins/skins_cfg.c:345
 msgid "Interface Preferences"
-msgstr "Параметры модуля Перекрёстное затухание"
+msgstr "Настройка Интерфейса"
 
 #: src/skins/ui_equalizer.c:330
 msgid "Preamp"
@@ -3094,14 +2360,47 @@
 msgid "16 kHz"
 msgstr "16 кГц"
 
-#: src/skins/ui_equalizer.c:378
+#: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
 msgstr "Эквалайзер Audacious"
 
-#: src/skins/ui_equalizer.c:884
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
 msgstr "Предустановки"
 
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Загрузить предустановку"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Загрузить авто-установки"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Загрузить установки эквалайзера"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Сохранить предустановки"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Сохранить авто-установки"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Сохранить установки эквалайзера"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Удалить предустановку"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Удалить авто-установки"
+
 #: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "кбит/с"
@@ -3115,9 +2414,9 @@
 msgstr "объёмное звучание"
 
 #: src/skins/ui_main.c:807
-#, fuzzy, c-format
+#, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Поиск: %d:%-2.2d/%d:%-2.2d (%d%%)"
+msgstr "Переход к %d:%-2.2d / %d:%-2.2d"
 
 #: src/skins/ui_main.c:828
 #, c-format
@@ -3158,19 +2457,19 @@
 msgid "Visualization Menu"
 msgstr "Меню визуализации"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
 msgstr "Одиночный режим."
 
-#: src/skins/ui_main.c:1647
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
 msgstr "Режим списка воспроизведения."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr "Остановить после дорожки."
 
-#: src/skins/ui_main.c:1671
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
 msgstr "Не останавливать после дорожки."
 
@@ -3396,478 +2695,445 @@
 msgstr "Сохранить выбранный список воспроизведения."
 
 #: src/skins/ui_manager.c:229
-msgid "Save All Playlists"
-msgstr "Сохранить все списки воспроизведения"
-
-#: src/skins/ui_manager.c:230
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-"Сохранить все открытые списки воспроизведения. Это делается автоматически "
-"при закрытии Audacious."
-
-#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr "Обновить список"
 
-#: src/skins/ui_manager.c:235
+#: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Обновить метаданные и соотнести их с записями списка воспроизведения."
 
-#: src/skins/ui_manager.c:238
-msgid "List Manager"
-msgstr "Менеджер списков"
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "Управление списком"
 
-#: src/skins/ui_manager.c:239
-msgid "Opens the playlist manager."
-msgstr "Открыть менеджер списков."
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Управление очередью"
 
-#: src/skins/ui_manager.c:243
+#: src/skins/ui_manager.c:237
 msgid "View"
 msgstr "Вид"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:238
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/skins/ui_manager.c:245
-#, fuzzy
+#: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
-msgstr "Параметры модуля Перекрёстное затухание"
+msgstr "Настройка интерфейса ..."
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
 msgstr "Добавить адрес..."
 
-#: src/skins/ui_manager.c:250
+#: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
 msgstr "Добавить звуковой поток из сети в список воспроизведения."
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:247
 msgid "Add Files..."
 msgstr "Добавить файлы..."
 
-#: src/skins/ui_manager.c:254
+#: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
 msgstr "Добавить файлы в список воспроизведения."
 
-#: src/skins/ui_manager.c:259
+#: src/skins/ui_manager.c:253
 msgid "Search and Select"
 msgstr "Найти и выбрать"
 
-#: src/skins/ui_manager.c:260
+#: src/skins/ui_manager.c:254
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr ""
-"Найти в списке воспроизведения и отметить записи, соответствующие заданному "
-"критерию."
+msgstr "Найти в списке воспроизведения и отметить записи, соответствующие заданному критерию."
 
-#: src/skins/ui_manager.c:263
+#: src/skins/ui_manager.c:257
 msgid "Invert Selection"
 msgstr "Инвертировать выбор"
 
-#: src/skins/ui_manager.c:264
+#: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
 msgstr "Снять выделение с отмеченных пунктов и пометить не отмеченные."
 
-#: src/skins/ui_manager.c:267
+#: src/skins/ui_manager.c:261
 msgid "Select All"
 msgstr "Выбрать все"
 
-#: src/skins/ui_manager.c:268
+#: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
 msgstr "Выбрать все записи списка воспроизведения."
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:265
 msgid "Select None"
 msgstr "Снять выделение"
 
-#: src/skins/ui_manager.c:272
+#: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
 msgstr "Снять выделение с ранее выделенных записей."
 
-#: src/skins/ui_manager.c:277
+#: src/skins/ui_manager.c:271
 msgid "Remove All"
 msgstr "Удалить все"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
 msgstr "Удалить все записи из списка воспроизведения."
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:275
 msgid "Clear Queue"
 msgstr "Очистить очередь"
 
-#: src/skins/ui_manager.c:282
+#: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
 msgstr "Очистить очередь, связанную с этим списком воспроизведения."
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
 msgstr "Удалить недоступные файлы"
 
-#: src/skins/ui_manager.c:286
+#: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
 msgstr "Удалить недоступные файлы из списка воспроизведения."
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
 msgstr "Удалить дубликаты"
 
-#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
 msgid "By Title"
 msgstr "По названию"
 
-#: src/skins/ui_manager.c:292
+#: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
-msgstr ""
-"Удалить из списка воспроизведения дублирующиеся записи с одинаковым "
-"названием."
+msgstr "Удалить из списка воспроизведения дублирующиеся записи с одинаковым названием."
 
-#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
-#: src/skins/ui_manager.c:365
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
 msgid "By Filename"
 msgstr "По имени файла"
 
-#: src/skins/ui_manager.c:296
+#: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr ""
-"Удалить из списка воспроизведения дублирующиеся записи с одинаковыми именами "
-"файлов."
+msgstr "Удалить из списка воспроизведения дублирующиеся записи с одинаковыми именами файлов."
 
-#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
-#: src/skins/ui_manager.c:369
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
 msgstr "По пути и имени файла"
 
-#: src/skins/ui_manager.c:300
+#: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr ""
-"Удалить из списка воспроизведения дублирующиеся записи, имеющие одинаковый "
-"абсолютный путь."
+msgstr "Удалить из списка воспроизведения дублирующиеся записи, имеющие одинаковый абсолютный путь."
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
 msgstr "Удалить не отмеченные"
 
-#: src/skins/ui_manager.c:304
+#: src/skins/ui_manager.c:298
 msgid "Remove unselected entries from the playlist."
 msgstr "Удалить из списка воспроизведения не выделенные записи."
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:301
 msgid "Remove Selected"
 msgstr "Удалить выбранные"
 
-#: src/skins/ui_manager.c:308
+#: src/skins/ui_manager.c:302
 msgid "Remove selected entries from the playlist."
 msgstr "Удалить из списка воспроизведения выделенные записи."
 
-#: src/skins/ui_manager.c:313
+#: src/skins/ui_manager.c:307
 msgid "Randomize List"
 msgstr "Сортировать в случайном порядке"
 
-#: src/skins/ui_manager.c:314
+#: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
 msgstr "Сортировать записи в списке воспроизведения в случайном порядке."
 
-#: src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:311
 msgid "Reverse List"
 msgstr "В обратном порядке"
 
-#: src/skins/ui_manager.c:318
+#: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
 msgstr "Обратить порядок записей в списке воспроизведения на противоположный."
 
-#: src/skins/ui_manager.c:321
+#: src/skins/ui_manager.c:315
 msgid "Sort List"
 msgstr "Сортировать список"
 
-#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
 msgstr "Сортировать список воспроизведения по названию."
 
-#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
 msgstr "По альбому"
 
-#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
 msgstr "Сортировать список воспроизведения по альбому."
 
-#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
 msgstr "По исполнителю"
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
 msgstr "Сортировать список воспроизведения по исполнителю."
 
-#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
 msgstr "Сортировать список воспроизведения по имени файла."
 
-#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
 msgstr "Сортировать список воспроизведения по абсолютному пути к файлу."
 
-#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
 msgstr "По дате"
 
-#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
 msgstr "Сортировать список воспроизведения по дате изменения."
 
-#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
 msgstr "По номеру дорожки"
 
-#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
 msgstr "Сортировать список воспроизведения по номеру дорожки."
 
-#: src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:345
 msgid "Sort Selected"
 msgstr "Сортировать выбранные"
 
-#: src/skins/ui_manager.c:387
+#: src/skins/ui_manager.c:381
 msgid "File"
 msgstr "Файл"
 
-#: src/skins/ui_manager.c:388
-msgid "Help"
-msgstr "Справка"
-
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:384
 msgid "Plugin Services"
 msgstr "Службы модулей"
 
-#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
 msgstr "Информация о дорожке"
 
-#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
 msgstr "Просмотреть информацию о дорожке."
 
-#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
 msgstr "Об Audacious"
 
-#: src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:395
 msgid "Play File"
 msgstr "Воспроизвести файл"
 
-#: src/skins/ui_manager.c:402
+#: src/skins/ui_manager.c:396
 msgid "Load and play a file"
 msgstr "Загрузить и воспроизвести файл"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:398
 msgid "Play Location"
 msgstr "Воспроизвести из адреса"
 
-#: src/skins/ui_manager.c:405
+#: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
 msgstr "Воспроизвести аудиоданные из выбранного места."
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:401
 msgid "Plugin services"
 msgstr "Службы модулей"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:403
 msgid "Preferences"
 msgstr "Параметры"
 
-#: src/skins/ui_manager.c:410
+#: src/skins/ui_manager.c:404
 msgid "Open preferences window"
 msgstr "Открыть окно параметров"
 
-#: src/skins/ui_manager.c:413
+#: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
 msgstr "Закрыть Audacious"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
 msgstr "Установить A-B"
 
-#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
 msgstr "Очистить A-B"
 
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
-msgid "Jump to Playlist Start"
-msgstr "Перейти к началу списка"
-
-#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
 msgstr "Перейти к указанному времени"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
 msgstr "Показать/скрыть очередь"
 
-#: src/skins/ui_manager.c:431
+#: src/skins/ui_manager.c:422
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Включить или отключить очерёдность записей в списке воспроизведения."
 
-#: src/skins/ui_manager.c:434
+#: src/skins/ui_manager.c:425
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/skins/ui_manager.c:438
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr "Вставить"
 
-#: src/skins/ui_manager.c:445
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "Загрузить"
 
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
-#: src/skins/ui_manager.c:486
+#: src/skins/ui_manager.c:437
+msgid "Import"
+msgstr "Импорт"
+
+#: src/skins/ui_manager.c:438
+msgid "Save"
+msgstr "Сохранить"
+
+#: src/skins/ui_manager.c:439
+msgid "Delete"
+msgstr "Удалить"
+
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
 msgstr "Предустановка"
 
-#: src/skins/ui_manager.c:451
-msgid "Load preset"
-msgstr "Загрузить предустановку"
-
-#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
-#: src/skins/ui_manager.c:489
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
 msgstr "Автоматически загружаемая предустановка"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr "Загрузить автоматически загружаемую предустановку"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
 msgstr "Загрузить в эквалайзер предустановку по умолчанию"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "Нулевой уровень"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
 msgstr "Сбросить установки эквалайзера в нулевой уровень"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "Из файла"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
 msgstr "Загрузить предустановку из файла"
 
-#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
 msgstr "Из EQF файла WinAMP'a"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
 msgstr "Загрузить предустановки из EQF файла WinAMP'a"
 
-#: src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
 msgstr "Предустановки WinAMP'a"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
 msgstr "Импортировать предустановки WinAMP'a"
 
-#: src/skins/ui_manager.c:472
-msgid "Save preset"
-msgstr "Сохранить предустановки"
-
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:466
 msgid "Save auto-load preset"
 msgstr "Сохранить автозагружаемые предустановки"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
 msgstr "Сохранить предустановки по умолчанию"
 
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "В файл"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
 msgstr "Сохранить предустановки в файл"
 
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
 msgstr "В файл EQF WinAMP'a"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
 msgstr "Сохранить предустановки в файл EQF WinAMP'a"
 
-#: src/skins/ui_manager.c:487
-msgid "Delete preset"
-msgstr "Удалить предустановку"
-
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:481
 msgid "Delete auto-load preset"
 msgstr "Удалить автозагружаемую предустановку"
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
 msgstr "Поиск записей в активном списке воспроизведения"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular "
-"expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular"
+" expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr ""
-"Выберите записи в списке воспроизведения путём заполнения одного или "
-"нескольких полей. В полях используется написание регулярных выражений, не "
-"чувствительное к регистру. Если вы не знаете, как работают регулярные "
-"выражения, просто вставьте часть букв из слова, которые хотите найти."
+msgstr "Выберите записи в списке воспроизведения путём заполнения одного или нескольких полей. В полях используется написание регулярных выражений, не чувствительное к регистру. Если вы не знаете, как работают регулярные выражения, просто вставьте часть букв из слова, которые хотите найти."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "Название: "
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr "Альбом: "
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
 msgstr "Исполнитель: "
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "Имя файла: "
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr "Очистить предыдущий выбор до начала поиска"
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
 msgstr "Автоматически переключать поочерёдно на соответствующим записям"
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
 msgstr "Создать новый список воспроизведения с соответствующими записями"
 
-#: src/skins/ui_playlist.c:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
 msgstr "Редактор списков воспроизведения Audacious"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d из %d)"
@@ -3880,117 +3146,66 @@
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Не архивированная тема Winamp 2.x"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Невозможно создать каталог (%s): %s\n"
 
-#: src/sndfile/plugin.c:438
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
 msgstr "О модуле sndfile"
 
-#: src/sndfile/plugin.c:439
-msgid ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-msgstr ""
-"Адаптировал для Audacious Tony Vroon <chainsaw@gentoo.org>\n"
-"из модуля xmms_sndfile\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"Эта программа - свободное программное обеспечение; вы можете распространять "
-"и/или модифицировать его в соответствии с условиями\n"
-"Стандартной Общественной Лицензии GNU, изданной Фондом Свободного\n"
-"Программного Обеспечения; или же версией 2 Стандартной Общественной\n"
-"Лицензии Лицензии GNU или (по желанию) любой более поздней её версией.\n"
-"\n"
-"Эта программа распространяется с надеждой, что она будет полезна, но БЕЗ\n"
-"ВСЯКИХ ГАРАНТИЙНЫХ ОБЯЗАТЕЛЬСТВ; без подразумеваемой гарантии товарного\n"
-"состояния и ПРИГОДНОСТИ ИСПОЛЬЗОВАНИЯ ЕЁ ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ.\n"
-"Обратитесь за подробностями к Лицензии GNU.\n"
-"\n"
-"Вы должны были получить копию Стандартной Общественной Лицензии GNU\n"
-"вместе с этой программой; если же нет, то напишите об этом по адресу: Free "
-"Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, "
-"USA."
-
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "О модуле SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:313
+#: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
 msgstr "Коррекция громкости"
 
-#: src/sndstretch/sndstretch_xmms.c:314
+#: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
 msgstr "Короткое перекрытие"
 
-#: src/sndstretch/sndstretch_xmms.c:360
+#: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
 msgstr "Скорость"
 
-#: src/sndstretch/sndstretch_xmms.c:361
+#: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
 msgstr "Смена высоты тона"
 
-#: src/sndstretch/sndstretch_xmms.c:362
+#: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
 msgstr "Масштабирование"
 
-#: src/sndstretch/sndstretch_xmms.c:363
-msgid "Options"
-msgstr "Параметры"
-
-#: src/sndstretch/sndstretch_xmms.c:382
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
 msgstr "Параметры модуля SndStretch"
 
-#: src/song_change/song_change.c:464
+#: src/song_change/song_change.c:437
 msgid "Command to run when Audacious starts a new song."
 msgstr "Команда, запускаемая Audacious в начале воспроизведения новой дорожки."
 
-#: src/song_change/song_change.c:465 src/song_change/song_change.c:469
-#: src/song_change/song_change.c:473 src/song_change/song_change.c:477
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
 msgstr "Команда:"
 
-#: src/song_change/song_change.c:468
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
 msgstr "Команда, запускаемая после окончания дорожки."
 
-#: src/song_change/song_change.c:472
+#: src/song_change/song_change.c:449
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr ""
-"Команда, запускаемая Audacious при достижении конца списка воспроизведения."
+msgstr "Команда, запускаемая Audacious при достижении конца списка воспроизведения."
 
-#: src/song_change/song_change.c:476
+#: src/song_change/song_change.c:455
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr ""
-"Команда, запускаемая при изменении названия дорожки (например, при "
-"воспроизведении из сети)."
+msgstr "Команда, запускаемая при изменении названия дорожки (например, при воспроизведении из сети)."
 
-#: src/song_change/song_change.c:480
-#, fuzzy
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -4007,41 +3222,27 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr ""
-"Допускается использовать следующий формат строк, которые будут заменены\n"
-"после вызова команды (не все из них можно использовать для команд,\n"
-"выполняемых при достижении конца списка воспроизведения).\n"
-"\n"
-"%F: Частота (в герцах)\n"
-"%c: Число каналов\n"
-"%f: Имя файла (абсолютный путь)\n"
-"%l: Длина (в миллисекундах)\n"
-"%n или %s: Название дорожки\n"
-"%r: Битрейт (в битах в секунду)\n"
-"%t: Положение списка воспроизведения (%02d)\n"
-"%p: Воспроизведение сейчас (1 или 0)"
+msgstr "Вы можете использовать следующие форматы строк,\nкоторые будут заменены перед вызовом команды\n(не все они полезны для команды окончания списка ).\n\n%F: Frequency (in hertz)\n%c: Number of channels\n%f: filename (full path)\n%l: length (in milliseconds)\n%n or %s: Song name\n%r: Rate (in bits per second)\n%t: Playlist position (%02d)\n%p: Currently playing (1 or 0)\n%a: Artist\n%b: Album\n%T: Track title"
 
-#: src/song_change/song_change.c:507
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr ""
-"Параметры, передаваемые оболочке, должны быть заключены в "
-"кавычки. В противном случае возможны проблемы с безопасностью."
+msgstr "Параметры, передаваемые оболочке, должны быть заключены в кавычки. В противном случае возможны проблемы с безопасностью."
 
-#: src/song_change/song_change.c:518
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr "Команды"
 
-#: src/song_change/song_change.c:555
+#: src/song_change/song_change.c:529
 msgid "Song Change"
 msgstr "Смена дорожки"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr "О модуле Статус"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -4050,127 +3251,98 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager.\n"
-msgstr ""
-"Модуль Статус\n"
-"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"Этот модуль отображает значок программы\n"
-"в системном лотке.\n"
+msgstr "Модуль Статус\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nЭтот модуль отображает значок программы\nв системном лотке.\n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr "Параметры модуля Статус"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr "Действие при щелчке правой кнопкой мыши"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
 msgstr "Уменьшенное меню #1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
 msgstr "Уменьшенное меню #2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr "Действие при прокрутке колеса мыши"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "Изменить громкость"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
 msgstr "Сменить текущую дорожку"
 
-#: src/statusicon/statusicon.c:500
-#, fuzzy
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
-msgstr "Параметры микшера"
+msgstr "Другие настройки"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
-msgstr ""
+msgstr "Отключить всплывающее окно"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
-msgstr ""
+msgstr "Вместо закрытия свернуть в область уведомлений (в трей)"
 
-#: src/stereo_plugin/stereo.c:41
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Продвигаться по списку воспроизведения при прокрутке колёсика"
+
+#: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
-msgstr ""
-"Модуль Дополнительное стерео\n"
-"\n"
-"Johan Levin 1999."
+msgstr "Модуль Дополнительное стерео\n\nJohan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:65
+#: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
 msgstr "О модуле Дополнительное стерео"
 
-#: src/stereo_plugin/stereo.c:102
+#: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
 msgstr "Параметры модуля Дополнительное стерео"
 
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr "О модуле Генератор сигналов"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
-msgstr ""
-"Генератор синусоидальных сигналов, Haavard Kvaalen <havardk@xmms.org>\n"
-"Изменения, Daniel J. Peng <danielpeng@bigfoot.com>\n"
-"\n"
-"Чтобы использовать его, добавьте в проигрыватель следующий адрес: tone://"
-"частота1;частота2;частота3;...\n"
-"Например, tone://2000;2005 для воспроизведения сигналов 2000 Гц и 2005 Гц"
+msgstr "Генератор синусоидальных сигналов, Haavard Kvaalen <havardk@xmms.org>\nИзменения, Daniel J. Peng <danielpeng@bigfoot.com>\n\nЧтобы использовать его, добавьте в проигрыватель следующий адрес: tone://частота1;частота2;частота3;...\nНапример, tone://2000;2005 для воспроизведения сигналов 2000 Гц и 2005 Гц"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr "Генератор сигналов: "
 
 #: src/unix-io/gtk.c:34
-#, fuzzy
 msgid "About File I/O Plugin"
-msgstr "О модуле OSS4"
-
-#: src/vorbis/configure.c:31
-msgid "Override generic titles"
-msgstr "Не использовать стандартные названия"
-
-#: src/vorbis/configure.c:32
-msgid "Title format:"
-msgstr "Формат названия:"
-
-#: src/vorbis/configure.c:36
-msgid "Ogg Vorbis Tags"
-msgstr "Теги Ogg Vorbis"
-
-#: src/vorbis/configure.c:69
-msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr "Параметры модуля Ogg Vorbis"
+msgstr "Про File I/O Plugin"
 
-#: src/vorbis/vorbis.c:581
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "О модуле Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:586
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -4187,22 +3359,7 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>\n"
 "\n"
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
-msgstr ""
-"Модуль Ogg Vorbis от Xiph.org Foundation\n"
-"\n"
-"Начальный код был написан\n"
-"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-"Вклад внесли\n"
-"Chris Montgomery <monty@xiph.org>\n"
-"Peter Alm <peter@xmms.org>\n"
-"Michael Smith <msmith@labyrinth.edu.au>\n"
-"Jack Moffitt <jack@icecast.org>\n"
-"Jorn Baayen <jorn@nl.linux.org>\n"
-"Haavard Kvaalen <havardk@xmms.org>\n"
-"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-"Eugene Zagidullin <e.asphyx@gmail.com>\n"
-"\n"
-"Посетите сайт Xiph.org Foundation по адресу http://www.xiph.org/\n"
+msgstr "Модуль Ogg Vorbis от Xiph.org Foundation\n\nНачальный код был написан\nTony Arcieri <bascule@inferno.tusculum.edu>\nВклад внесли\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHaavard Kvaalen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\nПосетите сайт Xiph.org Foundation по адресу http://www.xiph.org/\n"
 
 #: src/vtx/about.c:14
 msgid "About Vortex Player"
@@ -4211,21 +3368,13 @@
 #: src/vtx/about.c:15
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
-"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor."
-"ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "\n"
 "Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
 "and other AY/YM music sites.\n"
 "\n"
 "Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr ""
-"Проигрыватель файлов Vortex от Sashnov Alexander <sashnov@ngs.ru>\n"
-"Основан на коде in_vtx.dll от Roman Sherbakov <v_soft@microfor.ru>\n"
-"\n"
-"Музыку в формате vtx можно найти по адресу http://vtx.microfor.ru/music.htm\n"
-"и других AY/YM музыкальных сайтах.\n"
-"\n"
-"Реализацию для Audacious выполнил Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr "Проигрыватель файлов Vortex от Sashnov Alexander <sashnov@ngs.ru>\nОснован на коде in_vtx.dll от Roman Sherbakov <v_soft@microfor.ru>\n\nМузыку в формате vtx можно найти по адресу http://vtx.microfor.ru/music.htm\nи других AY/YM музыкальных сайтах.\n\nРеализацию для Audacious выполнил Pavel Vymetalek <pvymetalek@seznam.cz>"
 
 #: src/wavpack/wavpack.c:353
 #, c-format
@@ -4238,4485 +3387,4 @@
 "\n"
 "Some of the plugin code was by Miles Egan\n"
 "Visit the Wavpack site at http://www.wavpack.com/\n"
-msgstr ""
-"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
-"\n"
-"Часть кода этого модуля написал 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"
-
-#~ msgid ""
-#~ "* Select ALSA output ports *\n"
-#~ "MIDI events will be sent to the ports selected here. In example, if your "
-#~ "audio card provides a hardware synth and you want to play MIDI with it, "
-#~ "you'll probably want to select the wavetable synthesizer ports."
-#~ msgstr ""
-#~ "* Выберите порты вывода ALSA *\n"
-#~ "События MIDI будут направлены в порты, указанные здесь. Например, если у "
-#~ "вашей звуковой карты есть аппаратный синтезатор, и вы хотите проиграть "
-#~ "MIDI с его помощью, то вам необходимо выбрать порты синтезатора."
-
-#~ msgid ""
-#~ "* Select ALSA mixer card *\n"
-#~ "The ALSA backend outputs directly through ALSA, it doesn't use effect and "
-#~ "ouput plugins from the player. During playback, the player volumeslider "
-#~ "will manipulate the mixer control you select here. If you're using "
-#~ "wavetable synthesizer ports, you'll probably want to select the Synth "
-#~ "control here."
-#~ msgstr ""
-#~ "* Выберите микшерную карту ALSA *\n"
-#~ "Внутренний модуль ALSA выводит звук напрямую через ALSA, он не использует "
-#~ "модули эффектов и модули вывода проигрывателя. Во время воспроизведения "
-#~ "регулятор громкости проигрывателя будет управлять микшером, выбранным "
-#~ "вами здесь. Если вы используете порты синтезатора, то, вероятно, захотите "
-#~ "выбрать регулятор Synth."
-
-#~ msgid ""
-#~ "* Select ALSA mixer control *\n"
-#~ "The ALSA backend outputs directly through ALSA, it doesn't use effect and "
-#~ "ouput plugins from the player. During playback, the player volume slider "
-#~ "will manipulate the mixer control you select here. If you're using "
-#~ "wavetable synthesizer ports, you'll probably want to select the Synth "
-#~ "control here."
-#~ msgstr ""
-#~ "* Выберите устройство микшера ALSA *\n"
-#~ "Внутренний модуль ALSA выводит звук напрямую через ALSA, он не использует "
-#~ "модули эффектов и вывода из проигрывателя. Во время воспроизведения "
-#~ "регулятор громкости проигрывателя будет управлять микшером, который вы "
-#~ "выберете здесь. Если вы используете порты синтезатора, то, вероятно, "
-#~ "захотите выбрать регулятор Synth."
-
-#~ msgid ""
-#~ "* Backend selection *\n"
-#~ "AMIDI-Plug works with backends, in a modular fashion; here you should "
-#~ "select your backend; that is, the way MIDI events are going to be handled "
-#~ "and played.\n"
-#~ "If you have a hardware synthesizer on your audio card, and ALSA supports "
-#~ "it, you'll want to use the ALSA backend. It can also be used with "
-#~ "anything that provides an interface to the ALSA sequencer, including "
-#~ "software synths or external devices.\n"
-#~ "If you want to rely on a software synthesizer and/or want to pipe audio "
-#~ "into effect and output plugins of the player you'll want to use the good "
-#~ "FluidSynth backend.\n"
-#~ "Press the info button to read specific information about each backend."
-#~ msgstr ""
-#~ "* Выбор внутреннего модуля *\n"
-#~ "AMIDI-Plug работает в модульном режиме; здесь вам необходимо выбрать "
-#~ "внутренний модуль, то есть, способ, с помощью которого события MIDI будут "
-#~ "обрабатываться и проигрываться.\n"
-#~ "Если ваша звуковая карта оснащена аппаратным синтезатором и ALSA его "
-#~ "поддерживает, то лучше выбрать модуль ALSA. Его также можно использовать "
-#~ "для всего, что поддерживает интерфейс синтезатора ALSA, включая "
-#~ "программные синтезаторы или внешние устройства.\n"
-#~ "Если вы хотите использовать программный синтезатор и/или пропускать звук "
-#~ "через модули эффектов и вывода, то вам следует использовать хороший "
-#~ "модуль FluidSynth."
-
-#~ msgid ""
-#~ "* Transpose function *\n"
-#~ "This option allows you to play the midi file transposed in a different "
-#~ "key, by shifting of the desired number of semitones all its notes "
-#~ "(excepting those on midi channel 10, reserved for percussions). "
-#~ "Especially useful if you wish to sing or play along with another "
-#~ "instrument."
-#~ msgstr ""
-#~ "* Транспонирование *\n"
-#~ "Этот параметр позволяет воспроизводить MIDI-файл, переложив его в другой "
-#~ "ряд, смещая нужное число полутонов и их нот (за исключением тех, которые "
-#~ "находятся в 10 канале, который зарезервирован для ударных). Это удобно, "
-#~ "если вы хотите петь или играть вместе с другим инструментом."
-
-#~ msgid ""
-#~ "* Drumshift function *\n"
-#~ "This option allows you to shift notes on midi channel 10 (the standard "
-#~ "percussions channel) of the desired number of semitones. This results in "
-#~ "different drumset and percussions being used during midi playback, so if "
-#~ "you wish to enhance (or reduce, or alter) percussion sounds, try to play "
-#~ "with this value."
-#~ msgstr ""
-#~ "* Смещение ударных *\n"
-#~ "Этот параметр позволяет вам сместить ноты на 10 канале (стандартный канал "
-#~ "для ударных) на желаемое число полутонов. В результате во время "
-#~ "воспроизведения будет использован другой ряд ударных, так что если вы "
-#~ "хотите усилить (ослабить, или изменить) звуки ударных, попробуйте "
-#~ "поэкспериментировать с этим значением."
-
-#~ msgid ""
-#~ "* Pre-calculate MIDI length *\n"
-#~ "If this option is enabled, AMIDI-Plug will calculate the MIDI file length "
-#~ "as soon as the player requests it, instead of doing that only when the "
-#~ "MIDI file is being played. In example, MIDI length will be calculated "
-#~ "straight after adding MIDI files in a playlist. Disable this option if "
-#~ "you want faster playlist loading (when a lot of MIDI files are added), "
-#~ "enable it to display more information in the playlist straight after "
-#~ "loading."
-#~ msgstr ""
-#~ "* Вычислять длительность MIDI *\n"
-#~ "Если этот параметр включен, AMIDI-Plug будет вычислять длительность MIDI-"
-#~ "файлов сразу же по запросу проигрывателя, вместо того, чтобы дожидаться "
-#~ "окончания проигрывания файла. Например, длительность MIDI будет вычислена "
-#~ "сразу при добавлении MIDI файла в список. Отключите этот параметр, если "
-#~ "вы хотите ускорить загрузку списка воспроизведения (когда добавлено много "
-#~ "MIDI файлов), или же включите его для показа большей информации в списке "
-#~ "сразу после загрузки."
-
-#~ msgid ""
-#~ "* Extract comments from MIDI files *\n"
-#~ "Some MIDI files contain text comments (author, copyright, instrument "
-#~ "notes, etc.). If this option is enabled, AMIDI-Plug will extract and "
-#~ "display comments (if available) in the file information dialog."
-#~ msgstr ""
-#~ "* Считывать комментарии из MIDI-файлов *\n"
-#~ "Некоторые MIDI файлы содержат текстовые комментарии (автор, авторское "
-#~ "право, ноты, и др.). Если этот параметр включен, AMIDI-Plug будет "
-#~ "считывать и показывать комментарии (если доступны) в информационном окне."
-
-#~ msgid ""
-#~ "* Extract lyrics from MIDI files *\n"
-#~ "Some MIDI files contain song lyrics. If this option is enabled, AMIDI-"
-#~ "Plug will extract and display song lyrics (if available) in the file "
-#~ "information dialog."
-#~ msgstr ""
-#~ "* Считывать тексты из MIDI-файлов *\n"
-#~ "Некоторые MIDI-файлы содержат тексты песен. Если этот параметр включен, "
-#~ "AMIDI-Plug будет считывать и показывать тексты песен (если доступны) в "
-#~ "информационном окне."
-
-#~ msgid ""
-#~ "* Select SoundFont files *\n"
-#~ "In order to play MIDI with FluidSynth, you need to specify at least one "
-#~ "valid SoundFont file here (use absolute paths). The loading order is from "
-#~ "the top (first) to the bottom (last)."
-#~ msgstr ""
-#~ "* Выбор файлов SoundFont *\n"
-#~ "Для того, чтобы воспроизводить MIDI с помощью FluidSynth, нужно указать "
-#~ "здесь по крайней мере один рабочий SoundFont файл (указав абсолютный путь "
-#~ "к нему). Файлы загружаются сверху (с первого) вниз (до последнего)."
-
-#~ msgid ""
-#~ "* Load SoundFont on player start *\n"
-#~ "Depending on your system speed, SoundFont loading in FluidSynth will "
-#~ "require up to a few seconds. This is a one-time task (the soundfont will "
-#~ "stay loaded until it is changed or the backend is unloaded) that can be "
-#~ "done at player start, or before the first MIDI file is played (the latter "
-#~ "is a better choice if you don't use your player to listen MIDI files "
-#~ "only)."
-#~ msgstr ""
-#~ "* Загружать SoundFont при запуске проигрывателя *\n"
-#~ "В зависимости от скорости вашей системы, загрузка SoundFont в FluidSynth "
-#~ "может занимать до нескольких секунд. Эта задача выполняется один раз "
-#~ "(SoundFont остается загруженным, пока не изменится, или не будет "
-#~ "выгружен) во время запуска проигрывателя, или перед воспроизведением MIDI "
-#~ "файла (последнее лучше, если вы используете проигрыватель не только для "
-#~ "прослушивания MIDI-файлов)."
-
-#~ msgid ""
-#~ "* Load SoundFont on first midifile play *\n"
-#~ "Depending on your system speed, SoundFont loading in FluidSynth will "
-#~ "require up to a few seconds. This is a one-time task (the soundfont will "
-#~ "stay loaded until it is changed or the backend is unloaded) that can be "
-#~ "done at player start, or before the first MIDI file is played (the latter "
-#~ "is a better choice if you don't use your player to listen MIDI files "
-#~ "only)."
-#~ msgstr ""
-#~ "* Загружать SoundFont при воспроизведении первого MIDI-файла *\n"
-#~ "В зависимости от скорости вашей системы, загрузка SoundFont в FluidSynth "
-#~ "может занимать до нескольких секунд. Эта задача выполняется один раз "
-#~ "(SoundFont остается загруженным, пока не изменится, или не будет "
-#~ "выгружен) во время запуска проигрывателя, или перед воспроизведением MIDI "
-#~ "файла (последнее лучше, если вы используете проигрыватель не только для "
-#~ "прослушивания MIDI-файлов)."
-
-#~ msgid ""
-#~ "* Synthesizer gain *\n"
-#~ "From FluidSynth docs: the gain is applied to the final or master output "
-#~ "of the synthesizer; it is set to a low value by default to avoid the "
-#~ "saturation of the output when random MIDI files are played."
-#~ msgstr ""
-#~ "* Усиление синтезатора *\n"
-#~ "Из документации FluidSynth: усиление применяется на последнем или на "
-#~ "основном выводе синтезатора; по умолчанию установлено в низкое значение, "
-#~ "чтобы избежать искажений при воспроизведении разных MIDI-файлов."
-
-#~ msgid ""
-#~ "* Synthesizer polyphony *\n"
-#~ "From FluidSynth docs: the polyphony defines how many voices can be played "
-#~ "in parallel; the number of voices is not necessarily equivalent to the "
-#~ "number of notes played simultaneously; indeed, when a note is struck on a "
-#~ "specific MIDI channel, the preset on that channel may create several "
-#~ "voices, for example, one for the left audio channel and one for the right "
-#~ "audio channels; the number of voices activated depends on the number of "
-#~ "instrument zones that fall in the correspond to the velocity and key of "
-#~ "the played note."
-#~ msgstr ""
-#~ "* Полифония синтезатора *\n"
-#~ "Из документации FluidSynth: полифония определят, сколько голосов могут "
-#~ "играть одновременно; число голосов не обязательно соответствует "
-#~ "количеству воспроизводимых одновременно нот; на самом деле, когда нота "
-#~ "стоит на каком-то канале MIDI, синтезатор для этого канала может создать "
-#~ "несколько голосов, например, один для левого аудио канала и один для "
-#~ "правого. Количество активированных голосов зависит от количества "
-#~ "инструментальных зон, соотносимых со скоростью нажатия и ключом "
-#~ "проигрываемой ноты."
-
-#~ msgid ""
-#~ "* Synthesizer reverb *\n"
-#~ "From FluidSynth docs: when set to \"yes\" the reverb effects module is "
-#~ "activated; note that when the reverb module is active, the amount of "
-#~ "signal sent to the reverb module depends on the \"reverb send\" generator "
-#~ "defined in the SoundFont."
-#~ msgstr ""
-#~ "* Реверберация синтезатора *\n"
-#~ "Из документации FluidSynth: когда установлено в \"да\", включается модуль "
-#~ "реверберации; заметьте, что когда модуль реверберации включен, количество "
-#~ "сигналов, отправляемых на него, зависит от параметра \"reverb send\" "
-#~ "установленного в SoundFont."
-
-#~ msgid ""
-#~ "* Synthesizer chorus *\n"
-#~ "From FluidSynth docs: when set to \"yes\" the chorus effects module is "
-#~ "activated; note that when the chorus module is active, the amount of "
-#~ "signal sent to the chorus module depends on the \"chorus send\" generator "
-#~ "defined in the SoundFont."
-#~ msgstr ""
-#~ "* Хор синтезатора *\n"
-#~ "Из документации FluidSynth: когда установлено в \"да\", включается модуль "
-#~ "хора; заметьте, что когда модуль хора включен, количество сигналов, "
-#~ "отправляемых на него, зависит от параметра \"chorus send\" установленного "
-#~ "в SoundFont."
-
-#~ msgid ""
-#~ "* Synthesizer samplerate *\n"
-#~ "The sample rate of the audio generated by the synthesizer. You can also "
-#~ "specify a custom value in the interval 22050Hz-96000Hz."
-#~ msgstr ""
-#~ "* Частота синтезатора *\n"
-#~ "Частота звука, который генерирует синтезатор. Можно также указать другое "
-#~ "значение в интервале 22050-96000 Гц."
-
-#~ msgid ""
-#~ "If enabled, the extension from the original filename will not be stripped "
-#~ "before adding the new file extension to the end."
-#~ msgstr ""
-#~ "Если включено, то расширение имеющегося названия файла не будет удалено "
-#~ "до добавления в конце нового расширения файла"
-
-#~ msgid ""
-#~ "best/slowest:0;\n"
-#~ "worst/fastest:9;\n"
-#~ "recommended:2;\n"
-#~ "default:5;"
-#~ msgstr ""
-#~ "наилучшее, но медленно: 0;\n"
-#~ "наихудшее, но быстро: 9;\n"
-#~ "рекомендованное: 2;\n"
-#~ "по умолчанию: 5;"
-
-#~ msgid "Adds 16 bit checksum to every frame"
-#~ msgstr "Добавить 16-битную контрольную сумму к каждому фрейму"
-
-#~ msgid "Variable bitrate"
-#~ msgstr "Переменный битрейт"
-
-#~ msgid "Average bitrate"
-#~ msgstr "Средний битрейт"
-
-#~ msgid ""
-#~ "For use with players that do not support low bitrate mp3 (Apex AD600-A "
-#~ "DVD/mp3 player)"
-#~ msgstr ""
-#~ "Для использования с проигрывателями, которые не поддерживают низкий "
-#~ "битрейт mp3 (Apex AD600-A DVD/mp3 player)"
-
-#~ msgid ""
-#~ "highest:0;\n"
-#~ "lowest:9;\n"
-#~ "default:4;"
-#~ msgstr ""
-#~ "наивысший: 0;\n"
-#~ "самый низкий: 9;\n"
-#~ "по умолчанию: 4;"
-
-#~ msgid "Show playlists"
-#~ msgstr "Показать списки воспроизведения"
-
-#~ msgid "Show/hide playlists"
-#~ msgstr "Показать/скрыть списки воспроизведения"
-
-#~ msgid "About the Sun Driver"
-#~ msgstr "О модуле Sun Driver"
-
-#~ msgid ""
-#~ "XMMS BSD Sun Driver\n"
-#~ "\n"
-#~ "Copyright (c) 2001 CubeSoft Communications, Inc.\n"
-#~ "Maintainer: <vedge at csoft.org>.\n"
-#~ msgstr ""
-#~ "XMMS BSD Sun Драйвер\n"
-#~ "\n"
-#~ "Copyright (c) 2001 CubeSoft Communications, Inc.\n"
-#~ "Поддержка: <vedge at csoft.org>.\n"
-
-#~ msgid "Audio control device:"
-#~ msgstr "Устройство управления звуком:"
-
-#~ msgid "Buffer size (ms):"
-#~ msgstr "Размер буфера (мс):"
-
-#~ msgid "Volume controls device:"
-#~ msgstr "Устройство управления громкостью:"
-
-#~ msgid "XMMS uses mixer exclusively."
-#~ msgstr "Микшер используется только XMMS."
-
-#~ msgid "Sun driver configuration"
-#~ msgstr "Параметры модуля Sun driver"
-
-#~ msgid "Target volume:"
-#~ msgstr "Громкость:"
-
-#~ msgid "Effect strength:"
-#~ msgstr "Интенсивность эффекта:"
-
-#~ msgid "FLAC Audio Plugin "
-#~ msgstr "Модуль поддержки FLAC "
-
-#~ msgid "LyricWiki"
-#~ msgstr "LyricWiki"
-
-#~ msgid "Stream browser"
-#~ msgstr "Потоковый браузер"
-
-#~ msgid "Streambrowser"
-#~ msgstr "Потоковый браузер"
-
-#~ msgid "PREAMP"
-#~ msgstr "ПРЕДУСИЛЕНИЕ"
-
-#~ msgid "60HZ"
-#~ msgstr "60 Гц"
-
-#~ msgid "170HZ"
-#~ msgstr "170 Гц"
-
-#~ msgid "310HZ"
-#~ msgstr "310 Гц"
-
-#~ msgid "600HZ"
-#~ msgstr "600 Гц"
-
-#~ msgid "1KHZ"
-#~ msgstr "1 кГц"
-
-#~ msgid "3KHZ"
-#~ msgstr "3 кГц"
-
-#~ msgid "6KHZ"
-#~ msgstr "6 кГц"
-
-#~ msgid "12KHZ"
-#~ msgstr "12 кГц"
-
-#~ msgid "14KHZ"
-#~ msgstr "14 кГц"
-
-#~ msgid "16KHZ"
-#~ msgstr "16 кГц"
-
-#~ msgid "Audacious standard menu"
-#~ msgstr "Стандартное меню Audacious"
-
-#~ msgid "Surround echo"
-#~ msgstr "Объёмное эхо"
-
-#~ msgid "About ESounD Plugin"
-#~ msgstr "О модуле ESounD"
-
-#~ msgid ""
-#~ "Audacious ESounD Plugin\n"
-#~ "\n"
-#~ " This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Драйвер ESounD для Audacious\n"
-#~ "\n"
-#~ "Эта программа - свободное программное обеспечение; вы можете "
-#~ "распространять и/или модифицировать его в соответствии с условиями\n"
-#~ "Стандартной Общественной Лицензии GNU, изданной Фондом Свободного\n"
-#~ "Программного Обеспечения; или же версией 2 Стандартной Общественной\n"
-#~ "Лицензии Лицензии GNU или (по желанию) любой более поздней её версией.\n"
-#~ "\n"
-#~ "Эта программа распространяется с надеждой, что она будет полезна, но БЕЗ\n"
-#~ "ВСЯКИХ ГАРАНТИЙНЫХ ОБЯЗАТЕЛЬСТВ; без подразумеваемой гарантии товарного\n"
-#~ "состояния и ПРИГОДНОСТИ ИСПОЛЬЗОВАНИЯ ЕЁ ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ.\n"
-#~ "Обратитесь за подробностями к Лицензии GNU.\n"
-#~ "\n"
-#~ "Вы должны были получить копию Стандартной Общественной Лицензии GNU\n"
-#~ "вместе с этой программой; если же нет, то напишите об этом по адресу: "
-#~ "Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, "
-#~ "USA."
-
-#~ msgid "ESD Output Plugin configuration"
-#~ msgstr "Параметры модуля ESD"
-
-#~ msgid "Host:"
-#~ msgstr "Узел:"
-
-#~ msgid "Use remote host"
-#~ msgstr "Использовать удалённый узел"
-
-#~ msgid "Volume controls OSS mixer"
-#~ msgstr "Громкость регулируется микшером OSS"
-
-#~ msgid "Port:"
-#~ msgstr "Порт:"
-
-#~ msgid "Server"
-#~ msgstr "Сервер"
-
-#~ msgid "GTK Foobar-like Interface"
-#~ msgstr "Похожий на GTK Foobar интерфейс"
-
-#~ msgid "Load List"
-#~ msgstr "Загрузить список"
-
-#~ msgid "Save List"
-#~ msgstr "Сохранить список"
-
-#, fuzzy
-#~ msgid "About RoarAudio Plugin"
-#~ msgstr "О модуле FFaudio"
-
-#, fuzzy
-#~ msgid "RoarAudio Audacious Plugin..."
-#~ msgstr "О модуле LIRC"
-
-#, fuzzy
-#~ msgid "RoarAudio Plugin - Configuration"
-#~ msgstr "Параметры модуля CD Audio"
-
-#, fuzzy
-#~ msgid "Server Type:"
-#~ msgstr "Сервер:"
-
-#, fuzzy
-#~ msgid "Host:"
-#~ msgstr "_Шрифты"
-
-#, fuzzy
-#~ msgid "Proxy Address"
-#~ msgstr "Адрес:"
-
-#, fuzzy
-#~ msgid "Proxy"
-#~ msgstr "Gerpok"
-
-#, fuzzy
-#~ msgid "Player Name:"
-#~ msgstr "_Проигрыватель:"
-
-#, fuzzy
-#~ msgid "Player"
-#~ msgstr "Плеер:"
-
-#, fuzzy
-#~ msgid "Current Song"
-#~ msgstr "Действие:"
-
-#~ msgid ""
-#~ "<big>Unable to save playlist.</big>\n"
-#~ "\n"
-#~ "Unknown file type for '%s'.\n"
-#~ msgstr ""
-#~ "<big>Невозможно сохранить список воспроизведения.</big>\n"
-#~ "\n"
-#~ "Неизвестный тип файла для '%s'.\n"
-
-#~ msgid "ALSA Gapless Output Plugin Preferences"
-#~ msgstr "Параметры модуля вывода ALSA Gapless"
-
-#~ msgid "Unknown soundcard"
-#~ msgstr "Неизвестная звуковая карта"
-
-#~ msgid "Default PCM device (%s)"
-#~ msgstr "Устройство PCM по умолчанию (%s)"
-
-#~ msgid "Device:"
-#~ msgstr "Устройство:"
-
-#~ msgid "Mixer:"
-#~ msgstr "Микшер:"
-
-#~ msgid "Dummy Backend "
-#~ msgstr "Фиктивный модуль"
-
-#~ msgid ""
-#~ "This backend does not produce audio at all. It is mostly useful for "
-#~ "analysis and testing purposes, as it can log all MIDI events to standard "
-#~ "output, standard error or file.\n"
-#~ "Backend written by Giacomo Lozito."
-#~ msgstr ""
-#~ "Этот внутренний модуль вообще не производит звук. Он удобен только для "
-#~ "анализа и тестирования, он также может журналировать все события MIDI в "
-#~ "стандартный вывод, стандартный вывод ошибок, или в файл.\n"
-#~ "Этот внутренний модуль написан Giacomo Lozito."
-
-#~ msgid "AMIDI-Plug message"
-#~ msgstr "Сообщение AMIDI-Plug"
-
-#~ msgid "Please stop the player before changing AMIDI-Plug settings."
-#~ msgstr ""
-#~ "Пожалуйста, остановите воспроизведение перед изменением параметров AMIDI-"
-#~ "PLug"
-
-#~ msgid "DUMMY BACKEND CONFIGURATION"
-#~ msgstr "ПАРАМЕТРЫ ФИКТИВНОГО МОДУЛЯ"
-
-#~ msgid "MIDI logger settings"
-#~ msgstr "Параметры журнала MIDI"
-
-#~ msgid "Do not log anything"
-#~ msgstr "Не вести журнал"
-
-#~ msgid "Log MIDI events to standard output"
-#~ msgstr "Записывать события MIDI в стандартный вывод"
-
-#~ msgid "Log MIDI events to standard error"
-#~ msgstr "Записывать события MIDI в стандартный вывод ошибок"
-
-#~ msgid "Log MIDI events to file"
-#~ msgstr "Записывать события MIDI в файл"
-
-#~ msgid "Logfile settings"
-#~ msgstr "Параметры файла журнала"
-
-#~ msgid "Use a single file to log everything (rewrite)"
-#~ msgstr "Использовать один файл для журнала (перезаписывать)"
-
-#~ msgid "Use a single file to log everything (append)"
-#~ msgstr "Использовать один файл для журнала (добавлять)"
-
-#~ msgid "Use a different logfile for each MIDI file"
-#~ msgstr "Использовать отдельный файл для каждого MIDI-файла"
-
-#~ msgid "» Log dir:"
-#~ msgstr "» Каталог журнала:"
-
-#~ msgid "browse"
-#~ msgstr "Обзор"
-
-#~ msgid "» Log file:"
-#~ msgstr "» Файл журнала:"
-
-#~ msgid "Playback speed"
-#~ msgstr "Скорость воспроизведения"
-
-#~ msgid "Play at normal speed"
-#~ msgstr "Нормальная скорость воспроизведения"
-
-#~ msgid "Play as fast as possible"
-#~ msgstr "Максимальная скорость воспроизведения"
-
-#~ msgid "Dummy Backend not loaded or not available"
-#~ msgstr "Фиктивный модуль не загружен или недоступен"
-
-#~ msgid ""
-#~ "Dummy\n"
-#~ "backend"
-#~ msgstr ""
-#~ "Фиктивный\n"
-#~ "модуль"
-
-#~ msgid "Buffer settings"
-#~ msgstr "Параметры буфера"
-
-#~ msgid "def"
-#~ msgstr "определение"
-
-#~ msgid "handy buffer tuner"
-#~ msgstr "тонкая настройка буфера"
-
-#~ msgid "size"
-#~ msgstr "размер"
-
-#~ msgid "margin"
-#~ msgstr "поле"
-
-#~ msgid "increment"
-#~ msgstr "увеличение"
-
-#~ msgid ""
-#~ "* FluidSynth backend buffer *\n"
-#~ "This button resets the backend buffer parameters to default values."
-#~ msgstr ""
-#~ "* Буфер внутреннего модуля FluidSynth *\n"
-#~ "Эта кнопка сбрасывает настройки буфера до значений по умолчанию."
-
-#~ msgid ""
-#~ "* FluidSynth backend buffer *\n"
-#~ "If you notice skips or slowness during song playback and your system is "
-#~ "not performing any cpu-intensive task (except FluidSynth itself), you may "
-#~ "want to adjust the buffer parameters. Try to move the \"handy buffer tuner"
-#~ "\" some steps to the right until playback is fluid again."
-#~ msgstr ""
-#~ "* Буфер внутреннего модуля FluidSynth *\n"
-#~ "Если вы заметили пропуски или замедление воспроизведения дорожки в то "
-#~ "время, когда ваша система не выполняет каких-либо ресурсоёмких задач "
-#~ "(кроме самого FluidSynth), то, возможно, вам следует подкорректировать "
-#~ "параметры буфера. Попробуйте подвинуть ползунок \"тонкая настройка буфера"
-#~ "\" на несколько пунктов вправо до тех пор, пока воспроизведение не станет "
-#~ "ровным."
-
-#~ msgid ""
-#~ "* FluidSynth backend buffer *\n"
-#~ "It is a good idea to make buffer adjustments with the \"handy buffer tuner"
-#~ "\" before resorting to manual editing of buffer parameters.\n"
-#~ "However, if you want to fine-tune something and want to know what you're "
-#~ "doing, you can understand how these parameters work by reading the "
-#~ "backend code (b-fluidsynth.c). In short words, every amount of time "
-#~ "(proportional to buffer_SIZE and sample rate), right before gathering "
-#~ "samples, the buffer is resized as follows:\n"
-#~ "buffer_SIZE + buffer_MARGIN + extramargin\n"
-#~ "where extramargin is a value computed as number_of_seconds_of_playback / "
-#~ "margin_INCREMENT ."
-#~ msgstr ""
-#~ "* Буфер внутреннего модуля FluidSynth *\n"
-#~ "Прежде чем вручную настраивать параметры буфера, попробуйте "
-#~ "подкорректировать его с помощью ползунка \"тонкая настройка буфера\".Тем "
-#~ "не менее, если вы хотите хорошо настроить что-то и знаете, что делаете, "
-#~ "вы можете понять как работают эти параметры, посмотрев исходный код "
-#~ "модуля (b-fluidsynth.c). Короче говоря, в каждый момент времени "
-#~ "(пропорционально buffer_SIZE и частоте), прямо перед созданием очередной "
-#~ "порции звука, у буфера меняется размер по следующему принципу:\n"
-#~ "buffer_SIZE + buffer_MARGIN + extramargin,\n"
-#~ "где extramargin - число, высчитываемое как "
-#~ "количество_секунд_воспроизведения / margin_INCREMENT."
-
-#~ msgid "AudioCompress "
-#~ msgstr "AudioCompress "
-
-#~ msgid ""
-#~ "\n"
-#~ "(c)2003 trikuare studios(http://trikuare.cx)\n"
-#~ "Ported to Audacious by Tony Vroon (chainsaw@gentoo.org)\n"
-#~ "\n"
-#~ "Simple dynamic range compressor for transparently\n"
-#~ "keeping the volume level more or less consistent"
-#~ msgstr ""
-#~ "\n"
-#~ "(c)2003 trikuare studios (http://trikuare.cx)\n"
-#~ "Портирован Tony Vroon (chainsaw@gentoo.org) для Audacious\n"
-#~ "\n"
-#~ "Простой динамический компрессор для прозрачного\n"
-#~ "удержания громкости на относительно постоянном уровне."
-
-#~ msgid "About AudioCompress"
-#~ msgstr "О модуле AudioCompress"
-
-#~ msgid ""
-#~ "If checked, when the sound peaks the volume will be cut instantly; "
-#~ "otherwise, it will ramp down just in time for the peak (but some minor "
-#~ "clipping may still occur)."
-#~ msgstr ""
-#~ "Если включён, то срезает громкие звуковые пики немедленно. Иначе, модуль "
-#~ "снижает громкость только во время звуковых пиков (хотя некоторые резкие "
-#~ "звуки могут быть пропущены)."
-
-#~ msgid "The maximum amount to amplify the audio by"
-#~ msgstr "Уровень максимального усиления звука"
-
-#~ msgid "Defines how smoothly the volume will ramp up"
-#~ msgstr "Установить, насколько гладко должна нарастать громкость"
-
-#~ msgid ""
-#~ "The target audio level for ramping up. Lowering the value gives a bit "
-#~ "more dynamic range for peaks, but will make the overall sound quieter."
-#~ msgstr ""
-#~ "Заданный уровень для наращивания звука. Снижение этого значения даст "
-#~ "более динамичный спектр пиков, но сделает общий звуковой фон тише."
-
-#~ msgid "How long of a window to maintain"
-#~ msgstr "Сколько удерживать окно"
-
-#~ msgid " Quality Options "
-#~ msgstr "Параметры качества"
-
-#~ msgid " Aggressively prevent clipping"
-#~ msgstr "Усиленно предотвращать срезание"
-
-#~ msgid " Target & gain"
-#~ msgstr "Значения усиления звука"
-
-#~ msgid "Target audio level:"
-#~ msgstr "Заданный уровень звука:"
-
-#~ msgid "Maximum gain:"
-#~ msgstr "Максимальное усиление:"
-
-#~ msgid "Gain smooth:"
-#~ msgstr "Сглаживание усиления:"
-
-#~ msgid " History "
-#~ msgstr "История"
-
-#~ msgid ""
-#~ "How long of a history to maintain. A higher number will make the volume "
-#~ "changes less responsive."
-#~ msgstr ""
-#~ "Длительность ведения истории изменений сигнала. Большие значения приведут "
-#~ "к замедлению изменения громкости."
-
-#~ msgid "Load default values"
-#~ msgstr "Параметры по умолчанию"
-
-#~ msgid "Audio values"
-#~ msgstr "Параметры звука"
-
-#~ msgid "Limit read speed to: "
-#~ msgstr "Ограничить скорость чтения до:"
-
-#~ msgid "Start of playback"
-#~ msgstr "Начало воспроизведения"
-
-#~ msgid "Automatic songchange"
-#~ msgstr "Автоматическая смена дорожки"
-
-#~ msgid "Manual songchange"
-#~ msgstr "Смена дорожки вручную"
-
-#~ msgid "Manual stop"
-#~ msgstr "Остановка воспроизведения"
-
-#~ msgid "End of playlist"
-#~ msgstr "Конец списка воспроизведения"
-
-#~ msgid "Seeking"
-#~ msgstr "Перемещение"
-
-#~ msgid "Reopen output device"
-#~ msgstr "Повторно открыть устройство вывода"
-
-#~ msgid "Flush output device"
-#~ msgstr "Сбросить устройство вывода"
-
-#~ msgid "None (gapless/off)"
-#~ msgstr "Нет (непрерывный режим выключен)"
-
-#~ msgid "Simple crossfade"
-#~ msgstr "Простое перекрёстное затухание"
-
-#~ msgid "Advanced crossfade"
-#~ msgstr "Сложное перекрёстное затухание"
-
-#~ msgid "Fadein"
-#~ msgstr "Плавное увеличение громкости"
-
-#~ msgid "Fadeout"
-#~ msgstr "Плавное уменьшение громкости"
-
-#~ msgid "Fadeout/Fadein"
-#~ msgstr "Уменьшение/увеличение громкости"
-
-#~ msgid ""
-#~ "Audacious Crossfade Plugin\n"
-#~ "\n"
-#~ "Copyright © 2009 William Pitcock <nenolod@atheme.org>\n"
-#~ "\n"
-#~ "...based in part on XMMS-Crossfade:\n"
-#~ "Copyright © 2000-2009 Peter Eisenlohr <peter@eisenlohr.org>\n"
-#~ "\n"
-#~ "based on the original OSS Output Plugin Copyright (C) 1998-2000\n"
-#~ "Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front "
-#~ "Technologies\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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Модуль \"Перекрёстное затухание\"\n"
-#~ "\n"
-#~ "Copyright © 2009 William Pitcock <nenolod@atheme.org>\n"
-#~ "\n"
-#~ "...использует часть кода XMMS-Crossfade:\n"
-#~ "Copyright © 2000-2009 Peter Eisenlohr <peter@eisenlohr.org>\n"
-#~ "\n"
-#~ "используются оригинальные модули вывода звуковой системы OSS Copyright "
-#~ "(C) 1998-2000\n"
-#~ "Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front "
-#~ "Technologies\n"
-#~ "\n"
-#~ "Эта программа - свободное программное обеспечение; вы можете "
-#~ "распространять и/или модифицировать его в соответствии с условиями\n"
-#~ "Стандартной Общественной Лицензии GNU, изданной Фондом Свободного\n"
-#~ "Программного Обеспечения; или же версией 2 Стандартной Общественной\n"
-#~ "Лицензии Лицензии GNU или (по желанию) любой более поздней её версией.\n"
-#~ "\n"
-#~ "Эта программа распространяется с надеждой, что она будет полезна, но БЕЗ\n"
-#~ "ВСЯКИХ ГАРАНТИЙНЫХ ОБЯЗАТЕЛЬСТВ; без подразумеваемой гарантии товарного\n"
-#~ "состояния и ПРИГОДНОСТИ ИСПОЛЬЗОВАНИЯ ЕЁ ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ.\n"
-#~ "Обратитесь за подробностями к Лицензии GNU.\n"
-#~ "\n"
-#~ "Вы должны были получить копию Стандартной Общественной Лицензии GNU\n"
-#~ "вместе с этой программой; если же нет, то напишите об этом по адресу: "
-#~ "Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, "
-#~ "USA."
-
-#~ msgid "Crossfade Configuration"
-#~ msgstr "Параметры перекрёстного затухания"
-
-#~ msgid "About"
-#~ msgstr "О"
-
-#~ msgid "Output plugin"
-#~ msgstr "Драйвер вывода звука"
-
-#~ msgid "Throttle Output"
-#~ msgstr "Приглушенный вывод"
-
-#~ msgid "Max block size (bytes):"
-#~ msgstr "Максимальный размер блока (байт):"
-
-#~ msgid "Force close/reopen on songchange"
-#~ msgstr "Принудительно открыть заново при смене дорожки"
-
-#~ msgid "Plugin compatibility options"
-#~ msgstr "Параметры совместимости драйвера"
-
-#~ msgid ""
-#~ "When modifying the Output Options or the Mixing buffer size, you need to "
-#~ "stop/restart playback for the settings to take effect."
-#~ msgstr ""
-#~ "При изменении параметров вывода или размера буфера микшера необходимо "
-#~ "остановить и запустить воспроизведение заново, чтобы изменения вступили в "
-#~ "силу."
-
-#~ msgid "Mixing buffer size (ms):"
-#~ msgstr "Размер буфера микшера (мс):"
-
-#~ msgid ""
-#~ "Specify the size of the mixing buffer. Mixing buffer space is required "
-#~ "for pauses, fade-outs, offsetting (i.e. interleaving the end and "
-#~ "beginning of two songs) and killing trailing gaps. Fade-ins and killing "
-#~ "leading gaps are done on-the-fly and do not depend on mixing buffer "
-#~ "space.\n"
-#~ "Default: n/a - calculated automatically"
-#~ msgstr ""
-#~ "Укажите здесь размер буфера микшера. Буфер микшера необходим для пауз, "
-#~ "плавного уменьшения громкости, переходов (например, для связывания конца "
-#~ "и начала двух дорожек) и для удаления промежутков между дорожками. "
-#~ "Плавное увеличение громкости и удаление главных промежутков делается \"на "
-#~ "лету\" и не зависит от размера буфера микшера.\n"
-#~ "По умолчанию: недоступно - подсчитывается автоматически"
-
-#~ msgid "auto"
-#~ msgstr "Автоматически"
-
-#~ msgid ""
-#~ "Automatically calculate an optimal buffer size.\n"
-#~ "Default: On"
-#~ msgstr ""
-#~ "Автоматически рассчитывать оптимальный размер буфера.\n"
-#~ "По умолчанию включено"
-
-#~ msgid "Set parameters for:"
-#~ msgstr "Настроить параметры для:"
-
-#~ msgid ""
-#~ "Select the type of songchange you want to configure:\n"
-#~ "* Start of playback: When starting playback by pressing PLAY\n"
-#~ "* Automatic songchange: When reaching the end of a song and the playlist "
-#~ "advances to the next song\n"
-#~ "* Manual songchange: When manually selecting another song, for example by "
-#~ "pressing NEXT/PREV\n"
-#~ "* Manual stop: When pressing the STOP button\n"
-#~ "* End of playlist: After the last song in the playlist has been played\n"
-#~ "* Seeking: When seeking within the current song"
-#~ msgstr ""
-#~ "Выберите тип смены дорожки, который требуется настроить:\n"
-#~ "* Начало воспроизведения: когда воспроизведение запускается кнопкой "
-#~ "\"ИГРАТЬ\"\n"
-#~ "* Автоматическая смена дорожки: когда при достижении конца дорожки "
-#~ "происходит переход к следующей в списке воспроизведения\n"
-#~ "* Смена дорожки вручную: при выборе другой дорожки вручную, например, с "
-#~ "помощью кнопок СЛЕДУЮЩАЯ ДОРОЖКА / ПРЕДЫДУЩАЯ ДОРОЖКА\n"
-#~ "* Остановка воспроизведения: при нажатии на кнопку \"ОСТАНОВИТЬ\"\n"
-#~ "* Конец списка воспроизведения: после последней проигранной дорожки в "
-#~ "списке воспроизведения\n"
-#~ "* Перемещение: При передвижении по текущей дорожке"
-
-#~ msgid "Crossfade/Transition type:"
-#~ msgstr "Тип перекрёстного затухания/перехода:"
-
-#~ msgid ""
-#~ "Select the transition to be used for the songchange type selected above:\n"
-#~ "* Fade-in: Fade-in at 'Start of playback'\n"
-#~ "* Reopen output device: Force a close/open on the output plugin. This "
-#~ "will most certainly re-introduce gaps and clicks, but might be usefull "
-#~ "with some plugins.\n"
-#~ "* Flush output device: Keeps the output plugin opened, but flushes its "
-#~ "buffers. This will give you almost instant reaction when pressing NEXT/"
-#~ "PREV.\n"
-#~ "* None (gapless/off): Gapless mode. Keeps the device opened, but does not "
-#~ "do any fading.\n"
-#~ "* Simple crossfade: Does a simple crossfade between the previous and the "
-#~ "next song.\n"
-#~ "* Advanced crossfade: Allows you to configure the crossfade in more "
-#~ "detail.\n"
-#~ "* Fade-out: Fade-out at 'Manual stop' or 'End of playlist'."
-#~ msgstr ""
-#~ "Выберите переход для выбранного выше типа смены дорожки:\n"
-#~ "* Плавное увеличение громкости: плавное увеличение громкости в начале "
-#~ "воспроизведения'\n"
-#~ "* Повторно открыть устройство вывода: принудительно закрыть и открыть "
-#~ "драйвер вывода. Это с большей определённостью добавит пауз и щелчков, но "
-#~ "может помочь при использовании некоторых драйверов.\n"
-#~ "* Сбросить устройство вывода: оставить драйвер вывода открытым, но "
-#~ "сбросить его буферы. Это приведёт к более быстрой реакции на нажатие "
-#~ "кнопок СЛЕДУЮЩАЯ ДОРОЖКА / ПРЕДЫДУЩАЯ ДОРОЖКА.\n"
-#~ "* Нет (непрерывный режим выключен): режим без пауз. Устройство остаётся "
-#~ "открытым, но плавного затухания нет.\n"
-#~ "* Простое перекрёстное затухание: простое затухание между предыдущей и "
-#~ "следующей дорожками.\n"
-#~ "* Сложное перекрёстное затухание: имеется возможность настроить параметры "
-#~ "перекрёстного затухания более детально.\n"
-#~ "* Плавное уменьшение громкости: уменьшение громкости в режиме 'Остановка "
-#~ "воспроизведения\" или \"Конец списка воспроизведения\"."
-
-#~ msgid "Reopen"
-#~ msgstr "Открыть повторно"
-
-#~ msgid "Length (ms):"
-#~ msgstr "Длительность (мс):"
-
-#~ msgid ""
-#~ "Specify the length of the silence to be inserted between the tracks.\n"
-#~ "Default: 2000"
-#~ msgstr ""
-#~ "Укажите длительность тишины между дорожками.\n"
-#~ "По умолчанию: 2000"
-
-#~ msgid "Start volume (%):"
-#~ msgstr "Начальная громкость (%):"
-
-#~ msgid "Set the duration for the fadein of the next song."
-#~ msgstr ""
-#~ "Укажите продолжительность плавного увеличения громкости для следующей "
-#~ "дорожки"
-
-#~ msgid ""
-#~ "Set the start volume. XMMS-crossfade will fade from this volume to 100% "
-#~ "during the time specified above.\n"
-#~ "Default: 0"
-#~ msgstr ""
-#~ "Укажите начальную громкость. Перекрёстное затухание начнётся с этой "
-#~ "громкости до достижения 100% громкости за время, указанное выше.\n"
-#~ "По умолчанию: 0"
-
-#~ msgid "Fade in"
-#~ msgstr "Плавное увеличение громкости"
-
-#~ msgid "Flush"
-#~ msgstr "Очистить"
-
-#~ msgid ""
-#~ "Specify the length of the crosssfade.\n"
-#~ "Default: depends on songchange type"
-#~ msgstr ""
-#~ "Укажите длительность перекрёстного затухания.\n"
-#~ "По умолчанию: в зависимости от выбранного типа смены дорожки"
-
-#~ msgid "Crossfade"
-#~ msgstr "Перекрёстное затухание"
-
-#~ msgid "Simple XF"
-#~ msgstr "Простое затухание"
-
-#~ msgid "Set the duration for the fadeout of the previous song."
-#~ msgstr ""
-#~ "Установите продолжительность плавного уменьшения громкости предыдущей "
-#~ "дорожки"
-
-#~ msgid "End volume (%):"
-#~ msgstr "Конечная громкость (%):"
-
-#~ msgid ""
-#~ "Set the end volume. XMMS-crossfade will fade from 100% to this volume "
-#~ "during the time specified above.\n"
-#~ "Default: 0"
-#~ msgstr ""
-#~ "Укажите конечную громкость. Перекрёстное затухание начнётся со 100% "
-#~ "громкости до указанной громкости за время, указанное выше.\n"
-#~ "По умолчанию: 0"
-
-#~ msgid "Fade out"
-#~ msgstr "Плавное уменьшение громкости"
-
-#~ msgid "Custom (ms):"
-#~ msgstr "Другой (мс):"
-
-#~ msgid "Set a custom offset."
-#~ msgstr "Установите другое смещение"
-
-#~ msgid ""
-#~ "Set how much the end of the previous and the beginning of the next song "
-#~ "should overlap.\n"
-#~ "* Negative values indicate that the next song should start before the "
-#~ "previous has reached the end.\n"
-#~ "* A value of 0 means that the songs are concatenated seamlessly.\n"
-#~ "* Positive values will yield insert silence inbetween.."
-#~ msgstr ""
-#~ "Установите, какая часть предыдущей дорожки и начало следующей дорожки "
-#~ "должны перекрываться.\n"
-#~ "* Отрицательные значения означают, что следующая дорожка должна начаться "
-#~ "до того, как закончится предыдущая.\n"
-#~ "* Значение, равное 0, означает, что дорожки воспроизводятся без "
-#~ "промежутков.\n"
-#~ "* Положительные значения свидетельствуют об установлении тишины между "
-#~ "дорожками."
-
-#~ msgid "None (0 ms)"
-#~ msgstr "Нет (0 мс)"
-
-#~ msgid ""
-#~ "Don't overlap the two songs. The next song will start immediatelly after "
-#~ "the previous has ended."
-#~ msgstr ""
-#~ "Не перекрывать две дорожки. Следующая дорожка начнётся немедленно после "
-#~ "окончания предыдущей."
-
-#~ msgid "Lock to fadeout length"
-#~ msgstr "Привязать к времени уменьшения громкости"
-
-#~ msgid "Overlap by the fadeout duration specified above."
-#~ msgstr ""
-#~ "Перекрытие делается по длительности уменьшения громкости, указанного выше."
-
-#~ msgid "Lock to fadein length"
-#~ msgstr "Привязать к времени увеличения громкости"
-
-#~ msgid "Overlap by the fadein duration specified below.."
-#~ msgstr ""
-#~ "Перекрытие делается по длительности увеличения громкости, указанного ниже."
-
-#~ msgid "Offset"
-#~ msgstr "Смещение"
-
-#~ msgid " Enable"
-#~ msgstr "Включить"
-
-#~ msgid "Lock to Fade-out"
-#~ msgstr "Привязать к времени уменьшения громкости"
-
-#~ msgid "Use the same settings as fade-out."
-#~ msgstr ""
-#~ "Использовать те же настройки, что и для плавного уменьшения громкости"
-
-#~ msgid "Advanced XF"
-#~ msgstr "Дополнительно"
-
-#~ msgid "Set the duration for the fadein when starting playback."
-#~ msgstr ""
-#~ "Установить продолжительность увеличения громкости в начале "
-#~ "воспроизведения."
-
-#~ msgid "Set the duration for the fadeout of the last song."
-#~ msgstr ""
-#~ "Установить продолжительность уменьшения громкости последней дорожки."
-
-#~ msgid ""
-#~ "Set how much additional silence should be played after the end of the "
-#~ "last song. This way, you can avoid the clicks some soundcards produce "
-#~ "when being shut down during playback.\n"
-#~ "Default: 500"
-#~ msgstr ""
-#~ "Установить, насколько увеличить тишину после окончания последней дорожки. "
-#~ "Таким образом, можно избежать щелчков, которые издают некоторые звуковые "
-#~ "карты при выключении воспроизведения.\n"
-#~ "По умолчанию: 500"
-
-#~ msgid "Additional silence"
-#~ msgstr "Увеличение тишины"
-
-#~ msgid ""
-#~ "Set the duration for the fadeout when pausing.\n"
-#~ "Default: 100"
-#~ msgstr ""
-#~ "Установить продолжительность плавного уменьшения громкости во время "
-#~ "паузы.\n"
-#~ "По умолчанию: 100"
-
-#~ msgid ""
-#~ "Set how much additional silence should be played after pausing. This way, "
-#~ "you can avoid the clicks some soundcards produce when entering pause.\n"
-#~ "Default: 100"
-#~ msgstr ""
-#~ "Установить, насколько увеличить тишину после паузы. Таким образом, можно "
-#~ "избежать щелчков, которые издают некоторые звуковые карты при паузе.\n"
-#~ "По умолчанию: 100"
-
-#~ msgid ""
-#~ "Set the duration for the fadein when unpausing.\n"
-#~ "Default: 100"
-#~ msgstr ""
-#~ "Установить длительность плавного увеличения громкости после возобновления "
-#~ "воспроизведения.\n"
-#~ "По умолчанию: 100"
-
-#~ msgid "Fade out (ms):"
-#~ msgstr "Уменьшение громкости (мс):"
-
-#~ msgid "Silence (ms):"
-#~ msgstr "Тишина (мс):"
-
-#~ msgid "Fade in (ms):"
-#~ msgstr "Увеличение громкости (мс):"
-
-#~ msgid "Fade out / Fade in"
-#~ msgstr "Уменьшение / увеличение громкости"
-
-#~ msgid ""
-#~ "Set the maximum length for gaps at the beginning of a stream.\n"
-#~ "Default: 500"
-#~ msgstr ""
-#~ "Установить максимальную длительность пауз в начале звукового потока.\n"
-#~ "По умолчанию: 500"
-
-#~ msgid ""
-#~ "Set the maximum volume for gaps at the beginning of a stream. All samples "
-#~ "below this value are considered as silent.\n"
-#~ "Default: 512"
-#~ msgstr ""
-#~ "Установить максимальную громкость пауз в начале звукового потока. Все "
-#~ "сэмплы ниже этого значения рассматриваются как тишина.\n"
-#~ "По умолчанию: 512"
-
-#~ msgid "Max. length (ms):"
-#~ msgstr "Макс. длительность (мс):"
-
-#~ msgid "Max. level (16bit sample):"
-#~ msgstr "Макс. уровень (16-битные сэмплы):"
-
-#~ msgid "Leading gap killer"
-#~ msgstr "Начальное удаление промежутков"
-
-#~ msgid ""
-#~ "Set the maximum length for gaps at the end of a stream.\n"
-#~ "Default: 500"
-#~ msgstr ""
-#~ "Установить максимальную длительность пауз в конце потока.\n"
-#~ "По умолчанию: 500"
-
-#~ msgid ""
-#~ "Set the maximum volume for gaps at the end of a stream. All samples below "
-#~ "this value are considered as silent.\n"
-#~ "Default: 512"
-#~ msgstr ""
-#~ "Установить максимальную громкость пауз в конце звукового потока. Все "
-#~ "сэмплы ниже этого значения рассматриваются как тишина.\n"
-#~ "По умолчанию: 512"
-
-#~ msgid "Lock to Leading"
-#~ msgstr "Привязать к начальному"
-
-#~ msgid "Use the same settings as above."
-#~ msgstr "Использовать те же параметры, что и указанные выше."
-
-#~ msgid "Trailing gap killer"
-#~ msgstr "Конечное удаление промежутков"
-
-#~ msgid "Skip to next zero crossing"
-#~ msgstr "Сброс до следующего пересечения значений затухания в нулевой точке"
-
-#~ msgid ""
-#~ "If enabled, XMMS-crossfade will take additional care to avoid clicks with "
-#~ "pre-faded (gapless) tracks. XMMS-crossfade will cut off the end of the "
-#~ "previous song (the beginning of the next song) only at a zero-crossing of "
-#~ "the sample values.\n"
-#~ "Default: On"
-#~ msgstr ""
-#~ "Если активно, то модуль перекрёстного затухания позаботится дополнительно "
-#~ "о том, как избежать щелчков от дорожек, к которым уже применено "
-#~ "затухание. В этом случае окончание предыдущей дорожки срезается (начало "
-#~ "следующей дорожки) только в нулевой точке значений затухания.\n"
-#~ "По умолчанию: включено"
-
-#~ msgid "Advanced"
-#~ msgstr "Дополнительно"
-
-#~ msgid "Gap Killer"
-#~ msgstr "Уничтожитель пауз"
-
-#~ msgid "Write debug output to <stderr>"
-#~ msgstr "Записать отладочную информацию в стандартный вывод <stderr>"
-
-#~ msgid ""
-#~ "Monitors what is going on in XMMS-crossfade. If you think you found a bug "
-#~ "in XMMS-crossfade, please enable this option and send me the output.\n"
-#~ "Note that you should disable debug output if you start XMMS from within "
-#~ "Netscape. Netscape will spam you with dialogs containing the debug output "
-#~ "captured from <stderr>.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Проводить мониторинг действий модуля перекрёстного затухания. Если вам "
-#~ "показалось, что вы обнаружили ошибку в этом модуле, пожалуйста, включите "
-#~ "этот параметр и перешлите нам полученные данные.\n"
-#~ "Помните, что необходимо выключить формирование отладочной информации, "
-#~ "если модуль затухания запущен в браузере Netscape. Netscape забросает вас "
-#~ "сообщениями, содержащими отладочную информацию, полученную из "
-#~ "стандартного вывода <stderr>.\n"
-#~ "По умолчанию: выключено"
-
-#~ msgid "Debug options"
-#~ msgstr "Параметры отладки"
-
-#~ msgid "Enable volume control"
-#~ msgstr "Включить регулятор громкости"
-
-#~ msgid ""
-#~ "Enables/disables XMMS volume and balance controls.\n"
-#~ "Default: On"
-#~ msgstr ""
-#~ "Включить или отключить программные регуляторы громкости и баланса "
-#~ "Audacious.\n"
-#~ "По умолчанию: включено"
-
-#~ msgid ""
-#~ "Reverses left and right with the balance control.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Изменить левый и правый канал с помощью регулятора баланса.\n"
-#~ "По умолчанию: выключено"
-
-#~ msgid "Software Mixer"
-#~ msgstr "Программный микшер"
-
-#~ msgid ""
-#~ "Enable software mixer. Usefull for output plugins without mixer support.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Включить программный микшер. Полезно для модулей вывода без поддержки "
-#~ "микшера.\n"
-#~ "По умолчанию: выключено"
-
-#~ msgid "Volume control options"
-#~ msgstr "Параметры управления громкостью"
-
-#~ msgid "Songchange timeout (ms):"
-#~ msgstr "Время ожидания смены дорожки (мс):"
-
-#~ msgid ""
-#~ "The songchange timeout is the maximum time XMMS-crossfade waits for the "
-#~ "next song. If this timeout is exceeded, the output plugin/device is "
-#~ "closed.\n"
-#~ "Default: 100"
-#~ msgstr ""
-#~ "Максимальное время, в течение которого модуль перекрёстного затухания "
-#~ "будет ожидать следующую дорожку. При достижении этого значения модуль "
-#~ "вывода и устройство будут закрыты.\n"
-#~ "По умолчанию: 100"
-
-#~ msgid "Mixing buffer preload (ms):"
-#~ msgstr "Предзагрузка буфера микшера (мс):"
-
-#~ msgid ""
-#~ "Tells XMMS-crossfade how much data it should buffer before it starts "
-#~ "writing to the output plugin/device. Usually, this value can be set to 0, "
-#~ "because the output plugin does preloading on its own.\n"
-#~ "Default: 0"
-#~ msgstr ""
-#~ "Сообщить модулю перекрёстного затухания, сколько данных должны быть "
-#~ "переведены в буфер до начала записи в модуль вывода или устройство. "
-#~ "Обычно это значение равно 0, так как модуль вывода имеет свою собственную "
-#~ "систему предварительно загрузки.\n"
-#~ "По умолчанию: 0"
-
-#~ msgid "Don't crossfade"
-#~ msgstr "Не применять затухание"
-
-#~ msgid "successive tracks"
-#~ msgstr "последующих дорожек"
-
-#~ msgid ""
-#~ "This option enables the automatic detection of pre-faded or gapless "
-#~ "tracks, like the tracks on some compilations or on most live albums. If "
-#~ "such tracks are detected, crossfading will be disabled and only the "
-#~ "gapkiller (if enabled) will be used for the songchange.\n"
-#~ "Default: On"
-#~ msgstr ""
-#~ "Этот параметр включает автоматическое определение дорожек с затуханием "
-#~ "или непрерывных дорожек, например, дорожек в некоторых сборниках или в "
-#~ "большинстве \"живых\" альбомов. Если определена такая дорожка, затухание "
-#~ "будет отключено и только уничтожитель пауз (если включён) будет "
-#~ "применяться для обработки этих дорожек.\n"
-#~ "По умолчанию: включено"
-
-#~ msgid "same file"
-#~ msgstr "тот же самый файл"
-
-#~ msgid ""
-#~ "This option disables crossfading between the same file. This can happen "
-#~ "if you have only one file in the playlist and 'repeat' turned on.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Этот параметр отключает затухание между единственным файлом. Такое может "
-#~ "быть, если в списке воспроизведения имеется только один файл при "
-#~ "включённом режиме \"Повтор\".\n"
-#~ "По умолчанию: выключено"
-
-#~ msgid "Enable HTTP buffer underrun workaround"
-#~ msgstr "Включить буфер HTTP для избежания работы с недогрузкой"
-
-#~ msgid ""
-#~ "Enable this when you have problems playing internet HTTP audio streams. "
-#~ "Unfortunatelly, it also breaks crossfading.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Включите этот параметр, если есть проблемы с воспроизведением HTTP "
-#~ "аудиопотоков через интернет. К сожалению, это также нарушает затухание.\n"
-#~ "По умолчанию: выключено"
-
-#~ msgid "Limit OP buffer usage (ms):"
-#~ msgstr "Ограничение размера буфера модуля вывода (мс):"
-
-#~ msgid ""
-#~ "With this option enabled, XMMS-crossfade will limit the amount of data "
-#~ "being buffered by the output plugin. This way, you can decrease the "
-#~ "latency between pressing STOP/NEXT/PREV and the new song actually being "
-#~ "played. \n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Если включён этот параметр, модуль перекрёстного затухания будет "
-#~ "ограничивать количество данных буфера модуля вывода. Таким образом можно "
-#~ "сократить задержки между нажатием кнопок \"ОСТАНОВИТЬ\", \"СЛЕДУЮЩАЯ\", "
-#~ "\"ПРЕДЫДУЩАЯ\" во время воспроизведения дорожек. \n"
-#~ "По умолчанию: выключено"
-
-#~ msgid ""
-#~ "Beware that setting this value too low also increases the chance of "
-#~ "buffer underruns.\n"
-#~ "Default: 250"
-#~ msgstr ""
-#~ "Помните, что слишком низкое значение этого параметра также увеличивает "
-#~ "шанс недогрузки буфера.\n"
-#~ "По умолчанию: 250"
-
-#~ msgid "Use Quantaudio timing comments"
-#~ msgstr "Использовать комментарии Quantaudio"
-
-#~ msgid "Keep output opened"
-#~ msgstr "Не закрывать вывод"
-
-#~ msgid ""
-#~ "Keep the output device opened all the time, even if XMMS is stopped. This "
-#~ "way, you can avoid clicks caused by the soundcard when the device is "
-#~ "opened or closed\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Оставить открытым устройство вывода всё время, даже если программа "
-#~ "Audacious будет закрыта. Так можно избежать щелчков, вызванных звуковой "
-#~ "картой при открытии или закрытии устройства\n"
-#~ "По умолчанию: выключено"
-
-#~ msgid "Advanced options"
-#~ msgstr "Дополнительные параметры"
-
-#~ msgid "New"
-#~ msgstr "Новый"
-
-#~ msgid "Save Default List"
-#~ msgstr "Сохранить список по умолчанию"
-
-#~ msgid "Saves the selected playlist to the default location."
-#~ msgstr "Сохранить выбранный список воспроизведения в место по умолчанию."
-
-#~ msgid "Entries"
-#~ msgstr "Записи"
-
-#~ msgid "About Icecast-Plugin"
-#~ msgstr "О модуле Icecast"
-
-#~ msgid ""
-#~ "Icecast-Plugin\n"
-#~ "\n"
-#~ "This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "Модуль Icecast\n"
-#~ "\n"
-#~ "Эта программа - свободное программное обеспечение; вы можете "
-#~ "распространять и/или модифицировать его в соответствии с условиями\n"
-#~ "Стандартной Общественной Лицензии GNU, изданной Фондом Свободного\n"
-#~ "Программного Обеспечения; или же версией 2 Стандартной Общественной\n"
-#~ "Лицензии Лицензии GNU или (по желанию) любой более поздней её версией.\n"
-#~ "\n"
-#~ "Эта программа распространяется с надеждой, что она будет полезна, но БЕЗ\n"
-#~ "ВСЯКИХ ГАРАНТИЙНЫХ ОБЯЗАТЕЛЬСТВ; без подразумеваемой гарантии товарного\n"
-#~ "состояния и ПРИГОДНОСТИ ИСПОЛЬЗОВАНИЯ ЕЁ ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ.\n"
-#~ "Обратитесь за подробностями к Лицензии GNU.\n"
-#~ "\n"
-#~ "Вы должны были получить копию Стандартной Общественной Лицензии GNU\n"
-#~ "вместе с этой программой; если же нет, то напишите об этом по адресу: "
-#~ "Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, "
-#~ "USA."
-
-#~ msgid "Error setting hostname: %s\n"
-#~ msgstr "Ошибка в указании удалённого узла: %s\n"
-
-#~ msgid "Error setting protocol: %s\n"
-#~ msgstr "Ошибка в указании протокола: %s\n"
-
-#~ msgid "Error setting port: %s\n"
-#~ msgstr "Ошибка в указании порта: %s\n"
-
-#~ msgid "Error setting password: %s\n"
-#~ msgstr "Ошибка при введении пароля: %s\n"
-
-#~ msgid "Error setting mount: %s\n"
-#~ msgstr "Ошибка параметров монтирования: %s\n"
-
-#~ msgid "Error setting stream %s: %s\n"
-#~ msgstr "Ошибка в указании потока %s: %s\n"
-
-#~ msgid "public"
-#~ msgstr "публичный"
-
-#~ msgid "private"
-#~ msgstr "персональный"
-
-#~ msgid "Error setting stream name: %s\n"
-#~ msgstr "Ошибка в имени потока: %s\n"
-
-#~ msgid "Error setting stream genre: %s\n"
-#~ msgstr "Ошибка в указании жанра потока: %s\n"
-
-#~ msgid "Error setting stream URL: %s\n"
-#~ msgstr "Ошибка в URL потока: %s\n"
-
-#~ msgid "Error setting stream description: %s\n"
-#~ msgstr "Ошибка в описании потока: %s\n"
-
-#~ msgid "Error setting user: %s\n"
-#~ msgstr "Ошибка в имени пользователя: %s\n"
-
-#~ msgid "Error connecting to server: %s\n"
-#~ msgstr "Ошибка соединения с сервером: %s\n"
-
-#~ msgid "Icecast Configuration"
-#~ msgstr "Параметры Icecast"
-
-#~ msgid "Output stream format:"
-#~ msgstr "Формат вывода потока:"
-
-#~ msgid "Server address:"
-#~ msgstr "Адрес сервера:"
-
-#~ msgid "Server hostname or IP address"
-#~ msgstr "Имя (hostname) сервера или IP адрес"
-
-#~ msgid "Server port number"
-#~ msgstr "Номер порта сервера"
-
-#~ msgid "Mount point:"
-#~ msgstr "Точка монтирования:"
-
-#~ msgid "Mount point for the stream"
-#~ msgstr "Точка монтирования для потока"
-
-#~ msgid "User name:"
-#~ msgstr "Имя пользователя:"
-
-#~ msgid ""
-#~ "Icecast source user name for the stream; depends on your server "
-#~ "settings.\n"
-#~ "The default value is \"source\""
-#~ msgstr ""
-#~ "Icecast получает имя пользователя из потока; зависит от настройки вашего "
-#~ "сервера.\n"
-#~ "Значение по умолчанию \"source\""
-
-#~ msgid "Icecast source user password"
-#~ msgstr "Icecast получает пароль пользователя"
-
-#~ msgid "Connection timeout (seconds):"
-#~ msgstr "Время соединения (секунд):"
-
-#~ msgid ""
-#~ "Amount of time before plugin closes connection to server when no audio "
-#~ "data available"
-#~ msgstr ""
-#~ "Лимит времени до того, как модуль закроет соединение с сервером, если "
-#~ "аудиоданные больше недоступны."
-
-#~ msgid "Buffer size (bytes):"
-#~ msgstr "Размер буфера (байт):"
-
-#~ msgid ""
-#~ "Internal buffer size\n"
-#~ "Try to increase this if you are experiencing audio skipping on client side"
-#~ msgstr ""
-#~ "Внутренний размер буфера\n"
-#~ "Попробуйте увеличить это значение если есть пропуски звука на стороне "
-#~ "клиента."
-
-#~ msgid "Flush buffer if "
-#~ msgstr "Очистить буфер, если"
-
-#~ msgid "Determines when to flush internal buffer to prevent its overflow"
-#~ msgstr ""
-#~ "Определить, когда очистить внутренний буфер, чтобы избежать его "
-#~ "переполнения."
-
-#~ msgid "percents are filled"
-#~ msgstr "процентов заполнено"
-
-#~ msgid "Stream is public"
-#~ msgstr "Поток является публичным"
-
-#~ msgid ""
-#~ "Setting this asks the server to list the stream in any directories it "
-#~ "knows about"
-#~ msgstr ""
-#~ "Эта установка запрашивает у сервера список потоков во всех каталогах, о "
-#~ "которых он знает."
-
-#~ msgid "Stream name:"
-#~ msgstr "Название потока:"
-
-#~ msgid "Stream URL:"
-#~ msgstr "URL потока:"
-
-#~ msgid "The URL of a site about this stream"
-#~ msgstr "URL сайта об этом потоке"
-
-#~ msgid "Stream genre:"
-#~ msgstr "Жанр потока:"
-
-#~ msgid ""
-#~ "The genre (or genres) of the stream. This is usually a keyword list, eg "
-#~ "\"pop rock rap\""
-#~ msgstr ""
-#~ "Жанр (или жанры) потока. Обычно это список слов, например, \"pop rock rap"
-#~ "\"."
-
-#~ msgid "Stream description:"
-#~ msgstr "Описание потока:"
-
-#~ msgid ""
-#~ "<big>Couldn't initialize the last.fm radio plugin.</big>\n"
-#~ "\n"
-#~ "Check if your Scrobbler's plugin login data is set up properly."
-#~ msgstr ""
-#~ "<big>Невозможно инициализировать модуль last.fm радио.</big>\n"
-#~ "\n"
-#~ "Проверьте правильность имени пользователя и пароля в модуле Scrobbler."
-
-#~ msgid "Enable fast play-length calculation"
-#~ msgstr "Включить быстрый подсчёт длительности звучания"
-
-#~ msgid "Parse XING headers"
-#~ msgstr "Обрабатывать заголовки XING"
-
-#~ msgid "Use SJIS to write ID3 tags (not recommended)"
-#~ msgstr "Использовать SJIS для записи тегов ID3 (не рекомендуется)"
-
-#~ msgid "Metadata Settings"
-#~ msgstr "Настройка метаданных"
-
-#~ msgid "MPEG Audio Plugin Configuration"
-#~ msgstr "Параметры модуля поддержки MPEG"
-
-#~ msgid ""
-#~ "Audacious MPEG Audio Plugin\n"
-#~ "\n"
-#~ "Compiled against libMAD version: %d.%d.%d%s\n"
-#~ "\n"
-#~ "Written by:\n"
-#~ " William Pitcock <nenolod@sacredspiral.co.uk>\n"
-#~ " Yoshiki Yazawa <yaz@cc.rim.or.jp>\n"
-#~ "\n"
-#~ "Portions derived from XMMS-MAD by:\n"
-#~ " Sam Clegg\n"
-#~ "\n"
-#~ "ReplayGain support by:\n"
-#~ " Samuel Krempp"
-#~ msgstr ""
-#~ "Модуль Audacious MPEG Audio\n"
-#~ "\n"
-#~ "Собран с библиотекой libMAD версии: %d.%d.%d%s\n"
-#~ "\n"
-#~ "Авторы:\n"
-#~ " William Pitcock <nenolod@sacredspiral.co.uk>\n"
-#~ " Yoshiki Yazawa <yaz@cc.rim.or.jp>\n"
-#~ "\n"
-#~ "Частично использован XMMS-MAD от:\n"
-#~ " Sam Clegg\n"
-#~ "\n"
-#~ "Поддержка ReplayGain:\n"
-#~ " Samuel Krempp"
-
-#~ msgid "About MPEG Audio Plugin"
-#~ msgstr "О модуле поддержки MPEG"
-
-#~ msgid "About OSSv4 Driver"
-#~ msgstr "О драйвере OSSv4 Driver"
-
-#~ msgid ""
-#~ "Audacious OSSv4 Driver\n"
-#~ "\n"
-#~ "Based on the OSSv3 Output plugin,\n"
-#~ "Ported to OSSv4's VMIX by Cristi Magherusan <majeru@gentoo.ro>\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.\n"
-#~ "\n"
-#~ "Note: For any issues regarding this plugin (including patches and \n"
-#~ "suggestions) please contact the maintainer, and NO other \n"
-#~ "Audacious developers\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Драйвер Audacious OSSv4\n"
-#~ "\n"
-#~ "Основан на модуле вывода OSSv3,\n"
-#~ "Портирование на VMIX OSSv4 выполнил Cristi Magherusan <majeru@gentoo.ro>\n"
-#~ "\n"
-#~ "Эта программа - свободное программное обеспечение; вы можете "
-#~ "распространять и/или модифицировать его в соответствии с условиями\n"
-#~ "Стандартной Общественной Лицензии GNU, изданной Фондом Свободного\n"
-#~ "Программного Обеспечения; или же версией 2 Стандартной Общественной\n"
-#~ "Лицензии Лицензии GNU или (по желанию) любой более поздней её версией.\n"
-#~ "\n"
-#~ "Эта программа распространяется с надеждой, что она будет полезна, но БЕЗ\n"
-#~ "ВСЯКИХ ГАРАНТИЙНЫХ ОБЯЗАТЕЛЬСТВ; без подразумеваемой гарантии товарного\n"
-#~ "состояния и ПРИГОДНОСТИ ИСПОЛЬЗОВАНИЯ ЕЁ ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ.\n"
-#~ "Обратитесь за подробностями к Лицензии GNU.\n"
-#~ "\n"
-#~ "Вы должны были получить копию Стандартной Общественной Лицензии GNU\n"
-#~ "вместе с этой программой; если же нет, то напишите об этом по адресу: "
-#~ "Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, "
-#~ "USA.\n"
-#~ "Примечание: По всем вопросам, связанным с этим модулем, (включая патчи и\n"
-#~ "предложения) пожалуйста, обращайтесь к разработчику и НИ К КОМУ ДРУГОМУ "
-#~ "из\n"
-#~ "разработчиков Audacious\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "There has been an error that may require your attention.\n"
-#~ "\n"
-#~ "Contents of server error:\n"
-#~ "\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Произошла ошибка, которая может потребовать вашего внимания.\n"
-#~ "\n"
-#~ "Содержание ошибки сервера:\n"
-#~ "\n"
-#~ "%s\n"
-
-#~ msgid "Scrobbler Error"
-#~ msgstr "Ошибка Scrobbler"
-
-#~ msgid "VBR"
-#~ msgstr "VBR"
-
-#~ msgid ""
-#~ "<big>Couldn't open audio.</big>\n"
-#~ "\n"
-#~ "Please check that:\n"
-#~ "1. You have the correct output plugin selected.\n"
-#~ "2. No other programs is blocking the soundcard.\n"
-#~ "3. Your soundcard is configured properly.\n"
-#~ msgstr ""
-#~ "<big>Невозможно воспроизвести звук.</big>\n"
-#~ "\n"
-#~ "Пожалуйста, убедитесь, что:\n"
-#~ "1. Вы выбрали правильный модуль вывода звука.\n"
-#~ "2. Другие программы не блокируют звуковую карту.\n"
-#~ "3. Ваша звуковая карта настроена правильно.\n"
-
-#~ msgid "TiMidity Configuration"
-#~ msgstr "Параметры модуля TiMidity"
-
-#~ msgid "22000 Hz"
-#~ msgstr "22000 Гц"
-
-#~ msgid "44100 Hz"
-#~ msgstr "44100 Гц"
-
-#~ msgid "Sample Width"
-#~ msgstr "Разрядность сэмпла"
-
-#~ msgid "TiMidity Configuration File"
-#~ msgstr "Файл настроек TiMidity"
-
-#~ msgid "TiMidity Plugin %s"
-#~ msgstr "О модуле TiMidity %s"
-
-#~ msgid ""
-#~ "TiMidity Plugin\n"
-#~ "http://libtimidity.sourceforge.net\n"
-#~ "by Konstantin Korikov"
-#~ msgstr ""
-#~ "Модуль TiMidity\n"
-#~ "http://libtimidity.sourceforge.net\n"
-#~ "Konstantin Korikov"
-
-#~ msgid "Couldn't load MIDI file"
-#~ msgstr "Невозможно загрузить MIDI файл"
-
-#~ msgid "Can't open file\n"
-#~ msgstr "Невозможно открыть файл\n"
-
-#~ msgid "Not supported file format\n"
-#~ msgstr "Формат файла не поддерживается\n"
-
-#~ msgid "File is corrupted\n"
-#~ msgstr "Файл повреждён\n"
-
-#~ msgid "Can't read from file\n"
-#~ msgstr "Невозможно прочесть информацию из файла\n"
-
-#~ msgid "Insufficient memory available\n"
-#~ msgstr "Недостаточно памяти\n"
-
-#~ msgid "Output plugin error\n"
-#~ msgstr "Ошибка модуля вывода\n"
-
-#~ msgid "Unknown error\n"
-#~ msgstr "Неизвестная ошибка\n"
-
-#~ msgid "TTA Decoder Error"
-#~ msgstr "Ошибка декодера TTA"
-
-#~ msgid "TTA input plugin "
-#~ msgstr "Модуль поддержки TTA"
-
-#~ msgid ""
-#~ " for BMP\n"
-#~ "Copyright (c) 2004 True Audio Software\n"
-#~ msgstr ""
-#~ "Написано для BMP\n"
-#~ "Copyright (c) 2004 True Audio Software\n"
-
-#~ msgid "About True Audio Plugin"
-#~ msgstr "О модуле True Audio"
-
-#~ msgid "Ape2 Tag"
-#~ msgstr "Теги Ape2"
-
-#~ msgid "Title:"
-#~ msgstr "Название:"
-
-#~ msgid "Comment:"
-#~ msgstr "Комментарий:"
-
-#~ msgid "Genre:"
-#~ msgstr "Жанр:"
-
-#~ msgid "Remove Tag"
-#~ msgstr "Удалить тег"
-
-#~ msgid "Wavpack Info:"
-#~ msgstr "Информация Wavpack:"
-
-#~ msgid "version %d"
-#~ msgstr "версия: %d"
-
-#~ msgid "average bitrate: %6.1f kbps"
-#~ msgstr "средний битрейт: %6.1f кбит/с"
-
-#~ msgid "samplerate: %d Hz"
-#~ msgstr "частота: %d Гц"
-
-#~ msgid "bits per sample: %d"
-#~ msgstr "бит на сэмпл: %d"
-
-#~ msgid "channels: %d"
-#~ msgstr "каналов: %d"
-
-#~ msgid "length: %d:%.2d"
-#~ msgstr "длительность: %d:%.2d"
-
-#~ msgid "file size: %d Bytes"
-#~ msgstr "размер файла: %d байт"
-
-#~ msgid "Title Peak: ?"
-#~ msgstr "Пики названия: ?"
-
-#~ msgid "Album Peak: ?"
-#~ msgstr "Пики альбома: ?"
-
-#~ msgid "Title Gain: ?"
-#~ msgstr "Усиление названия: ?"
-
-#~ msgid "Album Gain: ?"
-#~ msgstr "Усиление альбома: ?"
-
-#~ msgid "File Info - %s"
-#~ msgstr "Информация о файле %s"
-
-#~ msgid "Enable Dynamic Bitrate Display"
-#~ msgstr "Включить динамическое отображение битрейта"
-
-#~ msgid "General Plugin Settings"
-#~ msgstr "Основные параметры модуля"
-
-#~ msgid "use Track Gain/Peak"
-#~ msgstr "использовать усиление / пик дорожки"
-
-#~ msgid "use Album Gain/Peak"
-#~ msgstr "использовать усиление / пик альбома"
-
-#~ msgid "Enable Clipping Prevention"
-#~ msgstr "Включить предотвращение срезания"
-
-#~ msgid "Enable ReplayGain"
-#~ msgstr "Включить ReplayGain"
-
-#~ msgid "ReplayGain Type"
-#~ msgstr "Тип ReplayGain"
-
-#~ msgid "ReplayGain Settings"
-#~ msgstr "Параметры ReplayGain"
-
-#~ msgid "Plugin"
-#~ msgstr "Модуль"
-
-#~ msgid "ReplayGain"
-#~ msgstr "ReplayGain"
-
-#~ msgid "Wavpack Configuration"
-#~ msgstr "Параметры модуля Wavpack"
-
-#, fuzzy
-#~ msgid "Override default devices"
-#~ msgstr "Переопределить устройство по-умолчанию:"
-
-#, fuzzy
-#~ msgid "Card:"
-#~ msgstr "Команда:"
-
-#~ msgid "Mixer card:"
-#~ msgstr "Карта микшера:"
-
-#~ msgid "Orientation"
-#~ msgstr "Положение"
-
-#~ msgid "The orientation of the tray"
-#~ msgstr "Положение системного лотка"
-
-#~ msgid "/Toggle Decorations"
-#~ msgstr "/Переключить отображение обрамления"
-
-#~ msgid "/-"
-#~ msgstr "/-"
-
-#~ msgid "/Close"
-#~ msgstr "/Закрыть"
-
-#~ msgid "Blur scope"
-#~ msgstr "Размытый осциллоскоп"
-
-#~ msgid "ReplayGain Settings:"
-#~ msgstr "Настройки ReplayGain:"
-
-#~ msgid "ReplayGain Type:"
-#~ msgstr "Тип ReplayGain:"
-
-#~ msgid "About Apple Lossless Audio Plugin"
-#~ msgstr "О модуле Apple Lossless"
-
-#~ msgid "About Monkey's Audio Plugin"
-#~ msgstr "О модуле Monkey's Audio"
-
-#~ msgid ""
-#~ "Copyright (C) 2007 Eugene Zagidullin <e.asphyx@gmail.com>\n"
-#~ "Based on ffape decoder, Copyright (C) 2007 Benjamin Zores\n"
-#~ "ffape itself based on libdemac by Dave Chapman\n"
-#~ "\n"
-#~ "ffape is a part of FFmpeg project, http://ffmpeg.mplayerhq.hu/"
-#~ msgstr ""
-#~ "Copyright (C) 2007 Eugene Zagidullin <e.asphyx@gmail.com>\n"
-#~ "Основан на декодере ffape, Copyright (C) 2007 Benjamin Zores\n"
-#~ "ffape, в свою очередь, основан на libdemac от Dave Chapman\n"
-#~ "\n"
-#~ "ffape является частью проекта FFmpeg, http://ffmpeg.mplayerhq.hu/"
-
-#~ msgid "ID3 format:"
-#~ msgstr "Формат ID3-тега:"
-
-#~ msgid "ALSA Driver configuration"
-#~ msgstr "Настройка драйвера ALSA"
-
-#~ msgid "Device settings"
-#~ msgstr "Настройки устройства"
-
-#~ msgid "About CD Audio Plugin NG"
-#~ msgstr "О модуле CD Audio NG"
-
-#~ msgid "Musepack Decoder Configuration"
-#~ msgstr "Настройка декодера Musepack"
-
-#~ msgid "General Settings"
-#~ msgstr "Общие параметры"
-
-#~ msgid "Use Track Gain"
-#~ msgstr "Использовать Gain/Peak дорожки"
-
-#~ msgid "Use Album Gain"
-#~ msgstr "Использовать Gain/Peak альбома"
-
-#~ msgid "Samplerate: %d Hz"
-#~ msgstr "Частота: %d Гц"
-
-#~ msgid "Channels: %d"
-#~ msgstr "Каналы: %d"
-
-#~ msgid "Length: %d:\\%.2d"
-#~ msgstr "Длительность: %d:\\%.2d"
-
-#~ msgid "File size: %d Bytes"
-#~ msgstr "Размер файла: %d Байт"
-
-#~ msgid "Track Peak: %5u"
-#~ msgstr "Пик дорожки: %5u"
-
-#~ msgid "Track Gain: %-+2.2f dB"
-#~ msgstr "Усиление дорожки: %-+2.2f dB"
-
-#~ msgid "Album Peak: %5u"
-#~ msgstr "Пик альбома: %5u"
-
-#~ msgid "Album Gain: %-+5.2f dB"
-#~ msgstr "Усиление альбома: %-+5.2f dB"
-
-#~ msgid "ID3 Tag:"
-#~ msgstr "Тег ID3:"
-
-#~ msgid " Close "
-#~ msgstr " Закрыть "
-
-#~ msgid "Sample rate mismatch"
-#~ msgstr "Некорректная частота сэмплирования"
-
-#, fuzzy
-#~ msgid "Audio Settings"
-#~ msgstr "Настройки будильника"
-
-#~ msgid "Force reopen audio when audio type changed"
-#~ msgstr "Принудительно пере-открывать аудио-вывод при смене типа аудио"
-
-#, fuzzy
-#~ msgid "Miscellaneous Settings"
-#~ msgstr "Настройки микшера:"
-
-#~ msgid "Display average bitrate for VBR"
-#~ msgstr "Отображать средний битрейт для VBR"
-
-#~ msgid "Using libfaad2-"
-#~ msgstr "Используется libfaad2-"
-
-#~ msgid "About ALSA Driver"
-#~ msgstr "О драйвере ALSA"
-
-#~ msgid ""
-#~ "Audacious ALSA Driver\n"
-#~ "\n"
-#~ " This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA.\n"
-#~ "Author: Matthieu Sozeau (mattam@altern.org)"
-#~ msgstr ""
-#~ "Драйвер ALSA для Audacious\n"
-#~ "\n"
-#~ " Эта программа - бесплатное программное обеспечение; вы можете "
-#~ "распространять и/или модифицировать ее\n"
-#~ "в соответствии с условиями Лицензии GNU, опубликованную\n"
-#~ "Организацией Бесплатного Программного Обеспечения; вы можете пользоваться "
-#~ "версией 2 Лицензии или\n"
-#~ "(по вашему желанию) любой более поздней версией.\n"
-#~ "\n"
-#~ "Эта программа распространяется в надежде, что она будет полезна,\n"
-#~ "но БЕЗ ВСЯКОЙ ГАРАНТИИ; даже без гарании подразумеваемой\n"
-#~ "РАБОТОСПОСОБНОСТИ или ПРИГОДНОСТИ ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ. Пожалуйста,\n"
-#~ "за подробностями обратитесь к Лицензии GNU.\n"
-#~ "\n"
-#~ "Вы должны были получить копию Лицензии GNU вместе с этой программой;\n"
-#~ "если же нет, то напишите об этом по адресу: Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301,\n"
-#~ "USA.\n"
-#~ "Автор: Matthieu Sozeau (mattam@altern.org)"
-
-#~ msgid "Soundcard:"
-#~ msgstr "Звуковая карта:"
-
-#~ msgid "Buffer time (ms):"
-#~ msgstr "Размер буфера (мс):"
-
-#~ msgid "Period time (ms):"
-#~ msgstr "Размер периода (мс):"
-
-#~ msgid "aRts Driver configuration"
-#~ msgstr "Настройка драйвера aRts"
-
-#~ msgid ""
-#~ "<big>No playable CD found.</big>\n"
-#~ "\n"
-#~ "No CD inserted, or inserted CD is not an audio CD.\n"
-#~ msgstr ""
-#~ "<big>Ну найден пригодный к воспроизведению диск.</big>\n"
-#~ "\n"
-#~ "Диск не вставлен в привод, или вставленный диск не является Audio CD.\n"
-
-#~ msgid "Print debug information"
-#~ msgstr "Выводить отладочную информацию"
-
-#, fuzzy
-#~ msgid "Audacious Skinned GUI Configuration"
-#~ msgstr "Настройка Audacious OSD"
-
-#~ msgid "Dither output when rounding to 16-bit"
-#~ msgstr "Размыть вывод при округлении до 16 бит"
-
-#, fuzzy
-#~ msgid "Base gain (dB):"
-#~ msgstr "Усиление по-умолачнию (дБ):"
-
-#~ msgid "Enable ReplayGain processing"
-#~ msgstr "Включить ReplayGain"
-
-#, fuzzy
-#~ msgid "Enable peak info clip prevention"
-#~ msgstr "Включить предотвращение срезания"
-
-#, fuzzy
-#~ msgid "Enable adaptive scaler clip prevention"
-#~ msgstr "Включить предотвращение срезания"
-
-#, fuzzy
-#~ msgid "Gain Control"
-#~ msgstr "Регулятор громкости:"
-
-#~ msgid "Enable 6dB Boost + Hard Limiting"
-#~ msgstr "Включить усиление на 6dB + жёсткое ограничение"
-
-#~ msgid "Playback:"
-#~ msgstr "Воспроизведение:"
-
-#~ msgid "Configure keys which controls Audacious playback."
-#~ msgstr "Клавиши для управления воспроизведением в Audacious."
-
-#~ msgid "Volume Control:"
-#~ msgstr "Регулировка громкости:"
-
-#~ msgid "Configure keys which controls music volume."
-#~ msgstr "Клавиши для управления громкостью."
-
-#~ msgid "Configure keys which control the player."
-#~ msgstr "Клавиши для управления плеером."
-
-#~ msgid "For this, the Audacious OSD plugin must be activated."
-#~ msgstr ""
-#~ "Чтобы эта функция стала доступной,\n"
-#~ "необходимо включить модуль Audacious OSD."
-
-#~ msgid "Track mode"
-#~ msgstr "Режим дорожки"
-
-#~ msgid "6dB hard limiting"
-#~ msgstr "6dB жёсткое ограничение"
-
-#~ msgid "Preamp (dB):"
-#~ msgstr "Предусиление (дБ):"
-
-#~ msgid "About sndfile WAV support"
-#~ msgstr "О модуле поддержки WAV"
-
-#, fuzzy
-#~ msgid "Couldn't open file!"
-#~ msgstr "Невозможно загрузить MIDI файл"
-
-#, fuzzy
-#~ msgid "Name:"
-#~ msgstr "Название: "
-
-#~ msgid " MPEG Info "
-#~ msgstr " Информация MPEG "
-
-#~ msgid " ID3 Tag "
-#~ msgstr " ID3-тег "
-
-#, fuzzy
-#~ msgid "Unknown"
-#~ msgstr "(неизвестно)"
-
-#, fuzzy
-#~ msgid "Layer %s"
-#~ msgstr "Проигрыватель WMA %s"
-
-#~ msgid "%d Hz"
-#~ msgstr "%d Гц"
-
-#~ msgid "Classic Rock"
-#~ msgstr "Классический рок"
-
-#~ msgid "Country"
-#~ msgstr "Кантри"
-
-#~ msgid "Dance"
-#~ msgstr "Дэнс"
-
-#~ msgid "Disco"
-#~ msgstr "Диско"
-
-#~ msgid "Funk"
-#~ msgstr "Фанк"
-
-#~ msgid "Grunge"
-#~ msgstr "Гранж"
-
-#~ msgid "Hip-Hop"
-#~ msgstr "Хип-Хоп"
-
-#~ msgid "Jazz"
-#~ msgstr "Джаз"
-
-#~ msgid "Metal"
-#~ msgstr "Метал"
-
-#~ msgid "Oldies"
-#~ msgstr "Ретро"
-
-#~ msgid "Other"
-#~ msgstr "Другое"
-
-#~ msgid "Pop"
-#~ msgstr "Поп"
-
-#~ msgid "R&B"
-#~ msgstr "R&B"
-
-#~ msgid "Rap"
-#~ msgstr "Рэп"
-
-#~ msgid "Reggae"
-#~ msgstr "Регги"
-
-#~ msgid "Rock"
-#~ msgstr "Рок"
-
-#~ msgid "Techno"
-#~ msgstr "Техно"
-
-#~ msgid "Industrial"
-#~ msgstr "Индустриальный"
-
-#~ msgid "Alternative"
-#~ msgstr "Альтернативный"
-
-#~ msgid "Ska"
-#~ msgstr "Ска"
-
-#~ msgid "Death Metal"
-#~ msgstr "Дэз метал"
-
-#~ msgid "Soundtrack"
-#~ msgstr "Звуковая дорожка"
-
-#~ msgid "Euro-Techno"
-#~ msgstr "Евро-Техно"
-
-#~ msgid "Ambient"
-#~ msgstr "Окружающая среда"
-
-#~ msgid "Trip-Hop"
-#~ msgstr "Трип-Хоп"
-
-#~ msgid "Vocal"
-#~ msgstr "Вокал"
-
-#~ msgid "Jazz+Funk"
-#~ msgstr "Джаз+Фанк"
-
-#~ msgid "Fusion"
-#~ msgstr "Слияние"
-
-#~ msgid "Trance"
-#~ msgstr "Транс"
-
-#~ msgid "Instrumental"
-#~ msgstr "Инструментальный"
-
-#~ msgid "Acid"
-#~ msgstr "Кислота"
-
-#~ msgid "House"
-#~ msgstr "Хаус"
-
-#~ msgid "Game"
-#~ msgstr "Игра"
-
-#~ msgid "Sound Clip"
-#~ msgstr "Музыкальный клип"
-
-#~ msgid "Gospel"
-#~ msgstr "Евангелие"
-
-#~ msgid "Noise"
-#~ msgstr "Шум"
-
-#~ msgid "AlternRock"
-#~ msgstr "Альтернативный рок"
-
-#~ msgid "Soul"
-#~ msgstr "Душа"
-
-#~ msgid "Punk"
-#~ msgstr "Панк"
-
-#~ msgid "Space"
-#~ msgstr "Космос"
-
-#~ msgid "Meditative"
-#~ msgstr "Медитация"
-
-#~ msgid "Instrumental Pop"
-#~ msgstr "Иструментальный поп"
-
-#~ msgid "Instrumental Rock"
-#~ msgstr "Иструментальный рок"
-
-#~ msgid "Ethnic"
-#~ msgstr "Этнический"
-
-#~ msgid "Gothic"
-#~ msgstr "Готический"
-
-#~ msgid "Darkwave"
-#~ msgstr "Темная волна"
-
-#~ msgid "Techno-Industrial"
-#~ msgstr "Техноиндустриальный"
-
-#~ msgid "Electronic"
-#~ msgstr "Электронный"
-
-#~ msgid "Pop-Folk"
-#~ msgstr "Народный поп"
-
-#~ msgid "Eurodance"
-#~ msgstr "Евродэнс"
-
-#~ msgid "Dream"
-#~ msgstr "Сон"
-
-#~ msgid "Southern Rock"
-#~ msgstr "Южный рок"
-
-#~ msgid "Comedy"
-#~ msgstr "Комедия"
-
-#~ msgid "Gangsta Rap"
-#~ msgstr "Черный рэп"
-
-#~ msgid "Top 40"
-#~ msgstr "Top 40"
-
-#~ msgid "Christian Rap"
-#~ msgstr "Христианский реп"
-
-#~ msgid "Pop/Funk"
-#~ msgstr "Поп/Фанк"
-
-#~ msgid "Jungle"
-#~ msgstr "Джангл"
-
-#~ msgid "Native American"
-#~ msgstr "Народная американская"
-
-#~ msgid "Cabaret"
-#~ msgstr "Кабаре"
-
-#~ msgid "New Wave"
-#~ msgstr "Новая волна"
-
-#~ msgid "Psychedelic"
-#~ msgstr "Психоделия"
-
-#~ msgid "Rave"
-#~ msgstr "Рэйв"
-
-#~ msgid "Trailer"
-#~ msgstr "Анонс"
-
-#~ msgid "Lo-Fi"
-#~ msgstr "Lo-Fi"
-
-#~ msgid "Tribal"
-#~ msgstr "Семейное"
-
-#~ msgid "Acid Punk"
-#~ msgstr "Кислотный панк"
-
-#~ msgid "Acid Jazz"
-#~ msgstr "Кислотный джаз"
-
-#~ msgid "Polka"
-#~ msgstr "Полька"
-
-#~ msgid "Musical"
-#~ msgstr "Музыкальное"
-
-#~ msgid "Rock & Roll"
-#~ msgstr "Рок-н-рол"
-
-#~ msgid "Hard Rock"
-#~ msgstr "Тяжелый рок"
-
-#~ msgid "Folk"
-#~ msgstr "Фольк"
-
-#~ msgid "Folk/Rock"
-#~ msgstr "Фольк/Рок"
-
-#~ msgid "National Folk"
-#~ msgstr "Национальный фольк"
-
-#~ msgid "Fast-Fusion"
-#~ msgstr "Быстрое слияние"
-
-#~ msgid "Bebob"
-#~ msgstr "Бибоп"
-
-#~ msgid "Revival"
-#~ msgstr "Возрождение"
-
-#~ msgid "Celtic"
-#~ msgstr "Кельтская"
-
-#~ msgid "Bluegrass"
-#~ msgstr "Bluegrass"
-
-#~ msgid "Avantgarde"
-#~ msgstr "Авангард"
-
-#~ msgid "Gothic Rock"
-#~ msgstr "Готический рок"
-
-#~ msgid "Progressive Rock"
-#~ msgstr "Прогрессивный рок"
-
-#~ msgid "Psychedelic Rock"
-#~ msgstr "Психоделический рок"
-
-#~ msgid "Symphonic Rock"
-#~ msgstr "Симфонический рок"
-
-#~ msgid "Slow Rock"
-#~ msgstr "Медленный рок"
-
-#~ msgid "Big Band"
-#~ msgstr "Big Band"
-
-#~ msgid "Chorus"
-#~ msgstr "Хор"
-
-#~ msgid "Easy Listening"
-#~ msgstr "Easy Listening"
-
-#~ msgid "Acoustic"
-#~ msgstr "Акустическая"
-
-#~ msgid "Humour"
-#~ msgstr "Юмор"
-
-#~ msgid "Chanson"
-#~ msgstr "Шансон"
-
-#~ msgid "Opera"
-#~ msgstr "Опера"
-
-#~ msgid "Chamber Music"
-#~ msgstr "Камерная музыка"
-
-#~ msgid "Sonata"
-#~ msgstr "Соната"
-
-#~ msgid "Symphony"
-#~ msgstr "Симфония"
-
-#~ msgid "Booty Bass"
-#~ msgstr "Booty Bass"
-
-#~ msgid "Primus"
-#~ msgstr "Прима"
-
-#~ msgid "Porn Groove"
-#~ msgstr "Порн грув"
-
-#~ msgid "Slow Jam"
-#~ msgstr "Медленный джэм"
-
-#~ msgid "Club"
-#~ msgstr "Клуб"
-
-#~ msgid "Tango"
-#~ msgstr "Танго"
-
-#~ msgid "Samba"
-#~ msgstr "Самба"
-
-#~ msgid "Folklore"
-#~ msgstr "Фольклор"
-
-#~ msgid "Ballad"
-#~ msgstr "Баллада"
-
-#~ msgid "Power Ballad"
-#~ msgstr "Сильная баллада"
-
-#~ msgid "Rhythmic Soul"
-#~ msgstr "Ритмичный соул"
-
-#~ msgid "Freestyle"
-#~ msgstr "Свободный стиль"
-
-#~ msgid "Duet"
-#~ msgstr "Дуэт"
-
-#~ msgid "Punk Rock"
-#~ msgstr "Панк рок"
-
-#~ msgid "Drum Solo"
-#~ msgstr "Ударное соло"
-
-#~ msgid "A Cappella"
-#~ msgstr "А Капелла"
-
-#~ msgid "Euro-House"
-#~ msgstr "Euro-House"
-
-#~ msgid "Dance Hall"
-#~ msgstr "Танцевальный зал"
-
-#~ msgid "Goa"
-#~ msgstr "Гоа"
-
-#~ msgid "Drum & Bass"
-#~ msgstr "Драм-н-бас"
-
-#~ msgid "Club-House"
-#~ msgstr "Клуб-хаус"
-
-#~ msgid "Hardcore"
-#~ msgstr "Хардкор"
-
-#~ msgid "Indie"
-#~ msgstr "Indie"
-
-#~ msgid "BritPop"
-#~ msgstr "Бритпоп"
-
-#~ msgid "Negerpunk"
-#~ msgstr "Чёрный панк"
-
-#~ msgid "Polsk Punk"
-#~ msgstr "Польский панк"
-
-#~ msgid "Christian Gangsta Rap"
-#~ msgstr "Черный христианский рэп"
-
-#~ msgid "Heavy Metal"
-#~ msgstr "Тяжелый метал"
-
-#~ msgid "Black Metal"
-#~ msgstr "Чёрный метал"
-
-#~ msgid "Contemporary Christian"
-#~ msgstr "Современная христианская"
-
-#~ msgid "Christian Rock"
-#~ msgstr "Христианский рок"
-
-#~ msgid "Merengue"
-#~ msgstr "Меренга"
-
-#~ msgid "Salsa"
-#~ msgstr "Салса"
-
-#~ msgid "Thrash Metal"
-#~ msgstr "Трэш метал"
-
-#~ msgid "Anime"
-#~ msgstr "Аниме"
-
-#~ msgid "JPop"
-#~ msgstr "JPop"
-
-#~ msgid "Synthpop"
-#~ msgstr "Электронный поп"
-
-#~ msgid ""
-#~ "An error occured:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Произошла ошибка:\n"
-#~ "%s"
-
-#~ msgid "Error!"
-#~ msgstr "Ошибка!"
-
-#~ msgid "Failed to modify tag (open)"
-#~ msgstr "Не удалось изменить тег (открыть)"
-
-#~ msgid "Failed to modify tag (close)"
-#~ msgstr "Не удалось изменить тег (закрыть)"
-
-#~ msgid "Failed to modify tag"
-#~ msgstr "Не удалось изменить тег"
-
-#~ msgid " Ogg Vorbis Tag "
-#~ msgstr " Тег Ogg Vorbis "
-
-#~ msgid "Version:"
-#~ msgstr "Версия:"
-
-#~ msgid "ISRC number:"
-#~ msgstr "Номер ISRC:"
-
-#~ msgid " Ogg Vorbis ReplayGain "
-#~ msgstr " Ogg Vorbis ReplayGain "
-
-#~ msgid "Track peak:"
-#~ msgstr "Пик дорожки:"
-
-#~ msgid "Album gain:"
-#~ msgstr "Усиление альбома:"
-
-#~ msgid "Album peak:"
-#~ msgstr "Пик альбома:"
-
-#~ msgid " Ogg Vorbis Info "
-#~ msgstr " Информация Ogg Vorbis "
-
-#~ msgid "File size:"
-#~ msgstr "Размер файла:"
-
-#~ msgid "N/A"
-#~ msgstr "Н/Д"
-
-#~ msgid "%d KBit/s (nominal)"
-#~ msgstr "%d КБит/с (номинал)"
-
-#~ msgid "%d"
-#~ msgstr "%d"
-
-#~ msgid "%d:%.2d"
-#~ msgstr "%d:%.2d"
-
-#~ msgid "%d Bytes"
-#~ msgstr "%d байт"
-
-#, fuzzy
-#~ msgid ""
-#~ "You cannot use the FileWriter plugin\n"
-#~ "when you're running in realtime mode."
-#~ msgstr ""
-#~ "Использование модуля записи на диск невозможно\n"
-#~ "во время работы в режиме реального времени."
-
-#, fuzzy
-#~ msgid "Override generic XMMS titles"
-#~ msgstr "Не использовать стандартные названия"
-
-#, fuzzy
-#~ msgid "No sub-tune control."
-#~ msgstr "Регулятор громкости:"
-
-#, fuzzy
-#~ msgid "22050"
-#~ msgstr "22000 Гц"
-
-#, fuzzy
-#~ msgid "44100"
-#~ msgstr "44100 Гц"
-
-#, fuzzy
-#~ msgid "12000"
-#~ msgstr "11000 Гц"
-
-#, fuzzy
-#~ msgid "24000"
-#~ msgstr "22000 Гц"
-
-#, fuzzy
-#~ msgid "32000"
-#~ msgstr "22000 Гц"
-
-#~ msgid "Drive %d"
-#~ msgstr "Привод %d"
-
-#~ msgid ""
-#~ "Failed to open device %s\n"
-#~ "Error: %s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Не удалось открыть устройство %s\n"
-#~ "Ошибка: %s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Failed to read \"Table of Contents\"\n"
-#~ "Maybe no disc in the drive?\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Не удалось прочитать \"Оглавление\"\n"
-#~ "Возможно нет диска в приводе?\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Device %s OK.\n"
-#~ "Disc has %d tracks"
-#~ msgstr ""
-#~ "Привод %s: ОК.\n"
-#~ "На диске %d дорожек"
-
-#~ msgid " (%d data tracks)"
-#~ msgstr " (%d дорожек с данными)"
-
-#~ msgid ""
-#~ "Digital audio extraction not tested as the disc has no audio tracks\n"
-#~ msgstr ""
-#~ "Цифровое считывание аудио не тестировалось, так как на диске нет аудио-"
-#~ "дорожек\n"
-
-#~ msgid ""
-#~ "Digital audio extraction test: OK\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Тестирование цифрового считывания: OK\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Digital audio extraction test failed: %s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Тестирование цифрового считывания неудачно: %s\n"
-#~ "\n"
-
-#~ msgid "Error: %s exist, but is not a directory"
-#~ msgstr "Ошибка: %s существует, но не является каталогом"
-
-#~ msgid "Directory %s OK."
-#~ msgstr "Каталог %s OK."
-
-#~ msgid "_Device:"
-#~ msgstr "_Устройство:"
-
-#~ msgid "Dir_ectory:"
-#~ msgstr "_Каталог:"
-
-#~ msgid "Analog"
-#~ msgstr "Аналоговый"
-
-#~ msgid "No mixer"
-#~ msgstr "Нет микшера"
-
-#~ msgid "CDROM drive"
-#~ msgstr "Привод CD-ROM"
-
-#~ msgid "OSS mixer"
-#~ msgstr "OSS-микшер"
-
-#~ msgid "Check drive..."
-#~ msgstr "Проверить привод"
-
-#~ msgid "CD Audio Player Configuration"
-#~ msgstr "Настройка проигрывателя компакт дисков"
-
-#~ msgid "Device"
-#~ msgstr "Устройство"
-
-#~ msgid "CDDB:"
-#~ msgstr "CDDB:"
-
-#~ msgid "Use CDDB"
-#~ msgstr "Использовать CDDB"
-
-#~ msgid "Get server list"
-#~ msgstr "Получить список серверов"
-
-#~ msgid "CDDB server:"
-#~ msgstr "Cервер CDDB:"
-
-#~ msgid "Name format:"
-#~ msgstr "Формат названия:"
-
-#~ msgid "CD Audio Plugin"
-#~ msgstr "Модуль поддержки аудио компакт-дисков"
-
-#~ msgid "CD Audio Track %02u"
-#~ msgstr "CD аудио-дорожка %02u"
-
-#~ msgid "Game console audio module decoder"
-#~ msgstr "Модуль поддержки Console Audio"
-
-#~ msgid "NSF/NSFE"
-#~ msgstr "NSF/NSFE"
-
-#~ msgid "Use optional NSFE playlist"
-#~ msgstr "Использовать список воспроизведения NSFE"
-
-#~ msgid "Disk Writer Plugin %s"
-#~ msgstr "Модуль записи на диск %s"
-
-#~ msgid "eSound Output Plugin"
-#~ msgstr "Модуль вывода звука eSound"
-
-#~ msgid "Extra Stereo Plugin %s"
-#~ msgstr "Модуль Extra Stereo %s"
-
-#~ msgid "BSD Sun Driver %s"
-#~ msgstr "BSD Sun Драйвер %s"
-
-#~ msgid "TiMidity Player %s"
-#~ msgstr "Проигрыватель TiMidity %s"
-
-#~ msgid "Tone Generator %s"
-#~ msgstr "Генератор сигналов %s"
-
-#~ msgid "Ogg Vorbis Audio Plugin"
-#~ msgstr "Модуль поддержки Ogg Vorbis"
-
-#~ msgid "WAV Audio Plugin"
-#~ msgstr "Модуль поддержки WAV"
-
-#~ msgid "ALSA %s output plugin"
-#~ msgstr "Модуль вывода звука ALSA %s"
-
-#~ msgid "AMIDI-Plug %s (MIDI Player)"
-#~ msgstr "AMIDI-Plug %s (MIDI проигрыватель)"
-
-#~ msgid "AMIDI-Plug - warning"
-#~ msgstr "AMIDI-Plug - предупреждение"
-
-#~ msgid ""
-#~ "No sequencer backend has been selected!\n"
-#~ "Please configure AMIDI-Plug before playing."
-#~ msgstr ""
-#~ "Не выбран модуль секвенсера!\n"
-#~ "Пожалуйста настройте AMIDI-Plug перед воспроизведением."
-
-#~ msgid ""
-#~ "\n"
-#~ "EvDev-Plug "
-#~ msgstr ""
-#~ "\n"
-#~ "EvDev-Plug "
-
-#~ msgid "Arabic (IBM-864)"
-#~ msgstr "Арабская (IBM-864)"
-
-#~ msgid "Arabic (ISO-8859-6)"
-#~ msgstr "Арабская (ISO-8859-6)"
-
-#~ msgid "Arabic (Windows-1256)"
-#~ msgstr "Арабская (Windows-1256)"
-
-#~ msgid "Baltic (ISO-8859-13)"
-#~ msgstr "Балтийская (ISO-8859-13)"
-
-#~ msgid "Baltic (ISO-8859-4)"
-#~ msgstr "Балтийская (ISO-8859-4)"
-
-#~ msgid "Baltic (Windows-1257)"
-#~ msgstr "Балтийская (Windows-1257)"
-
-#~ msgid "Celtic (ISO-8859-14)"
-#~ msgstr "Кельтская (ISO-8859-14)"
-
-#~ msgid "Central European (IBM-852)"
-#~ msgstr "Центральная Европа (IBM-852)"
-
-#~ msgid "Central European (ISO-8859-2)"
-#~ msgstr "Центральная Европа (ISO-8859-2)"
-
-#~ msgid "Central European (Windows-1250)"
-#~ msgstr "Центральная Европа (Windows-1250)"
-
-#~ msgid "Chinese Simplified (GB18030)"
-#~ msgstr "Китайская упрощенная (GB18030)"
-
-#~ msgid "Chinese Simplified (GB2312)"
-#~ msgstr "Китайская упрощенная (GB2312)"
-
-#~ msgid "Chinese Traditional (Big5)"
-#~ msgstr "Китайская традиционная (Big5)"
-
-#~ msgid "Chinese Traditional (Big5-HKSCS)"
-#~ msgstr "Китайская традиционная (Big5-HKSCS)"
-
-#~ msgid "Cyrillic (IBM-855)"
-#~ msgstr "Кириллица (IBM-855)"
-
-#~ msgid "Cyrillic (ISO-8859-5)"
-#~ msgstr "Кириллица (ISO-8859-5)"
-
-#~ msgid "Cyrillic (ISO-IR-111)"
-#~ msgstr "Кириллица (ISO-IR-111)"
-
-#~ msgid "Cyrillic (KOI8-R)"
-#~ msgstr "Кириллица (KOI8-R)"
-
-#~ msgid "Cyrillic (Windows-1251)"
-#~ msgstr "Кириллица (Windows-1251)"
-
-#~ msgid "Cyrillic/Russian (CP-866)"
-#~ msgstr "Кириллица/Россия (CP-866)"
-
-#~ msgid "Cyrillic/Ukrainian (KOI8-U)"
-#~ msgstr "Кириллица/Украина (KOI8-U)"
-
-#~ msgid "English (US-ASCII)"
-#~ msgstr "Английская (US-ASCII)"
-
-#~ msgid "Greek (ISO-8859-7)"
-#~ msgstr "Греческая (ISO-8859-7)"
-
-#~ msgid "Greek (Windows-1253)"
-#~ msgstr "Греческая (Windows-1253)"
-
-#~ msgid "Hebrew (IBM-862)"
-#~ msgstr "Иврит (IBM-862)"
-
-#~ msgid "Hebrew (Windows-1255)"
-#~ msgstr "Иврит (Windows-1255)"
-
-#~ msgid "Japanese (EUC-JP)"
-#~ msgstr "Японская (EUC-JP)"
-
-#~ msgid "Japanese (ISO-2022-JP)"
-#~ msgstr "Японская (ISO-2022-JP)"
-
-#~ msgid "Japanese (Shift_JIS)"
-#~ msgstr "Японская (Shift_JIS)"
-
-#~ msgid "Korean (EUC-KR)"
-#~ msgstr "Корейская (EUC-KR)"
-
-#~ msgid "Nordic (ISO-8859-10)"
-#~ msgstr "Скандинавская (ISO-8859-10)"
-
-#~ msgid "South European (ISO-8859-3)"
-#~ msgstr "Восточная Европа (ISO-8859-3)"
-
-#~ msgid "Thai (TIS-620)"
-#~ msgstr "Тайская (TIS-620)"
-
-#~ msgid "Turkish (IBM-857)"
-#~ msgstr "Турецкая (IBM-857)"
-
-#~ msgid "Turkish (ISO-8859-9)"
-#~ msgstr "Турецкая (ISO-8859-9)"
-
-#~ msgid "Turkish (Windows-1254)"
-#~ msgstr "Турецкая (Windows-1254)"
-
-#~ msgid "Unicode (UTF-7)"
-#~ msgstr "Юникод (UTF-7)"
-
-#~ msgid "Unicode (UTF-8)"
-#~ msgstr "Юникод (UTF-8)"
-
-#~ msgid "Unicode (UTF-16BE)"
-#~ msgstr "Юникод (UTF-16BE)"
-
-#~ msgid "Unicode (UTF-16LE)"
-#~ msgstr "Юникод (UTF-16LE)"
-
-#~ msgid "Unicode (UTF-32BE)"
-#~ msgstr "Юникод (UTF-32BE)"
-
-#~ msgid "Unicode (UTF-32LE)"
-#~ msgstr "Юникод (UTF-32LE)"
-
-#~ msgid "Vietnamese (VISCII)"
-#~ msgstr "Вьетнамская (VISCII)"
-
-#~ msgid "Vietnamese (Windows-1258)"
-#~ msgstr "Вьетнамская (Windows-1258)"
-
-#~ msgid "Visual Hebrew (ISO-8859-8)"
-#~ msgstr "Иврит (ISO-8859-8)"
-
-#~ msgid "Western (IBM-850)"
-#~ msgstr "Западная (IBM-850)"
-
-#~ msgid "Western (ISO-8859-1)"
-#~ msgstr "Западная (ISO-8859-1)"
-
-#~ msgid "Western (ISO-8859-15)"
-#~ msgstr "Западная (ISO-8859-15)"
-
-#~ msgid "Western (Windows-1252)"
-#~ msgstr "Западная (Windows-1252)"
-
-#~ msgid "Arabic (IBM-864-I)"
-#~ msgstr "Арабская (IBM-864-I)"
-
-#~ msgid "Arabic (ISO-8859-6-E)"
-#~ msgstr "Арабская (ISO-8859-6-E)"
-
-#~ msgid "Arabic (ISO-8859-6-I)"
-#~ msgstr "Арабская (ISO-8859-6-I)"
-
-#~ msgid "Arabic (MacArabic)"
-#~ msgstr "Арабская (MacArabic)"
-
-#~ msgid "Armenian (ARMSCII-8)"
-#~ msgstr "Армянская (ARMSCII-8)"
-
-#~ msgid "Central European (MacCE)"
-#~ msgstr "Центральная Европа (MacCE)"
-
-#~ msgid "Chinese Simplified (GBK)"
-#~ msgstr "Китайская упрощенная (GBK)"
-
-#~ msgid "Chinese Simplified (HZ)"
-#~ msgstr "Китайская упрощенная (HZ)"
-
-#~ msgid "Chinese Traditional (EUC-TW)"
-#~ msgstr "Китайская традиционная (EUC-TW)"
-
-#~ msgid "Croatian (MacCroatian)"
-#~ msgstr "Хорватская (MacCroatian)"
-
-#~ msgid "Cyrillic (MacCyrillic)"
-#~ msgstr "Кириллица (MacCyrillic)"
-
-#~ msgid "Cyrillic/Ukrainian (MacUkrainian)"
-#~ msgstr "Кириллица/Украина (MacUkrainian)"
-
-#~ msgid "Farsi (MacFarsi)"
-#~ msgstr "Фарси (MacFarsi)"
-
-#~ msgid "Greek (MacGreek)"
-#~ msgstr "Греческая (MacGreek)"
-
-#~ msgid "Gujarati (MacGujarati)"
-#~ msgstr "Гуджарати (MacGujarati)"
-
-#~ msgid "Gurmukhi (MacGurmukhi)"
-#~ msgstr "Гурмуки (MacGurmukhi)"
-
-#~ msgid "Hebrew (ISO-8859-8-E)"
-#~ msgstr "Иврит (ISO-8859-8-E)"
-
-#~ msgid "Hebrew (ISO-8859-8-I)"
-#~ msgstr "Иврит (ISO-8859-8-I)"
-
-#~ msgid "Hebrew (MacHebrew)"
-#~ msgstr "Иврит (MacHebrew)"
-
-#~ msgid "Hindi (MacDevanagari)"
-#~ msgstr "Хинди (MacDevanagari)"
-
-#~ msgid "Icelandic (MacIcelandic)"
-#~ msgstr "Исландская (MacIcelandic)"
-
-#~ msgid "Korean (JOHAB)"
-#~ msgstr "Корейская (JOHAB)"
-
-#~ msgid "Korean (UHC)"
-#~ msgstr "Корейская (UHC)"
-
-#~ msgid "Romanian (MacRomanian)"
-#~ msgstr "Румынская (MacRomanian)"
-
-#~ msgid "Turkish (MacTurkish)"
-#~ msgstr "Турецкая (MacTurkish)"
-
-#~ msgid "Vietnamese (TCVN)"
-#~ msgstr "Вьетнамская (TCVN)"
-
-#~ msgid "Vietnamese (VPS)"
-#~ msgstr "Вьетнамская (VPS)"
-
-#~ msgid "Western (MacRoman)"
-#~ msgstr "Западная (MacRoman)"
-
-#~ msgid "Tag Handling"
-#~ msgstr "Обработка тэгов"
-
-#~ msgid "Convert Character Set"
-#~ msgstr "Преобразование кодировки"
-
-#~ msgid "Convert character set from :"
-#~ msgstr "Преобразовать кодировку из :"
-
-#~ msgid "Disable bitrate update during playback (saves cpu usage)"
-#~ msgstr ""
-#~ "Запретить обновление битрейта во время проигрывания (уменьшает загрузку "
-#~ "процессора)"
-
-#~ msgid "Album mode"
-#~ msgstr "Альбомный режим"
-
-#~ msgid "0 dB"
-#~ msgstr "0 dB"
-
-#~ msgid "Without ReplayGain"
-#~ msgstr "Выключить ReplayGain"
-
-#~ msgid "Dither 24bps to 16bps"
-#~ msgstr "Преобразовать 24 бит/с в 16 бит/с"
-
-#~ msgid "With ReplayGain"
-#~ msgstr "Включить ReplayGain"
-
-#~ msgid "Noise shaping"
-#~ msgstr "Подавление шума"
-
-#~ msgid "high"
-#~ msgstr "высокое"
-
-#~ msgid "Dither to"
-#~ msgstr "Преобразовать к"
-
-#~ msgid "16 bps"
-#~ msgstr "16 бит/с"
-
-#~ msgid "24 bps"
-#~ msgstr "24 бит/с"
-
-#~ msgid ""
-#~ "Flac Plugin by Josh Coalson\n"
-#~ "contributions by\n"
-#~ "......\n"
-#~ "......\n"
-#~ "and\n"
-#~ "Daisuke Shimamura\n"
-#~ "Visit http://flac.sourceforge.net/\n"
-#~ "\n"
-#~ "Audacious Team port"
-#~ msgstr ""
-#~ "Модуль Flac от Josh Coalson\n"
-#~ "в разработке участвовали:\n"
-#~ "......\n"
-#~ "......\n"
-#~ "и\n"
-#~ "Daisuke Shimamura\n"
-#~ "Посетите http://flac.sourceforge.net/\n"
-#~ "\n"
-#~ "Audacious Team port"
-
-#~ msgid "Alt"
-#~ msgstr "Alt"
-
-#~ msgid "Blocksize: %d"
-#~ msgstr "Блок: %d"
-
-#~ msgid ""
-#~ "Blocksize: variable\n"
-#~ " min/max: %d/%d"
-#~ msgstr ""
-#~ "Блок: переменный\n"
-#~ " мин/макс: %d/%d"
-
-#~ msgid "FLAC Info:"
-#~ msgstr "Информация FLAC:"
-
-#~ msgid "Filesize: %lld B"
-#~ msgstr "Размер файла: %lld Б"
-
-#~ msgid "ReplayGain Reference Loudness: %2.1f dB"
-#~ msgstr "ReplayGain Рекомендуемая громкость: %2.1f дБ"
-
-#~ msgid "ReplayGain Track Peak: %1.8f"
-#~ msgstr "ReplayGain Пик дорожки: %1.8f"
-
-#~ msgid "ReplayGain Album Peak: %1.8f"
-#~ msgstr "ReplaGain Пик альбома: %1.8f"
+msgstr "Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n\nЧасть кода этого модуля написал Miles Egan\nПосетите сайт Wavpack по адресу http://www.wavpack.com/\n"

audacious-plugins-3.1.1.tar.bz2/po/sk.po -> audacious-plugins-3.2.4.tar.bz2/po/sk.po Changed

@@ -1,24 +1,23 @@
-# translation of sk.po to Slovak
-# Slovak translation for Audacious-Plugins
-# Copyright (C) 2007, 2008, 2010, 2011 Andrej Herceg <herceg.andrej@zoznam.sk>.
-# This file is distributed under the same license as the audacious-plugins package.
-#
+# Slovak translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
 #
+# Translators:
 # Andrej Herceg <herceg.andrej@zoznam.sk>, 2007, 2008, 2010, 2011.
+# Tomáš Vadina <kyberdev@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: sk\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\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"
-"Language: sk\n"
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 09:01-0500\n"
+"PO-Revision-Date: 2012-02-13 14:41+0000\n"
+"Last-Translator: Tomáš Vadina <kyberdev@gmail.com>\n"
+"Language-Team: Slovak\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"
-"X-Generator: KBabel 1.11.4\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #: src/aac/libmp4.c:256
 #, c-format
@@ -26,15 +25,246 @@
 "Using libfaad2-%s for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
-msgstr ""
-"Pre dekódovanie sa používa knižnica libfaad2-%s.\n"
-"FAAD2 AAC/HE-AAC/HE-AACv2/DRM dekodér (c) Nero AG, www.nero.com\n"
-"Copyright (c) 2005-2006 tím Audacious"
+msgstr "Pre dekódovanie sa používa knižnica libfaad2-%s.\nFAAD2 AAC/HE-AAC/HE-AACv2/DRM dekodér (c) Nero AG, www.nero.com\nCopyright (c) 2005-2006 tím Audacious"
 
 #: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "O module dekodéra MP4 AAC"
 
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "O programe Alarm"
+
+#: src/alarm/alarm.c:313
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr "Modul, ktorý možno použiť na prehrávanie v určitom čase.\n\nPôvodne napísal Adam Feakin a Daniel Stodden."
+
+#: src/alarm/interface.c:33
+msgid "Alarm"
+msgstr "Alarm"
+
+#: src/alarm/interface.c:40
+msgid "This is your wakeup call."
+msgstr "Toto je budiaci signál."
+
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
+msgid "OK"
+msgstr "OK"
+
+#: src/alarm/interface.c:214
+msgid "Alarm Settings"
+msgstr "Nastavenie Alarmu"
+
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
+msgid "Time"
+msgstr "Čas"
+
+#: src/alarm/interface.c:270
+msgid "hours"
+msgstr "hodín"
+
+#: src/alarm/interface.c:331
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:361
+msgid "minutes"
+msgstr "minút"
+
+#: src/alarm/interface.c:379
+msgid "Quiet after:"
+msgstr "Ticho po:"
+
+#: src/alarm/interface.c:389
+msgid "Alarm at (default):"
+msgstr "Budiť o (predvolené):"
+
+#: src/alarm/interface.c:409
+msgid "Choose the days for the alarm to come on"
+msgstr "Vyberte dni, kedy má budík budiť"
+
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
+msgid "Default"
+msgstr "Štandardné"
+
+#: src/alarm/interface.c:763
+msgid "Day"
+msgstr "Deň"
+
+#: src/alarm/interface.c:783
+msgid "Tuesday"
+msgstr "Utorok"
+
+#: src/alarm/interface.c:794
+msgid "Wednesday"
+msgstr "Streda"
+
+#: src/alarm/interface.c:805
+msgid "Thursday"
+msgstr "Štvrtok"
+
+#: src/alarm/interface.c:816
+msgid "Friday"
+msgstr "Piatok"
+
+#: src/alarm/interface.c:827
+msgid "Saturday"
+msgstr "Sobota"
+
+#: src/alarm/interface.c:838
+msgid "Sunday"
+msgstr "Nedeľa"
+
+#: src/alarm/interface.c:848
+msgid "Monday"
+msgstr "Pondelok"
+
+#: src/alarm/interface.c:859
+msgid "Days"
+msgstr "Dni"
+
+#: src/alarm/interface.c:875
+msgid "Fading"
+msgstr "Zosilovanie"
+
+#: src/alarm/interface.c:912
+msgid "seconds"
+msgstr "sekúnd"
+
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
+msgid "Volume"
+msgstr "Hlasitosť"
+
+#: src/alarm/interface.c:946
+msgid "Current"
+msgstr "Aktuálna"
+
+#: src/alarm/interface.c:954
+msgid "Start at"
+msgstr "Začať na"
+
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:998
+msgid "Final"
+msgstr "Skončiť na"
+
+#: src/alarm/interface.c:1051
+msgid "Additional Command"
+msgstr "Dodatočný príkaz"
+
+#: src/alarm/interface.c:1077
+msgid "enable"
+msgstr "povoliť"
+
+#: src/alarm/interface.c:1085
+msgid "Playlist (optional)"
+msgstr "Zoznam skladieb (voliteľné)"
+
+#: src/alarm/interface.c:1111
+msgid "Browse..."
+msgstr "Prechádzať..."
+
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
+msgid "Reminder"
+msgstr "Upozornenie"
+
+#: src/alarm/interface.c:1136
+msgid "Use reminder"
+msgstr "Upozorňovať"
+
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Možnosti"
+
+#: src/alarm/interface.c:1160
+msgid "What do these options mean?"
+msgstr "Čo tieto možnosti znamenajú?"
+
+#: src/alarm/interface.c:1188
+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ť o: \n Čas budíka.\n\n Ticho po: \n Zastaviť budík po uplynutí tejto doby.\n (pokiaľ nebude budiaci dialóg zatvorený)\n\n\nDni\n Deň:\n Vyberte dni, kedy má budík fungovať.\n\n Čas:\n Vyberte čas budíka pre každý deň,\n alebo použite štandardný čas.\n\n\nHlasitosť\n Zosilovanie: \n Zosiluje až na vybranú hodnotu \n po vybranú dobu.\n\n Začať na: \n Zosilovanie začne z tejto hlasitosti.\n\n Skončiť na: \n Hlasitosť na konci zosilnenia. Ak je doba\n zosilovania na hodnote 0, potom bude \n hlasitosť táto.\n\n\nMožnosti:\n Dodatočný príkaz:\n Tento príkaz bude spustený v dobe budíka.\n\n Zoznam skladieb: \n Načíta tento zoznam skladieb, z ktorého bude hrať \n (musí mať príponu .m3u). Ak zoznam nie je zadaný, \n budú použité skladby, ktoré budú v aktuálnom\n zozname skladieb.\n URL MP3/OGG prúdu môže byť taktiež\n zadaná, ale načítanie zoznamu skladieb\n z URL nie je momentálne podporované.\n\n Upozornenie:\n Pri vypnutí budíka zobrazí odkaz.\n Text odkazu vpíšte do vstupného poľa a ak \n si želáte zobrazovať odkaz, stlačte tlačidlo.\n"
+
+#: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Pomocník"
+
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: src/alarm/interface.c:1290
+msgid "Your reminder for today is.."
+msgstr "Váš odkaz pre dnes je.."
+
+#: src/alarm/interface.c:1315
+msgid "Thankyou"
+msgstr "Ďakujem"
+
 #: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Predvolené PCM zariadenie"
@@ -43,23 +273,23 @@
 msgid "Default mixer device"
 msgstr "Predvolené zariadenie mixéra"
 
-#: src/alsa/config.c:447
+#: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
 msgstr "Predvoľby výstupného modulu ALSA"
 
-#: src/alsa/config.c:454
+#: src/alsa/config.c:445
 msgid "PCM device:"
 msgstr "PCM zariadenie:"
 
-#: src/alsa/config.c:456 src/OSS/configure.c:246
+#: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
 msgstr "Zariadenie mixéra:"
 
-#: src/alsa/config.c:458
+#: src/alsa/config.c:449
 msgid "Mixer element:"
 msgstr "Prvok mixéra:"
 
-#: src/alsa/config.c:461
+#: src/alsa/config.c:452
 msgid "Work around drain hangup"
 msgstr "Obísť problém so zasekávaním pri vyprázdňovaní"
 
@@ -71,13 +301,11 @@
 msgid "ALSA error"
 msgstr "Chyba ALSA"
 
-#: src/amidi-plug/amidi-plug.c:335
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr ""
-"Nezvolili ste žiadne porty sekvencéra určené pre prehrávanie MIDI. Môžete "
-"tak urobiť v predvoľbách MIDI modulu."
+msgstr "Nezvolili ste žiadne porty sekvencéra určené pre prehrávanie MIDI. Môžete tak urobiť v predvoľbách MIDI modulu."
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:35
 msgid "ALSA Backend "
@@ -85,23 +313,10 @@
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:37
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
-"ports. The ALSA sequencer interface is very versatile, it can provide ports "
-"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
-"synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from "
-"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
-"hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Toto koncové zariadenie posiela MIDI udalosti skupine užívateľom vybraných "
-"portov ALSA sekvencéra. Rozhranie ALSA sekvencéra je vysoko prispôsobivé. "
-"Môže poskytovať porty pre hardvérové syntetizátory zvukovej karty (napr. "
-"emu10k1), alebo syntetizátorom softvérovým, vonkajším zariadeniam atď.\n"
-"Toto koncové zariadenie nevytvára zvuk, MIDI udalosti sú spracovávané priamo "
-"zariadením/programom, ktoré sa ukrýva za ALSA portom. Napríklad MIDI "
-"udalosti poslané hardvérovému syntetizátoru budú prehrané priamo ním.\n"
-"Ovládač koncového zariadenia napísal Giacomo Lozito."
+msgstr "Toto koncové zariadenie posiela MIDI udalosti skupine užívateľom vybraných portov ALSA sekvencéra. Rozhranie ALSA sekvencéra je vysoko prispôsobivé. Môže poskytovať porty pre hardvérové syntetizátory zvukovej karty (napr. emu10k1), alebo syntetizátorom softvérovým, vonkajším zariadeniam atď.\nToto koncové zariadenie nevytvára zvuk, MIDI udalosti sú spracovávané priamo zariadením/programom, ktoré sa ukrýva za ALSA portom. Napríklad MIDI udalosti poslané hardvérovému syntetizátoru budú prehrané priamo ním.\nOvládač koncového zariadenia napísal Giacomo Lozito."
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
@@ -109,19 +324,10 @@
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-"
-"time software synthesizer based on the SoundFont2 specification (www."
-"fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed "
-"by chosen ouput plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen ouput plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Toto koncové zariadenie vytvára zvuk posielaním MIDI udalostí do FluidSynth "
-"(softvérový syntetizátor pracujúci v reálnom čase založený na špecifikácii "
-"SoundFont2 www.fluidsynth.org).\n"
-"Vyprodukovaný zvuk môže byť upravený efektovými modulmi prehrávača a "
-"následne je spracovaný zvoleným výstupným modulom.\n"
-"Ovládač koncového zariadenia napísal Giacomo Lozito."
+msgstr "Toto koncové zariadenie vytvára zvuk posielaním MIDI udalostí do FluidSynth (softvérový syntetizátor pracujúci v reálnom čase založený na špecifikácii SoundFont2 www.fluidsynth.org).\nVyprodukovaný zvuk môže byť upravený efektovými modulmi prehrávača a následne je spracovaný zvoleným výstupným modulom.\nOvládač koncového zariadenia napísal Giacomo Lozito."
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
@@ -157,16 +363,13 @@
 
 #: src/amidi-plug/i_configure-alsa.c:429
 msgid "ALSA Backend not loaded or not available"
-msgstr ""
-"Ovládač koncového zariadenia ALSA nie je načítaný, alebo nie je dostupný"
+msgstr "Ovládač koncového zariadenia ALSA nie je načítaný, alebo nie je dostupný"
 
 #: src/amidi-plug/i_configure-alsa.c:448
 msgid ""
 "ALSA\n"
 "backend"
-msgstr ""
-"Koncové zariadenie\n"
-"ALSA"
+msgstr "Koncové zariadenie\nALSA"
 
 #: src/amidi-plug/i_configure-ap.c:59
 msgid "AMIDI-Plug - backend information"
@@ -216,9 +419,7 @@
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr ""
-"AMIDI\n"
-"Plug"
+msgstr "AMIDI\nPlug"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
@@ -324,17 +525,13 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:621
 msgid "FluidSynth Backend not loaded or not available"
-msgstr ""
-"Ovládač koncového zariadenia FluidSynth nie je načítaný, alebo nie je "
-"dostupný"
+msgstr "Ovládač koncového zariadenia FluidSynth nie je načítaný, alebo nie je dostupný"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:640
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr ""
-"Koncové zariadenie\n"
-"FluidSynth"
+msgstr "Koncové zariadenie\nFluidSynth"
 
 #: src/amidi-plug/i_configure-timidity.c:39
 msgid "TIMIDITY BACKEND CONFIGURATION"
@@ -348,11 +545,9 @@
 msgid ""
 "TiMidity\n"
 "backend"
-msgstr ""
-"Koncové zariadenie\n"
-"TiMidity"
+msgstr "Koncové zariadenie\nTiMidity"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
 msgstr "Názov:"
 
@@ -412,9 +607,7 @@
 msgid ""
 "\n"
 "AMIDI-Plug "
-msgstr ""
-"\n"
-"AMIDI-Plug "
+msgstr "\nAMIDI-Plug "
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -439,28 +632,7 @@
 "Tony Vroon\n"
 "for the good help with alpha testing\n"
 "\n"
-msgstr ""
-"\n"
-"modulárny prehrávač MIDI hudby\n"
-"http://www.develia.org/projects.php?p=amidiplug\n"
-"\n"
-"napísal Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-"\n"
-"zvláštne poďakovanie patrí…\n"
-"\n"
-"Clemensovi Ladischovi a Jaroslavovi Kyselovi\n"
-"za ich úžasné programy aplaymidi a amixer; tieto\n"
-"boli naozaj užitočné, spolu s dokumentáciou alsa-lib,\n"
-"aby som sa dozvedel viac o ALSA API\n"
-" <<<<<<<<<<<\n"
-"Alfredovi Spadafinovi\n"
-"za pekné logo MIDI klávesnice\n"
-"\n"
-"Tonymu Vroonovi\n"
-"za pomoc pri testovaní alfa verzie\n"
-"\n"
+msgstr "\nmodulárny prehrávač MIDI hudby\nhttp://www.develia.org/projects.php?p=amidiplug\n\nnapísal Giacomo Lozito\n< james@develia.org >\n\n\nzvláštne poďakovanie patrí…\n\nClemensovi Ladischovi a Jaroslavovi Kyselovi\nza ich úžasné programy aplaymidi a amixer; tieto\nboli naozaj užitočné, spolu s dokumentáciou alsa-lib,\naby som sa dozvedel viac o ALSA API\n <<<<<<<<<<<\nAlfredovi Spadafinovi\nza pekné logo MIDI klávesnice\n\nTonymu Vroonovi\nza pomoc pri testovaní alfa verzie\n\n"
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
@@ -478,249 +650,238 @@
 msgid "None"
 msgstr "Žiadne"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "Začiatok prehrávania"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "OSD sa zobrazí pri zahájení prehrávania položky zo zoznamu skladieb."
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "Zmena názvu"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr ""
-"OSD sa zobrazí počas prehrávania ak sa zmení názov, ale meno súboru ostane "
-"nezmenené. Je to hlavne vhodné na zobrazenie zmien názvov skladieb pri "
-"prehrávaní internetových prúdov."
+msgstr "OSD sa zobrazí počas prehrávania ak sa zmení názov, ale meno súboru ostane nezmenené. Je to hlavne vhodné na zobrazenie zmien názvov skladieb pri prehrávaní internetových prúdov."
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "Zmena hlasitosti"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
 msgstr "OSD sa zobrazí pri zmene hlasitosti."
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
 msgstr "Pozastavenie prehrávania"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
 msgstr "OSD sa zobrazí pri pozastavení prehrávania."
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
 msgstr "Obnovenie prehrávania"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSD sa zobrazí keď je prehrávanie obnovené."
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "Umiestnenie"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
 msgstr "Relatívne odsadenie v smere osi X:"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
 msgstr "Relatívne odsadenie v smere osi Y:"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr "Maximálna šírka OSD:"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr "Nastavenia pre viac monitorov"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
 msgstr "Zobraziť OSD na:"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "všetkých monitoroch"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "monitore %i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "Časovanie (ms)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "Zobrazenie:"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "Rozsvietenie:"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "Zhasnutie:"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "Písmo %i:"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "Tieň"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "Internacionalizácia"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 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:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "Vyberte súbor s vzhľadom"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr "Štýl zobrazenia"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "Farby"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "Farba %i:"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr "Používateľský vzhľad"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "Súbor s vzhľadom:"
 
-#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
-#: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "Prechádzať"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "Povoliť spúšťač"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "Udalosť"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
 msgstr "Bol zistený kompozitný správca"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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 ""
-"Nebol nájdený kompozitný správca.\n"
-"Ak viete, že žiadny nebeží, prosím, aktivujte kompozitného správcu, inak "
-"nebude OSD pracovať správne"
+"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
+msgstr "Nebol nájdený kompozitný správca.\nAk viete, že žiadny nebeží, prosím, aktivujte kompozitného správcu, inak nebude OSD pracovať správne"
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 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:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "Priehľadnosť"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr "Falošná priehľadnosť"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Skutočná priehľadnosť (vyžaduje kompozitné rozšírenie X servera)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
 msgstr "Kompozitné rozšírenie nie je načítané"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
 msgstr "Kompozitné rozšírenie nie je dostupné"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr "OSD Audacious"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
 msgstr "OSD pre Audacious - nastavenie"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr "Vyskúšať"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "Umiestnenie"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "Animácia"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "Výzdoba"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "Spúšťač"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
-#: src/sid/xs_interface.c:1302
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "Rôzne"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
 msgstr "O module OSD pre Audacious"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
-msgstr ""
-"\n"
-"OSD pre Audacious "
+msgstr "\nOSD pre Audacious "
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -731,33 +892,39 @@
 "written by Evan Martin\n"
 "http://neugierig.org/software/ghosd/\n"
 "\n"
-msgstr ""
-"\n"
-"http://www.develia.org/projects.php?p=audacious#aosd\n"
-"Napísal Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-"On-Screen-Display je založený na knižnici Ghosd,\n"
-"ktorú napísal Evan Martin\n"
-"http://neugierig.org/software/ghosd/\n"
-"\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\nNapísal Giacomo Lozito\n< james@develia.org >\n\nOn-Screen-Display je založený na knižnici Ghosd,\nktorú napísal Evan Martin\nhttp://neugierig.org/software/ghosd/\n\n"
 
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
 msgstr "Blur Scope: Výber farby"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:111
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
 msgid "Options:"
 msgstr "Možnosti:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:264
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr "Predvoľby Bauer stereophonic-to-binaural"
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr "Úroveň zdroja:"
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr "Frekvencia pre vystrihnutie:"
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr "Predvoľby:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
 msgstr "O module zvukových CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:265
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
-"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
 "Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
 "\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
@@ -767,27 +934,17 @@
 "This was a Google Summer of Code 2007 project.\n"
 "\n"
 "Copyright 2009 John Lindgren"
-msgstr ""
-"Copyright (c) 2007, Calin Crisan <ccrisan@gmail.com> a tím Audacious.\n"
-"\n"
-"Veľká vďaka patrí vývojárom libcdio <http://www.gnu.org/software/libcdio/> a "
-"libcddb <http://libcddb.sourceforge.net/>.\n"
-"\n"
-"Taktiež ďakujem Tonymu Vroonovi za rady a vedenie.\n"
-"\n"
-"Toto bol Google Summer of Code 2007 projekt.\n"
-"\n"
-"Copyright 2009 John Lindgren"
+msgstr "Copyright (c) 2007, Calin Crisan <ccrisan@gmail.com> a tím Audacious.\n\nVeľká vďaka patrí vývojárom libcdio <http://www.gnu.org/software/libcdio/> a libcddb <http://libcddb.sourceforge.net/>.\n\nTaktiež ďakujem Tonymu Vroonovi za rady a vedenie.\n\nToto bol Google Summer of Code 2007 projekt.\n\nCopyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:558
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
 msgstr "Zvukové CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:913
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
 msgstr "Mechanika je prázdna."
 
-#: src/cdaudio-ng/cdaudio-ng.c:915
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
 msgstr "Nepodporovaný typ disku."
 
@@ -835,18 +992,12 @@
 msgid "Override default device: "
 msgstr "Nahradiť predvolené zariadenie: "
 
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:131
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:125
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
 msgid "Ok"
 msgstr "OK"
 
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:138
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:132
-msgid "Cancel"
-msgstr "Zrušiť"
-
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
 msgstr "Prehrať CD"
@@ -855,86 +1006,84 @@
 msgid "Add CD"
 msgstr "Pridať CD"
 
-#: src/compressor/plugin.c:67
+#: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
 msgstr "O module Kompresia dynamického rozsahu"
 
-#: src/compressor/plugin.c:99
+#: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
 msgstr "Nastavenia kompresie dynamického rozsahu"
 
-#: src/compressor/plugin.c:111
+#: src/compressor/plugin.c:107
 msgid "Center volume:"
 msgstr "Stredná hlasitosť:"
 
-#: src/compressor/plugin.c:124
+#: src/compressor/plugin.c:120
 msgid "Dynamic range:"
 msgstr "Dynamický rozsah:"
 
-#: src/console/configure.c:138
+#: src/console/configure.c:136
 msgid "Game Console Music Decoder"
 msgstr "Dekodér konzolovej hudby"
 
-#: src/console/configure.c:155
+#: src/console/configure.c:153
 msgid "General"
 msgstr "Všeobecné"
 
-#: src/console/configure.c:157 src/skins/ui_manager.c:176
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
 msgid "Playback"
 msgstr "Prehrávanie"
 
-#: src/console/configure.c:172
+#: src/console/configure.c:170
 msgid "Bass:"
 msgstr "Hĺbky:"
 
-#: src/console/configure.c:176 src/console/configure.c:187
-#: src/console/configure.c:208
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
 msgid "secs"
 msgstr "s"
 
-#: src/console/configure.c:183
+#: src/console/configure.c:181
 msgid "Treble:"
 msgstr "Výšky:"
 
-#: src/console/configure.c:204
+#: src/console/configure.c:202
 msgid "Default song length:"
 msgstr "Predvolená dĺžka skladby:"
 
-#: src/console/configure.c:210 src/sid/xs_interface.c:666
+#: src/console/configure.c:208
 msgid "Resampling"
 msgstr "Prevzorkovanie"
 
-#: src/console/configure.c:216
+#: src/console/configure.c:214
 msgid "Enable audio resampling"
 msgstr "Povoliť prevzorkovanie zvuku"
 
-#: src/console/configure.c:231
+#: src/console/configure.c:229
 msgid "Resampling rate:"
 msgstr "Prevzorkovať na:"
 
-#: src/console/configure.c:235 src/sid/xs_interface.c:354
+#: src/console/configure.c:233
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:246
+#: src/console/configure.c:244
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:247
+#: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
 msgstr "Ignorovať dĺžku z SPC značiek"
 
-#: src/console/configure.c:248
+#: src/console/configure.c:246
 msgid "Increase reverb"
 msgstr "Predĺžiť dozvuk"
 
-#: src/console/configure.c:273
+#: src/console/configure.c:271
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not "
-"provide length information (i.e. looping tracks)."
-msgstr ""
-"Predvolená dĺžka skladby, vyjadrená v sekundách, je použitá pri skladbách, "
-"ktoré neposkytujú informáciu o dĺžke (napr. skladby s opakovaním)."
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
+msgstr "Predvolená dĺžka skladby, vyjadrená v sekundách, je použitá pri skladbách, ktoré neposkytujú informáciu o dĺžke (napr. skladby s opakovaním)."
 
 #: src/console/plugin.c:33
 msgid "About the Game Console Music Decoder"
@@ -946,96 +1095,79 @@
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
-msgstr ""
-"Dekodér konzolovej hudby je založený na Game_Music_Emu 0.5.2.\n"
-"Podporované formáty: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
-"Pre Audacious upravili: William Pitcock <nenolod@nenolod.net>,\n"
-" Shay Green <gblargg@gmail.com>\n"
+msgstr "Dekodér konzolovej hudby je založený na Game_Music_Emu 0.5.2.\nPodporované formáty: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nPre Audacious upravili: William Pitcock <nenolod@nenolod.net>,\n Shay Green <gblargg@gmail.com>\n"
 
-#: src/crossfade/plugin.c:65
+#: src/crossfade/plugin.c:60
 msgid "About Crossfade"
 msgstr "O module Prelínanie (crossfade)"
 
-#: src/crossfade/plugin.c:97
+#: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
 msgstr "Predvoľby prelínania"
 
-#: src/crossfade/plugin.c:109
+#: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
 msgstr "Presah (v sekundách):"
 
-#: src/crossfade/plugin.c:140 src/crossfade/plugin.c:146
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
 msgstr "Chyba prelínania"
 
-#: src/crossfade/plugin.c:140
+#: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
 msgstr "Prelínanie zlyhalo, pretože skladby majú rôzny počet kanálov."
 
-#: src/crossfade/plugin.c:148
+#: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
-"You can use the Sample Rate Converter effect to resample the songs to the "
-"same rate."
-msgstr ""
-"Prelínanie zlyhalo, pretože skladby majú rozdielnu vzorkovaciu frekvenciu:\n"
-"\n"
-"Na prevzorkovanie skladieb na rovnakú frekvenciu môžete použiť efektový "
-"modul „Konvertor vzorkovacej frekvencie“."
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
+msgstr "Prelínanie zlyhalo, pretože skladby majú rozdielnu vzorkovaciu frekvenciu:\n\nNa prevzorkovanie skladieb na rovnakú frekvenciu môžete použiť efektový modul „Konvertor vzorkovacej frekvencie“."
 
-#: src/crystalizer/crystalizer.c:108
+#: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
 msgstr "Nastaviť Crystalizer"
 
-#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
 msgstr "Sila efektu:"
 
-#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
-#: src/stereo_plugin/stereo.c:138
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
 msgid "Apply"
 msgstr "Použiť"
 
-#: src/daemon/daemon.c:58
-msgid "Daemon Interface (like old headless mode)"
-msgstr "Démon rozhranie (podobné starému serverovému režimu)"
-
 #: src/echo_plugin/gui.c:15
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin 1999.\n"
 "\n"
 "Surround echo by Carl van Schaik 1999"
-msgstr ""
-"Modul Ozvena\n"
-"Napísal Johan Levin, 1999\n"
-"\n"
-"Priestorovú ozvenu pridal Carl van Shaik, 1999"
+msgstr "Modul Ozvena\nNapísal Johan Levin, 1999\n\nPriestorovú ozvenu pridal Carl van Shaik, 1999"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
 msgstr "O module ozveny"
 
-#: src/echo_plugin/gui.c:72
+#: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
 msgstr "Nastaviť ozvenu"
 
-#: src/echo_plugin/gui.c:88
+#: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
 msgstr "Oneskorenie: (ms)"
 
-#: src/echo_plugin/gui.c:93
+#: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
 msgstr "Spätná väzba: (%)"
 
-#: src/echo_plugin/gui.c:98
+#: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
 msgstr "Hlasitosť: (%)"
 
-#: src/ffaudio/ffaudio-core.c:763
-#, fuzzy, c-format
+#: src/ffaudio/ffaudio-core.c:725
+#, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1048,108 +1180,65 @@
 "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"
-"Copyright (c) 2000-2009 Fabrice Bellard, ai.\n"
-"\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
-"Modul pre Audacious napísali:\n"
-" William Pitcock <nenolod@nenolod.net>,\n"
-" Matti Hämäläinen <ccr@tnsp.org>\n"
+msgstr "Multi-formátový dekódujúci modul zvuku pre Audacious založený na multimediálnom frameworku FFmpeg (http://www.ffmpeg.org/)\nCopyright (c) 2000-2009 Fabrice Bellard, et al.\n\nModul do Audacious:\n William Pitcock <nenolod@nenolod.net>,\n Matti Hämäläinen <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:777
+#: src/ffaudio/ffaudio-core.c:739
 msgid "About FFaudio Plugin"
 msgstr "O module FFaudio"
 
-#: src/filewriter/filewriter.c:155
+#: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
 msgstr "O module FileWriter"
 
-#: src/filewriter/filewriter.c:156
-msgid ""
-"FileWriter-Plugin\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Modul FileWriter\n"
-"\n"
-"Tento program je slobodný softvér. Môžete ho šíriť a/alebo upravovať podľa "
-"ustanovení GNU GPL, vydávanej nadáciou Free Software Foundation; buď vo "
-"verzii 2 tejto licencie, alebo (podľa vášho uváženia) v ľubovoľnej novšej "
-"verzii.\n"
-"\n"
-"Tento program je rozširovaný v nádeji, že bude užitočný, ale BEZ AKEJKOĽVEK "
-"ZÁRUKY. Neposkytujú sa ani odvodené záruky PREDAJNOSTI alebo VHODNOSTI PRE "
-"URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte v GNU GPL.\n"
-"\n"
-"Kópiu GNU GPL ste mali dostať spolu s týmto programom. Ak sa tak nestalo, "
-"požiadajte o ňu Free Software Foundation, Inc., 51 Franklin Street, Fifth "
-"Floor, Boston, MA 02110-1301, USA."
-
-#: src/filewriter/filewriter.c:450
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "Nastavenie zápisu do súboru"
 
-#: src/filewriter/filewriter.c:462
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "Formát výstupného súboru:"
 
-#: src/filewriter/filewriter.c:480
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "Nastaviť"
 
-#: src/filewriter/filewriter.c:495
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "Ukladať do pôvodného adresára"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr "Ukladať do vlastného adresára"
 
-#: src/filewriter/filewriter.c:510
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "Priečinok s výstupnými súbormi:"
 
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr "Vybrať priečinok"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr "Získať názov súboru z:"
 
-#: src/filewriter/filewriter.c:536
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr "pôvodných značiek v súbore"
 
-#: src/filewriter/filewriter.c:542
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr "názvu pôvodného súboru"
 
-#: src/filewriter/filewriter.c:552
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "Neodstraňovať príponu názvu súboru"
 
-#: src/filewriter/filewriter.c:567
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr "Na začiatok názvu súboru pridať číslo stopy"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:783
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "Auto"
 
@@ -1157,151 +1246,151 @@
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:724
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr "Nastavenie MP3"
 
-#: src/filewriter/mp3.c:747
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "Kvalita algoritmu:"
 
-#: src/filewriter/mp3.c:772
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr "Výstupná vzorkovacia frekvencia:"
 
-#: src/filewriter/mp3.c:800
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:807
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "Dátový tok / kompresný pomer:"
 
-#: src/filewriter/mp3.c:831
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "Dátový tok (kb/s):"
 
-#: src/filewriter/mp3.c:864
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr "Kompresný pomer:"
 
-#: src/filewriter/mp3.c:888
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr "Zvukový režim:"
 
-#: src/filewriter/mp3.c:913
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "Rôzne:"
 
-#: src/filewriter/mp3.c:924
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr "Vynútiť prísnu zhodu s ISO"
 
-#: src/filewriter/mp3.c:935
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "Ochrana pred chybami"
 
-#: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "Kvalita"
 
-#: src/filewriter/mp3.c:957
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr "Povoliť VBR/ABR"
 
-#: src/filewriter/mp3.c:967
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/filewriter/mp3.c:1000
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr "Nastavenia VBR:"
 
-#: src/filewriter/mp3.c:1016
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "Najmenší dátový tok (kb/s):"
 
-#: src/filewriter/mp3.c:1043
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "Najväčší dátový tok (kb/s):"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr "Prísne vynucovať najmenší dátový tok"
 
-#: src/filewriter/mp3.c:1078
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr "Nastavenia ABR:"
 
-#: src/filewriter/mp3.c:1088
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "Priemerný dátový tok (kb/s):"
 
-#: src/filewriter/mp3.c:1116
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr "Úroveň kvality VBR:"
 
-#: src/filewriter/mp3.c:1135
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr "Nezapisovať hlavičku Xing VBR"
 
-#: src/filewriter/mp3.c:1149
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "Parametre rámcov:"
 
-#: src/filewriter/mp3.c:1171
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr "Pridať označenie autorských práv"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr "Pridať označenie originálu"
 
-#: src/filewriter/mp3.c:1194
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "Parametre ID3:"
 
-#: src/filewriter/mp3.c:1205
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
 msgstr "Vynútiť pridanie značiek verzie 2"
 
-#: src/filewriter/mp3.c:1215
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr "Pridávať iba značky verzie 1"
 
-#: src/filewriter/mp3.c:1222
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr "Pridávať iba značky verzie 2"
 
-#: src/filewriter/mp3.c:1243
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
 msgstr "Značky"
 
-#: src/filewriter/vorbis.c:238
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Nastavenie kodéra Vorbis"
 
-#: src/filewriter/vorbis.c:258
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "Úroveň kvality (0-10):"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr "O module FLAC Audio"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1309,13 +1398,7 @@
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr ""
-"\n"
-"\n"
-"Pôvodný kód napísal\n"
-"Ralf Ertzinger <ralf@skytale.net>\n"
-"\n"
-"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\nPôvodný kód napísal\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
@@ -1328,38 +1411,17 @@
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-msgstr ""
-"Modul Klávesové skratky Gnome\n"
-"Umožňuje ovládanie prehrávača klávesovými skratkami Gnome.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
-msgid "Open Files"
-msgstr "Otvoriť súbory"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
-msgid "Add Files"
-msgstr "Pridať súbory"
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr "Audacious2"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr "GNT rozhranie"
+msgstr "Modul Klávesové skratky Gnome\nUmožňuje ovládanie prehrávača klávesovými skratkami Gnome.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
 
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Číslo položky"
 
-#: src/gtkui/columns.c:36 src/sid/xs_interface.c:1103
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "Názov"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
 msgstr "Umelec"
 
@@ -1367,7 +1429,7 @@
 msgid "Year"
 msgstr "Rok"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
 msgstr "Album"
 
@@ -1399,15 +1461,15 @@
 msgid "Bitrate"
 msgstr "Dátový tok"
 
-#: src/gtkui/columns.c:286
+#: src/gtkui/columns.c:278
 msgid "Choose Columns"
 msgstr "Vybrať stĺpce"
 
-#: src/gtkui/columns.c:300
+#: src/gtkui/columns.c:292
 msgid "Available:"
 msgstr "Dostupné:"
 
-#: src/gtkui/columns.c:334
+#: src/gtkui/columns.c:326
 msgid "Chosen:"
 msgstr "Vybrané:"
 
@@ -1431,328 +1493,299 @@
 msgid "Undock"
 msgstr "Uvolniť"
 
-#: src/gtkui/layout.c:123
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
 msgstr "Zakázať"
 
-#: src/gtkui/menus.c:132
-#, fuzzy
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
-msgstr "Otvoriť súbory …"
+msgstr "_Otvoriť súbory ..."
 
-#: src/gtkui/menus.c:133
-#, fuzzy
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
-msgstr "Otvoriť URL …"
+msgstr "Otvoriť _URL ..."
 
-#: src/gtkui/menus.c:134
-#, fuzzy
-msgid "_Add File ..."
-msgstr "Pridať súbory …"
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "Prid_ať súbory ..."
 
-#: src/gtkui/menus.c:135
-#, fuzzy
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
-msgstr "Pridať URL …"
+msgstr "Pridať U_RL ..."
 
-#: src/gtkui/menus.c:137
-#, fuzzy
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
-msgstr "O "
+msgstr "_O programe ..."
 
-#: src/gtkui/menus.c:138
-#, fuzzy
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
-msgstr "Predvoľby"
+msgstr "_Predvoľby"
 
-#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: src/gtkui/menus.c:142
-#, fuzzy
+#: src/gtkui/menus.c:141
 msgid "_Play"
-msgstr "Prehrať"
+msgstr "_Hrať"
 
-#: src/gtkui/menus.c:143
-#, fuzzy
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
-msgstr "Pozastaviť"
+msgstr "P_ozastaviť"
 
-#: src/gtkui/menus.c:144
-#, fuzzy
+#: src/gtkui/menus.c:143
 msgid "_Stop"
-msgstr "Zastaviť"
+msgstr "Za_staviť"
 
-#: src/gtkui/menus.c:145
-#, fuzzy
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
-msgstr "Predchádzajúca"
+msgstr "Pred_chádzajúca"
 
-#: src/gtkui/menus.c:146
-#, fuzzy
+#: src/gtkui/menus.c:145
 msgid "_Next"
-msgstr "Nasledujúca"
+msgstr "_Nasledujúca"
 
-#: src/gtkui/menus.c:148
-#, fuzzy
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
-msgstr "Opakovať"
+msgstr "O_pakovať"
 
-#: src/gtkui/menus.c:149
-#, fuzzy
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
-msgstr "Náhodné poradie"
+msgstr "Ná_hodné prehrávanie"
 
-#: src/gtkui/menus.c:150
-#, fuzzy
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
-msgstr "Neprehrávať ďalšiu skladbu zo zoznamu"
+msgstr "Nep_okračovať podľa zoznamu skladieb"
 
-#: src/gtkui/menus.c:151
-#, fuzzy
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
-msgstr "Zastaviť po skončení skladby."
+msgstr "Zastaviť po tejto skl_adbe"
 
-#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
-msgstr ""
+msgstr "_Informácie o skladbe ..."
 
-#: src/gtkui/menus.c:154
-#, fuzzy
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
-msgstr "Prejsť na čas"
+msgstr "S_kočiť na čas ..."
 
-#: src/gtkui/menus.c:155
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
-msgstr ""
+msgstr "Skočiť na sk_ladbu ..."
 
-#: src/gtkui/menus.c:158
-#, fuzzy
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
-msgstr "Podľa čísla stopy"
+msgstr "Podľa čí_sla stopy"
 
-#: src/gtkui/menus.c:159
-#, fuzzy
+#: src/gtkui/menus.c:158
 msgid "By _Title"
-msgstr "Podľa názvu"
+msgstr "Podľa _názvu"
 
-#: src/gtkui/menus.c:160
-#, fuzzy
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
-msgstr "Podľa umelca"
+msgstr "Podľa _umelca"
 
-#: src/gtkui/menus.c:161
-#, fuzzy
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
-msgstr "Podľa albumu"
+msgstr "Podľa a_lbumu"
 
-#: src/gtkui/menus.c:162
-#, fuzzy
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
-msgstr "Podľa dátumu vydania"
+msgstr "Podľa dátumu vy_dania"
 
-#: src/gtkui/menus.c:163
-#, fuzzy
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
-msgstr "Podľa cesty k súboru"
+msgstr "Podľa _cesty k súboru"
 
-#: src/gtkui/menus.c:164
-#, fuzzy
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
-msgstr "Vlastný názov"
+msgstr "Podľa vlastného ná_zvu"
 
-#: src/gtkui/menus.c:166
-#, fuzzy
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
-msgstr "Obrátiť poradie"
+msgstr "Obrátené poradie"
 
-#: src/gtkui/menus.c:167
-#, fuzzy
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
-msgstr "Náhodné poradie"
+msgstr "Náhodné po_radie"
 
-#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
 msgstr "_Obnoviť"
 
+#: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Odstrániť nedost_upné súbory"
+
 #: src/gtkui/menus.c:172
-#, fuzzy
 msgid "_Sort"
-msgstr "Triediť"
+msgstr "_Zoradiť"
 
 #: src/gtkui/menus.c:174
 msgid "_New"
-msgstr ""
+msgstr "_Nový"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
 msgstr "_Zatvoriť"
 
 #: src/gtkui/menus.c:177
-#, fuzzy
 msgid "_Import ..."
-msgstr "Importovať"
+msgstr "_Importovať ..."
 
 #: src/gtkui/menus.c:178
-#, fuzzy
 msgid "_Export ..."
-msgstr "Exportovať"
+msgstr "_Exportovať ..."
 
 #: src/gtkui/menus.c:180
-#, fuzzy
 msgid "_Playlist Manager ..."
-msgstr "Správca zoznamov skladieb"
+msgstr "S_právca zoznamu skladieb ..."
 
-#: src/gtkui/menus.c:183
-#, fuzzy
-msgid "Volume _Up"
-msgstr "Zosilniť"
+#: src/gtkui/menus.c:181
+msgid "_Queue Manager ..."
+msgstr "Správca _fronty .."
 
 #: src/gtkui/menus.c:184
-#, fuzzy
+msgid "Volume _Up"
+msgstr "Zo_silniť"
+
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
-msgstr "Stíšiť"
+msgstr "S_tíšiť"
 
-#: src/gtkui/menus.c:186
-#, fuzzy
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
-msgstr "Ekvalizér"
+msgstr "_Ekvalizér"
 
-#: src/gtkui/menus.c:188
-#, fuzzy
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
-msgstr "Efekty"
+msgstr "E_fekty"
 
-#: src/gtkui/menus.c:191
-#, fuzzy
+#: src/gtkui/menus.c:192
 msgid "_Interface"
-msgstr "Rozhranie"
+msgstr "_Rozhranie"
 
 #: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Vizualizácie"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
-msgstr ""
+msgstr "Zobraziť _panel s ponukou"
 
-#: src/gtkui/menus.c:194
-#, fuzzy
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
-msgstr "Zobraziť informačnú plochu"
+msgstr "Zobraziť panel s i_nformáciami"
 
-#: src/gtkui/menus.c:195
-#, fuzzy
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
-msgstr "Zobraziť stavový riadok"
+msgstr "Zobraziť panel so _stavom"
 
-#: src/gtkui/menus.c:197
-#, fuzzy
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
-msgstr "Zobrazovať hlavičky stĺpcov"
+msgstr "Zobraziť _hlavičky stĺpcov"
 
-#: src/gtkui/menus.c:198
-#, fuzzy
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
-msgstr "Vybrať stĺpce …"
+msgstr "Vybrať stĺp_ce ..."
 
-#: src/gtkui/menus.c:199
-#, fuzzy
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
-msgstr "Zmena skladby"
+msgstr "Ro_lovať na zmenenú skladbu"
 
-#: src/gtkui/menus.c:202
-#, fuzzy
+#: src/gtkui/menus.c:204
 msgid "_File"
-msgstr "Súbor"
+msgstr "_Súbor"
 
-#: src/gtkui/menus.c:203
-#, fuzzy
+#: src/gtkui/menus.c:205
 msgid "_Playback"
-msgstr "Prehrávanie"
+msgstr "_Prehrávanie"
 
-#: src/gtkui/menus.c:204
-#, fuzzy
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
-msgstr "Zoznam skladieb"
+msgstr "Zoznam sk_ladieb"
 
-#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
-#, fuzzy
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
-msgstr "Zariadenia"
+msgstr "_Služby"
 
-#: src/gtkui/menus.c:206
-#, fuzzy
+#: src/gtkui/menus.c:208
 msgid "_Output"
-msgstr "Výstup"
+msgstr "_Výstup"
 
-#: src/gtkui/menus.c:207
-#, fuzzy
+#: src/gtkui/menus.c:209
 msgid "_View"
-msgstr "Zobrazenie"
+msgstr "_Zobrazenie"
 
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
-msgstr ""
+msgstr "Pridať alebo odobrať z _fronty"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
-msgstr ""
+msgstr "Vys_trihnúť"
 
-#: src/gtkui/menus.c:215
-#, fuzzy
+#: src/gtkui/menus.c:217
 msgid "_Copy"
-msgstr "Kopírovať"
+msgstr "_Kopírovať"
 
-#: src/gtkui/menus.c:216
-#, fuzzy
+#: src/gtkui/menus.c:218
 msgid "_Paste"
-msgstr "Vložiť"
+msgstr "V_ložiť"
 
-#: src/gtkui/menus.c:217
-#, fuzzy
+#: src/gtkui/menus.c:219
 msgid "Select _All"
-msgstr "Vybrať všetko"
+msgstr "Ozn_ačiť všetko"
 
-#: src/gtkui/menus.c:222
-#, fuzzy
+#: src/gtkui/menus.c:224
 msgid "_Rename"
-msgstr "Názov súboru"
+msgstr "_Premenovať"
 
-#: src/gtkui/ui_gtk.c:75
+#: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
-msgstr "GTK rozhranie"
+msgstr "Rozhranie GTK"
 
-#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#: src/gtkui/ui_gtk.c:156 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
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "Napĺňanie vyrovnávajúcej pamäte ..."
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr "Chyba"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Zatvoriť"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.c:106
-#, fuzzy, c-format
+#: src/gtkui/ui_statusbar.c:109
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d kanálov"
-msgstr[1] "%d kanálov"
-msgstr[2] "%d kanálov"
+msgstr[1] "%d kanál"
+msgstr[2] "%d kanály"
 
-#: src/gtkui/ui_statusbar.c:121
-#, fuzzy, c-format
+#: src/gtkui/ui_statusbar.c:124
+#, c-format
 msgid "%d kbps"
-msgstr "kb/s"
+msgstr "%d kbps"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
@@ -1794,7 +1827,7 @@
 msgid "Volume Down"
 msgstr "Stíšiť"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
 msgstr "Prejsť na súbor"
 
@@ -1807,14 +1840,12 @@
 msgstr "Zobraziť OSD"
 
 #: src/hotkey/gui.c:84
-#, fuzzy
 msgid "Toggle Repeat"
-msgstr "Opakovať"
+msgstr "Prepnúť opakovanie"
 
 #: src/hotkey/gui.c:85
-#, fuzzy
 msgid "Toggle Shuffle"
-msgstr "Náhodné poradie"
+msgstr "Prepnúť náhodné prehrávanie"
 
 #: src/hotkey/gui.c:95
 msgid "(none)"
@@ -1822,14 +1853,10 @@
 
 #: src/hotkey/gui.c:232
 msgid ""
-"It is not recommended to bind the primary mouse buttons without "
-"modificators.\n"
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr ""
-"Priradenie primárneho tlačidla myši bez modifikátoru nie je odporúčané.\n"
-"\n"
-"Chcete pokračovať?"
+msgstr "Priradenie primárneho tlačidla myši bez modifikátoru nie je odporúčané.\n\nChcete pokračovať?"
 
 #: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
@@ -1843,9 +1870,7 @@
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr ""
-"V textovom poli stlačte kombináciu klávesov.\n"
-"Môžete priradiť aj tlačítka na myši."
+msgstr "V textovom poli stlačte kombináciu klávesov.\nMôžete priradiť aj tlačítka na myši."
 
 #: src/hotkey/gui.c:405
 msgid "Hotkeys:"
@@ -1877,46 +1902,33 @@
 "\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
-msgstr ""
-"Modul Globálne klávesové skratky\n"
-"Ovládajte prehrávač pomocou globálnych klávesových skratiek,\n"
-"alebo pomocou multimediálnych klávesov.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-"Prispievatelia:\n"
-"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
-"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
-"\t\t\tBryn Davies <curious@ihug.com.au>\n"
-"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
-"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
-"\n"
+msgstr "Modul Globálne klávesové skratky\nOvládajte prehrávač pomocou globálnych klávesových skratiek,\nalebo pomocou multimediálnych klávesov.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nPrispievatelia:\nCopyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n\t\t\tBryn Davies <curious@ihug.com.au>\n\t\t\tJonathan A. Davis <davis@jdhouse.org>\n\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n\n"
 
-#: src/jack/configure.c:71
+#: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
 msgstr "Pripojiť sa na všetky dostupné porty"
 
-#: src/jack/configure.c:78
+#: src/jack/configure.c:73
 msgid "Connect only the output ports"
 msgstr "Pripojiť sa len na výstupné porty"
 
-#: src/jack/configure.c:85
+#: src/jack/configure.c:80
 msgid "Connect to no ports"
 msgstr "Nepripájať sa na žiadne porty"
 
-#: src/jack/configure.c:103
+#: src/jack/configure.c:98
 msgid "jack Plugin configuration"
 msgstr "Nastavenie modulu jack"
 
-#: src/jack/configure.c:121
+#: src/jack/configure.c:116
 msgid "Connection mode:"
 msgstr "Režim pripojenia:"
 
-#: src/jack/configure.c:133
+#: src/jack/configure.c:128
 msgid "Enable debug printing"
 msgstr "Povoliť ladiace výpisy"
 
-#: src/jack/jack.c:438
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1925,93 +1937,132 @@
 "\n"
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
-msgstr ""
-"Ovládač jack pre XMMS 0.17\n"
-"\n"
-"xmms-jack.sf.net\n"
-"Chris Morgan<cmorgan@alum.wpi.edu>\n"
-"\n"
-"Pre Audacious upravil\n"
-"Giacomo Lozito z develia.org"
+msgstr "Ovládač jack pre XMMS 0.17\n\nxmms-jack.sf.net\nChris Morgan<cmorgan@alum.wpi.edu>\n\nPre Audacious upravil\nGiacomo Lozito z develia.org"
 
-#: src/jack/jack.c:443
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
 msgstr "O výstupnom module JACK 0.17"
 
-#: src/lyricwiki/lyricwiki.c:226
+#: src/ladspa/plugin.c:415
+msgid "About LADSPA Host"
+msgstr "O hostiteľovi LADSPA"
+
+#: src/ladspa/plugin.c:516
+#, c-format
+msgid "%s Settings"
+msgstr "Nastavenia %s"
+
+#: src/ladspa/plugin.c:584
+msgid "LADSPA Host Settings"
+msgstr "Nastavenia hostiteľa LADSPA"
+
+#: src/ladspa/plugin.c:593
+msgid "Module paths:"
+msgstr "Cesty modulu:"
+
+#: src/ladspa/plugin.c:598
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr " Oddeliť viac ciest s dvojbodkou.\nTieto cesty sú vyhľadávané v rátane do LADSPA_PATH.\nPo pridaní novej cesty, stlačte Enter pre vyhľadanie nových modulov. "
+
+#: src/ladspa/plugin.c:614
+msgid "Available plugins:"
+msgstr "Dostupné moduly:"
+
+#: src/ladspa/plugin.c:626
+msgid "Enable"
+msgstr "Povoliť"
+
+#: src/ladspa/plugin.c:632
+msgid "Enabled plugins:"
+msgstr "Povolené moduly:"
+
+#: src/ladspa/plugin.c:647
+msgid "Settings"
+msgstr "Nastavenie"
+
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
-msgstr ""
+msgstr "\nVyhľadáva sa text skladby..."
 
-#: src/lyricwiki/lyricwiki.c:249
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
-msgstr ""
+msgstr "\nPripájanie na lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:337
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
-msgstr ""
-"\n"
-"Žiadne texty neboli nájdené."
+msgstr "\nŽiadne texty neboli nájdené."
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr "O module Metronóm"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr ""
-"Generátor taktu od Martina Straussa <mys@faveve.uni-stuttgart.de>\n"
-"\n"
-"Pre použitie pridajte URL: tact://úderov*dôb/dĺžka\n"
-"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"
+msgstr "Generátor taktu od Martina Straussa <mys@faveve.uni-stuttgart.de>\n\nPre použitie pridajte URL: tact://úderov*dôb/dĺžka\nnapr. tact://77 pre 77 úderov za minútu\nalebo tact://60*3/4 pre 60 úderov za minútu v 3/4 takte"
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generátor taktu: %d bpm"
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generátor taktu: %d bpm %d/%d"
 
-#: src/mpg123/mpg123.c:183
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "O zmiešavači kanálov"
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "Nastavenie zniešavača kanálov"
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "Výstupné kanály:"
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "Zmeny sa prejavia pri prepnutí na ďalšiu skladbu."
+
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
 msgstr "Priestorový zvuk"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
 msgstr "Prebieha nahrávanie…"
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
-msgstr ""
+msgstr "Nahrať do zariadenia MTP"
 
-#: src/mtp_up/mtp.c:311
-#, fuzzy
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
-msgstr "Odpojiť zariadenie"
+msgstr "Odpojiť zariadenie MTP"
 
-#: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
-msgstr "Zastaviť"
+msgstr "Zastavené"
 
-#: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
-msgstr "Audacious - upozornenie o viditeľnosti"
+msgstr "Audacious teraz neprehráva."
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -2021,273 +2072,157 @@
 msgid ""
 " by Christian Birchinger <joker@netswarm.net>\n"
 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
-msgstr ""
-" napísal Christian Birchinger <joker@netswarm.net>\n"
-"založené na module pre XMMS, autorom ktorého je Håvard Kvål <havardk@xmms."
-"org>"
+msgstr " napísal Christian Birchinger <joker@netswarm.net>\nzaložené na module pre XMMS, autorom ktorého je Håvard Kvål <havardk@xmms.org>"
 
 #: src/null/null.c:68
 msgid "About Null Output"
 msgstr "O slepom výstupnom module"
 
-#: src/null/null.c:94
+#: src/null/null.c:89
 msgid "Null output preferences"
 msgstr "Predvoľby slepého výstupu"
 
-#: src/null/null.c:105
+#: src/null/null.c:100
 msgid "Run in real time"
 msgstr "Bežať v reálnom čase"
 
-#: src/oss4/configure.c:89
+#: src/oss4/configure.c:81
 msgid "1. Default device"
 msgstr "1. Štandardné zariadenie"
 
-#: src/oss4/configure.c:151
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
 msgstr "Predvoľby výstupného modulu OSS4"
 
-#: src/oss4/configure.c:163 src/OSS/configure.c:203
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "Zvukové zariadenie:"
 
-#: src/oss4/configure.c:189 src/OSS/configure.c:226 src/OSS/configure.c:269
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "Použiť iné zariadenie:"
 
-#: src/oss4/configure.c:202
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
 msgstr "Medi reláciami uložiť hlasitosť"
 
-#: src/oss4/configure.c:206
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
 msgstr "Povoliť konverziu formátu prostredníctvom OSS."
 
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Povoliť exkluzívny režim pre predchádzanie virtuálnemu zmiešavaniu."
+
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "O module OSS4"
 
-#: src/oss4/plugin.c:52
-msgid ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"This program is free software: you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation, either version 3 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-"Výstupný modul OSS4 pre Audacious\n"
-"Coyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"Chcel by som poďakovať ľudom na #audacious, špeciálne Tony Vroonovi a "
-"Johnovi Lingrenovi a samozrejme autorom predchádzajúceho OSS modulu.\n"
-"\n"
-"Tento program je slobodný softvér. Môžete ho šíriť a/alebo upravovať podľa "
-"ustanovení GNU GPL, vydávanej nadáciou Free Software Foundation buď vo "
-"verzii 3 tejto licencie, alebo (podľa vášho uváženia) v ľubovoľnej novšej "
-"verzii.\n"
-"\n"
-"Tento program je rozširovaný v nádeji, že bude užitočný, ale BEZ AKEJKOĽVEK "
-"ZÁRUKY. Neposkytujú sa ani odvodené záruky PREDAJNOSTI alebo VHODNOSTI PRE "
-"URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte v GNU GPL.\n"
-"\n"
-"Kópiu GNU GPL ste mali dostať spolu s týmto programom. Ak sa tak nestalo, "
-"požiadajte o ňu Free Software Foundation, Inc., 51 Franklin Street, Fifth "
-"Floor, Boston, MA 02110-1301, USA.\n"
-
-#: src/oss4/utils.c:204
+#: src/oss4/utils.c:211
 msgid "OSS4 error"
 msgstr "Chyba OSS4"
 
-#: src/OSS/configure.c:146
+#: src/OSS/configure.c:137
 #, c-format
 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
+#: src/OSS/configure.c:178
 msgid "OSS Driver configuration"
 msgstr "Nastavenie ovládača OSS"
 
-#: src/OSS/configure.c:290
+#: src/OSS/configure.c:281
 msgid "Devices"
 msgstr "Zariadenia"
 
-#: src/OSS/configure.c:292
+#: src/OSS/configure.c:283
 msgid "Buffering:"
 msgstr "Vyrovnávanie:"
 
-#: src/OSS/configure.c:305
+#: src/OSS/configure.c:296
 msgid "Pre-buffer (percent):"
 msgstr "Dopredu načítať (v percentách):"
 
-#: src/OSS/configure.c:316
+#: src/OSS/configure.c:307
 msgid "Buffering"
 msgstr "Vyrovnávanie"
 
-#: src/OSS/configure.c:317
+#: src/OSS/configure.c:308
 msgid "Mixer Settings:"
 msgstr "Nastavenia mixéra:"
 
-#: src/OSS/configure.c:323
+#: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
 msgstr "Hlasitosť je ovládaná kanálom Master a nie PCM"
 
-#: src/OSS/configure.c:329
+#: src/OSS/configure.c:320
 msgid "Mixer"
 msgstr "Mixér"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr "O module OSS"
 
-#: src/OSS/OSS.c:41
-msgid ""
-"Audacious OSS Driver\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"OSS ovládač pre Audacious\n"
-"\n"
-"Tento program je slobodný softvér. Môžete ho šíriť a/alebo upravovať podľa "
-"ustanovení GNU GPL, vydávanej nadáciou Free Software Foundation; buď vo "
-"verzii 2 tejto licencie, alebo (podľa vášho uváženia) v ľubovoľnej novšej "
-"verzii.\n"
-"\n"
-"Tento program je rozširovaný v nádeji, že bude užitočný, ale BEZ AKEJKOĽVEK "
-"ZÁRUKY; neposkytujú sa ani odvodené záruky PREDAJNOSTI, alebo VHODNOSTI PRE "
-"URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte v GNU GPL.\n"
-"\n"
-"Kópiu GNU GPL by ste mali dostať spolu s týmto programom. Ak sa tak nestalo, "
-"požiadajte o ňu Free Software Foundation, Inc., 51 Franklin Street, Fifth "
-"Floor, Boston, MA 02110-1301, USA."
-
-#: src/pulse_audio/pulse_audio.c:687
+#: src/pulse_audio/pulse_audio.c:669
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "O výstupnom module PulseAudio pre Audacious"
 
-#: src/pulse_audio/pulse_audio.c:688
-msgid ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Výstupný modul PulseAudio pre Audacious\n"
-"\n"
-"Tento program je slobodný softvér. Môžete ho šíriť a/alebo upravovať podľa "
-"ustanovení GNU GPL, vydávanej nadáciou Free Software Foundation buď vo "
-"verzii 2, tejto licencie, alebo (podľa vášho uváženia) v ľubovoľnej novšej "
-"verzii.\n"
-"\n"
-"Tento program je rozširovaný v nádeji, že bude užitočný, ale BEZ AKEJKOĽVEK "
-"ZÁRUKY. Neposkytujú sa ani odvodené záruky PREDAJNOSTI alebo VHODNOSTI PRE "
-"URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte v GNU GPL.\n"
-"\n"
-"Kópiu GNU GPL ste mali dostať spolu s týmto programom. Ak sa tak nestalo, "
-"požiadajte o ňu Free Software Foundation, Inc., 51 Franklin Street, Fifth "
-"Floor, Boston, MA 02110-1301, USA."
-
-#: src/resample/plugin.c:91
+#: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
 msgstr "O module Konvertor vzorkovacej frekvencie"
 
-#: src/resample/plugin.c:146
+#: src/resample/plugin.c:144
 msgid "Sample Rate Converter Preferences"
 msgstr "Nastavenia konverzie vzorkovacej frekvencie"
 
-#: src/resample/plugin.c:158
+#: src/resample/plugin.c:156
 msgid "Rate mappings:"
 msgstr "Priradenie frekvencií:"
 
-#: src/resample/plugin.c:181
+#: src/resample/plugin.c:179
 msgid "All others:"
 msgstr "Všetky ostatné:"
 
-#: src/resample/plugin.c:193
+#: src/resample/plugin.c:191
 msgid "Method:"
 msgstr "Metóda:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#: src/scrobbler/configure.c:150
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "Služby"
 
-#: src/scrobbler/configure.c:172
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "Prístupové meno:"
 
-#: src/scrobbler/configure.c:178
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr "URL Scrobblera:"
 
-#: src/scrobbler/configure.c:218
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:262
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:213
+#: src/scrobbler/plugin.c:194
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
-"com>\n"
-msgstr ""
-"Modul AudioScrobbler pre Audacious\n"
-"\n"
-"Pôvodne vytvoril Audun Hove <audun@nlc.no> a Pipian <pipian@pipian.com>\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr "Modul AudioScrobbler pre Audacious\n\nPôvodne vytvoril Audun Hove <audun@nlc.no> a Pipian <pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:215
+#: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
 msgstr "O module Scrobbler"
 
@@ -2299,652 +2234,39 @@
 msgid "SDL error"
 msgstr "Chyba SDL"
 
-#: src/sid/xs_about.c:84
-#, c-format
-msgid "About %s"
-msgstr "O %s"
-
-#: 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"
-
-#: src/sid/xs_fileinfo.c:164
-#, c-format
-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"
-
-#: src/sid/xs_interface.c:270
-msgid "8-bit"
-msgstr "8 bitov"
-
-#: src/sid/xs_interface.c:277
-msgid "16-bit"
-msgstr "16 bitov"
-
-#: src/sid/xs_interface.c:284
-msgid "Resolution:"
-msgstr "Rozlíšenie:"
-
-#: src/sid/xs_interface.c:315
-msgid "Autopanning"
-msgstr "Automatický priestorový posun"
-
-#: src/sid/xs_interface.c:322
-msgid "Channels:"
-msgstr "Počet kanálov:"
-
-#: src/sid/xs_interface.c:366
-msgid "Samplerate:"
-msgstr "Vzorkovacia frekvencia:"
-
-#: src/sid/xs_interface.c:383
-msgid "Use oversampling"
-msgstr "Prevzorkovať"
-
-#: src/sid/xs_interface.c:394
-msgid "Factor:"
-msgstr "Činiteľ:"
-
-#: src/sid/xs_interface.c:406
-msgid "Large factors require more CPU-power"
-msgstr "Vysoký činiteľ vyžaduje väčší výkon procesoru"
-
-#: src/sid/xs_interface.c:412
-msgid "Oversampling:"
-msgstr "Prevzorkovanie:"
-
-#: src/sid/xs_interface.c:417
-msgid "Audio"
-msgstr "Zvuk"
-
-#: src/sid/xs_interface.c:445
-msgid "Force speed"
-msgstr "Vnútiť rýchlosť"
-
-#: src/sid/xs_interface.c:449
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"clock speed/frequency. Otherwise the speed is determined from played file "
-"itself."
-msgstr ""
-"Ak je povolené, bude emulačnému jadru vnútená zvolená hodinová frekvencia. "
-"Inak bude rýchlosť určená zo samotného prehrávaného súboru."
-
-#: src/sid/xs_interface.c:451
-msgid "PAL (50 Hz)"
-msgstr "PAL (50Hz)"
-
-#: src/sid/xs_interface.c:455
-msgid ""
-"PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
-"Most of SID-tunes have been made for PAL computers."
-msgstr ""
-"PAL je európskeho norma televízneho vysielania, ktorá používa 50Hz "
-"vertikálnu obnovovaciu frekvenciu. Väčšina SID skladieb bola vytvorená pre "
-"počítače s PAL výstupom."
-
-#: src/sid/xs_interface.c:459
-msgid "NTSC (60 Hz)"
-msgstr "NTSC (60Hz)"
-
-#: src/sid/xs_interface.c:463
-msgid ""
-"NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
-"that differ from PAL). It is mainly used in United States, Japan and certain "
-"other countries."
-msgstr ""
-"NTSC je norma televízneho vysielanie s 60Hz vertikálnou obnovovacou "
-"frekvenciou (a s ďalšími odlišnosťami od normy PAL). Používa sa hlavne v "
-"Spojených štátoch, Japonsku a v niekoľkých ďalších krajinách."
-
-#: src/sid/xs_interface.c:467
-msgid "Clock speed:"
-msgstr "Hodinová frekvencia:"
-
-#: src/sid/xs_interface.c:484
-msgid "Force model"
-msgstr "Vnútiť model"
-
-#: src/sid/xs_interface.c:488
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"SID-chip model. Otherwise the preferred SID model is determined from the "
-"file (if PSIDv2NG type) or if not available, this setting is used."
-msgstr ""
-"Ak je povolené, emulačnému jadru bude vnútený typ SID čipu. V opačnom "
-"prípade bude typ SID čipu určený zo súboru (ak je typu PSIDv2NG), alebo, ak "
-"nie je informácia dostupná, použije sa vybraný typ."
-
-#: src/sid/xs_interface.c:490
-msgid "MOS 6581"
-msgstr "MOS 6581"
-
-#: src/sid/xs_interface.c:494
-msgid ""
-"MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
-"in few ways, having much fuller filter (which, due to design error, is never "
-"same between two different SID-chips) and has the \"volume adjustment bug\", "
-"which enables playing of digital samples."
-msgstr ""
-"MOS/CSG 6581 je skoršia hlavná verzia SID čipu. V porovnaní s 8580 má "
-"niekoľko odlišností. Má oveľa plnší filter (ktorý, kvôli chybe v návrhu, nie "
-"je nikdy rovnaký medzi dvomi rôznymi SID čipmi) a má „chybu pri regulovaní "
-"hlasitosti“, ktorá umožňuje prehrávanie digitálnych vzoriek."
-
-#: src/sid/xs_interface.c:498
-msgid "MOS 8580"
-msgstr "MOS 8580"
-
-#: src/sid/xs_interface.c:505
-msgid "SID model:"
-msgstr "Typ SID čipu:"
-
-#: src/sid/xs_interface.c:522
-msgid "SIDPlay 1 (frame-based)"
-msgstr "SIDPlay 1 (založené na snímkoch)"
-
-#: src/sid/xs_interface.c:526
-msgid ""
-"Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-"cases, though."
-msgstr ""
-"Pre emuláciu sa použije knižnica libSIDPlay 1.x. Je rýchlejšia, ale nie je "
-"tak presná. Napriek tomu je vo väčšine prípadov dostačujúca."
-
-#: src/sid/xs_interface.c:530
-msgid "SIDPlay 2 (cycle-based)"
-msgstr "SIDPlay 2 (založené na cykloch)"
-
-#: src/sid/xs_interface.c:534
-msgid ""
-"Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
-"emulation."
-msgstr ""
-"Pre emuláciu sa použije knižnica libSIDPlay 2.x. Kvôli presnejšej emulácii "
-"vyžaduje väčší výkon procesoru."
-
-#: src/sid/xs_interface.c:538
-msgid "Emulation library selection:"
-msgstr "Výber emulačnej knižnice:"
-
-#: src/sid/xs_interface.c:555
-msgid "Real C64 (SIDPlay 2 only)"
-msgstr "Skutočný C64 (iba pre SIDPlay 2)"
-
-#: src/sid/xs_interface.c:562
-msgid "Bank switching"
-msgstr "Prepínanie bánk"
-
-#: src/sid/xs_interface.c:569
-msgid "Transparent ROM"
-msgstr "Transparentná ROM"
-
-#: src/sid/xs_interface.c:576
-msgid "PlaySID environment"
-msgstr "Prostredie PlaySID"
-
-#: src/sid/xs_interface.c:583
-msgid "Memory mode:"
-msgstr "Režim pamäte:"
-
-#: src/sid/xs_interface.c:588
-msgid "Emu#1"
-msgstr "Emu#1"
-
-#: src/sid/xs_interface.c:611
-msgid "Optimization mode (faster, inaccurate)"
-msgstr "Optimalizovaný mód (rýchlejší, nepresný)"
-
-#: src/sid/xs_interface.c:615
-msgid ""
-"This setting can be used to enable libSIDPlay2's \"optimization mode\", "
-"which in downgrades the emulation from cycle-exact to something similar to "
-"frame-exact. The result is lower CPU usage, but worse accuracy."
-msgstr ""
-"Táto voľba môže byť použitá pre povolenie „optimalizovaného módu“, v ktorom "
-"sa znižuje presnosť emulácie z presnosti na cyklus k presnosti na snímok. "
-"Výsledkom je nižšie zaťaženie procesoru, ale aj menšia presnosť."
-
-#: src/sid/xs_interface.c:617
-msgid "reSID-emulation"
-msgstr "Emulácia reSID"
-
-#: src/sid/xs_interface.c:621
-msgid ""
-"reSID is the software SID-chip simulator based on SID reverse-engineering, "
-"created by Dag Lem. It is probably the closest thing to real SID available "
-"as software-only emulation."
-msgstr ""
-"reSID je softvérový simulátor SID čipu založený na spätnom inžinierstve SID "
-"čipu, ktorého autorom je Dag Lem. Ide pravdepodobne o najvernejšiu "
-"softvérovú emuláciu SID čipu."
-
-#: src/sid/xs_interface.c:625
-msgid "HardSID"
-msgstr "HardSID"
-
-#: src/sid/xs_interface.c:629
-msgid ""
-"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-"real SID-chip. Software can be used to control the HardSID and combined with "
-"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to "
-"achieve \"near 100%\" similarity to real C64. For more information, see "
-"http://www.hardsid.com/"
-msgstr ""
-"HardSID je EISA/PCI karta pre PC kompatibilné počítače, ktorá môže byť "
-"vybavená skutočným SID čipom. Softvér slúži na ovládanie HardSID a v "
-"kombinácii so softvérovou emuláciou zbytku C64 pomocou libSIDPlay2 sa dá "
-"dosiahnuť „takmer 100%“ zhoda so skutočným C64. Viac informácií nájdete na "
-"http://www.hardsid.com/"
-
-#: src/sid/xs_interface.c:633
-msgid "SIDPlay 2 options:"
-msgstr "Možnosti SIDPlay2:"
-
-#: src/sid/xs_interface.c:650
-msgid "Fast (nearest neighbour)"
-msgstr "Rýchla (najbližšia susedná vzorka)"
-
-#: src/sid/xs_interface.c:654
-msgid ""
-"Fastest and also worst sounding sampling method, simply picks nearest "
-"neighbouring sample."
-msgstr ""
-"Najrýchlejšia a tiež najhoršie znejúca vzorkovacia metóda, jednoducho vyberá "
-"najbližšiu susednú vzorku."
-
-#: src/sid/xs_interface.c:658
-msgid "Linear interpolation"
-msgstr "Lineárna interpolácia"
-
-#: src/sid/xs_interface.c:662
-msgid ""
-"Uses linear interpolation between samples, yielding higher audio quality "
-"with less sampling noise."
-msgstr ""
-"Používa lineárnu interpoláciu medzi vzorkami, čím dosahuje vyššiu kvalitu "
-"zvuku s menšími ruchmi."
-
-#: src/sid/xs_interface.c:673
-msgid "Resampling (FIR)"
-msgstr "Prevzorkovanie (FIR)"
-
-#: src/sid/xs_interface.c:680
-msgid "reSID sampling options:"
-msgstr "Možnosti vzorkovania reSID:"
-
-#: src/sid/xs_interface.c:685
-msgid "Emu#2"
-msgstr "Emu#2"
-
-#: src/sid/xs_interface.c:697
-msgid "Emulate filters"
-msgstr "Emulovať filtre"
-
-#: src/sid/xs_interface.c:701
-msgid ""
-"This option enables emulation of SID filter. The filter is an essential part "
-"of SID's sound capacity, but accurate emulation of it may require quite much "
-"CPU power. However, if filter emulation is disabled, tunes won't sound "
-"authentic at all if they utilize the filter."
-msgstr ""
-"Táto možnosť povoľuje emuláciu SID filtra. Filter je dôležitou súčasťou "
-"zvukovej výbavy SID čipu, ale jeho presná emulácia môže vyžadovať dosť veľký "
-"výkon procesoru. Ak však tento filter vypnete, skladby, ktoré ho používajú, "
-"nebudú znieť verne."
-
-#: src/sid/xs_interface.c:726
-msgid "FS"
-msgstr "FS"
-
-#: src/sid/xs_interface.c:743
-msgid "FM"
-msgstr "FM"
-
-#: src/sid/xs_interface.c:760
-msgid "FT"
-msgstr "FT"
-
-#: src/sid/xs_interface.c:771
-msgid "Reset values"
-msgstr "Obnoviť hodnoty"
-
-#: src/sid/xs_interface.c:776
-msgid "SIDPlay1"
-msgstr "SIDPlay1"
-
-#: src/sid/xs_interface.c:817
-msgid "Export"
-msgstr "Exportovať"
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Žáner"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Knižnica"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Vytvoriť zoznam skladieb"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Pridať do zoznamu skladieb"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Vyhľadať knižnicu"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "Pre import hudobnej knižnice do Audacious, vyberte priečinok a potom kliknite na ikonu \"obnoviť\"."
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Čakajte prosím ..."
 
-#: src/sid/xs_interface.c:825
-msgid "Use"
-msgstr "Použiť"
-
-#: 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:446
-msgid "Import"
-msgstr "Importovať"
-
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
-msgid "Delete"
-msgstr "Vymazať"
-
-#: src/sid/xs_interface.c:863
-msgid "Filter curve:"
-msgstr "Krivka filtra:"
-
-#: src/sid/xs_interface.c:868
-msgid "SIDPlay2"
-msgstr "SIDPlay2"
-
-#: src/sid/xs_interface.c:874
-msgid "Filters"
-msgstr "Filtre"
-
-#: src/sid/xs_interface.c:897
-msgid "Play at least for specified time"
-msgstr "Prehrávať aspoň počas určenej doby"
-
-#: src/sid/xs_interface.c:901
-msgid ""
-"If enabled, the tune is played at least for the specified time, adding "
-"silence to the end if necessary."
-msgstr ""
-"Ak je povolené, skladba je prehrávaná aspoň počas určenej doby. Ak je to "
-"potrebné, bude na koniec skladby pridané ticho."
-
-#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
-#: src/sid/xs_interface.c:1142
-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:"
-
-#: src/sid/xs_interface.c:945
-msgid "Play for specified time maximum"
-msgstr "Prehrávať maximálne počas určenej doby"
-
-#: src/sid/xs_interface.c:949
-msgid ""
-"If enabled, tune is played until specified duration is reached (aka maximum "
-"playtime)."
-msgstr ""
-"Ak je povolené, skladba bude prehrávaná najdlhšie počas určenej doby (tz. "
-"počas maximálnej dĺžky prehrávania)."
-
-#: src/sid/xs_interface.c:951
-msgid "Only when song length is unknown"
-msgstr "Len ak je dĺžka skladby neznáma"
-
-#: src/sid/xs_interface.c:955
-msgid ""
-"If enabled, the maximum playtime is applied only if song/tune length is not "
-"known."
-msgstr ""
-"Ak je povolené, maximálna doba prehrávania sa použije iba ak nie je dĺžka "
-"skladby známa."
-
-#: src/sid/xs_interface.c:982
-msgid "Maximum playtime:"
-msgstr "Maximálna doba prehrávania:"
-
-#: src/sid/xs_interface.c:999
-msgid "Use XSIDPLAY-compatible database"
-msgstr "Použiť databázu kompatibilnú s XSIDPLAY"
-
-#: src/sid/xs_interface.c:1003
-msgid ""
-"This option enables using of XSIDPLAY compatible song length database. "
-"(Refer to Audacious-SID documentation for more information)"
-msgstr ""
-"Táto voľba poloví používanie XSIDPLAY kompatibilnej databázy s dĺžkami "
-"skladieb. (Podrobnosti nájdete v dokumentácii k modulu Audacious-SID)"
-
-#: src/sid/xs_interface.c:1010
-msgid "DB-file:"
-msgstr "Súbor s databázou:"
-
-#: src/sid/xs_interface.c:1020
-msgid "Database path and filename"
-msgstr "Celá cesta k súboru s databázou"
-
-#: src/sid/xs_interface.c:1027
-msgid "Browse for song length-database file"
-msgstr "Vyhľadať súbor s databázou dĺžok skladieb"
-
-#: src/sid/xs_interface.c:1049
-msgid "Song length database:"
-msgstr "Databáza s dĺžkou skladby:"
-
-#: src/sid/xs_interface.c:1054
-msgid "Songlength"
-msgstr "Dĺžka skladby"
-
-#: src/sid/xs_interface.c:1072
-msgid "Override generic Tuplez format string"
-msgstr "Nahradiť všeobecný formátovací reťazec Tuplez"
-
-#: src/sid/xs_interface.c:1076
-msgid ""
-"By enabling this option you can specify a custom Tuplez formatting string "
-"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
-"below."
-msgstr ""
-"Po povolení tejto voľby môžete určiť používateľsky formátovací reťazec "
-"Tuplez pre súbory SID. Tuplez značky špecifické pre modul SID sú popísané "
-"nižšie."
-
-#: src/sid/xs_interface.c:1087
-msgid "Tuplez format string for SID-files"
-msgstr "Formátovací reťazec Tuplez pre súbory SID"
-
-#: src/sid/xs_interface.c:1090
-msgid ""
-"SID-specific Tuplez fields:\n"
-"\n"
-"sid-format\t\t- Specific fileformat\n"
-"sid-model\t\t- 6581 or 8580\n"
-"sid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n"
-"\n"
-"Other \"special\" fields set:\n"
-"\n"
-"subsong-num, subsong-id"
-msgstr ""
-"Tuplez položky špecifické pre SID:\n"
-"\n"
-"sid-format\t\t- Presný formát súboru\n"
-"sid-model\t\t- 6581 alebo 8580\n"
-"sid-speed\t\t- Časovanie alebo rýchlosť: PAL/NTSC atď.\n"
-"\n"
-"Ostatné „špeciálne“ sady položiek:\n"
-"\n"
-"subsong-num, subsong-id"
-
-#: src/sid/xs_interface.c:1098
-msgid "Song title format:"
-msgstr "Formát názvu skladby:"
-
-#: src/sid/xs_interface.c:1125
-msgid "Add sub-tunes to playlist"
-msgstr "Pridať podskladby do zoznamu skladieb"
-
-#: src/sid/xs_interface.c:1129
-msgid ""
-"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
-"only the default sub-tune will be added."
-msgstr ""
-"Ak je povolené, do zoznamu skladieb budú pridané podskladby každého súboru. "
-"Ak je zakázané, do zoznamu skladieb bude pridaná iba predvolená podskladba."
-
-#: src/sid/xs_interface.c:1131
-msgid "Only tunes with specified minimum duration"
-msgstr "Iba skladby dlhšie ako zadaná dĺžka prehrávania"
-
-#: src/sid/xs_interface.c:1135
-msgid "Only add sub-tunes that have a duration of at least specified time."
-msgstr "Pridajú sa iba podskladby, ktorých dĺžka je aspoň rovná zadanej dĺžke."
-
-#: src/sid/xs_interface.c:1162
-msgid "Sub-tune handling:"
-msgstr "Narábanie s podskladbami:"
-
-#: src/sid/xs_interface.c:1179
-msgid "Use STIL database"
-msgstr "Používať databázu STIL"
-
-#: src/sid/xs_interface.c:1183
-msgid ""
-"If this option is enabled (and the database & HVSC settings below are "
-"correctly set), Audacious-SID will use and display additional information "
-"from STIL database when HVSC SIDs are played."
-msgstr ""
-"Ak je táto voľba povolená (a sú správne nastavené databáza a HVSC "
-"nastavenia), Audacious-SID pri prehrávaní súborov HVSC SID použije a zobrazí "
-"doplňujúce informácie z databázy STIL."
-
-#: src/sid/xs_interface.c:1190
-msgid "STIL file:"
-msgstr "Súbor STIL:"
-
-#: src/sid/xs_interface.c:1206
-msgid ""
-"Path and filename of STIL database file (STIL.txt), usually found from "
-"HVSC's DOCUMENTS-subdirectory."
-msgstr ""
-"Cesta a názov súboru STIL databázy (STIL.txt). Zvyčajne sa nachádza v "
-"podadresári DOCUMENTS od HVSC."
-
-#: src/sid/xs_interface.c:1219
-msgid "Browse for STIL-database file"
-msgstr "Vybrať cestu k súboru STIL databázy"
-
-#: src/sid/xs_interface.c:1246
-msgid "HVSC path:"
-msgstr "Cesta k HVSC:"
-
-#: src/sid/xs_interface.c:1262
-msgid ""
-"Path to base-directory of your High Voltage SID Collection (HVSC), for "
-"example /media/C64Music/"
-msgstr ""
-"Cesta ku koreňovému adresáru vašej zbierky High Voltage SID (HVSC) (napr. /"
-"media/C64Music/)"
-
-#: src/sid/xs_interface.c:1275
-msgid "Browse for HVSC path"
-msgstr "Vybrať cestu k HVSC"
-
-#: src/sid/xs_interface.c:1297
-msgid "SID Tune Information List (STIL) database:"
-msgstr "Databáza SID Tune Information List (STIL):"
-
-#: src/sid/xs_interface.c:1321
-msgid "Cancel any changes"
-msgstr "Zrušiť všetky zmeny"
-
-#: src/sid/xs_interface.c:1328
-msgid "Accept and update changes"
-msgstr "Prijať a uložiť zmeny"
-
-#: src/sid/xs_interface.c:1628
-msgid "Audacious-SID Fileinfo"
-msgstr "Audacious - Informácie o súbore SID"
-
-#: src/sid/xs_interface.c:1649
-msgid "Filename:"
-msgstr "Názov súboru:"
-
-#: src/sid/xs_interface.c:1657
-msgid "Songname:"
-msgstr "Názov skladby:"
-
-#: src/sid/xs_interface.c:1665
-msgid "Composer:"
-msgstr "Skladateľ:"
-
-#: src/sid/xs_interface.c:1673
-msgid "Copyright:"
-msgstr "Autorské práva:"
-
-#: src/sid/xs_interface.c:1717
-msgid "Song Information:"
-msgstr "Informácie o skladbe:"
-
-#: src/sid/xs_interface.c:1752
-msgid "Author:"
-msgstr "Autor:"
-
-#: src/sid/xs_interface.c:1786
-msgid "Duration:"
-msgstr "Dĺžka:"
-
-#: src/sid/xs_interface.c:1820
-msgid "Sub-tune Information:"
-msgstr "Informácie o podskladbe:"
-
-#: src/sid/xs_interface.c:1881
-msgid "Select HVSC song length database"
-msgstr "Vybrať databázu dĺžok skladieb od HVSC"
-
-#: src/sid/xs_interface.c:1922
-msgid "Select STIL-database"
-msgstr "Vybrať databázu STIL"
-
-#: src/sid/xs_interface.c:1963
-msgid "Select HVSC location prefix"
-msgstr "Vybrať cestu k HVSC"
-
-#: src/sid/xs_interface.c:2004
-msgid "Select SIDPlay2 filters file for importing"
-msgstr "Vybrať súbor so SIDPlay2 filtrami pre import"
-
-#: src/sid/xs_interface.c:2045
-msgid "Select SIDPlay2 filters file for exporting"
-msgstr "Vybrať súbor s SIDPlay2 filtrami pre export"
-
-#: src/sid/xs_interface.c:2093 src/sid/xs_interface.c:2106
-msgid "Confirm selected action"
-msgstr "Potvrdiť vybranú akciu"
-
-#: src/sid/xs_interface.c:2123
-msgid "Yes"
-msgstr "Áno"
-
-#: src/sid/xs_interface.c:2129
-msgid "No"
-msgstr "Nie"
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Vybrať priečinok"
 
 #: src/skins/plugin.c:167
 msgid "About Skinned GUI"
@@ -2954,46 +2276,43 @@
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
-msgstr ""
-"Copyright (c) 2008 Tomasz Moń <desowin@gmail.com>\n"
-"\n"
+msgstr "Copyright (c) 2008 Tomasz Moń <desowin@gmail.com>\n\n"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:207
 msgid "_Player:"
 msgstr "V _okne prehrávača:"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
 msgstr "Vyberte písmo pre hlavné okno prehrávača:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
 msgstr "V zozname _skladieb:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
 msgstr "Vyberte písmo pre zoznam skladieb:"
 
-#: src/skins/skins_cfg.c:259
+#: src/skins/skins_cfg.c:215
 msgid "_Fonts"
 msgstr "_Písma"
 
-#: src/skins/skins_cfg.c:261
+#: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "Použiť bitmapové písma (podporuje iba ASCII)"
 
-#: src/skins/skins_cfg.c:263
+#: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "Rolovať názov skladby obidvoma smermi"
 
-#: src/skins/skins_cfg.c:346
+#: src/skins/skins_cfg.c:298
 msgid "_Skin"
 msgstr "_Vzhľad"
 
-#: src/skins/skins_cfg.c:393
-#, fuzzy
+#: src/skins/skins_cfg.c:345
 msgid "Interface Preferences"
-msgstr "Predvoľby prelínania"
+msgstr "Predvoľby rozhrania"
 
 #: src/skins/ui_equalizer.c:330
 msgid "Preamp"
@@ -3039,13 +2358,46 @@
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:378
+#: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
 msgstr "Ekvalizér Audacious"
 
-#: src/skins/ui_equalizer.c:884
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
-msgstr "Prednastavenia"
+msgstr "Predvoľby"
+
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Načítať predvoľbu"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Načítať automatickú predvoľbu"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Načítať predvoľbu ekvalizéra"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Uložiť predvoľbu"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Uložiť automatickú predvoľbu"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Uložiť predvoľby ekvaizéra"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Vymazať predvoľbu"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Vymazať automatickú predvoľbu"
 
 #: src/skins/ui_main.c:444
 msgid "kbps"
@@ -3060,9 +2412,9 @@
 msgstr "Priestorový zvuk"
 
 #: src/skins/ui_main.c:807
-#, fuzzy, c-format
+#, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Prejsť na: %d:%-2.2d/%d:%-2.2d (%d%%)"
+msgstr "prejsť na %d:%-2.2d / %d:%-2.2d"
 
 #: src/skins/ui_main.c:828
 #, c-format
@@ -3103,19 +2455,19 @@
 msgid "Visualization Menu"
 msgstr "Ponuka s typom znázornenia"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
 msgstr "Režim jednej skladby."
 
-#: src/skins/ui_main.c:1647
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
 msgstr "Režim zoznamu skladieb."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr "Zastaviť po skončení skladby."
 
-#: src/skins/ui_main.c:1671
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
 msgstr "Nezastaviť po skončení skladby."
 
@@ -3254,7 +2606,7 @@
 
 #: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
-msgstr "Ubehnutý čas"
+msgstr "Odohraný čas"
 
 #: src/skins/ui_manager.c:167
 msgid "Time Remaining"
@@ -3341,471 +2693,445 @@
 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:235
+#: src/skins/ui_manager.c:230
 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:233
+msgid "Playlist Manager"
+msgstr "Správca zoznamu skladieb"
 
-#: src/skins/ui_manager.c:239
-msgid "Opens the playlist manager."
-msgstr "Otvorí správcu zoznamov skladieb."
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Správca fronty"
 
-#: src/skins/ui_manager.c:243
+#: src/skins/ui_manager.c:237
 msgid "View"
 msgstr "Zobrazenie"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:238
 msgid "Interface"
 msgstr "Rozhranie"
 
-#: src/skins/ui_manager.c:245
-#, fuzzy
+#: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
-msgstr "Predvoľby prelínania"
+msgstr "Predvoľby rozhrania ..."
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
 msgstr "Pridať internetovú adresu…"
 
-#: src/skins/ui_manager.c:250
+#: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
 msgstr "Do zoznamu skladieb pridá vzdialenú stopu."
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:247
 msgid "Add Files..."
 msgstr "Pridať súbory…"
 
-#: src/skins/ui_manager.c:254
+#: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
 msgstr "Do zoznamu skladieb pridá súbory."
 
-#: src/skins/ui_manager.c:259
+#: src/skins/ui_manager.c:253
 msgid "Search and Select"
 msgstr "Hľadanie a výber"
 
-#: src/skins/ui_manager.c:260
+#: src/skins/ui_manager.c:254
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "Prehľadá zoznam skladieb a vyberie skladby podľa zadaných kritérií."
 
-#: src/skins/ui_manager.c:263
+#: src/skins/ui_manager.c:257
 msgid "Invert Selection"
 msgstr "Invertovať výber"
 
-#: src/skins/ui_manager.c:264
+#: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
 msgstr "Zamení vybrané a nevybrané položky."
 
-#: src/skins/ui_manager.c:267
+#: src/skins/ui_manager.c:261
 msgid "Select All"
-msgstr "Vybrať všetko"
+msgstr "Označiť všetko"
 
-#: src/skins/ui_manager.c:268
+#: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
 msgstr "Vyberie všetky skladby v zozname."
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:265
 msgid "Select None"
 msgstr "Zrušiť výber"
 
-#: src/skins/ui_manager.c:272
+#: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
 msgstr "Zruší výber skladieb zoznamu."
 
-#: src/skins/ui_manager.c:277
+#: src/skins/ui_manager.c:271
 msgid "Remove All"
 msgstr "Odstrániť všetky"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
 msgstr "Zo zoznamu odstráni všetky skladby."
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:275
 msgid "Clear Queue"
 msgstr "Vyprázdniť front"
 
-#: src/skins/ui_manager.c:282
+#: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
 msgstr "Vyprázdni front spojený s týmto zoznamom skladieb."
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
 msgstr "Odstrániť nedostupné súbory"
 
-#: src/skins/ui_manager.c:286
+#: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
 msgstr "Zo zoznamu skladieb odstráni nedostupné súbory."
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
 msgstr "Odstrániť duplikáty"
 
-#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
 msgid "By Title"
 msgstr "Podľa názvu"
 
-#: src/skins/ui_manager.c:292
+#: src/skins/ui_manager.c:286
 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:295 src/skins/ui_manager.c:335
-#: src/skins/ui_manager.c:365
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
 msgid "By Filename"
 msgstr "Podľa názvu súboru"
 
-#: src/skins/ui_manager.c:296
+#: src/skins/ui_manager.c:290
 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:299 src/skins/ui_manager.c:339
-#: src/skins/ui_manager.c:369
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
 msgstr "Podľa cesty a názvu súboru"
 
-#: src/skins/ui_manager.c:300
+#: src/skins/ui_manager.c:294
 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."
+msgstr "Zo zoznamu skladieb odstráni skladby s rovnakou cestou a názvom súboru."
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
 msgstr "Odstrániť neoznačené"
 
-#: src/skins/ui_manager.c:304
+#: src/skins/ui_manager.c:298
 msgid "Remove unselected entries from the playlist."
 msgstr "Zo zoznamu odstráni neoznačené skladby."
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:301
 msgid "Remove Selected"
 msgstr "Odstrániť označené"
 
-#: src/skins/ui_manager.c:308
+#: src/skins/ui_manager.c:302
 msgid "Remove selected entries from the playlist."
 msgstr "Zo zoznamu odstráni označené skladby."
 
-#: src/skins/ui_manager.c:313
+#: src/skins/ui_manager.c:307
 msgid "Randomize List"
 msgstr "Premiešať poradie"
 
-#: src/skins/ui_manager.c:314
+#: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
 msgstr "Skladby v zozname zoradí náhodne."
 
-#: src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:311
 msgid "Reverse List"
 msgstr "Obrátiť poradie"
 
-#: src/skins/ui_manager.c:318
+#: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
 msgstr "Obráti poradie skladieb v zozname."
 
-#: src/skins/ui_manager.c:321
+#: src/skins/ui_manager.c:315
 msgid "Sort List"
 msgstr "Triediť zoznam"
 
-#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
 msgstr "Zoradí skladby v zozname podľa názvu."
 
-#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
 msgstr "Podľa albumu"
 
-#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
 msgstr "Zoradí skladby v zozname podľa názvu."
 
-#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
 msgstr "Podľa umelca"
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
 msgstr "Zoradí skladby v zozname podľa umelca."
 
-#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
 msgstr "Zoradí skladby v zozname podľa názvu súboru."
 
-#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
 msgstr "Zoradí skladby v zozname podľa celej cesty."
 
-#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
 msgstr "Podľa dátumu"
 
-#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
 msgstr "Zoradí skladby v zozname podľa dátumu poslednej úpravy súboru."
 
-#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
 msgstr "Podľa čísla stopy"
 
-#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
 msgstr "Zoradí skladby v zozname podľa čísla stopy."
 
-#: src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:345
 msgid "Sort Selected"
 msgstr "Triediť výber"
 
-#: src/skins/ui_manager.c:387
+#: src/skins/ui_manager.c:381
 msgid "File"
 msgstr "Súbor"
 
-#: src/skins/ui_manager.c:388
-msgid "Help"
-msgstr "Pomocník"
-
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:384
 msgid "Plugin Services"
 msgstr "Služby modulov"
 
-#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
 msgstr "Zobraziť informácie o skladbe"
 
-#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
 msgstr "Zobrazí informácie o skladbe"
 
-#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
 msgstr "O Audacious"
 
-#: src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:395
 msgid "Play File"
 msgstr "Prehrať súbor"
 
-#: src/skins/ui_manager.c:402
+#: src/skins/ui_manager.c:396
 msgid "Load and play a file"
 msgstr "Načíta a prehrá súbor"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:398
 msgid "Play Location"
 msgstr "Prehrať z adresy"
 
-#: src/skins/ui_manager.c:405
+#: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
 msgstr "Prehrá súbor z vybranej adresy"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:401
 msgid "Plugin services"
 msgstr "Služby modulov"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:403
 msgid "Preferences"
 msgstr "Predvoľby"
 
-#: src/skins/ui_manager.c:410
+#: src/skins/ui_manager.c:404
 msgid "Open preferences window"
 msgstr "Otvorí okno s predvoľbami"
 
-#: src/skins/ui_manager.c:413
+#: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
 msgstr "Ukončí Audacious"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
 msgstr "Nastaviť A-B"
 
-#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
 msgstr "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
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
 msgstr "Prejsť na čas"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
-msgstr "Prepnúť front"
+msgstr "Prepnúť frontu"
 
-#: src/skins/ui_manager.c:431
+#: src/skins/ui_manager.c:422
 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
+#: src/skins/ui_manager.c:425
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr "Vystrihnúť"
 
-#: src/skins/ui_manager.c:438
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr "Vložiť"
 
-#: src/skins/ui_manager.c:445
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "Načítať"
 
-#: 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:437
+msgid "Import"
+msgstr "Importovať"
 
-#: src/skins/ui_manager.c:451
-msgid "Load preset"
-msgstr "Načíta prednastavenia"
+#: src/skins/ui_manager.c:438
+msgid "Save"
+msgstr "Uložiť"
+
+#: src/skins/ui_manager.c:439
+msgid "Delete"
+msgstr "Vymazať"
 
-#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
-#: src/skins/ui_manager.c:489
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
+msgid "Preset"
+msgstr "Predvoľby"
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
-msgstr "Automaticky načítavané prednastavenia"
+msgstr "Automaticky načítavané predvoľby"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
-msgstr "Načíta automaticky načítavané prednastavenia"
+msgstr "Načítať automaticky načítavané predvoľby"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
-msgstr "Načíta štandardné prednastavenia do ekvalizéra"
+msgstr "Načítať štandardné predvoľby do ekvalizéra"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "Vynulovať"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
-msgstr "Vynuluje prednastavenia ekvalizéra"
+msgstr "Vynulovať predvoľby ekvalizéra"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "Zo súboru"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
-msgstr "Načíta prednastavenia zo súboru"
+msgstr "Načítať predvoľby zo súboru"
 
-#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
 msgstr "Zo súboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
-msgstr "Načíta prednastavenia zo súboru WinAMP EQF"
+msgstr "Načítať predvoľby zo súboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
-msgstr "Prednastavenia WinAMP"
+msgstr "Predvoľby WinAMP"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
-msgstr "Importuje prednastavenia WinAMP"
+msgstr "Importovať predvoľby WinAMP"
 
-#: src/skins/ui_manager.c:472
-msgid "Save preset"
-msgstr "Uloží prednastavenia"
-
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:466
 msgid "Save auto-load preset"
-msgstr "Uloží automaticky načítavané prednastavenia"
+msgstr "Uložiť automaticky načítavané predvoľby"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
-msgstr "Uloží štandardné prednastavenia"
+msgstr "Uložiť štandardné predvoľby"
 
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "Do súboru"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
-msgstr "Uloží prednastavenia do súboru"
+msgstr "Uložiť predvoľby do súboru"
 
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
 msgstr "Do súboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
-msgstr "Uloží prednastavenia do súboru WinAMP EQF"
-
-#: src/skins/ui_manager.c:487
-msgid "Delete preset"
-msgstr "Vymaže prednastavenia"
+msgstr "Uložiť predvoľby do súboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:481
 msgid "Delete auto-load preset"
-msgstr "Vymaže automaticky načítavané prednastavenia"
+msgstr "Vymazať automaticky načítavané predvoľby"
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
 msgstr "Vyhľadať skladby v aktívnom zozname skladieb"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular "
-"expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular"
+" expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr ""
-"Položky v zozname skladieb vyberiete vyplnením jedného alebo viacerých polí. "
-"Polia používajú regulárne výrazy a neberie sa ohľad na veľkosť písmen. Ak "
-"regulárnym výrazom nerozumiete, jednoducho zadajte časť textu, ktorý chcete "
-"vyhľadať."
+msgstr "Položky v zozname skladieb vyberiete vyplnením jedného alebo viacerých polí. Polia používajú regulárne výrazy a neberie sa ohľad na veľkosť písmen. Ak regulárnym výrazom nerozumiete, jednoducho zadajte časť textu, ktorý chcete vyhľadať."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "Názov: "
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
 msgstr "Umelec: "
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "Názov súboru: "
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr "Pred hľadaním vymazať predchádzajúci výber"
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
 msgstr "Zhodujúce sa položky pridať do (odstrániť z) frontu"
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
 msgstr "Zo zhodujúcich sa položiek vytvoriť nový zoznam skladieb"
 
-#: src/skins/ui_playlist.c:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
 msgstr "Editor zoznamu skladieb"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
@@ -3818,112 +3144,66 @@
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Nezabalený vzhľad pre WinAMP 2.x"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nepodarilo sa vytvoriť adresár (%s): %s\n"
 
-#: src/sndfile/plugin.c:438
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
 msgstr "Modul sndfile (WAV)"
 
-#: src/sndfile/plugin.c:439
-msgid ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-msgstr ""
-"Pre Audacious upravil Tony Vroon <chainsaw@gentoo.org>\n"
-"z pôvodného modulu pre xmms_sndfile:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"Tento program slobodný sotvér. Môžete ho šíriť a/alebo upravovať podľa "
-"ustanovení GNU GPL, vydávanej nadáciou Free Software Foundation; buď vo "
-"verzii 2, tejto licencie, alebo (podľa vášho uváženia) v ľubovoľnej novšej "
-"verzii.\n"
-"\n"
-"Tento program je rozširovaný v nádeji, že bude užitočný, ale BEZ AKEJKOĽVEK "
-"ZÁRUKY; neposkytujú sa ani odvodené záruky PREDAJNOSTI, alebo VHODNOSTI PRE "
-"URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte v GNU GPL.\n"
-"\n"
-"Kópiu GNU GPL by ste mali dostať spolu s týmto programom. Ak sa tak nestalo, "
-"požiadajte o ňu Free Software Foundation, Inc., 51 Franklin Street, Fifth "
-"Floor, Boston, MA 02110-1301, USA"
-
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "O module SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:313
+#: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
 msgstr "Oprava hlasitosti"
 
-#: src/sndstretch/sndstretch_xmms.c:314
+#: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
 msgstr "Krátke presahy"
 
-#: src/sndstretch/sndstretch_xmms.c:360
+#: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
 msgstr "Rýchlosť"
 
-#: src/sndstretch/sndstretch_xmms.c:361
+#: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
 msgstr "Výška"
 
-#: src/sndstretch/sndstretch_xmms.c:362
+#: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
 msgstr "Zväčšiť"
 
-#: src/sndstretch/sndstretch_xmms.c:363
-msgid "Options"
-msgstr "Možnosti"
-
-#: src/sndstretch/sndstretch_xmms.c:382
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - Nastavenie"
 
-#: src/song_change/song_change.c:464
+#: src/song_change/song_change.c:437
 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:465 src/song_change/song_change.c:469
-#: src/song_change/song_change.c:473 src/song_change/song_change.c:477
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
 msgstr "Príkaz:"
 
-#: src/song_change/song_change.c:468
+#: src/song_change/song_change.c:443
 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:472
+#: src/song_change/song_change.c:449
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr ""
-"Príkaz, ktorý sa vykoná, keď Audacious dosiahne koniec zoznamu skladieb."
+msgstr "Príkaz, ktorý sa vykoná, keď Audacious dosiahne koniec zoznamu skladieb."
 
-#: src/song_change/song_change.c:476
+#: src/song_change/song_change.c:455
 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)."
+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:480
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3940,45 +3220,27 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr ""
-"Môžete použiť nasledujúce formátovacie reťazce,\n"
-"ktoré budú pri spustení príkazu nahradené (nie všetky\n"
-"sú užitočné pre príkaz spúšťaný na konci zoznamu skladieb).\n"
-"\n"
-"%F: Frekvencia (v hertzoch)\n"
-"%c: Počet kanálov\n"
-"%f: Názov súboru (celá cesta)\n"
-"%l: Dĺžka (v milisekundách)\n"
-"%n alebo %s: Názov skladby\n"
-"%r: Dátový tok (v bitoch za sekundu)\n"
-"%t: Pozícia v zozname skladieb (%02d)\n"
-"%p: Práve sa hrá (1 alebo 0)\n"
-"%a: Umelec\n"
-"%b: Album\n"
-"%T: Názov stopy"
+msgstr "Môžete použiť nasledujúce formátovacie reťazce,\nktoré budú pri spustení príkazu nahradené (nie všetky\nsú užitočné pre príkaz spúšťaný na konci zoznamu skladieb).\n\n%F: Frekvencia (v hertzoch)\n%c: Počet kanálov\n%f: Názov súboru (celá cesta)\n%l: Dĺžka (v milisekundách)\n%n alebo %s: Názov skladby\n%r: Dátový tok (v bitoch za sekundu)\n%t: Pozícia v zozname skladieb (%02d)\n%p: Práve sa hrá (1 alebo 0)\n%a: Umelec\n%b: Album\n%T: Názov stopy"
 
-#: src/song_change/song_change.c:507
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr ""
-"Parametre predávané shellu by mali byť uzatvorené do "
-"úvodzoviek. Nerešpektovanie tejto rady predstavuje bezpečnostné riziko.</"
-"span>"
+msgstr "Parametre predávané shellu by mali byť uzatvorené do úvodzoviek. Nerešpektovanie tejto rady predstavuje bezpečnostné riziko."
 
-#: src/song_change/song_change.c:518
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr "Príkazy"
 
-#: src/song_change/song_change.c:555
+#: src/song_change/song_change.c:529
 msgid "Song Change"
 msgstr "Zmena skladby"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr "O module Stavová ikona"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3987,127 +3249,98 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager.\n"
-msgstr ""
-"Modul Stavová ikona\n"
-"\n"
-"Copyright 2005-2007 Giacomo Lozito < james@develia.org >\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"Tento modul poskytuje stavovú ikonu umiestnenú\n"
-"v oznamovacej oblasti správcu okien.\n"
+msgstr "Modul Stavová ikona\n\nCopyright 2005-2007 Giacomo Lozito < james@develia.org >\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nTento modul poskytuje stavovú ikonu umiestnenú\nv oznamovacej oblasti správcu okien.\n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr "Modul Stavová ikona - Nastavenia"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr "Ponuka pri stlačení pravého tlačidla"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
 msgstr "Jednoduchá ponuka na prehrávanie č. 1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
 msgstr "Jednoduchá ponuka na prehrávanie č. 2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr "Reakcia na otáčanie kolieska na myši"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "Zmeniť hlasitosť"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
 msgstr "Zmeniť prehrávanú skladbu"
 
-#: src/statusicon/statusicon.c:500
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
 msgstr "Ďalšie nastavenia"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
 msgstr "Zakázať vyskakovacie okno"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
 msgstr "Zatvoriť do oznamovacej oblasti (systémovej časti panelu)"
 
-#: src/stereo_plugin/stereo.c:41
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Pokračovať v zozname skladieb ak sa posúva smerom hore"
+
+#: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
-msgstr ""
-"Modul Extra stereo\n"
-"\n"
-"Napísal Johan Levin, 1999."
+msgstr "Modul Extra stereo\n\nNapísal Johan Levin, 1999."
 
-#: src/stereo_plugin/stereo.c:65
+#: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
 msgstr "O module Extra stereo"
 
-#: src/stereo_plugin/stereo.c:102
+#: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
 msgstr "Nastaviť Extra stereo"
 
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr "O generátore tónov"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
-msgstr ""
-"Generátor harmonických tónov napísal Haavard Kvaalen <havardk@xmms.org>\n"
-"Upravil Daniel J. Peng <danielpeng@bigfoot.com>\n"
-"\n"
-"Pre použitie zadajte URL: tone://frekvencia1;frekvencia2; frekvencia3;...\n"
-"napr. na prehranie tónov o frekvencii 2000Hz a 2005Hz zadajte "
-"tone://2000;2005"
+msgstr "Generátor harmonických tónov napísal Haavard Kvaalen <havardk@xmms.org>\nUpravil Daniel J. Peng <danielpeng@bigfoot.com>\n\nPre použitie zadajte URL: tone://frekvencia1;frekvencia2; frekvencia3;...\nnapr. na prehranie tónov o frekvencii 2000Hz a 2005Hz zadajte tone://2000;2005"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr "Generátor tónov: "
 
 #: src/unix-io/gtk.c:34
-#, fuzzy
 msgid "About File I/O Plugin"
-msgstr "O module OSS4"
+msgstr "O module File I/O"
 
-#: src/vorbis/configure.c:31
-msgid "Override generic titles"
-msgstr "Používať vlastný formát názvu"
-
-#: src/vorbis/configure.c:32
-msgid "Title format:"
-msgstr "Formát názvu:"
-
-#: src/vorbis/configure.c:36
-msgid "Ogg Vorbis Tags"
-msgstr "Značky Ogg Vorbis"
-
-#: src/vorbis/configure.c:69
-msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr "Nastavenie modulu Ogg Vorbis Audio"
-
-#: src/vorbis/vorbis.c:581
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "O module Ogg Vorbis Audio"
 
-#: src/vorbis/vorbis.c:586
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -4124,22 +3357,7 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>\n"
 "\n"
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
-msgstr ""
-"Modul Ogg Vorbis od Xiph.org Foundation\n"
-"\n"
-"Pôvodný kód napísal\n"
-"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-"Prispeli\n"
-"Chris Montgomery <monty@xiph.org>\n"
-"Peter Alm <peter@xmms.org>\n"
-"Michael Smith <msmith@labyrinth.edu.au>\n"
-"Jack Moffitt <jack@icecast.org>\n"
-"Jorn Baayen <jorn@nl.linux.org>\n"
-"Haavard Kvaalen <havardk@xmms.org>\n"
-"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-"Eugene Zagidullin <e.asphyx@gmail.com>\n"
-"\n"
-"Navštívte stránky Xiph.org Foundation na http://www.xiph.org/\n"
+msgstr "Modul Ogg Vorbis od Xiph.org Foundation\n\nPôvodný kód napísal\nTony Arcieri <bascule@inferno.tusculum.edu>\nPrispeli\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHaavard Kvaalen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\nNavštívte stránky Xiph.org Foundation na http://www.xiph.org/\n"
 
 #: src/vtx/about.c:14
 msgid "About Vortex Player"
@@ -4148,22 +3366,13 @@
 #: src/vtx/about.c:15
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
-"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor."
-"ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "\n"
 "Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
 "and other AY/YM music sites.\n"
 "\n"
 "Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr ""
-"Prehrávač hudobného formátu Vortex napísal <sashnov@ngs.ru>\n"
-"Založené na pôvodom zdrojovom kóde in_vtx.dll od Romana Sherbakova "
-"<v_soft@microfor.ru>\n"
-"\n"
-"Hudba vo formáte vtx môže byť nájdená na http://vtx.microfor.ru/music.htm a "
-"ďalších AY/YM hudobných stránkach.\n"
-"\n"
-"Pre Audacious upravil Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr "Prehrávač hudobného formátu Vortex napísal <sashnov@ngs.ru>\nZaložené na pôvodom zdrojovom kóde in_vtx.dll od Romana Sherbakova <v_soft@microfor.ru>\n\nHudba vo formáte vtx môže byť nájdená na http://vtx.microfor.ru/music.htm a ďalších AY/YM hudobných stránkach.\n\nPre Audacious upravil Pavel Vymetalek <pvymetalek@seznam.cz>"
 
 #: src/wavpack/wavpack.c:353
 #, c-format
@@ -4176,1311 +3385,4 @@
 "\n"
 "Some of the plugin code was by Miles Egan\n"
 "Visit the Wavpack site at http://www.wavpack.com/\n"
-msgstr ""
-"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
-"\n"
-"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"
+msgstr "Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n\nNiektoré časti kódu modulu napísal Miles Egan\nNavštívte stránku Wavpack na adrese http://www.wavpack.com/\n"

audacious-plugins-3.1.1.tar.bz2/po/sr.po -> audacious-plugins-3.2.4.tar.bz2/po/sr.po Changed

@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUD\n"
-"POT-Creation-Date: 2011-10-24 16:38-0400\n"
-"PO-Revision-Date: 2011-11-06 08:25+0000\n"
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-04-30 05:25+0000\n"
 "Last-Translator: MirosNik <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian\n"
 "MIME-Version: 1.0\n"
@@ -24,225 +24,174 @@
 "Using libfaad2-%s for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
-msgstr ""
-"Користи libfaad2-%s за декодирање.\n"
-"ФААД2 ААЦ/ХЕ-ААЦ/ХЕ-ААЦв2/ДРМ декодер (c) Неро АГ, www.nero.com\n"
-"Ауторска права (c) 2005-2006 Екипа Безочника"
+msgstr "Користи libfaad2-%s за декодирање.\nФААД2 ААЦ/ХЕ-ААЦ/ХЕ-ААЦв2/ДРМ декодер (c) Неро АГ, www.nero.com\nАуторска права (c) 2005-2006 Екипа Безочника"
 
 #: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "О прикључку МП4 ААЦ декодеру"
 
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr "О ХММС аларму"
-
-#: src/alarm/interface.c:41
-msgid "XMMS Alarm"
-msgstr "ХММС аларм"
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "О Аларму"
 
-#: src/alarm/interface.c:50
+#: src/alarm/alarm.c:313
 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"
-"да започне пуштање у одређено време.\n"
+"A plugin that can be used to start playing at a certain time.\n"
 "\n"
-"Пошаљите све замерке:\n"
-"Адаму Фикину <adamf@snika.uklinux.net>\n"
-"Данијелу Стодену <stodden@in.tum.de>\n"
-"\n"
-"http://www.snika.uklinux.net/xmms-alarm/"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr "Прикључак који може бити коришћен да започне пуштање у одређено време.\n\nПрвобитни аутори су Адам Фикин и Данијел Стоден."
 
-#: src/alarm/interface.c:65
-msgid "Close"
-msgstr "Затвори"
-
-#: src/alarm/interface.c:95
+#: src/alarm/interface.c:33
 msgid "Alarm"
 msgstr "Аларм"
 
-#: src/alarm/interface.c:102
+#: src/alarm/interface.c:40
 msgid "This is your wakeup call."
 msgstr "Ово је ваш позив за буђење."
 
-#: src/alarm/interface.c:117 src/alarm/interface.c:1338
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
 msgid "OK"
 msgstr "У реду"
 
-#: src/alarm/interface.c:151
-msgid "Sorry"
-msgstr "Извините"
-
-#: src/alarm/interface.c:158
-msgid "Warning"
-msgstr "Упозорење"
-
-#: src/alarm/interface.c:167
-msgid ""
-"For safety reasons the \"quiet\" time must be at least 65 seconds longer than the fading time, it must also be more than 10 seconds. This basically means that there is a bug in the code and until I find a way of really fixing it this message will appear :)\n"
-"\n"
-"Your fading settings have NOT been saved\n"
-"\n"
-"--\n"
-"Adam"
-msgstr ""
-"Из безбедносних разлога време „утишавања“ мора бити најмање 65 секунди дуже од времена ишчезавања, такође мора да траје више од 10 секунди. Ово у основи значи да постоји грешка у кôду и док не пронађем начин да то заиста поправим ова порука ће се појављивати :)\n"
-"\n"
-"Ваша подешавања ишчезавања НИСУ сачувана\n"
-"\n"
-"--\n"
-"Адам"
-
-#: src/alarm/interface.c:183
-msgid "Oh Well"
-msgstr "Наравно"
-
-#: src/alarm/interface.c:339
+#: src/alarm/interface.c:214
 msgid "Alarm Settings"
 msgstr "Подешавања аларма"
 
-#: src/alarm/interface.c:354 src/alarm/interface.c:526
-#: src/alarm/interface.c:898
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
 msgid "Time"
 msgstr "Време"
 
-#: src/alarm/interface.c:395
+#: src/alarm/interface.c:270
 msgid "hours"
 msgstr "сат(а)"
 
-#: src/alarm/interface.c:456
+#: src/alarm/interface.c:331
 msgid "h"
 msgstr "часова"
 
-#: src/alarm/interface.c:486
+#: src/alarm/interface.c:361
 msgid "minutes"
 msgstr "минута"
 
-#: src/alarm/interface.c:504
+#: src/alarm/interface.c:379
 msgid "Quiet after:"
 msgstr "Утишај након:"
 
-#: src/alarm/interface.c:514
+#: src/alarm/interface.c:389
 msgid "Alarm at (default):"
 msgstr "Активирај аларм у (основно):"
 
-#: src/alarm/interface.c:534
+#: src/alarm/interface.c:409
 msgid "Choose the days for the alarm to come on"
 msgstr "Изаберите којим данима ће се активирати аларм"
 
-#: src/alarm/interface.c:562 src/alarm/interface.c:610
-#: src/alarm/interface.c:658 src/alarm/interface.c:706
-#: src/alarm/interface.c:754 src/alarm/interface.c:802
-#: src/alarm/interface.c:850 src/bs2b/plugin.c:198 src/OSS/configure.c:153
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
 msgid "Default"
 msgstr "Основно"
 
-#: src/alarm/interface.c:888
+#: src/alarm/interface.c:763
 msgid "Day"
 msgstr "Дан"
 
-#: src/alarm/interface.c:908
+#: src/alarm/interface.c:783
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: src/alarm/interface.c:919
+#: src/alarm/interface.c:794
 msgid "Wednesday"
 msgstr "Среда"
 
-#: src/alarm/interface.c:930
+#: src/alarm/interface.c:805
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: src/alarm/interface.c:941
+#: src/alarm/interface.c:816
 msgid "Friday"
 msgstr "Петак"
 
-#: src/alarm/interface.c:952
+#: src/alarm/interface.c:827
 msgid "Saturday"
 msgstr "Субота"
 
-#: src/alarm/interface.c:963
+#: src/alarm/interface.c:838
 msgid "Sunday"
 msgstr "Недеља"
 
-#: src/alarm/interface.c:973
+#: src/alarm/interface.c:848
 msgid "Monday"
 msgstr "Понедељак"
 
-#: src/alarm/interface.c:984
+#: src/alarm/interface.c:859
 msgid "Days"
 msgstr "Дани"
 
-#: src/alarm/interface.c:1000
+#: src/alarm/interface.c:875
 msgid "Fading"
 msgstr "Ишчезавање"
 
-#: src/alarm/interface.c:1037
+#: src/alarm/interface.c:912
 msgid "seconds"
 msgstr "секунде"
 
-#: src/alarm/interface.c:1045 src/alarm/interface.c:1160
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
 msgid "Volume"
 msgstr "Јачина"
 
-#: src/alarm/interface.c:1071
+#: src/alarm/interface.c:946
 msgid "Current"
 msgstr "Тренутно"
 
-#: src/alarm/interface.c:1079
+#: src/alarm/interface.c:954
 msgid "Start at"
 msgstr "Започни при"
 
-#: src/alarm/interface.c:1107 src/alarm/interface.c:1151
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
 msgid "%"
 msgstr "%"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:998
 msgid "Final"
 msgstr "Заврши при"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1051
 msgid "Additional Command"
 msgstr "Додатна наредба"
 
-#: src/alarm/interface.c:1202
+#: src/alarm/interface.c:1077
 msgid "enable"
 msgstr "укључи"
 
-#: src/alarm/interface.c:1210
+#: src/alarm/interface.c:1085
 msgid "Playlist (optional)"
 msgstr "Списак нумера (необавезно)"
 
-#: src/alarm/interface.c:1236
+#: src/alarm/interface.c:1111
 msgid "Browse..."
 msgstr "Претражи..."
 
-#: src/alarm/interface.c:1244 src/alarm/interface.c:1408
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
 msgid "Reminder"
 msgstr "Подсетник"
 
-#: src/alarm/interface.c:1261
+#: src/alarm/interface.c:1136
 msgid "Use reminder"
 msgstr "Користи подсетник"
 
-#: src/alarm/interface.c:1277 src/sndstretch/sndstretch_xmms.c:358
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
 msgid "Options"
 msgstr "Опције"
 
-#: src/alarm/interface.c:1285
+#: src/alarm/interface.c:1160
 msgid "What do these options mean?"
 msgstr "Шта значе ове опције?"
 
-#: src/alarm/interface.c:1313
+#: src/alarm/interface.c:1188
 msgid ""
 "\n"
 "Time\n"
@@ -295,73 +244,23 @@
 " 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"
-" Адреса мп3/огг тока може такође бити унешена\n"
-" овде, али хммс тренутно не подржава\n"
-" учитавање списка нумера са адреса.\n"
-"\n"
-" Подсетник:\n"
-" Приказује подсетник након искључења аларма,\n"
-" упишите подсетник у поље и штиклирајте\n"
-" квадратић ако желите да буде приказиван.\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 Адреса мп3/огг тока може такође бити унешена\n овде, али хммс тренутно не подржава\n учитавање списка нумера са адреса.\n\n Подсетник:\n Приказује подсетник након искључења аларма,\n упишите подсетник у поље и штиклирајте\n квадратић ако желите да буде приказиван.\n"
 
-#: src/alarm/interface.c:1315 src/skins/ui_manager.c:382
+#: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
 msgid "Help"
 msgstr "Помоћ"
 
-#: src/alarm/interface.c:1347 src/cdaudio-ng/configure.c:249
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
 #: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
 #: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
 msgid "Cancel"
 msgstr "Откажи"
 
-#: src/alarm/interface.c:1415
+#: src/alarm/interface.c:1290
 msgid "Your reminder for today is.."
 msgstr "Ваш подсетник за данас је.."
 
-#: src/alarm/interface.c:1440
+#: src/alarm/interface.c:1315
 msgid "Thankyou"
 msgstr "Хвала вам"
 
@@ -401,13 +300,11 @@
 msgid "ALSA error"
 msgstr "Грешка АЛСА-е"
 
-#: src/amidi-plug/amidi-plug.c:335
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr ""
-"Нисте изабрали ниједан порт секвенцера за МИДИ пуштање. То можете урадити у "
-"поставкама МИДИ прикључка."
+msgstr "Нисте изабрали ниједан порт секвенцера за МИДИ пуштање. То можете урадити у поставкама МИДИ прикључка."
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:35
 msgid "ALSA Backend "
@@ -418,10 +315,7 @@
 "This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
 "This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Овај позадинац шаље МИДИ догађаје у групу портова АЛСА секвенцера коју је изабрао корисник. Сучеље АЛСА секвенцера је врло разноврсно, може да обезбеди портове за хардверске синтисајзере звучних картица (тј. ему10к1), али такође и за софтверске синтисајзере, спољне уређаје, итд.\n"
-"Овај позадинац не производи звук, МИДИ догађајима се управља непосредно са уређаја/програма иза АЛСА портова; на пример, МИДИ догађаји послати хардверском синтисајзеру ће бити директно репродуковани.\n"
-"Овај програм је написао Ђакомо Лоцито."
+msgstr "Овај позадинац шаље МИДИ догађаје у групу портова АЛСА секвенцера коју је изабрао корисник. Сучеље АЛСА секвенцера је врло разноврсно, може да обезбеди портове за хардверске синтисајзере звучних картица (тј. ему10к1), али такође и за софтверске синтисајзере, спољне уређаје, итд.\nОвај позадинац не производи звук, МИДИ догађајима се управља непосредно са уређаја/програма иза АЛСА портова; на пример, МИДИ догађаји послати хардверском синтисајзеру ће бити директно репродуковани.\nОвај програм је написао Ђакомо Лоцито."
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
@@ -430,12 +324,9 @@
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
 "This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen ouput plugin.\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"Овај позадинац производи звук тако што шаље МИДИ догађаје Флуид синту, реално временском софтверском синтисајзеру заснованом на СаундФонт2 спецификацији (www.fluidsynth.org).\n"
-"Произведени звук може бити манипулисан помоћу програмских прикључака за ефекте а обрађен изабраним прикључком излаза.\n"
-"Овај програм је написао Ђакомо Лоцито."
+msgstr "Овај позадинац производи звук тако што шаље МИДИ догађаје Флуид синту, реално временском софтверском синтисајзеру заснованом на СаундФонт2 спецификацији (www.fluidsynth.org).\nПроизведени звук може бити манипулисан помоћу програмских прикључака за ефекте а обрађен изабраним прикључком излаза.\nОвај програм је написао Ђакомо Лоцито."
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
@@ -477,9 +368,7 @@
 msgid ""
 "ALSA\n"
 "backend"
-msgstr ""
-"АЛСА\n"
-"позадинац"
+msgstr "АЛСА\nпозадинац"
 
 #: src/amidi-plug/i_configure-ap.c:59
 msgid "AMIDI-Plug - backend information"
@@ -529,9 +418,7 @@
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr ""
-"АМИДИ\n"
-"прикључак"
+msgstr "АМИДИ\nприкључак"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
@@ -643,9 +530,7 @@
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr ""
-"ФлуидСинт\n"
-"позадинац"
+msgstr "ФлуидСинт\nпозадинац"
 
 #: src/amidi-plug/i_configure-timidity.c:39
 msgid "TIMIDITY BACKEND CONFIGURATION"
@@ -659,9 +544,7 @@
 msgid ""
 "TiMidity\n"
 "backend"
-msgstr ""
-"ТиМидити\n"
-"позадинац"
+msgstr "ТиМидити\nпозадинац"
 
 #: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
@@ -723,9 +606,7 @@
 msgid ""
 "\n"
 "AMIDI-Plug "
-msgstr ""
-"\n"
-"АМИДИ прикључак "
+msgstr "\nАМИДИ прикључак "
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -750,28 +631,7 @@
 "Tony Vroon\n"
 "for the good help with alpha testing\n"
 "\n"
-msgstr ""
-"\n"
-"Модуларни МИДИ музички програм\n"
-"http://www.develia.org/projects.php?p=amidiplug\n"
-"\n"
-"Написао га је Ђакомо Лоцито\n"
-"< james@develia.org >\n"
-"\n"
-"\n"
-"Посебно су заслужни...\n"
-"\n"
-"Клеменс Ладиш и Јарослав Кисела\n"
-"због њихових програма „aplaymidi“ и „amixer“; који\n"
-"су врло корисни, уз „alsa-lib docs“, како бисмо\n"
-"сазнали више о АЛСА АПИју\n"
-"\n"
-"Алфредо Спадафина\n"
-"који је урадио леп логотип МИДИ тастатуре \n"
-"\n"
-"Тони Врун\n"
-"због одличне помоћи за алфа тестирање\n"
-"\n"
+msgstr "\nМодуларни МИДИ музички програм\nhttp://www.develia.org/projects.php?p=amidiplug\n\nНаписао га је Ђакомо Лоцито\n< james@develia.org >\n\n\nПосебно су заслужни...\n\nКлеменс Ладиш и Јарослав Кисела\nзбог њихових програма „aplaymidi“ и „amixer“; који\nсу врло корисни, уз „alsa-lib docs“, како бисмо\nсазнали више о АЛСА АПИју\n\nАлфредо Спадафина\nкоји је урадио леп логотип МИДИ тастатуре \n\nТони Врун\nзбог одличне помоћи за алфа тестирање\n\n"
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
@@ -789,245 +649,238 @@
 msgid "None"
 msgstr "Ништа"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "Почетак репродукције"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Приказује ОСД када почиње репродукција песме."
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "Промена наслова"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr ""
-"Приказује ОСД када се, у току репродукције, измени наслов песме али назив "
-"датотеке остане исти. Ово је углавном корисно за приказивање измена у "
-"насловима у интернет токовима."
+msgstr "Приказује ОСД када се, у току репродукције, измени наслов песме али назив датотеке остане исти. Ово је углавном корисно за приказивање измена у насловима у интернет токовима."
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "Промена јачине звука"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
 msgstr "Приказује ОСД када је измењена јачина звука."
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
 msgstr "Паузирање"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
 msgstr "Приказује ОСД када је репродукција привремено заустављена."
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
 msgstr "Отпаузирање"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Приказује ОСД када је репродукција поново покренута."
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "Постављање"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
 msgstr "Релативан хоризонтални померај:"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
 msgstr "Релативан вертикални померај:"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr "Највећа ширина приказа:"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr "Опција више монитора"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
 msgstr "Прикажи ОСД на:"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "свим мониторима"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "на монитору бр. %i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "Време трајања (ms)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "Приказ:"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "Појављивање:"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "Ишчезавање:"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "Словни ликови"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "Писмо %i:"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "Сенка"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "Интернационализација"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "Искључи УТФ-8 конверзију текста (у аосд)"
 
-#: src/aosd/aosd_ui.c:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "Изаберите датотеку маске"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr "Стил исцртавања"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "Боје"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "Боја %i:"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr "Произвољна маска"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "Датотека маске:"
 
-#: src/aosd/aosd_ui.c:672
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "Претражи"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "Омогући активирање"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "Догађај"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
 msgstr "Откривен је композитни управник"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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 ""
-"Није откривен композитни управник;\n"
-"осим ако знате да је један већ покренут, молим покрените композитног управника јер у супротном ОСД неће радити исправно"
+msgstr "Није откривен композитни управник;\nосим ако знате да је један већ покренут, молим покрените композитног управника јер у супротном ОСД неће радити исправно"
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 msgid "Composite manager not required for fake transparency"
 msgstr "Композитни управник није потребан за лажну провидност"
 
-#: src/aosd/aosd_ui.c:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "Провидност"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr "Лажна провидност"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Стварна провидност (захтева Х композитно проширење)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
 msgstr "Композитно проширење није учитано"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
 msgstr "Композитно проширење није доступно"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr "Безочник — ОСД"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
 msgstr "Безочник ОСД — подешавања"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr "Испробај"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "Положај"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "Анимација"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "Декорација"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "Укључивање"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "Остало"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
 msgstr "Безочник ОСД"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
-msgstr ""
-"\n"
-"Безочник ОСД "
+msgstr "\nБезочник ОСД "
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1038,16 +891,7 @@
 "written by Evan Martin\n"
 "http://neugierig.org/software/ghosd/\n"
 "\n"
-msgstr ""
-"\n"
-"http://www.develia.org/projects.php?p=audacious#aosd\n"
-"написао је Ђакомо Лоцито\n"
-"< james@develia.org >\n"
-"\n"
-"Приказ на екрану (OSD) је заснован на библиотеци\n"
-"„Ghosd“ коју је написао Еван Мартин\n"
-"http://neugierig.org/software/ghosd/\n"
-"\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\nнаписао је Ђакомо Лоцито\n< james@develia.org >\n\nПриказ на екрану (OSD) је заснован на библиотеци\n„Ghosd“ коју је написао Еван Мартин\nhttp://neugierig.org/software/ghosd/\n\n"
 
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
@@ -1073,11 +917,11 @@
 msgid "Presets:"
 msgstr "Претподешавања:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:241
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
 msgstr "О прикључку звучног ЦД-а"
 
-#: src/cdaudio-ng/cdaudio-ng.c:242
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
@@ -1089,27 +933,17 @@
 "This was a Google Summer of Code 2007 project.\n"
 "\n"
 "Copyright 2009 John Lindgren"
-msgstr ""
-"Ауторска права (c) 2007, Калин Крисан <ccrisan@gmail.com> и Безочник тим.\n"
-"\n"
-"Велико хвала „libcdio“ програмерима <http://www.gnu.org/software/libcdio/>\n"
-"\tи „libcddb“ програмерима <http://libcddb.sourceforge.net/>.\n"
-"\n"
-"Хвала ти такође Тони Врун што си ме саветовао и водио.\n"
-"\n"
-"Беше то Гугл лето пројекта Кôд 2007.\n"
-"\n"
-"Ауторска права 2009 Џон Линдгрен"
+msgstr "Ауторска права (c) 2007, Калин Крисан <ccrisan@gmail.com> и Безочник тим.\n\nВелико хвала „libcdio“ програмерима <http://www.gnu.org/software/libcdio/>\n\tи „libcddb“ програмерима <http://libcddb.sourceforge.net/>.\n\nХвала ти такође Тони Врун што си ме саветовао и водио.\n\nБеше то Гугл лето пројекта Кôд 2007.\n\nАуторска права 2009 Џон Линдгрен"
 
-#: src/cdaudio-ng/cdaudio-ng.c:550
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
 msgstr "Аудио ЦД"
 
-#: src/cdaudio-ng/cdaudio-ng.c:922
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
 msgstr "Уређај је празан."
 
-#: src/cdaudio-ng/cdaudio-ng.c:924
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
 msgstr "Неподржана врста диска."
 
@@ -1248,9 +1082,7 @@
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not"
 " provide length information (i.e. looping tracks)."
-msgstr ""
-"Основно трајање песме, изражено у секундама, се користи за песме које не "
-"пружају информације о трајању (тј. упетљане нумере)."
+msgstr "Основно трајање песме, изражено у секундама, се користи за песме које не пружају информације о трајању (тј. упетљане нумере)."
 
 #: src/console/plugin.c:33
 msgid "About the Game Console Music Decoder"
@@ -1262,11 +1094,7 @@
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
-msgstr ""
-"Мотор конзолног музичког декодера је заснован на Game_Music_Emu 0.5.2.\n"
-"Подржани формати: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
-"Примењеност у Безочнику: Вилијам Питкок <nenolod@dereferenced.org>, \n"
-" Шај Грин <gblargg@gmail.com>\n"
+msgstr "Мотор конзолног музичког декодера је заснован на Game_Music_Emu 0.5.2.\nПодржани формати: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nПримењеност у Безочнику: Вилијам Питкок <nenolod@dereferenced.org>, \n Шај Грин <gblargg@gmail.com>\n"
 
 #: src/crossfade/plugin.c:60
 msgid "About Crossfade"
@@ -1294,10 +1122,7 @@
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
 "You can use the Sample Rate Converter effect to resample the songs to the same rate."
-msgstr ""
-"Постепени прелаз није успео јер је песма имала различит проток узорка.\n"
-"\n"
-"Можете да користите ефекат претварача протока узорка да поново узоркујете песме на исти проток узорка."
+msgstr "Постепени прелаз није успео јер је песма имала различит проток узорка.\n\nМожете да користите ефекат претварача протока узорка да поново узоркујете песме на исти проток узорка."
 
 #: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
@@ -1318,11 +1143,7 @@
 "By Johan Levin 1999.\n"
 "\n"
 "Surround echo by Carl van Schaik 1999"
-msgstr ""
-"Ехо прикључак\n"
-"Аутор Јохан Левин 1999.\n"
-"\n"
-"Ехо окружења је написао Карл ван Шаик 1999"
+msgstr "Ехо прикључак\nАутор Јохан Левин 1999.\n\nЕхо окружења је написао Карл ван Шаик 1999"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
@@ -1344,7 +1165,7 @@
 msgid "Volume: (%)"
 msgstr "Јачина: (%)"
 
-#: src/ffaudio/ffaudio-core.c:795
+#: src/ffaudio/ffaudio-core.c:718
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1358,20 +1179,9 @@
 "libavcodec %s (%s)\n"
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
-msgstr ""
-"Прикључак декодирања звука више формата за Безочника заснован на\n"
-"радном оквиру ФФмпег мултимедија (http://www.ffmpeg.org/)\n"
-"Ауторска права (c) 2000-2009 Фабрис Белард, и ос.\n"
-"\n"
-"Прикључак за Безочника приредили:\n"
-" Вилијам Питкок <nenolod@nenolod.net>,\n"
-" Матиј Хамалаинен <ccr@tnsp.org>\n"
-"\n"
-"libavcodec %s (%s)\n"
-"libavformat %s (%s)\n"
-"libavutil %s (%s)\n"
+msgstr "Прикључак декодирања звука више формата за Безочника заснован на\nрадном оквиру ФФмпег мултимедија (http://www.ffmpeg.org/)\nАуторска права (c) 2000-2009 Фабрис Белард, и ос.\n\nПрикључак за Безочника приредили:\n Вилијам Питкок <nenolod@nenolod.net>,\n Матиј Хамалаинен <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:809
+#: src/ffaudio/ffaudio-core.c:732
 msgid "About FFaudio Plugin"
 msgstr "О ФФаудио прикључку"
 
@@ -1379,55 +1189,55 @@
 msgid "About FileWriter-Plugin"
 msgstr "О прикључку Писац датотека"
 
-#: src/filewriter/filewriter.c:455
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "Подешавања Писца датотека"
 
-#: src/filewriter/filewriter.c:467
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "Формат излазне датотеке:"
 
-#: src/filewriter/filewriter.c:485
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "Подеси"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "Сачувај у оригиналном директоријуму"
 
-#: src/filewriter/filewriter.c:505
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr "Сачувај у произвољном директоријуму"
 
-#: src/filewriter/filewriter.c:515
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "Фасцикла излазне датотеке:"
 
-#: src/filewriter/filewriter.c:519
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr "Изаберите фасциклу"
 
-#: src/filewriter/filewriter.c:538
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr "Набави име датотеке из:"
 
-#: src/filewriter/filewriter.c:541
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr "ознаке оригиналне датотеке"
 
-#: src/filewriter/filewriter.c:547
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr "назива оригиналне датотеке"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "Не одузимај проширење назива датотеке"
 
-#: src/filewriter/filewriter.c:572
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr "Придодај број нумере називу датотеке"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "Самостално"
 
@@ -1435,151 +1245,151 @@
 msgid "Joint Stereo"
 msgstr "Удружени стерео"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "Моно"
 
-#: src/filewriter/mp3.c:712
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr "МП3 подешавања"
 
-#: src/filewriter/mp3.c:735
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "Квалитет алгоритма:"
 
-#: src/filewriter/mp3.c:760
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr "Проток узорка излаза:"
 
-#: src/filewriter/mp3.c:788
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:795
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "Проток бита / Однос сажимања:"
 
-#: src/filewriter/mp3.c:819
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "Проток бита (kbps):"
 
-#: src/filewriter/mp3.c:852
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr "Однос сажимања:"
 
-#: src/filewriter/mp3.c:876
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr "Режим звука:"
 
-#: src/filewriter/mp3.c:901
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "Разно:"
 
-#: src/filewriter/mp3.c:912
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr "Присили строго ИСО поштовање"
 
-#: src/filewriter/mp3.c:923
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "Грешка заштите"
 
-#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "Квалитет"
 
-#: src/filewriter/mp3.c:945
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr "Укључи ВБР/АБР"
 
-#: src/filewriter/mp3.c:955
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "Врста:"
 
-#: src/filewriter/mp3.c:988
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr "ВБР опције:"
 
-#: src/filewriter/mp3.c:1004
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "Најмањи проток бита (kb/s):"
 
-#: src/filewriter/mp3.c:1031
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "Највећи проток бита (kb/s):"
 
-#: src/filewriter/mp3.c:1054
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr "Строго спроведи најмањи проток бита"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr "АБР опције:"
 
-#: src/filewriter/mp3.c:1076
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "Просечни проток бита (kb/s):"
 
-#: src/filewriter/mp3.c:1104
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr "Ниво ВБР квалитета:"
 
-#: src/filewriter/mp3.c:1123
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr "Не записуј Хинг ВБР заглавље"
 
-#: src/filewriter/mp3.c:1137
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr "ВБР/АБР"
 
-#: src/filewriter/mp3.c:1147
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "Параметри кадра:"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr "Означи као ауторско право"
 
-#: src/filewriter/mp3.c:1170
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr "Означи као оригинал"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "ИД3 параметри:"
 
-#: src/filewriter/mp3.c:1193
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
 msgstr "Присили додавање ознаке издања 2"
 
-#: src/filewriter/mp3.c:1203
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr "Додај само в1 ознаку"
 
-#: src/filewriter/mp3.c:1210
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr "Додај само в2 ознаку"
 
-#: src/filewriter/mp3.c:1231
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
 msgstr "Ознаке"
 
-#: src/filewriter/vorbis.c:236
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Подешавање Ворбис шифрера"
 
-#: src/filewriter/vorbis.c:256
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "Ниво квалитета (0 — 10):"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr "О ФЛАЦ аудио прикључку"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1587,13 +1397,7 @@
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr ""
-"\n"
-"\n"
-"Оригинални кôд је написао\n"
-"Ралф Ерцингер <ralf@skytale.net>\n"
-"\n"
-"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\nОригинални кôд је написао\nРалф Ерцингер <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
@@ -1606,38 +1410,17 @@
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-msgstr ""
-"Прикључак Гномове пречице\n"
-"Омогућава вам да управљате програмом користећи Гномове пречице.\n"
-"\n"
-"Ауторска права (C) 2007-2008 Саша Хласјак <contact@saschahlusiak.de>\n"
-"\n"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
-msgid "Open Files"
-msgstr "Отвори датотеке"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
-msgid "Add Files"
-msgstr "Додај датотеке"
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr "Безочник2"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr "гнт сучеље"
+msgstr "Прикључак Гномове пречице\nОмогућава вам да управљате програмом користећи Гномове пречице.\n\nАуторска права (C) 2007-2008 Саша Хласјак <contact@saschahlusiak.de>\n\n"
 
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "Број ставке"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "Наслов"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
 msgstr "Извођач"
 
@@ -1645,7 +1428,7 @@
 msgid "Year"
 msgstr "Година"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
 msgstr "Албум"
 
@@ -1709,243 +1492,251 @@
 msgid "Undock"
 msgstr "Откачи"
 
-#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
 msgstr "Искључи"
 
-#: src/gtkui/menus.c:130
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
 msgstr "Отвори _датотеке ..."
 
-#: src/gtkui/menus.c:131
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
 msgstr "Отвори _адресу ..."
 
-#: src/gtkui/menus.c:132
-msgid "_Add File ..."
-msgstr "Додај да_тотеку ..."
-
 #: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "Додај да_тотеке ..."
+
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
 msgstr "Додај ад_ресу ..."
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
 msgstr "О _програму ..."
 
-#: src/gtkui/menus.c:136
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
 msgstr "_Поставке ..."
 
-#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: src/gtkui/menus.c:140
+#: src/gtkui/menus.c:141
 msgid "_Play"
 msgstr "Пу_сти"
 
-#: src/gtkui/menus.c:141
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
 msgstr "Па_узирај"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:143
 msgid "_Stop"
 msgstr "_Заустави"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
 msgstr "_Претходно"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:145
 msgid "_Next"
 msgstr "С_ледеће"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
 msgstr "_Понови"
 
-#: src/gtkui/menus.c:147
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
 msgstr "_Насумично"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
 msgstr "Н_е напредуј у списку нумера"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
 msgstr "Заустави _након ове песме"
 
-#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
 msgstr "Подаци о _песми ..."
 
-#: src/gtkui/menus.c:152
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
 msgstr "Пређи на _време ..."
 
-#: src/gtkui/menus.c:153
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
 msgstr "Пређи на _песму ..."
 
-#: src/gtkui/menus.c:156
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
 msgstr "Према броју _нумере"
 
-#: src/gtkui/menus.c:157
+#: src/gtkui/menus.c:158
 msgid "By _Title"
 msgstr "Према _наслову"
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
 msgstr "Према _извођачу"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
 msgstr "Према _албуму"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
 msgstr "Према _датуму издавања"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
 msgstr "Према _путањи датотеке"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
 msgstr "Према п_роизвољном наслову"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
 msgstr "Преокрени п_оредак"
 
-#: src/gtkui/menus.c:165
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
 msgstr "_Случајан поредак"
 
-#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
 msgstr "_Освежи"
 
 #: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Уклони _недоступне датотеке"
+
+#: src/gtkui/menus.c:172
 msgid "_Sort"
 msgstr "Пор_еђај"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:174
 msgid "_New"
 msgstr "_Ново"
 
-#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
 msgstr "_Затвори"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:177
 msgid "_Import ..."
 msgstr "Ув_ези ..."
 
-#: src/gtkui/menus.c:176
+#: src/gtkui/menus.c:178
 msgid "_Export ..."
 msgstr "Из_вези ..."
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:180
 msgid "_Playlist Manager ..."
 msgstr "_Управник списка нумера ..."
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:181
 msgid "_Queue Manager ..."
 msgstr "Управник _редоследа ..."
 
-#: src/gtkui/menus.c:182
+#: src/gtkui/menus.c:184
 msgid "Volume _Up"
 msgstr "По_јачај"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
 msgstr "У_тишај"
 
-#: src/gtkui/menus.c:185
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
 msgstr "Ује_дначавач"
 
-#: src/gtkui/menus.c:187
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
 msgstr "Е_фекти"
 
-#: src/gtkui/menus.c:190
+#: src/gtkui/menus.c:192
 msgid "_Interface"
 msgstr "Су_чеље"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Визуализације"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
 msgstr "Прикажи линију _изборника"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
 msgstr "Прикажи линију _података"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
 msgstr "Прикажи линију _стања"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
 msgstr "Прикажи _наслове колона"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
 msgstr "Изабери _колоне ..."
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
 msgstr "_Клизај при промени песме"
 
-#: src/gtkui/menus.c:201
+#: src/gtkui/menus.c:204
 msgid "_File"
 msgstr "_Датотека"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:205
 msgid "_Playback"
 msgstr "_Извођење"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
 msgstr "_Списак нумера"
 
-#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
 msgstr "_Услуге"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:208
 msgid "_Output"
 msgstr "_Излаз"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:209
 msgid "_View"
 msgstr "_Преглед"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
 msgstr "_Стави у ред/Избаци из реда"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
 msgstr "_Исеци"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:217
 msgid "_Copy"
 msgstr "У_множи"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:218
 msgid "_Paste"
 msgstr "У_баци"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:219
 msgid "Select _All"
 msgstr "_Изабери све"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:224
 msgid "_Rename"
 msgstr "_Преименуј"
 
@@ -1953,7 +1744,7 @@
 msgid "GTK Interface"
 msgstr "ГТК сучеље"
 
-#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s — Безочник"
@@ -1962,23 +1753,27 @@
 msgid "Buffering ..."
 msgstr "Баферујем ..."
 
-#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr "Безочник"
 
-#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr "Грешка"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Затвори"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "моно"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "стерео"
 
-#: src/gtkui/ui_statusbar.c:106
+#: src/gtkui/ui_statusbar.c:109
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1986,7 +1781,7 @@
 msgstr[1] "%d канала"
 msgstr[2] "%d канала"
 
-#: src/gtkui/ui_statusbar.c:121
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
@@ -2031,7 +1826,7 @@
 msgid "Volume Down"
 msgstr "Утишај"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
 msgstr "Скочи до датотеке"
 
@@ -2060,10 +1855,7 @@
 "It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr ""
-"Није препоручљиво повезати главну дугмад миша без измењивача.\n"
-"\n"
-"Да ли желите да наставите?"
+msgstr "Није препоручљиво повезати главну дугмад миша без измењивача.\n\nДа ли желите да наставите?"
 
 #: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
@@ -2077,9 +1869,7 @@
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr ""
-"Притисните комбинацију тастера унутар поља за текст.\n"
-"Можете такође да повежете дугмад миша."
+msgstr "Притисните комбинацију тастера унутар поља за текст.\nМожете такође да повежете дугмад миша."
 
 #: src/hotkey/gui.c:405
 msgid "Hotkeys:"
@@ -2111,19 +1901,7 @@
 "\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
-msgstr ""
-"Прикључак општих пречица\n"
-"Управљајте програмом користећи комбинације општих тастера или мултимедијалних тастера.\n"
-"\n"
-"Ауторска права (C) 2007-2008 Саша Хласјак <contact@saschahlusiak.de>\n"
-"\n"
-"Остали сарадници:\n"
-"Ауторска права (C) 2006-2007 Владимир Пасков <vlado.paskov@gmail.com>\n"
-"Ауторска права (C) 2000-2002 Вил Сирјала <syrjala@sci.fi>\n"
-"\t\t\tБрајан Девис <curious@ihug.com.au>\n"
-"\t\t\tЏонатан А. Давис <davis@jdhouse.org>\n"
-"\t\t\tЏереми Тан <nsx@nsx.homeip.net>\n"
-"\n"
+msgstr "Прикључак општих пречица\nУправљајте програмом користећи комбинације општих тастера или мултимедијалних тастера.\n\nАуторска права (C) 2007-2008 Саша Хласјак <contact@saschahlusiak.de>\n\nОстали сарадници:\nАуторска права (C) 2006-2007 Владимир Пасков <vlado.paskov@gmail.com>\nАуторска права (C) 2000-2002 Вил Сирјала <syrjala@sci.fi>\n\t\t\tБрајан Девис <curious@ihug.com.au>\n\t\t\tЏонатан А. Давис <davis@jdhouse.org>\n\t\t\tЏереми Тан <nsx@nsx.homeip.net>\n\n"
 
 #: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
@@ -2149,7 +1927,7 @@
 msgid "Enable debug printing"
 msgstr "Укључи штампање уклањања грешака"
 
-#: src/jack/jack.c:422
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2158,110 +1936,89 @@
 "\n"
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
-msgstr ""
-"Управљачки програм ХММС утичнице 0.17\n"
-"\n"
-"xmms-jack.sf.net\n"
-"Крис Морган<cmorgan@alum.wpi.edu>\n"
-"\n"
-"Прилагођавање Безочнику\n"
-"Ђакомо Лоцито са „develia.org“"
+msgstr "Управљачки програм ХММС утичнице 0.17\n\nxmms-jack.sf.net\nКрис Морган<cmorgan@alum.wpi.edu>\n\nПрилагођавање Безочнику\nЂакомо Лоцито са „develia.org“"
 
-#: src/jack/jack.c:427
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
 msgstr "О прикључку ЈАЦК излаза 0.17"
 
-#: src/ladspa/plugin.c:414
+#: src/ladspa/plugin.c:415
 msgid "About LADSPA Host"
 msgstr "О ЛАДСПА домаћину"
 
-#: src/ladspa/plugin.c:515
+#: src/ladspa/plugin.c:516
 #, c-format
 msgid "%s Settings"
 msgstr "Подешавања за %s"
 
-#: src/ladspa/plugin.c:583
+#: src/ladspa/plugin.c:584
 msgid "LADSPA Host Settings"
 msgstr "Подешавања ЛАДСПА домаћину"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:593
 msgid "Module paths:"
 msgstr "Путање модула:"
 
-#: src/ladspa/plugin.c:597
+#: src/ladspa/plugin.c:598
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr ""
-"Раздвојте више путања са две тачке.\n"
-"Те путање су тражене као додатне уз „ЛАДСПА ПУТАЊА“.\n"
-"Након додавања нових путања, притисните Унеси да потражите нове прикључке."
+msgstr "Раздвојте више путања са две тачке.\nТе путање су тражене као додатне уз „ЛАДСПА ПУТАЊА“.\nНакон додавања нових путања, притисните Унеси да потражите нове прикључке."
 
-#: src/ladspa/plugin.c:613
+#: src/ladspa/plugin.c:614
 msgid "Available plugins:"
 msgstr "Доступни прикључци:"
 
-#: src/ladspa/plugin.c:625
+#: src/ladspa/plugin.c:626
 msgid "Enable"
 msgstr "Укључи"
 
-#: src/ladspa/plugin.c:631
+#: src/ladspa/plugin.c:632
 msgid "Enabled plugins:"
 msgstr "Укључени прикључци:"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:647
 msgid "Settings"
 msgstr "Подешавања"
 
-#: src/lyricwiki/lyricwiki.c:227
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
-msgstr ""
-"\n"
-"Тражим текст песме..."
+msgstr "\nТражим текст песме..."
 
-#: src/lyricwiki/lyricwiki.c:250
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
-msgstr ""
-"\n"
-"Повезујем се на lyrics.wikia.com..."
+msgstr "\nПовезујем се на lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:338
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
-msgstr ""
-"\n"
-" Нисам пронашао текстове песама."
+msgstr "\n Нисам пронашао текстове песама."
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr "О Метроному"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr ""
-"Генератор такта је написао Мартин Штраус <mys@faveve.uni-stuttgart.de>\n"
-"\n"
-"Да га користите, додајте адресу: „tact://beats*num/den“\n"
-"нпр.: „tact://77“ да добијете 77 откуцаја у минуту\n"
-"или: „tact://60*3/4“ да добијете 60 отк./мин у 3/4 такту"
+msgstr "Генератор такта је написао Мартин Штраус <mys@faveve.uni-stuttgart.de>\n\nДа га користите, додајте адресу: „tact://beats*num/den“\nнпр.: „tact://77“ да добијете 77 откуцаја у минуту\nили: „tact://60*3/4“ да добијете 60 отк./мин у 3/4 такту"
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Генератор такта: %d отк/мин"
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Генератор такта: %d отк/мин %d/%d"
@@ -2282,27 +2039,27 @@
 msgid "Changes take effect at the next song change."
 msgstr "Измене ће ступити на снагу приликом промене следеће песме."
 
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
 msgstr "Окружење"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
 msgstr "Слање је у току..."
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
 msgstr "Пошаљи на МТП уређај"
 
-#: src/mtp_up/mtp.c:311
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
 msgstr "Искључи МТП уређај"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
 msgstr "Заустављено"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
 msgstr "Безочник не пушта песме."
 
@@ -2314,9 +2071,7 @@
 msgid ""
 " by Christian Birchinger <joker@netswarm.net>\n"
 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
-msgstr ""
-" је написао Кристијан Бирхингер <joker@netswarm.net>\n"
-"заснованом на ХММС прикључку Хаварда Квала <havardk@xmms.org>"
+msgstr " је написао Кристијан Бирхингер <joker@netswarm.net>\nзаснованом на ХММС прикључку Хаварда Квала <havardk@xmms.org>"
 
 #: src/null/null.c:68
 msgid "About Null Output"
@@ -2330,30 +2085,34 @@
 msgid "Run in real time"
 msgstr "Покрени у реалном времену"
 
-#: src/oss4/configure.c:76
+#: src/oss4/configure.c:81
 msgid "1. Default device"
 msgstr "1. Основни уређај"
 
-#: src/oss4/configure.c:132
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
 msgstr "Поставке прикључка излаза ОСС4"
 
-#: src/oss4/configure.c:144 src/OSS/configure.c:194
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "Звучни уређај:"
 
-#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "Користи алтернативни уређај:"
 
-#: src/oss4/configure.c:187
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
 msgstr "Сачувај јачину звука између сесија"
 
-#: src/oss4/configure.c:191
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
 msgstr "Укључује претварање формата направљено ОСС софтвером."
 
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Укључује искључиви режим да спречи виртуално мешање."
+
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "О ОСС4 прикључку"
@@ -2399,11 +2158,11 @@
 msgid "Mixer"
 msgstr "Миксер"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr "О ОСС управљачком програму"
 
-#: src/pulse_audio/pulse_audio.c:687
+#: src/pulse_audio/pulse_audio.c:677
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "О ПулсеАудио излазном прикључку Безочника"
 
@@ -2427,31 +2186,31 @@
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr "Промените лозинку"
 
-#: src/scrobbler/configure.c:143
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "Услуге"
 
-#: src/scrobbler/configure.c:165
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "Корисничко име:"
 
-#: src/scrobbler/configure.c:171
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr "Адреса Скроблера:"
 
-#: src/scrobbler/configure.c:211
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr "Ласт.ФМ"
 
-#: src/scrobbler/configure.c:238
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr "Скроблер"
 
@@ -2460,10 +2219,7 @@
 "Audacious AudioScrobbler Plugin\n"
 "\n"
 "Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
-msgstr ""
-"Аудио Скроблер прикључак Безочника\n"
-"\n"
-"Оригинално су га урадили Аудун Хов <audun@nlc.no> и Пипиан <pipian@pipian.com>\n"
+msgstr "Аудио Скроблер прикључак Безочника\n\nОригинално су га урадили Аудун Хов <audun@nlc.no> и Пипиан <pipian@pipian.com>\n"
 
 #: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
@@ -2477,17 +2233,49 @@
 msgid "SDL error"
 msgstr "Грешка СДЛ-а"
 
-#: src/skins/plugin.c:165
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Жанр"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Библиотека"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Направи списак нумера"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Додај у списак нумера"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Претражите библиотеку"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "Да увезете вашу музичку библиотеку у Безочнику, изаберите фасциклу и затим кликните на иконицу „освежи“."
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Молим сачекајте ..."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Изаберите фасциклу"
+
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "О маскирном сучељу"
 
-#: src/skins/plugin.c:166
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
-msgstr ""
-"Ауторска права (c) 2008, Томаш Мон <desowin@gmail.com>\n"
-"\n"
+msgstr "Ауторска права (c) 2008, Томаш Мон <desowin@gmail.com>\n\n"
 
 #: src/skins/skins_cfg.c:207
 msgid "_Player:"
@@ -2573,79 +2361,112 @@
 msgid "Audacious Equalizer"
 msgstr "Уједначавач Безочника"
 
-#: src/skins/ui_equalizer.c:896
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
 msgstr "Претподешавања"
 
-#: src/skins/ui_main.c:443
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Учитава претподешавање"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Учитава самостално претподешавање"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Учитава претподешавање уједначавача"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Чува претподешавање"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Чува самостално претподешавање"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Чува претподешавање уједначавача"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Избриши претподешавање"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Брише самостално претподешавање"
+
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr "kb/s"
 
-#: src/skins/ui_main.c:451
+#: src/skins/ui_main.c:452
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:458
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "окружење"
 
-#: src/skins/ui_main.c:806
+#: src/skins/ui_main.c:807
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Тражи до: %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:827
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Јачина звука: %d%%"
 
-#: src/skins/ui_main.c:850
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Уравнотеженост: %d%% леви"
 
-#: src/skins/ui_main.c:852
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "Уравнотеженост: центрирано"
 
-#: src/skins/ui_main.c:854
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Уравнотеженост: %d%% десни"
 
-#: src/skins/ui_main.c:980
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "Изборник опција"
 
-#: src/skins/ui_main.c:984
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "Искључи „Увек у првом плану“"
 
-#: src/skins/ui_main.c:986
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "Укључи „Увек у првом плану“"
 
-#: src/skins/ui_main.c:989
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "Поље информација о датотеци"
 
-#: src/skins/ui_main.c:994
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "Изборник приказивања"
 
-#: src/skins/ui_main.c:1648
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
 msgstr "Једноставни режим."
 
-#: src/skins/ui_main.c:1650
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
 msgstr "Режим списка нумера."
 
-#: src/skins/ui_main.c:1672
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr "Зауставља након песме."
 
-#: src/skins/ui_main.c:1674
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
 msgstr "Не зауставља након песме."
 
@@ -2922,9 +2743,7 @@
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr ""
-"Претржује списак нумера и означава ставке са списка нумера према одређеном "
-"услову."
+msgstr "Претржује списак нумера и означава ставке са списка нумера према одређеном услову."
 
 #: src/skins/ui_manager.c:257
 msgid "Invert Selection"
@@ -3107,7 +2926,7 @@
 
 #: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
-msgstr "O Безочнику"
+msgstr "О Безочнику"
 
 #: src/skins/ui_manager.c:395
 msgid "Play File"
@@ -3149,189 +2968,169 @@
 msgid "Clear A-B"
 msgstr "Обриши А—Б"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
-msgid "Jump to Playlist Start"
-msgstr "Скочи на почетак списка нумера"
-
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
 msgstr "Пређи на време"
 
-#: src/skins/ui_manager.c:424
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
 msgstr "У ред/из реда"
 
-#: src/skins/ui_manager.c:425
+#: src/skins/ui_manager.c:422
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Укључује/искључује ставке у/из ред(а) списак(а) нумера."
 
-#: src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:425
 msgid "Copy"
 msgstr "Умножи"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr "Исеци"
 
-#: src/skins/ui_manager.c:432
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr "Убаци"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "Учитај"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:437
 msgid "Import"
 msgstr "Увези"
 
-#: src/skins/ui_manager.c:441
+#: src/skins/ui_manager.c:438
 msgid "Save"
 msgstr "Сачувај"
 
-#: src/skins/ui_manager.c:442
+#: src/skins/ui_manager.c:439
 msgid "Delete"
 msgstr "Обриши"
 
-#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
 msgstr "Претподешавање"
 
-#: src/skins/ui_manager.c:445
-msgid "Load preset"
-msgstr "Учитава претподешавање"
-
-#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
 msgstr "Самостално учитај претподешавања"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr "Учитава самостално учитана претподешавања"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
 msgstr "Учитава основно претподешавање у уједначавачу"
 
-#: src/skins/ui_manager.c:453
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "Нула"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
 msgstr "Поставља нивое претподешавања уједначавача на нулу"
 
-#: src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "Из датотеке"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
 msgstr "Учитава претподешавање из датотеке"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
 msgstr "Из ВинАМП ЕКуФ датотеке"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
 msgstr "Учитава претподешавање из ВинАМП ЕКуФ датотеке"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
 msgstr "ВинАМП претподешавања"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
 msgstr "Увези ВинАМП претподешавања"
 
 #: src/skins/ui_manager.c:466
-msgid "Save preset"
-msgstr "Чува претподешавање"
-
-#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "Чува самостално учитано претподешавање"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
 msgstr "Чува основно претподешавање"
 
-#: src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "У датотеку"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
 msgstr "Чува претподешавање у датотеку"
 
-#: src/skins/ui_manager.c:477
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
 msgstr "У ВинАМП ЕКуФ датотеку"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
 msgstr "Чува претподешавање у ВинАМП ЕКуФ датотеку"
 
 #: src/skins/ui_manager.c:481
-msgid "Delete preset"
-msgstr "Избриши претподешавање"
-
-#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "Брише самостално учитано претподешавање"
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
 msgstr "Претражи ставке у активном списку нумера"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 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 "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr ""
-"Обележите ставке у списку нумера попуњавајући једно или више поља. Поља "
-"користе синтаксу обичних израза, не разликују величину слова. Ако не знате "
-"како обични изрази функционишу, једноставно дословно унесите део онога што "
-"тражите."
+msgstr "Обележите ставке у списку нумера попуњавајући једно или више поља. Поља користе синтаксу обичних израза, не разликују величину слова. Ако не знате како обични изрази функционишу, једноставно дословно унесите део онога што тражите."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "Наслов: "
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr "Албум: "
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
 msgstr "Извођач: "
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "Назив датотеке: "
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr "Обриши претходни избор пре претраге"
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
 msgstr "Подударајуће ставке самостално пребаци у ред"
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
 msgstr "Направи нови списак нумера са подударајућим ставкама"
 
-#: src/skins/ui_playlist.c:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
 msgstr "Уређивач списка нумера"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d од %d)"
@@ -3344,12 +3143,12 @@
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Неархивирана Винамп 2.x маска"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Не могу да направим фасциклу (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
 msgstr "О прикључку датотеке звука"
 
@@ -3381,31 +3180,29 @@
 msgid "SndStretch - Configuration"
 msgstr "Подешавања Растезања звука"
 
-#: src/song_change/song_change.c:447
+#: src/song_change/song_change.c:437
 msgid "Command to run when Audacious starts a new song."
 msgstr "Наредба за покретање када Безочник започиње нову песму."
 
-#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
-#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
 msgstr "Наредба:"
 
-#: src/song_change/song_change.c:453
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
 msgstr "Наредба за покретање при крају песме."
 
-#: src/song_change/song_change.c:459
+#: src/song_change/song_change.c:449
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Наредба за покретање када Безочник стигне на крај списка нумера."
 
-#: src/song_change/song_change.c:465
+#: src/song_change/song_change.c:455
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr ""
-"Наредба за покретање када се промени наслов песме (тј. наслови мрежних "
-"токова)."
+msgstr "Наредба за покретање када се промени наслов песме (тј. наслови мрежних токова)."
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3422,44 +3219,27 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr ""
-"Можете да користите следеће ниске формата које\n"
-"ће бити замењене пре позивања наредбе\n"
-"(нису све корисне за наредбу крај-списка-нумера).\n"
-"\n"
-"%F: Учесталост (у херцима)\n"
-"%c: Број канала\n"
-"%f: Назив датотеке (пуна путања)\n"
-"%l: Трајање (у милисекундама)\n"
-"%n или %s: Назив песме\n"
-"%r: Проток (у битима у секунди)\n"
-"%t: Позиција списка нумера (%%02d)\n"
-"%p: Тренутно пуштена (1 или 0)\n"
-"%a: Уметник\n"
-"%b: Албум\n"
-"%T: Наслов нумере"
+msgstr "Можете да користите следеће ниске формата које\nће бити замењене пре позивања наредбе\n(нису све корисне за наредбу крај-списка-нумера).\n\n%F: Учесталост (у херцима)\n%c: Број канала\n%f: Назив датотеке (пуна путања)\n%l: Трајање (у милисекундама)\n%n или %s: Назив песме\n%r: Проток (у битима у секунди)\n%t: Позиција списка нумера (%%02d)\n%p: Тренутно пуштена (1 или 0)\n%a: Уметник\n%b: Албум\n%T: Наслов нумере"
 
-#: src/song_change/song_change.c:498
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr ""
-"Параметри прослеђени љусци би требало да буду у "
-"наводницима. Све другачије је безбедносни ризик."
+msgstr "Параметри прослеђени љусци би требало да буду у наводницима. Све другачије је безбедносни ризик."
 
-#: src/song_change/song_change.c:509
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr "Наредбе"
 
-#: src/song_change/song_change.c:539
+#: src/song_change/song_change.c:529
 msgid "Song Change"
 msgstr "Промена песме"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr "О прикључку иконице стања"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3468,64 +3248,58 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager.\n"
-msgstr ""
-"Прикључак иконице стања\n"
-"\n"
-"Ауторска права 2005-2007 Ђакомо Лоцито < james@develia.org >\n"
-"Ауторска права 2010 Михал Липски <tallica@o2.pl>\n"
-"\n"
-"Овај додатак обезбеђује иконицу стања, смештену\n"
-"у области фиоке система управника прозора.\n"
+msgstr "Прикључак иконице стања\n\nАуторска права 2005-2007 Ђакомо Лоцито < james@develia.org >\nАуторска права 2010 Михал Липски <tallica@o2.pl>\n\nОвај додатак обезбеђује иконицу стања, смештену\nу области фиоке система управника прозора.\n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr "Подешавања прикључка иконице стања"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr "Изборник десног клика"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
 msgstr "Мали изборник репродукције #1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
 msgstr "Мали изборник репродукције #2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr "Радња клизања мишем"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "Промени јачину звука"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
 msgstr "Промени песму"
 
-#: src/statusicon/statusicon.c:500
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
 msgstr "Остала подешавања"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
 msgstr "Искључи прозор облачића"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
 msgstr "Затвори у обавештајној зони (системска фиока)"
 
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Напредује у списку нумера када клиза унапред"
+
 #: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
-msgstr ""
-"Екстра прикључак стереа\n"
-"\n"
-"Написао Џон Левин 1999."
+msgstr "Екстра прикључак стереа\n\nНаписао Џон Левин 1999."
 
 #: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
@@ -3535,77 +3309,25 @@
 msgid "Configure Extra Stereo"
 msgstr "Подешавање екстра стереа"
 
-#: src/streambrowser/gui/streambrowser_win.c:78
-msgid "Search:"
-msgstr "Потражи:"
-
-#: src/streambrowser/gui/streambrowser_win.c:97
-#: src/streambrowser/gui/streambrowser_win.c:372
-msgid "Add Bookmark"
-msgstr "Додај обалежавач"
-
-#: src/streambrowser/gui/streambrowser_win.c:324
-msgid "Stream name"
-msgstr "Назив тока"
-
-#: src/streambrowser/gui/streambrowser_win.c:331
-msgid "Now playing"
-msgstr "Сад пуштам"
-
-#: src/streambrowser/gui/streambrowser_win.c:369
-msgid "Remove Bookmark"
-msgstr "Уклони обележивач"
-
-#: src/streambrowser/streambrowser.c:330
-msgid "About Stream Browser"
-msgstr "О прегледачу тока"
-
-#: src/streambrowser/streambrowser.c:331
-msgid ""
-"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming directories.\n"
-"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
-"\tand of course to the whole Audacious community.\n"
-"\n"
-"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-"\n"
-"This was a Google Summer of Code 2008 project."
-msgstr ""
-"Ауторска права (c) 2008, Калин Крисан <ccrisan@gmail.com> и тим Безочника.\n"
-"\n"
-"Ово је једноставан прегледник тока који укључује најпопуларније директоријуме тока.\n"
-"Велико хвала програмерима Стримтјунера <http://www.nongnu.org/streamtuner>,\n"
-" и наравно целокупној заједници Безочника. \n"
-"\n"
-"Хвала ти такође Тони Врун што си ме саветовао и водио, опет.\n"
-"\n"
-"Беше то Гугл лето пројекта Кôд 2008."
-
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr "О Тонском генератору"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
-msgstr ""
-"Синусни тонски генератор је написао Хавард Квален <havardk@xmms.org>\n"
-"Прерадио га је Данијел Ј. Пенг <danielpeng@bigfoot.com>\n"
-"\n"
-"Да га користите, додајте адресу: tone://учесталост1;учесталост2;учесталост3;...\n"
-"нпр.: tone://2000;2005 да пустите тонове 2000Hz и 2005Hz."
+msgstr "Синусни тонски генератор је написао Хавард Квален <havardk@xmms.org>\nПрерадио га је Данијел Ј. Пенг <danielpeng@bigfoot.com>\n\nДа га користите, додајте адресу: tone://учесталост1;учесталост2;учесталост3;...\nнпр.: tone://2000;2005 да пустите тонове 2000Hz и 2005Hz."
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr "Тонски генератор: "
 
@@ -3613,11 +3335,11 @@
 msgid "About File I/O Plugin"
 msgstr "О прикључку У/И датотеке"
 
-#: src/vorbis/vorbis.c:572
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "О Огг Ворбис аудио прикључку"
 
-#: src/vorbis/vorbis.c:577
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -3634,26 +3356,11 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>\n"
 "\n"
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
-msgstr ""
-"Огг Ворбис прикључак — Xiph.орг задужбина\n"
-"\n"
-"Оригинални кôд је написао:\n"
-"Тони Арћери <bascule@inferno.tusculum.edu>\n"
-"Допринели су:\n"
-"Крис Монтгомери <monty@xiph.org>\n"
-"Питер Алм <peter@xmms.org>\n"
-"Мајкл Смит <msmith@labyrinth.edu.au>\n"
-"Џек Мофит <jack@icecast.org>\n"
-"Јорн Бајен <jorn@nl.linux.org>\n"
-"Хавард Квален <havardk@xmms.org>\n"
-"Ђанкарло Паскуто <gcp@sjeng.org>\n"
-"Евгениј Загидулин <e.asphyx@gmail.com>\n"
-"\n"
-"Посетите Xiph.org задужбину на: http://www.xiph.org/\n"
+msgstr "Огг Ворбис прикључак — Xiph.орг задужбина\n\nОригинални кôд је написао:\nТони Арћери <bascule@inferno.tusculum.edu>\nДопринели су:\nКрис Монтгомери <monty@xiph.org>\nПитер Алм <peter@xmms.org>\nМајкл Смит <msmith@labyrinth.edu.au>\nЏек Мофит <jack@icecast.org>\nЈорн Бајен <jorn@nl.linux.org>\nХавард Квален <havardk@xmms.org>\nЂанкарло Паскуто <gcp@sjeng.org>\nЕвгениј Загидулин <e.asphyx@gmail.com>\n\nПосетите Xiph.org задужбину на: http://www.xiph.org/\n"
 
 #: src/vtx/about.c:14
 msgid "About Vortex Player"
-msgstr "О Вортекс програму"
+msgstr "О програму Вортекс"
 
 #: src/vtx/about.c:15
 msgid ""
@@ -3664,14 +3371,7 @@
 "and other AY/YM music sites.\n"
 "\n"
 "Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr ""
-"Програм за датотеке Вортекс формата је написао Сашнов Александер <sashnov@ngs.ru>\n"
-"Засновано на оригиналном извору „in_vtx.dll“ Романа Шербакова <v_soft@microfor.ru>\n"
-"\n"
-"Музику у втх формату можете пронаћи на: http://vtx.microfor.ru/music.htm\n"
-"и другим AY/YM сајтовима музике.\n"
-"\n"
-"Применио у Безочнику Павел Вимталек <pvymetalek@seznam.cz>"
+msgstr "Програм за датотеке Вортекс формата је написао Сашнов Александер <sashnov@ngs.ru>\nЗасновано на оригиналном извору „in_vtx.dll“ Романа Шербакова <v_soft@microfor.ru>\n\nМузику у втх формату можете пронаћи на: http://vtx.microfor.ru/music.htm\nи другим AY/YM сајтовима музике.\n\nПрименио у Безочнику Павел Вимталек <pvymetalek@seznam.cz>"
 
 #: src/wavpack/wavpack.c:353
 #, c-format
@@ -3684,10 +3384,4 @@
 "\n"
 "Some of the plugin code was by Miles Egan\n"
 "Visit the Wavpack site at http://www.wavpack.com/\n"
-msgstr ""
-"Ауторска права (c) 2006 Вилијам Питкок <nenolod -at- nenolod.net>\n"
-"\n"
-"Нешто кôда прикључка је урадио Мајлс Еган\n"
-"Посетите сајт Вејвпака на: http://www.wavpack.com/\n"
-
-
+msgstr "Ауторска права (c) 2006 Вилијам Питкок <nenolod -at- nenolod.net>\n\nНешто кôда прикључка је урадио Мајлс Еган\nПосетите сајт Вејвпака на: http://www.wavpack.com/\n"

audacious-plugins-3.2.4.tar.bz2/po/uk.po Added

@@ -0,0 +1,3392 @@
+# Ukrainian translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# fedenko <fedenko@ukr.net>, 2011.
+# Kostyantyn Fedenko <fedenko@ukr.net>, 2011.
+# NaiLi Rootaerc <theism@mail.ru>, 2012.
+# Rax Garfield (http://biokillaz.com/), 2012.
+# Rax Garfield (http://biokillaz.com)/, 2012.
+# Yuri Chornoivan <yurchor@ukr.net>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-02-25 12:07+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"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:256
+#, c-format
+msgid ""
+"Using libfaad2-%s for decoding.\n"
+"FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
+"Copyright (c) 2005-2006 Audacious team"
+msgstr "(c) 2005-2006, Команда Audacious.\n\nДля декодування використовується libfaad2-%s.\nДекодер FAAD2 AAC/HE-AAC/HE-AACv2/DRM: (c) Nero AG, www.nero.com"
+
+#: src/aac/libmp4.c:261
+msgid "About MP4 AAC decoder plugin"
+msgstr "Про плаґін декодування MP4 AAC"
+
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "Про Будильник"
+
+#: src/alarm/alarm.c:313
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr "Модуль, що починає й закінчує відтворення за розкладом.\n\nАвторами є Adam Feakin та Daniel Stodden."
+
+#: src/alarm/interface.c:33
+msgid "Alarm"
+msgstr "Будильник"
+
+#: src/alarm/interface.c:40
+msgid "This is your wakeup call."
+msgstr "Вставай, Україно! Вставай, рідна ненько! Москаль вже годину не спить!"
+
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
+msgid "OK"
+msgstr "Гаразд"
+
+#: src/alarm/interface.c:214
+msgid "Alarm Settings"
+msgstr "Налаштування будильника"
+
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
+msgid "Time"
+msgstr "Час"
+
+#: src/alarm/interface.c:270
+msgid "hours"
+msgstr "год"
+
+#: src/alarm/interface.c:331
+msgid "h"
+msgstr " "
+
+#: src/alarm/interface.c:361
+msgid "minutes"
+msgstr "хв"
+
+#: src/alarm/interface.c:379
+msgid "Quiet after:"
+msgstr "Закінчити через:"
+
+#: src/alarm/interface.c:389
+msgid "Alarm at (default):"
+msgstr "Починати о (типово):"
+
+#: src/alarm/interface.c:409
+msgid "Choose the days for the alarm to come on"
+msgstr "Налаштуйте дні тижня, в які працюватиме будильник."
+
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
+msgid "Default"
+msgstr "Як типово"
+
+#: src/alarm/interface.c:763
+msgid "Day"
+msgstr "День"
+
+#: src/alarm/interface.c:783
+msgid "Tuesday"
+msgstr "Вівторок"
+
+#: src/alarm/interface.c:794
+msgid "Wednesday"
+msgstr "Середа"
+
+#: src/alarm/interface.c:805
+msgid "Thursday"
+msgstr "Четвер"
+
+#: src/alarm/interface.c:816
+msgid "Friday"
+msgstr "П’ятниця"
+
+#: src/alarm/interface.c:827
+msgid "Saturday"
+msgstr "Субота"
+
+#: src/alarm/interface.c:838
+msgid "Sunday"
+msgstr "Неділя"
+
+#: src/alarm/interface.c:848
+msgid "Monday"
+msgstr "Понеділок"
+
+#: src/alarm/interface.c:859
+msgid "Days"
+msgstr "Дні"
+
+#: src/alarm/interface.c:875
+msgid "Fading"
+msgstr "Наростання"
+
+#: src/alarm/interface.c:912
+msgid "seconds"
+msgstr "сек"
+
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
+msgid "Volume"
+msgstr "Гучність"
+
+#: src/alarm/interface.c:946
+msgid "Current"
+msgstr "Як зараз"
+
+#: src/alarm/interface.c:954
+msgid "Start at"
+msgstr "На початку:"
+
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:998
+msgid "Final"
+msgstr "По закінченню:"
+
+#: src/alarm/interface.c:1051
+msgid "Additional Command"
+msgstr "Виконувати команду"
+
+#: src/alarm/interface.c:1077
+msgid "enable"
+msgstr "увімкнути"
+
+#: src/alarm/interface.c:1085
+msgid "Playlist (optional)"
+msgstr "Список відтворення (необов’язково)"
+
+#: src/alarm/interface.c:1111
+msgid "Browse..."
+msgstr "Огляд..."
+
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
+msgid "Reminder"
+msgstr "Повідомлення"
+
+#: src/alarm/interface.c:1136
+msgid "Use reminder"
+msgstr "Використовувати:"
+
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Опції"
+
+#: src/alarm/interface.c:1160
+msgid "What do these options mean?"
+msgstr "Як це все налаштувати?"
+
+#: src/alarm/interface.c:1188
+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 Нарощувати до цієї гучності. Якщо часом\n наростання є 0, то все відтворення йтиме\n з цією гучністю.\n\n\nОпції:\n Виконувати команду:\n Запускати цю команду під час спрацьовування.\n\n Список відтворення (необов’язково): \n Відтворювати цей список відтворення (лише \n з суфіксом .m3u). Якщо не вказано, то\n відтворюватимуться останні відкриті\n доріжки.\n Можна ввести сюди URL mp3- чи ogg-потоку.\n Поки що завантаження списків відтворення\n за URL не підтримується.\n\n Повідомлення:\n Показувати повідомлення при спрацьовуванні.\n Для використання введіть повідомлення в поле\n й увімкніть \"Використовувати:\".\n"
+
+#: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Як налаштувати?"
+
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Скасувати"
+
+#: src/alarm/interface.c:1290
+msgid "Your reminder for today is.."
+msgstr "Нагадую:"
+
+#: src/alarm/interface.c:1315
+msgid "Thankyou"
+msgstr "Дякую"
+
+#: src/alsa/config.c:210
+msgid "Default PCM device"
+msgstr "Типовий PCM-прилад"
+
+#: src/alsa/config.c:235
+msgid "Default mixer device"
+msgstr "Типовий мікшер"
+
+#: src/alsa/config.c:438
+msgid "ALSA Output Plugin Preferences"
+msgstr "Налаштування виводу ALSA"
+
+#: src/alsa/config.c:445
+msgid "PCM device:"
+msgstr "PCM-пристрій:"
+
+#: src/alsa/config.c:447 src/OSS/configure.c:237
+msgid "Mixer device:"
+msgstr "Мікшер:"
+
+#: src/alsa/config.c:449
+msgid "Mixer element:"
+msgstr "Елемент мікшера:"
+
+#: src/alsa/config.c:452
+msgid "Work around drain hangup"
+msgstr "Не зависати через \"drain\"-ваду ALSA"
+
+#: src/alsa/plugin.c:59
+msgid "About ALSA Output Plugin"
+msgstr "Про плаґін виводу ALSA"
+
+#: src/alsa/plugin.c:81
+msgid "ALSA error"
+msgstr "Збій ALSA"
+
+#: src/amidi-plug/amidi-plug.c:326
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr "Ви не вибрали портів секвенсера для відтворення MIDI. Виберіть їх у налаштуваннях AMIDI-Plug. "
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:35
+msgid "ALSA Backend "
+msgstr "Постпроцесор ALSA"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:37
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr "Цей постпроцесор посилає MIDI-повідомлення групі портів секвенсера ALSA, обраних користувачем. Інтерфейс секвенсера ALSA дуже гнучкий, він може надавати порти для апаратних синтезаторів аудіокарт (наприклад, emu10k1), програмних синтезаторів, зовнішніх приладів тощо.\nЦей постпроцесор не генерує звук. MIDI-повідомлення керуються напряму приладами та програмами за портами ALSA. Наприклад, MIDI-повідомлення, надіслані апаратному синтезатору, будуть відтворені напряму.\nАвтором постпроцесора є Giacomo Lozito."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
+msgid "FluidSynth Backend "
+msgstr "Постпроцесор FluidSynth"
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr "Цей модуль відтворює звукові дані, надсилаючи ноти MIDI до FluidSynth, програмного синтезатора, що працює у режимі реального часу на основі специфікацій SoundFont2 (www.fluidsynth.org).\nОтримані звукові дані може бути оброблено за допомогою додатків ефектів програвача і вибраного додатка виведення даних.\nМодуль створено Джакомо Лоціто (Giacomo Lozito)."
+
+#: src/amidi-plug/i_configure-alsa.c:228
+msgid "ALSA BACKEND CONFIGURATION"
+msgstr "Налаштування постпроцесора ALSA"
+
+#: src/amidi-plug/i_configure-alsa.c:331
+msgid "Port"
+msgstr "Порт"
+
+#: src/amidi-plug/i_configure-alsa.c:333
+msgid "Client name"
+msgstr "Назва клієнта"
+
+#: src/amidi-plug/i_configure-alsa.c:335
+msgid "Port name"
+msgstr "Назва порта"
+
+#: src/amidi-plug/i_configure-alsa.c:346
+msgid "ALSA output ports"
+msgstr "Порти виводу ALSA"
+
+#: src/amidi-plug/i_configure-alsa.c:399
+msgid "Soundcard: "
+msgstr "Звукова карта:"
+
+#: src/amidi-plug/i_configure-alsa.c:401
+msgid "Mixer control: "
+msgstr "Елемент мікшера:"
+
+#: src/amidi-plug/i_configure-alsa.c:413
+msgid "Mixer settings"
+msgstr "Налаштування мікшера"
+
+#: src/amidi-plug/i_configure-alsa.c:429
+msgid "ALSA Backend not loaded or not available"
+msgstr "Постпроцесор ALSA вимкнений або недоступний."
+
+#: src/amidi-plug/i_configure-alsa.c:448
+msgid ""
+"ALSA\n"
+"backend"
+msgstr "Постпроцесор\nALSA"
+
+#: src/amidi-plug/i_configure-ap.c:59
+msgid "AMIDI-Plug - backend information"
+msgstr "AMIDI-Plug - інформація про постпроцесор"
+
+#: src/amidi-plug/i_configure-ap.c:196
+msgid "AMIDI-PLUG PREFERENCES"
+msgstr "Налаштування AMIDI-Plug"
+
+#: src/amidi-plug/i_configure-ap.c:223
+msgid "Backend selection"
+msgstr "Вибір постпроцесора"
+
+#: src/amidi-plug/i_configure-ap.c:227
+msgid "Available backends"
+msgstr "Наявні постпроцесори"
+
+#: src/amidi-plug/i_configure-ap.c:257
+msgid "Playback settings"
+msgstr "Налаштування відтворення"
+
+#: src/amidi-plug/i_configure-ap.c:262
+msgid "Transpose: "
+msgstr "Транспозиція: "
+
+#: src/amidi-plug/i_configure-ap.c:271
+msgid "Drum shift: "
+msgstr "Зсув ударних: "
+
+#: src/amidi-plug/i_configure-ap.c:289
+msgid "Advanced settings"
+msgstr "Додаткові налаштування"
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "Обчислювати тривалість MIDI-файлів у списку відтворення наперед"
+
+#: src/amidi-plug/i_configure-ap.c:298
+msgid "extract comments from MIDI file (if available)"
+msgstr "Витягувати коментарі (якщо є) з MIDI-файлу"
+
+#: src/amidi-plug/i_configure-ap.c:303
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "Витягувати текст пісні (якщо є) з MIDI-файлу"
+
+#: src/amidi-plug/i_configure-ap.c:333
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr "AMIDI-\nPlug"
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug - select file"
+msgstr "AMIDI-Plug - вибір файлу"
+
+#: src/amidi-plug/i_configure.c:129
+msgid "AMIDI-Plug - configuration"
+msgstr "AMIDI-Plug - налаштування"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:55
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Plug - вибір файлу SoundFont"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:270
+msgid "FLUIDSYNTH BACKEND CONFIGURATION"
+msgstr "Налаштування постпроцесора FluidSynth"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:313
+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 "Розмір (у байтах)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:398
+msgid "Load SF on player start"
+msgstr "Завантажувати з програвачем"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:402
+msgid "Load SF on first midifile play"
+msgstr "Завантажувати при відтворенні MIDI"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:417
+msgid "Synthesizer settings"
+msgstr "Налаштування синтезатора"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:426
+msgid "gain"
+msgstr "Підсилення"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:432
+#: src/amidi-plug/i_configure-fluidsynth.c:460
+#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:519
+msgid "use default"
+msgstr "як типово"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:435
+#: src/amidi-plug/i_configure-fluidsynth.c:463
+msgid "value:"
+msgstr "значення:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:454
+msgid "poliphony"
+msgstr "Поліфонія"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:482
+msgid "reverb"
+msgstr "Реверберація"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:491
+#: src/amidi-plug/i_configure-fluidsynth.c:522
+msgid "yes"
+msgstr "так"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:493
+#: src/amidi-plug/i_configure-fluidsynth.c:524
+msgid "no"
+msgstr "ні"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:513
+msgid "chorus"
+msgstr "Хорус"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:544
+msgid "sample rate"
+msgstr "Частота дискретизації"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:550
+msgid "22050 Hz "
+msgstr "22050 Гц"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:553
+msgid "44100 Hz "
+msgstr "44100 Гц"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:556
+msgid "96000 Hz "
+msgstr "96000 Гц"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:559
+msgid "custom "
+msgstr "Задана:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "Hz "
+msgstr "Гц"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:621
+msgid "FluidSynth Backend not loaded or not available"
+msgstr "Постпроцесор FluidSynth вимкнений або недоступний."
+
+#: src/amidi-plug/i_configure-fluidsynth.c:640
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr "Постпроцесор\nFluidSynth"
+
+#: src/amidi-plug/i_configure-timidity.c:39
+msgid "TIMIDITY BACKEND CONFIGURATION"
+msgstr "Налаштування постпроцесора TiMidity"
+
+#: src/amidi-plug/i_configure-timidity.c:64
+msgid "TiMidity Backend not loaded or not available"
+msgstr "Постпроцесор TiMidity вимкнений або недоступний."
+
+#: src/amidi-plug/i_configure-timidity.c:83
+msgid ""
+"TiMidity\n"
+"backend"
+msgstr "Постпроцесор\nTiMidity"
+
+#: src/amidi-plug/i_fileinfo.c:169
+msgid "Name:"
+msgstr "Назва:"
+
+#: src/amidi-plug/i_fileinfo.c:193
+msgid " MIDI Info "
+msgstr " Інформація MIDI "
+
+#: src/amidi-plug/i_fileinfo.c:205
+msgid "Format:"
+msgstr "Назва:"
+
+#: src/amidi-plug/i_fileinfo.c:208
+msgid "Length (msec):"
+msgstr "Тривалість (мс):"
+
+#: src/amidi-plug/i_fileinfo.c:211
+msgid "Num of Tracks:"
+msgstr "Кількість доріжок:"
+
+#: src/amidi-plug/i_fileinfo.c:216
+msgid "variable"
+msgstr "змінна"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "BPM:"
+msgstr "Темп (BMP):"
+
+#: src/amidi-plug/i_fileinfo.c:223
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "Time Div:"
+msgstr "Часовий код MIDI:"
+
+#: src/amidi-plug/i_fileinfo.c:237
+msgid " MIDI Comments and Lyrics "
+msgstr " Коментарі й слова пісні в MIDI "
+
+#: src/amidi-plug/i_fileinfo.c:288
+msgid "* no comments available in this MIDI file *"
+msgstr "* у цьому MIDI-файлі немає коментарів *"
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* у цьому MIDI-файлі немає слів пісні *"
+
+#: src/amidi-plug/i_fileinfo.c:349
+msgid " (invalid UTF-8)"
+msgstr " (недійсний UTF-8)"
+
+#: src/amidi-plug/i_utils.c:43
+msgid "AMIDI-Plug - about"
+msgstr "Про AMIDI-Plug"
+
+#: src/amidi-plug/i_utils.c:68
+msgid ""
+"\n"
+"AMIDI-Plug "
+msgstr "\nAMIDI-Plug "
+
+#: src/amidi-plug/i_utils.c:69
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing\n"
+"\n"
+msgstr "\nмодульний MIDI-програвач\nhttp://www.develia.org/projects.php?p=amidiplug\n\nнаписаний Giacomo Lozito\n< james@develia.org >\n\nОсоблива подяка:\n\nClemens Ladisch та Jaroslav Kysela\nза їхні класні програми aplaymidi й amixer, котрі були \nдуже корисними, разом із документацією alsa-lib,\nу вивченні ALSA API;\n\nAlfredo Spadafina\nза гарненький логотип MIDI-клавіатури;\n\nTony Vroon\nза допомогу з альфа-тестуванням.\n\n"
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "Прямокутник"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "Заокруглений прямокутник"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "Увігнутий прямокутник"
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "Тільки текст"
+
+#: src/aosd/aosd_trigger.c:78
+msgid "Playback Start"
+msgstr "Відтворення"
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Показує повідомлення на початку відтворення."
+
+#: src/aosd/aosd_trigger.c:83
+msgid "Title Change"
+msgstr "Зміна назви"
+
+#: src/aosd/aosd_trigger.c:84
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr "Показує повідомлення, коли під час відтворення змінюється назва доріжки, а ім’я файлу залишається старим. Це корисно при відтворенні потоків."
+
+#: src/aosd/aosd_trigger.c:90
+msgid "Volume Change"
+msgstr "Зміна гучності"
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Triggers OSD when volume is changed."
+msgstr "Показує повідомлення при зміні гучності."
+
+#: src/aosd/aosd_trigger.c:95
+msgid "Pause On"
+msgstr "Пауза"
+
+#: src/aosd/aosd_trigger.c:96
+msgid "Triggers OSD when playback is paused."
+msgstr "Показує повідомлення при призупиненні відтворення."
+
+#: src/aosd/aosd_trigger.c:100
+msgid "Pause Off"
+msgstr "Продовження"
+
+#: src/aosd/aosd_trigger.c:101
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Показує повідомлення при продовженні відтворення."
+
+#: src/aosd/aosd_ui.c:179
+msgid "Placement"
+msgstr "Розташування"
+
+#: src/aosd/aosd_ui.c:218
+msgid "Relative X offset:"
+msgstr "Відносний горизонтальний зсув:"
+
+#: src/aosd/aosd_ui.c:227
+msgid "Relative Y offset:"
+msgstr "Відносний вертикальний зсув:"
+
+#: src/aosd/aosd_ui.c:236
+msgid "Max OSD width:"
+msgstr "Максимальна ширина повідомлення:"
+
+#: src/aosd/aosd_ui.c:249
+msgid "Multi-Monitor options"
+msgstr "Опції для кількох моніторів"
+
+#: src/aosd/aosd_ui.c:253
+msgid "Display OSD using:"
+msgstr "Показувати на:"
+
+#: src/aosd/aosd_ui.c:264
+msgid "all monitors"
+msgstr "всіх моніторах"
+
+#: src/aosd/aosd_ui.c:267
+#, c-format
+msgid "monitor %i"
+msgstr "моніторі %i"
+
+#: src/aosd/aosd_ui.c:322
+msgid "Timing (ms)"
+msgstr "Часова витримка (мс)"
+
+#: src/aosd/aosd_ui.c:327
+msgid "Display:"
+msgstr "Показ:"
+
+#: src/aosd/aosd_ui.c:332
+msgid "Fade in:"
+msgstr "Поява:"
+
+#: src/aosd/aosd_ui.c:337
+msgid "Fade out:"
+msgstr "Зникнення:"
+
+#: src/aosd/aosd_ui.c:418
+msgid "Fonts"
+msgstr "Шрифти"
+
+#: src/aosd/aosd_ui.c:426
+#, c-format
+msgid "Font %i:"
+msgstr "Шрифт %i:"
+
+#: src/aosd/aosd_ui.c:443
+msgid "Shadow"
+msgstr "Тінь"
+
+#: src/aosd/aosd_ui.c:478
+msgid "Internationalization"
+msgstr "Інтернаціоналізація"
+
+#: src/aosd/aosd_ui.c:484
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "Вимкнути перетворення тексту в UTF-8 в повідомленнях"
+
+#: src/aosd/aosd_ui.c:502
+msgid "Select Skin File"
+msgstr "Вибрати файл жупана"
+
+#: src/aosd/aosd_ui.c:613
+msgid "Render Style"
+msgstr "Показати стиль"
+
+#: src/aosd/aosd_ui.c:629
+msgid "Colors"
+msgstr "Кольори"
+
+#: src/aosd/aosd_ui.c:642
+#, c-format
+msgid "Color %i:"
+msgstr "Колір %i:"
+
+#: src/aosd/aosd_ui.c:662
+msgid "Custom Skin"
+msgstr "Власний жупан"
+
+#: src/aosd/aosd_ui.c:668
+msgid "Skin file:"
+msgstr "Файл жупана:"
+
+#: src/aosd/aosd_ui.c:671
+msgid "Browse"
+msgstr "Огляд..."
+
+#: src/aosd/aosd_ui.c:773
+msgid "Enable trigger"
+msgstr "Задіяти спусковий гачок"
+
+#: src/aosd/aosd_ui.c:800
+msgid "Event"
+msgstr "Подія"
+
+#: src/aosd/aosd_ui.c:828
+msgid "Composite manager detected"
+msgstr "Композитний "
+
+#: src/aosd/aosd_ui.c:835
+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 "Композитного менеджера не знайдено.\nЯкщо він не запущений, увімкніть його, інакше екранне меню працюватиме неправильно."
+
+#: src/aosd/aosd_ui.c:843
+msgid "Composite manager not required for fake transparency"
+msgstr "Композитний менеджер не потрібен для фальшивої прозорості"
+
+#: src/aosd/aosd_ui.c:881
+msgid "Transparency"
+msgstr "Прозорість"
+
+#: src/aosd/aosd_ui.c:887
+msgid "Fake transparency"
+msgstr "Фальшива прозорість"
+
+#: src/aosd/aosd_ui.c:889
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Справжня прозорість (потребує композитні розширення X)"
+
+#: src/aosd/aosd_ui.c:931
+msgid "Composite extension not loaded"
+msgstr "Композитне розширення вимкнене"
+
+#: src/aosd/aosd_ui.c:939
+msgid "Composite extension not available"
+msgstr "Композитне розширення недоступне"
+
+#: src/aosd/aosd_ui.c:958
+#, c-format
+msgid "Audacious OSD"
+msgstr "OSD-повідомлення Audacious"
+
+#: src/aosd/aosd_ui.c:1039
+msgid "Audacious OSD - configuration"
+msgstr "Налаштування повідомлень на екрані"
+
+#: src/aosd/aosd_ui.c:1060
+msgid "Test"
+msgstr "Перевірка"
+
+#: src/aosd/aosd_ui.c:1075
+msgid "Position"
+msgstr "Розташування"
+
+#: src/aosd/aosd_ui.c:1080
+msgid "Animation"
+msgstr "Анімація"
+
+#: src/aosd/aosd_ui.c:1085
+msgid "Text"
+msgstr "Текст"
+
+#: src/aosd/aosd_ui.c:1090
+msgid "Decoration"
+msgstr "Оздоблення"
+
+#: src/aosd/aosd_ui.c:1095
+msgid "Trigger"
+msgstr "Спусковий гачок"
+
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
+msgid "Misc"
+msgstr "Різне"
+
+#: src/aosd/aosd_ui.c:1137
+msgid "Audacious OSD - about"
+msgstr "Про плаґін повідомлень на екрані"
+
+#: src/aosd/aosd_ui.c:1167
+msgid ""
+"\n"
+"Audacious OSD "
+msgstr "\nAudacious OSD "
+
+#: src/aosd/aosd_ui.c:1168
+msgid ""
+"\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"written by Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"On-Screen-Display is based on Ghosd library\n"
+"written by Evan Martin\n"
+"http://neugierig.org/software/ghosd/\n"
+"\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\nАвтором є Giacomo Lozito\n<james@develia.org>\n\nБазується на бібліотеці Ghosd,\nавтором якої є Evan Martin,\nhttp://neugierig.org/software/ghosd/\n\n"
+
+#: src/blur_scope/config.c:73
+msgid "Blur Scope: Color selection"
+msgstr "Розпливчастий осцилограф: вибір кольору"
+
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
+msgid "Options:"
+msgstr "Опції:"
+
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr "Налаштування перетворення стереозвуку в бінауральний за Бауером"
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr "Рівень змішування каналів:"
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr "Частота зрізу:"
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr "Пресети:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:242
+msgid "About Audio CD Plugin"
+msgstr "Про плаґін аудіо-компакт-дисків"
+
+#: src/cdaudio-ng/cdaudio-ng.c:243
+msgid ""
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project.\n"
+"\n"
+"Copyright 2009 John Lindgren"
+msgstr "(c) 2007, Calin Crisan <ccrisan@gmail.com> і Команда Audacious.\n\n(c) 2009, John Lindgren.\n\nВелике спасибі розробникам libcdio <http://www.gnu.org/software/libcdio/>\nі розробникам libcddb <http://libcddb.sourceforge.net/>.\n\nТакож дякую Tony Vroon за наставництво й спрямовування.\n\nЦе був проект \"Google Summer of Code 2007\"."
+
+#: src/cdaudio-ng/cdaudio-ng.c:552
+msgid "Audio CD"
+msgstr "Аудіо-CD"
+
+#: src/cdaudio-ng/cdaudio-ng.c:924
+msgid "Drive is empty."
+msgstr "Привід порожній."
+
+#: src/cdaudio-ng/cdaudio-ng.c:926
+msgid "Unsupported disk type."
+msgstr "Непідтримуваний тип диску."
+
+#: src/cdaudio-ng/configure.c:148
+msgid "CD Audio Plugin Configuration"
+msgstr "Налаштування плаґіну відтворення CD"
+
+#: src/cdaudio-ng/configure.c:160
+msgid "Digital audio extraction"
+msgstr "Цифрове добування аудіо"
+
+#: src/cdaudio-ng/configure.c:165
+msgid "Title information"
+msgstr "Інформація про назви"
+
+#: src/cdaudio-ng/configure.c:176
+msgid "Disc speed:"
+msgstr "Швидкість обертання диска:"
+
+#: src/cdaudio-ng/configure.c:184
+msgid "Use cd-text if available"
+msgstr "Використовувати CD-Text за наявності"
+
+#: src/cdaudio-ng/configure.c:191
+msgid "Use CDDB if available"
+msgstr "Використовувати CDDB за можливості"
+
+#: src/cdaudio-ng/configure.c:197
+msgid "Server: "
+msgstr "Сервер: "
+
+#: src/cdaudio-ng/configure.c:201
+msgid "Path: "
+msgstr "Шлях: "
+
+#: src/cdaudio-ng/configure.c:205
+msgid "Port: "
+msgstr "Порт: "
+
+#: src/cdaudio-ng/configure.c:218
+msgid "Use HTTP instead of CDDBP"
+msgstr "Використовувати HTTP замість CDDBP"
+
+#: src/cdaudio-ng/configure.c:230
+msgid "Override default device: "
+msgstr "Примусово встановити пристрій: "
+
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
+msgid "Ok"
+msgstr "Гаразд"
+
+#: src/cd-menu-items/cd-menu-items.c:34
+msgid "Play CD"
+msgstr "Відтворити CD"
+
+#: src/cd-menu-items/cd-menu-items.c:34
+msgid "Add CD"
+msgstr "Додати CD"
+
+#: src/compressor/plugin.c:63
+msgid "About Dynamic Range Compression Plugin"
+msgstr "Про плаґін-компресор звукового діапазону"
+
+#: src/compressor/plugin.c:95
+msgid "Dynamic Range Compressor Preferences"
+msgstr "Налаштування компресора звукового діапазону"
+
+#: src/compressor/plugin.c:107
+msgid "Center volume:"
+msgstr "Гучність центру:"
+
+#: src/compressor/plugin.c:120
+msgid "Dynamic range:"
+msgstr "Динамічний діапазон:"
+
+#: src/console/configure.c:136
+msgid "Game Console Music Decoder"
+msgstr "Декодер ігроконсольної музики"
+
+#: src/console/configure.c:153
+msgid "General"
+msgstr "Загальне"
+
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
+msgid "Playback"
+msgstr "Відтворення"
+
+#: src/console/configure.c:170
+msgid "Bass:"
+msgstr "НЧ:"
+
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
+msgid "secs"
+msgstr "сек"
+
+#: src/console/configure.c:181
+msgid "Treble:"
+msgstr "ВЧ:"
+
+#: src/console/configure.c:202
+msgid "Default song length:"
+msgstr "Типова тривалість пісні:"
+
+#: src/console/configure.c:208
+msgid "Resampling"
+msgstr "Передискретизація"
+
+#: src/console/configure.c:214
+msgid "Enable audio resampling"
+msgstr "Примусова передискретизація"
+
+#: src/console/configure.c:229
+msgid "Resampling rate:"
+msgstr "Частота дискретизації:"
+
+#: src/console/configure.c:233
+msgid "Hz"
+msgstr "Гц"
+
+#: src/console/configure.c:244
+msgid "SPC"
+msgstr "SPC700"
+
+#: src/console/configure.c:245
+msgid "Ignore length from SPC tags"
+msgstr "Ігнорувати тривалість із теґів SPC"
+
+#: src/console/configure.c:246
+msgid "Increase reverb"
+msgstr "Посилити реверберацію"
+
+#: src/console/configure.c:271
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
+msgstr "Типова тривалість пісні, вказана в секундах, використовується для доріжок, що не мають інформації про тривалість (наприклад, повторювані доріжки)."
+
+#: src/console/plugin.c:33
+msgid "About the Game Console Music Decoder"
+msgstr "Про декодер ігроконсольної музики"
+
+#: src/console/plugin.c:34
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2.\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
+" Shay Green <gblargg@gmail.com>\n"
+msgstr "Двигунець декодування ігроконсольної музики базується на Game_Music_Emu 0.5.2.\nПідтримувані формати: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nДля Audacious імплементували William Pitcock <nenolod@dereferenced.org> та Shay Green <gblargg@gmail.com>\n"
+
+#: src/crossfade/plugin.c:60
+msgid "About Crossfade"
+msgstr "Про плаґін перехресного затихання-наростання"
+
+#: src/crossfade/plugin.c:92
+msgid "Crossfade Preferences"
+msgstr "Перехресне затихання"
+
+#: src/crossfade/plugin.c:104
+msgid "Overlap (in seconds):"
+msgstr "Охоплювати (секунд):"
+
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
+msgid "Crossfade Error"
+msgstr "Збій при перехресному затиханні"
+
+#: src/crossfade/plugin.c:135
+msgid ""
+"Crossfading failed because the songs had a different number of channels."
+msgstr "Перехресне затихання тут неможливе, бо доріжки мають різну кількість каналів."
+
+#: src/crossfade/plugin.c:143
+msgid ""
+"Crossfading failed because the songs had different sample rates.\n"
+"\n"
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
+msgstr "Перехресне затихання тут неможливе, бо доріжки мають різну частоту дискретизації.\n\nМожна використовувати ефект \"Sample Rate Converter\" для примусового встановлення частоти дискретизації."
+
+#: src/crystalizer/crystalizer.c:100
+msgid "Configure Crystalizer"
+msgstr "Налаштування Кристалізатора"
+
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
+msgid "Effect intensity:"
+msgstr "Інтенсивність ефекту:"
+
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
+msgid "Apply"
+msgstr "Застосувати"
+
+#: src/echo_plugin/gui.c:15
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin 1999.\n"
+"\n"
+"Surround echo by Carl van Schaik 1999"
+msgstr "Плаґін відлуння\nJohan Levin створив 1999 року.\n\nВідлуння об’ємного звуку написав 1999 року Carl van Schaik."
+
+#: src/echo_plugin/gui.c:27
+msgid "About Echo Plugin"
+msgstr "Про плаґін відлуння"
+
+#: src/echo_plugin/gui.c:67
+msgid "Configure Echo"
+msgstr "Налаштування відлуння"
+
+#: src/echo_plugin/gui.c:83
+msgid "Delay: (ms)"
+msgstr "Затримка (мс):"
+
+#: src/echo_plugin/gui.c:88
+msgid "Feedback: (%)"
+msgstr "Зворотній зв’язок (%):"
+
+#: src/echo_plugin/gui.c:93
+msgid "Volume: (%)"
+msgstr "Гучність (%): "
+
+#: src/ffaudio/ffaudio-core.c:718
+#, 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"
+"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 (http://www.ffmpeg.org/).\n(c) 2000-2009 Fabrice Bellard та інші.\n\nАвтори плаґіна для Audacious:\n William Pitcock <nenolod@nenolod.net>,\n Matti Hämäläinen <ccr@tnsp.org>.\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
+
+#: src/ffaudio/ffaudio-core.c:732
+msgid "About FFaudio Plugin"
+msgstr "Про плаґін FFaudio"
+
+#: src/filewriter/filewriter.c:166
+msgid "About FileWriter-Plugin"
+msgstr "Про плаґін FileWriter"
+
+#: src/filewriter/filewriter.c:461
+msgid "File Writer Configuration"
+msgstr "Налаштування виводу в файл"
+
+#: src/filewriter/filewriter.c:473
+msgid "Output file format:"
+msgstr "Тип файлу виводу:"
+
+#: src/filewriter/filewriter.c:491
+msgid "Configure"
+msgstr "Налаштування..."
+
+#: src/filewriter/filewriter.c:506
+msgid "Save into original directory"
+msgstr "Зберігати в теку оригіналу"
+
+#: src/filewriter/filewriter.c:511
+msgid "Save into custom directory"
+msgstr "Обрати теку самостійно"
+
+#: src/filewriter/filewriter.c:521
+msgid "Output file folder:"
+msgstr "Зберігати вивід до:"
+
+#: src/filewriter/filewriter.c:525
+msgid "Pick a folder"
+msgstr "Вибір теки виводу"
+
+#: src/filewriter/filewriter.c:544
+msgid "Get filename from:"
+msgstr "Назва файла:"
+
+#: src/filewriter/filewriter.c:547
+msgid "original file tags"
+msgstr "за тегами доріжки"
+
+#: src/filewriter/filewriter.c:553
+msgid "original filename"
+msgstr "за назвою файлу оригіналу"
+
+#: src/filewriter/filewriter.c:563
+msgid "Don't strip file name extension"
+msgstr "Не вирізати розширення оригіналу"
+
+#: src/filewriter/filewriter.c:578
+msgid "Prepend track number to filename"
+msgstr "Номер доріжки на початку назви файлу"
+
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
+msgid "Auto"
+msgstr "Авто"
+
+#: src/filewriter/mp3.c:38
+msgid "Joint Stereo"
+msgstr "Об’єднане стерео"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
+msgid "Stereo"
+msgstr "Стерео"
+
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
+msgid "Mono"
+msgstr "Моно"
+
+#: src/filewriter/mp3.c:706
+msgid "MP3 Configuration"
+msgstr "Налаштування MP3"
+
+#: src/filewriter/mp3.c:729
+msgid "Algorithm Quality:"
+msgstr "Швидкість стиснення:"
+
+#: src/filewriter/mp3.c:754
+msgid "Output Samplerate:"
+msgstr "Частота дискретизації виводу:"
+
+#: src/filewriter/mp3.c:782
+msgid "(Hz)"
+msgstr "Гц"
+
+#: src/filewriter/mp3.c:789
+msgid "Bitrate / Compression ratio:"
+msgstr "Сила стискання"
+
+#: src/filewriter/mp3.c:813
+msgid "Bitrate (kbps):"
+msgstr "Бітрейт (Кбіт/с)"
+
+#: src/filewriter/mp3.c:846
+msgid "Compression ratio:"
+msgstr "Коефіцієнт стиснення:"
+
+#: src/filewriter/mp3.c:870
+msgid "Audio Mode:"
+msgstr "Тип звуку:"
+
+#: src/filewriter/mp3.c:895
+msgid "Misc:"
+msgstr "Різне:"
+
+#: src/filewriter/mp3.c:906
+msgid "Enforce strict ISO complience"
+msgstr "Примусова відповідність до ISO (для апаратних програвачів, більший розмір)"
+
+#: src/filewriter/mp3.c:917
+msgid "Error protection"
+msgstr "CRC-захист від збоїв (дещо менша якість)"
+
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
+msgid "Quality"
+msgstr "Якість"
+
+#: src/filewriter/mp3.c:939
+msgid "Enable VBR/ABR"
+msgstr "Увімкнути змінний чи усереднений бітрейт"
+
+#: src/filewriter/mp3.c:949
+msgid "Type:"
+msgstr "Тип бітрейту:"
+
+#: src/filewriter/mp3.c:982
+msgid "VBR Options:"
+msgstr "Опції VBR (змінний бітрейт):"
+
+#: src/filewriter/mp3.c:998
+msgid "Minimum bitrate (kbps):"
+msgstr "Мінімальний бітрейт (Кбіт/c):"
+
+#: src/filewriter/mp3.c:1025
+msgid "Maximum bitrate (kbps):"
+msgstr "Максимальний бітрейт (Кбіт/c):"
+
+#: src/filewriter/mp3.c:1048
+msgid "Strictly enforce minimum bitrate"
+msgstr "Примусово встановити мінімальний бітрейт"
+
+#: src/filewriter/mp3.c:1060
+msgid "ABR Options:"
+msgstr "Опції ABR (усереднений бітрейт):"
+
+#: src/filewriter/mp3.c:1070
+msgid "Average bitrate (kbps):"
+msgstr "Середній бітрейт (Кбіт/с):"
+
+#: src/filewriter/mp3.c:1098
+msgid "VBR quality level:"
+msgstr "Рівень якості VBR (менше - краще):"
+
+#: src/filewriter/mp3.c:1117
+msgid "Don't write Xing VBR header"
+msgstr "Не писати VBR-заголовок (\"Xing\")"
+
+#: src/filewriter/mp3.c:1131
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1141
+msgid "Frame params:"
+msgstr "Позначки:"
+
+#: src/filewriter/mp3.c:1153
+msgid "Mark as copyright"
+msgstr "\"Під авторськими правами\""
+
+#: src/filewriter/mp3.c:1164
+msgid "Mark as original"
+msgstr "\"Є оригіналом\""
+
+#: src/filewriter/mp3.c:1176
+msgid "ID3 params:"
+msgstr "Параметри ID3:"
+
+#: src/filewriter/mp3.c:1187
+msgid "Force addition of version 2 tag"
+msgstr "Примусово додавати теґ другої версії"
+
+#: src/filewriter/mp3.c:1197
+msgid "Only add v1 tag"
+msgstr "Додавати лише v1-теґ"
+
+#: src/filewriter/mp3.c:1204
+msgid "Only add v2 tag"
+msgstr "Додавати лише v2-теґ"
+
+#: src/filewriter/mp3.c:1225
+msgid "Tags"
+msgstr "Теґи"
+
+#: src/filewriter/vorbis.c:240
+msgid "Vorbis Encoder Configuration"
+msgstr "Налаштування кодувальника Vorbis"
+
+#: src/filewriter/vorbis.c:260
+msgid "Quality level (0 - 10):"
+msgstr "Рівень якості (0-10, менше - краще):"
+
+#: src/flacng/plugin.c:380
+msgid "About FLAC Audio Plugin"
+msgstr "Про плаґін вводу з FLAC"
+
+#: src/flacng/plugin.c:381
+msgid ""
+"\n"
+"\n"
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\nАвтором оригіналу є\nRalf Ertzinger <ralf@skytale.net>.\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
+msgid "About Gnome Shortcut Plugin"
+msgstr "Про плаґін скорочень GNOME"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:304
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Let's you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+msgstr "Плаґін скорочень GNOME\nдозволяє керувати Audacious за допомогою скорочень GNOME.\n\n(c) 2007-2008, Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
+
+#: src/gtkui/columns.c:36
+msgid "Entry number"
+msgstr "Номер у списку"
+
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
+msgid "Title"
+msgstr "Назва"
+
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
+msgid "Artist"
+msgstr "Виконавець"
+
+#: src/gtkui/columns.c:37
+msgid "Year"
+msgstr "Рік"
+
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
+msgid "Album"
+msgstr "Альбом"
+
+#: src/gtkui/columns.c:37
+msgid "Track"
+msgstr "Доріжка"
+
+#: src/gtkui/columns.c:37
+msgid "Queue position"
+msgstr "Позиція у черзі"
+
+#: src/gtkui/columns.c:38
+msgid "Length"
+msgstr "Тривалість"
+
+#: src/gtkui/columns.c:38
+msgid "File path"
+msgstr "Шлях до файлу"
+
+#: src/gtkui/columns.c:38
+msgid "File name"
+msgstr "Назва файлу"
+
+#: src/gtkui/columns.c:38
+msgid "Custom title"
+msgstr "Назва файлу"
+
+#: src/gtkui/columns.c:39
+msgid "Bitrate"
+msgstr "Бітова швидкість"
+
+#: src/gtkui/columns.c:278
+msgid "Choose Columns"
+msgstr "Вибрати стовпчики"
+
+#: src/gtkui/columns.c:292
+msgid "Available:"
+msgstr "Доступні:"
+
+#: src/gtkui/columns.c:326
+msgid "Chosen:"
+msgstr "Вибрані:"
+
+#: src/gtkui/layout.c:122
+msgid "Dock at Left"
+msgstr "Прикріпити зліва"
+
+#: src/gtkui/layout.c:122
+msgid "Dock at Right"
+msgstr "Прикріпити справа"
+
+#: src/gtkui/layout.c:123
+msgid "Dock at Top"
+msgstr "Прикріпити вгорі"
+
+#: src/gtkui/layout.c:123
+msgid "Dock at Bottom"
+msgstr "Прикріпити внизу"
+
+#: src/gtkui/layout.c:123
+msgid "Undock"
+msgstr "Відкріпити"
+
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
+msgid "Disable"
+msgstr "Вимкнути"
+
+#: src/gtkui/menus.c:131
+msgid "_Open Files ..."
+msgstr "Відтворити _файли..."
+
+#: src/gtkui/menus.c:132
+msgid "Open _URL ..."
+msgstr "Відтворити файли за _посиланням..."
+
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "_Додати файли..."
+
+#: src/gtkui/menus.c:134
+msgid "Add U_RL ..."
+msgstr "Додати файли _за посиланням..."
+
+#: src/gtkui/menus.c:136
+msgid "A_bout ..."
+msgstr "П_ро Audacious..."
+
+#: src/gtkui/menus.c:137
+msgid "_Preferences ..."
+msgstr "_Налаштування..."
+
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
+msgid "_Quit"
+msgstr "_Вихід"
+
+#: src/gtkui/menus.c:141
+msgid "_Play"
+msgstr "_Відтворити"
+
+#: src/gtkui/menus.c:142
+msgid "Paus_e"
+msgstr "_Призупинити"
+
+#: src/gtkui/menus.c:143
+msgid "_Stop"
+msgstr "_Зупинити"
+
+#: src/gtkui/menus.c:144
+msgid "Pre_vious"
+msgstr "П_опередня"
+
+#: src/gtkui/menus.c:145
+msgid "_Next"
+msgstr "_Наступна"
+
+#: src/gtkui/menus.c:147
+msgid "_Repeat"
+msgstr "Повто_рювати"
+
+#: src/gtkui/menus.c:148
+msgid "S_huffle"
+msgstr "В_ипадково"
+
+#: src/gtkui/menus.c:149
+msgid "N_o Playlist Advance"
+msgstr "Н_е просуватися списком"
+
+#: src/gtkui/menus.c:150
+msgid "Stop _After This Song"
+msgstr "Зупинити після _цієї пісні"
+
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
+msgid "Song _Info ..."
+msgstr "_Інформація про доріжку..."
+
+#: src/gtkui/menus.c:153
+msgid "Jump to _Time ..."
+msgstr "Перейти до _часу..."
+
+#: src/gtkui/menus.c:154
+msgid "_Jump to Song ..."
+msgstr "Перейти до _доріжки..."
+
+#: src/gtkui/menus.c:157
+msgid "By Track _Number"
+msgstr "_За номером доріжки"
+
+#: src/gtkui/menus.c:158
+msgid "By _Title"
+msgstr "За _назвою"
+
+#: src/gtkui/menus.c:159
+msgid "By _Artist"
+msgstr "За _виконавцем"
+
+#: src/gtkui/menus.c:160
+msgid "By A_lbum"
+msgstr "За _альбомом"
+
+#: src/gtkui/menus.c:161
+msgid "By Release _Date"
+msgstr "За _датою видання"
+
+#: src/gtkui/menus.c:162
+msgid "By _File Path"
+msgstr "За _шляхом до файлу"
+
+#: src/gtkui/menus.c:163
+msgid "By _Custom Title"
+msgstr "За назвою _файлу"
+
+#: src/gtkui/menus.c:165
+msgid "R_everse Order"
+msgstr "_У зворотньому порядку"
+
+#: src/gtkui/menus.c:166
+msgid "_Random Order"
+msgstr "У випадковому по_рядку"
+
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
+msgid "_Refresh"
+msgstr "_Оновити"
+
+#: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "Прибрати _недоступні файли"
+
+#: src/gtkui/menus.c:172
+msgid "_Sort"
+msgstr "_Сортувати"
+
+#: src/gtkui/menus.c:174
+msgid "_New"
+msgstr "_Новий"
+
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
+msgid "_Close"
+msgstr "_Закрити"
+
+#: src/gtkui/menus.c:177
+msgid "_Import ..."
+msgstr "_Імпортувати..."
+
+#: src/gtkui/menus.c:178
+msgid "_Export ..."
+msgstr "_Експортувати..."
+
+#: src/gtkui/menus.c:180
+msgid "_Playlist Manager ..."
+msgstr "Керування списками _відтворення..."
+
+#: src/gtkui/menus.c:181
+msgid "_Queue Manager ..."
+msgstr "Керування _чергою..."
+
+#: src/gtkui/menus.c:184
+msgid "Volume _Up"
+msgstr "З_більшити гучність"
+
+#: src/gtkui/menus.c:185
+msgid "Volume _Down"
+msgstr "З_меншити гучність"
+
+#: src/gtkui/menus.c:187
+msgid "_Equalizer"
+msgstr "_Еквалайзер"
+
+#: src/gtkui/menus.c:189
+msgid "E_ffects"
+msgstr "Е_фекти"
+
+#: src/gtkui/menus.c:192
+msgid "_Interface"
+msgstr "_Інтерфейс"
+
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "_Візуалізація"
+
+#: src/gtkui/menus.c:195
+msgid "Show _Menu Bar"
+msgstr "Показувати панель _меню"
+
+#: src/gtkui/menus.c:196
+msgid "Show I_nfo Bar"
+msgstr "Показувати панель і_нформації"
+
+#: src/gtkui/menus.c:197
+msgid "Show _Status Bar"
+msgstr "Показувати рядок _стану"
+
+#: src/gtkui/menus.c:199
+msgid "Show Column _Headers"
+msgstr "Показувати _заголовки стовпчиків "
+
+#: src/gtkui/menus.c:200
+msgid "Choose _Columns ..."
+msgstr "Вибрати с_товпчики..."
+
+#: src/gtkui/menus.c:201
+msgid "Scrol_l on Song Change"
+msgstr "_Прокручувати при зміні доріжки"
+
+#: src/gtkui/menus.c:204
+msgid "_File"
+msgstr "_Файл"
+
+#: src/gtkui/menus.c:205
+msgid "_Playback"
+msgstr "_Відтворення"
+
+#: src/gtkui/menus.c:206
+msgid "P_laylist"
+msgstr "_Список відтворення"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
+msgid "_Services"
+msgstr "С_лужби"
+
+#: src/gtkui/menus.c:208
+msgid "_Output"
+msgstr "В_ивід"
+
+#: src/gtkui/menus.c:209
+msgid "_View"
+msgstr "Ви_гляд"
+
+#: src/gtkui/menus.c:213
+msgid "_Queue/Unqueue"
+msgstr "_Елемент черги"
+
+#: src/gtkui/menus.c:216
+msgid "Cu_t"
+msgstr "_Вирізати"
+
+#: src/gtkui/menus.c:217
+msgid "_Copy"
+msgstr "_Копіювати"
+
+#: src/gtkui/menus.c:218
+msgid "_Paste"
+msgstr "Вст_авити"
+
+#: src/gtkui/menus.c:219
+msgid "Select _All"
+msgstr "Виді_лити все"
+
+#: src/gtkui/menus.c:224
+msgid "_Rename"
+msgstr "Перей_менувати"
+
+#: src/gtkui/ui_gtk.c:95
+msgid "GTK Interface"
+msgstr "Інтерфейс GTK"
+
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "Буферую..."
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
+msgid "Error"
+msgstr "Помилка"
+
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "Закрити"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
+msgid "mono"
+msgstr "моно"
+
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
+msgid "stereo"
+msgstr "стерео"
+
+#: src/gtkui/ui_statusbar.c:109
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] "%d канал"
+msgstr[1] "%d канали"
+msgstr[2] "%d каналів"
+
+#: src/gtkui/ui_statusbar.c:124
+#, c-format
+msgid "%d kbps"
+msgstr "%d кб/с"
+
+#: src/hotkey/gui.c:71
+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 "Наступна доріжка"
+
+#: src/hotkey/gui.c:76
+msgid "Forward 5 Seconds"
+msgstr "На 5 секунд вперед"
+
+#: src/hotkey/gui.c:77
+msgid "Rewind 5 Seconds"
+msgstr "На 5 секунд назад"
+
+#: src/hotkey/gui.c:78
+msgid "Mute"
+msgstr "Вимкнути звук"
+
+#: src/hotkey/gui.c:79
+msgid "Volume Up"
+msgstr "Збільшити гучність"
+
+#: src/hotkey/gui.c:80
+msgid "Volume Down"
+msgstr "Зменшити гучність"
+
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+msgid "Jump to File"
+msgstr "Перейти до файлу"
+
+#: src/hotkey/gui.c:82
+msgid "Toggle Player Windows"
+msgstr "Перемкнути стан вікон програвача"
+
+#: src/hotkey/gui.c:83
+msgid "Show On-Screen-Display"
+msgstr "Показати OSD-повідомлення"
+
+#: 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:232
+msgid ""
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr "Не раджу пов’язувати головні кнопки миші без модифікаторів.\n\nПродовжувати попри це?"
+
+#: src/hotkey/gui.c:234
+msgid "Binding mouse buttons"
+msgstr "Пов’язування кнопок миші"
+
+#: src/hotkey/gui.c:384
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Налаштування гарячих клавіш"
+
+#: src/hotkey/gui.c:400
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr "Маючи курсор на полі, натисніть необхідну клавішу чи комбінацію всередині поля.\nМожна також прив’язувати кнопки миші."
+
+#: src/hotkey/gui.c:405
+msgid "Hotkeys:"
+msgstr "Гарячі клавіші:"
+
+#: src/hotkey/gui.c:424
+msgid "Action:"
+msgstr "Дія:"
+
+#: src/hotkey/gui.c:432
+msgid "Key Binding:"
+msgstr "Прив’язка до клавіш:"
+
+#: src/hotkey/gui.c:663
+msgid "About Global Hotkey Plugin"
+msgstr "Про плаґін гарячих клавіш"
+
+#: src/hotkey/gui.c:664
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
+msgstr "Плаґін гарячих клавіш\nдозволяє керувати Audacious за допомогою клавіш чи їх комбінацій.\n\n(c) 2007-2008, Sascha Hlusiak <contact@saschahlusiak.de>\n\nТакож брали участь:\n(c) 2006-2007, Vladimir Paskov <vlado.paskov@gmail.com>,\n(c) 2000-2002, Ville Syrjälä <syrjala@sci.fi>,\n\t\tBryn Davies <curious@ihug.com.au>,\n\t\tJonathan A. Davis <davis@jdhouse.org>,\n\t\tJeremy Tan <nsx@nsx.homeip.net>,\n\n"
+
+#: src/jack/configure.c:66
+msgid "Connect to all available jack ports"
+msgstr "Встановити зв’язок із усіма доступними JACK-портами"
+
+#: src/jack/configure.c:73
+msgid "Connect only the output ports"
+msgstr "Встановити зв’язок лише з портами виводу"
+
+#: src/jack/configure.c:80
+msgid "Connect to no ports"
+msgstr "Не встановлювати зв’язка з портами"
+
+#: src/jack/configure.c:98
+msgid "jack Plugin configuration"
+msgstr "Налаштування плаґіна JACK"
+
+#: src/jack/configure.c:116
+msgid "Connection mode:"
+msgstr "Режим з’єднання:"
+
+#: src/jack/configure.c:128
+msgid "Enable debug printing"
+msgstr "Виводити налагоджувальну інформацію"
+
+#: src/jack/jack.c:435
+msgid ""
+"XMMS jack Driver 0.17\n"
+"\n"
+"xmms-jack.sf.net\n"
+"Chris Morgan<cmorgan@alum.wpi.edu>\n"
+"\n"
+"Audacious port by\n"
+"Giacomo Lozito from develia.org"
+msgstr "Драйвер JACK до XMMS 0.17\n\nxmms-jack.sf.net\nАвтор: Chris Morgan <cmorgan@alum.wpi.edu>\n\nGiacomo Lozito із develia.org\nспортував під Audacious"
+
+#: src/jack/jack.c:440
+msgid "About JACK Output Plugin 0.17"
+msgstr "Про плаґін виводу JACK"
+
+#: src/ladspa/plugin.c:415
+msgid "About LADSPA Host"
+msgstr "Про хост LADSPA"
+
+#: src/ladspa/plugin.c:516
+#, c-format
+msgid "%s Settings"
+msgstr "Налаштування %s"
+
+#: src/ladspa/plugin.c:584
+msgid "LADSPA Host Settings"
+msgstr "Налаштування хосту LADSPA"
+
+#: src/ladspa/plugin.c:593
+msgid "Module paths:"
+msgstr "Шляхи до модулів:"
+
+#: src/ladspa/plugin.c:598
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr "Якщо шляхів кілька, розділяйте їх двокрапками.\nПошук відбувається за вказаними шляхами та змінною LADSPA_PATH.\nВказавши шляхи, натисніть Enter для пошуку плаґінів."
+
+#: src/ladspa/plugin.c:614
+msgid "Available plugins:"
+msgstr "Наявні плаґіни:"
+
+#: src/ladspa/plugin.c:626
+msgid "Enable"
+msgstr "Увімкнути"
+
+#: src/ladspa/plugin.c:632
+msgid "Enabled plugins:"
+msgstr "Увімкнені плаґіни:"
+
+#: src/ladspa/plugin.c:647
+msgid "Settings"
+msgstr "Налаштування"
+
+#: src/lyricwiki/lyricwiki.c:267
+msgid ""
+"\n"
+"Looking for lyrics..."
+msgstr "\nШукаю слова..."
+
+#: src/lyricwiki/lyricwiki.c:304
+msgid ""
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr "\nЗ’єднуюся з lyrics.wikia.com..."
+
+#: src/lyricwiki/lyricwiki.c:377
+msgid ""
+"\n"
+"No lyrics were found."
+msgstr "\nНе знайдено слів пісні."
+
+#: src/metronom/metronom.c:86
+msgid "About Metronom"
+msgstr "Про плаґін-метроном"
+
+#: src/metronom/metronom.c:87
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr "Генератор такту, написаний Martin Strauss <mys@faveve.uni-stuttgart.de>,\n\nможна використовувати за URL: tact://beats*num/den\n(наприклад, tact://77 генерує такт із темпом 77 BPM,\ntact://60*3/4 - такт із темпом 60 BPM і розміром 3/4)"
+
+#: src/metronom/metronom.c:144
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Генератор такту: %d BPM"
+
+#: src/metronom/metronom.c:146
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Генератор такту: %d BPM, %d/%d"
+
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "Про змішувач каналів"
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "Налаштування змішувача каналів"
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "Каналів на виході:"
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "Зміни здійснюються при зміні відтворюваної доріжки."
+
+#: src/mpg123/mpg123.c:191
+msgid "Surround"
+msgstr "Об’ємний звук"
+
+#: src/mtp_up/mtp.c:340
+msgid "Upload in progress..."
+msgstr "Завантажую..."
+
+#: src/mtp_up/mtp.c:352
+msgid "Upload to MTP Device"
+msgstr "Завантажити на MTP-прилад"
+
+#: src/mtp_up/mtp.c:353
+msgid "Disconnect MTP Device"
+msgstr "Від’єднати MTP-прилад"
+
+#: src/notify/libnotify-aosd_event.c:48
+msgid "Stopped"
+msgstr "Зупинено"
+
+#: src/notify/libnotify-aosd_event.c:48
+msgid "Audacious is not playing."
+msgstr "Audacious нічого не відтворює."
+
+#: src/null/null.c:64
+msgid "Null output plugin "
+msgstr "Плаґін виводу в null"
+
+#: src/null/null.c:65
+msgid ""
+" by Christian Birchinger <joker@netswarm.net>\n"
+"based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
+msgstr " написаний Christian Birchinger <joker@netswarm.net>\nна основі плаґіну XMMS, написаного Håvard Kvål <havardk@xmms.org>"
+
+#: src/null/null.c:68
+msgid "About Null Output"
+msgstr "Про вивід у нікуди"
+
+#: src/null/null.c:89
+msgid "Null output preferences"
+msgstr "Налаштування виводу в нікуди"
+
+#: src/null/null.c:100
+msgid "Run in real time"
+msgstr "В реальному часі"
+
+#: src/oss4/configure.c:81
+msgid "1. Default device"
+msgstr "1. Типовий прилад"
+
+#: src/oss4/configure.c:138
+msgid "OSS4 Output Plugin Preferences"
+msgstr "Налаштування плаґіну виводу в OSS4"
+
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
+msgid "Audio device:"
+msgstr "Аудіоприлад:"
+
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
+msgid "Use alternate device:"
+msgstr "Використати інший прилад:"
+
+#: src/oss4/configure.c:193
+msgid "Save volume between sessions"
+msgstr "Зберігати гучність між сесіями"
+
+#: src/oss4/configure.c:197
+msgid "Enable format conversions made by the OSS software."
+msgstr "Задіяти зміни формату, здійснені програмами OSS."
+
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Діяти в ексклюзивному режимі, уникаючи віртуального мікшування."
+
+#: src/oss4/plugin.c:51
+msgid "About OSS4 Plugin"
+msgstr "Про плаґін виводу в OSS4"
+
+#: src/oss4/utils.c:211
+msgid "OSS4 error"
+msgstr "Збій OSS4"
+
+#: src/OSS/configure.c:137
+#, c-format
+msgid "Default (%s)"
+msgstr "Типово (%s)"
+
+#: src/OSS/configure.c:178
+msgid "OSS Driver configuration"
+msgstr "Налаштування драйвера OSS"
+
+#: src/OSS/configure.c:281
+msgid "Devices"
+msgstr "Прилади"
+
+#: src/OSS/configure.c:283
+msgid "Buffering:"
+msgstr "Буферування:"
+
+#: src/OSS/configure.c:296
+msgid "Pre-buffer (percent):"
+msgstr "Попередня буферизація (%):"
+
+#: src/OSS/configure.c:307
+msgid "Buffering"
+msgstr "Буферування"
+
+#: src/OSS/configure.c:308
+msgid "Mixer Settings:"
+msgstr "Налаштування мікшера:"
+
+#: src/OSS/configure.c:314
+msgid "Volume controls Master not PCM"
+msgstr "Гучність контролює Master, не PCM."
+
+#: src/OSS/configure.c:320
+msgid "Mixer"
+msgstr "Мікшер"
+
+#: src/OSS/OSS.c:41
+msgid "About OSS Driver"
+msgstr "Про драйвер OSS"
+
+#: src/pulse_audio/pulse_audio.c:677
+msgid "About Audacious PulseAudio Output Plugin"
+msgstr "Про плаґін виводу в PulseAudio"
+
+#: src/resample/plugin.c:89
+msgid "About Sample Rate Converter Plugin"
+msgstr "Про плаґін-перетворювач частоти дискретизації"
+
+#: src/resample/plugin.c:144
+msgid "Sample Rate Converter Preferences"
+msgstr "Налаштування перетворення частоти дискретизації"
+
+#: src/resample/plugin.c:156
+msgid "Rate mappings:"
+msgstr "Відповідність частот:"
+
+#: src/resample/plugin.c:179
+msgid "All others:"
+msgstr "Усі інші:"
+
+#: src/resample/plugin.c:191
+msgid "Method:"
+msgstr "Метод:"
+
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
+msgid "Change password"
+msgstr "Змінити пароль"
+
+#: src/scrobbler/configure.c:144
+msgid "Services"
+msgstr "Служби"
+
+#: src/scrobbler/configure.c:166
+msgid "Username:"
+msgstr "Ім’я користувача:"
+
+#: src/scrobbler/configure.c:172
+msgid "Password:"
+msgstr "Пароль:"
+
+#: src/scrobbler/configure.c:180
+msgid "Scrobbler URL:"
+msgstr "URL Scrobbler:"
+
+#: src/scrobbler/configure.c:212
+msgid "Last.FM"
+msgstr "Last.FM"
+
+#: src/scrobbler/configure.c:239
+msgid "Scrobbler"
+msgstr "Scrobbler"
+
+#: src/scrobbler/plugin.c:194
+msgid ""
+"Audacious AudioScrobbler Plugin\n"
+"\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr "Плаґін AudioScrobbler для Audacious\n\nОригінал створили Audun Hove <audun@nlc.no> та Pipian <pipian@pipian.com>\n"
+
+#: src/scrobbler/plugin.c:196
+msgid "About Scrobbler Plugin"
+msgstr "Про плаґін Scrobbler"
+
+#: src/sdlout/plugin.c:58
+msgid "About SDL Output Plugin"
+msgstr "Про плаґін виводу SDL"
+
+#: src/sdlout/plugin.c:78
+msgid "SDL error"
+msgstr "Збій SDL"
+
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "Жанр"
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "Бібліотека"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "_Створити список відтворення"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "_Додати до списку відтворення"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "Шукати в бібліотеці"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr "Щоб імпортувати свою музичну бібліотеку до Audacious, виберіть теку й натисніть на значок оновлення."
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "Зачекайте..."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "Вибрати теку"
+
+#: src/skins/plugin.c:167
+msgid "About Skinned GUI"
+msgstr "Про GUI \"Skinned\""
+
+#: src/skins/plugin.c:168
+msgid ""
+"Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
+"\n"
+msgstr "(c) 2008, Tomasz Moń <desowin@gmail.com>\n\n"
+
+#: src/skins/skins_cfg.c:207
+msgid "_Player:"
+msgstr "_Програвач"
+
+#: src/skins/skins_cfg.c:208
+msgid "Select main player window font:"
+msgstr "Шрифт основного вікна програвача"
+
+#: src/skins/skins_cfg.c:210
+msgid "_Playlist:"
+msgstr "_Список відтворення"
+
+#: src/skins/skins_cfg.c:211
+msgid "Select playlist font:"
+msgstr "Шрифт списку відтворення:"
+
+#: src/skins/skins_cfg.c:215
+msgid "_Fonts"
+msgstr "Шрифти"
+
+#: src/skins/skins_cfg.c:218
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Використовувати растрові шрифти (підтримується тільки ASCII)"
+
+#: src/skins/skins_cfg.c:220
+msgid "Scroll song title in both directions"
+msgstr "Прокручувати назву пісні в обох напрямках"
+
+#: src/skins/skins_cfg.c:298
+msgid "_Skin"
+msgstr "Жупан"
+
+#: src/skins/skins_cfg.c:345
+msgid "Interface Preferences"
+msgstr "Налаштування інтерфейсу"
+
+#: src/skins/ui_equalizer.c:330
+msgid "Preamp"
+msgstr "Попередній підсилювач"
+
+#: src/skins/ui_equalizer.c:334
+msgid "31 Hz"
+msgstr "31 Гц"
+
+#: src/skins/ui_equalizer.c:335
+msgid "63 Hz"
+msgstr "63 Гц"
+
+#: src/skins/ui_equalizer.c:335
+msgid "125 Hz"
+msgstr "125 Гц"
+
+#: src/skins/ui_equalizer.c:335
+msgid "250 Hz"
+msgstr "250 Гц"
+
+#: src/skins/ui_equalizer.c:335
+msgid "500 Hz"
+msgstr "500 Гц"
+
+#: src/skins/ui_equalizer.c:335
+msgid "1 kHz"
+msgstr "1 кГц"
+
+#: src/skins/ui_equalizer.c:336
+msgid "2 kHz"
+msgstr "2 кГц"
+
+#: src/skins/ui_equalizer.c:336
+msgid "4 kHz"
+msgstr "4 кГц"
+
+#: src/skins/ui_equalizer.c:336
+msgid "8 kHz"
+msgstr "8 кГц"
+
+#: src/skins/ui_equalizer.c:336
+msgid "16 kHz"
+msgstr "16 кГц"
+
+#: src/skins/ui_equalizer.c:379
+msgid "Audacious Equalizer"
+msgstr "Еквалайзер Audacious"
+
+#: src/skins/ui_equalizer.c:887
+msgid "Presets"
+msgstr "Типові налаштування"
+
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "Вибір пресету"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "Завантажити відповідний доріжці пресет"
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "Завантажити еквалайзерний пресет"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "Збереження пресету"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "Зберегти пресет як відповідний доріжці"
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "Зберегти еквалайзерний пресет"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "Видалення пресету"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "Видалити відповідний доріжці пресет"
+
+#: src/skins/ui_main.c:444
+msgid "kbps"
+msgstr "кб/с"
+
+#: src/skins/ui_main.c:452
+msgid "kHz"
+msgstr "кГц"
+
+#: src/skins/ui_main.c:459
+msgid "surround"
+msgstr "об'ємний"
+
+#: src/skins/ui_main.c:807
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Перехід до %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/ui_main.c:828
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Гучність: %d%%"
+
+#: src/skins/ui_main.c:851
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Баланс: %d%% вліво"
+
+#: src/skins/ui_main.c:853
+msgid "Balance: center"
+msgstr "Баланс: центр"
+
+#: src/skins/ui_main.c:855
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Баланс: %d%% вправо"
+
+#: src/skins/ui_main.c:981
+msgid "Options Menu"
+msgstr "Меню опцій"
+
+#: src/skins/ui_main.c:985
+msgid "Disable 'Always On Top'"
+msgstr "Вимкнути відображення над іншими вікнами"
+
+#: src/skins/ui_main.c:987
+msgid "Enable 'Always On Top'"
+msgstr "Відображати над іншими вікнами"
+
+#: src/skins/ui_main.c:990
+msgid "File Info Box"
+msgstr "Редактор інформації про доріжку"
+
+#: src/skins/ui_main.c:995
+msgid "Visualization Menu"
+msgstr "Меню візуалізації"
+
+#: src/skins/ui_main.c:1653
+msgid "Single mode."
+msgstr "Однодоріжковий режим."
+
+#: src/skins/ui_main.c:1655
+msgid "Playlist mode."
+msgstr "Режим списка відтворення."
+
+#: src/skins/ui_main.c:1677
+msgid "Stopping after song."
+msgstr "Зупинити після цієї доріжки."
+
+#: src/skins/ui_main.c:1679
+msgid "Not stopping after song."
+msgstr "Продовжити після цієї доріжки."
+
+#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+msgid "Autoscroll Songname"
+msgstr "Прокручувати назву доріжки"
+
+#: 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: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:88 src/skins/ui_manager.c:89
+msgid "Show Playlist Editor"
+msgstr "Показати редактор списків відтворення"
+
+#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+msgid "Show Equalizer"
+msgstr "Показати еквалайзер"
+
+#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+msgid "Always on Top"
+msgstr "Завжди згори"
+
+#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+msgid "Put on All Workspaces"
+msgstr "На всіх робочих областях"
+
+#: 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:115
+msgid "Analyzer"
+msgstr "Аналізатор"
+
+#: src/skins/ui_manager.c:116
+msgid "Scope"
+msgstr "Осцилограф"
+
+#: src/skins/ui_manager.c:117
+msgid "Voiceprint"
+msgstr "Спектрограма"
+
+#: src/skins/ui_manager.c:118
+msgid "Off"
+msgstr "Вимкнено"
+
+#: 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:123 src/skins/ui_manager.c:140
+msgid "Fire"
+msgstr "Вогонь"
+
+#: src/skins/ui_manager.c:124
+msgid "Vertical Lines"
+msgstr "Монотонні лінії"
+
+#: src/skins/ui_manager.c:128
+msgid "Lines"
+msgstr "Лінії"
+
+#: src/skins/ui_manager.c:129
+msgid "Bars"
+msgstr "Стовпчики"
+
+#: src/skins/ui_manager.c:133
+msgid "Dot Scope"
+msgstr "Крапковий"
+
+#: src/skins/ui_manager.c:134
+msgid "Line Scope"
+msgstr "Лінійний"
+
+#: src/skins/ui_manager.c:135
+msgid "Solid Scope"
+msgstr "Суцільний"
+
+#: src/skins/ui_manager.c:141
+msgid "Ice"
+msgstr "Лід"
+
+#: src/skins/ui_manager.c:146
+msgid "Smooth"
+msgstr "Плавний"
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slowest"
+msgstr "Дуже повільне"
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+msgid "Slow"
+msgstr "Повільне"
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Medium"
+msgstr "Помірне"
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fast"
+msgstr "Швидке"
+
+#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+msgid "Fastest"
+msgstr "Дуже швидке"
+
+#: src/skins/ui_manager.c:166
+msgid "Time Elapsed"
+msgstr "Скільки часу пройшло"
+
+#: src/skins/ui_manager.c:167
+msgid "Time Remaining"
+msgstr "Скільки часу залишається"
+
+#: 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:197
+msgid "Visualization Mode"
+msgstr "Режим візуалізації"
+
+#: src/skins/ui_manager.c:198
+msgid "Analyzer Mode"
+msgstr "Тип аналізатора"
+
+#: src/skins/ui_manager.c:199
+msgid "Scope Mode"
+msgstr "Тип осцилографа"
+
+#: src/skins/ui_manager.c:200
+msgid "Voiceprint Mode"
+msgstr "Тип спектрограми"
+
+#: src/skins/ui_manager.c:201
+msgid "WindowShade VU Mode"
+msgstr "Режим WindowShade VU"
+
+#: src/skins/ui_manager.c:202
+msgid "Analyzer Falloff"
+msgstr "Спадання стовпчиків аналізатора"
+
+#: src/skins/ui_manager.c:203
+msgid "Peaks Falloff"
+msgstr "Спадання піків аналізатора"
+
+#: 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:216 src/skins/ui_manager.c:217
+msgid "Select Previous Playlist"
+msgstr "Виділити попередній список відтворення"
+
+#: 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 "Refresh List"
+msgstr "Оновити список"
+
+#: src/skins/ui_manager.c:230
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Оновити метадані, пов'язані з доріжками списку відтворення."
+
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "Керування списками відтворення"
+
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Керування чергою"
+
+#: src/skins/ui_manager.c:237
+msgid "View"
+msgstr "Перегляд"
+
+#: src/skins/ui_manager.c:238
+msgid "Interface"
+msgstr "Інтерфейс"
+
+#: src/skins/ui_manager.c:239
+msgid "Interface Preferences ..."
+msgstr "Налаштування інтерфейсу ..."
+
+#: src/skins/ui_manager.c:243
+msgid "Add Internet Address..."
+msgstr "Додати інтернет адресу ..."
+
+#: src/skins/ui_manager.c:244
+msgid "Adds a remote track to the playlist."
+msgstr "Додає віддалену доріжку до списку відтворення."
+
+#: src/skins/ui_manager.c:247
+msgid "Add Files..."
+msgstr "Додати файли ..."
+
+#: src/skins/ui_manager.c:248
+msgid "Adds files to the playlist."
+msgstr "Додає файли до списку відтворення."
+
+#: src/skins/ui_manager.c:253
+msgid "Search and Select"
+msgstr "Пошук і виділення"
+
+#: src/skins/ui_manager.c:254
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr "Виділити елементи списка за вказаними критеріями."
+
+#: src/skins/ui_manager.c:257
+msgid "Invert Selection"
+msgstr "Інвертувати виділення"
+
+#: src/skins/ui_manager.c:258
+msgid "Inverts the selected and unselected entries."
+msgstr "Виділити досі невиділене й зняти поточне виділення."
+
+#: src/skins/ui_manager.c:261
+msgid "Select All"
+msgstr "Виділити все"
+
+#: src/skins/ui_manager.c:262
+msgid "Selects all of the playlist entries."
+msgstr "Виділити всі елементи списка."
+
+#: src/skins/ui_manager.c:265
+msgid "Select None"
+msgstr "Зняти виділення"
+
+#: src/skins/ui_manager.c:266
+msgid "Deselects all of the playlist entries."
+msgstr "Зняти виділення з усіх елементів списка."
+
+#: src/skins/ui_manager.c:271
+msgid "Remove All"
+msgstr "Вилучити всі"
+
+#: src/skins/ui_manager.c:272
+msgid "Removes all entries from the playlist."
+msgstr "Вилучає всі елементи зі списку відтворення."
+
+#: src/skins/ui_manager.c:275
+msgid "Clear Queue"
+msgstr "Очистити чергу"
+
+#: src/skins/ui_manager.c:276
+msgid "Clears the queue associated with this playlist."
+msgstr "Видалити з черги елементи цього списку."
+
+#: src/skins/ui_manager.c:279
+msgid "Remove Unavailable Files"
+msgstr "Прибрати недоступні файли."
+
+#: src/skins/ui_manager.c:280
+msgid "Removes unavailable files from the playlist."
+msgstr "Видалити зі списку відтворення недоступні файли."
+
+#: src/skins/ui_manager.c:283
+msgid "Remove Duplicates"
+msgstr "Видалити дублікати"
+
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
+msgid "By Title"
+msgstr "За назвою"
+
+#: src/skins/ui_manager.c:286
+msgid "Removes duplicate entries from the playlist by title."
+msgstr "Видалити зі списку відтворення дублікати за назвою."
+
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
+msgid "By Filename"
+msgstr "За ім’ям файлу"
+
+#: src/skins/ui_manager.c:290
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr "Видалити зі списку відтворення дублікати за ім’ям файла."
+
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
+msgid "By Path + Filename"
+msgstr "За шляхом та ім’ям файлу"
+
+#: src/skins/ui_manager.c:294
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr "Видалити зі списку відтворення дублікати за повним шляхом до них."
+
+#: src/skins/ui_manager.c:297
+msgid "Remove Unselected"
+msgstr "Вилучити невідмічені "
+
+#: src/skins/ui_manager.c:298
+msgid "Remove unselected entries from the playlist."
+msgstr "Вилучити невиділені елементи зі списку відтворення."
+
+#: src/skins/ui_manager.c:301
+msgid "Remove Selected"
+msgstr "Вилучити виділені"
+
+#: src/skins/ui_manager.c:302
+msgid "Remove selected entries from the playlist."
+msgstr "Вилучити виділені елементи зі списку відтворення"
+
+#: src/skins/ui_manager.c:307
+msgid "Randomize List"
+msgstr "Порушити порядок"
+
+#: src/skins/ui_manager.c:308
+msgid "Randomizes the playlist."
+msgstr "Розміщує елементи списка в довільному порядку."
+
+#: src/skins/ui_manager.c:311
+msgid "Reverse List"
+msgstr "Обернути список"
+
+#: src/skins/ui_manager.c:312
+msgid "Reverses the playlist."
+msgstr "Розмістити доріжки списка в протилежному порядку."
+
+#: src/skins/ui_manager.c:315
+msgid "Sort List"
+msgstr "Сортувати список..."
+
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
+msgid "Sorts the list by title."
+msgstr "Сортувати список за назвами доріжок."
+
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
+msgid "By Album"
+msgstr "За альбомом"
+
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
+msgid "Sorts the list by album."
+msgstr "Сортувати список за назвами альбомів."
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "By Artist"
+msgstr "За виконавцем"
+
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+msgid "Sorts the list by artist."
+msgstr "Сортувати список за іменами виконавців."
+
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+msgid "Sorts the list by filename."
+msgstr "Сортувати список за іменами файлів."
+
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+msgid "Sorts the list by full pathname."
+msgstr "Сортувати список за повним шляхом."
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "By Date"
+msgstr "За датою"
+
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+msgid "Sorts the list by modification time."
+msgstr "Сортувати список за часом останньої модифікації файлів."
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "By Track Number"
+msgstr "За номером доріжки"
+
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+msgid "Sorts the list by track number."
+msgstr "Сортувати список за номерами доріжок."
+
+#: src/skins/ui_manager.c:345
+msgid "Sort Selected"
+msgstr "Сортувати виділене"
+
+#: src/skins/ui_manager.c:381
+msgid "File"
+msgstr "Файл"
+
+#: src/skins/ui_manager.c:384
+msgid "Plugin Services"
+msgstr "Можливості плаґінів"
+
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
+msgid "View Track Details"
+msgstr "Інформація про доріжку"
+
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
+msgid "View track details"
+msgstr "Інформація про доріжку"
+
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
+msgid "About Audacious"
+msgstr "Про Audacious"
+
+#: src/skins/ui_manager.c:395
+msgid "Play File"
+msgstr "Відтворити файл..."
+
+#: src/skins/ui_manager.c:396
+msgid "Load and play a file"
+msgstr "Завантажити та відтворити файл"
+
+#: src/skins/ui_manager.c:398
+msgid "Play Location"
+msgstr "Відтворити за посиланням..."
+
+#: src/skins/ui_manager.c:399
+msgid "Play media from the selected location"
+msgstr "Відтворити за обраним шляхом"
+
+#: src/skins/ui_manager.c:401
+msgid "Plugin services"
+msgstr "Можливості плаґінів"
+
+#: src/skins/ui_manager.c:403
+msgid "Preferences"
+msgstr "Налаштування"
+
+#: src/skins/ui_manager.c:404
+msgid "Open preferences window"
+msgstr "Відчинити вікно налаштувань"
+
+#: src/skins/ui_manager.c:407
+msgid "Quit Audacious"
+msgstr "Завершити Audacious"
+
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
+msgid "Set A-B"
+msgstr "Встановити початок/кінець повтору"
+
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
+msgid "Clear A-B"
+msgstr "Перестати повторювати"
+
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+msgid "Jump to Time"
+msgstr "Перейти до часу"
+
+#: src/skins/ui_manager.c:421
+msgid "Queue Toggle"
+msgstr "Перемкнути стан черги"
+
+#: src/skins/ui_manager.c:422
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Вмикати/вимикати елемент черги списку відтворення."
+
+#: src/skins/ui_manager.c:425
+msgid "Copy"
+msgstr "Копіювати"
+
+#: src/skins/ui_manager.c:427
+msgid "Cut"
+msgstr "Вирізати"
+
+#: src/skins/ui_manager.c:429
+msgid "Paste"
+msgstr "Вставити"
+
+#: src/skins/ui_manager.c:436
+msgid "Load"
+msgstr "Завантажити"
+
+#: src/skins/ui_manager.c:437
+msgid "Import"
+msgstr "Імпортувати"
+
+#: src/skins/ui_manager.c:438
+msgid "Save"
+msgstr "Зберегти"
+
+#: src/skins/ui_manager.c:439
+msgid "Delete"
+msgstr "Вилучити"
+
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
+msgid "Preset"
+msgstr "Пресет"
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
+msgid "Auto-load preset"
+msgstr "Відповідний доріжці пресет"
+
+#: src/skins/ui_manager.c:445
+msgid "Load auto-load preset"
+msgstr "Завантажити відповідний доріжці пресет"
+
+#: src/skins/ui_manager.c:448
+msgid "Load default preset into equalizer"
+msgstr "Відновити типові значення"
+
+#: src/skins/ui_manager.c:450
+msgid "Zero"
+msgstr "Нулі"
+
+#: src/skins/ui_manager.c:451
+msgid "Set equalizer preset levels to zero"
+msgstr "Обнулити рівні еквалайзера"
+
+#: src/skins/ui_manager.c:453
+msgid "From file"
+msgstr "З файлу"
+
+#: src/skins/ui_manager.c:454
+msgid "Load preset from file"
+msgstr "Завантажити пресет із файлу"
+
+#: src/skins/ui_manager.c:456
+msgid "From WinAMP EQF file"
+msgstr "Із файлу WinAMP EQF"
+
+#: src/skins/ui_manager.c:457
+msgid "Load preset from WinAMP EQF file"
+msgstr "Завантажити пресет із файлу WinAMP EQF"
+
+#: src/skins/ui_manager.c:459
+msgid "WinAMP Presets"
+msgstr "Пресети WinAMP"
+
+#: src/skins/ui_manager.c:460
+msgid "Import WinAMP presets"
+msgstr "Імпортувати пресети WinAMP"
+
+#: src/skins/ui_manager.c:466
+msgid "Save auto-load preset"
+msgstr "Зберегти пресет як відповідний доріжці"
+
+#: src/skins/ui_manager.c:469
+msgid "Save default preset"
+msgstr "Зберегти як типові значення"
+
+#: src/skins/ui_manager.c:471
+msgid "To file"
+msgstr "До файлу"
+
+#: src/skins/ui_manager.c:472
+msgid "Save preset to file"
+msgstr "Зберегти пресет до файлу"
+
+#: src/skins/ui_manager.c:474
+msgid "To WinAMP EQF file"
+msgstr "До файлу WinAMP EQF"
+
+#: src/skins/ui_manager.c:475
+msgid "Save preset to WinAMP EQF file"
+msgstr "Зберегти пресет до файлу WinAMP EQF"
+
+#: src/skins/ui_manager.c:481
+msgid "Delete auto-load preset"
+msgstr "Видалити відповідний доріжці пресет"
+
+#: src/skins/ui_playlist.c:248
+msgid "Search entries in active playlist"
+msgstr "Пошук в активному списку відтворення"
+
+#: src/skins/ui_playlist.c:256
+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 "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr "Щоб шукати доріжки в списку відтворення, заповніть одне чи більше полів. Можна використовувати літери, цифри, інші знаки, регулярні вирази. Поля нечутливі до регістру."
+
+#: src/skins/ui_playlist.c:264
+msgid "Title: "
+msgstr "Назва: "
+
+#: src/skins/ui_playlist.c:271
+msgid "Album: "
+msgstr "Альбом: "
+
+#: src/skins/ui_playlist.c:278
+msgid "Artist: "
+msgstr "Виконавець: "
+
+#: src/skins/ui_playlist.c:285
+msgid "Filename: "
+msgstr "Ім’я файлу: "
+
+#: src/skins/ui_playlist.c:293
+msgid "Clear previous selection before searching"
+msgstr "Зняти попереднє виділення перед пошуком"
+
+#: src/skins/ui_playlist.c:296
+msgid "Automatically toggle queue for matching entries"
+msgstr "Автоматично перемикати стан черги знайдених елементів"
+
+#: src/skins/ui_playlist.c:299
+msgid "Create a new playlist with matching entries"
+msgstr "Виділити знайдене в новий список відтворення"
+
+#: src/skins/ui_playlist.c:765
+msgid "Audacious Playlist Editor"
+msgstr "Редактор списків відтворення Audacious"
+
+#: src/skins/ui_playlist.c:812
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d із %d)"
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr "Заархівований жупан Winamp 2.x"
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr "Неархівований жупан Winamp 2.x"
+
+#: src/skins/util.c:774
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr "Неможливо створити теку (%s): %s\n"
+
+#: src/sndfile/plugin.c:456
+msgid "About sndfile plugin"
+msgstr "Про плаґін sndfile"
+
+#: src/sndstretch/sndstretch_xmms.c:155
+msgid "About SndStretch"
+msgstr "Про SndStretch"
+
+#: src/sndstretch/sndstretch_xmms.c:308
+msgid "Volume corr."
+msgstr "Коригувати гучність"
+
+#: src/sndstretch/sndstretch_xmms.c:309
+msgid "Short Overlap"
+msgstr "Придушувати відлуння"
+
+#: src/sndstretch/sndstretch_xmms.c:355
+msgid "Speed"
+msgstr "Темп"
+
+#: src/sndstretch/sndstretch_xmms.c:356
+msgid "Pitch"
+msgstr "Висота"
+
+#: src/sndstretch/sndstretch_xmms.c:357
+msgid "Scale"
+msgstr "Масштаб"
+
+#: src/sndstretch/sndstretch_xmms.c:377
+msgid "SndStretch - Configuration"
+msgstr "Налаштування SndStretch"
+
+#: src/song_change/song_change.c:437
+msgid "Command to run when Audacious starts a new song."
+msgstr "Виконувати на початку відтворення доріжки:"
+
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
+msgid "Command:"
+msgstr " "
+
+#: src/song_change/song_change.c:443
+msgid "Command to run toward the end of a song."
+msgstr "Виконувати наприкінці відтворення доріжки:"
+
+#: src/song_change/song_change.c:449
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr "Виконувати при досягненні кінця списка відтворення."
+
+#: src/song_change/song_change.c:455
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr "Виконувати при зміні назви доріжки (онлайн-потоки тощо)."
+
+#: src/song_change/song_change.c:461
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command).\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: filename (full path)\n"
+"%l: length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr "Наступні змінні Audacious надає для використання в командах\n(не всі можна викориfor the end-of-playlist command):\n\n%F: Frequency (in hertz)\n%c: Number of channels\n%f: filename (full path)\n%l: length (in milliseconds)\n%n or %s: Song name\n%r: Rate (in bits per second)\n%t: Playlist position (%02d)\n%p: Currently playing (1 or 0)\n%a: Artist\n%b: Album\n%T: Track title"
+
+#: src/song_change/song_change.c:488
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr "Параметри подавати слід у лапках. Робити інакше небезпечно для системи."
+
+#: src/song_change/song_change.c:499
+msgid "Commands"
+msgstr "Команди"
+
+#: src/song_change/song_change.c:529
+msgid "Song Change"
+msgstr "Зміна доріжки"
+
+#: src/statusicon/statusicon.c:379
+msgid "About Status Icon Plugin"
+msgstr "Про плаґін значка стану"
+
+#: src/statusicon/statusicon.c:380
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager.\n"
+msgstr "Плаґін значка в лотку,\n\n2005-2007, Giacomo Lozito <james@develia.org>,\n2010, Michał Lipski <tallica@o2.pl,>\n\nрозміщує значок Audacious у системному\nлотку, наданому віконним менеджером.\n"
+
+#: src/statusicon/statusicon.c:451
+msgid "Status Icon Plugin - Preferences"
+msgstr "Налаштування значка в лотку"
+
+#: src/statusicon/statusicon.c:461
+msgid "Right-Click Menu"
+msgstr "Меню за правою кнопкою миші"
+
+#: src/statusicon/statusicon.c:466
+msgid "Small playback menu #1"
+msgstr "Мале меню відтворення #1"
+
+#: src/statusicon/statusicon.c:469
+msgid "Small playback menu #2"
+msgstr "Мале меню відтворення #2 (+ \"Вийти\")"
+
+#: src/statusicon/statusicon.c:485
+msgid "Mouse Scroll Action"
+msgstr "Дія коліщатка миші"
+
+#: src/statusicon/statusicon.c:489
+msgid "Change volume"
+msgstr "Зміна гучності"
+
+#: src/statusicon/statusicon.c:491
+msgid "Change playing song"
+msgstr "Зміна поточної доріжки"
+
+#: src/statusicon/statusicon.c:504
+msgid "Other settings"
+msgstr "Інші налаштування"
+
+#: src/statusicon/statusicon.c:509
+msgid "Disable the popup window"
+msgstr "Вимкнути спливне вікно"
+
+#: src/statusicon/statusicon.c:516
+msgid "Close to the notification area (system tray)"
+msgstr "Замість закриття згортати до лотка"
+
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "Просуватися списком відтворення при прокручуванні догори"
+
+#: src/stereo_plugin/stereo.c:45
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin 1999."
+msgstr "Плаґін розширеного стерео\n\nстворив 1999 року Johan Levin."
+
+#: src/stereo_plugin/stereo.c:64
+msgid "About Extra Stereo Plugin"
+msgstr "Про плаґін розширеного стерео"
+
+#: src/stereo_plugin/stereo.c:95
+msgid "Configure Extra Stereo"
+msgstr "Налаштування розширеного стерео"
+
+#: src/tonegen/tonegen.c:49
+msgid "About Tone Generator"
+msgstr "Про генератор тону"
+
+#: src/tonegen/tonegen.c:51
+msgid ""
+"Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
+msgstr "Генератор синусоїдного тону, створений Haavard Kvaalen <havardk@xmms.org>\nі модифікований Daniel J. Peng <danielpeng@bigfoot.com>,\n\nможна використовувати за URL: tone://frequency1;frequency2;frequency3;...\n(наприклад, tone://2000;2005 для відтворення тону 2000 Гц й тону 2005 Гц."
+
+#: src/tonegen/tonegen.c:101
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Гц"
+
+#: src/tonegen/tonegen.c:101
+msgid "Tone Generator: "
+msgstr "Генератор тону: "
+
+#: src/unix-io/gtk.c:34
+msgid "About File I/O Plugin"
+msgstr "Про плаґін файлового вводу-виводу"
+
+#: src/vorbis/vorbis.c:573
+msgid "About Ogg Vorbis Audio Plugin"
+msgstr "Про плаґін вводу з Ogg Vorbis"
+
+#: src/vorbis/vorbis.c:578
+msgid ""
+"Ogg Vorbis Plugin by the Xiph.org Foundation\n"
+"\n"
+"Original code by\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"Contributions from\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Haavard Kvaalen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>\n"
+"\n"
+"Visit the Xiph.org Foundation at http://www.xiph.org/\n"
+msgstr "Плаґін вводу з Ogg Vorbis створений Xiph.org Foundation\n\nАвтор оригіналу:\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nДописувачі:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHaavard Kvaalen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\nВідвідайте Фонд Xiph.org: http://www.xiph.org/\n"
+
+#: src/vtx/about.c:14
+msgid "About Vortex Player"
+msgstr "Про плаґін вводу з Vortex"
+
+#: src/vtx/about.c:15
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"\n"
+"Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
+"and other AY/YM music sites.\n"
+"\n"
+"Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr "Програвач файлів формату Vortex написаний Олександром Сашновим <sashnov@ngs.ru>\nна основі джерела оригінального in_vtx.dll, написаного Романом Щербаковим <v_soft@microfor.ru>\n\nМузику в форматі VTX можна знайти на http://vtx.microfor.ru/music.htm (вже немає),\nhttp://bulba.untergrund.net/ та інших сайтах про AY/YM.\n\nІмплементацію для Audacious написав Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/wavpack/wavpack.c:353
+#, c-format
+msgid "Wavpack Decoder Plugin %s"
+msgstr "Декодер Wavpack %s"
+
+#: src/wavpack/wavpack.c:354
+msgid ""
+"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan\n"
+"Visit the Wavpack site at http://www.wavpack.com/\n"
+msgstr "(c) 2006 William Pitcock <nenolod -at- nenolod.net>\n\nДеякий код написав Miles Egan.\nВідвідайте сайт Wavpack: http://www.wavpack.com/\n"

audacious-plugins-3.1.1.tar.bz2/po/zh_CN.po -> audacious-plugins-3.2.4.tar.bz2/po/zh_CN.po Changed

@@ -1,22 +1,24 @@
-# Chinese translations for Audacious-plugins package
-# Audacious-plugins软件包的简体中文翻译.
-# Copyright (C) 2010 THE Audacious-plugins'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the Audacious-plugins package.
-# Chasye <chasye@gmail.com>, 2010.
+# Simplified Chinese translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
 #
+# Translators:
+# Chasye <chasye@gmail.com>, 2010.
+# <ganweiliang886@gmail.com>, 2012.
+# <runningwaterpro@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious-plugins\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-10-10 13:39-0400\n"
-"PO-Revision-Date: 2011-10-16 18:53+0800\n"
-"Last-Translator: Chasye <chasye@gmail.com>\n"
-"Language-Team: Chinese (simplified)\n"
-"Language: zh_CN\n"
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 12:03-0500\n"
+"PO-Revision-Date: 2012-04-05 00:51+0000\n"
+"Last-Translator: Luke <runningwaterpro@gmail.com>\n"
+"Language-Team: Simplified Chinese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/aac/libmp4.c:256
 #, c-format
@@ -24,228 +26,174 @@
 "Using libfaad2-%s for decoding.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
-msgstr ""
-"正在使用libfaad2-%s进行解码。\n"
-"FAAD2 AAC/HE-AAC/HE-AACv2/DRM解码器 (c) Nero AG, www.nero.com\n"
-"版权所有 (c) 2005-2006 Audacious小组"
+msgstr "正在使用libfaad2-%s进行解码。\nFAAD2 AAC/HE-AAC/HE-AACv2/DRM解码器 (c) Nero AG, www.nero.com\n版权所有 (c) 2005-2006 Audacious小组"
 
 #: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "关于MP4 ACC解码插件"
 
-#: src/alarm/interface.c:33
-msgid "About XMMS Alarm"
-msgstr "关于XMMS闹钟"
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "关于闹钟"
 
-#: src/alarm/interface.c:40
-msgid "XMMS Alarm"
-msgstr "XMMS闹钟"
-
-#: src/alarm/interface.c:49
+#: src/alarm/alarm.c:313
 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"
+"A plugin that can be used to start playing at a certain time.\n"
 "\n"
-"http://www.snika.uklinux.net/xmms-alarm/"
+"Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
-"用于在设定时间启动播放的XMMS插件\n"
-"\n"
-"问题反馈:\n"
-"Adam Feakin <adamf@snika.uklinux.net>\n"
-"Daniel Stodden <stodden@in.tum.de>\n"
-"\n"
-"http://www.snika.uklinux.net/xmms-alarm/"
 
-#: src/alarm/interface.c:64
-msgid "Close"
-msgstr "关闭"
-
-#: src/alarm/interface.c:94
+#: src/alarm/interface.c:33
 msgid "Alarm"
 msgstr "闹钟"
 
-#: src/alarm/interface.c:101
+#: src/alarm/interface.c:40
 msgid "This is your wakeup call."
 msgstr "此为起床闹钟"
 
-#: src/alarm/interface.c:116 src/alarm/interface.c:1337
+#: src/alarm/interface.c:55 src/alarm/interface.c:1213
 msgid "OK"
 msgstr "确定"
 
-#: src/alarm/interface.c:150
-msgid "Sorry"
-msgstr "抱歉"
-
-#: src/alarm/interface.c:157
-msgid "Warning"
-msgstr "警告"
-
-#: src/alarm/interface.c:166
-msgid ""
-"For safety reasons the \"quiet\" time must be at least 65 seconds longer "
-"than the fading time, it must also be more than 10 seconds. This basically "
-"means that there is a bug in the code and until I find a way of really "
-"fixing it this message will appear :)\n"
-"\n"
-"Your fading settings have NOT been saved\n"
-"\n"
-"--\n"
-"Adam"
-msgstr ""
-"鉴于安全理由，\"静音\"时间至少要比渐退时间长65秒，其本身亦至少大于10秒。\n"
-"这基本上是代码的问题，同时在我找到解决方法前此信息还会出现的 :)\n"
-"\n"
-"你的渐退设置未保存\n"
-"\n"
-"--\n"
-"Adam"
-
-#: src/alarm/interface.c:182
-msgid "Oh Well"
-msgstr "不错嘛"
-
-#: src/alarm/interface.c:338
+#: src/alarm/interface.c:214
 msgid "Alarm Settings"
 msgstr "闹钟设置"
 
-#: src/alarm/interface.c:353 src/alarm/interface.c:525
-#: src/alarm/interface.c:897
+#: src/alarm/interface.c:229 src/alarm/interface.c:401
+#: src/alarm/interface.c:773
 msgid "Time"
 msgstr "时间"
 
-#: src/alarm/interface.c:394
+#: src/alarm/interface.c:270
 msgid "hours"
 msgstr "小时"
 
-#: src/alarm/interface.c:455
+#: src/alarm/interface.c:331
 msgid "h"
 msgstr "点"
 
-#: src/alarm/interface.c:485
+#: src/alarm/interface.c:361
 msgid "minutes"
 msgstr "分"
 
-#: src/alarm/interface.c:503
+#: src/alarm/interface.c:379
 msgid "Quiet after:"
 msgstr "静音时间："
 
-#: src/alarm/interface.c:513
+#: src/alarm/interface.c:389
 msgid "Alarm at (default):"
 msgstr "响闹钟(默认)："
 
-#: src/alarm/interface.c:533
+#: src/alarm/interface.c:409
 msgid "Choose the days for the alarm to come on"
 msgstr "选择响闹钟的日期"
 
-#: src/alarm/interface.c:561 src/alarm/interface.c:609
-#: src/alarm/interface.c:657 src/alarm/interface.c:705
-#: src/alarm/interface.c:753 src/alarm/interface.c:801
-#: src/alarm/interface.c:849 src/OSS/configure.c:153
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/alarm/interface.c:437 src/alarm/interface.c:485
+#: src/alarm/interface.c:533 src/alarm/interface.c:581
+#: src/alarm/interface.c:629 src/alarm/interface.c:677
+#: src/alarm/interface.c:725 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_equalizer.c:1104 src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
 msgid "Default"
 msgstr "默认"
 
-#: src/alarm/interface.c:887
+#: src/alarm/interface.c:763
 msgid "Day"
 msgstr "日期"
 
-#: src/alarm/interface.c:907
+#: src/alarm/interface.c:783
 msgid "Tuesday"
 msgstr "週二"
 
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:794
 msgid "Wednesday"
 msgstr "週三"
 
-#: src/alarm/interface.c:929
+#: src/alarm/interface.c:805
 msgid "Thursday"
 msgstr "週四"
 
-#: src/alarm/interface.c:940
+#: src/alarm/interface.c:816
 msgid "Friday"
 msgstr "週五"
 
-#: src/alarm/interface.c:951
+#: src/alarm/interface.c:827
 msgid "Saturday"
 msgstr "週末"
 
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:838
 msgid "Sunday"
 msgstr "週日"
 
-#: src/alarm/interface.c:972
+#: src/alarm/interface.c:848
 msgid "Monday"
 msgstr "週一"
 
-#: src/alarm/interface.c:983
+#: src/alarm/interface.c:859
 msgid "Days"
 msgstr "日期"
 
-#: src/alarm/interface.c:999
+#: src/alarm/interface.c:875
 msgid "Fading"
 msgstr "渐退"
 
-#: src/alarm/interface.c:1036
+#: src/alarm/interface.c:912
 msgid "seconds"
 msgstr "秒"
 
-#: src/alarm/interface.c:1044 src/alarm/interface.c:1159
+#: src/alarm/interface.c:920 src/alarm/interface.c:1035
 msgid "Volume"
 msgstr "音量"
 
-#: src/alarm/interface.c:1070
+#: src/alarm/interface.c:946
 msgid "Current"
 msgstr "当前"
 
-#: src/alarm/interface.c:1078
+#: src/alarm/interface.c:954
 msgid "Start at"
 msgstr "开始于"
 
-#: src/alarm/interface.c:1106 src/alarm/interface.c:1150
+#: src/alarm/interface.c:982 src/alarm/interface.c:1026
 msgid "%"
 msgstr "%"
 
-#: src/alarm/interface.c:1122
+#: src/alarm/interface.c:998
 msgid "Final"
 msgstr "完成于"
 
-#: src/alarm/interface.c:1175
+#: src/alarm/interface.c:1051
 msgid "Additional Command"
 msgstr "附加指令"
 
-#: src/alarm/interface.c:1201
+#: src/alarm/interface.c:1077
 msgid "enable"
 msgstr "启用"
 
-#: src/alarm/interface.c:1209
+#: src/alarm/interface.c:1085
 msgid "Playlist (optional)"
 msgstr "播放列表(可选)"
 
-#: src/alarm/interface.c:1235
+#: src/alarm/interface.c:1111
 msgid "Browse..."
 msgstr "浏览..."
 
-#: src/alarm/interface.c:1243 src/alarm/interface.c:1407
+#: src/alarm/interface.c:1119 src/alarm/interface.c:1283
 msgid "Reminder"
 msgstr "提醒器"
 
-#: src/alarm/interface.c:1260
+#: src/alarm/interface.c:1136
 msgid "Use reminder"
 msgstr "使用提醒器"
 
-#: src/alarm/interface.c:1276 src/sndstretch/sndstretch_xmms.c:358
+#: src/alarm/interface.c:1152 src/sndstretch/sndstretch_xmms.c:358
 msgid "Options"
 msgstr "选项"
 
-#: src/alarm/interface.c:1284
+#: src/alarm/interface.c:1160
 msgid "What do these options mean?"
 msgstr "这些选项有什么用？"
 
-#: src/alarm/interface.c:1312
+#: src/alarm/interface.c:1188
 msgid ""
 "\n"
 "Time\n"
@@ -298,67 +246,23 @@
 " 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"
+msgstr "\n时间\n 响闹钟: \n 闹钟启动时间。\n\n 静音时间: \n 在此时间之后停止播放。\n (如果起床对话框未关闭)\n\n\n日期\n 日期:\n 选择启用闹钟的日期\n\n 时间:\n 选择每天闹钟响的时间,\n 或者点击开关按钮使用默认时间\n\n\n音量\n 渐退: \n 在指定时间要把音量消退到指定音量。\n\n 开始于: \n 从此音量开始消退\n\n 完成于: \n 到达此音量时停止。\n 如果渐退时间为0，则直接设置为此音量后开始播放。\n\n\n选项:\n 附加指令:\n 在闹钟时间执行此指令。\n\n 播放列表:\n 从播放列表加载要播放的文件(仅支持.m3u文件) \n 如果未指定播放列表则使用当前的列表。\n 此处亦可使用远程的mp3/ogg流URL地址，\n 但现时暂未支持从播放列表中加载URL地址\n\n 提醒器:\n 当闹钟停止后显示提醒器，\n 如果你想显示提醒器，输出要用的提醒器并打开相应的开关按钮\n"
 
-#: src/alarm/interface.c:1314 src/skins/ui_manager.c:382
+#: src/alarm/interface.c:1190 src/skins/ui_manager.c:382
 msgid "Help"
 msgstr "帮助"
 
-#: src/alarm/interface.c:1346 src/cdaudio-ng/configure.c:249
+#: src/alarm/interface.c:1222 src/cdaudio-ng/configure.c:249
 #: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
 #: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
 msgid "Cancel"
 msgstr "取消"
 
-#: src/alarm/interface.c:1414
+#: src/alarm/interface.c:1290
 msgid "Your reminder for today is.."
 msgstr "你今天的提醒器是.."
 
-#: src/alarm/interface.c:1439
+#: src/alarm/interface.c:1315
 msgid "Thankyou"
 msgstr "谢谢"
 
@@ -398,7 +302,7 @@
 msgid "ALSA error"
 msgstr "ALSA错误"
 
-#: src/amidi-plug/amidi-plug.c:335
+#: src/amidi-plug/amidi-plug.c:326
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
@@ -410,21 +314,10 @@
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:37
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
-"ports. The ALSA sequencer interface is very versatile, it can provide ports "
-"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
-"synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from "
-"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
-"hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr ""
-"此后端将发送MIDI事件到用户选中的ALSA合成器端口。ALSA合成器接口是相当多用途"
-"的，它可以使用声卡上的硬件合成器(如：emu10k1)，同时亦可以使用软合成器，外置设"
-"备等。\n"
-"此后端并不生成音频，MIDI事件会直接由ALSA端口后面的设备或程序处理。假如，MIDI"
-"事件发送到硬件合成器会被直接播放。\n"
-"作者：Giacomo Lozito."
+msgstr "此后端将发送MIDI事件到用户选中的ALSA合成器端口。ALSA合成器接口是相当多用途的，它可以使用声卡上的硬件合成器(如：emu10k1)，同时亦可以使用软合成器，外置设备等。\n此后端并不生成音频，MIDI事件会直接由ALSA端口后面的设备或程序处理。假如，MIDI事件发送到硬件合成器会被直接播放。\n作者：Giacomo Lozito."
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
@@ -432,17 +325,10 @@
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-"
-"time software synthesizer based on the SoundFont2 specification (www."
-"fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed "
-"by chosen ouput plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
-"此后端通过把MIDI事件发送到FluidSynth生成音频，FluidSynth是符合SoundFont2标准"
-"的实时软件合成器(www.fluidsynth.org).\n"
-"音频将由播放器效果插件生成并由选中的输出插件播放。\n"
-"作者：Giacomo Lozito."
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
@@ -534,7 +420,7 @@
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr ""
+msgstr "AMIDI\nPlug"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
@@ -620,15 +506,15 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:550
 msgid "22050 Hz "
-msgstr ""
+msgstr "22050 赫兹"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:553
 msgid "44100 Hz "
-msgstr ""
+msgstr "44100 赫兹"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:556
 msgid "96000 Hz "
-msgstr ""
+msgstr "96000 赫兹"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:559
 msgid "custom "
@@ -636,7 +522,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "Hz "
-msgstr ""
+msgstr "赫兹"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:621
 msgid "FluidSynth Backend not loaded or not available"
@@ -722,7 +608,7 @@
 msgid ""
 "\n"
 "AMIDI-Plug "
-msgstr ""
+msgstr "\nAMIDI-Plug "
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -747,28 +633,7 @@
 "Tony Vroon\n"
 "for the good help with alpha testing\n"
 "\n"
-msgstr ""
-"\n"
-"模块化的MIDI音乐播放器\n"
-"http://www.develia.org/projects.php?p=amidiplug\n"
-"\n"
-"作者：Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-"\n"
-"特别鸣谢：\n"
-"\n"
-"Clemens Ladisch and Jaroslav Kysela\n"
-"for their cool programs aplaymidi and amixer; those\n"
-"were really useful, along with alsa-lib docs, in order\n"
-"to learn more about the ALSA API\n"
-"\n"
-"Alfredo Spadafina\n"
-"for the nice midi keyboard logo\n"
-"\n"
-"Tony Vroon\n"
-"for the good help with alpha testing\n"
-"\n"
+msgstr "\n模块化的MIDI音乐播放器\nhttp://www.develia.org/projects.php?p=amidiplug\n\n作者：Giacomo Lozito\n< james@develia.org >\n\n\n特别鸣谢：\n\nClemens Ladisch and Jaroslav Kysela\nfor their cool programs aplaymidi and amixer; those\nwere really useful, along with alsa-lib docs, in order\nto learn more about the ALSA API\n\nAlfredo Spadafina\nfor the nice midi keyboard logo\n\nTony Vroon\nfor the good help with alpha testing\n\n"
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
@@ -786,243 +651,238 @@
 msgid "None"
 msgstr "无"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "播放开始"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "开始播放时触发OSD"
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "标题改变"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid ""
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr ""
-"播放同一文件时，标题发生改变时触发OSD。\n"
-"播放网络媒体时会经常碰到。"
+msgstr "播放同一文件时，标题发生改变时触发OSD。\n播放网络媒体时会经常碰到。"
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "音量改变"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
 msgstr "调整音量时触发OSD"
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
 msgstr "暂停播放"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
 msgstr "暂停播放时触发OSD"
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
 msgstr "恢复播放"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
 msgstr "恢复播放时触发OSD"
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
 msgstr "X相对位移："
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
 msgstr "Y相对位移："
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr "最大OSD宽度："
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr "多屏选项"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
 msgstr "OSD显示于："
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "所有显示器"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "显示器%i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "延时(ms)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "显示："
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "淡入："
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "淡出："
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "字体"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "字体 %i："
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "阴影"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "国际化"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "禁用UTF-8转换(在aosd中)"
 
-#: src/aosd/aosd_ui.c:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "选择主题文件"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
 msgstr "渲染风格"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "颜色"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "颜色 %i："
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr "自定义主题"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "主题文件："
 
-#: src/aosd/aosd_ui.c:672
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "浏览"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "启用触发器"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "事件"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
 msgstr "检测到混合管理器"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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 ""
-"未检测到混合管理器；\n"
-"OSD无法正常工作，除非你激活混合管理器。"
+"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
+msgstr "未检测到混合管理器；\nOSD无法正常工作，除非你激活混合管理器。"
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 msgid "Composite manager not required for fake transparency"
 msgstr "假透明无需混合管理支持"
 
-#: src/aosd/aosd_ui.c:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "透明"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr "假透明"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "真透明(需要X Composite扩展)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
 msgstr "X Composite扩展未加载"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
 msgstr "X Composite扩展不可用"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - 设置"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr "测试"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "动画"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "字体"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "装饰器"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "触发器"
 
-#: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
+#: src/aosd/aosd_ui.c:1100 src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "其它"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
 msgstr "Audacious OSD - 关于"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
-msgstr ""
+msgstr "\nAudacious OSD "
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1033,15 +893,7 @@
 "written by Evan Martin\n"
 "http://neugierig.org/software/ghosd/\n"
 "\n"
-msgstr ""
-"\n"
-"http://www.develia.org/projects.php?p=audacious#aosd\n"
-"作者：Giacomo Lozito\n"
-"< james@develia.org >\n"
-"\n"
-"On-Screen-Display基于Ghosd库\n"
-"作者：Evan Martin\n"
-"http://neugierig.org/software/ghosd/\n"
+msgstr "\nhttp://www.develia.org/projects.php?p=audacious#aosd\n作者：Giacomo Lozito\n< james@develia.org >\n\nOn-Screen-Display基于Ghosd库\n作者：Evan Martin\nhttp://neugierig.org/software/ghosd/\n"
 
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
@@ -1051,14 +903,29 @@
 msgid "Options:"
 msgstr "选项"
 
-#: src/cdaudio-ng/cdaudio-ng.c:241
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr ""
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr ""
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr ""
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr "预置:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
 msgstr "关于音频CD插件"
 
-#: src/cdaudio-ng/cdaudio-ng.c:242
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
-"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
 "Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
 "\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
@@ -1068,25 +935,17 @@
 "This was a Google Summer of Code 2007 project.\n"
 "\n"
 "Copyright 2009 John Lindgren"
-msgstr ""
-"版权所有 (c)\n"
-"2009 John Lindgren\n"
-"2007 Calin Crisan <ccrisan@gmail.com> 及Audacious小组\n"
-"\n"
-"在此非常感谢libcdio <http://www.gnu.org/software/libcdio/>\n"
-"及libcddb<http://libcddb.sourceforge.net/>的开发者\n"
-"同时亦非常感谢Tony Vroon对我的帮助和指导.\n"
-"Google Summer of Code 2007 project."
+msgstr "版权所有 (c)\n2009 John Lindgren\n2007 Calin Crisan <ccrisan@gmail.com> 及Audacious小组\n\n在此非常感谢libcdio <http://www.gnu.org/software/libcdio/>\n及libcddb<http://libcddb.sourceforge.net/>的开发者\n同时亦非常感谢Tony Vroon对我的帮助和指导.\nGoogle Summer of Code 2007 project."
 
-#: src/cdaudio-ng/cdaudio-ng.c:550
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
 msgstr "音频CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:922
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
 msgstr "设备为空"
 
-#: src/cdaudio-ng/cdaudio-ng.c:924
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
 msgstr "未支持光盘类型"
 
@@ -1223,8 +1082,8 @@
 
 #: src/console/configure.c:271
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not "
-"provide length information (i.e. looping tracks)."
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
 msgstr "默认歌曲长度（单位：秒），用于本身不提供长度信息的文件（如：循环音轨)"
 
 #: src/console/plugin.c:33
@@ -1237,13 +1096,7 @@
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
-msgstr ""
-"游戏机音乐解码引擎基本于Game_Music_Emu 0.5.2.\n"
-"支持格式： AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
-"Audacious上的实现由：\n"
-"William Pitcock <nenolod@dereferenced.org>, \n"
-"Shay Green <gblargg@gmail.com>\n"
-"完成。\n"
+msgstr "游戏机音乐解码引擎基本于Game_Music_Emu 0.5.2.\n支持格式： AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nAudacious上的实现由：\nWilliam Pitcock <nenolod@dereferenced.org>, \nShay Green <gblargg@gmail.com>\n完成。\n"
 
 #: src/crossfade/plugin.c:60
 msgid "About Crossfade"
@@ -1270,12 +1123,8 @@
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
-"You can use the Sample Rate Converter effect to resample the songs to the "
-"same rate."
-msgstr ""
-"淡出失败， 原因：歌曲的采样不一致。\n"
-"\n"
-"你可以尝试使用”采样率转换器“使歌曲的采样一致。"
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
+msgstr "淡出失败， 原因：歌曲的采样不一致。\n\n你可以尝试使用”采样率转换器“使歌曲的采样一致。"
 
 #: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
@@ -1296,12 +1145,7 @@
 "By Johan Levin 1999.\n"
 "\n"
 "Surround echo by Carl van Schaik 1999"
-msgstr ""
-"回音插件\n"
-"作者： Johan Levin 1999.\n"
-"\n"
-"回音环绕\n"
-"作者：Carl van Schaik 1999"
+msgstr "回音插件\n作者： Johan Levin 1999.\n\n回音环绕\n作者：Carl van Schaik 1999"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
@@ -1323,7 +1167,7 @@
 msgid "Volume: (%)"
 msgstr "音量：(%)"
 
-#: src/ffaudio/ffaudio-core.c:795
+#: src/ffaudio/ffaudio-core.c:718
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1337,21 +1181,9 @@
 "libavcodec %s (%s)\n"
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
-msgstr ""
-"基于FFmepg多媒体框架(http://www.ffmpeg.org/)\n"
-"的Audacious音频解码插件\n"
-"版权所有 (c)\n"
-"2000-2009 Fabrice Bellard, et al.\n"
-"\n"
-"Audacious插件作者：\n"
-"\tWilliam Pitcock <nenolod@nenolod.net>,\n"
-"\tMatti Hämäläinen <ccr@tnsp.org>\n"
-"\n"
-"libavcodec %s (%s)\n"
-"libavformat %s (%s)\n"
-"libavutil %s (%s)\n"
+msgstr "基于FFmepg多媒体框架(http://www.ffmpeg.org/)\n的Audacious音频解码插件\n版权所有 (c)\n2000-2009 Fabrice Bellard, et al.\n\nAudacious插件作者：\n\tWilliam Pitcock <nenolod@nenolod.net>,\n\tMatti Hämäläinen <ccr@tnsp.org>\n\nlibavcodec %s (%s)\nlibavformat %s (%s)\nlibavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:809
+#: src/ffaudio/ffaudio-core.c:732
 msgid "About FFaudio Plugin"
 msgstr "关于FFaudio插件"
 
@@ -1359,55 +1191,55 @@
 msgid "About FileWriter-Plugin"
 msgstr "关于FileWriter插件"
 
-#: src/filewriter/filewriter.c:455
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "FileWriter设置"
 
-#: src/filewriter/filewriter.c:467
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "输出文件格式："
 
-#: src/filewriter/filewriter.c:485
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "设置"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "保存到原来的目录"
 
-#: src/filewriter/filewriter.c:505
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr "保存到自定义目录"
 
-#: src/filewriter/filewriter.c:515
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "输出文件目录："
 
-#: src/filewriter/filewriter.c:519
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr "选择目录"
 
-#: src/filewriter/filewriter.c:538
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr "文件名来自："
 
-#: src/filewriter/filewriter.c:541
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr "原始文件标签"
 
-#: src/filewriter/filewriter.c:547
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr "原始文件名"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "保留文件后缀"
 
-#: src/filewriter/filewriter.c:572
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr "文件名前加上音轨号"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "自动"
 
@@ -1415,151 +1247,151 @@
 msgid "Joint Stereo"
 msgstr "联合立体声"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "立体声"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "单声道"
 
-#: src/filewriter/mp3.c:712
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr "MP3设置"
 
-#: src/filewriter/mp3.c:735
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "音质"
 
-#: src/filewriter/mp3.c:760
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr "输出取样："
 
-#: src/filewriter/mp3.c:788
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
 msgstr ""
 
-#: src/filewriter/mp3.c:795
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "码率/压缩率："
 
-#: src/filewriter/mp3.c:819
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "码率(kbps)："
 
-#: src/filewriter/mp3.c:852
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr "压缩率："
 
-#: src/filewriter/mp3.c:876
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr "音频模式："
 
-#: src/filewriter/mp3.c:901
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "其它："
 
-#: src/filewriter/mp3.c:912
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr "强制严格遵从ISO"
 
-#: src/filewriter/mp3.c:923
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "错误保护"
 
-#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
+#: src/filewriter/mp3.c:929 src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "质量"
 
-#: src/filewriter/mp3.c:945
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr "启用VBR/ABR"
 
-#: src/filewriter/mp3.c:955
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "类型："
 
-#: src/filewriter/mp3.c:988
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr "VBR选项："
 
-#: src/filewriter/mp3.c:1004
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "最小码率(kbps)："
 
-#: src/filewriter/mp3.c:1031
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "最大码率(kbps)："
 
-#: src/filewriter/mp3.c:1054
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr "严格执行最小码率"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr "ABR选项："
 
-#: src/filewriter/mp3.c:1076
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "平均码率(kbps)："
 
-#: src/filewriter/mp3.c:1104
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr "VBR质量等级："
 
-#: src/filewriter/mp3.c:1123
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr "不要写入Xing VBR头"
 
-#: src/filewriter/mp3.c:1137
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1147
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "帧参数："
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr "标记为版权"
 
-#: src/filewriter/mp3.c:1170
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr "标记为原始文件"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "ID3参数："
 
-#: src/filewriter/mp3.c:1193
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
 msgstr "强制添加V2标签"
 
-#: src/filewriter/mp3.c:1203
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr "仅添加v1标签"
 
-#: src/filewriter/mp3.c:1210
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr "仅添加v2标签"
 
-#: src/filewriter/mp3.c:1231
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
 msgstr "标签"
 
-#: src/filewriter/vorbis.c:236
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis编码器设置"
 
-#: src/filewriter/vorbis.c:256
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "质量等级(0-10)："
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr "关于FLAC音频插件"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1567,12 +1399,7 @@
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr ""
-"\n"
-"\n"
-"原作者:Ralf Ertzinger <ralf@skytale.net>\n"
-"\n"
-"http://www.skytale.net/projects/bmp-flac2/"
+msgstr "\n\n原作者:Ralf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
@@ -1585,39 +1412,17 @@
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-msgstr ""
-"Gnome快捷键插件\n"
-"通过快捷键控制播放器.\n"
-"\n"
-"版权所有 (C)\n"
-"2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
-msgid "Open Files"
-msgstr "打开文件"
-
-#: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
-msgid "Add Files"
-msgstr "添加文件"
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr "Audacious2"
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr "gnt界面"
+msgstr "Gnome快捷键插件\n通过快捷键控制播放器.\n\n版权所有 (C)\n2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
 
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "序号"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:36 src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "标题"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:42
 msgid "Artist"
 msgstr "艺术家"
 
@@ -1625,7 +1430,7 @@
 msgid "Year"
 msgstr "年份"
 
-#: src/gtkui/columns.c:37
+#: src/gtkui/columns.c:37 src/search-tool/search-tool.c:43
 msgid "Album"
 msgstr "专辑"
 
@@ -1689,243 +1494,251 @@
 msgid "Undock"
 msgstr "无面板"
 
-#: src/gtkui/layout.c:123 src/ladspa/plugin.c:639
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:644
 msgid "Disable"
 msgstr "禁用"
 
-#: src/gtkui/menus.c:130
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
 msgstr "打开文件(_O) ..."
 
-#: src/gtkui/menus.c:131
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
 msgstr "打开URL(_U)..."
 
-#: src/gtkui/menus.c:132
-msgid "_Add File ..."
-msgstr "添加文件(_A)..."
-
 #: src/gtkui/menus.c:133
+msgid "_Add Files ..."
+msgstr "添加文件"
+
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
 msgstr "添加URL(_R)..."
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
 msgstr "关于(_b)"
 
-#: src/gtkui/menus.c:136
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
 msgstr "首选项(_P)..."
 
-#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
+#: src/gtkui/menus.c:138 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: src/gtkui/menus.c:140
+#: src/gtkui/menus.c:141
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.c:141
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
 msgstr "暂停(_e)"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:143
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
 msgstr "上一首(_v)"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:145
 msgid "_Next"
 msgstr "下一首(_N)"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
 msgstr "重复(_R)"
 
-#: src/gtkui/menus.c:147
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
 msgstr "随机(_h)"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
 msgstr "禁止自动播放下一首(_o)"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
 msgstr "完成后停止(_A)"
 
-#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
+#: src/gtkui/menus.c:152 src/gtkui/menus.c:212
 msgid "Song _Info ..."
 msgstr "歌曲信息(_I)..."
 
-#: src/gtkui/menus.c:152
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
 msgstr "跳到时间(_T)..."
 
-#: src/gtkui/menus.c:153
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
 msgstr "跳到歌曲(_J)..."
 
-#: src/gtkui/menus.c:156
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
 msgstr "按音轨序号(_N)"
 
-#: src/gtkui/menus.c:157
+#: src/gtkui/menus.c:158
 msgid "By _Title"
 msgstr "按标题(_T)"
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
 msgstr "按艺术家(_A)"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
 msgstr "按专辑(_l)"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
 msgstr "按发表日期(_D)"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
 msgstr "按文件路径(_F)"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
 msgstr "按自定义标题(_C)"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
 msgstr "反转(_e)"
 
-#: src/gtkui/menus.c:165
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
 msgstr "随机(_R)"
 
-#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
+#: src/gtkui/menus.c:169 src/gtkui/menus.c:214
 msgid "_Refresh"
 msgstr "刷新(_R)"
 
 #: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "移除无效文件"
+
+#: src/gtkui/menus.c:172
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:174
 msgid "_New"
 msgstr "新建(_N)"
 
-#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
+#: src/gtkui/menus.c:175 src/gtkui/menus.c:225
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:177
 msgid "_Import ..."
 msgstr "导入(_I)..."
 
-#: src/gtkui/menus.c:176
+#: src/gtkui/menus.c:178
 msgid "_Export ..."
 msgstr "导出(_E)..."
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:180
 msgid "_Playlist Manager ..."
 msgstr "播放列表管理器(_P)..."
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:181
 msgid "_Queue Manager ..."
 msgstr "队列管理器(_Q)..."
 
-#: src/gtkui/menus.c:182
+#: src/gtkui/menus.c:184
 msgid "Volume _Up"
 msgstr "调高音量(_U)"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
 msgstr "调低音量(_D)"
 
-#: src/gtkui/menus.c:185
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
 msgstr "均衡器(_E)"
 
-#: src/gtkui/menus.c:187
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
 msgstr "音效(_f)"
 
-#: src/gtkui/menus.c:190
+#: src/gtkui/menus.c:192
 msgid "_Interface"
 msgstr "界面(_I)"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "可视化"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
 msgstr "显示菜单(_M)"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
 msgstr "显示信息区域(_n)"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
 msgstr "显示状态栏(_S)"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
 msgstr "显示表头(_H)"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
 msgstr "揀选列(_C)..."
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
 msgstr "歌曲改变时滚动(_l)"
 
-#: src/gtkui/menus.c:201
+#: src/gtkui/menus.c:204
 msgid "_File"
 msgstr "文件(_F)"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:205
 msgid "_Playback"
 msgstr "回放(_P)"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
 msgstr "播放列表(_l)"
 
-#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:221
 msgid "_Services"
 msgstr "服务(_S)"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:208
 msgid "_Output"
 msgstr "输出(_O)"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:209
 msgid "_View"
 msgstr "外观(_V)"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
 msgstr "入队／出列(_Q)"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
 msgstr "剪切(_t)"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:217
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:218
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:219
 msgid "Select _All"
 msgstr "选中全部(_A)"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:224
 msgid "_Rename"
 msgstr "重命名(_R)"
 
@@ -1933,34 +1746,42 @@
 msgid "GTK Interface"
 msgstr "GTK界面"
 
-#: src/gtkui/ui_gtk.c:154 src/skins/ui_main.c:302
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:303
 #, c-format
 msgid "%s - Audacious"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:160 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "缓冲中..."
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:305 src/skins/ui_main.c:1504
 msgid "Audacious"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:206 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:216 src/skins/plugin.c:190
 msgid "Error"
 msgstr "错误"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
+#: src/gtkui/ui_playlist_notebook.c:97
+msgid "Close"
+msgstr "关闭"
+
+#: src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:460
 msgid "mono"
 msgstr "单声道"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
+#: src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:459
 msgid "stereo"
 msgstr "立体声"
 
-#: src/gtkui/ui_statusbar.c:106
+#: src/gtkui/ui_statusbar.c:109
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d声道"
 
-#: src/gtkui/ui_statusbar.c:121
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
 msgstr ""
@@ -2005,7 +1826,7 @@
 msgid "Volume Down"
 msgstr "调低音量"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to File"
 msgstr "跳到文件"
 
@@ -2031,8 +1852,7 @@
 
 #: src/hotkey/gui.c:232
 msgid ""
-"It is not recommended to bind the primary mouse buttons without "
-"modificators.\n"
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
 msgstr "并不建议绑定鼠标主键。要继续吗？"
@@ -2081,23 +1901,7 @@
 "\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
-msgstr ""
-"全局热键插件\n"
-"通过组合键或多媒体键控制播放器。\n"
-"版权所有 (C)\n"
-"2007-2008\n"
-"Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-"其它贡献者:\n"
-"版权所有 (C)\n"
-"2006-2007\n"
-"Vladimir Paskov <vlado.paskov@gmail.com>\n"
-"2000-2002\n"
-"Ville Syrjälä <syrjala@sci.fi>\n"
-"Bryn Davies <curious@ihug.com.au>\n"
-"Jonathan A. Davis <davis@jdhouse.org>\n"
-"Jeremy Tan <nsx@nsx.homeip.net>\n"
-"\n"
+msgstr "全局热键插件\n通过组合键或多媒体键控制播放器。\n版权所有 (C)\n2007-2008\nSascha Hlusiak <contact@saschahlusiak.de>\n\n其它贡献者:\n版权所有 (C)\n2006-2007\nVladimir Paskov <vlado.paskov@gmail.com>\n2000-2002\nVille Syrjälä <syrjala@sci.fi>\nBryn Davies <curious@ihug.com.au>\nJonathan A. Davis <davis@jdhouse.org>\nJeremy Tan <nsx@nsx.homeip.net>\n\n"
 
 #: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
@@ -2123,7 +1927,7 @@
 msgid "Enable debug printing"
 msgstr "启用调试输出"
 
-#: src/jack/jack.c:422
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2132,87 +1936,75 @@
 "\n"
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
-msgstr ""
-"XMMS Jack驱动0.17\n"
-"\n"
-"xmms-jack.sf.net\n"
-"Chris Morgan<cmorgan@alum.wpi.edu>\n"
-"\n"
-"Audacious版由Giacomo Lozito(develia.org)移植"
+msgstr "XMMS Jack驱动0.17\n\nxmms-jack.sf.net\nChris Morgan<cmorgan@alum.wpi.edu>\n\nAudacious版由Giacomo Lozito(develia.org)移植"
 
-#: src/jack/jack.c:427
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
 msgstr "关于JACK输出插件0.17"
 
-#: src/ladspa/plugin.c:410
+#: src/ladspa/plugin.c:415
 msgid "About LADSPA Host"
 msgstr ""
 
-#: src/ladspa/plugin.c:511
+#: src/ladspa/plugin.c:516
 #, c-format
 msgid "%s Settings"
 msgstr "%s 设置"
 
-#: src/ladspa/plugin.c:579
+#: src/ladspa/plugin.c:584
 msgid "LADSPA Host Settings"
 msgstr "LADSPA主机设置"
 
-#: src/ladspa/plugin.c:588
+#: src/ladspa/plugin.c:593
 msgid "Module paths:"
 msgstr "模块路径："
 
-#: src/ladspa/plugin.c:593
+#: src/ladspa/plugin.c:598
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
 msgstr ""
 
-#: src/ladspa/plugin.c:609
+#: src/ladspa/plugin.c:614
 msgid "Available plugins:"
 msgstr "可用插件："
 
-#: src/ladspa/plugin.c:621
+#: src/ladspa/plugin.c:626
 msgid "Enable"
 msgstr "启用"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:632
 msgid "Enabled plugins:"
 msgstr "已启用插件："
 
-#: src/ladspa/plugin.c:642
+#: src/ladspa/plugin.c:647
 msgid "Settings"
 msgstr "设置"
 
-#: src/lyricwiki/lyricwiki.c:227
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
-msgstr ""
-"\n"
-"正在搜索歌词..."
+msgstr "\n正在搜索歌词..."
 
-#: src/lyricwiki/lyricwiki.c:250
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
-msgstr ""
-"\n"
-"正在连接到lyrics.wikia.com..."
+msgstr "\n正在连接到lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:338
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
-msgstr ""
-"\n"
-"未找到相关歌词。"
+msgstr "\n未找到相关歌词。"
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr "关于Metronom"
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2221,53 +2013,53 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/mixer/plugin.c:63
+#: src/mixer/plugin.c:64
 msgid "About Channel Mixer"
 msgstr "关于通道混合器"
 
-#: src/mixer/plugin.c:92
+#: src/mixer/plugin.c:93
 msgid "Channel Mixer Settings"
 msgstr "通道混合器设置"
 
-#: src/mixer/plugin.c:101
+#: src/mixer/plugin.c:102
 msgid "Output channels:"
 msgstr "输出通道："
 
-#: src/mixer/plugin.c:111
+#: src/mixer/plugin.c:112
 msgid "Changes take effect at the next song change."
 msgstr "修改将在下一首歌生效。"
 
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
 msgstr "环绕音"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:340
 msgid "Upload in progress..."
 msgstr "正在上传..."
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:352
 msgid "Upload to MTP Device"
 msgstr "正上传到MTP设备　"
 
-#: src/mtp_up/mtp.c:311
+#: src/mtp_up/mtp.c:353
 msgid "Disconnect MTP Device"
 msgstr "断开与MTP设备的连接"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
 msgstr "已停止"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
 msgstr "Audacious未开始播放"
 
@@ -2279,9 +2071,7 @@
 msgid ""
 " by Christian Birchinger <joker@netswarm.net>\n"
 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
-msgstr ""
-"Christian Birchinger <joker@netswarm.net>\n"
-"基于Håvard Kvål <havardk@xmms.org>的XMMS插件"
+msgstr "Christian Birchinger <joker@netswarm.net>\n基于Håvard Kvål <havardk@xmms.org>的XMMS插件"
 
 #: src/null/null.c:68
 msgid "About Null Output"
@@ -2295,35 +2085,39 @@
 msgid "Run in real time"
 msgstr "以实时模式运行"
 
-#: src/oss4/configure.c:84
+#: src/oss4/configure.c:81
 msgid "1. Default device"
 msgstr "1. 默认设备"
 
-#: src/oss4/configure.c:142
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
 msgstr "OSS4输出插件首选项"
 
-#: src/oss4/configure.c:154 src/OSS/configure.c:194
+#: src/oss4/configure.c:150 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "音频设备："
 
-#: src/oss4/configure.c:182 src/OSS/configure.c:217 src/OSS/configure.c:260
+#: src/oss4/configure.c:178 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "使用其它设备"
 
-#: src/oss4/configure.c:197
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
 msgstr "会话中保存音量"
 
-#: src/oss4/configure.c:201
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
 msgstr "使用OSS的格式转换。"
 
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr ""
+
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "关于OSS4插件"
 
-#: src/oss4/utils.c:204
+#: src/oss4/utils.c:211
 msgid "OSS4 error"
 msgstr "OSS4错误"
 
@@ -2364,11 +2158,11 @@
 msgid "Mixer"
 msgstr "混音器"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr "关于OSS驱动"
 
-#: src/pulse_audio/pulse_audio.c:687
+#: src/pulse_audio/pulse_audio.c:677
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "关于Audacious PulseAudio输出插件"
 
@@ -2392,31 +2186,31 @@
 msgid "Method:"
 msgstr "方法："
 
-#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
+#: src/scrobbler/configure.c:123 src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr "修改密码"
 
-#: src/scrobbler/configure.c:143
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "服务"
 
-#: src/scrobbler/configure.c:165
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "用户名："
 
-#: src/scrobbler/configure.c:171
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "密码："
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr ""
 
-#: src/scrobbler/configure.c:211
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
 msgstr ""
 
-#: src/scrobbler/configure.c:238
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr ""
 
@@ -2424,14 +2218,8 @@
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
-"com>\n"
-msgstr ""
-"Audacious AudioScrobbler插件\n"
-"\n"
-"原作者：\n"
-"Audun Hove <audun@nlc.no>\n"
-"Pipian <pipian@pipian.com>\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr "Audacious AudioScrobbler插件\n\n原作者：\nAudun Hove <audun@nlc.no>\nPipian <pipian@pipian.com>\n"
 
 #: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
@@ -2445,6 +2233,40 @@
 msgid "SDL error"
 msgstr "SDL错误"
 
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr ""
+
+#: src/search-tool/search-tool.c:96 src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "库"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "创建播放列表"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "添加到播放列表"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "搜索库"
+
+#: src/search-tool/search-tool.c:645
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "请稍等...."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "选择文件夹"
+
 #: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "关于主题化界面"
@@ -2453,10 +2275,7 @@
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
-msgstr ""
-"版权所有 (c)\n"
-"2008, Tomasz Moń <desowin@gmail.com>\n"
-"\n"
+msgstr "版权所有 (c)\n2008, Tomasz Moń <desowin@gmail.com>\n\n"
 
 #: src/skins/skins_cfg.c:207
 msgid "_Player:"
@@ -2500,121 +2319,154 @@
 
 #: src/skins/ui_equalizer.c:334
 msgid "31 Hz"
-msgstr ""
+msgstr "31 赫兹"
 
 #: src/skins/ui_equalizer.c:335
 msgid "63 Hz"
-msgstr ""
+msgstr "63 赫兹"
 
 #: src/skins/ui_equalizer.c:335
 msgid "125 Hz"
-msgstr ""
+msgstr "125 赫兹"
 
 #: src/skins/ui_equalizer.c:335
 msgid "250 Hz"
-msgstr ""
+msgstr "250 赫兹"
 
 #: src/skins/ui_equalizer.c:335
 msgid "500 Hz"
-msgstr ""
+msgstr "200 赫兹"
 
 #: src/skins/ui_equalizer.c:335
 msgid "1 kHz"
-msgstr ""
+msgstr "1000 赫兹"
 
 #: src/skins/ui_equalizer.c:336
 msgid "2 kHz"
-msgstr ""
+msgstr "2000 赫兹"
 
 #: src/skins/ui_equalizer.c:336
 msgid "4 kHz"
-msgstr ""
+msgstr "4000 赫兹"
 
 #: src/skins/ui_equalizer.c:336
 msgid "8 kHz"
-msgstr ""
+msgstr "8000 赫兹"
 
 #: src/skins/ui_equalizer.c:336
 msgid "16 kHz"
-msgstr ""
+msgstr "16000 赫兹"
 
 #: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
 msgstr "Audacious均衡器"
 
-#: src/skins/ui_equalizer.c:896
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
 msgstr "预设"
 
-#: src/skins/ui_main.c:443
+#: src/skins/ui_equalizer.c:968 src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "载入预设"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1015 src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "加载均衡器预置"
+
+#: src/skins/ui_equalizer.c:1068 src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "保存预设"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1114 src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "保存均衡器预置"
+
+#: src/skins/ui_equalizer.c:1169 src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "删除预设"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr ""
+
+#: src/skins/ui_main.c:444
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:451
+#: src/skins/ui_main.c:452
 msgid "kHz"
-msgstr ""
+msgstr "千赫兹"
 
-#: src/skins/ui_main.c:458
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "环绕声"
 
-#: src/skins/ui_main.c:806
+#: src/skins/ui_main.c:807
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "查找： %d:%-2.2d/%d:%-2.2d"
 
-#: src/skins/ui_main.c:827
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "音量：%d%%"
 
-#: src/skins/ui_main.c:850
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "平衡：%d%% 左"
 
-#: src/skins/ui_main.c:852
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "平衡：中间"
 
-#: src/skins/ui_main.c:854
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "平衡：%d%% 右"
 
-#: src/skins/ui_main.c:980
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
 msgstr "选项菜单"
 
-#: src/skins/ui_main.c:984
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "禁用“顶置窗口”"
 
-#: src/skins/ui_main.c:986
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "启用“顶置窗口”"
 
-#: src/skins/ui_main.c:989
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
 msgstr "文件信息"
 
-#: src/skins/ui_main.c:994
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
 msgstr "可视化菜单"
 
-#: src/skins/ui_main.c:1646
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
 msgstr "单一窗口模式"
 
-#: src/skins/ui_main.c:1648
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
 msgstr "播放列表模式"
 
-#: src/skins/ui_main.c:1670
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr "完成后停止"
 
-#: src/skins/ui_main.c:1672
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
 msgstr "完成后不停止"
 
@@ -3116,187 +2968,169 @@
 msgid "Clear A-B"
 msgstr "清空A-B"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
-msgid "Jump to Playlist Start"
-msgstr "跳到被选中列表并播放"
-
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to Time"
 msgstr "跳到时间"
 
-#: src/skins/ui_manager.c:424
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
 msgstr "队列切换"
 
-#: src/skins/ui_manager.c:425
+#: src/skins/ui_manager.c:422
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "启用/禁用播放队列的条目"
 
-#: src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:425
 msgid "Copy"
 msgstr "复制"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr "剪切"
 
-#: src/skins/ui_manager.c:432
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr "粘贴"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "载入"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:437
 msgid "Import"
 msgstr "导入"
 
-#: src/skins/ui_manager.c:441
+#: src/skins/ui_manager.c:438
 msgid "Save"
 msgstr "保存"
 
-#: src/skins/ui_manager.c:442
+#: src/skins/ui_manager.c:439
 msgid "Delete"
 msgstr "删除"
 
-#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:441 src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
 msgstr "预设"
 
-#: src/skins/ui_manager.c:445
-msgid "Load preset"
-msgstr "载入预设"
-
-#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
 msgstr "自动载入预设"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr "载入自动载入预设"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
 msgstr "将默认预设载入到均衡器"
 
-#: src/skins/ui_manager.c:453
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "零"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
 msgstr "将均衡器的预设等级设置为零"
 
-#: src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "从文件加载"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
 msgstr "从文件加载预设"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
 msgstr "从WinAMP EQF文件加载"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
 msgstr "从WinAMP EQF文件加载预设"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
 msgstr "WinAMP 预设"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
 msgstr "导入WinAMP预设"
 
 #: src/skins/ui_manager.c:466
-msgid "Save preset"
-msgstr "保存预设"
-
-#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "保存自动加载预设"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
 msgstr "保存默认预设"
 
-#: src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "保存到文件"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
 msgstr "保存预设到文件"
 
-#: src/skins/ui_manager.c:477
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
 msgstr "保存到WinAMP EQF文件"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
 msgstr "保存预设到WinAMP EQF文件"
 
 #: src/skins/ui_manager.c:481
-msgid "Delete preset"
-msgstr "删除预设"
-
-#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "删除自动加载预设"
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
 msgstr "从当前播放列表中搜索条目"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular "
-"expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular"
+" expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr ""
-"按部分字段搜索播放列表中的条目。各个字段都可以使用正则表达式，而且是不分大小"
-"字的。如果你不知道何为正则表达式，简单的输入部分你想搜索的文字亦可。"
+msgstr "按部分字段搜索播放列表中的条目。各个字段都可以使用正则表达式，而且是不分大小字的。如果你不知道何为正则表达式，简单的输入部分你想搜索的文字亦可。"
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "标题："
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr "专辑："
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
 msgstr "艺术家："
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "文件名"
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr "搜索前清空之前的结果"
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
 msgstr "自动为区配条目切换队列"
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
 msgstr "用匹配的条目创建新的播放列表"
 
-#: src/skins/ui_playlist.c:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
 msgstr "Audacious播放列表编辑器"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3309,12 +3143,12 @@
 msgid "Unarchived Winamp 2.x skin"
 msgstr "未打包的Winamp 2.x主题"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "无法创建目录(%s)：%s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
 msgstr "关于sndfile插件"
 
@@ -3346,29 +3180,29 @@
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - 设置"
 
-#: src/song_change/song_change.c:447
+#: src/song_change/song_change.c:437
 msgid "Command to run when Audacious starts a new song."
 msgstr "歌曲开始播放时执行指令。"
 
-#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
-#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
+#: src/song_change/song_change.c:439 src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451 src/song_change/song_change.c:457
 msgid "Command:"
 msgstr "指令："
 
-#: src/song_change/song_change.c:453
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
 msgstr "歌曲即将完成时执行指令。"
 
-#: src/song_change/song_change.c:459
+#: src/song_change/song_change.c:449
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "当Audacious播放到列表结尾时执行指令。"
 
-#: src/song_change/song_change.c:465
+#: src/song_change/song_change.c:455
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr "歌曲的标题改变时执行指令(如：网络媒体的标题)。"
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3385,44 +3219,27 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr ""
-"你可以使用以下的格式符号，在执行命令时，\n"
-"它们会被转换为相应的值。\n"
-"部分符号在end-of-playlist命令中无效)\n"
-"\n"
-"%F: 频率 (单位：Hz)\n"
-"%c: 声道数\n"
-"%f: 文件名 (完整路径)\n"
-"%l: 长度 (单位：毫秒)\n"
-"%n 或 %s: 歌曲名\n"
-"%r: 比率 (单位： bit/秒)\n"
-"%t: 播放列表位置 (%02d)\n"
-"%p: 当前播放曲目 (1 or 0)\n"
-"%a: 艺术家\n"
-"%b: 专辑\n"
-"%T: 音轨标题"
+msgstr "你可以使用以下的格式符号，在执行命令时，\n它们会被转换为相应的值。\n部分符号在end-of-playlist命令中无效)\n\n%F: 频率 (单位：Hz)\n%c: 声道数\n%f: 文件名 (完整路径)\n%l: 长度 (单位：毫秒)\n%n 或 %s: 歌曲名\n%r: 比率 (单位： bit/秒)\n%t: 播放列表位置 (%02d)\n%p: 当前播放曲目 (1 or 0)\n%a: 艺术家\n%b: 专辑\n%T: 音轨标题"
 
-#: src/song_change/song_change.c:498
+#: src/song_change/song_change.c:488
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr ""
-"传递到Shell的参数一定要用引号包围，否则会是一件相当危险的"
-"事。"
+msgstr "传递到Shell的参数一定要用引号包围，否则会是一件相当危险的事。"
 
-#: src/song_change/song_change.c:509
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr "指令"
 
-#: src/song_change/song_change.c:539
+#: src/song_change/song_change.c:529
 msgid "Song Change"
 msgstr "歌曲改变"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr "关于状态图标插件"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3431,64 +3248,58 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager.\n"
-msgstr ""
-"状态图标插件\n"
-"\n"
-"版权所有 (c)\n"
-"2005-2007 Giacomo Lozito <james@develia.org>\n"
-"2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"此插件会在系统托盘上生成状态图标。\n"
+msgstr "状态图标插件\n\n版权所有 (c)\n2005-2007 Giacomo Lozito <james@develia.org>\n2010 Michał Lipski <tallica@o2.pl>\n\n此插件会在系统托盘上生成状态图标。\n"
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr "状态图标插件 - 首选项"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr "右键菜单"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
 msgstr "迷你播放菜单#1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
 msgstr "迷你播放菜单#2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr "鼠标滚轮动作"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "调整音量"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
 msgstr "改变歌曲"
 
-#: src/statusicon/statusicon.c:500
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
 msgstr "其它设置"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
 msgstr "禁用弹出窗口"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
 msgstr "关闭提示区域（系统托盘）"
 
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr ""
+
 #: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
-msgstr ""
-"Extra Stereo插件\n"
-"\n"
-"作者: Johan Levin 1999."
+msgstr "Extra Stereo插件\n\n作者: Johan Levin 1999."
 
 #: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
@@ -3498,62 +3309,11 @@
 msgid "Configure Extra Stereo"
 msgstr "设置Extra Stereo"
 
-#: src/streambrowser/gui/streambrowser_win.c:78
-msgid "Search:"
-msgstr "搜索："
-
-#: src/streambrowser/gui/streambrowser_win.c:97
-#: src/streambrowser/gui/streambrowser_win.c:372
-msgid "Add Bookmark"
-msgstr "添加书签"
-
-#: src/streambrowser/gui/streambrowser_win.c:324
-msgid "Stream name"
-msgstr "流名称"
-
-#: src/streambrowser/gui/streambrowser_win.c:331
-msgid "Now playing"
-msgstr "正在播放"
-
-#: src/streambrowser/gui/streambrowser_win.c:369
-msgid "Remove Bookmark"
-msgstr "删除书签"
-
-#: src/streambrowser/streambrowser.c:330
-msgid "About Stream Browser"
-msgstr "关于流查看器"
-
-#: src/streambrowser/streambrowser.c:331
-msgid ""
-"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming "
-"directories.\n"
-"Many thanks to the Streamtuner developers <http://www.nongnu.org/"
-"streamtuner>,\n"
-"\tand of course to the whole Audacious community.\n"
-"\n"
-"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-"\n"
-"This was a Google Summer of Code 2008 project."
-msgstr ""
-"版权所有 (c)\n"
-"2008, Calin Crisan <ccrisan@gmail.com>及Audacious开发小组。\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming "
-"directories.\n"
-"非常感谢Streamtuner的开发者<http://www.nongnu.org/streamtuner>，\n"
-"及Audacious社区全体。\n"
-"同时亦非常感谢Tony Vroon对我的帮助和指导。\n"
-"\n"
-"Google Summer of Code 2008 project."
-
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr "关于Tone Generator"
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3562,12 +3322,12 @@
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr ""
 
@@ -3575,11 +3335,11 @@
 msgid "About File I/O Plugin"
 msgstr "关于文件I/O插件"
 
-#: src/vorbis/vorbis.c:572
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "关于Ogg Vorbis音频插件"
 
-#: src/vorbis/vorbis.c:577
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -3596,22 +3356,7 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>\n"
 "\n"
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
-msgstr ""
-"Xiph.org基金会的Ogg Vorbis插件\n"
-"\n"
-"原作者：\n"
-"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-"贡献者：\n"
-"Chris Montgomery <monty@xiph.org>\n"
-"Peter Alm <peter@xmms.org>\n"
-"Michael Smith <msmith@labyrinth.edu.au>\n"
-"Jack Moffitt <jack@icecast.org>\n"
-"Jorn Baayen <jorn@nl.linux.org>\n"
-"Haavard Kvaalen <havardk@xmms.org>\n"
-"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-"Eugene Zagidullin <e.asphyx@gmail.com>\n"
-"\n"
-"马上登录Xiph.org基金会的网站http://www.xiph.org/\n"
+msgstr "Xiph.org基金会的Ogg Vorbis插件\n\n原作者：\nTony Arcieri <bascule@inferno.tusculum.edu>\n贡献者：\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHaavard Kvaalen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>\n\n马上登录Xiph.org基金会的网站http://www.xiph.org/\n"
 
 #: src/vtx/about.c:14
 msgid "About Vortex Player"
@@ -3620,19 +3365,13 @@
 #: src/vtx/about.c:15
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
-"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor."
-"ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "\n"
 "Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
 "and other AY/YM music sites.\n"
 "\n"
 "Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr ""
-"Sashnov Alexander <sashnov@ngs.ru>的Vortex文件播放器\n"
-"程序基于Roman Sherbakov<v_soft@microfor.ru>的in_vtx.dll源码\n"
-"vtx音乐文件可在http://vtx.microfor.ru/music.htm或者其它AY/YM音乐网站上找"
-"到。\n"
-"Audacious的实现由Pavel Vymetalek<pvymetalek@seznam.cz>完成"
+msgstr "Sashnov Alexander <sashnov@ngs.ru>的Vortex文件播放器\n程序基于Roman Sherbakov<v_soft@microfor.ru>的in_vtx.dll源码\nvtx音乐文件可在http://vtx.microfor.ru/music.htm或者其它AY/YM音乐网站上找到。\nAudacious的实现由Pavel Vymetalek<pvymetalek@seznam.cz>完成"
 
 #: src/wavpack/wavpack.c:353
 #, c-format
@@ -3645,1196 +3384,4 @@
 "\n"
 "Some of the plugin code was by Miles Egan\n"
 "Visit the Wavpack site at http://www.wavpack.com/\n"
-msgstr ""
-"版权所有 (c)\n"
-"2006 William Pitcock <nenolod -at- nenolod.net>\n"
-"\n"
-"插件部分代码来自Miles Egan\n"
-"登录Wavpack网站http://www.wavpack.com/\n"
-
-#~ msgid "Daemon Interface (like old headless mode)"
-#~ msgstr "Daemon模式"
-
-#~ msgid "About %s"
-#~ msgstr "关于 %s"
-
-#~ msgid " Error"
-#~ msgstr "错误"
-
-#~ msgid "General info"
-#~ msgstr "一般信息"
-
-#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "无法找到pixmap文件: %s"
-
-#~ msgid "Audacious-SID configuration"
-#~ msgstr "Audacious-SID设置"
-
-#~ msgid "Resolution:"
-#~ msgstr "分辨率："
-
-#~ msgid "Samplerate:"
-#~ msgstr "取样率："
-
-#~ msgid "Use oversampling"
-#~ msgstr "使用超取样"
-
-#~ msgid "Factor:"
-#~ msgstr "系数："
-
-#~ msgid "Large factors require more CPU-power"
-#~ msgstr "系数越大使用的CPU越多"
-
-#~ msgid "Oversampling:"
-#~ msgstr "超取样"
-
-#~ msgid "Audio"
-#~ msgstr "音频"
-
-#~ msgid "Force speed"
-#~ msgstr "强制速度"
-
-#~ msgid ""
-#~ "If enabled, this option \"forces\" the emulation engine to use the "
-#~ "selected clock speed/frequency. Otherwise the speed is determined from "
-#~ "played file itself."
-#~ msgstr "如果启用，将强制模拟器引擎使用指定的时频速度。否则则自己检测。"
-
-#~ msgid ""
-#~ "PAL is the european TV standard, which uses 50Hz vertical refresh "
-#~ "frequency. Most of SID-tunes have been made for PAL computers."
-#~ msgstr ""
-#~ "PAL是欧洲的电视标准，它使用的垂直刷新率是50Hz。大部分的SID-tunes都是为PAL"
-#~ "电脑制作的。"
-
-#~ msgid ""
-#~ "NTSC is the TV standard with 60Hz vertical refresh rate (and other "
-#~ "features that differ from PAL). It is mainly used in United States, Japan "
-#~ "and certain other countries."
-#~ msgstr ""
-#~ "NTSC则是使用垂直刷新率为50Hz的电视标准（除此以外，还包含其它不同于PAL的特"
-#~ "性)。主要在美国，日本还其它的部分国家使用。"
-
-#~ msgid "Clock speed:"
-#~ msgstr "时频速度："
-
-#~ msgid "Force model"
-#~ msgstr "强制型号"
-
-#~ msgid "SID model:"
-#~ msgstr "SID型号："
-
-#~ msgid "SIDPlay 1 (frame-based)"
-#~ msgstr "SIDPlay 1（基于帧）"
-
-#~ msgid ""
-#~ "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-#~ "cases, though."
-#~ msgstr ""
-#~ "使用libSIDPlay 1.x模拟器，速度更快，但并不准确。大部分情况都工作良好。"
-
-#~ msgid "SIDPlay 2 (cycle-based)"
-#~ msgstr "SIDPlay 2（基于周期）"
-
-#~ msgid ""
-#~ "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more "
-#~ "exact emulation."
-#~ msgstr "使用libSIDPlay 2.x模拟器，将使用更多CPU以获得更准确的模拟。"
-
-#~ msgid "Emulation library selection:"
-#~ msgstr "选择模拟器使用的库："
-
-#~ msgid "Real C64 (SIDPlay 2 only)"
-#~ msgstr "Real C64 （仅SIDPlay 2可用）"
-
-#~ msgid "Bank switching"
-#~ msgstr "Bank切换"
-
-#~ msgid "Transparent ROM"
-#~ msgstr "透明ROM"
-
-#~ msgid "PlaySID environment"
-#~ msgstr "PlaySID环境"
-
-#~ msgid "Memory mode:"
-#~ msgstr "内存模式："
-
-#~ msgid "Optimization mode (faster, inaccurate)"
-#~ msgstr "优化模式（更快，不准确）"
-
-#~ msgid "reSID-emulation"
-#~ msgstr "reSID模拟"
-
-#~ msgid "SIDPlay 2 options:"
-#~ msgstr "SIDPlay2 选项："
-
-#~ msgid "Resampling (FIR)"
-#~ msgstr "取样(FIR)"
-
-#~ msgid "reSID sampling options:"
-#~ msgstr "reSID取样选项："
-
-#~ msgid "Emulate filters"
-#~ msgstr "模拟过滤器"
-
-#~ msgid "Reset values"
-#~ msgstr "重置"
-
-#~ msgid "Export"
-#~ msgstr "导出"
-
-#~ msgid "Use"
-#~ msgstr "使用"
-
-#~ msgid "Filter curve:"
-#~ msgstr "过滤器曲线："
-
-#~ msgid "Filters"
-#~ msgstr "过滤器"
-
-#~ msgid "Play at least for specified time"
-#~ msgstr "至少播放指定的时间"
-
-#~ msgid "Playtime:"
-#~ msgstr "播放时间:"
-
-#~ msgid "Minimum playtime:"
-#~ msgstr "最小播放时间："
-
-#~ msgid "Play for specified time maximum"
-#~ msgstr "最长播放指定时间"
-
-#~ msgid "Only when song length is unknown"
-#~ msgstr "仅当歌曲长度未知"
-
-#~ msgid ""
-#~ "If enabled, the maximum playtime is applied only if song/tune length is "
-#~ "not known."
-#~ msgstr "如果启用，最长播放时间仅当歌曲长度未知时使用"
-
-#~ msgid "Maximum playtime:"
-#~ msgstr "最长播放时间："
-
-#~ msgid "Use XSIDPLAY-compatible database"
-#~ msgstr "使用XSIDPLAY兼容的数据库"
-
-#~ msgid "DB-file:"
-#~ msgstr "数据库文件："
-
-#~ msgid "Database path and filename"
-#~ msgstr "数据库文件路径及名称"
-
-#~ msgid "Browse for song length-database file"
-#~ msgstr "浏览"
-
-#~ msgid "Song length database:"
-#~ msgstr "歌曲长度数据库："
-
-#~ msgid "Songlength"
-#~ msgstr "歌曲长度"
-
-#~ msgid "Override generic Tuplez format string"
-#~ msgstr "覆盖常规Tuplez格式字串"
-
-#~ msgid "Tuplez format string for SID-files"
-#~ msgstr "SID文件Tuplez格式字串"
-
-#~ msgid "Song title format:"
-#~ msgstr "歌曲标题格式："
-
-#~ msgid "Use STIL database"
-#~ msgstr "使用STIL数据库"
-
-#~ msgid "STIL file:"
-#~ msgstr "STIL文件："
-
-#~ msgid ""
-#~ "Path and filename of STIL database file (STIL.txt), usually found from "
-#~ "HVSC's DOCUMENTS-subdirectory."
-#~ msgstr ""
-#~ "STIL数据库文件的路径及名称（STIL.txt）。通常可以在HVSC文档子目录下找到。"
-
-#~ msgid "Browse for STIL-database file"
-#~ msgstr "浏览STIL数据库文件"
-
-#~ msgid "HVSC path:"
-#~ msgstr "HVSC路径："
-
-#~ msgid "Browse for HVSC path"
-#~ msgstr "浏览HVSC路径"
-
-#~ msgid "SID Tune Information List (STIL) database:"
-#~ msgstr "SID音调信息列表（STIL）数据库"
-
-#~ msgid "Cancel any changes"
-#~ msgstr "取消所有变更"
-
-#~ msgid "Accept and update changes"
-#~ msgstr "同意并更新"
-
-#~ msgid "Audacious-SID Fileinfo"
-#~ msgstr "Audacious-SID文件信息"
-
-#~ msgid "Filename:"
-#~ msgstr "文件名："
-
-#~ msgid "Songname:"
-#~ msgstr "歌曲名："
-
-#~ msgid "Composer:"
-#~ msgstr "作曲家："
-
-#~ msgid "Copyright:"
-#~ msgstr "版权："
-
-#~ msgid "Song Information:"
-#~ msgstr "歌曲信息："
-
-#~ msgid "Author:"
-#~ msgstr "作者："
-
-#~ msgid "Duration:"
-#~ msgstr "持续时间："
-
-#~ msgid "Sub-tune Information:"
-#~ msgstr "Sub-tune信息："
-
-#~ msgid "Select HVSC song length database"
-#~ msgstr "选择HVSC歌曲长度数据库"
-
-#~ msgid "Select STIL-database"
-#~ msgstr "选择STIL数据库"
-
-#~ msgid "Select HVSC location prefix"
-#~ msgstr "选择HVSC路径前缀"
-
-#~ msgid "Select SIDPlay2 filters file for importing"
-#~ msgstr "选择要导入的SIDPlay2过滤文件"
-
-#~ msgid "Select SIDPlay2 filters file for exporting"
-#~ msgstr "选择要导出的SIDplay2过滤文件"
-
-#~ msgid "Confirm selected action"
-#~ msgstr "确认选中的动作"
-
-#~ msgid "Yes"
-#~ msgstr "是"
-
-#~ msgid "No"
-#~ msgstr "否"
-
-#~ msgid "Save All Playlists"
-#~ msgstr "保存所有播放列表"
-
-#~ msgid ""
-#~ "Saves all the playlists that are open. Note that this is done "
-#~ "automatically when Audacious quits."
-#~ msgstr "保存所有已打开的播放列表（其实Audacious退出时是会自动保存的）。"
-
-#~ msgid "Opens the playlist manager."
-#~ msgstr "打开播放列表管理器"
-
-#~ msgid "Override generic titles"
-#~ msgstr "覆蓋常规标题"
-
-#~ msgid "Title format:"
-#~ msgstr "标题格式"
-
-#~ msgid "Ogg Vorbis Tags"
-#~ msgstr "Ogg Vorbis标签"
-
-#~ msgid "Ogg Vorbis Audio Plugin Configuration"
-#~ msgstr "Ogg Vorbis音频播放设置"
-
-#~ msgid "Use Bitmap fonts if available"
-#~ msgstr "尽可能使用点阵字体"
-
-#~ 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 "Select Playlist"
-#~ msgstr "选择播放列表"
-
-#~ msgid "reset to current output volume"
-#~ 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 "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 "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 "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 "主题化界面"
+msgstr "版权所有 (c)\n2006 William Pitcock <nenolod -at- nenolod.net>\n\n插件部分代码来自Miles Egan\n登录Wavpack网站http://www.wavpack.com/\n"

audacious-plugins-3.1.1.tar.bz2/po/zh_TW.po -> audacious-plugins-3.2.4.tar.bz2/po/zh_TW.po Changed

@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: audacious-plugins 3.1\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-10-24 16:38-0400\n"
-"PO-Revision-Date: 2011-11-10 11:53+0800\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2011-12-29 19:29-0500\n"
+"PO-Revision-Date: 2012-04-24 09:03+0800\n"
 "Last-Translator: Ruei-Yuan Lu <RueiYuan.Lu@gmail.com>\n"
 "Language-Team: Chinese (traditional)\n"
 "Language: \n"
@@ -32,214 +32,180 @@
 msgid "About MP4 AAC decoder plugin"
 msgstr "關於 MP4 AAC 解碼器外掛"
 
-#: src/alarm/interface.c:34
-msgid "About XMMS Alarm"
-msgstr ""
-
-#: src/alarm/interface.c:41
-msgid "XMMS Alarm"
-msgstr ""
+#: src/alarm/alarm.c:312
+msgid "About Alarm"
+msgstr "關於鬧鐘"
 
-#: src/alarm/interface.c:50
+#: src/alarm/alarm.c:313
 msgid ""
-"An XMMS plugin which can be used\n"
-"to start playing at a certain time.\n"
+"A plugin that can be used 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/"
+"Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/interface.c:65
-msgid "Close"
-msgstr "關閉"
-
-#: src/alarm/interface.c:95
+#: src/alarm/interface.c:33
 msgid "Alarm"
 msgstr "鬧鐘"
 
-#: src/alarm/interface.c:102
+#: src/alarm/interface.c:40
 msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.c:117
-#: src/alarm/interface.c:1338
+#: src/alarm/interface.c:55
+#: src/alarm/interface.c:1213
 msgid "OK"
 msgstr "確認"
 
-#: src/alarm/interface.c:151
-msgid "Sorry"
-msgstr "抱歉"
-
-#: src/alarm/interface.c:158
-msgid "Warning"
-msgstr "警告"
-
-#: src/alarm/interface.c:167
-msgid ""
-"For safety reasons the \"quiet\" time must be at least 65 seconds longer than the fading time, it must also be more than 10 seconds. This basically means that there is a bug in the code and until I find a way of really fixing it this message will appear :)\n"
-"\n"
-"Your fading settings have NOT been saved\n"
-"\n"
-"--\n"
-"Adam"
-msgstr ""
-
-#: src/alarm/interface.c:183
-msgid "Oh Well"
-msgstr ""
-
-#: src/alarm/interface.c:339
+#: src/alarm/interface.c:214
 msgid "Alarm Settings"
 msgstr "鬧鐘設定"
 
-#: src/alarm/interface.c:354
-#: src/alarm/interface.c:526
-#: src/alarm/interface.c:898
+#: src/alarm/interface.c:229
+#: src/alarm/interface.c:401
+#: src/alarm/interface.c:773
 msgid "Time"
 msgstr "時間"
 
-#: src/alarm/interface.c:395
+#: src/alarm/interface.c:270
 msgid "hours"
 msgstr "小時"
 
-#: src/alarm/interface.c:456
+#: src/alarm/interface.c:331
 msgid "h"
 msgstr ""
 
-#: src/alarm/interface.c:486
+#: src/alarm/interface.c:361
 msgid "minutes"
 msgstr "分鐘"
 
-#: src/alarm/interface.c:504
+#: src/alarm/interface.c:379
 msgid "Quiet after:"
 msgstr "多久後靜音:"
 
-#: src/alarm/interface.c:514
+#: src/alarm/interface.c:389
 msgid "Alarm at (default):"
 msgstr "鈴響於 (預設)"
 
-#: src/alarm/interface.c:534
+#: src/alarm/interface.c:409
 msgid "Choose the days for the alarm to come on"
 msgstr "選擇想要在哪幾天啟用鬧鐘"
 
-#: src/alarm/interface.c:562
-#: src/alarm/interface.c:610
-#: src/alarm/interface.c:658
-#: src/alarm/interface.c:706
-#: src/alarm/interface.c:754
-#: src/alarm/interface.c:802
-#: src/alarm/interface.c:850
+#: src/alarm/interface.c:437
+#: src/alarm/interface.c:485
+#: src/alarm/interface.c:533
+#: src/alarm/interface.c:581
+#: src/alarm/interface.c:629
+#: src/alarm/interface.c:677
+#: src/alarm/interface.c:725
 #: src/bs2b/plugin.c:198
 #: src/OSS/configure.c:153
-#: src/skins/ui_manager.c:450
-#: src/skins/ui_manager.c:471
+#: src/skins/ui_equalizer.c:1104
+#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:468
 msgid "Default"
 msgstr "預設"
 
-#: src/alarm/interface.c:888
+#: src/alarm/interface.c:763
 msgid "Day"
 msgstr "日子"
 
-#: src/alarm/interface.c:908
+#: src/alarm/interface.c:783
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/alarm/interface.c:919
+#: src/alarm/interface.c:794
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/alarm/interface.c:930
+#: src/alarm/interface.c:805
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/alarm/interface.c:941
+#: src/alarm/interface.c:816
 msgid "Friday"
 msgstr "星期五"
 
-#: src/alarm/interface.c:952
+#: src/alarm/interface.c:827
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/alarm/interface.c:963
+#: src/alarm/interface.c:838
 msgid "Sunday"
 msgstr "星期日"
 
-#: src/alarm/interface.c:973
+#: src/alarm/interface.c:848
 msgid "Monday"
 msgstr "星期一"
 
-#: src/alarm/interface.c:984
+#: src/alarm/interface.c:859
 msgid "Days"
 msgstr "週排程"
 
-#: src/alarm/interface.c:1000
+#: src/alarm/interface.c:875
 msgid "Fading"
 msgstr "淡出"
 
-#: src/alarm/interface.c:1037
+#: src/alarm/interface.c:912
 msgid "seconds"
 msgstr "秒"
 
-#: src/alarm/interface.c:1045
-#: src/alarm/interface.c:1160
+#: src/alarm/interface.c:920
+#: src/alarm/interface.c:1035
 msgid "Volume"
 msgstr "音量"
 
-#: src/alarm/interface.c:1071
+#: src/alarm/interface.c:946
 msgid "Current"
 msgstr "目前音量"
 
-#: src/alarm/interface.c:1079
+#: src/alarm/interface.c:954
 msgid "Start at"
 msgstr "初始音量"
 
-#: src/alarm/interface.c:1107
-#: src/alarm/interface.c:1151
+#: src/alarm/interface.c:982
+#: src/alarm/interface.c:1026
 msgid "%"
-msgstr ""
+msgstr "%"
 
-#: src/alarm/interface.c:1123
+#: src/alarm/interface.c:998
 msgid "Final"
 msgstr "最終音量"
 
-#: src/alarm/interface.c:1176
+#: src/alarm/interface.c:1051
 msgid "Additional Command"
 msgstr "額外命令"
 
-#: src/alarm/interface.c:1202
+#: src/alarm/interface.c:1077
 msgid "enable"
 msgstr "啟用"
 
-#: src/alarm/interface.c:1210
+#: src/alarm/interface.c:1085
 msgid "Playlist (optional)"
 msgstr "播放清單 (選用)"
 
-#: src/alarm/interface.c:1236
+#: src/alarm/interface.c:1111
 msgid "Browse..."
 msgstr "瀏覽..."
 
-#: src/alarm/interface.c:1244
-#: src/alarm/interface.c:1408
+#: src/alarm/interface.c:1119
+#: src/alarm/interface.c:1283
 msgid "Reminder"
 msgstr "提醒"
 
-#: src/alarm/interface.c:1261
+#: src/alarm/interface.c:1136
 msgid "Use reminder"
 msgstr "提醒命令"
 
-#: src/alarm/interface.c:1277
+#: src/alarm/interface.c:1152
 #: src/sndstretch/sndstretch_xmms.c:358
 msgid "Options"
 msgstr "選項"
 
-#: src/alarm/interface.c:1285
+#: src/alarm/interface.c:1160
 msgid "What do these options mean?"
 msgstr "這些選項代表什麼意思？"
 
-#: src/alarm/interface.c:1313
+#: src/alarm/interface.c:1188
 msgid ""
 "\n"
 "Time\n"
@@ -339,12 +305,12 @@
 " 在鈴響過後顯示提醒，\n"
 " 在文字輸入欄位中輸入你想要的提醒訊息。\n"
 
-#: src/alarm/interface.c:1315
+#: src/alarm/interface.c:1190
 #: src/skins/ui_manager.c:382
 msgid "Help"
 msgstr "說明"
 
-#: src/alarm/interface.c:1347
+#: src/alarm/interface.c:1222
 #: src/cdaudio-ng/configure.c:249
 #: src/crystalizer/crystalizer.c:130
 #: src/echo_plugin/gui.c:125
@@ -354,11 +320,11 @@
 msgid "Cancel"
 msgstr "取消"
 
-#: src/alarm/interface.c:1415
+#: src/alarm/interface.c:1290
 msgid "Your reminder for today is.."
 msgstr "您今天的提醒"
 
-#: src/alarm/interface.c:1440
+#: src/alarm/interface.c:1315
 msgid "Thankyou"
 msgstr "謝謝"
 
@@ -399,7 +365,7 @@
 msgid "ALSA error"
 msgstr "ALSA 錯誤"
 
-#: src/amidi-plug/amidi-plug.c:335
+#: src/amidi-plug/amidi-plug.c:326
 msgid "You have not selected any sequencer ports for MIDI playback. You can do so in the MIDI plugin preferences."
 msgstr "您尚未選擇任何用於播放 MIDI 的編曲機連接埠。請到 MIDI 外掛偏好設定中設定。"
 
@@ -528,6 +494,8 @@
 "AMIDI\n"
 "Plug"
 msgstr ""
+"AMIDI\n"
+"Plug"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
@@ -613,15 +581,15 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:550
 msgid "22050 Hz "
-msgstr ""
+msgstr "22050 Hz "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:553
 msgid "44100 Hz "
-msgstr ""
+msgstr "44100 Hz "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:556
 msgid "96000 Hz "
-msgstr ""
+msgstr "96000 Hz "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:559
 msgid "custom "
@@ -629,7 +597,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "Hz "
-msgstr ""
+msgstr "Hz "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:621
 msgid "FluidSynth Backend not loaded or not available"
@@ -640,6 +608,8 @@
 "FluidSynth\n"
 "backend"
 msgstr ""
+"FluidSynth\n"
+" 後端"
 
 #: src/amidi-plug/i_configure-timidity.c:39
 msgid "TIMIDITY BACKEND CONFIGURATION"
@@ -654,14 +624,16 @@
 "TiMidity\n"
 "backend"
 msgstr ""
+"TiMidity\n"
+" 後端"
 
 #: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
-msgstr ""
+msgstr "名稱:"
 
 #: src/amidi-plug/i_fileinfo.c:193
 msgid " MIDI Info "
-msgstr ""
+msgstr " MIDI 資訊 "
 
 #: src/amidi-plug/i_fileinfo.c:205
 msgid "Format:"
@@ -681,7 +653,7 @@
 
 #: src/amidi-plug/i_fileinfo.c:217
 msgid "BPM:"
-msgstr ""
+msgstr "BPM:"
 
 #: src/amidi-plug/i_fileinfo.c:223
 msgid "BPM (wavg):"
@@ -716,6 +688,8 @@
 "\n"
 "AMIDI-Plug "
 msgstr ""
+"\n"
+"AMIDI-Plug "
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -758,236 +732,240 @@
 msgid "None"
 msgstr "無"
 
-#: src/aosd/aosd_trigger.c:77
+#: src/aosd/aosd_trigger.c:78
 msgid "Playback Start"
 msgstr "開始播放"
 
-#: src/aosd/aosd_trigger.c:78
+#: src/aosd/aosd_trigger.c:79
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "當播放清單中的項目被播放時觸發 OSD"
 
-#: src/aosd/aosd_trigger.c:82
+#: src/aosd/aosd_trigger.c:83
 msgid "Title Change"
 msgstr "標題變更"
 
-#: src/aosd/aosd_trigger.c:83
+#: src/aosd/aosd_trigger.c:84
 msgid "Triggers OSD when, during playback, the song title changes but the filename is the same. This is mostly useful to display title changes in internet streams."
 msgstr "當播放中歌曲標題改變但檔名不變時觸發 OSD。這對顯示網路串流的標題很有用。"
 
-#: src/aosd/aosd_trigger.c:89
+#: src/aosd/aosd_trigger.c:90
 msgid "Volume Change"
 msgstr "音量改變"
 
-#: src/aosd/aosd_trigger.c:90
+#: src/aosd/aosd_trigger.c:91
 msgid "Triggers OSD when volume is changed."
 msgstr "當音量改變時觸發 OSD"
 
-#: src/aosd/aosd_trigger.c:94
+#: src/aosd/aosd_trigger.c:95
 msgid "Pause On"
 msgstr "暫停播放"
 
-#: src/aosd/aosd_trigger.c:95
+#: src/aosd/aosd_trigger.c:96
 msgid "Triggers OSD when playback is paused."
 msgstr "當播放暫停時觸發 OSD"
 
-#: src/aosd/aosd_trigger.c:99
+#: src/aosd/aosd_trigger.c:100
 msgid "Pause Off"
 msgstr "解除暫停"
 
-#: src/aosd/aosd_trigger.c:100
+#: src/aosd/aosd_trigger.c:101
 msgid "Triggers OSD when playback is unpaused."
 msgstr "當解除暫停時觸發 OSD"
 
-#: src/aosd/aosd_ui.c:180
+#: src/aosd/aosd_ui.c:179
 msgid "Placement"
 msgstr "放置位置"
 
-#: src/aosd/aosd_ui.c:219
+#: src/aosd/aosd_ui.c:218
 msgid "Relative X offset:"
 msgstr "X 軸相對位移:"
 
-#: src/aosd/aosd_ui.c:228
+#: src/aosd/aosd_ui.c:227
 msgid "Relative Y offset:"
 msgstr "Y 軸相對位移:"
 
-#: src/aosd/aosd_ui.c:237
+#: src/aosd/aosd_ui.c:236
 msgid "Max OSD width:"
 msgstr "最大 OSD 寬度:"
 
-#: src/aosd/aosd_ui.c:250
+#: src/aosd/aosd_ui.c:249
 msgid "Multi-Monitor options"
 msgstr "多螢幕選項"
 
-#: src/aosd/aosd_ui.c:254
+#: src/aosd/aosd_ui.c:253
 msgid "Display OSD using:"
 msgstr "顯示 OSD:"
 
-#: src/aosd/aosd_ui.c:265
+#: src/aosd/aosd_ui.c:264
 msgid "all monitors"
 msgstr "所有螢幕"
 
-#: src/aosd/aosd_ui.c:268
+#: src/aosd/aosd_ui.c:267
 #, c-format
 msgid "monitor %i"
 msgstr "螢幕 %i"
 
-#: src/aosd/aosd_ui.c:323
+#: src/aosd/aosd_ui.c:322
 msgid "Timing (ms)"
 msgstr "計時 (毫秒)"
 
-#: src/aosd/aosd_ui.c:328
+#: src/aosd/aosd_ui.c:327
 msgid "Display:"
 msgstr "顯示:"
 
-#: src/aosd/aosd_ui.c:333
+#: src/aosd/aosd_ui.c:332
 msgid "Fade in:"
 msgstr "淡入:"
 
-#: src/aosd/aosd_ui.c:338
+#: src/aosd/aosd_ui.c:337
 msgid "Fade out:"
 msgstr "淡出:"
 
-#: src/aosd/aosd_ui.c:419
+#: src/aosd/aosd_ui.c:418
 msgid "Fonts"
 msgstr "字型"
 
-#: src/aosd/aosd_ui.c:427
+#: src/aosd/aosd_ui.c:426
 #, c-format
 msgid "Font %i:"
 msgstr "字型 %i:"
 
-#: src/aosd/aosd_ui.c:444
+#: src/aosd/aosd_ui.c:443
 msgid "Shadow"
 msgstr "陰影"
 
-#: src/aosd/aosd_ui.c:479
+#: src/aosd/aosd_ui.c:478
 msgid "Internationalization"
 msgstr "國際化"
 
-#: src/aosd/aosd_ui.c:485
+#: src/aosd/aosd_ui.c:484
 msgid "Disable UTF-8 conversion of text (in aosd)"
 msgstr "關閉文字的 UTF-8 轉換 (僅在 asod)"
 
-#: src/aosd/aosd_ui.c:503
+#: src/aosd/aosd_ui.c:502
 msgid "Select Skin File"
 msgstr "選擇面板檔案"
 
-#: src/aosd/aosd_ui.c:614
+#: src/aosd/aosd_ui.c:613
 msgid "Render Style"
-msgstr ""
+msgstr "呈現樣式"
 
-#: src/aosd/aosd_ui.c:630
+#: src/aosd/aosd_ui.c:629
 msgid "Colors"
 msgstr "顏色"
 
-#: src/aosd/aosd_ui.c:643
+#: src/aosd/aosd_ui.c:642
 #, c-format
 msgid "Color %i:"
 msgstr "顏色 %i:"
 
-#: src/aosd/aosd_ui.c:663
+#: src/aosd/aosd_ui.c:662
 msgid "Custom Skin"
 msgstr "自訂面板"
 
-#: src/aosd/aosd_ui.c:669
+#: src/aosd/aosd_ui.c:668
 msgid "Skin file:"
 msgstr "面板檔案:"
 
-#: src/aosd/aosd_ui.c:672
+#: src/aosd/aosd_ui.c:671
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/aosd/aosd_ui.c:774
+#: src/aosd/aosd_ui.c:773
 msgid "Enable trigger"
 msgstr "啟用觸發器"
 
-#: src/aosd/aosd_ui.c:801
+#: src/aosd/aosd_ui.c:800
 msgid "Event"
 msgstr "事件"
 
-#: src/aosd/aosd_ui.c:829
+#: src/aosd/aosd_ui.c:828
 msgid "Composite manager detected"
-msgstr "已偵測到 Composite manager"
+msgstr "已偵測到合成特效管理程式"
 
-#: src/aosd/aosd_ui.c:836
+#: src/aosd/aosd_ui.c:835
 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 ""
+"未偵測到合成特效管理程式；\n"
+"除非您確定已經執行，否則 OSD 將無法正確啟用。"
 
-#: src/aosd/aosd_ui.c:844
+#: src/aosd/aosd_ui.c:843
 msgid "Composite manager not required for fake transparency"
 msgstr "假的透明特效不需要 Composite manager"
 
-#: src/aosd/aosd_ui.c:882
+#: src/aosd/aosd_ui.c:881
 msgid "Transparency"
 msgstr "透明"
 
-#: src/aosd/aosd_ui.c:888
+#: src/aosd/aosd_ui.c:887
 msgid "Fake transparency"
 msgstr "假的透明特效"
 
-#: src/aosd/aosd_ui.c:890
+#: src/aosd/aosd_ui.c:889
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "真的透明特效 (需要 X Composite 延伸功能)"
 
-#: src/aosd/aosd_ui.c:932
+#: src/aosd/aosd_ui.c:931
 msgid "Composite extension not loaded"
 msgstr "Composite 延伸功能未載入"
 
-#: src/aosd/aosd_ui.c:940
+#: src/aosd/aosd_ui.c:939
 msgid "Composite extension not available"
 msgstr "Composite 延伸功能不存在"
 
-#: src/aosd/aosd_ui.c:959
+#: src/aosd/aosd_ui.c:958
 #, c-format
 msgid "Audacious OSD"
-msgstr ""
+msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1040
+#: src/aosd/aosd_ui.c:1039
 msgid "Audacious OSD - configuration"
 msgstr "Audacious OSD - 設定"
 
-#: src/aosd/aosd_ui.c:1061
+#: src/aosd/aosd_ui.c:1060
 msgid "Test"
 msgstr "測試"
 
-#: src/aosd/aosd_ui.c:1076
+#: src/aosd/aosd_ui.c:1075
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.c:1081
+#: src/aosd/aosd_ui.c:1080
 msgid "Animation"
 msgstr "動畫"
 
-#: src/aosd/aosd_ui.c:1086
+#: src/aosd/aosd_ui.c:1085
 msgid "Text"
 msgstr "文字"
 
-#: src/aosd/aosd_ui.c:1091
+#: src/aosd/aosd_ui.c:1090
 msgid "Decoration"
 msgstr "裝飾"
 
-#: src/aosd/aosd_ui.c:1096
+#: src/aosd/aosd_ui.c:1095
 msgid "Trigger"
 msgstr "觸發"
 
-#: src/aosd/aosd_ui.c:1101
+#: src/aosd/aosd_ui.c:1100
 #: src/cdaudio-ng/configure.c:171
 msgid "Misc"
 msgstr "雜項"
 
-#: src/aosd/aosd_ui.c:1138
+#: src/aosd/aosd_ui.c:1137
 msgid "Audacious OSD - about"
 msgstr "關於 - Audacious OSD"
 
-#: src/aosd/aosd_ui.c:1168
+#: src/aosd/aosd_ui.c:1167
 msgid ""
 "\n"
 "Audacious OSD "
 msgstr ""
+"\n"
+"Audacious OSD "
 
-#: src/aosd/aosd_ui.c:1169
+#: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -1025,11 +1003,11 @@
 msgid "Presets:"
 msgstr "樣式"
 
-#: src/cdaudio-ng/cdaudio-ng.c:241
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid "About Audio CD Plugin"
-msgstr ""
+msgstr "關於音樂 CD 外掛"
 
-#: src/cdaudio-ng/cdaudio-ng.c:242
+#: src/cdaudio-ng/cdaudio-ng.c:243
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
@@ -1043,15 +1021,15 @@
 "Copyright 2009 John Lindgren"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:550
+#: src/cdaudio-ng/cdaudio-ng.c:552
 msgid "Audio CD"
 msgstr "音樂 CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:922
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Drive is empty."
 msgstr "光碟機是空的。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:924
+#: src/cdaudio-ng/cdaudio-ng.c:926
 msgid "Unsupported disk type."
 msgstr "未支援的光碟類型"
 
@@ -1153,7 +1131,7 @@
 #: src/console/configure.c:185
 #: src/console/configure.c:206
 msgid "secs"
-msgstr ""
+msgstr "秒"
 
 #: src/console/configure.c:181
 msgid "Treble:"
@@ -1177,11 +1155,11 @@
 
 #: src/console/configure.c:233
 msgid "Hz"
-msgstr ""
+msgstr "Hz"
 
 #: src/console/configure.c:244
 msgid "SPC"
-msgstr ""
+msgstr "SPC"
 
 #: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
@@ -1193,7 +1171,7 @@
 
 #: src/console/configure.c:271
 msgid "The default song length, expressed in seconds, is used for songs that do not provide length information (i.e. looping tracks)."
-msgstr ""
+msgstr "預設的歌曲長度，以秒表示。用於沒有提供長度資訊的歌曲 (像會無限播放的音軌)"
 
 #: src/console/plugin.c:33
 msgid "About the Game Console Music Decoder"
@@ -1278,7 +1256,7 @@
 msgid "Volume: (%)"
 msgstr "音量: (%)"
 
-#: src/ffaudio/ffaudio-core.c:795
+#: src/ffaudio/ffaudio-core.c:798
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1294,64 +1272,64 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:809
+#: src/ffaudio/ffaudio-core.c:812
 msgid "About FFaudio Plugin"
-msgstr ""
+msgstr "關於 FFaudio 外掛"
 
 #: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.c:455
+#: src/filewriter/filewriter.c:461
 msgid "File Writer Configuration"
 msgstr "檔案輸出設定"
 
-#: src/filewriter/filewriter.c:467
+#: src/filewriter/filewriter.c:473
 msgid "Output file format:"
 msgstr "輸出檔案格式:"
 
-#: src/filewriter/filewriter.c:485
+#: src/filewriter/filewriter.c:491
 msgid "Configure"
 msgstr "設定"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:506
 msgid "Save into original directory"
 msgstr "儲存到原始資料夾"
 
-#: src/filewriter/filewriter.c:505
+#: src/filewriter/filewriter.c:511
 msgid "Save into custom directory"
 msgstr "儲存到自訂資料夾"
 
-#: src/filewriter/filewriter.c:515
+#: src/filewriter/filewriter.c:521
 msgid "Output file folder:"
 msgstr "輸出檔案資料夾:"
 
-#: src/filewriter/filewriter.c:519
+#: src/filewriter/filewriter.c:525
 msgid "Pick a folder"
 msgstr "選擇一個資料夾"
 
-#: src/filewriter/filewriter.c:538
+#: src/filewriter/filewriter.c:544
 msgid "Get filename from:"
 msgstr "檔名來源:"
 
-#: src/filewriter/filewriter.c:541
+#: src/filewriter/filewriter.c:547
 msgid "original file tags"
 msgstr "原始檔案標籤"
 
-#: src/filewriter/filewriter.c:547
+#: src/filewriter/filewriter.c:553
 msgid "original filename"
 msgstr "原始檔名"
 
-#: src/filewriter/filewriter.c:557
+#: src/filewriter/filewriter.c:563
 msgid "Don't strip file name extension"
 msgstr "不要去掉副檔名"
 
-#: src/filewriter/filewriter.c:572
+#: src/filewriter/filewriter.c:578
 msgid "Prepend track number to filename"
 msgstr "在檔名前面加上音軌號碼"
 
 #: src/filewriter/mp3.c:38
-#: src/filewriter/mp3.c:771
+#: src/filewriter/mp3.c:765
 msgid "Auto"
 msgstr "自動"
 
@@ -1360,153 +1338,153 @@
 msgstr "聯合立體聲"
 
 #: src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Stereo"
 msgstr "立體聲"
 
 #: src/filewriter/mp3.c:39
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Mono"
 msgstr "單聲道"
 
-#: src/filewriter/mp3.c:712
+#: src/filewriter/mp3.c:706
 msgid "MP3 Configuration"
 msgstr "MP3 設定"
 
-#: src/filewriter/mp3.c:735
+#: src/filewriter/mp3.c:729
 msgid "Algorithm Quality:"
 msgstr "演算法品質:"
 
-#: src/filewriter/mp3.c:760
+#: src/filewriter/mp3.c:754
 msgid "Output Samplerate:"
 msgstr "輸出取樣率:"
 
-#: src/filewriter/mp3.c:788
+#: src/filewriter/mp3.c:782
 msgid "(Hz)"
-msgstr ""
+msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:795
+#: src/filewriter/mp3.c:789
 msgid "Bitrate / Compression ratio:"
 msgstr "位元率 / 壓縮比率:"
 
-#: src/filewriter/mp3.c:819
+#: src/filewriter/mp3.c:813
 msgid "Bitrate (kbps):"
 msgstr "位元率 (kbps):"
 
-#: src/filewriter/mp3.c:852
+#: src/filewriter/mp3.c:846
 msgid "Compression ratio:"
 msgstr "壓縮比率:"
 
-#: src/filewriter/mp3.c:876
+#: src/filewriter/mp3.c:870
 msgid "Audio Mode:"
 msgstr "音訊模式:"
 
-#: src/filewriter/mp3.c:901
+#: src/filewriter/mp3.c:895
 msgid "Misc:"
 msgstr "雜項:"
 
-#: src/filewriter/mp3.c:912
+#: src/filewriter/mp3.c:906
 msgid "Enforce strict ISO complience"
 msgstr "強制嚴格相容於 ISO"
 
-#: src/filewriter/mp3.c:923
+#: src/filewriter/mp3.c:917
 msgid "Error protection"
 msgstr "錯誤保護"
 
-#: src/filewriter/mp3.c:935
-#: src/filewriter/vorbis.c:243
+#: src/filewriter/mp3.c:929
+#: src/filewriter/vorbis.c:247
 msgid "Quality"
 msgstr "品質"
 
-#: src/filewriter/mp3.c:945
+#: src/filewriter/mp3.c:939
 msgid "Enable VBR/ABR"
 msgstr "啟用 VBR/ABR"
 
-#: src/filewriter/mp3.c:955
+#: src/filewriter/mp3.c:949
 msgid "Type:"
 msgstr "類型:"
 
-#: src/filewriter/mp3.c:988
+#: src/filewriter/mp3.c:982
 msgid "VBR Options:"
 msgstr "VBR 選項:"
 
-#: src/filewriter/mp3.c:1004
+#: src/filewriter/mp3.c:998
 msgid "Minimum bitrate (kbps):"
 msgstr "最小位元率 (kbps):"
 
-#: src/filewriter/mp3.c:1031
+#: src/filewriter/mp3.c:1025
 msgid "Maximum bitrate (kbps):"
 msgstr "最大位元率 (kbps):"
 
-#: src/filewriter/mp3.c:1054
+#: src/filewriter/mp3.c:1048
 msgid "Strictly enforce minimum bitrate"
 msgstr "強制使用最小位元率"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1060
 msgid "ABR Options:"
 msgstr "ABR 選項:"
 
-#: src/filewriter/mp3.c:1076
+#: src/filewriter/mp3.c:1070
 msgid "Average bitrate (kbps):"
 msgstr "平均位元率 (kbps):"
 
-#: src/filewriter/mp3.c:1104
+#: src/filewriter/mp3.c:1098
 msgid "VBR quality level:"
 msgstr "VBR 品質等級:"
 
-#: src/filewriter/mp3.c:1123
+#: src/filewriter/mp3.c:1117
 msgid "Don't write Xing VBR header"
 msgstr "不要寫入 Xing VBR 檔頭"
 
-#: src/filewriter/mp3.c:1137
+#: src/filewriter/mp3.c:1131
 msgid "VBR/ABR"
-msgstr ""
+msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1147
+#: src/filewriter/mp3.c:1141
 msgid "Frame params:"
 msgstr "音框參數:"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1153
 msgid "Mark as copyright"
 msgstr "標示為版權"
 
-#: src/filewriter/mp3.c:1170
+#: src/filewriter/mp3.c:1164
 msgid "Mark as original"
 msgstr "標示為原創"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1176
 msgid "ID3 params:"
 msgstr "ID3 參數:"
 
-#: src/filewriter/mp3.c:1193
+#: src/filewriter/mp3.c:1187
 msgid "Force addition of version 2 tag"
 msgstr "強制加入第二版標籤"
 
-#: src/filewriter/mp3.c:1203
+#: src/filewriter/mp3.c:1197
 msgid "Only add v1 tag"
 msgstr "只加入第一版標籤"
 
-#: src/filewriter/mp3.c:1210
+#: src/filewriter/mp3.c:1204
 msgid "Only add v2 tag"
 msgstr "只加入第二版標籤"
 
-#: src/filewriter/mp3.c:1231
+#: src/filewriter/mp3.c:1225
 msgid "Tags"
 msgstr "標籤"
 
-#: src/filewriter/vorbis.c:236
+#: src/filewriter/vorbis.c:240
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis 編碼器設定"
 
-#: src/filewriter/vorbis.c:256
+#: src/filewriter/vorbis.c:260
 msgid "Quality level (0 - 10):"
 msgstr "品質等級 (0 - 10):"
 
-#: src/flacng/plugin.c:379
+#: src/flacng/plugin.c:380
 msgid "About FLAC Audio Plugin"
 msgstr "關於 FLAC 音訊外掛"
 
-#: src/flacng/plugin.c:380
+#: src/flacng/plugin.c:381
 msgid ""
 "\n"
 "\n"
@@ -1529,33 +1507,17 @@
 "\n"
 msgstr ""
 
-#: src/gntui/fileselector.c:75
-#: src/gntui/gntui.c:272
-msgid "Open Files"
-msgstr ""
-
-#: src/gntui/fileselector.c:75
-#: src/gntui/gntui.c:271
-msgid "Add Files"
-msgstr ""
-
-#: src/gntui/gntui.c:270
-msgid "Audacious2"
-msgstr ""
-
-#: src/gntui/gntui.c:311
-msgid "gnt interface"
-msgstr ""
-
 #: src/gtkui/columns.c:36
 msgid "Entry number"
 msgstr "項目編號"
 
 #: src/gtkui/columns.c:36
+#: src/search-tool/search-tool.c:43
 msgid "Title"
 msgstr "標題"
 
 #: src/gtkui/columns.c:37
+#: src/search-tool/search-tool.c:42
 msgid "Artist"
 msgstr "藝人"
 
@@ -1564,6 +1526,7 @@
 msgstr "年份"
 
 #: src/gtkui/columns.c:37
+#: src/search-tool/search-tool.c:43
 msgid "Album"
 msgstr "專輯"
 
@@ -1628,248 +1591,256 @@
 msgstr "解除嵌入"
 
 #: src/gtkui/layout.c:123
-#: src/ladspa/plugin.c:643
+#: src/ladspa/plugin.c:644
 msgid "Disable"
 msgstr "關閉"
 
-#: src/gtkui/menus.c:130
+#: src/gtkui/menus.c:131
 msgid "_Open Files ..."
 msgstr "開啟檔案(_O) ..."
 
-#: src/gtkui/menus.c:131
+#: src/gtkui/menus.c:132
 msgid "Open _URL ..."
 msgstr "開啟 _URL ..."
 
-#: src/gtkui/menus.c:132
-msgid "_Add File ..."
+#: src/gtkui/menus.c:133
+msgid "_Add Files ..."
 msgstr "加入檔案(_A) ... "
 
-#: src/gtkui/menus.c:133
+#: src/gtkui/menus.c:134
 msgid "Add U_RL ..."
 msgstr "加入 U_RL ..."
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:136
 msgid "A_bout ..."
 msgstr "關於(_B) ..."
 
-#: src/gtkui/menus.c:136
+#: src/gtkui/menus.c:137
 msgid "_Preferences ..."
 msgstr "偏好設定(_P) ..."
 
-#: src/gtkui/menus.c:137
+#: src/gtkui/menus.c:138
 #: src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "離開(_Q)"
 
-#: src/gtkui/menus.c:140
+#: src/gtkui/menus.c:141
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.c:141
+#: src/gtkui/menus.c:142
 msgid "Paus_e"
 msgstr "暫停(_E)"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:143
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:144
 msgid "Pre_vious"
 msgstr "上一個(_V)"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:145
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:147
 msgid "_Repeat"
 msgstr "重複"
 
-#: src/gtkui/menus.c:147
+#: src/gtkui/menus.c:148
 msgid "S_huffle"
 msgstr "隨機"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:149
 msgid "N_o Playlist Advance"
 msgstr "不要切換播放清單"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:150
 msgid "Stop _After This Song"
 msgstr "播放完目前歌曲後停止"
 
-#: src/gtkui/menus.c:151
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:152
+#: src/gtkui/menus.c:212
 msgid "Song _Info ..."
 msgstr "歌曲資訊(_I) ..."
 
-#: src/gtkui/menus.c:152
+#: src/gtkui/menus.c:153
 msgid "Jump to _Time ..."
 msgstr "跳至時間(_T) ..."
 
-#: src/gtkui/menus.c:153
+#: src/gtkui/menus.c:154
 msgid "_Jump to Song ..."
 msgstr "跳至歌曲(_J) ..."
 
-#: src/gtkui/menus.c:156
+#: src/gtkui/menus.c:157
 msgid "By Track _Number"
 msgstr "音軌編號(_N)"
 
-#: src/gtkui/menus.c:157
+#: src/gtkui/menus.c:158
 msgid "By _Title"
 msgstr "標題(_T)"
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:159
 msgid "By _Artist"
 msgstr "藝人(_A)"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:160
 msgid "By A_lbum"
 msgstr "專輯(_L)"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:161
 msgid "By Release _Date"
 msgstr "發行日期(_D)"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:162
 msgid "By _File Path"
 msgstr "檔案路徑(_F)"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:163
 msgid "By _Custom Title"
 msgstr "自訂標題(_C)"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:165
 msgid "R_everse Order"
 msgstr "反向順序(_E)"
 
-#: src/gtkui/menus.c:165
+#: src/gtkui/menus.c:166
 msgid "_Random Order"
 msgstr "隨機順序(_R)"
 
-#: src/gtkui/menus.c:168
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:169
+#: src/gtkui/menus.c:214
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
 #: src/gtkui/menus.c:170
+msgid "Remove _Unavailable Files"
+msgstr "移除不存在的檔案(_U)"
+
+#: src/gtkui/menus.c:172
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:174
 msgid "_New"
 msgstr "新增(_N)"
 
-#: src/gtkui/menus.c:173
-#: src/gtkui/menus.c:222
+#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:225
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:177
 msgid "_Import ..."
 msgstr "匯入(_I) ..."
 
-#: src/gtkui/menus.c:176
+#: src/gtkui/menus.c:178
 msgid "_Export ..."
 msgstr "匯出 (_E) ..."
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:180
 msgid "_Playlist Manager ..."
 msgstr "播放清單管理(_P) ..."
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:181
 msgid "_Queue Manager ..."
 msgstr "佇列管理(_Q) ..."
 
-#: src/gtkui/menus.c:182
+#: src/gtkui/menus.c:184
 msgid "Volume _Up"
 msgstr "提高音量(_U)"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:185
 msgid "Volume _Down"
 msgstr "降低音量(_D)"
 
-#: src/gtkui/menus.c:185
+#: src/gtkui/menus.c:187
 msgid "_Equalizer"
 msgstr "等化器(_E)"
 
-#: src/gtkui/menus.c:187
+#: src/gtkui/menus.c:189
 msgid "E_ffects"
 msgstr "特效(_F)"
 
-#: src/gtkui/menus.c:190
+#: src/gtkui/menus.c:192
 msgid "_Interface"
 msgstr "介面(_I)"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:193
+msgid "_Visualizations"
+msgstr "視覺特效(_V)"
+
+#: src/gtkui/menus.c:195
 msgid "Show _Menu Bar"
 msgstr "顯示選單列(_M)"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:196
 msgid "Show I_nfo Bar"
 msgstr "顯示資訊列(_N)"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:197
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:199
 msgid "Show Column _Headers"
 msgstr "顯示欄位標頭(_H)"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:200
 msgid "Choose _Columns ..."
 msgstr "選擇欄位 (_C) ..."
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:201
 msgid "Scrol_l on Song Change"
 msgstr "切換歌曲時捲動(_L)"
 
-#: src/gtkui/menus.c:201
+#: src/gtkui/menus.c:204
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:205
 msgid "_Playback"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:206
 msgid "P_laylist"
 msgstr "播放清單(_L)"
 
-#: src/gtkui/menus.c:204
-#: src/gtkui/menus.c:218
+#: src/gtkui/menus.c:207
+#: src/gtkui/menus.c:221
 msgid "_Services"
 msgstr "服務(_S)"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:208
 msgid "_Output"
 msgstr "輸出(_O)"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:209
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:213
 msgid "_Queue/Unqueue"
 msgstr "排入/移出佇列(_Q)"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:216
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:217
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:218
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:219
 msgid "Select _All"
 msgstr "選擇全部(_A)"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:224
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
@@ -1878,46 +1849,46 @@
 msgstr "GTK 介面"
 
 #: src/gtkui/ui_gtk.c:156
-#: src/skins/ui_main.c:302
+#: src/skins/ui_main.c:303
 #, c-format
 msgid "%s - Audacious"
-msgstr ""
+msgstr "%s - Audacious"
 
 #: src/gtkui/ui_gtk.c:162
 msgid "Buffering ..."
 msgstr "緩衝中 ..."
 
 #: src/gtkui/ui_gtk.c:165
-#: src/skins/ui_main.c:304
-#: src/skins/ui_main.c:1499
+#: src/skins/ui_main.c:305
+#: src/skins/ui_main.c:1504
 msgid "Audacious"
-msgstr ""
+msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:211
-#: src/skins/plugin.c:183
+#: src/gtkui/ui_gtk.c:216
+#: src/skins/plugin.c:190
 msgid "Error"
 msgstr "錯誤"
 
-#: src/gtkui/ui_statusbar.c:102
-#: src/skins/ui_main.c:459
+#: src/gtkui/ui_statusbar.c:105
+#: src/skins/ui_main.c:460
 msgid "mono"
-msgstr ""
+msgstr "單聲道"
 
-#: src/gtkui/ui_statusbar.c:104
-#: src/skins/ui_main.c:458
+#: src/gtkui/ui_statusbar.c:107
+#: src/skins/ui_main.c:459
 msgid "stereo"
-msgstr ""
+msgstr "立體聲"
 
-#: src/gtkui/ui_statusbar.c:106
+#: src/gtkui/ui_statusbar.c:109
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] ""
+msgstr[0] "%d 聲道"
 
-#: src/gtkui/ui_statusbar.c:121
+#: src/gtkui/ui_statusbar.c:124
 #, c-format
 msgid "%d kbps"
-msgstr ""
+msgstr "%d kbps"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
@@ -1964,8 +1935,8 @@
 msgstr "降低音量"
 
 #: src/hotkey/gui.c:81
-#: src/skins/ui_manager.c:418
-#: src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:416
 msgid "Jump to File"
 msgstr "跳至檔案"
 
@@ -2046,11 +2017,11 @@
 
 #: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
-msgstr ""
+msgstr "連接至所有可用的 jack 連接埠"
 
 #: src/jack/configure.c:73
 msgid "Connect only the output ports"
-msgstr ""
+msgstr "僅連接至輸出埠"
 
 #: src/jack/configure.c:80
 msgid "Connect to no ports"
@@ -2058,17 +2029,17 @@
 
 #: src/jack/configure.c:98
 msgid "jack Plugin configuration"
-msgstr ""
+msgstr "jack 外掛組態設定"
 
 #: src/jack/configure.c:116
 msgid "Connection mode:"
-msgstr ""
+msgstr "連接模式:"
 
 #: src/jack/configure.c:128
 msgid "Enable debug printing"
-msgstr ""
+msgstr "啟用除錯輸出"
 
-#: src/jack/jack.c:422
+#: src/jack/jack.c:435
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -2079,28 +2050,28 @@
 "Giacomo Lozito from develia.org"
 msgstr ""
 
-#: src/jack/jack.c:427
+#: src/jack/jack.c:440
 msgid "About JACK Output Plugin 0.17"
-msgstr ""
+msgstr "關於 JACK 輸出外掛 0.17"
 
-#: src/ladspa/plugin.c:414
+#: src/ladspa/plugin.c:415
 msgid "About LADSPA Host"
 msgstr ""
 
-#: src/ladspa/plugin.c:515
+#: src/ladspa/plugin.c:516
 #, c-format
 msgid "%s Settings"
 msgstr "%s 設定"
 
-#: src/ladspa/plugin.c:583
+#: src/ladspa/plugin.c:584
 msgid "LADSPA Host Settings"
 msgstr "LADSPA 主控端設定"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:593
 msgid "Module paths:"
 msgstr "模組路徑:"
 
-#: src/ladspa/plugin.c:597
+#: src/ladspa/plugin.c:598
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2110,24 +2081,23 @@
 "系統除了 LADSPA_PATH 之外也會搜尋這些路徑。\n"
 "加入新路徑之後請按 Enter 掃描新的外掛。"
 
-
-#: src/ladspa/plugin.c:613
+#: src/ladspa/plugin.c:614
 msgid "Available plugins:"
 msgstr "可用的外掛:"
 
-#: src/ladspa/plugin.c:625
+#: src/ladspa/plugin.c:626
 msgid "Enable"
 msgstr "啟用"
 
-#: src/ladspa/plugin.c:631
+#: src/ladspa/plugin.c:632
 msgid "Enabled plugins:"
 msgstr "啟用外掛:"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:647
 msgid "Settings"
 msgstr "設定"
 
-#: src/lyricwiki/lyricwiki.c:227
+#: src/lyricwiki/lyricwiki.c:267
 msgid ""
 "\n"
 "Looking for lyrics..."
@@ -2135,7 +2105,7 @@
 "\n"
 "尋找歌詞中 ..."
 
-#: src/lyricwiki/lyricwiki.c:250
+#: src/lyricwiki/lyricwiki.c:304
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
@@ -2143,7 +2113,7 @@
 "\n"
 "連線到 lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:338
+#: src/lyricwiki/lyricwiki.c:377
 msgid ""
 "\n"
 "No lyrics were found."
@@ -2151,11 +2121,11 @@
 "\n"
 "找不到歌詞。"
 
-#: src/metronom/metronom.c:85
+#: src/metronom/metronom.c:86
 msgid "About Metronom"
 msgstr ""
 
-#: src/metronom/metronom.c:86
+#: src/metronom/metronom.c:87
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2164,12 +2134,12 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:143
+#: src/metronom/metronom.c:144
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:145
+#: src/metronom/metronom.c:146
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
@@ -2190,27 +2160,27 @@
 msgid "Changes take effect at the next song change."
 msgstr "下一首歌播放時才會生效。"
 
-#: src/mpg123/mpg123.c:183
+#: src/mpg123/mpg123.c:191
 msgid "Surround"
 msgstr "環繞"
 
-#: src/mtp_up/mtp.c:298
+#: src/mtp_up/mtp.c:336
 msgid "Upload in progress..."
 msgstr "上傳處理中..."
 
-#: src/mtp_up/mtp.c:310
+#: src/mtp_up/mtp.c:348
 msgid "Upload to MTP Device"
 msgstr "上傳至 MTP 裝置"
 
-#: src/mtp_up/mtp.c:311
+#: src/mtp_up/mtp.c:349
 msgid "Disconnect MTP Device"
 msgstr "從 MTP 裝置離線"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Stopped"
 msgstr "已停止"
 
-#: src/notify/libnotify-aosd_event.c:47
+#: src/notify/libnotify-aosd_event.c:48
 msgid "Audacious is not playing."
 msgstr ""
 
@@ -2226,7 +2196,7 @@
 
 #: src/null/null.c:68
 msgid "About Null Output"
-msgstr ""
+msgstr "關於無聲輸出"
 
 #: src/null/null.c:89
 msgid "Null output preferences"
@@ -2236,33 +2206,37 @@
 msgid "Run in real time"
 msgstr "以即時優先權執行"
 
-#: src/oss4/configure.c:76
+#: src/oss4/configure.c:81
 msgid "1. Default device"
 msgstr "1. 預設裝置"
 
-#: src/oss4/configure.c:132
+#: src/oss4/configure.c:138
 msgid "OSS4 Output Plugin Preferences"
 msgstr "OSS4 輸出外掛偏好設定"
 
-#: src/oss4/configure.c:144
+#: src/oss4/configure.c:150
 #: src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "音訊裝置:"
 
-#: src/oss4/configure.c:172
+#: src/oss4/configure.c:178
 #: src/OSS/configure.c:217
 #: src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "使用替代裝置:"
 
-#: src/oss4/configure.c:187
+#: src/oss4/configure.c:193
 msgid "Save volume between sessions"
 msgstr "儲存不同工作階段的音量"
 
-#: src/oss4/configure.c:191
+#: src/oss4/configure.c:197
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
+#: src/oss4/configure.c:201
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr ""
+
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "關於 OSS4 外掛"
@@ -2308,11 +2282,11 @@
 msgid "Mixer"
 msgstr "混音器"
 
-#: src/OSS/OSS.c:40
+#: src/OSS/OSS.c:41
 msgid "About OSS Driver"
 msgstr "關於 OSS 驅動"
 
-#: src/pulse_audio/pulse_audio.c:687
+#: src/pulse_audio/pulse_audio.c:669
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "關於 Audacious PulseAudio 輸出外掛"
 
@@ -2336,32 +2310,32 @@
 msgid "Method:"
 msgstr "演算法:"
 
-#: src/scrobbler/configure.c:122
-#: src/scrobbler/configure.c:197
+#: src/scrobbler/configure.c:123
+#: src/scrobbler/configure.c:198
 msgid "Change password"
 msgstr "變更密碼"
 
-#: src/scrobbler/configure.c:143
+#: src/scrobbler/configure.c:144
 msgid "Services"
 msgstr "服務"
 
-#: src/scrobbler/configure.c:165
+#: src/scrobbler/configure.c:166
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: src/scrobbler/configure.c:171
+#: src/scrobbler/configure.c:172
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/scrobbler/configure.c:179
+#: src/scrobbler/configure.c:180
 msgid "Scrobbler URL:"
 msgstr ""
 
-#: src/scrobbler/configure.c:211
+#: src/scrobbler/configure.c:212
 msgid "Last.FM"
-msgstr ""
+msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:238
+#: src/scrobbler/configure.c:239
 msgid "Scrobbler"
 msgstr ""
 
@@ -2378,17 +2352,50 @@
 
 #: src/sdlout/plugin.c:58
 msgid "About SDL Output Plugin"
-msgstr ""
+msgstr "關於 SDL 輸出外掛"
 
 #: src/sdlout/plugin.c:78
 msgid "SDL error"
-msgstr ""
+msgstr "SDL 錯誤"
+
+#: src/search-tool/search-tool.c:42
+msgid "Genre"
+msgstr "類型"
+
+#: src/search-tool/search-tool.c:96
+#: src/search-tool/search-tool.c:106
+msgid "Library"
+msgstr "媒體櫃"
+
+#: src/search-tool/search-tool.c:591
+msgid "_Create Playlist"
+msgstr "建立播放清單(_C)"
+
+#: src/search-tool/search-tool.c:598
+msgid "_Add to Playlist"
+msgstr "加入至播放清單(_A):"
+
+#: src/search-tool/search-tool.c:641
+msgid "Search library"
+msgstr "搜尋媒體櫃"
+
+#: src/search-tool/search-tool.c:645
+msgid "To import your music library into Audacious, choose a folder and then click the \"refresh\" icon."
+msgstr "要將您的媒體櫃匯入至 Audacious，請選擇目標資料夾並且按下 \"重新整理\" 圖示。"
 
-#: src/skins/plugin.c:165
+#: src/search-tool/search-tool.c:653
+msgid "Please wait ..."
+msgstr "請稍候 ..."
+
+#: src/search-tool/search-tool.c:675
+msgid "Choose Folder"
+msgstr "選擇資料夾"
+
+#: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr ""
 
-#: src/skins/plugin.c:166
+#: src/skins/plugin.c:168
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -2436,121 +2443,159 @@
 
 #: src/skins/ui_equalizer.c:334
 msgid "31 Hz"
-msgstr ""
+msgstr "31 Hz"
 
 #: src/skins/ui_equalizer.c:335
 msgid "63 Hz"
-msgstr ""
+msgstr "63 Hz"
 
 #: src/skins/ui_equalizer.c:335
 msgid "125 Hz"
-msgstr ""
+msgstr "125 Hz"
 
 #: src/skins/ui_equalizer.c:335
 msgid "250 Hz"
-msgstr ""
+msgstr "250 Hz"
 
 #: src/skins/ui_equalizer.c:335
 msgid "500 Hz"
-msgstr ""
+msgstr "500 Hz"
 
 #: src/skins/ui_equalizer.c:335
 msgid "1 kHz"
-msgstr ""
+msgstr "1 kHz"
 
 #: src/skins/ui_equalizer.c:336
 msgid "2 kHz"
-msgstr ""
+msgstr "2 kHz"
 
 #: src/skins/ui_equalizer.c:336
 msgid "4 kHz"
-msgstr ""
+msgstr "4 kHz"
 
 #: src/skins/ui_equalizer.c:336
 msgid "8 kHz"
-msgstr ""
+msgstr "8 kHz"
 
 #: src/skins/ui_equalizer.c:336
 msgid "16 kHz"
-msgstr ""
+msgstr "16 kHz"
 
 #: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
 msgstr "Audacious 等化器"
 
-#: src/skins/ui_equalizer.c:896
+#: src/skins/ui_equalizer.c:887
 msgid "Presets"
 msgstr "樣式"
 
-#: src/skins/ui_main.c:443
+#: src/skins/ui_equalizer.c:968
+#: src/skins/ui_manager.c:442
+msgid "Load preset"
+msgstr "載入樣式"
+
+#: src/skins/ui_equalizer.c:985
+msgid "Load auto-preset"
+msgstr "讀取自動載入樣式"
+
+#: src/skins/ui_equalizer.c:1015
+#: src/skins/ui_equalizer.c:1033
+#: src/skins/ui_equalizer.c:1049
+msgid "Load equalizer preset"
+msgstr "載入等化器樣式"
+
+#: src/skins/ui_equalizer.c:1068
+#: src/skins/ui_manager.c:463
+msgid "Save preset"
+msgstr "儲存樣式"
+
+#: src/skins/ui_equalizer.c:1084
+msgid "Save auto-preset"
+msgstr "儲存自動載入樣式"
+
+#: src/skins/ui_equalizer.c:1114
+#: src/skins/ui_equalizer.c:1150
+msgid "Save equalizer preset"
+msgstr "儲存等化器樣式"
+
+#: src/skins/ui_equalizer.c:1169
+#: src/skins/ui_manager.c:478
+msgid "Delete preset"
+msgstr "刪除樣式"
+
+#: src/skins/ui_equalizer.c:1186
+msgid "Delete auto-preset"
+msgstr "刪除自動載入樣式"
+
+#: src/skins/ui_main.c:444
 msgid "kbps"
-msgstr ""
+msgstr "kbps"
 
-#: src/skins/ui_main.c:451
+#: src/skins/ui_main.c:452
 msgid "kHz"
-msgstr ""
+msgstr "kHz"
 
-#: src/skins/ui_main.c:458
+#: src/skins/ui_main.c:459
 msgid "surround"
 msgstr "環繞"
 
-#: src/skins/ui_main.c:806
+#: src/skins/ui_main.c:807
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr ""
+msgstr "移動至 %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:827
+#: src/skins/ui_main.c:828
 #, c-format
 msgid "Volume: %d%%"
 msgstr "音量: %d%%"
 
-#: src/skins/ui_main.c:850
+#: src/skins/ui_main.c:851
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "平衡: %d%% 偏左"
 
-#: src/skins/ui_main.c:852
+#: src/skins/ui_main.c:853
 msgid "Balance: center"
 msgstr "平衡: 中間"
 
-#: src/skins/ui_main.c:854
+#: src/skins/ui_main.c:855
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "平衡: %d%% 偏右"
 
-#: src/skins/ui_main.c:980
+#: src/skins/ui_main.c:981
 msgid "Options Menu"
-msgstr ""
+msgstr "選單選項"
 
-#: src/skins/ui_main.c:984
+#: src/skins/ui_main.c:985
 msgid "Disable 'Always On Top'"
 msgstr "關閉置頂"
 
-#: src/skins/ui_main.c:986
+#: src/skins/ui_main.c:987
 msgid "Enable 'Always On Top'"
 msgstr "啟用置頂"
 
-#: src/skins/ui_main.c:989
+#: src/skins/ui_main.c:990
 msgid "File Info Box"
-msgstr ""
+msgstr "檔案資訊視窗"
 
-#: src/skins/ui_main.c:994
+#: src/skins/ui_main.c:995
 msgid "Visualization Menu"
-msgstr "視覺化選單"
+msgstr "視覺特效選單"
 
-#: src/skins/ui_main.c:1648
+#: src/skins/ui_main.c:1653
 msgid "Single mode."
-msgstr ""
+msgstr "單一模式。"
 
-#: src/skins/ui_main.c:1650
+#: src/skins/ui_main.c:1655
 msgid "Playlist mode."
-msgstr ""
+msgstr "播放清單模式。"
 
-#: src/skins/ui_main.c:1672
+#: src/skins/ui_main.c:1677
 msgid "Stopping after song."
 msgstr ""
 
-#: src/skins/ui_main.c:1674
+#: src/skins/ui_main.c:1679
 msgid "Not stopping after song."
 msgstr ""
 
@@ -2733,11 +2778,11 @@
 
 #: src/skins/ui_manager.c:196
 msgid "Visualization"
-msgstr "視覺化"
+msgstr "視覺特效"
 
 #: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
-msgstr "視覺化模式"
+msgstr "視覺特效模式"
 
 #: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
@@ -2869,7 +2914,7 @@
 
 #: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
-msgstr ""
+msgstr "選擇所有的播放清單項目。"
 
 #: src/skins/ui_manager.c:265
 msgid "Select None"
@@ -2877,7 +2922,7 @@
 
 #: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
-msgstr ""
+msgstr "取消選擇所有的播放清單項目。"
 
 #: src/skins/ui_manager.c:271
 msgid "Remove All"
@@ -2885,7 +2930,7 @@
 
 #: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
-msgstr ""
+msgstr "從播放清單中移除所有的項目。"
 
 #: src/skins/ui_manager.c:275
 msgid "Clear Queue"
@@ -2897,11 +2942,11 @@
 
 #: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
-msgstr "移除不存在的檔案"
+msgstr "移除無法使用的檔案"
 
 #: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
-msgstr ""
+msgstr "從播放清單中移除無法使用的檔案。"
 
 #: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
@@ -2911,7 +2956,7 @@
 #: src/skins/ui_manager.c:317
 #: src/skins/ui_manager.c:347
 msgid "By Title"
-msgstr ""
+msgstr "標題"
 
 #: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
@@ -2921,7 +2966,7 @@
 #: src/skins/ui_manager.c:329
 #: src/skins/ui_manager.c:359
 msgid "By Filename"
-msgstr ""
+msgstr "檔案名稱"
 
 #: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
@@ -2931,7 +2976,7 @@
 #: src/skins/ui_manager.c:333
 #: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
-msgstr ""
+msgstr "路徑 + 檔案名稱"
 
 #: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
@@ -2955,82 +3000,82 @@
 
 #: src/skins/ui_manager.c:307
 msgid "Randomize List"
-msgstr ""
+msgstr "清單隨機排序"
 
 #: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
-msgstr ""
+msgstr "隨機排序播放清單。"
 
 #: src/skins/ui_manager.c:311
 msgid "Reverse List"
-msgstr ""
+msgstr "清單反向排序"
 
 #: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
-msgstr ""
+msgstr "反向排序播放清單。"
 
 #: src/skins/ui_manager.c:315
 msgid "Sort List"
-msgstr ""
+msgstr "排序清單"
 
 #: src/skins/ui_manager.c:318
 #: src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
-msgstr ""
+msgstr "以標題排序清單。"
 
 #: src/skins/ui_manager.c:321
 #: src/skins/ui_manager.c:351
 msgid "By Album"
-msgstr ""
+msgstr "專輯"
 
 #: src/skins/ui_manager.c:322
 #: src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
-msgstr ""
+msgstr "以專輯排序清單。"
 
 #: src/skins/ui_manager.c:325
 #: src/skins/ui_manager.c:355
 msgid "By Artist"
-msgstr ""
+msgstr "藝人"
 
 #: src/skins/ui_manager.c:326
 #: src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
-msgstr ""
+msgstr "以藝人排序清單"
 
 #: src/skins/ui_manager.c:330
 #: src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
-msgstr ""
+msgstr "以檔名排序清單。"
 
 #: src/skins/ui_manager.c:334
 #: src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
-msgstr ""
+msgstr "以完整路徑排序清單。"
 
 #: src/skins/ui_manager.c:337
 #: src/skins/ui_manager.c:367
 msgid "By Date"
-msgstr ""
+msgstr "日期"
 
 #: src/skins/ui_manager.c:338
 #: src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
-msgstr ""
+msgstr "以修改時間排序清單"
 
 #: src/skins/ui_manager.c:341
 #: src/skins/ui_manager.c:371
 msgid "By Track Number"
-msgstr ""
+msgstr "音軌編號"
 
 #: src/skins/ui_manager.c:342
 #: src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
-msgstr ""
+msgstr "以音軌編號排序清單"
 
 #: src/skins/ui_manager.c:345
 msgid "Sort Selected"
-msgstr ""
+msgstr "排序選擇的項目"
 
 #: src/skins/ui_manager.c:381
 msgid "File"
@@ -3097,185 +3142,168 @@
 msgid "Clear A-B"
 msgstr "清除 A-B"
 
-#: src/skins/ui_manager.c:415
-#: src/skins/ui_manager.c:416
-msgid "Jump to Playlist Start"
-msgstr "跳至播放清單開頭"
-
-#: src/skins/ui_manager.c:421
-#: src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:419
 msgid "Jump to Time"
 msgstr "跳至時間"
 
-#: src/skins/ui_manager.c:424
+#: src/skins/ui_manager.c:421
 msgid "Queue Toggle"
 msgstr "切換佇列"
 
-#: src/skins/ui_manager.c:425
+#: src/skins/ui_manager.c:422
 msgid "Enables/disables the entry in the playlist's queue."
-msgstr ""
+msgstr "啟用/停用在播放清單佇列中的項目。"
 
-#: src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:425
 msgid "Copy"
 msgstr "複製"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:427
 msgid "Cut"
 msgstr "剪下"
 
-#: src/skins/ui_manager.c:432
+#: src/skins/ui_manager.c:429
 msgid "Paste"
 msgstr "貼上"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:436
 msgid "Load"
 msgstr "載入"
 
-#: src/skins/ui_manager.c:440
+#: src/skins/ui_manager.c:437
 msgid "Import"
 msgstr "匯入"
 
-#: src/skins/ui_manager.c:441
+#: src/skins/ui_manager.c:438
 msgid "Save"
 msgstr "儲存"
 
-#: src/skins/ui_manager.c:442
+#: src/skins/ui_manager.c:439
 msgid "Delete"
 msgstr "刪除"
 
-#: src/skins/ui_manager.c:444
-#: src/skins/ui_manager.c:465
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:441
+#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:477
 msgid "Preset"
 msgstr "樣式"
 
-#: src/skins/ui_manager.c:445
-msgid "Load preset"
-msgstr "載入樣式"
-
-#: src/skins/ui_manager.c:447
-#: src/skins/ui_manager.c:468
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:444
+#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Auto-load preset"
 msgstr "自動載入樣式"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:445
 msgid "Load auto-load preset"
 msgstr "讀取自動載入樣式"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:448
 msgid "Load default preset into equalizer"
 msgstr "載入預設等化器樣式"
 
-#: src/skins/ui_manager.c:453
+#: src/skins/ui_manager.c:450
 msgid "Zero"
 msgstr "歸零"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:451
 msgid "Set equalizer preset levels to zero"
 msgstr "將等化器重置"
 
-#: src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:453
 msgid "From file"
 msgstr "從檔案"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:454
 msgid "Load preset from file"
 msgstr "從檔案載入樣式"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:456
 msgid "From WinAMP EQF file"
 msgstr "從 WinAMP EQF 檔"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:457
 msgid "Load preset from WinAMP EQF file"
 msgstr "從 WinAMP EQF 檔載入樣式"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:459
 msgid "WinAMP Presets"
 msgstr "WinAMP 樣式"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:460
 msgid "Import WinAMP presets"
 msgstr "匯入 WinAMP 樣式"
 
 #: src/skins/ui_manager.c:466
-msgid "Save preset"
-msgstr "儲存樣式"
-
-#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "儲存自動載入樣式"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:469
 msgid "Save default preset"
 msgstr "儲存預設樣式"
 
-#: src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:471
 msgid "To file"
 msgstr "至檔案"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:472
 msgid "Save preset to file"
 msgstr "儲存樣式到檔案"
 
-#: src/skins/ui_manager.c:477
+#: src/skins/ui_manager.c:474
 msgid "To WinAMP EQF file"
 msgstr "至 WinAMP EQF 檔"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:475
 msgid "Save preset to WinAMP EQF file"
 msgstr "儲存樣式到 WinAMP EQF 檔"
 
 #: src/skins/ui_manager.c:481
-msgid "Delete preset"
-msgstr "刪除樣式"
-
-#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "刪除自動載入樣式"
 
-#: src/skins/ui_playlist.c:244
+#: src/skins/ui_playlist.c:248
 msgid "Search entries in active playlist"
-msgstr ""
+msgstr "在使用中的播放清單裡搜尋播放項目"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:256
 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 expressions work, simply insert a literal portion of what you're searching for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:264
 msgid "Title: "
 msgstr "標題: "
 
-#: src/skins/ui_playlist.c:267
+#: src/skins/ui_playlist.c:271
 msgid "Album: "
 msgstr "專輯: "
 
-#: src/skins/ui_playlist.c:274
+#: src/skins/ui_playlist.c:278
 msgid "Artist: "
 msgstr "藝人: "
 
-#: src/skins/ui_playlist.c:281
+#: src/skins/ui_playlist.c:285
 msgid "Filename: "
 msgstr "檔名: "
 
-#: src/skins/ui_playlist.c:289
+#: src/skins/ui_playlist.c:293
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:292
+#: src/skins/ui_playlist.c:296
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:295
+#: src/skins/ui_playlist.c:299
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:762
+#: src/skins/ui_playlist.c:765
 msgid "Audacious Playlist Editor"
-msgstr ""
+msgstr "Audacious 播放清單編輯器"
 
-#: src/skins/ui_playlist.c:809
+#: src/skins/ui_playlist.c:812
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3288,14 +3316,14 @@
 msgid "Unarchived Winamp 2.x skin"
 msgstr "未壓縮的 Winamp 2.x skin"
 
-#: src/skins/util.c:773
+#: src/skins/util.c:774
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "無法建立資料夾 (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:456
 msgid "About sndfile plugin"
-msgstr ""
+msgstr "關於 sndfile 外掛"
 
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
@@ -3323,32 +3351,32 @@
 
 #: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
-msgstr "SndStretch - 設定"
+msgstr "SndStretch - 組態設定"
 
-#: src/song_change/song_change.c:447
+#: src/song_change/song_change.c:437
 msgid "Command to run when Audacious starts a new song."
 msgstr "當 Audacious 開始播放新的歌曲時執行的指令。"
 
-#: src/song_change/song_change.c:449
-#: src/song_change/song_change.c:455
-#: src/song_change/song_change.c:461
-#: src/song_change/song_change.c:467
+#: src/song_change/song_change.c:439
+#: src/song_change/song_change.c:445
+#: src/song_change/song_change.c:451
+#: src/song_change/song_change.c:457
 msgid "Command:"
 msgstr "命令:"
 
-#: src/song_change/song_change.c:453
+#: src/song_change/song_change.c:443
 msgid "Command to run toward the end of a song."
 msgstr "每當一首歌曲播放完時執行命令"
 
-#: src/song_change/song_change.c:459
+#: src/song_change/song_change.c:449
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "每當 Audacious 播放達到清單尾端時執行命令"
 
-#: src/song_change/song_change.c:465
+#: src/song_change/song_change.c:455
 msgid "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr "當一首歌的標題改變時執行命令。（網路串流的標題）"
 
-#: src/song_change/song_change.c:471
+#: src/song_change/song_change.c:461
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3382,23 +3410,23 @@
 "%b: 專輯\n"
 "%T: 音軌標題"
 
-#: src/song_change/song_change.c:498
+#: src/song_change/song_change.c:488
 msgid "Parameters passed to the shell should be encapsulated in quotes. Doing otherwise is a security risk."
 msgstr "傳給 shell 的參數應該用雙引號包起來，否則會有安全風險。"
 
-#: src/song_change/song_change.c:509
+#: src/song_change/song_change.c:499
 msgid "Commands"
 msgstr "命令"
 
-#: src/song_change/song_change.c:539
+#: src/song_change/song_change.c:529
 msgid "Song Change"
-msgstr ""
+msgstr "歌曲切換"
 
-#: src/statusicon/statusicon.c:378
+#: src/statusicon/statusicon.c:379
 msgid "About Status Icon Plugin"
 msgstr "關於狀態圖示外掛"
 
-#: src/statusicon/statusicon.c:379
+#: src/statusicon/statusicon.c:380
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3409,46 +3437,50 @@
 "the system tray area of the window manager.\n"
 msgstr ""
 
-#: src/statusicon/statusicon.c:447
+#: src/statusicon/statusicon.c:451
 msgid "Status Icon Plugin - Preferences"
 msgstr "狀態圖示外掛 - 偏好設定"
 
-#: src/statusicon/statusicon.c:457
+#: src/statusicon/statusicon.c:461
 msgid "Right-Click Menu"
 msgstr "右鍵選單"
 
-#: src/statusicon/statusicon.c:462
+#: src/statusicon/statusicon.c:466
 msgid "Small playback menu #1"
 msgstr "小型播放選單 #1"
 
-#: src/statusicon/statusicon.c:465
+#: src/statusicon/statusicon.c:469
 msgid "Small playback menu #2"
 msgstr "小型播放選單 #2"
 
-#: src/statusicon/statusicon.c:481
+#: src/statusicon/statusicon.c:485
 msgid "Mouse Scroll Action"
 msgstr "滑鼠滾輪動作"
 
-#: src/statusicon/statusicon.c:485
+#: src/statusicon/statusicon.c:489
 msgid "Change volume"
 msgstr "調整音量"
 
-#: src/statusicon/statusicon.c:487
+#: src/statusicon/statusicon.c:491
 msgid "Change playing song"
 msgstr "切換播放歌曲"
 
-#: src/statusicon/statusicon.c:500
+#: src/statusicon/statusicon.c:504
 msgid "Other settings"
 msgstr "其他設定"
 
-#: src/statusicon/statusicon.c:505
+#: src/statusicon/statusicon.c:509
 msgid "Disable the popup window"
 msgstr "關閉彈出式視窗"
 
-#: src/statusicon/statusicon.c:512
+#: src/statusicon/statusicon.c:516
 msgid "Close to the notification area (system tray)"
 msgstr "關閉視窗時縮到通知區域 (系統列)"
 
+#: src/statusicon/statusicon.c:524
+msgid "Advance in playlist when scrolling upward"
+msgstr "以與滑鼠滾輪的反方向切換歌曲"
+
 #: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
@@ -3464,49 +3496,11 @@
 msgid "Configure Extra Stereo"
 msgstr ""
 
-#: src/streambrowser/gui/streambrowser_win.c:78
-msgid "Search:"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:97
-#: src/streambrowser/gui/streambrowser_win.c:372
-msgid "Add Bookmark"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:324
-msgid "Stream name"
-msgstr "串流名稱"
-
-#: src/streambrowser/gui/streambrowser_win.c:331
-msgid "Now playing"
-msgstr ""
-
-#: src/streambrowser/gui/streambrowser_win.c:369
-msgid "Remove Bookmark"
-msgstr ""
-
-#: src/streambrowser/streambrowser.c:330
-msgid "About Stream Browser"
-msgstr "關於串流瀏覽器"
-
-#: src/streambrowser/streambrowser.c:331
-msgid ""
-"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
-"\n"
-"This is a simple stream browser that includes the most popular streaming directories.\n"
-"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
-"\tand of course to the whole Audacious community.\n"
-"\n"
-"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-"\n"
-"This was a Google Summer of Code 2008 project."
-msgstr ""
-
-#: src/tonegen/tonegen.c:48
+#: src/tonegen/tonegen.c:49
 msgid "About Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.c:50
+#: src/tonegen/tonegen.c:51
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3515,24 +3509,24 @@
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 #, c-format
 msgid "%s %.1f Hz"
-msgstr ""
+msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:100
+#: src/tonegen/tonegen.c:101
 msgid "Tone Generator: "
 msgstr ""
 
 #: src/unix-io/gtk.c:34
 msgid "About File I/O Plugin"
-msgstr ""
+msgstr "關於檔案 I/O 外掛"
 
-#: src/vorbis/vorbis.c:572
+#: src/vorbis/vorbis.c:573
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "關於 Ogg Vorbis 音訊外掛"
 
-#: src/vorbis/vorbis.c:577
+#: src/vorbis/vorbis.c:578
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -3569,7 +3563,7 @@
 #: src/wavpack/wavpack.c:353
 #, c-format
 msgid "Wavpack Decoder Plugin %s"
-msgstr ""
+msgstr "Wavpack 解碼器外掛 %s"
 
 #: src/wavpack/wavpack.c:354
 msgid ""

audacious-plugins-3.1.1.tar.bz2/src/OSS/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/OSS/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/OSS/OSS.c -> audacious-plugins-3.2.4.tar.bz2/src/OSS/OSS.c Changed

audacious-plugins-3.1.1.tar.bz2/src/aac/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/aac/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/aac/itunes-cover.c -> audacious-plugins-3.2.4.tar.bz2/src/aac/itunes-cover.c Changed

audacious-plugins-3.1.1.tar.bz2/src/aac/libmp4.c -> audacious-plugins-3.2.4.tar.bz2/src/aac/libmp4.c Changed

@@ -24,7 +24,6 @@
  */
 #define BUFFER_SIZE (FAAD_MIN_STREAMSIZE * 16)
 
-static void mp4_about (void);
 static void mp4_cleanup (void);
 static gint mp4_is_our_fd (const char *, VFSFile *);
 
@@ -246,24 +245,6 @@
     return parse_aac_stream (file);
 }
 
-static void mp4_about (void)
-{
-    static GtkWidget *aboutbox = NULL;
-
-    if (aboutbox == NULL)
-    {
-        gchar *about_text =
-         g_strdup_printf (_("Using libfaad2-%s for decoding.\n"
-         "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
-         "Copyright (c) 2005-2006 Audacious team"), FAAD2_VERSION);
-
-        audgui_simple_message (&aboutbox, GTK_MESSAGE_INFO,
-         _("About MP4 AAC decoder plugin"), about_text);
-
-        g_free (about_text);
-    }
-}
-
 static void mp4_cleanup (void)
 {
     g_mutex_free (seek_mutex);
@@ -384,37 +365,37 @@
     gchar *temp;
     gint length, bitrate, samplerate, channels;
 
-    tuple_associate_string (tuple, FIELD_CODEC, NULL, "MPEG-2/4 AAC");
+    tuple_set_str (tuple, FIELD_CODEC, NULL, "MPEG-2/4 AAC");
 
     if (!vfs_is_remote (filename))
     {
         calc_aac_info (handle, &length, &bitrate, &samplerate, &channels);
 
         if (length > 0)
-            tuple_associate_int (tuple, FIELD_LENGTH, NULL, length);
+            tuple_set_int (tuple, FIELD_LENGTH, NULL, length);
 
         if (bitrate > 0)
-            tuple_associate_int (tuple, FIELD_BITRATE, NULL, bitrate);
+            tuple_set_int (tuple, FIELD_BITRATE, NULL, bitrate);
     }
 
     temp = vfs_get_metadata (handle, "track-name");
     if (temp != NULL)
     {
-        tuple_associate_string (tuple, FIELD_TITLE, NULL, temp);
+        tuple_set_str (tuple, FIELD_TITLE, NULL, temp);
         g_free (temp);
     }
 
     temp = vfs_get_metadata (handle, "stream-name");
     if (temp != NULL)
     {
-        tuple_associate_string (tuple, FIELD_ALBUM, NULL, temp);
+        tuple_set_str (tuple, FIELD_ALBUM, NULL, temp);
         g_free (temp);
     }
 
     temp = vfs_get_metadata (handle, "content-bitrate");
     if (temp != NULL)
     {
-        tuple_associate_int (tuple, FIELD_BITRATE, NULL, atoi (temp) / 1000);
+        tuple_set_int (tuple, FIELD_BITRATE, NULL, atoi (temp) / 1000);
         g_free (temp);
     }
 
@@ -424,15 +405,16 @@
 static gboolean aac_title_changed (const gchar * filename, VFSFile * handle,
  Tuple * tuple)
 {
-    const gchar *old = tuple_get_string (tuple, FIELD_TITLE, NULL);
+    gchar *old = tuple_get_str (tuple, FIELD_TITLE, NULL);
     gchar *new = vfs_get_metadata (handle, "track-name");
     gboolean changed = FALSE;
 
     changed = (new != NULL && (old == NULL || strcmp (old, new)));
     if (changed)
-        tuple_associate_string (tuple, FIELD_TITLE, NULL, new);
+        tuple_set_str (tuple, FIELD_TITLE, NULL, new);
 
     g_free (new);
+    str_unref(old);
     return changed;
 }
 
@@ -444,7 +426,7 @@
     func (mp4, &string);
 
     if (string != NULL)
-        tuple_associate_string (tuple, field, NULL, string);
+        tuple_set_str (tuple, field, NULL, string);
 
     free (string);
 }
@@ -457,13 +439,13 @@
     gchar *year = NULL, *cd_track = NULL;
     gchar scratch[32];
 
-    tuple_associate_string (tuple, FIELD_CODEC, NULL, "MPEG-2/4 AAC");
+    tuple_set_str (tuple, FIELD_CODEC, NULL, "MPEG-2/4 AAC");
 
     length = mp4ff_get_track_duration (mp4, track);
     scale = mp4ff_time_scale (mp4, track);
 
     if (length > 0 && scale > 0)
-        tuple_associate_int (tuple, FIELD_LENGTH, NULL, length * 1000 / scale);
+        tuple_set_int (tuple, FIELD_LENGTH, NULL, length * 1000 / scale);
 
     rate = mp4ff_get_sample_rate (mp4, track);
     channels = mp4ff_get_channel_count (mp4, track);
@@ -472,13 +454,13 @@
     {
         snprintf (scratch, sizeof scratch, "%d kHz, %s", rate / 1000, channels
          == 1 ? "mono" : channels == 2 ? "stereo" : "surround");
-        tuple_associate_string (tuple, FIELD_QUALITY, NULL, scratch);
+        tuple_set_str (tuple, FIELD_QUALITY, NULL, scratch);
     }
 
     bitrate = mp4ff_get_avg_bitrate (mp4, track);
 
     if (bitrate > 0)
-        tuple_associate_int (tuple, FIELD_BITRATE, NULL, bitrate / 1000);
+        tuple_set_int (tuple, FIELD_BITRATE, NULL, bitrate / 1000);
 
     read_and_set_string (mp4, mp4ff_meta_get_title, tuple, FIELD_TITLE);
     read_and_set_string (mp4, mp4ff_meta_get_album, tuple, FIELD_ALBUM);
@@ -489,14 +471,14 @@
     mp4ff_meta_get_date (mp4, &year);
 
     if (year != NULL)
-        tuple_associate_int (tuple, FIELD_YEAR, NULL, atoi (year));
+        tuple_set_int (tuple, FIELD_YEAR, NULL, atoi (year));
 
     free (year);
 
     mp4ff_meta_get_track (mp4, &cd_track);
 
     if (cd_track != NULL)
-        tuple_associate_int (tuple, FIELD_TRACK_NUMBER, NULL, atoi (cd_track));
+        tuple_set_int (tuple, FIELD_TRACK_NUMBER, NULL, atoi (cd_track));
 
     free (cd_track);
 
@@ -743,8 +725,8 @@
     if (used)
     {
         * buflen -= used;
-        memmove (buf, buf + used, * buflen);
-        * buflen += vfs_fread (buf + * buflen, 1, size - * buflen, file);
+        memmove (buf, (char *) buf + used, * buflen);
+        * buflen += vfs_fread ((char *) buf + * buflen, 1, size - * buflen, file);
     }
 
     /* == START DECODING == */
@@ -755,8 +737,8 @@
     if ((used = NeAACDecInit (dec, buf, * buflen, & rate, & chan)))
     {
         * buflen -= used;
-        memmove (buf, buf + used, * buflen);
-        * buflen += vfs_fread (buf + * buflen, 1, size - * buflen, file);
+        memmove (buf, (char *) buf + used, * buflen);
+        * buflen += vfs_fread ((char *) buf + * buflen, 1, size - * buflen, file);
     }
 }
 
@@ -773,7 +755,7 @@
     tuple = aac_get_tuple (filename, file);
     if (tuple != NULL)
     {
-        mowgli_object_ref (tuple);
+        tuple_ref (tuple);
         playback->set_tuple (playback, tuple);
 
         bitrate = tuple_get_int (tuple, FIELD_BITRATE, NULL);
@@ -840,7 +822,7 @@
 
     if (tuple && aac_title_changed (filename, file, tuple))
     {
-        mowgli_object_ref (tuple);
+        tuple_ref (tuple);
         playback->set_tuple (playback, tuple);
     }
 
@@ -900,7 +882,7 @@
 
         if (tuple && aac_title_changed (filename, file, tuple))
         {
-            mowgli_object_ref (tuple);
+            tuple_ref (tuple);
             playback->set_tuple (playback, tuple);
         }
 
@@ -945,15 +927,17 @@
     playback->output->close_audio ();
     NeAACDecClose (decoder);
 
-    if (tuple != NULL)
-        mowgli_object_unref (tuple);
+    if (tuple)
+        tuple_unref (tuple);
 
     return TRUE;
 
 ERR_CLOSE_DECODER:
     NeAACDecClose (decoder);
+
     if (tuple)
-        mowgli_object_unref (tuple);
+        tuple_unref (tuple);
+
     return FALSE;
 }
 
@@ -988,13 +972,12 @@
 }
 
 gboolean read_itunes_cover (const gchar * filename, VFSFile * file, void * *
- data, gint * size);
+ data, gint64 * size);
 
 AUD_INPUT_PLUGIN
 (
     .name = "MP4 AAC decoder",
     .init = mp4_init,
-    .about = mp4_about,
     .play = mp4_play,
     .stop = mp4_stop,
     .pause = mp4_pause,

audacious-plugins-3.1.1.tar.bz2/src/aac/mp4_utils.c -> audacious-plugins-3.2.4.tar.bz2/src/aac/mp4_utils.c Changed

audacious-plugins-3.1.1.tar.bz2/src/aac/mp4ff/mp4ff.c -> audacious-plugins-3.2.4.tar.bz2/src/aac/mp4ff/mp4ff.c Changed

@@ -1,19 +1,19 @@
 /*
 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
 ** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.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; 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 
+** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
@@ -208,14 +208,19 @@
 /* parse subatoms */
 		if (meta_only && !need_parse_when_meta_only(atom_type))
 		{
-			mp4ff_set_position(f, mp4ff_position(f)+size-header_size);
-		} else if (atom_type < SUBATOMIC)
- {
- parse_sub_atoms(f, size-header_size,meta_only);
- } else {
- /* skip this atom */
- mp4ff_set_position(f, mp4ff_position(f)+size-header_size);
- }
+			if(mp4ff_set_position(f, mp4ff_position(f) + size - header_size) != 0)
+				break;
+		}
+		else if (atom_type < SUBATOMIC)
+		{
+			parse_sub_atoms(f, size-header_size,meta_only);
+		}
+		else
+		{
+			/* skip this atom */
+			if(mp4ff_set_position(f, mp4ff_position(f) + size - header_size) != 0)
+				break;
+		}
 }
 
 return 0;

audacious-plugins-3.1.1.tar.bz2/src/aac/mp4ff/mp4util.c -> audacious-plugins-3.2.4.tar.bz2/src/aac/mp4ff/mp4util.c Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/adplug/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/adplug-xmms.cc -> audacious-plugins-3.2.4.tar.bz2/src/adplug/adplug-xmms.cc Changed

@@ -23,6 +23,7 @@
 #include <sstream>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <gtk/gtk.h>
 #include "adplug.h"
@@ -34,8 +35,6 @@
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
 #include <audacious/plugin.h>
-#include <libaudcore/tuple_formatter.h>
-#include <libaudcore/vfs_buffered_file.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
@@ -121,10 +120,6 @@
 static CPlayer *
 factory (VFSFile * fd, Copl * newopl)
 {
- CPlayers::const_iterator i;
-
- dbg_printf ("factory(%p<%s>,opl): ", fd,
- fd->uri != NULL ? fd->uri : "unknown");
 return CAdPlug::factory (fd, newopl, conf.players);
 }
 
@@ -150,16 +145,16 @@
 ti = tuple_new_from_filename (filename);
 
 if (! p->getauthor().empty())
- tuple_associate_string(ti, FIELD_ARTIST, NULL, p->getauthor().c_str());
+ tuple_set_str(ti, FIELD_ARTIST, NULL, p->getauthor().c_str());
 if (! p->gettitle().empty())
- tuple_associate_string(ti, FIELD_TITLE, NULL, p->gettitle().c_str());
+ tuple_set_str(ti, FIELD_TITLE, NULL, p->gettitle().c_str());
 else if (! p->getdesc().empty())
- tuple_associate_string(ti, FIELD_TITLE, NULL, p->getdesc().c_str());
+ tuple_set_str(ti, FIELD_TITLE, NULL, p->getdesc().c_str());
 else
- tuple_associate_string(ti, FIELD_TITLE, NULL, g_path_get_basename(filename));
- tuple_associate_string(ti, FIELD_CODEC, NULL, p->gettype().c_str());
- tuple_associate_string(ti, FIELD_QUALITY, NULL, "sequenced");
- tuple_associate_int(ti, FIELD_LENGTH, NULL, p->songlength (plr.subsong));
+ tuple_set_str(ti, FIELD_TITLE, NULL, g_path_get_basename(filename));
+ tuple_set_str(ti, FIELD_CODEC, NULL, p->gettype().c_str());
+ tuple_set_str(ti, FIELD_QUALITY, NULL, "sequenced");
+ tuple_set_int(ti, FIELD_LENGTH, NULL, p->songlength (plr.subsong));
 delete p;
 }

audacious-plugins-3.1.1.tar.bz2/src/adplug/adplug-xmms.h -> audacious-plugins-3.2.4.tar.bz2/src/adplug/adplug-xmms.h Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/adl.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/adl.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/adplug.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/adplug.cxx Changed

@@ -1,17 +1,17 @@
 /*
 * Adplug - Replayer for many OPL2/OPL3 audio file formats.
 * Copyright (C) 1999 - 2008 Simon Peter <dn.tlp@gmx.net>, et al.
- * 
+ *
 * 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
@@ -199,7 +199,7 @@
 // Try a direct hit by file extension
 for (i = pl.begin (); i != pl.end (); i++)
 for (j = 0; (*i)->get_extension (j); j++)
- if (fp.extension (fd->uri, (*i)->get_extension (j)))
+ if (fp.extension (vfs_get_filename (fd), (*i)->get_extension (j)))
 {
 AdPlug_LogWrite ("Trying direct hit: %s\n", (*i)->filetype.c_str ());
 vfs_rewind (fd);

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/adtrack.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/adtrack.cxx Changed

@@ -1,17 +1,17 @@
 /*
 * Adplug - Replayer for many OPL2/OPL3 audio file formats.
 * Copyright (C) 1999 - 2003 Simon Peter <dn.tlp@gmx.net>, et al.
- * 
+ *
 * 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
@@ -55,7 +55,7 @@
 unsigned char chp, octave, pnote = 0;
 int i, j;
 AdTrackInst myinst;
- std::string filename (fd->uri);
+ std::string filename (vfs_get_filename (fd));
 
 // file validation
 if (!fp.extension (filename, ".sng") || fp.filesize (f) != 36000)

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/binio_virtual.h -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/binio_virtual.h Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/cff.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/cff.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/d00.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/d00.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/dmo.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/dmo.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/dtm.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/dtm.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/fmopl.c -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/fmopl.c Changed

@@ -31,7 +31,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#define INLINE		__inline
 #define HAS_YM3812	1
 
 #include <stdio.h>
@@ -244,7 +243,7 @@
 
 /* --------------------- subroutines --------------------- */
 
-INLINE int Limit( int val, int max, int min ) {
+static inline int Limit( int val, int max, int min ) {
 	if ( val > max )
 		val = max;
 	else if ( val < min )
@@ -254,7 +253,7 @@
 }
 
 /* status set and IRQ handling */
-INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag)
+static inline void OPL_STATUS_SET(FM_OPL *OPL,int flag)
 {
 	/* set status flag */
 	OPL->status |= flag;
@@ -270,7 +269,7 @@
 }
 
 /* status reset and IRQ handling */
-INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag)
+static inline void OPL_STATUS_RESET(FM_OPL *OPL,int flag)
 {
 	/* reset status flag */
 	OPL->status &=~flag;
@@ -286,7 +285,7 @@
 }
 
 /* IRQ mask set */
-INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag)
+static inline void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag)
 {
 	OPL->statusmask = flag;
 	/* IRQ handling check */
@@ -295,7 +294,7 @@
 }
 
 /* ----- key on ----- */
-INLINE void OPL_KEYON(OPL_SLOT *SLOT)
+static inline void OPL_KEYON(OPL_SLOT *SLOT)
 {
 	/* sin wave restart */
 	SLOT->Cnt = 0;
@@ -306,7 +305,7 @@
 	SLOT->eve = EG_AED;
 }
 /* ----- key off ----- */
-INLINE void OPL_KEYOFF(OPL_SLOT *SLOT)
+static inline void OPL_KEYOFF(OPL_SLOT *SLOT)
 {
 	if( SLOT->evm > ENV_MOD_RR)
 	{
@@ -322,7 +321,7 @@
 
 /* ---------- calcrate Envelope Generator & Phase Generator ---------- */
 /* return : envelope output */
-INLINE UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT )
+static inline UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT )
 {
 	/* calcrate envelope generator */
 	if( (SLOT->evc+=SLOT->evs) >= SLOT->eve )
@@ -368,7 +367,7 @@
 }
 
 /* ---------- frequency counter for operater update ---------- */
-INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT)
+static inline void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT)
 {
 	int ksr;
 
@@ -388,7 +387,7 @@
 }
 
 /* set multi,am,vib,EG-TYP,KSR,mul */
-INLINE void set_mul(FM_OPL *OPL,int slot,int v)
+static inline void set_mul(FM_OPL *OPL,int slot,int v)
 {
 	OPL_CH *CH = &OPL->P_CH[slot/2];
 	OPL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -402,7 +401,7 @@
 }
 
 /* set ksl & tl */
-INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v)
+static inline void set_ksl_tl(FM_OPL *OPL,int slot,int v)
 {
 	OPL_CH *CH = &OPL->P_CH[slot/2];
 	OPL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -418,7 +417,7 @@
 }
 
 /* set attack rate & decay rate */
-INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v)
+static inline void set_ar_dr(FM_OPL *OPL,int slot,int v)
 {
 	OPL_CH *CH = &OPL->P_CH[slot/2];
 	OPL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -435,7 +434,7 @@
 }
 
 /* set sustain level & release rate */
-INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v)
+static inline void set_sl_rr(FM_OPL *OPL,int slot,int v)
 {
 	OPL_CH *CH = &OPL->P_CH[slot/2];
 	OPL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -452,7 +451,7 @@
 /* operator output calcrator */
 #define OP_OUT(slot,env,con) slot->wavetable[((slot->Cnt+con)/(0x1000000/SIN_ENT))&(SIN_ENT-1)][env]
 /* ---------- calcrate one of channel ---------- */
-INLINE void OPL_CALC_CH( OPL_CH *CH )
+static inline void OPL_CALC_CH( OPL_CH *CH )
 {
 	UINT32 env_out;
 	OPL_SLOT *SLOT;
@@ -497,7 +496,7 @@
 
 /* ---------- calcrate rythm block ---------- */
 #define WHITE_NOISE_db 6.0
-INLINE void OPL_CALC_RH( OPL_CH *CH )
+static inline void OPL_CALC_RH( OPL_CH *CH )
 {
 	UINT32 env_tam,env_sd,env_top,env_hh;
 	int whitenoise = (rand()&1)*(WHITE_NOISE_db/EG_STEP);
@@ -713,7 +712,7 @@
 }
 
 /* CSM Key Controll */
-INLINE void CSMKeyControll(OPL_CH *CH)
+static inline void CSMKeyControll(OPL_CH *CH)
 {
 	OPL_SLOT *slot1 = &CH->SLOT[SLOT1];
 	OPL_SLOT *slot2 = &CH->SLOT[SLOT2];

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/hsc.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/hsc.cxx Changed

@@ -1,17 +1,17 @@
 /*
 * Adplug - Replayer for many OPL2/OPL3 audio file formats.
 * Copyright (C) 1999 - 2004 Simon Peter, <dn.tlp@gmx.net>, et al.
- * 
+ *
 * 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
@@ -39,9 +39,10 @@
 int i;
 
 // file validation section
- if (!f || !fp.extension (fd->uri, ".hsc") || fp.filesize (f) > 59187)
+ if (!f || !fp.extension (vfs_get_filename (fd), ".hsc") || fp.filesize (f) > 59187)
 {
- AdPlug_LogWrite ("ChscPlayer::load(\"%s\"): Not a HSC file!\n", fd->uri);
+ AdPlug_LogWrite ("ChscPlayer::load(\"%s\"): Not a HSC file!\n",
+ vfs_get_filename (fd));
 fp.close (f);
 return false;
 }
@@ -95,6 +96,12 @@
 songend = 1;
 }
 
+ if (pattnr >= 50 || pattpos >= 64)
+ {
+ fprintf (stderr, "hsc: Invalid pattnr (%d) or pattpos (%d)!\n", (int) pattnr, (int) pattpos);
+ return false;
+ }
+
 pattoff = pattpos * 9;
 for (chan = 0; chan < 9; chan++)
 { // handle all channels

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/hsp.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/hsp.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/imf.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/imf.cxx Changed

@@ -1,17 +1,17 @@
 /*
 * Adplug - Replayer for many OPL2/OPL3 audio file formats.
 * Copyright (C) 1999 - 2006 Simon Peter <dn.tlp@gmx.net>, et al.
- * 
+ *
 * 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
@@ -73,7 +73,7 @@
 
 if (strncmp (header, "ADLIB", 5) || version != 1)
 {
- if (!fp.extension (fd->uri, ".imf") && !fp.extension (fd->uri, ".wlf"))
+ if (!fp.extension (vfs_get_filename (fd), ".imf") && !fp.extension (vfs_get_filename (fd), ".wlf"))
 {
 // It's no IMF file at all
 fp.close (f);
@@ -138,7 +138,7 @@
 }
 }
 
- rate = getrate (fd->uri, fp, f);
+ rate = getrate (vfs_get_filename (fd), fp, f);
 fp.close (f);
 rewind (0);
 return true;

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/jbm.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/jbm.cxx Changed

@@ -1,17 +1,17 @@
 /*
 * Adplug - Replayer for many OPL2/OPL3 audio file formats.
 * Copyright (C) 1999 - 2007 Simon Peter, <dn.tlp@gmx.net>, et al.
- * 
+ *
 * 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.
@@ -24,7 +24,7 @@
 *
 * This version doesn't use the binstr.h functions (coded with custom func.)
 * This is my first attempt on writing a musicplayer for AdPlug, and i'm not
- * coding C++ very often.. 
+ * coding C++ very often..
 *
 * Released under the terms of the GNU General Public License.
 */
@@ -66,7 +66,7 @@
 bool CjbmPlayer::load(VFSFile * fd, const CFileProvider & fp)
 {
 binistream *f = fp.open (fd);
- std::string filename (fd->uri);
+ std::string filename (vfs_get_filename (fd));
 int		filelen = fp.filesize(f);
 int		i;
 
@@ -97,7 +97,7 @@
 
 flags = GET_WORD(m, 8);
 
- // Instrument datas are directly addressed with m[] 
+ // Instrument datas are directly addressed with m[]
 
 inscount = (filelen - instable) >> 4;
 
@@ -111,7 +111,7 @@
 }
 seqcount = (seqcount - seqtable) >> 1;
 sequences = new unsigned short[seqcount];
- for (i = 0; i < seqcount; i++) 
+ for (i = 0; i < seqcount; i++)
 sequences[i] = GET_WORD(m, seqtable + (i<<1));
 
 rewind(0);
@@ -289,6 +289,6 @@
 
 // FEEDBACK/FM mode
 opl->write(0xc0 + channel, m[i+8]&15);
-	
+
 return;
 }

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/ksm.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/ksm.cxx Changed

@@ -1,17 +1,17 @@
 /*
 * Adplug - Replayer for many OPL2/OPL3 audio file formats.
 * Copyright (C) 1999 - 2006 Simon Peter, <dn.tlp@gmx.net>, et al.
- * 
+ *
 * 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
@@ -48,7 +48,7 @@
 {
 binistream *f;
 int i;
- std::string filename (fd->uri);
+ std::string filename (vfs_get_filename (fd));
 char *fn = new char[filename.length () + 9];
 
 // file validation section
@@ -56,6 +56,7 @@
 {
 AdPlug_LogWrite ("CksmPlayer::load(,\"%s\"): File doesn't have '.ksm' "
 "extension! Rejected!\n", filename.c_str ());
+ delete[]fn;
 return false;
 }
 AdPlug_LogWrite ("*** CksmPlayer::load(,\"%s\") ***\n", filename.c_str ());

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/lds.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/lds.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/mid.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/mid.cxx Changed

@@ -1,17 +1,17 @@
 /*
 * Adplug - Replayer for many OPL2/OPL3 audio file formats.
 * Copyright (C) 1999 - 2005 Simon Peter, <dn.tlp@gmx.net>, et al.
- * 
+ *
 * 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
@@ -280,7 +280,7 @@
 return false;
 int good;
 unsigned char s[6];
- std::string filename (fd->uri);
+ std::string filename (vfs_get_filename (fd));
 
 f->readString ((char *) s, 6);
 good = 0;
@@ -818,7 +818,7 @@
 if (w!=0)
 {
 midiprintf("\n<%d>",w);
- f = 
+ f =
 ((float)w/(float)deltas)*((float)msqtr/(float)1000000);
 if (doing==1) f=0; //not playing yet. don't wait yet
 }

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/mkj.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/mkj.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/rix.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/rix.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/rol.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/rol.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/adplug/core/sa2.cxx -> audacious-plugins-3.2.4.tar.bz2/src/adplug/core/sa2.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/alarm/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/alarm/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/alarm/alarm.c -> audacious-plugins-3.2.4.tar.bz2/src/alarm/alarm.c Changed

audacious-plugins-3.1.1.tar.bz2/src/albumart/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/albumart/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/alsa/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/alsa/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/alsa/alsa.c -> audacious-plugins-3.2.4.tar.bz2/src/alsa/alsa.c Changed

@@ -693,6 +693,16 @@
         CHECK (snd_mixer_selem_get_playback_volume, alsa_mixer_element,
          SND_MIXER_SCHN_MONO, & left_l);
         right_l = left_l;
+
+        if (snd_mixer_selem_has_playback_switch (alsa_mixer_element))
+        {
+            int on = 0;
+            CHECK (snd_mixer_selem_get_playback_switch, alsa_mixer_element,
+             SND_MIXER_SCHN_MONO, & on);
+
+            if (! on)
+                left_l = right_l = 0;
+        }
     }
     else
     {
@@ -700,6 +710,20 @@
          SND_MIXER_SCHN_FRONT_LEFT, & left_l);
         CHECK (snd_mixer_selem_get_playback_volume, alsa_mixer_element,
          SND_MIXER_SCHN_FRONT_RIGHT, & right_l);
+
+        if (snd_mixer_selem_has_playback_switch (alsa_mixer_element))
+        {
+            int left_on = 0, right_on = 0;
+            CHECK (snd_mixer_selem_get_playback_switch, alsa_mixer_element,
+             SND_MIXER_SCHN_FRONT_LEFT, & left_on);
+            CHECK (snd_mixer_selem_get_playback_switch, alsa_mixer_element,
+             SND_MIXER_SCHN_FRONT_RIGHT, & right_on);
+
+            if (! left_on)
+                left_l = 0;
+            if (! right_on)
+                right_l = 0;
+        }
     }
 
 FAILED:

audacious-plugins-3.1.1.tar.bz2/src/alsa/config.c -> audacious-plugins-3.2.4.tar.bz2/src/alsa/config.c Changed

audacious-plugins-3.1.1.tar.bz2/src/alsa/plugin.c -> audacious-plugins-3.2.4.tar.bz2/src/alsa/plugin.c Changed

audacious-plugins-3.1.1.tar.bz2/src/amidi-plug/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/amidi-plug/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/amidi-plug/amidi-plug.c -> audacious-plugins-3.2.4.tar.bz2/src/amidi-plug/amidi-plug.c Changed

audacious-plugins-3.1.1.tar.bz2/src/amidi-plug/backend-fluidsynth/b-fluidsynth-config.h -> audacious-plugins-3.2.4.tar.bz2/src/amidi-plug/backend-fluidsynth/b-fluidsynth-config.h Changed

audacious-plugins-3.1.1.tar.bz2/src/amidi-plug/backend-fluidsynth/b-fluidsynth.c -> audacious-plugins-3.2.4.tar.bz2/src/amidi-plug/backend-fluidsynth/b-fluidsynth.c Changed

@@ -41,7 +41,7 @@
                         "to FluidSynth, a real-time software synthesizer based "
                         "on the SoundFont2 specification (www.fluidsynth.org).\n"
                         "Produced audio can be manipulated via player effect "
-                        "plugins and is processed by chosen ouput plugin.\n"
+                        "plugins and is processed by chosen output plugin.\n"
                         "Backend written by Giacomo Lozito.") );
   if ( ppos != NULL )
     *ppos = 2; /* preferred position in backend list */
@@ -64,8 +64,8 @@
   fluid_settings_setnum( sc.settings , "synth.sample-rate" , amidiplug_cfg_fsyn.fsyn_synth_samplerate );
   if ( amidiplug_cfg_fsyn.fsyn_synth_gain != -1 )
     fluid_settings_setnum( sc.settings , "synth.gain" , (gdouble)amidiplug_cfg_fsyn.fsyn_synth_gain / 10 );
-  if ( amidiplug_cfg_fsyn.fsyn_synth_poliphony != -1 )
-    fluid_settings_setint( sc.settings , "synth.poliphony" , amidiplug_cfg_fsyn.fsyn_synth_poliphony );
+  if ( amidiplug_cfg_fsyn.fsyn_synth_polyphony != -1 )
+    fluid_settings_setint( sc.settings , "synth.polyphony" , amidiplug_cfg_fsyn.fsyn_synth_polyphony );
   if ( amidiplug_cfg_fsyn.fsyn_synth_reverb == 1 )
     fluid_settings_setstr( sc.settings , "synth.reverb.active" , "yes" );
   else if ( amidiplug_cfg_fsyn.fsyn_synth_reverb == 0 )
@@ -418,7 +418,7 @@
     amidiplug_cfg_fsyn.fsyn_soundfont_load = 1;
     amidiplug_cfg_fsyn.fsyn_synth_samplerate = 44100;
     amidiplug_cfg_fsyn.fsyn_synth_gain = -1;
-    amidiplug_cfg_fsyn.fsyn_synth_poliphony = -1;
+    amidiplug_cfg_fsyn.fsyn_synth_polyphony = -1;
     amidiplug_cfg_fsyn.fsyn_synth_reverb = -1;
     amidiplug_cfg_fsyn.fsyn_synth_chorus = -1;
   }
@@ -441,11 +441,11 @@
         ( !i_bounds_check( amidiplug_cfg_fsyn.fsyn_synth_gain , 0 , 100 ) ))
       amidiplug_cfg_fsyn.fsyn_synth_gain = -1;
 
-    i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_poliphony" ,
-                         &amidiplug_cfg_fsyn.fsyn_synth_poliphony , -1 );
-    if (( amidiplug_cfg_fsyn.fsyn_synth_poliphony != -1 ) &&
-        ( !i_bounds_check( amidiplug_cfg_fsyn.fsyn_synth_poliphony , 0 , 100 ) ))
-      amidiplug_cfg_fsyn.fsyn_synth_poliphony = -1;
+    i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_polyphony" ,
+                         &amidiplug_cfg_fsyn.fsyn_synth_polyphony , -1 );
+    if (( amidiplug_cfg_fsyn.fsyn_synth_polyphony != -1 ) &&
+        ( !i_bounds_check( amidiplug_cfg_fsyn.fsyn_synth_polyphony , 0 , 100 ) ))
+      amidiplug_cfg_fsyn.fsyn_synth_polyphony = -1;
 
     i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_reverb" ,
                          &amidiplug_cfg_fsyn.fsyn_synth_reverb , -1 );

audacious-plugins-3.1.1.tar.bz2/src/amidi-plug/i_configure-fluidsynth.c -> audacious-plugins-3.2.4.tar.bz2/src/amidi-plug/i_configure-fluidsynth.c Changed

@@ -185,9 +185,9 @@
 {
 amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
 if (gtk_widget_get_sensitive (poly_spinbt))
- fsyncfg->fsyn_synth_poliphony = (gint)(gtk_spin_button_get_value(GTK_SPIN_BUTTON(poly_spinbt)));
+ fsyncfg->fsyn_synth_polyphony = (gint)(gtk_spin_button_get_value(GTK_SPIN_BUTTON(poly_spinbt)));
 else
- fsyncfg->fsyn_synth_poliphony = -1;
+ fsyncfg->fsyn_synth_polyphony = -1;
 }
 
 
@@ -399,7 +399,7 @@
 g_object_set_data( G_OBJECT(soundfont_load_option[0]) , "val" , GINT_TO_POINTER(0) );
 soundfont_load_option[1] = gtk_radio_button_new_with_label_from_widget(
 GTK_RADIO_BUTTON(soundfont_load_option[0]) ,
- _("Load SF on first midifile play") );
+ _("Load SF on first MIDI file play") );
 g_object_set_data( G_OBJECT(soundfont_load_option[1]) , "val" , GINT_TO_POINTER(1) );
 if ( fsyncfg->fsyn_soundfont_load == 0 )
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(soundfont_load_option[0]) , TRUE );
@@ -450,8 +450,8 @@
 gtk_box_pack_start( GTK_BOX(synth_gain_hbox) , synth_gain_value_hbox , FALSE , FALSE , 0 );
 gtk_box_pack_start( GTK_BOX(synth_gain_value_hbox) , synth_gain_value_label , FALSE , FALSE , 0 );
 gtk_box_pack_start( GTK_BOX(synth_gain_value_hbox) , synth_gain_value_spin , FALSE , FALSE , 0 );
- /* synth settings - poliphony */
- synth_poly_frame = gtk_frame_new( _("poliphony") );
+ /* synth settings - polyphony */
+ synth_poly_frame = gtk_frame_new( _("polyphony") );
 gtk_frame_set_label_align( GTK_FRAME(synth_poly_frame) , 0.5 , 0.5 );
 gtk_box_pack_start( GTK_BOX(synth_leftcol_vbox) , synth_poly_frame , TRUE , TRUE , 0 );
 synth_poly_hbox = gtk_hbox_new( TRUE , 2 );
@@ -465,7 +465,7 @@
 gtk_spin_button_set_value( GTK_SPIN_BUTTON(synth_poly_value_spin) , 256 );
 g_signal_connect( G_OBJECT(synth_poly_defcheckbt) , "toggled" ,
 G_CALLBACK(i_configure_ev_toggle_default) , synth_poly_value_hbox );
- if ( fsyncfg->fsyn_synth_poliphony < 0 )
+ if ( fsyncfg->fsyn_synth_polyphony < 0 )
 {
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_poly_defcheckbt) , TRUE );
 }
@@ -473,7 +473,7 @@
 {
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_poly_defcheckbt) , FALSE );
 gtk_spin_button_set_value( GTK_SPIN_BUTTON(synth_poly_value_spin) ,
- (gdouble)fsyncfg->fsyn_synth_poliphony );
+ (gdouble)fsyncfg->fsyn_synth_polyphony );
 }
 gtk_box_pack_start( GTK_BOX(synth_poly_hbox) , synth_poly_value_hbox , FALSE , FALSE , 0 );
 gtk_box_pack_start( GTK_BOX(synth_poly_value_hbox) , synth_poly_value_label , FALSE , FALSE , 0 );
@@ -672,7 +672,7 @@
 fsyncfg->fsyn_soundfont_load = 1;
 fsyncfg->fsyn_synth_samplerate = 44100;
 fsyncfg->fsyn_synth_gain = -1;
- fsyncfg->fsyn_synth_poliphony = -1;
+ fsyncfg->fsyn_synth_polyphony = -1;
 fsyncfg->fsyn_synth_reverb = -1;
 fsyncfg->fsyn_synth_chorus = -1;
 }
@@ -682,7 +682,7 @@
 i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_soundfont_load" , &fsyncfg->fsyn_soundfont_load , 1 );
 i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_samplerate" , &fsyncfg->fsyn_synth_samplerate , 44100 );
 i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_gain" , &fsyncfg->fsyn_synth_gain , -1 );
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_poliphony" , &fsyncfg->fsyn_synth_poliphony , -1 );
+ i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_polyphony" , &fsyncfg->fsyn_synth_polyphony , -1 );
 i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_reverb" , &fsyncfg->fsyn_synth_reverb , -1 );
 i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_chorus" , &fsyncfg->fsyn_synth_chorus , -1 );
 }
@@ -697,7 +697,7 @@
 i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_soundfont_load" , fsyncfg->fsyn_soundfont_load );
 i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_synth_samplerate" , fsyncfg->fsyn_synth_samplerate );
 i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_synth_gain" , fsyncfg->fsyn_synth_gain );
- i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_synth_poliphony" , fsyncfg->fsyn_synth_poliphony );
+ i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_synth_polyphony" , fsyncfg->fsyn_synth_polyphony );
 i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_synth_reverb" , fsyncfg->fsyn_synth_reverb );
 i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_synth_chorus" , fsyncfg->fsyn_synth_chorus );
 }

audacious-plugins-3.1.1.tar.bz2/src/amidi-plug/i_midi.c -> audacious-plugins-3.2.4.tar.bz2/src/amidi-plug/i_midi.c Changed

audacious-plugins-3.1.1.tar.bz2/src/amidi-plug/i_midievent.h -> audacious-plugins-3.2.4.tar.bz2/src/amidi-plug/i_midievent.h Changed

audacious-plugins-3.1.1.tar.bz2/src/aosd/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/aosd/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/aosd/aosd_cfg.c -> audacious-plugins-3.2.4.tar.bz2/src/aosd/aosd_cfg.c Changed

audacious-plugins-3.1.1.tar.bz2/src/aosd/aosd_trigger.c -> audacious-plugins-3.2.4.tar.bz2/src/aosd/aosd_trigger.c Changed

@@ -19,6 +19,7 @@
 */
 
 #include <glib.h>
+#include <string.h>
 
 #include <audacious/drct.h>
 #include <audacious/i18n.h>
@@ -140,7 +141,6 @@
 }
 /* When called, this hook will display the text of the user pointer
 or the current playing song, if NULL */
- hook_register("aosd toggle");
 hook_associate( "aosd toggle" , aosd_trigger_func_hook_cb , NULL );
 return;
 }
@@ -186,7 +186,7 @@
 static void
 aosd_trigger_func_pb_start_cb(gpointer hook_data, gpointer user_data)
 {
- gchar *title = aud_drct_pl_get_title(aud_drct_pl_get_pos());
+ char * title = aud_drct_get_title ();
 
 if (title != NULL)
 {
@@ -200,8 +200,8 @@
 g_free(utf8_title_markup);
 }
 g_free(utf8_title);
+ str_unref (title);
 }
- return;
 }
 
 typedef struct
@@ -290,8 +290,8 @@
 prevs->filename = g_strdup(pl_entry_filename);
 }
 
- g_free (pl_entry_filename);
- g_free (pl_entry_title);
+ str_unref (pl_entry_filename);
+ str_unref (pl_entry_title);
 }
 }
 
@@ -405,7 +405,7 @@
 global_config->osd->text.fonts_name[0] , utf8_title , time_cur_m , time_cur_s , time_tot_m , time_tot_s );
 aosd_osd_display( utf8_title_markup , global_config->osd , FALSE );
 g_free( utf8_title_markup );
- g_free( utf8_title );
+ str_unref (utf8_title);
 return;
 }
 
@@ -422,7 +422,7 @@
 aosd_osd_display( markup_text , global_config->osd , FALSE );
 } else {
 /* Display currently playing song */
- aosd_trigger_func_pb_start_cb ( GINT_TO_POINTER(aud_drct_pl_get_pos()), NULL );
+ aosd_trigger_func_pb_start_cb (NULL, NULL);
 }
 return;
 }

audacious-plugins-3.1.1.tar.bz2/src/asx/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/asx/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/asx/asx.c -> audacious-plugins-3.2.4.tar.bz2/src/asx/asx.c Changed

@@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+#include <string.h>
+
 #include <audacious/misc.h>
 #include <audacious/plugin.h>
 #include <libaudcore/audstrings.h>
@@ -26,7 +28,7 @@
 #include "util.h"
 
 static gboolean playlist_load_asx (const gchar * filename, VFSFile * file,
- gchar * * title, struct index * filenames, struct index * tuples)
+ gchar * * title, Index * filenames, Index * tuples)
 {
 gint i;
 gchar line_key[16];
@@ -49,7 +51,9 @@
 uri = str_replace_fragment(uri, strlen(uri), "http://", "mms://");
 
 if (uri != NULL)
- index_append (filenames, uri);
+ index_append (filenames, str_get (uri));
+
+ g_free (uri);
 }
 else
 break;
@@ -60,7 +64,7 @@
 }
 
 static gboolean playlist_save_asx (const gchar * filename, VFSFile * file,
- const gchar * title, struct index * filenames, struct index * tuples)
+ const gchar * title, Index * filenames, Index * tuples)
 {
 gint entries = index_count (filenames);
 gint count;

audacious-plugins-3.1.1.tar.bz2/src/asx/util.c -> audacious-plugins-3.2.4.tar.bz2/src/asx/util.c Changed

audacious-plugins-3.1.1.tar.bz2/src/asx/util.h -> audacious-plugins-3.2.4.tar.bz2/src/asx/util.h Changed

audacious-plugins-3.2.4.tar.bz2/src/audpl Added

audacious-plugins-3.2.4.tar.bz2/src/audpl/Makefile Added

audacious-plugins-3.2.4.tar.bz2/src/audpl/audpl.c Added

@@ -0,0 +1,225 @@
+/*
+ * Audacious playlist format plugin
+ * Copyright 2011 John Lindgren
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <audacious/plugin.h>
+#include <libaudcore/audstrings.h>
+
+typedef struct {
+ VFSFile * file;
+ char * cur;
+ int len;
+ char buf[65536];
+} ReadState;
+
+static bool_t read_key_raw (ReadState * state, char * * keyp, char * * valp)
+{
+ char * newline = memchr (state->cur, '\n', state->len);
+
+ if (! newline)
+ {
+ memmove (state->buf, state->cur, state->len);
+ state->cur = state->buf;
+ state->len += vfs_fread (state->buf + state->len, 1,
+ sizeof state->buf - state->len, state->file);
+
+ newline = memchr (state->cur, '\n', state->len);
+
+ if (! newline)
+ return FALSE;
+ }
+
+ * newline = 0;
+
+ char * equals = strchr (state->cur, '=');
+
+ if (! equals)
+ return FALSE;
+
+ * equals = 0;
+
+ * keyp = state->cur;
+ * valp = equals + 1;
+
+ state->len -= newline + 1 - state->cur;
+ state->cur = newline + 1;
+
+ return TRUE;
+}
+
+static bool_t read_key (ReadState * state, char * * keyp, char * * valp)
+{
+ if (! read_key_raw (state, keyp, valp))
+ return FALSE;
+
+ if (strcmp (* keyp, "uri"))
+ str_decode_percent (* valp, -1, * valp);
+
+ return TRUE;
+}
+
+static bool_t write_key_raw (VFSFile * file, const char * key, const char * val)
+{
+ int keylen = strlen (key);
+ int vallen = strlen (val);
+ char buf[keylen + vallen + 2];
+
+ memcpy (buf, key, keylen);
+ buf[keylen] = '=';
+ memcpy (buf + keylen + 1, val, vallen);
+ buf[keylen + vallen + 1] = '\n';
+
+ return (vfs_fwrite (buf, 1, keylen + vallen + 2, file) == keylen + vallen + 2);
+}
+
+static bool_t write_key (VFSFile * file, const char * key, const char * val)
+{
+ if (! strcmp (key, "uri"))
+ return write_key_raw (file, key, val);
+
+ char buf[3 * strlen (val) + 1];
+ str_encode_percent (val, -1, buf);
+ return write_key_raw (file, key, buf);
+}
+
+static bool_t audpl_load (const char * path, VFSFile * file, char * * title,
+ Index * filenames, Index * tuples)
+{
+ ReadState * state = malloc (sizeof (ReadState));
+ state->file = file;
+ state->cur = state->buf;
+ state->len = 0;
+
+ char * key, * val;
+
+ if (! read_key (state, & key, & val) || strcmp (key, "title"))
+ {
+ free (state);
+ return FALSE;
+ }
+
+ * title = str_get (val);
+
+ bool_t readed = read_key (state, & key, & val);
+
+ while (readed && ! strcmp (key, "uri"))
+ {
+ char * uri = str_get (val);
+ Tuple * tuple = NULL;
+
+ while ((readed = read_key (state, & key, & val)) && strcmp (key, "uri"))
+ {
+ if (! tuple)
+ tuple = tuple_new_from_filename (uri);
+
+ if (! strcmp (key, "empty"))
+ continue;
+
+ int field = tuple_field_by_name (key);
+ TupleValueType type = tuple_field_get_type (field);
+
+ if (field < 0)
+ break;
+
+ if (type == TUPLE_STRING)
+ tuple_set_str (tuple, field, NULL, val);
+ else if (type == TUPLE_INT)
+ tuple_set_int (tuple, field, NULL, atoi (val));
+ }
+
+ index_append (filenames, uri);
+ index_append (tuples, tuple);
+ }
+
+ free (state);
+ return TRUE;
+}
+
+static bool_t audpl_save (const char * path, VFSFile * file,
+ const char * title, Index * filenames, Index * tuples)
+{
+ if (! write_key (file, "title", title))
+ return FALSE;
+
+ int count = index_count (filenames);
+
+ for (int i = 0; i < count; i ++)
+ {
+ if (! write_key (file, "uri", index_get (filenames, i)))
+ return FALSE;
+
+ const Tuple * tuple = tuples ? index_get (tuples, i) : NULL;
+
+ if (tuple)
+ {
+ int keys = 0;
+
+ for (int f = 0; f < TUPLE_FIELDS; f ++)
+ {
+ if (f == FIELD_FILE_PATH || f == FIELD_FILE_NAME || f == FIELD_FILE_EXT)
+ continue;
+
+ TupleValueType type = tuple_get_value_type (tuple, f, NULL);
+
+ if (type == TUPLE_STRING)
+ {
+ char * str = tuple_get_str (tuple, f, NULL);
+
+ if (! write_key (file, tuple_field_get_name (f), str))
+ {
+ str_unref (str);
+ return FALSE;
+ }
+
+ str_unref (str);
+ keys ++;
+ }
+ else if (type == TUPLE_INT)
+ {
+ char buf[32];
+ snprintf (buf, sizeof buf, "%d", tuple_get_int (tuple, f, NULL));
+
+ if (! write_key (file, tuple_field_get_name (f), buf))
+ return FALSE;
+
+ keys ++;
+ }
+ }
+
+ /* distinguish between an empty tuple and no tuple at all */
+ if (! keys && ! write_key (file, "empty", "1"))
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+}
+
+static const char * const audpl_exts[] = {"audpl", NULL};
+
+AUD_PLAYLIST_PLUGIN
+(
+ .name = "Audacious playlist format",
+ .extensions = audpl_exts,
+ .load = audpl_load,
+ .save = audpl_save
+)

audacious-plugins-3.1.1.tar.bz2/src/blur_scope/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/blur_scope/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/blur_scope/blur_scope.c -> audacious-plugins-3.2.4.tar.bz2/src/blur_scope/blur_scope.c Changed

audacious-plugins-3.1.1.tar.bz2/src/bs2b/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/bs2b/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/cairo-spectrum/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/cairo-spectrum/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/cairo-spectrum/cairo-spectrum.c -> audacious-plugins-3.2.4.tar.bz2/src/cairo-spectrum/cairo-spectrum.c Changed

audacious-plugins-3.1.1.tar.bz2/src/cd-menu-items/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/cd-menu-items/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/cdaudio-ng/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/cdaudio-ng/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/cdaudio-ng/cdaudio-ng.c -> audacious-plugins-3.2.4.tar.bz2/src/cdaudio-ng/cdaudio-ng.c Changed

@@ -18,8 +18,6 @@
 * along with this program. If not, see <http://www.gnu.org/licenses>.
 */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -32,6 +30,16 @@
 #include <cdio/audio.h>
 #include <cdio/sector.h>
 #include <cdio/cd_types.h>
+
+/* libcdio's header files #define these */
+#undef PACKAGE
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef VERSION
+
 #include <cddb/cddb.h>
 
 #include <glib.h>
@@ -41,11 +49,12 @@
 #include <audacious/misc.h>
 #include <audacious/playlist.h>
 #include <audacious/plugin.h>
-#include <libaudcore/eventqueue.h>
+#include <libaudcore/hook.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
 #include "cdaudio-ng.h"
+#include "config.h"
 #include "configure.h"
 
 #define MAX_RETRIES 10
@@ -122,7 +131,8 @@
 msg = g_markup_vprintf_escaped (message_format, args);
 va_end (args);
 
- event_queue_with_data_free ("interface show error", msg);
+ aud_interface_show_error (msg);
+ g_free (msg);
 }
 
 /* main thread only */
@@ -141,7 +151,7 @@
 length--;
 }
 
- g_free (filename);
+ str_unref (filename);
 }
 }
 
@@ -518,16 +528,17 @@
 
 if (!strcmp (filename, "cdda://"))
 {
- gint i = 0;
-
 tuple = tuple_new_from_filename (filename);
- tuple->nsubtunes = n_audio_tracks;
- tuple->subtunes = g_malloc (sizeof *tuple->subtunes * tuple->nsubtunes);
+
+ gint subtunes[n_audio_tracks];
+ gint i = 0;
 
 /* only add the audio tracks to the playlist */
 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
 if (cdda_track_audiop (pcdrom_drive, trackno))
- tuple->subtunes[i++] = trackno;
+ subtunes[i ++] = trackno;
+
+ tuple_set_subtunes (tuple, n_audio_tracks, subtunes);
 
 goto DONE;
 }
@@ -551,23 +562,23 @@
 
 if (strlen (trackinfo[trackno].performer))
 {
- tuple_associate_string (tuple, FIELD_ARTIST, NULL,
+ tuple_set_str (tuple, FIELD_ARTIST, NULL,
 trackinfo[trackno].performer);
 }
 if (strlen (trackinfo[0].name))
 {
- tuple_associate_string (tuple, FIELD_ALBUM, NULL,
+ tuple_set_str (tuple, FIELD_ALBUM, NULL,
 trackinfo[0].name);
 }
 if (strlen (trackinfo[trackno].name))
 {
- tuple_associate_string (tuple, FIELD_TITLE, NULL,
+ tuple_set_str (tuple, FIELD_TITLE, NULL,
 trackinfo[trackno].name);
 }
 
- tuple_associate_int (tuple, FIELD_TRACK_NUMBER, NULL, trackno);
+ tuple_set_int (tuple, FIELD_TRACK_NUMBER, NULL, trackno);
 
- tuple_associate_int (tuple, FIELD_LENGTH, NULL,
+ tuple_set_int (tuple, FIELD_LENGTH, NULL,
 calculate_track_length (trackinfo[trackno].
 startlsn,
 trackinfo[trackno].
@@ -575,7 +586,7 @@
 
 if (strlen (trackinfo[trackno].genre))
 {
- tuple_associate_string (tuple, FIELD_GENRE, NULL,
+ tuple_set_str (tuple, FIELD_GENRE, NULL,
 trackinfo[trackno].genre);
 }
 
@@ -924,6 +935,13 @@
 cdaudio_error (_("Unsupported disk type."));
 }
 
+ /* reset libcdio, else it will not read a new disk correctly */
+ if (pcdrom_drive)
+ {
+ cdda_close (pcdrom_drive);
+ pcdrom_drive = NULL;
+ }
+
 g_free (trackinfo);
 trackinfo = NULL;
 return;

audacious-plugins-3.1.1.tar.bz2/src/console/Audacious_Driver.cxx -> audacious-plugins-3.2.4.tar.bz2/src/console/Audacious_Driver.cxx Changed

@@ -8,6 +8,7 @@
 
 #include "config.h"
 #include <math.h>
+#include <string.h>
 
 extern "C" {
 #include <libaudcore/audstrings.h>
@@ -72,9 +73,9 @@
 m_type = 0;
 m_track = -1;
 
- m_path = filename_split_subtune(path, &m_track);
- if (m_path == NULL)
- return;
+ const gchar * sub;
+ uri_parse (path, NULL, NULL, & sub, & m_track);
+ m_path = g_strndup (path, sub - path);
 
 m_track -= 1;
 
@@ -152,42 +153,43 @@
 return 0;
 }
 
+static inline void set_str (Tuple * tuple, int field, const char * str)
+{
+ char * valid = str_to_utf8 (str);
+ tuple_set_str (tuple, field, NULL, valid);
+ free (valid);
+}
+
 static Tuple * get_track_ti(const gchar *path, const track_info_t *info, const gint track)
 {
 Tuple *ti = tuple_new_from_filename(path);
 
 if (ti != NULL)
 {
- gint length;
- tuple_associate_string(ti, FIELD_ARTIST, NULL, info->author);
- tuple_associate_string(ti, FIELD_ALBUM, NULL, info->game);
- tuple_associate_string(ti, -1, "game", info->game);
- tuple_associate_string(ti, FIELD_TITLE, NULL, (info->song && info->song[0]) ? info->song : g_path_get_basename(path));
- tuple_associate_string(ti, FIELD_COPYRIGHT, NULL, info->copyright);
- tuple_associate_string(ti, -1, "console", info->system);
- tuple_associate_string(ti, FIELD_CODEC, NULL, info->system);
- tuple_associate_string(ti, FIELD_QUALITY, NULL, "sequenced");
- tuple_associate_string(ti, -1, "dumper", info->dumper);
- tuple_associate_string(ti, FIELD_COMMENT, NULL, info->comment);
+ set_str (ti, FIELD_ARTIST, info->author);
+ set_str (ti, FIELD_ALBUM, info->game);
+ set_str (ti, FIELD_TITLE, info->song);
+ set_str (ti, FIELD_COPYRIGHT, info->copyright);
+ set_str (ti, FIELD_CODEC, info->system);
+ set_str (ti, FIELD_COMMENT, info->comment);
+
 if (track >= 0)
 {
- tuple_associate_int(ti, FIELD_TRACK_NUMBER, NULL, track + 1);
- tuple_associate_int(ti, FIELD_SUBSONG_ID, NULL, track + 1);
- tuple_associate_int(ti, FIELD_SUBSONG_NUM, NULL, info->track_count);
+ tuple_set_int(ti, FIELD_TRACK_NUMBER, NULL, track + 1);
+ tuple_set_int(ti, FIELD_SUBSONG_ID, NULL, track + 1);
+ tuple_set_int(ti, FIELD_SUBSONG_NUM, NULL, info->track_count);
 }
 else
- {
- ti->nsubtunes = info->track_count;
- }
+ tuple_set_subtunes (ti, info->track_count, NULL);
 
- length = info->length;
+ int length = info->length;
 if (length <= 0)
 length = info->intro_length + 2 * info->loop_length;
 if (length <= 0)
 length = audcfg.loop_length * 1000;
 else if (length >= fade_threshold)
 length += fade_length;
- tuple_associate_int(ti, FIELD_LENGTH, NULL, length);
+ tuple_set_int(ti, FIELD_LENGTH, NULL, length);
 }
 
 return ti;
@@ -268,7 +270,7 @@
 if (ti != NULL)
 {
 length = tuple_get_int(ti, FIELD_LENGTH, NULL);
- tuple_free(ti);
+ tuple_unref(ti);
 playback->set_params(playback, fh.m_emu->voice_count() * 1000, sample_rate, 2);
 }
 }

audacious-plugins-3.1.1.tar.bz2/src/console/Gbs_Emu.h -> audacious-plugins-3.2.4.tar.bz2/src/console/Gbs_Emu.h Changed

@@ -14,7 +14,7 @@
 	// Equalizer profiles for Game Boy Color speaker and headphones
 	static equalizer_t const handheld_eq;
 	static equalizer_t const headphones_eq;
-	
+
 	// GBS file header
 	enum { header_size = 112 };
 	struct header_t
@@ -33,15 +33,15 @@
 		char author [32];
 		char copyright [32];
 	};
-	
+
 	// Header for currently loaded file
 	header_t const& header() const { return header_; }
-	
+
 	static gme_type_t static_type() { return gme_gbs_type; }
-	
+
 public:
 	// deprecated
-	Music_Emu::load;
+	using Music_Emu::load;
 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
 			{ return load_remaining_( &h, sizeof h, in ); }
 
@@ -62,25 +62,25 @@
 	enum { bank_size = 0x4000 };
 	Rom_Data<bank_size> rom;
 	void set_bank( int );
-	
+
 	// timer
 	blip_time_t cpu_time;
 	blip_time_t play_period;
 	blip_time_t next_play;
 	void update_timer();
-	
+
 	header_t header_;
 	void cpu_jsr( gb_addr_t );
-	
+
 public: private: friend class Gb_Cpu;
 	blip_time_t clock() const { return cpu_time - cpu::remain(); }
-	
+
 	enum { joypad_addr = 0xFF00 };
 	enum { ram_addr = 0xA000 };
 	enum { hi_page = 0xFF00 - ram_addr };
 	byte ram [0x4000 + 0x2000 + Gb_Cpu::cpu_padding];
 	Gb_Apu apu;
-	
+
 	int cpu_read( gb_addr_t );
 	void cpu_write( gb_addr_t, int );
 };

audacious-plugins-3.1.1.tar.bz2/src/console/Gym_Emu.h -> audacious-plugins-3.2.4.tar.bz2/src/console/Gym_Emu.h Changed

audacious-plugins-3.1.1.tar.bz2/src/console/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/console/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/console/Music_Emu.h -> audacious-plugins-3.2.4.tar.bz2/src/console/Music_Emu.h Changed

@@ -13,94 +13,94 @@
 
 	// Set output sample rate. Must be called only once before loading file.
 	blargg_err_t set_sample_rate( long sample_rate );
-	
+
 	// Start a track, where 0 is the first track. Also clears warning string.
 	blargg_err_t start_track( int );
-	
+
 	// Generate 'count' samples info 'buf'. Output is in stereo. Any emulation
 	// errors set warning string, and major errors also end track.
 	typedef short sample_t;
 	blargg_err_t play( long count, sample_t* buf );
-	
+
 // Informational
-	
+
 	// Sample rate sound is generated at
 	long sample_rate() const;
-	
+
 	// Index of current track or -1 if one hasn't been started
 	int current_track() const;
-	
+
 	// Number of voices used by currently loaded file
 	int voice_count() const;
-	
+
 	// Names of voices
 	const char** voice_names() const;
-	
+
 // Track status/control
 
 	// Number of milliseconds (1000 msec = 1 second) played since beginning of track
 	long tell() const;
-	
+
 	// Seek to new time in track. Seeking backwards or far forward can take a while.
 	blargg_err_t seek( long msec );
-	
+
 	// Skip n samples
 	blargg_err_t skip( long n );
-	
+
 	// True if a track has reached its end
 	bool track_ended() const;
-	
+
 	// Set start time and length of track fade out. Once fade ends track_ended() returns
 	// true. Fade time can be changed while track is playing.
 	void set_fade( long start_msec, long length_msec = 8000 );
-	
+
 	// Disable automatic end-of-track detection and skipping of silence at beginning
 	void ignore_silence( bool disable = true );
-	
+
 	// Info for current track
-	Gme_File::track_info;
+	using Gme_File::track_info;
 	blargg_err_t track_info( track_info_t* out ) const;
-	
+
 // Sound customization
-	
+
 	// Adjust song tempo, where 1.0 = normal, 0.5 = half speed, 2.0 = double speed.
 	// Track length as returned by track_info() assumes a tempo of 1.0.
 	void set_tempo( double );
-	
+
 	// Mute/unmute voice i, where voice 0 is first voice
 	void mute_voice( int index, bool mute = true );
-	
+
 	// Set muting state of all voices at once using a bit mask, where -1 mutes them all,
 	// 0 unmutes them all, 0x01 mutes just the first voice, etc.
 	void mute_voices( int mask );
-	
+
 	// Change overall output amplitude, where 1.0 results in minimal clamping.
 	// Must be called before set_sample_rate().
 	void set_gain( double );
-	
+
 	// Request use of custom multichannel buffer. Only supported by "classic" emulators;
 	// on others this has no effect. Should be called only once *before* set_sample_rate().
 	virtual void set_buffer( Multi_Buffer* ) { }
-	
+
 	// Enables/disables accurate emulation options, if any are supported. Might change
 	// equalizer settings.
 	void enable_accuracy( bool enable = true );
-	
+
 // Sound equalization (treble/bass)
 
 	// Frequency equalizer parameters (see gme.txt)
 	// See gme.h for definition of struct gme_equalizer_t.
 	typedef gme_equalizer_t equalizer_t;
-	
+
 	// Current frequency equalizater parameters
 	equalizer_t const& equalizer() const;
-	
+
 	// Set frequency equalizer parameters
 	void set_equalizer( equalizer_t const& );
-	
+
 	// Equalizer settings for TV speaker
 	static equalizer_t const tv_eq;
-	
+
 public:
 	Music_Emu();
 	~Music_Emu();
@@ -113,7 +113,7 @@
 	double gain() const { return gain_; }
 	double tempo() const { return tempo_; }
 	void remute_voices();
-	
+
 	virtual blargg_err_t set_sample_rate_( long sample_rate ) = 0;
 	virtual void set_equalizer_( equalizer_t const& ) { }
 	virtual void enable_accuracy_( bool enable ) { }
@@ -135,10 +135,10 @@
 	int mute_mask_;
 	double tempo_;
 	double gain_;
-	
+
 	long sample_rate_;
 	blargg_long msec_to_samples( blargg_long msec ) const;
-	
+
 	// track-specific
 	int current_track_;
 	blargg_long out_time; // number of samples played since start of track
@@ -147,12 +147,12 @@
 	volatile bool track_ended_;
 	void clear_track_vars();
 	void end_track_if_error( blargg_err_t );
-	
+
 	// fading
 	blargg_long fade_start;
 	int fade_step;
 	void handle_fade( long count, sample_t* out );
-	
+
 	// silence detection
 	int silence_lookahead; // speed to run emulator when looking ahead for silence
 	bool ignore_silence_;
@@ -163,7 +163,7 @@
 	blargg_vector<sample_t> buf;
 	void fill_buf();
 	void emu_play( long count, sample_t* out );
-	
+
 	Multi_Buffer* effects_buffer;
 	friend Music_Emu* gme_new_emu( gme_type_t, int );
 	friend void gme_set_stereo_depth( Music_Emu*, double );

audacious-plugins-3.1.1.tar.bz2/src/console/Nsf_Emu.h -> audacious-plugins-3.2.4.tar.bz2/src/console/Nsf_Emu.h Changed

@@ -14,7 +14,7 @@
 	// Equalizer profiles for US NES and Japanese Famicom
 	static equalizer_t const nes_eq;
 	static equalizer_t const famicom_eq;
-	
+
 	// NSF file header
 	enum { header_size = 0x80 };
 	struct header_t
@@ -36,15 +36,15 @@
 		byte chip_flags;
 		byte unused [4];
 	};
-	
+
 	// Header for currently loaded file
 	header_t const& header() const { return header_; }
-	
+
 	static gme_type_t static_type() { return gme_nsf_type; }
-	
+
 public:
 	// deprecated
-	Music_Emu::load;
+	using Music_Emu::load;
 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
 			{ return load_remaining_( &h, sizeof h, in ); }
 
@@ -68,26 +68,26 @@
 	nes_addr_t play_addr;
 	double clock_rate_;
 	bool pal_only;
-	
+
 	// timing
 	Nes_Cpu::registers_t saved_state;
 	nes_time_t next_play;
 	nes_time_t play_period;
 	int play_extra;
 	int play_ready;
-	
+
 	enum { rom_begin = 0x8000 };
 	enum { bank_select_addr = 0x5FF8 };
 	enum { bank_size = 0x1000 };
 	Rom_Data<bank_size> rom;
-	
+
 public: private: friend class Nes_Cpu;
 	void cpu_jsr( nes_addr_t );
 	int cpu_read( nes_addr_t );
 	void cpu_write( nes_addr_t, int );
 	void cpu_write_misc( nes_addr_t, int );
 	enum { badop_addr = bank_select_addr };
-	
+
 private:
 	class Nes_Namco_Apu* namco;
 	class Nes_Vrc6_Apu* vrc6;
@@ -95,9 +95,9 @@
 	Nes_Apu apu;
 	static int pcm_read( void*, nes_addr_t );
 	blargg_err_t init_sound();
-	
+
 	header_t header_;
-	
+
 	enum { sram_addr = 0x6000 };
 	byte sram [0x2000];
 	byte unmapped_code [Nes_Cpu::page_size + 8];

audacious-plugins-3.1.1.tar.bz2/src/console/Nsfe_Emu.h -> audacious-plugins-3.2.4.tar.bz2/src/console/Nsfe_Emu.h Changed

audacious-plugins-3.1.1.tar.bz2/src/console/Spc_Emu.h -> audacious-plugins-3.2.4.tar.bz2/src/console/Spc_Emu.h Changed

@@ -14,7 +14,7 @@
 	// The Super Nintendo hardware samples at 32kHz. Other sample rates are
 	// handled by resampling the 32kHz output; emulation accuracy is not affected.
 	enum { native_sample_rate = 32000 };
-	
+
 	// SPC file header
 	enum { header_size = 0x100 };
 	struct header_t
@@ -37,18 +37,18 @@
 		byte emulator;
 		byte unused2 [46];
 	};
-	
+
 	// Header for currently loaded file
 	header_t const& header() const { return *(header_t const*) file_data; }
-	
+
 	// Prevents channels and global volumes from being phase-negated
 	void disable_surround( bool disable = true );
-	
+
 	static gme_type_t static_type() { return gme_spc_type; }
-	
+
 public:
 	// deprecated
-	Music_Emu::load;
+	using Music_Emu::load;
 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
 			{ return load_remaining_( &h, sizeof h, in ); }
 	byte const* trailer() const; // use track_info()
@@ -73,7 +73,7 @@
 	Fir_Resampler<24> resampler;
 	SPC_Filter filter;
 	Snes_Spc apu;
-	
+
 	blargg_err_t play_and_filter( long count, sample_t out [] );
 };

audacious-plugins-3.1.1.tar.bz2/src/console/Vfs_File.cxx -> audacious-plugins-3.2.4.tar.bz2/src/console/Vfs_File.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/console/Vgm_Emu.h -> audacious-plugins-3.2.4.tar.bz2/src/console/Vgm_Emu.h Changed

@@ -16,11 +16,11 @@
 	// True if custom buffer and custom equalization are supported
 	// TODO: move into Music_Emu and rename to something like supports_custom_buffer()
 	bool is_classic_emu() const { return !uses_fm; }
-	
+
 	// Disable running FM chips at higher than normal rate. Will result in slightly
 	// more aliasing of high notes.
 	void disable_oversampling( bool disable = true ) { disable_oversampling_ = disable; }
-	
+
 	// VGM header format
 	enum { header_size = 0x40 };
 	struct header_t
@@ -43,15 +43,15 @@
 		byte data_offset [4];
 		byte unused2 [8];
 	};
-	
+
 	// Header for currently loaded file
 	header_t const& header() const { return *(header_t const*) data; }
-	
+
 	static gme_type_t static_type() { return gme_vgm_type; }
-	
+
 public:
 	// deprecated
-	Music_Emu::load;
+	using Music_Emu::load;
 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
 			{ return load_remaining_( &h, sizeof h, in ); }
 	byte const* gd3_data( int* size_out = 0 ) const; // use track_info()

audacious-plugins-3.1.1.tar.bz2/src/crystalizer/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/crystalizer/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/cue/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/cue/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/cue/cue.c -> audacious-plugins-3.2.4.tar.bz2/src/cue/cue.c Changed

@@ -18,6 +18,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+#include <glib.h>
+#include <string.h>
+
 #include <audacious/misc.h>
 #include <audacious/plugin.h>
 #include <libaudcore/audstrings.h>
@@ -51,11 +54,11 @@
 if (text == NULL)
 return;
 
- tuple_associate_string(tuple, tuple_type, NULL, text);
+ tuple_set_str(tuple, tuple_type, NULL, text);
 }
 
 static gboolean playlist_load_cue (const gchar * cue_filename, VFSFile * file,
- gchar * * title, struct index * filenames, struct index * tuples)
+ gchar * * title, Index * filenames, Index * tuples)
 {
 gint64 size = vfs_fsize (file);
 gchar * buffer = g_malloc (size + 1);
@@ -79,18 +82,22 @@
 
 Track * current = cd_get_track (cd, 1);
 g_return_val_if_fail (current != NULL, FALSE);
- gchar * filename = aud_construct_uri (track_get_filename (current),
+ gchar * track_filename = track_get_filename (current);
+ g_return_val_if_fail (track_filename != NULL, FALSE);
+ gchar * filename = aud_construct_uri (track_filename,
 cue_filename);
 
 Tuple * base_tuple = NULL;
+ gboolean base_tuple_scanned = FALSE;
 
 for (gint track = 1; track <= tracks; track ++)
 {
 g_return_val_if_fail (current != NULL, FALSE);
 g_return_val_if_fail (filename != NULL, FALSE);
 
- if (base_tuple == NULL)
+ if (base_tuple == NULL && ! base_tuple_scanned)
 {
+ base_tuple_scanned = TRUE;
 PluginHandle * decoder = aud_file_find_decoder (filename, FALSE);
 if (decoder != NULL)
 base_tuple = aud_file_read_tuple (filename, decoder);
@@ -105,39 +112,41 @@
 
 Tuple * tuple = (base_tuple != NULL) ? tuple_copy (base_tuple) :
 tuple_new_from_filename (filename);
- tuple_associate_int (tuple, FIELD_TRACK_NUMBER, NULL, track);
+ tuple_set_int (tuple, FIELD_TRACK_NUMBER, NULL, track);
 
 gint begin = (gint64) track_get_start (current) * 1000 / 75;
- tuple_associate_int (tuple, FIELD_SEGMENT_START, NULL, begin);
+ tuple_set_int (tuple, FIELD_SEGMENT_START, NULL, begin);
 
 if (last_track)
 {
 if (base_tuple != NULL && tuple_get_value_type (base_tuple,
 FIELD_LENGTH, NULL) == TUPLE_INT)
- tuple_associate_int (tuple, FIELD_LENGTH, NULL, tuple_get_int
+ tuple_set_int (tuple, FIELD_LENGTH, NULL, tuple_get_int
 (base_tuple, FIELD_LENGTH, NULL) - begin);
 }
 else
 {
 gint length = (gint64) track_get_length (current) * 1000 / 75;
- tuple_associate_int (tuple, FIELD_LENGTH, NULL, length);
- tuple_associate_int (tuple, FIELD_SEGMENT_END, NULL, begin + length);
+ tuple_set_int (tuple, FIELD_LENGTH, NULL, length);
+ tuple_set_int (tuple, FIELD_SEGMENT_END, NULL, begin + length);
 }
 
 for (gint i = 0; i < G_N_ELEMENTS (pti_map); i ++)
 tuple_attach_cdtext (tuple, current, pti_map[i].tuple_type,
 pti_map[i].pti);
 
- index_append (filenames, filename);
+ index_append (filenames, str_get (filename));
 index_append (tuples, tuple);
 
 current = next;
+ g_free (filename);
 filename = next_filename;
 
 if (last_track && base_tuple != NULL)
 {
- tuple_free (base_tuple);
+ tuple_unref (base_tuple);
 base_tuple = NULL;
+ base_tuple_scanned = FALSE;
 }
 }

audacious-plugins-3.1.1.tar.bz2/src/echo_plugin/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/echo_plugin/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/ffaudio/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/ffaudio/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/ffaudio/ffaudio-core.c -> audacious-plugins-3.2.4.tar.bz2/src/ffaudio/ffaudio-core.c Changed

@@ -27,7 +27,6 @@
 
 #undef FFAUDIO_DOUBLECHECK /* Doublecheck probing result for debugging purposes */
 #undef FFAUDIO_NO_BLACKLIST /* Don't blacklist any recognized codecs/formats */
-#define FFAUDIO_USE_AUDTAG /* Use Audacious tagging library */
 
 #include "config.h"
 #include "ffaudio-stdinc.h"
@@ -35,22 +34,22 @@
 #include <audacious/debug.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
-#ifdef FFAUDIO_USE_AUDTAG
 #include <audacious/audtag.h>
-#endif
 #include <libaudcore/audstrings.h>
 
-/***********************************************************************************
- * Plugin glue. *
- ***********************************************************************************/
-
 static GMutex *ctrl_mutex = NULL;
 static GCond *ctrl_cond = NULL;
 static gint64 seek_value = -1;
 static gboolean stop_flag = FALSE;
 
 static GStaticMutex data_mutex = G_STATIC_MUTEX_INIT;
-static mowgli_patricia_t * extension_dict = NULL;
+static GHashTable * extension_dict = NULL;
+
+/* str_unref() may be a macro */
+static void str_unref_cb (void * str)
+{
+ str_unref (str);
+}
 
 static gint lockmgr (void * * mutexp, enum AVLockOp op)
 {
@@ -75,17 +74,12 @@
 
 static gboolean ffaudio_init (void)
 {
- avcodec_init();
 av_register_all();
 av_lockmgr_register (lockmgr);
 
 ctrl_mutex = g_mutex_new();
 ctrl_cond = g_cond_new();
 
-#ifdef FFAUDIO_USE_AUDTAG
- tag_init();
-#endif
-
 return TRUE;
 }
 
@@ -97,7 +91,7 @@
 g_cond_free(ctrl_cond);
 
 if (extension_dict)
- mowgli_patricia_destroy (extension_dict, NULL, NULL);
+ g_hash_table_destroy (extension_dict);
 
 av_lockmgr_register (NULL);
 }
@@ -108,9 +102,10 @@
 return (! av_strerror (error, buf, sizeof buf)) ? buf : "unknown error";
 }
 
-static mowgli_patricia_t * create_extension_dict (void)
+static GHashTable * create_extension_dict (void)
 {
- mowgli_patricia_t * dict = mowgli_patricia_create (NULL);
+ GHashTable * dict = g_hash_table_new_full (g_str_hash, g_str_equal,
+ str_unref_cb, NULL);
 
 AVInputFormat * f;
 for (f = av_iformat_next (NULL); f; f = av_iformat_next (f))
@@ -130,7 +125,7 @@
 next ++;
 }
 
- mowgli_patricia_add (dict, parse, f);
+ g_hash_table_insert (dict, str_get(parse), f);
 }
 
 g_free (exts);
@@ -141,17 +136,21 @@
 
 static AVInputFormat * get_format_by_extension (const gchar * name)
 {
- gchar * ext = uri_get_extension (name);
- if (! ext)
+ const gchar * ext0, * sub;
+ uri_parse (name, NULL, & ext0, & sub, NULL);
+
+ if (ext0 == sub)
 return NULL;
 
+ gchar * ext = g_ascii_strdown (ext0 + 1, sub - ext0 - 1);
+
 AUDDBG ("Get format by extension: %s\n", name);
 g_static_mutex_lock (& data_mutex);
 
 if (! extension_dict)
 extension_dict = create_extension_dict ();
 
- AVInputFormat * f = mowgli_patricia_retrieve (extension_dict, ext);
+ AVInputFormat * f = g_hash_table_lookup (extension_dict, ext);
 g_static_mutex_unlock (& data_mutex);
 
 if (f)
@@ -217,7 +216,7 @@
 
 static AVFormatContext * open_input_file (const gchar * name, VFSFile * file)
 {
- AVInputFormat * f = get_format (file->uri, file);
+ AVInputFormat * f = get_format (name, file);
 
 if (! f)
 {
@@ -244,7 +243,13 @@
 static void close_input_file (AVFormatContext * c)
 {
 AVIOContext * io = c->pb;
+
+#if CHECK_LIBAVFORMAT_VERSION (53, 24, 1)
+ avformat_close_input (&c);
+#else
 av_close_input_file (c);
+#endif
+
 io_context_free (io);
 }
 
@@ -310,11 +315,11 @@
 {
 switch (m->ttype) {
 case TUPLE_STRING:
- tuple_associate_string (tuple, m->field, NULL, tag->value);
+ tuple_set_str (tuple, m->field, NULL, tag->value);
 break;
 
 case TUPLE_INT:
- tuple_associate_int (tuple, m->field, NULL, atoi(tag->value));
+ tuple_set_int (tuple, m->field, NULL, atoi(tag->value));
 break;
 
 default:
@@ -332,13 +337,13 @@
 for (i = 0; i < n_metaentries; i++)
 ffaudio_get_meta(tuple, ic, &metaentries[i]);
 
- tuple_associate_int(tuple, FIELD_LENGTH, NULL, ic->duration / 1000);
- tuple_associate_int(tuple, FIELD_BITRATE, NULL, ic->bit_rate / 1000);
+ tuple_set_int(tuple, FIELD_LENGTH, NULL, ic->duration / 1000);
+ tuple_set_int(tuple, FIELD_BITRATE, NULL, ic->bit_rate / 1000);
 }
 
 if (codec != NULL && codec->long_name != NULL)
 {
- tuple_associate_string(tuple, FIELD_CODEC, NULL, codec->long_name);
+ tuple_set_str(tuple, FIELD_CODEC, NULL, codec->long_name);
 }
 }
 
@@ -359,7 +364,7 @@
 c = s->codec;
 if (c->codec_type == AVMEDIA_TYPE_AUDIO)
 {
- av_find_stream_info(ic);
+ avformat_find_stream_info (ic, NULL);
 codec = avcodec_find_decoder(c->codec_id);
 if (codec != NULL)
 break;
@@ -383,32 +388,22 @@
 if (t == NULL)
 return NULL;
 
-#ifdef FFAUDIO_USE_AUDTAG
 vfs_rewind(fd);
 tag_tuple_read(t, fd);
-#endif
 
 return t;
 }
 
-#ifdef FFAUDIO_USE_AUDTAG
 static gboolean ffaudio_write_tag (const Tuple * tuple, VFSFile * file)
 {
 if (! file)
 return FALSE;
 
- gchar *file_uri = g_ascii_strdown(file->uri, -4);
-
- if (g_str_has_suffix(file_uri, ".ape"))
- {
- g_free(file_uri);
+ if (str_has_suffix_nocase (vfs_get_filename (file), ".ape"))
 return tag_tuple_write(tuple, file, TAG_TYPE_APE);
- }
- g_free(file_uri);
 
 return tag_tuple_write(tuple, file, TAG_TYPE_NONE);
 }
-#endif
 
 static gboolean ffaudio_play (InputPlayback * playback, const gchar * filename,
 VFSFile * file, gint start_time, gint stop_time, gboolean pause)
@@ -421,11 +416,8 @@
 AVCodecContext *c = NULL;
 AVStream *s = NULL;
 AVPacket pkt = {.data = NULL};
- guint8 *outbuf = NULL, *resbuf = NULL;
 gint i, stream_id, errcount;
- gint in_sample_size, out_sample_size, chunk_size;
- ReSampleContext *resctx = NULL;
- gboolean codec_opened = FALSE, do_resampling = FALSE;
+ gboolean codec_opened = FALSE;
 gint out_fmt;
 gboolean seekable;
 gboolean error = FALSE;
@@ -440,7 +432,7 @@
 c = s->codec;
 if (c->codec_type == AVMEDIA_TYPE_AUDIO)
 {
- av_find_stream_info(ic);
+ avformat_find_stream_info (ic, NULL);
 codec = avcodec_find_decoder(c->codec_id);
 stream_id = i;
 if (codec != NULL)
@@ -456,42 +448,19 @@
 
 AUDDBG("got codec %s for stream index %d, opening\n", codec->name, stream_id);
 
- if (avcodec_open(c, codec) < 0)
+ if (avcodec_open2 (c, codec, NULL) < 0)
 goto error_exit;
 
 codec_opened = TRUE;
 
- /* Determine if audio conversion or resampling is needed */
- 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);
-
 switch (c->sample_fmt) {
- case SAMPLE_FMT_U8: out_fmt = FMT_U8; break;
- case SAMPLE_FMT_S16: out_fmt = FMT_S16_NE; break;
- case SAMPLE_FMT_S32: out_fmt = FMT_S32_NE; break;
- case SAMPLE_FMT_FLT: out_fmt = FMT_FLOAT; break;
- default: do_resampling = TRUE; break;
- }
-
- if (do_resampling)
- {
- /* Initialize resampling context */
- out_fmt = FMT_S16_NE;
-
- AUDDBG("resampling needed chn=%d, rate=%d, fmt=%d -> chn=%d, rate=%d, fmt=S16NE\n",
- c->channels, c->sample_rate, c->sample_fmt,
- c->channels, c->sample_rate);
-
- resctx = av_audio_resample_init(
- c->channels, c->channels,
- c->sample_rate, c->sample_rate,
- SAMPLE_FMT_S16, c->sample_fmt,
- 16, 10, 0, 0.8);
-
- if (resctx == NULL)
- goto error_exit;
+ case AV_SAMPLE_FMT_U8: out_fmt = FMT_U8; break;
+ case AV_SAMPLE_FMT_S16: out_fmt = FMT_S16_NE; break;
+ case AV_SAMPLE_FMT_S32: out_fmt = FMT_S32_NE; break;
+ case AV_SAMPLE_FMT_FLT: out_fmt = FMT_FLOAT; break;
+ default:
+ fprintf (stderr, "ffaudio: Unsupported audio format %d\n", (int) c->sample_fmt);
+ goto error_exit;
 }
 
 /* Open audio output */
@@ -505,10 +474,6 @@
 
 playback->set_gain_from_playlist(playback);
 
- /* Allocate output buffer aligned to 16 byte boundary */
- outbuf = av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
- resbuf = av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
-
 AUDDBG("setting parameters\n");
 
 if (pause)
@@ -581,9 +546,6 @@
 memcpy(&tmp, &pkt, sizeof(tmp));
 while (tmp.size > 0 && !stop_flag)
 {
- gint len, out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
- guint8 *outbuf_p;
-
 /* Check for seek request and bail out if we have one */
 g_mutex_lock(ctrl_mutex);
 if (seek_value != -1)
@@ -601,59 +563,25 @@
 }
 g_mutex_unlock(ctrl_mutex);
 
- /* Decode whatever we can of the frame data */
- len = avcodec_decode_audio3(c, (gint16 *)outbuf, &out_size, &tmp);
+ AVFrame * frame = avcodec_alloc_frame ();
+ int decoded = 0;
+ int len = avcodec_decode_audio4 (c, frame, & decoded, & tmp);
+
 if (len < 0)
 {
- AUDDBG("codec failure, breaking out of loop\n");
+ fprintf (stderr, "ffaudio: decode_audio() failed, code %d\n", len);
 break;
 }
 
 tmp.size -= len;
 tmp.data += len;
 
- if (out_size <= 0)
+ if (! decoded)
 continue;
 
- /* Perform audio resampling if necessary */
- if (do_resampling)
- {
- out_size = audio_resample(resctx,
- (gint16 *)resbuf, (gint16 *)outbuf,
- out_size / in_sample_size) * out_sample_size;
- outbuf_p = resbuf;
- }
- else
- outbuf_p = outbuf;
-
- /* Output audio in small blocks */
- while (out_size > 0 && !stop_flag && (stop_time < 0 ||
- playback->output->written_time () < stop_time))
- {
- gint writeoff = MIN (chunk_size, out_size);
-
- playback->output->write_audio((gint16 *)outbuf_p, writeoff);
-
- outbuf_p += writeoff;
- out_size -= writeoff;
-
- /* Check for seek request and bail out if we have one */
- g_mutex_lock(ctrl_mutex);
- if (seek_value != -1)
- {
- if (!seekable)
- {
- seek_value = -1;
- g_cond_signal(ctrl_cond);
- }
- else
- {
- g_mutex_unlock(ctrl_mutex);
- break;
- }
- }
- g_mutex_unlock(ctrl_mutex);
- }
+ playback->output->write_audio (frame->data[0], FMT_SIZEOF (out_fmt)
+ * c->channels * frame->nb_samples);
+ av_free (frame);
 }
 
 if (pkt.data)
@@ -676,10 +604,6 @@
 
 stop_flag = TRUE;
 
- av_free(outbuf);
- av_free(resbuf);
- if (resctx != NULL)
- audio_resample_close(resctx);
 if (pkt.data)
 av_free_packet(&pkt);
 if (codec_opened)
@@ -759,7 +683,7 @@
 "wav",
 
 /* Handle OGG streams (FLAC/Vorbis etc.) */
- "ogg",
+ "ogg", "oga",
 
 /* Speex */
 "spx",
@@ -830,9 +754,7 @@
 .about = ffaudio_about,
 .name = "FFmpeg Support",
 .extensions = ffaudio_fmts,
-#ifdef FFAUDIO_USE_AUDTAG
 .update_song_tuple = ffaudio_write_tag,
-#endif
 
 /* FFMPEG probing takes forever on network files, so try everything else
 * first. -jlindgren */

audacious-plugins-3.1.1.tar.bz2/src/ffaudio/ffaudio-io.c -> audacious-plugins-3.2.4.tar.bz2/src/ffaudio/ffaudio-io.c Changed

audacious-plugins-3.1.1.tar.bz2/src/filewriter/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/filewriter/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/filewriter/filewriter.c -> audacious-plugins-3.2.4.tar.bz2/src/filewriter/filewriter.c Changed

@@ -21,12 +21,12 @@
 */
 
 #include <gtk/gtk.h>
+#include <stdlib.h>
 
 #include <audacious/gtk-compat.h>
 #include <audacious/misc.h>
 #include <audacious/playlist.h>
 #include <libaudcore/audstrings.h>
-#include <libaudcore/tuple_formatter.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
@@ -231,8 +231,12 @@
 {
 gchar * utf8 = aud_playlist_entry_get_title (playlist, pos, FALSE);
 string_replace_char (utf8, '/', ' ');
- filename = string_encode_percent (utf8, FALSE);
- g_free (utf8);
+
+ gchar buf[3 * strlen (utf8) + 1];
+ str_encode_percent (utf8, -1, buf);
+ str_unref (utf8);
+
+ filename = g_strdup (buf);
 }
 else
 {
@@ -240,7 +244,7 @@
 gchar * original = strrchr (temp, '/');
 g_return_val_if_fail (original != NULL, 0);
 filename = g_strdup (original + 1);
- g_free (temp);
+ str_unref (temp);
 
 if (!use_suffix)
 if ((temp = strrchr(filename, '.')) != NULL)
@@ -260,7 +264,9 @@
 
 if (save_original)
 {
- directory = aud_playlist_entry_get_filename (playlist, pos);
+ temp = aud_playlist_entry_get_filename (playlist, pos);
+ directory = g_strdup (temp);
+ str_unref (temp);
 temp = strrchr (directory, '/');
 g_return_val_if_fail (temp != NULL, 0);
 temp[1] = 0;
@@ -318,7 +324,7 @@
 
 if (tuple)
 {
- tuple_free (tuple);
+ tuple_unref (tuple);
 tuple = NULL;
 }
 }

audacious-plugins-3.1.1.tar.bz2/src/filewriter/flac.c -> audacious-plugins-3.2.4.tar.bz2/src/filewriter/flac.c Changed

@@ -26,6 +26,7 @@
 #include <FLAC/all.h>
 #include <stdlib.h>
 
+
 static gint flac_open(void);
 static void flac_write(gpointer data, gint length);
 static void flac_close(void);
@@ -72,16 +73,38 @@
 return FLAC__STREAM_ENCODER_TELL_STATUS_OK;
 }
 
-#define INSERT_VORBIS_COMMENT(t, keyword) \
- if (t) \
- { \
- gchar *scratch = g_strdup_printf(keyword, t); \
- comment_entry.length = strlen(scratch); \
- comment_entry.entry = (guchar *) scratch; \
- FLAC__metadata_object_vorbiscomment_insert_comment(meta, \
- meta->data.vorbis_comment.num_comments, comment_entry, TRUE); \
- g_free(scratch); \
- }
+static void insert_vorbis_comment (FLAC__StreamMetadata * meta,
+ const char * name, const Tuple * tuple, int field)
+{
+ TupleValueType type = tuple_field_get_type (field);
+ if (tuple_get_value_type (tuple, field, NULL) != type)
+ return;
+
+ char * temp;
+
+ switch (type)
+ {
+ case TUPLE_INT:;
+ int ival = tuple_get_int (tuple, field, NULL);
+ temp = g_strdup_printf ("%s=%d", name, ival);
+ break;
+ case TUPLE_STRING:;
+ char * sval = tuple_get_str (tuple, field, NULL);
+ temp = g_strdup_printf ("%s=%s", name, sval);
+ str_unref (sval);
+ default:
+ return;
+ }
+
+ FLAC__StreamMetadata_VorbisComment_Entry comment;
+ comment.length = strlen (temp);
+ comment.entry = (unsigned char *) temp;
+
+ FLAC__metadata_object_vorbiscomment_insert_comment (meta,
+ meta->data.vorbis_comment.num_comments, comment, TRUE);
+
+ g_free (temp);
+}
 
 static gint flac_open(void)
 {
@@ -95,18 +118,16 @@
 if (tuple)
 {
 FLAC__StreamMetadata *meta;
- FLAC__StreamMetadata_VorbisComment_Entry comment_entry;
-
 meta = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
 
- INSERT_VORBIS_COMMENT(tuple_get_string(tuple, FIELD_TITLE, NULL), "title=%s");
- INSERT_VORBIS_COMMENT(tuple_get_string(tuple, FIELD_ARTIST, NULL), "artist=%s");
- INSERT_VORBIS_COMMENT(tuple_get_string(tuple, FIELD_ALBUM, NULL), "album=%s");
- INSERT_VORBIS_COMMENT(tuple_get_string(tuple, FIELD_GENRE, NULL), "genre=%s");
- INSERT_VORBIS_COMMENT(tuple_get_string(tuple, FIELD_COMMENT, NULL), "comment=%s");
- INSERT_VORBIS_COMMENT(tuple_get_string(tuple, FIELD_DATE, NULL), "date=%s");
- INSERT_VORBIS_COMMENT(tuple_get_int(tuple, FIELD_YEAR, NULL), "year=%d");
- INSERT_VORBIS_COMMENT(tuple_get_int(tuple, FIELD_TRACK_NUMBER, NULL), "tracknumber=%d");
+ insert_vorbis_comment (meta, "title", tuple, FIELD_TITLE);
+ insert_vorbis_comment (meta, "artist", tuple, FIELD_ARTIST);
+ insert_vorbis_comment (meta, "album", tuple, FIELD_ALBUM);
+ insert_vorbis_comment (meta, "genre", tuple, FIELD_GENRE);
+ insert_vorbis_comment (meta, "comment", tuple, FIELD_COMMENT);
+ insert_vorbis_comment (meta, "date", tuple, FIELD_DATE);
+ insert_vorbis_comment (meta, "year", tuple, FIELD_YEAR);
+ insert_vorbis_comment (meta, "tracknumber", tuple, FIELD_TRACK_NUMBER);
 
 FLAC__stream_encoder_set_metadata(flac_encoder, &meta, 1);
 }

audacious-plugins-3.1.1.tar.bz2/src/filewriter/mp3.c -> audacious-plugins-3.2.4.tar.bz2/src/filewriter/mp3.c Changed

@@ -115,12 +115,12 @@
 
 static void free_lameid3(lameid3_t *p)
 {
-    g_free(p->track_name);
-    g_free(p->album_name);
-    g_free(p->performer);
-    g_free(p->genre);
-    g_free(p->year);
-    g_free(p->track_number);
+    str_unref (p->track_name);
+    str_unref (p->album_name);
+    str_unref (p->performer);
+    str_unref (p->genre);
+    str_unref (p->year);
+    str_unref (p->track_number);
 
     p->track_name = NULL;
     p->album_name = NULL;
@@ -209,28 +209,22 @@
 
     if (tuple) {
         /* XXX write UTF-8 even though libmp3lame does id3v2.3. --yaz */
-        lameid3.track_name =
-            g_strdup(tuple_get_string(tuple, FIELD_TITLE, NULL));
+        lameid3.track_name = tuple_get_str (tuple, FIELD_TITLE, NULL);
         id3tag_set_title(gfp, lameid3.track_name);
 
-        lameid3.performer =
-            g_strdup(tuple_get_string(tuple, FIELD_ARTIST, NULL));
+        lameid3.performer = tuple_get_str (tuple, FIELD_ARTIST, NULL);
         id3tag_set_artist(gfp, lameid3.performer);
 
-        lameid3.album_name =
-            g_strdup(tuple_get_string(tuple, FIELD_ALBUM, NULL));
+        lameid3.album_name = tuple_get_str (tuple, FIELD_ALBUM, NULL);
         id3tag_set_album(gfp, lameid3.album_name);
 
-        lameid3.genre =
-            g_strdup(tuple_get_string(tuple, FIELD_GENRE, NULL));
+        lameid3.genre = tuple_get_str (tuple, FIELD_GENRE, NULL);
         id3tag_set_genre(gfp, lameid3.genre);
 
-        lameid3.year =
-            g_strdup_printf("%d", tuple_get_int(tuple, FIELD_YEAR, NULL));
+        lameid3.year = str_printf ("%d", tuple_get_int (tuple, FIELD_YEAR, NULL));
         id3tag_set_year(gfp, lameid3.year);
 
-        lameid3.track_number =
-            g_strdup_printf("%d", tuple_get_int(tuple, FIELD_TRACK_NUMBER, NULL));
+        lameid3.track_number = str_printf ("%d", tuple_get_int (tuple, FIELD_TRACK_NUMBER, NULL));
         id3tag_set_track(gfp, lameid3.track_number);
 
         if (force_v2_val) {
@@ -631,7 +625,7 @@
 {
     if (!strcmp(user_data, "v1") && inside != 1) {
         if (gtk_toggle_button_get_active
-            (GTK_TOGGLE_BUTTON(tags_only_v1_toggle)) == TRUE);
+            (GTK_TOGGLE_BUTTON(tags_only_v1_toggle)) == TRUE)
         {
             inside = 1;
             gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
@@ -645,7 +639,7 @@
     }
     else if (!strcmp(user_data, "v2") && inside != 1) {
         if (gtk_toggle_button_get_active
-            (GTK_TOGGLE_BUTTON(tags_only_v2_toggle)) == TRUE);
+            (GTK_TOGGLE_BUTTON(tags_only_v2_toggle)) == TRUE)
         {
             inside = 1;
             gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON

audacious-plugins-3.1.1.tar.bz2/src/filewriter/vorbis.c -> audacious-plugins-3.2.4.tar.bz2/src/filewriter/vorbis.c Changed

@@ -72,6 +72,17 @@
         write_output=write_output_func;
 }
 
+static void add_string_from_tuple (vorbis_comment * vc, const char * name,
+ const Tuple * tuple, gint field)
+{
+    gchar * val = tuple_get_str (tuple, field, NULL);
+    if (! val)
+        return;
+
+    vorbis_comment_add_tag (vc, name, val);
+    str_unref (val);
+}
+
 static gint vorbis_open(void)
 {
     ogg_packet header;
@@ -85,22 +96,15 @@
 
     if (tuple)
     {
-        const gchar *scratch;
         gchar tmpstr[32];
         gint scrint;
 
-        if ((scratch = tuple_get_string(tuple, FIELD_TITLE, NULL)))
-            vorbis_comment_add_tag(&vc, "title", (gchar *) scratch);
-        if ((scratch = tuple_get_string(tuple, FIELD_ARTIST, NULL)))
-            vorbis_comment_add_tag(&vc, "artist", (gchar *) scratch);
-        if ((scratch = tuple_get_string(tuple, FIELD_ALBUM, NULL)))
-            vorbis_comment_add_tag(&vc, "album", (gchar *) scratch);
-        if ((scratch = tuple_get_string(tuple, FIELD_GENRE, NULL)))
-            vorbis_comment_add_tag(&vc, "genre", (gchar *) scratch);
-        if ((scratch = tuple_get_string(tuple, FIELD_DATE, NULL)))
-            vorbis_comment_add_tag(&vc, "date", (gchar *) scratch);
-        if ((scratch = tuple_get_string(tuple, FIELD_COMMENT, NULL)))
-            vorbis_comment_add_tag(&vc, "comment", (gchar *) scratch);
+        add_string_from_tuple (& vc, "title", tuple, FIELD_TITLE);
+        add_string_from_tuple (& vc, "artist", tuple, FIELD_ARTIST);
+        add_string_from_tuple (& vc, "album", tuple, FIELD_ALBUM);
+        add_string_from_tuple (& vc, "genre", tuple, FIELD_GENRE);
+        add_string_from_tuple (& vc, "date", tuple, FIELD_DATE);
+        add_string_from_tuple (& vc, "comment", tuple, FIELD_COMMENT);
 
         if ((scrint = tuple_get_int(tuple, FIELD_TRACK_NUMBER, NULL)))
         {

audacious-plugins-3.1.1.tar.bz2/src/flacng/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/flacng/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/flacng/flacng.h -> audacious-plugins-3.2.4.tar.bz2/src/flacng/flacng.h Changed

audacious-plugins-3.1.1.tar.bz2/src/flacng/metadata.c -> audacious-plugins-3.2.4.tar.bz2/src/flacng/metadata.c Changed

@@ -19,13 +19,13 @@
 *
 */
 
+#include <string.h>
 #include <audacious/debug.h>
 
 #include "flacng.h"
 
 static size_t read_cb(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
 {
- AUDDBG("Read callback.\n");
 size_t read;
 
 if (handle == NULL)
@@ -53,18 +53,14 @@
 
 static size_t write_cb(const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
 {
- AUDDBG("Write callback.\n");
-
 return vfs_fwrite(ptr, size, nmemb, handle);
 }
 
 static int seek_cb(FLAC__IOHandle handle, FLAC__int64 offset, int whence)
 {
- AUDDBG("Seek callback.\n");
-
 if (vfs_fseek(handle, offset, whence) != 0)
 {
- FLACNG_ERROR("Could not seek to %lld!\n", (long long)offset);
+ FLACNG_ERROR("Could not seek to %ld!\n", (long)offset);
 return -1;
 }
 
@@ -87,8 +83,6 @@
 
 static int eof_cb(FLAC__IOHandle handle)
 {
- AUDDBG("EOF callback\n");
-
 return vfs_feof(handle);
 }
 
@@ -106,7 +100,7 @@
 {
 FLAC__StreamMetadata_VorbisComment_Entry entry;
 gchar *str;
- gchar *val = (gchar *) tuple_get_string(tuple, tuple_name, NULL);
+ gchar *val = tuple_get_str(tuple, tuple_name, NULL);
 
 if (val == NULL)
 return;
@@ -117,6 +111,7 @@
 FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,
 vc_block->data.vorbis_comment.num_comments, entry, true);
 g_free(str);
+ str_unref(val);
 }
 
 static void insert_int_tuple_to_vc (FLAC__StreamMetadata * vc_block,
@@ -198,7 +193,7 @@
 return FALSE;
 }
 
-gboolean flac_get_image(const gchar *filename, VFSFile *fd, void **data, gint *length)
+gboolean flac_get_image(const gchar *filename, VFSFile *fd, void **data, gint64 *length)
 {
 AUDDBG("Probe for song image.\n");
 
@@ -232,7 +227,7 @@
 AUDDBG("FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER found.");
 
 *data = g_memdup(metadata->data.picture.data, metadata->data.picture.data_length);
- *length = (guint32) metadata->data.picture.data_length;
+ *length = metadata->data.picture.data_length;
 has_image = TRUE;
 }
 }
@@ -293,21 +288,24 @@
 if (tuple_get_value_type(tuple, unit_field, NULL) == TUPLE_INT)
 value = value * (gint64) tuple_get_int(tuple, unit_field, NULL) / unit;
 else
- tuple_associate_int(tuple, unit_field, NULL, unit);
+ tuple_set_int(tuple, unit_field, NULL, unit);
 
- tuple_associate_int(tuple, field, NULL, value);
+ tuple_set_int(tuple, field, NULL, value);
 }
 
 static void add_text (Tuple * tuple, gint field, const gchar * value)
 {
- const gchar * cur = tuple_get_string (tuple, field, NULL);
+ gchar * cur = tuple_get_str (tuple, field, NULL);
 if (cur)
 {
 gchar * both = g_strconcat (cur, ", ", value, NULL);
- tuple_associate_string_rel (tuple, field, NULL, both);
+ tuple_set_str (tuple, field, NULL, both);
+ g_free(both);
 }
 else
- tuple_associate_string (tuple, field, NULL, value);
+ tuple_set_str (tuple, field, NULL, value);
+
+ str_unref(cur);
 }
 
 static void parse_comment (Tuple * tuple, const gchar * key, const gchar * value)
@@ -334,9 +332,9 @@
 }
 
 if (! strcasecmp (key, "TRACKNUMBER"))
- tuple_associate_int(tuple, FIELD_TRACK_NUMBER, NULL, atoi(value));
+ tuple_set_int(tuple, FIELD_TRACK_NUMBER, NULL, atoi(value));
 else if (! strcasecmp (key, "DATE"))
- tuple_associate_int(tuple, FIELD_YEAR, NULL, atoi(value));
+ tuple_set_int(tuple, FIELD_YEAR, NULL, atoi(value));
 else if (! strcasecmp (key, "REPLAYGAIN_TRACK_GAIN"))
 set_gain_info(tuple, FIELD_GAIN_TRACK_GAIN, FIELD_GAIN_GAIN_UNIT, value);
 else if (! strcasecmp (key, "REPLAYGAIN_TRACK_PEAK"))
@@ -362,8 +360,8 @@
 
 tuple = tuple_new_from_filename(filename);
 
- tuple_associate_string(tuple, FIELD_CODEC, NULL, "Free Lossless Audio Codec (FLAC)");
- tuple_associate_string(tuple, FIELD_QUALITY, NULL, "lossless");
+ tuple_set_str(tuple, FIELD_CODEC, NULL, "Free Lossless Audio Codec (FLAC)");
+ tuple_set_str(tuple, FIELD_QUALITY, NULL, "lossless");
 
 chain = FLAC__metadata_chain_new();
 g_return_val_if_fail(chain != NULL, FALSE);
@@ -412,11 +410,11 @@
 if (metadata->data.stream_info.sample_rate == 0)
 {
 FLACNG_ERROR("Invalid sample rate for stream!\n");
- tuple_associate_int(tuple, FIELD_LENGTH, NULL, -1);
+ tuple_set_int(tuple, FIELD_LENGTH, NULL, -1);
 }
 else
 {
- tuple_associate_int(tuple, FIELD_LENGTH, NULL,
+ tuple_set_int(tuple, FIELD_LENGTH, NULL,
 (metadata->data.stream_info.total_samples / metadata->data.stream_info.sample_rate) * 1000);
 AUDDBG("Stream length: %d seconds\n", tuple_get_int(tuple, FIELD_LENGTH, NULL));
 }
@@ -424,13 +422,13 @@
 gsize size = vfs_fsize(fd);
 
 if (size == -1 || metadata->data.stream_info.total_samples == 0)
- tuple_associate_int(tuple, FIELD_BITRATE, NULL, 0);
+ tuple_set_int(tuple, FIELD_BITRATE, NULL, 0);
 else
 {
 gint bitrate = 8 * size *
 (gint64) metadata->data.stream_info.sample_rate / metadata->data.stream_info.total_samples;
 
- tuple_associate_int(tuple, FIELD_BITRATE, NULL, (bitrate + 500) / 1000);
+ tuple_set_int(tuple, FIELD_BITRATE, NULL, (bitrate + 500) / 1000);
 }
 break;

audacious-plugins-3.1.1.tar.bz2/src/flacng/plugin.c -> audacious-plugins-3.2.4.tar.bz2/src/flacng/plugin.c Changed

@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+#include <string.h>
+
 #include <audacious/debug.h>
 #include <audacious/i18n.h>
 #include <libaudgui/libaudgui.h>
@@ -27,7 +29,6 @@
 
 FLAC__StreamDecoder *main_decoder;
 callback_info *main_info;
-gboolean plugin_initialized = FALSE;
 static GMutex *seek_mutex;
 static GCond *seek_cond;
 static gint seek_value;
@@ -72,7 +73,6 @@
 seek_cond = g_cond_new();
 
 AUDDBG("Plugin initialized.\n");
- plugin_initialized = TRUE;
 return TRUE;
 }
 
@@ -83,8 +83,6 @@
 
 FLAC__stream_decoder_delete(main_decoder);
 clean_callback_info(main_info);
-
- plugin_initialized = FALSE;
 }
 
 gboolean flac_is_our_fd(const gchar *filename, VFSFile *fd)
@@ -142,12 +140,6 @@
 gpointer play_buffer = NULL;
 gboolean error = FALSE;
 
- if (!plugin_initialized)
- {
- FLACNG_ERROR("Plugin not initialized!\n");
- return FALSE;
- }
-
 main_info->fd = file;
 
 if (read_metadata(main_decoder, main_info) == FALSE)
@@ -187,7 +179,6 @@
 (main_info->stream.bits_per_sample), main_info->stream.samplerate,
 main_info->stream.channels))
 {
- FLACNG_ERROR("Could not open output plugin!\n");
 error = TRUE;
 goto ERR_NO_CLOSE;
 }

audacious-plugins-3.1.1.tar.bz2/src/flacng/seekable_stream_callbacks.c -> audacious-plugins-3.2.4.tar.bz2/src/flacng/seekable_stream_callbacks.c Changed

audacious-plugins-3.1.1.tar.bz2/src/gio/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/gio/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/gio/gio.c -> audacious-plugins-3.2.4.tar.bz2/src/gio/gio.c Changed

@@ -1,5 +1,6 @@
 /*  Audacious
  *  Copyright (c) 2009 William Pitcock
+ *  Copyright (c) 2011 Michał Lipski
  *
  *  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
@@ -35,20 +36,42 @@
     GSList *stream_stack;
 } VFSGIOHandle;
 
-static GVfs *gvfs = NULL;
-
-VFSFile *
+void *
 gio_vfs_fopen_impl(const gchar *path, const gchar *mode)
 {
-    VFSFile *file;
     VFSGIOHandle *handle;
     GError *error = NULL;
+    gchar *scheme;
+    static const gchar *const *schemes = NULL;
+    gboolean supported = FALSE;
+    guint num;
 
     if (path == NULL || mode == NULL)
-	    return NULL;
+        return NULL;
+
+    if (schemes == NULL)
+        schemes = g_vfs_get_supported_uri_schemes(g_vfs_get_default());
+
+    num = g_strv_length((gchar **) schemes);
+
+    if (num == 0)
+        return NULL;
 
     handle = g_slice_new0(VFSGIOHandle);
-    handle->file = g_vfs_get_file_for_uri(gvfs, path);
+    handle->file = g_file_new_for_uri(path);
+    scheme = g_file_get_uri_scheme(handle->file);
+
+    for (gint i = 0; schemes[i]; i++)
+        if (strcmp(schemes[i], scheme) == 0)
+        {
+            supported = TRUE;
+            break;
+        }
+
+    g_free(scheme);
+
+    if (!supported)
+        goto CLEANUP;
 
     if (*mode == 'r')
     {
@@ -63,48 +86,38 @@
     else
     {
         g_warning("UNSUPPORTED ACCESS MODE: %s", mode);
-        g_object_unref(handle->file);
-        g_slice_free(VFSGIOHandle, handle);
-        return NULL;
+        goto CLEANUP;
     }
 
     if (handle->istream == NULL && handle->ostream == NULL)
     {
         g_warning("Could not open %s for reading or writing: %s", path, error->message);
-        g_object_unref(handle->file);
-        g_slice_free(VFSGIOHandle, handle);
         g_error_free(error);
-        return NULL;
+        goto CLEANUP;
     }
 
-    file = g_new(VFSFile, 1);
-    file->handle = handle;
+    return handle;
 
-    return file;
+CLEANUP:
+    g_object_unref(handle->file);
+    g_slice_free(VFSGIOHandle, handle);
+    return NULL;
 }
 
 gint
 gio_vfs_fclose_impl(VFSFile * file)
 {
     gint ret = 0;
+    VFSGIOHandle *handle = vfs_get_handle(file);
 
-    g_return_val_if_fail(file != NULL, -1);
-
-    if (file->handle)
-    {
-        VFSGIOHandle *handle = (VFSGIOHandle *) file->handle;
-
-        if (handle->istream)
-            g_object_unref(handle->istream);
+    if (handle->istream)
+        g_object_unref(handle->istream);
 
-        if (handle->ostream)
-            g_object_unref(handle->ostream);
+    if (handle->ostream)
+        g_object_unref(handle->ostream);
 
-        g_object_unref(handle->file);
-        g_slice_free(VFSGIOHandle, handle);
-
-        file->handle = NULL;
-    }
+    g_object_unref(handle->file);
+    g_slice_free(VFSGIOHandle, handle);
 
     return ret;
 }
@@ -112,16 +125,11 @@
 gint64 gio_vfs_fread_impl (void * ptr, gint64 size, gint64 nmemb, VFSFile *
  file)
 {
-    VFSGIOHandle *handle;
+    VFSGIOHandle *handle = vfs_get_handle(file);
     goffset count = 0;
     gsize realsize = (size * nmemb);
     gsize ret, bytes_read;
 
-    g_return_val_if_fail(file != NULL, EOF);
-    g_return_val_if_fail(file->handle != NULL, EOF);
-
-    handle = (VFSGIOHandle *) file->handle;
-
     /* handle ungetc() *grumble* --nenolod */
     if (handle->stream_stack != NULL)
     {
@@ -130,7 +138,7 @@
         {
             uc = GPOINTER_TO_INT(handle->stream_stack->data);
             handle->stream_stack = g_slist_delete_link(handle->stream_stack, handle->stream_stack);
-            memcpy(ptr + count, &uc, 1);
+            memcpy((char *) ptr + count, &uc, 1);
             count++;
         }
     }
@@ -139,7 +147,7 @@
     while (realsize - bytes_read > 0)
     {
         ret = g_input_stream_read(G_INPUT_STREAM(handle->istream),
-            ptr + bytes_read + count, realsize - bytes_read - count, NULL, NULL) + count;
+            (char *) ptr + bytes_read + count, realsize - bytes_read - count, NULL, NULL) + count;
 
         if (ret > 0)
             bytes_read += ret;
@@ -153,14 +161,9 @@
 gint64 gio_vfs_fwrite_impl (const void * ptr, gint64 size, gint64 nmemb,
  VFSFile * file)
 {
-    VFSGIOHandle *handle;
+    VFSGIOHandle *handle = vfs_get_handle(file);
     gsize ret;
 
-    g_return_val_if_fail(file != NULL, EOF);
-    g_return_val_if_fail(file->handle != NULL, EOF);
-
-    handle = (VFSGIOHandle *) file->handle;
-
     ret = g_output_stream_write(G_OUTPUT_STREAM(handle->ostream), ptr, size * nmemb, NULL, NULL);
     return (size > 0) ? ret / size : 0;
 }
@@ -169,12 +172,7 @@
 gio_vfs_getc_impl(VFSFile *file)
 {
     guchar buf;
-    VFSGIOHandle *handle;
-
-    g_return_val_if_fail(file != NULL, EOF);
-    g_return_val_if_fail(file->handle != NULL, EOF);
-
-    handle = (VFSGIOHandle *) file->handle;
+    VFSGIOHandle *handle = vfs_get_handle(file);
 
     if (handle->stream_stack != NULL)
     {
@@ -191,12 +189,8 @@
 gint
 gio_vfs_ungetc_impl(gint c, VFSFile * file)
 {
-    VFSGIOHandle *handle;
-
-    g_return_val_if_fail(file != NULL, EOF);
-    g_return_val_if_fail(file->handle != NULL, EOF);
+    VFSGIOHandle *handle = vfs_get_handle(file);
 
-    handle = (VFSGIOHandle *) file->handle;
     handle->stream_stack = g_slist_prepend(handle->stream_stack, GINT_TO_POINTER(c));
     if (handle->stream_stack != NULL)
         return c;
@@ -209,14 +203,9 @@
           gint64 offset,
           gint whence)
 {
-    VFSGIOHandle *handle;
+    VFSGIOHandle *handle = vfs_get_handle(file);
     GSeekType seektype;
 
-    g_return_val_if_fail(file != NULL, -1);
-    g_return_val_if_fail(file->handle != NULL, -1);
-
-    handle = (VFSGIOHandle *) file->handle;
-
     if (!g_seekable_can_seek(handle->seekable))
         return -1;
 
@@ -245,20 +234,13 @@
 void
 gio_vfs_rewind_impl(VFSFile * file)
 {
-    g_return_if_fail(file != NULL);
-
-    file->base->vfs_fseek_impl(file, 0, SEEK_SET);
+    gio_vfs_fseek_impl(file, 0, SEEK_SET);
 }
 
 gint64
 gio_vfs_ftell_impl(VFSFile * file)
 {
-    VFSGIOHandle *handle;
-
-    g_return_val_if_fail(file != NULL, -1);
-    g_return_val_if_fail(file->handle != NULL, -1);
-
-    handle = (VFSGIOHandle *) file->handle;
+    VFSGIOHandle *handle = vfs_get_handle(file);
 
     return (glong) (g_seekable_tell(handle->seekable) - g_slist_length(handle->stream_stack));
 }
@@ -276,12 +258,7 @@
 
 gint gio_vfs_ftruncate_impl (VFSFile * file, gint64 size)
 {
-    VFSGIOHandle *handle;
-
-    g_return_val_if_fail(file != NULL, -1);
-
-    handle = (VFSGIOHandle *) file->handle;
-
+    VFSGIOHandle *handle = vfs_get_handle(file);
     return g_seekable_truncate (handle->seekable, size, NULL, NULL) ? 0 : -1;
 }
 
@@ -289,14 +266,10 @@
 gio_vfs_fsize_impl(VFSFile * file)
 {
     GFileInfo *info;
-    VFSGIOHandle *handle;
+    VFSGIOHandle *handle = vfs_get_handle(file);
     GError *error = NULL;
     gint64 size;
 
-    g_return_val_if_fail(file != NULL, -1);
-    g_return_val_if_fail(file->handle != NULL, -1);
-
-    handle = (VFSGIOHandle *) file->handle;
     info = g_file_query_info(handle->file, G_FILE_ATTRIBUTE_STANDARD_SIZE, G_FILE_QUERY_INFO_NONE, NULL, &error);
 
     if (info == NULL)
@@ -312,8 +285,7 @@
     return size;
 }
 
-/* FIXME: What URI schemes can GIO actually handle? */
-static const gchar * const gio_schemes[] = {NULL};
+static const gchar * const gio_schemes[] = {"ftp", "sftp", "smb", NULL};
 
 static VFSConstructor constructor = {
  .vfs_fopen_impl = gio_vfs_fopen_impl,

audacious-plugins-3.1.1.tar.bz2/src/gnomeshortcuts/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/gnomeshortcuts/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/gtkui/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/gtkui/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/gtkui/columns.c -> audacious-plugins-3.2.4.tar.bz2/src/gtkui/columns.c Changed

@@ -75,7 +75,7 @@
 
 static GtkWidget * window = NULL;
 static GtkWidget * chosen_list = NULL, * avail_list = NULL;
-static struct index * chosen = NULL, * avail = NULL;
+static Index * chosen = NULL, * avail = NULL;
 
 static void get_value (void * user, gint row, gint column, GValue * value)
 {
@@ -112,8 +112,8 @@
 if (before == row)
 return;
 
- struct index * move = index_new ();
- struct index * others = index_new ();
+ Index * move = index_new ();
+ Index * others = index_new ();
 
 gint begin, end;
 if (before < row)
@@ -164,9 +164,9 @@
 .select_all = select_all,
 .shift_rows = shift_rows};
 
-static void transfer (struct index * source)
+static void transfer (Index * source)
 {
- struct index * dest;
+ Index * dest;
 GtkWidget * source_list, * dest_list;
 if (source == chosen)
 {
@@ -276,9 +276,11 @@
 }
 
 window = gtk_dialog_new_with_buttons (_("Choose Columns"), NULL, 0,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 NULL);
 gtk_window_set_default_size ((GtkWindow *) window, 400, 300);
+ gtk_dialog_set_default_response ((GtkDialog *) window, GTK_RESPONSE_ACCEPT);
+
 g_signal_connect (window, "response", (GCallback) response_cb, NULL);
 g_signal_connect (window, "destroy", (GCallback) destroy_cb, NULL);
 
@@ -302,7 +304,7 @@
 
 avail_list = audgui_list_new (& callbacks, avail, index_count (avail));
 gtk_tree_view_set_headers_visible ((GtkTreeView *) avail_list, FALSE);
- audgui_list_add_column (avail_list, NULL, 0, G_TYPE_STRING, TRUE);
+ audgui_list_add_column (avail_list, NULL, 0, G_TYPE_STRING, -1);
 gtk_container_add ((GtkContainer *) scroll, avail_list);
 
 vbox = gtk_vbox_new (FALSE, 6);
@@ -336,7 +338,7 @@
 
 chosen_list = audgui_list_new (& callbacks, chosen, index_count (chosen));
 gtk_tree_view_set_headers_visible ((GtkTreeView *) chosen_list, FALSE);
- audgui_list_add_column (chosen_list, NULL, 0, G_TYPE_STRING, TRUE);
+ audgui_list_add_column (chosen_list, NULL, 0, G_TYPE_STRING, -1);
 gtk_container_add ((GtkContainer *) scroll, chosen_list);
 
 gtk_widget_show_all (window);

audacious-plugins-3.1.1.tar.bz2/src/gtkui/layout.c -> audacious-plugins-3.2.4.tar.bz2/src/gtkui/layout.c Changed

@@ -60,6 +60,7 @@
 {
 g_return_val_if_fail (! layout, NULL);
 layout = gtk_alignment_new (0, 0, 1, 1);
+ gtk_alignment_set_padding ((GtkAlignment *) layout, 3, 3, 3, 3);
 NULL_ON_DESTROY (layout);
 return layout;
 }
@@ -142,7 +143,7 @@
 {
 g_return_val_if_fail (widget && name, NULL);
 
- GtkWidget * vbox = gtk_vbox_new (FALSE, 0);
+ GtkWidget * vbox = gtk_vbox_new (FALSE, 2);
 
 GtkWidget * ebox = gtk_event_box_new ();
 gtk_box_pack_start ((GtkBox *) vbox, ebox, FALSE, FALSE, 0);
@@ -150,7 +151,6 @@
 widget);
 
 GtkWidget * label = gtk_label_new (NULL);
- gtk_misc_set_padding ((GtkMisc *) label, 3, 0);
 gchar * markup = g_markup_printf_escaped ("%s", name);
 gtk_label_set_markup ((GtkLabel *) label, markup);
 g_free (markup);
@@ -225,6 +225,13 @@
 item->dock = item->x = item->y = -1;
 item->w = DEFAULT_WIDTH;
 item->h = DEFAULT_HEIGHT;
+
+ if (! strcmp (name, "Search Tool"))
+ {
+ item->dock = DOCK_LEFT;
+ item->w = 200;
+ }
+
 items = g_list_append (items, item);
 return item;
 }
@@ -317,6 +324,8 @@
 NULL_ON_DESTROY (item->window);
 
 gtk_window_set_title ((GtkWindow *) item->window, item->name);
+ gtk_container_set_border_width ((GtkContainer *) item->window, 2);
+
 g_signal_connect_swapped (item->window, "delete-event", (GCallback)
 delete_cb, item->widget);
 g_signal_connect_swapped (item->window, "key-press-event", (GCallback)

audacious-plugins-3.1.1.tar.bz2/src/gtkui/menus.c -> audacious-plugins-3.2.4.tar.bz2/src/gtkui/menus.c Changed

@@ -92,11 +92,12 @@
 
 static void pl_new (void)
 {
-    aud_playlist_insert (aud_playlist_get_active () + 1);
-    aud_playlist_set_active (aud_playlist_get_active () + 1);
+    aud_playlist_insert (-1);
+    aud_playlist_set_active (aud_playlist_count () - 1);
 }
 
 static void pl_refresh (void) {aud_playlist_rescan (aud_playlist_get_active ()); }
+static void pl_remove_failed (void) {aud_playlist_remove_failed (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); }
@@ -127,30 +128,30 @@
 static void autoscroll_set (gboolean on) {aud_set_bool ("gtkui", "autoscroll", on); }
 
 static const struct MenuItem file_items[] = {
- {N_("_Open Files ..."), GTK_STOCK_OPEN, 'l', .func = open_files},
+ {N_("_Open Files ..."), GTK_STOCK_OPEN, 'o', CTRL, .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},
+ {N_("_Add Files ..."), GTK_STOCK_ADD, 'o', SHIFT | CTRL, .func = add_files},
+ {N_("Add U_RL ..."), GTK_STOCK_NETWORK, 'l', SHIFT | 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_("_Preferences ..."), GTK_STOCK_PREFERENCES, .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},
+ {N_("_Play"), GTK_STOCK_MEDIA_PLAY, GDK_Return, CTRL, .func = aud_drct_play},
+ {N_("Paus_e"), GTK_STOCK_MEDIA_PAUSE, ',', CTRL, .func = aud_drct_pause},
+ {N_("_Stop"), GTK_STOCK_MEDIA_STOP, '.', CTRL, .func = aud_drct_stop},
+ {N_("Pre_vious"), GTK_STOCK_MEDIA_PREVIOUS, GDK_Up, ALT, .func = aud_drct_pl_prev},
+ {N_("_Next"), GTK_STOCK_MEDIA_NEXT, GDK_Down, ALT, .func = aud_drct_pl_next},
  {.sep = TRUE},
- {N_("_Repeat"), NULL, 'r', .get = repeat_get, repeat_set, "set repeat"},
- {N_("S_huffle"), NULL, 's', .get = shuffle_get, shuffle_set, "set shuffle"},
+ {N_("_Repeat"), NULL, 'r', CTRL, .get = repeat_get, repeat_set, "set repeat"},
+ {N_("S_huffle"), NULL, 's', CTRL, .get = shuffle_get, shuffle_set, "set shuffle"},
  {N_("N_o Playlist Advance"), NULL, 'n', CTRL, .get = no_advance_get, no_advance_set, "set no_playlist_advance"},
  {N_("Stop _After This Song"), NULL, 'm', CTRL, .get = stop_after_get, stop_after_set, "set stop_after_current_song"},
  {.sep = TRUE},
- {N_("Song _Info ..."), GTK_STOCK_INFO, 'i', .func = audgui_infowin_show_current},
- {N_("Jump to _Time ..."), GTK_STOCK_JUMP_TO, 'j', CTRL, .func = audgui_jump_to_time},
- {N_("_Jump to Song ..."), GTK_STOCK_JUMP_TO, 'j', .func = audgui_jump_to_track}};
+ {N_("Song _Info ..."), GTK_STOCK_INFO, 'i', CTRL, .func = audgui_infowin_show_current},
+ {N_("Jump to _Time ..."), GTK_STOCK_JUMP_TO, .func = audgui_jump_to_time},
+ {N_("_Jump to Song ..."), GTK_STOCK_JUMP_TO, 'j', CTRL, .func = audgui_jump_to_track}};
 
 static const struct MenuItem sort_items[] = {
  {N_("By Track _Number"), .func = pl_sort_track},
@@ -166,21 +167,22 @@
 
 static const struct MenuItem playlist_items[] = {
  {N_("_Refresh"), GTK_STOCK_REFRESH, GDK_F5, .func = pl_refresh},
+ {N_("Remove _Unavailable Files"), GTK_STOCK_REMOVE, .func = pl_remove_failed},
  {.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},
+ {N_("_Import ..."), GTK_STOCK_OPEN, .func = audgui_import_playlist},
+ {N_("_Export ..."), GTK_STOCK_SAVE, .func = audgui_export_playlist},
  {.sep = TRUE},
- {N_("_Playlist Manager ..."), AUD_STOCK_PLAYLIST, 'p', .func = audgui_playlist_manager},
+ {N_("_Playlist Manager ..."), AUD_STOCK_PLAYLIST, 'p', CTRL, .func = audgui_playlist_manager},
  {N_("_Queue Manager ..."), AUD_STOCK_QUEUETOGGLE, 'u', CTRL, .func = audgui_queue_manager_show}};
 
 static const struct MenuItem output_items[] = {
- {N_("Volume _Up"), GTK_STOCK_GO_UP, '+', .func = volume_up},
- {N_("Volume _Down"), GTK_STOCK_GO_DOWN, '-', .func = volume_down},
+ {N_("Volume _Up"), GTK_STOCK_GO_UP, '+', CTRL, .func = volume_up},
+ {N_("Volume _Down"), GTK_STOCK_GO_DOWN, '-', CTRL, .func = volume_down},
  {.sep = TRUE},
  {N_("_Equalizer"), GTK_STOCK_PREFERENCES, 'e', CTRL, .func = audgui_show_equalizer_window},
  {.sep = TRUE},
@@ -188,6 +190,7 @@
 
 static const struct MenuItem view_items[] = {
  {N_("_Interface"), .get_sub = audgui_create_iface_menu},
+ {N_("_Visualizations"), .get_sub = audgui_create_vis_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},
@@ -207,13 +210,13 @@
 
 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_("_Queue/Unqueue"), AUD_STOCK_QUEUETOGGLE, 'q', ALT, .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},
+ {N_("Cu_t"), GTK_STOCK_CUT, .func = playlist_cut},
+ {N_("_Copy"), GTK_STOCK_COPY, .func = playlist_copy},
+ {N_("_Paste"), GTK_STOCK_PASTE, .func = playlist_paste},
+ {N_("Select _All"), GTK_STOCK_SELECT_ALL, .func = pl_select_all},
  {.sep = TRUE},
  {N_("_Services"), .get_sub = get_services_pl}};

audacious-plugins-3.1.1.tar.bz2/src/gtkui/playlist_util.c -> audacious-plugins-3.2.4.tar.bz2/src/gtkui/playlist_util.c Changed

audacious-plugins-3.1.1.tar.bz2/src/gtkui/ui_gtk.c -> audacious-plugins-3.2.4.tar.bz2/src/gtkui/ui_gtk.c Changed

@@ -26,6 +26,7 @@
 #include <audacious/i18n.h>
 #include <audacious/playlist.h>
 #include <audacious/plugin.h>
+#include <audacious/plugins.h>
 #include <audacious/misc.h>
 #include <libaudcore/hook.h>
 #include <libaudgui/libaudgui.h>
@@ -47,13 +48,13 @@
 "statusbar_visible", "TRUE",
 
 "autoscroll", "TRUE",
- "playlist_columns", "number title artist album queued length",
+ "playlist_columns", "title artist album queued length",
 "playlist_headers", "TRUE",
 
 "player_x", "-1",
 "player_y", "-1",
- "player_width", "600",
- "player_height", "400",
+ "player_width", "760",
+ "player_height", "460",
 
 /* hidden settings */
 "always_on_top", "FALSE",
@@ -62,6 +63,8 @@
 "custom_playlist_colors", "FALSE",
 NULL};
 
+static PluginHandle * search_tool;
+
 static GtkWidget *volume;
 static gboolean volume_slider_is_moving = FALSE;
 static guint update_volume_timeout_source = 0;
@@ -70,9 +73,8 @@
 static GtkAccelGroup * accel;
 
 static GtkWidget * button_play, * button_pause, * button_stop, * slider,
- * label_time, * button_shuffle, * button_repeat;
-static GtkWidget * window, * vbox, * menu_box, * menu, * playlist_box,
- * infoarea, * statusbar;
+ * label_time, * button_shuffle, * button_repeat, * search_button;
+static GtkWidget * window, * vbox_outer, * vbox, * menu_box, * menu, * infoarea, * statusbar;
 static GtkWidget * menu_main, * menu_rclick, * menu_tab;
 
 static GtkWidget * error_win = NULL;
@@ -81,8 +83,6 @@
 static guint delayed_title_change_source = 0;
 static guint update_song_timeout_source = 0;
 
-extern GtkWidget *ui_playlist_notebook_tab_title_editing;
-
 static gboolean init (void);
 static void cleanup (void);
 static void ui_show (gboolean show);
@@ -101,8 +101,8 @@
 .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,
+ .run_gtk_plugin = (void (*) (void *, const gchar *)) layout_add,
+ .stop_gtk_plugin = (void (*) (void *)) layout_remove,
 )
 
 static void save_window_size (void)
@@ -156,7 +156,7 @@
 gchar * title_s = g_strdup_printf (_("%s - Audacious"), title);
 gtk_window_set_title ((GtkWindow *) window, title_s);
 g_free (title_s);
- g_free (title);
+ str_unref (title);
 }
 else
 gtk_window_set_title ((GtkWindow *) window, _("Buffering ..."));
@@ -203,7 +203,12 @@
 
 static gboolean ui_is_focused (void)
 {
+/* gtk_window_is_active() is too unreliable, unfortunately. --jlindgren */
+#if 0
 return gtk_window_is_active ((GtkWindow *) window);
+#else
+ return ui_is_shown ();
+#endif
 }
 
 static void ui_show_error (const gchar * text)
@@ -262,13 +267,29 @@
 return TRUE;
 }
 
+static void do_seek (gint time)
+{
+ set_slider (time);
+ set_time_label (time, aud_drct_get_length ());
+ aud_drct_seek (time);
+
+ // Trick: Unschedule and then schedule the update function. This gives the
+ // player 1/4 second to perform the seek before we update the display again,
+ // in an attempt to reduce flickering.
+ if (update_song_timeout_source)
+ {
+ g_source_remove (update_song_timeout_source);
+ update_song_timeout_source = g_timeout_add (250, (GSourceFunc) time_counter_cb, NULL);
+ }
+}
+
 static gboolean ui_slider_change_value_cb(GtkRange * range, GtkScrollType scroll)
 {
 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));
+ do_seek (gtk_range_get_value (range));
 
 return FALSE;
 }
@@ -276,23 +297,12 @@
 static gboolean ui_slider_button_press_cb(GtkWidget * widget, GdkEventButton * event, gpointer user_data)
 {
 slider_is_moving = TRUE;
-
- /* HACK: clicking with the left mouse button moves the slider
- to the location of the click. */
- if (event->button == 1)
- event->button = 2;
-
 return FALSE;
 }
 
 static gboolean ui_slider_button_release_cb(GtkWidget * widget, GdkEventButton * event, gpointer user_data)
 {
- /* HACK: see ui_slider_button_press_cb */
- if (event->button == 1)
- event->button = 2;
-
 slider_is_moving = FALSE;
-
 return FALSE;
 }
 
@@ -316,18 +326,12 @@
 static gboolean ui_volume_slider_update(gpointer data)
 {
 gint volume;
- static gint last_volume = -1;
 
 if (volume_slider_is_moving || data == NULL)
 return TRUE;
 
 aud_drct_get_volume_main(&volume);
 
- if (last_volume == volume)
- return TRUE;
-
- last_volume = volume;
-
 if (volume == (gint) gtk_scale_button_get_value(GTK_SCALE_BUTTON(data)))
 return TRUE;
 
@@ -426,7 +430,7 @@
 return TRUE;
 }
 
-static GtkWidget *gtk_toolbar_button_add(GtkWidget * toolbar, void (*callback) (), const gchar * stock_id)
+static GtkWidget *toolbar_button_add(GtkWidget * toolbar, void (*callback) (), const gchar * stock_id)
 {
 GtkWidget *icon;
 GtkWidget *button = gtk_button_new();
@@ -451,7 +455,10 @@
 gtk_widget_set_can_focus (button, FALSE);
 gtk_button_set_relief ((GtkButton *) button, GTK_RELIEF_NONE);
 
- if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), icon))
+ if (! alt)
+ gtk_container_add ((GtkContainer *) button, gtk_image_new_from_stock
+ (icon, GTK_ICON_SIZE_BUTTON));
+ else if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), icon))
 gtk_container_add ((GtkContainer *) button, gtk_image_new_from_icon_name
 (icon, GTK_ICON_SIZE_BUTTON));
 else
@@ -467,76 +474,57 @@
 return button;
 }
 
-static GtkWidget *gtk_markup_label_new(const gchar * str)
+static GtkWidget *markup_label_new(const gchar * str)
 {
 GtkWidget *label = gtk_label_new(str);
 g_object_set(G_OBJECT(label), "use-markup", TRUE, NULL);
 return label;
 }
 
-static gboolean ui_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+static void window_mapped_cb (GtkWidget * widget, void * unused)
 {
- if (ui_playlist_notebook_tab_title_editing)
+ gtk_widget_grab_focus (playlist_get_treeview (aud_playlist_get_active ()));
+}
+
+static gboolean window_keypress_cb (GtkWidget * widget, GdkEventKey * event, void * unused)
+{
+ switch (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK))
 {
- if (event->keyval == GDK_KP_Enter || event->keyval == GDK_Escape)
+ case 0:;
+ /* single-key shortcuts; must not interfere with text entry */
+ GtkWidget * focused = gtk_window_get_focus ((GtkWindow *) window);
+ if (focused && GTK_IS_ENTRY (focused))
 return FALSE;
 
- GtkWidget *entry = g_object_get_data(G_OBJECT(ui_playlist_notebook_tab_title_editing), "entry");
- gtk_widget_event(entry, (GdkEvent*) event);
- return TRUE;
- }
+ switch (event->keyval)
+ {
+ case 'z':
+ aud_drct_pl_prev ();
+ return TRUE;
+ case 'x':
+ aud_drct_play ();
+ return TRUE;
+ case 'c':
+ case ' ':
+ aud_drct_pause ();
+ return TRUE;
+ case 'v':
+ aud_drct_stop ();
+ return TRUE;
+ case 'b':
+ aud_drct_pl_next ();
+ return TRUE;
+ case GDK_Left:
+ if (aud_drct_get_playing ())
+ do_seek (aud_drct_get_time () - 5000);
+ return TRUE;
+ case GDK_Right:
+ if (aud_drct_get_playing ())
+ do_seek (aud_drct_get_time () + 5000);
+ return TRUE;
+ }
 
- switch (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK))
- {
- case 0:
- switch (event->keyval)
- {
- case GDK_Left:
- case GDK_KP_Left:
- case GDK_KP_7:
- if (aud_drct_get_playing ())
- aud_drct_seek (aud_drct_get_time () - 5000);
- break;
-
- case GDK_Right:
- case GDK_KP_Right:
- case GDK_KP_9:
- if (aud_drct_get_playing ())
- aud_drct_seek (aud_drct_get_time () + 5000);
- break;
-
- case GDK_KP_4:
- aud_drct_pl_prev();
- break;
-
- case GDK_KP_6:
- aud_drct_pl_next();
- break;
-
- case GDK_space:
- if (aud_drct_get_playing())
- aud_drct_pause();
- else
- aud_drct_play();
- break;
-
- case GDK_Escape:
- ui_playlist_notebook_position (GINT_TO_POINTER
- (aud_playlist_get_active ()), NULL);
- break;
-
- case GDK_Delete:
- playlist_delete_selected ();
- break;
-
- case GDK_Menu:
- popup_menu_rclick (0, event->time);
- break;
-
- default:
- return FALSE;
- }
- break;
+ return FALSE;
 
 case GDK_CONTROL_MASK:
 switch (event->keyval)
@@ -546,6 +534,7 @@
 aud_playlist_set_active ((aud_playlist_get_active () + 1) %
 aud_playlist_count ());
 break;
+
 default:
 return FALSE;
 }
@@ -565,11 +554,13 @@
 case GDK_MOD1_MASK:
 switch (event->keyval)
 {
- case GDK_Up:
- playlist_shift (-1);
+ case GDK_Left:
+ if (aud_drct_get_playing ())
+ do_seek (aud_drct_get_time () - 5000);
 break;
- case GDK_Down:
- playlist_shift (1);
+ case GDK_Right:
+ if (aud_drct_get_playing ())
+ do_seek (aud_drct_get_time () + 5000);
 break;
 default:
 return FALSE;
@@ -581,6 +572,48 @@
 return TRUE;
 }
 
+static gboolean playlist_keypress_cb (GtkWidget * widget, GdkEventKey * event, void * unused)
+{
+ switch (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK))
+ {
+ case 0:
+ switch (event->keyval)
+ {
+ case GDK_Escape:
+ ui_playlist_notebook_position (GINT_TO_POINTER (aud_playlist_get_active ()), NULL);
+ return TRUE;
+ case GDK_Delete:
+ playlist_delete_selected ();
+ return TRUE;
+ case GDK_Menu:
+ popup_menu_rclick (0, event->time);
+ return TRUE;
+ }
+
+ break;
+ case GDK_CONTROL_MASK:
+ switch (event->keyval)
+ {
+ case 'x':
+ playlist_cut ();
+ return TRUE;
+ case 'c':
+ playlist_copy ();
+ return TRUE;
+ case 'v':
+ playlist_paste ();
+ return TRUE;
+ case 'a':
+ aud_playlist_select_all (aud_playlist_get_active (), TRUE);
+ return TRUE;
+ }
+
+ break;
+ }
+
+ return FALSE;
+}
+
 static void update_toggles (void * data, void * user)
 {
 gtk_toggle_button_set_active ((GtkToggleButton *) button_repeat, aud_get_bool (NULL, "repeat"));
@@ -597,6 +630,18 @@
 aud_set_bool (NULL, "shuffle", gtk_toggle_button_get_active (button));
 }
 
+static void toggle_search_tool (GtkToggleButton * button, void * unused)
+{
+ aud_plugin_enable (search_tool, gtk_toggle_button_get_active (button));
+}
+
+static gboolean search_tool_toggled (PluginHandle * plugin, void * unused)
+{
+ gtk_toggle_button_set_active ((GtkToggleButton *) search_button,
+ aud_plugin_get_enabled (plugin));
+ return TRUE;
+}
+
 static void config_save (void)
 {
 save_window_size ();
@@ -607,7 +652,6 @@
 static void ui_hooks_associate(void)
 {
 hook_associate ("title change", (HookFunction) title_change_cb, NULL);
- hook_associate ("playback seek", (HookFunction) time_counter_cb, NULL);
 hook_associate ("playback begin", (HookFunction) ui_playback_begin, NULL);
 hook_associate ("playback ready", (HookFunction) ui_playback_ready, NULL);
 hook_associate ("playback pause", (HookFunction) pause_cb, NULL);
@@ -625,7 +669,6 @@
 static void ui_hooks_disassociate(void)
 {
 hook_dissociate ("title change", (HookFunction) title_change_cb);
- hook_dissociate ("playback seek", (HookFunction) time_counter_cb);
 hook_dissociate ("playback begin", (HookFunction) ui_playback_begin);
 hook_dissociate ("playback ready", (HookFunction) ui_playback_ready);
 hook_dissociate ("playback pause", (HookFunction) pause_cb);
@@ -642,6 +685,8 @@
 
 static gboolean init (void)
 {
+ search_tool = aud_plugin_lookup_basename ("search-tool");
+
 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 */
@@ -659,36 +704,49 @@
 gint w = aud_get_int ("gtkui", "player_width");
 gint h = aud_get_int ("gtkui", "player_height");
 
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 gtk_window_set_default_size ((GtkWindow *) window, w, h);
 gtk_window_set_keep_above ((GtkWindow *) window, aud_get_bool ("gtkui", "always_on_top"));
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_window_set_has_resize_grip ((GtkWindow *) window, FALSE);
+#endif
 
 if (aud_get_bool ("gtkui", "save_window_position") && (x != -1 || y != -1))
 gtk_window_move ((GtkWindow *) window, x, y);
 
 g_signal_connect(G_OBJECT(window), "delete-event", G_CALLBACK(window_delete), NULL);
 
- vbox = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(window), vbox);
-
 accel = gtk_accel_group_new ();
 gtk_window_add_accel_group ((GtkWindow *) window, accel);
 
+ vbox_outer = gtk_vbox_new (FALSE, 0);
+ gtk_container_add ((GtkContainer *) window, vbox_outer);
+
 menu_box = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start ((GtkBox *) vbox, menu_box, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *) vbox_outer, menu_box, FALSE, FALSE, 0);
 show_menu (aud_get_bool ("gtkui", "menu_visible"));
 
 tophbox = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), tophbox, FALSE, TRUE, 0);
+ gtk_box_pack_start ((GtkBox *) vbox_outer, tophbox, FALSE, FALSE, 0);
 
 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, 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);
+
+ if (search_tool)
+ {
+ search_button = toggle_button_new (GTK_STOCK_FIND, NULL, toggle_search_tool, NULL);
+ gtk_box_pack_start ((GtkBox *) tophbox, search_button, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active ((GtkToggleButton *) search_button,
+ aud_plugin_get_enabled (search_tool));
+ aud_plugin_add_watch (search_tool, search_tool_toggled, NULL);
+ }
+
+ toolbar_button_add(buttonbox, button_open_pressed, GTK_STOCK_OPEN);
+ toolbar_button_add(buttonbox, button_add_pressed, GTK_STOCK_ADD);
+ button_play = toolbar_button_add (buttonbox, aud_drct_play, GTK_STOCK_MEDIA_PLAY);
+ button_pause = toolbar_button_add (buttonbox, aud_drct_pause, GTK_STOCK_MEDIA_PAUSE);
+ button_stop = toolbar_button_add (buttonbox, aud_drct_stop, GTK_STOCK_MEDIA_STOP);
+ toolbar_button_add (buttonbox, aud_drct_pl_prev, GTK_STOCK_MEDIA_PREVIOUS);
+ 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 */
@@ -717,7 +775,7 @@
 gtk_box_pack_start ((GtkBox *) shbox, slider, TRUE, TRUE, 6);
 gtk_widget_set_no_show_all (slider, TRUE);
 
- label_time = gtk_markup_label_new(NULL);
+ label_time = markup_label_new(NULL);
 gtk_widget_set_no_show_all (label_time, TRUE);
 
 gtk_box_pack_end ((GtkBox *) shbox, label_time, FALSE, FALSE, 6);
@@ -726,8 +784,7 @@
 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)));
 gtk_widget_set_can_focus(volume, FALSE);
- /* Set the default volume to the balance average.
- (I'll add balance control later) -Ryan */
+
 gint lvol = 0, rvol = 0;
 aud_drct_get_volume(&lvol, &rvol);
 gtk_scale_button_set_value(GTK_SCALE_BUTTON(volume), (lvol + rvol) / 2);
@@ -741,24 +798,17 @@
 toggle_repeat, NULL);
 gtk_box_pack_end ((GtkBox *) tophbox, button_repeat, FALSE, FALSE, 0);
 
- playlist_box = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), playlist_box, TRUE, TRUE, 0);
-
- /* Create playlist notebook */
- ui_playlist_notebook_new ();
- g_object_ref (G_OBJECT(UI_PLAYLIST_NOTEBOOK));
-
- if (aud_get_bool ("gtkui", "statusbar_visible"))
- {
- statusbar = ui_statusbar_new();
- gtk_box_pack_end(GTK_BOX(vbox), statusbar, FALSE, FALSE, 3);
- }
-
 layout_load ();
 
 GtkWidget * layout = layout_new ();
- gtk_box_pack_start ((GtkBox *) playlist_box, layout, TRUE, TRUE, 0);
- layout_add_center ((GtkWidget *) UI_PLAYLIST_NOTEBOOK);
+ gtk_box_pack_start ((GtkBox *) vbox_outer, layout, TRUE, TRUE, 0);
+
+ vbox = gtk_vbox_new (FALSE, 6);
+ layout_add_center (vbox);
+
+ /* Create playlist notebook */
+ ui_playlist_notebook_new ();
+ gtk_box_pack_start ((GtkBox *) vbox, (GtkWidget *) UI_PLAYLIST_NOTEBOOK, TRUE, TRUE, 0);
 
 if (aud_get_bool ("gtkui", "infoarea_visible"))
 {
@@ -766,6 +816,12 @@
 gtk_box_pack_end (GTK_BOX(vbox), infoarea, FALSE, FALSE, 0);
 }
 
+ if (aud_get_bool ("gtkui", "statusbar_visible"))
+ {
+ statusbar = ui_statusbar_new ();
+ gtk_box_pack_end ((GtkBox *) vbox_outer, statusbar, FALSE, FALSE, 0);
+ }
+
 AUDDBG("hooks associate\n");
 ui_hooks_associate();
 
@@ -781,7 +837,9 @@
 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);
 
- g_signal_connect(window, "key-press-event", G_CALLBACK(ui_key_press_cb), NULL);
+ g_signal_connect (window, "map-event", (GCallback) window_mapped_cb, NULL);
+ g_signal_connect (window, "key-press-event", (GCallback) window_keypress_cb, NULL);
+ g_signal_connect (UI_PLAYLIST_NOTEBOOK, "key-press-event", (GCallback) playlist_keypress_cb, NULL);
 
 if (aud_drct_get_playing ())
 {
@@ -794,7 +852,7 @@
 
 title_change_cb ();
 
- gtk_widget_show_all (vbox);
+ gtk_widget_show_all (vbox_outer);
 
 if (aud_get_bool ("gtkui", "player_visible"))
 ui_show (TRUE);
@@ -838,11 +896,11 @@
 
 ui_hooks_disassociate();
 
- pw_col_cleanup ();
+ if (search_tool)
+ aud_plugin_remove_watch (search_tool, search_tool_toggled, NULL);
 
- g_object_unref ((GObject *) UI_PLAYLIST_NOTEBOOK);
+ pw_col_cleanup ();
 gtk_widget_destroy (window);
-
 layout_cleanup ();
 }
 
@@ -886,7 +944,6 @@
 {
 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);
 }
 
@@ -904,11 +961,7 @@
 if (show && ! 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_box_pack_end ((GtkBox *) vbox_outer, statusbar, FALSE, FALSE, 0);
 gtk_widget_show_all (statusbar);
 }

audacious-plugins-3.1.1.tar.bz2/src/gtkui/ui_infoarea.c -> audacious-plugins-3.2.4.tar.bz2/src/gtkui/ui_infoarea.c Changed

@@ -45,8 +45,8 @@
 typedef struct {
     GtkWidget * box, * main, * vis;
 
-    gchar * title, * artist, * album;
-    gchar * last_title, * last_artist, * last_album;
+    gchar * title, * artist, * album; /* pooled */
+    gchar * last_title, * last_artist, * last_album; /* pooled */
     gfloat alpha, last_alpha;
 
     gboolean stopped;
@@ -303,22 +303,22 @@
 
     if (area->title != NULL)
         draw_text (area->main, cr, x, SPACING, width, 1, 1, 1, area->alpha,
-         "Sans 18", area->title);
+         "18", area->title);
     if (area->last_title != NULL)
         draw_text (area->main, cr, x, SPACING, width, 1, 1, 1, area->last_alpha,
-         "Sans 18", area->last_title);
+         "18", area->last_title);
     if (area->artist != NULL)
         draw_text (area->main, cr, x, SPACING + ICON_SIZE / 2, width, 1, 1, 1,
-         area->alpha, "Sans 9", area->artist);
+         area->alpha, "9", area->artist);
     if (area->last_artist != NULL)
         draw_text (area->main, cr, x, SPACING + ICON_SIZE / 2, width, 1, 1, 1,
-         area->last_alpha, "Sans 9", area->last_artist);
+         area->last_alpha, "9", area->last_artist);
     if (area->album != NULL)
         draw_text (area->main, cr, x, SPACING + ICON_SIZE * 3 / 4, width, 0.7,
-         0.7, 0.7, area->alpha, "Sans 9", area->album);
+         0.7, 0.7, area->alpha, "9", area->album);
     if (area->last_album != NULL)
         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);
+         0.7, 0.7, area->last_alpha, "9", area->last_album);
 }
 
 #if GTK_CHECK_VERSION (3, 0, 0)
@@ -392,15 +392,15 @@
     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);
+        str_unref (title);
+        str_unref (artist);
+        str_unref (album);
         return;
     }
 
-    g_free (area->title);
-    g_free (area->artist);
-    g_free (area->album);
+    str_unref (area->title);
+    str_unref (area->artist);
+    str_unref (area->album);
     area->title = title;
     area->artist = artist;
     area->album = album;
@@ -429,15 +429,15 @@
     area->last_pb = area->pb;
     area->pb = NULL;
 
-    g_free (area->last_title);
+    str_unref (area->last_title);
     area->last_title = area->title;
     area->title = NULL;
 
-    g_free (area->last_artist);
+    str_unref (area->last_artist);
     area->last_artist = area->artist;
     area->artist = NULL;
 
-    g_free (area->last_album);
+    str_unref (area->last_album);
     area->last_album = area->album;
     area->album = NULL;
 
@@ -494,12 +494,12 @@
         area->fade_timeout = 0;
     }
 
-    g_free (area->title);
-    g_free (area->artist);
-    g_free (area->album);
-    g_free (area->last_title);
-    g_free (area->last_artist);
-    g_free (area->last_album);
+    str_unref (area->title);
+    str_unref (area->artist);
+    str_unref (area->album);
+    str_unref (area->last_title);
+    str_unref (area->last_artist);
+    str_unref (area->last_album);
 
     if (area->pb)
         g_object_unref (area->pb);
@@ -556,5 +556,8 @@
         }
     }
 
-    return area->box;
+    GtkWidget * frame = gtk_frame_new (NULL);
+    gtk_frame_set_shadow_type ((GtkFrame *) frame, GTK_SHADOW_IN);
+    gtk_container_add ((GtkContainer *) frame, area->box);
+    return frame;
 }

audacious-plugins-3.1.1.tar.bz2/src/gtkui/ui_playlist_notebook.c -> audacious-plugins-3.2.4.tar.bz2/src/gtkui/ui_playlist_notebook.c Changed

@@ -1,5 +1,5 @@
 /* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2011 Audacious development team
+ * Copyright (C) 2005-2012 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
@@ -37,17 +37,105 @@
 
 #define CURRENT_POS (-2)
 
+#if GTK_CHECK_VERSION(2, 20, 0)
+#define HAVE_ADD_BUTTON
+#endif
+
 static GtkWidget * notebook = NULL;
 static GQueue follow_queue = G_QUEUE_INIT;
-static gboolean playlist_activated = FALSE;
 static gint highlighted = -1;
 
-static struct index *pages;
-GtkWidget *ui_playlist_notebook_tab_title_editing = NULL;
+static GtkWidget *ui_playlist_notebook_tab_title_editing;
 
 static gint switch_handler = 0;
 static gint reorder_handler = 0;
 
+#ifdef HAVE_ADD_BUTTON
+static void add_button_cb (GtkButton * button, void * unused)
+{
+ aud_playlist_insert (-1);
+ aud_playlist_set_active (aud_playlist_count () - 1);
+}
+
+static void make_add_button (GtkWidget * notebook)
+{
+ GtkWidget * button = gtk_button_new ();
+ gtk_button_set_relief ((GtkButton *) button, GTK_RELIEF_NONE);
+ gtk_container_add ((GtkContainer *) button, gtk_image_new_from_stock
+ (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
+ gtk_widget_set_can_focus (button, FALSE);
+
+ g_signal_connect (button, "clicked", (GCallback) add_button_cb, NULL);
+ gtk_widget_show_all (button);
+
+ gtk_notebook_set_action_widget ((GtkNotebook *) notebook, button, GTK_PACK_END);
+}
+#endif
+
+static void close_button_cb (GtkWidget * button, void * id)
+{
+ audgui_confirm_playlist_delete (aud_playlist_by_unique_id (GPOINTER_TO_INT (id)));
+}
+
+#if ! GTK_CHECK_VERSION (3, 0, 0)
+static void close_button_style_set(GtkWidget * button, GtkRcStyle * previous_style,
+ gpointer user_data)
+{
+ gint w, h;
+ gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), GTK_ICON_SIZE_MENU, &w, &h);
+ gtk_widget_set_size_request (button, w + 2, h + 2);
+}
+#endif
+
+static GtkWidget * make_close_button (gint list)
+{
+ GtkWidget * button = gtk_button_new ();
+ gtk_button_set_relief ((GtkButton *) button, GTK_RELIEF_NONE);
+ gtk_button_set_focus_on_click ((GtkButton *) button, FALSE);
+ gtk_widget_set_name (button, "gtkui-tab-close-button");
+ g_signal_connect (button, "clicked", (GCallback) close_button_cb,
+ GINT_TO_POINTER (aud_playlist_get_unique_id (list)));
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkCssProvider * provider = gtk_css_provider_new ();
+ gtk_css_provider_load_from_data (provider,
+ "#gtkui-tab-close-button {"
+ " -GtkButton-default-border: 0;"
+ " -GtkButton-default-outside-border: 0;"
+ " -GtkButton-inner-border: 0;"
+ " -GtkWidget-focus-padding: 0;"
+ " -GtkWidget-focus-line-width: 0;"
+ " margin: 0;"
+ " padding: 0; }",
+ -1, NULL);
+
+ gtk_style_context_add_provider (gtk_widget_get_style_context (button),
+ GTK_STYLE_PROVIDER (provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ g_object_unref (provider);
+#else
+ gtk_rc_parse_string (
+ "style \"gtkui-tab-close-button-style\" {"
+ " GtkWidget::focus-padding = 0"
+ " GtkWidget::focus-line-width = 0"
+ " xthickness = 0"
+ " ythickness = 0 }"
+ "widget \"*.gtkui-tab-close-button\" style \"gtkui-tab-close-button-style\""
+ );
+
+ g_signal_connect (button, "style-set", (GCallback) close_button_style_set, NULL);
+#endif
+
+ GtkWidget * icon = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+ gtk_container_add ((GtkContainer *) button, icon);
+
+ GtkWidget * align = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
+ gtk_container_add ((GtkContainer *) align, button);
+
+ gtk_widget_show_all (align);
+ return align;
+}
+
 GtkNotebook *ui_playlist_get_notebook(void)
 {
 return GTK_NOTEBOOK(notebook);
@@ -145,7 +233,7 @@
 else
 gtk_label_set_text (label, title);
 
- g_free (title);
+ str_unref (title);
 }
 
 void ui_playlist_notebook_edit_tab_title(GtkWidget *ebox)
@@ -165,7 +253,7 @@
 
 gchar * title = aud_playlist_get_title (aud_playlist_get_active ());
 gtk_entry_set_text ((GtkEntry *) entry, title);
- g_free (title);
+ str_unref (title);
 gtk_widget_grab_focus(entry);
 gtk_editable_select_region(GTK_EDITABLE(entry), 0, -1);
 gtk_widget_show(entry);
@@ -173,11 +261,6 @@
 ui_playlist_notebook_tab_title_editing = ebox;
 }
 
-static void change_view (void)
-{
- gtk_notebook_set_show_tabs (UI_PLAYLIST_NOTEBOOK, (index_count (pages) > 1));
-}
-
 void ui_playlist_notebook_create_tab(gint playlist)
 {
 GtkWidget *scrollwin, *treeview;
@@ -185,7 +268,6 @@
 gint position = aud_playlist_get_position (playlist);
 
 scrollwin = gtk_scrolled_window_new(NULL, NULL);
- index_insert(pages, playlist, scrollwin);
 
 treeview = ui_playlist_widget_new(playlist);
 g_object_set_data(G_OBJECT(scrollwin), "treeview", treeview);
@@ -197,7 +279,7 @@
 ebox = gtk_event_box_new();
 gtk_event_box_set_visible_window ((GtkEventBox *) ebox, FALSE);
 
- hbox = gtk_hbox_new(FALSE, 2);
+ hbox = gtk_hbox_new (FALSE, 2);
 
 label = gtk_label_new ("");
 set_tab_label (playlist, (GtkLabel *) label);
@@ -209,13 +291,17 @@
 gtk_widget_show_all(ebox);
 gtk_widget_hide(entry);
 
+ gtk_box_pack_end ((GtkBox *) hbox, make_close_button (playlist), FALSE, FALSE, 0);
+
 g_object_set_data(G_OBJECT(ebox), "label", label);
 g_object_set_data(G_OBJECT(ebox), "entry", entry);
 g_object_set_data(G_OBJECT(ebox), "page", scrollwin);
 
- gtk_notebook_append_page(UI_PLAYLIST_NOTEBOOK, scrollwin, ebox);
+ gtk_notebook_insert_page (UI_PLAYLIST_NOTEBOOK, scrollwin, ebox, playlist);
 gtk_notebook_set_tab_reorderable(UI_PLAYLIST_NOTEBOOK, scrollwin, TRUE);
- change_view ();
+
+ g_object_set_data ((GObject *) treeview, "playlist-id",
+ GINT_TO_POINTER (aud_playlist_get_unique_id (playlist)));
 
 if (position >= 0)
 {
@@ -230,29 +316,16 @@
 g_signal_connect(entry, "activate", G_CALLBACK(tab_title_save), ebox);
 }
 
-void ui_playlist_notebook_destroy_tab(gint playlist)
-{
- GtkWidget *page = index_get(pages, playlist);
-
- gtk_notebook_remove_page(UI_PLAYLIST_NOTEBOOK, gtk_notebook_page_num(UI_PLAYLIST_NOTEBOOK, page));
- index_delete(pages, playlist, 1);
- change_view ();
-}
-
 void ui_playlist_notebook_populate(void)
 {
 gint playlists = aud_playlist_count();
 gint count;
 
- pages = index_new();
-
 for (count = 0; count < playlists; count++)
 ui_playlist_notebook_create_tab(count);
 
 gtk_notebook_set_current_page (UI_PLAYLIST_NOTEBOOK, aud_playlist_get_active ());
- gtk_widget_grab_focus (gtk_bin_get_child ((GtkBin *)
- gtk_notebook_get_nth_page (UI_PLAYLIST_NOTEBOOK, aud_playlist_get_active ())));
- highlighted = aud_playlist_get_playing ();
+ highlighted = aud_playlist_get_unique_id (aud_playlist_get_playing ());
 
 if (! switch_handler)
 switch_handler = g_signal_connect (notebook, "switch-page", (GCallback)
@@ -260,6 +333,8 @@
 if (! reorder_handler)
 reorder_handler = g_signal_connect (notebook, "page-reordered",
 (GCallback) tab_reordered, NULL);
+
+ gtk_widget_grab_focus (playlist_get_treeview (aud_playlist_get_active ()));
 }
 
 void ui_playlist_notebook_empty (void)
@@ -273,22 +348,7 @@
 
 gint n_pages = gtk_notebook_get_n_pages ((GtkNotebook *) notebook);
 while (n_pages)
- ui_playlist_notebook_destroy_tab (-- n_pages);
-}
-
-static void do_highlight (void)
-{
- gint playing = aud_playlist_get_playing ();
-
- if (highlighted != playing)
- {
- if (highlighted >= 0 && highlighted < aud_playlist_count ())
- set_tab_label (highlighted, get_tab_label (highlighted));
- if (playing >= 0)
- set_tab_label (playing, get_tab_label (playing));
-
- highlighted = playing;
- }
+ gtk_notebook_remove_page ((GtkNotebook *) notebook, -- n_pages);
 }
 
 static void do_follow (void)
@@ -317,53 +377,98 @@
 }
 }
 
-static void update_list (gint list, gint type, gint at, gint count)
+static void add_remove_pages (void)
 {
- if (type >= PLAYLIST_UPDATE_METADATA)
- set_tab_label (list, get_tab_label (list));
+ gint lists = aud_playlist_count ();
+ gint pages = gtk_notebook_get_n_pages ((GtkNotebook *) notebook);
 
- ui_playlist_widget_update (playlist_get_treeview (list), type, at, count);
-}
+ /* scan through existing treeviews */
+ for (gint i = 0; i < pages; )
+ {
+ GtkWidget * page = gtk_notebook_get_nth_page ((GtkNotebook *) notebook, i);
+ GtkWidget * tree = g_object_get_data ((GObject *) page, "treeview");
+ gint tree_id = GPOINTER_TO_INT (g_object_get_data ((GObject *) tree, "playlist-id"));
 
-void ui_playlist_notebook_update (void * data, void * user)
-{
- gint type = GPOINTER_TO_INT (data);
- gint lists = aud_playlist_count ();
+ /* do we have an orphaned treeview? */
+ if (aud_playlist_by_unique_id (tree_id) < 0)
+ {
+ g_signal_handlers_block_by_func (notebook, (void *) tab_changed, NULL);
+ gtk_notebook_remove_page ((GtkNotebook *) notebook, i);
+ g_signal_handlers_unblock_by_func (notebook, (void *) tab_changed, NULL);
+ pages --;
+ continue;
+ }
 
- gint list, at, count;
- gboolean limited = aud_playlist_update_range (& list, & at, & count);
+ /* do we have the right treeview? */
+ gint list_id = aud_playlist_get_unique_id (i);
 
- if (type == PLAYLIST_UPDATE_STRUCTURE && ! limited)
- {
- gint n_pages = gtk_notebook_get_n_pages (UI_PLAYLIST_NOTEBOOK);
+ if (tree_id == list_id)
+ {
+ ui_playlist_widget_set_playlist (tree, i);
+ i ++;
+ continue;
+ }
 
- while (n_pages < lists)
- ui_playlist_notebook_create_tab (n_pages ++);
- while (n_pages > lists)
- ui_playlist_notebook_destroy_tab (-- n_pages);
+ /* look for the right treeview */
+ gint found = FALSE;
 
- for (gint i = 0; i < n_pages; i ++)
- ui_playlist_widget_set_playlist (playlist_get_treeview (i), i);
+ for (gint j = i + 1; j < pages; j ++)
+ {
+ page = gtk_notebook_get_nth_page ((GtkNotebook *) notebook, j);
+ tree = g_object_get_data ((GObject *) page, "treeview");
+ tree_id = GPOINTER_TO_INT (g_object_get_data ((GObject *) tree, "playlist-id"));
+
+ /* found it? move it to the right place */
+ if (tree_id == list_id)
+ {
+ g_signal_handlers_block_by_func (notebook, (void *) tab_reordered, NULL);
+ gtk_notebook_reorder_child ((GtkNotebook *) notebook, page, i);
+ g_signal_handlers_unblock_by_func (notebook, (void *) tab_reordered, NULL);
+ found = TRUE;
+ break;
+ }
+ }
 
- playlist_activated = TRUE;
+ /* didn't find it? create it */
+ if (! found)
+ {
+ ui_playlist_notebook_create_tab (i);
+ pages ++;
+ continue;
+ }
 }
 
- if (playlist_activated)
+ /* create new treeviews */
+ while (pages < lists)
 {
- gtk_notebook_set_current_page (UI_PLAYLIST_NOTEBOOK,
- aud_playlist_get_active ());
- playlist_activated = FALSE;
+ ui_playlist_notebook_create_tab (pages);
+ pages ++;
 }
+}
 
- if (limited)
- update_list (list, type, at, count);
- else
+void ui_playlist_notebook_update (void * data, void * user)
+{
+ gint global_level = GPOINTER_TO_INT (data);
+
+ if (global_level == PLAYLIST_UPDATE_STRUCTURE)
+ add_remove_pages ();
+
+ gint lists = aud_playlist_count ();
+
+ for (gint list = 0; list < lists; list ++)
 {
- for (list = 0; list < lists; list ++)
- update_list (list, type, 0, aud_playlist_entry_count (list));
+ if (global_level >= PLAYLIST_UPDATE_METADATA)
+ set_tab_label (list, get_tab_label (list));
+
+ gint at, count;
+ gint level = aud_playlist_updated_range (list, & at, & count);
+
+ if (level)
+ ui_playlist_widget_update (playlist_get_treeview (list), level, at, count);
 }
 
- do_highlight ();
+ gtk_notebook_set_current_page ((GtkNotebook *) notebook, aud_playlist_get_active ());
+
 do_follow ();
 }
 
@@ -394,35 +499,48 @@
 
 void ui_playlist_notebook_activate (void * data, void * user)
 {
- if (aud_playlist_update_pending ())
- playlist_activated = TRUE;
- else
- gtk_notebook_set_current_page (UI_PLAYLIST_NOTEBOOK,
- aud_playlist_get_active ());
+ if (! aud_playlist_update_pending ())
+ gtk_notebook_set_current_page ((GtkNotebook *) notebook, aud_playlist_get_active ());
 }
 
 void ui_playlist_notebook_set_playing (void * data, void * user)
 {
- if (! aud_playlist_update_pending ())
- do_highlight ();
+ gint new = aud_playlist_get_unique_id (aud_playlist_get_playing ());
+
+ if (highlighted == new)
+ return;
+
+ gint pages = gtk_notebook_get_n_pages ((GtkNotebook *) notebook);
+
+ for (gint i = 0; i < pages; i ++)
+ {
+ GtkWidget * page = gtk_notebook_get_nth_page ((GtkNotebook *) notebook, i);
+ GtkWidget * tree = g_object_get_data ((GObject *) page, "treeview");
+ gint tree_id = GPOINTER_TO_INT (g_object_get_data ((GObject *) tree, "playlist-id"));
+
+ if (tree_id == highlighted || tree_id == new)
+ set_tab_label (i, get_tab_label (i));
+ }
+
+ highlighted = new;
 }
 
 static void destroy_cb (void)
 {
 notebook = NULL;
 g_queue_clear (& follow_queue);
- index_free (pages);
 switch_handler = 0;
 reorder_handler = 0;
 }
 
-GtkWidget *ui_playlist_notebook_new()
+GtkWidget * ui_playlist_notebook_new (void)
 {
- AUDDBG("playlist notebook create\n");
+ notebook = gtk_notebook_new ();
+ gtk_notebook_set_scrollable ((GtkNotebook *) notebook, TRUE);
 
- notebook = gtk_notebook_new();
- gtk_notebook_set_scrollable(UI_PLAYLIST_NOTEBOOK, TRUE);
- gtk_notebook_set_show_border(UI_PLAYLIST_NOTEBOOK, FALSE);
+#ifdef HAVE_ADD_BUTTON
+ make_add_button (notebook);
+#endif
 
 g_signal_connect (notebook, "destroy", (GCallback) destroy_cb, NULL);
 return notebook;

audacious-plugins-3.1.1.tar.bz2/src/gtkui/ui_playlist_notebook.h -> audacious-plugins-3.2.4.tar.bz2/src/gtkui/ui_playlist_notebook.h Changed

audacious-plugins-3.1.1.tar.bz2/src/gtkui/ui_playlist_widget.c -> audacious-plugins-3.2.4.tar.bz2/src/gtkui/ui_playlist_widget.c Changed

@@ -38,8 +38,8 @@
 static const GType pw_col_types[PW_COLS] = {G_TYPE_INT, G_TYPE_STRING,
 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING};
-static const gboolean pw_col_expand[PW_COLS] = {FALSE, TRUE, TRUE, FALSE, TRUE,
- FALSE, FALSE, FALSE, TRUE, TRUE, TRUE, FALSE};
+static const gboolean pw_col_widths[PW_COLS] = {7, -1, -1, 4, -1, 2, 3, 7, -1,
+ -1, -1, 3};
 static const gboolean pw_col_label[PW_COLS] = {FALSE, TRUE, TRUE, TRUE, TRUE,
 FALSE, FALSE, FALSE, TRUE, TRUE, TRUE, FALSE};
 
@@ -60,8 +60,9 @@
 static void set_string_from_tuple (GValue * value, const Tuple * tuple,
 gint field)
 {
- g_value_set_string (value, tuple ? tuple_get_string (tuple, field, NULL) :
- NULL);
+ gchar *str = tuple ? tuple_get_str (tuple, field, NULL) : NULL;
+ g_value_set_string (value, str);
+ str_unref(str);
 }
 
 static void set_queued (GValue * value, gint list, gint row)
@@ -119,19 +120,16 @@
 g_value_set_int (value, 1 + row);
 break;
 case PW_COL_TITLE:
- g_value_take_string (value, title);
- title = NULL;
+ g_value_set_string (value, title);
 break;
 case PW_COL_ARTIST:
- g_value_take_string (value, artist);
- artist = NULL;
+ g_value_set_string (value, artist);
 break;
 case PW_COL_YEAR:
 set_int_from_tuple (value, tuple, FIELD_YEAR);
 break;
 case PW_COL_ALBUM:
- g_value_take_string (value, album);
- album = NULL;
+ g_value_set_string (value, album);
 break;
 case PW_COL_TRACK:
 set_int_from_tuple (value, tuple, FIELD_TRACK_NUMBER);
@@ -148,20 +146,21 @@
 case PW_COL_PATH:
 set_string_from_tuple (value, tuple, FIELD_FILE_PATH);
 break;
- case PW_COL_CUSTOM:
- g_value_take_string (value, aud_playlist_entry_get_title (data->list,
- row, TRUE));
+ case PW_COL_CUSTOM:;
+ gchar * custom = aud_playlist_entry_get_title (data->list, row, TRUE);
+ g_value_set_string (value, custom);
+ str_unref (custom);
 break;
 case PW_COL_BITRATE:
 set_int_from_tuple (value, tuple, FIELD_BITRATE);
 break;
 }
 
- g_free (title);
- g_free (artist);
- g_free (album);
+ str_unref (title);
+ str_unref (artist);
+ str_unref (album);
 if (tuple)
- tuple_free (tuple);
+ tuple_unref (tuple);
 }
 
 static gboolean get_selected (void * user, gint row)
@@ -263,21 +262,28 @@
 if (! remain)
 remain ++; /* force non-match if there are no non-blank keys */
 
- for (gint i = 0; i < G_N_ELEMENTS (s) && remain; i ++)
+ for (gint i = 0; i < G_N_ELEMENTS (s); i ++)
 {
 if (! s[i])
 continue;
- temp = g_utf8_strdown (s[i], -1);
- for (gint j = 0; keys[j] && remain; j ++)
+
+ if (remain)
 {
- if (keys[j][0] && strstr (temp, keys[j]))
+ temp = g_utf8_strdown (s[i], -1);
+
+ for (gint j = 0; keys[j] && remain; j ++)
 {
- keys[j][0] = 0; /* don't look for this one again */
- remain --;
+ if (keys[j][0] && strstr (temp, keys[j]))
+ {
+ keys[j][0] = 0; /* don't look for this one again */
+ remain --;
+ }
 }
+
+ g_free (temp);
 }
- g_free (temp);
- g_free (s[i]);
+
+ str_unref (s[i]);
 }
 
 g_strfreev (keys);
@@ -331,11 +337,16 @@
 NULL);
 g_signal_connect_swapped (list, "destroy", (GCallback) destroy_cb, data);
 
+ /* Disable type-to-search because it blocks CTRL-V, causing URI's to be
+ * pasted into the search box rather than added to the playlist. The search
+ * box can still be brought up with CTRL-F. */
+ gtk_tree_view_set_enable_search ((GtkTreeView *) list, FALSE);
+
 for (gint i = 0; i < pw_num_cols; i ++)
 {
 gint n = pw_cols[i];
 audgui_list_add_column (list, pw_col_label[n] ? _(pw_col_names[n]) :
- NULL, i, pw_col_types[n], pw_col_expand[n]);
+ NULL, i, pw_col_types[n], pw_col_widths[n]);
 }
 
 return list;

audacious-plugins-3.1.1.tar.bz2/src/gtkui/ui_statusbar.c -> audacious-plugins-3.2.4.tar.bz2/src/gtkui/ui_statusbar.c Changed

@@ -79,10 +79,10 @@
     gint playlist = aud_playlist_get_playing ();
     Tuple * tuple = aud_playlist_entry_get_tuple (playlist,
      aud_playlist_get_position (playlist), FALSE);
-    const gchar * codec = tuple ? tuple_get_string (tuple, FIELD_CODEC, NULL) :
+    gchar * codec = tuple ? tuple_get_str (tuple, FIELD_CODEC, NULL) :
      NULL;
     if (tuple)
-        tuple_free (tuple);
+        tuple_unref (tuple);
 
     gint bitrate, samplerate, channels;
     aud_drct_get_info(&bitrate, &samplerate, &channels);
@@ -97,6 +97,8 @@
             APPEND (buf, ", ");
     }
 
+    str_unref(codec);
+
     if (channels > 0)
     {
         if (channels == 1)
@@ -135,6 +137,7 @@
     hook_dissociate("playback ready", (HookFunction) ui_statusbar_info_change);
     hook_dissociate("info change", (HookFunction) ui_statusbar_info_change);
     hook_dissociate("playback stop", (HookFunction) ui_statusbar_playback_stop);
+    hook_dissociate("playlist activate", (HookFunction) ui_statusbar_update_playlist_length);
     hook_dissociate("playlist update", (HookFunction) ui_statusbar_update_playlist_length);
 }
 
@@ -158,6 +161,7 @@
     gtk_box_pack_start(GTK_BOX(hbox), length, FALSE, FALSE, 5);
     ui_statusbar_update_playlist_length(NULL, length);
 
+    hook_associate("playlist activate", (HookFunction) ui_statusbar_update_playlist_length, length);
     hook_associate("playlist update", (HookFunction) ui_statusbar_update_playlist_length, length);
 
     g_signal_connect(G_OBJECT(hbox), "destroy", G_CALLBACK(ui_statusbar_destroy_cb), NULL);

audacious-plugins-3.1.1.tar.bz2/src/hotkey/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/hotkey/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/hotkey/plugin.c -> audacious-plugins-3.2.4.tar.bz2/src/hotkey/plugin.c Changed

audacious-plugins-3.1.1.tar.bz2/src/jack/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/jack/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/ladspa/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/ladspa/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/ladspa/loaded-list.c -> audacious-plugins-3.2.4.tar.bz2/src/ladspa/loaded-list.c Changed

audacious-plugins-3.1.1.tar.bz2/src/ladspa/plugin-list.c -> audacious-plugins-3.2.4.tar.bz2/src/ladspa/plugin-list.c Changed

audacious-plugins-3.1.1.tar.bz2/src/ladspa/plugin.c -> audacious-plugins-3.2.4.tar.bz2/src/ladspa/plugin.c Changed

@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <gmodule.h>
@@ -42,9 +43,9 @@
 
 pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 char * module_path;
-struct index * modules; /* (void *) */
-struct index * plugins; /* (PluginData *) */
-struct index * loadeds; /* (LoadedPlugin *) */
+Index * modules; /* (void *) */
+Index * plugins; /* (PluginData *) */
+Index * loadeds; /* (LoadedPlugin *) */
 
 GtkWidget * about_win;
 GtkWidget * config_win;
@@ -177,7 +178,7 @@
 }
 
 LADSPA_Descriptor_Function descfun = (LADSPA_Descriptor_Function) sym;
- 
+
 const LADSPA_Descriptor * desc;
 for (int i = 0; (desc = descfun (i)); i ++)
 {
@@ -614,6 +615,7 @@
 gtk_box_pack_start ((GtkBox *) vbox2, label, 0, 0, 0);
 
 GtkWidget * scrolled = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) scrolled, GTK_SHADOW_IN);
 gtk_box_pack_start ((GtkBox *) vbox2, scrolled, 1, 1, 0);
 
 plugin_list = create_plugin_list ();
@@ -632,6 +634,7 @@
 gtk_box_pack_start ((GtkBox *) vbox2, label, 0, 0, 0);
 
 scrolled = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) scrolled, GTK_SHADOW_IN);
 gtk_box_pack_start ((GtkBox *) vbox2, scrolled, 1, 1, 0);
 
 loaded_list = create_loaded_list ();

audacious-plugins-3.1.1.tar.bz2/src/ladspa/plugin.h -> audacious-plugins-3.2.4.tar.bz2/src/ladspa/plugin.h Changed

audacious-plugins-3.1.1.tar.bz2/src/lyricwiki/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/lyricwiki/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/lyricwiki/lyricwiki.c -> audacious-plugins-3.2.4.tar.bz2/src/lyricwiki/lyricwiki.c Changed

@@ -34,7 +34,6 @@
 #include <libxml/tree.h>
 #include <libxml/HTMLparser.h>
 #include <libxml/xpath.h>
-#include <mowgli.h>
 
 #include <audacious/drct.h>
 #include <audacious/i18n.h>
@@ -42,6 +41,7 @@
 #include <audacious/playlist.h>
 #include <audacious/plugin.h>
 #include <audacious/plugins.h>
+#include <libaudcore/audstrings.h>
 #include <libaudcore/hook.h>
 #include <libaudcore/vfs_async.h>
 
@@ -153,20 +153,13 @@
 	doc = xmlParseMemory(buf, (int) len);
 	xmlSetGenericErrorFunc(NULL, NULL);
 
-/* workaround for uninitialized libxml func pointers; see:
- * http://www.linuxquestions.org/questions/programming-9/[solved]using-libxml2-on-mingw-xmlfree-crashes-839802 */
-#ifdef _WIN32
- if (! xmlFree)
- xmlMemGet (& xmlFree, & xmlMalloc, & xmlRealloc, NULL);
-#endif
-
 	if (doc != NULL)
 	{
 		xmlNodePtr root, cur;
 
 		root = xmlDocGetRootElement(doc);
 
-		MOWGLI_ITER_FOREACH(cur, root->xmlChildrenNode)
+		for (cur = root->xmlChildrenNode; cur; cur = cur->next)
 		{
 			if (xmlStrEqual(cur->name, (xmlChar *) "url"))
 			{
@@ -208,8 +201,8 @@
 
 	for (i = 0; i < sizeof(fields)/sizeof(gint); i++)
 	{
-		const gchar* string1 = tuple_get_string(tu, fields[i], NULL);
-		const gchar* string2 = tuple_get_string(cu, fields[i], NULL);
+		gchar * string1 = tuple_get_str (tu, fields[i], NULL);
+		gchar * string2 = tuple_get_str (cu, fields[i], NULL);
 
 		if (string1 == NULL && string2 == NULL)
 			continue;
@@ -217,12 +210,17 @@
 		if (string1 == NULL || string2 == NULL ||
 			strcmp(string1, string2) != 0)
 		{
-		 ret = FALSE;
-		 break;
+			ret = FALSE;
+			str_unref (string1);
+			str_unref (string2);
+			break;
 		}
+
+		str_unref (string1);
+		str_unref (string2);
 	}
 
-	tuple_free(cu);
+	tuple_unref(cu);
 	return ret;
 }
 
@@ -241,7 +239,8 @@
 
 	if (check_current_track(tu))
 		update_lyrics_window(tu, lyrics);
-	mowgli_object_unref(tu);
+
+	tuple_unref (tu);
 
 	if (lyrics != NULL)
 		g_free(lyrics);
@@ -259,9 +258,8 @@
 	{
 		if (check_current_track(tu))
 			update_lyrics_window(tu, NULL);
-		mowgli_object_unref(tu);
 
-		return FALSE;
+		goto CLEANUP;
 	}
 
 	if (check_current_track(tu))
@@ -269,10 +267,20 @@
 		update_lyrics_window(tu, _("\nLooking for lyrics..."));
 		vfs_async_file_get_contents(uri, (VFSConsumer) get_lyrics_step_3, tu);
 	}
+	else
+	{
+		g_free(uri);
+		goto CLEANUP;
+	}
 
 	g_free(buf);
 
 	return TRUE;
+
+CLEANUP:
+	g_free(buf);
+	tuple_unref (tu);
+	return FALSE;
 }
 
 void
@@ -280,10 +288,13 @@
 {
 	gchar *uri;
 	gchar *artist, *title;
-	Tuple *tuple = tuple_copy(tu);
 
-	artist = lyricwiki_url_encode(tuple_get_string(tu, FIELD_ARTIST, NULL));
-	title = lyricwiki_url_encode(tuple_get_string(tu, FIELD_TITLE, NULL));
+	gchar * artist0 = tuple_get_str (tu, FIELD_ARTIST, NULL);
+	gchar * title0 = tuple_get_str (tu, FIELD_TITLE, NULL);
+	artist = lyricwiki_url_encode (artist0);
+	title = lyricwiki_url_encode (title0);
+	str_unref (artist0);
+	str_unref (title0);
 
 	uri = g_strdup_printf("http://lyrics.wikia.com/api.php?action=lyrics&artist=%s&song=%s&fmt=xml", artist, title);
 
@@ -291,7 +302,7 @@
 	g_free(title);
 
 	update_lyrics_window(tu, _("\nConnecting to lyrics.wikia.com..."));
-	vfs_async_file_get_contents(uri, (VFSConsumer) get_lyrics_step_2, tuple);
+	vfs_async_file_get_contents(uri, (VFSConsumer) get_lyrics_step_2, (Tuple *) tu);
 
 	g_free(uri);
 }
@@ -312,6 +323,7 @@
 	textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
 
 	scrollview = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollview), GTK_SHADOW_IN);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollview), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	vbox = gtk_vbox_new(FALSE, 10);
 
@@ -335,9 +347,7 @@
 update_lyrics_window(const Tuple *tu, const gchar *lyrics)
 {
 	GtkTextIter iter;
-	const gchar *artist, *title;
 	const gchar *real_lyrics;
-	gchar *f_name, *f_ext = NULL;
 
 	if (textbuffer == NULL)
 		return;
@@ -346,27 +356,14 @@
 
 	gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(textbuffer), &iter);
 
-	title = tuple_get_string(tu, FIELD_TITLE, NULL);
-	artist = tuple_get_string(tu, FIELD_ARTIST, NULL);
+	gchar * title = tuple_get_str (tu, FIELD_TITLE, NULL);
+	gchar * artist = tuple_get_str (tu, FIELD_ARTIST, NULL);
 
-	if (title == NULL)
-	{
-		f_name = (gchar *) tuple_get_string(tu, FIELD_FILE_NAME, NULL);
-		f_ext = (gchar *) tuple_get_string(tu, FIELD_FILE_EXT, NULL);
-
-		title = g_strdup(f_name);
+	if (! title)
+		title = tuple_get_str (tu, FIELD_FILE_NAME, NULL);
 
-		f_name = g_strrstr(title, f_ext);
-		if (f_name != NULL && f_name != title)
-		{
-			f_name--;
-			f_name[0] = '\0';
-		}
-	}
 	gtk_text_buffer_insert_with_tags_by_name(GTK_TEXT_BUFFER(textbuffer), &iter,
 			title, strlen(title), "weight_bold", "size_x_large", NULL);
-	if (f_ext != NULL)
-		g_free((gpointer) title);
 
 	gtk_text_buffer_insert(GTK_TEXT_BUFFER(textbuffer), &iter, "\n", 1);
 
@@ -384,6 +381,9 @@
 
 	gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(textbuffer), &iter);
 	gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(textview), &iter, 0, TRUE, 0, 0);
+
+	str_unref (title);
+	str_unref (artist);
 }
 
 void
@@ -399,9 +399,6 @@
 	Tuple * tu = aud_playlist_entry_get_tuple (playlist, pos, FALSE);
 
 	get_lyrics_step_1(tu);
-
-	if (tu)
-		tuple_free (tu);
 }
 
 static gboolean init (void)

audacious-plugins-3.1.1.tar.bz2/src/m3u/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/m3u/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/m3u/m3u.c -> audacious-plugins-3.2.4.tar.bz2/src/m3u/m3u.c Changed

audacious-plugins-3.1.1.tar.bz2/src/metronom/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/metronom/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/metronom/metronom.c -> audacious-plugins-3.2.4.tar.bz2/src/metronom/metronom.c Changed

audacious-plugins-3.1.1.tar.bz2/src/mms/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/mms/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/mms/mms.c -> audacious-plugins-3.2.4.tar.bz2/src/mms/mms.c Changed

@@ -45,26 +45,12 @@
     gint len, used;
 } MMSHandle;
 
-static VFSFile * mms_vfs_fopen_impl (const gchar * path, const gchar * mode)
+static void * mms_vfs_fopen_impl (const gchar * path, const gchar * mode)
 {
     AUDDBG("Opening %s.\n", path);
 
-    VFSFile *file;
     MMSHandle *handle;
-
-    if (!path || !mode)
-	return NULL;
-
-    file = g_new(VFSFile, 1);
     handle = g_new0(MMSHandle, 1);
-
-    file->handle = handle;
-
-    if (file->handle == NULL) {
-        g_free(file);
-        file = NULL;
-    }
-
     handle->mmsh = mmsh_connect(NULL, NULL, path, 128 * 1024);
 
     if (handle->mmsh == NULL) {
@@ -76,42 +62,32 @@
     {
         fprintf(stderr, "mms: Failed to open %s.\n", path);
         g_free(handle);
-        g_free(file);
-        file = NULL;
+        return NULL;
     }
 
     handle->buf = g_malloc (BUFSIZE);
-    return file;
+    return handle;
 }
 
 static gint mms_vfs_fclose_impl (VFSFile * file)
 {
-    gint ret = 0;
+    MMSHandle *handle = (MMSHandle *) vfs_get_handle (file);
 
-    if (file == NULL)
-        return -1;
-
-    if (file->handle)
-    {
-        MMSHandle *handle = (MMSHandle *) file->handle;
+    if (handle->mms != NULL)
+        mms_close(handle->mms);
+    else /* if (handle->mmsh != NULL) */
+        mmsh_close(handle->mmsh);
 
-        if (handle->mms != NULL)
-            mms_close(handle->mms);
-        else /* if (handle->mmsh != NULL) */
-            mmsh_close(handle->mmsh);
+    g_free (handle->buf);
+    g_free (handle);
 
-        g_free (handle->buf);
-        g_free (handle);
-        file->handle = NULL;
-    }
-
-    return ret;
+    return 0;
 }
 
 static gint64 mms_vfs_fread_impl (void * buf, gint64 size, gint64 count,
  VFSFile * file)
 {
-    MMSHandle * h = file->handle;
+    MMSHandle * h = vfs_get_handle (file);
     gint64 goal = size * count;
     gint64 total = 0;
 
@@ -146,7 +122,7 @@
 
         memcpy (buf, h->buf + h->used, copy);
         h->used += copy;
-        buf += copy;
+        buf = (char *) buf + copy;
         total += copy;
     }
 
@@ -162,7 +138,7 @@
 
 static gint mms_vfs_fseek_impl (VFSFile * file, gint64 offset, gint whence)
 {
-    MMSHandle * h = file->handle;
+    MMSHandle * h = vfs_get_handle (file);
 
     if (whence == SEEK_SET)
     {
@@ -187,7 +163,7 @@
 
 static gint64 mms_vfs_ftell_impl (VFSFile * file)
 {
-    MMSHandle * h = file->handle;
+    MMSHandle * h = vfs_get_handle (file);
     return h->offset + h->used;
 }
 
@@ -206,7 +182,7 @@
 {
     return FALSE;
 
-    MMSHandle * h = file->handle;
+    MMSHandle * h = vfs_get_handle (file);
 
     if (h->mms)
         return (h->offset + h->used == mms_get_length (h->mms));
@@ -222,7 +198,7 @@
 
 static gint64 mms_vfs_fsize_impl (VFSFile * file)
 {
-    MMSHandle * h = file->handle;
+    MMSHandle * h = vfs_get_handle (file);
 
     if (h->mms)
         return mms_get_length (h->mms);

audacious-plugins-3.1.1.tar.bz2/src/modplug/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/modplug/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/modplug/archive/arch_raw.cxx -> audacious-plugins-3.2.4.tar.bz2/src/modplug/archive/arch_raw.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/modplug/archive/arch_raw.h -> audacious-plugins-3.2.4.tar.bz2/src/modplug/archive/arch_raw.h Changed

audacious-plugins-3.1.1.tar.bz2/src/modplug/modplugbmp.cxx -> audacious-plugins-3.2.4.tar.bz2/src/modplug/modplugbmp.cxx Changed

audacious-plugins-3.1.1.tar.bz2/src/modplug/modplugbmp.h -> audacious-plugins-3.2.4.tar.bz2/src/modplug/modplugbmp.h Changed

@@ -16,28 +16,28 @@
 }
 
 /* Module files have their magic deep inside the file, at offset 1080; source: http://www.onicos.com/staff/iz/formats/mod.html and information by Michael Doering from UADE */
-#define MOD_MAGIC_PROTRACKER4	(unsigned char [4]) { 0x4D, 0x2E, 0x4B, 0x2E }  // "M.K." - Protracker 4 channel
-#define MOD_MAGIC_PROTRACKER4X	(unsigned char [4]) { 0x4D, 0x21, 0x4B, 0x21 }  // "M!K!" - Protracker 4 channel
-#define MOD_MAGIC_NOISETRACKER	(unsigned char [4]) { 0x4D, 0x26, 0x4B, 0x21 }  // "M&K!" - Noisetracker 1.3 by Kaktus & Mahoney
-#define MOD_MAGIC_STARTRACKER4	(unsigned char [4]) { 0x46, 0x4C, 0x54, 0x34 }  // "FLT4" - Startracker 4 channel (Startrekker/AudioSculpture)
-#define MOD_MAGIC_STARTRACKER8	(unsigned char [4]) { 0x46, 0x4C, 0x54, 0x38 }  // "FLT8" - Startracker 8 channel (Startrekker/AudioSculpture)
-#define MOD_MAGIC_STARTRACKER4X	(unsigned char [4]) { 0x45, 0x58, 0x30, 0x34 }  // "EX04" - Startracker 4 channel (Startrekker/AudioSculpture)
-#define MOD_MAGIC_STARTRACKER8X	(unsigned char [4]) { 0x45, 0x58, 0x30, 0x38 }  // "EX08" - Startracker 8 channel (Startrekker/AudioSculpture)
-#define MOD_MAGIC_FASTTRACKER4	(unsigned char [4]) { 0x34, 0x43, 0x48, 0x4E }  // "4CHN" - Fasttracker 4 channel
-#define MOD_MAGIC_OKTALYZER8	(unsigned char [4]) { 0x43, 0x44, 0x38, 0x31 }  // "CD81" - Atari oktalyzer 8 channel
-#define MOD_MAGIC_OKTALYZER8X	(unsigned char [4]) { 0x4F, 0x4B, 0x54, 0x41 }  // "OKTA" - Atari oktalyzer 8 channel
-#define MOD_MAGIC_TAKETRACKER16	(unsigned char [4]) { 0x31, 0x36, 0x43, 0x4E }  // "16CN" - Taketracker 16 channel
-#define MOD_MAGIC_TAKETRACKER32 (unsigned char [4]) { 0x33, 0x32, 0x43, 0x4E }  // "32CN" - Taketracker 32 channel
-
-#define S3M_MAGIC	(unsigned char [4]) { 0x53, 0x43, 0x52, 0x4D }			/* This is the SCRM string at offset 44 to 47 in the S3M header */
+#define MOD_MAGIC_PROTRACKER4	"M.K."  // Protracker 4 channel
+#define MOD_MAGIC_PROTRACKER4X	"M!K!"  // Protracker 4 channel
+#define MOD_MAGIC_NOISETRACKER	"M&K!"  // Noisetracker 1.3 by Kaktus & Mahoney
+#define MOD_MAGIC_STARTRACKER4	"FLT4"  // Startracker 4 channel (Startrekker/AudioSculpture)
+#define MOD_MAGIC_STARTRACKER8	"FLT8"  // Startracker 8 channel (Startrekker/AudioSculpture)
+#define MOD_MAGIC_STARTRACKER4X	"EX04"  // Startracker 4 channel (Startrekker/AudioSculpture)
+#define MOD_MAGIC_STARTRACKER8X	"EX08"  // Startracker 8 channel (Startrekker/AudioSculpture)
+#define MOD_MAGIC_FASTTRACKER4	"4CHN"  // Fasttracker 4 channel
+#define MOD_MAGIC_OKTALYZER8	"CD81"  // Atari oktalyzer 8 channel
+#define MOD_MAGIC_OKTALYZER8X	"OKTA"  // Atari oktalyzer 8 channel
+#define MOD_MAGIC_TAKETRACKER16	"16CN"  // Taketracker 16 channel
+#define MOD_MAGIC_TAKETRACKER32 "32CN"  // Taketracker 32 channel
+
+#define S3M_MAGIC	"SCRM"  /* This is the SCRM string at offset 44 to 47 in the S3M header */
 
 /* These nicer formats have the magic bytes at the front of the file where they belong */
-#define UMX_MAGIC	(unsigned char [4]) { 0xC1, 0x83, 0x2A, 0x9E }
-#define XM_MAGIC	(unsigned char [4]) { 0x45, 0x78, 0x74, 0x65 }			/* Exte(nded Module) */
-#define M669_MAGIC	(unsigned char [4]) { 0x69, 0x66, 0x20, 0x20 }			/* Last two bytes are bogus, and not checked */
-#define IT_MAGIC	(unsigned char [4]) { 0x49, 0x4D, 0x50, 0x4D }			/* IMPM */
-#define MTM_MAGIC	(unsigned char [4]) { 0x4D, 0x54, 0x4D, 0x10 }
-#define PSM_MAGIC	(unsigned char [4]) { 0x50, 0x53, 0x4D, 0x20 }
+#define UMX_MAGIC	"\xC1\x83\x2A\x9E"
+#define XM_MAGIC	"Exte"              /* Exte(nded Module) */
+#define M669_MAGIC	"if  "              /* Last two bytes are bogus, and not checked */
+#define IT_MAGIC	"IMPM"              /* IMPM */
+#define MTM_MAGIC	"\x4D\x54\x4D\x10"
+#define PSM_MAGIC	"PSM "
 
 using namespace std;

audacious-plugins-3.1.1.tar.bz2/src/modplug/plugin_main.c -> audacious-plugins-3.2.4.tar.bz2/src/modplug/plugin_main.c Changed

audacious-plugins-3.1.1.tar.bz2/src/mpg123/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/mpg123/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/mpg123/mpg123.c -> audacious-plugins-3.2.4.tar.bz2/src/mpg123/mpg123.c Changed

@@ -22,6 +22,8 @@
 /* must come before <mpg123.h> to get _FILE_OFFSET_BITS */
 #include "config.h"
 
+#include <glib.h>
+#include <string.h>
 #include <mpg123.h>
 
 #ifdef DEBUG_MPG123_IO
@@ -184,22 +186,22 @@
 
 	Tuple * tuple = tuple_new_from_filename (filename);
 	make_format_string (& info, scratch, sizeof scratch);
-	tuple_associate_string (tuple, FIELD_CODEC, NULL, scratch);
+	tuple_set_str (tuple, FIELD_CODEC, NULL, scratch);
 	snprintf (scratch, sizeof scratch, "%s, %d Hz", (channels == 2)
 	 ? _("Stereo") : (channels > 2) ? _("Surround") : _("Mono"), (gint) rate);
-	tuple_associate_string (tuple, FIELD_QUALITY, NULL, scratch);
-	tuple_associate_int (tuple, FIELD_BITRATE, NULL, info.bitrate);
+	tuple_set_str (tuple, FIELD_QUALITY, NULL, scratch);
+	tuple_set_int (tuple, FIELD_BITRATE, NULL, info.bitrate);
 
 	if (! vfs_is_streaming (file))
 	{
 		gint64 size = vfs_fsize (file);
 		gint64 samples = mpg123_length (decoder);
-		gint length = (samples > 0) ? samples * 1000 / rate : 0;
+		gint length = (samples > 0 && rate > 0) ? samples * 1000 / rate : 0;
 
 		if (length > 0)
-			tuple_associate_int (tuple, FIELD_LENGTH, NULL, length);
+			tuple_set_int (tuple, FIELD_LENGTH, NULL, length);
 		if (size > 0 && length > 0)
-			tuple_associate_int (tuple, FIELD_BITRATE, NULL, 8 * size / length);
+			tuple_set_int (tuple, FIELD_BITRATE, NULL, 8 * size / length);
 	}
 
 	mpg123_delete (decoder);
@@ -243,14 +245,15 @@
 static gboolean
 update_stream_metadata(VFSFile *file, const gchar *name, Tuple *tuple, gint item)
 {
-	const gchar *old = tuple_get_string(tuple, item, NULL);
+	gchar *old = tuple_get_str(tuple, item, NULL);
 	gchar *new = get_stream_metadata(file, name);
 	gboolean changed = (new != NULL && (old == NULL || strcmp(old, new)));
 
 	if (changed)
-		tuple_associate_string(tuple, item, NULL, new);
+		tuple_set_str(tuple, item, NULL, new);
 
 	g_free(new);
+	str_unref(old);
 	return changed;
 }
 
@@ -264,7 +267,7 @@
 	update_stream_metadata (file, "track-name", tuple, FIELD_TITLE);
 	update_stream_metadata (file, "stream-name", tuple, FIELD_ARTIST);
 
-	mowgli_object_ref (tuple);
+	tuple_ref (tuple);
 	p->set_tuple (p, tuple);
 
 	return tuple;
@@ -276,7 +279,7 @@
 	if (update_stream_metadata (file, "track-name", tuple, FIELD_TITLE) ||
 	 update_stream_metadata (file, "stream-name", tuple, FIELD_ARTIST))
 	{
-		mowgli_object_ref (tuple);
+		tuple_ref (tuple);
 		p->set_tuple (p, tuple);
 	}
 }
@@ -483,7 +486,7 @@
 cleanup:
 	mpg123_delete(ctx.decoder);
 	if (ctx.tu)
-		tuple_free (ctx.tu);
+		tuple_unref (ctx.tu);
 	return ! error;
 }
 
@@ -538,7 +541,7 @@
 }
 
 static gboolean mpg123_get_image (const gchar * filename, VFSFile * handle,
- void * * data, gint * length)
+ void * * data, gint64 * length)
 {
 	if (! handle || vfs_is_streaming (handle))
 		return FALSE;

audacious-plugins-3.2.4.tar.bz2/src/mpris2 Added

audacious-plugins-3.2.4.tar.bz2/src/mpris2/Makefile Added

audacious-plugins-3.2.4.tar.bz2/src/mpris2/codegen Added

audacious-plugins-3.2.4.tar.bz2/src/mpris2/mpris2-player.xml Added

audacious-plugins-3.2.4.tar.bz2/src/mpris2/mpris2.xml Added

audacious-plugins-3.2.4.tar.bz2/src/mpris2/object-core.c Added

@@ -0,0 +1,1806 @@
+/*
+ * Generated by gdbus-codegen 2.30.2. DO NOT EDIT.
+ *
+ * The license of this code is the same as for the source it was derived from.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "object-core.h"
+
+#ifdef G_OS_UNIX
+# include <gio/gunixfdlist.h>
+#endif
+
+typedef struct
+{
+ GDBusArgInfo parent_struct;
+ gboolean use_gvariant;
+} _ExtendedGDBusArgInfo;
+
+typedef struct
+{
+ GDBusMethodInfo parent_struct;
+ const gchar *signal_name;
+ gboolean pass_fdlist;
+} _ExtendedGDBusMethodInfo;
+
+typedef struct
+{
+ GDBusSignalInfo parent_struct;
+ const gchar *signal_name;
+} _ExtendedGDBusSignalInfo;
+
+typedef struct
+{
+ GDBusPropertyInfo parent_struct;
+ const gchar *hyphen_name;
+ gboolean use_gvariant;
+} _ExtendedGDBusPropertyInfo;
+
+typedef struct
+{
+ GDBusInterfaceInfo parent_struct;
+ const gchar *hyphen_name;
+} _ExtendedGDBusInterfaceInfo;
+
+typedef struct
+{
+ const _ExtendedGDBusPropertyInfo *info;
+ guint prop_id;
+ GValue orig_value; /* the value before the change */
+} ChangedProperty;
+
+static void
+_changed_property_free (ChangedProperty *data)
+{
+ g_value_unset (&data->orig_value);
+ g_free (data);
+}
+
+static gboolean
+_g_strv_equal0 (gchar **a, gchar **b)
+{
+ gboolean ret = FALSE;
+ guint n;
+ if (a == NULL && b == NULL)
+ {
+ ret = TRUE;
+ goto out;
+ }
+ if (a == NULL || b == NULL)
+ goto out;
+ if (g_strv_length (a) != g_strv_length (b))
+ goto out;
+ for (n = 0; a[n] != NULL; n++)
+ if (g_strcmp0 (a[n], b[n]) != 0)
+ goto out;
+ ret = TRUE;
+out:
+ return ret;
+}
+
+static gboolean
+_g_variant_equal0 (GVariant *a, GVariant *b)
+{
+ gboolean ret = FALSE;
+ if (a == NULL && b == NULL)
+ {
+ ret = TRUE;
+ goto out;
+ }
+ if (a == NULL || b == NULL)
+ goto out;
+ ret = g_variant_equal (a, b);
+out:
+ return ret;
+}
+
+G_GNUC_UNUSED static gboolean
+_g_value_equal (const GValue *a, const GValue *b)
+{
+ gboolean ret = FALSE;
+ g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));
+ switch (G_VALUE_TYPE (a))
+ {
+ case G_TYPE_BOOLEAN:
+ ret = (g_value_get_boolean (a) == g_value_get_boolean (b));
+ break;
+ case G_TYPE_UCHAR:
+ ret = (g_value_get_uchar (a) == g_value_get_uchar (b));
+ break;
+ case G_TYPE_INT:
+ ret = (g_value_get_int (a) == g_value_get_int (b));
+ break;
+ case G_TYPE_UINT:
+ ret = (g_value_get_uint (a) == g_value_get_uint (b));
+ break;
+ case G_TYPE_INT64:
+ ret = (g_value_get_int64 (a) == g_value_get_int64 (b));
+ break;
+ case G_TYPE_UINT64:
+ ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));
+ break;
+ case G_TYPE_DOUBLE:
+ ret = (g_value_get_double (a) == g_value_get_double (b));
+ break;
+ case G_TYPE_STRING:
+ ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);
+ break;
+ case G_TYPE_VARIANT:
+ ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));
+ break;
+ default:
+ if (G_VALUE_TYPE (a) == G_TYPE_STRV)
+ ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));
+ else
+ g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));
+ break;
+ }
+ return ret;
+}
+
+/* ------------------------------------------------------------------------
+ * Code for interface org.mpris.MediaPlayer2
+ * ------------------------------------------------------------------------
+ */
+
+/**
+ * SECTION:MprisMediaPlayer2
+ * @title: MprisMediaPlayer2
+ * @short_description: Generated C code for the org.mpris.MediaPlayer2 D-Bus interface
+ *
+ * This section contains code for working with the <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link> D-Bus interface in C.
+ */
+
+/* ---- Introspection data for org.mpris.MediaPlayer2 ---- */
+
+static const _ExtendedGDBusMethodInfo _mpris_media_player2_method_info_quit =
+{
+ {
+ -1,
+ "Quit",
+ NULL,
+ NULL,
+ NULL
+ },
+ "handle-quit",
+ FALSE
+};
+
+static const _ExtendedGDBusMethodInfo _mpris_media_player2_method_info_raise =
+{
+ {
+ -1,
+ "Raise",
+ NULL,
+ NULL,
+ NULL
+ },
+ "handle-raise",
+ FALSE
+};
+
+static const _ExtendedGDBusMethodInfo * const _mpris_media_player2_method_info_pointers[] =
+{
+ &_mpris_media_player2_method_info_quit,
+ &_mpris_media_player2_method_info_raise,
+ NULL
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_property_info_can_quit =
+{
+ {
+ -1,
+ "CanQuit",
+ "b",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "can-quit",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_property_info_can_raise =
+{
+ {
+ -1,
+ "CanRaise",
+ "b",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "can-raise",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_property_info_desktop_entry =
+{
+ {
+ -1,
+ "DesktopEntry",
+ "s",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "desktop-entry",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_property_info_has_track_list =
+{
+ {
+ -1,
+ "HasTrackList",
+ "b",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "has-track-list",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_property_info_identity =
+{
+ {
+ -1,
+ "Identity",
+ "s",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "identity",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo * const _mpris_media_player2_property_info_pointers[] =
+{
+ &_mpris_media_player2_property_info_can_quit,
+ &_mpris_media_player2_property_info_can_raise,
+ &_mpris_media_player2_property_info_desktop_entry,
+ &_mpris_media_player2_property_info_has_track_list,
+ &_mpris_media_player2_property_info_identity,
+ NULL
+};
+
+static const _ExtendedGDBusInterfaceInfo _mpris_media_player2_interface_info =
+{
+ {
+ -1,
+ "org.mpris.MediaPlayer2",
+ (GDBusMethodInfo **) &_mpris_media_player2_method_info_pointers,
+ NULL,
+ (GDBusPropertyInfo **) &_mpris_media_player2_property_info_pointers,
+ NULL
+ },
+ "media-player2",
+};
+
+
+/**
+ * mpris_media_player2_interface_info:
+ *
+ * Gets a machine-readable description of the <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link> D-Bus interface.
+ *
+ * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
+ */
+GDBusInterfaceInfo *
+mpris_media_player2_interface_info (void)
+{
+ return (GDBusInterfaceInfo *) &_mpris_media_player2_interface_info;
+}
+
+/**
+ * mpris_media_player2_override_properties:
+ * @klass: The class structure for a #GObject-derived class.
+ * @property_id_begin: The property id to assign to the first overridden property.
+ *
+ * Overrides all #GObject properties in the #MprisMediaPlayer2 interface for a concrete class.
+ * The properties are overridden in the order they are defined.
+ *
+ * Returns: The last property id.
+ */
+guint
+mpris_media_player2_override_properties (GObjectClass *klass, guint property_id_begin)
+{
+ g_object_class_override_property (klass, property_id_begin++, "can-quit");
+ g_object_class_override_property (klass, property_id_begin++, "can-raise");
+ g_object_class_override_property (klass, property_id_begin++, "desktop-entry");
+ g_object_class_override_property (klass, property_id_begin++, "has-track-list");
+ g_object_class_override_property (klass, property_id_begin++, "identity");
+ return property_id_begin - 1;
+}
+
+
+
+/**
+ * MprisMediaPlayer2:
+ *
+ * Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link>.
+ */
+
+/**
+ * MprisMediaPlayer2Iface:
+ * @parent_iface: The parent interface.
+ * @handle_quit: Handler for the #MprisMediaPlayer2::handle-quit signal.
+ * @handle_raise: Handler for the #MprisMediaPlayer2::handle-raise signal.
+ * @get_can_quit: Getter for the #MprisMediaPlayer2:can-quit property.
+ * @get_can_raise: Getter for the #MprisMediaPlayer2:can-raise property.
+ * @get_desktop_entry: Getter for the #MprisMediaPlayer2:desktop-entry property.
+ * @get_has_track_list: Getter for the #MprisMediaPlayer2:has-track-list property.
+ * @get_identity: Getter for the #MprisMediaPlayer2:identity property.
+ *
+ * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link>.
+ */
+
+static void
+mpris_media_player2_default_init (MprisMediaPlayer2Iface *iface)
+{
+ /* GObject signals for incoming D-Bus method calls: */
+ /**
+ * MprisMediaPlayer2::handle-quit:
+ * @object: A #MprisMediaPlayer2.
+ * @invocation: A #GDBusMethodInvocation.
+ *
+ * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Quit">Quit()</link> D-Bus method.
+ *
+ * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_complete_quit() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+ *
+ * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
+ */
+ g_signal_new ("handle-quit",
+ G_TYPE_FROM_INTERFACE (iface),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MprisMediaPlayer2Iface, handle_quit),
+ g_signal_accumulator_true_handled,
+ NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN,
+ 1,
+ G_TYPE_DBUS_METHOD_INVOCATION);
+
+ /**
+ * MprisMediaPlayer2::handle-raise:
+ * @object: A #MprisMediaPlayer2.
+ * @invocation: A #GDBusMethodInvocation.
+ *
+ * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Raise">Raise()</link> D-Bus method.
+ *
+ * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_complete_raise() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+ *
+ * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
+ */
+ g_signal_new ("handle-raise",
+ G_TYPE_FROM_INTERFACE (iface),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MprisMediaPlayer2Iface, handle_raise),
+ g_signal_accumulator_true_handled,
+ NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN,
+ 1,
+ G_TYPE_DBUS_METHOD_INVOCATION);
+
+ /* GObject properties for D-Bus properties: */
+ /**
+ * MprisMediaPlayer2:can-quit:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2.CanQuit">"CanQuit"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_boolean ("can-quit", "CanQuit", "CanQuit", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * MprisMediaPlayer2:can-raise:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2.CanRaise">"CanRaise"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_boolean ("can-raise", "CanRaise", "CanRaise", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * MprisMediaPlayer2:desktop-entry:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2.DesktopEntry">"DesktopEntry"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_string ("desktop-entry", "DesktopEntry", "DesktopEntry", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * MprisMediaPlayer2:has-track-list:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2.HasTrackList">"HasTrackList"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_boolean ("has-track-list", "HasTrackList", "HasTrackList", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * MprisMediaPlayer2:identity:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2.Identity">"Identity"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_string ("identity", "Identity", "Identity", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+}
+
+typedef MprisMediaPlayer2Iface MprisMediaPlayer2Interface;
+G_DEFINE_INTERFACE (MprisMediaPlayer2, mpris_media_player2, G_TYPE_OBJECT);
+
+/**
+ * mpris_media_player2_get_can_quit: (skip)
+ * @object: A #MprisMediaPlayer2.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.CanQuit">"CanQuit"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+gboolean 
+mpris_media_player2_get_can_quit (MprisMediaPlayer2 *object)
+{
+ return MPRIS_MEDIA_PLAYER2_GET_IFACE (object)->get_can_quit (object);
+}
+
+/**
+ * mpris_media_player2_set_can_quit: (skip)
+ * @object: A #MprisMediaPlayer2.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2.CanQuit">"CanQuit"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_set_can_quit (MprisMediaPlayer2 *object, gboolean value)
+{
+ g_object_set (G_OBJECT (object), "can-quit", value, NULL);
+}
+
+/**
+ * mpris_media_player2_get_can_raise: (skip)
+ * @object: A #MprisMediaPlayer2.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.CanRaise">"CanRaise"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+gboolean 
+mpris_media_player2_get_can_raise (MprisMediaPlayer2 *object)
+{
+ return MPRIS_MEDIA_PLAYER2_GET_IFACE (object)->get_can_raise (object);
+}
+
+/**
+ * mpris_media_player2_set_can_raise: (skip)
+ * @object: A #MprisMediaPlayer2.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2.CanRaise">"CanRaise"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_set_can_raise (MprisMediaPlayer2 *object, gboolean value)
+{
+ g_object_set (G_OBJECT (object), "can-raise", value, NULL);
+}
+
+/**
+ * mpris_media_player2_get_desktop_entry: (skip)
+ * @object: A #MprisMediaPlayer2.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.DesktopEntry">"DesktopEntry"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use mpris_media_player2_dup_desktop_entry() if on another thread.</warning>
+ *
+ * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
+ */
+const gchar *
+mpris_media_player2_get_desktop_entry (MprisMediaPlayer2 *object)
+{
+ return MPRIS_MEDIA_PLAYER2_GET_IFACE (object)->get_desktop_entry (object);
+}
+
+/**
+ * mpris_media_player2_dup_desktop_entry: (skip)
+ * @object: A #MprisMediaPlayer2.
+ *
+ * Gets a copy of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.DesktopEntry">"DesktopEntry"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
+ */
+gchar *
+mpris_media_player2_dup_desktop_entry (MprisMediaPlayer2 *object)
+{
+ gchar *value;
+ g_object_get (G_OBJECT (object), "desktop-entry", &value, NULL);
+ return value;
+}
+
+/**
+ * mpris_media_player2_set_desktop_entry: (skip)
+ * @object: A #MprisMediaPlayer2.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2.DesktopEntry">"DesktopEntry"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_set_desktop_entry (MprisMediaPlayer2 *object, const gchar *value)
+{
+ g_object_set (G_OBJECT (object), "desktop-entry", value, NULL);
+}
+
+/**
+ * mpris_media_player2_get_has_track_list: (skip)
+ * @object: A #MprisMediaPlayer2.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.HasTrackList">"HasTrackList"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+gboolean 
+mpris_media_player2_get_has_track_list (MprisMediaPlayer2 *object)
+{
+ return MPRIS_MEDIA_PLAYER2_GET_IFACE (object)->get_has_track_list (object);
+}
+
+/**
+ * mpris_media_player2_set_has_track_list: (skip)
+ * @object: A #MprisMediaPlayer2.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2.HasTrackList">"HasTrackList"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_set_has_track_list (MprisMediaPlayer2 *object, gboolean value)
+{
+ g_object_set (G_OBJECT (object), "has-track-list", value, NULL);
+}
+
+/**
+ * mpris_media_player2_get_identity: (skip)
+ * @object: A #MprisMediaPlayer2.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.Identity">"Identity"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use mpris_media_player2_dup_identity() if on another thread.</warning>
+ *
+ * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
+ */
+const gchar *
+mpris_media_player2_get_identity (MprisMediaPlayer2 *object)
+{
+ return MPRIS_MEDIA_PLAYER2_GET_IFACE (object)->get_identity (object);
+}
+
+/**
+ * mpris_media_player2_dup_identity: (skip)
+ * @object: A #MprisMediaPlayer2.
+ *
+ * Gets a copy of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.Identity">"Identity"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
+ */
+gchar *
+mpris_media_player2_dup_identity (MprisMediaPlayer2 *object)
+{
+ gchar *value;
+ g_object_get (G_OBJECT (object), "identity", &value, NULL);
+ return value;
+}
+
+/**
+ * mpris_media_player2_set_identity: (skip)
+ * @object: A #MprisMediaPlayer2.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2.Identity">"Identity"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_set_identity (MprisMediaPlayer2 *object, const gchar *value)
+{
+ g_object_set (G_OBJECT (object), "identity", value, NULL);
+}
+
+/**
+ * mpris_media_player2_call_quit:
+ * @proxy: A #MprisMediaPlayer2Proxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Quit">Quit()</link> D-Bus method on @proxy.
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mpris_media_player2_call_quit_finish() to get the result of the operation.
+ *
+ * See mpris_media_player2_call_quit_sync() for the synchronous, blocking version of this method.
+ */
+void
+mpris_media_player2_call_quit (
+ MprisMediaPlayer2 *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_dbus_proxy_call (G_DBUS_PROXY (proxy),
+ "Quit",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ callback,
+ user_data);
+}
+
+/**
+ * mpris_media_player2_call_quit_finish:
+ * @proxy: A #MprisMediaPlayer2Proxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_call_quit().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with mpris_media_player2_call_quit().
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_call_quit_finish (
+ MprisMediaPlayer2 *proxy,
+ GAsyncResult *res,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_call_quit_sync:
+ * @proxy: A #MprisMediaPlayer2Proxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Quit">Quit()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
+ *
+ * See mpris_media_player2_call_quit() for the asynchronous version of this method.
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_call_quit_sync (
+ MprisMediaPlayer2 *proxy,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
+ "Quit",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_call_raise:
+ * @proxy: A #MprisMediaPlayer2Proxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Raise">Raise()</link> D-Bus method on @proxy.
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mpris_media_player2_call_raise_finish() to get the result of the operation.
+ *
+ * See mpris_media_player2_call_raise_sync() for the synchronous, blocking version of this method.
+ */
+void
+mpris_media_player2_call_raise (
+ MprisMediaPlayer2 *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_dbus_proxy_call (G_DBUS_PROXY (proxy),
+ "Raise",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ callback,
+ user_data);
+}
+
+/**
+ * mpris_media_player2_call_raise_finish:
+ * @proxy: A #MprisMediaPlayer2Proxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_call_raise().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with mpris_media_player2_call_raise().
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_call_raise_finish (
+ MprisMediaPlayer2 *proxy,
+ GAsyncResult *res,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_call_raise_sync:
+ * @proxy: A #MprisMediaPlayer2Proxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Raise">Raise()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
+ *
+ * See mpris_media_player2_call_raise() for the asynchronous version of this method.
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_call_raise_sync (
+ MprisMediaPlayer2 *proxy,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
+ "Raise",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_complete_quit:
+ * @object: A #MprisMediaPlayer2.
+ * @invocation: (transfer full): A #GDBusMethodInvocation.
+ *
+ * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Quit">Quit()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
+ *
+ * This method will free @invocation, you cannot use it afterwards.
+ */
+void
+mpris_media_player2_complete_quit (
+ MprisMediaPlayer2 *object,
+ GDBusMethodInvocation *invocation)
+{
+ g_dbus_method_invocation_return_value (invocation,
+ g_variant_new ("()"));
+}
+
+/**
+ * mpris_media_player2_complete_raise:
+ * @object: A #MprisMediaPlayer2.
+ * @invocation: (transfer full): A #GDBusMethodInvocation.
+ *
+ * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Raise">Raise()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
+ *
+ * This method will free @invocation, you cannot use it afterwards.
+ */
+void
+mpris_media_player2_complete_raise (
+ MprisMediaPlayer2 *object,
+ GDBusMethodInvocation *invocation)
+{
+ g_dbus_method_invocation_return_value (invocation,
+ g_variant_new ("()"));
+}
+
+/* ------------------------------------------------------------------------ */
+
+/**
+ * MprisMediaPlayer2Proxy:
+ *
+ * The #MprisMediaPlayer2Proxy structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * MprisMediaPlayer2ProxyClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #MprisMediaPlayer2Proxy.
+ */
+
+struct _MprisMediaPlayer2ProxyPrivate
+{
+ GData *qdata;
+};
+
+static void mpris_media_player2_proxy_iface_init (MprisMediaPlayer2Iface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (MprisMediaPlayer2Proxy, mpris_media_player2_proxy, G_TYPE_DBUS_PROXY,
+ G_IMPLEMENT_INTERFACE (MPRIS_TYPE_MEDIA_PLAYER2, mpris_media_player2_proxy_iface_init));
+
+static void
+mpris_media_player2_proxy_finalize (GObject *object)
+{
+ MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (object);
+ g_datalist_clear (&proxy->priv->qdata);
+ G_OBJECT_CLASS (mpris_media_player2_proxy_parent_class)->finalize (object);
+}
+
+static void
+mpris_media_player2_proxy_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ const _ExtendedGDBusPropertyInfo *info;
+ GVariant *variant;
+ g_assert (prop_id != 0 && prop_id - 1 < 5);
+ info = _mpris_media_player2_property_info_pointers[prop_id - 1];
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name);
+ if (info->use_gvariant)
+ {
+ g_value_set_variant (value, variant);
+ }
+ else
+ {
+ if (variant != NULL)
+ g_dbus_gvariant_to_gvalue (variant, value);
+ }
+ if (variant != NULL)
+ g_variant_unref (variant);
+}
+
+static void
+mpris_media_player2_proxy_set_property_cb (GDBusProxy *proxy,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ const _ExtendedGDBusPropertyInfo *info = user_data;
+ GError *error;
+ error = NULL;
+ if (!g_dbus_proxy_call_finish (proxy, res, &error))
+ {
+ g_warning ("Error setting property `%s' on interface org.mpris.MediaPlayer2: %s (%s, %d)",
+ info->parent_struct.name, 
+ error->message, g_quark_to_string (error->domain), error->code);
+ g_error_free (error);
+ }
+}
+
+static void
+mpris_media_player2_proxy_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ const _ExtendedGDBusPropertyInfo *info;
+ GVariant *variant;
+ g_assert (prop_id != 0 && prop_id - 1 < 5);
+ info = _mpris_media_player2_property_info_pointers[prop_id - 1];
+ variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature));
+ g_dbus_proxy_call (G_DBUS_PROXY (object),
+ "org.freedesktop.DBus.Properties.Set",
+ g_variant_new ("(ssv)", "org.mpris.MediaPlayer2", info->parent_struct.name, variant),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL, (GAsyncReadyCallback) mpris_media_player2_proxy_set_property_cb, (gpointer) info);
+ g_variant_unref (variant);
+}
+
+static void
+mpris_media_player2_proxy_g_signal (GDBusProxy *proxy,
+ const gchar *sender_name,
+ const gchar *signal_name,
+ GVariant *parameters)
+{
+ _ExtendedGDBusSignalInfo *info;
+ GVariantIter iter;
+ GVariant *child;
+ GValue *paramv;
+ guint num_params;
+ guint n;
+ guint signal_id;
+ info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_mpris_media_player2_interface_info, signal_name);
+ if (info == NULL)
+ return;
+ num_params = g_variant_n_children (parameters);
+ paramv = g_new0 (GValue, num_params + 1);
+ g_value_init (&paramv[0], MPRIS_TYPE_MEDIA_PLAYER2);
+ g_value_set_object (&paramv[0], proxy);
+ g_variant_iter_init (&iter, parameters);
+ n = 1;
+ while ((child = g_variant_iter_next_value (&iter)) != NULL)
+ {
+ _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1];
+ if (arg_info->use_gvariant)
+ {
+ g_value_init (&paramv[n], G_TYPE_VARIANT);
+ g_value_set_variant (&paramv[n], child);
+ n++;
+ }
+ else
+ g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
+ g_variant_unref (child);
+ }
+ signal_id = g_signal_lookup (info->signal_name, MPRIS_TYPE_MEDIA_PLAYER2);
+ g_signal_emitv (paramv, signal_id, 0, NULL);
+ for (n = 0; n < num_params + 1; n++)
+ g_value_unset (&paramv[n]);
+ g_free (paramv);
+}
+
+static void
+mpris_media_player2_proxy_g_properties_changed (GDBusProxy *_proxy,
+ GVariant *changed_properties,
+ const gchar *const *invalidated_properties)
+{
+ MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (_proxy);
+ guint n;
+ const gchar *key;
+ GVariantIter *iter;
+ _ExtendedGDBusPropertyInfo *info;
+ g_variant_get (changed_properties, "a{sv}", &iter);
+ while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
+ {
+ info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_interface_info, key);
+ g_datalist_remove_data (&proxy->priv->qdata, key);
+ if (info != NULL)
+ g_object_notify (G_OBJECT (proxy), info->hyphen_name);
+ }
+ g_variant_iter_free (iter);
+ for (n = 0; invalidated_properties[n] != NULL; n++)
+ {
+ info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_interface_info, invalidated_properties[n]);
+ g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
+ if (info != NULL)
+ g_object_notify (G_OBJECT (proxy), info->hyphen_name);
+ }
+}
+
+static gboolean 
+mpris_media_player2_proxy_get_can_quit (MprisMediaPlayer2 *object)
+{
+ MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (object);
+ GVariant *variant;
+ gboolean value = 0;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanQuit");
+ if (variant != NULL)
+ {
+ value = g_variant_get_boolean (variant);
+ g_variant_unref (variant);
+ }
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_proxy_get_can_raise (MprisMediaPlayer2 *object)
+{
+ MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (object);
+ GVariant *variant;
+ gboolean value = 0;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanRaise");
+ if (variant != NULL)
+ {
+ value = g_variant_get_boolean (variant);
+ g_variant_unref (variant);
+ }
+ return value;
+}
+
+static const gchar *
+mpris_media_player2_proxy_get_desktop_entry (MprisMediaPlayer2 *object)
+{
+ MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (object);
+ GVariant *variant;
+ const gchar *value = NULL;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "DesktopEntry");
+ if (variant != NULL)
+ {
+ value = g_variant_get_string (variant, NULL);
+ g_variant_unref (variant);
+ }
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_proxy_get_has_track_list (MprisMediaPlayer2 *object)
+{
+ MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (object);
+ GVariant *variant;
+ gboolean value = 0;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "HasTrackList");
+ if (variant != NULL)
+ {
+ value = g_variant_get_boolean (variant);
+ g_variant_unref (variant);
+ }
+ return value;
+}
+
+static const gchar *
+mpris_media_player2_proxy_get_identity (MprisMediaPlayer2 *object)
+{
+ MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (object);
+ GVariant *variant;
+ const gchar *value = NULL;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Identity");
+ if (variant != NULL)
+ {
+ value = g_variant_get_string (variant, NULL);
+ g_variant_unref (variant);
+ }
+ return value;
+}
+
+static void
+mpris_media_player2_proxy_init (MprisMediaPlayer2Proxy *proxy)
+{
+ proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, MPRIS_TYPE_MEDIA_PLAYER2_PROXY, MprisMediaPlayer2ProxyPrivate);
+ g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), mpris_media_player2_interface_info ());
+}
+
+static void
+mpris_media_player2_proxy_class_init (MprisMediaPlayer2ProxyClass *klass)
+{
+ GObjectClass *gobject_class;
+ GDBusProxyClass *proxy_class;
+
+ g_type_class_add_private (klass, sizeof (MprisMediaPlayer2ProxyPrivate));
+
+ gobject_class = G_OBJECT_CLASS (klass);
+ gobject_class->finalize = mpris_media_player2_proxy_finalize;
+ gobject_class->get_property = mpris_media_player2_proxy_get_property;
+ gobject_class->set_property = mpris_media_player2_proxy_set_property;
+
+ proxy_class = G_DBUS_PROXY_CLASS (klass);
+ proxy_class->g_signal = mpris_media_player2_proxy_g_signal;
+ proxy_class->g_properties_changed = mpris_media_player2_proxy_g_properties_changed;
+
+
+ mpris_media_player2_override_properties (gobject_class, 1);
+}
+
+static void
+mpris_media_player2_proxy_iface_init (MprisMediaPlayer2Iface *iface)
+{
+ iface->get_can_quit = mpris_media_player2_proxy_get_can_quit;
+ iface->get_can_raise = mpris_media_player2_proxy_get_can_raise;
+ iface->get_desktop_entry = mpris_media_player2_proxy_get_desktop_entry;
+ iface->get_has_track_list = mpris_media_player2_proxy_get_has_track_list;
+ iface->get_identity = mpris_media_player2_proxy_get_identity;
+}
+
+/**
+ * mpris_media_player2_proxy_new:
+ * @connection: A #GDBusConnection.
+ * @flags: Flags from the #GDBusProxyFlags enumeration.
+ * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link>. See g_dbus_proxy_new() for more details.
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mpris_media_player2_proxy_new_finish() to get the result of the operation.
+ *
+ * See mpris_media_player2_proxy_new_sync() for the synchronous, blocking version of this constructor.
+ */
+void
+mpris_media_player2_proxy_new (
+ GDBusConnection *connection,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_async_initable_new_async (MPRIS_TYPE_MEDIA_PLAYER2_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2", NULL);
+}
+
+/**
+ * mpris_media_player2_proxy_new_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_proxy_new().
+ * @error: Return location for error or %NULL
+ *
+ * Finishes an operation started with mpris_media_player2_proxy_new().
+ *
+ * Returns: (transfer full) (type MprisMediaPlayer2Proxy): The constructed proxy object or %NULL if @error is set.
+ */
+MprisMediaPlayer2 *
+mpris_media_player2_proxy_new_finish (
+ GAsyncResult *res,
+ GError **error)
+{
+ GObject *ret;
+ GObject *source_object;
+ source_object = g_async_result_get_source_object (res);
+ ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
+ g_object_unref (source_object);
+ if (ret != NULL)
+ return MPRIS_MEDIA_PLAYER2 (ret);
+ else
+ return NULL;
+}
+
+/**
+ * mpris_media_player2_proxy_new_sync:
+ * @connection: A #GDBusConnection.
+ * @flags: Flags from the #GDBusProxyFlags enumeration.
+ * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL
+ *
+ * Synchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link>. See g_dbus_proxy_new_sync() for more details.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * See mpris_media_player2_proxy_new() for the asynchronous version of this constructor.
+ *
+ * Returns: (transfer full) (type MprisMediaPlayer2Proxy): The constructed proxy object or %NULL if @error is set.
+ */
+MprisMediaPlayer2 *
+mpris_media_player2_proxy_new_sync (
+ GDBusConnection *connection,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GInitable *ret;
+ ret = g_initable_new (MPRIS_TYPE_MEDIA_PLAYER2_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2", NULL);
+ if (ret != NULL)
+ return MPRIS_MEDIA_PLAYER2 (ret);
+ else
+ return NULL;
+}
+
+
+/**
+ * mpris_media_player2_proxy_new_for_bus:
+ * @bus_type: A #GBusType.
+ * @flags: Flags from the #GDBusProxyFlags enumeration.
+ * @name: A bus name (well-known or unique).
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ * Like mpris_media_player2_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mpris_media_player2_proxy_new_for_bus_finish() to get the result of the operation.
+ *
+ * See mpris_media_player2_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
+ */
+void
+mpris_media_player2_proxy_new_for_bus (
+ GBusType bus_type,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_async_initable_new_async (MPRIS_TYPE_MEDIA_PLAYER2_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2", NULL);
+}
+
+/**
+ * mpris_media_player2_proxy_new_for_bus_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_proxy_new_for_bus().
+ * @error: Return location for error or %NULL
+ *
+ * Finishes an operation started with mpris_media_player2_proxy_new_for_bus().
+ *
+ * Returns: (transfer full) (type MprisMediaPlayer2Proxy): The constructed proxy object or %NULL if @error is set.
+ */
+MprisMediaPlayer2 *
+mpris_media_player2_proxy_new_for_bus_finish (
+ GAsyncResult *res,
+ GError **error)
+{
+ GObject *ret;
+ GObject *source_object;
+ source_object = g_async_result_get_source_object (res);
+ ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
+ g_object_unref (source_object);
+ if (ret != NULL)
+ return MPRIS_MEDIA_PLAYER2 (ret);
+ else
+ return NULL;
+}
+
+/**
+ * mpris_media_player2_proxy_new_for_bus_sync:
+ * @bus_type: A #GBusType.
+ * @flags: Flags from the #GDBusProxyFlags enumeration.
+ * @name: A bus name (well-known or unique).
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL
+ *
+ * Like mpris_media_player2_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * See mpris_media_player2_proxy_new_for_bus() for the asynchronous version of this constructor.
+ *
+ * Returns: (transfer full) (type MprisMediaPlayer2Proxy): The constructed proxy object or %NULL if @error is set.
+ */
+MprisMediaPlayer2 *
+mpris_media_player2_proxy_new_for_bus_sync (
+ GBusType bus_type,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GInitable *ret;
+ ret = g_initable_new (MPRIS_TYPE_MEDIA_PLAYER2_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2", NULL);
+ if (ret != NULL)
+ return MPRIS_MEDIA_PLAYER2 (ret);
+ else
+ return NULL;
+}
+
+
+/* ------------------------------------------------------------------------ */
+
+/**
+ * MprisMediaPlayer2Skeleton:
+ *
+ * The #MprisMediaPlayer2Skeleton structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * MprisMediaPlayer2SkeletonClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #MprisMediaPlayer2Skeleton.
+ */
+
+struct _MprisMediaPlayer2SkeletonPrivate
+{
+ GValueArray *properties;
+ GList *changed_properties;
+ GSource *changed_properties_idle_source;
+ GMainContext *context;
+ GMutex *lock;
+};
+
+static void
+_mpris_media_player2_skeleton_handle_method_call (
+ GDBusConnection *connection,
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *method_name,
+ GVariant *parameters,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (user_data);
+ _ExtendedGDBusMethodInfo *info;
+ GVariantIter iter;
+ GVariant *child;
+ GValue *paramv;
+ guint num_params;
+ guint num_extra;
+ guint n;
+ guint signal_id;
+ GValue return_value = {0};
+ info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
+ g_assert (info != NULL);
+ num_params = g_variant_n_children (parameters);
+ num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra);
+ n = 0;
+ g_value_init (&paramv[n], MPRIS_TYPE_MEDIA_PLAYER2);
+ g_value_set_object (&paramv[n++], skeleton);
+ g_value_init (&paramv[n], G_TYPE_DBUS_METHOD_INVOCATION);
+ g_value_set_object (&paramv[n++], invocation);
+ if (info->pass_fdlist)
+ {
+#ifdef G_OS_UNIX
+ g_value_init (&paramv[n], G_TYPE_UNIX_FD_LIST);
+ g_value_set_object (&paramv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)));
+#else
+ g_assert_not_reached ();
+#endif
+ }
+ g_variant_iter_init (&iter, parameters);
+ while ((child = g_variant_iter_next_value (&iter)) != NULL)
+ {
+ _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra];
+ if (arg_info->use_gvariant)
+ {
+ g_value_init (&paramv[n], G_TYPE_VARIANT);
+ g_value_set_variant (&paramv[n], child);
+ n++;
+ }
+ else
+ g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
+ g_variant_unref (child);
+ }
+ signal_id = g_signal_lookup (info->signal_name, MPRIS_TYPE_MEDIA_PLAYER2);
+ g_value_init (&return_value, G_TYPE_BOOLEAN);
+ g_signal_emitv (paramv, signal_id, 0, &return_value);
+ if (!g_value_get_boolean (&return_value))
+ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name);
+ g_value_unset (&return_value);
+ for (n = 0; n < num_params + num_extra; n++)
+ g_value_unset (&paramv[n]);
+ g_free (paramv);
+}
+
+static GVariant *
+_mpris_media_player2_skeleton_handle_get_property (
+ GDBusConnection *connection,
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *property_name,
+ GError **error,
+ gpointer user_data)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (user_data);
+ GValue value = {0};
+ GParamSpec *pspec;
+ _ExtendedGDBusPropertyInfo *info;
+ GVariant *ret;
+ ret = NULL;
+ info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_interface_info, property_name);
+ g_assert (info != NULL);
+ pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
+ if (pspec == NULL)
+ {
+ g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
+ }
+ else
+ {
+ g_value_init (&value, pspec->value_type);
+ g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value);
+ ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature));
+ g_value_unset (&value);
+ }
+ return ret;
+}
+
+static gboolean
+_mpris_media_player2_skeleton_handle_set_property (
+ GDBusConnection *connection,
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *property_name,
+ GVariant *variant,
+ GError **error,
+ gpointer user_data)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (user_data);
+ GValue value = {0};
+ GParamSpec *pspec;
+ _ExtendedGDBusPropertyInfo *info;
+ gboolean ret;
+ ret = FALSE;
+ info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_interface_info, property_name);
+ g_assert (info != NULL);
+ pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
+ if (pspec == NULL)
+ {
+ g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
+ }
+ else
+ {
+ if (info->use_gvariant)
+ g_value_set_variant (&value, variant);
+ else
+ g_dbus_gvariant_to_gvalue (variant, &value);
+ g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value);
+ g_value_unset (&value);
+ ret = TRUE;
+ }
+ return ret;
+}
+
+static const GDBusInterfaceVTable _mpris_media_player2_skeleton_vtable =
+{
+ _mpris_media_player2_skeleton_handle_method_call,
+ _mpris_media_player2_skeleton_handle_get_property,
+ _mpris_media_player2_skeleton_handle_set_property
+};
+
+static GDBusInterfaceInfo *
+mpris_media_player2_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton)
+{
+ return mpris_media_player2_interface_info ();
+}
+
+static GDBusInterfaceVTable *
+mpris_media_player2_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton)
+{
+ return (GDBusInterfaceVTable *) &_mpris_media_player2_skeleton_vtable;
+}
+
+static GVariant *
+mpris_media_player2_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (_skeleton);
+
+ GVariantBuilder builder;
+ guint n;
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
+ if (_mpris_media_player2_interface_info.parent_struct.properties == NULL)
+ goto out;
+ for (n = 0; _mpris_media_player2_interface_info.parent_struct.properties[n] != NULL; n++)
+ {
+ GDBusPropertyInfo *info = _mpris_media_player2_interface_info.parent_struct.properties[n];
+ if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
+ {
+ GVariant *value;
+ value = _mpris_media_player2_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.mpris.MediaPlayer2", info->name, NULL, skeleton);
+ if (value != NULL)
+ {
+ g_variant_take_ref (value);
+ g_variant_builder_add (&builder, "{sv}", info->name, value);
+ g_variant_unref (value);
+ }
+ }
+ }
+out:
+ return g_variant_builder_end (&builder);
+}
+
+static gboolean _mpris_media_player2_emit_changed (gpointer user_data);
+
+static void
+mpris_media_player2_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (_skeleton);
+ gboolean emit_changed = FALSE;
+
+ g_mutex_lock (skeleton->priv->lock);
+ if (skeleton->priv->changed_properties_idle_source != NULL)
+ {
+ g_source_destroy (skeleton->priv->changed_properties_idle_source);
+ skeleton->priv->changed_properties_idle_source = NULL;
+ emit_changed = TRUE;
+ }
+ g_mutex_unlock (skeleton->priv->lock);
+
+ if (emit_changed)
+ _mpris_media_player2_emit_changed (skeleton);
+}
+
+static void mpris_media_player2_skeleton_iface_init (MprisMediaPlayer2Iface *iface);
+G_DEFINE_TYPE_WITH_CODE (MprisMediaPlayer2Skeleton, mpris_media_player2_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_IMPLEMENT_INTERFACE (MPRIS_TYPE_MEDIA_PLAYER2, mpris_media_player2_skeleton_iface_init));
+
+static void
+mpris_media_player2_skeleton_finalize (GObject *object)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
+ g_value_array_free (skeleton->priv->properties);
+ g_list_foreach (skeleton->priv->changed_properties, (GFunc) _changed_property_free, NULL);
+ g_list_free (skeleton->priv->changed_properties);
+ if (skeleton->priv->changed_properties_idle_source != NULL)
+ g_source_destroy (skeleton->priv->changed_properties_idle_source);
+ if (skeleton->priv->context != NULL)
+ g_main_context_unref (skeleton->priv->context);
+ g_mutex_free (skeleton->priv->lock);
+ G_OBJECT_CLASS (mpris_media_player2_skeleton_parent_class)->finalize (object);
+}
+
+static void
+mpris_media_player2_skeleton_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
+ g_assert (prop_id != 0 && prop_id - 1 < 5);
+ g_mutex_lock (skeleton->priv->lock);
+ g_value_copy (&skeleton->priv->properties->values[prop_id - 1], value);
+ g_mutex_unlock (skeleton->priv->lock);
+}
+
+static gboolean
+_mpris_media_player2_emit_changed (gpointer user_data)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (user_data);
+ GList *l;
+ GVariantBuilder builder;
+ GVariantBuilder invalidated_builder;
+ guint num_changes;
+
+ g_mutex_lock (skeleton->priv->lock);
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
+ g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as"));
+ for (l = skeleton->priv->changed_properties, num_changes = 0; l != NULL; l = l->next)
+ {
+ ChangedProperty *cp = l->data;
+ GVariant *variant;
+ const GValue *cur_value;
+
+ cur_value = &skeleton->priv->properties->values[cp->prop_id - 1];
+ if (!_g_value_equal (cur_value, &cp->orig_value))
+ {
+ variant = g_dbus_gvalue_to_gvariant (cur_value, G_VARIANT_TYPE (cp->info->parent_struct.signature));
+ g_variant_builder_add (&builder, "{sv}", cp->info->parent_struct.name, variant);
+ g_variant_unref (variant);
+ num_changes++;
+ }
+ }
+ if (num_changes > 0)
+ {
+ g_dbus_connection_emit_signal (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)),
+ NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)),
+ "org.freedesktop.DBus.Properties",
+ "PropertiesChanged",
+ g_variant_new ("(sa{sv}as)",
+ "org.mpris.MediaPlayer2",
+ &builder, &invalidated_builder),
+ NULL);
+ }
+ else
+ {
+ g_variant_builder_clear (&builder);
+ g_variant_builder_clear (&invalidated_builder);
+ }
+ g_list_foreach (skeleton->priv->changed_properties, (GFunc) _changed_property_free, NULL);
+ g_list_free (skeleton->priv->changed_properties);
+ skeleton->priv->changed_properties = NULL;
+ skeleton->priv->changed_properties_idle_source = NULL;
+ g_mutex_unlock (skeleton->priv->lock);
+ return FALSE;
+}
+
+static void
+_mpris_media_player2_schedule_emit_changed (MprisMediaPlayer2Skeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)
+{
+ ChangedProperty *cp;
+ GList *l;
+ cp = NULL;
+ for (l = skeleton->priv->changed_properties; l != NULL; l = l->next)
+ {
+ ChangedProperty *i_cp = l->data;
+ if (i_cp->info == info)
+ {
+ cp = i_cp;
+ break;
+ }
+ }
+ if (cp == NULL)
+ {
+ cp = g_new0 (ChangedProperty, 1);
+ cp->prop_id = prop_id;
+ cp->info = info;
+ skeleton->priv->changed_properties = g_list_prepend (skeleton->priv->changed_properties, cp);
+ g_value_init (&cp->orig_value, G_VALUE_TYPE (orig_value));
+ g_value_copy (orig_value, &cp->orig_value);
+ }
+}
+
+static void
+mpris_media_player2_skeleton_notify (GObject *object,
+ GParamSpec *pspec)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
+ g_mutex_lock (skeleton->priv->lock);
+ if (skeleton->priv->changed_properties != NULL &&
+ skeleton->priv->changed_properties_idle_source == NULL)
+ {
+ skeleton->priv->changed_properties_idle_source = g_idle_source_new ();
+ g_source_set_priority (skeleton->priv->changed_properties_idle_source, G_PRIORITY_DEFAULT);
+ g_source_set_callback (skeleton->priv->changed_properties_idle_source, _mpris_media_player2_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);
+ g_source_attach (skeleton->priv->changed_properties_idle_source, skeleton->priv->context);
+ g_source_unref (skeleton->priv->changed_properties_idle_source);
+ }
+ g_mutex_unlock (skeleton->priv->lock);
+}
+
+static void
+mpris_media_player2_skeleton_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
+ g_assert (prop_id != 0 && prop_id - 1 < 5);
+ g_mutex_lock (skeleton->priv->lock);
+ g_object_freeze_notify (object);
+ if (!_g_value_equal (value, &skeleton->priv->properties->values[prop_id - 1]))
+ {
+ if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL)
+ _mpris_media_player2_schedule_emit_changed (skeleton, _mpris_media_player2_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties->values[prop_id - 1]);
+ g_value_copy (value, &skeleton->priv->properties->values[prop_id - 1]);
+ g_object_notify_by_pspec (object, pspec);
+ }
+ g_mutex_unlock (skeleton->priv->lock);
+ g_object_thaw_notify (object);
+}
+
+static void
+mpris_media_player2_skeleton_init (MprisMediaPlayer2Skeleton *skeleton)
+{
+ skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, MPRIS_TYPE_MEDIA_PLAYER2_SKELETON, MprisMediaPlayer2SkeletonPrivate);
+ skeleton->priv->lock = g_mutex_new ();
+ skeleton->priv->context = g_main_context_get_thread_default ();
+ if (skeleton->priv->context != NULL)
+ g_main_context_ref (skeleton->priv->context);
+ skeleton->priv->properties = g_value_array_new (5);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[0], G_TYPE_BOOLEAN);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[1], G_TYPE_BOOLEAN);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[2], G_TYPE_STRING);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[3], G_TYPE_BOOLEAN);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[4], G_TYPE_STRING);
+}
+
+static gboolean 
+mpris_media_player2_skeleton_get_can_quit (MprisMediaPlayer2 *object)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
+ gboolean value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_boolean (&(skeleton->priv->properties->values[0]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_skeleton_get_can_raise (MprisMediaPlayer2 *object)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
+ gboolean value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_boolean (&(skeleton->priv->properties->values[1]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static const gchar *
+mpris_media_player2_skeleton_get_desktop_entry (MprisMediaPlayer2 *object)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
+ const gchar *value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_string (&(skeleton->priv->properties->values[2]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_skeleton_get_has_track_list (MprisMediaPlayer2 *object)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
+ gboolean value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_boolean (&(skeleton->priv->properties->values[3]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static const gchar *
+mpris_media_player2_skeleton_get_identity (MprisMediaPlayer2 *object)
+{
+ MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
+ const gchar *value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_string (&(skeleton->priv->properties->values[4]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static void
+mpris_media_player2_skeleton_class_init (MprisMediaPlayer2SkeletonClass *klass)
+{
+ GObjectClass *gobject_class;
+ GDBusInterfaceSkeletonClass *skeleton_class;
+
+ g_type_class_add_private (klass, sizeof (MprisMediaPlayer2SkeletonPrivate));
+
+ gobject_class = G_OBJECT_CLASS (klass);
+ gobject_class->finalize = mpris_media_player2_skeleton_finalize;
+ gobject_class->get_property = mpris_media_player2_skeleton_get_property;
+ gobject_class->set_property = mpris_media_player2_skeleton_set_property;
+ gobject_class->notify = mpris_media_player2_skeleton_notify;
+
+
+ mpris_media_player2_override_properties (gobject_class, 1);
+
+ skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
+ skeleton_class->get_info = mpris_media_player2_skeleton_dbus_interface_get_info;
+ skeleton_class->get_properties = mpris_media_player2_skeleton_dbus_interface_get_properties;
+ skeleton_class->flush = mpris_media_player2_skeleton_dbus_interface_flush;
+ skeleton_class->get_vtable = mpris_media_player2_skeleton_dbus_interface_get_vtable;
+}
+
+static void
+mpris_media_player2_skeleton_iface_init (MprisMediaPlayer2Iface *iface)
+{
+ iface->get_can_quit = mpris_media_player2_skeleton_get_can_quit;
+ iface->get_can_raise = mpris_media_player2_skeleton_get_can_raise;
+ iface->get_desktop_entry = mpris_media_player2_skeleton_get_desktop_entry;
+ iface->get_has_track_list = mpris_media_player2_skeleton_get_has_track_list;
+ iface->get_identity = mpris_media_player2_skeleton_get_identity;
+}
+
+/**
+ * mpris_media_player2_skeleton_new:
+ *
+ * Creates a skeleton object for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link>.
+ *
+ * Returns: (transfer full) (type MprisMediaPlayer2Skeleton): The skeleton object.
+ */
+MprisMediaPlayer2 *
+mpris_media_player2_skeleton_new (void)
+{
+ return MPRIS_MEDIA_PLAYER2 (g_object_new (MPRIS_TYPE_MEDIA_PLAYER2_SKELETON, NULL));
+}
+

audacious-plugins-3.2.4.tar.bz2/src/mpris2/object-core.h Added

@@ -0,0 +1,221 @@
+/*
+ * Generated by gdbus-codegen 2.30.2. DO NOT EDIT.
+ *
+ * The license of this code is the same as for the source it was derived from.
+ */
+
+#ifndef __OBJECT_CORE_H__
+#define __OBJECT_CORE_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+
+/* ------------------------------------------------------------------------ */
+/* Declarations for org.mpris.MediaPlayer2 */
+
+#define MPRIS_TYPE_MEDIA_PLAYER2 (mpris_media_player2_get_type ())
+#define MPRIS_MEDIA_PLAYER2(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MPRIS_TYPE_MEDIA_PLAYER2, MprisMediaPlayer2))
+#define MPRIS_IS_MEDIA_PLAYER2(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MPRIS_TYPE_MEDIA_PLAYER2))
+#define MPRIS_MEDIA_PLAYER2_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), MPRIS_TYPE_MEDIA_PLAYER2, MprisMediaPlayer2Iface))
+
+struct _MprisMediaPlayer2;
+typedef struct _MprisMediaPlayer2 MprisMediaPlayer2;
+typedef struct _MprisMediaPlayer2Iface MprisMediaPlayer2Iface;
+
+struct _MprisMediaPlayer2Iface
+{
+ GTypeInterface parent_iface;
+
+
+ gboolean (*handle_quit) (
+ MprisMediaPlayer2 *object,
+ GDBusMethodInvocation *invocation);
+
+ gboolean (*handle_raise) (
+ MprisMediaPlayer2 *object,
+ GDBusMethodInvocation *invocation);
+
+ gboolean (*get_can_quit) (MprisMediaPlayer2 *object);
+
+ gboolean (*get_can_raise) (MprisMediaPlayer2 *object);
+
+ const gchar * (*get_desktop_entry) (MprisMediaPlayer2 *object);
+
+ gboolean (*get_has_track_list) (MprisMediaPlayer2 *object);
+
+ const gchar * (*get_identity) (MprisMediaPlayer2 *object);
+
+};
+
+GType mpris_media_player2_get_type (void) G_GNUC_CONST;
+
+GDBusInterfaceInfo *mpris_media_player2_interface_info (void);
+guint mpris_media_player2_override_properties (GObjectClass *klass, guint property_id_begin);
+
+
+/* D-Bus method call completion functions: */
+void mpris_media_player2_complete_quit (
+ MprisMediaPlayer2 *object,
+ GDBusMethodInvocation *invocation);
+
+void mpris_media_player2_complete_raise (
+ MprisMediaPlayer2 *object,
+ GDBusMethodInvocation *invocation);
+
+
+
+/* D-Bus method calls: */
+void mpris_media_player2_call_quit (
+ MprisMediaPlayer2 *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean mpris_media_player2_call_quit_finish (
+ MprisMediaPlayer2 *proxy,
+ GAsyncResult *res,
+ GError **error);
+
+gboolean mpris_media_player2_call_quit_sync (
+ MprisMediaPlayer2 *proxy,
+ GCancellable *cancellable,
+ GError **error);
+
+void mpris_media_player2_call_raise (
+ MprisMediaPlayer2 *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean mpris_media_player2_call_raise_finish (
+ MprisMediaPlayer2 *proxy,
+ GAsyncResult *res,
+ GError **error);
+
+gboolean mpris_media_player2_call_raise_sync (
+ MprisMediaPlayer2 *proxy,
+ GCancellable *cancellable,
+ GError **error);
+
+
+
+/* D-Bus property accessors: */
+gboolean mpris_media_player2_get_can_quit (MprisMediaPlayer2 *object);
+void mpris_media_player2_set_can_quit (MprisMediaPlayer2 *object, gboolean value);
+
+gboolean mpris_media_player2_get_can_raise (MprisMediaPlayer2 *object);
+void mpris_media_player2_set_can_raise (MprisMediaPlayer2 *object, gboolean value);
+
+const gchar *mpris_media_player2_get_desktop_entry (MprisMediaPlayer2 *object);
+gchar *mpris_media_player2_dup_desktop_entry (MprisMediaPlayer2 *object);
+void mpris_media_player2_set_desktop_entry (MprisMediaPlayer2 *object, const gchar *value);
+
+gboolean mpris_media_player2_get_has_track_list (MprisMediaPlayer2 *object);
+void mpris_media_player2_set_has_track_list (MprisMediaPlayer2 *object, gboolean value);
+
+const gchar *mpris_media_player2_get_identity (MprisMediaPlayer2 *object);
+gchar *mpris_media_player2_dup_identity (MprisMediaPlayer2 *object);
+void mpris_media_player2_set_identity (MprisMediaPlayer2 *object, const gchar *value);
+
+
+/* ---- */
+
+#define MPRIS_TYPE_MEDIA_PLAYER2_PROXY (mpris_media_player2_proxy_get_type ())
+#define MPRIS_MEDIA_PLAYER2_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MPRIS_TYPE_MEDIA_PLAYER2_PROXY, MprisMediaPlayer2Proxy))
+#define MPRIS_MEDIA_PLAYER2_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), MPRIS_TYPE_MEDIA_PLAYER2_PROXY, MprisMediaPlayer2ProxyClass))
+#define MPRIS_MEDIA_PLAYER2_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MPRIS_TYPE_MEDIA_PLAYER2_PROXY, MprisMediaPlayer2ProxyClass))
+#define MPRIS_IS_MEDIA_PLAYER2_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MPRIS_TYPE_MEDIA_PLAYER2_PROXY))
+#define MPRIS_IS_MEDIA_PLAYER2_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MPRIS_TYPE_MEDIA_PLAYER2_PROXY))
+
+typedef struct _MprisMediaPlayer2Proxy MprisMediaPlayer2Proxy;
+typedef struct _MprisMediaPlayer2ProxyClass MprisMediaPlayer2ProxyClass;
+typedef struct _MprisMediaPlayer2ProxyPrivate MprisMediaPlayer2ProxyPrivate;
+
+struct _MprisMediaPlayer2Proxy
+{
+ /*< private >*/
+ GDBusProxy parent_instance;
+ MprisMediaPlayer2ProxyPrivate *priv;
+};
+
+struct _MprisMediaPlayer2ProxyClass
+{
+ GDBusProxyClass parent_class;
+};
+
+GType mpris_media_player2_proxy_get_type (void) G_GNUC_CONST;
+
+void mpris_media_player2_proxy_new (
+ GDBusConnection *connection,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+MprisMediaPlayer2 *mpris_media_player2_proxy_new_finish (
+ GAsyncResult *res,
+ GError **error);
+MprisMediaPlayer2 *mpris_media_player2_proxy_new_sync (
+ GDBusConnection *connection,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GError **error);
+
+void mpris_media_player2_proxy_new_for_bus (
+ GBusType bus_type,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+MprisMediaPlayer2 *mpris_media_player2_proxy_new_for_bus_finish (
+ GAsyncResult *res,
+ GError **error);
+MprisMediaPlayer2 *mpris_media_player2_proxy_new_for_bus_sync (
+ GBusType bus_type,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GError **error);
+
+
+/* ---- */
+
+#define MPRIS_TYPE_MEDIA_PLAYER2_SKELETON (mpris_media_player2_skeleton_get_type ())
+#define MPRIS_MEDIA_PLAYER2_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MPRIS_TYPE_MEDIA_PLAYER2_SKELETON, MprisMediaPlayer2Skeleton))
+#define MPRIS_MEDIA_PLAYER2_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), MPRIS_TYPE_MEDIA_PLAYER2_SKELETON, MprisMediaPlayer2SkeletonClass))
+#define MPRIS_MEDIA_PLAYER2_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MPRIS_TYPE_MEDIA_PLAYER2_SKELETON, MprisMediaPlayer2SkeletonClass))
+#define MPRIS_IS_MEDIA_PLAYER2_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MPRIS_TYPE_MEDIA_PLAYER2_SKELETON))
+#define MPRIS_IS_MEDIA_PLAYER2_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MPRIS_TYPE_MEDIA_PLAYER2_SKELETON))
+
+typedef struct _MprisMediaPlayer2Skeleton MprisMediaPlayer2Skeleton;
+typedef struct _MprisMediaPlayer2SkeletonClass MprisMediaPlayer2SkeletonClass;
+typedef struct _MprisMediaPlayer2SkeletonPrivate MprisMediaPlayer2SkeletonPrivate;
+
+struct _MprisMediaPlayer2Skeleton
+{
+ /*< private >*/
+ GDBusInterfaceSkeleton parent_instance;
+ MprisMediaPlayer2SkeletonPrivate *priv;
+};
+
+struct _MprisMediaPlayer2SkeletonClass
+{
+ GDBusInterfaceSkeletonClass parent_class;
+};
+
+GType mpris_media_player2_skeleton_get_type (void) G_GNUC_CONST;
+
+MprisMediaPlayer2 *mpris_media_player2_skeleton_new (void);
+
+
+G_END_DECLS
+
+#endif /* __OBJECT_CORE_H__ */

audacious-plugins-3.2.4.tar.bz2/src/mpris2/object-player.c Added

@@ -0,0 +1,2650 @@
+/*
+ * Generated by gdbus-codegen 2.30.2. DO NOT EDIT.
+ *
+ * The license of this code is the same as for the source it was derived from.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "object-player.h"
+
+#ifdef G_OS_UNIX
+# include <gio/gunixfdlist.h>
+#endif
+
+typedef struct
+{
+ GDBusArgInfo parent_struct;
+ gboolean use_gvariant;
+} _ExtendedGDBusArgInfo;
+
+typedef struct
+{
+ GDBusMethodInfo parent_struct;
+ const gchar *signal_name;
+ gboolean pass_fdlist;
+} _ExtendedGDBusMethodInfo;
+
+typedef struct
+{
+ GDBusSignalInfo parent_struct;
+ const gchar *signal_name;
+} _ExtendedGDBusSignalInfo;
+
+typedef struct
+{
+ GDBusPropertyInfo parent_struct;
+ const gchar *hyphen_name;
+ gboolean use_gvariant;
+} _ExtendedGDBusPropertyInfo;
+
+typedef struct
+{
+ GDBusInterfaceInfo parent_struct;
+ const gchar *hyphen_name;
+} _ExtendedGDBusInterfaceInfo;
+
+typedef struct
+{
+ const _ExtendedGDBusPropertyInfo *info;
+ guint prop_id;
+ GValue orig_value; /* the value before the change */
+} ChangedProperty;
+
+static void
+_changed_property_free (ChangedProperty *data)
+{
+ g_value_unset (&data->orig_value);
+ g_free (data);
+}
+
+static gboolean
+_g_strv_equal0 (gchar **a, gchar **b)
+{
+ gboolean ret = FALSE;
+ guint n;
+ if (a == NULL && b == NULL)
+ {
+ ret = TRUE;
+ goto out;
+ }
+ if (a == NULL || b == NULL)
+ goto out;
+ if (g_strv_length (a) != g_strv_length (b))
+ goto out;
+ for (n = 0; a[n] != NULL; n++)
+ if (g_strcmp0 (a[n], b[n]) != 0)
+ goto out;
+ ret = TRUE;
+out:
+ return ret;
+}
+
+static gboolean
+_g_variant_equal0 (GVariant *a, GVariant *b)
+{
+ gboolean ret = FALSE;
+ if (a == NULL && b == NULL)
+ {
+ ret = TRUE;
+ goto out;
+ }
+ if (a == NULL || b == NULL)
+ goto out;
+ ret = g_variant_equal (a, b);
+out:
+ return ret;
+}
+
+G_GNUC_UNUSED static gboolean
+_g_value_equal (const GValue *a, const GValue *b)
+{
+ gboolean ret = FALSE;
+ g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));
+ switch (G_VALUE_TYPE (a))
+ {
+ case G_TYPE_BOOLEAN:
+ ret = (g_value_get_boolean (a) == g_value_get_boolean (b));
+ break;
+ case G_TYPE_UCHAR:
+ ret = (g_value_get_uchar (a) == g_value_get_uchar (b));
+ break;
+ case G_TYPE_INT:
+ ret = (g_value_get_int (a) == g_value_get_int (b));
+ break;
+ case G_TYPE_UINT:
+ ret = (g_value_get_uint (a) == g_value_get_uint (b));
+ break;
+ case G_TYPE_INT64:
+ ret = (g_value_get_int64 (a) == g_value_get_int64 (b));
+ break;
+ case G_TYPE_UINT64:
+ ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));
+ break;
+ case G_TYPE_DOUBLE:
+ ret = (g_value_get_double (a) == g_value_get_double (b));
+ break;
+ case G_TYPE_STRING:
+ ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);
+ break;
+ case G_TYPE_VARIANT:
+ ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));
+ break;
+ default:
+ if (G_VALUE_TYPE (a) == G_TYPE_STRV)
+ ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));
+ else
+ g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));
+ break;
+ }
+ return ret;
+}
+
+/* ------------------------------------------------------------------------
+ * Code for interface org.mpris.MediaPlayer2.Player
+ * ------------------------------------------------------------------------
+ */
+
+/**
+ * SECTION:MprisMediaPlayer2Player
+ * @title: MprisMediaPlayer2Player
+ * @short_description: Generated C code for the org.mpris.MediaPlayer2.Player D-Bus interface
+ *
+ * This section contains code for working with the <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link> D-Bus interface in C.
+ */
+
+/* ---- Introspection data for org.mpris.MediaPlayer2.Player ---- */
+
+static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_next =
+{
+ {
+ -1,
+ "Next",
+ NULL,
+ NULL,
+ NULL
+ },
+ "handle-next",
+ FALSE
+};
+
+static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_pause =
+{
+ {
+ -1,
+ "Pause",
+ NULL,
+ NULL,
+ NULL
+ },
+ "handle-pause",
+ FALSE
+};
+
+static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_play =
+{
+ {
+ -1,
+ "Play",
+ NULL,
+ NULL,
+ NULL
+ },
+ "handle-play",
+ FALSE
+};
+
+static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_play_pause =
+{
+ {
+ -1,
+ "PlayPause",
+ NULL,
+ NULL,
+ NULL
+ },
+ "handle-play-pause",
+ FALSE
+};
+
+static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_previous =
+{
+ {
+ -1,
+ "Previous",
+ NULL,
+ NULL,
+ NULL
+ },
+ "handle-previous",
+ FALSE
+};
+
+static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_stop =
+{
+ {
+ -1,
+ "Stop",
+ NULL,
+ NULL,
+ NULL
+ },
+ "handle-stop",
+ FALSE
+};
+
+static const _ExtendedGDBusMethodInfo * const _mpris_media_player2_player_method_info_pointers[] =
+{
+ &_mpris_media_player2_player_method_info_next,
+ &_mpris_media_player2_player_method_info_pause,
+ &_mpris_media_player2_player_method_info_play,
+ &_mpris_media_player2_player_method_info_play_pause,
+ &_mpris_media_player2_player_method_info_previous,
+ &_mpris_media_player2_player_method_info_stop,
+ NULL
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_can_control =
+{
+ {
+ -1,
+ "CanControl",
+ "b",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "can-control",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_can_go_next =
+{
+ {
+ -1,
+ "CanGoNext",
+ "b",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "can-go-next",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_can_go_previous =
+{
+ {
+ -1,
+ "CanGoPrevious",
+ "b",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "can-go-previous",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_can_pause =
+{
+ {
+ -1,
+ "CanPause",
+ "b",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "can-pause",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_can_play =
+{
+ {
+ -1,
+ "CanPlay",
+ "b",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "can-play",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_can_seek =
+{
+ {
+ -1,
+ "CanSeek",
+ "b",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "can-seek",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_metadata =
+{
+ {
+ -1,
+ "Metadata",
+ "a{sv}",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "metadata",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_playback_status =
+{
+ {
+ -1,
+ "PlaybackStatus",
+ "s",
+ G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+ NULL
+ },
+ "playback-status",
+ FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo * const _mpris_media_player2_player_property_info_pointers[] =
+{
+ &_mpris_media_player2_player_property_info_can_control,
+ &_mpris_media_player2_player_property_info_can_go_next,
+ &_mpris_media_player2_player_property_info_can_go_previous,
+ &_mpris_media_player2_player_property_info_can_pause,
+ &_mpris_media_player2_player_property_info_can_play,
+ &_mpris_media_player2_player_property_info_can_seek,
+ &_mpris_media_player2_player_property_info_metadata,
+ &_mpris_media_player2_player_property_info_playback_status,
+ NULL
+};
+
+static const _ExtendedGDBusInterfaceInfo _mpris_media_player2_player_interface_info =
+{
+ {
+ -1,
+ "org.mpris.MediaPlayer2.Player",
+ (GDBusMethodInfo **) &_mpris_media_player2_player_method_info_pointers,
+ NULL,
+ (GDBusPropertyInfo **) &_mpris_media_player2_player_property_info_pointers,
+ NULL
+ },
+ "media-player2-player",
+};
+
+
+/**
+ * mpris_media_player2_player_interface_info:
+ *
+ * Gets a machine-readable description of the <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link> D-Bus interface.
+ *
+ * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
+ */
+GDBusInterfaceInfo *
+mpris_media_player2_player_interface_info (void)
+{
+ return (GDBusInterfaceInfo *) &_mpris_media_player2_player_interface_info;
+}
+
+/**
+ * mpris_media_player2_player_override_properties:
+ * @klass: The class structure for a #GObject-derived class.
+ * @property_id_begin: The property id to assign to the first overridden property.
+ *
+ * Overrides all #GObject properties in the #MprisMediaPlayer2Player interface for a concrete class.
+ * The properties are overridden in the order they are defined.
+ *
+ * Returns: The last property id.
+ */
+guint
+mpris_media_player2_player_override_properties (GObjectClass *klass, guint property_id_begin)
+{
+ g_object_class_override_property (klass, property_id_begin++, "can-control");
+ g_object_class_override_property (klass, property_id_begin++, "can-go-next");
+ g_object_class_override_property (klass, property_id_begin++, "can-go-previous");
+ g_object_class_override_property (klass, property_id_begin++, "can-pause");
+ g_object_class_override_property (klass, property_id_begin++, "can-play");
+ g_object_class_override_property (klass, property_id_begin++, "can-seek");
+ g_object_class_override_property (klass, property_id_begin++, "metadata");
+ g_object_class_override_property (klass, property_id_begin++, "playback-status");
+ return property_id_begin - 1;
+}
+
+
+
+/**
+ * MprisMediaPlayer2Player:
+ *
+ * Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link>.
+ */
+
+/**
+ * MprisMediaPlayer2PlayerIface:
+ * @parent_iface: The parent interface.
+ * @handle_next: Handler for the #MprisMediaPlayer2Player::handle-next signal.
+ * @handle_pause: Handler for the #MprisMediaPlayer2Player::handle-pause signal.
+ * @handle_play: Handler for the #MprisMediaPlayer2Player::handle-play signal.
+ * @handle_play_pause: Handler for the #MprisMediaPlayer2Player::handle-play-pause signal.
+ * @handle_previous: Handler for the #MprisMediaPlayer2Player::handle-previous signal.
+ * @handle_stop: Handler for the #MprisMediaPlayer2Player::handle-stop signal.
+ * @get_can_control: Getter for the #MprisMediaPlayer2Player:can-control property.
+ * @get_can_go_next: Getter for the #MprisMediaPlayer2Player:can-go-next property.
+ * @get_can_go_previous: Getter for the #MprisMediaPlayer2Player:can-go-previous property.
+ * @get_can_pause: Getter for the #MprisMediaPlayer2Player:can-pause property.
+ * @get_can_play: Getter for the #MprisMediaPlayer2Player:can-play property.
+ * @get_can_seek: Getter for the #MprisMediaPlayer2Player:can-seek property.
+ * @get_metadata: Getter for the #MprisMediaPlayer2Player:metadata property.
+ * @get_playback_status: Getter for the #MprisMediaPlayer2Player:playback-status property.
+ *
+ * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link>.
+ */
+
+static void
+mpris_media_player2_player_default_init (MprisMediaPlayer2PlayerIface *iface)
+{
+ /* GObject signals for incoming D-Bus method calls: */
+ /**
+ * MprisMediaPlayer2Player::handle-next:
+ * @object: A #MprisMediaPlayer2Player.
+ * @invocation: A #GDBusMethodInvocation.
+ *
+ * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Next">Next()</link> D-Bus method.
+ *
+ * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_next() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+ *
+ * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
+ */
+ g_signal_new ("handle-next",
+ G_TYPE_FROM_INTERFACE (iface),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_next),
+ g_signal_accumulator_true_handled,
+ NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN,
+ 1,
+ G_TYPE_DBUS_METHOD_INVOCATION);
+
+ /**
+ * MprisMediaPlayer2Player::handle-pause:
+ * @object: A #MprisMediaPlayer2Player.
+ * @invocation: A #GDBusMethodInvocation.
+ *
+ * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Pause">Pause()</link> D-Bus method.
+ *
+ * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_pause() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+ *
+ * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
+ */
+ g_signal_new ("handle-pause",
+ G_TYPE_FROM_INTERFACE (iface),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_pause),
+ g_signal_accumulator_true_handled,
+ NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN,
+ 1,
+ G_TYPE_DBUS_METHOD_INVOCATION);
+
+ /**
+ * MprisMediaPlayer2Player::handle-play:
+ * @object: A #MprisMediaPlayer2Player.
+ * @invocation: A #GDBusMethodInvocation.
+ *
+ * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Play">Play()</link> D-Bus method.
+ *
+ * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_play() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+ *
+ * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
+ */
+ g_signal_new ("handle-play",
+ G_TYPE_FROM_INTERFACE (iface),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_play),
+ g_signal_accumulator_true_handled,
+ NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN,
+ 1,
+ G_TYPE_DBUS_METHOD_INVOCATION);
+
+ /**
+ * MprisMediaPlayer2Player::handle-play-pause:
+ * @object: A #MprisMediaPlayer2Player.
+ * @invocation: A #GDBusMethodInvocation.
+ *
+ * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.PlayPause">PlayPause()</link> D-Bus method.
+ *
+ * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_play_pause() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+ *
+ * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
+ */
+ g_signal_new ("handle-play-pause",
+ G_TYPE_FROM_INTERFACE (iface),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_play_pause),
+ g_signal_accumulator_true_handled,
+ NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN,
+ 1,
+ G_TYPE_DBUS_METHOD_INVOCATION);
+
+ /**
+ * MprisMediaPlayer2Player::handle-previous:
+ * @object: A #MprisMediaPlayer2Player.
+ * @invocation: A #GDBusMethodInvocation.
+ *
+ * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Previous">Previous()</link> D-Bus method.
+ *
+ * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_previous() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+ *
+ * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
+ */
+ g_signal_new ("handle-previous",
+ G_TYPE_FROM_INTERFACE (iface),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_previous),
+ g_signal_accumulator_true_handled,
+ NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN,
+ 1,
+ G_TYPE_DBUS_METHOD_INVOCATION);
+
+ /**
+ * MprisMediaPlayer2Player::handle-stop:
+ * @object: A #MprisMediaPlayer2Player.
+ * @invocation: A #GDBusMethodInvocation.
+ *
+ * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Stop">Stop()</link> D-Bus method.
+ *
+ * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_stop() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+ *
+ * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
+ */
+ g_signal_new ("handle-stop",
+ G_TYPE_FROM_INTERFACE (iface),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_stop),
+ g_signal_accumulator_true_handled,
+ NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN,
+ 1,
+ G_TYPE_DBUS_METHOD_INVOCATION);
+
+ /* GObject properties for D-Bus properties: */
+ /**
+ * MprisMediaPlayer2Player:can-control:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanControl">"CanControl"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_boolean ("can-control", "CanControl", "CanControl", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * MprisMediaPlayer2Player:can-go-next:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanGoNext">"CanGoNext"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_boolean ("can-go-next", "CanGoNext", "CanGoNext", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * MprisMediaPlayer2Player:can-go-previous:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanGoPrevious">"CanGoPrevious"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_boolean ("can-go-previous", "CanGoPrevious", "CanGoPrevious", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * MprisMediaPlayer2Player:can-pause:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanPause">"CanPause"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_boolean ("can-pause", "CanPause", "CanPause", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * MprisMediaPlayer2Player:can-play:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanPlay">"CanPlay"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_boolean ("can-play", "CanPlay", "CanPlay", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * MprisMediaPlayer2Player:can-seek:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanSeek">"CanSeek"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_boolean ("can-seek", "CanSeek", "CanSeek", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * MprisMediaPlayer2Player:metadata:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Metadata">"Metadata"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_variant ("metadata", "Metadata", "Metadata", G_VARIANT_TYPE ("a{sv}"), NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * MprisMediaPlayer2Player:playback-status:
+ *
+ * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.PlaybackStatus">"PlaybackStatus"</link>.
+ *
+ * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+ */
+ g_object_interface_install_property (iface,
+ g_param_spec_string ("playback-status", "PlaybackStatus", "PlaybackStatus", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+}
+
+typedef MprisMediaPlayer2PlayerIface MprisMediaPlayer2PlayerInterface;
+G_DEFINE_INTERFACE (MprisMediaPlayer2Player, mpris_media_player2_player, G_TYPE_OBJECT);
+
+/**
+ * mpris_media_player2_player_get_can_control: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanControl">"CanControl"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+gboolean 
+mpris_media_player2_player_get_can_control (MprisMediaPlayer2Player *object)
+{
+ return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_can_control (object);
+}
+
+/**
+ * mpris_media_player2_player_set_can_control: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanControl">"CanControl"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_player_set_can_control (MprisMediaPlayer2Player *object, gboolean value)
+{
+ g_object_set (G_OBJECT (object), "can-control", value, NULL);
+}
+
+/**
+ * mpris_media_player2_player_get_can_go_next: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanGoNext">"CanGoNext"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+gboolean 
+mpris_media_player2_player_get_can_go_next (MprisMediaPlayer2Player *object)
+{
+ return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_can_go_next (object);
+}
+
+/**
+ * mpris_media_player2_player_set_can_go_next: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanGoNext">"CanGoNext"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_player_set_can_go_next (MprisMediaPlayer2Player *object, gboolean value)
+{
+ g_object_set (G_OBJECT (object), "can-go-next", value, NULL);
+}
+
+/**
+ * mpris_media_player2_player_get_can_go_previous: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanGoPrevious">"CanGoPrevious"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+gboolean 
+mpris_media_player2_player_get_can_go_previous (MprisMediaPlayer2Player *object)
+{
+ return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_can_go_previous (object);
+}
+
+/**
+ * mpris_media_player2_player_set_can_go_previous: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanGoPrevious">"CanGoPrevious"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_player_set_can_go_previous (MprisMediaPlayer2Player *object, gboolean value)
+{
+ g_object_set (G_OBJECT (object), "can-go-previous", value, NULL);
+}
+
+/**
+ * mpris_media_player2_player_get_can_pause: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanPause">"CanPause"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+gboolean 
+mpris_media_player2_player_get_can_pause (MprisMediaPlayer2Player *object)
+{
+ return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_can_pause (object);
+}
+
+/**
+ * mpris_media_player2_player_set_can_pause: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanPause">"CanPause"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_player_set_can_pause (MprisMediaPlayer2Player *object, gboolean value)
+{
+ g_object_set (G_OBJECT (object), "can-pause", value, NULL);
+}
+
+/**
+ * mpris_media_player2_player_get_can_play: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanPlay">"CanPlay"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+gboolean 
+mpris_media_player2_player_get_can_play (MprisMediaPlayer2Player *object)
+{
+ return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_can_play (object);
+}
+
+/**
+ * mpris_media_player2_player_set_can_play: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanPlay">"CanPlay"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_player_set_can_play (MprisMediaPlayer2Player *object, gboolean value)
+{
+ g_object_set (G_OBJECT (object), "can-play", value, NULL);
+}
+
+/**
+ * mpris_media_player2_player_get_can_seek: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanSeek">"CanSeek"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+gboolean 
+mpris_media_player2_player_get_can_seek (MprisMediaPlayer2Player *object)
+{
+ return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_can_seek (object);
+}
+
+/**
+ * mpris_media_player2_player_set_can_seek: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanSeek">"CanSeek"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_player_set_can_seek (MprisMediaPlayer2Player *object, gboolean value)
+{
+ g_object_set (G_OBJECT (object), "can-seek", value, NULL);
+}
+
+/**
+ * mpris_media_player2_player_get_metadata: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Metadata">"Metadata"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use mpris_media_player2_player_dup_metadata() if on another thread.</warning>
+ *
+ * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
+ */
+GVariant *
+mpris_media_player2_player_get_metadata (MprisMediaPlayer2Player *object)
+{
+ return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_metadata (object);
+}
+
+/**
+ * mpris_media_player2_player_dup_metadata: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ *
+ * Gets a copy of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Metadata">"Metadata"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_variant_unref().
+ */
+GVariant *
+mpris_media_player2_player_dup_metadata (MprisMediaPlayer2Player *object)
+{
+ GVariant *value;
+ g_object_get (G_OBJECT (object), "metadata", &value, NULL);
+ return value;
+}
+
+/**
+ * mpris_media_player2_player_set_metadata: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Metadata">"Metadata"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_player_set_metadata (MprisMediaPlayer2Player *object, GVariant *value)
+{
+ g_object_set (G_OBJECT (object), "metadata", value, NULL);
+}
+
+/**
+ * mpris_media_player2_player_get_playback_status: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.PlaybackStatus">"PlaybackStatus"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use mpris_media_player2_player_dup_playback_status() if on another thread.</warning>
+ *
+ * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
+ */
+const gchar *
+mpris_media_player2_player_get_playback_status (MprisMediaPlayer2Player *object)
+{
+ return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_playback_status (object);
+}
+
+/**
+ * mpris_media_player2_player_dup_playback_status: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ *
+ * Gets a copy of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.PlaybackStatus">"PlaybackStatus"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
+ */
+gchar *
+mpris_media_player2_player_dup_playback_status (MprisMediaPlayer2Player *object)
+{
+ gchar *value;
+ g_object_get (G_OBJECT (object), "playback-status", &value, NULL);
+ return value;
+}
+
+/**
+ * mpris_media_player2_player_set_playback_status: (skip)
+ * @object: A #MprisMediaPlayer2Player.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.PlaybackStatus">"PlaybackStatus"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+mpris_media_player2_player_set_playback_status (MprisMediaPlayer2Player *object, const gchar *value)
+{
+ g_object_set (G_OBJECT (object), "playback-status", value, NULL);
+}
+
+/**
+ * mpris_media_player2_player_call_next:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Next">Next()</link> D-Bus method on @proxy.
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mpris_media_player2_player_call_next_finish() to get the result of the operation.
+ *
+ * See mpris_media_player2_player_call_next_sync() for the synchronous, blocking version of this method.
+ */
+void
+mpris_media_player2_player_call_next (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_dbus_proxy_call (G_DBUS_PROXY (proxy),
+ "Next",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ callback,
+ user_data);
+}
+
+/**
+ * mpris_media_player2_player_call_next_finish:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_next().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with mpris_media_player2_player_call_next().
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_player_call_next_finish (
+ MprisMediaPlayer2Player *proxy,
+ GAsyncResult *res,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_player_call_next_sync:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Next">Next()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
+ *
+ * See mpris_media_player2_player_call_next() for the asynchronous version of this method.
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_player_call_next_sync (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
+ "Next",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_player_call_pause:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Pause">Pause()</link> D-Bus method on @proxy.
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mpris_media_player2_player_call_pause_finish() to get the result of the operation.
+ *
+ * See mpris_media_player2_player_call_pause_sync() for the synchronous, blocking version of this method.
+ */
+void
+mpris_media_player2_player_call_pause (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_dbus_proxy_call (G_DBUS_PROXY (proxy),
+ "Pause",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ callback,
+ user_data);
+}
+
+/**
+ * mpris_media_player2_player_call_pause_finish:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_pause().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with mpris_media_player2_player_call_pause().
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_player_call_pause_finish (
+ MprisMediaPlayer2Player *proxy,
+ GAsyncResult *res,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_player_call_pause_sync:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Pause">Pause()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
+ *
+ * See mpris_media_player2_player_call_pause() for the asynchronous version of this method.
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_player_call_pause_sync (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
+ "Pause",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_player_call_play:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Play">Play()</link> D-Bus method on @proxy.
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mpris_media_player2_player_call_play_finish() to get the result of the operation.
+ *
+ * See mpris_media_player2_player_call_play_sync() for the synchronous, blocking version of this method.
+ */
+void
+mpris_media_player2_player_call_play (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_dbus_proxy_call (G_DBUS_PROXY (proxy),
+ "Play",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ callback,
+ user_data);
+}
+
+/**
+ * mpris_media_player2_player_call_play_finish:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_play().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with mpris_media_player2_player_call_play().
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_player_call_play_finish (
+ MprisMediaPlayer2Player *proxy,
+ GAsyncResult *res,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_player_call_play_sync:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Play">Play()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
+ *
+ * See mpris_media_player2_player_call_play() for the asynchronous version of this method.
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_player_call_play_sync (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
+ "Play",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_player_call_play_pause:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.PlayPause">PlayPause()</link> D-Bus method on @proxy.
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mpris_media_player2_player_call_play_pause_finish() to get the result of the operation.
+ *
+ * See mpris_media_player2_player_call_play_pause_sync() for the synchronous, blocking version of this method.
+ */
+void
+mpris_media_player2_player_call_play_pause (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_dbus_proxy_call (G_DBUS_PROXY (proxy),
+ "PlayPause",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ callback,
+ user_data);
+}
+
+/**
+ * mpris_media_player2_player_call_play_pause_finish:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_play_pause().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with mpris_media_player2_player_call_play_pause().
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_player_call_play_pause_finish (
+ MprisMediaPlayer2Player *proxy,
+ GAsyncResult *res,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_player_call_play_pause_sync:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.PlayPause">PlayPause()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
+ *
+ * See mpris_media_player2_player_call_play_pause() for the asynchronous version of this method.
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_player_call_play_pause_sync (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
+ "PlayPause",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_player_call_previous:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Previous">Previous()</link> D-Bus method on @proxy.
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mpris_media_player2_player_call_previous_finish() to get the result of the operation.
+ *
+ * See mpris_media_player2_player_call_previous_sync() for the synchronous, blocking version of this method.
+ */
+void
+mpris_media_player2_player_call_previous (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_dbus_proxy_call (G_DBUS_PROXY (proxy),
+ "Previous",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ callback,
+ user_data);
+}
+
+/**
+ * mpris_media_player2_player_call_previous_finish:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_previous().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with mpris_media_player2_player_call_previous().
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_player_call_previous_finish (
+ MprisMediaPlayer2Player *proxy,
+ GAsyncResult *res,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_player_call_previous_sync:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Previous">Previous()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
+ *
+ * See mpris_media_player2_player_call_previous() for the asynchronous version of this method.
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_player_call_previous_sync (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
+ "Previous",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_player_call_stop:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Stop">Stop()</link> D-Bus method on @proxy.
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mpris_media_player2_player_call_stop_finish() to get the result of the operation.
+ *
+ * See mpris_media_player2_player_call_stop_sync() for the synchronous, blocking version of this method.
+ */
+void
+mpris_media_player2_player_call_stop (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_dbus_proxy_call (G_DBUS_PROXY (proxy),
+ "Stop",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ callback,
+ user_data);
+}
+
+/**
+ * mpris_media_player2_player_call_stop_finish:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_stop().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with mpris_media_player2_player_call_stop().
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_player_call_stop_finish (
+ MprisMediaPlayer2Player *proxy,
+ GAsyncResult *res,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_player_call_stop_sync:
+ * @proxy: A #MprisMediaPlayer2PlayerProxy.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Stop">Stop()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
+ *
+ * See mpris_media_player2_player_call_stop() for the asynchronous version of this method.
+ *
+ * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
+ */
+gboolean
+mpris_media_player2_player_call_stop_sync (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GVariant *_ret;
+ _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
+ "Stop",
+ g_variant_new ("()"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ cancellable,
+ error);
+ if (_ret == NULL)
+ goto _out;
+ g_variant_get (_ret,
+ "()");
+ g_variant_unref (_ret);
+_out:
+ return _ret != NULL;
+}
+
+/**
+ * mpris_media_player2_player_complete_next:
+ * @object: A #MprisMediaPlayer2Player.
+ * @invocation: (transfer full): A #GDBusMethodInvocation.
+ *
+ * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Next">Next()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
+ *
+ * This method will free @invocation, you cannot use it afterwards.
+ */
+void
+mpris_media_player2_player_complete_next (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation)
+{
+ g_dbus_method_invocation_return_value (invocation,
+ g_variant_new ("()"));
+}
+
+/**
+ * mpris_media_player2_player_complete_pause:
+ * @object: A #MprisMediaPlayer2Player.
+ * @invocation: (transfer full): A #GDBusMethodInvocation.
+ *
+ * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Pause">Pause()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
+ *
+ * This method will free @invocation, you cannot use it afterwards.
+ */
+void
+mpris_media_player2_player_complete_pause (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation)
+{
+ g_dbus_method_invocation_return_value (invocation,
+ g_variant_new ("()"));
+}
+
+/**
+ * mpris_media_player2_player_complete_play:
+ * @object: A #MprisMediaPlayer2Player.
+ * @invocation: (transfer full): A #GDBusMethodInvocation.
+ *
+ * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Play">Play()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
+ *
+ * This method will free @invocation, you cannot use it afterwards.
+ */
+void
+mpris_media_player2_player_complete_play (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation)
+{
+ g_dbus_method_invocation_return_value (invocation,
+ g_variant_new ("()"));
+}
+
+/**
+ * mpris_media_player2_player_complete_play_pause:
+ * @object: A #MprisMediaPlayer2Player.
+ * @invocation: (transfer full): A #GDBusMethodInvocation.
+ *
+ * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.PlayPause">PlayPause()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
+ *
+ * This method will free @invocation, you cannot use it afterwards.
+ */
+void
+mpris_media_player2_player_complete_play_pause (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation)
+{
+ g_dbus_method_invocation_return_value (invocation,
+ g_variant_new ("()"));
+}
+
+/**
+ * mpris_media_player2_player_complete_previous:
+ * @object: A #MprisMediaPlayer2Player.
+ * @invocation: (transfer full): A #GDBusMethodInvocation.
+ *
+ * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Previous">Previous()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
+ *
+ * This method will free @invocation, you cannot use it afterwards.
+ */
+void
+mpris_media_player2_player_complete_previous (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation)
+{
+ g_dbus_method_invocation_return_value (invocation,
+ g_variant_new ("()"));
+}
+
+/**
+ * mpris_media_player2_player_complete_stop:
+ * @object: A #MprisMediaPlayer2Player.
+ * @invocation: (transfer full): A #GDBusMethodInvocation.
+ *
+ * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Stop">Stop()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
+ *
+ * This method will free @invocation, you cannot use it afterwards.
+ */
+void
+mpris_media_player2_player_complete_stop (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation)
+{
+ g_dbus_method_invocation_return_value (invocation,
+ g_variant_new ("()"));
+}
+
+/* ------------------------------------------------------------------------ */
+
+/**
+ * MprisMediaPlayer2PlayerProxy:
+ *
+ * The #MprisMediaPlayer2PlayerProxy structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * MprisMediaPlayer2PlayerProxyClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #MprisMediaPlayer2PlayerProxy.
+ */
+
+struct _MprisMediaPlayer2PlayerProxyPrivate
+{
+ GData *qdata;
+};
+
+static void mpris_media_player2_player_proxy_iface_init (MprisMediaPlayer2PlayerIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (MprisMediaPlayer2PlayerProxy, mpris_media_player2_player_proxy, G_TYPE_DBUS_PROXY,
+ G_IMPLEMENT_INTERFACE (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER, mpris_media_player2_player_proxy_iface_init));
+
+static void
+mpris_media_player2_player_proxy_finalize (GObject *object)
+{
+ MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
+ g_datalist_clear (&proxy->priv->qdata);
+ G_OBJECT_CLASS (mpris_media_player2_player_proxy_parent_class)->finalize (object);
+}
+
+static void
+mpris_media_player2_player_proxy_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ const _ExtendedGDBusPropertyInfo *info;
+ GVariant *variant;
+ g_assert (prop_id != 0 && prop_id - 1 < 8);
+ info = _mpris_media_player2_player_property_info_pointers[prop_id - 1];
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name);
+ if (info->use_gvariant)
+ {
+ g_value_set_variant (value, variant);
+ }
+ else
+ {
+ if (variant != NULL)
+ g_dbus_gvariant_to_gvalue (variant, value);
+ }
+ if (variant != NULL)
+ g_variant_unref (variant);
+}
+
+static void
+mpris_media_player2_player_proxy_set_property_cb (GDBusProxy *proxy,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ const _ExtendedGDBusPropertyInfo *info = user_data;
+ GError *error;
+ error = NULL;
+ if (!g_dbus_proxy_call_finish (proxy, res, &error))
+ {
+ g_warning ("Error setting property `%s' on interface org.mpris.MediaPlayer2.Player: %s (%s, %d)",
+ info->parent_struct.name, 
+ error->message, g_quark_to_string (error->domain), error->code);
+ g_error_free (error);
+ }
+}
+
+static void
+mpris_media_player2_player_proxy_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ const _ExtendedGDBusPropertyInfo *info;
+ GVariant *variant;
+ g_assert (prop_id != 0 && prop_id - 1 < 8);
+ info = _mpris_media_player2_player_property_info_pointers[prop_id - 1];
+ variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature));
+ g_dbus_proxy_call (G_DBUS_PROXY (object),
+ "org.freedesktop.DBus.Properties.Set",
+ g_variant_new ("(ssv)", "org.mpris.MediaPlayer2.Player", info->parent_struct.name, variant),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL, (GAsyncReadyCallback) mpris_media_player2_player_proxy_set_property_cb, (gpointer) info);
+ g_variant_unref (variant);
+}
+
+static void
+mpris_media_player2_player_proxy_g_signal (GDBusProxy *proxy,
+ const gchar *sender_name,
+ const gchar *signal_name,
+ GVariant *parameters)
+{
+ _ExtendedGDBusSignalInfo *info;
+ GVariantIter iter;
+ GVariant *child;
+ GValue *paramv;
+ guint num_params;
+ guint n;
+ guint signal_id;
+ info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_mpris_media_player2_player_interface_info, signal_name);
+ if (info == NULL)
+ return;
+ num_params = g_variant_n_children (parameters);
+ paramv = g_new0 (GValue, num_params + 1);
+ g_value_init (&paramv[0], MPRIS_TYPE_MEDIA_PLAYER2_PLAYER);
+ g_value_set_object (&paramv[0], proxy);
+ g_variant_iter_init (&iter, parameters);
+ n = 1;
+ while ((child = g_variant_iter_next_value (&iter)) != NULL)
+ {
+ _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1];
+ if (arg_info->use_gvariant)
+ {
+ g_value_init (&paramv[n], G_TYPE_VARIANT);
+ g_value_set_variant (&paramv[n], child);
+ n++;
+ }
+ else
+ g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
+ g_variant_unref (child);
+ }
+ signal_id = g_signal_lookup (info->signal_name, MPRIS_TYPE_MEDIA_PLAYER2_PLAYER);
+ g_signal_emitv (paramv, signal_id, 0, NULL);
+ for (n = 0; n < num_params + 1; n++)
+ g_value_unset (&paramv[n]);
+ g_free (paramv);
+}
+
+static void
+mpris_media_player2_player_proxy_g_properties_changed (GDBusProxy *_proxy,
+ GVariant *changed_properties,
+ const gchar *const *invalidated_properties)
+{
+ MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (_proxy);
+ guint n;
+ const gchar *key;
+ GVariantIter *iter;
+ _ExtendedGDBusPropertyInfo *info;
+ g_variant_get (changed_properties, "a{sv}", &iter);
+ while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
+ {
+ info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_player_interface_info, key);
+ g_datalist_remove_data (&proxy->priv->qdata, key);
+ if (info != NULL)
+ g_object_notify (G_OBJECT (proxy), info->hyphen_name);
+ }
+ g_variant_iter_free (iter);
+ for (n = 0; invalidated_properties[n] != NULL; n++)
+ {
+ info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_player_interface_info, invalidated_properties[n]);
+ g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
+ if (info != NULL)
+ g_object_notify (G_OBJECT (proxy), info->hyphen_name);
+ }
+}
+
+static gboolean 
+mpris_media_player2_player_proxy_get_can_control (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
+ GVariant *variant;
+ gboolean value = 0;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanControl");
+ if (variant != NULL)
+ {
+ value = g_variant_get_boolean (variant);
+ g_variant_unref (variant);
+ }
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_player_proxy_get_can_go_next (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
+ GVariant *variant;
+ gboolean value = 0;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanGoNext");
+ if (variant != NULL)
+ {
+ value = g_variant_get_boolean (variant);
+ g_variant_unref (variant);
+ }
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_player_proxy_get_can_go_previous (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
+ GVariant *variant;
+ gboolean value = 0;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanGoPrevious");
+ if (variant != NULL)
+ {
+ value = g_variant_get_boolean (variant);
+ g_variant_unref (variant);
+ }
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_player_proxy_get_can_pause (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
+ GVariant *variant;
+ gboolean value = 0;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanPause");
+ if (variant != NULL)
+ {
+ value = g_variant_get_boolean (variant);
+ g_variant_unref (variant);
+ }
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_player_proxy_get_can_play (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
+ GVariant *variant;
+ gboolean value = 0;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanPlay");
+ if (variant != NULL)
+ {
+ value = g_variant_get_boolean (variant);
+ g_variant_unref (variant);
+ }
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_player_proxy_get_can_seek (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
+ GVariant *variant;
+ gboolean value = 0;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanSeek");
+ if (variant != NULL)
+ {
+ value = g_variant_get_boolean (variant);
+ g_variant_unref (variant);
+ }
+ return value;
+}
+
+static GVariant *
+mpris_media_player2_player_proxy_get_metadata (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
+ GVariant *variant;
+ GVariant *value = NULL;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Metadata");
+ value = variant;
+ if (variant != NULL)
+ g_variant_unref (variant);
+ return value;
+}
+
+static const gchar *
+mpris_media_player2_player_proxy_get_playback_status (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
+ GVariant *variant;
+ const gchar *value = NULL;
+ variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "PlaybackStatus");
+ if (variant != NULL)
+ {
+ value = g_variant_get_string (variant, NULL);
+ g_variant_unref (variant);
+ }
+ return value;
+}
+
+static void
+mpris_media_player2_player_proxy_init (MprisMediaPlayer2PlayerProxy *proxy)
+{
+ proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, MprisMediaPlayer2PlayerProxyPrivate);
+ g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), mpris_media_player2_player_interface_info ());
+}
+
+static void
+mpris_media_player2_player_proxy_class_init (MprisMediaPlayer2PlayerProxyClass *klass)
+{
+ GObjectClass *gobject_class;
+ GDBusProxyClass *proxy_class;
+
+ g_type_class_add_private (klass, sizeof (MprisMediaPlayer2PlayerProxyPrivate));
+
+ gobject_class = G_OBJECT_CLASS (klass);
+ gobject_class->finalize = mpris_media_player2_player_proxy_finalize;
+ gobject_class->get_property = mpris_media_player2_player_proxy_get_property;
+ gobject_class->set_property = mpris_media_player2_player_proxy_set_property;
+
+ proxy_class = G_DBUS_PROXY_CLASS (klass);
+ proxy_class->g_signal = mpris_media_player2_player_proxy_g_signal;
+ proxy_class->g_properties_changed = mpris_media_player2_player_proxy_g_properties_changed;
+
+
+ mpris_media_player2_player_override_properties (gobject_class, 1);
+}
+
+static void
+mpris_media_player2_player_proxy_iface_init (MprisMediaPlayer2PlayerIface *iface)
+{
+ iface->get_can_control = mpris_media_player2_player_proxy_get_can_control;
+ iface->get_can_go_next = mpris_media_player2_player_proxy_get_can_go_next;
+ iface->get_can_go_previous = mpris_media_player2_player_proxy_get_can_go_previous;
+ iface->get_can_pause = mpris_media_player2_player_proxy_get_can_pause;
+ iface->get_can_play = mpris_media_player2_player_proxy_get_can_play;
+ iface->get_can_seek = mpris_media_player2_player_proxy_get_can_seek;
+ iface->get_metadata = mpris_media_player2_player_proxy_get_metadata;
+ iface->get_playback_status = mpris_media_player2_player_proxy_get_playback_status;
+}
+
+/**
+ * mpris_media_player2_player_proxy_new:
+ * @connection: A #GDBusConnection.
+ * @flags: Flags from the #GDBusProxyFlags enumeration.
+ * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link>. See g_dbus_proxy_new() for more details.
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mpris_media_player2_player_proxy_new_finish() to get the result of the operation.
+ *
+ * See mpris_media_player2_player_proxy_new_sync() for the synchronous, blocking version of this constructor.
+ */
+void
+mpris_media_player2_player_proxy_new (
+ GDBusConnection *connection,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_async_initable_new_async (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2.Player", NULL);
+}
+
+/**
+ * mpris_media_player2_player_proxy_new_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_proxy_new().
+ * @error: Return location for error or %NULL
+ *
+ * Finishes an operation started with mpris_media_player2_player_proxy_new().
+ *
+ * Returns: (transfer full) (type MprisMediaPlayer2PlayerProxy): The constructed proxy object or %NULL if @error is set.
+ */
+MprisMediaPlayer2Player *
+mpris_media_player2_player_proxy_new_finish (
+ GAsyncResult *res,
+ GError **error)
+{
+ GObject *ret;
+ GObject *source_object;
+ source_object = g_async_result_get_source_object (res);
+ ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
+ g_object_unref (source_object);
+ if (ret != NULL)
+ return MPRIS_MEDIA_PLAYER2_PLAYER (ret);
+ else
+ return NULL;
+}
+
+/**
+ * mpris_media_player2_player_proxy_new_sync:
+ * @connection: A #GDBusConnection.
+ * @flags: Flags from the #GDBusProxyFlags enumeration.
+ * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL
+ *
+ * Synchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link>. See g_dbus_proxy_new_sync() for more details.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * See mpris_media_player2_player_proxy_new() for the asynchronous version of this constructor.
+ *
+ * Returns: (transfer full) (type MprisMediaPlayer2PlayerProxy): The constructed proxy object or %NULL if @error is set.
+ */
+MprisMediaPlayer2Player *
+mpris_media_player2_player_proxy_new_sync (
+ GDBusConnection *connection,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GInitable *ret;
+ ret = g_initable_new (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2.Player", NULL);
+ if (ret != NULL)
+ return MPRIS_MEDIA_PLAYER2_PLAYER (ret);
+ else
+ return NULL;
+}
+
+
+/**
+ * mpris_media_player2_player_proxy_new_for_bus:
+ * @bus_type: A #GBusType.
+ * @flags: Flags from the #GDBusProxyFlags enumeration.
+ * @name: A bus name (well-known or unique).
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ * Like mpris_media_player2_player_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mpris_media_player2_player_proxy_new_for_bus_finish() to get the result of the operation.
+ *
+ * See mpris_media_player2_player_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
+ */
+void
+mpris_media_player2_player_proxy_new_for_bus (
+ GBusType bus_type,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_async_initable_new_async (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2.Player", NULL);
+}
+
+/**
+ * mpris_media_player2_player_proxy_new_for_bus_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_proxy_new_for_bus().
+ * @error: Return location for error or %NULL
+ *
+ * Finishes an operation started with mpris_media_player2_player_proxy_new_for_bus().
+ *
+ * Returns: (transfer full) (type MprisMediaPlayer2PlayerProxy): The constructed proxy object or %NULL if @error is set.
+ */
+MprisMediaPlayer2Player *
+mpris_media_player2_player_proxy_new_for_bus_finish (
+ GAsyncResult *res,
+ GError **error)
+{
+ GObject *ret;
+ GObject *source_object;
+ source_object = g_async_result_get_source_object (res);
+ ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
+ g_object_unref (source_object);
+ if (ret != NULL)
+ return MPRIS_MEDIA_PLAYER2_PLAYER (ret);
+ else
+ return NULL;
+}
+
+/**
+ * mpris_media_player2_player_proxy_new_for_bus_sync:
+ * @bus_type: A #GBusType.
+ * @flags: Flags from the #GDBusProxyFlags enumeration.
+ * @name: A bus name (well-known or unique).
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL
+ *
+ * Like mpris_media_player2_player_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * See mpris_media_player2_player_proxy_new_for_bus() for the asynchronous version of this constructor.
+ *
+ * Returns: (transfer full) (type MprisMediaPlayer2PlayerProxy): The constructed proxy object or %NULL if @error is set.
+ */
+MprisMediaPlayer2Player *
+mpris_media_player2_player_proxy_new_for_bus_sync (
+ GBusType bus_type,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GInitable *ret;
+ ret = g_initable_new (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2.Player", NULL);
+ if (ret != NULL)
+ return MPRIS_MEDIA_PLAYER2_PLAYER (ret);
+ else
+ return NULL;
+}
+
+
+/* ------------------------------------------------------------------------ */
+
+/**
+ * MprisMediaPlayer2PlayerSkeleton:
+ *
+ * The #MprisMediaPlayer2PlayerSkeleton structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * MprisMediaPlayer2PlayerSkeletonClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #MprisMediaPlayer2PlayerSkeleton.
+ */
+
+struct _MprisMediaPlayer2PlayerSkeletonPrivate
+{
+ GValueArray *properties;
+ GList *changed_properties;
+ GSource *changed_properties_idle_source;
+ GMainContext *context;
+ GMutex *lock;
+};
+
+static void
+_mpris_media_player2_player_skeleton_handle_method_call (
+ GDBusConnection *connection,
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *method_name,
+ GVariant *parameters,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (user_data);
+ _ExtendedGDBusMethodInfo *info;
+ GVariantIter iter;
+ GVariant *child;
+ GValue *paramv;
+ guint num_params;
+ guint num_extra;
+ guint n;
+ guint signal_id;
+ GValue return_value = {0};
+ info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
+ g_assert (info != NULL);
+ num_params = g_variant_n_children (parameters);
+ num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra);
+ n = 0;
+ g_value_init (&paramv[n], MPRIS_TYPE_MEDIA_PLAYER2_PLAYER);
+ g_value_set_object (&paramv[n++], skeleton);
+ g_value_init (&paramv[n], G_TYPE_DBUS_METHOD_INVOCATION);
+ g_value_set_object (&paramv[n++], invocation);
+ if (info->pass_fdlist)
+ {
+#ifdef G_OS_UNIX
+ g_value_init (&paramv[n], G_TYPE_UNIX_FD_LIST);
+ g_value_set_object (&paramv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)));
+#else
+ g_assert_not_reached ();
+#endif
+ }
+ g_variant_iter_init (&iter, parameters);
+ while ((child = g_variant_iter_next_value (&iter)) != NULL)
+ {
+ _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra];
+ if (arg_info->use_gvariant)
+ {
+ g_value_init (&paramv[n], G_TYPE_VARIANT);
+ g_value_set_variant (&paramv[n], child);
+ n++;
+ }
+ else
+ g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
+ g_variant_unref (child);
+ }
+ signal_id = g_signal_lookup (info->signal_name, MPRIS_TYPE_MEDIA_PLAYER2_PLAYER);
+ g_value_init (&return_value, G_TYPE_BOOLEAN);
+ g_signal_emitv (paramv, signal_id, 0, &return_value);
+ if (!g_value_get_boolean (&return_value))
+ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name);
+ g_value_unset (&return_value);
+ for (n = 0; n < num_params + num_extra; n++)
+ g_value_unset (&paramv[n]);
+ g_free (paramv);
+}
+
+static GVariant *
+_mpris_media_player2_player_skeleton_handle_get_property (
+ GDBusConnection *connection,
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *property_name,
+ GError **error,
+ gpointer user_data)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (user_data);
+ GValue value = {0};
+ GParamSpec *pspec;
+ _ExtendedGDBusPropertyInfo *info;
+ GVariant *ret;
+ ret = NULL;
+ info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_player_interface_info, property_name);
+ g_assert (info != NULL);
+ pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
+ if (pspec == NULL)
+ {
+ g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
+ }
+ else
+ {
+ g_value_init (&value, pspec->value_type);
+ g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value);
+ ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature));
+ g_value_unset (&value);
+ }
+ return ret;
+}
+
+static gboolean
+_mpris_media_player2_player_skeleton_handle_set_property (
+ GDBusConnection *connection,
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *property_name,
+ GVariant *variant,
+ GError **error,
+ gpointer user_data)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (user_data);
+ GValue value = {0};
+ GParamSpec *pspec;
+ _ExtendedGDBusPropertyInfo *info;
+ gboolean ret;
+ ret = FALSE;
+ info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_player_interface_info, property_name);
+ g_assert (info != NULL);
+ pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
+ if (pspec == NULL)
+ {
+ g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
+ }
+ else
+ {
+ if (info->use_gvariant)
+ g_value_set_variant (&value, variant);
+ else
+ g_dbus_gvariant_to_gvalue (variant, &value);
+ g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value);
+ g_value_unset (&value);
+ ret = TRUE;
+ }
+ return ret;
+}
+
+static const GDBusInterfaceVTable _mpris_media_player2_player_skeleton_vtable =
+{
+ _mpris_media_player2_player_skeleton_handle_method_call,
+ _mpris_media_player2_player_skeleton_handle_get_property,
+ _mpris_media_player2_player_skeleton_handle_set_property
+};
+
+static GDBusInterfaceInfo *
+mpris_media_player2_player_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton)
+{
+ return mpris_media_player2_player_interface_info ();
+}
+
+static GDBusInterfaceVTable *
+mpris_media_player2_player_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton)
+{
+ return (GDBusInterfaceVTable *) &_mpris_media_player2_player_skeleton_vtable;
+}
+
+static GVariant *
+mpris_media_player2_player_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (_skeleton);
+
+ GVariantBuilder builder;
+ guint n;
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
+ if (_mpris_media_player2_player_interface_info.parent_struct.properties == NULL)
+ goto out;
+ for (n = 0; _mpris_media_player2_player_interface_info.parent_struct.properties[n] != NULL; n++)
+ {
+ GDBusPropertyInfo *info = _mpris_media_player2_player_interface_info.parent_struct.properties[n];
+ if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
+ {
+ GVariant *value;
+ value = _mpris_media_player2_player_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.mpris.MediaPlayer2.Player", info->name, NULL, skeleton);
+ if (value != NULL)
+ {
+ g_variant_take_ref (value);
+ g_variant_builder_add (&builder, "{sv}", info->name, value);
+ g_variant_unref (value);
+ }
+ }
+ }
+out:
+ return g_variant_builder_end (&builder);
+}
+
+static gboolean _mpris_media_player2_player_emit_changed (gpointer user_data);
+
+static void
+mpris_media_player2_player_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (_skeleton);
+ gboolean emit_changed = FALSE;
+
+ g_mutex_lock (skeleton->priv->lock);
+ if (skeleton->priv->changed_properties_idle_source != NULL)
+ {
+ g_source_destroy (skeleton->priv->changed_properties_idle_source);
+ skeleton->priv->changed_properties_idle_source = NULL;
+ emit_changed = TRUE;
+ }
+ g_mutex_unlock (skeleton->priv->lock);
+
+ if (emit_changed)
+ _mpris_media_player2_player_emit_changed (skeleton);
+}
+
+static void mpris_media_player2_player_skeleton_iface_init (MprisMediaPlayer2PlayerIface *iface);
+G_DEFINE_TYPE_WITH_CODE (MprisMediaPlayer2PlayerSkeleton, mpris_media_player2_player_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_IMPLEMENT_INTERFACE (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER, mpris_media_player2_player_skeleton_iface_init));
+
+static void
+mpris_media_player2_player_skeleton_finalize (GObject *object)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
+ g_value_array_free (skeleton->priv->properties);
+ g_list_foreach (skeleton->priv->changed_properties, (GFunc) _changed_property_free, NULL);
+ g_list_free (skeleton->priv->changed_properties);
+ if (skeleton->priv->changed_properties_idle_source != NULL)
+ g_source_destroy (skeleton->priv->changed_properties_idle_source);
+ if (skeleton->priv->context != NULL)
+ g_main_context_unref (skeleton->priv->context);
+ g_mutex_free (skeleton->priv->lock);
+ G_OBJECT_CLASS (mpris_media_player2_player_skeleton_parent_class)->finalize (object);
+}
+
+static void
+mpris_media_player2_player_skeleton_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
+ g_assert (prop_id != 0 && prop_id - 1 < 8);
+ g_mutex_lock (skeleton->priv->lock);
+ g_value_copy (&skeleton->priv->properties->values[prop_id - 1], value);
+ g_mutex_unlock (skeleton->priv->lock);
+}
+
+static gboolean
+_mpris_media_player2_player_emit_changed (gpointer user_data)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (user_data);
+ GList *l;
+ GVariantBuilder builder;
+ GVariantBuilder invalidated_builder;
+ guint num_changes;
+
+ g_mutex_lock (skeleton->priv->lock);
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
+ g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as"));
+ for (l = skeleton->priv->changed_properties, num_changes = 0; l != NULL; l = l->next)
+ {
+ ChangedProperty *cp = l->data;
+ GVariant *variant;
+ const GValue *cur_value;
+
+ cur_value = &skeleton->priv->properties->values[cp->prop_id - 1];
+ if (!_g_value_equal (cur_value, &cp->orig_value))
+ {
+ variant = g_dbus_gvalue_to_gvariant (cur_value, G_VARIANT_TYPE (cp->info->parent_struct.signature));
+ g_variant_builder_add (&builder, "{sv}", cp->info->parent_struct.name, variant);
+ g_variant_unref (variant);
+ num_changes++;
+ }
+ }
+ if (num_changes > 0)
+ {
+ g_dbus_connection_emit_signal (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)),
+ NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)),
+ "org.freedesktop.DBus.Properties",
+ "PropertiesChanged",
+ g_variant_new ("(sa{sv}as)",
+ "org.mpris.MediaPlayer2.Player",
+ &builder, &invalidated_builder),
+ NULL);
+ }
+ else
+ {
+ g_variant_builder_clear (&builder);
+ g_variant_builder_clear (&invalidated_builder);
+ }
+ g_list_foreach (skeleton->priv->changed_properties, (GFunc) _changed_property_free, NULL);
+ g_list_free (skeleton->priv->changed_properties);
+ skeleton->priv->changed_properties = NULL;
+ skeleton->priv->changed_properties_idle_source = NULL;
+ g_mutex_unlock (skeleton->priv->lock);
+ return FALSE;
+}
+
+static void
+_mpris_media_player2_player_schedule_emit_changed (MprisMediaPlayer2PlayerSkeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)
+{
+ ChangedProperty *cp;
+ GList *l;
+ cp = NULL;
+ for (l = skeleton->priv->changed_properties; l != NULL; l = l->next)
+ {
+ ChangedProperty *i_cp = l->data;
+ if (i_cp->info == info)
+ {
+ cp = i_cp;
+ break;
+ }
+ }
+ if (cp == NULL)
+ {
+ cp = g_new0 (ChangedProperty, 1);
+ cp->prop_id = prop_id;
+ cp->info = info;
+ skeleton->priv->changed_properties = g_list_prepend (skeleton->priv->changed_properties, cp);
+ g_value_init (&cp->orig_value, G_VALUE_TYPE (orig_value));
+ g_value_copy (orig_value, &cp->orig_value);
+ }
+}
+
+static void
+mpris_media_player2_player_skeleton_notify (GObject *object,
+ GParamSpec *pspec)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
+ g_mutex_lock (skeleton->priv->lock);
+ if (skeleton->priv->changed_properties != NULL &&
+ skeleton->priv->changed_properties_idle_source == NULL)
+ {
+ skeleton->priv->changed_properties_idle_source = g_idle_source_new ();
+ g_source_set_priority (skeleton->priv->changed_properties_idle_source, G_PRIORITY_DEFAULT);
+ g_source_set_callback (skeleton->priv->changed_properties_idle_source, _mpris_media_player2_player_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);
+ g_source_attach (skeleton->priv->changed_properties_idle_source, skeleton->priv->context);
+ g_source_unref (skeleton->priv->changed_properties_idle_source);
+ }
+ g_mutex_unlock (skeleton->priv->lock);
+}
+
+static void
+mpris_media_player2_player_skeleton_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
+ g_assert (prop_id != 0 && prop_id - 1 < 8);
+ g_mutex_lock (skeleton->priv->lock);
+ g_object_freeze_notify (object);
+ if (!_g_value_equal (value, &skeleton->priv->properties->values[prop_id - 1]))
+ {
+ if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL)
+ _mpris_media_player2_player_schedule_emit_changed (skeleton, _mpris_media_player2_player_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties->values[prop_id - 1]);
+ g_value_copy (value, &skeleton->priv->properties->values[prop_id - 1]);
+ g_object_notify_by_pspec (object, pspec);
+ }
+ g_mutex_unlock (skeleton->priv->lock);
+ g_object_thaw_notify (object);
+}
+
+static void
+mpris_media_player2_player_skeleton_init (MprisMediaPlayer2PlayerSkeleton *skeleton)
+{
+ skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON, MprisMediaPlayer2PlayerSkeletonPrivate);
+ skeleton->priv->lock = g_mutex_new ();
+ skeleton->priv->context = g_main_context_get_thread_default ();
+ if (skeleton->priv->context != NULL)
+ g_main_context_ref (skeleton->priv->context);
+ skeleton->priv->properties = g_value_array_new (8);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[0], G_TYPE_BOOLEAN);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[1], G_TYPE_BOOLEAN);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[2], G_TYPE_BOOLEAN);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[3], G_TYPE_BOOLEAN);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[4], G_TYPE_BOOLEAN);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[5], G_TYPE_BOOLEAN);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[6], G_TYPE_VARIANT);
+ g_value_array_append (skeleton->priv->properties, NULL);
+ g_value_init (&skeleton->priv->properties->values[7], G_TYPE_STRING);
+}
+
+static gboolean 
+mpris_media_player2_player_skeleton_get_can_control (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
+ gboolean value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_boolean (&(skeleton->priv->properties->values[0]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_player_skeleton_get_can_go_next (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
+ gboolean value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_boolean (&(skeleton->priv->properties->values[1]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_player_skeleton_get_can_go_previous (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
+ gboolean value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_boolean (&(skeleton->priv->properties->values[2]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_player_skeleton_get_can_pause (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
+ gboolean value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_boolean (&(skeleton->priv->properties->values[3]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_player_skeleton_get_can_play (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
+ gboolean value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_boolean (&(skeleton->priv->properties->values[4]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static gboolean 
+mpris_media_player2_player_skeleton_get_can_seek (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
+ gboolean value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_boolean (&(skeleton->priv->properties->values[5]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static GVariant *
+mpris_media_player2_player_skeleton_get_metadata (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
+ GVariant *value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_variant (&(skeleton->priv->properties->values[6]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static const gchar *
+mpris_media_player2_player_skeleton_get_playback_status (MprisMediaPlayer2Player *object)
+{
+ MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
+ const gchar *value;
+ g_mutex_lock (skeleton->priv->lock);
+ value = g_value_get_string (&(skeleton->priv->properties->values[7]));
+ g_mutex_unlock (skeleton->priv->lock);
+ return value;
+}
+
+static void
+mpris_media_player2_player_skeleton_class_init (MprisMediaPlayer2PlayerSkeletonClass *klass)
+{
+ GObjectClass *gobject_class;
+ GDBusInterfaceSkeletonClass *skeleton_class;
+
+ g_type_class_add_private (klass, sizeof (MprisMediaPlayer2PlayerSkeletonPrivate));
+
+ gobject_class = G_OBJECT_CLASS (klass);
+ gobject_class->finalize = mpris_media_player2_player_skeleton_finalize;
+ gobject_class->get_property = mpris_media_player2_player_skeleton_get_property;
+ gobject_class->set_property = mpris_media_player2_player_skeleton_set_property;
+ gobject_class->notify = mpris_media_player2_player_skeleton_notify;
+
+
+ mpris_media_player2_player_override_properties (gobject_class, 1);
+
+ skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
+ skeleton_class->get_info = mpris_media_player2_player_skeleton_dbus_interface_get_info;
+ skeleton_class->get_properties = mpris_media_player2_player_skeleton_dbus_interface_get_properties;
+ skeleton_class->flush = mpris_media_player2_player_skeleton_dbus_interface_flush;
+ skeleton_class->get_vtable = mpris_media_player2_player_skeleton_dbus_interface_get_vtable;
+}
+
+static void
+mpris_media_player2_player_skeleton_iface_init (MprisMediaPlayer2PlayerIface *iface)
+{
+ iface->get_can_control = mpris_media_player2_player_skeleton_get_can_control;
+ iface->get_can_go_next = mpris_media_player2_player_skeleton_get_can_go_next;
+ iface->get_can_go_previous = mpris_media_player2_player_skeleton_get_can_go_previous;
+ iface->get_can_pause = mpris_media_player2_player_skeleton_get_can_pause;
+ iface->get_can_play = mpris_media_player2_player_skeleton_get_can_play;
+ iface->get_can_seek = mpris_media_player2_player_skeleton_get_can_seek;
+ iface->get_metadata = mpris_media_player2_player_skeleton_get_metadata;
+ iface->get_playback_status = mpris_media_player2_player_skeleton_get_playback_status;
+}
+
+/**
+ * mpris_media_player2_player_skeleton_new:
+ *
+ * Creates a skeleton object for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link>.
+ *
+ * Returns: (transfer full) (type MprisMediaPlayer2PlayerSkeleton): The skeleton object.
+ */
+MprisMediaPlayer2Player *
+mpris_media_player2_player_skeleton_new (void)
+{
+ return MPRIS_MEDIA_PLAYER2_PLAYER (g_object_new (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON, NULL));
+}
+

audacious-plugins-3.2.4.tar.bz2/src/mpris2/object-player.h Added

@@ -0,0 +1,332 @@
+/*
+ * Generated by gdbus-codegen 2.30.2. DO NOT EDIT.
+ *
+ * The license of this code is the same as for the source it was derived from.
+ */
+
+#ifndef __OBJECT_PLAYER_H__
+#define __OBJECT_PLAYER_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+
+/* ------------------------------------------------------------------------ */
+/* Declarations for org.mpris.MediaPlayer2.Player */
+
+#define MPRIS_TYPE_MEDIA_PLAYER2_PLAYER (mpris_media_player2_player_get_type ())
+#define MPRIS_MEDIA_PLAYER2_PLAYER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER, MprisMediaPlayer2Player))
+#define MPRIS_IS_MEDIA_PLAYER2_PLAYER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER))
+#define MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER, MprisMediaPlayer2PlayerIface))
+
+struct _MprisMediaPlayer2Player;
+typedef struct _MprisMediaPlayer2Player MprisMediaPlayer2Player;
+typedef struct _MprisMediaPlayer2PlayerIface MprisMediaPlayer2PlayerIface;
+
+struct _MprisMediaPlayer2PlayerIface
+{
+ GTypeInterface parent_iface;
+
+
+ gboolean (*handle_next) (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation);
+
+ gboolean (*handle_pause) (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation);
+
+ gboolean (*handle_play) (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation);
+
+ gboolean (*handle_play_pause) (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation);
+
+ gboolean (*handle_previous) (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation);
+
+ gboolean (*handle_stop) (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation);
+
+ gboolean (*get_can_control) (MprisMediaPlayer2Player *object);
+
+ gboolean (*get_can_go_next) (MprisMediaPlayer2Player *object);
+
+ gboolean (*get_can_go_previous) (MprisMediaPlayer2Player *object);
+
+ gboolean (*get_can_pause) (MprisMediaPlayer2Player *object);
+
+ gboolean (*get_can_play) (MprisMediaPlayer2Player *object);
+
+ gboolean (*get_can_seek) (MprisMediaPlayer2Player *object);
+
+ GVariant * (*get_metadata) (MprisMediaPlayer2Player *object);
+
+ const gchar * (*get_playback_status) (MprisMediaPlayer2Player *object);
+
+};
+
+GType mpris_media_player2_player_get_type (void) G_GNUC_CONST;
+
+GDBusInterfaceInfo *mpris_media_player2_player_interface_info (void);
+guint mpris_media_player2_player_override_properties (GObjectClass *klass, guint property_id_begin);
+
+
+/* D-Bus method call completion functions: */
+void mpris_media_player2_player_complete_next (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation);
+
+void mpris_media_player2_player_complete_pause (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation);
+
+void mpris_media_player2_player_complete_play (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation);
+
+void mpris_media_player2_player_complete_play_pause (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation);
+
+void mpris_media_player2_player_complete_previous (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation);
+
+void mpris_media_player2_player_complete_stop (
+ MprisMediaPlayer2Player *object,
+ GDBusMethodInvocation *invocation);
+
+
+
+/* D-Bus method calls: */
+void mpris_media_player2_player_call_next (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean mpris_media_player2_player_call_next_finish (
+ MprisMediaPlayer2Player *proxy,
+ GAsyncResult *res,
+ GError **error);
+
+gboolean mpris_media_player2_player_call_next_sync (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GError **error);
+
+void mpris_media_player2_player_call_pause (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean mpris_media_player2_player_call_pause_finish (
+ MprisMediaPlayer2Player *proxy,
+ GAsyncResult *res,
+ GError **error);
+
+gboolean mpris_media_player2_player_call_pause_sync (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GError **error);
+
+void mpris_media_player2_player_call_play (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean mpris_media_player2_player_call_play_finish (
+ MprisMediaPlayer2Player *proxy,
+ GAsyncResult *res,
+ GError **error);
+
+gboolean mpris_media_player2_player_call_play_sync (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GError **error);
+
+void mpris_media_player2_player_call_play_pause (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean mpris_media_player2_player_call_play_pause_finish (
+ MprisMediaPlayer2Player *proxy,
+ GAsyncResult *res,
+ GError **error);
+
+gboolean mpris_media_player2_player_call_play_pause_sync (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GError **error);
+
+void mpris_media_player2_player_call_previous (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean mpris_media_player2_player_call_previous_finish (
+ MprisMediaPlayer2Player *proxy,
+ GAsyncResult *res,
+ GError **error);
+
+gboolean mpris_media_player2_player_call_previous_sync (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GError **error);
+
+void mpris_media_player2_player_call_stop (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean mpris_media_player2_player_call_stop_finish (
+ MprisMediaPlayer2Player *proxy,
+ GAsyncResult *res,
+ GError **error);
+
+gboolean mpris_media_player2_player_call_stop_sync (
+ MprisMediaPlayer2Player *proxy,
+ GCancellable *cancellable,
+ GError **error);
+
+
+
+/* D-Bus property accessors: */
+gboolean mpris_media_player2_player_get_can_control (MprisMediaPlayer2Player *object);
+void mpris_media_player2_player_set_can_control (MprisMediaPlayer2Player *object, gboolean value);
+
+gboolean mpris_media_player2_player_get_can_go_next (MprisMediaPlayer2Player *object);
+void mpris_media_player2_player_set_can_go_next (MprisMediaPlayer2Player *object, gboolean value);
+
+gboolean mpris_media_player2_player_get_can_go_previous (MprisMediaPlayer2Player *object);
+void mpris_media_player2_player_set_can_go_previous (MprisMediaPlayer2Player *object, gboolean value);
+
+gboolean mpris_media_player2_player_get_can_pause (MprisMediaPlayer2Player *object);
+void mpris_media_player2_player_set_can_pause (MprisMediaPlayer2Player *object, gboolean value);
+
+gboolean mpris_media_player2_player_get_can_play (MprisMediaPlayer2Player *object);
+void mpris_media_player2_player_set_can_play (MprisMediaPlayer2Player *object, gboolean value);
+
+gboolean mpris_media_player2_player_get_can_seek (MprisMediaPlayer2Player *object);
+void mpris_media_player2_player_set_can_seek (MprisMediaPlayer2Player *object, gboolean value);
+
+GVariant *mpris_media_player2_player_get_metadata (MprisMediaPlayer2Player *object);
+GVariant *mpris_media_player2_player_dup_metadata (MprisMediaPlayer2Player *object);
+void mpris_media_player2_player_set_metadata (MprisMediaPlayer2Player *object, GVariant *value);
+
+const gchar *mpris_media_player2_player_get_playback_status (MprisMediaPlayer2Player *object);
+gchar *mpris_media_player2_player_dup_playback_status (MprisMediaPlayer2Player *object);
+void mpris_media_player2_player_set_playback_status (MprisMediaPlayer2Player *object, const gchar *value);
+
+
+/* ---- */
+
+#define MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY (mpris_media_player2_player_proxy_get_type ())
+#define MPRIS_MEDIA_PLAYER2_PLAYER_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, MprisMediaPlayer2PlayerProxy))
+#define MPRIS_MEDIA_PLAYER2_PLAYER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, MprisMediaPlayer2PlayerProxyClass))
+#define MPRIS_MEDIA_PLAYER2_PLAYER_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, MprisMediaPlayer2PlayerProxyClass))
+#define MPRIS_IS_MEDIA_PLAYER2_PLAYER_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY))
+#define MPRIS_IS_MEDIA_PLAYER2_PLAYER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY))
+
+typedef struct _MprisMediaPlayer2PlayerProxy MprisMediaPlayer2PlayerProxy;
+typedef struct _MprisMediaPlayer2PlayerProxyClass MprisMediaPlayer2PlayerProxyClass;
+typedef struct _MprisMediaPlayer2PlayerProxyPrivate MprisMediaPlayer2PlayerProxyPrivate;
+
+struct _MprisMediaPlayer2PlayerProxy
+{
+ /*< private >*/
+ GDBusProxy parent_instance;
+ MprisMediaPlayer2PlayerProxyPrivate *priv;
+};
+
+struct _MprisMediaPlayer2PlayerProxyClass
+{
+ GDBusProxyClass parent_class;
+};
+
+GType mpris_media_player2_player_proxy_get_type (void) G_GNUC_CONST;
+
+void mpris_media_player2_player_proxy_new (
+ GDBusConnection *connection,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+MprisMediaPlayer2Player *mpris_media_player2_player_proxy_new_finish (
+ GAsyncResult *res,
+ GError **error);
+MprisMediaPlayer2Player *mpris_media_player2_player_proxy_new_sync (
+ GDBusConnection *connection,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GError **error);
+
+void mpris_media_player2_player_proxy_new_for_bus (
+ GBusType bus_type,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+MprisMediaPlayer2Player *mpris_media_player2_player_proxy_new_for_bus_finish (
+ GAsyncResult *res,
+ GError **error);
+MprisMediaPlayer2Player *mpris_media_player2_player_proxy_new_for_bus_sync (
+ GBusType bus_type,
+ GDBusProxyFlags flags,
+ const gchar *name,
+ const gchar *object_path,
+ GCancellable *cancellable,
+ GError **error);
+
+
+/* ---- */
+
+#define MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON (mpris_media_player2_player_skeleton_get_type ())
+#define MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON, MprisMediaPlayer2PlayerSkeleton))
+#define MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON, MprisMediaPlayer2PlayerSkeletonClass))
+#define MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON, MprisMediaPlayer2PlayerSkeletonClass))
+#define MPRIS_IS_MEDIA_PLAYER2_PLAYER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON))
+#define MPRIS_IS_MEDIA_PLAYER2_PLAYER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON))
+
+typedef struct _MprisMediaPlayer2PlayerSkeleton MprisMediaPlayer2PlayerSkeleton;
+typedef struct _MprisMediaPlayer2PlayerSkeletonClass MprisMediaPlayer2PlayerSkeletonClass;
+typedef struct _MprisMediaPlayer2PlayerSkeletonPrivate MprisMediaPlayer2PlayerSkeletonPrivate;
+
+struct _MprisMediaPlayer2PlayerSkeleton
+{
+ /*< private >*/
+ GDBusInterfaceSkeleton parent_instance;
+ MprisMediaPlayer2PlayerSkeletonPrivate *priv;
+};
+
+struct _MprisMediaPlayer2PlayerSkeletonClass
+{
+ GDBusInterfaceSkeletonClass parent_class;
+};
+
+GType mpris_media_player2_player_skeleton_get_type (void) G_GNUC_CONST;
+
+MprisMediaPlayer2Player *mpris_media_player2_player_skeleton_new (void);
+
+
+G_END_DECLS
+
+#endif /* __OBJECT_PLAYER_H__ */

audacious-plugins-3.2.4.tar.bz2/src/mpris2/plugin.c Added

@@ -0,0 +1,315 @@
+/*
+ * MPRIS 2 Server for Audacious
+ * Copyright 2011 John Lindgren
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
+ */
+
+#include <stdio.h>
+
+#include <audacious/drct.h>
+#include <audacious/misc.h>
+#include <audacious/playlist.h>
+#include <audacious/plugin.h>
+#include <libaudcore/hook.h>
+
+#include "object-core.h"
+#include "object-player.h"
+
+static GDBusConnection * bus;
+static GObject * object_core, * object_player;
+static char * last_title, * last_artist, * last_album, * last_file;
+static const char * image_file;
+static GVariantType * metadata_type;
+
+static bool_t quit_cb (MprisMediaPlayer2 * object, GDBusMethodInvocation * call,
+ void * unused)
+{
+ aud_drct_quit ();
+ mpris_media_player2_complete_quit (object, call);
+ return TRUE;
+}
+
+static bool_t raise_cb (MprisMediaPlayer2 * object, GDBusMethodInvocation *
+ call, void * unused)
+{
+ aud_interface_show (TRUE);
+ mpris_media_player2_complete_raise (object, call);
+ return TRUE;
+}
+
+static void update_metadata (void * data, GObject * object)
+{
+ char * title = NULL, * artist = NULL, * album = NULL, * file = NULL;
+
+ if (aud_drct_get_playing ())
+ {
+ int playlist = aud_playlist_get_playing ();
+ int entry = aud_playlist_get_position (playlist);
+ aud_playlist_entry_describe (playlist, entry, & title, & artist, & album, TRUE);
+ file = aud_playlist_entry_get_filename (playlist, entry);
+ }
+
+ if (title == last_title && artist == last_artist && album == last_album &&
+ file == last_file)
+ {
+ str_unref (title);
+ str_unref (artist);
+ str_unref (album);
+ str_unref (file);
+ return;
+ }
+
+ if (file != last_file)
+ {
+ if (image_file)
+ aud_art_unref (last_file);
+ image_file = file ? aud_art_get_file (file) : NULL;
+ }
+
+ str_unref (last_title);
+ str_unref (last_artist);
+ str_unref (last_album);
+ str_unref (last_file);
+ last_title = title;
+ last_artist = artist;
+ last_album = album;
+ last_file = file;
+
+ GVariant * elems[4];
+ int nelems = 0;
+
+ if (title)
+ {
+ GVariant * key = g_variant_new_string ("xesam:title");
+ GVariant * str = g_variant_new_string (title);
+ GVariant * var = g_variant_new_variant (str);
+ elems[nelems ++] = g_variant_new_dict_entry (key, var);
+ }
+
+ if (artist)
+ {
+ GVariant * key = g_variant_new_string ("xesam:artist");
+ GVariant * str = g_variant_new_string (artist);
+ GVariant * array = g_variant_new_array (G_VARIANT_TYPE_STRING, & str, 1);
+ GVariant * var = g_variant_new_variant (array);
+ elems[nelems ++] = g_variant_new_dict_entry (key, var);
+ }
+
+ if (album)
+ {
+ GVariant * key = g_variant_new_string ("xesam:album");
+ GVariant * str = g_variant_new_string (album);
+ GVariant * var = g_variant_new_variant (str);
+ elems[nelems ++] = g_variant_new_dict_entry (key, var);
+ }
+
+ if (image_file)
+ {
+ GVariant * key = g_variant_new_string ("mpris:artUrl");
+ GVariant * str = g_variant_new_string (image_file);
+ GVariant * var = g_variant_new_variant (str);
+ elems[nelems ++] = g_variant_new_dict_entry (key, var);
+ }
+
+ if (! metadata_type)
+ metadata_type = g_variant_type_new ("{sv}");
+
+ GVariant * array = g_variant_new_array (metadata_type, elems, nelems);
+ g_object_set (object, "metadata", array, NULL);
+}
+
+static void update_playback_status (void * data, GObject * object)
+{
+ const char * status;
+
+ if (aud_drct_get_playing ())
+ status = aud_drct_get_paused () ? "Paused" : "Playing";
+ else
+ status = "Stopped";
+
+ g_object_set (object, "playback-status", status, NULL);
+}
+
+static bool_t next_cb (MprisMediaPlayer2Player * object, GDBusMethodInvocation *
+ call, void * unused)
+{
+ aud_drct_pl_next ();
+ mpris_media_player2_player_complete_next (object, call);
+ return TRUE;
+}
+
+static bool_t pause_cb (MprisMediaPlayer2Player * object,
+ GDBusMethodInvocation * call, void * unused)
+{
+ if (aud_drct_get_playing () && ! aud_drct_get_paused ())
+ aud_drct_pause ();
+
+ mpris_media_player2_player_complete_pause (object, call);
+ return TRUE;
+}
+
+static bool_t play_cb (MprisMediaPlayer2Player * object, GDBusMethodInvocation *
+ call, void * unused)
+{
+ if (! aud_drct_get_playing () || aud_drct_get_paused ())
+ aud_drct_play ();
+
+ mpris_media_player2_player_complete_play (object, call);
+ return TRUE;
+}
+
+static bool_t play_pause_cb (MprisMediaPlayer2Player * object,
+ GDBusMethodInvocation * call, void * unused)
+{
+ if (aud_drct_get_playing () && ! aud_drct_get_paused ())
+ aud_drct_pause ();
+ else
+ aud_drct_play ();
+
+ mpris_media_player2_player_complete_play_pause (object, call);
+ return TRUE;
+}
+
+static bool_t previous_cb (MprisMediaPlayer2Player * object,
+ GDBusMethodInvocation * call, void * unused)
+{
+ aud_drct_pl_prev ();
+ mpris_media_player2_player_complete_previous (object, call);
+ return TRUE;
+}
+
+static bool_t stop_cb (MprisMediaPlayer2Player * object, GDBusMethodInvocation *
+ call, void * unused)
+{
+ if (aud_drct_get_playing ())
+ aud_drct_stop ();
+
+ mpris_media_player2_player_complete_stop (object, call);
+ return TRUE;
+}
+
+void mpris2_cleanup (void)
+{
+ hook_dissociate ("playback begin", (HookFunction) update_playback_status);
+ hook_dissociate ("playback pause", (HookFunction) update_playback_status);
+ hook_dissociate ("playback stop", (HookFunction) update_playback_status);
+ hook_dissociate ("playback unpause", (HookFunction) update_playback_status);
+
+ hook_dissociate ("playback begin", (HookFunction) update_metadata);
+ hook_dissociate ("playback stop", (HookFunction) update_metadata);
+ hook_dissociate ("playlist update", (HookFunction) update_metadata);
+
+ g_dbus_connection_close_sync (bus, NULL, NULL);
+ g_object_unref (object_core);
+ g_object_unref (object_player);
+
+ if (image_file)
+ {
+ aud_art_unref (last_file);
+ image_file = NULL;
+ }
+
+ str_unref (last_title);
+ str_unref (last_artist);
+ str_unref (last_album);
+ str_unref (last_file);
+ last_title = last_artist = last_album = last_file = NULL;
+
+ if (metadata_type)
+ {
+ g_variant_type_free (metadata_type);
+ metadata_type = NULL;
+ }
+}
+
+bool_t mpris2_init (void)
+{
+ GError * error = NULL;
+ bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, & error);
+
+ if (! bus)
+ {
+ fprintf (stderr, "mpris2: %s\n", error->message);
+ g_error_free (error);
+ return FALSE;
+ }
+
+ g_bus_own_name_on_connection (bus, "org.mpris.MediaPlayer2.audacious", 0,
+ NULL, NULL, NULL, NULL);
+
+ object_core = (GObject *) mpris_media_player2_skeleton_new ();
+
+ g_object_set (object_core,
+ "can-quit", TRUE,
+ "can-raise", TRUE,
+ "desktop-entry", "audacious",
+ "has-track-list", FALSE,
+ "identity", "Audacious",
+ NULL);
+
+ g_signal_connect (object_core, "handle-quit", (GCallback) quit_cb, NULL);
+ g_signal_connect (object_core, "handle-raise", (GCallback) raise_cb, NULL);
+
+ object_player = (GObject *) mpris_media_player2_player_skeleton_new ();
+
+ g_object_set (object_player,
+ "can-control", TRUE,
+ "can-go-next", TRUE,
+ "can-go-previous", TRUE,
+ "can-pause", TRUE,
+ "can-play", TRUE,
+ "can-seek", FALSE,
+ NULL);
+
+ update_playback_status (NULL, object_player);
+
+ hook_associate ("playback begin", (HookFunction) update_playback_status, object_player);
+ hook_associate ("playback pause", (HookFunction) update_playback_status, object_player);
+ hook_associate ("playback stop", (HookFunction) update_playback_status, object_player);
+ hook_associate ("playback unpause", (HookFunction) update_playback_status, object_player);
+
+ hook_associate ("playback begin", (HookFunction) update_metadata, object_player);
+ hook_associate ("playback stop", (HookFunction) update_metadata, object_player);
+ hook_associate ("playlist update", (HookFunction) update_metadata, object_player);
+
+ g_signal_connect (object_player, "handle-next", (GCallback) next_cb, NULL);
+ g_signal_connect (object_player, "handle-pause", (GCallback) pause_cb, NULL);
+ g_signal_connect (object_player, "handle-play", (GCallback) play_cb, NULL);
+ g_signal_connect (object_player, "handle-play-pause", (GCallback) play_pause_cb, NULL);
+ g_signal_connect (object_player, "handle-previous", (GCallback) previous_cb, NULL);
+ g_signal_connect (object_player, "handle-stop", (GCallback) stop_cb, NULL);
+
+ if (! g_dbus_interface_skeleton_export ((GDBusInterfaceSkeleton *)
+ object_core, bus, "/org/mpris/MediaPlayer2", & error) ||
+ ! g_dbus_interface_skeleton_export ((GDBusInterfaceSkeleton *)
+ object_player, bus, "/org/mpris/MediaPlayer2", & error))
+ {
+ mpris2_cleanup ();
+ fprintf (stderr, "mpris2: %s\n", error->message);
+ g_error_free (error);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+AUD_GENERAL_PLUGIN
+(
+ .name = "MPRIS 2 Server",
+ .enabled_by_default = TRUE,
+ .init = mpris2_init,
+ .cleanup = mpris2_cleanup
+)

audacious-plugins-3.1.1.tar.bz2/src/mtp_up/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/mtp_up/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/mtp_up/mtp.c -> audacious-plugins-3.2.4.tar.bz2/src/mtp_up/mtp.c Changed

@@ -19,6 +19,7 @@
 #include <config.h>
 
 #include <glib.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <libmtp.h>
 
@@ -109,13 +110,50 @@
 up_list = g_list_prepend (up_list, (void *) tuple);
 
 if (tuple)
- tuple_free (tuple);
+ tuple_unref (tuple);
 }
 }
 
 return g_list_reverse(up_list);
 }
 
+static char * strdup_tuple_filename (const Tuple * tuple)
+{
+ gchar * fpath = tuple_get_str (tuple, FIELD_FILE_PATH, NULL);
+ gchar * fname = tuple_get_str (tuple, FIELD_FILE_NAME, NULL);
+
+ gchar * filename = g_strdup_printf ("%s/%s", fpath, fname);
+
+ str_unref (fpath);
+ str_unref (fname);
+
+ return filename;
+}
+
+static char * strdup_tuple_field (const Tuple * tuple, int field)
+{
+ char * sval, * dup;
+ int ival;
+
+ switch (tuple_get_value_type (tuple, field, NULL))
+ {
+ case TUPLE_INT:
+ ival = tuple_get_int (tuple, field, NULL);
+ dup = g_strdup_printf ("%d", ival);
+ break;
+ case TUPLE_STRING:
+ sval = tuple_get_str (tuple, field, NULL);
+ dup = g_strdup (sval);
+ str_unref (sval);
+ break;
+ default:
+ dup = NULL;
+ break;
+ }
+
+ return dup;
+}
+
 LIBMTP_track_t *track_metadata(Tuple *from_tuple)
 {
 LIBMTP_track_t *tr;
@@ -124,7 +162,7 @@
 uint64_t filesize;
 struct stat sb;
 
- uri_path = g_strdup_printf("%s/%s", tuple_get_string(from_tuple, FIELD_FILE_PATH, NULL), tuple_get_string(from_tuple, FIELD_FILE_NAME, NULL));
+ uri_path = strdup_tuple_filename (from_tuple);
 gchar *tmp = g_strescape(uri_path,NULL);
 filename=g_filename_from_uri(tmp,NULL,NULL);
 g_free(tmp);
@@ -159,15 +197,15 @@
 
 /* track metadata*/
 tr = LIBMTP_new_track_t();
- tr->title = g_strdup((gchar*) tuple_get_string(from_tuple, FIELD_TITLE, NULL));
- tr->artist = g_strdup((gchar*) tuple_get_string(from_tuple, FIELD_ARTIST, NULL));
- tr->album = g_strdup((gchar*)tuple_get_string(from_tuple, FIELD_ALBUM, NULL));
+ tr->title = strdup_tuple_field (from_tuple, FIELD_TITLE);
+ tr->artist = strdup_tuple_field (from_tuple, FIELD_ARTIST);
+ tr->album = strdup_tuple_field (from_tuple, FIELD_ALBUM);
 tr->filesize = filesize;
- tr->filename = g_strdup(tuple_get_string(from_tuple, FIELD_FILE_NAME, NULL));
+ tr->filename = strdup_tuple_field (from_tuple, FIELD_FILE_NAME);
 tr->duration = (uint32_t)tuple_get_int(from_tuple, FIELD_LENGTH, NULL);
 tr->filetype = find_filetype (filename);
- tr->genre = g_strdup((gchar*)tuple_get_string(from_tuple, FIELD_GENRE, NULL));
- tr->date = g_strdup_printf("%d",tuple_get_int(from_tuple, FIELD_YEAR, NULL));
+ tr->genre = strdup_tuple_field (from_tuple, FIELD_GENRE);
+ tr->date = strdup_tuple_field (from_tuple, FIELD_YEAR);
 g_free(filename);
 return tr;
 }
@@ -178,8 +216,12 @@
 gchar *tmp, *from_path = NULL, *filename;
 LIBMTP_track_t *gentrack;
 gentrack = track_metadata(from_tuple);
- from_path = g_strdup_printf("%s/%s", tuple_get_string(from_tuple, FIELD_FILE_PATH, NULL), tuple_get_string(from_tuple, FIELD_FILE_NAME, NULL));
- if(gentrack == NULL) return 1;
+ from_path = strdup_tuple_filename (from_tuple);
+ if(gentrack == NULL)
+ {
+ g_free(from_path);
+ return 1;
+ }
 tmp = g_strescape(from_path,NULL);
 filename=g_filename_from_uri(tmp,NULL,NULL);

audacious-plugins-3.1.1.tar.bz2/src/neon/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/neon/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/neon/cert_verification.c -> audacious-plugins-3.2.4.tar.bz2/src/neon/cert_verification.c Changed

@@ -17,14 +17,13 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+#include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <ne_ssl.h>
 #include <ne_session.h>
 
-#include <libaudcore/md5.h>
-
 #include "cert_verification.h"
 
 // Certificate validation handling.
@@ -282,12 +281,13 @@
 g_return_val_if_fail(ASNTYPE_SEQUENCE == content.type, FALSE);
 
 // Calculate MD5 sum of subject.
- aud_md5state_t md5state;
- aud_md5_init(&md5state);
- aud_md5_append(&md5state, content.start, content.nextStart - content.start);
- g_free(certDer);
 unsigned char md5pword[16];
- aud_md5_finish(&md5state, md5pword);
+ gsize md5len = 16;
+
+ GChecksum * state = g_checksum_new (G_CHECKSUM_MD5);
+ g_checksum_update (state, content.start, content.nextStart - content.start);
+ g_checksum_get_digest (state, md5pword, & md5len);
+ g_checksum_free (state);
 
 guint32 hash = 0;
 gint i = 0;
@@ -298,6 +298,8 @@
 hash |= md5pword[i];
 }
 *out_hash = hash;
+
+ g_free(certDer);
 return TRUE;
 }

audacious-plugins-3.1.1.tar.bz2/src/neon/neon.c -> audacious-plugins-3.2.4.tar.bz2/src/neon/neon.c Changed

@@ -18,6 +18,7 @@
 */
 
 #include <stdint.h>
+#include <string.h>
 
 #ifdef DEBUG
 #define NEON_DEBUG
@@ -708,45 +709,33 @@
 return NULL;
 }
 
+
 /*
 * -----
 */
 
-VFSFile* neon_vfs_fopen_impl(const gchar* path, const gchar* mode) {
- VFSFile* file;
+void * neon_vfs_fopen_impl (const gchar * path, const gchar * mode)
+{
 struct neon_handle* handle;
 
 _DEBUG("Trying to open '%s' with neon", path);
 
- if (NULL == (file = g_new0(VFSFile, 1))) {
- _ERROR("Could not allocate memory for filehandle");
- return NULL;
- }
-
 if (NULL == (handle = handle_init())) {
 _ERROR("Could not allocate memory for neon handle");
- g_free(file);
 return NULL;
 }
 
 _DEBUG("Allocated new handle: %p", handle);
 
- if (NULL == (handle->url = g_strdup(path))) {
- _ERROR ("<%p> Could not copy URL string", (void *) handle);
- handle_free(handle);
- g_free(file);
- return NULL;
- }
+ handle->url = g_strdup (path);
 
 if (0 != open_handle(handle, 0)) {
 _ERROR ("<%p> Could not open URL", (void *) handle);
 handle_free(handle);
- g_free(file);
 return NULL;
 }
 
- file->handle = handle;
- return file;
+ return handle;
 }
 
 /*
@@ -755,7 +744,7 @@
 
 gint neon_vfs_fclose_impl(VFSFile* file) {
 
- struct neon_handle* h = (struct neon_handle *)file->handle;
+ struct neon_handle* h = (struct neon_handle *)vfs_get_handle (file);
 
 if (NULL != h->reader) {
 kill_reader(h);
@@ -783,7 +772,7 @@
 static gint64 neon_fread_real (void * ptr_, gint64 size, gint64 nmemb,
 VFSFile * file)
 {
- struct neon_handle* h = (struct neon_handle*)file->handle;
+ struct neon_handle* h = (struct neon_handle*)vfs_get_handle (file);
 gint belem;
 gint relem;
 gint ret;
@@ -1019,7 +1008,7 @@
 gint64 neon_vfs_fwrite_impl (const void * ptr, gint64 size, gint64 nmemb,
 VFSFile * file)
 {
- _ERROR ("<%p> NOT IMPLEMENTED", (void *) file->handle);
+ _ERROR ("<%p> NOT IMPLEMENTED", (void *) vfs_get_handle (file));
 
 return 0;
 }
@@ -1032,7 +1021,7 @@
 unsigned char c;
 
 if (1 != neon_vfs_fread_impl(&c, 1, 1, file)) {
- _ERROR ("<%p> Could not getc()!", (void *) file->handle);
+ _ERROR ("<%p> Could not getc()!", (void *) vfs_get_handle (file));
 return -1;
 }
 
@@ -1044,14 +1033,14 @@
 */
 
 gint neon_vfs_ungetc_impl(gint c, VFSFile* stream) {
- _ERROR ("<%p> NOT IMPLEMENTED", (void *) stream->handle);
+ _ERROR ("<%p> NOT IMPLEMENTED", (void *) vfs_get_handle (stream));
 
 return 0;
 }
 
 gint64 neon_vfs_ftell_impl (VFSFile * file)
 {
- struct neon_handle* h = (struct neon_handle *)file->handle;
+ struct neon_handle* h = (struct neon_handle *)vfs_get_handle (file);
 
 _DEBUG("<%p> Current file position: %ld", h, h->pos);
 
@@ -1064,7 +1053,7 @@
 
 gboolean neon_vfs_feof_impl(VFSFile* file) {
 
- struct neon_handle* h = (struct neon_handle*)file->handle;
+ struct neon_handle* h = (struct neon_handle*)vfs_get_handle (file);
 
 _DEBUG("<%p> EOF status: %s", h, h->eof?"TRUE":"FALSE");
 
@@ -1077,7 +1066,7 @@
 
 gint neon_vfs_truncate_impl (VFSFile * file, gint64 size)
 {
- _ERROR ("<%p> NOT IMPLEMENTED", (void *) file->handle);
+ _ERROR ("<%p> NOT IMPLEMENTED", (void *) vfs_get_handle (file));
 
 return 0;
 }
@@ -1088,7 +1077,7 @@
 
 gint neon_vfs_fseek_impl (VFSFile * file, gint64 offset, gint whence)
 {
- struct neon_handle* h = (struct neon_handle*)file->handle;
+ struct neon_handle* h = (struct neon_handle*)vfs_get_handle (file);
 glong newpos;
 glong content_length;
 
@@ -1195,7 +1184,7 @@
 
 gchar *neon_vfs_metadata_impl(VFSFile* file, const gchar* field) {
 
- struct neon_handle* h = (struct neon_handle*)file->handle;
+ struct neon_handle* h = (struct neon_handle*)vfs_get_handle (file);
 
 _DEBUG("<%p> Field name: %s", h, field);
 
@@ -1217,7 +1206,7 @@
 
 gint64 neon_vfs_fsize_impl (VFSFile * file)
 {
- struct neon_handle* h = (struct neon_handle*)file->handle;
+ struct neon_handle* h = (struct neon_handle*)vfs_get_handle (file);
 
 if (-1 == h->content_length) {
 _DEBUG("<%p> Unknown content length", h);

audacious-plugins-3.1.1.tar.bz2/src/notify/libnotify-aosd_event.c -> audacious-plugins-3.2.4.tar.bz2/src/notify/libnotify-aosd_event.c Changed

@@ -19,6 +19,7 @@
 ************************************************************************/
 
 #include <glib.h>
+#include <string.h>
 
 #include <audacious/drct.h>
 #include <audacious/i18n.h>
@@ -59,25 +60,20 @@
 if (artist)
 {
 if (album)
- {
 message = g_strdup_printf ("%s\n%s", artist, album);
- g_free (artist);
- g_free (album);
- }
 else
- message = artist;
+ message = g_strdup (artist);
 }
 else if (album)
- message = album;
+ message = g_strdup (album);
 else
 message = g_strdup ("");
 
 if (! GPOINTER_TO_INT (explicit) && last_title && last_message && ! strcmp
 (title, last_title) && ! strcmp (message, last_message))
 {
- g_free (title);
 g_free (message);
- return;
+ goto FREE;
 }
 
 GdkPixbuf * pb = audgui_pixbuf_for_current ();
@@ -90,8 +86,13 @@
 g_object_unref (pb);
 
 clear ();
- last_title = title;
+ last_title = g_strdup (title);
 last_message = message;
+
+FREE:
+ str_unref (title);
+ str_unref (artist);
+ str_unref (album);
 }
 
 void event_init (void)

audacious-plugins-3.1.1.tar.bz2/src/notify/libnotify-aosd_osd.c -> audacious-plugins-3.2.4.tar.bz2/src/notify/libnotify-aosd_osd.c Changed

audacious-plugins-3.1.1.tar.bz2/src/null/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/null/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/oss4/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/oss4/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/oss4/configure.c -> audacious-plugins-3.2.4.tar.bz2/src/oss4/configure.c Changed

@@ -1,20 +1,20 @@
 /*
- * OSS4 Output Plugin for Audacious
+ * configure.c
 * Copyright 2010-2011 Michał Lipski <tallica@o2.pl>
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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 "oss.h"
@@ -54,6 +54,11 @@
 aud_set_bool("oss4", "cookedmode", gtk_toggle_button_get_active(widget));
 }
 
+static void exclusive_toggled_cb(GtkToggleButton *widget, gpointer data)
+{
+ aud_set_bool("oss4", "exclusive", gtk_toggle_button_get_active(widget));
+}
+
 static void vol_toggled_cb(GtkToggleButton *widget, gpointer data)
 {
 aud_set_bool("oss4", "save_volume", gtk_toggle_button_get_active(widget));
@@ -123,7 +128,8 @@
 static void window_create(void)
 {
 GtkWidget *vbox, *dev_list_box, *dev_label, *dev_list_combo, *alt_dev_box, *alt_dev_check,
- *alt_dev_text, *option_box, *vol_check, *cookedmode_check, *button_box, *button_ok;
+ *alt_dev_text, *option_box, *vol_check, *cookedmode_check, *button_box, *button_ok,
+ *exclusive_check;
 GtkTreeModel *dev_list_model;
 GtkCellRenderer *cell;
 gchar *device;
@@ -172,7 +178,7 @@
 alt_dev_check = gtk_check_button_new_with_label(_("Use alternate device:"));
 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alt_dev_check), aud_get_bool("oss4", "use_alt_device"));
 
- gtk_box_pack_start(GTK_BOX(alt_dev_box), alt_dev_check, FALSE, FALSE, 5);
+ gtk_box_pack_start(GTK_BOX(alt_dev_box), alt_dev_check, FALSE, FALSE, 0);
 
 alt_dev_text = gtk_entry_new();
 device = aud_get_string("oss4", "alt_device");
@@ -192,6 +198,10 @@
 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cookedmode_check), aud_get_bool("oss4", "cookedmode"));
 gtk_box_pack_start(GTK_BOX(option_box), cookedmode_check, FALSE, FALSE, 5);
 
+ exclusive_check = gtk_check_button_new_with_label(_("Enable exclusive mode to prevent virtual mixing."));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(exclusive_check), aud_get_bool("oss4", "exclusive"));
+ gtk_box_pack_start(GTK_BOX(option_box), exclusive_check, FALSE, FALSE, 5);
+
 button_box = gtk_hbutton_box_new();
 gtk_button_box_set_layout(GTK_BUTTON_BOX(button_box), GTK_BUTTONBOX_END);
 gtk_box_set_spacing(GTK_BOX(button_box), 5);
@@ -218,9 +228,16 @@
 g_signal_connect(G_OBJECT(cookedmode_check), "toggled",
 G_CALLBACK(cookedmode_toggled_cb), NULL);
 
+ g_signal_connect(G_OBJECT(exclusive_check), "toggled",
+ G_CALLBACK(exclusive_toggled_cb), NULL);
+
 g_signal_connect_swapped(G_OBJECT(button_ok), "clicked",
 G_CALLBACK(gtk_widget_destroy), window);
 
+ g_signal_connect(G_OBJECT(window), "destroy",
+ G_CALLBACK(gtk_widget_destroyed), &window);
+
+
 gtk_widget_show_all(window);
 }

audacious-plugins-3.1.1.tar.bz2/src/oss4/oss.c -> audacious-plugins-3.2.4.tar.bz2/src/oss4/oss.c Changed

@@ -1,23 +1,23 @@
 /*
- * OSS4 Output Plugin for Audacious
+ * oss.c
 * Copyright 2010-2011 Michał Lipski <tallica@o2.pl>
 *
 * I would like to thank people on #audacious, especially Tony Vroon and
 * John Lindgren and of course the authors of the previous OSS plugin.
 *
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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 "oss.h"
@@ -29,6 +29,7 @@
 "save_volume", "TRUE",
 "volume", "12850", /* 0x3232 */
 "cookedmode", "TRUE",
+ "exclusive", "FALSE",
 NULL};
 
 oss_data_t *oss_data;
@@ -74,7 +75,8 @@
 
 param = rate;
 CHECK_NOISY(ioctl, oss_data->fd, SNDCTL_DSP_SPEED, &param);
- CHECK_VAL(param == rate, ERROR_NOISY, "Selected sample rate is not supported by the device.\n");
+ CHECK_VAL(param >= rate * 9 / 10 && param <= rate * 11 / 10, ERROR_NOISY,
+ "Selected sample rate is not supported by the device.\n");
 
 param = channels;
 CHECK_NOISY(ioctl, oss_data->fd, SNDCTL_DSP_CHANNELS, &param);
@@ -94,15 +96,22 @@
 static gint open_device(void)
 {
 gint res = -1;
+ gint flags = O_WRONLY;
 gchar *device = aud_get_string("oss4", "device");
 gchar *alt_device = aud_get_string("oss4", "alt_device");
 
+ if (aud_get_bool("oss4", "exclusive"))
+ {
+ AUDDBG("Enabled exclusive mode.\n");
+ flags |= O_EXCL;
+ }
+
 if (aud_get_bool("oss4", "use_alt_device") && alt_device != NULL)
- res = open(alt_device, O_WRONLY);
+ res = open(alt_device, flags);
 else if (device != NULL)
- res = open(device, O_WRONLY);
+ res = open(device, flags);
 else
- res = open(DEFAULT_DSP, O_WRONLY);
+ res = open(DEFAULT_DSP, flags);
 
 g_free(device);
 g_free(alt_device);
@@ -173,7 +182,7 @@
 
 while (length > 0)
 {
- written = write(oss_data->fd, data + start, length);
+ written = write(oss_data->fd, (char *) data + start, length);
 
 if (written < 0)
 {
@@ -271,6 +280,8 @@
 
 void oss_get_volume(gint *left, gint *right)
 {
+ *left = *right = 0;
+
 gint vol;
 
 if (oss_data->fd == -1 || !oss_ioctl_vol)

audacious-plugins-3.1.1.tar.bz2/src/oss4/oss.h -> audacious-plugins-3.2.4.tar.bz2/src/oss4/oss.h Changed

@@ -1,20 +1,20 @@
 /*
- * OSS4 Output Plugin for Audacious
+ * oss.h
 * Copyright 2010-2011 Michał Lipski <tallica@o2.pl>
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
 *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
 */
 
 #ifndef AUDACIOUS_OSS4_H
@@ -22,9 +22,12 @@
 
 #include "config.h"
 
+#include <unistd.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <glib.h>
 #include <errno.h>
+#include <string.h>
 #include <sys/ioctl.h>
 
 #ifdef HAVE_SYS_SOUNDCARD_H

audacious-plugins-3.1.1.tar.bz2/src/oss4/plugin.c -> audacious-plugins-3.2.4.tar.bz2/src/oss4/plugin.c Changed

@@ -1,20 +1,20 @@
 /*
- * OSS4 Output Plugin for Audacious
+ * plugin.c
 * Copyright 2010-2011 Michał Lipski <tallica@o2.pl>
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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 "oss.h"
@@ -53,14 +53,14 @@
 "Copyright 2010-2011 Michał Lipski <tallica@o2.pl>\n\n"
 "I would like to thank people on #audacious, especially Tony Vroon and "
 "John Lindgren and of course the authors of the previous OSS plugin.\n\n"
- "This program is free software: you can redistribute it and/or modify "
- "it under the terms of the GNU General Public License as published by "
- "the Free Software Foundation, either version 3 of the License, or "
- "(at your option) any later version.\n\n"
- "This program is distributed in the hope that it will be useful, "
- "but WITHOUT ANY WARRANTY; without even the implied warranty of "
- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the "
- "GNU General Public License for more details.\n\n"
- "You should have received a copy of the GNU General Public License "
- "along with this program. If not, see <http://www.gnu.org/licenses/>.\n");
+ "Redistribution and use in source and binary forms, with or without "
+ "modification, are permitted provided that the following conditions are met:\n\n"
+ "1. Redistributions of source code must retain the above copyright notice, "
+ "this list of conditions, and the following disclaimer.\n\n"
+ "2. Redistributions in binary form must reproduce the above copyright notice, "
+ "this list of conditions, and the following disclaimer in the documentation "
+ "provided with the distribution.\n\n"
+ "This software is provided \"as is\" and without any warranty, express or "
+ "implied. In no event shall the authors be liable for any damages arising from "
+ "the use of this software.");
 }

audacious-plugins-3.1.1.tar.bz2/src/oss4/utils.c -> audacious-plugins-3.2.4.tar.bz2/src/oss4/utils.c Changed

@@ -1,20 +1,20 @@
 /*
- * OSS4 Output Plugin for Audacious
+ * utils.c
 * Copyright 2010-2011 Michał Lipski <tallica@o2.pl>
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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 "oss.h"

audacious-plugins-3.1.1.tar.bz2/src/pls/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/pls/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/pls/pls.c -> audacious-plugins-3.2.4.tar.bz2/src/pls/pls.c Changed

audacious-plugins-3.1.1.tar.bz2/src/pls/util.c -> audacious-plugins-3.2.4.tar.bz2/src/pls/util.c Changed

audacious-plugins-3.1.1.tar.bz2/src/pls/util.h -> audacious-plugins-3.2.4.tar.bz2/src/pls/util.h Changed

audacious-plugins-3.1.1.tar.bz2/src/psf/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/psf/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/psf/eng_protos.h -> audacious-plugins-3.2.4.tar.bz2/src/psf/eng_protos.h Changed

audacious-plugins-3.1.1.tar.bz2/src/psf/eng_psf.c -> audacious-plugins-3.2.4.tar.bz2/src/psf/eng_psf.c Changed

@@ -64,7 +64,6 @@
 extern void psx_hw_slice(void);
 extern void psx_hw_frame(void);
 extern void setlength(int32 stop, int32 fade);
-extern gboolean stop_flag;
 
 int32 psf_start(uint8 *buffer, uint32 length)
 {
@@ -186,11 +185,18 @@
 		// now patch the file into RAM
 		offset = lib_decoded[0x18] | lib_decoded[0x19]<<8 | lib_decoded[0x1a]<<16 | lib_decoded[0x1b]<<24;
 		offset &= 0x3fffffff;	// kill any MIPS cache segment indicators
-		plength = lib_decoded[0x1c] | lib_decoded[0x1d]<<8 | lib_decoded[0x1e]<<16 | lib_decoded[0x1f]<<24;
+
+		/* valid PS-X EXE image must be at least 2048 bytes, plength section may be wrong on
+		 * shite rips... --nenolod */
+		if (lib_len < 2048)
+			plength = 0;
+		else
+			plength = lib_len - 2048;
+
 		#if DEBUG_LOADER
 		printf("library offset: %x plength: %d\n", offset, plength);
 		#endif
-		memcpy(&psx_ram[offset/4], lib_decoded+2048, plength);
+		memcpy(&psx_ram[offset/4], lib_decoded + 2048, plength);
 
 		// Dispose the corlett structure for the lib - we don't use it
 		free(lib);
@@ -199,14 +205,13 @@
 	// now patch the main file into RAM OVER the libraries (but not the aux lib)
 	offset = file[0x18] | file[0x19]<<8 | file[0x1a]<<16 | file[0x1b]<<24;
 	offset &= 0x3fffffff;	// kill any MIPS cache segment indicators
-	plength = file[0x1c] | file[0x1d]<<8 | file[0x1e]<<16 | file[0x1f]<<24;
 
-	// Philosoma has an illegal "plength". *sigh*
-	if (plength > (file_len-2048))
-	{
-		plength = file_len-2048;
-	}
-	memcpy(&psx_ram[offset/4], file+2048, plength);
+	if (file_len < 2048)
+		plength = 0;
+	else
+		plength = file_len - 2048;
+
+	memcpy(&psx_ram[offset/4], file + 2048, plength);
 
 	// load any auxiliary libraries now
 	for (i = 0; i < 8; i++)
@@ -225,6 +230,9 @@
 			}
 			lib_raw_length = tmp_length;
 
+			if (lib_raw_file == NULL)
+				return AO_FAIL;
+
 			if (corlett_decode(lib_raw_file, lib_raw_length, &alib_decoded, &alib_len, &lib) != AO_SUCCESS)
 			{
 				free(lib_raw_file);
@@ -252,8 +260,13 @@
 			// now patch the file into RAM
 			offset = alib_decoded[0x18] | alib_decoded[0x19]<<8 | alib_decoded[0x1a]<<16 | alib_decoded[0x1b]<<24;
 			offset &= 0x3fffffff;	// kill any MIPS cache segment indicators
-			plength = alib_decoded[0x1c] | alib_decoded[0x1d]<<8 | alib_decoded[0x1e]<<16 | alib_decoded[0x1f]<<24;
-			memcpy(&psx_ram[offset/4], alib_decoded+2048, plength);
+
+			if (alib_len < 2048)
+				plength = 0;
+			else
+				plength = alib_len - 2048;
+
+			memcpy(&psx_ram[offset/4], alib_decoded + 2048, plength);
 
 			// Dispose the corlett structure for the lib - we don't use it
 			free(lib);

audacious-plugins-3.1.1.tar.bz2/src/psf/eng_psf2.c -> audacious-plugins-3.2.4.tar.bz2/src/psf/eng_psf2.c Changed

audacious-plugins-3.1.1.tar.bz2/src/psf/eng_spx.c -> audacious-plugins-3.2.4.tar.bz2/src/psf/eng_spx.c Changed

audacious-plugins-3.1.1.tar.bz2/src/psf/peops2/adsr.c -> audacious-plugins-3.2.4.tar.bz2/src/psf/peops2/adsr.c Changed

@@ -66,7 +66,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StartADSR(int ch) // MIX ADSR
+void StartADSR(int ch) // MIX ADSR
 {
 s_chan[ch].ADSRX.lVolume=1; // and init some adsr vars
 s_chan[ch].ADSRX.State=0;
@@ -75,8 +75,8 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE int MixADSR(int ch) // MIX ADSR
-{ 
+int MixADSR(int ch) // MIX ADSR
+{
 if(s_chan[ch].bStop) // should be stopped:
 { // do release
 if(s_chan[ch].ADSRX.ReleaseModeExp)
@@ -98,7 +98,7 @@
 s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x0C + 32];
 }
 
- if(s_chan[ch].ADSRX.EnvelopeVol<0) 
+ if(s_chan[ch].ADSRX.EnvelopeVol<0)
 {
 s_chan[ch].ADSRX.EnvelopeVol=0;
 s_chan[ch].bOn=0;
@@ -115,7 +115,7 @@
 {
 if(s_chan[ch].ADSRX.AttackModeExp)
 {
- if(s_chan[ch].ADSRX.EnvelopeVol<0x60000000) 
+ if(s_chan[ch].ADSRX.EnvelopeVol<0x60000000)
 s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.AttackRate^0x7F)-0x10 + 32];
 else
 s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.AttackRate^0x7F)-0x18 + 32];
@@ -125,7 +125,7 @@
 s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.AttackRate^0x7F)-0x10 + 32];
 }
 
- if(s_chan[ch].ADSRX.EnvelopeVol<0) 
+ if(s_chan[ch].ADSRX.EnvelopeVol<0)
 {
 s_chan[ch].ADSRX.EnvelopeVol=0x7FFFFFFF;
 s_chan[ch].ADSRX.State=1;
@@ -165,7 +165,7 @@
 {
 if(s_chan[ch].ADSRX.SustainModeExp)
 {
- if(s_chan[ch].ADSRX.EnvelopeVol<0x60000000) 
+ if(s_chan[ch].ADSRX.EnvelopeVol<0x60000000)
 s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.SustainRate^0x7F)-0x10 + 32];
 else
 s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.SustainRate^0x7F)-0x18 + 32];
@@ -175,7 +175,7 @@
 s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.SustainRate^0x7F)-0x10 + 32];
 }
 
- if(s_chan[ch].ADSRX.EnvelopeVol<0) 
+ if(s_chan[ch].ADSRX.EnvelopeVol<0)
 {
 s_chan[ch].ADSRX.EnvelopeVol=0x7FFFFFFF;
 }
@@ -201,7 +201,7 @@
 s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((s_chan[ch].ADSRX.SustainRate^0x7F))-0x0F + 32];
 }
 
- if(s_chan[ch].ADSRX.EnvelopeVol<0) 
+ if(s_chan[ch].ADSRX.EnvelopeVol<0)
 {
 s_chan[ch].ADSRX.EnvelopeVol=0;
 }
@@ -222,7 +222,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 First, here is an extract from doomed's SPU doc, which explains the basics
-of the SPU "volume envelope": 
+of the SPU "volume envelope":
 
 *** doomed doc extract start ***
 
@@ -296,7 +296,7 @@
 read.
 -- James' Note: return range: 0 -> 32767
 
-*** doomed doc extract end *** 
+*** doomed doc extract end ***
 
 By using a small PSX proggie to visualise the envelope as it was played,
 the following results for envelope timing were obtained:
@@ -352,7 +352,7 @@
 Substituting, we get: k = 0.00146
 
 Further info on logarithmic nature:
- frames to decay to sustain level 3 = 3 * frames to decay to 
+ frames to decay to sustain level 3 = 3 * frames to decay to
 sustain level 9
 
 Also no. of frames to 25% volume = roughly 1.85 * no. of frames to
@@ -414,7 +414,7 @@
 ------------------------------------
 
 
-Other notes: 
+Other notes:
 
 Log stuff not figured out. You may get some clues from the "Decay rate"
 stuff above. For emu purposes it may not be important - use linear
@@ -452,7 +452,7 @@
 lT=s_chan[ch].ADSR.lTime- // -> how much time is past?
 s_chan[ch].ADSR.ReleaseStartTime;
 l1=s_chan[ch].ADSR.ReleaseTime;
- 
+
 if(lT<l1) // -> we still have to release
 {
 v=v-((v*lT)/l1); // --> calc new volume
@@ -465,12 +465,12 @@
 v=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;
 }
 }
- else 
+ else
 {//--------------------------------------------------// not in release phase:
 v=1024;
 lT=s_chan[ch].ADSR.lTime;
 l1=s_chan[ch].ADSR.AttackTime;
- 
+
 if(lT<l1) // attack
 { // no exp mode used (yet)
 // if(s_chan[ch].ADSR.AttackModeExp)
@@ -516,13 +516,13 @@
 }
 }
 
- //----------------------------------------------------// 
+ //----------------------------------------------------//
 // ok, done for this channel, so increase time
 
- s_chan[ch].ADSR.lTime+=1; // 1 = 1.020408f ms; 
+ s_chan[ch].ADSR.lTime+=1; // 1 = 1.020408f ms;
 
 if(v>1024) v=1024; // adjust volume
- if(v<0) v=0; 
+ if(v<0) v=0;
 s_chan[ch].ADSR.lVolume=v; // store act volume
 
 return v; // return the volume factor

audacious-plugins-3.1.1.tar.bz2/src/psf/peops2/adsr.h -> audacious-plugins-3.2.4.tar.bz2/src/psf/peops2/adsr.h Changed

audacious-plugins-3.1.1.tar.bz2/src/psf/peops2/reverb.c -> audacious-plugins-3.2.4.tar.bz2/src/psf/peops2/reverb.c Changed

@@ -57,10 +57,10 @@
 // START REVERB
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StartREVERB(int ch)
+void StartREVERB(int ch)
 {
 int core=ch/24;
- 
+
 if((s_chan[ch].bReverbL || s_chan[ch].bReverbR) && (spuCtrl2[core]&0x80)) // reverb possible?
 {
 if(iUseReverb==1) s_chan[ch].bRVBActive=1;
@@ -72,7 +72,7 @@
 // HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void InitREVERB(void)
+static inline void InitREVERB(void)
 {
 if(iUseReverb==1)
 {
@@ -85,10 +85,10 @@
 // STORE REVERB
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StoreREVERB(int ch,int ns)
+void StoreREVERB(int ch,int ns)
 {
 int core=ch/24;
- 
+
 if(iUseReverb==0) return;
 else
 if(iUseReverb==1) // -------------------------------- // Neil's reverb
@@ -105,7 +105,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE int g_buffer(int iOff,int core) // get_buffer content helper: takes care about wraps
+static inline int g_buffer(int iOff,int core) // get_buffer content helper: takes care about wraps
 {
 short * p=(short *)spuMem;
 iOff=(iOff)+rvb[core].CurrAddr;
@@ -116,7 +116,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void s_buffer(int iOff,int iVal,int core) // set_buffer content helper: takes care about wraps and clipping
+static inline void s_buffer(int iOff,int iVal,int core) // set_buffer content helper: takes care about wraps and clipping
 {
 short * p=(short *)spuMem;
 iOff=(iOff)+rvb[core].CurrAddr;
@@ -128,7 +128,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void s_buffer1(int iOff,int iVal,int core) // set_buffer (+1 sample) content helper: takes care about wraps and clipping
+static inline void s_buffer1(int iOff,int iVal,int core) // set_buffer (+1 sample) content helper: takes care about wraps and clipping
 {
 short * p=(short *)spuMem;
 iOff=(iOff)+rvb[core].CurrAddr+1;
@@ -140,18 +140,18 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE int MixREVERBLeft(int ns,int core)
+int MixREVERBLeft(int ns,int core)
 {
 if(iUseReverb==1)
 {
- if(!rvb[core].StartAddr || !rvb[core].EndAddr || 
+ if(!rvb[core].StartAddr || !rvb[core].EndAddr ||
 rvb[core].StartAddr>=rvb[core].EndAddr) // reverb is off
 {
 rvb[core].iLastRVBLeft=rvb[core].iLastRVBRight=rvb[core].iRVBLeft=rvb[core].iRVBRight=0;
 return 0;
 }
 
- rvb[core].iCnt++; 
+ rvb[core].iCnt++;
 
 if(rvb[core].iCnt&1) // we work on every second left value: downsample to 22 khz
 {
@@ -159,8 +159,8 @@
 {
 int ACC0,ACC1,FB_A0,FB_A1,FB_B0,FB_B1;
 
- const int INPUT_SAMPLE_L=*(sRVBStart[core]+(ns<<1)); 
- const int INPUT_SAMPLE_R=*(sRVBStart[core]+(ns<<1)+1); 
+ const int INPUT_SAMPLE_L=*(sRVBStart[core]+(ns<<1));
+ const int INPUT_SAMPLE_R=*(sRVBStart[core]+(ns<<1)+1);
 
 const int IIR_INPUT_A0 = (g_buffer(rvb[core].IIR_SRC_A0,core) * rvb[core].IIR_COEF)/32768L + (INPUT_SAMPLE_L * rvb[core].IN_COEF_L)/32768L;
 const int IIR_INPUT_A1 = (g_buffer(rvb[core].IIR_SRC_A1,core) * rvb[core].IIR_COEF)/32768L + (INPUT_SAMPLE_R * rvb[core].IN_COEF_R)/32768L;
@@ -176,7 +176,7 @@
 s_buffer1(rvb[core].IIR_DEST_A1, IIR_A1,core);
 s_buffer1(rvb[core].IIR_DEST_B0, IIR_B0,core);
 s_buffer1(rvb[core].IIR_DEST_B1, IIR_B1,core);
- 
+
 ACC0 = (g_buffer(rvb[core].ACC_SRC_A0,core) * rvb[core].ACC_COEF_A)/32768L +
 (g_buffer(rvb[core].ACC_SRC_B0,core) * rvb[core].ACC_COEF_B)/32768L +
 (g_buffer(rvb[core].ACC_SRC_C0,core) * rvb[core].ACC_COEF_C)/32768L +
@@ -193,10 +193,10 @@
 
 s_buffer(rvb[core].MIX_DEST_A0, ACC0 - (FB_A0 * rvb[core].FB_ALPHA)/32768L,core);
 s_buffer(rvb[core].MIX_DEST_A1, ACC1 - (FB_A1 * rvb[core].FB_ALPHA)/32768L,core);
- 
+
 s_buffer(rvb[core].MIX_DEST_B0, (rvb[core].FB_ALPHA * ACC0)/32768L - (FB_A0 * (int)(rvb[core].FB_ALPHA^0xFFFF8000))/32768L - (FB_B0 * rvb[core].FB_X)/32768L,core);
 s_buffer(rvb[core].MIX_DEST_B1, (rvb[core].FB_ALPHA * ACC1)/32768L - (FB_A1 * (int)(rvb[core].FB_ALPHA^0xFFFF8000))/32768L - (FB_B1 * rvb[core].FB_X)/32768L,core);
- 
+
 rvb[core].iLastRVBLeft = rvb[core].iRVBLeft;
 rvb[core].iLastRVBRight = rvb[core].iRVBRight;
 
@@ -227,7 +227,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE int MixREVERBRight(int core)
+int MixREVERBRight(int core)
 {
 if(iUseReverb==1) // Neill's reverb:
 {

audacious-plugins-3.1.1.tar.bz2/src/psf/peops2/reverb.h -> audacious-plugins-3.2.4.tar.bz2/src/psf/peops2/reverb.h Changed

audacious-plugins-3.1.1.tar.bz2/src/psf/peops2/spu.c -> audacious-plugins-3.2.4.tar.bz2/src/psf/peops2/spu.c Changed

@@ -5,7 +5,7 @@
 copyright : (C) 2002 by Pete Bernert
 email : BlackDove@addcom.de
 ***************************************************************************/
- 
+
 /***************************************************************************
 * *
 * This program is free software; you can redistribute it and/or modify *
@@ -15,7 +15,7 @@
 * additional informations. *
 * *
 ***************************************************************************/
- 
+
 //*************************************************************************//
 // History of changes:
 //
@@ -102,20 +102,20 @@
 #include "../peops2/externals.h"
 #include "../peops2/regs.h"
 #include "../peops2/dma.h"
- 
+
 ////////////////////////////////////////////////////////////////////////
 // globals
 ////////////////////////////////////////////////////////////////////////
 
 // psx buffer / addresses
 
-unsigned short regArea[32*1024]; 
+unsigned short regArea[32*1024];
 unsigned short spuMem[1*1024*1024];
 unsigned char * spuMemC;
 unsigned char * pSpuIrq[2];
 unsigned char * pSpuBuffer;
 
-// user settings 
+// user settings
 
 int iUseXA=0;
 int iXAPitch=1;
@@ -125,7 +125,7 @@
 int iRecordMode=0;
 int iUseReverb=1;
 int iUseInterpolation=2;
- 
+
 // MAIN infos struct for each channel
 
 SPUCHAN s_chan[MAXCHAN+1]; // channel + 1 infos (1 is security for fmod handling)
@@ -135,7 +135,7 @@
 
 unsigned short spuCtrl2[2]; // some vars to store psx reg infos
 unsigned short spuStat2[2];
-unsigned long spuIrq2[2]; 
+unsigned long spuIrq2[2];
 unsigned long spuAddr2[2]; // address into spu mem
 unsigned long spuRvbAddr2[2];
 unsigned long spuRvbAEnd2[2];
@@ -174,7 +174,7 @@
 
 // dirty inline func includes
 
-#include "reverb.c" 
+#include "reverb.c"
 #include "adsr.c"
 
 ////////////////////////////////////////////////////////////////////////
@@ -212,15 +212,15 @@
 //
 // - and next delta significant (at least twice) bigger:
 // /
-// __- 
-// 
+// __-
+//
 // - and next delta is nearly same:
 // /
 // /
-// 
+//
 
 
-INLINE void InterpolateUp(int ch)
+static inline void InterpolateUp(int ch)
 {
 if(s_chan[ch].SB[32]==1) // flag == 1? calc step and set flag... and don't change the value in this pass
 {
@@ -237,7 +237,7 @@
 if(id2<(id1<<1))
 s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x10000L;
 else
- s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L; 
+ s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L;
 }
 else // curr delta negative
 {
@@ -247,7 +247,7 @@
 if(id2>(id1<<1))
 s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x10000L;
 else
- s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L; 
+ s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L;
 }
 }
 else
@@ -268,7 +268,7 @@
 // even easier interpolation on downsampling, also no special filter, again just "Pete's common sense" tm
 //
 
-INLINE void InterpolateDown(int ch)
+static inline void InterpolateDown(int ch)
 {
 if(s_chan[ch].sinc>=0x20000L) // we would skip at least one val?
 {
@@ -294,22 +294,22 @@
 // START SOUND... called by main thread to setup a new sound on a channel
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StartSound(int ch)
+static inline void StartSound(int ch)
 {
 dwNewChannel2[ch/24]&=~(1<<(ch%24)); // clear new channel bit
 dwEndChannel2[ch/24]&=~(1<<(ch%24)); // clear end channel bit
 
 StartADSR(ch);
- StartREVERB(ch); 
- 
+ StartREVERB(ch);
+
 s_chan[ch].pCurr=s_chan[ch].pStart; // set sample start
- 
+
 s_chan[ch].s_1=0; // init mixing vars
 s_chan[ch].s_2=0;
 s_chan[ch].iSBPos=28;
 
 s_chan[ch].bNew=0; // init channel flags
- s_chan[ch].bStop=0; 
+ s_chan[ch].bStop=0;
 s_chan[ch].bOn=1;
 
 s_chan[ch].SB[29]=0; // init our interpolation helpers
@@ -404,12 +404,12 @@
 
 if(iUseTimer) return 0; // linux no-thread mode? bye
 
- if(dwNewChannel2[0] || dwNewChannel2[1]) 
+ if(dwNewChannel2[0] || dwNewChannel2[1])
 iSecureStart=1; // if a new channel kicks in (or, of course, sound buffer runs low), we will leave the loop
 }
 #endif
 
- //--------------------------------------------------// continue from irq handling in timer mode? 
+ //--------------------------------------------------// continue from irq handling in timer mode?
 
 if(lastch>=0) // will be -1 if no continue is pending
 {
@@ -418,7 +418,7 @@
 }
 
 //--------------------------------------------------//
- //- main channel loop -// 
+ //- main channel loop -//
 //--------------------------------------------------//
 {
 for(ch=0;ch<MAXCHAN;ch++) // loop em all... we will collect 1 ms of sound of each playing channel
@@ -462,9 +462,9 @@
 predict_nr >>= 4;
 flags=(int)*start;start++;
 
- // -------------------------------------- // 
+ // -------------------------------------- //
 
- for (nSample=0;nSample<28;start++) 
+ for (nSample=0;nSample<28;start++)
 {
 d=(int)*start;
 s=((d&0xf)<<12);
@@ -478,12 +478,12 @@
 s_chan[ch].SB[nSample++]=fa;
 
 if(s&0x8000) s|=0xffff0000;
- fa=(s>>shift_factor); 
+ fa=(s>>shift_factor);
 fa=fa + ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6);
 s_2=s_1;s_1=fa;
 
 s_chan[ch].SB[nSample++]=fa;
- } 
+ }
 
 //////////////////////////////////////////// irq check
 
@@ -491,7 +491,7 @@
 {
 if((pSpuIrq[ch/24] > start-16 && // irq address reached?
 pSpuIrq[ch/24] <= start) ||
- ((flags&1) && // special: irq on looping addr, when stop/loop flag is set 
+ ((flags&1) && // special: irq on looping addr, when stop/loop flag is set
 (pSpuIrq[ch/24] > s_chan[ch].pLoop-16 &&
 pSpuIrq[ch/24] <= s_chan[ch].pLoop)))
 {
@@ -503,7 +503,7 @@
 if(ch<24) InterruptDMA4(); // -> let's see what is happening if we call our irqs instead ;)
 else InterruptDMA7();
 }
- 
+
 if(iSPUIRQWait) // -> option: wait after irq for main emu
 {
 iSpuAsyncWait=1;
@@ -511,7 +511,7 @@
 }
 }
 }
- 
+
 //////////////////////////////////////////// flag handler
 
 if((flags&4) && (!s_chan[ch].bIgnoreLoop))
@@ -520,9 +520,9 @@
 if(flags&1) // 1: stop/loop
 {
 dwEndChannel2[ch/24]|=(1<<(ch%24));
- 
+
 // We play this block out first...
- //if(!(flags&2)|| s_chan[ch].pLoop==NULL) 
+ //if(!(flags&2)|| s_chan[ch].pLoop==NULL)
 // 1+2: do loop... otherwise: stop
 if(flags!=3 || s_chan[ch].pLoop==NULL) // PETE: if we don't check exactly for 3, loop hang ups will happen (DQ4, for example)
 { // and checking if pLoop is set avoids crashes, yeah
@@ -536,7 +536,7 @@
 
 s_chan[ch].pCurr=start; // store values for next cycle
 s_chan[ch].s_1=s_1;
- s_chan[ch].s_2=s_2; 
+ s_chan[ch].s_2=s_2;
 
 ////////////////////////////////////////////
 
@@ -544,7 +544,7 @@
 {
 bIRQReturn=0;
 {
- lastch=ch; 
+ lastch=ch;
 // lastns=ns;	// changemeback
 
 return NULL;
@@ -563,20 +563,20 @@
 // else // else adjust
 {
 if(fa>32767L) fa=32767L;
- if(fa<-32767L) fa=-32767L; 
+ if(fa<-32767L) fa=-32767L;
 }
 
 if(iUseInterpolation>=2) // gauss/cubic interpolation
 {
 gpos = s_chan[ch].SB[28];
- gval0 = fa; 
+ gval0 = fa;
 gpos = (gpos+1) & 3;
 s_chan[ch].SB[28] = gpos;
 }
 else
 if(iUseInterpolation==1) // simple interpolation
 {
- s_chan[ch].SB[28] = 0; 
+ s_chan[ch].SB[28] = 0;
 s_chan[ch].SB[29] = s_chan[ch].SB[30]; // -> helpers for simple linear interpolation: delay real val for two slots, and calc the two deltas, for a 'look at the future behaviour'
 s_chan[ch].SB[30] = s_chan[ch].SB[31];
 s_chan[ch].SB[31] = fa;
@@ -605,17 +605,17 @@
 // mmm... depending on the noise freq we allow bigger/smaller changes to the previous val
 fa=s_chan[ch].iOldNoise+((fa-s_chan[ch].iOldNoise)/((0x001f-((spuCtrl2[ch/24]&0x3f00)>>9))+1));
 if(fa>32767L) fa=32767L;
- if(fa<-32767L) fa=-32767L; 
+ if(fa<-32767L) fa=-32767L;
 s_chan[ch].iOldNoise=fa;
 
 if(iUseInterpolation<2) // no gauss/cubic interpolation?
 s_chan[ch].SB[29] = fa; // -> store noise val in "current sample" slot
 } //----------------------------------------
- else // NO NOISE (NORMAL SAMPLE DATA) HERE 
+ else // NO NOISE (NORMAL SAMPLE DATA) HERE
 {//------------------------------------------//
 if(iUseInterpolation==3) // cubic interpolation
 {
- long xd; 
+ long xd;
 xd = ((s_chan[ch].spos) >> 1)+1;
 gpos = s_chan[ch].SB[28];
 
@@ -674,7 +674,7 @@
 
 if(NP>0x3fff) NP=0x3fff;
 if(NP<0x1) NP=0x1;
- 
+
 	 intr = (double)48000.0f / (double)44100.0f * (double)NP;
 NP = (UINT32)intr;
 
@@ -690,13 +690,13 @@
 // mmmm... set up freq decoding positions?
 // s_chan[ch+1].iSBPos=28;
 // s_chan[ch+1].spos=0x10000L;
- } 
- else 
- { 
+ }
+ else
+ {
 //////////////////////////////////////////////
 // ok, left/right sound volume (psx volume goes from 0 ... 0x3fff)
 
- if(s_chan[ch].iMute) 
+ if(s_chan[ch].iMute)
 s_chan[ch].sval=0; // debug mute
 else
 {
@@ -705,23 +705,23 @@
 if(s_chan[ch].bVolumeR)
 SSumR[0]+=(s_chan[ch].sval*s_chan[ch].iRightVolume)/0x4000L;
 }
- 
+
 //////////////////////////////////////////////
- // now let us store sound data for reverb 
- 
+ // now let us store sound data for reverb
+
 if(s_chan[ch].bRVBActive) StoreREVERB(ch,0);
 }
 
 ////////////////////////////////////////////////
 // ok, go on until 1 ms data of this channel is collected
- 
- s_chan[ch].spos += s_chan[ch].sinc; 
- 
- } 
-ENDX: ; 
+
+ s_chan[ch].spos += s_chan[ch].sinc;
+
+ }
+ENDX: ;
 }
- } 
- 
+ }
+
 //---------------------------------------------------//
 //- here we have another 1 ms of sound data
 //---------------------------------------------------//
@@ -733,7 +733,7 @@
 SSumL[0]+=MixREVERBLeft(0,1);
 SSumR[0]+=MixREVERBRight(0);
 SSumR[0]+=MixREVERBRight(1);
- 
+
 d=SSumL[0];SSumL[0]=0;
 d2=SSumR[0];SSumR[0]=0;
 
@@ -764,7 +764,7 @@
 
 InitREVERB();
 
- ////////////////////////////////////////////////////// 
+ //////////////////////////////////////////////////////
 // feed the sound
 // wanna have around 1/60 sec (16.666 ms) updates
 	if (seektime != 0 && sampcount < seektime)
@@ -788,7 +788,7 @@
 		if (iSilenceCount < 20)
 		 	psf2_update((u8*)pSpuBuffer,(u8*)pS-(u8*)pSpuBuffer, data);
 
-	 pS=(short *)pSpuBuffer;					 
+	 pS=(short *)pSpuBuffer;
 	}
 }
 
@@ -827,7 +827,7 @@
 // SPUINIT: this func will be called first by the main emu
 ////////////////////////////////////////////////////////////////////////
 
- 
+
 EXPORT_GCC long CALLBACK SPU2init(void)
 {
 spuMemC=(unsigned char *)spuMem; // just small setup
@@ -852,7 +852,7 @@
 pS=(short *)pSpuBuffer; // setup soundbuffer pointer
 
 bEndThread=0; // init thread vars
- bThreadEnded=0; 
+ bThreadEnded=0;
 bSpuInit=1; // flag: we are inited
 }
 
@@ -872,7 +872,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 static void SetupStreams(void)
-{ 
+{
 int i;
 
 pSpuBuffer=(unsigned char *)malloc(32768); // alloc mixing buffer
@@ -890,7 +890,7 @@
 
 for(i=0;i<MAXCHAN;i++) // loop sound channels
 {
-// we don't use mutex sync... not needed, would only 
+// we don't use mutex sync... not needed, would only
 // slow us down:
 // s_chan[i].hMutex=CreateMutex(NULL,FALSE,NULL);
 s_chan[i].ADSRX.SustainLevel = 1024; // -> init sustain
@@ -907,7 +907,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 static void RemoveStreams(void)
-{ 
+{
 free(pSpuBuffer); // free mixing buffer
 pSpuBuffer=NULL;
 free(sRVBStart[0]); // free reverb buffer
@@ -921,7 +921,7 @@
 {
 WaitForSingleObject(s_chan[i].hMutex,2000);
 ReleaseMutex(s_chan[i].hMutex);
- if(s_chan[i].hMutex) 
+ if(s_chan[i].hMutex)
 {CloseHandle(s_chan[i].hMutex);s_chan[i].hMutex=0;}
 }
 */
@@ -931,15 +931,15 @@
 ////////////////////////////////////////////////////////////////////////
 // SPUOPEN: called by main emu after init
 ////////////////////////////////////////////////////////////////////////
- 
-EXPORT_GCC long CALLBACK SPU2open(void *pDsp) 
+
+EXPORT_GCC long CALLBACK SPU2open(void *pDsp)
 {
 if(bSPUIsOpen) return 0; // security for some stupid main emus
 
 iUseXA=0; // just small setup
 bEndThread=0;
 bThreadEnded=0;
- spuMemC=(unsigned char *)spuMem; 
+ spuMemC=(unsigned char *)spuMem;
 memset((void *)s_chan,0,(MAXCHAN+1)*sizeof(SPUCHAN));
 pSpuIrq[0]=0;
 pSpuIrq[1]=0;
@@ -948,21 +948,21 @@
 dwNewChannel2[1]=0;
 dwEndChannel2[0]=0;
 dwEndChannel2[1]=0;
- spuCtrl2[0]=0; 
- spuCtrl2[1]=0; 
+ spuCtrl2[0]=0;
+ spuCtrl2[1]=0;
 spuStat2[0]=0;
 spuStat2[1]=0;
- spuIrq2[0]=0; 
- spuIrq2[1]=0; 
- spuAddr2[0]=0xffffffff; 
- spuAddr2[1]=0xffffffff; 
+ spuIrq2[0]=0;
+ spuIrq2[1]=0;
+ spuAddr2[0]=0xffffffff;
+ spuAddr2[1]=0xffffffff;
 spuRvbAddr2[0]=0;
 spuRvbAddr2[1]=0;
 spuRvbAEnd2[0]=0;
 spuRvbAEnd2[1]=0;
- 
+
 // ReadConfig(); // read user stuff
- 
+
 // SetupSound(); // setup midas (before init!)
 
 SetupStreams(); // prepare streaming
@@ -971,7 +971,7 @@
 
 bSPUIsOpen=1;
 
- return 0; 
+ return 0;
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -1013,7 +1013,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 // SETUP CALLBACKS
-// this functions will be called once, 
+// this functions will be called once,
 // passes a callback that should be called on SPU-IRQ/cdda volume change
 ////////////////////////////////////////////////////////////////////////

audacious-plugins-3.1.1.tar.bz2/src/psf/plugin.c -> audacious-plugins-3.2.4.tar.bz2/src/psf/plugin.c Changed

@@ -24,6 +24,7 @@
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include <glib.h>
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,7 +32,6 @@
 
 #include <audacious/misc.h>
 #include <audacious/plugin.h>
-#include <libaudcore/tuple_formatter.h>
 
 #include "ao.h"
 #include "corlett.h"
@@ -117,15 +117,15 @@
 
 	t = tuple_new_from_filename(filename);
 
-	tuple_associate_int(t, FIELD_LENGTH, NULL, c->inf_length ? psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade) : -1);
-	tuple_associate_string(t, FIELD_ARTIST, NULL, c->inf_artist);
-	tuple_associate_string(t, FIELD_ALBUM, NULL, c->inf_game);
-	tuple_associate_string(t, -1, "game", c->inf_game);
-	tuple_associate_string(t, FIELD_TITLE, NULL, c->inf_title);
-	tuple_associate_string(t, FIELD_COPYRIGHT, NULL, c->inf_copy);
-	tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced");
-	tuple_associate_string(t, FIELD_CODEC, NULL, "PlayStation 1/2 Audio");
-	tuple_associate_string(t, -1, "console", "PlayStation 1/2");
+	tuple_set_int(t, FIELD_LENGTH, NULL, c->inf_length ? psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade) : -1);
+	tuple_set_str(t, FIELD_ARTIST, NULL, c->inf_artist);
+	tuple_set_str(t, FIELD_ALBUM, NULL, c->inf_game);
+	tuple_set_str(t, -1, "game", c->inf_game);
+	tuple_set_str(t, FIELD_TITLE, NULL, c->inf_title);
+	tuple_set_str(t, FIELD_COPYRIGHT, NULL, c->inf_copy);
+	tuple_set_str(t, FIELD_QUALITY, NULL, "sequenced");
+	tuple_set_str(t, FIELD_CODEC, NULL, "PlayStation 1/2 Audio");
+	tuple_set_str(t, -1, "console", "PlayStation 1/2");
 
 	free(c);
 	g_free(buf);

audacious-plugins-3.1.1.tar.bz2/src/psf/psx.c -> audacious-plugins-3.2.4.tar.bz2/src/psf/psx.c Changed

@@ -223,7 +223,7 @@
 	logerror( "%08x: GTE: %08x %s\n", mipscpu.pc, INS_COFUN( mipscpu.op ), s_text );
 }
 #else
-INLINE void GTELOG(const char *a, ...) {}
+static inline void GTELOG(const char *a, ...) {}
 #endif
 
 static UINT32 getcp2dr( int n_reg );
@@ -242,7 +242,7 @@
 #endif
 }
 
-INLINE void mips_set_cp0r( int reg, UINT32 value )
+static inline void mips_set_cp0r( int reg, UINT32 value )
 {
 	mipscpu.cp0r[ reg ] = value;
 	if( reg == CP0_SR || reg == CP0_CAUSE )
@@ -259,7 +259,7 @@
 	}
 }
 
-INLINE void mips_commit_delayed_load( void )
+static inline void mips_commit_delayed_load( void )
 {
 	if( mipscpu.delayr != 0 )
 	{
@@ -269,7 +269,7 @@
 	}
 }
 
-INLINE void mips_delayed_branch( UINT32 n_adr )
+static inline void mips_delayed_branch( UINT32 n_adr )
 {
 	if( ( n_adr & ( ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
 	{
@@ -285,7 +285,7 @@
 	}
 }
 
-INLINE void mips_set_pc( unsigned val )
+static inline void mips_set_pc( unsigned val )
 {
 	mipscpu.pc = val;
 	change_pc( val );
@@ -293,7 +293,7 @@
 	mipscpu.delayv = 0;
 }
 
-INLINE void mips_advance_pc( void )
+static inline void mips_advance_pc( void )
 {
 	if( mipscpu.delayr == REGPC )
 	{
@@ -306,7 +306,7 @@
 	}
 }
 
-INLINE void mips_load( UINT32 n_r, UINT32 n_v )
+static inline void mips_load( UINT32 n_r, UINT32 n_v )
 {
 	mips_advance_pc();
 	if( n_r != 0 )
@@ -315,7 +315,7 @@
 	}
 }
 
-INLINE void mips_delayed_load( UINT32 n_r, UINT32 n_v )
+static inline void mips_delayed_load( UINT32 n_r, UINT32 n_v )
 {
 	if( mipscpu.delayr == REGPC )
 	{
@@ -408,7 +408,7 @@
 //		CALL_MAME_DEBUG;
 
 //		psx_hw_runcounters();
-	
+
 		mipscpu.op = cpu_readop32( mipscpu.pc );
 
 #if 0
@@ -426,7 +426,7 @@
 		if (( mipscpu.delayr == 0 ) || ((mipscpu.delayr != 0) && (mipscpu.op != 0)))
 		{
 			mipscpu.prevpc = mipscpu.pc;
-		}	
+		}
 #if 0
 		if (1) //psxcpu_verbose)
 		{
@@ -1915,7 +1915,7 @@
 	mipscpu.cp2cr[ n_reg ].d = n_value;
 }
 
-INLINE INT32 LIM( INT32 n_value, INT32 n_max, INT32 n_min, UINT32 n_flag )
+static inline INT32 LIM( INT32 n_value, INT32 n_max, INT32 n_min, UINT32 n_flag )
 {
 	if( n_value > n_max )
 	{
@@ -1930,7 +1930,7 @@
 	return n_value;
 }
 
-INLINE INT64 BOUNDS( INT64 n_value, INT64 n_max, int n_maxflag, INT64 n_min, int n_minflag )
+static inline INT64 BOUNDS( INT64 n_value, INT64 n_max, int n_maxflag, INT64 n_min, int n_minflag )
 {
 	if( n_value > n_max )
 	{
@@ -1954,7 +1954,7 @@
 #define Lm_C3( a ) LIM( ( a ), 0x00ff, 0x0000, ( 1 << 19 ) )
 #define Lm_D( a ) LIM( ( a ), 0xffff, 0x0000, ( 1 << 31 ) | ( 1 << 18 ) )
 
-INLINE UINT32 Lm_E( UINT32 n_z )
+static inline UINT32 Lm_E( UINT32 n_z )
 {
 	if( n_z <= H / 2 )
 	{
@@ -2751,7 +2751,7 @@
 		case CPUINFO_INT_REGISTER + MIPS_CP2CR29:		mipscpu.cp2cr[ 29 ].d = info->i;		break;
 		case CPUINFO_INT_REGISTER + MIPS_CP2CR30:		mipscpu.cp2cr[ 30 ].d = info->i;		break;
 		case CPUINFO_INT_REGISTER + MIPS_CP2CR31:		mipscpu.cp2cr[ 31 ].d = info->i;		break;
-		
+
 		/* --- the following bits of info are set as pointers to data or functions --- */
 		case CPUINFO_PTR_IRQ_CALLBACK:					mipscpu.irq_callback = info->irqcallback;			break;
 	}
@@ -2777,7 +2777,7 @@
 		case CPUINFO_INT_MAX_INSTRUCTION_BYTES:			info->i = 4;							break;
 		case CPUINFO_INT_MIN_CYCLES:					info->i = 1;							break;
 		case CPUINFO_INT_MAX_CYCLES:					info->i = 40;							break;
-		
+
 		case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:	info->i = 32;					break;
 		case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32;					break;
 		case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0;					break;

audacious-plugins-3.1.1.tar.bz2/src/pulse_audio/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/pulse_audio/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/pulse_audio/pulse_audio.c -> audacious-plugins-3.2.4.tar.bz2/src/pulse_audio/pulse_audio.c Changed

@@ -31,6 +31,7 @@
 
 #include <audacious/debug.h>
 #include <audacious/drct.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 #include <audacious/i18n.h>
 #include <libaudgui/libaudgui.h>
@@ -163,33 +164,27 @@
 pa_threaded_mainloop_signal(mainloop, 0);
 }
 
-static void pulse_get_volume(int *l, int *r) {
- pa_cvolume v;
- int b = 0;
-
- *l = *r = 100;
+static void pulse_get_volume (int * l, int * r)
+{
+ * l = * r = 0;
 
- if (connected) {
- pa_threaded_mainloop_lock(mainloop);
- CHECK_DEAD_GOTO(fail, 1);
+ if (! connected || ! volume_valid)
+ return;
 
- v = volume;
- b = volume_valid;
+ pa_threaded_mainloop_lock (mainloop);
+ CHECK_DEAD_GOTO (fail, 1);
 
- fail:
- pa_threaded_mainloop_unlock(mainloop);
- } else {
- v = volume;
- b = volume_valid;
+ if (volume.channels == 2)
+ {
+ * l = (volume.values[0] * 100 + PA_VOLUME_NORM / 2) / PA_VOLUME_NORM;
+ * r = (volume.values[1] * 100 + PA_VOLUME_NORM / 2) / PA_VOLUME_NORM;
 }
+ else
+ * l = * r = (pa_cvolume_avg (& volume) * 100 + PA_VOLUME_NORM / 2) /
+ PA_VOLUME_NORM;
 
- if (b) {
- if (v.channels == 2) {
- * l = (v.values[0] * 100 + PA_VOLUME_NORM / 2) / PA_VOLUME_NORM;
- * r = (v.values[1] * 100 + PA_VOLUME_NORM / 2) / PA_VOLUME_NORM;
- } else
- * l = * r = (pa_cvolume_avg (& v) * 100 + PA_VOLUME_NORM / 2) / PA_VOLUME_NORM;
- }
+fail:
+ pa_threaded_mainloop_unlock (mainloop);
 }
 
 static void volume_time_cb(pa_mainloop_api *api, pa_time_event *e, const struct timeval *tv, void *userdata) {
@@ -208,10 +203,11 @@
 
 static void pulse_set_volume(int l, int r) {
 
- if (connected) {
- pa_threaded_mainloop_lock(mainloop);
- CHECK_DEAD_GOTO(fail, 1);
- }
+ if (! connected)
+ return;
+
+ pa_threaded_mainloop_lock (mainloop);
+ CHECK_DEAD_GOTO (fail, 1);
 
 /* sanitize output volumes. */
 l = CLAMP(l, 0, 100);
@@ -440,7 +436,7 @@
 writeoffs < length;
 writeoffs += writable, remain -= writable)
 {
- gpointer pptr = ptr + writeoffs;
+ gpointer pptr = (char *) ptr + writeoffs;
 
 writable = length - writeoffs;
 size_t fragsize = pa_stream_writable_size(stream);
@@ -487,6 +483,7 @@
 }
 
 volume_time_event = NULL;
+ volume_valid = 0;
 }
 
 static int pulse_open(gint fmt, int rate, int nch) {
@@ -584,11 +581,18 @@
 pa_stream_set_latency_update_callback(stream, stream_latency_update_cb, NULL);
 
 /* Connect stream with sink and default volume */
- if (pa_stream_connect_playback(stream, NULL, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0) {
+ /* Buffer struct */
+
+ int aud_buffer = aud_get_int(NULL, "output_buffer_size");
+ size_t buffer_size = pa_usec_to_bytes(aud_buffer, &ss) * 1000;
+ pa_buffer_attr buffer = {(uint32_t) -1, buffer_size, (uint32_t) -1, (uint32_t) -1, buffer_size};
+
+ if (pa_stream_connect_playback(stream, NULL, &buffer, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0) {
 ERROR ("Failed to connect stream: %s", pa_strerror(pa_context_errno(context)));
 goto unlock_and_fail;
 }
 
+
 /* Wait until the stream is ready */
 pa_threaded_mainloop_wait(mainloop);
 
@@ -671,7 +675,7 @@
 static GtkWidget *dialog;
 audgui_simple_message(& dialog, GTK_MESSAGE_INFO,
 _("About Audacious PulseAudio Output Plugin"),
- "Audacious PulseAudio Output Plugin\n\n "
+ "Audacious PulseAudio Output Plugin\n\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
 "the Free Software Foundation; either version 2 of the License, or\n"

audacious-plugins-3.1.1.tar.bz2/src/resample/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/resample/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/scrobbler/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/scrobbler/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/scrobbler/configure.c -> audacious-plugins-3.2.4.tar.bz2/src/scrobbler/configure.c Changed

audacious-plugins-3.1.1.tar.bz2/src/scrobbler/plugin.c -> audacious-plugins-3.2.4.tar.bz2/src/scrobbler/plugin.c Changed

audacious-plugins-3.1.1.tar.bz2/src/scrobbler/scrobbler.c -> audacious-plugins-3.2.4.tar.bz2/src/scrobbler/scrobbler.c Changed

@@ -14,7 +14,6 @@
 #include <audacious/debug.h>
 #include <audacious/misc.h>
 #include <audacious/plugin.h>
-#include <libaudcore/md5.h>
 
 #define SCROBBLER_CLI_ID "aud"
 #define SCROBBLER_HS_WAIT 1800
@@ -77,7 +76,7 @@
 {
 const gchar *cur, *ext;
 gchar *path, *tmp;
- gint realchar;
+ guint realchar;
 
 if (!encoded_path)
 return NULL;
@@ -141,12 +140,17 @@
 static item_t *create_item(Tuple *tuple, int len)
 {
 item_t *item;
- const gchar *album;
+ gchar *album, *artist, *title;
 
 item = malloc(sizeof(item_t));
 
- item->artist = fmt_escape(tuple_get_string(tuple, FIELD_ARTIST, NULL));
- item->title = fmt_escape(tuple_get_string(tuple, FIELD_TITLE, NULL));
+ artist = tuple_get_str(tuple, FIELD_ARTIST, NULL);
+ item->artist = fmt_escape(artist);
+ str_unref(artist);
+
+ title = tuple_get_str(tuple, FIELD_TITLE, NULL);
+ item->title = fmt_escape(title);
+ str_unref(title);
 
 if (item->artist == NULL || item->title == NULL)
 {
@@ -159,9 +163,12 @@
 item->timeplayed = 0;
 item->utctime = time(NULL);
 
- album = tuple_get_string(tuple, FIELD_ALBUM, NULL);
+ album = tuple_get_str(tuple, FIELD_ALBUM, NULL);
 if (album)
- item->album = fmt_escape((char*) album);
+ {
+ item->album = fmt_escape(album);
+ str_unref(album);
+ }
 else
 item->album = fmt_escape("");
 
@@ -457,12 +464,13 @@
 
 static unsigned char *md5_string(char *pass, int len)
 {
- aud_md5state_t md5state;
 static unsigned char md5pword[16];
+ gsize md5len = 16;
 
- aud_md5_init(&md5state);
- aud_md5_append(&md5state, (unsigned const char *)pass, len);
- aud_md5_finish(&md5state, md5pword);
+ GChecksum * state = g_checksum_new (G_CHECKSUM_MD5);
+ g_checksum_update (state, (unsigned char *) pass, len);
+ g_checksum_get_digest (state, md5pword, & md5len);
+ g_checksum_free (state);
 
 return md5pword;
 }
@@ -573,17 +581,19 @@
 }
 
 if (sc_challenge_hash != NULL) {
- aud_md5state_t md5state;
 unsigned char md5pword[16];
+ gsize md5len = 16;
 
- aud_md5_init(&md5state);
 /*AUDDBG("Pass Hash: %s", sc_password));*/
- aud_md5_append(&md5state, (unsigned const char *)sc_password,
- strlen(sc_password));
 /*AUDDBG("Challenge Hash: %s", sc_challenge_hash));*/
- aud_md5_append(&md5state, (unsigned const char *)sc_challenge_hash,
- strlen(sc_challenge_hash));
- aud_md5_finish(&md5state, md5pword);
+
+ GChecksum * state = g_checksum_new (G_CHECKSUM_MD5);
+ g_checksum_update (state, (unsigned char *) sc_password, strlen (sc_password));
+ g_checksum_update (state, (unsigned char *) sc_challenge_hash,
+ strlen (sc_challenge_hash));
+ g_checksum_get_digest (state, md5pword, & md5len);
+ g_checksum_free (state);
+
 hexify((char*)md5pword, sizeof(md5pword));
 /*AUDDBG("Response Hash: %s", sc_response_hash));*/
 }
@@ -784,9 +794,18 @@
 curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 /*cfa(&post, &last, "debug", "failed");*/
 
- char *field_artist = fmt_escape(tuple_get_string(tuple, FIELD_ARTIST, NULL));
- char *field_title = fmt_escape(tuple_get_string(tuple, FIELD_TITLE, NULL));
- char *field_album = tuple_get_string(tuple, FIELD_ALBUM, NULL) ? fmt_escape(tuple_get_string(tuple, FIELD_ALBUM, NULL)) : fmt_escape("");
+ char *artist = tuple_get_str(tuple, FIELD_ARTIST, NULL);
+ char *field_artist = fmt_escape(artist);
+ str_unref(artist);
+
+ char *title = tuple_get_str(tuple, FIELD_TITLE, NULL);
+ char *field_title = fmt_escape(title);
+ str_unref(title);
+
+ char *album = tuple_get_str(tuple, FIELD_ALBUM, NULL);
+ char *field_album = album ? fmt_escape(album) : fmt_escape("");
+ str_unref(album);
+
 snprintf(entry, 16384, "s=%s&a=%s&t=%s&b=%s&l=%d&n=%d&m=", sc_session_id,
 field_artist,
 field_title,
@@ -953,18 +972,18 @@
 Tuple *tuple = tuple_new();
 gchar* string_value;
 string_value = xmms_urldecode_plain(artist);
- tuple_associate_string(tuple, FIELD_ARTIST, NULL, string_value);
+ tuple_set_str(tuple, FIELD_ARTIST, NULL, string_value);
 g_free(string_value);
 string_value = xmms_urldecode_plain(title);
- tuple_associate_string(tuple, FIELD_TITLE, NULL, string_value);
+ tuple_set_str(tuple, FIELD_TITLE, NULL, string_value);
 g_free(string_value);
 string_value = xmms_urldecode_plain(album);
- tuple_associate_string(tuple, FIELD_ALBUM, NULL, string_value);
+ tuple_set_str(tuple, FIELD_ALBUM, NULL, string_value);
 g_free(string_value);
- tuple_associate_int(tuple, FIELD_TRACK_NUMBER, NULL, track);
+ tuple_set_int(tuple, FIELD_TRACK_NUMBER, NULL, track);
 item = q_put(tuple, t, len);
 
- tuple_free(tuple);
+ tuple_unref(tuple);
 
 if (item != NULL)
 AUDDBG ("a[%d]=%s t[%d]=%s l[%d]=%d i[%d]=%d b[%d]=%s\n", i,
@@ -972,9 +991,9 @@
 I_TIME (item), i, I_ALBUM (item));
 }
 
- free(artist);
- free(title);
- free(album);
+ g_free(artist);
+ g_free(title);
+ g_free(album);
 i++;
 }
 g_strfreev(entry);

audacious-plugins-3.1.1.tar.bz2/src/scrobbler/scrobbler.h -> audacious-plugins-3.2.4.tar.bz2/src/scrobbler/scrobbler.h Changed

audacious-plugins-3.1.1.tar.bz2/src/sdlout/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/sdlout/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/sdlout/plugin.c -> audacious-plugins-3.2.4.tar.bz2/src/sdlout/plugin.c Changed

audacious-plugins-3.1.1.tar.bz2/src/sdlout/sdlout.c -> audacious-plugins-3.2.4.tar.bz2/src/sdlout/sdlout.c Changed

audacious-plugins-3.2.4.tar.bz2/src/search-tool Added

audacious-plugins-3.2.4.tar.bz2/src/search-tool/Makefile Added

audacious-plugins-3.2.4.tar.bz2/src/search-tool/search-tool.c Added

@@ -0,0 +1,705 @@
+/*
+ * search-tool.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 <string.h>
+
+#include <gtk/gtk.h>
+
+#include <audacious/gtk-compat.h>
+#include <audacious/i18n.h>
+#include <audacious/misc.h>
+#include <audacious/playlist.h>
+#include <audacious/plugin.h>
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudgui/list.h>
+
+#include "config.h"
+
+#define MAX_RESULTS 12
+#define SEARCH_DELAY 300
+
+enum {GENRE, ARTIST, ALBUM, TITLE, FIELDS};
+
+static const gchar * const field_names[] = {N_("Genre"), N_("Artist"),
+ N_("Album"), N_("Title")};
+
+typedef struct {
+ gint field;
+ gchar * name, * folded;
+ GArray * matches;
+} Item;
+
+static gint playlist_id;
+static gchar * * search_terms;
+
+static GHashTable * added_table;
+static GHashTable * dicts[FIELDS];
+static Index * items;
+static GArray * selection;
+
+static gboolean adding, dicts_valid;
+static gint search_source;
+
+static GtkWidget * help_label, * wait_label, * scrolled, * results_list;
+
+/* str_unref() may be a macro */
+static void str_unref_cb (void * str)
+{
+ str_unref (str);
+}
+
+static Item * item_new (gint field, gchar * name)
+{
+ Item * item = g_slice_new (Item);
+ item->field = field;
+ item->name = name;
+ item->folded = g_utf8_casefold (name, -1);
+ item->matches = g_array_new (FALSE, FALSE, sizeof (gint));
+ return item;
+}
+
+static void item_free (Item * item)
+{
+ str_unref (item->name);
+ g_free (item->folded);
+ g_array_free (item->matches, TRUE);
+ g_slice_free (Item, item);
+}
+
+static void find_playlist (void)
+{
+ playlist_id = -1;
+
+ for (gint p = 0; playlist_id < 0 && p < aud_playlist_count (); p ++)
+ {
+ gchar * title = aud_playlist_get_title (p);
+
+ if (! strcmp (title, _("Library")))
+ playlist_id = aud_playlist_get_unique_id (p);
+
+ str_unref (title);
+ }
+}
+
+static gint create_playlist (void)
+{
+ gint list = aud_playlist_get_blank ();
+ aud_playlist_set_title (list, _("Library"));
+ aud_playlist_set_active (list);
+ playlist_id = aud_playlist_get_unique_id (list);
+ return list;
+}
+
+static gint get_playlist (gboolean require_added, gboolean require_scanned)
+{
+ if (playlist_id < 0)
+ return -1;
+
+ gint list = aud_playlist_by_unique_id (playlist_id);
+
+ if (list < 0)
+ {
+ playlist_id = -1;
+ return -1;
+ }
+
+ if (require_added && aud_playlist_add_in_progress (list))
+ return -1;
+ if (require_scanned && aud_playlist_scan_in_progress (list))
+ return -1;
+
+ return list;
+}
+
+static void set_search_phrase (const gchar * phrase)
+{
+ g_strfreev (search_terms);
+
+ gchar * folded = g_utf8_casefold (phrase, -1);
+ search_terms = g_strsplit (folded, " ", -1);
+ g_free (folded);
+}
+
+static gchar * get_path (void)
+{
+ gchar * path = aud_get_string ("search-tool", "path");
+ if (g_file_test (path, G_FILE_TEST_EXISTS))
+ return path;
+
+ g_free (path);
+ path = g_build_filename (g_get_home_dir (), "Music", NULL);
+ if (g_file_test (path, G_FILE_TEST_EXISTS))
+ return path;
+
+ g_free (path);
+ return g_strdup (g_get_home_dir ());
+}
+
+static void destroy_added_table (void)
+{
+ if (! added_table)
+ return;
+
+ g_hash_table_destroy (added_table);
+ added_table = NULL;
+}
+
+static void destroy_dicts (void)
+{
+ if (items)
+ index_delete (items, 0, index_count (items));
+
+ for (gint f = 0; f < FIELDS; f ++)
+ {
+ if (! dicts[f])
+ continue;
+
+ g_hash_table_destroy (dicts[f]);
+ dicts[f] = NULL;
+ }
+}
+
+static void create_dicts (gint list)
+{
+ destroy_dicts ();
+ for (gint f = 0; f < FIELDS; f ++)
+ dicts[f] = g_hash_table_new_full (g_str_hash, g_str_equal, str_unref_cb,
+ (GDestroyNotify) item_free);
+
+ gint entries = aud_playlist_entry_count (list);
+
+ for (gint e = 0; e < entries; e ++)
+ {
+ gchar * fields[FIELDS];
+
+ Tuple * tuple = aud_playlist_entry_get_tuple (list, e, TRUE);
+ fields[GENRE] = tuple ? tuple_get_str (tuple, FIELD_GENRE, NULL) : NULL;
+ if (tuple)
+ tuple_unref (tuple);
+
+ aud_playlist_entry_describe (list, e, & fields[TITLE], & fields[ARTIST],
+ & fields[ALBUM], TRUE);
+
+ for (gint f = 0; f < FIELDS; f ++)
+ {
+ if (! fields[f])
+ continue;
+
+ Item * item = g_hash_table_lookup (dicts[f], fields[f]);
+
+ if (item)
+ str_unref (fields[f]);
+ else
+ {
+ item = item_new (f, fields[f]);
+ g_hash_table_insert (dicts[f], str_ref (item->name), item);
+ }
+
+ g_array_append_val (item->matches, e);
+ }
+ }
+}
+
+static void search_cb (void * key, void * item, void * index)
+{
+ if (index_count (index) > MAX_RESULTS)
+ return;
+
+ for (gint t = 0; search_terms[t]; t ++)
+ {
+ if (! strstr (((Item *) item)->folded, search_terms[t]))
+ return;
+ }
+
+ index_append (index, item);
+}
+
+static gint item_compare (const void * _a, const void * _b)
+{
+ const Item * a = _a, * b = _b;
+
+ if (a->field != b->field)
+ return (a->field > b->field) ? 1 : -1;
+
+ return string_compare (a->name, b->name);
+}
+
+static void do_search (void)
+{
+ index_delete (items, 0, index_count (items));
+
+ for (gint f = 0; f < FIELDS; f ++)
+ {
+ if (! dicts[f])
+ continue;
+
+ Index * index = index_new ();
+ g_hash_table_foreach (dicts[f], search_cb, index);
+
+ if (index_count (index) <= MAX_RESULTS)
+ {
+ index_sort (index, item_compare);
+ index_merge_append (items, index);
+ }
+
+ index_free (index);
+ }
+
+ g_array_set_size (selection, index_count (items));
+ memset (selection->data, 0, selection->len);
+ if (selection->len > 0)
+ selection->data[0] = 1;
+}
+
+static gboolean filter_cb (const gchar * filename, void * unused)
+{
+ return added_table && ! g_hash_table_lookup_extended (added_table, filename, NULL, NULL);
+}
+
+static void begin_add (const gchar * path)
+{
+ gint list = get_playlist (FALSE, FALSE);
+
+ if (list < 0)
+ list = create_playlist ();
+
+ aud_set_string ("search-tool", "path", path);
+
+ gchar * uri = filename_to_uri (path);
+ g_return_if_fail (uri);
+ gchar * prefix = g_str_has_suffix (uri, "/") ? g_strdup (uri) : g_strconcat (uri, "/", NULL);
+
+ destroy_added_table ();
+ added_table = g_hash_table_new_full (g_str_hash, g_str_equal, str_unref_cb, NULL);
+
+ gint entries = aud_playlist_entry_count (list);
+
+ for (gint entry = 0; entry < entries; entry ++)
+ {
+ gchar * filename = aud_playlist_entry_get_filename (list, entry);
+
+ if (g_str_has_prefix (filename, prefix) && ! g_hash_table_lookup_extended
+ (added_table, filename, NULL, NULL))
+ {
+ aud_playlist_entry_set_selected (list, entry, FALSE);
+ g_hash_table_insert (added_table, filename, NULL);
+ }
+ else
+ {
+ aud_playlist_entry_set_selected (list, entry, TRUE);
+ str_unref (filename);
+ }
+ }
+
+ aud_playlist_delete_selected (list);
+ aud_playlist_remove_failed (list);
+
+ Index * add = index_new ();
+ index_append (add, str_get (uri));
+ aud_playlist_entry_insert_filtered (list, -1, add, NULL, filter_cb, NULL, FALSE);
+
+ g_free (uri);
+ g_free (prefix);
+ adding = TRUE;
+}
+
+static void show_hide_widgets (void)
+{
+ if (! help_label || ! wait_label || ! scrolled)
+ return;
+
+ if (playlist_id < 0)
+ {
+ gtk_widget_hide (wait_label);
+ gtk_widget_hide (scrolled);
+ gtk_widget_show (help_label);
+ }
+ else
+ {
+ gtk_widget_hide (help_label);
+
+ if (dicts_valid)
+ {
+ gtk_widget_hide (wait_label);
+ gtk_widget_show (scrolled);
+ }
+ else
+ {
+ gtk_widget_hide (scrolled);
+ gtk_widget_show (wait_label);
+ }
+ }
+}
+
+static gint search_timeout (void * unused)
+{
+ do_search ();
+
+ if (results_list)
+ {
+ audgui_list_delete_rows (results_list, 0, audgui_list_row_count (results_list));
+ audgui_list_insert_rows (results_list, 0, index_count (items));
+ }
+
+ if (search_source)
+ {
+ g_source_remove (search_source);
+ search_source = 0;
+ }
+
+ return FALSE;
+}
+
+static void schedule_search (void)
+{
+ if (search_source)
+ g_source_remove (search_source);
+
+ search_source = g_timeout_add (SEARCH_DELAY, search_timeout, NULL);
+}
+
+static void update_dicts (void)
+{
+ gint list = get_playlist (TRUE, TRUE);
+
+ if (list >= 0)
+ {
+ create_dicts (list);
+ dicts_valid = TRUE;
+ schedule_search ();
+ }
+ else
+ {
+ destroy_dicts ();
+ dicts_valid = FALSE;
+ }
+
+ if (results_list)
+ audgui_list_delete_rows (results_list, 0, audgui_list_row_count (results_list));
+
+ show_hide_widgets ();
+}
+
+static void add_complete_cb (void * unused, void * unused2)
+{
+ if (adding)
+ {
+ gint list = get_playlist (TRUE, FALSE);
+
+ if (list >= 0 && ! aud_playlist_add_in_progress (list))
+ {
+ adding = FALSE;
+ destroy_added_table ();
+ aud_playlist_sort_by_scheme (list, PLAYLIST_SORT_PATH);
+ }
+ }
+
+ if (! dicts_valid && ! aud_playlist_update_pending ())
+ update_dicts ();
+}
+
+static void scan_complete_cb (void * unused, void * unused2)
+{
+ if (! dicts_valid && ! aud_playlist_update_pending ())
+ update_dicts ();
+}
+
+static void playlist_update_cb (void * data, void * unused)
+{
+ if (! dicts_valid)
+ update_dicts ();
+ else
+ {
+ gint list = get_playlist (TRUE, TRUE);
+ gint at, count;
+
+ if (list < 0 || aud_playlist_updated_range (list, & at, & count) >=
+ PLAYLIST_UPDATE_METADATA)
+ update_dicts ();
+ }
+}
+
+static gboolean search_init (void)
+{
+ find_playlist ();
+
+ set_search_phrase ("");
+ items = index_new ();
+ selection = g_array_new (FALSE, FALSE, 1);
+
+ update_dicts ();
+
+ hook_associate ("playlist add complete", add_complete_cb, NULL);
+ hook_associate ("playlist scan complete", scan_complete_cb, NULL);
+ hook_associate ("playlist update", playlist_update_cb, NULL);
+
+ return TRUE;
+}
+
+static void search_cleanup (void)
+{
+ hook_dissociate ("playlist add complete", add_complete_cb);
+ hook_dissociate ("playlist scan complete", scan_complete_cb);
+ hook_dissociate ("playlist update", playlist_update_cb);
+
+ if (search_source)
+ {
+ g_source_remove (search_source);
+ search_source = 0;
+ }
+
+ g_strfreev (search_terms);
+ search_terms = NULL;
+
+ index_free (items);
+ items = NULL;
+ g_array_free (selection, TRUE);
+ selection = NULL;
+
+ destroy_added_table ();
+ destroy_dicts ();
+}
+
+static void do_add (gboolean play, gchar * * title)
+{
+ gint list = aud_playlist_by_unique_id (playlist_id);
+ gint n_items = index_count (items);
+ gint n_selected = 0;
+
+ Index * filenames = index_new ();
+ Index * tuples = index_new ();
+
+ for (gint i = 0; i < n_items; i ++)
+ {
+ if (! selection->data[i])
+ continue;
+
+ Item * item = index_get (items, i);
+
+ for (gint m = 0; m < item->matches->len; m ++)
+ {
+ gint entry = g_array_index (item->matches, gint, m);
+ index_append (filenames, aud_playlist_entry_get_filename (list, entry));
+ index_append (tuples, aud_playlist_entry_get_tuple (list, entry, TRUE));
+ }
+
+ n_selected ++;
+ if (title && n_selected == 1)
+ * title = item->name;
+ }
+
+ if (title && n_selected != 1)
+ * title = NULL;
+
+ aud_playlist_entry_insert_batch (aud_playlist_get_active (), -1, filenames,
+ tuples, play);
+}
+
+static void action_play (void)
+{
+ gint list = aud_playlist_get_temporary ();
+ aud_playlist_set_active (list);
+
+ if (aud_get_bool (NULL, "clear_playlist"))
+ aud_playlist_entry_delete (list, 0, aud_playlist_entry_count (list));
+ else
+ aud_playlist_queue_delete (list, 0, aud_playlist_queue_count (list));
+
+ do_add (TRUE, NULL);
+}
+
+static void action_create_playlist (void)
+{
+ gchar * title;
+
+ aud_playlist_insert (-1);
+ aud_playlist_set_active (aud_playlist_count () - 1);
+ do_add (FALSE, & title);
+
+ if (title)
+ aud_playlist_set_title (aud_playlist_count () - 1, title);
+}
+
+static void action_add_to_playlist (void)
+{
+ if (aud_playlist_by_unique_id (playlist_id) == aud_playlist_get_active ())
+ return;
+
+ do_add (FALSE, NULL);
+}
+
+static void list_get_value (void * user, gint row, gint column, GValue * value)
+{
+ g_return_if_fail (items && row >= 0 && row < index_count (items));
+
+ Item * item = index_get (items, row);
+ g_value_take_string (value, g_strdup_printf ("%s: %s",
+ _(field_names[item->field]), item->name));
+}
+
+static gboolean list_get_selected (void * user, gint row)
+{
+ g_return_val_if_fail (selection && row >= 0 && row < selection->len, FALSE);
+ return selection->data[row];
+}
+
+static void list_set_selected (void * user, gint row, gboolean selected)
+{
+ g_return_if_fail (selection && row >= 0 && row < selection->len);
+ selection->data[row] = selected;
+}
+
+static void list_select_all (void * user, gboolean selected)
+{
+ g_return_if_fail (selection);
+ memset (selection->data, selected, selection->len);
+}
+
+static void list_activate_row (void * user, gint row)
+{
+ action_play ();
+}
+
+static void list_right_click (void * user, GdkEventButton * event)
+{
+ GtkWidget * menu = gtk_menu_new ();
+
+ GtkWidget * item = gtk_image_menu_item_new_from_stock (GTK_STOCK_MEDIA_PLAY, NULL);
+ g_signal_connect (item, "activate", (GCallback) action_play, NULL);
+ gtk_widget_show (item);
+ gtk_menu_shell_append ((GtkMenuShell *) menu, item);
+
+ item = gtk_image_menu_item_new_with_mnemonic (_("_Create Playlist"));
+ gtk_image_menu_item_set_image ((GtkImageMenuItem *) item,
+ gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU));
+ g_signal_connect (item, "activate", (GCallback) action_create_playlist, NULL);
+ gtk_widget_show (item);
+ gtk_menu_shell_append ((GtkMenuShell *) menu, item);
+
+ item = gtk_image_menu_item_new_with_mnemonic (_("_Add to Playlist"));
+ gtk_image_menu_item_set_image ((GtkImageMenuItem *) item,
+ gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
+ g_signal_connect (item, "activate", (GCallback) action_add_to_playlist, NULL);
+ gtk_widget_show (item);
+ gtk_menu_shell_append ((GtkMenuShell *) menu, item);
+
+ gtk_menu_popup ((GtkMenu *) menu, NULL, NULL, NULL, NULL, event->button, event->time);
+}
+
+static const AudguiListCallbacks list_callbacks = {
+ .get_value = list_get_value,
+ .get_selected = list_get_selected,
+ .set_selected = list_set_selected,
+ .select_all = list_select_all,
+ .activate_row = list_activate_row,
+ .right_click = list_right_click};
+
+static void entry_cb (GtkEntry * entry, void * unused)
+{
+ set_search_phrase (gtk_entry_get_text ((GtkEntry *) entry));
+ schedule_search ();
+}
+
+static void refresh_cb (GtkButton * button, GtkWidget * chooser)
+{
+ gchar * path = gtk_file_chooser_get_filename ((GtkFileChooser *) chooser);
+ begin_add (path);
+ g_free (path);
+
+ update_dicts ();
+}
+
+static void * search_get_widget (void)
+{
+ GtkWidget * vbox = gtk_vbox_new (FALSE, 6);
+
+ GtkWidget * entry = gtk_entry_new ();
+#if GTK_CHECK_VERSION (2, 16, 0)
+ gtk_entry_set_icon_from_stock ((GtkEntry *) entry, GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
+#endif
+#if GTK_CHECK_VERSION (3, 2, 0)
+ gtk_entry_set_placeholder_text ((GtkEntry *) entry, _("Search library"));
+#endif
+ gtk_box_pack_start ((GtkBox *) vbox, entry, FALSE, FALSE, 0);
+
+ help_label = gtk_label_new (_("To import your music library into "
+ "Audacious, choose a folder and then click the \"refresh\" icon."));
+ gtk_widget_set_size_request (help_label, 194, -1);
+ gtk_label_set_line_wrap ((GtkLabel *) help_label, TRUE);
+ g_signal_connect (help_label, "destroy", (GCallback) gtk_widget_destroyed, & help_label);
+ gtk_widget_set_no_show_all (help_label, TRUE);
+ gtk_box_pack_start ((GtkBox *) vbox, help_label, TRUE, FALSE, 0);
+
+ wait_label = gtk_label_new (_("Please wait ..."));
+ g_signal_connect (wait_label, "destroy", (GCallback) gtk_widget_destroyed, & wait_label);
+ gtk_widget_set_no_show_all (wait_label, TRUE);
+ gtk_box_pack_start ((GtkBox *) vbox, wait_label, TRUE, FALSE, 0);
+
+ scrolled = gtk_scrolled_window_new (NULL, NULL);
+ g_signal_connect (scrolled, "destroy", (GCallback) gtk_widget_destroyed, & scrolled);
+ gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) scrolled, GTK_SHADOW_IN);
+ gtk_scrolled_window_set_policy ((GtkScrolledWindow *) scrolled,
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_widget_set_no_show_all (scrolled, TRUE);
+ gtk_box_pack_start ((GtkBox *) vbox, scrolled, TRUE, TRUE, 0);
+
+ results_list = audgui_list_new (& list_callbacks, NULL, items ? index_count (items) : 0);
+ g_signal_connect (results_list, "destroy", (GCallback) gtk_widget_destroyed, & results_list);
+ gtk_tree_view_set_headers_visible ((GtkTreeView *) results_list, FALSE);
+ audgui_list_add_column (results_list, NULL, 0, G_TYPE_STRING, -1);
+ gtk_container_add ((GtkContainer *) scrolled, results_list);
+
+ GtkWidget * hbox = gtk_hbox_new (FALSE, 6);
+ gtk_box_pack_end ((GtkBox *) vbox, hbox, FALSE, FALSE, 0);
+
+ GtkWidget * chooser = gtk_file_chooser_button_new (_("Choose Folder"),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ gtk_box_pack_start ((GtkBox *) hbox, chooser, TRUE, TRUE, 0);
+
+ gchar * path = get_path ();
+ gtk_file_chooser_set_filename ((GtkFileChooser *) chooser, path);
+ g_free (path);
+
+ GtkWidget * button = gtk_button_new ();
+ gtk_container_add ((GtkContainer *) button, gtk_image_new_from_stock
+ (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON));
+ gtk_button_set_relief ((GtkButton *) button, GTK_RELIEF_NONE);
+ gtk_box_pack_start ((GtkBox *) hbox, button, FALSE, FALSE, 0);
+
+ g_signal_connect (entry, "changed", (GCallback) entry_cb, NULL);
+ g_signal_connect (entry, "activate", (GCallback) action_play, NULL);
+ g_signal_connect (button, "clicked", (GCallback) refresh_cb, chooser);
+
+ gtk_widget_show_all (vbox);
+ gtk_widget_show (results_list);
+ show_hide_widgets ();
+
+ return vbox;
+}
+
+AUD_GENERAL_PLUGIN
+(
+ .name = "Search Tool",
+ .init = search_init,
+ .cleanup = search_cleanup,
+ .get_widget = search_get_widget
+)

audacious-plugins-3.1.1.tar.bz2/src/sid/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/sid/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/sid/xmms-sid.c -> audacious-plugins-3.2.4.tar.bz2/src/sid/xmms-sid.c Changed

@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
+#include <audacious/debug.h>
 #include <libaudcore/audstrings.h>
 
 #include "xs_config.h"
@@ -59,15 +60,15 @@
 va_end(ap);
 }
 
-#ifdef DEBUG
 void XSDEBUG(const gchar *fmt, ...)
 {
 va_list ap;
 va_start(ap, fmt);
- g_logv("AUD-SID", G_LOG_LEVEL_DEBUG, fmt, ap);
+ char * str = g_strdup_vprintf (fmt, ap);
+ AUDDBG ("%s", str);
+ g_free (str);
 va_end(ap);
 }
-#endif
 
 
 /*
@@ -176,39 +177,32 @@
 xs_tuneinfo_t *tmpTune;
 gboolean audioOpen = FALSE;
 gint audioBufSize, bufRemaining, tmpLength, subTune = -1;
- gchar *tmpFilename, *audioBuffer = NULL, *oversampleBuffer = NULL;
+ gchar *audioBuffer = NULL, *oversampleBuffer = NULL;
 Tuple *tmpTuple;
 
 assert(pb);
 assert(xs_status.sidPlayer != NULL);
 
- XSDEBUG("play '%s'\n", pb->filename);
-
- if ((tmpFilename = filename_split_subtune (filename, & subTune)) == NULL)
- return FALSE;
+ uri_parse (filename, NULL, NULL, NULL, & subTune);
 
 /* Get tune information */
 XS_MUTEX_LOCK(xs_status);
- if ((xs_status.tuneInfo = xs_status.sidPlayer->plrGetSIDInfo(tmpFilename)) == NULL) {
+
+ if (! (xs_status.tuneInfo = xs_status.sidPlayer->plrGetSIDInfo (filename)))
+ {
 XS_MUTEX_UNLOCK(xs_status);
- g_free(tmpFilename);
 return FALSE;
 }
 
 /* Initialize the tune */
- if (!xs_status.sidPlayer->plrLoadSID(&xs_status, tmpFilename)) {
+ if (! xs_status.sidPlayer->plrLoadSID (& xs_status, filename))
+ {
 XS_MUTEX_UNLOCK(xs_status);
- g_free(tmpFilename);
 xs_tuneinfo_free(xs_status.tuneInfo);
 xs_status.tuneInfo = NULL;
 return FALSE;
 }
 
- g_free(tmpFilename);
- tmpFilename = NULL;
-
- XSDEBUG("load ok\n");
-
 gboolean error = FALSE;
 
 /* Set general status information */
@@ -430,21 +424,28 @@
 */
 static void xs_get_song_tuple_info(Tuple *tuple, xs_tuneinfo_t *info, gint subTune)
 {
- gchar *tmpStr, tmpStr2[64];
-
- tuple_associate_string_rel(tuple, FIELD_TITLE, NULL, str_to_utf8(info->sidName));
- tuple_associate_string_rel(tuple, FIELD_ARTIST, NULL, str_to_utf8(info->sidComposer));
- tuple_associate_string_rel(tuple, FIELD_COPYRIGHT, NULL, str_to_utf8(info->sidCopyright));
- tuple_associate_string(tuple, -1, "sid-format", info->sidFormat);
- tuple_associate_string(tuple, FIELD_CODEC, NULL, "Commodore 64 SID PlaySID/RSID");
-
+ gchar *tmpStr;
+
+ tmpStr = str_to_utf8(info->sidName);
+ tuple_set_str(tuple, FIELD_TITLE, NULL, tmpStr);
+ g_free(tmpStr);
+ tmpStr = str_to_utf8(info->sidComposer);
+ tuple_set_str(tuple, FIELD_ARTIST, NULL, tmpStr);
+ g_free(tmpStr);
+ tmpStr = str_to_utf8(info->sidCopyright);
+ tuple_set_str(tuple, FIELD_COPYRIGHT, NULL, tmpStr);
+ g_free(tmpStr);
+ tuple_set_str(tuple, FIELD_CODEC, NULL, info->sidFormat);
+
+#if 0
 switch (info->sidModel) {
 case XS_SIDMODEL_6581: tmpStr = "6581"; break;
 case XS_SIDMODEL_8580: tmpStr = "8580"; break;
 case XS_SIDMODEL_ANY: tmpStr = "ANY"; break;
 default: tmpStr = "?"; break;
 }
- tuple_associate_string(tuple, -1, "sid-model", tmpStr);
+ tuple_set_str(tuple, -1, "sid-model", tmpStr);
+#endif
 
 /* Get sub-tune information, if available */
 if (subTune < 0 || info->startTune > info->nsubTunes)
@@ -452,8 +453,9 @@
 
 if (subTune > 0 && subTune <= info->nsubTunes) {
 gint tmpInt = info->subTunes[subTune - 1].tuneLength;
- tuple_associate_int(tuple, FIELD_LENGTH, NULL, (tmpInt < 0) ? -1 : tmpInt * 1000);
+ tuple_set_int(tuple, FIELD_LENGTH, NULL, (tmpInt < 0) ? -1 : tmpInt * 1000);
 
+#if 0
 tmpInt = info->subTunes[subTune - 1].tuneSpeed;
 if (tmpInt > 0) {
 switch (tmpInt) {
@@ -470,38 +472,35 @@
 } else
 tmpStr = "?";
 
- tuple_associate_string(tuple, -1, "sid-speed", tmpStr);
+ tuple_set_str(tuple, -1, "sid-speed", tmpStr);
+#endif
 } else
 subTune = 1;
 
- tuple_associate_int(tuple, FIELD_SUBSONG_NUM, NULL, info->nsubTunes);
- tuple_associate_int(tuple, FIELD_SUBSONG_ID, NULL, subTune);
- tuple_associate_int(tuple, FIELD_TRACK_NUMBER, NULL, subTune);
-
- if (xs_cfg.titleOverride)
- tuple_associate_string(tuple, FIELD_FORMATTER, NULL, xs_cfg.titleFormat);
+ tuple_set_int(tuple, FIELD_SUBSONG_NUM, NULL, info->nsubTunes);
+ tuple_set_int(tuple, FIELD_SUBSONG_ID, NULL, subTune);
+ tuple_set_int(tuple, FIELD_TRACK_NUMBER, NULL, subTune);
 }
 
 
 static void xs_fill_subtunes(Tuple *tuple, xs_tuneinfo_t *info)
 {
 gint count, found;
-
- tuple->subtunes = g_new(gint, info->nsubTunes);
+ gint subtunes[info->nsubTunes];
 
 for (found = count = 0; count < info->nsubTunes; count++) {
 if (count + 1 == info->startTune || !xs_cfg.subAutoMinOnly ||
+ info->subTunes[count].tuneLength < 0 ||
 info->subTunes[count].tuneLength >= xs_cfg.subAutoMinTime)
- tuple->subtunes[found++] = count + 1;
+ subtunes[found ++] = count + 1;
 }
 
- tuple->nsubtunes = found;
+ tuple_set_subtunes (tuple, found, subtunes);
 }
 
 Tuple * xs_probe_for_tuple(const gchar *filename, xs_file_t *fd)
 {
 Tuple *tuple;
- gchar *tmpFilename;
 xs_tuneinfo_t *info;
 gint tune = -1;
 
@@ -516,27 +515,20 @@
 XS_MUTEX_UNLOCK(xs_status);
 
 /* Get information from URL */
- tmpFilename = filename_split_subtune(filename, &tune);
- if (tmpFilename == NULL) return NULL;
-
- tuple = tuple_new_from_filename(tmpFilename);
- if (tuple == NULL) {
- g_free(tmpFilename);
- return NULL;
- }
+ tuple = tuple_new_from_filename (filename);
+ tune = tuple_get_int (tuple, FIELD_SUBSONG_NUM, NULL);
 
 /* Get tune information from emulation engine */
 XS_MUTEX_LOCK(xs_status);
- info = xs_status.sidPlayer->plrGetSIDInfo(tmpFilename);
+ info = xs_status.sidPlayer->plrGetSIDInfo (filename);
 XS_MUTEX_UNLOCK(xs_status);
- g_free(tmpFilename);
 
 if (info == NULL)
 return tuple;
 
 xs_get_song_tuple_info(tuple, info, tune);
 
- if (xs_cfg.subAutoEnable && info->nsubTunes > 1 && tune < 0)
+ if (xs_cfg.subAutoEnable && info->nsubTunes > 1 && ! tune)
 xs_fill_subtunes(tuple, info);
 
 xs_tuneinfo_free(info);

audacious-plugins-3.1.1.tar.bz2/src/sid/xmms-sid.h -> audacious-plugins-3.2.4.tar.bz2/src/sid/xmms-sid.h Changed

audacious-plugins-3.1.1.tar.bz2/src/sid/xs_config.c -> audacious-plugins-3.2.4.tar.bz2/src/sid/xs_config.c Changed

audacious-plugins-3.1.1.tar.bz2/src/sid/xs_length.c -> audacious-plugins-3.2.4.tar.bz2/src/sid/xs_length.c Changed

audacious-plugins-3.1.1.tar.bz2/src/sid/xs_length.h -> audacious-plugins-3.2.4.tar.bz2/src/sid/xs_length.h Changed

audacious-plugins-3.2.4.tar.bz2/src/sid/xs_md5.c Added

audacious-plugins-3.2.4.tar.bz2/src/sid/xs_md5.h Added

audacious-plugins-3.1.1.tar.bz2/src/sid/xs_player.h -> audacious-plugins-3.2.4.tar.bz2/src/sid/xs_player.h Changed

audacious-plugins-3.1.1.tar.bz2/src/sid/xs_sidplay1.cc -> audacious-plugins-3.2.4.tar.bz2/src/sid/xs_sidplay1.cc Changed

@@ -65,12 +65,12 @@
 gboolean xs_sidplay1_probe(xs_file_t *f)
 {
     gchar tmpBuf[4];
-    
+
     if (!f) return FALSE;
-    
+
     if (xs_fread(tmpBuf, sizeof(gchar), 4, f) != 4)
         return FALSE;
-    
+
     if (!strncmp(tmpBuf, "PSID", 4))
         return TRUE;
     else
@@ -220,8 +220,8 @@
     }
 
     engine->currConfig.forceSongSpeed = xs_cfg.forceSpeed;
-    
-    
+
+
     /* Configure rest of the emulation */
     /* if (xs_cfg.forceModel) */
     engine->currConfig.mos8580 = xs_cfg.mos8580;
@@ -236,14 +236,14 @@
         xs_error("[SIDPlay1] Emulator engine configuration failed!\n");
         return FALSE;
     }
-    
+
     /* Create sidtune object */
     engine->currTune = new sidTune(0);
     if (!engine->currTune) {
         xs_error("[SIDPlay1] Could not initialize SIDTune object.\n");
         return FALSE;
     }
-    
+
     return TRUE;
 }
 
@@ -269,7 +269,7 @@
     }
 
     xs_sidplay1_delete(status);
-    
+
     g_free(engine);
     status->sidEngine = NULL;
 }
@@ -319,7 +319,7 @@
 
 /* Load a given SID-tune file
  */
-gboolean xs_sidplay1_load(xs_status_t * status, gchar * filename)
+gboolean xs_sidplay1_load(xs_status_t * status, const gchar * filename)
 {
     xs_sidplay1_t *engine;
     assert(status != NULL);
@@ -330,10 +330,10 @@
 
     /* Try to get the tune */
     if (!filename) return FALSE;
-    
+
     if (xs_fload_buffer(filename, &(engine->buf), &(engine->bufSize)) != 0)
         return FALSE;
-    
+
     if (!engine->currTune->load(engine->buf, engine->bufSize))
         return FALSE;
 
@@ -350,7 +350,7 @@
 
     engine = (xs_sidplay1_t *) status->sidEngine;
     if (engine == NULL) return;
-    
+
     g_free(engine->buf);
     engine->buf = NULL;
     engine->bufSize = 0;

audacious-plugins-3.1.1.tar.bz2/src/sid/xs_sidplay1.h -> audacious-plugins-3.2.4.tar.bz2/src/sid/xs_sidplay1.h Changed

audacious-plugins-3.1.1.tar.bz2/src/sid/xs_sidplay2.cc -> audacious-plugins-3.2.4.tar.bz2/src/sid/xs_sidplay2.cc Changed

audacious-plugins-3.1.1.tar.bz2/src/sid/xs_sidplay2.h -> audacious-plugins-3.2.4.tar.bz2/src/sid/xs_sidplay2.h Changed

audacious-plugins-3.1.1.tar.bz2/src/sid/xs_support.c -> audacious-plugins-3.2.4.tar.bz2/src/sid/xs_support.c Changed

audacious-plugins-3.1.1.tar.bz2/src/skins/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/skins/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/skins/actions-playlist.h -> audacious-plugins-3.2.4.tar.bz2/src/skins/actions-playlist.h Changed

audacious-plugins-3.1.1.tar.bz2/src/skins/plugin.c -> audacious-plugins-3.2.4.tar.bz2/src/skins/plugin.c Changed

@@ -18,6 +18,8 @@
 * Audacious or using our public API to be a derived work.
 */
 
+#include <stdlib.h>
+
 #include <audacious/drct.h>
 #include <audacious/i18n.h>
 #include <audacious/plugin.h>
@@ -38,7 +40,6 @@
 
 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);
@@ -48,7 +49,6 @@
 .name = "Winamp Classic Interface",
 .init = skins_init,
 .cleanup = skins_cleanup,
- .about = skins_about,
 .configure = skins_configure,
 .show = mainwin_show,
 .is_shown = ui_is_shown,
@@ -126,7 +126,6 @@
 
 mainwin_show (config.player_visible);
 
- eq_init_hooks ();
 update_source = g_timeout_add (250, update_cb, NULL);
 
 return TRUE;
@@ -140,7 +139,6 @@
 
 mainwin_unhook ();
 playlistwin_unhook ();
- eq_end_hooks ();
 g_source_remove (update_source);
 
 skins_cfg_save();
@@ -157,15 +155,6 @@
 }
 }
 
-static void skins_about (void)
-{
- static GtkWidget * about_window = NULL;
-
- audgui_simple_message (& about_window, GTK_MESSAGE_INFO,
- _("About Skinned GUI"),
- _("Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n\n"));
-}
-
 static gboolean ui_is_shown (void)
 {
 return config.player_visible;
@@ -173,9 +162,14 @@
 
 static gboolean ui_is_focused (void)
 {
+/* gtk_window_is_active() is too unreliable, unfortunately. --jlindgren */
+#if 0
 return gtk_window_is_active ((GtkWindow *) mainwin) || gtk_window_is_active
 ((GtkWindow *) equalizerwin) || gtk_window_is_active ((GtkWindow *)
 playlistwin);
+#else
+ return ui_is_shown ();
+#endif
 }
 
 static void show_error_message (const gchar * text)

audacious-plugins-3.1.1.tar.bz2/src/skins/ui/mainwin.ui -> audacious-plugins-3.2.4.tar.bz2/src/skins/ui/mainwin.ui Changed

audacious-plugins-3.1.1.tar.bz2/src/skins/ui_equalizer.c -> audacious-plugins-3.2.4.tar.bz2/src/skins/ui_equalizer.c Changed

@@ -58,6 +58,8 @@
 static void equalizerwin_set_preamp (gfloat preamp);
 static void equalizerwin_set_band (gint band, gfloat value);
 
+static void position_cb (void * data, void * user_data);
+
 GtkWidget *equalizerwin;
 static GtkWidget *equalizerwin_graph;
 
@@ -78,7 +80,7 @@
 static GtkWidget *equalizerwin_preamp,*equalizerwin_bands[10];
 static GtkWidget *equalizerwin_volume, *equalizerwin_balance;
 
-static GList *equalizer_presets = NULL, *equalizer_auto_presets = NULL;
+static Index * equalizer_presets = NULL, * equalizer_auto_presets = NULL;
 
 static void
 equalizer_preset_free(EqualizerPreset * preset)
@@ -90,6 +92,14 @@
 g_free(preset);
 }
 
+static void free_presets (Index * presets)
+{
+ for (int p = 0; p < index_count (presets); p ++)
+ equalizer_preset_free (index_get (presets, p));
+
+ index_free (presets);
+}
+
 void equalizerwin_set_shape (void)
 {
 gint id = config.equalizer_shaded ? SKIN_MASK_EQ_SHADE : SKIN_MASK_EQ;
@@ -402,6 +412,13 @@
 hook_dissociate ("set equalizer_active", (HookFunction) update_from_config);
 hook_dissociate ("set equalizer_bands", (HookFunction) update_from_config);
 hook_dissociate ("set equalizer_preamp", (HookFunction) update_from_config);
+
+ hook_dissociate ("playlist position", position_cb);
+
+ free_presets (equalizer_presets);
+ free_presets (equalizer_auto_presets);
+ equalizer_presets = NULL;
+ equalizer_auto_presets = NULL;
 }
 
 void
@@ -410,6 +427,11 @@
 equalizer_presets = aud_equalizer_read_presets("eq.preset");
 equalizer_auto_presets = aud_equalizer_read_presets("eq.auto_preset");
 
+ if (! equalizer_presets)
+ equalizer_presets = index_new ();
+ if (! equalizer_auto_presets)
+ equalizer_auto_presets = index_new ();
+
 equalizerwin_create_window();
 
 gtk_window_add_accel_group( GTK_WINDOW(equalizerwin) , ui_manager_get_accel_group() );
@@ -422,6 +444,16 @@
 hook_associate ("set equalizer_active", (HookFunction) update_from_config, NULL);
 hook_associate ("set equalizer_bands", (HookFunction) update_from_config, NULL);
 hook_associate ("set equalizer_preamp", (HookFunction) update_from_config, NULL);
+
+ int playlist = aud_playlist_get_playing ();
+
+ /* Load preset for the first song. FIXME: Doing this at interface load is
+ really too late as the song may already be started. Really, this stuff
+ shouldn't be in the interface plugin at all but in core. -jlindgren */
+ if (playlist != -1)
+ position_cb (GINT_TO_POINTER (playlist), NULL);
+
+ hook_associate ("playlist position", position_cb, NULL);
 }
 
 static void equalizerwin_real_show (gboolean show)
@@ -447,78 +479,64 @@
 }
 }
 
-static EqualizerPreset *
-equalizerwin_find_preset(GList * list, const gchar * name)
+static int equalizerwin_find_preset (Index * list, const char * name)
 {
- GList *node = list;
- EqualizerPreset *preset;
-
- while (node) {
- preset = node->data;
+ for (int p = 0; p < index_count (list); p ++)
+ {
+ EqualizerPreset * preset = index_get (list, p);
 if (!strcasecmp(preset->name, name))
- return preset;
- node = g_list_next(node);
+ return p;
 }
- return NULL;
+
+ return -1;
 }
 
-static gboolean
-equalizerwin_load_preset(GList * list, const gchar * name)
+static bool_t equalizerwin_load_preset (Index * list, const char * name)
 {
- EqualizerPreset *preset;
- gint i;
+ int p = equalizerwin_find_preset (list, name);
+ if (p < 0)
+ return FALSE;
 
- if ((preset = equalizerwin_find_preset(list, name)) != NULL) {
- equalizerwin_set_preamp(preset->preamp);
- for (i = 0; i < AUD_EQUALIZER_NBANDS; i++)
- equalizerwin_set_band(i, preset->bands[i]);
+ EqualizerPreset * preset = index_get (list, p);
+ equalizerwin_set_preamp (preset->preamp);
 
- return TRUE;
- }
- return FALSE;
+ for (int i = 0; i < AUD_EQUALIZER_NBANDS; i ++)
+ equalizerwin_set_band (i, preset->bands[i]);
+
+ return TRUE;
 }
 
-static GList *
-equalizerwin_save_preset(GList * list, const gchar * name,
- const gchar * filename)
+static void equalizerwin_save_preset (Index * list, const char * name,
+ const char * filename)
 {
- gint i;
- EqualizerPreset *preset;
+ int p = equalizerwin_find_preset (list, name);
+ EqualizerPreset * preset = (p >= 0) ? index_get (list, p) : NULL;
 
- if (!(preset = equalizerwin_find_preset(list, name))) {
+ if (! preset)
+ {
 preset = g_new0(EqualizerPreset, 1);
 preset->name = g_strdup(name);
- list = g_list_append(list, preset);
+ index_append (list, preset);
 }
 
 preset->preamp = equalizerwin_get_preamp();
- for (i = 0; i < AUD_EQUALIZER_NBANDS; i++)
+ for (int i = 0; i < AUD_EQUALIZER_NBANDS; i ++)
 preset->bands[i] = equalizerwin_get_band(i);
 
 aud_equalizer_write_preset_file(list, filename);
-
- return list;
 }
 
-static GList *
-equalizerwin_delete_preset(GList * list, gchar * name, gchar * filename)
+static void equalizerwin_delete_preset (Index * list, gchar * name, gchar * filename)
 {
- EqualizerPreset *preset;
- GList *node;
-
- if (!(preset = equalizerwin_find_preset(list, name)))
- return list;
-
- if (!(node = g_list_find(list, preset)))
- return list;
+ int p = equalizerwin_find_preset (list, name);
+ if (p < 0)
+ return;
 
- list = g_list_remove_link(list, node);
+ EqualizerPreset * preset = index_get (list, p);
 equalizer_preset_free(preset);
- g_list_free_1(node);
+ index_delete (list, p, 1);
 
 aud_equalizer_write_preset_file(list, filename);
-
- return list;
 }
 
 static void
@@ -557,40 +575,35 @@
 gtk_tree_model_get(model, &iter, 0, &text, -1);
 
 if (!strcmp(filename, "eq.preset"))
- equalizer_presets = equalizerwin_delete_preset(equalizer_presets, text, filename);
+ equalizerwin_delete_preset (equalizer_presets, text, filename);
 else if (!strcmp(filename, "eq.auto_preset"))
- equalizer_auto_presets = equalizerwin_delete_preset(equalizer_auto_presets, text, filename);
+ equalizerwin_delete_preset (equalizer_auto_presets, text, filename);
 
 gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
 }
 }
 
 static void
-free_cb (gpointer data, gpointer user_data)
-{
- equalizer_preset_free((EqualizerPreset*)data);
-}
-
-static void
 equalizerwin_read_winamp_eqf(VFSFile * file)
 {
- GList *presets;
- gint i;
-
+ Index * presets;
 if ((presets = aud_import_winamp_eqf(file)) == NULL)
 return;
 
+ if (! index_count (presets))
+ goto DONE;
+
 /* just get the first preset --asphyx */
- EqualizerPreset *preset = (EqualizerPreset*)presets->data;
+ EqualizerPreset * preset = index_get (presets, 0);
 equalizerwin_set_preamp(preset->preamp);
 
- for (i = 0; i < AUD_EQUALIZER_NBANDS; i++)
+ for (int i = 0; i < AUD_EQUALIZER_NBANDS; i ++)
 equalizerwin_set_band(i, preset->bands[i]);
 
- g_list_foreach(presets, free_cb, NULL);
- g_list_free(presets);
-
 equalizerwin_eq_changed();
+
+DONE:
+ free_presets (presets);
 }
 
 static gboolean equalizerwin_read_aud_preset (const gchar * file)
@@ -611,9 +624,10 @@
 const gchar *text;
 
 text = gtk_entry_get_text(GTK_ENTRY(equalizerwin_save_entry));
- if (strlen(text) != 0)
- equalizer_presets =
- equalizerwin_save_preset(equalizer_presets, text, "eq.preset");
+
+ if (text[0])
+ equalizerwin_save_preset (equalizer_presets, text, "eq.preset");
+
 gtk_widget_destroy(equalizerwin_save_window);
 }
 
@@ -682,10 +696,10 @@
 const gchar *text;
 
 text = gtk_entry_get_text(GTK_ENTRY(equalizerwin_save_auto_entry));
- if (strlen(text) != 0)
- equalizer_auto_presets =
- equalizerwin_save_preset(equalizer_auto_presets, text,
- "eq.auto_preset");
+
+ if (text[0])
+ equalizerwin_save_preset (equalizer_auto_presets, text, "eq.auto_preset");
+
 gtk_widget_destroy(equalizerwin_save_auto_window);
 }
 
@@ -783,16 +797,20 @@
 static void
 import_winamp_file(const gchar * filename)
 {
- VFSFile *file;
- GList *list;
-
- if (!(file = open_vfs_file(filename, "rb")) ||
- !(list = aud_import_winamp_eqf(file)))
+ VFSFile * file = open_vfs_file (filename, "r");
+ if (! file)
 return;
 
- equalizer_presets = g_list_concat(equalizer_presets, list);
+ Index * list = aud_import_winamp_eqf (file);
+ if (! list)
+ goto CLOSE;
+
+ index_merge_append (equalizer_presets, list);
+ index_free (list);
+
 aud_equalizer_write_preset_file(equalizer_presets, "eq.preset");
 
+CLOSE:
 vfs_fclose(file);
 }
 
@@ -832,8 +850,7 @@
 return FALSE;
 }
 
-static GtkWidget *
-equalizerwin_create_list_window(GList *preset_list,
+static GtkWidget * equalizerwin_create_list_window (Index * preset_list,
 const gchar *title,
 GtkWidget **window,
 GtkSelectionMode sel_mode,
@@ -844,7 +861,6 @@
 {
 GtkWidget *vbox, *scrolled_window, *bbox, *view;
 GtkWidget *button_cancel, *button_action;
- GList *node;
 
 GtkListStore *store;
 GtkTreeIter iter;
@@ -876,12 +892,11 @@
 
 /* fill the store with the names of all available presets */
 store = gtk_list_store_new(1, G_TYPE_STRING);
- for (node = preset_list; node; node = g_list_next(node))
+ for (int p = 0; p < index_count (preset_list); p ++)
 {
+ EqualizerPreset * preset = index_get (preset_list, p);
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- 0, ((EqualizerPreset*)node->data)->name,
- -1);
+ gtk_list_store_set (store, & iter, 0, preset->name, -1);
 }
 model = GTK_TREE_MODEL(store);
 
@@ -974,7 +989,7 @@
 }
 
 equalizerwin_create_list_window(equalizer_presets,
- Q_("Load preset"),
+ _("Load preset"),
 &equalizerwin_load_window,
 GTK_SELECTION_SINGLE, NULL,
 GTK_STOCK_OK,
@@ -991,7 +1006,7 @@
 }
 
 equalizerwin_create_list_window(equalizer_auto_presets,
- Q_("Load auto-preset"),
+ _("Load auto-preset"),
 &equalizerwin_load_auto_window,
 GTK_SELECTION_SINGLE, NULL,
 GTK_STOCK_OK,
@@ -1021,7 +1036,7 @@
 GtkWidget *dialog;
 gchar *file_uri;
 
- dialog = make_filebrowser(Q_("Load equalizer preset"), FALSE);
+ dialog = make_filebrowser(_("Load equalizer preset"), FALSE);
 if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
 {
 file_uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
@@ -1039,7 +1054,7 @@
 GtkWidget *dialog;
 gchar *file_uri;
 
- dialog = make_filebrowser(Q_("Load equalizer preset"), FALSE);
+ dialog = make_filebrowser(_("Load equalizer preset"), FALSE);
 if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
 {
 file_uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
@@ -1055,7 +1070,7 @@
 GtkWidget *dialog;
 gchar *file_uri;
 
- dialog = make_filebrowser(Q_("Load equalizer preset"), FALSE);
+ dialog = make_filebrowser(_("Load equalizer preset"), FALSE);
 if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
 {
 file_uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
@@ -1074,7 +1089,7 @@
 }
 
 equalizerwin_create_list_window(equalizer_presets,
- Q_("Save preset"),
+ _("Save preset"),
 &equalizerwin_save_window,
 GTK_SELECTION_SINGLE,
 &equalizerwin_save_entry,
@@ -1086,13 +1101,11 @@
 void
 action_equ_save_auto_preset(void)
 {
- gchar *name;
-
 if (equalizerwin_save_auto_window)
 gtk_window_present(GTK_WINDOW(equalizerwin_save_auto_window));
 else
 equalizerwin_create_list_window(equalizer_auto_presets,
- Q_("Save auto-preset"),
+ _("Save auto-preset"),
 &equalizerwin_save_auto_window,
 GTK_SELECTION_SINGLE,
 &equalizerwin_save_auto_entry,
@@ -1100,21 +1113,19 @@
 G_CALLBACK(equalizerwin_save_auto_ok),
 G_CALLBACK(equalizerwin_save_auto_select));
 
- name = aud_drct_pl_get_file (aud_drct_pl_get_pos ());
+ char * name = aud_drct_get_filename ();
 
 if (name != NULL)
 {
 gtk_entry_set_text(GTK_ENTRY(equalizerwin_save_auto_entry),
 g_basename(name));
- g_free(name);
+ str_unref (name);
 }
 }
 
-void
-action_equ_save_default_preset(void)
+void action_equ_save_default_preset (void)
 {
- equalizer_presets =
- equalizerwin_save_preset(equalizer_presets, Q_("Default"), "eq.preset");
+ equalizerwin_save_preset (equalizer_presets, _("Default"), "eq.preset");
 }
 
 void
@@ -1122,10 +1133,9 @@
 {
 GtkWidget *dialog;
 gchar *file_uri;
- gchar *songname;
 gint i;
 
- dialog = make_filebrowser(Q_("Save equalizer preset"), TRUE);
+ dialog = make_filebrowser(_("Save equalizer preset"), TRUE);
 if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
 {
 file_uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
@@ -1139,7 +1149,7 @@
 g_free(file_uri);
 }
 
- songname = aud_drct_pl_get_file (aud_drct_pl_get_pos ());
+ char * songname = aud_drct_get_filename ();
 
 if (songname != NULL)
 {
@@ -1149,7 +1159,7 @@
 eqname);
 g_free (eqname);
 g_free (ext);
- g_free (songname);
+ str_unref (songname);
 }
 
 gtk_widget_destroy(dialog);
@@ -1161,7 +1171,7 @@
 GtkWidget *dialog;
 gchar *file_uri;
 
- dialog = make_filebrowser(Q_("Save equalizer preset"), TRUE);
+ dialog = make_filebrowser(_("Save equalizer preset"), TRUE);
 if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
 {
 file_uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
@@ -1180,7 +1190,7 @@
 }
 
 equalizerwin_create_list_window(equalizer_presets,
- Q_("Delete preset"),
+ _("Delete preset"),
 &equalizerwin_delete_window,
 GTK_SELECTION_MULTIPLE, NULL,
 GTK_STOCK_DELETE,
@@ -1197,7 +1207,7 @@
 }
 
 equalizerwin_create_list_window(equalizer_auto_presets,
- Q_("Delete auto-preset"),
+ _("Delete auto-preset"),
 &equalizerwin_delete_auto_window,
 GTK_SELECTION_MULTIPLE, NULL,
 GTK_STOCK_DELETE,
@@ -1261,25 +1271,7 @@
 
 gchar * filename = aud_playlist_entry_get_filename (playlist, position);
 load_auto_preset (filename);
- g_free (filename);
-}
-
-void eq_init_hooks (void)
-{
- gint playlist = aud_playlist_get_playing ();
-
- /* Load preset for the first song. FIXME: Doing this at interface load is
- really too late as the song may already be started. Really, this stuff
- shouldn't be in the interface plugin at all but in core. -jlindgren */
- if (playlist != -1)
- position_cb (GINT_TO_POINTER (playlist), NULL);
-
- hook_associate ("playlist position", position_cb, NULL);
-}
-
-void eq_end_hooks (void)
-{
- hook_dissociate ("playlist position", position_cb);
+ str_unref (filename);
 }
 
 void action_show_equalizer (GtkToggleAction * action)

audacious-plugins-3.1.1.tar.bz2/src/skins/ui_equalizer.h -> audacious-plugins-3.2.4.tar.bz2/src/skins/ui_equalizer.h Changed

audacious-plugins-3.1.1.tar.bz2/src/skins/ui_main.c -> audacious-plugins-3.2.4.tar.bz2/src/skins/ui_main.c Changed

@@ -24,6 +24,7 @@
 */
 
 #include <math.h>
+#include <stdlib.h>
 #include <sys/time.h>
 
 #include <gdk/gdkkeysyms.h>
@@ -521,6 +522,8 @@
 case GDK_SCROLL_RIGHT:
 aud_drct_seek (aud_drct_get_time () + 5000);
 break;
+ default:
+ break;
 }
 }
 
@@ -1453,20 +1456,24 @@
 {
 if (event->changed_mask & GDK_WINDOW_STATE_STICKY)
 {
- gboolean sticky = (event->new_window_state & GDK_WINDOW_STATE_STICKY);
+ config.sticky = (event->new_window_state & GDK_WINDOW_STATE_STICKY) ?
+ TRUE : FALSE;
+
 GtkToggleAction * action = (GtkToggleAction *)
 gtk_action_group_get_action (toggleaction_group_others,
 "view put on all workspaces");
- gtk_toggle_action_set_active (action, sticky);
+ gtk_toggle_action_set_active (action, config.sticky);
 }
 
 if (event->changed_mask & GDK_WINDOW_STATE_ABOVE)
 {
- gboolean above = (event->new_window_state & GDK_WINDOW_STATE_ABOVE);
+ config.always_on_top = (event->new_window_state &
+ GDK_WINDOW_STATE_ABOVE) ? TRUE : FALSE;
+
 GtkToggleAction * action = (GtkToggleAction *)
 gtk_action_group_get_action (toggleaction_group_others,
 "view always on top");
- gtk_toggle_action_set_active (action, above);
+ gtk_toggle_action_set_active (action, config.always_on_top);
 }
 
 return TRUE;
@@ -1679,15 +1686,25 @@
 
 void action_view_always_on_top (GtkToggleAction * action)
 {
- config.always_on_top = gtk_toggle_action_get_active (action);
- ui_skinned_menurow_update (mainwin_menurow);
- hint_set_always (config.always_on_top);
+ gboolean on_top = gtk_toggle_action_get_active (action);
+
+ if (config.always_on_top != on_top)
+ {
+ config.always_on_top = on_top;
+ ui_skinned_menurow_update (mainwin_menurow);
+ hint_set_always (config.always_on_top);
+ }
 }
 
 void action_view_on_all_workspaces (GtkToggleAction * action)
 {
- config.sticky = gtk_toggle_action_get_active( action );
- hint_set_sticky(config.sticky);
+ gboolean sticky = gtk_toggle_action_get_active (action);
+
+ if (config.sticky != sticky)
+ {
+ config.sticky = sticky;
+ hint_set_sticky (sticky);
+ }
 }
 
 void action_roll_up_player (GtkToggleAction * action)

audacious-plugins-3.1.1.tar.bz2/src/skins/ui_main_evlisteners.c -> audacious-plugins-3.2.4.tar.bz2/src/skins/ui_main_evlisteners.c Changed

@@ -39,7 +39,7 @@
     {
         gchar * title = aud_drct_get_title ();
         mainwin_set_song_title (title);
-        g_free (title);
+        str_unref (title);
     }
     else
         mainwin_set_song_title ("Buffering ...");
@@ -92,6 +92,24 @@
     mainwin_clear_song_info ();
 }
 
+static void repeat_toggled (void * data, void * user)
+{
+    bool_t repeat = aud_get_bool (NULL, "repeat");
+    check_set (toggleaction_group_others, "playback repeat", repeat);
+}
+
+static void shuffle_toggled (void * data, void * user)
+{
+    bool_t shuffle = aud_get_bool (NULL, "shuffle");
+    check_set (toggleaction_group_others, "playback shuffle", shuffle);
+}
+
+static void no_advance_toggled (void * data, void * user)
+{
+    bool_t no_advance = aud_get_bool (NULL, "no_playlist_advance");
+    check_set (toggleaction_group_others, "playback no playlist advance", no_advance);
+}
+
 static void stop_after_song_toggled (void * hook_data, void * user_data)
 {
     mainwin_enable_status_message (FALSE);
@@ -270,6 +288,10 @@
     hook_associate ("info change", (HookFunction) info_change, NULL);
 
     hook_associate("playback seek", (HookFunction) mainwin_update_song_info, NULL);
+
+    hook_associate ("set repeat", repeat_toggled, NULL);
+    hook_associate ("set shuffle", shuffle_toggled, NULL);
+    hook_associate ("set no_playlist_advance", no_advance_toggled, NULL);
     hook_associate ("set stop_after_current_song", stop_after_song_toggled, NULL);
 }
 
@@ -286,6 +308,10 @@
     hook_dissociate ("info change", (HookFunction) info_change);
 
     hook_dissociate("playback seek", (HookFunction) mainwin_update_song_info);
+
+    hook_dissociate ("set repeat", repeat_toggled);
+    hook_dissociate ("set shuffle", shuffle_toggled);
+    hook_dissociate ("set no_playlist_advance", no_advance_toggled);
     hook_dissociate ("set stop_after_current_song", stop_after_song_toggled);
 }

audacious-plugins-3.1.1.tar.bz2/src/skins/ui_manager.c -> audacious-plugins-3.2.4.tar.bz2/src/skins/ui_manager.c Changed

audacious-plugins-3.1.1.tar.bz2/src/skins/ui_playlist.c -> audacious-plugins-3.2.4.tar.bz2/src/skins/ui_playlist.c Changed

@@ -137,7 +137,7 @@
 gchar * title = aud_playlist_entry_get_title (playlist, entry, TRUE);
 snprintf (scratch + strlen (scratch), sizeof scratch - strlen (scratch),
 "%s", title);
- g_free (title);
+ str_unref (title);
 
 if (length > 0)
 snprintf (scratch + strlen (scratch), sizeof scratch - strlen
@@ -210,7 +210,8 @@
 {
 gint entries = aud_playlist_entry_count (playlist);
 gint new = aud_playlist_count ();
- struct index * copy = index_new ();
+ Index * filenames = index_new ();
+ Index * tuples = index_new ();
 gint entry;
 
 aud_playlist_insert (new);
@@ -218,10 +219,13 @@
 for (entry = 0; entry < entries; entry ++)
 {
 if (aud_playlist_entry_get_selected (playlist, entry))
- index_append (copy, aud_playlist_entry_get_filename (playlist, entry));
+ {
+ index_append (filenames, aud_playlist_entry_get_filename (playlist, entry));
+ index_append (tuples, aud_playlist_entry_get_tuple (playlist, entry, TRUE));
+ }
 }
 
- aud_playlist_entry_insert_batch (new, 0, copy, NULL, FALSE);
+ aud_playlist_entry_insert_batch (new, 0, filenames, tuples, FALSE);
 aud_playlist_set_active (new);
 }
 
@@ -344,28 +348,27 @@
 
 searchdata = (gchar*)gtk_entry_get_text( GTK_ENTRY(searchdlg_entry_title) );
 AUDDBG("title=\"%s\"\n", searchdata);
- tuple_associate_string(tuple, FIELD_TITLE, NULL, searchdata);
+ tuple_set_str(tuple, FIELD_TITLE, NULL, searchdata);
 
 searchdata = (gchar*)gtk_entry_get_text( GTK_ENTRY(searchdlg_entry_album) );
 AUDDBG("album=\"%s\"\n", searchdata);
- tuple_associate_string(tuple, FIELD_ALBUM, NULL, searchdata);
+ tuple_set_str(tuple, FIELD_ALBUM, NULL, searchdata);
 
 searchdata = (gchar*)gtk_entry_get_text( GTK_ENTRY(searchdlg_entry_performer) );
 AUDDBG("performer=\"%s\"\n", searchdata);
- tuple_associate_string(tuple, FIELD_ARTIST, NULL, searchdata);
+ tuple_set_str(tuple, FIELD_ARTIST, NULL, searchdata);
 
 searchdata = (gchar*)gtk_entry_get_text( GTK_ENTRY(searchdlg_entry_file_name) );
 AUDDBG("filename=\"%s\"\n", searchdata);
- tuple_associate_string(tuple, FIELD_FILE_NAME, NULL, searchdata);
+ tuple_set_str(tuple, FIELD_FILE_NAME, NULL, searchdata);
 
 /* check if previous selection should be cleared before searching */
 if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(searchdlg_checkbt_clearprevsel)) == TRUE )
 playlistwin_select_none();
- /* now send this tuple to the real search function */
+
 aud_playlist_select_by_patterns (active_playlist, tuple);
+ tuple_unref (tuple);
 
- /* we do not need the tuple and its data anymore */
- mowgli_object_unref(tuple);
 /* check if a new playlist should be created after searching */
 if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(searchdlg_checkbt_newplaylist)) == TRUE )
 copy_selected_to_new (active_playlist);
@@ -808,7 +811,7 @@
 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);
+ str_unref (title);
 }
 else
 active_title = NULL;
@@ -936,11 +939,6 @@
 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);

audacious-plugins-3.1.1.tar.bz2/src/skins/ui_skin.c -> audacious-plugins-3.2.4.tar.bz2/src/skins/ui_skin.c Changed

audacious-plugins-3.1.1.tar.bz2/src/skins/ui_skinned_equalizer_slider.c -> audacious-plugins-3.2.4.tar.bz2/src/skins/ui_skinned_equalizer_slider.c Changed

audacious-plugins-3.1.1.tar.bz2/src/skins/ui_skinned_playlist.c -> audacious-plugins-3.2.4.tar.bz2/src/skins/ui_skinned_playlist.c Changed

audacious-plugins-3.1.1.tar.bz2/src/skins/ui_skinned_window.c -> audacious-plugins-3.2.4.tar.bz2/src/skins/ui_skinned_window.c Changed

audacious-plugins-3.1.1.tar.bz2/src/skins/util.c -> audacious-plugins-3.2.4.tar.bz2/src/skins/util.c Changed

audacious-plugins-3.1.1.tar.bz2/src/smb/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/smb/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/smb/smb.c -> audacious-plugins-3.2.4.tar.bz2/src/smb/smb.c Changed

@@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+#include <glib.h>
+
 #include "config.h"
 #include <audacious/plugin.h>
 #include <stdio.h>
@@ -42,56 +44,44 @@
 } SMBFile;
 
 /* TODO: make writing work. */
-VFSFile *smb_vfs_fopen_impl(const gchar * path, const gchar * mode)
+void * smb_vfs_fopen_impl (const gchar * path, const gchar * mode)
 {
- VFSFile *file;
 SMBFile *handle;
 struct stat st;
 
 if (!path || !mode)
 return NULL;
 
- 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;
- } else {
- smbc_stat(path,&st);
- handle->length = st.st_size;
- file->handle = (void *)handle;
+ if (handle->fd < 0)
+ {
+ g_free (handle);
+ return NULL;
 }
 
- return file;
+ smbc_stat (path, & st);
+ handle->length = st.st_size;
+
+ return handle;
 }
 
 gint smb_vfs_fclose_impl(VFSFile * file)
 {
 gint ret = 0;
- SMBFile *handle;
-
- if (file == NULL)
- return -1;
+ SMBFile * handle = vfs_get_handle (file);
 
- if (file->handle)
- {
- handle = (SMBFile *)file->handle;
- if (smbc_close(handle->fd) != 0)
- ret = -1;
- g_free(file->handle);
- }
+ if (smbc_close (handle->fd))
+ ret = -1;
 
+ g_free (handle);
 return ret;
 }
 
 static gint64 smb_vfs_fread_impl (void * ptr, gint64 size, gint64 nmemb, VFSFile * file)
 {
- SMBFile *handle;
- if (file == NULL)
- return 0;
- handle = (SMBFile *)file->handle;
+ SMBFile * handle = vfs_get_handle (file);
 return smbc_read(handle->fd, ptr, size * nmemb);
 }
 
@@ -102,22 +92,18 @@
 
 gint smb_vfs_getc_impl(VFSFile *file)
 {
- SMBFile *handle;
+ SMBFile * handle = vfs_get_handle (file);
 char temp;
- handle = (SMBFile *)file->handle;
+
 smbc_read(handle->fd, &temp, 1);
 return (gint) temp;
 }
 
 static gint smb_vfs_fseek_impl(VFSFile * file, gint64 offset, gint whence)
 {
- SMBFile *handle;
+ SMBFile * handle = vfs_get_handle (file);
 gint64 roffset = offset;
 gint ret = 0;
- if (file == NULL)
- return 0;
-
- handle = (SMBFile *)file->handle;
 
 if (whence == SEEK_END)
 {
@@ -152,15 +138,14 @@
 
 static gint64 smb_vfs_ftell_impl(VFSFile * file)
 {
- SMBFile *handle;
- handle = (SMBFile *)file->handle;
+ SMBFile * handle = vfs_get_handle (file);
 return smbc_lseek(handle->fd, 0, SEEK_CUR);
 }
 
 gboolean
 smb_vfs_feof_impl(VFSFile * file)
 {
- SMBFile * handle = file->handle;
+ SMBFile * handle = vfs_get_handle (file);
 gint64 at;
 
 at = smb_vfs_ftell_impl(file);
@@ -175,8 +160,7 @@
 
 static gint64 smb_vfs_fsize_impl (VFSFile * file)
 {
- SMBFile *handle = (SMBFile *)file->handle;
-
+ SMBFile * handle = vfs_get_handle (file);
 return handle->length;
 }

audacious-plugins-3.1.1.tar.bz2/src/sndfile/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/sndfile/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/sndfile/plugin.c -> audacious-plugins-3.2.4.tar.bz2/src/sndfile/plugin.c Changed

audacious-plugins-3.1.1.tar.bz2/src/sndstretch/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/sndstretch/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/sndstretch/sndstretch.c -> audacious-plugins-3.2.4.tar.bz2/src/sndstretch/sndstretch.c Changed

audacious-plugins-3.1.1.tar.bz2/src/sndstretch/sndstretch_xmms.c -> audacious-plugins-3.2.4.tar.bz2/src/sndstretch/sndstretch_xmms.c Changed

audacious-plugins-3.1.1.tar.bz2/src/song_change/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/song_change/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/song_change/song_change.c -> audacious-plugins-3.2.4.tar.bz2/src/song_change/song_change.c Changed

@@ -127,27 +127,28 @@
  *   r - track title
  */
 /* do_command(): do @cmd after replacing the format codes
-   @cmd: command to run
-   @current_file: file name of current song
-   @pos: playlist_pos */
-static void do_command(char *cmd, const char *current_file, int pos)
+   @cmd: command to run */
+static void do_command (char * cmd)
 {
-    int length;
-    char *str, *shstring = NULL, *temp, numbuf[32];
+    int playlist = aud_playlist_get_playing ();
+    int pos = aud_playlist_get_position (playlist);
+
+    char *shstring = NULL, *temp, numbuf[32];
     gboolean playing;
     Formatter *formatter;
 
     if (cmd && strlen(cmd) > 0)
     {
         formatter = formatter_new();
-        str = aud_drct_pl_get_title(pos);
-        if (str)
+
+        char * ctitle = aud_playlist_entry_get_title (playlist, pos, FALSE);
+        if (ctitle)
         {
-            temp = escape_shell_chars(str);
+            temp = escape_shell_chars (ctitle);
             formatter_associate(formatter, 's', temp);
             formatter_associate(formatter, 'n', temp);
-            g_free(str);
             g_free(temp);
+            str_unref (ctitle);
         }
         else
         {
@@ -155,18 +156,22 @@
             formatter_associate(formatter, 'n', "");
         }
 
-        if (current_file)
+        char * filename = aud_playlist_entry_get_filename (playlist, pos);
+        if (filename)
         {
-            temp = escape_shell_chars(current_file);
+            temp = escape_shell_chars (filename);
             formatter_associate(formatter, 'f', temp);
             g_free(temp);
+            str_unref (filename);
         }
         else
             formatter_associate(formatter, 'f', "");
+
         g_snprintf(numbuf, sizeof(numbuf), "%02d", pos + 1);
         formatter_associate(formatter, 't', numbuf);
-        length = aud_drct_pl_get_time(pos);
-        if (length != -1)
+
+        int length = aud_playlist_entry_get_length (playlist, pos, FALSE);
+        if (length > 0)
         {
             g_snprintf(numbuf, sizeof(numbuf), "%d", length);
             formatter_associate(formatter, 'l', numbuf);
@@ -193,26 +198,35 @@
         Tuple * tuple = aud_playlist_entry_get_tuple
             (aud_playlist_get_active (), pos, 0);
 
-        const char *artist = tuple_get_string(tuple, FIELD_ARTIST, NULL);
+        char * artist = tuple ? tuple_get_str (tuple, FIELD_ARTIST, NULL) : NULL;
         if (artist)
+        {
             formatter_associate(formatter, 'a', artist);
+            str_unref(artist);
+        }
         else
             formatter_associate(formatter, 'a', "");
 
-        const char *album = tuple_get_string(tuple, FIELD_ALBUM, NULL);
+        char * album = tuple ? tuple_get_str (tuple, FIELD_ALBUM, NULL) : NULL;
         if (album)
+        {
             formatter_associate(formatter, 'b', album);
+            str_unref(album);
+        }
         else
             formatter_associate(formatter, 'b', "");
 
-        const char *title = tuple_get_string(tuple, FIELD_TITLE, NULL);
+        char * title = tuple ? tuple_get_str (tuple, FIELD_TITLE, NULL) : NULL;
         if (title)
+        {
             formatter_associate(formatter, 'T', title);
+            str_unref(title);
+        }
         else
             formatter_associate(formatter, 'T', "");
 
         if (tuple)
-            tuple_free (tuple);
+            tuple_unref (tuple);
 
         shstring = formatter_format(formatter, cmd);
         formatter_destroy(formatter);
@@ -322,28 +336,12 @@
 
 static void songchange_playback_begin(gpointer unused, gpointer unused2)
 {
-    int pos;
-    char *current_file;
-
-    pos = aud_drct_pl_get_pos();
-    current_file = aud_drct_pl_get_file(pos);
-
-    do_command(cmd_line, current_file, pos);
-
-    g_free(current_file);
+    do_command (cmd_line);
 }
 
 static void songchange_playback_end(gpointer unused, gpointer unused2)
 {
-    int pos;
-    char *current_file;
-
-    pos = aud_drct_pl_get_pos();
-    current_file = aud_drct_pl_get_file(pos);
-
-    do_command(cmd_line_after, current_file, pos);
-
-    g_free(current_file);
+    do_command (cmd_line_after);
 }
 
 #if 0
@@ -396,15 +394,7 @@
 
 static void songchange_playlist_eof(gpointer unused, gpointer unused2)
 {
-    gint pos;
-    gchar *current_file;
-
-    pos = aud_drct_pl_get_pos();
-    current_file = aud_drct_pl_get_file(pos);
-
-    do_command(cmd_line_end, current_file, pos);
-
-    g_free(current_file);
+    do_command (cmd_line_end);
 }
 
 typedef struct {

audacious-plugins-3.1.1.tar.bz2/src/statusicon/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/statusicon/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/statusicon/config.c -> audacious-plugins-3.2.4.tar.bz2/src/statusicon/config.c Changed

audacious-plugins-3.1.1.tar.bz2/src/statusicon/statusicon.c -> audacious-plugins-3.2.4.tar.bz2/src/statusicon/statusicon.c Changed

@@ -25,6 +25,7 @@
 #include <audacious/drct.h>
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
+#include <audacious/plugins.h>
 #include <libaudcore/hook.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
@@ -79,7 +80,8 @@
 if (event->state & GDK_SHIFT_MASK)
 aud_drct_pl_next();
 else
- hook_call ("interface toggle visibility", NULL);
+ aud_interface_show (! (aud_interface_is_shown () &&
+ aud_interface_is_focused ()));
 break;
 }
 
@@ -116,7 +118,7 @@
 si_volume_change(si_cfg.volume_delta);
 break;
 case SI_CFG_SCROLL_ACTION_SKIP:
- si_playback_skip(-1);
+ si_playback_skip (aud_get_bool ("statusicon", "reverse_scroll") ? 1 : -1);
 break;
 }
 break;
@@ -130,7 +132,7 @@
 si_volume_change(-si_cfg.volume_delta);
 break;
 case SI_CFG_SCROLL_ACTION_SKIP:
- si_playback_skip(1);
+ si_playback_skip (aud_get_bool ("statusicon", "reverse_scroll") ? -1 : 1);
 break;
 }
 break;
@@ -295,7 +297,7 @@
 if (si_cfg.close_to_tray)
 {
 *handle = TRUE;
- hook_call("interface toggle visibility", NULL);
+ aud_interface_show (FALSE);
 }
 }
 
@@ -319,7 +321,7 @@
 g_object_set_data(G_OBJECT(si_applet), "timer_active", GINT_TO_POINTER(0));
 g_object_set_data(G_OBJECT(si_applet), "popup_active", GINT_TO_POINTER(0));
 
- g_signal_connect(G_OBJECT(si_applet), "button-release-event", G_CALLBACK(si_cb_btpress), NULL);
+ g_signal_connect(G_OBJECT(si_applet), "button-press-event", G_CALLBACK(si_cb_btpress), NULL);
 g_signal_connect(G_OBJECT(si_applet), "scroll-event", G_CALLBACK(si_cb_btscroll), NULL);
 g_signal_connect(G_OBJECT(si_applet), "query-tooltip", G_CALLBACK(si_cb_tooltip), NULL);
 
@@ -336,6 +338,13 @@
 
 if (! enable && si_applet)
 {
+ /* Prevent accidentally hiding of the interface
+ * by disabling the plugin while Audacious is closed to the tray. */
+ extern GeneralPlugin _aud_plugin_self;
+ PluginHandle *si = aud_plugin_by_header(&_aud_plugin_self);
+ if (! aud_plugin_get_enabled(si) && ! aud_interface_is_shown())
+ aud_interface_show(TRUE);
+
 GtkWidget *si_smenu = g_object_get_data(G_OBJECT(si_applet), "smenu");
 si_popup_timer_stop(si_applet); /* just in case the timer is active */
 gtk_widget_destroy(si_smenu);
@@ -385,6 +394,7 @@
 
 static GtkWidget *prefs_disable_popup_chkbtn;
 static GtkWidget *prefs_close_to_tray_chkbtn;
+static GtkWidget * reverse_scroll_toggle;
 
 void si_prefs_cb_commit(gpointer prefs_win)
 {
@@ -412,6 +422,8 @@
 
 si_cfg.disable_popup = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_disable_popup_chkbtn));
 si_cfg.close_to_tray = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_close_to_tray_chkbtn));
+ aud_set_bool ("statusicon", "reverse_scroll", gtk_toggle_button_get_active
+ ((GtkToggleButton *) reverse_scroll_toggle));
 
 si_cfg_save();
 
@@ -516,6 +528,12 @@
 
 gtk_box_pack_start(GTK_BOX(prefs_other_vbox), prefs_close_to_tray_chkbtn, TRUE, TRUE, 0);
 
+ reverse_scroll_toggle = gtk_check_button_new_with_label
+ (_("Advance in playlist when scrolling upward"));
+ gtk_toggle_button_set_active ((GtkToggleButton *) reverse_scroll_toggle,
+ aud_get_bool ("statusicon", "reverse_scroll"));
+ gtk_box_pack_start ((GtkBox *) prefs_other_vbox, reverse_scroll_toggle, TRUE, TRUE, 0);
+
 gtk_box_pack_start(GTK_BOX(prefs_vbox), prefs_other_frame, TRUE, TRUE, 0);
 
 /* horizontal separator and buttons */

audacious-plugins-3.1.1.tar.bz2/src/stereo_plugin/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/stereo_plugin/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/tonegen/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/tonegen/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/tonegen/tonegen.c -> audacious-plugins-3.2.4.tar.bz2/src/tonegen/tonegen.c Changed

audacious-plugins-3.1.1.tar.bz2/src/unix-io/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/unix-io/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/unix-io/gtk.c -> audacious-plugins-3.2.4.tar.bz2/src/unix-io/gtk.c Changed

audacious-plugins-3.1.1.tar.bz2/src/unix-io/unix-io.c -> audacious-plugins-3.2.4.tar.bz2/src/unix-io/unix-io.c Changed

@@ -35,9 +35,8 @@
 void unix_error (const gchar * format, ...);
 void unix_about (void);
 
-static VFSFile * unix_fopen (const gchar * uri, const gchar * mode)
+static void * unix_fopen (const gchar * uri, const gchar * mode)
 {
- VFSFile * file = NULL;
 gboolean update;
 mode_t mode_flag;
 gint handle;
@@ -80,24 +79,21 @@
 if (handle < 0)
 {
 unix_error ("Cannot open %s: %s.", filename, strerror (errno));
- goto DONE;
+ g_free (filename);
+ return NULL;
 }
 
 #ifdef HAVE_FCNTL
 fcntl (handle, F_SETFD, FD_CLOEXEC);
 #endif
 
- file = g_malloc (sizeof * file);
- file->handle = GINT_TO_POINTER (handle);
-
-DONE:
 g_free (filename);
- return file;
+ return GINT_TO_POINTER (handle);
 }
 
 static gint unix_fclose (VFSFile * file)
 {
- gint handle = GPOINTER_TO_INT (file->handle);
+ gint handle = GPOINTER_TO_INT (vfs_get_handle (file));
 gint result = 0;
 
 #ifdef HAVE_FSYNC
@@ -119,7 +115,7 @@
 
 static gint64 unix_fread (void * ptr, gint64 size, gint64 nitems, VFSFile * file)
 {
- gint handle = GPOINTER_TO_INT (file->handle);
+ gint handle = GPOINTER_TO_INT (vfs_get_handle (file));
 gint64 goal = size * nitems;
 gint64 total = 0;
 
@@ -145,7 +141,7 @@
 static gint64 unix_fwrite (const void * ptr, gint64 size, gint64 nitems,
 VFSFile * file)
 {
- gint handle = GPOINTER_TO_INT (file->handle);
+ gint handle = GPOINTER_TO_INT (vfs_get_handle (file));
 gint64 goal = size * nitems;
 gint64 total = 0;
 
@@ -167,7 +163,7 @@
 
 static gint unix_fseek (VFSFile * file, gint64 offset, gint whence)
 {
- gint handle = GPOINTER_TO_INT (file->handle);
+ gint handle = GPOINTER_TO_INT (vfs_get_handle (file));
 
 if (lseek (handle, offset, whence) < 0)
 {
@@ -180,7 +176,7 @@
 
 static gint64 unix_ftell (VFSFile * file)
 {
- gint handle = GPOINTER_TO_INT (file->handle);
+ gint handle = GPOINTER_TO_INT (vfs_get_handle (file));
 gint64 result = lseek (handle, 0, SEEK_CUR);
 
 if (result < 0)
@@ -219,7 +215,7 @@
 
 static gint unix_ftruncate (VFSFile * file, gint64 length)
 {
- gint handle = GPOINTER_TO_INT (file->handle);
+ gint handle = GPOINTER_TO_INT (vfs_get_handle (file));
 
 gint result = ftruncate (handle, length);

audacious-plugins-3.1.1.tar.bz2/src/voice_removal/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/voice_removal/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/voice_removal/voice_removal.c -> audacious-plugins-3.2.4.tar.bz2/src/voice_removal/voice_removal.c Changed

audacious-plugins-3.1.1.tar.bz2/src/vorbis/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/vorbis/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/vorbis/vcupdate.c -> audacious-plugins-3.2.4.tar.bz2/src/vorbis/vcupdate.c Changed

@@ -37,21 +37,23 @@
 #include <audacious/i18n.h>
 #include <libaudcore/audstrings.h>
 
-#include <mowgli.h>
-
 #include "vorbis.h"
 #include "vcedit.h"
 
 static gboolean write_and_pivot_files(vcedit_state * state);
 
-static mowgli_patricia_t *
-dictionary_from_vorbis_comment(vorbis_comment * vc)
+/* str_unref() may be a macro */
+static void str_unref_cb (void * str)
+{
+ str_unref (str);
+}
+
+static GHashTable * dictionary_from_vorbis_comment (vorbis_comment * vc)
 {
- mowgli_patricia_t *dict;
 gint i;
- gchar *val;
 
- dict = mowgli_patricia_create (NULL);
+ GHashTable * dict = g_hash_table_new_full (g_str_hash, g_str_equal,
+ str_unref_cb, str_unref_cb);
 
 for (i = 0; i < vc->comments; i++) {
 gchar **frags;
@@ -59,13 +61,8 @@
 AUDDBG("%s\n", vc->user_comments[i]);
 frags = g_strsplit(vc->user_comments[i], "=", 2);
 
- /* FIXME: need more rigorous checks to guard against
- borqued comments */
-
- /* No RHS? */
- val = frags[1] ? frags[1] : "";
-
- mowgli_patricia_add(dict, frags[0], g_strdup(val));
+ if (frags[0] && frags[1])
+ g_hash_table_insert (dict, str_get (frags[0]), str_get (frags[1]));
 
 g_strfreev(frags); /* Don't use g_free() for string lists! --eugene */
 }
@@ -73,52 +70,43 @@
 return dict;
 }
 
-static gint add_tag_cb (const gchar * key, void * field, void * vc)
+static void add_tag_cb (void * key, void * field, void * vc)
 {
 vorbis_comment_add_tag (vc, key, field);
- return 0;
 }
 
-static void
-dictionary_to_vorbis_comment(vorbis_comment * vc, mowgli_patricia_t * dict)
+static void dictionary_to_vorbis_comment (vorbis_comment * vc, GHashTable * dict)
 {
 vorbis_comment_clear(vc);
- mowgli_patricia_foreach (dict, add_tag_cb, vc);
+ g_hash_table_foreach (dict, add_tag_cb, vc);
 }
 
 static void insert_str_tuple_field_to_dictionary (const Tuple * tuple, int
- fieldn, mowgli_patricia_t * dict, char * key)
+ fieldn, GHashTable * dict, const char * key)
 {
- g_free (mowgli_patricia_delete (dict, key));
-
- gchar *tmp = (gchar*)tuple_get_string(tuple, fieldn, NULL);
- if(tmp != NULL && strlen(tmp) != 0) mowgli_patricia_add(dict, key, g_strdup(tmp));
+ gchar *tmp = (gchar*)tuple_get_str(tuple, fieldn, NULL);
+ if (tmp && tmp[0])
+ g_hash_table_insert (dict, str_get (key), str_get (tmp));
+ str_unref(tmp);
 }
 
 static void insert_int_tuple_field_to_dictionary (const Tuple * tuple, int
- fieldn, mowgli_patricia_t * dict, char * key)
+ fieldn, GHashTable * dict, const char * key)
 {
 int val;
 
- g_free (mowgli_patricia_delete (dict, key));
-
 if(tuple_get_value_type(tuple, fieldn, NULL) == TUPLE_INT && (val = tuple_get_int(tuple, fieldn, NULL)) >= 0) {
- gchar *tmp = g_strdup_printf("%d", val);
- mowgli_patricia_add(dict, key, tmp);
+ char tmp[16];
+ snprintf (tmp, sizeof tmp, "%d", val);
+ g_hash_table_insert (dict, str_get (key), str_get (tmp));
 }
 }
 
-static void destroy_cb (const gchar * key, void * data, void * unused)
-{
- g_free (data);
-}
-
 gboolean vorbis_update_song_tuple (const Tuple * tuple, VFSFile * fd)
 {
 
 vcedit_state *state;
 vorbis_comment *comment;
- mowgli_patricia_t *dict;
 gboolean ret;
 
 if(!tuple || !fd) return FALSE;
@@ -131,7 +119,7 @@
 }
 
 comment = vcedit_comments(state);
- dict = dictionary_from_vorbis_comment(comment);
+ GHashTable * dict = dictionary_from_vorbis_comment (comment);
 
 insert_str_tuple_field_to_dictionary(tuple, FIELD_TITLE, dict, "title");
 insert_str_tuple_field_to_dictionary(tuple, FIELD_ARTIST, dict, "artist");
@@ -143,7 +131,7 @@
 insert_int_tuple_field_to_dictionary(tuple, FIELD_TRACK_NUMBER, dict, "tracknumber");
 
 dictionary_to_vorbis_comment(comment, dict);
- mowgli_patricia_destroy(dict, destroy_cb, NULL);
+ g_hash_table_destroy (dict);
 
 ret = write_and_pivot_files(state);

audacious-plugins-3.1.1.tar.bz2/src/vorbis/vorbis.c -> audacious-plugins-3.2.4.tar.bz2/src/vorbis/vorbis.c Changed

@@ -32,6 +32,7 @@
 #include <glib.h>
 
 #include <stdlib.h>
+#include <string.h>
 #include <math.h>
 
 #include <ogg/ogg.h>
@@ -153,7 +154,7 @@
 gchar *str = vorbis_comment_query(comment, key, 0);
 if (str != NULL) {
 gchar *tmp = str_to_utf8(str);
- tuple_associate_string(tuple, nfield, field, tmp);
+ tuple_set_str(tuple, nfield, field, tmp);
 g_free(tmp);
 }
 }
@@ -171,7 +172,7 @@
 (vorbisfile, -1) * 1000;
 
 /* associate with tuple */
- tuple_associate_int(tuple, FIELD_LENGTH, NULL, length);
+ tuple_set_int(tuple, FIELD_LENGTH, NULL, length);
 
 if ((comment = ov_comment(vorbisfile, -1)) != NULL) {
 gchar *tmps;
@@ -182,17 +183,17 @@
 set_tuple_str(tuple, FIELD_COMMENT, NULL, comment, "comment");
 
 if ((tmps = vorbis_comment_query(comment, "tracknumber", 0)) != NULL)
- tuple_associate_int(tuple, FIELD_TRACK_NUMBER, NULL, atoi(tmps));
+ tuple_set_int(tuple, FIELD_TRACK_NUMBER, NULL, atoi(tmps));
 
 if ((tmps = vorbis_comment_query (comment, "date", 0)) != NULL)
- tuple_associate_int (tuple, FIELD_YEAR, NULL, atoi (tmps));
+ tuple_set_int (tuple, FIELD_YEAR, NULL, atoi (tmps));
 }
 
 vorbis_info * info = ov_info (vorbisfile, -1);
 tuple_set_format (tuple, "Ogg Vorbis", info->channels, info->rate,
 info->bitrate_nominal / 1000);
 
- tuple_associate_string(tuple, FIELD_MIMETYPE, NULL, "application/ogg");
+ tuple_set_str(tuple, FIELD_MIMETYPE, NULL, "application/ogg");
 
 return tuple;
 }
@@ -515,7 +516,7 @@
 }
 
 static gboolean get_song_image (const gchar * filename, VFSFile * file,
- void * * data, gint * size)
+ void * * data, gint64 * size)
 {
 OggVorbis_File vfile;
 
@@ -549,7 +550,7 @@
 goto PARSE_ERR;
 
 * data = g_malloc (* size);
- memcpy (* data, data2 + 8 + mime_length + 4 + desc_length + 20, * size);
+ memcpy (* data, (char *) data2 + 8 + mime_length + 4 + desc_length + 20, * size);
 
 g_free (data2);
 ov_clear (& vfile);

audacious-plugins-3.1.1.tar.bz2/src/vtx/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/vtx/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/vtx/ay8912.c -> audacious-plugins-3.2.4.tar.bz2/src/vtx/ay8912.c Changed

@@ -1,5 +1,6 @@
 /* AY/YM emulator implementation. */
 
+#include <stdio.h>
 #include <inttypes.h>
 #include "ayemu.h"
 
@@ -76,7 +77,7 @@
 {
 if (ay->magic == MAGIC1)
 return 1;
- fprintf(stderr, "libayemu: passed pointer %p to uninitialized ayemu_ay_t structure\n", ay);
+ fprintf(stderr, "libayemu: passed pointer %p to uninitialized ayemu_ay_t structure\n", (void *) ay);
 return 0;
 }
 
@@ -412,7 +413,7 @@
 snd_numcount = sound_bufsize / (ay->sndfmt.channels * (ay->sndfmt.bpc >> 3));
 while (snd_numcount-- > 0) {
 mix_l = mix_r = 0;
-		
+
 for (m = 0 ; m < ay->ChipTacts_per_outcount ; m++) {
 if (++ay->cnt_a >= ay->regs.tone_a) {
 	ay->cnt_a = 0;
@@ -426,15 +427,15 @@
 	ay->cnt_c = 0;
 	ay->bit_c = ! ay->bit_c;
 }
-			
+
 /* GenNoise (c) Hacker KAY & Sergey Bulba */
 if (++ay->cnt_n >= (ay->regs.noise * 2)) {
 	ay->cnt_n = 0;
 	ay->Cur_Seed = (ay->Cur_Seed * 2 + 1) ^ \
-	 (((ay->Cur_Seed >> 16) ^ (ay->Cur_Seed >> 13)) & 1); 
+	 (((ay->Cur_Seed >> 16) ^ (ay->Cur_Seed >> 13)) & 1);
 	ay->bit_n = ((ay->Cur_Seed >> 16) & 1);
 }
-			
+
 if (++ay->cnt_e >= ay->regs.env_freq) {
 	ay->cnt_e = 0;
 	if (++ay->env_pos > 127)
@@ -448,23 +449,23 @@
 	mix_l += ay->vols[0][tmpvol];
 	mix_r += ay->vols[1][tmpvol];
 }
-			
+
 if ((ay->bit_b | !ay->regs.R7_tone_b) & (ay->bit_n | !ay->regs.R7_noise_b)) {
 	tmpvol =(ay->regs.env_b)? ENVVOL : ay->regs.vol_b * 2 + 1;
 	mix_l += ay->vols[2][tmpvol];
 	mix_r += ay->vols[3][tmpvol];
 }
-			
+
 if ((ay->bit_c | !ay->regs.R7_tone_c) & (ay->bit_n | !ay->regs.R7_noise_c)) {
 	tmpvol = (ay->regs.env_c)? ENVVOL : ay->regs.vol_c * 2 + 1;
 	mix_l += ay->vols[4][tmpvol];
 	mix_r += ay->vols[5][tmpvol];
- }			
+ }
 } /* end for (m=0; ...) */
-		
+
 mix_l /= ay->Amp_Global;
 mix_r /= ay->Amp_Global;
-		
+
 if (ay->sndfmt.bpc == 8) {
 mix_l = (mix_l >> 8) | 128; /* 8 bit sound */
 mix_r = (mix_r >> 8) | 128;

audacious-plugins-3.1.1.tar.bz2/src/vtx/vtx.c -> audacious-plugins-3.2.4.tar.bz2/src/vtx/vtx.c Changed

@@ -21,7 +21,6 @@
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
 #include <audacious/plugin.h>
-#include <libaudcore/tuple_formatter.h>
 #include <audacious/debug.h>
 
 #include "vtx.h"
@@ -69,20 +68,20 @@
 {
 Tuple *out = tuple_new_from_filename(filename);
 
- tuple_associate_string(out, FIELD_ARTIST, NULL, in->hdr.author);
- tuple_associate_string(out, FIELD_TITLE, NULL, in->hdr.title);
+ tuple_set_str(out, FIELD_ARTIST, NULL, in->hdr.author);
+ tuple_set_str(out, FIELD_TITLE, NULL, in->hdr.title);
 
- tuple_associate_int(out, FIELD_LENGTH, NULL, in->hdr.regdata_size / 14 * 1000 / 50);
+ tuple_set_int(out, FIELD_LENGTH, NULL, in->hdr.regdata_size / 14 * 1000 / 50);
 
- tuple_associate_string(out, FIELD_GENRE, NULL, (in->hdr.chiptype == AYEMU_AY) ? "AY chiptunes" : "YM chiptunes");
- tuple_associate_string(out, FIELD_ALBUM, NULL, in->hdr.from);
- tuple_associate_string(out, -1, "game", in->hdr.from);
+ tuple_set_str(out, FIELD_GENRE, NULL, (in->hdr.chiptype == AYEMU_AY) ? "AY chiptunes" : "YM chiptunes");
+ tuple_set_str(out, FIELD_ALBUM, NULL, in->hdr.from);
+ tuple_set_str(out, -1, "game", in->hdr.from);
 
- tuple_associate_string(out, FIELD_QUALITY, NULL, "sequenced");
- tuple_associate_string(out, FIELD_CODEC, NULL, in->hdr.tracker);
- tuple_associate_string(out, -1, "tracker", in->hdr.tracker);
+ tuple_set_str(out, FIELD_QUALITY, NULL, "sequenced");
+ tuple_set_str(out, FIELD_CODEC, NULL, in->hdr.tracker);
+ tuple_set_str(out, -1, "tracker", in->hdr.tracker);
 
- tuple_associate_int(out, FIELD_YEAR, NULL, in->hdr.year);
+ tuple_set_int(out, FIELD_YEAR, NULL, in->hdr.year);
 
 return out;
 }

audacious-plugins-3.1.1.tar.bz2/src/vtx/vtx.h -> audacious-plugins-3.2.4.tar.bz2/src/vtx/vtx.h Changed

audacious-plugins-3.1.1.tar.bz2/src/vtx/vtxfile.c -> audacious-plugins-3.2.4.tar.bz2/src/vtx/vtxfile.c Changed

@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -49,7 +50,7 @@
 }
 
 /* read 32-bit integer from file.
- * Returns 1 if error occurs 
+ * Returns 1 if error occurs
 */
 static int read_word32(VFSFile *fp, int32_t *p)
 {
@@ -173,12 +174,12 @@
 fprintf(stderr, "ayemu_vtx_load_data: tune file not open yet (do you call ayemu_vtx_open first?)\n");
 return NULL;
 }
- packed_size = 0; 
+ packed_size = 0;
 buf_alloc = 4096;
 packed_data = (char *) malloc (buf_alloc);
 /* read packed AY register data to end of file. */
 while ((c = vfs_getc (vtx->fp)) != EOF) {
- if (buf_alloc < packed_size) { 
+ if (buf_alloc < packed_size) {
 buf_alloc *= 2;
 packed_data = (char *) realloc (packed_data, buf_alloc);
 if (packed_data == NULL) {
@@ -188,7 +189,7 @@
 }
 }
 packed_data[packed_size++] = c;
- } 
+ }
 vfs_fclose (vtx->fp);
 vtx->fp = NULL;
 if ((vtx->regdata = (char *) malloc (vtx->hdr.regdata_size)) == NULL) {
@@ -230,7 +231,7 @@
 {
 char s[32];
 snprintf(s, sizeof(s), "%d", num);
- return append_string(buf, sz, s);
+ append_string(buf, sz, s);
 }
 
 static void append_char(char *buf, const int sz, const char c)

audacious-plugins-3.1.1.tar.bz2/src/wavpack/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/wavpack/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/wavpack/wavpack.c -> audacious-plugins-3.2.4.tar.bz2/src/wavpack/wavpack.c Changed

audacious-plugins-3.1.1.tar.bz2/src/xsf/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/xsf/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/xsf/desmume/cp15.c -> audacious-plugins-3.2.4.tar.bz2/src/xsf/desmume/cp15.c Changed

@@ -30,14 +30,14 @@
 	int i;
 	armcp15_t *armcp15 = (armcp15_t*)malloc(sizeof(armcp15_t));
 	if(!armcp15) return NULL;
-	
+
 	armcp15->cpu = c;
 	armcp15->IDCode = 0x41049460;
 	armcp15->cacheType = 0x0F0D2112;
 	armcp15->TCMSize = 0x00140140;
 	armcp15->ctrl = 0x00000000;
-	armcp15->DCConfig = 0x0; 
-	armcp15->ICConfig = 0x0; 
+	armcp15->DCConfig = 0x0;
+	armcp15->ICConfig = 0x0;
 	armcp15->writeBuffCtrl = 0x0;
 	armcp15->und = 0x0;
 	armcp15->DaccessPerm = 0x22222222;
@@ -57,7 +57,7 @@
 	armcp15->DTCMRegion = 0x0080000A;
 	armcp15->processID = 0;
 
- /* preset calculated regionmasks */	
+ /* preset calculated regionmasks */
 	for (i=0;i<8;i++) {
 armcp15->regionWriteMask_USR[i] = 0 ;
 armcp15->regionWriteMask_SYS[i] = 0 ;
@@ -72,7 +72,7 @@
 armcp15->regionExecuteSet_USR[i] = 0 ;
 armcp15->regionExecuteSet_SYS[i] = 0 ;
 } ;
-	
+
 	return armcp15;
 }
 
@@ -188,7 +188,7 @@
 			armcp15->regionExecuteSet_SYS[num] = set ;
 			break ;
 	}
-} ;
+}
 
 /* precalculate region masks/sets from cp15 register */
 void armcp15_maskPrecalc(armcp15_t *armcp15)
@@ -264,7 +264,7 @@
 BOOL armcp15_moveCP2ARM(armcp15_t *armcp15, u32 * R, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2)
 {
 	if(armcp15->cpu->CPSR.bits.mode == USR) return FALSE;
-	
+
 	switch(CRn)
 	{
 		case 0 :
@@ -291,7 +291,7 @@
 				return TRUE;
 			}
 			return FALSE;
-			
+
 		case 2 :
 			if((opcode1==0) && (CRm==0))
 			{
@@ -434,7 +434,7 @@
 BOOL armcp15_moveARM2CP(armcp15_t *armcp15, u32 val, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2)
 {
 	if(armcp15->cpu->CPSR.bits.mode == USR) return FALSE;
-	
+
 	switch(CRn)
 	{
 		case 1 :

audacious-plugins-3.1.1.tar.bz2/src/xsf/desmume/cp15.h -> audacious-plugins-3.2.4.tar.bz2/src/xsf/desmume/cp15.h Changed

audacious-plugins-3.1.1.tar.bz2/src/xsf/plugin.c -> audacious-plugins-3.2.4.tar.bz2/src/xsf/plugin.c Changed

@@ -24,6 +24,7 @@
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include <glib.h>
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,7 +32,6 @@
 
 #include <audacious/misc.h>
 #include <audacious/plugin.h>
-#include <libaudcore/tuple_formatter.h>
 
 #include "ao.h"
 #include "corlett.h"
@@ -90,15 +90,15 @@
 
 	t = tuple_new_from_filename(filename);
 
-	tuple_associate_int(t, FIELD_LENGTH, NULL, c->inf_length ? psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade) : -1);
-	tuple_associate_string(t, FIELD_ARTIST, NULL, c->inf_artist);
-	tuple_associate_string(t, FIELD_ALBUM, NULL, c->inf_game);
-	tuple_associate_string(t, -1, "game", c->inf_game);
-	tuple_associate_string(t, FIELD_TITLE, NULL, c->inf_title);
-	tuple_associate_string(t, FIELD_COPYRIGHT, NULL, c->inf_copy);
-	tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced");
-	tuple_associate_string(t, FIELD_CODEC, NULL, "GBA/Nintendo DS Audio");
-	tuple_associate_string(t, -1, "console", "GBA/Nintendo DS");
+	tuple_set_int(t, FIELD_LENGTH, NULL, c->inf_length ? psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade) : -1);
+	tuple_set_str(t, FIELD_ARTIST, NULL, c->inf_artist);
+	tuple_set_str(t, FIELD_ALBUM, NULL, c->inf_game);
+	tuple_set_str(t, -1, "game", c->inf_game);
+	tuple_set_str(t, FIELD_TITLE, NULL, c->inf_title);
+	tuple_set_str(t, FIELD_COPYRIGHT, NULL, c->inf_copy);
+	tuple_set_str(t, FIELD_QUALITY, NULL, "sequenced");
+	tuple_set_str(t, FIELD_CODEC, NULL, "GBA/Nintendo DS Audio");
+	tuple_set_str(t, -1, "console", "GBA/Nintendo DS");
 
 	free(c);
 	g_free(buf);

audacious-plugins-3.1.1.tar.bz2/src/xspf/Makefile -> audacious-plugins-3.2.4.tar.bz2/src/xspf/Makefile Changed

audacious-plugins-3.1.1.tar.bz2/src/xspf/xspf.c -> audacious-plugins-3.2.4.tar.bz2/src/xspf/xspf.c Changed

@@ -2,7 +2,7 @@
 * Audacious: A cross-platform multimedia player
 * Copyright (c) 2006 William Pitcock, Tony Vroon, George Averill,
 * Giacomo Lozito, Derek Pomery, Yoshiki Yazawa
- * and Matti Hämäläinen.
+ * and Matti HÃ¤mÃ¤lÃ¤inen.
 * Copyright (c) 2011 John Lindgren
 *
 * This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+#include <glib.h>
+#include <string.h>
+
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xmlreader.h>
@@ -54,10 +57,9 @@
 { FIELD_QUALITY, "quality", TUPLE_STRING, TRUE},
 
 { FIELD_CODEC, "codec", TUPLE_STRING, TRUE},
- { FIELD_SONG_ARTIST, "song-artist", TUPLE_STRING, TRUE},
 
- { FIELD_MTIME, "mtime", TUPLE_INT, TRUE},
- { FIELD_FORMATTER, "formatter", TUPLE_STRING, TRUE},
+ { FIELD_SONG_ARTIST, "song-artist", TUPLE_STRING, TRUE},
+ { FIELD_COMPOSER, "composer", TUPLE_STRING, TRUE},
 { FIELD_PERFORMER, "performer", TUPLE_STRING, TRUE},
 { FIELD_COPYRIGHT, "copyright", TUPLE_STRING, TRUE},
 { FIELD_DATE, "date", TUPLE_STRING, TRUE},
@@ -80,7 +82,7 @@
 static const gint xspf_nentries = (sizeof(xspf_entries) / sizeof(xspf_entries[0]));
 
 static void xspf_add_file (xmlNode * track, const gchar * filename, const gchar
- * base, struct index * filenames, struct index * tuples)
+ * base, Index * filenames, Index * tuples)
 {
 xmlNode *nptr;
 gchar *location = NULL;
@@ -93,22 +95,22 @@
 gchar *str = (gchar *)xmlNodeGetContent(nptr);
 
 if (strstr (str, "://") != NULL)
- location = g_strdup (str);
+ location = str_get (str);
 else if (str[0] == '/' && base != NULL)
 {
 const gchar * colon = strstr (base, "://");
 
 if (colon != NULL)
- location = g_strdup_printf ("%.*s%s", (gint) (colon + 3
- - base), base, str);
+ location = str_printf ("%.*s%s", (gint) (colon + 3 -
+ base), base, str);
 }
 else if (base != NULL)
 {
 const gchar * slash = strrchr (base, '/');
 
 if (slash != NULL)
- location = g_strdup_printf ("%.*s%s", (gint) (slash + 1
- - base), base, str);
+ location = str_printf ("%.*s%s", (gint) (slash + 1 -
+ base), base, str);
 }
 
 xmlFree(str);
@@ -134,13 +136,13 @@
 case TUPLE_STRING:
 if (! tuple)
 tuple = tuple_new ();
- tuple_associate_string(tuple, xspf_entries[i].tupleField, NULL, (gchar *)str);
+ tuple_set_str(tuple, xspf_entries[i].tupleField, NULL, (gchar *)str);
 break;
 
 case TUPLE_INT:
 if (! tuple)
 tuple = tuple_new ();
- tuple_associate_int(tuple, xspf_entries[i].tupleField, NULL, atol((char *)str));
+ tuple_set_int(tuple, xspf_entries[i].tupleField, NULL, atol((char *)str));
 break;
 
 default:
@@ -164,12 +166,12 @@
 index_append(tuples, tuple);
 }
 else if (tuple)
- tuple_free (tuple);
+ tuple_unref (tuple);
 }
 
 
 static void xspf_find_track (xmlNode * tracklist, const gchar * filename, const
- gchar * base, struct index * filenames, struct index * tuples)
+ gchar * base, Index * filenames, Index * tuples)
 {
 xmlNode *nptr;
 
@@ -196,20 +198,13 @@
 }
 
 static gboolean xspf_playlist_load (const gchar * filename, VFSFile * file,
- gchar * * title, struct index * filenames, struct index * tuples)
+ gchar * * title, Index * filenames, Index * tuples)
 {
 xmlDoc * doc = xmlReadIO (read_cb, close_cb, file, filename, NULL,
 XML_PARSE_RECOVER);
 if (! doc)
 return FALSE;
 
-/* workaround for uninitialized libxml func pointers; see:
- * http://www.linuxquestions.org/questions/programming-9/[solved]using-libxml2-on-mingw-xmlfree-crashes-839802 */
-#ifdef _WIN32
- if (! xmlFree)
- xmlMemGet (& xmlFree, & xmlMalloc, & xmlRealloc, NULL);
-#endif
-
 * title = NULL;
 
 xmlNode *nptr, *nptr2;
@@ -232,8 +227,8 @@
 xmlChar * xml_title = xmlNodeGetContent (nptr2);
 if (xml_title && xml_title[0])
 {
- g_free (* title);
- * title = g_strdup ((gchar *) xml_title);
+ str_unref (* title);
+ * title = str_get ((gchar *) xml_title);
 }
 xmlFree (xml_title);
 }
@@ -354,7 +349,7 @@
 
 
 static gboolean xspf_playlist_save (const gchar * filename, VFSFile * file,
- const gchar * title, struct index * filenames, struct index * tuples)
+ const gchar * title, Index * filenames, Index * tuples)
 {
 gint entries = index_count (filenames);
 xmlDocPtr doc;
@@ -383,7 +378,7 @@
 const gchar * filename = index_get (filenames, count);
 const Tuple * tuple = index_get (tuples, count);
 xmlNodePtr track, location;
- const gchar *scratch = NULL;
+ gchar *scratch = NULL;
 gint scratchi = 0;
 
 track = xmlNewNode(NULL, (xmlChar *)"track");
@@ -403,9 +398,10 @@
 
 switch (xs->type) {
 case TUPLE_STRING:
- scratch = tuple_get_string (tuple, xs->tupleField, NULL);
+ scratch = tuple_get_str (tuple, xs->tupleField, NULL);
 if (! scratch)
 isOK = FALSE;
+ str_unref(scratch);
 break;
 case TUPLE_INT:
 scratchi = tuple_get_int (tuple, xs->tupleField, NULL);